Hans Leidekker : wmiutils: Fix parsing of relative paths.

[Alexandre Julliard]

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

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Fri Jun  7 10:30:31 2013 +0200

wmiutils: Fix parsing of relative paths.

---

 dlls/wmiutils/path.c       |   19 +++++++++++--------
 dlls/wmiutils/tests/path.c |   31 +++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c
index 988d2e6..046f424 100644
--- a/dlls/wmiutils/path.c
+++ b/dlls/wmiutils/path.c
@@ -420,15 +420,18 @@ static HRESULT parse_text( struct path *path, ULONG mode, const WCHAR *text )
         path->flags |= WBEMPATH_INFO_PATH_HAD_SERVER;
     }
     p = q;
-    if (*q && *q != '\\' && *q != '/' && *q != ':')
+    if (strchrW( p, '\\' ) || strchrW( p, '/' ))
     {
-        path->num_namespaces = 1;
-        q++;
-    }
-    while (*q && *q != ':')
-    {
-        if (*q == '\\' || *q == '/') path->num_namespaces++;
-        q++;
+        if (*q != '\\' && *q != '/' && *q != ':')
+        {
+            path->num_namespaces = 1;
+            q++;
+        }
+        while (*q && *q != ':')
+        {
+            if (*q == '\\' || *q == '/') path->num_namespaces++;
+            q++;
+        }
     }
     if (path->num_namespaces)
     {
diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c
index 54c0e9a..ffc3d46 100644
--- a/dlls/wmiutils/tests/path.c
+++ b/dlls/wmiutils/tests/path.c
@@ -161,6 +161,11 @@ static void test_IWbemPath_SetText(void)
 
 static void test_IWbemPath_GetText(void)
 {
+    static const WCHAR serviceW[] =
+        {'W','i','n','3','2','_','S','e','r','v','i','c','e','.','N','a','m','e','=',
+         '\"','S','e','r','v','i','c','e','\"',0};
+    static const WCHAR classW[] =
+        {'W','i','n','3','2','_','C','l','a','s','s',0};
     static const WCHAR expected1W[] =
         {'r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_',
          'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','d','=',
@@ -329,6 +334,32 @@ static void test_IWbemPath_GetText(void)
     ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr );
 
     IWbemPath_Release( path );
+    if (!(path = create_path())) return;
+
+    hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, serviceW );
+    ok( hr == S_OK, "got %08x\n", hr );
+
+    len = sizeof(buf)/sizeof(buf[0]);
+    memset( buf, 0x55, sizeof(buf) );
+    hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf );
+    ok( hr == S_OK, "got %08x\n", hr );
+    ok( !lstrcmpW( buf, serviceW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) );
+    ok( len == lstrlenW( serviceW ) + 1, "unexpected length %u\n", len );
+
+    IWbemPath_Release( path );
+    if (!(path = create_path())) return;
+
+    hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, classW );
+    ok( hr == S_OK, "got %08x\n", hr );
+
+    len = sizeof(buf)/sizeof(buf[0]);
+    memset( buf, 0x55, sizeof(buf) );
+    hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf );
+    ok( hr == S_OK, "got %08x\n", hr );
+    ok( !lstrcmpW( buf, classW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) );
+    ok( len == lstrlenW( classW ) + 1, "unexpected length %u\n", len );
+
+    IWbemPath_Release( path );
 }
 
 static void test_IWbemPath_GetClassName(void)