summaryrefslogtreecommitdiff
path: root/src/VBox/Devices/VMMDev/VMMDev.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/VBox/Devices/VMMDev/VMMDev.cpp')
-rw-r--r--src/VBox/Devices/VMMDev/VMMDev.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/VBox/Devices/VMMDev/VMMDev.cpp b/src/VBox/Devices/VMMDev/VMMDev.cpp
index dc8340c89..d700883be 100644
--- a/src/VBox/Devices/VMMDev/VMMDev.cpp
+++ b/src/VBox/Devices/VMMDev/VMMDev.cpp
@@ -1,4 +1,4 @@
-/* $Id: VMMDev.cpp 29590 2010-05-18 07:02:17Z vboxsync $ */
+/* $Id: VMMDev.cpp 29751 2010-05-21 23:32:23Z vboxsync $ */
/** @file
* VMMDev - Guest <-> VMM/Host communication device.
*/
@@ -1765,7 +1765,7 @@ static DECLCALLBACK(int) vmmdevRequestHandler(PPDMDEVINS pDevIns, void *pvUser,
VMMDevSharedModuleRegistrationRequest *pReqModule = (VMMDevSharedModuleRegistrationRequest *)pRequestHeader;
if ( pRequestHeader->size < sizeof(VMMDevSharedModuleRegistrationRequest)
- || pRequestHeader->size != RT_OFFSETOF(VMMDevSharedModuleRegistrationRequest, aRegions[pReqModule->cRegions]))
+ || pRequestHeader->size != RT_UOFFSETOF(VMMDevSharedModuleRegistrationRequest, aRegions[pReqModule->cRegions]))
{
pRequestHeader->rc = VERR_INVALID_PARAMETER;
}
@@ -2096,7 +2096,8 @@ static DECLCALLBACK(int) vmmdevSetMouseCapabilities(PPDMIVMMDEVPORT pInterface,
Log(("vmmdevSetMouseCapabilities: bNotify %d\n", bNotify));
- pThis->mouseCapabilities &= ~VMMDEV_MOUSE_HOST_MASK;
+ pThis->mouseCapabilities &= ~VMMDEV_MOUSE_HOST_MASK
+ | VMMDEV_MOUSE_HOST_RECHECKS_NEEDS_HOST_CURSOR;
pThis->mouseCapabilities |= (capabilities & VMMDEV_MOUSE_HOST_MASK);
if (bNotify)
VMMDevNotifyGuest (pThis, VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED);
@@ -2883,7 +2884,8 @@ static DECLCALLBACK(int) vmmdevConstruct(PPDMDEVINS pDevIns, int iInstance, PCFG
AssertRCReturn(rc, rc);
pThis->u32HGCMEnabled = 0;
#endif /* VBOX_WITH_HGCM */
- /* The GUI checks whether this changes in this version of VirtualBox. */
+ /* In this version of VirtualBox the GUI checks whether "needs host cursor"
+ * changes. */
pThis->mouseCapabilities |= VMMDEV_MOUSE_HOST_RECHECKS_NEEDS_HOST_CURSOR;
PDMDevHlpSTAMRegisterF(pDevIns, &pThis->StatMemBalloonChunks, STAMTYPE_U32, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT, "Memory balloon size", "/Devices/VMMDev/BalloonChunks");