Hans Leidekker : msi: Also set the Intel property on 64-bit processors.

[Alexandre Julliard]

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

Author: Hans Leidekker 
Date:   Wed Mar 28 15:34:06 2012 +0200

msi: Also set the Intel property on 64-bit processors.

---

dlls/msi/package.c       |    3 +--
 dlls/msi/tests/package.c |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index 43c6ff9..834467f 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -884,10 +884,9 @@ static VOID set_installer_properties(MSIPACKAGE *package)

GetNativeSystemInfo( &sys_info );
     sprintfW( bufstr, szIntFormat, sys_info.wProcessorLevel );
+    msi_set_property( package->db, szIntel, bufstr );
     if (sys_info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL)
     {
-        msi_set_property( package->db, szIntel, bufstr );
-
         GetSystemDirectoryW( pth, MAX_PATH );
         PathAddBackslashW( pth );
         msi_set_property( package->db, szSystemFolder, pth );
diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index 5a2ce9e..6c53827 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -10181,6 +10181,12 @@ static void test_installprops(void)
         {
             buf[0] = 0;
             size = MAX_PATH;
+            r = MsiGetProperty(hpkg, "Intel", buf, &size);
+            ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r);
+            ok(buf[0], "property not set\n");
+
+            buf[0] = 0;
+            size = MAX_PATH;
             r = MsiGetProperty(hpkg, "MsiAMD64", buf, &size);
             ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r);
             ok(buf[0], "property not set\n");
@@ -10251,6 +10257,12 @@ static void test_installprops(void)
             {
                 buf[0] = 0;
                 size = MAX_PATH;
+                r = MsiGetProperty(hpkg, "Intel", buf, &size);
+                ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r);
+                ok(buf[0], "property not set\n");
+
+                buf[0] = 0;
+                size = MAX_PATH;
                 r = MsiGetProperty(hpkg, "MsiAMD64", buf, &size);
                 ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r);
                 ok(!buf[0], "property set\n");
@@ -10313,6 +10325,12 @@ static void test_installprops(void)
             {
                 buf[0] = 0;
                 size = MAX_PATH;
+                r = MsiGetProperty(hpkg, "Intel", buf, &size);
+                ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r);
+                ok(buf[0], "property not set\n");
+
+                buf[0] = 0;
+                size = MAX_PATH;
                 r = MsiGetProperty(hpkg, "MsiAMD64", buf, &size);
                 ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r);
                 ok(buf[0], "property not set\n");