Changeset 34887 in vbox for trunk/src/VBox

Timestamp:

Dec 9, 2010 2:13:56 PM (14 years ago)

Author:

vboxsync

Message:

crOpenGL/XPDM: fix explorer crashes on windows vista/win7 guests

Location:

trunk/src/VBox

Files:

• Additions/common/crOpenGL/icd_drv.c (modified) (1 diff)
• Additions/common/crOpenGL/load.c (modified) (2 diffs)
• Additions/common/crOpenGL/pack/packspu_misc.c (modified) (1 diff)
• GuestHost/OpenGL/util/vboxhgcm.c (modified) (11 diffs)

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

@@ -86 +86 @@
     }
 
-    crNetTearDown();
     crDebug("DrvValidateVersion %x -> FALSE, going to use system default opengl32.dll\n", version); 
     return FALSE;

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

@@ -342 +342 @@
 #endif
 
+#ifndef WINDOWS
     crNetTearDown();
+#endif
 
 #ifdef GLX
@@ -412 +414 @@
 #endif
 
+#ifndef WINDOWS
     crNetTearDown();
+#endif
+
 #ifdef CHROMIUM_THREADSAFE
     crUnlockMutex(mutex);

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_misc.c

@@ -537 +537 @@
         {
             crFreeMutex(&_PackMutex);
+            crNetTearDown();
             break;
         }

trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

@@ -1492 +1492 @@
 #endif
 
+    if (!g_crvboxhgcm.initialized) return;
+
+#ifdef CHROMIUM_THREADSAFE
+    crLockMutex(&g_crvboxhgcm.mutex);
+#endif
+
     VBOXCRHGSMIPROFILE_FUNC_PROLOGUE();
 
@@ -1505 +1511 @@
     conn->cbBuffer = 0;
 
-    //@todo hold lock here?
     if (conn->type == CR_VBOXHGCM)
     {
@@ -1575 +1580 @@
 
     VBOXCRHGSMIPROFILE_FUNC_EPILOGUE();
+
+#ifdef CHROMIUM_THREADSAFE
+    crUnlockMutex(&g_crvboxhgcm.mutex);
+#endif
 }
 
@@ -2319 +2328 @@
     if (!g_crvboxhgcm.initialized) return;
 
+#ifdef CHROMIUM_THREADSAFE
+    crLockMutex(&g_crvboxhgcm.mutex);
+#endif
+
     /* Connection count would be changed in calls to crNetDisconnect, so we have to store original value.
      * Walking array backwards is not a good idea as it could cause some issues if we'd disconnect clients not in the
@@ -2331 +2344 @@
     CRASSERT(0==g_crvboxhgcm.num_conns);
 
+    g_crvboxhgcm.initialized = 0;
+
 #ifdef CHROMIUM_THREADSAFE
+    crUnlockMutex(&g_crvboxhgcm.mutex);
     crFreeMutex(&g_crvboxhgcm.mutex);
     crFreeMutex(&g_crvboxhgcm.recvmutex);
@@ -2339 +2355 @@
         crBufferPoolCallbackFree(g_crvboxhgcm.bufpool, crVBoxHGCMBufferFree);
     g_crvboxhgcm.bufpool = NULL;
-
-    g_crvboxhgcm.initialized = 0;
 
     crFree(g_crvboxhgcm.conns);
@@ -2401 +2415 @@
         conn->HandleNewMessage = crVBoxHGCMHandleNewMessage;
     }
-    conn->index = g_crvboxhgcm.num_conns;
     conn->sizeof_buffer_header = sizeof(CRVBOXHGCMBUFFER);
     conn->actual_network = 1;
@@ -2417 +2430 @@
     conn->cbHostBuffer = 0;
 
+#ifdef CHROMIUM_THREADSAFE
+    crLockMutex(&g_crvboxhgcm.mutex);
+#endif
     /* Find a free slot */
     for (i = 0; i < g_crvboxhgcm.num_conns; i++) {
@@ -2431 +2447 @@
         n_bytes = ( g_crvboxhgcm.num_conns + 1 ) * sizeof(*g_crvboxhgcm.conns);
         crRealloc( (void **) &g_crvboxhgcm.conns, n_bytes );
+        conn->index = g_crvboxhgcm.num_conns;
         g_crvboxhgcm.conns[g_crvboxhgcm.num_conns++] = conn;
     }
+#ifdef CHROMIUM_THREADSAFE
+    crUnlockMutex(&g_crvboxhgcm.mutex);
+#endif
 }
 
@@ -2440 +2460 @@
 
     VBOXCRHGSMIPROFILE_FUNC_PROLOGUE();
+
+#ifdef CHROMIUM_THREADSAFE
+    crLockMutex(&g_crvboxhgcm.mutex);
+#endif
 
 #ifdef IN_GUEST
@@ -2480 +2504 @@
     }
 
+#ifdef CHROMIUM_THREADSAFE
+    crUnlockMutex(&g_crvboxhgcm.mutex);
+#endif
+
     VBOXCRHGSMIPROFILE_FUNC_EPILOGUE();