Alexandre Julliard : winsta: Use --prefer-native instead of DLL_WINE_PREATTACH.

Alexandre Julliard julliard at winehq.org
Thu Feb 25 16:45:37 CST 2021


Module: wine
Branch: master
Commit: 60933c5b93a4494fa70234903386100863a121db
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=60933c5b93a4494fa70234903386100863a121db

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Feb 25 08:59:36 2021 +0100

winsta: Use --prefer-native instead of DLL_WINE_PREATTACH.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winsta/Makefile.in |  2 +-
 dlls/winsta/main.c      | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/dlls/winsta/Makefile.in b/dlls/winsta/Makefile.in
index 58f9ca1812d..a83405a806d 100644
--- a/dlls/winsta/Makefile.in
+++ b/dlls/winsta/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = winsta.dll
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	main.c
diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c
index 7568310aeaa..9ec4d64d0b6 100644
--- a/dlls/winsta/main.c
+++ b/dlls/winsta/main.c
@@ -27,24 +27,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(winsta);
 
-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;
-        default:
-            break;
-    }
-
-    return TRUE;
-}
-
 BOOLEAN WINAPI WinStationQueryInformationA( HANDLE server, ULONG logon_id, WINSTATIONINFOCLASS class,
                                             void *info, ULONG len, ULONG *ret_len )
 {




More information about the wine-cvs mailing list