From b11d58aef5c1946a18a8549925cc9a2adfe7e3e0 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Thu, 28 May 2020 18:49:15 +0100
Subject: [PATCH] clean up BUGTRAP code in win32/win_main.c to avoid unmatched
}
(though that said we don't officially care about the win32 folder files anymore)
---
src/win32/win_main.c | 29 ++++++++++-------------------
1 file changed, 10 insertions(+), 19 deletions(-)
diff --git a/src/win32/win_main.c b/src/win32/win_main.c
index 8a29f7e18..e1d90881b 100644
--- a/src/win32/win_main.c
+++ b/src/win32/win_main.c
@@ -643,37 +643,28 @@ int WINAPI WinMain (HINSTANCE hInstance,
int nCmdShow)
{
int Result = -1;
-
-#if 0
- // Win95 and NT <4 don't have this, so link at runtime.
- p_IsDebuggerPresent pfnIsDebuggerPresent = (p_IsDebuggerPresent)GetProcAddress(GetModuleHandleA("kernel32.dll"),"IsDebuggerPresent");
-#endif
-
UNREFERENCED_PARAMETER(hPrevInstance);
UNREFERENCED_PARAMETER(lpCmdLine);
UNREFERENCED_PARAMETER(nCmdShow);
+ {
#if 0
+ p_IsDebuggerPresent pfnIsDebuggerPresent = (p_IsDebuggerPresent)GetProcAddress(GetModuleHandleA("kernel32.dll"),"IsDebuggerPresent");
+ if((!pfnIsDebuggerPresent || !pfnIsDebuggerPresent())
#ifdef BUGTRAP
- // Try BugTrap first.
- if((!pfnIsDebuggerPresent || !pfnIsDebuggerPresent()) && InitBugTrap())
- Result = HandledWinMain(hInstance);
- else
- {
+ && !InitBugTrap()
#endif
- // Try Dr MinGW's exception handler.
- if (!pfnIsDebuggerPresent || !pfnIsDebuggerPresent())
+ )
#endif
+ {
LoadLibraryA("exchndl.dll");
-
+ }
+ }
#ifndef __MINGW32__
- prevExceptionFilter = SetUnhandledExceptionFilter(RecordExceptionInfo);
+ prevExceptionFilter = SetUnhandledExceptionFilter(RecordExceptionInfo);
#endif
-
- Result = HandledWinMain(hInstance);
+ Result = HandledWinMain(hInstance);
#ifdef BUGTRAP
- } // BT failure clause.
-
// This is safe even if BT didn't start.
ShutdownBugTrap();
#endif
--
GitLab