Changeset 32631 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Sep 20, 2010 9:55:38 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

66037

Message:

Devices/VMMDev and Additions/common/VBoxGuestLib: get the mouse pointer shape IOCTL size right on the guest side and check it better on the host side

File:

• trunk/src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -751 +751 @@
             if (pRequestHeader->size < sizeof(VMMDevReqMousePointer))
             {
-                AssertMsg(pRequestHeader->size == 0x10028 && pRequestHeader->version == 10000,  /* don't bitch about legacy!!! */
+                AssertMsg(pRequestHeader->size == 0x10028 && pRequestHeader->version == 10000,  /* don't complain about legacy!!! */
                           ("VMMDev mouse shape structure has invalid size %d (%#x) version=%d!\n",
                            pRequestHeader->size, pRequestHeader->size, pRequestHeader->size, pRequestHeader->version));
@@ -767 +767 @@
                      fVisible, fAlpha, fShape, pointerShape->width, pointerShape->height));
 
-                if (pRequestHeader->size == sizeof(VMMDevReqMousePointer))
+                if (      pRequestHeader->size
+                       != vmmdevGetMousePointerReqSize(pointerShape->width,
+                                                       pointerShape->height)
+                    || !pointerShape->width
+                    || !pointerShape->height)
                 {
                     /* The guest did not provide the shape actually. */