ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wbemprox: Implement Win32_DiskDrive.DeviceId.

This commit is contained in:
Hans Leidekker 2013-01-21 16:29:00 +01:00 committed by Alexandre Julliard
parent b637d4ca94
commit 99c1b55727
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/wbemprox/builtin.c
View File

@ -215,6 +215,7 @@ static const struct column col_compsys[] =
};
static const struct column col_diskdrive[] =
{
{ prop_deviceidW, CIM_STRING|COL_FLAG_KEY },
{ prop_manufacturerW, CIM_STRING },
{ prop_modelW, CIM_STRING },
{ prop_serialnumberW, CIM_STRING }
@ -345,6 +346,8 @@ static const WCHAR compsys_manufacturerW[] =
{'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0};
static const WCHAR compsys_modelW[] =
{'W','i','n','e',0};
static const WCHAR diskdrive_deviceidW[] =
{'\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0};
static const WCHAR diskdrive_modelW[] =
{'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0};
static const WCHAR diskdrive_manufacturerW[] =
@ -399,6 +402,7 @@ struct record_computersystem
};
struct record_diskdrive
{
const WCHAR *device_id;
const WCHAR *manufacturer;
const WCHAR *name;
const WCHAR *serialnumber;
@ -518,7 +522,7 @@ static const struct record_cdromdrive data_cdromdrive[] =
};
static const struct record_diskdrive data_diskdrive[] =
{
{ diskdrive_manufacturerW, diskdrive_modelW }
{ diskdrive_deviceidW, diskdrive_manufacturerW, diskdrive_modelW }
};
static const struct record_params data_params[] =
{

6
dlls/wbemprox/tests/query.c
View File

@ -91,7 +91,11 @@ static void test_select( IWbemServices *services )
{'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_',
'P','r','o','c','e','s','s',' ','W','H','E','R','E',' ','C','a','p','t','i','o','n',' ',
'L','I','K','E',' ','\'','%','%','R','E','G','E','D','I','T','%','\'',0};
static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7 };
static const WCHAR query8[] =
{'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_',
'D','i','s','k','D','r','i','v','e',' ','W','H','E','R','E',' ','D','e','v','i','c','e','I','D','=',
'\"','\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0','\"',0};
static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8 };
HRESULT hr;
IEnumWbemClassObject *result;
BSTR wql = SysAllocString( wqlW );