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

msi: Improve tracing in the FindRelatedProducts action.

This commit is contained in:
Hans Leidekker 2011-05-17 11:08:49 +02:00 committed by Alexandre Julliard
parent e9c4e501f4
commit 9e5562297d
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/msi/upgrade.c
View File

@ -123,33 +123,31 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param)
while (rc == ERROR_SUCCESS) while (rc == ERROR_SUCCESS)
{ {
rc = RegEnumValueW(hkey, index, product, &sz, NULL, NULL, NULL, NULL); rc = RegEnumValueW(hkey, index, product, &sz, NULL, NULL, NULL, NULL);
TRACE("Looking at (%i) %s\n",index,debugstr_w(product));
if (rc == ERROR_SUCCESS) if (rc == ERROR_SUCCESS)
{ {
WCHAR productid[GUID_SIZE]; WCHAR productid[GUID_SIZE];
LPCWSTR ver; LPCWSTR ver, language, action_property;
LPCWSTR language; DWORD check = 0, comp_ver, sz = 0x100;
LPCWSTR action_property;
DWORD check = 0x00000000;
DWORD comp_ver = 0x00000000;
DWORD sz = 0x100;
HKEY hukey; HKEY hukey;
INT r; INT r;
TRACE("Looking at index %u product %s\n", index, debugstr_w(product));
unsquash_guid(product, productid); unsquash_guid(product, productid);
rc = MSIREG_OpenProductKey(productid, NULL, package->Context, rc = MSIREG_OpenProductKey(productid, NULL, package->Context,
&hukey, FALSE); &hukey, FALSE);
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
{ {
TRACE("product key not found\n");
rc = ERROR_SUCCESS; rc = ERROR_SUCCESS;
index ++; index ++;
continue; continue;
} }
sz = sizeof(DWORD); sz = sizeof(DWORD);
RegQueryValueExW(hukey, INSTALLPROPERTY_VERSIONW, NULL, NULL, RegQueryValueExW(hukey, INSTALLPROPERTY_VERSIONW, NULL, NULL, (LPBYTE)&check, &sz);
(LPBYTE)&check, &sz);
/* check min */ /* check version minimum */
ver = MSI_RecordGetString(rec,2); ver = MSI_RecordGetString(rec,2);
if (ver) if (ver)
{ {
@ -157,13 +155,14 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param)
r = check - comp_ver; r = check - comp_ver;
if (r < 0 || (r == 0 && !(attributes & msidbUpgradeAttributesVersionMinInclusive))) if (r < 0 || (r == 0 && !(attributes & msidbUpgradeAttributesVersionMinInclusive)))
{ {
TRACE("version below minimum\n");
RegCloseKey(hukey); RegCloseKey(hukey);
index ++; index ++;
continue; continue;
} }
} }
/* check max */ /* check version maximum */
ver = MSI_RecordGetString(rec,3); ver = MSI_RecordGetString(rec,3);
if (ver) if (ver)
{ {
@ -175,21 +174,21 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param)
index ++; index ++;
continue; continue;
} }
TRACE("version above maximum\n");
} }
/* check language*/ /* check language */
sz = sizeof(DWORD); sz = sizeof(DWORD);
RegQueryValueExW(hukey, INSTALLPROPERTY_LANGUAGEW, NULL, NULL, RegQueryValueExW(hukey, INSTALLPROPERTY_LANGUAGEW, NULL, NULL, (LPBYTE)&check, &sz);
(LPBYTE)&check, &sz);
RegCloseKey(hukey); RegCloseKey(hukey);
language = MSI_RecordGetString(rec,4); language = MSI_RecordGetString(rec,4);
TRACE("Checking languages %x and %s\n", check,
debugstr_w(language));
if (!check_language(check, language, attributes)) if (!check_language(check, language, attributes))
{ {
index ++; index ++;
continue; continue;
TRACE("language doesn't match\n");
} }
TRACE("found related product\n");
action_property = MSI_RecordGetString(rec, 7); action_property = MSI_RecordGetString(rec, 7);
append_productcode(package, action_property, productid); append_productcode(package, action_property, productid);