Signed-off-by: Gijs Vermeulen gijsvrm@gmail.com --- dlls/wbemprox/tests/query.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-)
diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index da47773da2..0fa091b739 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1144,8 +1144,10 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_PhysicalMemory" ); IEnumWbemClassObject *result; IWbemClassObject *obj; - HRESULT hr; + CIMTYPE type; + VARIANT val; DWORD count; + HRESULT hr;
hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); if (hr != S_OK) @@ -1154,21 +1156,39 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) return; }
- hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - - if (count > 0) + for (;;) { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + check_property( obj, L"BankLabel", VT_BSTR, CIM_STRING ); check_property( obj, L"Capacity", VT_BSTR, CIM_UINT64 ); check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); check_property( obj, L"DeviceLocator", VT_BSTR, CIM_STRING ); check_property( obj, L"FormFactor", VT_I4, CIM_UINT16 ); check_property( obj, L"MemoryType", VT_I4, CIM_UINT16 ); - check_property( obj, L"PartNumber", VT_NULL, CIM_STRING ); - check_property( obj, L"SerialNumber", VT_NULL, CIM_STRING ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"PartNumber", 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "PartNumber %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"SerialNumber", 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "SerialNumber %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql );
Signed-off-by: Gijs Vermeulen gijsvrm@gmail.com --- dlls/wbemprox/tests/query.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 0fa091b739..73740f18c8 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1168,6 +1168,17 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) check_property( obj, L"FormFactor", VT_I4, CIM_UINT16 ); check_property( obj, L"MemoryType", VT_I4, CIM_UINT16 );
+ type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"ConfiguredClockSpeed", 0, &val, &type, NULL ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* < win10 */, "got %08x\n", hr ); + if (hr == S_OK) + { + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + trace( "ConfiguredClockSpeed %u\n", V_I4( &val ) ); + } + type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"PartNumber", 0, &val, &type, NULL );
Signed-off-by: Hans Leidekker hans@codeweavers.com
-
Gijs Vermeulen -
Hans Leidekker