Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-07 09:53:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] reg: Fail if one or more arguments follow a help switch.

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

wine commit id 6c466296a7629487930d4d6e4fa7d7ae66a7bf61 by Hugh McMaster <hugh.mcmaster@outlook.com>

manual adjustment needed
This commit is contained in:
winesync 2022-01-16 21:22:50 +01:00 • committed by Thomas Csovcsity
parent 181292dc07
commit 67493a4006
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
base/applications/cmdutils/reg/reg.c
View file

@ -349,14 +349,12 @@ int __cdecl wmain(int argc, WCHAR *argvW[])
return 1; return 1;
} }
else if (argc == 2) /* Valid operation, no arguments supplied */ else if (argc == 2) /* Valid operation, no arguments supplied */
{ goto invalid;
output_message(STRING_INVALID_SYNTAX);
output_message(STRING_FUNC_HELP, _wcsupr(argvW[1]));
return 1;
}
if (is_help_switch(argvW[2])) if (is_help_switch(argvW[2]))
{ {
if (argc > 3) goto invalid;
output_message(op_help); output_message(op_help);
output_message(STRING_REG_VIEW_USAGE); output_message(STRING_REG_VIEW_USAGE);
return 0; return 0;
@ -378,4 +376,9 @@ int __cdecl wmain(int argc, WCHAR *argvW[])
return reg_import(argc, argvW); return reg_import(argc, argvW);
return reg_query(argc, argvW); return reg_query(argc, argvW);
invalid:
output_message(STRING_INVALID_SYNTAX);
output_message(STRING_FUNC_HELP, wcsupr(argvW[1]));
return 1;
} }

8
modules/rostests/winetests/reg/copy.c
View file

@ -37,16 +37,16 @@ static void test_command_syntax(void)
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);
run_reg_exe("reg copy /? /f", &r); run_reg_exe("reg copy /? /f", &r);
todo_wine 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);
run_reg_exe("reg copy /h /f", &r); run_reg_exe("reg copy /h /f", &r);
todo_wine 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);
run_reg_exe("reg copy /? /s", &r); run_reg_exe("reg copy /? /s", &r);
todo_wine 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);
run_reg_exe("reg copy /h /s", &r); run_reg_exe("reg copy /h /s", &r);
todo_wine 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);
run_reg_exe("reg copy /f", &r); run_reg_exe("reg copy /f", &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: ac32dd8abcdd93f5428ba93c8aff7f0bb5a7c2f2 wine: 6c466296a7629487930d4d6e4fa7d7ae66a7bf61