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

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


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

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

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

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

---

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

diff --git a/dlls/wimgapi/Makefile.in b/dlls/wimgapi/Makefile.in
index a004ac11879..cc69f471edb 100644
--- a/dlls/wimgapi/Makefile.in
+++ b/dlls/wimgapi/Makefile.in
@@ -1,6 +1,6 @@
 MODULE = wimgapi.dll
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	main.c
diff --git a/dlls/wimgapi/main.c b/dlls/wimgapi/main.c
index e092fdeaaf1..87496e92f96 100644
--- a/dlls/wimgapi/main.c
+++ b/dlls/wimgapi/main.c
@@ -28,22 +28,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(wimgapi);
 
-BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
-{
-    TRACE("(0x%p, %d, %p)\n", instance, reason, reserved);
-
-    switch (reason)
-    {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(instance);
-            break;
-    }
-
-    return TRUE;
-}
-
 DWORD WINAPI WIMRegisterMessageCallback(HANDLE wim, FARPROC callback, PVOID data)
 {
     FIXME("(%p %p %p) stub\n", wim, callback, data);




More information about the wine-cvs mailing list