Changeset 32631 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp

Timestamp:

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

Author:

vboxsync

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/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp

@@ -99 +99 @@
 {
     VMMDevReqMousePointer *pReq;
-    int rc = vbglR3GRAlloc((VMMDevRequestHeader **)&pReq, RT_OFFSETOF(VMMDevReqMousePointer, pointerData) + cbImg, VMMDevReq_SetPointerShape);
+    size_t cbReq = vmmdevGetMousePointerReqSize(cx, cy);
+    AssertReturn(   !pvImg
+                 || cbReq == RT_OFFSETOF(VMMDevReqMousePointer, pointerData) + cbImg,
+                 VERR_INVALID_PARAMETER);
+    int rc = vbglR3GRAlloc((VMMDevRequestHeader **)&pReq, cbReq,
+                           VMMDevReq_SetPointerShape);
     if (RT_SUCCESS(rc))
     {
@@ -111 +116 @@
 
         rc = vbglR3GRPerform(&pReq->header);
-        vbglR3GRFree(&pReq->header);
         if (RT_SUCCESS(rc))
             rc = pReq->header.rc;
+        vbglR3GRFree(&pReq->header);
     }
     return rc;