Changeset 42971 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine

Timestamp:

Aug 24, 2012 11:19:31 AM (12 years ago)

Author:

vboxsync

Message:

wddm/3d: fix app crashes on shut down

Location:

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

Files:

• device.c (modified) (3 diffs)
• swapchain.c (modified) (7 diffs)

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

@@ -1958 +1958 @@
     }
 
+    if (This->swapchains)
+    {
     HeapFree(GetProcessHeap(), 0, This->swapchains);
     This->swapchains = NULL;
     This->NumberOfSwapChains = 0;
+    }
+    else
+    {
+        Assert(!This->NumberOfSwapChains);
+    }
 
     for (i = 0; i < This->NumberOfPalettes; i++) HeapFree(GetProcessHeap(), 0, This->palettes[i]);
@@ -7005 +7012 @@
     IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface;
     int i;
+    IWineD3DSwapChain **pvOldBuf = This->swapchains;
+
     for (i = 0; i < This->NumberOfSwapChains; ++i)
     {
@@ -7042 +7051 @@
             context_destroy(This, This->contexts[0]);
         }
-    }
+        This->swapchains = NULL;
+    }
+
+    if (pvOldBuf)
+        HeapFree(GetProcessHeap(), 0, pvOldBuf);
+
     return WINED3D_OK;
 }

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

@@ -62 +62 @@
 }
 
-VOID swapchain_invalidate(IWineD3DSwapChainImpl *pSwapchain)
+static VOID swapchain_cleanup_rt_refs(IWineD3DSwapChainImpl *pSwapchain, IWineD3DSurface *rt, int iBb)
+{
+    IWineD3DDeviceImpl *device = pSwapchain->device;
+    struct wined3d_context *context;
+    UINT i;
+    for (i = 0; i < device->numContexts; ++i)
+    {
+        context = device->contexts[i];
+
+        if (rt == context->current_rt)
+        {
+            context->current_rt = NULL;
+        }
+    }
+
+    if (device->NumberOfSwapChains)
+    {
+        IWineD3DSwapChainImpl *pDefaultSwapchain = (IWineD3DSwapChainImpl*)device->swapchains[0];
+        for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i)
+        {
+            if (device->render_targets[i] == rt)
+            {
+                IWineD3DSurface *newRt;
+                if (i)
+                    newRt = NULL;
+                else if (iBb == -1) /* front buffer */
+                    newRt = pDefaultSwapchain->frontBuffer;
+                else
+                    newRt = pDefaultSwapchain->backBuffer ? pDefaultSwapchain->backBuffer[0] : pDefaultSwapchain->frontBuffer;
+
+                IWineD3DDevice_SetRenderTarget((IWineD3DDevice*)device, i, newRt, TRUE);
+            }
+        }
+    }
+}
+
+static VOID swapchain_cleanup_refs(IWineD3DSwapChainImpl *pSwapchain)
 {
     /* first make sure the swapchain is not used by anyone */
@@ -76 +112 @@
             context->currentSwapchain = NULL;
         }
-
-        if (pSwapchain->frontBuffer == context->current_rt)
-        {
-            context->current_rt = NULL;
-        }
-        else if (pSwapchain->backBuffer)
-        {
-            UINT j;
-            for (j = 0; j < pSwapchain->presentParms.BackBufferCount; ++j)
-            {
-                if (pSwapchain->backBuffer[j] == context->current_rt)
-                {
-                    context->current_rt = NULL;
-                    break;
-                }
-            }
-        }
-    }
+    }
+
+    if (pSwapchain->frontBuffer)
+        swapchain_cleanup_rt_refs(pSwapchain, pSwapchain->frontBuffer, -1);
+
+    if (pSwapchain->backBuffer)
+    {
+        UINT j;
+        for (j = 0; j < pSwapchain->presentParms.BackBufferCount; ++j)
+        {
+            swapchain_cleanup_rt_refs(pSwapchain, pSwapchain->backBuffer[j], j);
+        }
+    }
+}
+
+static VOID swapchain_invalidate(IWineD3DSwapChainImpl *pSwapchain)
+{
+    swapchain_cleanup_refs(pSwapchain);
 
     pSwapchain->win_handle = NULL;
@@ -105 +141 @@
 {
     IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
-    WINED3DDISPLAYMODE mode;
     unsigned int i;
 
@@ -111 +146 @@
 
     IWineD3DSwapChain_SetGammaRamp(iface, 0, &This->orig_gamma);
+
+#ifdef VBOX_WITH_WDDM
+    /* first remove swapchain from a list to ensure context is properly acquired
+     * & gl resources are properly cleared on last swapchain destruction */
+    IWineD3DDevice_RemoveSwapChain((IWineD3DDevice*)This->device, (IWineD3DSwapChain*)This);
+
+    swapchain_cleanup_refs(This);
+#endif
 
     /* Release the swapchain's draw buffers. Make sure This->backBuffer[0] is
@@ -154 +197 @@
         This->presentRt = NULL;
     }
-#endif
-
+
+    if(This->win_handle) {
+        VBoxExtWndDestroy(This->win_handle, This->hDC);
+        swapchain_invalidate(This);
+    }
+    else
+    {
+        WARN("null win info");
+    }
+#else
     IWineD3DDevice_RemoveSwapChain((IWineD3DDevice*)This->device, (IWineD3DSwapChain*)This);
     if (!This->device->NumberOfSwapChains)
@@ -165 +216 @@
          */
         if(This->presentParms.Windowed == FALSE && This->presentParms.AutoRestoreDisplayMode) {
+            WINED3DDISPLAYMODE mode;
             mode.Width = This->orig_width;
             mode.Height = This->orig_height;
@@ -172 +224 @@
         }
     }
-#ifdef VBOX_WITH_WDDM
-    if(This->win_handle) {
-        VBoxExtWndDestroy(This->win_handle, This->hDC);
-        swapchain_invalidate(This);
-    }
-    else
-    {
-        WARN("null win info");
-    }
-#else
+
     HeapFree(GetProcessHeap(), 0, This->context);
 #endif
+
     HeapFree(GetProcessHeap(), 0, This);
 }