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

ole32: Get rid of pointer moniker initialization helper. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2020-01-30 14:53:44 +03:00 committed by Alexandre Julliard
parent 2017977cb3
commit bea01f4532
1 changed files with 31 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
dlls/ole32/pointermoniker.c
View File

@ -32,6 +32,7 @@
#include "objbase.h" #include "objbase.h"
#include "oleidl.h" #include "oleidl.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/heap.h"
#include "moniker.h" #include "moniker.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);
@ -42,7 +43,7 @@ typedef struct PointerMonikerImpl
IMoniker IMoniker_iface; IMoniker IMoniker_iface;
IMarshal IMarshal_iface; IMarshal IMarshal_iface;
LONG ref; /* reference counter for this object */ LONG refcount;
IUnknown *pObject; IUnknown *pObject;
} PointerMonikerImpl; } PointerMonikerImpl;
@ -88,40 +89,30 @@ static HRESULT WINAPI PointerMonikerImpl_QueryInterface(IMoniker *iface, REFIID
return S_OK; return S_OK;
} }
/****************************************************************************** static ULONG WINAPI PointerMonikerImpl_AddRef(IMoniker *iface)
* PointerMoniker_AddRef
******************************************************************************/
static ULONG WINAPI
PointerMonikerImpl_AddRef(IMoniker* iface)
{ {
PointerMonikerImpl *This = impl_from_IMoniker(iface); PointerMonikerImpl *moniker = impl_from_IMoniker(iface);
ULONG refcount = InterlockedIncrement(&moniker->refcount);
TRACE("(%p)\n",This); TRACE("%p, refcount %u.\n", iface, refcount);
return InterlockedIncrement(&This->ref); return refcount;
} }
/****************************************************************************** static ULONG WINAPI PointerMonikerImpl_Release(IMoniker *iface)
* PointerMoniker_Release
******************************************************************************/
static ULONG WINAPI
PointerMonikerImpl_Release(IMoniker* iface)
{ {
PointerMonikerImpl *This = impl_from_IMoniker(iface); PointerMonikerImpl *moniker = impl_from_IMoniker(iface);
ULONG ref; ULONG refcount = InterlockedDecrement(&moniker->refcount);
TRACE("(%p)\n",This); TRACE("%p, refcount %u.\n", iface, refcount);
ref = InterlockedDecrement(&This->ref); if (!refcount)
/* destroy the object if there are no more references on it */
if (ref == 0)
{ {
if (This->pObject) IUnknown_Release(This->pObject); if (moniker->pObject) IUnknown_Release(moniker->pObject);
HeapFree(GetProcessHeap(),0,This); heap_free(moniker);
} }
return ref; return refcount;
} }
/****************************************************************************** /******************************************************************************
@ -659,52 +650,34 @@ static const IMarshalVtbl pointer_moniker_marshal_vtbl =
pointer_moniker_marshal_DisconnectObject pointer_moniker_marshal_DisconnectObject
}; };
/******************************************************************************
* PointerMoniker_Construct (local function)
*******************************************************************************/
static void PointerMonikerImpl_Construct(PointerMonikerImpl* This, IUnknown *punk)
{
TRACE("(%p)\n",This);
This->IMoniker_iface.lpVtbl = &VT_PointerMonikerImpl;
This->IMarshal_iface.lpVtbl = &pointer_moniker_marshal_vtbl;
This->ref = 1;
if (punk)
IUnknown_AddRef(punk);
This->pObject = punk;
}
/*********************************************************************** /***********************************************************************
* CreatePointerMoniker (OLE32.@) * CreatePointerMoniker (OLE32.@)
*
* Creates a moniker which represents a pointer.
*
* PARAMS
* punk [I] Pointer to the object to represent.
* ppmk [O] Address that receives the pointer to the created moniker.
*
* RETURNS
* Success: S_OK.
* Failure: Any HRESULT code.
*/ */
HRESULT WINAPI CreatePointerMoniker(LPUNKNOWN punk, LPMONIKER *ppmk) HRESULT WINAPI CreatePointerMoniker(IUnknown *object, IMoniker **ret)
{ {
PointerMonikerImpl *This; PointerMonikerImpl *moniker;
TRACE("(%p, %p)\n", punk, ppmk); TRACE("(%p, %p)\n", object, ret);
if (!ppmk) if (!ret)
return E_INVALIDARG; return E_INVALIDARG;
This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); moniker = heap_alloc(sizeof(*moniker));
if (!This) if (!moniker)
{ {
*ppmk = NULL; *ret = NULL;
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
PointerMonikerImpl_Construct(This, punk); moniker->IMoniker_iface.lpVtbl = &VT_PointerMonikerImpl;
*ppmk = &This->IMoniker_iface; moniker->IMarshal_iface.lpVtbl = &pointer_moniker_marshal_vtbl;
moniker->refcount = 1;
moniker->pObject = object;
if (moniker->pObject)
IUnknown_AddRef(moniker->pObject);
*ret = &moniker->IMoniker_iface;
return S_OK; return S_OK;
} }