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

dxgi: COM cleanup in the IDXGISwapChain iface.

This commit is contained in:
Michael Stefaniuc 2011-06-06 10:25:49 +02:00 committed by Alexandre Julliard
parent 125b949545
commit 61f51eb47e
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/dxgi/dxgi_private.h
View File

@ -124,7 +124,7 @@ HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IWineDXGIFactory *parent
/* IDXGISwapChain */ /* IDXGISwapChain */
struct dxgi_swapchain struct dxgi_swapchain
{ {
const struct IDXGISwapChainVtbl *vtbl; IDXGISwapChain IDXGISwapChain_iface;
LONG refcount; LONG refcount;
struct wined3d_swapchain *wined3d_swapchain; struct wined3d_swapchain *wined3d_swapchain;
}; };

15
dlls/dxgi/swapchain.c
View File

@ -24,6 +24,11 @@
WINE_DEFAULT_DEBUG_CHANNEL(dxgi); WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
static inline struct dxgi_swapchain *impl_from_IDXGISwapChain(IDXGISwapChain *iface)
{
return CONTAINING_RECORD(iface, struct dxgi_swapchain, IDXGISwapChain_iface);
}
/* IUnknown methods */ /* IUnknown methods */
static HRESULT STDMETHODCALLTYPE dxgi_swapchain_QueryInterface(IDXGISwapChain *iface, REFIID riid, void **object) static HRESULT STDMETHODCALLTYPE dxgi_swapchain_QueryInterface(IDXGISwapChain *iface, REFIID riid, void **object)
@ -48,7 +53,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_QueryInterface(IDXGISwapChain *i
static ULONG STDMETHODCALLTYPE dxgi_swapchain_AddRef(IDXGISwapChain *iface) static ULONG STDMETHODCALLTYPE dxgi_swapchain_AddRef(IDXGISwapChain *iface)
{ {
struct dxgi_swapchain *This = (struct dxgi_swapchain *)iface; struct dxgi_swapchain *This = impl_from_IDXGISwapChain(iface);
ULONG refcount = InterlockedIncrement(&This->refcount); ULONG refcount = InterlockedIncrement(&This->refcount);
TRACE("%p increasing refcount to %u\n", This, refcount); TRACE("%p increasing refcount to %u\n", This, refcount);
@ -61,7 +66,7 @@ static ULONG STDMETHODCALLTYPE dxgi_swapchain_AddRef(IDXGISwapChain *iface)
static ULONG STDMETHODCALLTYPE dxgi_swapchain_Release(IDXGISwapChain *iface) static ULONG STDMETHODCALLTYPE dxgi_swapchain_Release(IDXGISwapChain *iface)
{ {
struct dxgi_swapchain *This = (struct dxgi_swapchain *)iface; struct dxgi_swapchain *This = impl_from_IDXGISwapChain(iface);
ULONG refcount = InterlockedDecrement(&This->refcount); ULONG refcount = InterlockedDecrement(&This->refcount);
TRACE("%p decreasing refcount to %u\n", This, refcount); TRACE("%p decreasing refcount to %u\n", This, refcount);
@ -130,7 +135,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDevice(IDXGISwapChain *iface,
static HRESULT STDMETHODCALLTYPE dxgi_swapchain_Present(IDXGISwapChain *iface, UINT sync_interval, UINT flags) static HRESULT STDMETHODCALLTYPE dxgi_swapchain_Present(IDXGISwapChain *iface, UINT sync_interval, UINT flags)
{ {
struct dxgi_swapchain *This = (struct dxgi_swapchain *)iface; struct dxgi_swapchain *This = impl_from_IDXGISwapChain(iface);
TRACE("iface %p, sync_interval %u, flags %#x\n", iface, sync_interval, flags); TRACE("iface %p, sync_interval %u, flags %#x\n", iface, sync_interval, flags);
@ -143,7 +148,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_Present(IDXGISwapChain *iface, U
static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface, static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface,
UINT buffer_idx, REFIID riid, void **surface) UINT buffer_idx, REFIID riid, void **surface)
{ {
struct dxgi_swapchain *This = (struct dxgi_swapchain *)iface; struct dxgi_swapchain *This = impl_from_IDXGISwapChain(iface);
struct wined3d_surface *backbuffer; struct wined3d_surface *backbuffer;
IUnknown *parent; IUnknown *parent;
HRESULT hr; HRESULT hr;
@ -271,7 +276,7 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device
{ {
HRESULT hr; HRESULT hr;
swapchain->vtbl = &dxgi_swapchain_vtbl; swapchain->IDXGISwapChain_iface.lpVtbl = &dxgi_swapchain_vtbl;
swapchain->refcount = 1; swapchain->refcount = 1;
hr = wined3d_swapchain_create(device->wined3d_device, present_parameters, hr = wined3d_swapchain_create(device->wined3d_device, present_parameters,