Alexandre Julliard : rasdlg: 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: dd3164906361e4b40fcba63fa8dfb2fe4c77ab44
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=dd3164906361e4b40fcba63fa8dfb2fe4c77ab44

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

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

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

---

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

diff --git a/dlls/rasdlg/Makefile.in b/dlls/rasdlg/Makefile.in
index d780513fb6c..e7262be3d85 100644
--- a/dlls/rasdlg/Makefile.in
+++ b/dlls/rasdlg/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = rasdlg.dll
 IMPORTLIB = rasdlg
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	rasdlg_main.c
diff --git a/dlls/rasdlg/rasdlg_main.c b/dlls/rasdlg/rasdlg_main.c
index 255e6e6621a..149ed022314 100644
--- a/dlls/rasdlg/rasdlg_main.c
+++ b/dlls/rasdlg/rasdlg_main.c
@@ -27,24 +27,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(rasdlg);
 
-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;
-}
-
 BOOL WINAPI RasEntryDlgW(LPWSTR phonebook, LPWSTR entry, RASENTRYDLGW *lpInfo)
 {
     FIXME("(%s %s %p) stub\n", debugstr_w(phonebook), debugstr_w(entry), lpInfo);




More information about the wine-cvs mailing list