Module: wine Branch: master Commit: edc4fb8e9f9817134370e7ff7e9f43cdb6be3ce7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=edc4fb8e9f9817134370e7ff7...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Feb 22 09:24:08 2021 +0100
avrt: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/avrt/Makefile.in | 2 +- dlls/avrt/main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/dlls/avrt/Makefile.in b/dlls/avrt/Makefile.in index 49f5b291ef2..d796989b4ea 100644 --- a/dlls/avrt/Makefile.in +++ b/dlls/avrt/Makefile.in @@ -2,7 +2,7 @@ MODULE = avrt.dll IMPORTLIB = avrt IMPORTS = user32
-EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ main.c diff --git a/dlls/avrt/main.c b/dlls/avrt/main.c index 258c525e198..abcf0ab68ab 100644 --- a/dlls/avrt/main.c +++ b/dlls/avrt/main.c @@ -38,22 +38,6 @@ static inline WCHAR *heap_strdupAW(const char *src) return dst; }
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - HANDLE WINAPI AvSetMmThreadCharacteristicsA(const char *name, DWORD *index) { WCHAR *nameW = NULL;