Hugh McMaster : regedit: Process the next file, if any, on error.
Alexandre Julliard
julliard at winehq.org
Tue Jul 5 11:07:51 CDT 2016
Module: wine
Branch: master
Commit: 6ad44d7a3190d8e9a3daa9bd723980e5c4320b42
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad44d7a3190d8e9a3daa9bd723980e5c4320b42
Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date: Tue Jul 5 09:13:35 2016 +0000
regedit: Process the next file, if any, on error.
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/regedit/regedit.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c
index 04dd317..c37f695 100644
--- a/programs/regedit/regedit.c
+++ b/programs/regedit/regedit.c
@@ -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)
More information about the wine-cvs
mailing list