Alexandre Julliard : mscat32: 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: 1ea7ddf8c6587b8baf6c4ff7cc4595d2f0a58fd3
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ea7ddf8c6587b8baf6c4ff7cc4595d2f0a58fd3
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Feb 18 11:45:01 2021 +0100
mscat32: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mscat32/Makefile.in | 5 +----
dlls/mscat32/main.c | 40 ----------------------------------------
2 files changed, 1 insertion(+), 44 deletions(-)
diff --git a/dlls/mscat32/Makefile.in b/dlls/mscat32/Makefile.in
index 4ccaf8c42c8..cc53ef65cc1 100644
--- a/dlls/mscat32/Makefile.in
+++ b/dlls/mscat32/Makefile.in
@@ -1,7 +1,4 @@
MODULE = mscat32.dll
IMPORTS = wintrust
-EXTRADLLFLAGS = -mno-cygwin
-
-C_SRCS = \
- main.c
+EXTRADLLFLAGS = -Wb,--prefer-native
diff --git a/dlls/mscat32/main.c b/dlls/mscat32/main.c
deleted file mode 100644
index 8408070282c..00000000000
--- a/dlls/mscat32/main.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* mscat32.dll - Backend for Microsoft's MakeCat command-line tool
- *
- * Copyright (C) 2007 Alexander N. Sørnes <alex at thehandofagony.com>
- *
- * This program 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 program 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 program; 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(mscat);
-
-
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
- TRACE("(%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved);
-
- if (fdwReason == DLL_WINE_PREATTACH) return FALSE; /* prefer native version */
-
- if (fdwReason == DLL_PROCESS_ATTACH)
- {
- DisableThreadLibraryCalls( hinstDLL );
- }
-
- return TRUE;
-}
More information about the wine-cvs
mailing list