André Hentschel : d3drm: Reorder device creation function to avoid forward declarations.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2e963df91121d4b05e3e1b5f334f0f8d22a3a7ae
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2e963df91121d4b05e3e1b5f33...

Author: André Hentschel 
Date:   Tue Jan 17 22:56:13 2012 +0100

d3drm: Reorder device creation function to avoid forward declarations.

---

dlls/d3drm/device.c |   53 ++++++++++++++++++++++++--------------------------
 1 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c
index f02ce33..a203b0c 100644
--- a/dlls/d3drm/device.c
+++ b/dlls/d3drm/device.c
@@ -38,9 +38,6 @@ typedef struct {
     LONG ref;
 } IDirect3DRMDeviceImpl;

-static const struct IDirect3DRMDevice2Vtbl Direct3DRMDevice2_Vtbl;
-static const struct IDirect3DRMDevice3Vtbl Direct3DRMDevice3_Vtbl;
-
 static inline IDirect3DRMDeviceImpl *impl_from_IDirect3DRMDevice2(IDirect3DRMDevice2 *iface)
 {
     return CONTAINING_RECORD(iface, IDirect3DRMDeviceImpl, IDirect3DRMDevice2_iface);
@@ -51,31 +48,6 @@ static inline IDirect3DRMDeviceImpl *impl_from_IDirect3DRMDevice3(IDirect3DRMDev
     return CONTAINING_RECORD(iface, IDirect3DRMDeviceImpl, IDirect3DRMDevice3_iface);
 }

-HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj)
-{
-    IDirect3DRMDeviceImpl* object;
-
-    TRACE("(%p)\n", ppObj);
-
-    object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMDeviceImpl));
-    if (!object)
-    {
-        ERR("Out of memory\n");
-        return E_OUTOFMEMORY;
-    }
-
-    object->IDirect3DRMDevice2_iface.lpVtbl = &Direct3DRMDevice2_Vtbl;
-    object->IDirect3DRMDevice3_iface.lpVtbl = &Direct3DRMDevice3_Vtbl;
-    object->ref = 1;
-
-    if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3))
-        *ppObj = (IUnknown*)&object->IDirect3DRMDevice3_iface;
-    else
-        *ppObj = (IUnknown*)&object->IDirect3DRMDevice2_iface;
-
-    return S_OK;
-}
-
 /*** IUnknown methods ***/
 static HRESULT WINAPI IDirect3DRMDevice2Impl_QueryInterface(IDirect3DRMDevice2* iface,
                                                             REFIID riid, void** object)
@@ -1021,3 +993,28 @@ static const struct IDirect3DRMDevice3Vtbl Direct3DRMDevice3_Vtbl =
     IDirect3DRMDevice3Impl_GetStateChangeOptions,
     IDirect3DRMDevice3Impl_SetStateChangeOptions
 };
+
+HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj)
+{
+    IDirect3DRMDeviceImpl* object;
+
+    TRACE("(%p)\n", ppObj);
+
+    object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMDeviceImpl));
+    if (!object)
+    {
+        ERR("Out of memory\n");
+        return E_OUTOFMEMORY;
+    }
+
+    object->IDirect3DRMDevice2_iface.lpVtbl = &Direct3DRMDevice2_Vtbl;
+    object->IDirect3DRMDevice3_iface.lpVtbl = &Direct3DRMDevice3_Vtbl;
+    object->ref = 1;
+
+    if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3))
+        *ppObj = (IUnknown*)&object->IDirect3DRMDevice3_iface;
+    else
+        *ppObj = (IUnknown*)&object->IDirect3DRMDevice2_iface;
+
+    return S_OK;
+}