vbox的更動 34916 路徑 trunk/src/VBox/Additions/common

時間撮記:

2010-12-9 下午05:29:43 (14 年 以前)

作者:

vboxsync

訊息:

crOgl/wddm: visible regions handling fix

檔案:

• trunk/src/VBox/Additions/common/crOpenGL/load.c (修改) (2 筆差異)

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -798 +798 @@
     }
 
-    if (pRegions->pRegions->fFlags.bSetVisibleRects && pRegions->pRegions->fFlags.bSetViewRect)
-    {
-        int winX, winY;
-        unsigned int winW, winH;
-
-        winX = pRegions->pRegions->RectsInfo.aRects[0].left;
-        winY = pRegions->pRegions->RectsInfo.aRects[0].top;
-        winW = pRegions->pRegions->RectsInfo.aRects[0].right - winX;
-        winH = pRegions->pRegions->RectsInfo.aRects[0].bottom - winY;
-
-        if (stub.trackWindowPos && (winX!=pWindow->x || winY!=pWindow->y))
-        {
-            crDebug("Dispatched WindowPosition (%i)", pWindow->spuWindow);
-            stub.spuDispatch.WindowPosition(pWindow->spuWindow, winX, winY);
-            pWindow->x = winX;
-            pWindow->y = winY;
-            bChanged = true;
-        }
-
-        if (stub.trackWindowSize && (winW!=pWindow->width || winH!=pWindow->height))
-        {
-            crDebug("Dispatched WindowSize (%i)", pWindow->spuWindow);
-            stub.spuDispatch.WindowSize(pWindow->spuWindow, winW, winH);
-            pWindow->width = winW;
-            pWindow->height = winH;
-            bChanged = true;
-        }
-
-        hNewRgn = stubMakeRegionFromRects(pRegions->pRegions, 1);
-
-        /* ensure the window is in sync to avoid possible incorrect host notifications  */
-        {
-            BOOL bRc = MoveWindow(pRegions->hWnd, winX, winY, winW, winH, FALSE /*BOOL bRepaint*/);
+    if (pRegions->pRegions->fFlags.bSetVisibleRects || pRegions->pRegions->fFlags.bSetViewRect)
+    {
+        /* ensure data integrity */
+        Assert(!pRegions->pRegions->fFlags.bAddHiddenRects);
+
+        if (pRegions->pRegions->fFlags.bSetViewRect)
+        {
+            int winX, winY;
+            unsigned int winW, winH;
+            BOOL bRc;
+
+            winX = pRegions->pRegions->RectsInfo.aRects[0].left;
+            winY = pRegions->pRegions->RectsInfo.aRects[0].top;
+            winW = pRegions->pRegions->RectsInfo.aRects[0].right - winX;
+            winH = pRegions->pRegions->RectsInfo.aRects[0].bottom - winY;
+
+            if (stub.trackWindowPos && (winX!=pWindow->x || winY!=pWindow->y))
+            {
+                crDebug("Dispatched WindowPosition (%i)", pWindow->spuWindow);
+                stub.spuDispatch.WindowPosition(pWindow->spuWindow, winX, winY);
+                pWindow->x = winX;
+                pWindow->y = winY;
+                bChanged = true;
+            }
+
+            if (stub.trackWindowSize && (winW!=pWindow->width || winH!=pWindow->height))
+            {
+                crDebug("Dispatched WindowSize (%i)", pWindow->spuWindow);
+                stub.spuDispatch.WindowSize(pWindow->spuWindow, winW, winH);
+                pWindow->width = winW;
+                pWindow->height = winH;
+                bChanged = true;
+            }
+
+            bRc = MoveWindow(pRegions->hWnd, winX, winY, winW, winH, FALSE /*BOOL bRepaint*/);
             if (!bRc)
             {
@@ -836 +838 @@
                 crWarning("stubSyncTrUpdateWindowCB: MoveWindow failed winEr(%d)", winEr);
             }
+        }
+
+        if (pRegions->pRegions->fFlags.bSetVisibleRects)
+        {
+            hNewRgn = stubMakeRegionFromRects(pRegions->pRegions, pRegions->pRegions->fFlags.bSetViewRect ? 1 : 0);
         }
     }