Michael Stefaniuc : dxgi: COM cleanup for the IDXGIOutput iface.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 125b949545e19725740eed41390a092c6ca21d19
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=125b949545e19725740eed4139...

Author: Michael Stefaniuc 
Date:   Mon Jun  6 10:21:49 2011 +0200

dxgi: COM cleanup for the IDXGIOutput iface.

---

dlls/dxgi/adapter.c      |    2 +-
 dlls/dxgi/dxgi_private.h |    2 +-
 dlls/dxgi/output.c       |   15 ++++++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c
index 7cd808f..d4f757b 100644
--- a/dlls/dxgi/adapter.c
+++ b/dlls/dxgi/adapter.c
@@ -228,7 +228,7 @@ HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IWineDXGIFactory *parent
         return E_OUTOFMEMORY;
     }
     dxgi_output_init(output, adapter);
-    adapter->output = (IDXGIOutput *)output;
+    adapter->output = &output->IDXGIOutput_iface;

return S_OK;
 }
diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h
index cb472f3..741e3e3 100644
--- a/dlls/dxgi/dxgi_private.h
+++ b/dlls/dxgi/dxgi_private.h
@@ -102,7 +102,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l
 /* IDXGIOutput */
 struct dxgi_output
 {
-    const struct IDXGIOutputVtbl *vtbl;
+    IDXGIOutput IDXGIOutput_iface;
     LONG refcount;
     struct dxgi_adapter *adapter;
 };
diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c
index 5ab7992..acc9f25 100644
--- a/dlls/dxgi/output.c
+++ b/dlls/dxgi/output.c
@@ -23,6 +23,11 @@

WINE_DEFAULT_DEBUG_CHANNEL(dxgi);

+static inline struct dxgi_output *impl_from_IDXGIOutput(IDXGIOutput *iface)
+{
+    return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput_iface);
+}
+
 /* IUnknown methods */

static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput *iface, REFIID riid, void **object)
@@ -46,7 +51,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput *iface,

static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput *iface)
 {
-    struct dxgi_output *This = (struct dxgi_output *)iface;
+    struct dxgi_output *This = impl_from_IDXGIOutput(iface);
     ULONG refcount = InterlockedIncrement(&This->refcount);

TRACE("%p increasing refcount to %u.\n", This, refcount);
@@ -56,7 +61,7 @@ static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput *iface)

static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput *iface)
 {
-    struct dxgi_output *This = (struct dxgi_output *)iface;
+    struct dxgi_output *This = impl_from_IDXGIOutput(iface);
     ULONG refcount = InterlockedDecrement(&This->refcount);

TRACE("%p decreasing refcount to %u.\n", This, refcount);
@@ -98,7 +103,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetPrivateData(IDXGIOutput *iface,
 static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput *iface,
         REFIID riid, void **parent)
 {
-    struct dxgi_output *This = (struct dxgi_output *)iface;
+    struct dxgi_output *This = impl_from_IDXGIOutput(iface);

TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent);

@@ -117,7 +122,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput *iface, DXGI_OU
 static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *iface,
         DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC *desc)
 {
-    struct dxgi_output *This = (struct dxgi_output *)iface;
+    struct dxgi_output *This = impl_from_IDXGIOutput(iface);
     enum wined3d_format_id wined3d_format;
     struct wined3d *wined3d;
     UINT i;
@@ -279,7 +284,7 @@ static const struct IDXGIOutputVtbl dxgi_output_vtbl =

void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter)
 {
-    output->vtbl = &dxgi_output_vtbl;
+    output->IDXGIOutput_iface.lpVtbl = &dxgi_output_vtbl;
     output->refcount = 1;
     output->adapter = adapter;
 }