From: Sebastian Lackner Subject: [2/2] wbemprox: Add bios name column in Win32_BIOS. Message-Id: <56147A90.60507@fds-team.de> Date: Wed, 7 Oct 2015 03:51:12 +0200 From: Michael Müller Signed-off-by: Michael Müller Signed-off-by: Sebastian Lackner --- dlls/wbemprox/builtin.c | 8 ++++++-- dlls/wbemprox/tests/query.c | 12 ++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 1c960eb..8f51453 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -377,7 +377,8 @@ static const struct column col_bios[] = { prop_releasedateW, CIM_DATETIME }, { prop_serialnumberW, CIM_STRING }, { prop_smbiosbiosversionW, CIM_STRING }, - { prop_versionW, CIM_STRING|COL_FLAG_KEY } + { prop_versionW, CIM_STRING|COL_FLAG_KEY }, + { prop_nameW, CIM_STRING } }; static const struct column col_cdromdrive[] = { @@ -666,6 +667,8 @@ static const WCHAR bios_smbiosbiosversionW[] = {'W','i','n','e',0}; static const WCHAR bios_versionW[] = {'W','I','N','E',' ',' ',' ','-',' ','1',0}; +static const WCHAR bios_nameW[] = + {'W','I','N','E',' ','B','I','O','S',0}; static const WCHAR cdromdrive_mediatypeW[] = {'C','D','-','R','O','M',0}; static const WCHAR cdromdrive_nameW[] = @@ -765,6 +768,7 @@ struct record_bios const WCHAR *serialnumber; const WCHAR *smbiosbiosversion; const WCHAR *version; + const WCHAR *name; }; struct record_cdromdrive { @@ -1041,7 +1045,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_smbiosbiosversionW, bios_versionW } + bios_smbiosbiosversionW, bios_versionW, bios_nameW } }; static const struct record_computersystemproduct data_compsysproduct[] = { diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index f2c5e9f..ba3c16c 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -335,15 +335,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 ); IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); -- 2.6.0