[PATCH] msi: Complain louder if we can't find a custom action DLL or EXE.
Zebediah Figura
z.figura12 at gmail.com
Mon Dec 4 12:41:15 CST 2017
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
Cursory testing also seems to show that we shouldn't be returning success in
the case that we fail to load a DLL, but more thorough testing will be needed
in order not to trigger bug #26162.
dlls/msi/custom.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index 02c3440..2570fe2 100644
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -263,7 +263,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 )))
{
- WARN( "failed to load dll %s (%u)\n", debugstr_w( tmpfile ), GetLastError() );
+ ERR( "failed to load dll %s (%u)\n", debugstr_w( tmpfile ), GetLastError() );
}
binary->source = strdupW( source );
binary->tmpfile = tmpfile;
@@ -567,7 +567,7 @@ static DWORD ACTION_CallDllFunction( const GUID *guid )
hModule = LoadLibraryW( dll );
if (!hModule)
{
- WARN( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() );
+ ERR( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() );
return ERROR_SUCCESS;
}
@@ -700,7 +700,7 @@ static HANDLE execute_command( const WCHAR *app, WCHAR *arg, const WCHAR *dir )
}
if (!len_exe)
{
- WARN("can't find executable %u\n", GetLastError());
+ ERR("can't find executable %u\n", GetLastError());
msi_free( exe );
return INVALID_HANDLE_VALUE;
}
@@ -738,7 +738,7 @@ static HANDLE execute_command( const WCHAR *app, WCHAR *arg, const WCHAR *dir )
msi_free( exe );
if (!ret)
{
- WARN("unable to execute command %u\n", GetLastError());
+ ERR("unable to execute command %u\n", GetLastError());
return INVALID_HANDLE_VALUE;
}
CloseHandle( info.hThread );
--
2.7.4
More information about the wine-devel
mailing list