From f7e6b02835d2b27efc1bb102a7484c6c16504725 Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Wed, 11 Mar 2026 00:48:23 +1100 Subject: [PATCH] Use standard callback types in 4J input headers --- 4J.Input/4J_Input.cpp | 8 ++++---- 4J.Input/4J_Input.h | 6 +++--- Minecraft.Client/Platform/Common/Consoles_App.cpp | 2 +- Minecraft.Client/Platform/Common/Consoles_App.h | 2 +- Minecraft.Client/Platform/Durango/4JLibs/inc/4J_Input.h | 6 +++--- Minecraft.Client/Platform/Orbis/4JLibs/inc/4J_Input.h | 6 +++--- Minecraft.Client/Platform/PS3/4JLibs/inc/4J_Input.h | 6 +++--- Minecraft.Client/Platform/PSVita/4JLibs/inc/4J_Input.h | 6 +++--- Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h | 6 +++--- Minecraft.Client/Platform/Xbox/4JLibs/inc/4J_Input.h | 6 +++--- Minecraft.World/Blocks/TileEntities/SignTileEntity.cpp | 4 ++-- Minecraft.World/Blocks/TileEntities/SignTileEntity.h | 4 ++-- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/4J.Input/4J_Input.cpp b/4J.Input/4J_Input.cpp index c4135523c..bc5babf89 100644 --- a/4J.Input/4J_Input.cpp +++ b/4J.Input/4J_Input.cpp @@ -512,7 +512,7 @@ void C_4JInput::SetJoypadSensitivity(int /*iPad*/, float /*fSensitivity*/) {} void C_4JInput::SetJoypadStickAxisMap(int /*iPad*/, unsigned int /*uiFrom*/, unsigned int /*uiTo*/) {} void C_4JInput::SetJoypadStickTriggerMap(int /*iPad*/, unsigned int /*uiFrom*/, unsigned int /*uiTo*/) {} void C_4JInput::SetKeyRepeatRate(float /*fRepeatDelaySecs*/, float /*fRepeatRateSecs*/) {} -void C_4JInput::SetDebugSequence(const char * /*chSequenceA*/, int(*/*Func*/)(LPVOID), LPVOID /*lpParam*/) {} +void C_4JInput::SetDebugSequence(const char * /*chSequenceA*/, int(*/*Func*/)(void *), void * /*lpParam*/) {} FLOAT C_4JInput::GetIdleSeconds(int /*iPad*/) { return 0.0f; } bool C_4JInput::IsPadConnected(int iPad) { return iPad == 0; } // slot 0 = keyboard+mouse @@ -530,7 +530,7 @@ EKeyboardResult C_4JInput::RequestKeyboard(const wchar_t * /*Title*/, const wcha return EKeyboard_Cancelled; } void C_4JInput::GetText(uint16_t *UTF16String) { if (UTF16String) UTF16String[0] = 0; } -bool C_4JInput::VerifyStrings(WCHAR ** /*pwStringA*/, int /*iStringC*/, - int(*/*Func*/)(LPVOID, STRING_VERIFY_RESPONSE *), LPVOID /*lpParam*/) { return true; } -void C_4JInput::CancelQueuedVerifyStrings(int(*/*Func*/)(LPVOID, STRING_VERIFY_RESPONSE *), LPVOID /*lpParam*/) {} +bool C_4JInput::VerifyStrings(wchar_t ** /*pwStringA*/, int /*iStringC*/, + int(*/*Func*/)(void *, STRING_VERIFY_RESPONSE *), void * /*lpParam*/) { return true; } +void C_4JInput::CancelQueuedVerifyStrings(int(*/*Func*/)(void *, STRING_VERIFY_RESPONSE *), void * /*lpParam*/) {} void C_4JInput::CancelAllVerifyInProgress(void) {} diff --git a/4J.Input/4J_Input.h b/4J.Input/4J_Input.h index 06d3f5819..51e79b098 100644 --- a/4J.Input/4J_Input.h +++ b/4J.Input/4J_Input.h @@ -93,7 +93,7 @@ public: void SetJoypadStickAxisMap(int iPad,unsigned int uiFrom, unsigned int uiTo); void SetJoypadStickTriggerMap(int iPad,unsigned int uiFrom, unsigned int uiTo); void SetKeyRepeatRate(float fRepeatDelaySecs,float fRepeatRateSecs); - void SetDebugSequence( const char *chSequenceA,int( *Func)(LPVOID),LPVOID lpParam ); + void SetDebugSequence( const char *chSequenceA,int( *Func)(void *),void *lpParam ); FLOAT GetIdleSeconds(int iPad); bool IsPadConnected(int iPad); @@ -126,8 +126,8 @@ public: // Exemption It is not required to use the Xbox LIVE service to verify real-time text communication. An example of real-time text communication is in-game text chat. // // Intent Protect players from inappropriate language. - bool VerifyStrings(WCHAR **pwStringA,int iStringC,int( *Func)(LPVOID,STRING_VERIFY_RESPONSE *),LPVOID lpParam); - void CancelQueuedVerifyStrings(int( *Func)(LPVOID,STRING_VERIFY_RESPONSE *),LPVOID lpParam); + bool VerifyStrings(wchar_t **pwStringA,int iStringC,int( *Func)(void *,STRING_VERIFY_RESPONSE *),void *lpParam); + void CancelQueuedVerifyStrings(int( *Func)(void *,STRING_VERIFY_RESPONSE *),void *lpParam); void CancelAllVerifyInProgress(void); //bool InputDetected(DWORD dwUserIndex,WCHAR *pwchInput); diff --git a/Minecraft.Client/Platform/Common/Consoles_App.cpp b/Minecraft.Client/Platform/Common/Consoles_App.cpp index 44360cdb9..f63d3e400 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.cpp +++ b/Minecraft.Client/Platform/Common/Consoles_App.cpp @@ -4926,7 +4926,7 @@ void CMinecraftApp::SetDebugSequence(const char *pchSeq) { InputManager.SetDebugSequence(pchSeq,&CMinecraftApp::DebugInputCallback,this); } -int CMinecraftApp::DebugInputCallback(LPVOID pParam) +int CMinecraftApp::DebugInputCallback(void *pParam) { CMinecraftApp* pClass = (CMinecraftApp*)pParam; //printf("sequence matched\n"); diff --git a/Minecraft.Client/Platform/Common/Consoles_App.h b/Minecraft.Client/Platform/Common/Consoles_App.h index 3e28d4e7b..0a0933eb3 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.h +++ b/Minecraft.Client/Platform/Common/Consoles_App.h @@ -311,7 +311,7 @@ public: bool DebugSettingsOn() { return false;} #endif void SetDebugSequence(const char *pchSeq); - static int DebugInputCallback(LPVOID pParam); + static int DebugInputCallback(void *pParam); //bool UploadFileToGlobalStorage(int iQuadrant, C4JStorage::eGlobalStorage eStorageFacility, std::wstring *wsFile ); // Installed DLC diff --git a/Minecraft.Client/Platform/Durango/4JLibs/inc/4J_Input.h b/Minecraft.Client/Platform/Durango/4JLibs/inc/4J_Input.h index 656726464..96038740c 100644 --- a/Minecraft.Client/Platform/Durango/4JLibs/inc/4J_Input.h +++ b/Minecraft.Client/Platform/Durango/4JLibs/inc/4J_Input.h @@ -110,7 +110,7 @@ public: void SetJoypadStickAxisMap(int iPad,unsigned int uiFrom, unsigned int uiTo); void SetJoypadStickTriggerMap(int iPad,unsigned int uiFrom, unsigned int uiTo); void SetKeyRepeatRate(float fRepeatDelaySecs,float fRepeatRateSecs); - void SetDebugSequence( const char *chSequenceA,int( *Func)(LPVOID),LPVOID lpParam ); + void SetDebugSequence( const char *chSequenceA,int( *Func)(void *),void *lpParam ); FLOAT GetIdleSeconds(int iPad); unsigned int GetConnectedGamepadCount(); bool IsPadConnected(int iPad); @@ -147,8 +147,8 @@ public: // Exemption It is not required to use the Xbox LIVE service to verify real-time text communication. An example of real-time text communication is in-game text chat. // // Intent Protect players from inappropriate language. - bool VerifyStrings(WCHAR **pwStringA,int iStringC,int( *Func)(LPVOID,STRING_VERIFY_RESPONSE *),LPVOID lpParam); - void CancelQueuedVerifyStrings(int( *Func)(LPVOID,STRING_VERIFY_RESPONSE *),LPVOID lpParam); + bool VerifyStrings(wchar_t **pwStringA,int iStringC,int( *Func)(void *,STRING_VERIFY_RESPONSE *),void *lpParam); + void CancelQueuedVerifyStrings(int( *Func)(void *,STRING_VERIFY_RESPONSE *),void *lpParam); void CancelAllVerifyInProgress(void); //bool InputDetected(DWORD dwUserIndex,WCHAR *pwchInput); diff --git a/Minecraft.Client/Platform/Orbis/4JLibs/inc/4J_Input.h b/Minecraft.Client/Platform/Orbis/4JLibs/inc/4J_Input.h index cd884a58e..71c32ebbc 100644 --- a/Minecraft.Client/Platform/Orbis/4JLibs/inc/4J_Input.h +++ b/Minecraft.Client/Platform/Orbis/4JLibs/inc/4J_Input.h @@ -173,7 +173,7 @@ public: void SetJoypadStickAxisMap(int iPad,unsigned int uiFrom, unsigned int uiTo); void SetJoypadStickTriggerMap(int iPad,unsigned int uiFrom, unsigned int uiTo); void SetKeyRepeatRate(float fRepeatDelaySecs,float fRepeatRateSecs); - void SetDebugSequence( const char *chSequenceA,int( *Func)(LPVOID),LPVOID lpParam ); + void SetDebugSequence( const char *chSequenceA,int( *Func)(void *),void *lpParam ); FLOAT GetIdleSeconds(int iPad); bool IsPadConnected(int iPad); void SetCircleCrossSwapped(bool swapped); @@ -214,8 +214,8 @@ public: // Exemption It is not required to use the Xbox LIVE service to verify real-time text communication. An example of real-time text communication is in-game text chat. // // Intent Protect players from inappropriate language. - bool VerifyStrings(WCHAR **pwStringA,int iStringC,int( *Func)(LPVOID,STRING_VERIFY_RESPONSE *),LPVOID lpParam); - void CancelQueuedVerifyStrings(int( *Func)(LPVOID,STRING_VERIFY_RESPONSE *),LPVOID lpParam); + bool VerifyStrings(wchar_t **pwStringA,int iStringC,int( *Func)(void *,STRING_VERIFY_RESPONSE *),void *lpParam); + void CancelQueuedVerifyStrings(int( *Func)(void *,STRING_VERIFY_RESPONSE *),void *lpParam); void CancelAllVerifyInProgress(void); //bool InputDetected(DWORD dwUserIndex,WCHAR *pwchInput); diff --git a/Minecraft.Client/Platform/PS3/4JLibs/inc/4J_Input.h b/Minecraft.Client/Platform/PS3/4JLibs/inc/4J_Input.h index 0fb3ff58d..09e97b0ea 100644 --- a/Minecraft.Client/Platform/PS3/4JLibs/inc/4J_Input.h +++ b/Minecraft.Client/Platform/PS3/4JLibs/inc/4J_Input.h @@ -115,7 +115,7 @@ public: void SetJoypadStickAxisMap(int iPad,unsigned int uiFrom, unsigned int uiTo); void SetJoypadStickTriggerMap(int iPad,unsigned int uiFrom, unsigned int uiTo); void SetKeyRepeatRate(float fRepeatDelaySecs,float fRepeatRateSecs); - void SetDebugSequence( const char *chSequenceA,int( *Func)(LPVOID),LPVOID lpParam ); + void SetDebugSequence( const char *chSequenceA,int( *Func)(void *),void *lpParam ); FLOAT GetIdleSeconds(int iPad); bool IsPadConnected(int iPad); bool IsCircleCrossSwapped(); @@ -153,8 +153,8 @@ public: // Exemption It is not required to use the Xbox LIVE service to verify real-time text communication. An example of real-time text communication is in-game text chat. // // Intent Protect players from inappropriate language. - bool VerifyStrings(WCHAR **pwStringA,int iStringC,int( *Func)(LPVOID,STRING_VERIFY_RESPONSE *),LPVOID lpParam); - void CancelQueuedVerifyStrings(int( *Func)(LPVOID,STRING_VERIFY_RESPONSE *),LPVOID lpParam); + bool VerifyStrings(wchar_t **pwStringA,int iStringC,int( *Func)(void *,STRING_VERIFY_RESPONSE *),void *lpParam); + void CancelQueuedVerifyStrings(int( *Func)(void *,STRING_VERIFY_RESPONSE *),void *lpParam); void CancelAllVerifyInProgress(void); //bool InputDetected(DWORD dwUserIndex,WCHAR *pwchInput); diff --git a/Minecraft.Client/Platform/PSVita/4JLibs/inc/4J_Input.h b/Minecraft.Client/Platform/PSVita/4JLibs/inc/4J_Input.h index 381d684f2..aec2c5c07 100644 --- a/Minecraft.Client/Platform/PSVita/4JLibs/inc/4J_Input.h +++ b/Minecraft.Client/Platform/PSVita/4JLibs/inc/4J_Input.h @@ -124,7 +124,7 @@ public: void SetJoypadStickAxisMap(int iPad,unsigned int uiFrom, unsigned int uiTo); void SetJoypadStickTriggerMap(int iPad,unsigned int uiFrom, unsigned int uiTo); void SetKeyRepeatRate(float fRepeatDelaySecs,float fRepeatRateSecs); - void SetDebugSequence( const char *chSequenceA,int( *Func)(LPVOID),LPVOID lpParam ); + void SetDebugSequence( const char *chSequenceA,int( *Func)(void *),void *lpParam ); FLOAT GetIdleSeconds(int iPad); bool IsPadConnected(int iPad); void SetCircleCrossSwapped(bool swapped); @@ -164,8 +164,8 @@ public: // Exemption It is not required to use the Xbox LIVE service to verify real-time text communication. An example of real-time text communication is in-game text chat. // // Intent Protect players from inappropriate language. - bool VerifyStrings(WCHAR **pwStringA,int iStringC,int( *Func)(LPVOID,STRING_VERIFY_RESPONSE *),LPVOID lpParam); - void CancelQueuedVerifyStrings(int( *Func)(LPVOID,STRING_VERIFY_RESPONSE *),LPVOID lpParam); + bool VerifyStrings(wchar_t **pwStringA,int iStringC,int( *Func)(void *,STRING_VERIFY_RESPONSE *),void *lpParam); + void CancelQueuedVerifyStrings(int( *Func)(void *,STRING_VERIFY_RESPONSE *),void *lpParam); void CancelAllVerifyInProgress(void); bool IsVitaTV(); diff --git a/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h b/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h index 06d3f5819..51e79b098 100644 --- a/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h +++ b/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h @@ -93,7 +93,7 @@ public: void SetJoypadStickAxisMap(int iPad,unsigned int uiFrom, unsigned int uiTo); void SetJoypadStickTriggerMap(int iPad,unsigned int uiFrom, unsigned int uiTo); void SetKeyRepeatRate(float fRepeatDelaySecs,float fRepeatRateSecs); - void SetDebugSequence( const char *chSequenceA,int( *Func)(LPVOID),LPVOID lpParam ); + void SetDebugSequence( const char *chSequenceA,int( *Func)(void *),void *lpParam ); FLOAT GetIdleSeconds(int iPad); bool IsPadConnected(int iPad); @@ -126,8 +126,8 @@ public: // Exemption It is not required to use the Xbox LIVE service to verify real-time text communication. An example of real-time text communication is in-game text chat. // // Intent Protect players from inappropriate language. - bool VerifyStrings(WCHAR **pwStringA,int iStringC,int( *Func)(LPVOID,STRING_VERIFY_RESPONSE *),LPVOID lpParam); - void CancelQueuedVerifyStrings(int( *Func)(LPVOID,STRING_VERIFY_RESPONSE *),LPVOID lpParam); + bool VerifyStrings(wchar_t **pwStringA,int iStringC,int( *Func)(void *,STRING_VERIFY_RESPONSE *),void *lpParam); + void CancelQueuedVerifyStrings(int( *Func)(void *,STRING_VERIFY_RESPONSE *),void *lpParam); void CancelAllVerifyInProgress(void); //bool InputDetected(DWORD dwUserIndex,WCHAR *pwchInput); diff --git a/Minecraft.Client/Platform/Xbox/4JLibs/inc/4J_Input.h b/Minecraft.Client/Platform/Xbox/4JLibs/inc/4J_Input.h index 120e9c7b5..e618d683d 100644 --- a/Minecraft.Client/Platform/Xbox/4JLibs/inc/4J_Input.h +++ b/Minecraft.Client/Platform/Xbox/4JLibs/inc/4J_Input.h @@ -84,7 +84,7 @@ public: void SetJoypadStickAxisMap(int iPad,unsigned int uiFrom, unsigned int uiTo); void SetJoypadStickTriggerMap(int iPad,unsigned int uiFrom, unsigned int uiTo); void SetKeyRepeatRate(float fRepeatDelaySecs,float fRepeatRateSecs); - void SetDebugSequence( const char *chSequenceA,int( *Func)(LPVOID),LPVOID lpParam ); + void SetDebugSequence( const char *chSequenceA,int( *Func)(void *),void *lpParam ); FLOAT GetIdleSeconds(int iPad); bool IsPadConnected(int iPad); @@ -116,8 +116,8 @@ public: // // Intent Protect players from inappropriate language. /* -bool VerifyStrings(WCHAR **pwStringA,int iStringC,int( *Func)(LPVOID,STRING_VERIFY_RESPONSE *),LPVOID lpParam); - void CancelQueuedVerifyStrings(int( *Func)(LPVOID,STRING_VERIFY_RESPONSE *),LPVOID lpParam); +bool VerifyStrings(wchar_t **pwStringA,int iStringC,int( *Func)(void *,STRING_VERIFY_RESPONSE *),void *lpParam); + void CancelQueuedVerifyStrings(int( *Func)(void *,STRING_VERIFY_RESPONSE *),void *lpParam); void CancelAllVerifyInProgress(void); */ //bool InputDetected(DWORD dwUserIndex,WCHAR *pwchInput); diff --git a/Minecraft.World/Blocks/TileEntities/SignTileEntity.cpp b/Minecraft.World/Blocks/TileEntities/SignTileEntity.cpp index 3cc0dc95c..6f410f059 100644 --- a/Minecraft.World/Blocks/TileEntities/SignTileEntity.cpp +++ b/Minecraft.World/Blocks/TileEntities/SignTileEntity.cpp @@ -156,7 +156,7 @@ void SignTileEntity::SetMessage(int iIndex,std::wstring &wsText) } // 4J-PB - added for string verification -int SignTileEntity::StringVerifyCallback(LPVOID lpParam,STRING_VERIFY_RESPONSE *pResults) +int SignTileEntity::StringVerifyCallback(void *lpParam,STRING_VERIFY_RESPONSE *pResults) { // results will be in m_pStringVerifyResponse SignTileEntity *pClass=(SignTileEntity *)lpParam; @@ -195,4 +195,4 @@ std::shared_ptr SignTileEntity::clone() result->m_bVerified = m_bVerified; result->m_bCensored = m_bCensored; return result; -} \ No newline at end of file +} diff --git a/Minecraft.World/Blocks/TileEntities/SignTileEntity.h b/Minecraft.World/Blocks/TileEntities/SignTileEntity.h index 6325180b6..b19d413d6 100644 --- a/Minecraft.World/Blocks/TileEntities/SignTileEntity.h +++ b/Minecraft.World/Blocks/TileEntities/SignTileEntity.h @@ -42,8 +42,8 @@ public: bool isEditable(); void setEditable(bool isEditable); virtual void setChanged(); - static int StringVerifyCallback(LPVOID lpParam,STRING_VERIFY_RESPONSE *pResults); + static int StringVerifyCallback(void *lpParam,STRING_VERIFY_RESPONSE *pResults); // 4J Added virtual std::shared_ptr clone(); -}; \ No newline at end of file +};