https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54f7d655e487a2a71658d68a61e92afcb17ad965
commit 54f7d655e487a2a71658d68a61e92afcb17ad965 Author: winesync <[email protected]> AuthorDate: Mon Jan 17 18:47:38 2022 +0100 Commit: Thomas Csovcsity <[email protected]> CommitDate: Sun Jun 19 13:06:39 2022 +0200 [WINESYNC] reg/tests: Split 'export' syntax tests into a separate function. Signed-off-by: Hugh McMaster <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 959ea6677ea0571c5042a5ec5bec33fb5a5f1dc6 by Hugh McMaster <[email protected]> --- modules/rostests/winetests/reg/export.c | 19 ++++++++++++++----- sdk/tools/winesync/reg.cfg | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/modules/rostests/winetests/reg/export.c b/modules/rostests/winetests/reg/export.c index 79135b0efb0..31a75566fae 100644 --- a/modules/rostests/winetests/reg/export.c +++ b/modules/rostests/winetests/reg/export.c @@ -168,12 +168,9 @@ const char *escaped_null_test = /* Unit tests */ -static void test_export(void) +static void test_command_syntax(void) { - LONG err; - DWORD r, dword, type, size; - HKEY hkey, subkey; - BYTE hex[4], buffer[8]; + DWORD r; delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); @@ -210,6 +207,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE, &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + /* This test fails because the registry key doesn't exist */ run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -224,6 +222,16 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /reg:64 /reg:64", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + +static void test_export(void) +{ + LONG err; + DWORD r, dword, type, size; + HKEY hkey, subkey; + BYTE hex[4], buffer[8]; + + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); /* Test registry export with an empty key */ add_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); @@ -591,6 +599,7 @@ START_TEST(export) return; } + test_command_syntax(); test_export(); /* Check if reg.exe is running with elevated privileges */ diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg index 40ff996b768..db8e2db9535 100644 --- a/sdk/tools/winesync/reg.cfg +++ b/sdk/tools/winesync/reg.cfg @@ -4,4 +4,4 @@ directories: files: programs/reg/resource.h: base/applications/cmdutils/reg/resource.h tags: - wine: fee692178cebd33220027ad6038f6acd8185b77f + wine: 959ea6677ea0571c5042a5ec5bec33fb5a5f1dc6
