Changeset 37174 in vbox for trunk/src/VBox/Additions

Timestamp:

May 21, 2011 8:49:15 PM (14 years ago)

Author:

vboxsync

Message:

Additions/x11/seamless: allow for the possibility that nothing is visible on-screen

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp (modified) (2 diffs)
• x11/VBoxClient/seamless-host.cpp (modified) (1 diff)

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

@@ -137 +137 @@
  *       to copy our rectangle and header data into a single structure and perform an
  *       additional allocation.
+ * @todo Would that really gain us much, given that the rectangles may not
+ *       be grouped at all, or in the format we need?  Keeping the memory
+ *       for our "single structure" around (re-alloc-ing it if necessary)
+ *       sounds like a simpler optimisation if we need it.
  */
 VBGLR3DECL(int) VbglR3SeamlessSendRects(uint32_t cRects, PRTRECT pRects)
@@ -143 +147 @@
     int rc;
 
-    if (!cRects || !pRects)
-        return VINF_SUCCESS;
+    AssertReturn(pRects || (cRects == 0), VERR_INVALID_PARAMETER);
     rc = vbglR3GRAlloc((VMMDevRequestHeader **)&pReq,
-                       sizeof(VMMDevVideoSetVisibleRegion) + (cRects - 1) * sizeof(RTRECT),
+                         sizeof(VMMDevVideoSetVisibleRegion)
+                       + cRects * sizeof(RTRECT) - sizeof(RTRECT),
                        VMMDevReq_VideoSetVisibleRegion);
     if (RT_SUCCESS(rc))
     {
         pReq->cRect = cRects;
-        memcpy(&pReq->Rect, pRects, cRects * sizeof(RTRECT));
+        if (cRects)
+            memcpy(&pReq->Rect, pRects, cRects * sizeof(RTRECT));
+        /* This will fail harmlessly for cRect == 0 and older host code */
         rc = vbglR3GRPerform(&pReq->header);
+        LogFunc(("Visible region request returned %Rrc, internal %Rrc.\n",
+                 rc, pReq->header.rc));
         if (RT_SUCCESS(rc))
             rc = pReq->header.rc;
         vbglR3GRFree(&pReq->header);
     }
+    LogFunc(("Sending %u rectangles to the host: %Rrc\n", cRects, rc));
     return rc;
 }

trunk/src/VBox/Additions/x11/VBoxClient/seamless-host.cpp

@@ -137 +137 @@
 {
     LogRelFlowFunc(("\n"));
-    if (!pRects)  /* Assertion */
+    if (cRects && !pRects)  /* Assertion */
     {
         LogRelThisFunc(("ERROR: called with null pointer!\n"));