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

msi: Handle non-null product code in MSI_ApplyPatchW.

This commit is contained in:
Hans Leidekker 2010-05-04 09:07:23 +02:00 committed by Alexandre Julliard
parent 25460075cc
commit 74641ab8db
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/msi/msi.c
View File

@ -359,21 +359,27 @@ static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWS
lstrcatW(cmd, patcheq);
lstrcatW(cmd, szPatchPackage);
beg = codes;
while ((end = strchrW(beg, '}')))
if (szProductCode)
r = MsiConfigureProductExW(szProductCode, INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT, cmd);
else
{
*(end + 1) = '\0';
r = MsiConfigureProductExW(beg, INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT, cmd);
if (r == ERROR_SUCCESS)
beg = codes;
while ((end = strchrW(beg, '}')))
{
TRACE("patch applied\n");
succeeded = TRUE;
*(end + 1) = '\0';
r = MsiConfigureProductExW(beg, INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT, cmd);
if (r == ERROR_SUCCESS)
{
TRACE("patch applied\n");
succeeded = TRUE;
}
beg = end + 2;
}
beg = end + 2;
if (succeeded)
r = ERROR_SUCCESS;
}
if (succeeded)
r = ERROR_SUCCESS;
done:
msi_free(cmd);
msi_free(codes);