Module: wine Branch: master Commit: 7a24a471d3bfbd7cc67097c1cca00cd5a473ab6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a24a471d3bfbd7cc67097c1c...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Feb 23 10:05:48 2021 +0100
fontsub: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/fontsub/Makefile.in | 2 +- dlls/fontsub/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/dlls/fontsub/Makefile.in b/dlls/fontsub/Makefile.in index c1b36e65175..7ce57d27cdf 100644 --- a/dlls/fontsub/Makefile.in +++ b/dlls/fontsub/Makefile.in @@ -1,6 +1,6 @@ MODULE = fontsub.dll
-EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ main.c diff --git a/dlls/fontsub/main.c b/dlls/fontsub/main.c index a0a6032d051..17bc0c7cc70 100644 --- a/dlls/fontsub/main.c +++ b/dlls/fontsub/main.c @@ -25,21 +25,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(fontsub);
-BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%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; -} - ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, unsigned char **dest, ULONG *dest_len, ULONG *written, const unsigned short flags, const unsigned short face_index, const unsigned short format, const unsigned short lang, const unsigned short platform, const unsigned short encoding,