From e8a53a006dd157b74eb2b48b051baccf7efedc55 Mon Sep 17 00:00:00 2001 From: Reece Dunn Date: Sun, 28 Sep 2008 20:31:04 +0100 Subject: [PATCH] shell32: print the correct GUIDs in the shellpath tests. --- dlls/shell32/tests/shellpath.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index a1cf2d3..41a154d 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -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; 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) pidlLast->mkid.abID[0] == PT_GUID)) { GUID *shellGuid = (GUID *)(pidlLast->mkid.abID + 2); + static char shellGuidStr[39], guidStr[39]; ok(IsEqualIID(shellGuid, guid), "%s: got GUID %s, expected %s\n", getFolderName(folder), - printGUID(shellGuid), printGUID(guid)); + printGUID(shellGuid, shellGuidStr), printGUID(guid, guidStr)); } IMalloc_Free(pMalloc, pidl); } -- 1.5.6.1.1071.g76fb