wbemprox: Add bios name column in Win32_BIOS.
Signed-off-by: Michael Müller <michael@fds-team.de> Signed-off-by: Sebastian Lackner <sebastian@fds-team.de> Signed-off-by: Hans Leidekker <hans@codeweavers.com>
This commit is contained in:
parent
08acac5f91
commit
20ff3352eb
|
@ -374,6 +374,7 @@ static const struct column col_bios[] =
|
||||||
{ prop_descriptionW, CIM_STRING },
|
{ prop_descriptionW, CIM_STRING },
|
||||||
{ prop_identificationcodeW, CIM_STRING },
|
{ prop_identificationcodeW, CIM_STRING },
|
||||||
{ prop_manufacturerW, CIM_STRING },
|
{ prop_manufacturerW, CIM_STRING },
|
||||||
|
{ prop_nameW, CIM_STRING },
|
||||||
{ prop_releasedateW, CIM_DATETIME },
|
{ prop_releasedateW, CIM_DATETIME },
|
||||||
{ prop_serialnumberW, CIM_STRING },
|
{ prop_serialnumberW, CIM_STRING },
|
||||||
{ prop_smbiosbiosversionW, 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};
|
{'D','e','f','a','u','l','t',' ','S','y','s','t','e','m',' ','B','I','O','S',0};
|
||||||
static const WCHAR bios_manufacturerW[] =
|
static const WCHAR bios_manufacturerW[] =
|
||||||
{'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0};
|
{'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[] =
|
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};
|
{'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[] =
|
static const WCHAR bios_serialnumberW[] =
|
||||||
|
@ -761,6 +764,7 @@ struct record_bios
|
||||||
const WCHAR *description;
|
const WCHAR *description;
|
||||||
const WCHAR *identificationcode;
|
const WCHAR *identificationcode;
|
||||||
const WCHAR *manufacturer;
|
const WCHAR *manufacturer;
|
||||||
|
const WCHAR *name;
|
||||||
const WCHAR *releasedate;
|
const WCHAR *releasedate;
|
||||||
const WCHAR *serialnumber;
|
const WCHAR *serialnumber;
|
||||||
const WCHAR *smbiosbiosversion;
|
const WCHAR *smbiosbiosversion;
|
||||||
|
@ -1040,7 +1044,7 @@ static const struct record_baseboard data_baseboard[] =
|
||||||
};
|
};
|
||||||
static const struct record_bios data_bios[] =
|
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 }
|
bios_smbiosbiosversionW, bios_versionW }
|
||||||
};
|
};
|
||||||
static const struct record_computersystemproduct data_compsysproduct[] =
|
static const struct record_computersystemproduct data_compsysproduct[] =
|
||||||
|
|
|
@ -299,15 +299,11 @@ static void test_Win32_Bios( IWbemServices *services )
|
||||||
type = 0xdeadbeef;
|
type = 0xdeadbeef;
|
||||||
VariantInit( &val );
|
VariantInit( &val );
|
||||||
hr = IWbemClassObject_Get( obj, nameW, 0, &val, &type, NULL );
|
hr = IWbemClassObject_Get( obj, nameW, 0, &val, &type, NULL );
|
||||||
todo_wine
|
|
||||||
ok( hr == S_OK, "failed to get name %08x\n", hr );
|
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 );
|
||||||
ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) );
|
trace( "name: %s\n", wine_dbgstr_w(V_BSTR( &val )) );
|
||||||
ok( type == CIM_STRING, "unexpected type 0x%x\n", type );
|
VariantClear( &val );
|
||||||
trace( "name: %s\n", wine_dbgstr_w(V_BSTR( &val )) );
|
|
||||||
VariantClear( &val );
|
|
||||||
}
|
|
||||||
|
|
||||||
type = 0xdeadbeef;
|
type = 0xdeadbeef;
|
||||||
VariantInit( &val );
|
VariantInit( &val );
|
||||||
|
|
Loading…
Reference in New Issue