diff --git a/Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.cpp b/Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.cpp index a1e6d3e1d..db885e5ea 100644 --- a/Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.cpp +++ b/Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.cpp @@ -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; diff --git a/Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.h b/Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.h index 087b4d484..dccb52949 100644 --- a/Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.h +++ b/Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.h @@ -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; }; - diff --git a/Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.cpp b/Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.cpp index 699911c84..cf34cfc65 100644 --- a/Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.cpp +++ b/Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.cpp @@ -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; diff --git a/Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.h b/Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.h index 8b42f58f2..a2a6346a4 100644 --- a/Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.h +++ b/Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.h @@ -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(); }; - diff --git a/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.cpp b/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.cpp index ab16c7b71..18fbf4bfb 100644 --- a/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.cpp +++ b/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.cpp @@ -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); } - diff --git a/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.h b/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.h index 2385b6516..081aea344 100644 --- a/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.h +++ b/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.h @@ -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); }; - diff --git a/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.cpp b/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.cpp index 70117ffce..2c79a16ae 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.cpp +++ b/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.cpp @@ -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; diff --git a/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.h b/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.h index 408eb11cc..bcb2be98e 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.h +++ b/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.h @@ -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: }; -