Changeset 31756 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Display

Timestamp:

Aug 18, 2010 12:10:29 PM (14 years ago)

Author:

vboxsync

Message:

wddm: multi-screen fixes

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxScreen.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxScreen.cpp

@@ -416 +416 @@
     HRESULT hr = S_FALSE;
 
-    Assert(0);
-
     if (!pMon->bInited)
     {
@@ -527 +525 @@
     {
         DWORD dwErr = WaitForSingleObject(pMon->hThread, INFINITE);
-        if (dwErr != WAIT_OBJECT_0)
+        if (dwErr == WAIT_OBJECT_0)
+        {
+            CloseHandle(pMon->hThread);
+            pMon->hThread = 0;
+        }
+        else
         {
             DWORD winErr = GetLastError();
@@ -537 +540 @@
     {
         DWORD winErr = GetLastError();
-        hr = HRESULT_FROM_WIN32(winErr);
-        Assert(0);
-    }
-
-    return hr;
-}
-
+        Assert(winErr != ERROR_SUCCESS);
+        if (winErr != ERROR_INVALID_THREAD_ID)
+        {
+            hr = HRESULT_FROM_WIN32(winErr);
+            Assert(0);
+        }
+        /* else - treat as OK */
+    }
+
+    return hr;
+}
+