Alexandre Julliard : fntcache: Use --prefer-native instead of DLL_WINE_PREATTACH.
Alexandre Julliard
julliard at winehq.org
Tue Feb 23 15:54:46 CST 2021
Module: wine
Branch: master
Commit: 7df6c7edfe44699970f096b72fe9c59cbf19d09d
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7df6c7edfe44699970f096b72fe9c59cbf19d09d
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Feb 23 10:05:44 2021 +0100
fntcache: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/fntcache/Makefile.in | 2 +-
dlls/fntcache/main.c | 21 ---------------------
2 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/dlls/fntcache/Makefile.in b/dlls/fntcache/Makefile.in
index 8e791a35e34..167bc28bcff 100644
--- a/dlls/fntcache/Makefile.in
+++ b/dlls/fntcache/Makefile.in
@@ -1,7 +1,7 @@
MODULE = fntcache.dll
IMPORTS = advapi32
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
main.c
diff --git a/dlls/fntcache/main.c b/dlls/fntcache/main.c
index f579c4ebf3a..0f8508652f2 100644
--- a/dlls/fntcache/main.c
+++ b/dlls/fntcache/main.c
@@ -25,30 +25,9 @@
WINE_DEFAULT_DEBUG_CHANNEL(fontcache);
-static HINSTANCE hInst;
static SERVICE_STATUS_HANDLE service_handle;
static HANDLE stop_event;
-/***********************************************************************
- * DllMain (fntcache.@)
- */
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
- TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
-
- switch (fdwReason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(hinstDLL);
- hInst = hinstDLL;
- break;
- }
-
- return TRUE;
-}
-
static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, void *event_data, void *context )
{
SERVICE_STATUS status;
More information about the wine-cvs
mailing list