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

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

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

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

---

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

diff --git a/dlls/msasn1/Makefile.in b/dlls/msasn1/Makefile.in
index b57eda7793b..18d6d92526c 100644
--- a/dlls/msasn1/Makefile.in
+++ b/dlls/msasn1/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = msasn1.dll
 IMPORTLIB = msasn1
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	main.c
diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c
index fc867e7b815..2ebaa8c485c 100644
--- a/dlls/msasn1/main.c
+++ b/dlls/msasn1/main.c
@@ -29,21 +29,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(msasn1);
 
-BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
-{
-
-    switch (reason)
-    {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(instance);
-            break;
-    }
-
-    return TRUE;
-}
-
 ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, ASN1uint32_t flags,
                                       ASN1uint32_t pdu, const ASN1GenericFun_t encoder[],
                                       const ASN1GenericFun_t decoder[], const ASN1FreeFun_t freemem[],




More information about the wine-cvs mailing list