Module: wine Branch: master Commit: 02755e0a5337d06c75b90b63c4eb5c8408c46b9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=02755e0a5337d06c75b90b63c...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Feb 26 10:24:26 2021 +0100
wmphoto: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wmphoto/Makefile.in | 2 +- dlls/wmphoto/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/dlls/wmphoto/Makefile.in b/dlls/wmphoto/Makefile.in index 8a626e61f18..d9bfe9542f3 100644 --- a/dlls/wmphoto/Makefile.in +++ b/dlls/wmphoto/Makefile.in @@ -2,7 +2,7 @@ MODULE = wmphoto.dll IMPORTS = windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi PARENTSRC = ../windowscodecs
-EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native EXTRAINCL = $(JXRLIB_CFLAGS)
C_SRCS = \ diff --git a/dlls/wmphoto/main.c b/dlls/wmphoto/main.c index 7659dcb2ca8..5c92965b575 100644 --- a/dlls/wmphoto/main.c +++ b/dlls/wmphoto/main.c @@ -135,8 +135,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) windowscodecs_module = instance; DisableThreadLibraryCalls(instance); break; - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ }
return TRUE;