Alexandre Julliard : dcomp: Use --prefer-native instead of DLL_WINE_PREATTACH.
Alexandre Julliard
julliard at winehq.org
Thu Feb 18 16:06:06 CST 2021
Module: wine
Branch: master
Commit: 146ff01f5465ba4d6c769ac452a00e8a6a4b112d
URL: https://source.winehq.org/git/wine.git/?a=commit;h=146ff01f5465ba4d6c769ac452a00e8a6a4b112d
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Feb 18 11:43:26 2021 +0100
dcomp: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dcomp/Makefile.in | 5 ++---
dlls/dcomp/main.c | 44 --------------------------------------------
2 files changed, 2 insertions(+), 47 deletions(-)
diff --git a/dlls/dcomp/Makefile.in b/dlls/dcomp/Makefile.in
index 436b88993ab..c02907f3373 100644
--- a/dlls/dcomp/Makefile.in
+++ b/dlls/dcomp/Makefile.in
@@ -1,9 +1,8 @@
MODULE = dcomp.dll
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
- device.c \
- main.c
+ device.c
RC_SRCS = version.rc
diff --git a/dlls/dcomp/main.c b/dlls/dcomp/main.c
deleted file mode 100644
index b0b911a9bf5..00000000000
--- a/dlls/dcomp/main.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * DirectComposition Library
- *
- * Copyright 2020 Austin English
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dcomp);
-
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
- TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
-
- switch (fdwReason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(hinstDLL);
- break;
- default:
- break;
- }
-
- return TRUE;
-}
More information about the wine-cvs
mailing list