ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Release msi_custom_action_info when no longer needed.

This commit is contained in:
Hib Eris 2009-06-21 19:48:11 +02:00 committed by Alexandre Julliard
parent 65ac206194
commit e86ebd75b0
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/msi/custom.c
View File

@ -888,7 +888,9 @@ static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source,
info = do_msidbCustomActionTypeDll( package, type, tmp_file, target, action ); info = do_msidbCustomActionTypeDll( package, type, tmp_file, target, action );
return wait_thread_handle( info ); r = wait_thread_handle( info );
release_custom_action_data( info );
return r;
} }
static UINT HANDLE_CustomType2(MSIPACKAGE *package, LPCWSTR source, static UINT HANDLE_CustomType2(MSIPACKAGE *package, LPCWSTR source,
@ -1167,9 +1169,7 @@ static DWORD ACTION_CallScript( const GUID *guid )
else else
ERR("failed to create handle for %p\n", info->package ); ERR("failed to create handle for %p\n", info->package );
if (info->type & msidbCustomActionTypeAsync && release_custom_action_data( info );
info->type & msidbCustomActionTypeContinue)
release_custom_action_data( info );
return S_OK; return S_OK;
} }
@ -1226,13 +1226,16 @@ static msi_custom_action_info *do_msidbCustomActionTypeScript(
static UINT HANDLE_CustomType37_38(MSIPACKAGE *package, LPCWSTR source, static UINT HANDLE_CustomType37_38(MSIPACKAGE *package, LPCWSTR source,
LPCWSTR target, const INT type, LPCWSTR action) LPCWSTR target, const INT type, LPCWSTR action)
{ {
UINT r;
msi_custom_action_info *info; msi_custom_action_info *info;
TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); TRACE("%s %s\n", debugstr_w(source), debugstr_w(target));
info = do_msidbCustomActionTypeScript( package, type, target, NULL, action ); info = do_msidbCustomActionTypeScript( package, type, target, NULL, action );
return wait_thread_handle( info ); r = wait_thread_handle( info );
release_custom_action_data( info );
return r;
} }
static UINT HANDLE_CustomType5_6(MSIPACKAGE *package, LPCWSTR source, static UINT HANDLE_CustomType5_6(MSIPACKAGE *package, LPCWSTR source,
@ -1277,6 +1280,7 @@ static UINT HANDLE_CustomType5_6(MSIPACKAGE *package, LPCWSTR source,
info = do_msidbCustomActionTypeScript( package, type, bufferw, target, action ); info = do_msidbCustomActionTypeScript( package, type, bufferw, target, action );
r = wait_thread_handle( info ); r = wait_thread_handle( info );
release_custom_action_data( info );
done: done:
msi_free(bufferw); msi_free(bufferw);