system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Zebediah Figura 2021-01-23 17:42:42 -06:00 committed by Alexandre Julliard
parent 5f21acdc9e
commit 4086623792
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dlls/msi/custom.c
View file

@ -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);