msi: Return an error if trying to run a 64-bit custom action in a 32-bit prefix.

This matches native behaviour (manually tested). This allows the Research in Motion (Blackberry) USB and Modem driver to fail cleanly instead of hanging, if run in a 32-bit prefix. Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msi: Return an error if trying to run a 64-bit custom action in a 32-bit prefix.
40866237 · Zebediah Figura · Alexandre Julliard · 5f21acdc · 40866237
Commit 40866237 authored Jan 23, 2021 by Zebediah Figura Committed by Alexandre Julliard Jan 25, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

custom.c dlls/msi/custom.c +7 -0

No files found.
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -748,6 +748,13 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll(
    if (!ret)
        info->arch = (sizeof(void *) == 8 ? SCS_64BIT_BINARY : SCS_32BIT_BINARY);

+    if (info->arch == SCS_64BIT_BINARY && sizeof(void *) == 4 && !is_wow64)
+    {
+        ERR("Attempt to run a 64-bit custom action inside a 32-bit WINEPREFIX.\n");
+        free_custom_action_data( info );
+        return NULL;
+    }
+
    custom_start_server(package, info->arch);

    info->handle = CreateThread(NULL, 0, custom_client_thread, info, 0, NULL);