ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3drm: Reorder meshbuilder creation function to avoid forward declarations.

This commit is contained in:
André Hentschel 2012-01-19 22:03:12 +01:00 committed by Alexandre Julliard
parent c5cf5f8ea8
commit 2e3e62b6aa
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
dlls/d3drm/meshbuilder.c
View File

@ -58,9 +58,6 @@ typedef struct {
DWORD flags; DWORD flags;
} Header; } Header;
static const struct IDirect3DRMMeshBuilder2Vtbl Direct3DRMMeshBuilder2_Vtbl;
static const struct IDirect3DRMMeshBuilder3Vtbl Direct3DRMMeshBuilder3_Vtbl;
static char templates[] = { static char templates[] = {
"xof 0302txt 0064" "xof 0302txt 0064"
"template Header" "template Header"
@ -292,31 +289,6 @@ static inline IDirect3DRMMeshBuilderImpl *impl_from_IDirect3DRMMeshBuilder3(IDir
return CONTAINING_RECORD(iface, IDirect3DRMMeshBuilderImpl, IDirect3DRMMeshBuilder3_iface); return CONTAINING_RECORD(iface, IDirect3DRMMeshBuilderImpl, IDirect3DRMMeshBuilder3_iface);
} }
HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj)
{
IDirect3DRMMeshBuilderImpl* object;
TRACE("(%p)\n", ppObj);
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMMeshBuilderImpl));
if (!object)
{
ERR("Out of memory\n");
return E_OUTOFMEMORY;
}
object->IDirect3DRMMeshBuilder2_iface.lpVtbl = &Direct3DRMMeshBuilder2_Vtbl;
object->IDirect3DRMMeshBuilder3_iface.lpVtbl = &Direct3DRMMeshBuilder3_Vtbl;
object->ref = 1;
if (IsEqualGUID(riid, &IID_IDirect3DRMMeshBuilder3))
*ppObj = (IUnknown*)&object->IDirect3DRMMeshBuilder3_iface;
else
*ppObj = (IUnknown*)&object->IDirect3DRMMeshBuilder2_iface;
return S_OK;
}
/*** IUnknown methods ***/ /*** IUnknown methods ***/
static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_QueryInterface(IDirect3DRMMeshBuilder2* iface, static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_QueryInterface(IDirect3DRMMeshBuilder2* iface,
REFIID riid, void** ppvObject) REFIID riid, void** ppvObject)
@ -1968,3 +1940,28 @@ static const struct IDirect3DRMMeshBuilder3Vtbl Direct3DRMMeshBuilder3_Vtbl =
IDirect3DRMMeshBuilder3Impl_GetNormals, IDirect3DRMMeshBuilder3Impl_GetNormals,
IDirect3DRMMeshBuilder3Impl_GetNormalCount IDirect3DRMMeshBuilder3Impl_GetNormalCount
}; };
HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj)
{
IDirect3DRMMeshBuilderImpl* object;
TRACE("(%p)\n", ppObj);
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMMeshBuilderImpl));
if (!object)
{
ERR("Out of memory\n");
return E_OUTOFMEMORY;
}
object->IDirect3DRMMeshBuilder2_iface.lpVtbl = &Direct3DRMMeshBuilder2_Vtbl;
object->IDirect3DRMMeshBuilder3_iface.lpVtbl = &Direct3DRMMeshBuilder3_Vtbl;
object->ref = 1;
if (IsEqualGUID(riid, &IID_IDirect3DRMMeshBuilder3))
*ppObj = (IUnknown*)&object->IDirect3DRMMeshBuilder3_iface;
else
*ppObj = (IUnknown*)&object->IDirect3DRMMeshBuilder2_iface;
return S_OK;
}