Commit 7c0d6e80 authored by Alexandre Julliard's avatar Alexandre Julliard

ntdll: Also fallback to native if builtin is for the wrong architecture.

parent 8f2f59ee
...@@ -1372,7 +1372,8 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, ...@@ -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 ); return find_builtin_dll( &nt_name, module, size, &info, machine, FALSE );
default: default:
status = find_builtin_dll( &nt_name, module, size, &info, machine, (loadorder == LO_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; return status;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment