[PATCH] ntdll: Use 32bit when COM header marks it required
Currently, when using wine64 to to load a .NET application which has the 32-bit required flag switched on, it fails with a c0000017 error (ERROR_NOT_ENOUGH_MEMORY). (This used to be the error for all 32-bit .NET applications run via wine64 until 926dd780697852b375ec0a193c762e7723a3f5e6) This patch allows applications marked with the 32-bit required flag to fallback to execution under 32-bit wine. --- dlls/ntdll/loader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5bded9955fe5..d6bef36a9147 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2138,9 +2138,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) if (!info->contains_code) return TRUE; if (info->image_flags & IMAGE_FLAGS_ComPlusNativeReady) { - if (!convert_to_pe64( module, info )) return FALSE; + return convert_to_pe64( module, info ); } - if (info->image_flags & IMAGE_FLAGS_ComPlusILOnly) return TRUE; return FALSE; #else return FALSE; /* no wow64 support on other platforms */ -- 2.17.1
Currently, when using wine64 to to load a .NET application which has the 32-bit required flag switched on, it fails with a c0000017 error (ERROR_NOT_ENOUGH_MEMORY). (This used to be the error for all 32-bit .NET applications run via wine64 until 926dd780697852b375ec0a193c762e7723a3f5e6) This patch allows applications marked with the 32-bit required flag to fallback to execution under 32-bit wine. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- Changes since v1: - Add Signed-off-by tag dlls/ntdll/loader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5bded9955fe5..d6bef36a9147 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2138,9 +2138,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) if (!info->contains_code) return TRUE; if (info->image_flags & IMAGE_FLAGS_ComPlusNativeReady) { - if (!convert_to_pe64( module, info )) return FALSE; + return convert_to_pe64( module, info ); } - if (info->image_flags & IMAGE_FLAGS_ComPlusILOnly) return TRUE; return FALSE; #else return FALSE; /* no wow64 support on other platforms */ -- 2.17.1
participants (1)
-
Brendan McGrath