https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9b91b795518169845e2d2…
commit 9b91b795518169845e2d261b45d1c69c5e084a45
Author: winesync <ros-dev(a)reactos.org>
AuthorDate: Sun Jan 16 20:35:55 2022 +0100
Commit: Thomas Csovcsity <thc.fr13nd(a)gmail.com>
CommitDate: Sun Jun 19 13:06:30 2022 +0200
[WINESYNC] reg: 'export' sorts before 'import'.
Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 42420f4d6c13cc4818e10c9b0cd9ee64c3715db3 by Hugh McMaster
<hugh.mcmaster(a)outlook.com>
---
base/applications/cmdutils/reg/reg.c | 12 ++++++------
sdk/tools/winesync/reg.cfg | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/base/applications/cmdutils/reg/reg.c b/base/applications/cmdutils/reg/reg.c
index 8a27756b974..e993c8098d3 100644
--- a/base/applications/cmdutils/reg/reg.c
+++ b/base/applications/cmdutils/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 }
};
@@ -390,12 +390,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;
diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg
index 3020298c9f7..b38542e94ab 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: d37375e47033f92375ec4a431b5c3c2f28dd5829
+ wine: 42420f4d6c13cc4818e10c9b0cd9ee64c3715db3