Changeset 32577 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Timestamp:

Sep 16, 2010 6:11:27 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: aero working on win7 (window contents still corrupted)

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoIf.h (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoIf.h

@@ -419 +419 @@
 }
 
-DECLINLINE(bool) vboxWddmRectIsEmpty(RECT * pRect)
+DECLINLINE(bool) vboxWddmRectIsEmpty(const RECT * pRect)
 {
     return pRect->left == pRect->right-1 && pRect->top == pRect->bottom-1;
 }
 
-DECLINLINE(bool) vboxWddmRectIsIntersect(RECT * pRect1, RECT * pRect2)
+DECLINLINE(bool) vboxWddmRectIsIntersect(const RECT * pRect1, const RECT * pRect2)
 {
     return !((pRect1->left < pRect2->left && pRect1->right < pRect2->left)
@@ -432 +432 @@
 }
 
-DECLINLINE(bool) vboxWddmRectIsInclude(RECT * pRect1, RECT * pRect2)
-{
-    return ((pRect1->left <= pRect2->left && pRect1->right >= pRect2->right)
-            && (pRect1->top <= pRect2->top && pRect1->bottom >= pRect2->bottom));
-}
-
 DECLINLINE(void) vboxWddmRectUnited(RECT * pDst, const RECT * pRect1, const RECT * pRect2)
 {
@@ -452 +446 @@
     pRect->right  += x;
     pRect->bottom += y;
+}
+
+DECLINLINE(void) vboxWddmRectMove(RECT * pRect, int x, int y)
+{
+    LONG w = pRect->right - pRect->left;
+    LONG h = pRect->bottom - pRect->top;
+    pRect->left   = x;
+    pRect->top    = y;
+    pRect->right  = w + x;
+    pRect->bottom = h + y;
+}
+
+DECLINLINE(void) vboxWddmRectTranslated(RECT *pDst, const RECT * pRect, int x, int y)
+{
+    *pDst = *pRect;
+    vboxWddmRectTranslate(pDst, x, y);
+}
+
+DECLINLINE(void) vboxWddmRectMoved(RECT *pDst, const RECT * pRect, int x, int y)
+{
+    *pDst = *pRect;
+    vboxWddmRectMove(pDst, x, y);
 }