vbox的更動 69080 路徑 trunk/src/VBox

時間撮記:

2017-10-13 下午03:40:38 (7 年 以前)

作者:

vboxsync

訊息:

Additions/x11/vboxvideo: Replace custom VBVXASSERT with IPRT assertion syntax.
bugref:9017: Additions/x11: put vboxvideo into upstream X.Org

At some point we started using custom assertion code in X.Org vboxvideo.
This change removes that and switches assertions in the code to use IPRT
assertions, albeit provided by our IPRT replacement header and not by IPRT
itself.

位置:

trunk/src/VBox/Additions/x11/vboxvideo

檔案:

• getmode.c (修改) (3 筆差異)
• pointer.c (修改) (3 筆差異)
• setmode.c (修改) (2 筆差異)
• vboxvideo.c (修改) (2 筆差異)
• vboxvideo.h (修改) (1 筆差異)
• vbva.c (修改) (3 筆差異)

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

@@ -212 +212 @@
         return;
     rc = VBoxHGSMIGetModeHints(&pVBox->guestCtx, pVBox->cScreens, pVBox->paVBVAModeHints);
-    VBVXASSERT(rc == VINF_SUCCESS, ("VBoxHGSMIGetModeHints failed, rc=%d.\n", rc));
+    AssertMsg(rc == VINF_SUCCESS, ("VBoxHGSMIGetModeHints failed, rc=%d.\n", rc));
     for (i = 0; i < pVBox->cScreens; ++i)
         if (pVBox->paVBVAModeHints[i].magic == VBVAMODEHINT_MAGIC)
@@ -229 +229 @@
         }
     rc = VBoxQueryConfHGSMI(&pVBox->guestCtx, VBOX_VBVA_CONF32_CURSOR_CAPABILITIES, &fCursorCapabilities);
-    VBVXASSERT(rc == VINF_SUCCESS, ("Getting VBOX_VBVA_CONF32_CURSOR_CAPABILITIES failed, rc=%d.\n", rc));
+    AssertMsg(rc == VINF_SUCCESS, ("Getting VBOX_VBVA_CONF32_CURSOR_CAPABILITIES failed, rc=%d.\n", rc));
     compareAndMaybeSetUseHardwareCursor(pVBox, fCursorCapabilities, &fChanged, true);
     if (pfNeedUpdate != NULL && fChanged)
@@ -253 +253 @@
     while (rc > 0 || (rc == -1 && errno == EINTR));
     /* Why do they return EAGAIN instead of zero bytes read like everyone else does? */
-    VBVXASSERT(rc != -1 || errno == EAGAIN, ("Reading ACPI input event failed.\n"));
+    AssertMsg(rc != -1 || errno == EAGAIN, ("Reading ACPI input event failed.\n"));
 }
 

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

@@ -139 +139 @@
 
     rc = VBoxHGSMIUpdatePointerShape(&pVBox->guestCtx, 0, 0, 0, 0, 0, NULL, 0);
-    VBVXASSERT(rc == VINF_SUCCESS, ("Could not hide the virtual mouse pointer, VBox error %d.\n", rc));
+    AssertMsg(rc == VINF_SUCCESS, ("Could not hide the virtual mouse pointer, VBox error %d.\n", rc));
 }
 
@@ -152 +152 @@
     rc = VBoxHGSMIUpdatePointerShape(&pVBox->guestCtx, VBOX_MOUSE_POINTER_VISIBLE,
                                      0, 0, 0, 0, NULL, 0);
-    VBVXASSERT(rc == VINF_SUCCESS, ("Could not unhide the virtual mouse pointer.\n"));
+    AssertMsg(rc == VINF_SUCCESS, ("Could not unhide the virtual mouse pointer.\n"));
 }
 
@@ -171 +171 @@
              pImage->cHotX, pImage->cHotY, pImage->cWidth, pImage->cHeight,
              pImage->pPixels, pImage->cbLength);
-    VBVXASSERT(rc == VINF_SUCCESS, ("Unable to set the virtual mouse pointer image.\n"));
+    AssertMsg(rc == VINF_SUCCESS, ("Unable to set the virtual mouse pointer image.\n"));
 }
 

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

@@ -69 +69 @@
 
     /* Assume 32BPP - this is just a sanity test. */
-    VBVXASSERT(   cbOldSize / 4 <= VBOX_VIDEO_MAX_VIRTUAL * VBOX_VIDEO_MAX_VIRTUAL
+    AssertMsg(   cbOldSize / 4 <= VBOX_VIDEO_MAX_VIRTUAL * VBOX_VIDEO_MAX_VIRTUAL
                && cbNewSize / 4 <= VBOX_VIDEO_MAX_VIRTUAL * VBOX_VIDEO_MAX_VIRTUAL,
                ("cbOldSize=%llu cbNewSize=%llu, max=%u.\n", (unsigned long long)cbOldSize, (unsigned long long)cbNewSize,
@@ -97 +97 @@
               cDisplay, cWidth, cHeight, x, y, fEnabled, fConnected, pFrameBuffer->x0, pFrameBuffer->y0, pFrameBuffer->cWidth,
               pFrameBuffer->cHeight, pFrameBuffer->cBPP);
-    VBVXASSERT(cWidth != 0 && cHeight != 0, ("cWidth = 0 or cHeight = 0\n"));
+    AssertMsg(cWidth != 0 && cHeight != 0, ("cWidth = 0 or cHeight = 0\n"));
     offStart = (y * pFrameBuffer->cWidth + x) * pFrameBuffer->cBPP / 8;
     if (cDisplay == 0 && fEnabled)

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

@@ -245 +245 @@
 
     TRACE_LOG("width=%d, height=%d\n", width, height);
-    VBVXASSERT(width >= 0 && height >= 0, ("Invalid negative width (%d) or height (%d)\n", width, height));
+    AssertMsg(width >= 0 && height >= 0, ("Invalid negative width (%d) or height (%d)\n", width, height));
     if (pScreen == NULL)  /* Not yet initialised. */
         return TRUE;
     pPixmap = pScreen->GetScreenPixmap(pScreen);
-    VBVXASSERT(pPixmap != NULL, ("Failed to get the screen pixmap.\n"));
+    AssertMsg(pPixmap != NULL, ("Failed to get the screen pixmap.\n"));
     TRACE_LOG("pPixmap=%p adjustedWidth=%d height=%d pScrn->depth=%d pScrn->bitsPerPixel=%d cbLine=%d pVBox->base=%p pPixmap->drawable.width=%d pPixmap->drawable.height=%d\n",
               (void *)pPixmap, adjustedWidth, height, pScrn->depth,
@@ -343 +343 @@
      * See the work-around in ScreenInit. */
     xf86RandR12GetOriginalVirtualSize(pScrn, &originalX, &originalY);
-    VBVXASSERT(originalX == VBOX_VIDEO_MAX_VIRTUAL && originalY == VBOX_VIDEO_MAX_VIRTUAL, ("OriginalSize=%dx%d",
+    AssertMsg(originalX == VBOX_VIDEO_MAX_VIRTUAL && originalY == VBOX_VIDEO_MAX_VIRTUAL, ("OriginalSize=%dx%d",
                originalX, originalY));
     for (i = cFirst; i < cLast; ++i)

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

@@ -79 +79 @@
 
 #endif  /* !DEBUG */
-
-/* Not just for debug builds.  If something is wrong we want to know at once. */
-#define VBVXASSERT(expr, out) \
-if (!(expr)) \
-{ \
-    xf86ErrorF("\nAssertion failed!\n\n"); \
-    xf86ErrorF("%s\n", #expr); \
-    xf86ErrorF("at %s (%s:%d)\n", __func__, __FILE__, __LINE__); \
-    xf86ErrorF out; \
-    FatalError("Assertion"); \
-}
 
 #define VBOX_VERSION            VBOX_VERSION_MAJOR * 10000 \

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

@@ -135 +135 @@
     rc = VBoxHGSMISetupGuestContext(&pVBox->guestCtx, pvGuestHeapMemory, cbGuestHeapMemory,
                                     offVRAMBaseMapping + offGuestHeapMemory, &g_hgsmiEnv);
-    VBVXASSERT(RT_SUCCESS(rc), ("Failed to set up the guest-to-host message buffer heap, rc=%d\n", rc));
+    AssertMsg(RT_SUCCESS(rc), ("Failed to set up the guest-to-host message buffer heap, rc=%d\n", rc));
     pVBox->cbView = offVRAMBaseMapping;
 }
@@ -180 +180 @@
     rc = VBoxHGSMISendViewInfo(&pVBox->guestCtx, pVBox->cScreens,
                                vboxFillViewInfo, (void *)pVBox);
-    VBVXASSERT(RT_SUCCESS(rc), ("Failed to send the view information to the host, rc=%d\n", rc));
+    AssertMsg(RT_SUCCESS(rc), ("Failed to send the view information to the host, rc=%d\n", rc));
     return TRUE;
 }
@@ -229 +229 @@
             rc = FALSE;
     }
-    VBVXASSERT(rc, ("Failed to enable screen update reporting for at least one virtual monitor.\n"));
+    AssertMsg(rc, ("Failed to enable screen update reporting for at least one virtual monitor.\n"));
     pVBox->fHaveHGSMIModeHints = haveHGSMIModeHintAndCursorReportingInterface(pVBox);
     pVBox->fHostHasScreenBlankingFlag = hostHasScreenBlankingFlag(pVBox);