[PATCH 0/2] MR7484: wbemprox: Fix format string.

[PATCH 1/2] wbemprox: Fix format string.

[Hans Leidekker]

From: Hans Leidekker

---
 dlls/wbemprox/builtin.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c
index 99b925026ec..646d93e3978 100644
--- a/dlls/wbemprox/builtin.c
+++ b/dlls/wbemprox/builtin.c
@@ -4449,7 +4449,7 @@ static enum fill_status fill_videocontroller( struct table *table, const struct
         rec->current_scanmode      = 2; /* Unknown */
         rec->current_verticalres   = vres;
         rec->description           = wcsdup( rec->caption );
-        swprintf( device_id, ARRAY_SIZE( device_id ), L"VideoController1", i + 1 );
+        swprintf( device_id, ARRAY_SIZE( device_id ), L"VideoController%u", i + 1 );
         rec->device_id             = wcsdup( device_id );
         rec->driverdate            = convert_driverdate( adapters[i].driver_date );
         free( adapters[i].driver_date );

[PATCH 2/2] wbemprox/tests: Avoid test failures on Windows 7.

[Hans Leidekker]

From: Hans Leidekker

---
 dlls/wbemprox/tests/query.c | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c
index 7151dfa4046..1c6530a5b24 100644
--- a/dlls/wbemprox/tests/query.c
+++ b/dlls/wbemprox/tests/query.c
@@ -1688,7 +1688,6 @@ static void test_Win32_PhysicalMemory( IWbemServices *services )
         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"Manufacturer", VT_BSTR, CIM_STRING );
         check_property( obj, L"MemoryType", VT_I4, CIM_UINT16 );

type = 0xdeadbeef;
@@ -1702,6 +1701,15 @@ static void test_Win32_PhysicalMemory( IWbemServices *services )
             trace( "ConfiguredClockSpeed %ld\n", V_I4( &val ) );
         }

+        type = 0xdeadbeef;
+        VariantInit( &val );
+        hr = IWbemClassObject_Get( obj, L"Manufacturer", 0, &val, &type, NULL );
+        ok( hr == S_OK, "got %#lx\n", hr );
+        ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type %#x\n", V_VT( &val ) );
+        ok( type == CIM_STRING, "unexpected type %#lx\n", type );
+        trace( "Manufacturer %s\n", wine_dbgstr_w(V_BSTR( &val )) );
+        VariantClear( &val );
+
         type = 0xdeadbeef;
         VariantInit( &val );
         hr = IWbemClassObject_Get( obj, L"PartNumber", 0, &val, &type, NULL );
@@ -1896,8 +1904,6 @@ static void test_Win32_VideoController( IWbemServices *services )
         check_property( obj, L"__RELPATH", VT_BSTR, CIM_STRING );
         check_property( obj, L"__SERVER", VT_BSTR, CIM_STRING );
         check_property( obj, L"AdapterCompatibility", VT_BSTR, CIM_STRING );
-        check_property( obj, L"AdapterDACType", VT_BSTR, CIM_STRING );
-        check_property( obj, L"AdapterRAM", VT_I4, CIM_UINT32 );
         check_property( obj, L"Availability", VT_I4, CIM_UINT16 );
         check_property( obj, L"Caption", VT_BSTR, CIM_STRING );
         check_property( obj, L"ConfigManagerErrorCode", VT_I4, CIM_UINT32 );
@@ -1905,6 +1911,23 @@ static void test_Win32_VideoController( IWbemServices *services )
         check_property( obj, L"DriverVersion", VT_BSTR, CIM_STRING );
         check_property( obj, L"Status", VT_BSTR, CIM_STRING );

+        type = 0xdeadbeef;
+        VariantInit( &val );
+        hr = IWbemClassObject_Get( obj, L"AdapterDACType", 0, &val, &type, NULL );
+        ok( hr == S_OK, "got %#lx\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 %#lx\n", type );
+        trace( "AdapterDACType %s\n", wine_dbgstr_w(V_BSTR( &val )) );
+        VariantClear( &val );
+
+        type = 0xdeadbeef;
+        VariantInit( &val );
+        hr = IWbemClassObject_Get( obj, L"AdapterRAM", 0, &val, &type, NULL );
+        ok( hr == S_OK, "got %#lx\n", hr );
+        ok( V_VT( &val ) == VT_I4 || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) );
+        ok( type == CIM_UINT32, "unexpected type %#lx\n", type );
+        trace( "AdapterRAM %lu\n", V_UI4( &val ) );
+
         type = 0xdeadbeef;
         VariantInit( &val );
         hr = IWbemClassObject_Get( obj, L"InstalledDisplayDrivers", 0, &val, &type, NULL );