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

[WINESYNC] reg: Use 'argvW' array naming in export.c.

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

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

manual adjustment needed
This commit is contained in:
winesync 2022-01-16 20:31:21 +01:00 • committed by Thomas Csovcsity
parent b4d8b76a2f
commit fb4f651902
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
base/applications/cmdutils/reg/export.c
View file

@ -360,7 +360,7 @@ static BOOL is_overwrite_switch(const WCHAR *s)
return is_switch(s, 'y'); return is_switch(s, 'y');
} }
int reg_export(int argc, WCHAR *argv[]) int reg_export(int argc, WCHAR *argvW[])
{ {
HKEY root, hkey; HKEY root, hkey;
WCHAR *path, *long_key; WCHAR *path, *long_key;
@ -371,10 +371,10 @@ int reg_export(int argc, WCHAR *argv[])
if (argc == 3 || argc > 5) if (argc == 3 || argc > 5)
goto error; goto error;
if (!parse_registry_key(argv[2], &root, &path, &long_key)) if (!parse_registry_key(argvW[2], &root, &path, &long_key))
return 1; return 1;
if (argc == 5 && !(overwrite_file = is_overwrite_switch(argv[4]))) if (argc == 5 && !(overwrite_file = is_overwrite_switch(argvW[4])))
goto error; goto error;
if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey)) if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey))
@ -383,7 +383,7 @@ int reg_export(int argc, WCHAR *argv[])
return 1; return 1;
} }
hFile = get_file_handle(argv[3], overwrite_file); hFile = get_file_handle(argvW[3], overwrite_file);
export_file_header(hFile); export_file_header(hFile);
ret = export_registry_data(hFile, hkey, long_key); ret = export_registry_data(hFile, hkey, long_key);
export_newline(hFile); export_newline(hFile);
@ -395,6 +395,6 @@ int reg_export(int argc, WCHAR *argv[])
error: error:
output_message(STRING_INVALID_SYNTAX); output_message(STRING_INVALID_SYNTAX);
output_message(STRING_FUNC_HELP, _wcsupr(argv[1])); output_message(STRING_FUNC_HELP, _wcsupr(argvW[1]));
return 1; return 1;
} }

2
base/applications/cmdutils/reg/reg.h
View file

@ -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); BOOL value_empty, BOOL value_all, BOOL force);
/* export.c */ /* export.c */
int reg_export(int argc, WCHAR *argv[]); int reg_export(int argc, WCHAR *argvW[]);
/* import.c */ /* import.c */
int reg_import(int argc, WCHAR *argvW[]); int reg_import(int argc, WCHAR *argvW[]);

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: 4cbf47054fc7d95bcbab368fa53fc71908472309 wine: d37375e47033f92375ec4a431b5c3c2f28dd5829