ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw: Simplify ddraw_destroy_swapchain(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2019-04-12 17:20:46 +04:30 committed by Alexandre Julliard
parent 15d52fec68
commit f485816d10
1 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dlls/ddraw/ddraw.c
View File

@ -365,44 +365,34 @@ static ULONG WINAPI d3d1_AddRef(IDirect3D *iface)
static void ddraw_destroy_swapchain(struct ddraw *ddraw) static void ddraw_destroy_swapchain(struct ddraw *ddraw)
{ {
unsigned int i;
HRESULT hr;
TRACE("Destroying the swapchain.\n"); TRACE("Destroying the swapchain.\n");
wined3d_swapchain_decref(ddraw->wined3d_swapchain); wined3d_swapchain_decref(ddraw->wined3d_swapchain);
ddraw->wined3d_swapchain = NULL; ddraw->wined3d_swapchain = NULL;
if (!(ddraw->flags & DDRAW_NO3D)) for (i = 0; i < ddraw->numConvertedDecls; ++i)
{ {
UINT i; wined3d_vertex_declaration_decref(ddraw->decls[i].decl);
for (i = 0; i < ddraw->numConvertedDecls; ++i)
{
wined3d_vertex_declaration_decref(ddraw->decls[i].decl);
}
heap_free(ddraw->decls);
ddraw->numConvertedDecls = 0;
if (FAILED(wined3d_device_uninit_3d(ddraw->wined3d_device)))
{
ERR("Failed to uninit 3D.\n");
}
else
{
/* Free the d3d window if one was created. */
if (ddraw->d3d_window && ddraw->d3d_window != ddraw->dest_window)
{
TRACE("Destroying the hidden render window %p.\n", ddraw->d3d_window);
DestroyWindow(ddraw->d3d_window);
ddraw->d3d_window = 0;
}
}
ddraw->flags &= ~DDRAW_D3D_INITIALIZED;
} }
else heap_free(ddraw->decls);
ddraw->numConvertedDecls = 0;
if (FAILED(hr = wined3d_device_uninit_3d(ddraw->wined3d_device)))
ERR("Failed to uninit 3D, hr %#x.\n", hr);
/* Free the d3d window if one was created. */
if (ddraw->d3d_window && ddraw->d3d_window != ddraw->dest_window)
{ {
wined3d_device_uninit_3d(ddraw->wined3d_device); TRACE("Destroying the hidden render window %p.\n", ddraw->d3d_window);
DestroyWindow(ddraw->d3d_window);
ddraw->d3d_window = 0;
} }
ddraw->flags &= ~DDRAW_D3D_INITIALIZED;
ddraw_set_swapchain_window(ddraw, NULL); ddraw_set_swapchain_window(ddraw, NULL);
TRACE("Swapchain destroyed.\n"); TRACE("Swapchain destroyed.\n");