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

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

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

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

---

 dlls/sfc_os/Makefile.in |  2 +-
 dlls/sfc_os/sfc_os.c    | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/dlls/sfc_os/Makefile.in b/dlls/sfc_os/Makefile.in
index 1329b2e7967..561b49911b3 100644
--- a/dlls/sfc_os/Makefile.in
+++ b/dlls/sfc_os/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = sfc_os.dll
 IMPORTLIB = sfc_os
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = sfc_os.c
diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c
index 6193dda43ef..f6163f5b4eb 100644
--- a/dlls/sfc_os/sfc_os.c
+++ b/dlls/sfc_os/sfc_os.c
@@ -30,25 +30,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(sfc);
 
-/******************************************************************
- *      DllMain
- */
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-    TRACE("(%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;
-}
-
 /******************************************************************
  *      SfcGetNextProtectedFile     [sfc_os.@]
  */




More information about the wine-cvs mailing list