Module: wine Branch: master Commit: faa7af5e783d3961fbb0c0207821ffdd0e1e0105 URL: https://source.winehq.org/git/wine.git/?a=commit;h=faa7af5e783d3961fbb0c0207...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Feb 25 08:59:17 2021 +0100
wer: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wer/Makefile.in | 2 +- dlls/wer/main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/dlls/wer/Makefile.in b/dlls/wer/Makefile.in index 1de79a1d25c..a811b4576aa 100644 --- a/dlls/wer/Makefile.in +++ b/dlls/wer/Makefile.in @@ -2,7 +2,7 @@ MODULE = wer.dll IMPORTLIB = wer IMPORTS = advapi32
-EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ main.c diff --git a/dlls/wer/main.c b/dlls/wer/main.c index ad57cbdf40e..e54e6d6e0c9 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -50,22 +50,6 @@ static struct list report_table = LIST_INIT(report_table);
static const WCHAR regpath_exclude[] = L"Software\Microsoft\Windows Error Reporting\ExcludedApplications";
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%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; -} - /*********************************************************************** * WerAddExcludedApplication (wer.@) *