system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 11:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

msi: Fix memory leaks.

Browse source 
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2018-10-12 16:44:02 +02:00 committed by Alexandre Julliard
parent 66e0e07152
commit 965ca1b4de
1 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
dlls/msi/custom.c
View file

@ -538,46 +538,49 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid)
if (r != ERROR_SUCCESS)
return r;
hPackage = alloc_msi_remote_handle( remote_package );
if (!hPackage)
{
ERR( "failed to create handle for %x\n", remote_package );
midl_user_free( dll );
midl_user_free( proc );
return ERROR_INSTALL_FAILURE;
}
hModule = LoadLibraryW( dll );
if (!hModule)
{
ERR( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() );
midl_user_free( dll );
midl_user_free( proc );
MsiCloseHandle( hPackage );
return ERROR_SUCCESS;
}
fn = (MsiCustomActionEntryPoint) GetProcAddress( hModule, proc );
if (fn)
{
hPackage = alloc_msi_remote_handle( remote_package );
if (hPackage)
{
TRACE("calling %s\n", debugstr_a(proc));
handle_msi_break(proc);
__TRY
{
r = custom_proc_wrapper(fn, hPackage);
}
__EXCEPT_PAGE_FAULT
{
ERR("Custom action (%s:%s) caused a page fault: %08x\n",
debugstr_w(dll), debugstr_a(proc), GetExceptionCode());
r = ERROR_SUCCESS;
}
__ENDTRY;
MsiCloseHandle( hPackage );
}
else
ERR("failed to create handle for %x\n", remote_package );
}
if (!fn) WARN( "GetProcAddress(%s) failed\n", debugstr_a(proc) );
else
ERR("GetProcAddress(%s) failed\n", debugstr_a(proc));
{
handle_msi_break(proc);
__TRY
{
r = custom_proc_wrapper( fn, hPackage );
}
__EXCEPT_PAGE_FAULT
{
ERR( "Custom action (%s:%s) caused a page fault: %08x\n",
debugstr_w(dll), debugstr_a(proc), GetExceptionCode() );
r = ERROR_SUCCESS;
}
__ENDTRY;
}
FreeLibrary(hModule);
midl_user_free(dll);
midl_user_free(proc);
MsiCloseHandle(hPackage);
return r;
}