Alexandre Julliard : wshom.ocx: Use --prefer-native instead of DLL_WINE_PREATTACH.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Fri Feb 26 10:24:31 2021 +0100

wshom.ocx: Use --prefer-native instead of DLL_WINE_PREATTACH.

Signed-off-by: Alexandre Julliard

---

dlls/wshom.ocx/Makefile.in  | 2 +-
 dlls/wshom.ocx/wshom_main.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in
index 6cbec442032..fc967aa3c4c 100644
--- a/dlls/wshom.ocx/Makefile.in
+++ b/dlls/wshom.ocx/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = wshom.ocx
 IMPORTS   = uuid oleaut32 ole32 shell32 user32 advapi32

-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native

C_SRCS = \
    shell.c \
diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c
index a44b44ce8f4..2a7e909bcce 100644
--- a/dlls/wshom.ocx/wshom_main.c
+++ b/dlls/wshom.ocx/wshom_main.c
@@ -222,8 +222,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)

switch(fdwReason)
     {
-    case DLL_WINE_PREATTACH:
-        return FALSE;  /* prefer native version */
     case DLL_PROCESS_ATTACH:
         wshom_instance = hInstDLL;
         DisableThreadLibraryCalls(wshom_instance);