From b1c48e66c935ca6fefe7cca08b73261b6db82b6e Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sat, 30 Dec 2023 00:45:38 +0100 Subject: [PATCH] sceNp: fix size_t data types --- rpcs3/Emu/Cell/Modules/sceNp.cpp | 20 +++--- rpcs3/Emu/Cell/Modules/sceNp.h | 4 +- rpcs3/Emu/Cell/Modules/sceNp2.cpp | 12 ++-- rpcs3/Emu/Cell/Modules/sceNp2.h | 2 +- rpcs3/Emu/Cell/Modules/sceNpClans.cpp | 2 +- rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp | 14 ++-- rpcs3/Emu/Cell/Modules/sceNpTus.cpp | 82 +++++++++++------------ 7 files changed, 68 insertions(+), 68 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/sceNp.cpp b/rpcs3/Emu/Cell/Modules/sceNp.cpp index 99e3928a10..bae0a4e616 100644 --- a/rpcs3/Emu/Cell/Modules/sceNp.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNp.cpp @@ -2080,7 +2080,7 @@ error_code sceNpCommerceDestroyCtx(u32 ctx_id) return CELL_OK; } -error_code sceNpCommerceInitProductCategory(vm::ptr pc, vm::cptr data, u64 data_size) +error_code sceNpCommerceInitProductCategory(vm::ptr pc, vm::cptr data, u32 data_size) { sceNp.todo("sceNpCommerceInitProductCategory(pc=*0x%x, data=*0x%x, data_size=%d)", pc, data, data_size); return CELL_OK; @@ -2103,7 +2103,7 @@ error_code sceNpCommerceGetProductCategoryFinish(u32 req_id) return CELL_OK; } -error_code sceNpCommerceGetProductCategoryResult(u32 req_id, vm::ptr buf, u64 buf_size, vm::ptr fill_size) +error_code sceNpCommerceGetProductCategoryResult(u32 req_id, vm::ptr buf, u32 buf_size, vm::ptr fill_size) { sceNp.todo("sceNpCommerceGetProductCategoryResult(req_id=%d, buf=*0x%x, buf_size=%d, fill_size=*0x%x)", req_id, buf, buf_size, fill_size); return CELL_OK; @@ -2778,7 +2778,7 @@ error_code sceNpLookupUserProfileAsync(s32 transId, vm::cptr npId, vm:: } error_code sceNpLookupUserProfileWithAvatarSize(s32 transId, s32 avatarSizeType, vm::cptr npId, vm::ptr userInfo, vm::ptr aboutMe, - vm::ptr languages, vm::ptr countryCode, vm::ptr avatarImageData, u64 avatarImageDataMaxSize, vm::ptr avatarImageDataSize, vm::ptr option) + vm::ptr languages, vm::ptr countryCode, vm::ptr avatarImageData, u32 avatarImageDataMaxSize, vm::ptr avatarImageDataSize, vm::ptr option) { sceNp.todo("sceNpLookupUserProfileWithAvatarSize(transId=%d, avatarSizeType=%d, npId=*0x%x, userInfo=*0x%x, aboutMe=*0x%x, languages=*0x%x, countryCode=*0x%x, avatarImageData=*0x%x, " "avatarImageDataMaxSize=%d, avatarImageDataSize=*0x%x, option=*0x%x)", @@ -2810,7 +2810,7 @@ error_code sceNpLookupUserProfileWithAvatarSize(s32 transId, s32 avatarSizeType, } error_code sceNpLookupUserProfileWithAvatarSizeAsync(s32 transId, s32 avatarSizeType, vm::cptr npId, vm::ptr userInfo, vm::ptr aboutMe, - vm::ptr languages, vm::ptr countryCode, vm::ptr avatarImageData, u64 avatarImageDataMaxSize, vm::ptr avatarImageDataSize, s32 prio, + vm::ptr languages, vm::ptr countryCode, vm::ptr avatarImageData, u32 avatarImageDataMaxSize, vm::ptr avatarImageDataSize, s32 prio, vm::ptr option) { sceNp.todo("sceNpLookupUserProfileWithAvatarSizeAsync(transId=%d, avatarSizeType=%d, npId=*0x%x, userInfo=*0x%x, aboutMe=*0x%x, languages=*0x%x, countryCode=*0x%x, avatarImageData=*0x%x, " @@ -2928,7 +2928,7 @@ error_code sceNpLookupTitleStorageAsync() return CELL_OK; } -error_code sceNpLookupTitleSmallStorage(s32 transId, vm::ptr data, u64 maxSize, vm::ptr contentLength, vm::ptr option) +error_code sceNpLookupTitleSmallStorage(s32 transId, vm::ptr data, u32 maxSize, vm::ptr contentLength, vm::ptr option) { sceNp.todo("sceNpLookupTitleSmallStorage(transId=%d, data=*0x%x, maxSize=%d, contentLength=*0x%x, option=*0x%x)", transId, data, maxSize, contentLength, option); @@ -2962,7 +2962,7 @@ error_code sceNpLookupTitleSmallStorage(s32 transId, vm::ptr data, u64 max return CELL_OK; } -error_code sceNpLookupTitleSmallStorageAsync(s32 transId, vm::ptr data, u64 maxSize, vm::ptr contentLength, s32 prio, vm::ptr option) +error_code sceNpLookupTitleSmallStorageAsync(s32 transId, vm::ptr data, u32 maxSize, vm::ptr contentLength, s32 prio, vm::ptr option) { sceNp.todo("sceNpLookupTitleSmallStorageAsync(transId=%d, data=*0x%x, maxSize=%d, contentLength=*0x%x, prio=%d, option=*0x%x)", transId, data, maxSize, contentLength, prio, option); @@ -2983,7 +2983,7 @@ error_code sceNpLookupTitleSmallStorageAsync(s32 transId, vm::ptr data, u6 return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; } - // if (something > maxSize) + //if (something > maxSize) //{ // return SCE_NP_COMMUNITY_ERROR_BODY_TOO_LARGE; //} @@ -3631,14 +3631,14 @@ error_code sceNpMatchingDestroyCtx(u32 ctx_id) return CELL_OK; } -error_code sceNpMatchingGetResult(u32 ctx_id, u32 req_id, vm::ptr buf, vm::ptr size, vm::ptr event) +error_code sceNpMatchingGetResult(u32 ctx_id, u32 req_id, vm::ptr buf, vm::ptr size, vm::ptr event) { sceNp.todo("sceNpMatchingGetResult(ctx_id=%d, req_id=%d, buf=*0x%x, size=*0x%x, event=*0x%x)", ctx_id, req_id, buf, size, event); return CELL_OK; } -error_code sceNpMatchingGetResultGUI(vm::ptr buf, vm::ptr size, vm::ptr event) +error_code sceNpMatchingGetResultGUI(vm::ptr buf, vm::ptr size, vm::ptr event) { sceNp.todo("sceNpMatchingGetResultGUI(buf=*0x%x, size=*0x%x, event=*0x%x)", buf, size, event); @@ -3687,7 +3687,7 @@ error_code sceNpMatchingGetRoomSearchFlag(u32 ctx_id, vm::ptr lobb return CELL_OK; } -error_code sceNpMatchingGetRoomMemberListLocal(u32 ctx_id, vm::ptr room_id, vm::ptr buflen, vm::ptr buf) +error_code sceNpMatchingGetRoomMemberListLocal(u32 ctx_id, vm::ptr room_id, vm::ptr buflen, vm::ptr buf) { sceNp.todo("sceNpMatchingGetRoomMemberListLocal(ctx_id=%d, room_id=*0x%x, buflen=*0x%x, buf=*0x%x)", ctx_id, room_id, buflen, buf); diff --git a/rpcs3/Emu/Cell/Modules/sceNp.h b/rpcs3/Emu/Cell/Modules/sceNp.h index 769e9689f4..f65e77c4e4 100644 --- a/rpcs3/Emu/Cell/Modules/sceNp.h +++ b/rpcs3/Emu/Cell/Modules/sceNp.h @@ -1288,7 +1288,7 @@ struct SceNpCommerceProductCategory { be_t version; vm::bcptr data; - be_t dataSize; + be_t dataSize; be_t dval; u8 reserved[16]; }; @@ -1370,7 +1370,7 @@ struct SceNpMatchingAttr struct { vm::bptr ptr; - be_t size; + be_t size; } data; } value; }; diff --git a/rpcs3/Emu/Cell/Modules/sceNp2.cpp b/rpcs3/Emu/Cell/Modules/sceNp2.cpp index cebda52426..50a84c01cb 100644 --- a/rpcs3/Emu/Cell/Modules/sceNp2.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNp2.cpp @@ -175,7 +175,7 @@ void fmt_class_string::format(std::string& out, u64 arg) }); } -error_code sceNpMatching2Init2(u64 stackSize, s32 priority, vm::ptr param); +error_code sceNpMatching2Init2(u32 stackSize, s32 priority, vm::ptr param); error_code sceNpMatching2Term(ppu_thread& ppu); error_code sceNpMatching2Term2(); @@ -236,7 +236,7 @@ error_code sceNpMatching2Init(u32 stackSize, s32 priority) return sceNpMatching2Init2(stackSize, priority, vm::null); // > SDK 2.4.0 } -error_code sceNpMatching2Init2(u64 stackSize, s32 priority, vm::ptr param) +error_code sceNpMatching2Init2(u32 stackSize, s32 priority, vm::ptr param) { sceNp2.warning("sceNpMatching2Init2(stackSize=0x%x, priority=%d, param=*0x%x)", stackSize, priority, param); @@ -794,7 +794,7 @@ error_code sceNpMatching2GetServerInfo( return CELL_OK; } -error_code sceNpMatching2GetEventData(SceNpMatching2ContextId ctxId, SceNpMatching2EventKey eventKey, vm::ptr buf, u64 bufLen) +error_code sceNpMatching2GetEventData(SceNpMatching2ContextId ctxId, SceNpMatching2EventKey eventKey, vm::ptr buf, u32 bufLen) { sceNp2.notice("sceNpMatching2GetEventData(ctxId=%d, eventKey=%d, buf=*0x%x, bufLen=%d)", ctxId, eventKey, buf, bufLen); @@ -944,7 +944,7 @@ error_code sceNpMatching2JoinRoom( } error_code sceNpMatching2GetRoomMemberDataInternalLocal(SceNpMatching2ContextId ctxId, SceNpMatching2RoomId roomId, SceNpMatching2RoomMemberId memberId, vm::cptr attrId, - u32 attrIdNum, vm::ptr member, vm::ptr buf, u64 bufLen) + u32 attrIdNum, vm::ptr member, vm::ptr buf, u32 bufLen) { sceNp2.warning("sceNpMatching2GetRoomMemberDataInternalLocal(ctxId=%d, roomId=%d, memberId=%d, attrId=*0x%x, attrIdNum=%d, member=*0x%x, buf=*0x%x, bufLen=%d)", ctxId, roomId, memberId, attrId, attrIdNum, member, buf, bufLen); @@ -1182,7 +1182,7 @@ error_code sceNpMatching2GetServerIdListLocal(SceNpMatching2ContextId ctxId, vm: return not_an_error(static_cast(slist.size())); } -error_code sceNpUtilBuildCdnUrl(vm::cptr url, vm::ptr buf, u64 bufSize, vm::ptr required, vm::ptr option) +error_code sceNpUtilBuildCdnUrl(vm::cptr url, vm::ptr buf, u32 bufSize, vm::ptr required, vm::ptr option) { sceNp2.todo("sceNpUtilBuildCdnUrl(url=%s, buf=*0x%x, bufSize=%d, required=*0x%x, option=*0x%x)", url, buf, bufSize, required, option); @@ -1192,7 +1192,7 @@ error_code sceNpUtilBuildCdnUrl(vm::cptr url, vm::ptr buf, u64 bufSi return SCE_NP_UTIL_ERROR_INVALID_ARGUMENT; } - // if (offline) + //if (offline) //{ // return SCE_NP_ERROR_OFFLINE; //} diff --git a/rpcs3/Emu/Cell/Modules/sceNp2.h b/rpcs3/Emu/Cell/Modules/sceNp2.h index 711f050274..9c83eab607 100644 --- a/rpcs3/Emu/Cell/Modules/sceNp2.h +++ b/rpcs3/Emu/Cell/Modules/sceNp2.h @@ -1619,7 +1619,7 @@ struct SceNpAuthorizationCode struct SceNpAuthGetAuthorizationCodeParameter { - be_t size; + be_t size; vm::bcptr pClientId; vm::bcptr pScope; }; diff --git a/rpcs3/Emu/Cell/Modules/sceNpClans.cpp b/rpcs3/Emu/Cell/Modules/sceNpClans.cpp index 7b7c5a894d..91d22079fe 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpClans.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNpClans.cpp @@ -73,7 +73,7 @@ void fmt_class_string::format(std::string& out, u64 arg) }); } -error_code sceNpClansInit(vm::cptr commId, vm::cptr passphrase, vm::ptr pool, vm::ptr poolSize, u32 flags) +error_code sceNpClansInit(vm::cptr commId, vm::cptr passphrase, vm::ptr pool, vm::ptr poolSize, u32 flags) { sceNpClans.warning("sceNpClansInit(commId=*0x%x, passphrase=*0x%x, pool=*0x%x, poolSize=*0x%x, flags=0x%x)", commId, passphrase, pool, poolSize, flags); diff --git a/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp b/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp index 0581a70513..ab791ca704 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp @@ -199,13 +199,13 @@ error_code sceNpCommerce2GetCategoryContentsStart(u32 req_id, vm::cptr cat return CELL_OK; } -error_code sceNpCommerce2GetCategoryContentsGetResult(u32 req_id, vm::ptr buf, u64 buf_size, vm::ptr fill_size) // TODO: correct size types? +error_code sceNpCommerce2GetCategoryContentsGetResult(u32 req_id, vm::ptr buf, u32 buf_size, vm::ptr fill_size) { sceNpCommerce2.todo("sceNpCommerce2GetCategoryContentsGetResult(req_id=%d, buf=*0x%x, buf_size=%d, fill_size=*0x%x)", req_id, buf, buf_size, fill_size); return CELL_OK; } -error_code sceNpCommerce2InitGetCategoryContentsResult(vm::ptr result, vm::ptr data, u64 data_size) // TODO: correct size types? +error_code sceNpCommerce2InitGetCategoryContentsResult(vm::ptr result, vm::ptr data, u32 data_size) { sceNpCommerce2.todo("sceNpCommerce2InitGetCategoryContentsResult(result=*0x%x, data=*0x%x, data_size=%d)", result, data, data_size); return CELL_OK; @@ -253,13 +253,13 @@ error_code sceNpCommerce2GetProductInfoStart(u32 req_id, vm::cptr category return CELL_OK; } -error_code sceNpCommerce2GetProductInfoGetResult(u32 req_id, vm::ptr buf, u64 buf_size, vm::ptr fill_size) // TODO: correct size types? +error_code sceNpCommerce2GetProductInfoGetResult(u32 req_id, vm::ptr buf, u32 buf_size, vm::ptr fill_size) { sceNpCommerce2.todo("sceNpCommerce2GetProductInfoGetResult(req_id=%d, buf=*0x%x, buf_size=%d, fill_size=*0x%x)", req_id, buf, buf_size, fill_size); return CELL_OK; } -error_code sceNpCommerce2InitGetProductInfoResult(vm::ptr result, vm::ptr data, u64 data_size) // TODO: correct size types? +error_code sceNpCommerce2InitGetProductInfoResult(vm::ptr result, vm::ptr data, u32 data_size) { sceNpCommerce2.todo("sceNpCommerce2InitGetProductInfoResult(result=*0x%x, data=*0x%x, data_size=%d)", result, data, data_size); return CELL_OK; @@ -289,13 +289,13 @@ error_code sceNpCommerce2GetProductInfoListStart(u32 req_id, vm::cptr pr return CELL_OK; } -error_code sceNpCommerce2GetProductInfoListGetResult(u32 req_id, vm::ptr buf, u64 buf_size, vm::ptr fill_size) // TODO: correct size types? +error_code sceNpCommerce2GetProductInfoListGetResult(u32 req_id, vm::ptr buf, u32 buf_size, vm::ptr fill_size) { sceNpCommerce2.todo("sceNpCommerce2GetProductInfoListGetResult(req_id=%d, buf=*0x%x, buf_size=%d, fill_size=*0x%x)", req_id, buf, buf_size, fill_size); return CELL_OK; } -error_code sceNpCommerce2InitGetProductInfoListResult(vm::ptr result, vm::ptr data, u64 data_size) // TODO: correct size types? +error_code sceNpCommerce2InitGetProductInfoListResult(vm::ptr result, vm::ptr data, u32 data_size) { sceNpCommerce2.todo("sceNpCommerce2InitGetProductInfoListResult(result=*0x%x, data=*0x%x, data_size=%d)", result, data, data_size); return CELL_OK; @@ -337,7 +337,7 @@ error_code sceNpCommerce2GetGameSkuInfoFromGameProductInfo(vm::cptr buf, u64 buflen, u32 price) // TODO: correct size types? +error_code sceNpCommerce2GetPrice(u32 ctx_id, vm::ptr buf, u32 buflen, u32 price) { sceNpCommerce2.todo("sceNpCommerce2GetPrice(ctx_id=%d, buf=*0x%x, buflen=%d, price=%d)", ctx_id, buf, buflen, price); return CELL_OK; diff --git a/rpcs3/Emu/Cell/Modules/sceNpTus.cpp b/rpcs3/Emu/Cell/Modules/sceNpTus.cpp index c2bacc2c25..3df206233f 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpTus.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNpTus.cpp @@ -357,7 +357,7 @@ error_code sceNpTusSetMultiSlotVariableVUserAsync(s32 transId, vm::cptr -error_code scenp_tus_get_multislot_variable(s32 transId, T targetNpId, vm::cptr slotIdArray, vm::ptr variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr option, bool vuser, bool async) +error_code scenp_tus_get_multislot_variable(s32 transId, T targetNpId, vm::cptr slotIdArray, vm::ptr variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr option, bool vuser, bool async) { auto& nph = g_fxo->get>(); @@ -408,32 +408,32 @@ error_code scenp_tus_get_multislot_variable(s32 transId, T targetNpId, vm::cptr< return *trans_ctx->result; } -error_code sceNpTusGetMultiSlotVariable(s32 transId, vm::cptr targetNpId, vm::cptr slotIdArray, vm::ptr variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetMultiSlotVariable(s32 transId, vm::cptr targetNpId, vm::cptr slotIdArray, vm::ptr variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetMultiSlotVariable(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, variableArray, variableArraySize, arrayNum, option); return scenp_tus_get_multislot_variable(transId, targetNpId, slotIdArray, variableArray, variableArraySize, arrayNum, option, false, false); } -error_code sceNpTusGetMultiSlotVariableVUser(s32 transId, vm::cptr targetVirtualUserId, vm::cptr slotIdArray, vm::ptr variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetMultiSlotVariableVUser(s32 transId, vm::cptr targetVirtualUserId, vm::cptr slotIdArray, vm::ptr variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetMultiSlotVariableVUser(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, variableArray, variableArraySize, arrayNum, option); return scenp_tus_get_multislot_variable(transId, targetVirtualUserId, slotIdArray, variableArray, variableArraySize, arrayNum, option, true, false); } -error_code sceNpTusGetMultiSlotVariableAsync(s32 transId, vm::cptr targetNpId, vm::cptr slotIdArray, vm::ptr variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetMultiSlotVariableAsync(s32 transId, vm::cptr targetNpId, vm::cptr slotIdArray, vm::ptr variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetMultiSlotVariableAsync(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, variableArray, variableArraySize, arrayNum, option); return scenp_tus_get_multislot_variable(transId, targetNpId, slotIdArray, variableArray, variableArraySize, arrayNum, option, false, true); } -error_code sceNpTusGetMultiSlotVariableVUserAsync(s32 transId, vm::cptr targetVirtualUserId, vm::cptr slotIdArray, vm::ptr variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetMultiSlotVariableVUserAsync(s32 transId, vm::cptr targetVirtualUserId, vm::cptr slotIdArray, vm::ptr variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetMultiSlotVariableVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, variableArray, variableArraySize, arrayNum, option); return scenp_tus_get_multislot_variable(transId, targetVirtualUserId, slotIdArray, variableArray, variableArraySize, arrayNum, option, true, true); } template -error_code scenp_tus_get_multiuser_variable(s32 transId, T targetNpIdArray, SceNpTusSlotId slotId, vm::ptr variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr option, bool vuser, bool async) +error_code scenp_tus_get_multiuser_variable(s32 transId, T targetNpIdArray, SceNpTusSlotId slotId, vm::ptr variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr option, bool vuser, bool async) { auto& nph = g_fxo->get>(); @@ -490,31 +490,31 @@ error_code scenp_tus_get_multiuser_variable(s32 transId, T targetNpIdArray, SceN return *trans_ctx->result; } -error_code sceNpTusGetMultiUserVariable(s32 transId, vm::cptr targetNpIdArray, SceNpTusSlotId slotId, vm::ptr variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetMultiUserVariable(s32 transId, vm::cptr targetNpIdArray, SceNpTusSlotId slotId, vm::ptr variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetMultiUserVariable(transId=%d, targetNpIdArray=*0x%x, slotId=%d, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpIdArray, slotId, variableArray, variableArraySize, arrayNum, option); return scenp_tus_get_multiuser_variable(transId, targetNpIdArray, slotId, variableArray, variableArraySize, arrayNum, option, false, false); } -error_code sceNpTusGetMultiUserVariableVUser(s32 transId, vm::cptr targetVirtualUserIdArray, SceNpTusSlotId slotId, vm::ptr variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetMultiUserVariableVUser(s32 transId, vm::cptr targetVirtualUserIdArray, SceNpTusSlotId slotId, vm::ptr variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetMultiUserVariableVUser(transId=%d, targetVirtualUserIdArray=*0x%x, slotId=%d, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserIdArray, slotId, variableArray, variableArraySize, arrayNum, option); return scenp_tus_get_multiuser_variable(transId, targetVirtualUserIdArray, slotId, variableArray, variableArraySize, arrayNum, option, true, false); } -error_code sceNpTusGetMultiUserVariableAsync(s32 transId, vm::cptr targetNpIdArray, SceNpTusSlotId slotId, vm::ptr variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetMultiUserVariableAsync(s32 transId, vm::cptr targetNpIdArray, SceNpTusSlotId slotId, vm::ptr variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetMultiUserVariableAsync(transId=%d, targetNpIdArray=*0x%x, slotId=%d, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpIdArray, slotId, variableArray, variableArraySize, arrayNum, option); return scenp_tus_get_multiuser_variable(transId, targetNpIdArray, slotId, variableArray, variableArraySize, arrayNum, option, false, true); } -error_code sceNpTusGetMultiUserVariableVUserAsync(s32 transId, vm::cptr targetVirtualUserIdArray, SceNpTusSlotId slotId, vm::ptr variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetMultiUserVariableVUserAsync(s32 transId, vm::cptr targetVirtualUserIdArray, SceNpTusSlotId slotId, vm::ptr variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetMultiUserVariableVUserAsync(transId=%d, targetVirtualUserIdArray=*0x%x, slotId=%d, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserIdArray, slotId, variableArray, variableArraySize, arrayNum, option); return scenp_tus_get_multiuser_variable(transId, targetVirtualUserIdArray, slotId, variableArray, variableArraySize, arrayNum, option, true, true); } -error_code scenp_tus_get_friends_variable(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr option, bool async) +error_code scenp_tus_get_friends_variable(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr option, bool async) { auto& nph = g_fxo->get>(); @@ -565,20 +565,20 @@ error_code scenp_tus_get_friends_variable(s32 transId, SceNpTusSlotId slotId, s3 return *trans_ctx->result; } -error_code sceNpTusGetFriendsVariable(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetFriendsVariable(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetFriendsVariable(transId=%d, slotId=%d, includeSelf=%d, sortType=%d, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, slotId, includeSelf, sortType, variableArray, variableArraySize, arrayNum, option); return scenp_tus_get_friends_variable(transId, slotId, includeSelf, sortType, variableArray, variableArraySize, arrayNum, option, false); } -error_code sceNpTusGetFriendsVariableAsync(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetFriendsVariableAsync(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetFriendsVariableAsync(transId=%d, slotId=%d, includeSelf=%d, sortType=%d, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, slotId, includeSelf, sortType, variableArray, variableArraySize, arrayNum, option); return scenp_tus_get_friends_variable(transId, slotId, includeSelf, sortType, variableArray, variableArraySize, arrayNum, option, true); } template -error_code scenp_tus_add_and_get_variable(s32 transId, T targetNpId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr outVariable, u64 outVariableSize, vm::ptr option, bool vuser, bool async) +error_code scenp_tus_add_and_get_variable(s32 transId, T targetNpId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr outVariable, u32 outVariableSize, vm::ptr option, bool vuser, bool async) { auto& nph = g_fxo->get>(); @@ -624,32 +624,32 @@ error_code scenp_tus_add_and_get_variable(s32 transId, T targetNpId, SceNpTusSlo return *trans_ctx->result; } -error_code sceNpTusAddAndGetVariable(s32 transId, vm::cptr targetNpId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr outVariable, u64 outVariableSize, vm::ptr option) +error_code sceNpTusAddAndGetVariable(s32 transId, vm::cptr targetNpId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr outVariable, u32 outVariableSize, vm::ptr option) { sceNpTus.warning("sceNpTusAddAndGetVariable(transId=%d, targetNpId=*0x%x, slotId=%d, inVariable=%d, outVariable=*0x%x, outVariableSize=%d, option=*0x%x)", transId, targetNpId, slotId, inVariable, outVariable, outVariableSize, option); return scenp_tus_add_and_get_variable(transId, targetNpId, slotId, inVariable, outVariable, outVariableSize, option, false, false); } -error_code sceNpTusAddAndGetVariableVUser(s32 transId, vm::cptr targetVirtualUserId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr outVariable, u64 outVariableSize, vm::ptr option) +error_code sceNpTusAddAndGetVariableVUser(s32 transId, vm::cptr targetVirtualUserId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr outVariable, u32 outVariableSize, vm::ptr option) { sceNpTus.warning("sceNpTusAddAndGetVariableVUser(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, inVariable=%d, outVariable=*0x%x, outVariableSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, inVariable, outVariable, outVariableSize, option); return scenp_tus_add_and_get_variable(transId, targetVirtualUserId, slotId, inVariable, outVariable, outVariableSize, option, true, false); } -error_code sceNpTusAddAndGetVariableAsync(s32 transId, vm::cptr targetNpId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr outVariable, u64 outVariableSize, vm::ptr option) +error_code sceNpTusAddAndGetVariableAsync(s32 transId, vm::cptr targetNpId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr outVariable, u32 outVariableSize, vm::ptr option) { sceNpTus.warning("sceNpTusAddAndGetVariableAsync(transId=%d, targetNpId=*0x%x, slotId=%d, inVariable=%d, outVariable=*0x%x, outVariableSize=%d, option=*0x%x)", transId, targetNpId, slotId, inVariable, outVariable, outVariableSize, option); return scenp_tus_add_and_get_variable(transId, targetNpId, slotId, inVariable, outVariable, outVariableSize, option, false, true); } -error_code sceNpTusAddAndGetVariableVUserAsync(s32 transId, vm::cptr targetVirtualUserId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr outVariable, u64 outVariableSize, vm::ptr option) +error_code sceNpTusAddAndGetVariableVUserAsync(s32 transId, vm::cptr targetVirtualUserId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr outVariable, u32 outVariableSize, vm::ptr option) { sceNpTus.warning("sceNpTusAddAndGetVariableVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, inVariable=%d, outVariable=*0x%x, outVariableSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, inVariable, outVariable, outVariableSize, option); return scenp_tus_add_and_get_variable(transId, targetVirtualUserId, slotId, inVariable, outVariable, outVariableSize, option, true, true); } template -error_code scenp_tus_try_and_set_variable(s32 transId, T targetNpId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr resultVariable, u64 resultVariableSize, vm::ptr option, bool vuser, bool async) +error_code scenp_tus_try_and_set_variable(s32 transId, T targetNpId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr resultVariable, u32 resultVariableSize, vm::ptr option, bool vuser, bool async) { auto& nph = g_fxo->get>(); @@ -695,25 +695,25 @@ error_code scenp_tus_try_and_set_variable(s32 transId, T targetNpId, SceNpTusSlo return *trans_ctx->result; } -error_code sceNpTusTryAndSetVariable(s32 transId, vm::cptr targetNpId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr resultVariable, u64 resultVariableSize, vm::ptr option) +error_code sceNpTusTryAndSetVariable(s32 transId, vm::cptr targetNpId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr resultVariable, u32 resultVariableSize, vm::ptr option) { sceNpTus.warning("sceNpTusTryAndSetVariable(transId=%d, targetNpId=*0x%x, slotId=%d, opeType=%d, variable=%d, resultVariable=*0x%x, resultVariableSize=%d, option=*0x%x)", transId, targetNpId, slotId, opeType, variable, resultVariable, resultVariableSize, option); return scenp_tus_try_and_set_variable(transId, targetNpId, slotId, opeType, variable, resultVariable, resultVariableSize, option, false, false); } -error_code sceNpTusTryAndSetVariableVUser(s32 transId, vm::cptr targetVirtualUserId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr resultVariable, u64 resultVariableSize, vm::ptr option) +error_code sceNpTusTryAndSetVariableVUser(s32 transId, vm::cptr targetVirtualUserId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr resultVariable, u32 resultVariableSize, vm::ptr option) { sceNpTus.warning("sceNpTusTryAndSetVariableVUser(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, opeType=%d, variable=%d, resultVariable=*0x%x, resultVariableSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, opeType, variable, resultVariable, resultVariableSize, option); return scenp_tus_try_and_set_variable(transId, targetVirtualUserId, slotId, opeType, variable, resultVariable, resultVariableSize, option, true, false); } -error_code sceNpTusTryAndSetVariableAsync(s32 transId, vm::cptr targetNpId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr resultVariable, u64 resultVariableSize, vm::ptr option) +error_code sceNpTusTryAndSetVariableAsync(s32 transId, vm::cptr targetNpId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr resultVariable, u32 resultVariableSize, vm::ptr option) { sceNpTus.warning("sceNpTusTryAndSetVariableAsync(transId=%d, targetNpId=*0x%x, slotId=%d, opeType=%d, variable=%d, resultVariable=*0x%x, resultVariableSize=%d, option=*0x%x)", transId, targetNpId, slotId, opeType, variable, resultVariable, resultVariableSize, option); return scenp_tus_try_and_set_variable(transId, targetNpId, slotId, opeType, variable, resultVariable, resultVariableSize, option, false, true); } -error_code sceNpTusTryAndSetVariableVUserAsync(s32 transId, vm::cptr targetVirtualUserId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr resultVariable, u64 resultVariableSize, vm::ptr option) +error_code sceNpTusTryAndSetVariableVUserAsync(s32 transId, vm::cptr targetVirtualUserId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr resultVariable, u32 resultVariableSize, vm::ptr option) { sceNpTus.warning("sceNpTusTryAndSetVariableVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, opeType=%d, variable=%d, resultVariable=*0x%x, resultVariableSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, opeType, variable, resultVariable, resultVariableSize, option); return scenp_tus_try_and_set_variable(transId, targetVirtualUserId, slotId, opeType, variable, resultVariable, resultVariableSize, option, true, true); @@ -791,7 +791,7 @@ error_code sceNpTusDeleteMultiSlotVariableVUserAsync(s32 transId, vm::cptr -error_code scenp_tus_set_data(s32 transId, T targetNpId, SceNpTusSlotId slotId, u32 totalSize, u32 sendSize, vm::cptr data, vm::cptr info, u64 infoStructSize, vm::ptr option, bool vuser, bool async) +error_code scenp_tus_set_data(s32 transId, T targetNpId, SceNpTusSlotId slotId, u32 totalSize, u32 sendSize, vm::cptr data, vm::cptr info, u32 infoStructSize, vm::ptr option, bool vuser, bool async) { auto& nph = g_fxo->get>(); @@ -832,25 +832,25 @@ error_code scenp_tus_set_data(s32 transId, T targetNpId, SceNpTusSlotId slotId, return *trans_ctx->result; } -error_code sceNpTusSetData(s32 transId, vm::cptr targetNpId, SceNpTusSlotId slotId, u32 totalSize, u32 sendSize, vm::cptr data, vm::cptr info, u64 infoStructSize, vm::ptr option) +error_code sceNpTusSetData(s32 transId, vm::cptr targetNpId, SceNpTusSlotId slotId, u32 totalSize, u32 sendSize, vm::cptr data, vm::cptr info, u32 infoStructSize, vm::ptr option) { sceNpTus.warning("sceNpTusSetData(transId=%d, targetNpId=*0x%x, slotId=%d, totalSize=%d, sendSize=%d, data=*0x%x, info=*0x%x, infoStructSize=%d, option=*0x%x)", transId, targetNpId, slotId, totalSize, sendSize, data, info, infoStructSize, option); return scenp_tus_set_data(transId, targetNpId, slotId, totalSize, sendSize, data, info, infoStructSize, option, false, false); } -error_code sceNpTusSetDataVUser(s32 transId, vm::cptr targetVirtualUserId, SceNpTusSlotId slotId, u32 totalSize, u32 sendSize, vm::cptr data, vm::cptr info, u64 infoStructSize, vm::ptr option) +error_code sceNpTusSetDataVUser(s32 transId, vm::cptr targetVirtualUserId, SceNpTusSlotId slotId, u32 totalSize, u32 sendSize, vm::cptr data, vm::cptr info, u32 infoStructSize, vm::ptr option) { sceNpTus.warning("sceNpTusSetDataVUser(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, totalSize=%d, sendSize=%d, data=*0x%x, info=*0x%x, infoStructSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, totalSize, sendSize, data, info, infoStructSize, option); return scenp_tus_set_data(transId, targetVirtualUserId, slotId, totalSize, sendSize, data, info, infoStructSize, option, true, false); } -error_code sceNpTusSetDataAsync(s32 transId, vm::cptr targetNpId, SceNpTusSlotId slotId, u32 totalSize, u32 sendSize, vm::cptr data, vm::cptr info, u64 infoStructSize, vm::ptr option) +error_code sceNpTusSetDataAsync(s32 transId, vm::cptr targetNpId, SceNpTusSlotId slotId, u32 totalSize, u32 sendSize, vm::cptr data, vm::cptr info, u32 infoStructSize, vm::ptr option) { sceNpTus.warning("sceNpTusSetDataAsync(transId=%d, targetNpId=*0x%x, slotId=%d, totalSize=%d, sendSize=%d, data=*0x%x, info=*0x%x, infoStructSize=%d, option=*0x%x)", transId, targetNpId, slotId, totalSize, sendSize, data, info, infoStructSize, option); return scenp_tus_set_data(transId, targetNpId, slotId, totalSize, sendSize, data, info, infoStructSize, option, false, true); } -error_code sceNpTusSetDataVUserAsync(s32 transId, vm::cptr targetVirtualUserId, SceNpTusSlotId slotId, u32 totalSize, u32 sendSize, vm::cptr data, vm::cptr info, u64 infoStructSize, vm::ptr option) +error_code sceNpTusSetDataVUserAsync(s32 transId, vm::cptr targetVirtualUserId, SceNpTusSlotId slotId, u32 totalSize, u32 sendSize, vm::cptr data, vm::cptr info, u32 infoStructSize, vm::ptr option) { sceNpTus.warning("sceNpTusSetDataVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, totalSize=%d, sendSize=%d, data=*0x%x, info=*0x%x, infoStructSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, totalSize, sendSize, data, info, infoStructSize, option); return scenp_tus_set_data(transId, targetVirtualUserId, slotId, totalSize, sendSize, data, info, infoStructSize, option, true, true); @@ -923,7 +923,7 @@ error_code sceNpTusGetDataVUserAsync(s32 transId, vm::cptr -error_code scenp_tus_get_multislot_data_status(s32 transId, T targetNpId, vm::cptr slotIdArray, vm::ptr statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr option, bool vuser, bool async) +error_code scenp_tus_get_multislot_data_status(s32 transId, T targetNpId, vm::cptr slotIdArray, vm::ptr statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr option, bool vuser, bool async) { auto& nph = g_fxo->get>(); @@ -969,32 +969,32 @@ error_code scenp_tus_get_multislot_data_status(s32 transId, T targetNpId, vm::cp return *trans_ctx->result; } -error_code sceNpTusGetMultiSlotDataStatus(s32 transId, vm::cptr targetNpId, vm::cptr slotIdArray, vm::ptr statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetMultiSlotDataStatus(s32 transId, vm::cptr targetNpId, vm::cptr slotIdArray, vm::ptr statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetMultiSlotDataStatus(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, statusArray, statusArraySize, arrayNum, option); return scenp_tus_get_multislot_data_status(transId, targetNpId, slotIdArray, statusArray, statusArraySize, arrayNum, option, false, false); } -error_code sceNpTusGetMultiSlotDataStatusVUser(s32 transId, vm::cptr targetVirtualUserId, vm::cptr slotIdArray, vm::ptr statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetMultiSlotDataStatusVUser(s32 transId, vm::cptr targetVirtualUserId, vm::cptr slotIdArray, vm::ptr statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetMultiSlotDataStatusVUser(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, statusArray, statusArraySize, arrayNum, option); return scenp_tus_get_multislot_data_status(transId, targetVirtualUserId, slotIdArray, statusArray, statusArraySize, arrayNum, option, true, false); } -error_code sceNpTusGetMultiSlotDataStatusAsync(s32 transId, vm::cptr targetNpId, vm::cptr slotIdArray, vm::ptr statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetMultiSlotDataStatusAsync(s32 transId, vm::cptr targetNpId, vm::cptr slotIdArray, vm::ptr statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetMultiSlotDataStatusAsync(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, statusArray, statusArraySize, arrayNum, option); return scenp_tus_get_multislot_data_status(transId, targetNpId, slotIdArray, statusArray, statusArraySize, arrayNum, option, false, true); } -error_code sceNpTusGetMultiSlotDataStatusVUserAsync(s32 transId, vm::cptr targetVirtualUserId, vm::cptr slotIdArray, vm::ptr statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetMultiSlotDataStatusVUserAsync(s32 transId, vm::cptr targetVirtualUserId, vm::cptr slotIdArray, vm::ptr statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetMultiSlotDataStatusVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, statusArray, statusArraySize, arrayNum, option); return scenp_tus_get_multislot_data_status(transId, targetVirtualUserId, slotIdArray, statusArray, statusArraySize, arrayNum, option, true, true); } template -error_code scenp_tus_get_multiuser_data_status(s32 transId, T targetNpIdArray, SceNpTusSlotId slotId, vm::ptr statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr option, bool vuser, bool async) +error_code scenp_tus_get_multiuser_data_status(s32 transId, T targetNpIdArray, SceNpTusSlotId slotId, vm::ptr statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr option, bool vuser, bool async) { auto& nph = g_fxo->get>(); @@ -1046,31 +1046,31 @@ error_code scenp_tus_get_multiuser_data_status(s32 transId, T targetNpIdArray, S return *trans_ctx->result; } -error_code sceNpTusGetMultiUserDataStatus(s32 transId, vm::cptr targetNpIdArray, SceNpTusSlotId slotId, vm::ptr statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetMultiUserDataStatus(s32 transId, vm::cptr targetNpIdArray, SceNpTusSlotId slotId, vm::ptr statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetMultiUserDataStatus(transId=%d, targetNpIdArray=*0x%x, slotId=%d, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpIdArray, slotId, statusArray, statusArraySize, arrayNum, option); return scenp_tus_get_multiuser_data_status(transId, targetNpIdArray, slotId, statusArray, statusArraySize, arrayNum, option, false, false); } -error_code sceNpTusGetMultiUserDataStatusVUser(s32 transId, vm::cptr targetVirtualUserIdArray, SceNpTusSlotId slotId, vm::ptr statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetMultiUserDataStatusVUser(s32 transId, vm::cptr targetVirtualUserIdArray, SceNpTusSlotId slotId, vm::ptr statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetMultiUserDataStatusVUser(transId=%d, targetVirtualUserIdArray=*0x%x, slotId=%d, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserIdArray, slotId, statusArray, statusArraySize, arrayNum, option); return scenp_tus_get_multiuser_data_status(transId, targetVirtualUserIdArray, slotId, statusArray, statusArraySize, arrayNum, option, true, false); } -error_code sceNpTusGetMultiUserDataStatusAsync(s32 transId, vm::cptr targetNpIdArray, SceNpTusSlotId slotId, vm::ptr statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetMultiUserDataStatusAsync(s32 transId, vm::cptr targetNpIdArray, SceNpTusSlotId slotId, vm::ptr statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetMultiUserDataStatusAsync(transId=%d, targetNpIdArray=*0x%x, slotId=%d, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpIdArray, slotId, statusArray, statusArraySize, arrayNum, option); return scenp_tus_get_multiuser_data_status(transId, targetNpIdArray, slotId, statusArray, statusArraySize, arrayNum, option, false, true); } -error_code sceNpTusGetMultiUserDataStatusVUserAsync(s32 transId, vm::cptr targetVirtualUserIdArray, SceNpTusSlotId slotId, vm::ptr statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetMultiUserDataStatusVUserAsync(s32 transId, vm::cptr targetVirtualUserIdArray, SceNpTusSlotId slotId, vm::ptr statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetMultiUserDataStatusVUserAsync(transId=%d, targetVirtualUserIdArray=*0x%x, slotId=%d, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserIdArray, slotId, statusArray, statusArraySize, arrayNum, option); return scenp_tus_get_multiuser_data_status(transId, targetVirtualUserIdArray, slotId, statusArray, statusArraySize, arrayNum, option, true, true); } -error_code scenp_tus_get_friends_data_status(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr option, bool async) +error_code scenp_tus_get_friends_data_status(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr option, bool async) { auto& nph = g_fxo->get>(); @@ -1116,13 +1116,13 @@ error_code scenp_tus_get_friends_data_status(s32 transId, SceNpTusSlotId slotId, return *trans_ctx->result; } -error_code sceNpTusGetFriendsDataStatus(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetFriendsDataStatus(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetFriendsDataStatus(transId=%d, slotId=%d, includeSelf=%d, sortType=%d, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, slotId, includeSelf, sortType, statusArray, statusArraySize, arrayNum, option); return scenp_tus_get_friends_data_status(transId, slotId, includeSelf, sortType, statusArray, statusArraySize, arrayNum, option, false); } -error_code sceNpTusGetFriendsDataStatusAsync(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr option) +error_code sceNpTusGetFriendsDataStatusAsync(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr option) { sceNpTus.warning("sceNpTusGetFriendsDataStatusAsync(transId=%d, slotId=%d, includeSelf=%d, sortType=%d, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, slotId, includeSelf, sortType, statusArray, statusArraySize, arrayNum, option); return scenp_tus_get_friends_data_status(transId, slotId, includeSelf, sortType, statusArray, statusArraySize, arrayNum, option, true);