Module: wine Branch: master Commit: 48b58cf1f416b1337c938715acfb23eb8700da3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=48b58cf1f416b1337c938715a...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Feb 26 10:24:03 2021 +0100
spoolss: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/spoolss/Makefile.in | 2 +- dlls/spoolss/spoolss_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/dlls/spoolss/Makefile.in b/dlls/spoolss/Makefile.in index a177944008a..2b61d1f78f4 100644 --- a/dlls/spoolss/Makefile.in +++ b/dlls/spoolss/Makefile.in @@ -2,7 +2,7 @@ MODULE = spoolss.dll IMPORTLIB = spoolss IMPORTS = winspool
-EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ router.c \ diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index bee58755eee..bc02b43ff62 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -46,8 +46,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) TRACE("(%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;