Alexandre Julliard : ntdll: Also fallback to native if builtin is for the wrong architecture.
Alexandre Julliard
julliard at winehq.org
Tue Apr 6 15:50:12 CDT 2021
Module: wine
Branch: master
Commit: 7c0d6e8067ac20a249a2aef0237faf54fe77aa01
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c0d6e8067ac20a249a2aef0237faf54fe77aa01
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Apr 6 12:21:40 2021 +0200
ntdll: Also fallback to native if builtin is for the wrong architecture.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/unix/loader.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index c13055a5549..3d613425b68 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -1372,7 +1372,8 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename,
return find_builtin_dll( &nt_name, module, size, &info, machine, FALSE );
default:
status = find_builtin_dll( &nt_name, module, size, &info, machine, (loadorder == LO_DEFAULT) );
- if (status == STATUS_DLL_NOT_FOUND) return STATUS_IMAGE_ALREADY_LOADED;
+ if (status == STATUS_DLL_NOT_FOUND || status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH)
+ return STATUS_IMAGE_ALREADY_LOADED;
return status;
}
}
More information about the wine-cvs
mailing list