Changeset 50900 in vbox for trunk/src/VBox

Timestamp:

Mar 26, 2014 10:00:47 PM (11 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxVideo: fix a return value.

Location:

trunk/src/VBox/Additions

Files:

• WINNT/Graphics/Video/mp/common/VBoxMPCommon.h (modified) (2 diffs)
• common/VBoxVideo/HGSMIBase.cpp (modified) (4 diffs)
• x11/vboxvideo/pointer.c (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPCommon.h

@@ -69 +69 @@
 inline bool VBoxMPCmnUpdatePointerShape(PVBOXMP_COMMON pCommon, PVIDEO_POINTER_ATTRIBUTES pAttrs, uint32_t cbLength)
 {
-    return VBoxHGSMIUpdatePointerShape(&pCommon->guestCtx,
+    int rc;
+    rc =   VBoxHGSMIUpdatePointerShape(&pCommon->guestCtx,
                                        pAttrs->Enable & 0x0000FFFF,
                                        (pAttrs->Enable >> 16) & 0xFF,
@@ -75 +76 @@
                                        pAttrs->Width, pAttrs->Height, pAttrs->Pixels,
                                        cbLength - sizeof(VIDEO_POINTER_ATTRIBUTES));
+    return RT_SUCCESS(rc);
 }
 

trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp

@@ -495 +495 @@
  *
  * @returns  success or failure
- * @todo  why not return an iprt status code?
  * @param  fFlags    cursor flags, @see VMMDevReqMousePointer::fFlags
  * @param  cHotX     horizontal position of the hot spot
@@ -504 +503 @@
  * @param  cbLength  size in bytes of the pixel data
  */
-RTDECL(bool) VBoxHGSMIUpdatePointerShape(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+RTDECL(int)  VBoxHGSMIUpdatePointerShape(PHGSMIGUESTCOMMANDCONTEXT pCtx,
                                          uint32_t fFlags,
                                          uint32_t cHotX,
@@ -532 +531 @@
         LogFunc(("calculated pointer data size is too big (%d bytes, limit %d)\n",
                  cbData, cbLength));
-        return false;
+        return VERR_INVALID_PARAMETER;
     }
     /* Allocate the IO buffer. */
@@ -563 +562 @@
         rc = VERR_NO_MEMORY;
     LogFlowFunc(("rc %d\n", rc));
-    return RT_SUCCESS(rc);
+    return rc;
 }
 

trunk/src/VBox/Additions/x11/vboxvideo/pointer.c

@@ -532 +532 @@
     }
 
-    rc = VBoxHGSMIUpdatePointerShape(&pVBox->guestCtx, fFlags, bitsp->xhot,
-                                     bitsp->yhot, w, h, p, sizeData);
+    VBoxHGSMIUpdatePointerShape(&pVBox->guestCtx, fFlags, bitsp->xhot,
+                                bitsp->yhot, w, h, p, sizeData);
     free(p);
 }