Changeset 39257 in vbox

Timestamp:

Nov 9, 2011 3:30:48 PM (13 years ago)

Author:

vboxsync

Message:

wddm/wine: missing CloseHandle & lock init/term

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d

Files:

• vboxext.c (modified) (1 diff)
• wined3d_main.c (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/vboxext.c

@@ -186 +186 @@
     FreeLibrary(pWorker->hSelf);
 
+    CloseHandle(pWorker->hThread);
+
     return S_OK;
 }

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_main.c

@@ -150 +150 @@
 }
 
+#ifdef VBOX_WITH_WDDM
+void WINAPI wined3d_mutex_init(void)
+{
+    InitializeCriticalSection(&wined3d_cs);
+}
+
+void WINAPI wined3d_mutex_term(void)
+{
+    DeleteCriticalSection(&wined3d_cs);
+}
+#endif
+
 static BOOL wined3d_dll_init(HINSTANCE hInstDLL)
 {
@@ -161 +173 @@
     WNDCLASSA wc;
 
+#ifdef VBOX_WITH_WDDM
+    wined3d_mutex_init();
+#endif
+
     wined3d_context_tls_idx = TlsAlloc();
     if (wined3d_context_tls_idx == TLS_OUT_OF_INDEXES)
@@ -166 +182 @@
         DWORD err = GetLastError();
         ERR("Failed to allocate context TLS index, err %#x.\n", err);
+#ifdef VBOX_WITH_WDDM
+        wined3d_mutex_term();
+#endif
         return FALSE;
     }
@@ -192 +211 @@
             ERR("Failed to free context TLS index, err %#x.\n", err);
         }
+#ifdef VBOX_WITH_WDDM
+        wined3d_mutex_term();
+#endif
         return FALSE;
     }
@@ -390 +412 @@
     UnregisterClassA(WINED3D_OPENGL_WINDOW_CLASS_NAME, hInstDLL);
 
+#ifdef VBOX_WITH_WDDM
+    wined3d_mutex_term();
+#endif
+
     return TRUE;
 }