Changeset 6565 in vbox

Timestamp:

Jan 29, 2008 12:53:19 PM (17 years ago)

Author:

vboxsync

Message:

Fix for Todo in r27575. added as new function as we cannot use function overloading.

Location:

trunk

Files:

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

trunk/include/VBox/VBoxGuest.h

@@ -1423 +1423 @@
 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)     VbglR3SetPointerShapeReq(VMMDevReqMousePointer *pReq);
 /** @}  */
 

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

@@ -99 +99 @@
 
 /**
+ * Send mouse pointer shape information to the host.
+ * This version of the function accepts a request for clients that
+ * already allocate and manipulate the request structure directly.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pReq        Pointer to the VMMDevReqMousePointer structure.
+ */
+VBGLR3DECL(int) VbglR3SetPointerShapeReq(VMMDevReqMousePointer *pReq)
+{
+    int rc = vbglR3GRPerform(&pReq->header);
+    if (RT_SUCCESS(rc))
+        rc = pReq->header.rc;
+    return rc;
+}
+
+
+/**
  * Query the last display change request.
  *

trunk/src/VBox/Additions/x11/xgraphics/Makefile.kmk

@@ -195 +195 @@
 vboxvideo_drv_LIBS = \
         $(VBOX_LIB_VBGL_R3) \
-        $(VBOX_LIB_IPRT_GUEST_R3) \
+        $(VBOX_LIB_IPRT_GUEST_R3_MINI) \
         $(VBOX_LIB_VBGL_R3)
 ## @todo Use VBOX_LIB_IPRT_GUEST_R3_MINI instead of VBOX_LIB_IPRT_GUEST_R3?

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

@@ -361 +361 @@
     int rc;
     pVBox->reqp->fFlags = 0;
-    rc = VbglR3SetPointerShape(0, pVBox->reqp->xHot, pVBox->reqp->yHot, pVBox->reqp->width,
-                               pVBox->reqp->height, pVBox->reqp->pointerData,
-                               pVBox->pointerSize);
+    rc = VbglR3SetPointerShapeReq(pVBox->reqp);
     if (RT_FAILURE(rc))
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Could not hide the virtual mouse pointer.\n");
@@ -373 +371 @@
     int rc;
     pVBox->reqp->fFlags = VBOX_MOUSE_POINTER_VISIBLE;
-    rc = VbglR3SetPointerShape(VBOX_MOUSE_POINTER_VISIBLE, pVBox->reqp->xHot, pVBox->reqp->yHot,
-                               pVBox->reqp->width, pVBox->reqp->height, pVBox->reqp->pointerData,
-                               pVBox->pointerSize);
+    rc = VbglR3SetPointerShapeReq(pVBox->reqp);
     if (RT_FAILURE(rc))
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Could not unhide the virtual mouse pointer.\n");
@@ -393 +389 @@
 #endif
 
-    rc = VbglR3SetPointerShape(reqp->fFlags, reqp->xHot, reqp->yHot, reqp->width, reqp->height,
-                               reqp->pointerData, pVBox->pointerSize);
+    rc = VbglR3SetPointerShapeReq(reqp);
     if (RT_FAILURE(rc))
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,  "Unable to set the virtual mouse pointer image.\n");
@@ -663 +658 @@
                  (unsigned long)sizeRequest);
 
-    /** @todo r=bird: The VbglR3SetPointerShape API and this code seems to 
-     * end up doing the stuff twice, at least wrt memory. It would make much 
-     * more sense to have a VbglR3SetPointerShape version which took a 
-     * VMMDevReqMousePointer pointer instead. Sorry for not spotting this 
-     * the first time around. */
     reqp = (VMMDevReqMousePointer *)p;
     *reqp = *pVBox->reqp;
@@ -710 +700 @@
     }
 
-    VbglR3SetPointerShape(VBOX_MOUSE_POINTER_SHAPE | VBOX_MOUSE_POINTER_ALPHA, bitsp->xhot, bitsp->yhot, w, h,
-                          pm, pVBox->pointerSize);
+    VbglR3SetPointerShapeReq(reqp);
     xfree(p);
 }