[PATCH 4/7] d3drm: Move IUnknown methods of viewports from version 1->2.
Aaryaman Vasishta
jem456.vasishta at gmail.com
Fri Jun 24 16:49:30 CDT 2016
Signed-off-by: Aaryaman Vasishta <jem456.vasishta at gmail.com>
---
dlls/d3drm/viewport.c | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c
index 8f7bf39..cb5f9b5 100644
--- a/dlls/d3drm/viewport.c
+++ b/dlls/d3drm/viewport.c
@@ -51,15 +51,6 @@ static HRESULT WINAPI d3drm_viewport2_QueryInterface(IDirect3DRMViewport2 *iface
TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
- return IDirect3DRMViewport_QueryInterface(&viewport->IDirect3DRMViewport_iface, riid, out);
-}
-
-static HRESULT WINAPI d3drm_viewport1_QueryInterface(IDirect3DRMViewport *iface, REFIID riid, void **out)
-{
- struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface);
-
- TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
-
if (IsEqualGUID(riid, &IID_IDirect3DRMViewport)
|| IsEqualGUID(riid, &IID_IDirect3DRMObject)
|| IsEqualGUID(riid, &IID_IUnknown))
@@ -81,18 +72,18 @@ static HRESULT WINAPI d3drm_viewport1_QueryInterface(IDirect3DRMViewport *iface,
return S_OK;
}
-static ULONG WINAPI d3drm_viewport2_AddRef(IDirect3DRMViewport2 *iface)
+static HRESULT WINAPI d3drm_viewport1_QueryInterface(IDirect3DRMViewport *iface, REFIID riid, void **out)
{
- struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface);
+ struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface);
- TRACE("iface %p.\n", iface);
+ TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
- return IDirect3DRMViewport_AddRef(&viewport->IDirect3DRMViewport_iface);
+ return d3drm_viewport2_QueryInterface(&viewport->IDirect3DRMViewport2_iface, riid, out);
}
-static ULONG WINAPI d3drm_viewport1_AddRef(IDirect3DRMViewport *iface)
+static ULONG WINAPI d3drm_viewport2_AddRef(IDirect3DRMViewport2 *iface)
{
- struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface);
+ struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface);
ULONG refcount = InterlockedIncrement(&viewport->obj.ref);
TRACE("%p increasing refcount to %u.\n", iface, refcount);
@@ -100,18 +91,18 @@ static ULONG WINAPI d3drm_viewport1_AddRef(IDirect3DRMViewport *iface)
return refcount;
}
-static ULONG WINAPI d3drm_viewport2_Release(IDirect3DRMViewport2 *iface)
+static ULONG WINAPI d3drm_viewport1_AddRef(IDirect3DRMViewport *iface)
{
- struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface);
+ struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface);
TRACE("iface %p.\n", iface);
- return IDirect3DRMViewport_Release(&viewport->IDirect3DRMViewport_iface);
+ return d3drm_viewport2_AddRef(&viewport->IDirect3DRMViewport2_iface);
}
-static ULONG WINAPI d3drm_viewport1_Release(IDirect3DRMViewport *iface)
+static ULONG WINAPI d3drm_viewport2_Release(IDirect3DRMViewport2 *iface)
{
- struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface);
+ struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface);
ULONG refcount = InterlockedDecrement(&viewport->obj.ref);
TRACE("%p decreasing refcount to %u.\n", iface, refcount);
@@ -124,6 +115,15 @@ static ULONG WINAPI d3drm_viewport1_Release(IDirect3DRMViewport *iface)
return refcount;
}
+static ULONG WINAPI d3drm_viewport1_Release(IDirect3DRMViewport *iface)
+{
+ struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return d3drm_viewport2_Release(&viewport->IDirect3DRMViewport2_iface);
+}
+
static HRESULT WINAPI d3drm_viewport2_Clone(IDirect3DRMViewport2 *iface,
IUnknown *outer, REFIID iid, void **out)
{
--
2.3.2 (Apple Git-55)
More information about the wine-patches
mailing list