mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 12:19:49 +00:00
wmiutils: Remove unused IUnknown *outer parameter from object constructors.
This commit is contained in:
parent
182ff187a9
commit
f8a18f9c90
4 changed files with 11 additions and 14 deletions
|
@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmiutils);
|
||||||
|
|
||||||
static HINSTANCE instance;
|
static HINSTANCE instance;
|
||||||
|
|
||||||
typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj );
|
typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj );
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
|
@ -87,14 +87,11 @@ static HRESULT WINAPI wmiutils_cf_CreateInstance( IClassFactory *iface, LPUNKNOW
|
||||||
if (pOuter)
|
if (pOuter)
|
||||||
return CLASS_E_NOAGGREGATION;
|
return CLASS_E_NOAGGREGATION;
|
||||||
|
|
||||||
r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk );
|
r = This->pfnCreateInstance( (LPVOID *)&punk );
|
||||||
if (FAILED(r))
|
if (FAILED(r))
|
||||||
return r;
|
return r;
|
||||||
|
|
||||||
r = IUnknown_QueryInterface( punk, riid, ppobj );
|
r = IUnknown_QueryInterface( punk, riid, ppobj );
|
||||||
if (FAILED(r))
|
|
||||||
return r;
|
|
||||||
|
|
||||||
IUnknown_Release( punk );
|
IUnknown_Release( punk );
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
|
@ -276,11 +276,11 @@ static const struct IWbemPathKeyListVtbl keylist_vtbl =
|
||||||
keylist_GetText
|
keylist_GetText
|
||||||
};
|
};
|
||||||
|
|
||||||
static HRESULT WbemPathKeyList_create( IUnknown *pUnkOuter, IWbemPath *parent, LPVOID *ppObj )
|
static HRESULT WbemPathKeyList_create( IWbemPath *parent, LPVOID *ppObj )
|
||||||
{
|
{
|
||||||
struct keylist *keylist;
|
struct keylist *keylist;
|
||||||
|
|
||||||
TRACE("%p, %p\n", pUnkOuter, ppObj);
|
TRACE("%p\n", ppObj);
|
||||||
|
|
||||||
if (!(keylist = heap_alloc( sizeof(*keylist) ))) return E_OUTOFMEMORY;
|
if (!(keylist = heap_alloc( sizeof(*keylist) ))) return E_OUTOFMEMORY;
|
||||||
|
|
||||||
|
@ -1178,7 +1178,7 @@ static HRESULT WINAPI path_GetKeyList(
|
||||||
LeaveCriticalSection( &path->cs );
|
LeaveCriticalSection( &path->cs );
|
||||||
return WBEM_E_INVALID_PARAMETER;
|
return WBEM_E_INVALID_PARAMETER;
|
||||||
}
|
}
|
||||||
hr = WbemPathKeyList_create( NULL, iface, (void **)pOut );
|
hr = WbemPathKeyList_create( iface, (void **)pOut );
|
||||||
|
|
||||||
LeaveCriticalSection( &path->cs );
|
LeaveCriticalSection( &path->cs );
|
||||||
return hr;
|
return hr;
|
||||||
|
@ -1269,11 +1269,11 @@ static const struct IWbemPathVtbl path_vtbl =
|
||||||
path_IsSameClassName
|
path_IsSameClassName
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT WbemPath_create( IUnknown *pUnkOuter, LPVOID *ppObj )
|
HRESULT WbemPath_create( LPVOID *ppObj )
|
||||||
{
|
{
|
||||||
struct path *path;
|
struct path *path;
|
||||||
|
|
||||||
TRACE("%p, %p\n", pUnkOuter, ppObj);
|
TRACE("%p\n", ppObj);
|
||||||
|
|
||||||
if (!(path = heap_alloc( sizeof(*path) ))) return E_OUTOFMEMORY;
|
if (!(path = heap_alloc( sizeof(*path) ))) return E_OUTOFMEMORY;
|
||||||
|
|
||||||
|
|
|
@ -132,11 +132,11 @@ static const struct IWbemStatusCodeTextVtbl status_code_vtbl =
|
||||||
status_code_GetFacilityCodeText
|
status_code_GetFacilityCodeText
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT WbemStatusCodeText_create( IUnknown *pUnkOuter, LPVOID *ppObj )
|
HRESULT WbemStatusCodeText_create( LPVOID *ppObj )
|
||||||
{
|
{
|
||||||
status_code *sc;
|
status_code *sc;
|
||||||
|
|
||||||
TRACE("(%p,%p)\n", pUnkOuter, ppObj);
|
TRACE("(%p)\n", ppObj);
|
||||||
|
|
||||||
if (!(sc = heap_alloc( sizeof(*sc) ))) return E_OUTOFMEMORY;
|
if (!(sc = heap_alloc( sizeof(*sc) ))) return E_OUTOFMEMORY;
|
||||||
|
|
||||||
|
|
|
@ -18,8 +18,8 @@
|
||||||
|
|
||||||
#include "wine/unicode.h"
|
#include "wine/unicode.h"
|
||||||
|
|
||||||
HRESULT WbemPath_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
|
HRESULT WbemPath_create(LPVOID *) DECLSPEC_HIDDEN;
|
||||||
HRESULT WbemStatusCodeText_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
|
HRESULT WbemStatusCodeText_create(LPVOID *) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1);
|
static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1);
|
||||||
static inline void *heap_alloc( size_t len )
|
static inline void *heap_alloc( size_t len )
|
||||||
|
|
Loading…
Reference in a new issue