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

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

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

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

---

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

diff --git a/dlls/pstorec/Makefile.in b/dlls/pstorec/Makefile.in
index f8009e21a22..dd4dd616a33 100644
--- a/dlls/pstorec/Makefile.in
+++ b/dlls/pstorec/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = pstorec.dll
 IMPORTS   = uuid
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	pstorec.c
diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c
index 02cd803c116..65debd3e6f4 100644
--- a/dlls/pstorec/pstorec.c
+++ b/dlls/pstorec/pstorec.c
@@ -43,21 +43,6 @@ static inline PStore_impl *impl_from_IPStore(IPStore *iface)
     return CONTAINING_RECORD(iface, PStore_impl, IPStore_iface);
 }
 
-BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
-{
-    TRACE("%p %x %p\n", hinst, fdwReason, fImpLoad);
-
-    switch (fdwReason)
-    {
-    case DLL_WINE_PREATTACH:
-        return FALSE;  /* prefer native version */
-    case DLL_PROCESS_ATTACH:
-        DisableThreadLibraryCalls(hinst);
-        break;
-    }
-    return TRUE;
-}
-
 /**************************************************************************
  *  IPStore->QueryInterface
  */




More information about the wine-cvs mailing list