Changeset 6510 in vbox

Timestamp:

Jan 25, 2008 10:56:25 AM (17 years ago)

Author:

vboxsync

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

27519

Message:

Changed VbglR3SetPointerShape to accept the full request size.

Location:

trunk

Files:

• include/VBox/VBoxGuest.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp (modified) (2 diffs)
• src/VBox/Additions/x11/xgraphics/vboxutils-new.c (modified) (4 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -1422 +1422 @@
 VBGLR3DECL(int)     VbglR3VideoAccelEnable(bool fEnable);
 VBGLR3DECL(int)     VbglR3VideoAccelFlush(void);
-VBGLR3DECL(int)     VbglR3SetPointerShape(uint32_t fFlags, uint32_t xHot, uint32_t yHot, uint32_t cx, uint32_t cy, const void *pvImg, size_t cbImg);
+VBGLR3DECL(int)     VbglR3SetPointerShape(uint32_t fFlags, uint32_t xHot, uint32_t yHot, uint32_t cx, uint32_t cy, const void *pvImg, size_t cbReq);
 /** @}  */
 

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

@@ -68 +68 @@
  * @param   cy          Pointer height.
  * @param   pvImg       Pointer to the image data (can be NULL).
- * @param   cbImg       The size of the image data not including the pre-allocated area.
- *                      This should be the size of the image data exceeding the size of
- *                      the VMMDevReqMousePointer structure.
+ * @param   cbReq       The complete size of the request.
  */
-VBGLR3DECL(int) VbglR3SetPointerShape(uint32_t fFlags, uint32_t xHot, uint32_t yHot, uint32_t cx, uint32_t cy, const void *pvImg, size_t cbImg)
+VBGLR3DECL(int) VbglR3SetPointerShape(uint32_t fFlags, uint32_t xHot, uint32_t yHot, uint32_t cx, uint32_t cy, const void *pvImg, size_t cbReq)
 {
     VMMDevReqMousePointer *pReq;
-    int rc = vbglR3GRAlloc((VMMDevRequestHeader **)&pReq, sizeof(VMMDevReqMousePointer) + cbImg, VMMDevReq_SetPointerShape);
+    int rc = vbglR3GRAlloc((VMMDevRequestHeader **)&pReq, cbReq, VMMDevReq_SetPointerShape);
     if (RT_SUCCESS(rc))
     {
@@ -84 +82 @@
         pReq->height = cy;
         if (pvImg)
-            memcpy(pReq->pointerData, pvImg, sizeof(pReq->pointerData) + cbImg);
+            memcpy(pReq->pointerData, pvImg, cbReq - sizeof(VMMDevReqMousePointer) + sizeof(pReq->pointerData));
 
         rc = vbglR3GRPerform(&pReq->header);

trunk/src/VBox/Additions/x11/xgraphics/vboxutils-new.c

@@ -366 +366 @@
     rc = VbglR3SetPointerShape(0, pVBox->reqp->xHot, pVBox->reqp->yHot, pVBox->reqp->width,
                                pVBox->reqp->height, pVBox->reqp->pointerData,
-                               pVBox->reqp->header.size - pVBox->set_pointer_shape_size);
+                               pVBox->reqp->header.size);
     if (RT_FAILURE(rc))
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Could not hide the virtual mouse pointer.\n");
@@ -378 +378 @@
     rc = VbglR3SetPointerShape(VBOX_MOUSE_POINTER_VISIBLE, pVBox->reqp->xHot, pVBox->reqp->yHot,
                                pVBox->reqp->width, pVBox->reqp->height, pVBox->reqp->pointerData,
-                               pVBox->reqp->header.size - pVBox->set_pointer_shape_size);
+                               pVBox->reqp->header.size);
     if (RT_FAILURE(rc))
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Could not unhide the virtual mouse pointer.\n");
@@ -397 +397 @@
 
     rc = VbglR3SetPointerShape(reqp->fFlags, reqp->xHot, reqp->yHot, reqp->width, reqp->height,
-                               reqp->pointerData, reqp->header.size - pVBox->set_pointer_shape_size);
+                               reqp->pointerData, reqp->header.size);
     if (RT_FAILURE(rc))
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,  "Unable to set the virtual mouse pointer image.\n");
@@ -708 +708 @@
 
     VbglR3SetPointerShape(VBOX_MOUSE_POINTER_SHAPE | VBOX_MOUSE_POINTER_ALPHA, bitsp->xhot, bitsp->yhot, w, h,
-                          pm, reqp->header.size - pVBox->set_pointer_shape_size);
+                          pm, reqp->header.size);
     xfree(p);
 }