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

wmiutils: Don't prepend a backslash if WBEMPATH_GET_NAMESPACE_ONLY is specified.

This commit is contained in:
Hans Leidekker 2013-01-03 14:36:07 +01:00 committed by Alexandre Julliard
parent f776b64fa6
commit 1a16bf4459
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/wmiutils/path.c
View File

@ -210,7 +210,7 @@ static HRESULT WINAPI path_SetText(
return S_OK; return S_OK;
} }
static WCHAR *build_namespace( struct path *path, int *len ) static WCHAR *build_namespace( struct path *path, int *len, BOOL leading_slash )
{ {
WCHAR *ret, *p; WCHAR *ret, *p;
int i; int i;
@ -218,13 +218,13 @@ static WCHAR *build_namespace( struct path *path, int *len )
*len = 0; *len = 0;
for (i = 0; i < path->num_namespaces; i++) for (i = 0; i < path->num_namespaces; i++)
{ {
if (i > 0) *len += 1; if (i > 0 || leading_slash) *len += 1;
*len += path->len_namespaces[i]; *len += path->len_namespaces[i];
} }
if (!(p = ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) return NULL; if (!(p = ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) return NULL;
for (i = 0; i < path->num_namespaces; i++) for (i = 0; i < path->num_namespaces; i++)
{ {
if (i > 0) *p++ = '\\'; if (i > 0 || leading_slash) *p++ = '\\';
memcpy( p, path->namespaces[i], path->len_namespaces[i] * sizeof(WCHAR) ); memcpy( p, path->namespaces[i], path->len_namespaces[i] * sizeof(WCHAR) );
p += path->len_namespaces[i]; p += path->len_namespaces[i];
} }
@ -238,7 +238,7 @@ static WCHAR *build_server( struct path *path, int *len )
*len = 0; *len = 0;
if (path->len_server) *len += 2 + path->len_server; if (path->len_server) *len += 2 + path->len_server;
else *len += 4; else *len += 3;
if (!(p = ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) return NULL; if (!(p = ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) return NULL;
if (path->len_server) if (path->len_server)
{ {
@ -247,7 +247,7 @@ static WCHAR *build_server( struct path *path, int *len )
} }
else else
{ {
p[0] = p[1] = p[3] = '\\'; p[0] = p[1] = '\\';
p[2] = '.'; p[2] = '.';
} }
return ret; return ret;
@ -260,7 +260,7 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len )
case 0: case 0:
{ {
int len_namespace; int len_namespace;
WCHAR *ret, *namespace = build_namespace( path, &len_namespace ); WCHAR *ret, *namespace = build_namespace( path, &len_namespace, FALSE );
if (!namespace) return NULL; if (!namespace) return NULL;
@ -293,7 +293,7 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len )
case WBEMPATH_GET_SERVER_TOO: case WBEMPATH_GET_SERVER_TOO:
{ {
int len_namespace, len_server; int len_namespace, len_server;
WCHAR *p, *ret, *namespace = build_namespace( path, &len_namespace ); WCHAR *p, *ret, *namespace = build_namespace( path, &len_namespace, TRUE );
WCHAR *server = build_server( path, &len_server ); WCHAR *server = build_server( path, &len_server );
if (!namespace || !server) if (!namespace || !server)
@ -326,7 +326,7 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len )
case WBEMPATH_GET_SERVER_AND_NAMESPACE_ONLY: case WBEMPATH_GET_SERVER_AND_NAMESPACE_ONLY:
{ {
int len_namespace, len_server; int len_namespace, len_server;
WCHAR *p, *ret, *namespace = build_namespace( path, &len_namespace ); WCHAR *p, *ret, *namespace = build_namespace( path, &len_namespace, TRUE );
WCHAR *server = build_server( path, &len_server ); WCHAR *server = build_server( path, &len_server );
if (!namespace || !server) if (!namespace || !server)
@ -350,7 +350,7 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len )
return ret; return ret;
} }
case WBEMPATH_GET_NAMESPACE_ONLY: case WBEMPATH_GET_NAMESPACE_ONLY:
return build_namespace( path, len ); return build_namespace( path, len, FALSE );
case WBEMPATH_GET_ORIGINAL: case WBEMPATH_GET_ORIGINAL:
if (!path->len_text) if (!path->len_text)