Zebediah Figura : msi: Don' t queue a parent dialog to be shown in EndDialog.
Alexandre Julliard
julliard at winehq.org
Fri Jul 21 14:09:19 CDT 2017
Module: wine
Branch: master
Commit: 14f865e14fc6f290d392c6c847d2841dcc6ba96e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f865e14fc6f290d392c6c847d2841dcc6ba96e
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Thu Jul 20 23:43:14 2017 -0500
msi: Don't queue a parent dialog to be shown in EndDialog.
When using "Return", the parent dialog already exists, so there is
no need to do this. Moreover, if the parent dialog is queued, a
subsequent "Exit" would not properly exit the parent dialog.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msi/dialog.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 6b57606..a5b839d 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -4381,12 +4381,7 @@ static UINT event_end_dialog( msi_dialog *dialog, const WCHAR *argument )
else if (!strcmpW( argument, ignoreW ))
dialog->package->CurrentInstallState = ERROR_SUCCESS;
else if (!strcmpW( argument, returnW ))
- {
- msi_dialog *parent = dialog->parent;
- msi_free( dialog->package->next_dialog );
- dialog->package->next_dialog = (parent) ? strdupW( parent->name ) : NULL;
dialog->package->CurrentInstallState = ERROR_SUCCESS;
- }
else
{
ERR("Unknown argument string %s\n", debugstr_w(argument));
More information about the wine-cvs
mailing list