Module: wine Branch: master Commit: a60d6f3ec967e9b114985e5dbb6ec7a22b0d0000 URL: https://gitlab.winehq.org/wine/wine/-/commit/a60d6f3ec967e9b114985e5dbb6ec7a...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Nov 27 12:55:26 2023 +0100
ntdll: Still use LdrGetProcedureAddress for CtrlRoutine.
Fixes d57c41990acde38f085da1c8dd6051e5fd287fb7.
---
dlls/ntdll/loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5b0d3f6b6ee..df8324e0b6b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4268,6 +4268,7 @@ void loader_init( CONTEXT *context, void **entry ) if (!imports_fixup_done) { MEMORY_BASIC_INFORMATION meminfo; + ANSI_STRING ctrl_routine = RTL_CONSTANT_STRING( "CtrlRoutine" ); WINE_MODREF *kernel32; PEB *peb = NtCurrentTeb()->Peb;
@@ -4304,7 +4305,7 @@ void loader_init( CONTEXT *context, void **entry ) } node_kernel32 = kernel32->ldr.DdagNode; pBaseThreadInitThunk = RtlFindExportedRoutineByName( kernel32->ldr.DllBase, "BaseThreadInitThunk" ); - pCtrlRoutine = RtlFindExportedRoutineByName( kernel32->ldr.DllBase, "CtrlRoutine" ); + LdrGetProcedureAddress( kernel32->ldr.DllBase, &ctrl_routine, 0, (void **)&pCtrlRoutine );
actctx_init(); locale_init();