Hans Leidekker : msi: Don't hide failure of script custom actions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 022915f75b4fdda9fc3f875c74269d137429a19f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=022915f75b4fdda9fc3f875c74...

Author: Hans Leidekker 
Date:   Tue May 15 09:39:41 2012 +0200

msi: Don't hide failure of script custom actions.

---

dlls/msi/custom.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index 9e50035..c1aa627 100644
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -957,7 +957,7 @@ static DWORD ACTION_CallScript( const GUID *guid )
 {
     msi_custom_action_info *info;
     MSIHANDLE hPackage;
-    UINT r;
+    UINT r = ERROR_FUNCTION_FAILED;

info = find_action_by_guid( guid );
     if (!info)
@@ -979,13 +979,13 @@ static DWORD ACTION_CallScript( const GUID *guid )
         ERR("failed to create handle for %p\n", info->package );

release_custom_action_data( info );
-    return S_OK;
+    return r;
 }

static DWORD WINAPI ScriptThread( LPVOID arg )
 {
     LPGUID guid = arg;
-    DWORD rc = 0;
+    DWORD rc;

TRACE("custom action (%x) started\n", GetCurrentThreadId() );