Changeset 64425 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Oct 26, 2016 7:26:46 AM (8 years ago)

Author:

vboxsync

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

111545

Message:

bugref:8614: Additions/common/VBoxVideo: make the code more self-contained: remove final dependencies on vboxguest in vboxvideo.

Location:

trunk/src/VBox/Additions/common/VBoxVideo

Files:

• Modesetting.cpp (modified) (2 diffs)
• VBVABase.cpp (modified) (7 diffs)

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

@@ -23 +23 @@
 #ifndef VBOX_GUESTR3XF86MOD
 # include <iprt/string.h>
+#endif
+
+#ifndef LINUX_VERSION_CODE
+# define VBVOAssertPtr AssertPtr
+#else
+# define VBVOAssertPtr(a) do {} while(0)
 #endif
 
@@ -330 +336 @@
 {
     int rc;
-    AssertPtrReturn(paHints, VERR_INVALID_POINTER);
+    VBVOAssertPtr(paHints);
+    if (!VALID_PTR(paHints))
+        return VERR_INVALID_POINTER;
     void *p = VBoxHGSMIBufferAlloc(pCtx,   sizeof(VBVAQUERYMODEHINTS)
                                          + cScreens * sizeof(VBVAMODEHINT),

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

@@ -21 +21 @@
 #include <VBox/err.h>
 // #include <VBox/log.h>
-#include <iprt/assert.h>
+#ifndef LINUX_VERSION_CODE
+# include <iprt/assert.h>
+# define VBVOAssert Assert
+#else
+# define VBVOAssert(a) do {} while(0)
+#endif
 #include <iprt/string.h>
 
@@ -164 +169 @@
         uint32_t indexRecordNext;
 
-        Assert(!pCtx->fHwBufferOverflow);
-        Assert(pCtx->pRecord == NULL);
+        VBVOAssert(!pCtx->fHwBufferOverflow);
+        VBVOAssert(pCtx->pRecord == NULL);
 
         indexRecordNext = (pCtx->pVBVA->indexRecordFree + 1) % VBVA_MAX_RECORDS;
@@ -208 +213 @@
     // LogFunc(("\n"));
 
-    Assert(pCtx->pVBVA);
+    VBVOAssert(pCtx->pVBVA);
 
     pRecord = pCtx->pRecord;
-    Assert(pRecord && (pRecord->cbRecord & VBVA_F_RECORD_PARTIAL));
+    VBVOAssert(pRecord && (pRecord->cbRecord & VBVA_F_RECORD_PARTIAL));
 
     /* Mark the record completed. */
@@ -290 +295 @@
 
     VBVABUFFER *pVBVA = pCtx->pVBVA;
-    Assert(pVBVA);
+    VBVOAssert(pVBVA);
 
     if (!pVBVA || pCtx->fHwBufferOverflow)
@@ -297 +302 @@
     }
 
-    Assert(pVBVA->indexRecordFirst != pVBVA->indexRecordFree);
+    VBVOAssert(pVBVA->indexRecordFirst != pVBVA->indexRecordFree);
 
     pRecord = pCtx->pRecord;
-    Assert(pRecord && (pRecord->cbRecord & VBVA_F_RECORD_PARTIAL));
+    VBVOAssert(pRecord && (pRecord->cbRecord & VBVA_F_RECORD_PARTIAL));
 
     // LogFunc(("%d\n", cb));
@@ -330 +335 @@
                     // LogFunc(("Buffer overflow!!!\n"));
                     pCtx->fHwBufferOverflow = true;
-                    Assert(false);
+                    VBVOAssert(false);
                     return false;
                 }
@@ -338 +343 @@
         }
 
-        Assert(cbChunk <= cb);
-        Assert(cbChunk <= vboxHwBufferAvail (pVBVA));
+        VBVOAssert(cbChunk <= cb);
+        VBVOAssert(cbChunk <= vboxHwBufferAvail (pVBVA));
 
         vboxHwBufferPlaceDataAt (pCtx, (uint8_t *)p + cbWritten, cbChunk, pVBVA->off32Free);