system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 06:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

msi: Use a different separator as a semi-colon may separate values in the CustomActionData.

Browse source
This commit is contained in:
James Hawkins 2007-07-24 15:54:36 -07:00 committed by Alexandre Julliard
parent 85c5dcb13f
commit 6af199ef9c
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dlls/msi/custom.c
View file

@ -137,7 +137,7 @@ static BOOL check_execution_scheduling_options(MSIPACKAGE *package, LPCWSTR acti
/* stores the following properties before the action:
*
* [CustomActionData;UserSID;ProductCode]Action
* [CustomActionData][UserSID][ProductCode]Action
*/
static LPWSTR msi_get_deferred_action(LPCWSTR action, LPCWSTR actiondata,
LPCWSTR usersid, LPCWSTR prodcode)
@ -145,7 +145,7 @@ static LPWSTR msi_get_deferred_action(LPCWSTR action, LPCWSTR actiondata,
LPWSTR deferred;
DWORD len;
static const WCHAR format[] = {'[','%','s',';','%','s',';','%','s',']','%','s',0};
static const WCHAR format[] = {'[','%','s',']','[','%','s',']','[','%','s',']','%','s',0};
if (!actiondata)
return strdupW(action);
@ -162,15 +162,15 @@ static void set_deferred_action_props(MSIPACKAGE *package, LPWSTR deferred_data)
{
LPWSTR end, beg = deferred_data + 1;
end = strchrW(beg, ';');
end = strchrW(beg, ']');
*end = '\0';
MSI_SetPropertyW(package, szActionData, beg);
beg = end + 1;
beg = end + 2;
end = strchrW(beg, ';');
end = strchrW(beg, ']');
*end = '\0';
MSI_SetPropertyW(package, UserSID, beg);
beg = end + 1;
beg = end + 2;
end = strchrW(beg, ']');
*end = '\0';
@ -193,7 +193,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL
WCHAR *deformated=NULL;
/* deferred action: [properties]Action */
if ((ptr = strchrW(action_copy, ']')))
if ((ptr = strrchrW(action_copy, ']')))
{
deferred_data = action_copy;
action = ptr + 1;