Changeset 17482 in vbox for trunk

Timestamp:

Mar 6, 2009 3:49:42 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

43908

Message:

crOpenGL: fixed VM hangs when starting guests with 3D acceleration enabled (public bug #3437)

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• renderspu_init.c (modified) (1 diff)
• renderspu_wgl.c (modified) (2 diffs)

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

@@ -69 +69 @@
 
     (void) unused;
+
+    /* Force system to create the message queue. 
+     * Else, there's a chance than render spu will issue PostThreadMessage
+     * before this thread calls GetMessage for first time.
+     */
+    PeekMessage(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE);
 
     crDebug("RenderSPU: Window thread started (%x)", crThreadID());

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

@@ -47 +47 @@
     vrdw.hWnd = window->hWnd;
 
-    PostThreadMessage(render_spu.dwWinThreadId, WM_VBOX_RENDERSPU_DESTROY_WINDOW, 0, (LPARAM) &vrdw);
-    WaitForSingleObject(render_spu.hWinThreadReadyEvent, INFINITE);
+    if (render_spu.dwWinThreadId)
+    {
+        PostThreadMessage(render_spu.dwWinThreadId, WM_VBOX_RENDERSPU_DESTROY_WINDOW, 0, (LPARAM) &vrdw);
+        WaitForSingleObject(render_spu.hWinThreadReadyEvent, INFINITE);
+    }
+    else
+    {
+        crError("Render SPU: window thread is not running");
+    }
 
     window->hWnd = NULL;
@@ -674 +681 @@
         cs.hInstance    = hinstance;
 
-        PostThreadMessage(render_spu.dwWinThreadId, WM_VBOX_RENDERSPU_CREATE_WINDOW, 0, (LPARAM) &cs);
-        WaitForSingleObject(render_spu.hWinThreadReadyEvent, INFINITE);
-    }
-    
+        if (render_spu.dwWinThreadId)
+        {
+            DWORD res;
+            int cnt=0;
+
+            if (!PostThreadMessage(render_spu.dwWinThreadId, WM_VBOX_RENDERSPU_CREATE_WINDOW, 0, (LPARAM) &cs))
+            {
+                crError("Render SPU: PostThreadMessage failed with %i", GetLastError());
+                return GL_FALSE;
+            }
+
+            do
+            {
+                res = WaitForSingleObject(render_spu.hWinThreadReadyEvent, 1000);
+                cnt++;
+            }
+            while ((res!=WAIT_OBJECT_0) && (cnt<10));
+
+            crDebug("Render SPU: window thread waited %i secs", cnt);
+
+            if (res!=WAIT_OBJECT_0)
+            {
+                crError("Render SPU: window thread not responded after %i tries", cnt);
+                return GL_FALSE;
+            }
+        }
+        else
+        {
+            crError("Render SPU: window thread is not running");
+            return GL_FALSE;
+        }
+    }
 
     if ( !window->hWnd )