Alexandre Julliard : esent: 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: b3bb24ef31df51cb1597f2ed80591b1685ed11a0
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=b3bb24ef31df51cb1597f2ed80591b1685ed11a0

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

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

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

---

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

diff --git a/dlls/esent/Makefile.in b/dlls/esent/Makefile.in
index b789ee2a65c..c06056b22af 100644
--- a/dlls/esent/Makefile.in
+++ b/dlls/esent/Makefile.in
@@ -1,6 +1,3 @@
 MODULE = esent.dll
 
-EXTRADLLFLAGS = -mno-cygwin
-
-C_SRCS = \
-	esent_main.c
+EXTRADLLFLAGS = -Wb,--prefer-native
diff --git a/dlls/esent/esent_main.c b/dlls/esent/esent_main.c
deleted file mode 100644
index f555676f422..00000000000
--- a/dlls/esent/esent_main.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2015 Jacek Caban for CodeWeavers
- *
- * 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 "windows.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(esent);
-
-BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
-{
-    TRACE("(%p, %u, %p)\n", instance, reason, 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