[ros-diffs] [reactos] 39/158: [WINESYNC] reg: Use 'argvW' array naming in export.c.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb4f651902dda65cfde9d…

commit fb4f651902dda65cfde9d696d282e7addb366fe1
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Sun Jan 16 20:31:21 2022 +0100
Commit:     Thomas Csovcsity <thc.fr13nd(a)gmail.com>
CommitDate: Sun Jun 19 13:06:30 2022 +0200

    [WINESYNC] reg: Use 'argvW' array naming in export.c.
    
    Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id d37375e47033f92375ec4a431b5c3c2f28dd5829 by Hugh McMaster
<hugh.mcmaster(a)outlook.com>
    
    manual adjustment needed
---
 base/applications/cmdutils/reg/export.c | 10 +++++-----
 base/applications/cmdutils/reg/reg.h    |  2 +-
 sdk/tools/winesync/reg.cfg              |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/base/applications/cmdutils/reg/export.c
b/base/applications/cmdutils/reg/export.c
index 4e069bdda18..82bb64c24d8 100644
--- a/base/applications/cmdutils/reg/export.c
+++ b/base/applications/cmdutils/reg/export.c
@@ -360,7 +360,7 @@ static BOOL is_overwrite_switch(const WCHAR *s)
     return is_switch(s, 'y');
 }
 
-int reg_export(int argc, WCHAR *argv[])
+int reg_export(int argc, WCHAR *argvW[])
 {
     HKEY root, hkey;
     WCHAR *path, *long_key;
@@ -371,10 +371,10 @@ int reg_export(int argc, WCHAR *argv[])
     if (argc == 3 || argc > 5)
         goto error;
 
-    if (!parse_registry_key(argv[2], &root, &path, &long_key))
+    if (!parse_registry_key(argvW[2], &root, &path, &long_key))
         return 1;
 
-    if (argc == 5 && !(overwrite_file = is_overwrite_switch(argv[4])))
+    if (argc == 5 && !(overwrite_file = is_overwrite_switch(argvW[4])))
         goto error;
 
     if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey))
@@ -383,7 +383,7 @@ int reg_export(int argc, WCHAR *argv[])
         return 1;
     }
 
-    hFile = get_file_handle(argv[3], overwrite_file);
+    hFile = get_file_handle(argvW[3], overwrite_file);
     export_file_header(hFile);
     ret = export_registry_data(hFile, hkey, long_key);
     export_newline(hFile);
@@ -395,6 +395,6 @@ int reg_export(int argc, WCHAR *argv[])
 
 error:
     output_message(STRING_INVALID_SYNTAX);
-    output_message(STRING_FUNC_HELP, _wcsupr(argv[1]));
+    output_message(STRING_FUNC_HELP, _wcsupr(argvW[1]));
     return 1;
 }
diff --git a/base/applications/cmdutils/reg/reg.h b/base/applications/cmdutils/reg/reg.h
index 703dd0d37af..83bcf516297 100644
--- a/base/applications/cmdutils/reg/reg.h
+++ b/base/applications/cmdutils/reg/reg.h
@@ -53,7 +53,7 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR
*value_name,
                BOOL value_empty, BOOL value_all, BOOL force);
 
 /* export.c */
-int reg_export(int argc, WCHAR *argv[]);
+int reg_export(int argc, WCHAR *argvW[]);
 
 /* import.c */
 int reg_import(int argc, WCHAR *argvW[]);
diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg
index e1852985669..3020298c9f7 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: 4cbf47054fc7d95bcbab368fa53fc71908472309
+  wine: d37375e47033f92375ec4a431b5c3c2f28dd5829