Module: wine Branch: master Commit: 2e35f400f8b27d10a9796d458c14dfd227c49f30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e35f400f8b27d10a9796d458...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Feb 24 10:28:05 2021 +0100
ntprint: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ntprint/Makefile.in | 2 +- dlls/ntprint/ntprint.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/dlls/ntprint/Makefile.in b/dlls/ntprint/Makefile.in index 29edde3bc4b..55644dcfc7a 100644 --- a/dlls/ntprint/Makefile.in +++ b/dlls/ntprint/Makefile.in @@ -1,7 +1,7 @@ MODULE = ntprint.dll IMPORTS = winspool
-EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ ntprint.c diff --git a/dlls/ntprint/ntprint.c b/dlls/ntprint/ntprint.c index 100385725c8..6a4cb57c7f6 100644 --- a/dlls/ntprint/ntprint.c +++ b/dlls/ntprint/ntprint.c @@ -39,25 +39,6 @@ typedef struct { DWORD installed; /* Number of installed Monitors */ } monitorinfo_t;
-/***************************************************** - * DllMain - */ -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; - } - return TRUE; -} - /***************************************************** * PSetupCreateMonitorInfo [NTPRINT.@] *