system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:54:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Dmitry Timoshkov 2013-12-30 18:21:36 +09:00 committed by Alexandre Julliard
parent fb9e8bc94e
commit 182ff187a9
7 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/wbemprox/class.c
View file

@ -152,7 +152,7 @@ static HRESULT WINAPI enum_class_object_Clone(
TRACE("%p, %p\n", iface, ppEnum); TRACE("%p, %p\n", iface, ppEnum);
return EnumWbemClassObject_create( NULL, ec->query, (void **)ppEnum ); return EnumWbemClassObject_create( ec->query, (void **)ppEnum );
} }
static HRESULT WINAPI enum_class_object_Skip( static HRESULT WINAPI enum_class_object_Skip(
@ -190,12 +190,11 @@ static const IEnumWbemClassObjectVtbl enum_class_object_vtbl =
enum_class_object_Skip enum_class_object_Skip
}; };
HRESULT EnumWbemClassObject_create( HRESULT EnumWbemClassObject_create( struct query *query, LPVOID *ppObj )
IUnknown *pUnkOuter, struct query *query, LPVOID *ppObj )
{ {
struct enum_class_object *ec; struct enum_class_object *ec;
TRACE("%p, %p\n", pUnkOuter, ppObj); TRACE("%p\n", ppObj);
ec = heap_alloc( sizeof(*ec) ); ec = heap_alloc( sizeof(*ec) );
if (!ec) return E_OUTOFMEMORY; if (!ec) return E_OUTOFMEMORY;
@ -551,7 +550,7 @@ static HRESULT WINAPI class_object_GetPropertyQualifierSet(
TRACE("%p, %s, %p\n", iface, debugstr_w(wszProperty), ppQualSet); TRACE("%p, %s, %p\n", iface, debugstr_w(wszProperty), ppQualSet);
return WbemQualifierSet_create( NULL, co->name, wszProperty, (void **)ppQualSet ); return WbemQualifierSet_create( co->name, wszProperty, (void **)ppQualSet );
} }
static HRESULT WINAPI class_object_Clone( static HRESULT WINAPI class_object_Clone(

7
dlls/wbemprox/main.c
View file

@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox);
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 wbemprox_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;
} }

5
dlls/wbemprox/qualifier.c
View file

@ -247,12 +247,11 @@ static const IWbemQualifierSetVtbl qualifier_set_vtbl =
qualifier_set_EndEnumeration qualifier_set_EndEnumeration
}; };
HRESULT WbemQualifierSet_create( HRESULT WbemQualifierSet_create( const WCHAR *class, const WCHAR *member, LPVOID *ppObj )
IUnknown *pUnkOuter, const WCHAR *class, const WCHAR *member, LPVOID *ppObj )
{ {
struct qualifier_set *set; struct qualifier_set *set;
TRACE("%p, %p\n", pUnkOuter, ppObj); TRACE("%p\n", ppObj);
if (!(set = heap_alloc( sizeof(*set) ))) return E_OUTOFMEMORY; if (!(set = heap_alloc( sizeof(*set) ))) return E_OUTOFMEMORY;

2
dlls/wbemprox/query.c
View file

@ -314,7 +314,7 @@ HRESULT exec_query( const WCHAR *str, IEnumWbemClassObject **result )
if (hr != S_OK) goto done; if (hr != S_OK) goto done;
hr = execute_view( query->view ); hr = execute_view( query->view );
if (hr != S_OK) goto done; if (hr != S_OK) goto done;
hr = EnumWbemClassObject_create( NULL, query, (void **)result ); hr = EnumWbemClassObject_create( query, (void **)result );
done: done:
release_query( query ); release_query( query );

8
dlls/wbemprox/services.c
View file

@ -282,7 +282,7 @@ static HRESULT WINAPI wbem_services_OpenNamespace(
if ((strcmpiW( strNamespace, cimv2W ) && strcmpiW( strNamespace, defaultW )) || ws->namespace) if ((strcmpiW( strNamespace, cimv2W ) && strcmpiW( strNamespace, defaultW )) || ws->namespace)
return WBEM_E_INVALID_NAMESPACE; return WBEM_E_INVALID_NAMESPACE;
return WbemServices_create( NULL, cimv2W, (void **)ppWorkingNamespace ); return WbemServices_create( cimv2W, (void **)ppWorkingNamespace );
} }
static HRESULT WINAPI wbem_services_CancelAsyncCall( static HRESULT WINAPI wbem_services_CancelAsyncCall(
@ -816,7 +816,7 @@ static HRESULT WINAPI wbem_services_ExecMethod(
hr = execute_view( query->view ); hr = execute_view( query->view );
if (hr != S_OK) goto done; if (hr != S_OK) goto done;
hr = EnumWbemClassObject_create( NULL, query, (void **)&result ); hr = EnumWbemClassObject_create( query, (void **)&result );
if (hr != S_OK) goto done; if (hr != S_OK) goto done;
hr = create_class_object( query->view->table->name, result, 0, NULL, &obj ); hr = create_class_object( query->view->table->name, result, 0, NULL, &obj );
@ -879,11 +879,11 @@ static const IWbemServicesVtbl wbem_services_vtbl =
wbem_services_ExecMethodAsync wbem_services_ExecMethodAsync
}; };
HRESULT WbemServices_create( IUnknown *pUnkOuter, const WCHAR *namespace, LPVOID *ppObj ) HRESULT WbemServices_create( const WCHAR *namespace, LPVOID *ppObj )
{ {
struct wbem_services *ws; struct wbem_services *ws;
TRACE("(%p,%p)\n", pUnkOuter, ppObj); TRACE("(%p)\n", ppObj);
ws = heap_alloc( sizeof(*ws) ); ws = heap_alloc( sizeof(*ws) );
if (!ws) return E_OUTOFMEMORY; if (!ws) return E_OUTOFMEMORY;

6
dlls/wbemprox/wbemlocator.c
View file

@ -194,7 +194,7 @@ static HRESULT WINAPI wbem_locator_ConnectServer(
if (SecurityFlags) if (SecurityFlags)
FIXME("unsupported flags\n"); FIXME("unsupported flags\n");
hr = WbemServices_create( NULL, namespace, (void **)ppNamespace ); hr = WbemServices_create( namespace, (void **)ppNamespace );
heap_free( namespace ); heap_free( namespace );
heap_free( server ); heap_free( server );
if (SUCCEEDED( hr )) if (SUCCEEDED( hr ))
@ -211,11 +211,11 @@ static const IWbemLocatorVtbl wbem_locator_vtbl =
wbem_locator_ConnectServer wbem_locator_ConnectServer
}; };
HRESULT WbemLocator_create( IUnknown *pUnkOuter, LPVOID *ppObj ) HRESULT WbemLocator_create( LPVOID *ppObj )
{ {
wbem_locator *wl; wbem_locator *wl;
TRACE("(%p,%p)\n", pUnkOuter, ppObj); TRACE("(%p)\n", ppObj);
wl = heap_alloc( sizeof(*wl) ); wl = heap_alloc( sizeof(*wl) );
if (!wl) return E_OUTOFMEMORY; if (!wl) return E_OUTOFMEMORY;

8
dlls/wbemprox/wbemprox_private.h
View file

@ -207,12 +207,12 @@ void set_variant( VARTYPE, LONGLONG, void *, VARIANT * ) DECLSPEC_HIDDEN;
HRESULT create_signature( const WCHAR *, const WCHAR *, enum param_direction, HRESULT create_signature( const WCHAR *, const WCHAR *, enum param_direction,
IWbemClassObject ** ) DECLSPEC_HIDDEN; IWbemClassObject ** ) DECLSPEC_HIDDEN;
HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(LPVOID *) DECLSPEC_HIDDEN;
HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemServices_create(const WCHAR *, LPVOID *) DECLSPEC_HIDDEN;
HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT, HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT,
struct record *, IWbemClassObject **) DECLSPEC_HIDDEN; struct record *, IWbemClassObject **) DECLSPEC_HIDDEN;
HRESULT EnumWbemClassObject_create(IUnknown *, struct query *, LPVOID *) DECLSPEC_HIDDEN; HRESULT EnumWbemClassObject_create(struct query *, LPVOID *) DECLSPEC_HIDDEN;
HRESULT WbemQualifierSet_create(IUnknown *, const WCHAR *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemQualifierSet_create(const WCHAR *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN;
HRESULT process_get_owner(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT process_get_owner(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN;
HRESULT reg_enum_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT reg_enum_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN;