Alexandre Julliard : xolehlp: Use --prefer-native instead of DLL_WINE_PREATTACH.
Alexandre Julliard
julliard at winehq.org
Thu Feb 25 16:45:37 CST 2021
Module: wine
Branch: master
Commit: 1b826d9f563e235ea366e4599535f9844adab295
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b826d9f563e235ea366e4599535f9844adab295
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Feb 25 08:59:52 2021 +0100
xolehlp: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/xolehlp/Makefile.in | 2 +-
dlls/xolehlp/xolehlp.c | 15 ---------------
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/dlls/xolehlp/Makefile.in b/dlls/xolehlp/Makefile.in
index 37b1d0169fe..629db5e01be 100644
--- a/dlls/xolehlp/Makefile.in
+++ b/dlls/xolehlp/Makefile.in
@@ -1,6 +1,6 @@
MODULE = xolehlp.dll
IMPORTS = adsiid uuid
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = xolehlp.c
diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c
index 29b30244451..d3355c1c34e 100644
--- a/dlls/xolehlp/xolehlp.c
+++ b/dlls/xolehlp/xolehlp.c
@@ -630,21 +630,6 @@ static HRESULT TransactionManager_Create(REFIID riid, void **ppv)
}
/* DTC Proxy Core Object end */
-BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
-{
- TRACE("%p, %u, %p\n", hinst, reason, reserved);
-
- switch (reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls( hinst );
- break;
- }
- return TRUE;
-}
-
static BOOL is_local_machineA( const CHAR *server )
{
static const CHAR dot[] = ".";
More information about the wine-cvs
mailing list