Brendan McGrath : ntdll: Use 32bit when COM header marks it required.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8cd569cf2628fbb2497e5ef020e670f77cf36d40
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8cd569cf2628fbb2497e5ef02...

Author: Brendan McGrath <brendan(a)redmandi.com>
Date:   Sun Nov 25 06:39:00 2018 +1100

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).

Signed-off-by: Brendan McGrath <brendan(a)redmandi.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/ntdll/loader.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index b00a5f8..631e8bd 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -1984,12 +1984,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info )
     if (info->machine == IMAGE_FILE_MACHINE_ARM64) return TRUE;
 #endif
     if (!info->contains_code) return TRUE;
-    if (info->image_flags & IMAGE_FLAGS_ComPlusNativeReady)
-    {
-        if (!convert_to_pe64( module, info )) return FALSE;
-    }
-    if (info->image_flags & IMAGE_FLAGS_ComPlusILOnly) return TRUE;
-    return FALSE;
+    if (!(info->image_flags & IMAGE_FLAGS_ComPlusNativeReady)) return FALSE;
+    return convert_to_pe64( module, info );
 #else
     return FALSE;  /* no wow64 support on other platforms */
 #endif