Module: wine Branch: master Commit: de2a6d9b38f5abac6806036ccce39e8982d197c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de2a6d9b38f5abac6806036cc...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Feb 23 10:06:28 2021 +0100
mfplat: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/mfplat/Makefile.in | 2 +- dlls/mfplat/main.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index bc04a440826..9e5c607deae 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -2,7 +2,7 @@ MODULE = mfplat.dll IMPORTLIB = mfplat IMPORTS = advapi32 ole32 mfuuid propsys rtworkq
-EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ buffer.c \ diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 99afbaf8a46..999d8a86147 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -702,20 +702,6 @@ static BOOL GUIDFromString(LPCWSTR s, GUID *id) return FALSE; }
-BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -} - static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, const MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes)