[PATCH v2] msi: Disable WoW redirection when installing a 64-bit package.

[Zebediah Figura]

Fixes https://bugs.winehq.org/show_bug.cgi?id=30713

Signed-off-by: Zebediah Figura 
---
v2: Disable in ACTION_HandleStandardAction() instead.

dlls/msi/action.c        |   8 ++++
 dlls/msi/tests/install.c | 101 ++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 104 insertions(+), 5 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 67dfbe4..7197bca 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -7855,8 +7855,12 @@ StandardActions[] =
 static UINT ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action)
 {
     UINT rc = ERROR_FUNCTION_NOT_CALLED;
+    void *cookie;
     UINT i;

+    if (is_wow64 && package->platform == PLATFORM_X64)
+        Wow64DisableWow64FsRedirection(&cookie);
+
     i = 0;
     while (StandardActions[i].action != NULL)
     {
@@ -7891,6 +7895,10 @@ static UINT ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action)
         }
         i++;
     }
+
+    if (is_wow64 && package->platform == PLATFORM_X64)
+        Wow64RevertWow64FsRedirection(cookie);
+
     return rc;
 }

diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 5c83d30..ac2c837 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -48,6 +48,8 @@ static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*);
 static BOOL (WINAPI *pOpenProcessToken)( HANDLE, DWORD, PHANDLE );
 static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD);
 static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
+static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **);
+static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *);

static HMODULE hsrclient = 0;
 static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD);
@@ -1334,6 +1336,18 @@ static const char da_install_exec_seq_dat[] =
     "immediate\t\t800\n"
     "InstallFinalize\t\t1100\n";

+static const CHAR x64_directory_dat[] =
+    "Directory\tDirectory_Parent\tDefaultDir\n"
+    "s72\tS72\tl255\n"
+    "Directory\tDirectory\n"
+    "CABOUTDIR\tMSITESTDIR\tcabout\n"
+    "CHANGEDDIR\tMSITESTDIR\tchanged:second\n"
+    "FIRSTDIR\tMSITESTDIR\tfirst\n"
+    "MSITESTDIR\tProgramFiles64Folder\tmsitest\n"
+    "NEWDIR\tCABOUTDIR\tnew\n"
+    "ProgramFiles64Folder\tTARGETDIR\t.\n"
+    "TARGETDIR\t\tSourceDir";
+
 typedef struct _msi_table
 {
     const CHAR *filename;
@@ -2015,6 +2029,18 @@ static const msi_table da_tables[] =
     ADD_TABLE(da_custom_action),
 };

+static const msi_table x64_tables[] =
+{
+    ADD_TABLE(media),
+    ADD_TABLE(x64_directory),
+    ADD_TABLE(file),
+    ADD_TABLE(component),
+    ADD_TABLE(feature),
+    ADD_TABLE(feature_comp),
+    ADD_TABLE(property),
+    ADD_TABLE(install_exec_seq),
+};
+
 /* cabinet definitions */

/* make the max size large so there is only one cab file */
@@ -2145,6 +2171,8 @@ static void init_functionpointers(void)
     GET_PROC(hadvapi32, OpenProcessToken);
     GET_PROC(hadvapi32, RegDeleteKeyExA)
     GET_PROC(hkernel32, IsWow64Process)
+    GET_PROC(hkernel32, Wow64DisableWow64FsRedirection);
+    GET_PROC(hkernel32, Wow64RevertWow64FsRedirection);

hsrclient = LoadLibraryA("srclient.dll");
     GET_PROC(hsrclient, SRRemoveRestorePoint);
@@ -2330,7 +2358,8 @@ static BOOL get_system_dirs(void)
     HKEY hkey;
     DWORD type, size;

-    if (RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\Microsoft\Windows\CurrentVersion", &hkey))
+    if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\Microsoft\Windows\CurrentVersion",
+        0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &hkey))
         return FALSE;

size = MAX_PATH;
@@ -5693,16 +5722,16 @@ static void test_package_validation(void)

r = MsiInstallProductA(msifile, NULL);
         ok(r == ERROR_INSTALL_PACKAGE_INVALID, "Expected ERROR_INSTALL_PACKAGE_INVALID, got %u\n", r);
-        ok(!delete_pf_native("msitest\maximus", TRUE), "file exists\n");
-        ok(!delete_pf_native("msitest", FALSE), "directory exists\n");
+        ok(!delete_pf("msitest\maximus", TRUE), "file exists\n");
+        ok(!delete_pf("msitest", FALSE), "directory exists\n");

DeleteFileA(msifile);
         create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "x64;0");

r = MsiInstallProductA(msifile, NULL);
         ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
-        ok(delete_pf_native("msitest\maximus", TRUE), "file exists\n");
-        ok(delete_pf_native("msitest", FALSE), "directory exists\n");
+        ok(delete_pf("msitest\maximus", TRUE), "file exists\n");
+        ok(delete_pf("msitest", FALSE), "directory exists\n");
     }
     else
     {
@@ -6124,6 +6153,67 @@ error:
     DeleteFileA(msifile);
 }

+static void test_wow64(void)
+{
+    void *cookie;
+    UINT r;
+
+    if (!is_wow64)
+    {
+        skip("test must be run on WoW64\n");
+        return;
+    }
+
+    if (is_process_limited())
+    {
+        skip("process is limited\n");
+        return;
+    }
+
+    create_test_files();
+    create_database_template(msifile, x64_tables, sizeof(x64_tables)/sizeof(msi_table), 200, "x64;0");
+    r = MsiInstallProductA(msifile, NULL);
+    if (r == ERROR_INSTALL_PACKAGE_REJECTED)
+    {
+        skip("Not enough rights to perform tests\n");
+        goto error;
+    }
+
+    pWow64DisableWow64FsRedirection(&cookie);
+
+    ok(!delete_pf("msitest\cabout\new\five.txt", TRUE), "File installed\n");
+    ok(!delete_pf("msitest\cabout\new", FALSE), "Directory created\n");
+    ok(!delete_pf("msitest\cabout\four.txt", TRUE), "File installed\n");
+    ok(!delete_pf("msitest\cabout", FALSE), "Directory created\n");
+    ok(!delete_pf("msitest\changed\three.txt", TRUE), "File installed\n");
+    ok(!delete_pf("msitest\changed", FALSE), "Directory created\n");
+    ok(!delete_pf("msitest\first\two.txt", TRUE), "File installed\n");
+    ok(!delete_pf("msitest\first", FALSE), "Directory created\n");
+    ok(!delete_pf("msitest\one.txt", TRUE), "File installed\n");
+    ok(!delete_pf("msitest\filename", TRUE), "File installed\n");
+    ok(!delete_pf("msitest\service.exe", TRUE), "File installed\n");
+    ok(!delete_pf("msitest", FALSE), "Directory created\n");
+
+    ok(delete_pf_native("msitest\cabout\new\five.txt", TRUE), "File not installed\n");
+    ok(delete_pf_native("msitest\cabout\new", FALSE), "Directory not created\n");
+    ok(delete_pf_native("msitest\cabout\four.txt", TRUE), "File not installed\n");
+    ok(delete_pf_native("msitest\cabout", FALSE), "Directory not created\n");
+    ok(delete_pf_native("msitest\changed\three.txt", TRUE), "File not installed\n");
+    ok(delete_pf_native("msitest\changed", FALSE), "Directory not created\n");
+    ok(delete_pf_native("msitest\first\two.txt", TRUE), "File not installed\n");
+    ok(delete_pf_native("msitest\first", FALSE), "Directory not created\n");
+    ok(delete_pf_native("msitest\one.txt", TRUE), "File not installed\n");
+    ok(delete_pf_native("msitest\filename", TRUE), "File not installed\n");
+    ok(delete_pf_native("msitest\service.exe", TRUE), "File not installed\n");
+    ok(delete_pf_native("msitest", FALSE), "Directory not created\n");
+
+    pWow64RevertWow64FsRedirection(cookie);
+
+error:
+    delete_test_files();
+    DeleteFileA(msifile);
+}
+
 START_TEST(install)
 {
     DWORD len;
@@ -6217,6 +6307,7 @@ START_TEST(install)
     test_remove_upgrade_code();
     test_feature_tree();
     test_deferred_action();
+    test_wow64();

DeleteFileA(customdll);

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?
Full results can be found at
https://testbot.winehq.org/JobDetails.pl?Key=38181

Your paranoid android.

=== wxppro (32 bit install) ===
msi:install contains a misplaced failure message for custom

[Hans Leidekker]

Signed-off-by: Hans Leidekker