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

Alexandre Julliard julliard at winehq.org
Thu Feb 25 16:45:36 CST 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Feb 25 08:58:56 2021 +0100

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

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

---

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

diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in
index b6edec5f6a9..5c4acb232a4 100644
--- a/dlls/uiautomationcore/Makefile.in
+++ b/dlls/uiautomationcore/Makefile.in
@@ -1,7 +1,7 @@
 MODULE = uiautomationcore.dll
 IMPORTLIB = uiautomationcore
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	uia_main.c
diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c
index 77460aa174c..42014af6035 100644
--- a/dlls/uiautomationcore/uia_main.c
+++ b/dlls/uiautomationcore/uia_main.c
@@ -22,21 +22,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(uiautomation);
 
-BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, void *lpv)
-{
-    TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv);
-
-    switch(fdwReason) {
-    case DLL_WINE_PREATTACH:
-        return FALSE;  /* prefer native version */
-    case DLL_PROCESS_ATTACH:
-        DisableThreadLibraryCalls(hInstDLL);
-        break;
-    }
-
-    return TRUE;
-}
-
 /***********************************************************************
  *          UiaClientsAreListening (uiautomationcore.@)
  */




More information about the wine-cvs mailing list