Reece Dunn : shell32: Print the correct GUIDs in the shellpath tests.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 17bf6ef8fc516e57f64d2d032bed004117ca0019
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=17bf6ef8fc516e57f64d2d032b...

Author: Reece Dunn 
Date:   Sun Sep 28 20:31:04 2008 +0100

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..4d87e8d 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);
+            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);
     }