From d351a9999e33bfedbaf8160007ad6ebbc33cb038 Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Wed, 28 Mar 2012 15:34:06 +0200 Subject: [PATCH] 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 43c6ff95073..834467f21b7 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 5a2ce9efa51..6c53827e36b 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"); -- 2.11.4.GIT