Alexandre Julliard : ntdll: Remove DLL_WINE_PREATTACH support.
Alexandre Julliard
julliard at winehq.org
Tue Mar 2 15:35:58 CST 2021
Module: wine
Branch: master
Commit: e5cade0ff189c7bc871cf3686d16c55939d06068
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5cade0ff189c7bc871cf3686d16c55939d06068
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Mar 2 11:01:25 2021 +0100
ntdll: Remove DLL_WINE_PREATTACH support.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/loader.c | 12 ------------
include/winnt.h | 3 ---
2 files changed, 15 deletions(-)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 6c86e6b2e6c..a7e6d712df1 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -105,8 +105,6 @@ static const char * const reason_names[] =
"PROCESS_ATTACH",
"THREAD_ATTACH",
"THREAD_DETACH",
- NULL, NULL, NULL, NULL,
- "WINE_PREATTACH"
};
struct file_id
@@ -1261,8 +1259,6 @@ static void call_tls_callbacks( HMODULE module, UINT reason )
const PIMAGE_TLS_CALLBACK *callback;
ULONG dirsize;
- if (reason == DLL_WINE_PREATTACH) return;
-
dir = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_TLS, &dirsize );
if (!dir || !dir->AddressOfCallBacks) return;
@@ -2687,14 +2683,6 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC
case LO_BUILTIN_NATIVE:
case LO_DEFAULT:
nts = load_builtin_dll( load_path, &nt_name, flags, pwm, loadorder == LO_DEFAULT );
- if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT &&
- (MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL ) != STATUS_SUCCESS))
- {
- /* stub-only dll, try native */
- TRACE( "%s pre-attach returned FALSE, preferring native\n", debugstr_us(&nt_name) );
- LdrUnloadDll( (*pwm)->ldr.DllBase );
- nts = STATUS_IMAGE_ALREADY_LOADED;
- }
if (nts == STATUS_DLL_NOT_FOUND || nts == STATUS_IMAGE_ALREADY_LOADED)
nts = load_native_dll( load_path, &nt_name, mapping, &image_info, &id, flags, pwm );
break;
diff --git a/include/winnt.h b/include/winnt.h
index 7973960bf21..9025e965b4d 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -676,9 +676,6 @@ typedef DWORD FLONG;
#define DLL_PROCESS_ATTACH 1 /* attach process (load library) */
#define DLL_THREAD_ATTACH 2 /* attach new thread */
#define DLL_THREAD_DETACH 3 /* detach thread */
-#ifdef __WINESRC__
-#define DLL_WINE_PREATTACH 8 /* called before process attach for Wine builtins */
-#endif
/* u.x.wProcessorArchitecture (NT) */
#define PROCESSOR_ARCHITECTURE_INTEL 0
More information about the wine-cvs
mailing list