Module: wine Branch: master Commit: 8a74df64836fff539e71b3e26708d8ae1290aa92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a74df64836fff539e71b3e26...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Feb 26 10:23:14 2021 +0100
msscript.ocx: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msscript.ocx/Makefile.in | 2 +- dlls/msscript.ocx/msscript.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/dlls/msscript.ocx/Makefile.in b/dlls/msscript.ocx/Makefile.in index 304b924f931..28b0dd1c132 100644 --- a/dlls/msscript.ocx/Makefile.in +++ b/dlls/msscript.ocx/Makefile.in @@ -3,7 +3,7 @@ RC_SRCS = msscript.rc IDL_SRCS = msscript.idl IMPORTS = gdi32 user32 ole32 oleaut32
-EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ msscript.c diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 70dc05f61e0..15d15ab4349 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -4013,8 +4013,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) TRACE("(%p %d %p)\n", instance, reason, reserved);
switch(reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: msscript_instance = instance; DisableThreadLibraryCalls(instance);