archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 08:51:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

sceNp: fixups

Browse source
This commit is contained in:
Megamouse 2019-09-12 20:51:18 +02:00
parent 52e8747b83
commit 32a4c2242b
5 changed files with 213 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

34
rpcs3/Emu/Cell/Modules/sceNp.cpp
View file

@ -392,7 +392,7 @@ error_code sceNpInit(u32 poolsize, vm::ptr<void> poolptr)
{
return SCE_NP_ERROR_INVALID_ARGUMENT;
}
else if (poolsize < 128 * 1024)
else if (poolsize < SCE_NP_MIN_POOLSIZE)
{
return SCE_NP_ERROR_INSUFFICIENT_BUFFER;
}
@ -1746,7 +1746,16 @@ error_code sceNpLookupInit()
const auto lookup_manager = g_fxo->get<sce_np_lookup_manager>();
// TODO: check if this might throw SCE_NP_COMMUNITY_ERROR_ALREADY_INITIALIZED
if (lookup_manager->is_initialized)
{
return SCE_NP_COMMUNITY_ERROR_ALREADY_INITIALIZED;
}
if (!g_fxo->get<sce_np_manager>()->is_initialized)
{
return SCE_NP_ERROR_NOT_INITIALIZED;
}
lookup_manager->is_initialized = true;
return CELL_OK;
@ -1758,7 +1767,16 @@ error_code sceNpLookupTerm()
const auto lookup_manager = g_fxo->get<sce_np_lookup_manager>();
// TODO: check if this might throw SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED
if (!lookup_manager->is_initialized)
{
return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
}
if (!g_fxo->get<sce_np_manager>()->is_initialized)
{
return SCE_NP_ERROR_NOT_INITIALIZED;
}
lookup_manager->is_initialized = false;
return CELL_OK;
@ -2900,6 +2918,11 @@ error_code sceNpScoreInit()
return SCE_NP_COMMUNITY_ERROR_ALREADY_INITIALIZED;
}
if (!g_fxo->get<sce_np_manager>()->is_initialized)
{
return SCE_NP_ERROR_NOT_INITIALIZED;
}
score_manager->is_initialized = true;
return CELL_OK;
@ -2916,6 +2939,11 @@ error_code sceNpScoreTerm()
return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
}
if (!g_fxo->get<sce_np_manager>()->is_initialized)
{
return SCE_NP_ERROR_NOT_INITIALIZED;
}
score_manager->is_initialized = false;
return CELL_OK;