Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] reg/tests: Ensure test key is fully removed before each sequence begins.

Browse source 
Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 405853adb53695c0fd3f7d38ac733dd6900a48dd by Hugh McMaster <hugh.mcmaster@outlook.com>
This commit is contained in:
winesync 2022-01-16 14:51:45 +01:00 committed by Thomas Csovcsity
parent e163213a0f
commit 855cf07c70
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
modules/rostests/winetests/reg/reg.c
View file

@ -222,6 +222,9 @@ static void test_add(void)
DWORD r, dword, type, size; DWORD r, dword, type, size;
char buffer[22]; char buffer[22];
delete_tree(HKEY_CURRENT_USER, KEY_BASE);
verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE);
run_reg_exe("reg add", &r); run_reg_exe("reg add", &r);
ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
@ -234,11 +237,6 @@ static void test_add(void)
run_reg_exe("reg add -H", &r); run_reg_exe("reg add -H", &r);
ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err);
verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE);
run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r);
ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
@ -602,12 +600,11 @@ static void test_add(void)
static void test_delete(void) static void test_delete(void)
{ {
HKEY hkey, hsubkey; HKEY hkey, hsubkey;
LONG err;
DWORD r; DWORD r;
const DWORD deadbeef = 0xdeadbeef; const DWORD deadbeef = 0xdeadbeef;
err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); delete_tree(HKEY_CURRENT_USER, KEY_BASE);
ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE);
run_reg_exe("reg delete", &r); run_reg_exe("reg delete", &r);
ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
@ -664,8 +661,8 @@ static void test_query(void)
const DWORD dword1 = 0x123; const DWORD dword1 = 0x123;
const DWORD dword2 = 0xabc; const DWORD dword2 = 0xabc;
err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); delete_tree(HKEY_CURRENT_USER, KEY_BASE);
ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE);
run_reg_exe("reg query", &r); run_reg_exe("reg query", &r);
ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
@ -858,8 +855,8 @@ static void test_import(void)
LONG err; LONG err;
BYTE hex[8]; BYTE hex[8];
err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); delete_tree(HKEY_CURRENT_USER, KEY_BASE);
ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE);
run_reg_exe("reg import", &r); run_reg_exe("reg import", &r);
ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
@ -2387,8 +2384,8 @@ static void test_unicode_import(void)
char buffer[24]; char buffer[24];
BYTE hex[8]; BYTE hex[8];
err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); delete_tree(HKEY_CURRENT_USER, KEY_BASE);
ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE);
test_import_wstr("REGEDIT\n", &r); test_import_wstr("REGEDIT\n", &r);
ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */,
@ -3910,8 +3907,8 @@ static void test_import_with_whitespace(void)
DWORD r, dword; DWORD r, dword;
LONG err; LONG err;
err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); delete_tree(HKEY_CURRENT_USER, KEY_BASE);
ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE);
test_import_str(" REGEDIT4\n\n" test_import_str(" REGEDIT4\n\n"
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r);
@ -4058,8 +4055,8 @@ static void test_unicode_import_with_whitespace(void)
DWORD r, dword; DWORD r, dword;
LONG err; LONG err;
err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); delete_tree(HKEY_CURRENT_USER, KEY_BASE);
ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE);
test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n"
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r);
@ -4453,8 +4450,8 @@ static void test_export(void)
"\"Wine4g\"=\"Value2\"\r\n" "\"Wine4g\"=\"Value2\"\r\n"
"\"Wine4h\"=\"abc\"\r\n\r\n"; "\"Wine4h\"=\"abc\"\r\n\r\n";
err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); delete_tree(HKEY_CURRENT_USER, KEY_BASE);
ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE);
run_reg_exe("reg export", &r); run_reg_exe("reg export", &r);
ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
@ -4691,6 +4688,9 @@ static void test_copy(void)
{ {
DWORD r; DWORD r;
delete_tree(HKEY_CURRENT_USER, KEY_BASE);
verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE);
run_reg_exe("reg copy", &r); run_reg_exe("reg copy", &r);
ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);

2
sdk/tools/winesync/reg.cfg
View file

@ -4,4 +4,4 @@ directories:
files: files:
programs/reg/resource.h: base/applications/cmdutils/reg/resource.h programs/reg/resource.h: base/applications/cmdutils/reg/resource.h
tags: tags:
wine: add814af3eb7368961fe5b37a66c616e4bd97e4b wine: 405853adb53695c0fd3f7d38ac733dd6900a48dd