From: Nikolay Sivov <nsivov@codeweavers.com>
Subject: [PATCH 2/2] ole32: Remove a helper used once
Message-Id: <1396328198.24767.1.camel@laptop>
Date: Tue, 01 Apr 2014 08:56:38 +0400

---
 dlls/ole32/pointermoniker.c | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c
index a44c159..6f16b93 100644
--- a/dlls/ole32/pointermoniker.c
+++ b/dlls/ole32/pointermoniker.c
@@ -236,7 +236,7 @@ PointerMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar,
     if (ppmkReduced==NULL)
         return E_POINTER;
 
-    PointerMonikerImpl_AddRef(iface);
+    IMoniker_AddRef(iface);
 
     *ppmkReduced=iface;
 
@@ -541,21 +541,6 @@ static const IMonikerVtbl VT_PointerMonikerImpl =
     PointerMonikerImpl_IsSystemMoniker
 };
 
-/******************************************************************************
- *         PointerMoniker_Construct (local function)
- *******************************************************************************/
-static void PointerMonikerImpl_Construct(PointerMonikerImpl* This, IUnknown *punk)
-{
-    TRACE("(%p)\n",This);
-
-    /* Initialize the virtual function table. */
-    This->IMoniker_iface.lpVtbl = &VT_PointerMonikerImpl;
-    This->ref = 1;
-    if (punk)
-        IUnknown_AddRef(punk);
-    This->pObject      = punk;
-}
-
 /***********************************************************************
  *           CreatePointerMoniker (OLE32.@)
  *
@@ -569,7 +554,7 @@ static void PointerMonikerImpl_Construct(PointerMonikerImpl* This, IUnknown *pun
  *  Success: S_OK.
  *  Failure: Any HRESULT code.
  */
-HRESULT WINAPI CreatePointerMoniker(LPUNKNOWN punk, LPMONIKER *ppmk)
+HRESULT WINAPI CreatePointerMoniker(IUnknown *punk, IMoniker **ppmk)
 {
     PointerMonikerImpl *This;
 
@@ -585,7 +570,12 @@ HRESULT WINAPI CreatePointerMoniker(LPUNKNOWN punk, LPMONIKER *ppmk)
         return E_OUTOFMEMORY;
     }
 
-    PointerMonikerImpl_Construct(This, punk);
+    This->IMoniker_iface.lpVtbl = &VT_PointerMonikerImpl;
+    This->ref = 1;
+    if (punk)
+        IUnknown_AddRef(punk);
+    This->pObject = punk;
+
     *ppmk = &This->IMoniker_iface;
     return S_OK;
 }
@@ -652,9 +642,9 @@ static const IClassFactoryVtbl PointerMonikerCFVtbl =
     PointerMonikerCF_CreateInstance,
     PointerMonikerCF_LockServer
 };
-static const IClassFactoryVtbl *PointerMonikerCF = &PointerMonikerCFVtbl;
+static IClassFactory PointerMonikerCF = { &PointerMonikerCFVtbl };
 
 HRESULT PointerMonikerCF_Create(REFIID riid, LPVOID *ppv)
 {
-    return IClassFactory_QueryInterface((IClassFactory *)&PointerMonikerCF, riid, ppv);
+    return IClassFactory_QueryInterface(&PointerMonikerCF, riid, ppv);
 }