Alexandre Julliard : userenv: Use --prefer-native instead of DLL_WINE_PREATTACH.
Alexandre Julliard
julliard at winehq.org
Thu Feb 25 16:45:36 CST 2021
Module: wine
Branch: master
Commit: e6a41c26697f1489690c818dc76e00d7a5008dd6
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6a41c26697f1489690c818dc76e00d7a5008dd6
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Feb 25 08:59:05 2021 +0100
userenv: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/userenv/Makefile.in | 2 +-
dlls/userenv/userenv_main.c | 15 ---------------
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/dlls/userenv/Makefile.in b/dlls/userenv/Makefile.in
index df719af26ca..9757eb7ceb4 100644
--- a/dlls/userenv/Makefile.in
+++ b/dlls/userenv/Makefile.in
@@ -2,7 +2,7 @@ MODULE = userenv.dll
IMPORTS = advapi32
IMPORTLIB = userenv
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
userenv_main.c
diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c
index 58e610f6c6e..87ace7d5c11 100644
--- a/dlls/userenv/userenv_main.c
+++ b/dlls/userenv/userenv_main.c
@@ -35,21 +35,6 @@
WINE_DEFAULT_DEBUG_CHANNEL( userenv );
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
- TRACE("%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;
- }
- return TRUE;
-}
-
static BOOL get_reg_value(WCHAR *env, HKEY hkey, const WCHAR *name, WCHAR *val, DWORD size)
{
DWORD type, res_size=0;
More information about the wine-cvs
mailing list