From f5977140aee3e310139cb673bf30d5b446b64f95 Mon Sep 17 00:00:00 2001
From: PatrickvL <pvanlogchem@gmail.com>
Date: Sun, 1 Jan 2017 15:41:19 +0100
Subject: [PATCH] Added logging for LAUNCH_DATA_PAGE (and _HEADER)

---
 src/CxbxKrnl/EmuKrnlLogging.cpp | 21 ++++++++++++++++++++-
 src/CxbxKrnl/EmuKrnlLogging.h   |  4 ++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/CxbxKrnl/EmuKrnlLogging.cpp b/src/CxbxKrnl/EmuKrnlLogging.cpp
index 0d1f7f25c..5a6bf8890 100644
--- a/src/CxbxKrnl/EmuKrnlLogging.cpp
+++ b/src/CxbxKrnl/EmuKrnlLogging.cpp
@@ -335,7 +335,9 @@ ENUM2STR_END_and_LOGRENDER(XC_VALUE_INDEX)
 
 #undef LOGRENDER_TYPE
 
-#define LOGRENDER_MEMBER(Member) << "\n   ."#Member": " << value.Member
+#define LOGRENDER_MEMBER_NAME(Member) << "\n   ."#Member": "
+#define LOGRENDER_MEMBER_VALUE(Member) << value.Member
+#define LOGRENDER_MEMBER(Member) LOGRENDER_MEMBER_NAME(Member) LOGRENDER_MEMBER_VALUE(Member)
 
 LOGRENDER_HEADER(BOOLEAN)
 {
@@ -372,6 +374,23 @@ LOGRENDER_TYPE(LARGE_INTEGER)
 		LOGRENDER_MEMBER(QuadPart);
 }
 
+LOGRENDER_TYPE(LAUNCH_DATA_HEADER)
+{
+	return os
+		LOGRENDER_MEMBER(dwLaunchDataType)
+		LOGRENDER_MEMBER(dwTitleId)
+		LOGRENDER_MEMBER(szLaunchPath)
+		LOGRENDER_MEMBER(dwFlags);
+}
+
+LOGRENDER_TYPE(LAUNCH_DATA_PAGE)
+{
+	return os
+		LOGRENDER_MEMBER_NAME(Header) << &value.Header
+		LOGRENDER_MEMBER(Pad)
+		LOGRENDER_MEMBER(LaunchData);
+}
+
 LOGRENDER_TYPE(MM_STATISTICS)
 {
 	return os
diff --git a/src/CxbxKrnl/EmuKrnlLogging.h b/src/CxbxKrnl/EmuKrnlLogging.h
index a66f7ec74..ebadf5e73 100644
--- a/src/CxbxKrnl/EmuKrnlLogging.h
+++ b/src/CxbxKrnl/EmuKrnlLogging.h
@@ -111,8 +111,8 @@ LOGRENDER_HEADERS(FILETIME);
 // TODO : LOGRENDER_HEADER(KTHREAD);
 // TODO : LOGRENDER_HEADER(KTIMER);
 LOGRENDER_HEADERS(LARGE_INTEGER);
-// TODO : LOGRENDER_HEADER(LAUNCH_DATA_HEADER);
-// TODO : LOGRENDER_HEADER(LAUNCH_DATA_PAGE);
+LOGRENDER_HEADER(LAUNCH_DATA_HEADER);
+LOGRENDER_HEADER(LAUNCH_DATA_PAGE);
 // TODO : LOGRENDER_HEADER(LIST_ENTRY);
 // TODO : LOGRENDER_HEADER(LPCCH);
 // TODO : LOGRENDER_HEADER(LPCSTR);