Hugh McMaster : reg: 'export' sorts before 'import'.
Alexandre Julliard
julliard at winehq.org
Thu Mar 18 16:43:54 CDT 2021
Module: wine
Branch: master
Commit: 42420f4d6c13cc4818e10c9b0cd9ee64c3715db3
URL: https://source.winehq.org/git/wine.git/?a=commit;h=42420f4d6c13cc4818e10c9b0cd9ee64c3715db3
Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date: Thu Mar 18 22:36:53 2021 +1100
reg: 'export' sorts before 'import'.
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/reg/reg.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/programs/reg/reg.c b/programs/reg/reg.c
index daeec5f5718..309d855e996 100644
--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -306,8 +306,8 @@ static BOOL is_help_switch(const WCHAR *s)
enum operations {
REG_ADD,
REG_DELETE,
- REG_IMPORT,
REG_EXPORT,
+ REG_IMPORT,
REG_QUERY,
REG_INVALID
};
@@ -318,16 +318,16 @@ static enum operations get_operation(const WCHAR *str, int *op_help)
static const WCHAR add[] = {'a','d','d',0};
static const WCHAR delete[] = {'d','e','l','e','t','e',0};
- static const WCHAR import[] = {'i','m','p','o','r','t',0};
static const WCHAR export[] = {'e','x','p','o','r','t',0};
+ static const WCHAR import[] = {'i','m','p','o','r','t',0};
static const WCHAR query[] = {'q','u','e','r','y',0};
static const struct op_info op_array[] =
{
{ add, REG_ADD, STRING_ADD_USAGE },
{ delete, REG_DELETE, STRING_DELETE_USAGE },
- { import, REG_IMPORT, STRING_IMPORT_USAGE },
{ export, REG_EXPORT, STRING_EXPORT_USAGE },
+ { import, REG_IMPORT, STRING_IMPORT_USAGE },
{ query, REG_QUERY, STRING_QUERY_USAGE },
{ NULL, -1, 0 }
};
@@ -389,12 +389,12 @@ int __cdecl wmain(int argc, WCHAR *argvW[])
return 0;
}
- if (op == REG_IMPORT)
- return reg_import(argc, argvW);
-
if (op == REG_EXPORT)
return reg_export(argc, argvW);
+ if (op == REG_IMPORT)
+ return reg_import(argc, argvW);
+
if (!parse_registry_key(argvW[2], &root, &path, &key_name))
return 1;
More information about the wine-cvs
mailing list