From 9daa8f9c1aa7a158bcde78825ed4f3bb9931bace Mon Sep 17 00:00:00 2001
From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com>
Date: Tue, 10 Mar 2026 22:36:38 +1100
Subject: [PATCH] Remove Win32 callback types from common UI scenes

---
 Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp    | 6 +++---
 Minecraft.Client/Platform/Common/UI/UIScene_MessageBox.h    | 6 +++---
 .../Platform/Common/UI/UIScene_QuadrantSignin.cpp           | 4 ++--
 .../Platform/Common/UI/UIScene_QuadrantSignin.h             | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp
index 207dc28a5..eeac83238 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp
@@ -281,7 +281,7 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
 {
 	int primaryPad = ProfileManager.GetPrimaryPad();
 	
-	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad) = NULL;
+	int (*signInReturnedFunc) (void *,const bool, const int iPad) = NULL;
 
 	switch((int)controlId)
 	{
@@ -1042,7 +1042,7 @@ void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_PlayGame(void *
 
 	UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam;
 
-	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad) = NULL;
+	int (*signInReturnedFunc) (void *,const bool, const int iPad) = NULL;
 
 	// 4J-PB - Check if there is a patch for the game
 	pClass->m_errorCode = ProfileManager.getNPAvailability(ProfileManager.GetPrimaryPad());
@@ -1131,7 +1131,7 @@ void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_Leaderboards(vo
 
 	UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam;
 
-	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad) = NULL;
+	int (*signInReturnedFunc) (void *,const bool, const int iPad) = NULL;
 
 	// 4J-PB - Check if there is a patch for the game
 	pClass->m_errorCode = ProfileManager.getNPAvailability(ProfileManager.GetPrimaryPad());
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_MessageBox.h b/Minecraft.Client/Platform/Common/UI/UIScene_MessageBox.h
index 38d850d03..fd3813684 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_MessageBox.h
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_MessageBox.h
@@ -15,8 +15,8 @@ private:
 		eControl_COUNT
 	};
 
-	int( *m_Func)(LPVOID,int,const C4JStorage::EMessageResult);
-	LPVOID m_lpParam;
+	int( *m_Func)(void *,int,const C4JStorage::EMessageResult);
+	void *m_lpParam;
 	int m_buttonCount;
 
 	UIControl_Button m_buttonButtons[eControl_COUNT];
@@ -56,4 +56,4 @@ public:
 
 protected:
 	void handlePress(F64 controlId, F64 childId);
-};
\ No newline at end of file
+};
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp
index a035d074d..4f453c4f8 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp
@@ -198,7 +198,7 @@ int UIScene_QuadrantSignin::SignInReturned(void *pParam,bool bContinue, int iPad
 }
 
 #ifdef _DURANGO
-void UIScene_QuadrantSignin::checkAllPrivilegesCallback(LPVOID lpParam, bool hasPrivileges, int iPad)
+void UIScene_QuadrantSignin::checkAllPrivilegesCallback(void *lpParam, bool hasPrivileges, int iPad)
 {
 	UIScene_QuadrantSignin* pClass = (UIScene_QuadrantSignin*)lpParam;
 
@@ -269,7 +269,7 @@ void UIScene_QuadrantSignin::setControllerState(int iPad, EControllerStatus stat
 	}
 }
 
-int UIScene_QuadrantSignin::AvatarReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes)
+int UIScene_QuadrantSignin::AvatarReturned(void *lpParam, std::uint8_t *pbThumbnail,DWORD dwThumbnailBytes)
 {
 	UIScene_QuadrantSignin *pClass = (UIScene_QuadrantSignin *)lpParam;
 	app.DebugPrintf(app.USER_SR,"AvatarReturned callback\n");
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.h b/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.h
index bc9bb4325..b082f6fef 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.h
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.h
@@ -99,12 +99,12 @@ public:
 
 private:
 	static int SignInReturned(void *pParam,bool bContinue, int iPad);
-	static int AvatarReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes);
+	static int AvatarReturned(void *lpParam, std::uint8_t *pbThumbnail, DWORD dwThumbnailBytes);
 
 	void updateState();
 	void setControllerState(int iPad, EControllerStatus state);
 
 #ifdef _DURANGO
-	static void checkAllPrivilegesCallback(LPVOID lpParam, bool hasPrivileges, int iPad);
+	static void checkAllPrivilegesCallback(void *lpParam, bool hasPrivileges, int iPad);
 #endif
 };