From 06561779110c8d0b55fa9d71716776499144ca65 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Mon, 15 Apr 2013 08:14:53 +0200
Subject: [PATCH] d3drm: Get rid of Direct3DRM_create().

---
 dlls/d3drm/d3drm.c         | 11 +++++------
 dlls/d3drm/d3drm_main.c    | 10 ----------
 dlls/d3drm/d3drm_private.h |  1 -
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index a18eb111ec..65dea6c4d1 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -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;
 }
diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c
index 2adc188c96..c9bf703f59 100644
--- a/dlls/d3drm/d3drm_main.c
+++ b/dlls/d3drm/d3drm_main.c
@@ -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);
-}
diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h
index 0283cad45a..ce896a1a5c 100644
--- a/dlls/d3drm/d3drm_private.h
+++ b/dlls/d3drm/d3drm_private.h
@@ -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;