ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

advapi32/tests: HKCR mask tests fix for WinNT.

This commit is contained in:
George Stephanos 2013-08-30 00:15:56 +02:00 committed by Alexandre Julliard
parent 478db5bcd5
commit 8aa205fbcf
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/advapi32/tests/registry.c
View File

@ -2130,7 +2130,6 @@ static void test_classesroot(void)
todo_wine ok(res == ERROR_SUCCESS || todo_wine ok(res == ERROR_SUCCESS ||
broken(res == ERROR_FILE_NOT_FOUND /* WinNT */), broken(res == ERROR_FILE_NOT_FOUND /* WinNT */),
"test key not found in hkcr: %d\n", res); "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) if (res)
{ {
skip("HKCR key merging not supported\n"); skip("HKCR key merging not supported\n");
@ -2139,6 +2138,8 @@ static void test_classesroot(void)
return; return;
} }
todo_wine ok(IS_HKCR(hkcr), "hkcr mask not set in %p\n", hkcr);
/* set a value in user's classes */ /* set a value in user's classes */
res = RegSetValueExA(hkey, "val1", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); res = RegSetValueExA(hkey, "val1", 0, REG_SZ, (const BYTE *)"user", sizeof("user"));
ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); 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 ); res = RegOpenKeyA( HKEY_CLASSES_ROOT, "CLSID", &hkey );
ok(res == ERROR_SUCCESS, "RegOpenKeyA failed: %d\n", res); 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 ); RegCloseKey( hkey );
res = RegOpenKeyA( HKEY_CURRENT_USER, "Software", &hkey ); res = RegOpenKeyA( HKEY_CURRENT_USER, "Software", &hkey );