Changeset 3428 in vbox

Timestamp:

Jul 4, 2007 5:16:28 PM (18 years ago)

Author:

vboxsync

Message:

bugfix

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• glwindrv.cpp (modified) (2 diffs)
• service.cpp (modified) (2 diffs)
• vboxgl.cpp (modified) (1 diff)

trunk/src/VBox/HostServices/SharedOpenGL/glwindrv.cpp

@@ -132 +132 @@
     {
         if (pClient->hdc)
-            DeleteDC(pClient->hdc);
+            ReleaseDC(pClient->hwnd, pClient->hdc);
         PostMessage(pClient->hwnd, WM_CLOSE, 0, 0);
         pClient->hwnd = 0;
@@ -425 +425 @@
     ppfd = (LPPIXELFORMATDESCRIPTOR)pClient->pLastParam;
 
+    hdc = VBOX_OGL_GUEST_TO_HOST_HDC(hdc);
+    if (!hdc)
+        hdc = GetDC(0);
+
     Log(("DrvDescribePixelFormat %x %d %d %x\n", hdc, iPixelFormat, nBytes, ppfd));
-    pClient->lastretval = DescribePixelFormat(VBOX_OGL_GUEST_TO_HOST_HDC(hdc), iPixelFormat, nBytes, ppfd);
+    pClient->lastretval = DescribePixelFormat(hdc, iPixelFormat, nBytes, ppfd);
     if (!pClient->lastretval)
         Log(("DescribePixelFormat failed with %d\n", GetLastError()));
-}
+
+    if (!VBOX_OGL_GUEST_TO_HOST_HDC(hdc))
+        ReleaseDC(0, pClient->hdc);
+}

trunk/src/VBox/HostServices/SharedOpenGL/service.cpp

@@ -209 +209 @@
             else 
             if (    paParms[0].type != VBOX_HGCM_SVC_PARM_PTR       /* pCmdBuffer */
-                ||  paParms[1].type != VBOX_HGCM_SVC_PARM_PTR       /* pLastParam */
-                ||  paParms[2].type != VBOX_HGCM_SVC_PARM_32BIT     /* cCommands */
+                ||  paParms[1].type != VBOX_HGCM_SVC_PARM_32BIT     /* cCommands */
+                ||  paParms[2].type != VBOX_HGCM_SVC_PARM_PTR       /* pLastParam */
                 ||  paParms[3].type != VBOX_HGCM_SVC_PARM_64BIT     /* retval */
                 ||  paParms[4].type != VBOX_HGCM_SVC_PARM_32BIT     /* lasterror */
@@ -227 +227 @@
 
                 /* Save the last parameter of the last command in the client structure so the macro can pick it up there */
-                pClient->pLastParam  = (uint8_t *)paParms[1].u.pointer.addr;
-                pClient->cbLastParam = paParms[1].u.pointer.size;
+                pClient->pLastParam  = (uint8_t *)paParms[2].u.pointer.addr;
+                pClient->cbLastParam = paParms[2].u.pointer.size;
 
                 /* Execute the function. */

trunk/src/VBox/HostServices/SharedOpenGL/vboxgl.cpp

@@ -135 +135 @@
 
     *pLastRetVal = pClient->lastretval;
-    *pLastError  = glGetError();
+    *pLastError  = 0; //glGetError();
 
 #ifdef DEBUG