Skip to content

W
wine-cw
Commit 6ad44d7a authored by Hugh McMaster's avatar Hugh McMaster Committed by Alexandre Julliard
Browse files
Options

regedit: Process the next file, if any, on error.

Signed-off-by: 's avatarHugh McMaster <hugh.mcmaster@outlook.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 221bb0f7
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
programs/regedit/regedit.c
View file @ 6ad44d7a
......@@ -88,7 +88,7 @@ typedef enum {
ACTION_ADD, ACTION_EXPORT, ACTION_DELETE
} REGEDIT_ACTION;
static BOOL PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i)
static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i)
{
switch (action) {
case ACTION_ADD: {
......@@ -113,7 +113,8 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i)
if (size == 0)
{
output_message(STRING_FILE_NOT_FOUND, filename);
exit(1);
HeapFree(GetProcessHeap(), 0, realname);
return;
}
reg_file = _wfopen(realname, rb_mode);
if (reg_file == NULL)
......@@ -121,7 +122,8 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i)
WCHAR regedit[] = {'r','e','g','e','d','i','t',0};
_wperror(regedit);
output_message(STRING_CANNOT_OPEN_FILE, filename);
exit(1);
HeapFree(GetProcessHeap(), 0, realname);
return;
}
import_registry_file(reg_file);
if (realname)
......@@ -150,7 +152,6 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i)
exit(1);
break;
}
return TRUE;
}
BOOL ProcessCmdLine(WCHAR *cmdline)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment