Alexandre Julliard : shell32/tests: Fix the system directory test for old WoW64 platforms.

Alexandre Julliard julliard at winehq.org
Wed Dec 23 10:04:14 CST 2009


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Dec 23 12:18:37 2009 +0100

shell32/tests: Fix the system directory test for old WoW64 platforms.

---

 dlls/shell32/tests/shellpath.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c
index f9f59e1..c035aaf 100644
--- a/dlls/shell32/tests/shellpath.c
+++ b/dlls/shell32/tests/shellpath.c
@@ -675,7 +675,7 @@ static void testWinDir(void)
  */
 static void testSystemDir(void)
 {
-    char systemShellPath[MAX_PATH], systemDir[MAX_PATH] = { 0 };
+    char systemShellPath[MAX_PATH], systemDir[MAX_PATH], systemDirx86[MAX_PATH];
 
     if (!pSHGetSpecialFolderPathA) return;
 
@@ -689,13 +689,13 @@ static void testSystemDir(void)
          systemDir, systemShellPath);
     }
 
-    if (!pGetSystemWow64DirectoryA || !pGetSystemWow64DirectoryA(systemDir, sizeof(systemDir)))
-        GetSystemDirectoryA(systemDir, sizeof(systemDir));
-    myPathRemoveBackslashA(systemDir);
+    if (!pGetSystemWow64DirectoryA || !pGetSystemWow64DirectoryA(systemDirx86, sizeof(systemDirx86)))
+        GetSystemDirectoryA(systemDirx86, sizeof(systemDirx86));
+    myPathRemoveBackslashA(systemDirx86);
     if (pSHGetSpecialFolderPathA(NULL, systemShellPath, CSIDL_SYSTEMX86, FALSE))
     {
         myPathRemoveBackslashA(systemShellPath);
-        ok(!lstrcmpiA(systemDir, systemShellPath),
+        ok(!lstrcmpiA(systemDirx86, systemShellPath) || broken(!lstrcmpiA(systemDir, systemShellPath)),
          "GetSystemDirectory returns %s SHGetSpecialFolderPath returns %s\n",
          systemDir, systemShellPath);
     }




More information about the wine-cvs mailing list