Alexandre Julliard : dwmapi: 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: e701ce3afaab40696eaee46beb07b67838eacafd
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e701ce3afaab40696eaee46beb07b67838eacafd

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

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

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

---

 dlls/dwmapi/Makefile.in   |  2 +-
 dlls/dwmapi/dwmapi_main.c | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in
index 3a3691326f8..682bf68b111 100644
--- a/dlls/dwmapi/Makefile.in
+++ b/dlls/dwmapi/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = dwmapi.dll
 IMPORTLIB = dwmapi
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	dwmapi_main.c
diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c
index 45c33c2169a..b6c89f3a7f8 100644
--- a/dlls/dwmapi/dwmapi_main.c
+++ b/dlls/dwmapi/dwmapi_main.c
@@ -32,20 +32,6 @@
 WINE_DEFAULT_DEBUG_CHANNEL(dwmapi);
 
 
-/* At process attach */
-BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
-{
-    switch(fdwReason)
-    {
-    case DLL_WINE_PREATTACH:
-        return FALSE;  /* prefer native version */
-    case DLL_PROCESS_ATTACH:
-        DisableThreadLibraryCalls( hInstDLL );
-        break;
-    }
-    return TRUE;
-}
-
 /**********************************************************************
  *           DwmIsCompositionEnabled         (DWMAPI.@)
  */




More information about the wine-cvs mailing list