Changeset 36047 in vbox for trunk/src/VBox

Timestamp:

Feb 21, 2011 10:32:25 PM (14 years ago)

Author:

vboxsync

Message:

crOpenGL: fix crash on win hosts when forced shutting down a vm (#6443)

File:

• trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_init.c (modified) (1 diff)

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_init.c

@@ -407 +407 @@
     if (render_spu.dwWinThreadId)
     {
-        PostThreadMessage(render_spu.dwWinThreadId, WM_QUIT, 0, 0);
-        WaitForSingleObject(render_spu.hWinThreadReadyEvent, INFINITE);
+        HANDLE hNative;
+
+        hNative = OpenThread(SYNCHRONIZE|THREAD_QUERY_INFORMATION|THREAD_TERMINATE,
+                             false, render_spu.dwWinThreadId);
+        if (!hNative)
+        {
+            crWarning("Failed to get handle for window thread(%#x)", GetLastError());
+        }
+
+        if (PostThreadMessage(render_spu.dwWinThreadId, WM_QUIT, 0, 0))
+        {
+            WaitForSingleObject(render_spu.hWinThreadReadyEvent, INFINITE);
+
+            /*wait for os thread to actually finish*/
+            if (hNative && WaitForSingleObject(hNative, 3000)==WAIT_TIMEOUT)
+            {
+                crDebug("Wait failed, terminating");
+                if (!TerminateThread(hNative, 1))
+                {
+                    crWarning("TerminateThread failed");
+                }
+            }
+        }
+
+        if (hNative)
+        {
+            CloseHandle(hNative);
+        }
     }
     CloseHandle(render_spu.hWinThreadReadyEvent);