Alexandre Julliard : advapi32/tests: Fix a test failure on Wow64.

Alexandre Julliard julliard at winehq.org
Tue Feb 23 11:17:20 CST 2010


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Feb 23 11:07:02 2010 +0100

advapi32/tests: Fix a test failure on Wow64.

---

 dlls/advapi32/tests/registry.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
index 2ad9f89..9f9506a 100644
--- a/dlls/advapi32/tests/registry.c
+++ b/dlls/advapi32/tests/registry.c
@@ -922,9 +922,11 @@ static void test_reg_open_key(void)
 
     /*  beginning backslash character */
     ret = RegOpenKeyA(HKEY_CURRENT_USER, "\\Software\\Wine\\Test", &hkResult);
-       ok(ret == ERROR_BAD_PATHNAME || /* NT/2k/XP */
-           ret == ERROR_FILE_NOT_FOUND /* Win9x,ME */
-           , "expected ERROR_BAD_PATHNAME or ERROR_FILE_NOT_FOUND, got %d\n", ret);
+    ok(ret == ERROR_BAD_PATHNAME || /* NT/2k/XP */
+       ret == ERROR_FILE_NOT_FOUND || /* Win9x,ME */
+       broken(ret == ERROR_SUCCESS),  /* wow64 */
+       "expected ERROR_BAD_PATHNAME or ERROR_FILE_NOT_FOUND, got %d\n", ret);
+    if (!ret) RegCloseKey(hkResult);
 
     hkResult = NULL;
     ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, "\\clsid", 0, KEY_QUERY_VALUE, &hkResult);




More information about the wine-cvs mailing list