[PATCH 0/1] MR6839: msi: Also set x64 properties for arm64 hosts.

[PATCH 1/1] msi: Also set x64 properties for arm64 hosts.

[Billy Laws]

From: Billy Laws

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

diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index 89b4c09dfa4..aaf66f31970 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -791,7 +791,8 @@ static VOID set_installer_properties(MSIPACKAGE *package)
         PathAddBackslashW( pth );
         msi_set_property( package->db, L"CommonFilesFolder", pth, -1 );
     }
-    else if (sys_info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+    else if (sys_info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64 ||
+             sys_info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64)
     {
         msi_set_property( package->db, L"MsiAMD64", bufstr, -1 );
         msi_set_property( package->db, L"Msix64", bufstr, -1 );
diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index e96907b3cf9..f7d9f57857d 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -5620,7 +5620,8 @@ static void test_installprops(void)
     sprintf(buf, "%d", LOBYTE(LOWORD(GetVersion())) * 100 + HIBYTE(LOWORD(GetVersion())));
     check_prop(hpkg, "VersionNT", buf, 1, 1);

-    if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+    if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64 ||
+        si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64)
     {
         sprintf(buf, "%d", si.wProcessorLevel);
         check_prop(hpkg, "Intel", buf, 1, 0);

[PATCH 1/1] msi: Also set x64 properties for arm64 hosts.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=149739

Your paranoid android.

=== debian11b (64 bit WoW report) ===

user32:
win.c:4073: Test succeeded inside todo block: Expected active window 0000000001DD0166, got 0000000001DD0166.
win.c:4074: Test succeeded inside todo block: Expected focus window 0000000001DD0166, got 0000000001DD0166.

[Hans Leidekker (＠hans)]

I can't verify your tests because I don't have Windows on ARM here. I guess we should add an ARM Windows machine to our CI pipeline at some point.

[PATCH 0/1] MR6839: msi: Also set x64 properties for arm64 hosts. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.