=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: d3drm: Reorder frame creation function to avoid forward declarations.
Alexandre Julliard
julliard at winehq.org
Fri Jan 20 13:09:30 CST 2012
Module: wine
Branch: master
Commit: c5cf5f8ea8861e35c9d7b098003b3c3d5e3ba9d0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5cf5f8ea8861e35c9d7b098003b3c3d5e3ba9d0
Author: André Hentschel <nerv at dawncrow.de>
Date: Thu Jan 19 21:59:34 2012 +0100
d3drm: Reorder frame creation function to avoid forward declarations.
---
dlls/d3drm/frame.c | 53 ++++++++++++++++++++++++---------------------------
1 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c
index 212f7dd..7c0d97a 100644
--- a/dlls/d3drm/frame.c
+++ b/dlls/d3drm/frame.c
@@ -35,9 +35,6 @@ typedef struct {
LONG ref;
} IDirect3DRMFrameImpl;
-static const struct IDirect3DRMFrame2Vtbl Direct3DRMFrame2_Vtbl;
-static const struct IDirect3DRMFrame3Vtbl Direct3DRMFrame3_Vtbl;
-
static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface)
{
return CONTAINING_RECORD(iface, IDirect3DRMFrameImpl, IDirect3DRMFrame2_iface);
@@ -48,31 +45,6 @@ static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame3(IDirect3DRMFrame
return CONTAINING_RECORD(iface, IDirect3DRMFrameImpl, IDirect3DRMFrame3_iface);
}
-HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown** ppObj)
-{
- IDirect3DRMFrameImpl* object;
-
- TRACE("(%p)\n", ppObj);
-
- object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMFrameImpl));
- if (!object)
- {
- ERR("Out of memory\n");
- return E_OUTOFMEMORY;
- }
-
- object->IDirect3DRMFrame2_iface.lpVtbl = &Direct3DRMFrame2_Vtbl;
- object->IDirect3DRMFrame3_iface.lpVtbl = &Direct3DRMFrame3_Vtbl;
- object->ref = 1;
-
- if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3))
- *ppObj = (IUnknown*)&object->IDirect3DRMFrame3_iface;
- else
- *ppObj = (IUnknown*)&object->IDirect3DRMFrame2_iface;
-
- return S_OK;
-}
-
/*** IUnknown methods ***/
static HRESULT WINAPI IDirect3DRMFrame2Impl_QueryInterface(IDirect3DRMFrame2* iface,
REFIID riid, void** object)
@@ -1963,3 +1935,28 @@ static const struct IDirect3DRMFrame3Vtbl Direct3DRMFrame3_Vtbl =
IDirect3DRMFrame3Impl_SetMaterialOverride,
IDirect3DRMFrame3Impl_GetMaterialOverride
};
+
+HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown** ppObj)
+{
+ IDirect3DRMFrameImpl* object;
+
+ TRACE("(%p)\n", ppObj);
+
+ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMFrameImpl));
+ if (!object)
+ {
+ ERR("Out of memory\n");
+ return E_OUTOFMEMORY;
+ }
+
+ object->IDirect3DRMFrame2_iface.lpVtbl = &Direct3DRMFrame2_Vtbl;
+ object->IDirect3DRMFrame3_iface.lpVtbl = &Direct3DRMFrame3_Vtbl;
+ object->ref = 1;
+
+ if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3))
+ *ppObj = (IUnknown*)&object->IDirect3DRMFrame3_iface;
+ else
+ *ppObj = (IUnknown*)&object->IDirect3DRMFrame2_iface;
+
+ return S_OK;
+}
More information about the wine-cvs
mailing list