Module: wine Branch: master Commit: a8aecf946688cba1a98aa7355d904f5e9dfe8ebc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8aecf946688cba1a98aa7355...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Feb 24 10:29:12 2021 +0100
t2embed: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/t2embed/Makefile.in | 2 +- dlls/t2embed/main.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/dlls/t2embed/Makefile.in b/dlls/t2embed/Makefile.in index f2b0583f987..faceac9b3a4 100644 --- a/dlls/t2embed/Makefile.in +++ b/dlls/t2embed/Makefile.in @@ -2,7 +2,7 @@ MODULE = t2embed.dll IMPORTLIB = t2embed IMPORTS = gdi32 advapi32
-EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ main.c diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 12005640281..f79d4d69eb5 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -28,20 +28,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(t2embed);
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - LONG WINAPI TTLoadEmbeddedFont(HANDLE *phFontReference, ULONG ulFlags, ULONG *pulPrivStatus, ULONG ulPrivs, ULONG *pulStatus, READEMBEDPROC lpfnReadFromStream,