Changeset 38366 in vbox

Timestamp:

Aug 9, 2011 6:55:53 AM (13 years ago)

Author:

vboxsync

Message:

wine/wddm: cleanup & fixes for window create/destroy

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/vboxext.c (modified) (6 diffs)

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

@@ -241 +241 @@
 }
 
+/* wine serializes all calls to us, so no need for any synchronization here */
 static DWORD g_cVBoxExtInits = 0;
+
+static DWORD vboxExtAddRef()
+{
+    return ++g_cVBoxExtInits;
+}
+
+static DWORD vboxExtRelease()
+{
+    DWORD cVBoxExtInits = --g_cVBoxExtInits;
+    Assert(cVBoxExtInits < UINT32_MAX/2);
+    return cVBoxExtInits;
+}
+
+static DWORD vboxExtGetRef()
+{
+    return g_cVBoxExtInits;
+}
+
 HRESULT VBoxExtCheckInit()
 {
     HRESULT hr = S_OK;
-    if (!g_cVBoxExtInits)
+    if (!vboxExtGetRef())
     {
         hr = vboxExtInit();
@@ -254 +273 @@
         }
     }
-    ++g_cVBoxExtInits;
+    vboxExtAddRef();
     return S_OK;
 }
@@ -261 +280 @@
 {
     HRESULT hr = S_OK;
-    if (g_cVBoxExtInits == 1)
+    if (vboxExtGetRef() == 1)
     {
         hr = vboxExtTerm();
@@ -270 +289 @@
         }
     }
-    --g_cVBoxExtInits;
+    vboxExtRelease();
     return S_OK;
 }
@@ -415 +434 @@
             *phWnd = hWnd;
             *phDC = GetDC(hWnd);
+            /* make sure we keep inited until the window is active */
+            vboxExtAddRef();
         }
         else
@@ -435 +456 @@
     Assert(bResult);
     if (bResult)
+    {
+        /* release the reference we previously acquired on window creation */
+        vboxExtRelease();
         return S_OK;
+    }
 
     winErr = GetLastError();