James Hawkins : msi: Free the custom action data after the thread function executes.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Feb 26 07:59:30 CST 2007


Module: wine
Branch: master
Commit: 747f19f01196cba5a24a1f60a306f815ef4763b0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=747f19f01196cba5a24a1f60a306f815ef4763b0

Author: James Hawkins <truiken at gmail.com>
Date:   Sat Feb 24 23:06:54 2007 -0600

msi: Free the custom action data after the thread function executes.

---

 dlls/msi/custom.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index ba5c825..c6c07cf 100644
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -452,9 +452,6 @@ static UINT wait_thread_handle( msi_custom_action_info *info )
     else
     {
         TRACE("%s running in background\n", debugstr_w( info->action ));
-
-        if (info->type & msidbCustomActionTypeContinue)
-            free_custom_action_data( info );
     }
 
     return rc;
@@ -529,6 +526,10 @@ static DWORD WINAPI ACTION_CallDllFunction( const LPGUID guid )
 
     FreeLibrary(hModule);
 
+    if (info->type & msidbCustomActionTypeAsync &&
+        info->type & msidbCustomActionTypeContinue)
+        free_custom_action_data( info );
+
     return r;
 }
 




More information about the wine-cvs mailing list