[PATCH 1/2] wbemprox/tests: Don't crash on VirtualBox

Andrew Eikum aeikum at codeweavers.com
Mon Aug 6 11:11:01 CDT 2018


Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
---
 dlls/wbemprox/tests/query.c | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c
index cb911d7927..87b42daeca 100644
--- a/dlls/wbemprox/tests/query.c
+++ b/dlls/wbemprox/tests/query.c
@@ -1368,25 +1368,28 @@ static void test_Win32_PhysicalMemory( IWbemServices *services )
     hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count );
     ok( hr == S_OK, "got %08x\n", hr );
 
-    type = 0xdeadbeef;
-    VariantInit( &val );
-    hr = IWbemClassObject_Get( obj, capacityW, 0, &val, &type, NULL );
-    ok( hr == S_OK, "failed to get capacity %08x\n", hr );
-    ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) );
-    ok( type == CIM_UINT64, "unexpected type 0x%x\n", type );
-    trace( "capacity %s\n", wine_dbgstr_w(V_BSTR( &val )) );
-    VariantClear( &val );
+    if (count > 0)
+    {
+        type = 0xdeadbeef;
+        VariantInit( &val );
+        hr = IWbemClassObject_Get( obj, capacityW, 0, &val, &type, NULL );
+        ok( hr == S_OK, "failed to get capacity %08x\n", hr );
+        ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) );
+        ok( type == CIM_UINT64, "unexpected type 0x%x\n", type );
+        trace( "capacity %s\n", wine_dbgstr_w(V_BSTR( &val )) );
+        VariantClear( &val );
 
-    type = 0xdeadbeef;
-    VariantInit( &val );
-    hr = IWbemClassObject_Get( obj, memorytypeW, 0, &val, &type, NULL );
-    ok( hr == S_OK, "failed to get memory type %08x\n", hr );
-    ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) );
-    ok( type == CIM_UINT16, "unexpected type 0x%x\n", type );
-    trace( "memorytype %u\n", V_I4( &val ) );
-    VariantClear( &val );
+        type = 0xdeadbeef;
+        VariantInit( &val );
+        hr = IWbemClassObject_Get( obj, memorytypeW, 0, &val, &type, NULL );
+        ok( hr == S_OK, "failed to get memory type %08x\n", hr );
+        ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) );
+        ok( type == CIM_UINT16, "unexpected type 0x%x\n", type );
+        trace( "memorytype %u\n", V_I4( &val ) );
+        VariantClear( &val );
 
-    IWbemClassObject_Release( obj );
+        IWbemClassObject_Release( obj );
+    }
     IEnumWbemClassObject_Release( result );
     SysFreeString( query );
     SysFreeString( wql );
-- 
2.18.0





More information about the wine-devel mailing list