[PATCH 0/1] MR6599: msi: Disable WOW64 redirection for all 64-bit package archs.

[Billy Laws (＠bylaws)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6599

[PATCH 1/1] msi: Disable WOW64 redirection for all 64-bit package archs.

[Billy Laws]

From: Billy Laws <blaws05(a)gmail.com>

---
 dlls/msi/msipriv.h | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index cca16e642d2..e20ead557ce 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -370,6 +370,19 @@ enum platform
     PLATFORM_ARM64
 };
 
+static inline BOOL is_platform_64bit(enum platform platform)
+{
+    switch (platform)
+    {
+    case PLATFORM_INTEL64:
+    case PLATFORM_X64:
+    case PLATFORM_ARM64:
+        return TRUE;
+    default:
+        return FALSE;
+    }
+}
+
 enum clr_version
 {
     CLR_VERSION_V10,
@@ -1085,11 +1098,11 @@ extern WCHAR *msi_get_package_code(MSIDATABASE *db) __WINE_DEALLOC(free) __WINE_
 /* wrappers for filesystem functions */
 static inline void msi_disable_fs_redirection( MSIPACKAGE *package )
 {
-    if (is_wow64 && package->platform == PLATFORM_X64) Wow64DisableWow64FsRedirection( &package->cookie );
+    if (is_wow64 && is_platform_64bit( package->platform )) Wow64DisableWow64FsRedirection( &package->cookie );
 }
 static inline void msi_revert_fs_redirection( MSIPACKAGE *package )
 {
-    if (is_wow64 && package->platform == PLATFORM_X64) Wow64RevertWow64FsRedirection( package->cookie );
+    if (is_wow64 && is_platform_64bit( package->platform )) Wow64RevertWow64FsRedirection( package->cookie );
 }
 extern BOOL msi_get_temp_file_name( MSIPACKAGE *, const WCHAR *, const WCHAR *, WCHAR * );
 extern HANDLE msi_create_file( MSIPACKAGE *, const WCHAR *, DWORD, DWORD, DWORD, DWORD );
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6599

[PATCH 1/1] msi: Disable WOW64 redirection for all 64-bit package archs.

[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=148803

Your paranoid android.


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

d3d9:
d3d9ex.c:3230: Test failed: Expected message 0x18 for window 0, but didn't receive it, i=0.

[PATCH 0/1] MR6599: msi: Disable WOW64 redirection for all 64-bit package archs. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6599