Changeset 24028 in vbox for trunk

Timestamp:

Oct 23, 2009 12:27:20 PM (16 years ago)

Author:

vboxsync

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

53873

Message:

2d accel: guest driver fix for overlay surfaces not marked as visible

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display

Files:

• dd.c (modified) (5 diffs)
• driver.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Display/dd.c

@@ -675 +675 @@
                         uint32_t surfSizeY = pBody->SurfInfo.sizeY;
                     pDesc->hHostHandle = pBody->SurfInfo.hSurf;
+                    if(!!(lpSurfaceLocal->ddsCaps.dwCaps & DDSCAPS_OVERLAY)
+                                && !!(lpSurfaceLocal->ddsCaps.dwCaps & DDSCAPS_VISIBLE))
+                    {
+                        pDesc->bVisible = true;
+                    }
                     lpSurfaceGlobal->dwReserved1 = (ULONG_PTR)pDesc;
                     lPitch = pBody->SurfInfo.pitch;
@@ -1183 +1188 @@
         if(lpSurfaceLocal->ddsCaps.dwCaps & DDSCAPS_VISIBLE
                 || (
-                        !(lpSurfaceLocal->ddsCaps.dwCaps & DDSCAPS_COMPLEX)
-                        && (
-                                lpSurfaceLocal->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE
-                                || (
-                                        (lpSurfaceLocal->ddsCaps.dwCaps & DDSCAPS_OVERLAY)
-                                        && !pDesc->bHidden
-                                    )
+                        lpSurfaceLocal->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE
+                        || (
+                                !!(lpSurfaceLocal->ddsCaps.dwCaps & DDSCAPS_OVERLAY)
+                                && pDesc->bVisible
                            )
                    )
@@ -1724 +1726 @@
     DISPDBG((0, "%s\n", __FUNCTION__));
 
-    if(pSrcDesc->bHidden)
+    if(!pSrcDesc->bVisible)
     {
         lpSetOverlayPosition->ddRVal = DDERR_GENERIC;
@@ -1765 +1767 @@
     DISPDBG((0, "%s\n", __FUNCTION__));
 
-//    if(pSrcDesc->bHidden)
+//    if(!pSrcDesc->bVisible)
 //    {
 //        lpUpdateOverlay->ddRVal = DDERR_GENERIC;
@@ -1791 +1793 @@
         if(lpUpdateOverlay->dwFlags & DDOVER_HIDE)
         {
-            pSrcDesc->bHidden = true;
+            pSrcDesc->bVisible = false;
         }
         else if(lpUpdateOverlay->dwFlags & DDOVER_SHOW)
         {
-            pSrcDesc->bHidden = false;
+            pSrcDesc->bVisible = true;
             if(pSrcDesc->UpdatedMemRegion.bValid)
             {

trunk/src/VBox/Additions/WINNT/Graphics/Display/driver.h

@@ -116 +116 @@
 #endif
 //    uint32_t cBitsPerPixel;
-    bool bHidden;
+    bool bVisible;
     VBOXVHWAREGION UpdatedMemRegion;
     VBOXVHWAREGION NonupdatedMemRegion;