Module: wine Branch: master Commit: 6df5cce24801c06d1d71e944a1590e3fb6d720b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6df5cce24801c06d1d71e944a...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Feb 25 08:59:01 2021 +0100
url: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/url/Makefile.in | 2 +- dlls/url/url_main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/dlls/url/Makefile.in b/dlls/url/Makefile.in index 8f5c8dabc8d..8a9d18ebaad 100644 --- a/dlls/url/Makefile.in +++ b/dlls/url/Makefile.in @@ -2,6 +2,6 @@ MODULE = url.dll IMPORTLIB = url IMPORTS = shell32 shlwapi
-EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = url_main.c diff --git a/dlls/url/url_main.c b/dlls/url/url_main.c index 8ad413b6ea9..697ce0e05df 100644 --- a/dlls/url/url_main.c +++ b/dlls/url/url_main.c @@ -31,22 +31,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(url);
-/*********************************************************************** - * DllMain (URL.@) - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( inst ); - break; - } - return TRUE; -} - /*********************************************************************** * AddMIMEFileTypesPS (URL.@) *