Zebediah Figura : msi: Disable WoW redirection when installing a 64-bit package.
Alexandre Julliard
julliard at winehq.org
Thu Sep 13 03:49:13 CDT 2018
Module: wine
Branch: stable
Commit: 4207c3f857a37367357a1d9e894be12708c54f00
URL: https://source.winehq.org/git/wine.git/?a=commit;h=4207c3f857a37367357a1d9e894be12708c54f00
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Fri May 4 00:17:39 2018 -0500
msi: Disable WoW redirection when installing a 64-bit package.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 540c48b91175b11c7b8646d0a036b20c46425080)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
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 54295a3..ad8b285 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -7853,8 +7853,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)
{
@@ -7889,6 +7893,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 acbf162..125d359 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);
@@ -1306,6 +1308,18 @@ static const char da_install_exec_seq_dat[] =
"InstallFinalize\t\t1100\n"
"cleanup\t\t1200\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;
@@ -1973,6 +1987,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 */
@@ -2103,6 +2129,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);
@@ -2288,7 +2316,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;
@@ -5532,16 +5561,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
{
@@ -5941,6 +5970,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;
@@ -6030,6 +6120,7 @@ START_TEST(install)
test_remove_upgrade_code();
test_feature_tree();
test_deferred_action();
+ test_wow64();
DeleteFileA(log_file);
More information about the wine-cvs
mailing list