Hans Leidekker : msi: A custom action dll failing to load is not a fatal error.
Alexandre Julliard
julliard at winehq.org
Wed Feb 23 13:01:52 CST 2011
Module: wine
Branch: master
Commit: 288718d8c3e656311593ac0cb1811d500f4c0f08
URL: http://source.winehq.org/git/wine.git/?a=commit;h=288718d8c3e656311593ac0cb1811d500f4c0f08
Author: Hans Leidekker <hans at codeweavers.com>
Date: Wed Feb 23 11:25:17 2011 +0100
msi: A custom action dll failing to load is not a fatal error.
---
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 );
More information about the wine-cvs
mailing list