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

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


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

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

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

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

---

 dlls/svrapi/Makefile.in   |  5 +----
 dlls/svrapi/svrapi_main.c | 46 ----------------------------------------------
 2 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/dlls/svrapi/Makefile.in b/dlls/svrapi/Makefile.in
index c9467f28d97..4ebcc804cda 100644
--- a/dlls/svrapi/Makefile.in
+++ b/dlls/svrapi/Makefile.in
@@ -1,6 +1,3 @@
 MODULE    = svrapi.dll
 
-EXTRADLLFLAGS = -mno-cygwin
-
-C_SRCS = \
-	svrapi_main.c
+EXTRADLLFLAGS = -Wb,--prefer-native
diff --git a/dlls/svrapi/svrapi_main.c b/dlls/svrapi/svrapi_main.c
deleted file mode 100644
index 8c7b007fc5a..00000000000
--- a/dlls/svrapi/svrapi_main.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-* Part of NETAPI on Windows 9x
-*
-* Copyright 2006 Konstantin Petrov
-*
-* 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 "winerror.h"
-#include "svrapi.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(svrapi);
-
-/***********************************************************************
- *             DllMain (SVRAPI.init)
- */
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
-{
-    TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad);
-
-    switch(fdwReason) {
-        case DLL_WINE_PREATTACH:
-            return FALSE; /*prefer native version*/
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(hinstDLL);
-            break;
-    }
-    return TRUE;
-}




More information about the wine-cvs mailing list