Changeset 34295 in vbox for trunk

Timestamp:

Nov 23, 2010 4:12:35 PM (14 years ago)

Author:

vboxsync

Message:

crOpenGL/wddm: more strict window info tracking

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• context.c (modified) (4 diffs)
• load.c (modified) (7 diffs)
• stub.c (modified) (1 diff)
• stub.h (modified) (1 diff)

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

@@ -501 +501 @@
 {
     RECT rect;
-    HWND hwnd;
-
-    if (!window->drawable) {
+
+    if (!window->drawable || !window->hWnd) {
         *w = *h = 0;
         return;
     }
 
-    hwnd = WindowFromDC( window->drawable );
-
-    if (!hwnd) {
-        *w = 0;
-        *h = 0;
-    }
-    else {
-        if (!GetClientRect(hwnd, &rect))
-        {
-            crWarning("GetClientRect failed for %p", hwnd);
-            *w = *h = 0;
-            return;
-        }
-        *w = rect.right - rect.left;
-        *h = rect.bottom - rect.top;
-        if (!ClientToScreen( hwnd, (LPPOINT) &rect ))
-        {
-            crWarning("ClientToScreen failed for %p", hwnd);
-            *w = *h = 0;
-            return;
-        }
-        *x = rect.left;
-        *y = rect.top;
-    }
+    if (window->hWnd!=WindowFromDC(window->drawable))
+    {
+        crWarning("Window(%i) DC is no longer valid", window->spuWindow);
+        return;
+    }
+
+    if (!GetClientRect(window->hWnd, &rect))
+    {
+        crWarning("GetClientRect failed for %p", window->hWnd);
+        *w = *h = 0;
+        return;
+    }
+    *w = rect.right - rect.left;
+    *h = rect.bottom - rect.top;
+
+    if (!ClientToScreen( window->hWnd, (LPPOINT) &rect ))
+    {
+        crWarning("ClientToScreen failed for %p", window->hWnd);
+        *w = *h = 0;
+        return;
+    }
+    *x = rect.left;
+    *y = rect.top;
 }
 
@@ -537 +535 @@
 GetWindowTitle( const WindowInfo *window, char *title )
 {
-    HWND hwnd;
     /* XXX - we don't handle recurseUp */
-    hwnd = WindowFromDC( window->drawable );
-    if (hwnd)
-        GetWindowText(hwnd, title, 100);
+    if (window->hWnd)
+        GetWindowText(window->hWnd, title, 100);
     else
         title[0] = 0;
@@ -558 +554 @@
     // apparently the "window" parameter passed to this 
     // function contains the native window information
-    HWND NATIVEhwnd = WindowFromDC( window->drawable ); 
+    HWND NATIVEhwnd = window->hWnd;
+
+    if (NATIVEhwnd!=WindowFromDC(window->drawable))
+    {
+        crWarning("Window(%i) DC is no longer valid", window->spuWindow);
+        return;
+    }
 
     // get the native window's height and width
@@ -1028 +1030 @@
                 {
 #ifdef WINDOWS
-                        if (!WindowFromDC(context->currentDrawable->drawable))
+                        if (context->currentDrawable->hWnd!=WindowFromDC(context->currentDrawable->drawable))
                         {
                             crWindowDestroy((GLint)context->currentDrawable->hWnd);

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

@@ -142 +142 @@
 {
 #ifdef WINDOWS
-    if (!WindowFromDC(pWindow->drawable))
+    if (pWindow->hWnd!=WindowFromDC(pWindow->drawable))
     {
         return false;
@@ -197 +197 @@
     if (!stub.currentContext)
         return;
+
+#if defined(WINDOWS) && defined(VBOX_WITH_WDDM)
+    if (stub.bRunningUnderWDDM)
+        return;
+#endif
 
 #if defined(CR_NEWWINTRACK) && !defined(WINDOWS)
@@ -657 +662 @@
         int i;
 
+# ifdef VBOX_WITH_WDDM
+        stub.bRunningUnderWDDM = false;
+# endif
         /* Apply viewport hack only if we're running under wine */
         if (NULL!=GetModuleHandle("wined3d.dll") || NULL != GetModuleHandle("wined3dwddm.dll"))
@@ -726 +734 @@
     }
 
+    if (!stubSystemWindowExist(pWindow))
+    {
+        crWindowDestroy((GLint)pWindow->hWnd);
+        return;
+    }
+
+    stub.spu->dispatch_table.VBoxPackSetInjectID(pWindow->u32ClientID);
+
     if (!pWindow->mapped)
     {
@@ -841 +857 @@
     }
 
+#if defined(WINDOWS) && defined(VBOX_WITH_WDDM)
+    if (stub.bRunningUnderWDDM)
+        return;
+#endif
     stubCheckWindowState(pWindow, GL_TRUE);
 }
@@ -884 +904 @@
                     crDebug("running with VBoxDispD3D");
                     stub.trackWindowVisibleRgn = 0;
+                    stub.bRunningUnderWDDM = true;
                 }
             }
@@ -932 +953 @@
                         crWarning("VBoxDispMpTstCallbacks.pfnGetRegions failed with 0x%x", hr);
                     }
+                    crHashtableWalk(stub.windowTable, stubSyncTrCheckWindowsCB, NULL);
                 }
             }

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

@@ -268 +268 @@
 
     if (!pWindow) return GL_FALSE;
-    hwnd = WindowFromDC(pWindow->drawable);
+    hwnd = pWindow->hWnd;
     if (!hwnd) return GL_FALSE;
 
+    if (hwnd!=WindowFromDC(pWindow->drawable))
+    {
+        crWarning("Window(%i) DC is no longer valid", pWindow->spuWindow);
+        return GL_FALSE;
+    }
     
     hVisRgn = CreateRectRgn(0,0,0,0);

trunk/src/VBox/Additions/common/crOpenGL/stub.h

@@ -246 +246 @@
     HHOOK           hMessageHook;
 # endif
+# ifdef VBOX_WITH_WDDM
+    bool            bRunningUnderWDDM;
+# endif
 #endif