[PATCH 1/2] msi: Check for failure from do_msidbCustomActionTypeDll().

[Zebediah Figura]

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

diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index b3ac7327d94..7ae7e45af29 100644
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -771,7 +771,8 @@ static UINT HANDLE_CustomType1( MSIPACKAGE *package, const WCHAR *source, const

TRACE("Calling function %s from %s\n", debugstr_w(target), debugstr_w(binary->tmpfile));

-    info = do_msidbCustomActionTypeDll( package, type, binary->tmpfile, target, action );
+    if (!(info = do_msidbCustomActionTypeDll( package, type, binary->tmpfile, target, action )))
+        return ERROR_FUNCTION_FAILED;
     return wait_thread_handle( info );
 }

@@ -876,7 +877,8 @@ static UINT HANDLE_CustomType17( MSIPACKAGE *package, const WCHAR *source, const
         return ERROR_FUNCTION_FAILED;
     }

-    info = do_msidbCustomActionTypeDll( package, type, file->TargetPath, target, action );
+    if (!(info = do_msidbCustomActionTypeDll( package, type, file->TargetPath, target, action )))
+        return ERROR_FUNCTION_FAILED;
     return wait_thread_handle( info );
 }

[PATCH 2/2] msi: Return an error if trying to run a 64-bit custom action in a 32-bit prefix.

[Zebediah Figura]

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 
---
 dlls/msi/custom.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index 7ae7e45af29..fb03958eb11 100644
--- 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);

[PATCH 2/2] msi: Return an error if trying to run a 64-bit custom action in a 32-bit prefix.

[Hans Leidekker]

Signed-off-by: Hans Leidekker

[Hans Leidekker]

Signed-off-by: Hans Leidekker