Hans Leidekker : msi: Search all installation contexts in the FindRelatedProducts action.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 548d71ee4526a84296e4438bdcf9e4fed2f7bf15
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=548d71ee4526a84296e4438bdc...

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Tue May 17 11:09:14 2011 +0200

msi: Search all installation contexts in the FindRelatedProducts action.

---

 dlls/msi/upgrade.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c
index 8a0c43a..cae5af6 100644
--- a/dlls/msi/upgrade.c
+++ b/dlls/msi/upgrade.c
@@ -134,9 +134,9 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param)
             TRACE("Looking at index %u product %s\n", index, debugstr_w(product));
 
             unsquash_guid(product, productid);
-            rc = MSIREG_OpenProductKey(productid, NULL, package->Context,
-                                       &hukey, FALSE);
-            if (rc != ERROR_SUCCESS)
+            if (MSIREG_OpenProductKey(productid, NULL, MSIINSTALLCONTEXT_USERMANAGED, &hukey, FALSE) &&
+                MSIREG_OpenProductKey(productid, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, &hukey, FALSE) &&
+                MSIREG_OpenProductKey(productid, NULL, MSIINSTALLCONTEXT_MACHINE, &hukey, FALSE))
             {
                 TRACE("product key not found\n");
                 rc = ERROR_SUCCESS;