Commit 17bf6ef8 authored by Reece Dunn's avatar Reece Dunn Committed by Alexandre Julliard

shell32: Print the correct GUIDs in the shellpath tests.

parent d9145df0
...@@ -272,10 +272,8 @@ static const char *getFolderName(int folder) ...@@ -272,10 +272,8 @@ static const char *getFolderName(int folder)
} }
} }
static const char *printGUID(const GUID *guid) static const char *printGUID(const GUID *guid, char * guidSTR)
{ {
static char guidSTR[39];
if (!guid) return NULL; if (!guid) return NULL;
sprintf(guidSTR, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", sprintf(guidSTR, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
...@@ -551,10 +549,11 @@ static void matchGUID(int folder, const GUID *guid) ...@@ -551,10 +549,11 @@ static void matchGUID(int folder, const GUID *guid)
pidlLast->mkid.abID[0] == PT_GUID)) pidlLast->mkid.abID[0] == PT_GUID))
{ {
GUID *shellGuid = (GUID *)(pidlLast->mkid.abID + 2); GUID *shellGuid = (GUID *)(pidlLast->mkid.abID + 2);
char shellGuidStr[39], guidStr[39];
ok(IsEqualIID(shellGuid, guid), ok(IsEqualIID(shellGuid, guid),
"%s: got GUID %s, expected %s\n", getFolderName(folder), "%s: got GUID %s, expected %s\n", getFolderName(folder),
printGUID(shellGuid), printGUID(guid)); printGUID(shellGuid, shellGuidStr), printGUID(guid, guidStr));
} }
IMalloc_Free(pMalloc, pidl); IMalloc_Free(pMalloc, pidl);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment