Henri Verbeet : d3drm: Introduce impl_from_IDirect3DRMVisualArray().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 44f5d4bd645c6e76202981c0c3717024f0b888e3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=44f5d4bd645c6e76202981c0c3...

Author: Henri Verbeet 
Date:   Wed Oct  9 10:39:40 2013 +0200

d3drm: Introduce impl_from_IDirect3DRMVisualArray().

---

dlls/d3drm/frame.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c
index 4d8867e..7523eab 100644
--- a/dlls/d3drm/frame.c
+++ b/dlls/d3drm/frame.c
@@ -92,6 +92,11 @@ static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame3(IDirect3DRMFrame

static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface);

+static inline IDirect3DRMVisualArrayImpl *impl_from_IDirect3DRMVisualArray(IDirect3DRMVisualArray *iface)
+{
+    return CONTAINING_RECORD(iface, IDirect3DRMVisualArrayImpl, IDirect3DRMVisualArray_iface);
+}
+
 static inline struct d3drm_light_array *impl_from_IDirect3DRMLightArray(IDirect3DRMLightArray *iface)
 {
     return CONTAINING_RECORD(iface, struct d3drm_light_array, IDirect3DRMLightArray_iface);
@@ -235,7 +240,7 @@ static HRESULT WINAPI IDirect3DRMVisualArrayImpl_QueryInterface(IDirect3DRMVisua

static ULONG WINAPI IDirect3DRMVisualArrayImpl_AddRef(IDirect3DRMVisualArray* iface)
 {
-    IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface;
+    IDirect3DRMVisualArrayImpl *This = impl_from_IDirect3DRMVisualArray(iface);
     ULONG ref = InterlockedIncrement(&This->ref);

TRACE("(%p)->(): new ref = %u\n", iface, ref);
@@ -245,7 +250,7 @@ static ULONG WINAPI IDirect3DRMVisualArrayImpl_AddRef(IDirect3DRMVisualArray* if

static ULONG WINAPI IDirect3DRMVisualArrayImpl_Release(IDirect3DRMVisualArray* iface)
 {
-    IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface;
+    IDirect3DRMVisualArrayImpl *This = impl_from_IDirect3DRMVisualArray(iface);
     ULONG ref = InterlockedDecrement(&This->ref);
     ULONG i;

@@ -265,7 +270,7 @@ static ULONG WINAPI IDirect3DRMVisualArrayImpl_Release(IDirect3DRMVisualArray* i
 /*** IDirect3DRMArray methods ***/
 static DWORD WINAPI IDirect3DRMVisualArrayImpl_GetSize(IDirect3DRMVisualArray* iface)
 {
-    IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface;
+    IDirect3DRMVisualArrayImpl *This = impl_from_IDirect3DRMVisualArray(iface);

TRACE("(%p)->() = %d\n", iface,  This->size);

@@ -276,7 +281,7 @@ static DWORD WINAPI IDirect3DRMVisualArrayImpl_GetSize(IDirect3DRMVisualArray* i
 static HRESULT WINAPI IDirect3DRMVisualArrayImpl_GetElement(IDirect3DRMVisualArray *iface,
         DWORD index, IDirect3DRMVisual **visual)
 {
-    IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface;
+    IDirect3DRMVisualArrayImpl *This = impl_from_IDirect3DRMVisualArray(iface);

TRACE("(%p)->(%u, %p)\n", iface, index, visual);