Commit d351a999 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

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

parent 45696154
...@@ -884,10 +884,9 @@ static VOID set_installer_properties(MSIPACKAGE *package) ...@@ -884,10 +884,9 @@ static VOID set_installer_properties(MSIPACKAGE *package)
GetNativeSystemInfo( &sys_info ); GetNativeSystemInfo( &sys_info );
sprintfW( bufstr, szIntFormat, sys_info.wProcessorLevel ); sprintfW( bufstr, szIntFormat, sys_info.wProcessorLevel );
msi_set_property( package->db, szIntel, bufstr );
if (sys_info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) if (sys_info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL)
{ {
msi_set_property( package->db, szIntel, bufstr );
GetSystemDirectoryW( pth, MAX_PATH ); GetSystemDirectoryW( pth, MAX_PATH );
PathAddBackslashW( pth ); PathAddBackslashW( pth );
msi_set_property( package->db, szSystemFolder, pth ); msi_set_property( package->db, szSystemFolder, pth );
......
...@@ -10181,6 +10181,12 @@ static void test_installprops(void) ...@@ -10181,6 +10181,12 @@ static void test_installprops(void)
{ {
buf[0] = 0; buf[0] = 0;
size = MAX_PATH; 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); r = MsiGetProperty(hpkg, "MsiAMD64", buf, &size);
ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r);
ok(buf[0], "property not set\n"); ok(buf[0], "property not set\n");
...@@ -10251,6 +10257,12 @@ static void test_installprops(void) ...@@ -10251,6 +10257,12 @@ static void test_installprops(void)
{ {
buf[0] = 0; buf[0] = 0;
size = MAX_PATH; 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); r = MsiGetProperty(hpkg, "MsiAMD64", buf, &size);
ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r);
ok(!buf[0], "property set\n"); ok(!buf[0], "property set\n");
...@@ -10313,6 +10325,12 @@ static void test_installprops(void) ...@@ -10313,6 +10325,12 @@ static void test_installprops(void)
{ {
buf[0] = 0; buf[0] = 0;
size = MAX_PATH; 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); r = MsiGetProperty(hpkg, "MsiAMD64", buf, &size);
ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r);
ok(buf[0], "property not set\n"); ok(buf[0], "property not set\n");
......
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