Alexandre Julliard : ntdll: Don't try to open the file in the prefix for 16-bit builtins.
Alexandre Julliard
julliard at winehq.org
Thu Apr 8 16:14:03 CDT 2021
Module: wine
Branch: master
Commit: 277a5728da6cdce0247521dc63b324e120b542d6
URL: https://source.winehq.org/git/wine.git/?a=commit;h=277a5728da6cdce0247521dc63b324e120b542d6
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Apr 8 18:16:15 2021 +0200
ntdll: Don't try to open the file in the prefix for 16-bit builtins.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/loader.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index e919d7e2671..160a16daff8 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -2730,6 +2730,12 @@ 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;
+ }
}
}
More information about the wine-cvs
mailing list