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

wbemprox: Don't return an error from IWbemClassObject::BeginMethodEnumeration if the object has an iterator. 

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2018-10-09 15:25:02 +02:00 committed by Alexandre Julliard
parent e72983b512
commit a9c6ff2327
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/wbemprox/class.c
View File

@ -907,11 +907,6 @@ static HRESULT WINAPI class_object_BeginMethodEnumeration(
if (lEnumFlags) FIXME("flags 0x%08x not supported\n", lEnumFlags); if (lEnumFlags) FIXME("flags 0x%08x not supported\n", lEnumFlags);
if (co->iter)
{
WARN("not allowed on instance\n");
return WBEM_E_ILLEGAL_OPERATION;
}
co->index_method = 0; co->index_method = 0;
return S_OK; return S_OK;
} }

33
dlls/wbemprox/tests/query.c
View File

@ -722,8 +722,8 @@ static void test_StdRegProv( IWbemServices *services )
'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n',0};
static const WCHAR regtestW[] = static const WCHAR regtestW[] =
{'S','o','f','t','w','a','r','e','\\','S','t','d','R','e','g','P','r','o','v','T','e','s','t',0}; {'S','o','f','t','w','a','r','e','\\','S','t','d','R','e','g','P','r','o','v','T','e','s','t',0};
BSTR class = SysAllocString( stdregprovW ), method; BSTR class = SysAllocString( stdregprovW ), method, name;
IWbemClassObject *reg, *sig_in, *in, *out; IWbemClassObject *reg, *sig_in, *sig_out, *in, *out;
VARIANT defkey, subkey, retval, names, types, value, valuename; VARIANT defkey, subkey, retval, names, types, value, valuename;
CIMTYPE type; CIMTYPE type;
HRESULT hr; HRESULT hr;
@ -735,6 +735,29 @@ static void test_StdRegProv( IWbemServices *services )
win_skip( "StdRegProv not available\n" ); win_skip( "StdRegProv not available\n" );
return; return;
} }
hr = IWbemClassObject_BeginMethodEnumeration( reg, 0 );
ok( hr == S_OK, "got %08x\n", hr );
while (IWbemClassObject_NextMethod( reg, 0, &name, &sig_in, &sig_out ) == S_OK)
{
SysFreeString( name );
IWbemClassObject_Release( sig_in );
IWbemClassObject_Release( sig_out );
}
hr = IWbemClassObject_EndMethodEnumeration( reg );
ok( hr == S_OK, "got %08x\n", hr );
hr = IWbemClassObject_BeginEnumeration( reg, 0 );
ok( hr == S_OK, "got %08x\n", hr );
while (IWbemClassObject_Next( reg, 0, &name, NULL, NULL, NULL ) == S_OK)
SysFreeString( name );
hr = IWbemClassObject_EndEnumeration( reg );
ok( hr == S_OK, "got %08x\n", hr );
hr = IWbemClassObject_GetMethod( reg, createkeyW, 0, &sig_in, NULL ); hr = IWbemClassObject_GetMethod( reg, createkeyW, 0, &sig_in, NULL );
ok( hr == S_OK, "failed to get CreateKey method %08x\n", hr ); ok( hr == S_OK, "failed to get CreateKey method %08x\n", hr );
@ -1168,6 +1191,12 @@ static void test_Win32_OperatingSystem( IWbemServices *services )
hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count );
ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr );
hr = IWbemClassObject_BeginEnumeration( obj, 0 );
ok( hr == S_OK, "got %08x\n", hr );
hr = IWbemClassObject_EndEnumeration( obj );
ok( hr == S_OK, "got %08x\n", hr );
type = 0xdeadbeef; type = 0xdeadbeef;
VariantInit( &val ); VariantInit( &val );
hr = IWbemClassObject_Get( obj, buildnumberW, 0, &val, &type, NULL ); hr = IWbemClassObject_Get( obj, buildnumberW, 0, &val, &type, NULL );