[PATCH] msi: Use the global is_wow64 variable in custom_start_server().

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/msi/custom.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index 508d2edb5cf..b3ac7327d94 100644
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -582,7 +582,6 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch)
     WCHAR buffer[24];
     void *cookie;
     HANDLE pipe;
-    BOOL wow64;

if ((arch == SCS_32BIT_BINARY && package->custom_server_32_process) ||
         (arch == SCS_64BIT_BINARY && package->custom_server_64_process))
@@ -595,17 +594,14 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch)
     if (pipe == INVALID_HANDLE_VALUE)
         ERR("Failed to create custom action client pipe: %u\n", GetLastError());

-    if (!IsWow64Process(GetCurrentProcess(), &wow64))
-        wow64 = FALSE;
-
-    if ((sizeof(void *) == 8 || wow64) && arch == SCS_32BIT_BINARY)
+    if ((sizeof(void *) == 8 || is_wow64) && arch == SCS_32BIT_BINARY)
         GetSystemWow64DirectoryW(path, MAX_PATH - ARRAY_SIZE(L"\msiexec.exe"));
     else
         GetSystemDirectoryW(path, MAX_PATH - ARRAY_SIZE(L"\msiexec.exe"));
     lstrcatW(path, L"\msiexec.exe");
     swprintf(cmdline, ARRAY_SIZE(cmdline), L"%s -Embedding %d", path, GetCurrentProcessId());

-    if (wow64 && arch == SCS_64BIT_BINARY)
+    if (is_wow64 && arch == SCS_64BIT_BINARY)
     {
         Wow64DisableWow64FsRedirection(&cookie);
         CreateProcessW(path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);

[PATCH] msi/tests: Test the "VersionNT" property.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/msi/tests/package.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index f8bf431883b..3b98d9ef111 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -5735,6 +5735,9 @@ static void test_installprops(void)

GetNativeSystemInfo(&si);

+    sprintf(buf, "%d", LOBYTE(LOWORD(GetVersion())) * 100 + HIBYTE(LOWORD(GetVersion())));
+    check_prop(hpkg, "VersionNT", buf, 1);
+
     if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
     {
         sprintf(buf, "%d", si.wProcessorLevel);

[PATCH] msi/tests: Test the "VersionNT" property.

[Hans Leidekker]

Signed-off-by: Hans Leidekker

[Hans Leidekker]

Signed-off-by: Hans Leidekker