Alexandre Julliard : inkobj: 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: b7c57404268e0ff3cf3180e317cbdc565f448c02
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7c57404268e0ff3cf3180e317cbdc565f448c02
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Feb 23 10:06:14 2021 +0100
inkobj: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/inkobj/Makefile.in | 2 +-
dlls/inkobj/inkobj.c | 18 ------------------
2 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/dlls/inkobj/Makefile.in b/dlls/inkobj/Makefile.in
index e5cede52242..ae8d5b9241d 100644
--- a/dlls/inkobj/Makefile.in
+++ b/dlls/inkobj/Makefile.in
@@ -1,6 +1,6 @@
MODULE = inkobj.dll
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
inkobj.c
diff --git a/dlls/inkobj/inkobj.c b/dlls/inkobj/inkobj.c
index f199f567929..d72d273a43a 100644
--- a/dlls/inkobj/inkobj.c
+++ b/dlls/inkobj/inkobj.c
@@ -21,24 +21,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(inkobj);
static LONG INKOBJ_refCount;
-/*****************************************************
- * DllMain (INKOBJ.init)
- */
-BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved)
-{
- TRACE("(%p, %d, %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;
-}
-
/*****************************************************
* DllCanUnloadNow (INKOBJ.@)
*/
More information about the wine-cvs
mailing list