James Hawkins : msi: Send the expected data to set_deferred_action_props.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Jun 19 06:42:18 CDT 2007


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

Author: James Hawkins <truiken at gmail.com>
Date:   Mon Jun 18 09:40:34 2007 -0700

msi: Send the expected data to set_deferred_action_props.

---

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

diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index c89acbf..af9c8dc 100644
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -157,7 +157,7 @@ static LPWSTR msi_get_deferred_action(LPCWSTR action, LPCWSTR actiondata,
 
 static void set_deferred_action_props(MSIPACKAGE *package, LPWSTR deferred_data)
 {
-    LPWSTR end, beg = deferred_data;
+    LPWSTR end, beg = deferred_data + 1;
 
     end = strchrW(beg, ';');
     *end = '\0';
@@ -189,11 +189,10 @@ UINT ACTION_CustomAction(MSIPACKAGE *package,LPCWSTR action, BOOL execute)
     LPWSTR action_copy = strdupW(action);
     WCHAR *deformated=NULL;
 
-    /* deferred action: [CustomActionData]Action */
+    /* deferred action: [properties]Action */
     if ((ptr = strchrW(action_copy, ']')))
     {
-        deferred_data = action_copy + 1;
-        *ptr = '\0';
+        deferred_data = action_copy;
         action = ptr + 1;
     }
 




More information about the wine-cvs mailing list