ensure exception logging doesn't happen when a debugger is attached

1 files changed, 134 insertions, 130 deletions

diff --git a/NorthstarDedicatedTest/logging.cpp b/NorthstarDedicatedTest/logging.cpp
index 5fa7e39d..09ae6961 100644
--- a/NorthstarDedicatedTest/logging.cpp
+++ b/NorthstarDedicatedTest/logging.cpp
@@ -16,145 +16,149 @@ long __stdcall ExceptionFilter(EXCEPTION_POINTERS* exceptionInfo)
 	if (logged)
 		return EXCEPTION_CONTINUE_SEARCH;
 
-	const DWORD exceptionCode = exceptionInfo->ExceptionRecord->ExceptionCode;
-	if (exceptionCode != EXCEPTION_ACCESS_VIOLATION && exceptionCode != EXCEPTION_ARRAY_BOUNDS_EXCEEDED &&
-		exceptionCode != EXCEPTION_DATATYPE_MISALIGNMENT && exceptionCode != EXCEPTION_FLT_DENORMAL_OPERAND &&
-		exceptionCode != EXCEPTION_FLT_DIVIDE_BY_ZERO && exceptionCode != EXCEPTION_FLT_INEXACT_RESULT &&
-		exceptionCode != EXCEPTION_FLT_INVALID_OPERATION && exceptionCode != EXCEPTION_FLT_OVERFLOW &&
-		exceptionCode != EXCEPTION_FLT_STACK_CHECK && exceptionCode != EXCEPTION_FLT_UNDERFLOW &&
-		exceptionCode != EXCEPTION_ILLEGAL_INSTRUCTION && exceptionCode != EXCEPTION_IN_PAGE_ERROR &&
-		exceptionCode != EXCEPTION_INT_DIVIDE_BY_ZERO && exceptionCode != EXCEPTION_INT_OVERFLOW &&
-		exceptionCode != EXCEPTION_INVALID_DISPOSITION && exceptionCode != EXCEPTION_NONCONTINUABLE_EXCEPTION &&
-		exceptionCode != EXCEPTION_PRIV_INSTRUCTION && exceptionCode != EXCEPTION_STACK_OVERFLOW)
-		return EXCEPTION_CONTINUE_SEARCH;
-
-	std::stringstream exceptionCause;
-	switch (exceptionCode)
-	{
-	case EXCEPTION_ACCESS_VIOLATION:
-	case EXCEPTION_IN_PAGE_ERROR:
+	if (!IsDebuggerPresent())
 	{
-		exceptionCause << "Cause: Access Violation" << std::endl;
+		const DWORD exceptionCode = exceptionInfo->ExceptionRecord->ExceptionCode;
+		if (exceptionCode != EXCEPTION_ACCESS_VIOLATION && exceptionCode != EXCEPTION_ARRAY_BOUNDS_EXCEEDED &&
+			exceptionCode != EXCEPTION_DATATYPE_MISALIGNMENT && exceptionCode != EXCEPTION_FLT_DENORMAL_OPERAND &&
+			exceptionCode != EXCEPTION_FLT_DIVIDE_BY_ZERO && exceptionCode != EXCEPTION_FLT_INEXACT_RESULT &&
+			exceptionCode != EXCEPTION_FLT_INVALID_OPERATION && exceptionCode != EXCEPTION_FLT_OVERFLOW &&
+			exceptionCode != EXCEPTION_FLT_STACK_CHECK && exceptionCode != EXCEPTION_FLT_UNDERFLOW &&
+			exceptionCode != EXCEPTION_ILLEGAL_INSTRUCTION && exceptionCode != EXCEPTION_IN_PAGE_ERROR &&
+			exceptionCode != EXCEPTION_INT_DIVIDE_BY_ZERO && exceptionCode != EXCEPTION_INT_OVERFLOW &&
+			exceptionCode != EXCEPTION_INVALID_DISPOSITION && exceptionCode != EXCEPTION_NONCONTINUABLE_EXCEPTION &&
+			exceptionCode != EXCEPTION_PRIV_INSTRUCTION && exceptionCode != EXCEPTION_STACK_OVERFLOW)
+			return EXCEPTION_CONTINUE_SEARCH;
+
+		std::stringstream exceptionCause;
+		switch (exceptionCode)
+		{
+		case EXCEPTION_ACCESS_VIOLATION:
+		case EXCEPTION_IN_PAGE_ERROR:
+		{
+			exceptionCause << "Cause: Access Violation" << std::endl;
 
-		auto exceptionInfo0 = exceptionInfo->ExceptionRecord->ExceptionInformation[0];
-		auto exceptionInfo1 = exceptionInfo->ExceptionRecord->ExceptionInformation[1];
+			auto exceptionInfo0 = exceptionInfo->ExceptionRecord->ExceptionInformation[0];
+			auto exceptionInfo1 = exceptionInfo->ExceptionRecord->ExceptionInformation[1];
 
-		if (!exceptionInfo0)
-			exceptionCause << "Attempted to read from: 0x" << std::setw(8) << std::setfill('0') << std::hex << exceptionInfo1;
-		else if (exceptionInfo0 == 1)
-			exceptionCause << "Attempted to write to: 0x" << std::setw(8) << std::setfill('0') << std::hex << exceptionInfo1;
-		else if (exceptionInfo0 == 8)
-			exceptionCause << "Data Execution Prevention (DEP) at: 0x" << std::setw(8) << std::setfill('0') << std::hex << exceptionInfo1;
-		else
-			exceptionCause << "Unknown access violation at: 0x" << std::setw(8) << std::setfill('0') << std::hex << exceptionInfo1;
+			if (!exceptionInfo0)
+				exceptionCause << "Attempted to read from: 0x" << std::setw(8) << std::setfill('0') << std::hex << exceptionInfo1;
+			else if (exceptionInfo0 == 1)
+				exceptionCause << "Attempted to write to: 0x" << std::setw(8) << std::setfill('0') << std::hex << exceptionInfo1;
+			else if (exceptionInfo0 == 8)
+				exceptionCause << "Data Execution Prevention (DEP) at: 0x" << std::setw(8) << std::setfill('0') << std::hex << exceptionInfo1;
+			else
+				exceptionCause << "Unknown access violation at: 0x" << std::setw(8) << std::setfill('0') << std::hex << exceptionInfo1;
 
-		break;
-	}
-	case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
-		exceptionCause << "Cause: Array bounds exceeded";
-		break;
-	case EXCEPTION_DATATYPE_MISALIGNMENT:
-		exceptionCause << "Cause: Datatype misalignment";
-		break;
-	case EXCEPTION_FLT_DENORMAL_OPERAND:
-		exceptionCause << "Cause: Denormal operand";
-		break;
-	case EXCEPTION_FLT_DIVIDE_BY_ZERO:
-	case EXCEPTION_INT_DIVIDE_BY_ZERO:
-		exceptionCause << "Cause: Divide by zero";
-		break;
-	case EXCEPTION_FLT_INEXACT_RESULT:
-		exceptionCause << "Cause: Inexact result";
-		break;
-	case EXCEPTION_FLT_INVALID_OPERATION:
-		exceptionCause << "Cause: invalid operation";
-		break;
-	case EXCEPTION_FLT_OVERFLOW:
-	case EXCEPTION_INT_OVERFLOW:
-		exceptionCause << "Cause: Numeric overflow";
-		break;
-	case EXCEPTION_FLT_UNDERFLOW:
-		exceptionCause << "Cause: Numeric underflow";
-		break;
-	case EXCEPTION_FLT_STACK_CHECK:
-		exceptionCause << "Cause: Stack check";
-		break;
-	case EXCEPTION_ILLEGAL_INSTRUCTION:
-		exceptionCause << "Cause: Illegal instruction";
-		break;
-	case EXCEPTION_INVALID_DISPOSITION:
-		exceptionCause << "Cause: Invalid disposition";
-		break;
-	case EXCEPTION_NONCONTINUABLE_EXCEPTION:
-		exceptionCause << "Cause: Noncontinuable exception";
-		break;
-	case EXCEPTION_PRIV_INSTRUCTION:
-		exceptionCause << "Cause: Priv instruction";
-		break;
-	case EXCEPTION_STACK_OVERFLOW:
-		exceptionCause << "Cause: Stack overflow";
-		break;
-	default:
-		exceptionCause << "Cause: Unknown";
-		break;
-	}
+			break;
+		}
+		case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
+			exceptionCause << "Cause: Array bounds exceeded";
+			break;
+		case EXCEPTION_DATATYPE_MISALIGNMENT:
+			exceptionCause << "Cause: Datatype misalignment";
+			break;
+		case EXCEPTION_FLT_DENORMAL_OPERAND:
+			exceptionCause << "Cause: Denormal operand";
+			break;
+		case EXCEPTION_FLT_DIVIDE_BY_ZERO:
+		case EXCEPTION_INT_DIVIDE_BY_ZERO:
+			exceptionCause << "Cause: Divide by zero";
+			break;
+		case EXCEPTION_FLT_INEXACT_RESULT:
+			exceptionCause << "Cause: Inexact result";
+			break;
+		case EXCEPTION_FLT_INVALID_OPERATION:
+			exceptionCause << "Cause: invalid operation";
+			break;
+		case EXCEPTION_FLT_OVERFLOW:
+		case EXCEPTION_INT_OVERFLOW:
+			exceptionCause << "Cause: Numeric overflow";
+			break;
+		case EXCEPTION_FLT_UNDERFLOW:
+			exceptionCause << "Cause: Numeric underflow";
+			break;
+		case EXCEPTION_FLT_STACK_CHECK:
+			exceptionCause << "Cause: Stack check";
+			break;
+		case EXCEPTION_ILLEGAL_INSTRUCTION:
+			exceptionCause << "Cause: Illegal instruction";
+			break;
+		case EXCEPTION_INVALID_DISPOSITION:
+			exceptionCause << "Cause: Invalid disposition";
+			break;
+		case EXCEPTION_NONCONTINUABLE_EXCEPTION:
+			exceptionCause << "Cause: Noncontinuable exception";
+			break;
+		case EXCEPTION_PRIV_INSTRUCTION:
+			exceptionCause << "Cause: Priv instruction";
+			break;
+		case EXCEPTION_STACK_OVERFLOW:
+			exceptionCause << "Cause: Stack overflow";
+			break;
+		default:
+			exceptionCause << "Cause: Unknown";
+			break;
+		}
 
-	void* exceptionAddress = exceptionInfo->ExceptionRecord->ExceptionAddress;
-
-	HMODULE crashedModuleHandle;
-	GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, static_cast<LPCSTR>(exceptionAddress), &crashedModuleHandle);
-
-	MODULEINFO crashedModuleInfo;
-	GetModuleInformation(GetCurrentProcess(), crashedModuleHandle, &crashedModuleInfo, sizeof(crashedModuleInfo));
-
-	char crashedModuleFullName[MAX_PATH];
-	GetModuleFileNameExA(GetCurrentProcess(), crashedModuleHandle, crashedModuleFullName, MAX_PATH);
-	char* crashedModuleName = strrchr(crashedModuleFullName, '\\') + 1;
-
-	DWORD crashedModuleOffset = ((DWORD)exceptionAddress) - ((DWORD)crashedModuleInfo.lpBaseOfDll);
-	CONTEXT* exceptionContext = exceptionInfo->ContextRecord;
-
-	spdlog::error("Northstar has crashed! a minidump has been written and exception info is available below:");
-	spdlog::error(exceptionCause.str());
-	spdlog::error("Address: {} + 0x{0:x}", crashedModuleName, crashedModuleOffset);
-	spdlog::error("RAX: 0x{0:x}", exceptionContext->Rax);
-	spdlog::error("RBX: 0x{0:x}", exceptionContext->Rbx);
-	spdlog::error("RCX: 0x{0:x}", exceptionContext->Rcx);
-	spdlog::error("RDX: 0x{0:x}", exceptionContext->Rdx);
-	spdlog::error("RSI: 0x{0:x}", exceptionContext->Rsi);
-	spdlog::error("RDI: 0x{0:x}", exceptionContext->Rdi);
-	spdlog::error("RBP: 0x{0:x}", exceptionContext->Rbp);
-	spdlog::error("RSP: 0x{0:x}", exceptionContext->Rsp);
-	spdlog::error("R8: 0x{0:x}", exceptionContext->R8);
-	spdlog::error("R9: 0x{0:x}", exceptionContext->R9);
-	spdlog::error("R10: 0x{0:x}", exceptionContext->R10);
-	spdlog::error("R11: 0x{0:x}", exceptionContext->R11);
-	spdlog::error("R12: 0x{0:x}", exceptionContext->R12);
-	spdlog::error("R13: 0x{0:x}", exceptionContext->R13);
-	spdlog::error("R14: 0x{0:x}", exceptionContext->R14);
-	spdlog::error("R15: 0x{0:x}", exceptionContext->R15);
+		void* exceptionAddress = exceptionInfo->ExceptionRecord->ExceptionAddress;
+
+		HMODULE crashedModuleHandle;
+		GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, static_cast<LPCSTR>(exceptionAddress), &crashedModuleHandle);
+
+		MODULEINFO crashedModuleInfo;
+		GetModuleInformation(GetCurrentProcess(), crashedModuleHandle, &crashedModuleInfo, sizeof(crashedModuleInfo));
+
+		char crashedModuleFullName[MAX_PATH];
+		GetModuleFileNameExA(GetCurrentProcess(), crashedModuleHandle, crashedModuleFullName, MAX_PATH);
+		char* crashedModuleName = strrchr(crashedModuleFullName, '\\') + 1;
+
+		DWORD crashedModuleOffset = ((DWORD)exceptionAddress) - ((DWORD)crashedModuleInfo.lpBaseOfDll);
+		CONTEXT* exceptionContext = exceptionInfo->ContextRecord;
+
+		spdlog::error("Northstar has crashed! a minidump has been written and exception info is available below:");
+		spdlog::error(exceptionCause.str());
+		spdlog::error("Address: {} + 0x{0:x}", crashedModuleName, crashedModuleOffset);
+		spdlog::error("RAX: 0x{0:x}", exceptionContext->Rax);
+		spdlog::error("RBX: 0x{0:x}", exceptionContext->Rbx);
+		spdlog::error("RCX: 0x{0:x}", exceptionContext->Rcx);
+		spdlog::error("RDX: 0x{0:x}", exceptionContext->Rdx);
+		spdlog::error("RSI: 0x{0:x}", exceptionContext->Rsi);
+		spdlog::error("RDI: 0x{0:x}", exceptionContext->Rdi);
+		spdlog::error("RBP: 0x{0:x}", exceptionContext->Rbp);
+		spdlog::error("RSP: 0x{0:x}", exceptionContext->Rsp);
+		spdlog::error("R8: 0x{0:x}", exceptionContext->R8);
+		spdlog::error("R9: 0x{0:x}", exceptionContext->R9);
+		spdlog::error("R10: 0x{0:x}", exceptionContext->R10);
+		spdlog::error("R11: 0x{0:x}", exceptionContext->R11);
+		spdlog::error("R12: 0x{0:x}", exceptionContext->R12);
+		spdlog::error("R13: 0x{0:x}", exceptionContext->R13);
+		spdlog::error("R14: 0x{0:x}", exceptionContext->R14);
+		spdlog::error("R15: 0x{0:x}", exceptionContext->R15);
+
+		time_t time = std::time(nullptr);
+		tm currentTime = *std::localtime(&time);
+		std::stringstream stream;
+		stream << std::put_time(&currentTime, "R2Northstar/logs/nsdump%d-%m-%Y %H-%M-%S.dmp");
+
+		auto hMinidumpFile = CreateFileA(stream.str().c_str(), GENERIC_WRITE, FILE_SHARE_READ, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
+		if (hMinidumpFile)
+		{
+			MINIDUMP_EXCEPTION_INFORMATION dumpExceptionInfo;
+			dumpExceptionInfo.ThreadId = GetCurrentThreadId();
+			dumpExceptionInfo.ExceptionPointers = exceptionInfo;
+			dumpExceptionInfo.ClientPointers = false;
 
-	time_t time = std::time(nullptr);
-	tm currentTime = *std::localtime(&time);
-	std::stringstream stream;
-	stream << std::put_time(&currentTime, "R2Northstar/logs/nsdump%d-%m-%Y %H-%M-%S.dmp");
+			MiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(), hMinidumpFile, MINIDUMP_TYPE(MiniDumpWithIndirectlyReferencedMemory | MiniDumpScanMemory), &dumpExceptionInfo, nullptr, nullptr);
+			CloseHandle(hMinidumpFile);
+		}
+		else
+			spdlog::error("Failed to write minidump file {}!", stream.str());
 
-	auto hMinidumpFile = CreateFileA(stream.str().c_str(), GENERIC_WRITE, FILE_SHARE_READ, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
-	if (hMinidumpFile)
-	{
-		MINIDUMP_EXCEPTION_INFORMATION dumpExceptionInfo;
-		dumpExceptionInfo.ThreadId = GetCurrentThreadId();
-		dumpExceptionInfo.ExceptionPointers = exceptionInfo;
-		dumpExceptionInfo.ClientPointers = false;
+		if (!IsDedicated())
+			MessageBoxA(0, "Northstar has crashed! A crash log and dump can be found in R2Northstar/logs", "Northstar has crashed!", MB_ICONERROR | MB_OK);
 
-		MiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(), hMinidumpFile, MINIDUMP_TYPE(MiniDumpWithIndirectlyReferencedMemory | MiniDumpScanMemory), &dumpExceptionInfo, nullptr, nullptr);
-		CloseHandle(hMinidumpFile);
 	}
-	else
-		spdlog::error("Failed to write minidump file {}!", stream.str());
-
-	if (!IsDedicated())
-		MessageBoxA(0, "Northstar has crashed! A crash log and dump can be found in R2Northstar/logs", "Northstar has crashed!", MB_ICONERROR | MB_OK);
 
 	logged = true;
 	return EXCEPTION_EXECUTE_HANDLER;