From 829177f57a1cb45265c223d3c5b832607ce92cf6 Mon Sep 17 00:00:00 2001 From: Luke Usher Date: Sat, 9 Nov 2019 23:05:46 +0000 Subject: [PATCH] Better implementation of RtlAssert --- src/core/kernel/exports/EmuKrnlRtl.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/core/kernel/exports/EmuKrnlRtl.cpp b/src/core/kernel/exports/EmuKrnlRtl.cpp index 37871e555..a0bf86782 100644 --- a/src/core/kernel/exports/EmuKrnlRtl.cpp +++ b/src/core/kernel/exports/EmuKrnlRtl.cpp @@ -235,10 +235,15 @@ XBSYSAPI EXPORTNUM(264) xboxkrnl::VOID NTAPI xboxkrnl::RtlAssert LOG_FUNC_ARG(Message) LOG_FUNC_END; - //printf("Assertion Failed: %s %s:%d %s\n", FailedAssertion, FileName, LineNumber, Message); - - - //CxbxPopupMessage(LOG_LEVEL::WARNING, CxbxMsgDlgIcon_Warn, "RtlAssert() raised by emulated program - consult Debug log"); + std::stringstream ss; + ss << "RtlAssert() raised by emulated program\n" << FileName << ":" << LineNumber << ":" << FailedAssertion ; + if (Message) { + ss << " " << Message; + } + + ss << ")"; + + CxbxPopupMessage(LOG_LEVEL::WARNING, CxbxMsgDlgIcon_Warn, ss.str().c_str()); } // ******************************************************************