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

Alexandre Julliard julliard at winehq.org
Wed Feb 24 15:45:39 CST 2021


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

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

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

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

---

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

diff --git a/dlls/ninput/Makefile.in b/dlls/ninput/Makefile.in
index 2afd034f75d..3ebda8e9578 100644
--- a/dlls/ninput/Makefile.in
+++ b/dlls/ninput/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = ninput.dll
 IMPORTLIB = ninput
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	main.c
diff --git a/dlls/ninput/main.c b/dlls/ninput/main.c
index 8635ffb0e94..56d82b08ac5 100644
--- a/dlls/ninput/main.c
+++ b/dlls/ninput/main.c
@@ -165,18 +165,3 @@ HRESULT WINAPI ProcessInertiaInteractionContext(HINTERACTIONCONTEXT context)
     FIXME("context %p: stub!\n", context);
     return E_NOTIMPL;
 }
-
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
-{
-    TRACE("(%p, %d, %p)\n", inst, reason, reserved);
-
-    switch (reason)
-    {
-    case DLL_WINE_PREATTACH:
-        return FALSE;    /* prefer native version */
-    case DLL_PROCESS_ATTACH:
-        DisableThreadLibraryCalls(inst);
-        break;
-    }
-    return TRUE;
-}




More information about the wine-cvs mailing list