Changeset 38840 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/disp

Timestamp:

Sep 23, 2011 11:34:44 AM (13 years ago)

Author:

vboxsync

Message:

VBoxVideo: fix guest video driver hang when switching back from fullscreen text apps (public #9636)

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm

Files:

• VBoxDispDriver.cpp (modified) (2 diffs)
• VBoxDispDriverDDraw.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDriver.cpp

@@ -789 +789 @@
 {
     PVBOXDISPDEV pDev = (PVBOXDISPDEV) dhpdev;
-    DWORD dwrc;
     int rc;
     LOGF_ENTER();
@@ -846 +845 @@
 
         /* Associate back GDI bitmap residing in our framebuffer memory with GDI's handle to our device */
-        dwrc = EngAssociateSurface((HSURF)pDev->surface.hBitmap, pDev->hDevGDI, 0);
-        if (dwrc != NO_ERROR)
-        {
-            WARN(("EngAssociateSurface on bitmap failed with %#x", dwrc));
+        if (!EngAssociateSurface((HSURF)pDev->surface.hBitmap, pDev->hDevGDI, 0))
+        {
+            WARN(("EngAssociateSurface on bitmap failed"));
             return FALSE;
         }
 
         /* Associate device managed surface with GDI's handle to our device */
-        dwrc = EngAssociateSurface(pDev->surface.hSurface, pDev->hDevGDI, pDev->flDrawingHooks);
-        if (dwrc != NO_ERROR)
-        {
-            WARN(("EngAssociateSurface on surface failed with %#x", dwrc));
+        if (!EngAssociateSurface(pDev->surface.hSurface, pDev->hDevGDI, pDev->flDrawingHooks))
+        {
+            WARN(("EngAssociateSurface on surface failed"));
             return FALSE;
         }

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDriverDDraw.cpp

@@ -243 +243 @@
          * (required for VBVA and VRDP).
          */
-        DWORD dwrc;
         SURFOBJ *pso;
 
-        dwrc = EngAssociateSurface((HSURF)hBitmap, pDev->hDevGDI, pDev->flDrawingHooks);
-        if (dwrc!=NO_ERROR)
-        {
-            VBOX_WARN_WINERR(dwrc);
+        if (!EngAssociateSurface((HSURF)hBitmap, pDev->hDevGDI, pDev->flDrawingHooks))
+        {
+            WARN(("EngAssociateSurface failed"));
             EngDeleteSurface((HSURF)hBitmap);
             return NULL;