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

Alexandre Julliard julliard at winehq.org
Wed Feb 24 15:45:40 CST 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Feb 24 10:28:53 2021 +0100

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

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

---

 dlls/slc/Makefile.in |  2 +-
 dlls/slc/slc.c       | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/dlls/slc/Makefile.in b/dlls/slc/Makefile.in
index fac1c25b192..d3d59fbb312 100644
--- a/dlls/slc/Makefile.in
+++ b/dlls/slc/Makefile.in
@@ -2,7 +2,7 @@ EXTRADEFS = -D_SLC_
 MODULE    = slc.dll
 IMPORTLIB = slc
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	slc.c
diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c
index ffecaa07bff..b246a7dfc1a 100644
--- a/dlls/slc/slc.c
+++ b/dlls/slc/slc.c
@@ -76,20 +76,3 @@ HRESULT WINAPI SLOpen(HSLC *handle)
 
     return S_OK;
 }
-
-/***********************************************************************
- *             DllMain   (CLUSAPI.@)
- *
- */
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-    switch(fdwReason)
-    {
-    case DLL_WINE_PREATTACH:
-        return FALSE;  /* prefer native version */
-    case DLL_PROCESS_ATTACH:
-        DisableThreadLibraryCalls( hinstDLL );
-        break;
-    }
-    return TRUE;
-}




More information about the wine-cvs mailing list