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

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


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

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

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

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

---

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

diff --git a/dlls/gpkcsp/Makefile.in b/dlls/gpkcsp/Makefile.in
index fbd4008eb0b..49efda4ebd1 100644
--- a/dlls/gpkcsp/Makefile.in
+++ b/dlls/gpkcsp/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = gpkcsp.dll
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	main.c
diff --git a/dlls/gpkcsp/main.c b/dlls/gpkcsp/main.c
index 52d9112825e..4e890fafbe7 100644
--- a/dlls/gpkcsp/main.c
+++ b/dlls/gpkcsp/main.c
@@ -25,21 +25,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(gpkcsp);
 
-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;
-}
-
 /*****************************************************
  *    DllRegisterServer (GPKCSP.@)
  */




More information about the wine-cvs mailing list