vbox: update to 4.3.28

Issue #2090
This commit is contained in:
Alexander Boettcher 2016-01-12 00:24:31 +01:00 committed by Christian Helmuth
parent aabdb77697
commit 95a9ceed4a
4 changed files with 12 additions and 26 deletions

View File

@ -1 +1 @@
5a3ab790e3488d1e0d2646a1e23dd2a353dafedc
6bc6fb1f497b9521b975d2b61956513dbc1db5dd

View File

@ -1,17 +1,17 @@
LICENSE := GPLv2
VERSION := 4.3.26
VERSION := 4.3.28
DOWNLOADS := virtualbox.archive virtualbox_sdk.archive
VIRTUALBOX_TBZ2 := VirtualBox-$(VERSION).tar.bz2
VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-98988.zip
VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-100309.zip
URL(virtualbox) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_TBZ2)
DIR(virtualbox) := src/app/virtualbox
SHA(virtualbox) := f421be5b31deb5f73352d002020fa6fbce44a001
SHA(virtualbox) := 252ef1654494177dcf5d8095f70e51250c894b19
URL(virtualbox_sdk) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_SDK_ZIP)
DIR(virtualbox_sdk) := src/app/virtualbox_sdk
SHA(virtualbox_sdk) := d579eae196fd0d1cc6e25a7563cfa93f24ee989c
SHA(virtualbox_sdk) := 29ef210a0056245ec77195b14687cbf707b21b35
PATCHES_DIR := src/virtualbox/patches
PATCHES_DIR_VBOX4 := src/virtualbox/patches

View File

@ -28,7 +28,7 @@ index b8f9ebf..aa3eb87 100644
}
+#ifdef DEBUG
else
E1kLog(("%s At %08X read (%s) attempt from non-existing register\n",
E1kLog2(("%s At %08X read (%s) attempt from non-existing register\n",
pThis->szPrf, offReg, e1kU32toHex(u32, mask, buf)));
+#endif

View File

@ -1627,29 +1627,15 @@ index c61ea6f..ed4bb7a 100644
#include "AutoCaller.h"
#include "Logging.h"
@@ -679,16 +681,21 @@ DECLCALLBACK(int) Medium::Task::fntMediumTask(RTTHREAD aThread, void *pvUser)
HRESULT rc = pTask->handler();
+ Progress * p = nullptr;
+
/* complete the progress if run asynchronously */
if (pTask->isAsync())
{
if (!pTask->mProgress.isNull())
- pTask->mProgress->notifyComplete(rc);
+ p = pTask->mProgress;
}
/* pTask is no longer needed, delete it. */
@@ -697,7 +704,7 @@ DECLCALLBACK(int) Medium::Task::fntMediumTask(RTTHREAD aThread, void *pvUser)
delete pTask;
+ if (p)
+ p->notifyComplete(rc);
+
LogFlowFunc(("rc=%Rhrc\n", rc));
LogFlowFuncLeave();
/* complete the progress if run asynchronously */
- if (!pProgress.isNull())
+ if (pProgress && !pProgress.isNull())
pProgress->notifyComplete(rc);
LogFlowFunc(("rc=%Rhrc\n", rc));
@@ -1231,7 +1238,7 @@ HRESULT Medium::init(VirtualBox *aVirtualBox,
else
{