diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpClans.cpp b/rpcs3/Emu/SysCalls/Modules/sceNpClans.cpp index b6712524bd..314b9ba339 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNpClans.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNpClans.cpp @@ -20,7 +20,7 @@ struct sceNpClansInternal sceNpClansInternal sceNpClansInstance; -int sceNpClansInit(vm::ptr commId, vm::ptr passphrase, vm::ptr pool, vm::ptr poolSize, u32 flags) +int sceNpClansInit(vm::ptr commId, vm::ptr passphrase, vm::ptr pool, vm::ptr poolSize, u32 flags) { sceNpClans->Warning("sceNpClansInit(commId_addr=0x%x, passphrase_addr=0x%x, pool_addr=0x%x,poolSize_addr=0x%x, flags=%d)", commId.addr(), passphrase.addr(), pool.addr(), poolSize.addr(), flags); @@ -49,7 +49,7 @@ int sceNpClansTerm() int sceNpClansCreateRequest(vm::ptr handle,u64 flags) { - sceNpClans->Todo("sceNpClansInit(handle_addr=0x%x, flags=%d)", handle.addr(), flags); + sceNpClans->Todo("sceNpClansCreateRequest(handle_addr=0x%x, flags=0x%llx)", handle.addr(), flags); if (!sceNpClansInstance.m_bSceNpClansInitialized) return SCE_NP_CLANS_ERROR_NOT_INITIALIZED; @@ -87,7 +87,7 @@ int sceNpClansCreateClan(vm::ptr handle, vm::ptr SCE_NP_CLANS_CLAN_NAME_MAX_LENGTH) || (*tag > SCE_NP_CLANS_CLAN_TAG_MAX_LENGTH)) + if ((strlen(name.get_ptr()) > SCE_NP_CLANS_CLAN_NAME_MAX_LENGTH) || (strlen(tag.get_ptr()) > SCE_NP_CLANS_CLAN_TAG_MAX_LENGTH)) return SCE_NP_CLANS_ERROR_EXCEEDS_MAX; return CELL_OK; @@ -243,15 +243,17 @@ int sceNpClansLeaveClan() return CELL_OK; } -int sceNpClansKickMember(vm::ptr handle, u32 clanId,vm::ptr npid, vm::ptr message) +int sceNpClansKickMember(vm::ptr handle, u32 clanId, vm::ptr npid, vm::ptr message) { UNIMPLEMENTED_FUNC(sceNpClans); if (!sceNpClansInstance.m_bSceNpClansInitialized) return SCE_NP_CLANS_ERROR_NOT_INITIALIZED; - if (message > SCE_NP_CLANS_MESSAGE_BODY_MAX_LENGTH) + /* + if (*(message->body) > SCE_NP_CLANS_MESSAGE_BODY_MAX_LENGTH) return SCE_NP_CLANS_ERROR_EXCEEDS_MAX; + */ return CELL_OK; } @@ -263,8 +265,10 @@ int sceNpClansSendInvitation(vm::ptr handle, u32 clanId if (!sceNpClansInstance.m_bSceNpClansInitialized) return SCE_NP_CLANS_ERROR_NOT_INITIALIZED; - if (message > SCE_NP_CLANS_MESSAGE_BODY_MAX_LENGTH) - return SCE_NP_CLANS_ERROR_EXCEEDS_MAX; + /* + if (*(message->body) > SCE_NP_CLANS_MESSAGE_BODY_MAX_LENGTH) + return SCE_NP_CLANS_ERROR_EXCEEDS_MAX; + */ return CELL_OK; } @@ -286,8 +290,10 @@ int sceNpClansSendInvitationResponse(vm::ptr handle, u3 if (!sceNpClansInstance.m_bSceNpClansInitialized) return SCE_NP_CLANS_ERROR_NOT_INITIALIZED; - if (message > SCE_NP_CLANS_MESSAGE_BODY_MAX_LENGTH) - return SCE_NP_CLANS_ERROR_EXCEEDS_MAX; + /* + if (*(message->body) > SCE_NP_CLANS_MESSAGE_BODY_MAX_LENGTH) + return SCE_NP_CLANS_ERROR_EXCEEDS_MAX; + */ return CELL_OK; } @@ -299,8 +305,10 @@ int sceNpClansSendMembershipRequest(vm::ptr handle, u32 if (!sceNpClansInstance.m_bSceNpClansInitialized) return SCE_NP_CLANS_ERROR_NOT_INITIALIZED; - if (message > SCE_NP_CLANS_MESSAGE_BODY_MAX_LENGTH) - return SCE_NP_CLANS_ERROR_EXCEEDS_MAX; + /* + if (*(message->body) > SCE_NP_CLANS_MESSAGE_BODY_MAX_LENGTH) + return SCE_NP_CLANS_ERROR_EXCEEDS_MAX; + */ return CELL_OK; } @@ -395,8 +403,10 @@ int sceNpClansPostChallenge(vm::ptr handle, u32 clanId, if (data != 0) return SCE_NP_CLANS_ERROR_NOT_SUPPORTED; - if (message > SCE_NP_CLANS_MESSAGE_BODY_MAX_LENGTH) - return SCE_NP_CLANS_ERROR_EXCEEDS_MAX; + /* + if (*(message->body) > SCE_NP_CLANS_MESSAGE_BODY_MAX_LENGTH) + return SCE_NP_CLANS_ERROR_EXCEEDS_MAX; + */ //todo