mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-14 22:28:30 +00:00
ntdll: Remove DLL_WINE_PREATTACH support.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
24b447714e
commit
e5cade0ff1
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue