From 6e2f40f5814221887a0d08249393d0fede1ada7d Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Sat, 14 Mar 2026 06:41:42 +1100 Subject: [PATCH] Remove LPVOID from Sony commerce callbacks --- .../Common/Network/Sony/SonyCommerce.cpp | 27 ++++++------- .../Common/Network/Sony/SonyCommerce.h | 22 +++++----- .../Orbis/Network/SonyCommerce_Orbis.cpp | 34 ++++++++-------- .../Orbis/Network/SonyCommerce_Orbis.h | 32 +++++++-------- .../Platform/PS3/Network/SonyCommerce_PS3.cpp | 27 ++++++------- .../Platform/PS3/Network/SonyCommerce_PS3.h | 28 ++++++------- .../PSVita/Network/SonyCommerce_Vita.cpp | 40 +++++++++---------- .../PSVita/Network/SonyCommerce_Vita.h | 38 +++++++++--------- 8 files changed, 123 insertions(+), 125 deletions(-) diff --git a/Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.cpp b/Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.cpp index 669c4c59e..1beafa953 100644 --- a/Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.cpp +++ b/Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.cpp @@ -9,7 +9,7 @@ bool SonyCommerce::m_bCommerceInitialised = false; SceNpCommerce2SessionInfo SonyCommerce::m_sessionInfo; SonyCommerce::State SonyCommerce::m_state = e_state_noSession; int SonyCommerce::m_errorCode = 0; -LPVOID SonyCommerce::m_callbackParam = NULL; +void* SonyCommerce::m_callbackParam = NULL; void* SonyCommerce::m_receiveBuffer = NULL; SonyCommerce::Event SonyCommerce::m_event; @@ -29,7 +29,7 @@ sys_memory_container_t SonyCommerce::m_memContainer = SYS_MEMORY_CONTAINER_I bool SonyCommerce::m_bUpgradingTrial = false; SonyCommerce::CallbackFunc SonyCommerce::m_trialUpgradeCallbackFunc; -LPVOID SonyCommerce::m_trialUpgradeCallbackParam; +void* SonyCommerce::m_trialUpgradeCallbackParam; CRITICAL_SECTION SonyCommerce::m_queueLock; @@ -81,7 +81,7 @@ void SonyCommerce::Init() -void SonyCommerce::CheckForTrialUpgradeKey_Callback(LPVOID param, bool bFullVersion) +void SonyCommerce::CheckForTrialUpgradeKey_Callback(void* param, bool bFullVersion) { ProfileManager.SetFullVersion(bFullVersion); if(ProfileManager.IsFullVersion()) @@ -798,7 +798,7 @@ int SonyCommerce::downloadList(DownloadListInputParams ¶ms) return CELL_OK; } -void SonyCommerce::UpgradeTrialCallback2(LPVOID lpParam,int err) +void SonyCommerce::UpgradeTrialCallback2(void* lpParam,int err) { app.DebugPrintf(4,"SonyCommerce_UpgradeTrialCallback2 : err : 0x%08x\n", err); SonyCommerce::CheckForTrialUpgradeKey(); @@ -811,7 +811,7 @@ void SonyCommerce::UpgradeTrialCallback2(LPVOID lpParam,int err) m_trialUpgradeCallbackFunc(m_trialUpgradeCallbackParam, m_errorCode); } -void SonyCommerce::UpgradeTrialCallback1(LPVOID lpParam,int err) +void SonyCommerce::UpgradeTrialCallback1(void* lpParam,int err) { app.DebugPrintf(4,"SonyCommerce_UpgradeTrialCallback1 : err : 0x%08x\n", err); @@ -847,7 +847,7 @@ void SonyCommerce_UpgradeTrial() app.UpgradeTrial(); } -void SonyCommerce::UpgradeTrial(CallbackFunc cb, LPVOID lpParam) +void SonyCommerce::UpgradeTrial(CallbackFunc cb, void* lpParam) { m_trialUpgradeCallbackFunc = cb; m_trialUpgradeCallbackParam = lpParam; @@ -1383,7 +1383,7 @@ int SonyCommerce::commerceEnd() return ret; } -void SonyCommerce::CreateSession( CallbackFunc cb, LPVOID lpParam ) +void SonyCommerce::CreateSession( CallbackFunc cb, void* lpParam ) { Init(); EnterCriticalSection(&m_queueLock); @@ -1406,7 +1406,7 @@ void SonyCommerce::CloseSession() Shutdown(); } -void SonyCommerce::GetProductList( CallbackFunc cb, LPVOID lpParam, std::vector* productList, const char *categoryId) +void SonyCommerce::GetProductList( CallbackFunc cb, void* lpParam, std::vector* productList, const char *categoryId) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1416,7 +1416,7 @@ void SonyCommerce::GetProductList( CallbackFunc cb, LPVOID lpParam, std::vector< LeaveCriticalSection(&m_queueLock); } -void SonyCommerce::GetDetailedProductInfo( CallbackFunc cb, LPVOID lpParam, ProductInfoDetailed* productInfo, const char *productId, const char *categoryId ) +void SonyCommerce::GetDetailedProductInfo( CallbackFunc cb, void* lpParam, ProductInfoDetailed* productInfo, const char *productId, const char *categoryId ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1428,7 +1428,7 @@ void SonyCommerce::GetDetailedProductInfo( CallbackFunc cb, LPVOID lpParam, Prod } // 4J-PB - fill out the long description and the price for the product -void SonyCommerce::AddDetailedProductInfo( CallbackFunc cb, LPVOID lpParam, ProductInfo* productInfo, const char *productId, const char *categoryId ) +void SonyCommerce::AddDetailedProductInfo( CallbackFunc cb, void* lpParam, ProductInfo* productInfo, const char *productId, const char *categoryId ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1438,7 +1438,7 @@ void SonyCommerce::AddDetailedProductInfo( CallbackFunc cb, LPVOID lpParam, Prod m_messageQueue.push(e_message_commerceAddDetailedProductInfo); LeaveCriticalSection(&m_queueLock); } -void SonyCommerce::GetCategoryInfo( CallbackFunc cb, LPVOID lpParam, CategoryInfo *info, const char *categoryId ) +void SonyCommerce::GetCategoryInfo( CallbackFunc cb, void* lpParam, CategoryInfo *info, const char *categoryId ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1448,7 +1448,7 @@ void SonyCommerce::GetCategoryInfo( CallbackFunc cb, LPVOID lpParam, CategoryInf LeaveCriticalSection(&m_queueLock); } -void SonyCommerce::Checkout( CallbackFunc cb, LPVOID lpParam, const char* skuID ) +void SonyCommerce::Checkout( CallbackFunc cb, void* lpParam, const char* skuID ) { if(m_memContainer != SYS_MEMORY_CONTAINER_ID_INVALID) { @@ -1469,7 +1469,7 @@ void SonyCommerce::Checkout( CallbackFunc cb, LPVOID lpParam, const char* skuID LeaveCriticalSection(&m_queueLock); } -void SonyCommerce::DownloadAlreadyPurchased( CallbackFunc cb, LPVOID lpParam, const char* skuID ) +void SonyCommerce::DownloadAlreadyPurchased( CallbackFunc cb, void* lpParam, const char* skuID ) { if(m_memContainer != SYS_MEMORY_CONTAINER_ID_INVALID) return; @@ -1489,4 +1489,3 @@ void SonyCommerce::DownloadAlreadyPurchased( CallbackFunc cb, LPVOID lpParam, co } - diff --git a/Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.h b/Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.h index 6df04947a..8b0e2e4dd 100644 --- a/Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.h +++ b/Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.h @@ -43,7 +43,7 @@ class SonyCommerce { public: - typedef void (*CallbackFunc)(LPVOID lpParam, int error_code); + typedef void (*CallbackFunc)(void* lpParam, int error_code); /// @brief @@ -153,20 +153,20 @@ public: public: - virtual void CreateSession(CallbackFunc cb, LPVOID lpParam) = 0; + virtual void CreateSession(CallbackFunc cb, void* lpParam) = 0; virtual void CloseSession() = 0; - virtual void GetCategoryInfo(CallbackFunc cb, LPVOID lpParam, CategoryInfo *info, const char *categoryId) = 0; - virtual void GetProductList(CallbackFunc cb, LPVOID lpParam, std::vector* productList, const char *categoryId) = 0; - virtual void GetDetailedProductInfo(CallbackFunc cb, LPVOID lpParam, ProductInfoDetailed* productInfoDetailed, const char *productId, const char *categoryId) = 0; - virtual void AddDetailedProductInfo( CallbackFunc cb, LPVOID lpParam, ProductInfo* productInfo, const char *productId, const char *categoryId ) = 0; - virtual void Checkout(CallbackFunc cb, LPVOID lpParam, const char* skuID) = 0; - virtual void DownloadAlreadyPurchased(CallbackFunc cb, LPVOID lpParam, const char* skuID) = 0; + virtual void GetCategoryInfo(CallbackFunc cb, void* lpParam, CategoryInfo *info, const char *categoryId) = 0; + virtual void GetProductList(CallbackFunc cb, void* lpParam, std::vector* productList, const char *categoryId) = 0; + virtual void GetDetailedProductInfo(CallbackFunc cb, void* lpParam, ProductInfoDetailed* productInfoDetailed, const char *productId, const char *categoryId) = 0; + virtual void AddDetailedProductInfo( CallbackFunc cb, void* lpParam, ProductInfo* productInfo, const char *productId, const char *categoryId ) = 0; + virtual void Checkout(CallbackFunc cb, void* lpParam, const char* skuID) = 0; + virtual void DownloadAlreadyPurchased(CallbackFunc cb, void* lpParam, const char* skuID) = 0; #if defined(__ORBIS__) || defined( __PSVITA__) - virtual void Checkout_Game(CallbackFunc cb, LPVOID lpParam, const char* skuID) = 0; - virtual void DownloadAlreadyPurchased_Game(CallbackFunc cb, LPVOID lpParam, const char* skuID) = 0; + virtual void Checkout_Game(CallbackFunc cb, void* lpParam, const char* skuID) = 0; + virtual void DownloadAlreadyPurchased_Game(CallbackFunc cb, void* lpParam, const char* skuID) = 0; #endif - virtual void UpgradeTrial(CallbackFunc cb, LPVOID lpParam) = 0; + virtual void UpgradeTrial(CallbackFunc cb, void* lpParam) = 0; virtual void CheckForTrialUpgradeKey() = 0; virtual bool LicenseChecked() = 0; diff --git a/Minecraft.Client/Platform/Orbis/Network/SonyCommerce_Orbis.cpp b/Minecraft.Client/Platform/Orbis/Network/SonyCommerce_Orbis.cpp index 6e3da0598..ce426c08f 100644 --- a/Minecraft.Client/Platform/Orbis/Network/SonyCommerce_Orbis.cpp +++ b/Minecraft.Client/Platform/Orbis/Network/SonyCommerce_Orbis.cpp @@ -9,7 +9,7 @@ bool SonyCommerce_Orbis::m_bCommerceInitialised = false; // SceNpCommerce2SessionInfo SonyCommerce_Orbis::m_sessionInfo; SonyCommerce_Orbis::State SonyCommerce_Orbis::m_state = e_state_noSession; int SonyCommerce_Orbis::m_errorCode = 0; -LPVOID SonyCommerce_Orbis::m_callbackParam = NULL; +void* SonyCommerce_Orbis::m_callbackParam = NULL; void* SonyCommerce_Orbis::m_receiveBuffer = NULL; SonyCommerce_Orbis::Event SonyCommerce_Orbis::m_event; @@ -29,7 +29,7 @@ SonyCommerce_Orbis::CallbackFunc SonyCommerce_Orbis::m_callbackFunc = NULL; bool SonyCommerce_Orbis::m_bUpgradingTrial = false; SonyCommerce_Orbis::CallbackFunc SonyCommerce_Orbis::m_trialUpgradeCallbackFunc; -LPVOID SonyCommerce_Orbis::m_trialUpgradeCallbackParam; +void* SonyCommerce_Orbis::m_trialUpgradeCallbackParam; CRITICAL_SECTION SonyCommerce_Orbis::m_queueLock; @@ -73,7 +73,7 @@ void SonyCommerce_Orbis::Init() -void SonyCommerce_Orbis::CheckForTrialUpgradeKey_Callback(LPVOID param, bool bFullVersion) +void SonyCommerce_Orbis::CheckForTrialUpgradeKey_Callback(void* param, bool bFullVersion) { ProfileManager.SetFullVersion(bFullVersion); if(ProfileManager.IsFullVersion()) @@ -498,7 +498,7 @@ int SonyCommerce_Orbis::downloadList_game(DownloadListInputParams ¶ms) return ret; } -void SonyCommerce_Orbis::UpgradeTrialCallback2(LPVOID lpParam,int err) +void SonyCommerce_Orbis::UpgradeTrialCallback2(void* lpParam,int err) { SonyCommerce* pCommerce = (SonyCommerce*)lpParam; app.DebugPrintf(4,"SonyCommerce_UpgradeTrialCallback2 : err : 0x%08x\n", err); @@ -512,7 +512,7 @@ void SonyCommerce_Orbis::UpgradeTrialCallback2(LPVOID lpParam,int err) m_trialUpgradeCallbackFunc(m_trialUpgradeCallbackParam, m_errorCode); } -void SonyCommerce_Orbis::UpgradeTrialCallback1(LPVOID lpParam,int err) +void SonyCommerce_Orbis::UpgradeTrialCallback1(void* lpParam,int err) { SonyCommerce* pCommerce = (SonyCommerce*)lpParam; app.DebugPrintf(4,"SonyCommerce_UpgradeTrialCallback1 : err : 0x%08x\n", err); @@ -551,7 +551,7 @@ void SonyCommerce_UpgradeTrial() app.UpgradeTrial(); } -void SonyCommerce_Orbis::UpgradeTrial(CallbackFunc cb, LPVOID lpParam) +void SonyCommerce_Orbis::UpgradeTrial(CallbackFunc cb, void* lpParam) { m_trialUpgradeCallbackFunc = cb; m_trialUpgradeCallbackParam = lpParam; @@ -1130,7 +1130,7 @@ int SonyCommerce_Orbis::commerceEnd() return ret; } -void SonyCommerce_Orbis::CreateSession( CallbackFunc cb, LPVOID lpParam ) +void SonyCommerce_Orbis::CreateSession( CallbackFunc cb, void* lpParam ) { // 4J-PB - reset any previous error code // I had this happen when I was offline on Vita, and accepted the PSN sign-in @@ -1172,7 +1172,7 @@ void SonyCommerce_Orbis::CloseSession() //Shutdown(); } -void SonyCommerce_Orbis::GetProductList( CallbackFunc cb, LPVOID lpParam, std::vector* productList, const char *categoryId) +void SonyCommerce_Orbis::GetProductList( CallbackFunc cb, void* lpParam, std::vector* productList, const char *categoryId) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1182,7 +1182,7 @@ void SonyCommerce_Orbis::GetProductList( CallbackFunc cb, LPVOID lpParam, std::v LeaveCriticalSection(&m_queueLock); } -void SonyCommerce_Orbis::GetDetailedProductInfo( CallbackFunc cb, LPVOID lpParam, ProductInfoDetailed* productInfo, const char *productId, const char *categoryId ) +void SonyCommerce_Orbis::GetDetailedProductInfo( CallbackFunc cb, void* lpParam, ProductInfoDetailed* productInfo, const char *productId, const char *categoryId ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1194,7 +1194,7 @@ void SonyCommerce_Orbis::GetDetailedProductInfo( CallbackFunc cb, LPVOID lpParam } // 4J-PB - fill out the long description and the price for the product -void SonyCommerce_Orbis::AddDetailedProductInfo( CallbackFunc cb, LPVOID lpParam, ProductInfo* productInfo, const char *productId, const char *categoryId ) +void SonyCommerce_Orbis::AddDetailedProductInfo( CallbackFunc cb, void* lpParam, ProductInfo* productInfo, const char *productId, const char *categoryId ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1204,7 +1204,7 @@ void SonyCommerce_Orbis::AddDetailedProductInfo( CallbackFunc cb, LPVOID lpParam m_messageQueue.push(e_message_commerceAddDetailedProductInfo); LeaveCriticalSection(&m_queueLock); } -void SonyCommerce_Orbis::GetCategoryInfo( CallbackFunc cb, LPVOID lpParam, CategoryInfo *info, const char *categoryId ) +void SonyCommerce_Orbis::GetCategoryInfo( CallbackFunc cb, void* lpParam, CategoryInfo *info, const char *categoryId ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1214,7 +1214,7 @@ void SonyCommerce_Orbis::GetCategoryInfo( CallbackFunc cb, LPVOID lpParam, Categ LeaveCriticalSection(&m_queueLock); } -void SonyCommerce_Orbis::Checkout( CallbackFunc cb, LPVOID lpParam, const char* skuID ) +void SonyCommerce_Orbis::Checkout( CallbackFunc cb, void* lpParam, const char* skuID ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1224,7 +1224,7 @@ void SonyCommerce_Orbis::Checkout( CallbackFunc cb, LPVOID lpParam, const char* LeaveCriticalSection(&m_queueLock); } -void SonyCommerce_Orbis::DownloadAlreadyPurchased( CallbackFunc cb, LPVOID lpParam, const char* skuID ) +void SonyCommerce_Orbis::DownloadAlreadyPurchased( CallbackFunc cb, void* lpParam, const char* skuID ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1234,7 +1234,7 @@ void SonyCommerce_Orbis::DownloadAlreadyPurchased( CallbackFunc cb, LPVOID lpPar LeaveCriticalSection(&m_queueLock); } -void SonyCommerce_Orbis::Checkout_Game( CallbackFunc cb, LPVOID lpParam, const char* skuID ) +void SonyCommerce_Orbis::Checkout_Game( CallbackFunc cb, void* lpParam, const char* skuID ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1243,7 +1243,7 @@ void SonyCommerce_Orbis::Checkout_Game( CallbackFunc cb, LPVOID lpParam, const c m_messageQueue.push(e_message_commerceCheckout_Game); LeaveCriticalSection(&m_queueLock); } -void SonyCommerce_Orbis::DownloadAlreadyPurchased_Game( CallbackFunc cb, LPVOID lpParam, const char* skuID ) +void SonyCommerce_Orbis::DownloadAlreadyPurchased_Game( CallbackFunc cb, void* lpParam, const char* skuID ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1267,7 +1267,7 @@ std::vector g_productInfo; SonyCommerce::CategoryInfo g_categoryInfo2; SonyCommerce::ProductInfoDetailed g_productInfoDetailed; -void testCallback(LPVOID lpParam, int error_code) +void testCallback(void* lpParam, int error_code) { app.DebugPrintf("Callback hit, error 0x%08x\n", error_code); } @@ -1311,4 +1311,4 @@ void SonyCommerce_Orbis::Test() } } -*/ \ No newline at end of file +*/ diff --git a/Minecraft.Client/Platform/Orbis/Network/SonyCommerce_Orbis.h b/Minecraft.Client/Platform/Orbis/Network/SonyCommerce_Orbis.h index fc824a7e2..7c24f2793 100644 --- a/Minecraft.Client/Platform/Orbis/Network/SonyCommerce_Orbis.h +++ b/Minecraft.Client/Platform/Orbis/Network/SonyCommerce_Orbis.h @@ -81,7 +81,7 @@ class SonyCommerce_Orbis : public SonyCommerce // static SceNpCommerce2SessionInfo m_sessionInfo; static State m_state; static int m_errorCode; - static LPVOID m_callbackParam; + static void* m_callbackParam; static Event m_event; static Message m_message; // static uint32_t m_requestID; @@ -100,7 +100,7 @@ class SonyCommerce_Orbis : public SonyCommerce static bool m_bUpgradingTrial; static C4JThread* m_tickThread; static CallbackFunc m_trialUpgradeCallbackFunc; - static LPVOID m_trialUpgradeCallbackParam; + static void* m_trialUpgradeCallbackParam; static CRITICAL_SECTION m_queueLock; static void runCallback() @@ -112,7 +112,7 @@ class SonyCommerce_Orbis : public SonyCommerce func(m_callbackParam, m_errorCode); m_errorCode = SCE_OK; } - static void setCallback(CallbackFunc cb,LPVOID lpParam) + static void setCallback(CallbackFunc cb, void* lpParam) { assert(m_callbackFunc == NULL); m_callbackFunc = cb; @@ -142,8 +142,8 @@ class SonyCommerce_Orbis : public SonyCommerce static int downloadList(DownloadListInputParams ¶ms); static int checkout_game(CheckoutInputParams ¶ms); static int downloadList_game(DownloadListInputParams ¶ms); - static void UpgradeTrialCallback1(LPVOID lpParam,int err); - static void UpgradeTrialCallback2(LPVOID lpParam,int err); + static void UpgradeTrialCallback1(void* lpParam,int err); + static void UpgradeTrialCallback2(void* lpParam,int err); static void Delete(); static void copyCategoryInfo(CategoryInfo *pInfo, sce::Toolkit::NP::CategoryInfo *pNPInfo); static void copyProductList(std::vector* pProductList, std::vector* pNPProductList); @@ -160,22 +160,22 @@ class SonyCommerce_Orbis : public SonyCommerce static void Init(); static int Shutdown(); - static void CheckForTrialUpgradeKey_Callback(LPVOID param, bool bFullVersion); + static void CheckForTrialUpgradeKey_Callback(void* param, bool bFullVersion); public: - virtual void CreateSession(CallbackFunc cb, LPVOID lpParam); + virtual void CreateSession(CallbackFunc cb, void* lpParam); virtual void CloseSession(); - virtual void GetCategoryInfo(CallbackFunc cb, LPVOID lpParam, CategoryInfo *info, const char *categoryId); - virtual void GetProductList(CallbackFunc cb, LPVOID lpParam, std::vector* productList, const char *categoryId); - virtual void GetDetailedProductInfo(CallbackFunc cb, LPVOID lpParam, ProductInfoDetailed* productInfoDetailed, const char *productId, const char *categoryId); - virtual void AddDetailedProductInfo( CallbackFunc cb, LPVOID lpParam, ProductInfo* productInfo, const char *productId, const char *categoryId ); - virtual void Checkout(CallbackFunc cb, LPVOID lpParam, const char* skuID); - virtual void DownloadAlreadyPurchased(CallbackFunc cb, LPVOID lpParam, const char* skuID); - virtual void Checkout_Game(CallbackFunc cb, LPVOID lpParam, const char* skuID); - virtual void DownloadAlreadyPurchased_Game(CallbackFunc cb, LPVOID lpParam, const char* skuID); - virtual void UpgradeTrial(CallbackFunc cb, LPVOID lpParam); + virtual void GetCategoryInfo(CallbackFunc cb, void* lpParam, CategoryInfo *info, const char *categoryId); + virtual void GetProductList(CallbackFunc cb, void* lpParam, std::vector* productList, const char *categoryId); + virtual void GetDetailedProductInfo(CallbackFunc cb, void* lpParam, ProductInfoDetailed* productInfoDetailed, const char *productId, const char *categoryId); + virtual void AddDetailedProductInfo( CallbackFunc cb, void* lpParam, ProductInfo* productInfo, const char *productId, const char *categoryId ); + virtual void Checkout(CallbackFunc cb, void* lpParam, const char* skuID); + virtual void DownloadAlreadyPurchased(CallbackFunc cb, void* lpParam, const char* skuID); + virtual void Checkout_Game(CallbackFunc cb, void* lpParam, const char* skuID); + virtual void DownloadAlreadyPurchased_Game(CallbackFunc cb, void* lpParam, const char* skuID); + virtual void UpgradeTrial(CallbackFunc cb, void* lpParam); virtual void CheckForTrialUpgradeKey(); virtual bool LicenseChecked(); diff --git a/Minecraft.Client/Platform/PS3/Network/SonyCommerce_PS3.cpp b/Minecraft.Client/Platform/PS3/Network/SonyCommerce_PS3.cpp index e24a4bc07..97cb47980 100644 --- a/Minecraft.Client/Platform/PS3/Network/SonyCommerce_PS3.cpp +++ b/Minecraft.Client/Platform/PS3/Network/SonyCommerce_PS3.cpp @@ -9,7 +9,7 @@ bool SonyCommerce_PS3::m_bCommerceInitialised = false; SceNpCommerce2SessionInfo SonyCommerce_PS3::m_sessionInfo; SonyCommerce_PS3::State SonyCommerce_PS3::m_state = e_state_noSession; int SonyCommerce_PS3::m_errorCode = 0; -LPVOID SonyCommerce_PS3::m_callbackParam = NULL; +void* SonyCommerce_PS3::m_callbackParam = NULL; void* SonyCommerce_PS3::m_receiveBuffer = NULL; SonyCommerce_PS3::Event SonyCommerce_PS3::m_event; @@ -29,7 +29,7 @@ sys_memory_container_t SonyCommerce_PS3::m_memContainer = SYS_MEMORY_CONTAIN bool SonyCommerce_PS3::m_bUpgradingTrial = false; SonyCommerce_PS3::CallbackFunc SonyCommerce_PS3::m_trialUpgradeCallbackFunc; -LPVOID SonyCommerce_PS3::m_trialUpgradeCallbackParam; +void* SonyCommerce_PS3::m_trialUpgradeCallbackParam; CRITICAL_SECTION SonyCommerce_PS3::m_queueLock; @@ -81,7 +81,7 @@ void SonyCommerce_PS3::Init() -void SonyCommerce_PS3::CheckForTrialUpgradeKey_Callback(LPVOID param, bool bFullVersion) +void SonyCommerce_PS3::CheckForTrialUpgradeKey_Callback(void* param, bool bFullVersion) { ProfileManager.SetFullVersion(bFullVersion); if(ProfileManager.IsFullVersion()) @@ -806,7 +806,7 @@ int SonyCommerce_PS3::downloadList(DownloadListInputParams ¶ms) return CELL_OK; } -void SonyCommerce_PS3::UpgradeTrialCallback2(LPVOID lpParam,int err) +void SonyCommerce_PS3::UpgradeTrialCallback2(void* lpParam,int err) { SonyCommerce* pCommerce = (SonyCommerce*)lpParam; app.DebugPrintf(4,"SonyCommerce_UpgradeTrialCallback2 : err : 0x%08x\n", err); @@ -820,7 +820,7 @@ void SonyCommerce_PS3::UpgradeTrialCallback2(LPVOID lpParam,int err) m_trialUpgradeCallbackFunc(m_trialUpgradeCallbackParam, m_errorCode); } -void SonyCommerce_PS3::UpgradeTrialCallback1(LPVOID lpParam,int err) +void SonyCommerce_PS3::UpgradeTrialCallback1(void* lpParam,int err) { SonyCommerce* pCommerce = (SonyCommerce*)lpParam; app.DebugPrintf(4,"SonyCommerce_UpgradeTrialCallback1 : err : 0x%08x\n", err); @@ -856,7 +856,7 @@ void SonyCommerce_UpgradeTrial() app.UpgradeTrial(); } -void SonyCommerce_PS3::UpgradeTrial(CallbackFunc cb, LPVOID lpParam) +void SonyCommerce_PS3::UpgradeTrial(CallbackFunc cb, void* lpParam) { m_trialUpgradeCallbackFunc = cb; m_trialUpgradeCallbackParam = lpParam; @@ -1396,7 +1396,7 @@ int SonyCommerce_PS3::commerceEnd() return ret; } -void SonyCommerce_PS3::CreateSession( CallbackFunc cb, LPVOID lpParam ) +void SonyCommerce_PS3::CreateSession( CallbackFunc cb, void* lpParam ) { // 4J-PB - reset any previous error code // I had this happen when I was offline on Vita, and accepted the PSN sign-in @@ -1427,7 +1427,7 @@ void SonyCommerce_PS3::CloseSession() Shutdown(); } -void SonyCommerce_PS3::GetProductList( CallbackFunc cb, LPVOID lpParam, std::vector* productList, const char *categoryId) +void SonyCommerce_PS3::GetProductList( CallbackFunc cb, void* lpParam, std::vector* productList, const char *categoryId) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1437,7 +1437,7 @@ void SonyCommerce_PS3::GetProductList( CallbackFunc cb, LPVOID lpParam, std::vec LeaveCriticalSection(&m_queueLock); } -void SonyCommerce_PS3::GetDetailedProductInfo( CallbackFunc cb, LPVOID lpParam, ProductInfoDetailed* productInfo, const char *productId, const char *categoryId ) +void SonyCommerce_PS3::GetDetailedProductInfo( CallbackFunc cb, void* lpParam, ProductInfoDetailed* productInfo, const char *productId, const char *categoryId ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1449,7 +1449,7 @@ void SonyCommerce_PS3::GetDetailedProductInfo( CallbackFunc cb, LPVOID lpParam, } // 4J-PB - fill out the long description and the price for the product -void SonyCommerce_PS3::AddDetailedProductInfo( CallbackFunc cb, LPVOID lpParam, ProductInfo* productInfo, const char *productId, const char *categoryId ) +void SonyCommerce_PS3::AddDetailedProductInfo( CallbackFunc cb, void* lpParam, ProductInfo* productInfo, const char *productId, const char *categoryId ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1459,7 +1459,7 @@ void SonyCommerce_PS3::AddDetailedProductInfo( CallbackFunc cb, LPVOID lpParam, m_messageQueue.push(e_message_commerceAddDetailedProductInfo); LeaveCriticalSection(&m_queueLock); } -void SonyCommerce_PS3::GetCategoryInfo( CallbackFunc cb, LPVOID lpParam, CategoryInfo *info, const char *categoryId ) +void SonyCommerce_PS3::GetCategoryInfo( CallbackFunc cb, void* lpParam, CategoryInfo *info, const char *categoryId ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1469,7 +1469,7 @@ void SonyCommerce_PS3::GetCategoryInfo( CallbackFunc cb, LPVOID lpParam, Categor LeaveCriticalSection(&m_queueLock); } -void SonyCommerce_PS3::Checkout( CallbackFunc cb, LPVOID lpParam, const char* skuID ) +void SonyCommerce_PS3::Checkout( CallbackFunc cb, void* lpParam, const char* skuID ) { if(m_memContainer != SYS_MEMORY_CONTAINER_ID_INVALID) { @@ -1490,7 +1490,7 @@ void SonyCommerce_PS3::Checkout( CallbackFunc cb, LPVOID lpParam, const char* sk LeaveCriticalSection(&m_queueLock); } -void SonyCommerce_PS3::DownloadAlreadyPurchased( CallbackFunc cb, LPVOID lpParam, const char* skuID ) +void SonyCommerce_PS3::DownloadAlreadyPurchased( CallbackFunc cb, void* lpParam, const char* skuID ) { if(m_memContainer != SYS_MEMORY_CONTAINER_ID_INVALID) return; @@ -1510,4 +1510,3 @@ void SonyCommerce_PS3::DownloadAlreadyPurchased( CallbackFunc cb, LPVOID lpParam } - diff --git a/Minecraft.Client/Platform/PS3/Network/SonyCommerce_PS3.h b/Minecraft.Client/Platform/PS3/Network/SonyCommerce_PS3.h index a39efafb6..f9f74150a 100644 --- a/Minecraft.Client/Platform/PS3/Network/SonyCommerce_PS3.h +++ b/Minecraft.Client/Platform/PS3/Network/SonyCommerce_PS3.h @@ -88,7 +88,7 @@ class SonyCommerce_PS3 : public SonyCommerce static SceNpCommerce2SessionInfo m_sessionInfo; static State m_state; static int m_errorCode; - static LPVOID m_callbackParam; + static void* m_callbackParam; static Event m_event; static Message m_message; // static uint32_t m_requestID; @@ -107,7 +107,7 @@ class SonyCommerce_PS3 : public SonyCommerce static bool m_bUpgradingTrial; static C4JThread* m_tickThread; static CallbackFunc m_trialUpgradeCallbackFunc; - static LPVOID m_trialUpgradeCallbackParam; + static void* m_trialUpgradeCallbackParam; static CRITICAL_SECTION m_queueLock; static void runCallback() @@ -119,7 +119,7 @@ class SonyCommerce_PS3 : public SonyCommerce func(m_callbackParam, m_errorCode); m_errorCode = CELL_OK; } - static void setCallback(CallbackFunc cb,LPVOID lpParam) + static void setCallback(CallbackFunc cb, void* lpParam) { assert(m_callbackFunc == NULL); m_callbackFunc = cb; @@ -147,8 +147,8 @@ class SonyCommerce_PS3 : public SonyCommerce static int addDetailedProductInfo(ProductInfo *info, const char *productId, char *categoryId); static int checkout(CheckoutInputParams ¶ms); static int downloadList(DownloadListInputParams ¶ms); - static void UpgradeTrialCallback1(LPVOID lpParam,int err); - static void UpgradeTrialCallback2(LPVOID lpParam,int err); + static void UpgradeTrialCallback1(void* lpParam,int err); + static void UpgradeTrialCallback2(void* lpParam,int err); static void Delete(); @@ -160,20 +160,20 @@ class SonyCommerce_PS3 : public SonyCommerce static void Init(); static int Shutdown(); - static void CheckForTrialUpgradeKey_Callback(LPVOID param, bool bFullVersion); + static void CheckForTrialUpgradeKey_Callback(void* param, bool bFullVersion); public: - virtual void CreateSession(CallbackFunc cb, LPVOID lpParam); + virtual void CreateSession(CallbackFunc cb, void* lpParam); virtual void CloseSession(); - virtual void GetCategoryInfo(CallbackFunc cb, LPVOID lpParam, CategoryInfo *info, const char *categoryId); - virtual void GetProductList(CallbackFunc cb, LPVOID lpParam, std::vector* productList, const char *categoryId); - virtual void GetDetailedProductInfo(CallbackFunc cb, LPVOID lpParam, ProductInfoDetailed* productInfoDetailed, const char *productId, const char *categoryId); - virtual void AddDetailedProductInfo( CallbackFunc cb, LPVOID lpParam, ProductInfo* productInfo, const char *productId, const char *categoryId ); - virtual void Checkout(CallbackFunc cb, LPVOID lpParam, const char* skuID); - virtual void DownloadAlreadyPurchased(CallbackFunc cb, LPVOID lpParam, const char* skuID); - virtual void UpgradeTrial(CallbackFunc cb, LPVOID lpParam); + virtual void GetCategoryInfo(CallbackFunc cb, void* lpParam, CategoryInfo *info, const char *categoryId); + virtual void GetProductList(CallbackFunc cb, void* lpParam, std::vector* productList, const char *categoryId); + virtual void GetDetailedProductInfo(CallbackFunc cb, void* lpParam, ProductInfoDetailed* productInfoDetailed, const char *productId, const char *categoryId); + virtual void AddDetailedProductInfo( CallbackFunc cb, void* lpParam, ProductInfo* productInfo, const char *productId, const char *categoryId ); + virtual void Checkout(CallbackFunc cb, void* lpParam, const char* skuID); + virtual void DownloadAlreadyPurchased(CallbackFunc cb, void* lpParam, const char* skuID); + virtual void UpgradeTrial(CallbackFunc cb, void* lpParam); virtual void CheckForTrialUpgradeKey(); virtual bool LicenseChecked(); diff --git a/Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.cpp b/Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.cpp index 62d894309..e3ac197fa 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.cpp +++ b/Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.cpp @@ -10,7 +10,7 @@ bool SonyCommerce_Vita::m_bCommerceInitialised = false; // SceNpCommerce2SessionInfo SonyCommerce_Vita::m_sessionInfo; SonyCommerce_Vita::State SonyCommerce_Vita::m_state = e_state_noSession; int SonyCommerce_Vita::m_errorCode = 0; -LPVOID SonyCommerce_Vita::m_callbackParam = NULL; +void* SonyCommerce_Vita::m_callbackParam = NULL; void* SonyCommerce_Vita::m_receiveBuffer = NULL; SonyCommerce_Vita::Event SonyCommerce_Vita::m_event; @@ -30,7 +30,7 @@ SonyCommerce_Vita::CallbackFunc SonyCommerce_Vita::m_callbackFunc = NULL; bool SonyCommerce_Vita::m_bUpgradingTrial = false; SonyCommerce_Vita::CallbackFunc SonyCommerce_Vita::m_trialUpgradeCallbackFunc; -LPVOID SonyCommerce_Vita::m_trialUpgradeCallbackParam; +void* SonyCommerce_Vita::m_trialUpgradeCallbackParam; CRITICAL_SECTION SonyCommerce_Vita::m_queueLock; @@ -84,7 +84,7 @@ void SonyCommerce_Vita::Init() -void SonyCommerce_Vita::CheckForTrialUpgradeKey_Callback(LPVOID param, bool bFullVersion) +void SonyCommerce_Vita::CheckForTrialUpgradeKey_Callback(void* param, bool bFullVersion) { ProfileManager.SetFullVersion(bFullVersion); if(ProfileManager.IsFullVersion()) @@ -126,7 +126,7 @@ int SonyCommerce_Vita::Shutdown() return ret; } -void SonyCommerce_Vita::InstallContentCallback(LPVOID lpParam,int err) +void SonyCommerce_Vita::InstallContentCallback(void* lpParam,int err) { m_iClearDLCCountdown = 30; m_bInstallingContent = false; @@ -582,7 +582,7 @@ int SonyCommerce_Vita::installContent() } -void SonyCommerce_Vita::UpgradeTrialCallback2(LPVOID lpParam,int err) +void SonyCommerce_Vita::UpgradeTrialCallback2(void* lpParam,int err) { SonyCommerce* pCommerce = (SonyCommerce*)lpParam; app.DebugPrintf(4,"SonyCommerce_UpgradeTrialCallback2 : err : 0x%08x\n", err); @@ -596,7 +596,7 @@ void SonyCommerce_Vita::UpgradeTrialCallback2(LPVOID lpParam,int err) m_trialUpgradeCallbackFunc(m_trialUpgradeCallbackParam, m_errorCode); } -void SonyCommerce_Vita::UpgradeTrialCallback1(LPVOID lpParam,int err) +void SonyCommerce_Vita::UpgradeTrialCallback1(void* lpParam,int err) { SonyCommerce* pCommerce = (SonyCommerce*)lpParam; app.DebugPrintf(4,"SonyCommerce_UpgradeTrialCallback1 : err : 0x%08x\n", err); @@ -632,7 +632,7 @@ void SonyCommerce_UpgradeTrial() app.UpgradeTrial(); } -void SonyCommerce_Vita::UpgradeTrial(CallbackFunc cb, LPVOID lpParam) +void SonyCommerce_Vita::UpgradeTrial(CallbackFunc cb, void* lpParam) { m_trialUpgradeCallbackFunc = cb; m_trialUpgradeCallbackParam = lpParam; @@ -1304,7 +1304,7 @@ int SonyCommerce_Vita::commerceEnd() return ret; } -void SonyCommerce_Vita::CreateSession( CallbackFunc cb, LPVOID lpParam ) +void SonyCommerce_Vita::CreateSession( CallbackFunc cb, void* lpParam ) { // 4J-PB - reset any previous error code // I had this happen when I was offline on Vita, and accepted the PSN sign-in @@ -1343,7 +1343,7 @@ void SonyCommerce_Vita::CloseSession() Shutdown(); } -void SonyCommerce_Vita::GetProductList( CallbackFunc cb, LPVOID lpParam, std::vector* productList, const char *categoryId) +void SonyCommerce_Vita::GetProductList( CallbackFunc cb, void* lpParam, std::vector* productList, const char *categoryId) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1353,7 +1353,7 @@ void SonyCommerce_Vita::GetProductList( CallbackFunc cb, LPVOID lpParam, std::ve LeaveCriticalSection(&m_queueLock); } -void SonyCommerce_Vita::GetDetailedProductInfo( CallbackFunc cb, LPVOID lpParam, ProductInfoDetailed* productInfo, const char *productId, const char *categoryId ) +void SonyCommerce_Vita::GetDetailedProductInfo( CallbackFunc cb, void* lpParam, ProductInfoDetailed* productInfo, const char *productId, const char *categoryId ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1365,7 +1365,7 @@ void SonyCommerce_Vita::GetDetailedProductInfo( CallbackFunc cb, LPVOID lpParam, } // 4J-PB - fill out the long description and the price for the product -void SonyCommerce_Vita::AddDetailedProductInfo( CallbackFunc cb, LPVOID lpParam, ProductInfo* productInfo, const char *productId, const char *categoryId ) +void SonyCommerce_Vita::AddDetailedProductInfo( CallbackFunc cb, void* lpParam, ProductInfo* productInfo, const char *productId, const char *categoryId ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1375,7 +1375,7 @@ void SonyCommerce_Vita::AddDetailedProductInfo( CallbackFunc cb, LPVOID lpParam, m_messageQueue.push(e_message_commerceAddDetailedProductInfo); LeaveCriticalSection(&m_queueLock); } -void SonyCommerce_Vita::GetCategoryInfo( CallbackFunc cb, LPVOID lpParam, CategoryInfo *info, const char *categoryId ) +void SonyCommerce_Vita::GetCategoryInfo( CallbackFunc cb, void* lpParam, CategoryInfo *info, const char *categoryId ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1385,7 +1385,7 @@ void SonyCommerce_Vita::GetCategoryInfo( CallbackFunc cb, LPVOID lpParam, Catego LeaveCriticalSection(&m_queueLock); } -void SonyCommerce_Vita::Checkout( CallbackFunc cb, LPVOID lpParam, ProductInfo* productInfo ) +void SonyCommerce_Vita::Checkout( CallbackFunc cb, void* lpParam, ProductInfo* productInfo ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1399,12 +1399,12 @@ void SonyCommerce_Vita::Checkout( CallbackFunc cb, LPVOID lpParam, ProductInfo* LeaveCriticalSection(&m_queueLock); } -void SonyCommerce_Vita::Checkout( CallbackFunc cb, LPVOID lpParam, const char* skuID ) +void SonyCommerce_Vita::Checkout( CallbackFunc cb, void* lpParam, const char* skuID ) { assert(0); } -void SonyCommerce_Vita::DownloadAlreadyPurchased( CallbackFunc cb, LPVOID lpParam, const char* skuID ) +void SonyCommerce_Vita::DownloadAlreadyPurchased( CallbackFunc cb, void* lpParam, const char* skuID ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1414,7 +1414,7 @@ void SonyCommerce_Vita::DownloadAlreadyPurchased( CallbackFunc cb, LPVOID lpPara LeaveCriticalSection(&m_queueLock); } -void SonyCommerce_Vita::Checkout_Game( CallbackFunc cb, LPVOID lpParam, const char* skuID ) +void SonyCommerce_Vita::Checkout_Game( CallbackFunc cb, void* lpParam, const char* skuID ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1423,7 +1423,7 @@ void SonyCommerce_Vita::Checkout_Game( CallbackFunc cb, LPVOID lpParam, const ch m_messageQueue.push(e_message_commerceCheckout_Game); LeaveCriticalSection(&m_queueLock); } -void SonyCommerce_Vita::DownloadAlreadyPurchased_Game( CallbackFunc cb, LPVOID lpParam, const char* skuID ) +void SonyCommerce_Vita::DownloadAlreadyPurchased_Game( CallbackFunc cb, void* lpParam, const char* skuID ) { EnterCriticalSection(&m_queueLock); setCallback(cb,lpParam); @@ -1433,7 +1433,7 @@ void SonyCommerce_Vita::DownloadAlreadyPurchased_Game( CallbackFunc cb, LPVOID l LeaveCriticalSection(&m_queueLock); } -void SonyCommerce_Vita::InstallContent( CallbackFunc cb, LPVOID lpParam ) +void SonyCommerce_Vita::InstallContent( CallbackFunc cb, void* lpParam ) { if(m_callbackFunc == NULL && m_messageQueue.size() == 0) // wait till other processes have finished { @@ -1472,7 +1472,7 @@ std::vector g_productInfo; SonyCommerce::CategoryInfo g_categoryInfo2; SonyCommerce::ProductInfoDetailed g_productInfoDetailed; -void testCallback(LPVOID lpParam, int error_code) +void testCallback(void* lpParam, int error_code) { app.DebugPrintf("Callback hit, error 0x%08x\n", error_code); } @@ -1516,4 +1516,4 @@ void SonyCommerce_Vita::Test() } } -*/ \ No newline at end of file +*/ diff --git a/Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.h b/Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.h index 64b1d6a46..835f7fef9 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.h +++ b/Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.h @@ -88,7 +88,7 @@ class SonyCommerce_Vita : public SonyCommerce // static SceNpCommerce2SessionInfo m_sessionInfo; static State m_state; static int m_errorCode; - static LPVOID m_callbackParam; + static void* m_callbackParam; static Event m_event; static Message m_message; // static uint32_t m_requestID; @@ -107,7 +107,7 @@ class SonyCommerce_Vita : public SonyCommerce static bool m_bUpgradingTrial; static C4JThread* m_tickThread; static CallbackFunc m_trialUpgradeCallbackFunc; - static LPVOID m_trialUpgradeCallbackParam; + static void* m_trialUpgradeCallbackParam; static CRITICAL_SECTION m_queueLock; static bool m_bLicenseInstalled; static bool m_bDownloadsPending; @@ -126,7 +126,7 @@ class SonyCommerce_Vita : public SonyCommerce func(m_callbackParam, m_errorCode); m_errorCode = SCE_OK; } - static void setCallback(CallbackFunc cb,LPVOID lpParam) + static void setCallback(CallbackFunc cb, void* lpParam) { assert(m_callbackFunc == NULL); m_callbackFunc = cb; @@ -158,14 +158,14 @@ class SonyCommerce_Vita : public SonyCommerce static int checkout_game(CheckoutInputParams ¶ms); static int downloadList_game(DownloadListInputParams ¶ms); static int installContent(); - static void UpgradeTrialCallback1(LPVOID lpParam,int err); - static void UpgradeTrialCallback2(LPVOID lpParam,int err); + static void UpgradeTrialCallback1(void* lpParam,int err); + static void UpgradeTrialCallback2(void* lpParam,int err); static void Delete(); static void copyCategoryInfo(CategoryInfo *pInfo, sce::Toolkit::NP::CategoryInfo *pNPInfo); static void copyProductList(std::vector* pProductList, std::vector* pNPProductList); static void copyDetailedProductInfo(ProductInfoDetailed *pInfo, sce::Toolkit::NP::ProductInfoDetailed* pNPInfo); static void copyAddDetailedProductInfo(ProductInfo *pInfo, sce::Toolkit::NP::ProductInfoDetailed* pNPInfo); - static void InstallContentCallback(LPVOID lpParam,int err); + static void InstallContentCallback(void* lpParam,int err); static int commerceEnd(); // static int upgradeTrial(); @@ -176,25 +176,25 @@ class SonyCommerce_Vita : public SonyCommerce static void Init(); static int Shutdown(); - static void CheckForTrialUpgradeKey_Callback(LPVOID param, bool bFullVersion); + static void CheckForTrialUpgradeKey_Callback(void* param, bool bFullVersion); public: static void checkBackgroundDownloadStatus(); - virtual void CreateSession(CallbackFunc cb, LPVOID lpParam); + virtual void CreateSession(CallbackFunc cb, void* lpParam); virtual void CloseSession(); - virtual void GetCategoryInfo(CallbackFunc cb, LPVOID lpParam, CategoryInfo *info, const char *categoryId); - virtual void GetProductList(CallbackFunc cb, LPVOID lpParam, std::vector* productList, const char *categoryId); - virtual void GetDetailedProductInfo(CallbackFunc cb, LPVOID lpParam, ProductInfoDetailed* productInfoDetailed, const char *productId, const char *categoryId); - virtual void AddDetailedProductInfo( CallbackFunc cb, LPVOID lpParam, ProductInfo* productInfo, const char *productId, const char *categoryId ); - virtual void Checkout(CallbackFunc cb, LPVOID lpParam, const char* skuID); - virtual void Checkout(CallbackFunc cb, LPVOID lpParam, ProductInfo* productInfo); - virtual void DownloadAlreadyPurchased(CallbackFunc cb, LPVOID lpParam, const char* skuID); - virtual void Checkout_Game(CallbackFunc cb, LPVOID lpParam, const char* skuID); - virtual void DownloadAlreadyPurchased_Game(CallbackFunc cb, LPVOID lpParam, const char* skuID); - static void InstallContent(CallbackFunc cb, LPVOID lpParam); - virtual void UpgradeTrial(CallbackFunc cb, LPVOID lpParam); + virtual void GetCategoryInfo(CallbackFunc cb, void* lpParam, CategoryInfo *info, const char *categoryId); + virtual void GetProductList(CallbackFunc cb, void* lpParam, std::vector* productList, const char *categoryId); + virtual void GetDetailedProductInfo(CallbackFunc cb, void* lpParam, ProductInfoDetailed* productInfoDetailed, const char *productId, const char *categoryId); + virtual void AddDetailedProductInfo( CallbackFunc cb, void* lpParam, ProductInfo* productInfo, const char *productId, const char *categoryId ); + virtual void Checkout(CallbackFunc cb, void* lpParam, const char* skuID); + virtual void Checkout(CallbackFunc cb, void* lpParam, ProductInfo* productInfo); + virtual void DownloadAlreadyPurchased(CallbackFunc cb, void* lpParam, const char* skuID); + virtual void Checkout_Game(CallbackFunc cb, void* lpParam, const char* skuID); + virtual void DownloadAlreadyPurchased_Game(CallbackFunc cb, void* lpParam, const char* skuID); + static void InstallContent(CallbackFunc cb, void* lpParam); + virtual void UpgradeTrial(CallbackFunc cb, void* lpParam); virtual void CheckForTrialUpgradeKey(); virtual bool LicenseChecked();