From 60790a86afff7cdd5279ebb11baa4064cbe20284 Mon Sep 17 00:00:00 2001
From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com>
Date: Sat, 14 Mar 2026 07:32:45 +1100
Subject: [PATCH] Remove WinAPI types from console utility helpers

---
 Minecraft.Client/Platform/Common/Console_Utils.cpp | 9 ++++-----
 Minecraft.Client/Platform/Common/Consoles_App.h    | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Minecraft.Client/Platform/Common/Console_Utils.cpp b/Minecraft.Client/Platform/Common/Console_Utils.cpp
index 2aee7c307..85bceb5ce 100644
--- a/Minecraft.Client/Platform/Common/Console_Utils.cpp
+++ b/Minecraft.Client/Platform/Common/Console_Utils.cpp
@@ -7,12 +7,12 @@
 // Desc: Internal helper function
 //--------------------------------------------------------------------------------------
 #ifndef _CONTENT_PACKAGE
-static VOID DebugSpewV( const CHAR* strFormat, va_list pArgList )
+static void DebugSpewV(const char* strFormat, va_list pArgList)
 {
 #if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ || defined(__linux__)
 	assert(0);
 #else
-	CHAR str[2048];
+	char str[2048];
 	// Use the secure CRT to avoid buffer overruns. Specify a count of
 	// _TRUNCATE so that too long strings will be silently truncated
 	// rather than triggering an error.
@@ -27,9 +27,9 @@ static VOID DebugSpewV( const CHAR* strFormat, va_list pArgList )
 // Desc: Prints formatted debug spew
 //--------------------------------------------------------------------------------------
 #ifdef  _Printf_format_string_  // VC++ 2008 and later support this annotation
-VOID CDECL DebugSpew( _In_z_ _Printf_format_string_ const CHAR* strFormat, ... )
+void CDECL DebugSpew(_In_z_ _Printf_format_string_ const char* strFormat, ...)
 #else
-VOID CDECL DebugPrintf( const CHAR* strFormat, ... )
+void CDECL DebugPrintf(const char* strFormat, ...)
 #endif
 {
 #ifndef _CONTENT_PACKAGE
@@ -39,4 +39,3 @@ VOID CDECL DebugPrintf( const CHAR* strFormat, ... )
 	va_end( pArgList );
 #endif
 }
-
diff --git a/Minecraft.Client/Platform/Common/Consoles_App.h b/Minecraft.Client/Platform/Common/Consoles_App.h
index 4b8807399..e044f7a19 100644
--- a/Minecraft.Client/Platform/Common/Consoles_App.h
+++ b/Minecraft.Client/Platform/Common/Consoles_App.h
@@ -197,10 +197,10 @@ public:
 	void			SetFreezePlayers(bool bVal)																							{ m_bFreezePlayers = bVal; }
 
 	// debug -0 show safe area
-	void			ShowSafeArea(BOOL bShow)
+	void			ShowSafeArea(bool show)
 	{
 #ifdef _XBOX
-		CXuiSceneBase::ShowSafeArea( bShow );
+		CXuiSceneBase::ShowSafeArea(show);
 #endif
 	}
 	// 4J-PB - to capture the social post screenshot
@@ -485,7 +485,7 @@ public:
 
 
 
-	static const DWORD m_dwOfferID = 0x00000001;
+	static constexpr unsigned int m_dwOfferID = 0x00000001;
 
 // timer
 	void InitTime();