Changeset 42971 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/device.c

Timestamp:

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

Author:

vboxsync

Message:

wddm/3d: fix app crashes on shut down

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/device.c (modified) (3 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;
 }