ntdll: Allow loading of native libraries for Win16.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51224 Signed-off-by: Roman Pišl <rpisl@seznam.cz> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
31e984a09d
commit
a0425b9610
dlls/ntdll
|
@ -2828,12 +2828,6 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, con
|
|||
status = STATUS_SUCCESS;
|
||||
goto done;
|
||||
}
|
||||
/* 16-bit files can't be loaded from the prefix */
|
||||
if (libname[0] && libname[1] && !wcscmp( libname + wcslen(libname) - 2, L"16" ))
|
||||
{
|
||||
status = find_builtin_without_file( libname, nt_name, pwm, mapping, image_info, id );
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2842,6 +2836,10 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, con
|
|||
else if (!(status = RtlDosPathNameToNtPathName_U_WithStatus( libname, nt_name, NULL, NULL )))
|
||||
status = open_dll_file( nt_name, pwm, mapping, image_info, id );
|
||||
|
||||
/* 16-bit files can't be loaded from the prefix */
|
||||
if (status && libname[0] && libname[1] && !wcscmp( libname + wcslen(libname) - 2, L"16" ) && !contains_path( libname ))
|
||||
status = find_builtin_without_file( libname, nt_name, pwm, mapping, image_info, id );
|
||||
|
||||
if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) status = STATUS_INVALID_IMAGE_FORMAT;
|
||||
|
||||
done:
|
||||
|
|
Loading…
Reference in New Issue