Changeset 5038 in vbox

Timestamp:

Sep 26, 2007 8:09:52 AM (17 years ago)

Author:

vboxsync

Message:

Inform VBVA and VRDP about rectangle updated within DdLock/DdUnlock (fixes missing images in Word).

Location:

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

Files:

• dd.c (modified) (3 diffs)
• driver.h (modified) (2 diffs)
• vrdp.c (modified) (1 diff)

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

@@ -636 +636 @@
     DWORD                           ReturnedDataLength;
 
-    DISPDBG((0, "%s: %p\n", __FUNCTION__, pDev));
+    DISPDBG((0, "%s: %p bMap %d\n", __FUNCTION__, pDev, lpMapMemory->bMap));
 
     if (lpMapMemory->bMap)
@@ -718 +718 @@
     PPDEV pDev = (PPDEV)lpLock->lpDD->dhpdev;
 
-    DISPDBG((0, "%s: %p\n", __FUNCTION__, pDev));
+    DISPDBG((0, "%s: %p bHasRect = %d\n", __FUNCTION__, pDev, lpLock->bHasRect));
+    
+    pDev->ddLock.bHasRect = lpLock->bHasRect;
+    
+    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;
+    }
 
     // Because we correctly set 'fpVidMem' to be the offset into our frame
@@ -750 +758 @@
     DISPDBG((0, "%s: %p\n", __FUNCTION__, pDev));
 
+    if (pDev->ddLock.bHasRect)
+    {
+        DISPDBG((0, "%d,%d %dx%d\n", pDev->ddLock.rArea.left, pDev->ddLock.rArea.top, pDev->ddLock.rArea.right - pDev->ddLock.rArea.left, pDev->ddLock.rArea.bottom - pDev->ddLock.rArea.top));
+        
+        if (pDev->pInfo && vboxHwBufferBeginUpdate (pDev))
+        {
+            vbvaReportDirtyRect (pDev, &pDev->ddLock.rArea);
+
+            if (  pDev->pInfo->hostEvents.fu32Events
+                & VBOX_VIDEO_INFO_HOST_EVENTS_F_VRDP_RESET)
+            {
+                vrdpReset (pDev);
+
+                pDev->pInfo->hostEvents.fu32Events &=
+                          ~VBOX_VIDEO_INFO_HOST_EVENTS_F_VRDP_RESET;
+            }
+
+            if (pDev->vbva.pVbvaMemory->fu32ModeFlags
+                & VBVA_F_MODE_VRDP)
+            {
+                vrdpReportDirtyRect (pDev, &pDev->ddLock.rArea);
+            }
+
+            vboxHwBufferEndUpdate (pDev);
+        }
+        pDev->ddLock.bHasRect = 0;
+    }
+
     lpUnlock->ddRVal = DD_OK;
     return DDHAL_DRIVER_NOTHANDLED;

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

@@ -133 +133 @@
     DWORD            cHeaps;
     VIDEOMEMORY*     pvmList;
-#endif
+    struct {
+        DWORD bHasRect;
+        RECTL rArea;
+    } ddLock;
+#endif /* VBOX_WITH_DDRAW */
 };
 
@@ -238 +242 @@
 #endif /* VBOX_VBVA_ADJUST_RECT */
 
+void vrdpReportDirtyRect (PPDEV ppdev, RECTL *prcl);
+void vbvaReportDirtyRect (PPDEV ppdev, RECTL *prcl);
 
 #include <iprt/assert.h>

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

@@ -405 +405 @@
 }
 
-static void vrdpReportDirtyRect (PPDEV ppdev, RECTL *prcl)
+void vrdpReportDirtyRect (PPDEV ppdev, RECTL *prcl)
 {
     SURFOBJ *pso = ppdev->psoScreenBitmap;