Commit 06561779 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

d3drm: Get rid of Direct3DRM_create().

parent 0c228f5f
......@@ -1678,14 +1678,13 @@ static const struct IDirect3DRM3Vtbl Direct3DRM3_Vtbl =
IDirect3DRM3Impl_GetOptions
};
HRESULT Direct3DRM_create(IUnknown** ppObj)
HRESULT WINAPI Direct3DRMCreate(IDirect3DRM **d3drm)
{
IDirect3DRMImpl* object;
IDirect3DRMImpl *object;
TRACE("(%p)\n", ppObj);
TRACE("d3drm %p.\n", d3drm);
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMImpl));
if (!object)
if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
return E_OUTOFMEMORY;
object->IDirect3DRM_iface.lpVtbl = &Direct3DRM_Vtbl;
......@@ -1693,7 +1692,7 @@ HRESULT Direct3DRM_create(IUnknown** ppObj)
object->IDirect3DRM3_iface.lpVtbl = &Direct3DRM3_Vtbl;
object->ref = 1;
*ppObj = (IUnknown*)&object->IDirect3DRM_iface;
*d3drm = &object->IDirect3DRM_iface;
return S_OK;
}
......@@ -42,13 +42,3 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
}
return TRUE;
}
/***********************************************************************
* (D3DRM.@)
*/
HRESULT WINAPI Direct3DRMCreate(LPDIRECT3DRM* ppDirect3DRM)
{
TRACE("(%p)\n", ppDirect3DRM);
return Direct3DRM_create((IUnknown**)ppDirect3DRM);
}
......@@ -24,7 +24,6 @@
#include "d3drm.h"
#include "dxfile.h"
HRESULT Direct3DRM_create(IUnknown** ppObj) DECLSPEC_HIDDEN;
HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN;
HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent_frame, IUnknown** ret_iface) DECLSPEC_HIDDEN;
HRESULT Direct3DRMLight_create(IUnknown** ppObj) DECLSPEC_HIDDEN;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment