From 288718d8c3e656311593ac0cb1811d500f4c0f08 Mon Sep 17 00:00:00 2001
From: Hans Leidekker <hans@codeweavers.com>
Date: Wed, 23 Feb 2011 11:25:17 +0100
Subject: [PATCH] msi: A custom action dll failing to load is not a fatal
 error.

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

diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index c3f23027566..83a750dd578 100644
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -424,10 +424,7 @@ static MSIBINARY *create_temp_binary( MSIPACKAGE *package, LPCWSTR source, BOOL
     /* keep a reference to prevent the dll from being unloaded */
     if (dll && !(binary->module = LoadLibraryW( tmpfile )))
     {
-        ERR("failed to load dll %s (%u)\n", debugstr_w( tmpfile ), GetLastError() );
-        DeleteFileW( tmpfile );
-        msi_free( binary );
-        return NULL;
+        WARN( "failed to load dll %s (%u)\n", debugstr_w( tmpfile ), GetLastError() );
     }
     binary->source = strdupW( source );
     binary->tmpfile = strdupW( tmpfile );
@@ -720,8 +717,8 @@ static DWORD ACTION_CallDllFunction( const GUID *guid )
     hModule = LoadLibraryW( dll );
     if (!hModule)
     {
-        ERR("failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() );
-        return r;
+        WARN( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() );
+        return ERROR_SUCCESS;
     }
 
     proc = strdupWtoA( function );
-- 
2.11.4.GIT