Remove Win32 callback types from common UI scenes

This commit is contained in:
notmatthewbeshay 2026-03-10 22:36:38 +11:00
parent 80f1a8d1b5
commit 9daa8f9c1a
4 changed files with 10 additions and 10 deletions

View file

@ -281,7 +281,7 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
{ {
int primaryPad = ProfileManager.GetPrimaryPad(); 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) switch((int)controlId)
{ {
@ -1042,7 +1042,7 @@ void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_PlayGame(void *
UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam; 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 // 4J-PB - Check if there is a patch for the game
pClass->m_errorCode = ProfileManager.getNPAvailability(ProfileManager.GetPrimaryPad()); pClass->m_errorCode = ProfileManager.getNPAvailability(ProfileManager.GetPrimaryPad());
@ -1131,7 +1131,7 @@ void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_Leaderboards(vo
UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam; 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 // 4J-PB - Check if there is a patch for the game
pClass->m_errorCode = ProfileManager.getNPAvailability(ProfileManager.GetPrimaryPad()); pClass->m_errorCode = ProfileManager.getNPAvailability(ProfileManager.GetPrimaryPad());

View file

@ -15,8 +15,8 @@ private:
eControl_COUNT eControl_COUNT
}; };
int( *m_Func)(LPVOID,int,const C4JStorage::EMessageResult); int( *m_Func)(void *,int,const C4JStorage::EMessageResult);
LPVOID m_lpParam; void *m_lpParam;
int m_buttonCount; int m_buttonCount;
UIControl_Button m_buttonButtons[eControl_COUNT]; UIControl_Button m_buttonButtons[eControl_COUNT];

View file

@ -198,7 +198,7 @@ int UIScene_QuadrantSignin::SignInReturned(void *pParam,bool bContinue, int iPad
} }
#ifdef _DURANGO #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; 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; UIScene_QuadrantSignin *pClass = (UIScene_QuadrantSignin *)lpParam;
app.DebugPrintf(app.USER_SR,"AvatarReturned callback\n"); app.DebugPrintf(app.USER_SR,"AvatarReturned callback\n");

View file

@ -99,12 +99,12 @@ public:
private: private:
static int SignInReturned(void *pParam,bool bContinue, int iPad); 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 updateState();
void setControllerState(int iPad, EControllerStatus state); void setControllerState(int iPad, EControllerStatus state);
#ifdef _DURANGO #ifdef _DURANGO
static void checkAllPrivilegesCallback(LPVOID lpParam, bool hasPrivileges, int iPad); static void checkAllPrivilegesCallback(void *lpParam, bool hasPrivileges, int iPad);
#endif #endif
}; };