Hugh McMaster : reg: Make help for registry operations common in wmain.
Alexandre Julliard
julliard at winehq.org
Fri Jun 3 10:03:46 CDT 2016
Module: wine
Branch: master
Commit: 2864105ef59e62692cd97ce23574c3606dff4c67
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2864105ef59e62692cd97ce23574c3606dff4c67
Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date: Fri Jun 3 05:24:00 2016 +0000
reg: Make help for registry operations common in wmain.
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/reg/reg.c | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/programs/reg/reg.c b/programs/reg/reg.c
index 417fe88..92f6428 100644
--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -956,18 +956,22 @@ int wmain(int argc, WCHAR *argvW[])
output_message(STRING_FUNC_HELP, struprW(argvW[1]));
return 1;
}
+ else if (show_op_help)
+ {
+ if (op == REG_ADD)
+ output_message(STRING_ADD_USAGE);
+ else if (op == REG_DELETE)
+ output_message(STRING_DELETE_USAGE);
+ else
+ output_message(STRING_QUERY_USAGE);
+ return 0;
+ }
if (op == REG_ADD)
{
WCHAR *key_name, *value_name = NULL, *type = NULL, separator = '\0', *data = NULL;
BOOL value_empty = FALSE, force = FALSE;
- if (show_op_help)
- {
- output_message(STRING_ADD_USAGE);
- return 0;
- }
-
key_name = argvW[2];
for (i = 1; i < argc; i++)
{
@@ -1013,12 +1017,6 @@ int wmain(int argc, WCHAR *argvW[])
WCHAR *key_name, *value_name = NULL;
BOOL value_empty = FALSE, value_all = FALSE, force = FALSE;
- if (show_op_help)
- {
- output_message(STRING_DELETE_USAGE);
- return 0;
- }
-
key_name = argvW[2];
for (i = 1; i < argc; i++)
{
@@ -1044,12 +1042,6 @@ int wmain(int argc, WCHAR *argvW[])
WCHAR *key_name, *value_name = NULL;
BOOL value_empty = FALSE, recurse = FALSE;
- if (show_op_help)
- {
- output_message(STRING_QUERY_USAGE);
- return 0;
- }
-
key_name = argvW[2];
for (i = 1; i < argc; i++)
{
More information about the wine-cvs
mailing list