msi: A custom action dll failing to load is not a fatal error.

Hans Leidekker hans at codeweavers.com
Wed Feb 23 04:25:17 CST 2011


See http://bugs.winehq.org/show_bug.cgi?id=26162
---
 dlls/msi/custom.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index c3f2302..83a750d 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 );
-- 
1.7.1






More information about the wine-patches mailing list