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

d3d8: Get rid of the implicit swapchain refcounting hacks.

This commit is contained in:
Henri Verbeet 2011-04-11 20:55:16 +02:00 committed by Alexandre Julliard
parent 17c51d49b7
commit 4e56a4fe79
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/d3d8/device.c
View File

@ -256,12 +256,9 @@ static void *d3d8_get_object(struct d3d8_handle_table *t, DWORD handle, enum d3d
static ULONG WINAPI D3D8CB_DestroySwapChain(IWineD3DSwapChain *swapchain) static ULONG WINAPI D3D8CB_DestroySwapChain(IWineD3DSwapChain *swapchain)
{ {
IUnknown *parent;
TRACE("swapchain %p.\n", swapchain); TRACE("swapchain %p.\n", swapchain);
parent = IWineD3DSwapChain_GetParent(swapchain); return IWineD3DSwapChain_Release(swapchain);
return IUnknown_Release(parent);
} }
static inline IDirect3DDevice8Impl *impl_from_IDirect3DDevice8(IDirect3DDevice8 *iface) static inline IDirect3DDevice8Impl *impl_from_IDirect3DDevice8(IDirect3DDevice8 *iface)
@ -2913,8 +2910,8 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar
WINED3DPRESENT_PARAMETERS *present_parameters, IWineD3DSwapChain **swapchain) WINED3DPRESENT_PARAMETERS *present_parameters, IWineD3DSwapChain **swapchain)
{ {
IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface);
IDirect3DSwapChain8Impl *d3d_swapchain;
D3DPRESENT_PARAMETERS local_parameters; D3DPRESENT_PARAMETERS local_parameters;
IDirect3DSwapChain8 *d3d_swapchain;
HRESULT hr; HRESULT hr;
TRACE("iface %p, present_parameters %p, swapchain %p\n", iface, present_parameters, swapchain); TRACE("iface %p, present_parameters %p, swapchain %p\n", iface, present_parameters, swapchain);
@ -2935,7 +2932,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar
local_parameters.FullScreen_PresentationInterval = present_parameters->PresentationInterval; local_parameters.FullScreen_PresentationInterval = present_parameters->PresentationInterval;
hr = IDirect3DDevice8_CreateAdditionalSwapChain(&This->IDirect3DDevice8_iface, hr = IDirect3DDevice8_CreateAdditionalSwapChain(&This->IDirect3DDevice8_iface,
&local_parameters, (IDirect3DSwapChain8 **)&d3d_swapchain); &local_parameters, &d3d_swapchain);
if (FAILED(hr)) if (FAILED(hr))
{ {
ERR("(%p) CreateAdditionalSwapChain failed, returning %#x\n", iface, hr); ERR("(%p) CreateAdditionalSwapChain failed, returning %#x\n", iface, hr);
@ -2943,9 +2940,9 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar
return hr; return hr;
} }
*swapchain = d3d_swapchain->wineD3DSwapChain; *swapchain = ((IDirect3DSwapChain8Impl *)d3d_swapchain)->wineD3DSwapChain;
IUnknown_Release(d3d_swapchain->parentDevice); IWineD3DSwapChain_AddRef(*swapchain);
d3d_swapchain->parentDevice = NULL; IDirect3DSwapChain8_Release(d3d_swapchain);
/* Copy back the presentation parameters */ /* Copy back the presentation parameters */
present_parameters->BackBufferWidth = local_parameters.BackBufferWidth; present_parameters->BackBufferWidth = local_parameters.BackBufferWidth;

2
dlls/d3d8/swapchain.c
View File

@ -78,7 +78,7 @@ static ULONG WINAPI IDirect3DSwapChain8Impl_Release(IDirect3DSwapChain8 *iface)
IDirect3DDevice8 *parentDevice = This->parentDevice; IDirect3DDevice8 *parentDevice = This->parentDevice;
wined3d_mutex_lock(); wined3d_mutex_lock();
IWineD3DSwapChain_Destroy(This->wineD3DSwapChain); IWineD3DSwapChain_Release(This->wineD3DSwapChain);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
if (parentDevice) if (parentDevice)