[PATCH 1/2] wbemprox: Implement Win32_SoundDevice.Manufacturer.

[Gijs Vermeulen]

From: Esme Povirk

Signed-off-by: Gijs Vermeulen 
---
 dlls/wbemprox/builtin.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c
index a94d41bfc4..957dbe53ab 100644
--- a/dlls/wbemprox/builtin.c
+++ b/dlls/wbemprox/builtin.c
@@ -379,6 +379,7 @@ static const struct column col_sounddevice[] =
     { L"Name",        CIM_STRING },
     { L"ProductName", CIM_STRING },
     { L"StatusInfo",  CIM_UINT16 },
+    { L"Manufacturer", CIM_STRING },
 };
 static const struct column col_stdregprov[] =
 {
@@ -767,6 +768,7 @@ struct record_sounddevice
     const WCHAR *name;
     const WCHAR *productname;
     UINT16       statusinfo;
+    const WCHAR *manufacturer;
 };
 struct record_stdregprov
 {
@@ -884,7 +886,7 @@ static const struct record_quickfixengineering data_quickfixengineering[] =
 };
 static const struct record_sounddevice data_sounddevice[] =
 {
-    { L"Wine Audio Device", L"Wine Audio Device", 3 /* enabled */ }
+    { L"Wine Audio Device", L"Wine Audio Device", 3 /* enabled */, L"The Wine Project" }
 };
 static const struct record_stdregprov data_stdregprov[] =
 {

[PATCH 2/2] wbemprox/tests: Add Win32_SoundDevice tests.

[Gijs Vermeulen]

Signed-off-by: Gijs Vermeulen 
---
 dlls/wbemprox/tests/query.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c
index 7dcfd35e93..da47773da2 100644
--- a/dlls/wbemprox/tests/query.c
+++ b/dlls/wbemprox/tests/query.c
@@ -1551,6 +1551,35 @@ static void test_Win32_QuickFixEngineering( IWbemServices *services )
     SysFreeString( wql );
 }

+static void test_Win32_SoundDevice( IWbemServices *services )
+{
+    BSTR wql = SysAllocString( L"wql" );
+    BSTR query = SysAllocString( L"SELECT * FROM Win32_SoundDevice" );
+    IEnumWbemClassObject *result;
+    IWbemClassObject *obj;
+    HRESULT hr;
+    DWORD count;
+
+    hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result );
+    ok( hr == S_OK, "got %08x\n", hr );
+
+    for (;;)
+    {
+        hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count );
+        if (hr != S_OK) break;
+
+        check_property( obj, L"Name", VT_BSTR, CIM_STRING );
+        check_property( obj, L"ProductName", VT_BSTR, CIM_STRING );
+        check_property( obj, L"StatusInfo", VT_I4, CIM_UINT16 );
+        check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING );
+        IWbemClassObject_Release( obj );
+    }
+
+    IEnumWbemClassObject_Release( result );
+    SysFreeString( query );
+    SysFreeString( wql );
+}
+
 START_TEST(query)
 {
     BSTR path = SysAllocString( L"ROOT\CIMV2" );
@@ -1602,6 +1631,7 @@ START_TEST(query)
     test_Win32_Processor( services );
     test_Win32_QuickFixEngineering( services );
     test_Win32_Service( services );
+    test_Win32_SoundDevice( services );
     test_Win32_SystemEnclosure( services );
     test_Win32_VideoController( services );
     test_Win32_WinSAT( services );