Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 10:23:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] reg: Move 'import' syntax checks to reg_import().

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

wine commit id 4cbf47054fc7d95bcbab368fa53fc71908472309 by Hugh McMaster <hugh.mcmaster@outlook.com>
This commit is contained in:
winesync 2022-01-16 20:31:21 +01:00 • committed by Thomas Csovcsity
parent f16c791548
commit b4d8b76a2f
4 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
base/applications/cmdutils/reg/import.c
View file

@ -983,13 +983,22 @@ cleanup:
return NULL; return NULL;
} }
int reg_import(const WCHAR *filename) int reg_import(int argc, WCHAR *argvW[])
{ {
WCHAR *filename, *pos;
FILE *fp; FILE *fp;
static const WCHAR rb_mode[] = {'r','b',0}; static const WCHAR rb_mode[] = {'r','b',0};
BYTE s[2]; BYTE s[2];
struct parser parser; struct parser parser;
WCHAR *pos;
if (argc > 3)
{
output_message(STRING_INVALID_SYNTAX);
output_message(STRING_FUNC_HELP, wcsupr(argvW[1]));
return 1;
}
filename = argvW[2];
fp = _wfopen(filename, rb_mode); fp = _wfopen(filename, rb_mode);
if (!fp) if (!fp)

9
base/applications/cmdutils/reg/reg.c
View file

@ -390,15 +390,8 @@ int __cdecl wmain(int argc, WCHAR *argvW[])
return 0; return 0;
} }
if (op == REG_IMPORT && argc > 3)
{
output_message(STRING_INVALID_SYNTAX);
output_message(STRING_FUNC_HELP, wcsupr(argvW[1]));
return 1;
}
if (op == REG_IMPORT) if (op == REG_IMPORT)
return reg_import(argvW[2]); return reg_import(argc, argvW);
if (op == REG_EXPORT) if (op == REG_EXPORT)
return reg_export(argc, argvW); return reg_export(argc, argvW);

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

@ -56,7 +56,7 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name,
int reg_export(int argc, WCHAR *argv[]); int reg_export(int argc, WCHAR *argv[]);
/* import.c */ /* import.c */
int reg_import(const WCHAR *filename); int reg_import(int argc, WCHAR *argvW[]);
/* query.c */ /* query.c */
int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name,

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