Michael Müller : wbemprox: Add bios name column in Win32_BIOS.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 20ff3352eb19292d47eaa8f3aecc61523ac1f1d9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=20ff3352eb19292d47eaa8f3ae...

Author: Michael Müller <michael(a)fds-team.de>
Date:   Wed Oct  7 14:20:25 2015 +0200

wbemprox: Add bios name column in Win32_BIOS.

Signed-off-by: Michael Müller <michael(a)fds-team.de>
Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de>
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

---

 dlls/wbemprox/builtin.c     |  6 +++++-
 dlls/wbemprox/tests/query.c | 12 ++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c
index 1c960eb..2ff3f50 100644
--- a/dlls/wbemprox/builtin.c
+++ b/dlls/wbemprox/builtin.c
@@ -374,6 +374,7 @@ static const struct column col_bios[] =
     { prop_descriptionW,        CIM_STRING },
     { prop_identificationcodeW, CIM_STRING },
     { prop_manufacturerW,       CIM_STRING },
+    { prop_nameW,               CIM_STRING },
     { prop_releasedateW,        CIM_DATETIME },
     { prop_serialnumberW,       CIM_STRING },
     { prop_smbiosbiosversionW,  CIM_STRING },
@@ -658,6 +659,8 @@ static const WCHAR bios_descriptionW[] =
     {'D','e','f','a','u','l','t',' ','S','y','s','t','e','m',' ','B','I','O','S',0};
 static const WCHAR bios_manufacturerW[] =
     {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0};
+static const WCHAR bios_nameW[] =
+    {'W','I','N','E',' ','B','I','O','S',0};
 static const WCHAR bios_releasedateW[] =
     {'2','0','1','2','0','6','0','8','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0};
 static const WCHAR bios_serialnumberW[] =
@@ -761,6 +764,7 @@ struct record_bios
     const WCHAR *description;
     const WCHAR *identificationcode;
     const WCHAR *manufacturer;
+    const WCHAR *name;
     const WCHAR *releasedate;
     const WCHAR *serialnumber;
     const WCHAR *smbiosbiosversion;
@@ -1040,7 +1044,7 @@ static const struct record_baseboard data_baseboard[] =
 };
 static const struct record_bios data_bios[] =
 {
-    { bios_descriptionW, bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW,
+    { bios_descriptionW, bios_descriptionW, bios_manufacturerW, bios_nameW, bios_releasedateW, bios_serialnumberW,
       bios_smbiosbiosversionW, bios_versionW }
 };
 static const struct record_computersystemproduct data_compsysproduct[] =
diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c
index 98550d5..3138c7a 100644
--- a/dlls/wbemprox/tests/query.c
+++ b/dlls/wbemprox/tests/query.c
@@ -299,15 +299,11 @@ static void test_Win32_Bios( IWbemServices *services )
     type = 0xdeadbeef;
     VariantInit( &val );
     hr = IWbemClassObject_Get( obj, nameW, 0, &val, &type, NULL );
-    todo_wine
     ok( hr == S_OK, "failed to get name %08x\n", hr );
-    if (hr == S_OK)
-    {
-        ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) );
-        ok( type == CIM_STRING, "unexpected type 0x%x\n", type );
-        trace( "name: %s\n", wine_dbgstr_w(V_BSTR( &val )) );
-        VariantClear( &val );
-    }
+    ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) );
+    ok( type == CIM_STRING, "unexpected type 0x%x\n", type );
+    trace( "name: %s\n", wine_dbgstr_w(V_BSTR( &val )) );
+    VariantClear( &val );
 
     type = 0xdeadbeef;
     VariantInit( &val );