Module: wine Branch: master Commit: 0ed2adf60f87e9c698759a915b16aeceef945acc URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ed2adf60f87e9c698759a915...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Mar 2 10:53:55 2021 +0100
comsvcs: Use --prefer_native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/comsvcs/Makefile.in | 2 +- dlls/comsvcs/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index 7845400cb2e..54d4e6a9ded 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -2,7 +2,7 @@ MODULE = comsvcs.dll IMPORTLIB = comsvcs IMPORTS = ole32 uuid
-EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ main.c diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 74704077ecb..3023783bdf5 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -360,8 +360,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv) { switch(reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: COMSVCS_hInstance = hinst; DisableThreadLibraryCalls(hinst);