Skip to content

W
wine-winehq
Commit 598a25de authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

msi: Ignore min/max versions if their values are null.

parent ab111025
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 14 deletions
dlls/msi/upgrade.c
View file @ 598a25de
...@@ -151,26 +151,30 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) ...@@ -151,26 +151,30 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param)
(LPBYTE)&check, &sz); (LPBYTE)&check, &sz);
/* check min */ /* check min */
ver = MSI_RecordGetString(rec,2); ver = MSI_RecordGetString(rec,2);
comp_ver = msi_version_str_to_dword(ver); if (ver)
r = check - comp_ver;
if (r < 0 || (r == 0 && !(attributes &
msidbUpgradeAttributesVersionMinInclusive)))
{ {
RegCloseKey(hukey); comp_ver = msi_version_str_to_dword(ver);
index ++; r = check - comp_ver;
continue; if (r < 0 || (r == 0 && !(attributes & msidbUpgradeAttributesVersionMinInclusive)))
{
RegCloseKey(hukey);
index ++;
continue;
}
} }
/* check max */ /* check max */
ver = MSI_RecordGetString(rec,3); ver = MSI_RecordGetString(rec,3);
comp_ver = msi_version_str_to_dword(ver); if (ver)
r = check - comp_ver;
if (r > 0 || (r == 0 && !(attributes &
msidbUpgradeAttributesVersionMaxInclusive)))
{ {
RegCloseKey(hukey); comp_ver = msi_version_str_to_dword(ver);
index ++; r = check - comp_ver;
continue; if (r > 0 || (r == 0 && !(attributes & msidbUpgradeAttributesVersionMaxInclusive)))
{
RegCloseKey(hukey);
index ++;
continue;
}
} }
/* check language*/ /* check language*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment