msi: Use a more unique property separator.

This commit is contained in:
James Hawkins 2007-07-27 11:13:01 -07:00 committed by Alexandre Julliard
parent ac1f717ab8
commit 9089835c35
1 changed files with 10 additions and 6 deletions

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,9 @@ 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 +164,17 @@ static void set_deferred_action_props(MSIPACKAGE *package, LPWSTR deferred_data)
{
LPWSTR end, beg = deferred_data + 1;
end = strchrW(beg, ']');
static const WCHAR sep[] = {'<','=','>',0};
end = strstrW(beg, sep);
*end = '\0';
MSI_SetPropertyW(package, szActionData, beg);
beg = end + 2;
beg = end + 3;
end = strchrW(beg, ']');
end = strstrW(beg, sep);
*end = '\0';
MSI_SetPropertyW(package, UserSID, beg);
beg = end + 2;
beg = end + 3;
end = strchrW(beg, ']');
*end = '\0';