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

dxgi: COM cleanup for the IWineDXGIAdapter iface.

This commit is contained in:
Michael Stefaniuc 2011-06-07 10:09:02 +02:00 committed by Alexandre Julliard
parent 31510a1acf
commit 2486da8250
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/dxgi/adapter.c
View File

@ -24,6 +24,11 @@
WINE_DEFAULT_DEBUG_CHANNEL(dxgi); WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
static inline struct dxgi_adapter *impl_from_IWineDXGIAdapter(IWineDXGIAdapter *iface)
{
return CONTAINING_RECORD(iface, struct dxgi_adapter, IWineDXGIAdapter_iface);
}
/* IUnknown methods */ /* IUnknown methods */
static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IWineDXGIAdapter *iface, REFIID riid, void **object) static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IWineDXGIAdapter *iface, REFIID riid, void **object)
@ -48,7 +53,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IWineDXGIAdapter *i
static ULONG STDMETHODCALLTYPE dxgi_adapter_AddRef(IWineDXGIAdapter *iface) static ULONG STDMETHODCALLTYPE dxgi_adapter_AddRef(IWineDXGIAdapter *iface)
{ {
struct dxgi_adapter *This = (struct dxgi_adapter *)iface; struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(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);
@ -58,7 +63,7 @@ static ULONG STDMETHODCALLTYPE dxgi_adapter_AddRef(IWineDXGIAdapter *iface)
static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IWineDXGIAdapter *iface) static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IWineDXGIAdapter *iface)
{ {
struct dxgi_adapter *This = (struct dxgi_adapter *)iface; struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(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);
@ -100,7 +105,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetPrivateData(IWineDXGIAdapter *i
static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IWineDXGIAdapter *iface, REFIID riid, void **parent) static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IWineDXGIAdapter *iface, REFIID riid, void **parent)
{ {
struct dxgi_adapter *This = (struct dxgi_adapter *)iface; struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface);
TRACE("iface %p, riid %s, parent %p\n", iface, debugstr_guid(riid), parent); TRACE("iface %p, riid %s, parent %p\n", iface, debugstr_guid(riid), parent);
@ -112,7 +117,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IWineDXGIAdapter *iface,
static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *iface, static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *iface,
UINT output_idx, IDXGIOutput **output) UINT output_idx, IDXGIOutput **output)
{ {
struct dxgi_adapter *This = (struct dxgi_adapter *)iface; struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface);
TRACE("iface %p, output_idx %u, output %p.\n", iface, output_idx, output); TRACE("iface %p, output_idx %u, output %p.\n", iface, output_idx, output);
@ -132,7 +137,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac
static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc)
{ {
struct dxgi_adapter *This = (struct dxgi_adapter *)iface; struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface);
WINED3DADAPTER_IDENTIFIER adapter_id; WINED3DADAPTER_IDENTIFIER adapter_id;
char description[128]; char description[128];
struct wined3d *wined3d; struct wined3d *wined3d;
@ -187,7 +192,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda
static UINT STDMETHODCALLTYPE dxgi_adapter_get_ordinal(IWineDXGIAdapter *iface) static UINT STDMETHODCALLTYPE dxgi_adapter_get_ordinal(IWineDXGIAdapter *iface)
{ {
struct dxgi_adapter *This = (struct dxgi_adapter *)iface; struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface);
TRACE("iface %p, returning %u\n", iface, This->ordinal); TRACE("iface %p, returning %u\n", iface, This->ordinal);
@ -217,7 +222,7 @@ HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IWineDXGIFactory *parent
{ {
struct dxgi_output *output; struct dxgi_output *output;
adapter->vtbl = &dxgi_adapter_vtbl; adapter->IWineDXGIAdapter_iface.lpVtbl = &dxgi_adapter_vtbl;
adapter->parent = parent; adapter->parent = parent;
adapter->refcount = 1; adapter->refcount = 1;
adapter->ordinal = ordinal; adapter->ordinal = ordinal;

2
dlls/dxgi/dxgi_private.h
View File

@ -112,7 +112,7 @@ void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter)
/* IDXGIAdapter */ /* IDXGIAdapter */
struct dxgi_adapter struct dxgi_adapter
{ {
const struct IWineDXGIAdapterVtbl *vtbl; IWineDXGIAdapter IWineDXGIAdapter_iface;
IWineDXGIFactory *parent; IWineDXGIFactory *parent;
LONG refcount; LONG refcount;
UINT ordinal; UINT ordinal;