Alexandre Julliard : npptools: Use --prefer-native instead of DLL_WINE_PREATTACH.

Alexandre Julliard julliard at winehq.org
Fri Feb 19 17:20:08 CST 2021


Module: wine
Branch: master
Commit: 3fe970ccebcf96a30f9a36e9bfb2e75ac9b462b5
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3fe970ccebcf96a30f9a36e9bfb2e75ac9b462b5

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Feb 18 11:48:03 2021 +0100

npptools: Use --prefer-native instead of DLL_WINE_PREATTACH.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/npptools/Makefile.in |  5 +----
 dlls/npptools/main.c      | 37 -------------------------------------
 2 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/dlls/npptools/Makefile.in b/dlls/npptools/Makefile.in
index 64ff9691aa6..4aa7f466fac 100644
--- a/dlls/npptools/Makefile.in
+++ b/dlls/npptools/Makefile.in
@@ -1,6 +1,3 @@
 MODULE    = npptools.dll
 
-EXTRADLLFLAGS = -mno-cygwin
-
-C_SRCS = \
-	main.c
+EXTRADLLFLAGS = -Wb,--prefer-native
diff --git a/dlls/npptools/main.c b/dlls/npptools/main.c
deleted file mode 100644
index ad2b8931556..00000000000
--- a/dlls/npptools/main.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *
- * Copyright 2014 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"
-
-BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
-{
-    switch (reason)
-    {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(instance);
-            break;
-    }
-
-    return TRUE;
-}




More information about the wine-cvs mailing list