George Stephanos : advapi32/tests: HKCR mask tests fix for WinNT.

[Alexandre Julliard]

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

Author: George Stephanos 
Date:   Fri Aug 30 00:15:56 2013 +0200

advapi32/tests: HKCR mask tests fix for WinNT.

---

dlls/advapi32/tests/registry.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
index fd5d373..981ac93 100644
--- a/dlls/advapi32/tests/registry.c
+++ b/dlls/advapi32/tests/registry.c
@@ -2130,7 +2130,6 @@ static void test_classesroot(void)
     todo_wine ok(res == ERROR_SUCCESS ||
                  broken(res == ERROR_FILE_NOT_FOUND /* WinNT */),
                  "test key not found in hkcr: %d\n", res);
-    todo_wine ok(IS_HKCR(hkcr), "hkcr mask not set in %p\n", hkcr);
     if (res)
     {
         skip("HKCR key merging not supported\n");
@@ -2139,6 +2138,8 @@ static void test_classesroot(void)
         return;
     }

+    todo_wine ok(IS_HKCR(hkcr), "hkcr mask not set in %p\n", hkcr);
+
     /* set a value in user's classes */
     res = RegSetValueExA(hkey, "val1", 0, REG_SZ, (const BYTE *)"user", sizeof("user"));
     ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError());
@@ -2583,7 +2584,8 @@ static void test_classesroot_mask(void)

res = RegOpenKeyA( HKEY_CLASSES_ROOT, "CLSID", &hkey );
     ok(res == ERROR_SUCCESS, "RegOpenKeyA failed: %d\n", res);
-    todo_wine ok(IS_HKCR(hkey), "hkcr mask not set in %p\n", hkey);
+    todo_wine ok(IS_HKCR(hkey) || broken(!IS_HKCR(hkey)) /* WinNT */,
+                 "hkcr mask not set in %p\n", hkey);
     RegCloseKey( hkey );

res = RegOpenKeyA( HKEY_CURRENT_USER, "Software", &hkey );