Changeset 5159 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Display/dd.c

Timestamp:

Oct 4, 2007 4:09:56 PM (17 years ago)

Author:

vboxsync

Message:

DdMapMemory must map the offscreen heap as well. Report DdLock updates only for the primary surface.

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Display/dd.c (modified) (3 diffs)

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

@@ -649 +649 @@
 
         ShareMemory.ViewOffset = 0;
-        ShareMemory.ViewSize   = pDev->cyScreen * pDev->lDeltaScreen;
+
+        // We map down to the end of the frame buffer, including the offscreen heap.
+        ShareMemory.ViewSize   = pDev->layout.offVBVABuffer;
 
         DISPDBG((0, "ViewSize = %x\n", ShareMemory.ViewSize));
@@ -661 +663 @@
                        &ReturnedDataLength))
         {
-            DISPDBG((0, "Failed IOCTL_VIDEO_SHARE_MEMORY"));
+            DISPDBG((0, "Failed IOCTL_VIDEO_SHARE_MEMORY\n"));
 
             lpMapMemory->ddRVal = DDERR_GENERIC;
@@ -717 +719 @@
 {
     PPDEV pDev = (PPDEV)lpLock->lpDD->dhpdev;
-
-    DISPDBG((0, "%s: %p bHasRect = %d\n", __FUNCTION__, pDev, lpLock->bHasRect));
     
-    pDev->ddLock.bLocked = TRUE;
-    
-    if (lpLock->bHasRect)
-    {
-        DISPDBG((0, "%d,%d %dx%d\n", lpLock->rArea.left, lpLock->rArea.top, lpLock->rArea.right - lpLock->rArea.left, lpLock->rArea.bottom - lpLock->rArea.top));
-        pDev->ddLock.rArea = lpLock->rArea;
-    }
-    else
-    {
-        pDev->ddLock.rArea.left   = 0;
-        pDev->ddLock.rArea.top    = 0;
-        pDev->ddLock.rArea.right  = pDev->cxScreen;
-        pDev->ddLock.rArea.bottom = pDev->cyScreen;
+    PDD_SURFACE_LOCAL lpSurfaceLocal = lpLock->lpDDSurface;
+
+    DISPDBG((0, "%s: %p bHasRect = %d fpProcess = %p\n", __FUNCTION__, pDev, lpLock->bHasRect, lpLock->fpProcess));
+
+    if (lpSurfaceLocal->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)
+    {
+        /* The updated rectangle must be reported only for the primary surface. */
+        pDev->ddLock.bLocked = TRUE;
+
+        if (lpLock->bHasRect)
+        {
+            DISPDBG((0, "%d,%d %dx%d\n", lpLock->rArea.left, lpLock->rArea.top, lpLock->rArea.right - lpLock->rArea.left, lpLock->rArea.bottom - lpLock->rArea.top));
+            pDev->ddLock.rArea = lpLock->rArea;
+        }
+        else
+        {
+            pDev->ddLock.rArea.left   = 0;
+            pDev->ddLock.rArea.top    = 0;
+            pDev->ddLock.rArea.right  = pDev->cxScreen;
+            pDev->ddLock.rArea.bottom = pDev->cyScreen;
+        }
+    }
+    else
+    {
+        DISPDBG((0, "%s: secondary surface.\n", __FUNCTION__));
     }