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

[WINESYNC] reg: Simplify basic syntax checks.

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

wine commit id 8801118e384b7388a0fa5c43b5540bfd7f257ab6 by Hugh McMaster <hugh.mcmaster@outlook.com>

manual adjustments needed
This commit is contained in:
winesync 2022-01-16 20:25:19 +01:00 • committed by Thomas Csovcsity
parent 01c1091e51
commit f16c791548
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -349,7 +349,6 @@ static enum operations get_operation(const WCHAR *str, int *op_help)
int __cdecl wmain(int argc, WCHAR *argvW[]) int __cdecl wmain(int argc, WCHAR *argvW[])
{ {
int i, op, op_help, ret; int i, op, op_help, ret;
BOOL show_op_help = FALSE;
static const WCHAR switchVAW[] = {'v','a',0}; static const WCHAR switchVAW[] = {'v','a',0};
static const WCHAR switchVEW[] = {'v','e',0}; static const WCHAR switchVEW[] = {'v','e',0};
WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0';
@ -378,21 +377,26 @@ int __cdecl wmain(int argc, WCHAR *argvW[])
return 1; return 1;
} }
if (argc > 2) else if (argc == 2) /* Valid operation, no arguments supplied */
show_op_help = is_help_switch(argvW[2]);
if (argc == 2 || ((show_op_help || op == REG_IMPORT) && argc > 3))
{ {
output_message(STRING_INVALID_SYNTAX); output_message(STRING_INVALID_SYNTAX);
output_message(STRING_FUNC_HELP, _wcsupr(argvW[1])); output_message(STRING_FUNC_HELP, _wcsupr(argvW[1]));
return 1; return 1;
} }
else if (show_op_help)
if (is_help_switch(argvW[2]))
{ {
output_message(op_help); output_message(op_help);
return 0; return 0;
} }
if (op == REG_IMPORT && argc > 3)
{
output_message(STRING_INVALID_SYNTAX);
output_message(STRING_FUNC_HELP, wcsupr(argvW[1]));
return 1;
}
if (op == REG_IMPORT) if (op == REG_IMPORT)
return reg_import(argvW[2]); return reg_import(argvW[2]);

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: 7803c53cfe6635a5d3e0d9f58e743235746ec9d2 wine: 8801118e384b7388a0fa5c43b5540bfd7f257ab6