Hans Leidekker : wbemprox: Implement Win32_DiskDrive.DeviceId.

[Alexandre Julliard]

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

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Mon Jan 21 16:29:00 2013 +0100

wbemprox: Implement Win32_DiskDrive.DeviceId.

---

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

diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c
index 4375d75..09da3f6 100644
--- a/dlls/wbemprox/builtin.c
+++ b/dlls/wbemprox/builtin.c
@@ -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[] =
 {
diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c
index 1096caa..04c87b7 100644
--- a/dlls/wbemprox/tests/query.c
+++ b/dlls/wbemprox/tests/query.c
@@ -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 );