backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-27 17:36:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove LPVOID from Sony remote storage callbacks

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-14 06:38:11 +11:00
parent 8a66847c65
commit d3ce6b3334
8 changed files with 35 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.cpp
View file

@ -21,12 +21,12 @@ static SceRemoteStorageStatus statParams;
// void remoteStorageGetCallback(LPVOID lpParam, SonyRemoteStorage::Status s, int error_code)
// void remoteStorageGetCallback(void* lpParam, SonyRemoteStorage::Status s, int error_code)
// {
// app.DebugPrintf("remoteStorageGetCallback err : 0x%08x\n");
// }
//
// void remoteStorageCallback(LPVOID lpParam, SonyRemoteStorage::Status s, int error_code)
// void remoteStorageCallback(void* lpParam, SonyRemoteStorage::Status s, int error_code)
// {
// app.DebugPrintf("remoteStorageCallback err : 0x%08x\n");
//
@ -40,7 +40,7 @@ static SceRemoteStorageStatus statParams;
void getSaveInfoReturnCallback(LPVOID lpParam, SonyRemoteStorage::Status s, int error_code)
void getSaveInfoReturnCallback(void* lpParam, SonyRemoteStorage::Status s, int error_code)
{
SonyRemoteStorage* pRemoteStorage = (SonyRemoteStorage*)lpParam;
app.DebugPrintf("remoteStorageGetInfoCallback err : 0x%08x\n", error_code);
@ -65,7 +65,7 @@ void getSaveInfoReturnCallback(LPVOID lpParam, SonyRemoteStorage::Status s, int
static void getSaveInfoInitCallback(LPVOID lpParam, SonyRemoteStorage::Status s, int error_code)
static void getSaveInfoInitCallback(void* lpParam, SonyRemoteStorage::Status s, int error_code)
{
SonyRemoteStorage* pRemoteStorage = (SonyRemoteStorage*)lpParam;
if(error_code != 0)
@ -101,7 +101,7 @@ void SonyRemoteStorage::getSaveInfo()
m_getInfoStatus = e_noInfoFound;
}
bool SonyRemoteStorage::getSaveData( const char* localDirname, CallbackFunc cb, LPVOID lpParam )
bool SonyRemoteStorage::getSaveData( const char* localDirname, CallbackFunc cb, void* lpParam )
{
m_startTime = System::currentTimeMillis();
m_dataProgress = 0;
@ -109,7 +109,7 @@ bool SonyRemoteStorage::getSaveData( const char* localDirname, CallbackFunc cb,
}
static void setSaveDataInitCallback(LPVOID lpParam, SonyRemoteStorage::Status s, int error_code)
static void setSaveDataInitCallback(void* lpParam, SonyRemoteStorage::Status s, int error_code)
{
SonyRemoteStorage* pRemoteStorage = (SonyRemoteStorage*)lpParam;
if(error_code != 0)
@ -227,7 +227,7 @@ int SonyRemoteStorage::getSaveFilesize()
}
bool SonyRemoteStorage::setData( PSAVE_INFO info, CallbackFunc cb, LPVOID lpParam )
bool SonyRemoteStorage::setData( PSAVE_INFO info, CallbackFunc cb, void* lpParam )
{
m_setDataSaveInfo = info;
m_callbackFunc = cb;

13
Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.h
View file

@ -22,7 +22,7 @@ public:
e_getStatusInProgress,
e_getStatusSucceeded
};
typedef void (*CallbackFunc)(LPVOID lpParam, Status s, int error_code);
typedef void (*CallbackFunc)(void* lpParam, Status s, int error_code);
enum GetInfoStatus
{
@ -66,7 +66,7 @@ public:
bool saveIsAvailable();
int getSaveFilesize();
bool getSaveData(const char* localDirname, CallbackFunc cb, LPVOID lpParam);
bool getSaveData(const char* localDirname, CallbackFunc cb, void* lpParam);
bool setSaveData(PSAVE_INFO info, CallbackFunc cb, void* lpParam);
bool waitingForSetData() { return (m_setDataStatus == e_settingData); }
@ -80,9 +80,9 @@ public:
void SetServiceID(char *pchServiceID) { m_pchServiceID=pchServiceID; }
virtual bool init(CallbackFunc cb, LPVOID lpParam) = 0;
virtual bool getRemoteFileInfo(SceRemoteStorageStatus* pInfo, CallbackFunc cb, LPVOID lpParam) = 0;
virtual bool getData(const char* remotePath, const char* localPath, CallbackFunc cb, LPVOID lpParam) = 0;
virtual bool init(CallbackFunc cb, void* lpParam) = 0;
virtual bool getRemoteFileInfo(SceRemoteStorageStatus* pInfo, CallbackFunc cb, void* lpParam) = 0;
virtual bool getData(const char* remotePath, const char* localPath, CallbackFunc cb, void* lpParam) = 0;
virtual void abort() = 0;
virtual bool shutdown();
virtual bool setDataInternal() = 0;
@ -95,7 +95,7 @@ public:
bool setData( PSAVE_INFO info, CallbackFunc cb, LPVOID lpParam );
bool setData( PSAVE_INFO info, CallbackFunc cb, void* lpParam );
static int LoadSaveDataThumbnailReturned(void *lpParam,std::uint8_t *thumbnailData,unsigned int thumbnailBytes);
static int setDataThread(void* lpParam);
@ -119,4 +119,3 @@ protected:
bool m_bTransferStarted;
};

8
Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.cpp
View file

@ -141,7 +141,7 @@ void SonyRemoteStorage_Orbis::internalCallback(const SceRemoteStorageEvent event
}
}
bool SonyRemoteStorage_Orbis::init(CallbackFunc cb, LPVOID lpParam)
bool SonyRemoteStorage_Orbis::init(CallbackFunc cb, void* lpParam)
{
int ret = 0;
@ -248,7 +248,7 @@ bool SonyRemoteStorage_Orbis::init(CallbackFunc cb, LPVOID lpParam)
bool SonyRemoteStorage_Orbis::getRemoteFileInfo(SceRemoteStorageStatus* pInfo, CallbackFunc cb, LPVOID lpParam)
bool SonyRemoteStorage_Orbis::getRemoteFileInfo(SceRemoteStorageStatus* pInfo, CallbackFunc cb, void* lpParam)
{
m_callbackFunc = cb;
m_callbackParam = lpParam;
@ -287,7 +287,7 @@ void SonyRemoteStorage_Orbis::abort()
}
bool SonyRemoteStorage_Orbis::setData( PSAVE_INFO info, CallbackFunc cb, LPVOID lpParam )
bool SonyRemoteStorage_Orbis::setData( PSAVE_INFO info, CallbackFunc cb, void* lpParam )
{
assert(0);
return false;
@ -328,7 +328,7 @@ bool SonyRemoteStorage_Orbis::setData( PSAVE_INFO info, CallbackFunc cb, LPVOID
// }
}
bool SonyRemoteStorage_Orbis::getData( const char* remotePath, const char* localPath, CallbackFunc cb, LPVOID lpParam )
bool SonyRemoteStorage_Orbis::getData( const char* remotePath, const char* localPath, CallbackFunc cb, void* lpParam )
{
m_callbackFunc = cb;
m_callbackParam = lpParam;

9
Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.h
View file

@ -8,11 +8,11 @@ class SonyRemoteStorage_Orbis : public SonyRemoteStorage
public:
virtual bool init(CallbackFunc cb, LPVOID lpParam);
virtual bool setData(PSAVE_INFO info, CallbackFunc cb, LPVOID lpParam);
virtual bool init(CallbackFunc cb, void* lpParam);
virtual bool setData(PSAVE_INFO info, CallbackFunc cb, void* lpParam);
virtual bool getRemoteFileInfo(SceRemoteStorageStatus* pInfo, CallbackFunc cb, LPVOID lpParam);
virtual bool getData(const char* remotePath, const char* localPath, CallbackFunc cb, LPVOID lpParam);
virtual bool getRemoteFileInfo(SceRemoteStorageStatus* pInfo, CallbackFunc cb, void* lpParam);
virtual bool getData(const char* remotePath, const char* localPath, CallbackFunc cb, void* lpParam);
virtual void abort();
virtual bool setDataInternal(){ assert(0); }
@ -39,4 +39,3 @@ private:
void runCallback();
};

9
Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.cpp
View file

@ -200,7 +200,7 @@ void SonyRemoteStorage_PS3::internalCallback(const SceRemoteStorageEvent event,
}
}
bool SonyRemoteStorage_PS3::init(CallbackFunc cb, LPVOID lpParam)
bool SonyRemoteStorage_PS3::init(CallbackFunc cb, void* lpParam)
{
m_callbackFunc = cb;
m_callbackParam = lpParam;
@ -270,7 +270,7 @@ bool SonyRemoteStorage_PS3::init(CallbackFunc cb, LPVOID lpParam)
bool SonyRemoteStorage_PS3::getRemoteFileInfo(SceRemoteStorageStatus* pInfo, CallbackFunc cb, LPVOID lpParam)
bool SonyRemoteStorage_PS3::getRemoteFileInfo(SceRemoteStorageStatus* pInfo, CallbackFunc cb, void* lpParam)
{
m_callbackFunc = cb;
m_callbackParam = lpParam;
@ -392,7 +392,7 @@ bool SonyRemoteStorage_PS3::setDataInternal()
}
}
bool SonyRemoteStorage_PS3::getData( const char* remotePath, const char* localPath, CallbackFunc cb, LPVOID lpParam )
bool SonyRemoteStorage_PS3::getData( const char* remotePath, const char* localPath, CallbackFunc cb, void* lpParam )
{
m_callbackFunc = cb;
m_callbackParam = lpParam;
@ -429,7 +429,7 @@ void SonyRemoteStorage_PS3::runCallback()
m_lastErrorCode = ERROR_SUCCESS;
}
int SonyRemoteStorage_PS3::SaveCompressCallback(LPVOID lpParam,bool bRes)
int SonyRemoteStorage_PS3::SaveCompressCallback(void* lpParam,bool bRes)
{
SonyRemoteStorage_PS3* pRS = (SonyRemoteStorage_PS3*)lpParam;
pRS->m_compressedSaveState = e_state_Idle;
@ -516,4 +516,3 @@ void SonyRemoteStorage_PS3::CompressSaveData()
app.DebugPrintf("done\n");
assert(m_compressedSaveState == e_state_Idle);
}

9
Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.h
View file

@ -8,10 +8,10 @@ class SonyRemoteStorage_PS3 : public SonyRemoteStorage
public:
virtual bool init(CallbackFunc cb, LPVOID lpParam);
virtual bool init(CallbackFunc cb, void* lpParam);
virtual bool getRemoteFileInfo(SceRemoteStorageStatus* pInfo, CallbackFunc cb, LPVOID lpParam);
virtual bool getData(const char* remotePath, const char* localPath, CallbackFunc cb, LPVOID lpParam);
virtual bool getRemoteFileInfo(SceRemoteStorageStatus* pInfo, CallbackFunc cb, void* lpParam);
virtual bool getData(const char* remotePath, const char* localPath, CallbackFunc cb, void* lpParam);
virtual void abort();
virtual bool setDataInternal();
@ -56,9 +56,8 @@ private:
virtual void runCallback();
static int SaveCompressCallback(LPVOID lpParam,bool bRes);
static int SaveCompressCallback(void* lpParam,bool bRes);
static int LoadCompressCallback(void *pParam,bool bIsCorrupt, bool bIsOwner);
};

6
Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.cpp
View file

@ -140,7 +140,7 @@ void SonyRemoteStorage_Vita::internalCallback(const SceRemoteStorageEvent event,
}
}
bool SonyRemoteStorage_Vita::init(CallbackFunc cb, LPVOID lpParam)
bool SonyRemoteStorage_Vita::init(CallbackFunc cb, void* lpParam)
{
int ret = 0;
int reqId = 0;
@ -242,7 +242,7 @@ bool SonyRemoteStorage_Vita::init(CallbackFunc cb, LPVOID lpParam)
bool SonyRemoteStorage_Vita::getRemoteFileInfo(SceRemoteStorageStatus* pInfo, CallbackFunc cb, LPVOID lpParam)
bool SonyRemoteStorage_Vita::getRemoteFileInfo(SceRemoteStorageStatus* pInfo, CallbackFunc cb, void* lpParam)
{
m_callbackFunc = cb;
m_callbackParam = lpParam;
@ -360,7 +360,7 @@ bool SonyRemoteStorage_Vita::setDataInternal()
}
bool SonyRemoteStorage_Vita::getData( const char* remotePath, const char* localPath, CallbackFunc cb, LPVOID lpParam )
bool SonyRemoteStorage_Vita::getData( const char* remotePath, const char* localPath, CallbackFunc cb, void* lpParam )
{
m_callbackFunc = cb;
m_callbackParam = lpParam;

7
Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.h
View file

@ -8,10 +8,10 @@ class SonyRemoteStorage_Vita : public SonyRemoteStorage
public:
virtual bool init(CallbackFunc cb, LPVOID lpParam);
virtual bool init(CallbackFunc cb, void* lpParam);
virtual bool getRemoteFileInfo(SceRemoteStorageStatus* pInfo, CallbackFunc cb, LPVOID lpParam);
virtual bool getData(const char* remotePath, const char* localPath, CallbackFunc cb, LPVOID lpParam);
virtual bool getRemoteFileInfo(SceRemoteStorageStatus* pInfo, CallbackFunc cb, void* lpParam);
virtual bool getData(const char* remotePath, const char* localPath, CallbackFunc cb, void* lpParam);
virtual void abort();
virtual bool setDataInternal();
@ -40,4 +40,3 @@ private:
};