Module: wine Branch: master Commit: bd3885946c20be13cc2f96d2bdd8bd5490ddc1da URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd3885946c20be13cc2f96d2bd...
Author: Hans Leidekker hans@codeweavers.com Date: Fri Sep 9 11:01:12 2011 +0200
msi: Return the right error from ResolveSource when the user cancels.
---
dlls/msi/action.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4c857f9..69384be 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5149,11 +5149,11 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) msg = msi_build_error_string(package, 1302, 1, prompt); while(attrib == INVALID_FILE_ATTRIBUTES) { - rc = MessageBoxW(NULL,msg,NULL,MB_OKCANCEL); + rc = MessageBoxW(NULL, msg, NULL, MB_OKCANCEL); if (rc == IDCANCEL) { - rc = ERROR_INSTALL_USEREXIT; - break; + msi_free(prompt); + return ERROR_INSTALL_USEREXIT; } attrib = GetFileAttributesW(package->db->path); }