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

Alexandre Julliard julliard at winehq.org
Mon Feb 22 15:43:21 CST 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Feb 22 09:23:45 2021 +0100

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

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

---

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

diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in
index 83bd379c1ba..e79b3fe9e33 100644
--- a/dlls/aclui/Makefile.in
+++ b/dlls/aclui/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = aclui.dll
 IMPORTLIB = aclui
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = aclui_main.c
diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c
index 033a47191cb..1a03f30df24 100644
--- a/dlls/aclui/aclui_main.c
+++ b/dlls/aclui/aclui_main.c
@@ -31,21 +31,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(aclui);
 
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-    TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
-
-    switch (fdwReason)
-    {
-    case DLL_WINE_PREATTACH:
-        return FALSE;    /* prefer native version */
-    case DLL_PROCESS_ATTACH:
-        DisableThreadLibraryCalls(hinstDLL);
-        break;
-    }
-    return TRUE;
-}
-
 HPROPSHEETPAGE WINAPI CreateSecurityPage(LPSECURITYINFO psi)
 {
     FIXME("(%p): stub\n", psi);




More information about the wine-cvs mailing list