[2/7] wbemprox: The last parameter to IWbemClassObject::GetMethod is optional.
Hans Leidekker
hans at codeweavers.com
Wed Oct 17 04:06:59 CDT 2012
---
dlls/wbemprox/class.c | 2 +-
dlls/wbemprox/tests/query.c | 11 ++++-------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c
index a3a06e1..75bd612 100644
--- a/dlls/wbemprox/class.c
+++ b/dlls/wbemprox/class.c
@@ -848,7 +848,7 @@ static HRESULT WINAPI class_object_GetMethod(
TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature);
hr = create_signature( co->name, wszName, PARAM_IN, ppInSignature );
- if (hr != S_OK) return hr;
+ if (hr != S_OK || !ppOutSignature) return hr;
hr = create_signature( co->name, wszName, PARAM_OUT, ppOutSignature );
if (hr != S_OK) IWbemClassObject_Release( *ppInSignature );
diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c
index 15fad8c..e531b3c 100644
--- a/dlls/wbemprox/tests/query.c
+++ b/dlls/wbemprox/tests/query.c
@@ -143,7 +143,7 @@ static void test_StdRegProv( IWbemServices *services )
{'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\',
'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n',0};
BSTR class = SysAllocString( stdregprovW ), method;
- IWbemClassObject *reg, *sig_in, *sig_out, *in, *out;
+ IWbemClassObject *reg, *sig_in, *in, *out;
VARIANT defkey, subkey, retval, names, types, value, valuename;
CIMTYPE type;
HRESULT hr;
@@ -154,7 +154,7 @@ static void test_StdRegProv( IWbemServices *services )
win_skip( "StdRegProv not available\n" );
return;
}
- hr = IWbemClassObject_GetMethod( reg, enumkeyW, 0, &sig_in, &sig_out );
+ hr = IWbemClassObject_GetMethod( reg, enumkeyW, 0, &sig_in, NULL );
ok( hr == S_OK, "failed to get EnumKey method %08x\n", hr );
hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in );
@@ -196,9 +196,8 @@ static void test_StdRegProv( IWbemServices *services )
IWbemClassObject_Release( in );
IWbemClassObject_Release( out );
IWbemClassObject_Release( sig_in );
- IWbemClassObject_Release( sig_out );
- hr = IWbemClassObject_GetMethod( reg, enumvaluesW, 0, &sig_in, &sig_out );
+ hr = IWbemClassObject_GetMethod( reg, enumvaluesW, 0, &sig_in, NULL );
ok( hr == S_OK, "failed to get EnumValues method %08x\n", hr );
hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in );
@@ -248,9 +247,8 @@ static void test_StdRegProv( IWbemServices *services )
IWbemClassObject_Release( in );
IWbemClassObject_Release( out );
IWbemClassObject_Release( sig_in );
- IWbemClassObject_Release( sig_out );
- hr = IWbemClassObject_GetMethod( reg, getstringvalueW, 0, &sig_in, &sig_out );
+ hr = IWbemClassObject_GetMethod( reg, getstringvalueW, 0, &sig_in, NULL );
ok( hr == S_OK, "failed to get GetStringValue method %08x\n", hr );
hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in );
@@ -298,7 +296,6 @@ static void test_StdRegProv( IWbemServices *services )
IWbemClassObject_Release( in );
IWbemClassObject_Release( out );
IWbemClassObject_Release( sig_in );
- IWbemClassObject_Release( sig_out );
IWbemClassObject_Release( reg );
SysFreeString( class );
--
1.7.10.4
More information about the wine-patches
mailing list