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

Alexandre Julliard julliard at winehq.org
Tue Feb 23 15:54:47 CST 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Feb 23 10:06:48 2021 +0100

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

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

---

 dlls/msisip/Makefile.in |  2 +-
 dlls/msisip/main.c      | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/dlls/msisip/Makefile.in b/dlls/msisip/Makefile.in
index c19f18373ef..dd9b6ed5150 100644
--- a/dlls/msisip/Makefile.in
+++ b/dlls/msisip/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = msisip.dll
 IMPORTS   = crypt32 ole32
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	main.c
diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c
index 11893f149c3..6324542428a 100644
--- a/dlls/msisip/main.c
+++ b/dlls/msisip/main.c
@@ -28,22 +28,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(msisip);
 
-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;
-    }
-
-    return TRUE;
-}
-
 static GUID mySubject = { 0x000c10f1, 0x0000, 0x0000,
  { 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46 }};
 




More information about the wine-cvs mailing list