ddraw: Destroy the swapchain after the D3D device in DllMain().

This commit is contained in:
Henri Verbeet 2011-12-11 21:43:28 +01:00 committed by Alexandre Julliard
parent e191b051b1
commit 9d55388156
1 changed files with 6 additions and 3 deletions

View File

@ -941,9 +941,6 @@ DllMain(HINSTANCE hInstDLL,
IDirectDraw4_AddRef(&ddraw->IDirectDraw4_iface);
IDirectDraw7_AddRef(&ddraw->IDirectDraw7_iface);
if (ddraw->wined3d_swapchain)
ddraw_destroy_swapchain(ddraw);
/* Does a D3D device exist? Destroy it
* TODO: Destroy all Vertex buffers, Lights, Materials
* and execute buffers too
@ -954,6 +951,12 @@ DllMain(HINSTANCE hInstDLL,
while(IDirect3DDevice7_Release(&ddraw->d3ddevice->IDirect3DDevice7_iface));
}
/* Destroy the swapchain after any 3D device. The 3D device
* cleanup code needs a swapchain. Specifically, it tries to
* set the current render target to the front buffer. */
if (ddraw->wined3d_swapchain)
ddraw_destroy_swapchain(ddraw);
/* Try to release the objects
* Do an EnumSurfaces to find any hanging surfaces
*/