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

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


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

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

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

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

---

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

diff --git a/dlls/ncrypt/Makefile.in b/dlls/ncrypt/Makefile.in
index c387c35d854..9e6c9f5ff9a 100644
--- a/dlls/ncrypt/Makefile.in
+++ b/dlls/ncrypt/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = ncrypt.dll
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	main.c
diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c
index a8dda3c54a0..f23b239d93f 100644
--- a/dlls/ncrypt/main.c
+++ b/dlls/ncrypt/main.c
@@ -27,22 +27,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ncrypt);
 
-BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
-{
-    TRACE("(%p, %u, %p)\n", instance, reason, reserved);
-
-    switch (reason)
-    {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(instance);
-            break;
-    }
-
-    return TRUE;
-}
-
 SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key,
                                                 const WCHAR *algid, const WCHAR *name, DWORD keyspec,
                                                 DWORD flags)




More information about the wine-cvs mailing list