marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wmiutils: Fix parsing of relative paths.

oldstable
Hans Leidekker 2013-06-07 10:30:31 +02:00 committed by Alexandre Julliard
parent 29c43e2efc
commit 540370fb03
2 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/wmiutils/path.c
View File

@ -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)
{

31
dlls/wmiutils/tests/path.c
View File

@ -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','=',
@ -328,6 +333,32 @@ static void test_IWbemPath_GetText(void)
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path20 );
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 );
}