Changeset 3432 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/OpenGL

Timestamp:

Jul 5, 2007 8:14:18 AM (18 years ago)

Author:

vboxsync

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

22642

Message:

Fixed issue with NULL parameter passing

Location:

trunk/src/VBox/Additions/WINNT/Graphics/OpenGL

Files:

• OGLComplexSync.cpp (modified) (1 diff)
• VBoxOGL.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/OGLComplexSync.cpp

@@ -122 +122 @@
 {
     /* if ppfd == NULL, then DrvDescribelayerPlane returns the maximum nr of supported pixel formats */
-    if (ppfd)
-    {
-        VBOX_OGL_GEN_SYNC_OP4_PASS_PTR_RET(int, DrvDescribePixelFormat, hdc, iPixelFormat, nBytes, nBytes, ppfd);
-        return retval;
-    }
-    else
-    {
-        VBOX_OGL_GEN_SYNC_OP4_RET(int, DrvDescribePixelFormat, hdc, iPixelFormat, nBytes, ppfd);
-        return retval;
-    }
+    VBOX_OGL_GEN_SYNC_OP4_PASS_PTR_RET(int, DrvDescribePixelFormat, hdc, iPixelFormat, nBytes, nBytes, ppfd);
+    return retval;
 }
 

trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/VBoxOGL.cpp

@@ -435 +435 @@
     parms.lasterror.type                    = VMMDevHGCMParmType_32bit;
     parms.lasterror.u.value32               = 0;
-    parms.pLastParam.type                   = VMMDevHGCMParmType_LinAddr;
-    parms.pLastParam.u.Pointer.size         = cbParam;
-    parms.pLastParam.u.Pointer.u.linearAddr = (vmmDevHypPtr)pLastParam;
+    if (!cbParam || !pLastParam)
+    {
+        parms.pLastParam.type                   = VMMDevHGCMParmType_LinAddr;
+        parms.pLastParam.u.Pointer.size         = cbParam;
+        parms.pLastParam.u.Pointer.u.linearAddr = (vmmDevHypPtr)pLastParam;
+    }
+    else
+    {
+        /* Placeholder as HGCM doesn't like NULL pointers */
+        Assert(!cbParam && !pLastParam);
+        parms.pLastParam.type                   = VMMDevHGCMParmType_32bit;
+        parms.pLastParam.u.value32              = 0;
+    }
 
     int rc = vboxHGCMCall(vboxOGLCtx.hGuestDrv, &parms, sizeof (parms));