marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wmiutils: Remove unused IUnknown *outer parameter from object constructors.

oldstable
Dmitry Timoshkov 2013-12-30 18:21:40 +09:00 committed by Alexandre Julliard
parent 182ff187a9
commit f8a18f9c90
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/wmiutils/main.c
View File

@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmiutils);
static HINSTANCE instance;
typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj );
typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj );
typedef struct
{
@ -87,14 +87,11 @@ static HRESULT WINAPI wmiutils_cf_CreateInstance( IClassFactory *iface, LPUNKNOW
if (pOuter)
return CLASS_E_NOAGGREGATION;
r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk );
r = This->pfnCreateInstance( (LPVOID *)&punk );
if (FAILED(r))
return r;
r = IUnknown_QueryInterface( punk, riid, ppobj );
if (FAILED(r))
return r;
IUnknown_Release( punk );
return r;
}

10
dlls/wmiutils/path.c
View File

@ -276,11 +276,11 @@ static const struct IWbemPathKeyListVtbl keylist_vtbl =
keylist_GetText
};
static HRESULT WbemPathKeyList_create( IUnknown *pUnkOuter, IWbemPath *parent, LPVOID *ppObj )
static HRESULT WbemPathKeyList_create( IWbemPath *parent, LPVOID *ppObj )
{
struct keylist *keylist;
TRACE("%p, %p\n", pUnkOuter, ppObj);
TRACE("%p\n", ppObj);
if (!(keylist = heap_alloc( sizeof(*keylist) ))) return E_OUTOFMEMORY;
@ -1178,7 +1178,7 @@ static HRESULT WINAPI path_GetKeyList(
LeaveCriticalSection( &path->cs );
return WBEM_E_INVALID_PARAMETER;
}
hr = WbemPathKeyList_create( NULL, iface, (void **)pOut );
hr = WbemPathKeyList_create( iface, (void **)pOut );
LeaveCriticalSection( &path->cs );
return hr;
@ -1269,11 +1269,11 @@ static const struct IWbemPathVtbl path_vtbl =
path_IsSameClassName
};
HRESULT WbemPath_create( IUnknown *pUnkOuter, LPVOID *ppObj )
HRESULT WbemPath_create( LPVOID *ppObj )
{
struct path *path;
TRACE("%p, %p\n", pUnkOuter, ppObj);
TRACE("%p\n", ppObj);
if (!(path = heap_alloc( sizeof(*path) ))) return E_OUTOFMEMORY;

4
dlls/wmiutils/statuscode.c
View File

@ -132,11 +132,11 @@ static const struct IWbemStatusCodeTextVtbl status_code_vtbl =
status_code_GetFacilityCodeText
};
HRESULT WbemStatusCodeText_create( IUnknown *pUnkOuter, LPVOID *ppObj )
HRESULT WbemStatusCodeText_create( LPVOID *ppObj )
{
status_code *sc;
TRACE("(%p,%p)\n", pUnkOuter, ppObj);
TRACE("(%p)\n", ppObj);
if (!(sc = heap_alloc( sizeof(*sc) ))) return E_OUTOFMEMORY;

4
dlls/wmiutils/wmiutils_private.h
View File

@ -18,8 +18,8 @@
#include "wine/unicode.h"
HRESULT WbemPath_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
HRESULT WbemStatusCodeText_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
HRESULT WbemPath_create(LPVOID *) DECLSPEC_HIDDEN;
HRESULT WbemStatusCodeText_create(LPVOID *) DECLSPEC_HIDDEN;
static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1);
static inline void *heap_alloc( size_t len )