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

fix up an issue with sceNpTrophyCreateContext (#2382)

Browse source
This commit is contained in:
georgemoralis 2017-02-14 19:46:56 +02:00 • committed by Ivan
parent 682924b51a
commit 5d705c0e9c
3 changed files with 40 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rpcs3/Emu/Cell/Modules/cellGameExec.cpp
View file

@ -29,14 +29,17 @@ s32 cellGameGetHomeDataImportPath()
fmt::throw_exception("Unimplemented" HERE); fmt::throw_exception("Unimplemented" HERE);
} }
s32 cellGameGetHomeLaunchOptionPath() s32 cellGameGetHomeLaunchOptionPath(vm::ptr<char> commonPath, vm::ptr<char> personalPath)
{ {
fmt::throw_exception("Unimplemented" HERE); cellGameExec.todo("cellGameGetHomeLaunchOptionPath(commonPath=%s, personalPath=%s)", commonPath, personalPath);
// TODO: PlayStation home is not supported atm.
return CELL_GAME_ERROR_NOAPP;
} }
s32 cellGameGetBootGameInfo(vm::ptr<u32> type, vm::ptr<char> dirName, vm::ptr<u32> execData) s32 cellGameGetBootGameInfo(vm::ptr<u32> type, vm::ptr<char> dirName, vm::ptr<u32> execData)
{ {
cellGameExec.todo("cellGameGetBootGameInfo(type=*0x%x, dirName=*0x%x, execData=*0x%x)", type, dirName, execData); cellGameExec.todo("cellGameGetBootGameInfo(type=*0x%x, dirName=%s, execData=*0x%x)", type, dirName, execData);
// TODO: Support more boot types // TODO: Support more boot types
*type = CELL_GAME_GAMETYPE_SYS; *type = CELL_GAME_GAMETYPE_SYS;

30
rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp
View file

@ -92,19 +92,42 @@ s32 sceNpTrophyAbortHandle(u32 handle)
return CELL_OK; return CELL_OK;
} }
void deleteTerminateChar(char* myStr,char _char) {
char *del = &myStr[strlen(myStr)];
while (del > myStr && *del != _char)
del--;
if (*del == _char)
*del = '\0';
return;
}
s32 sceNpTrophyCreateContext(vm::ptr<u32> context, vm::cptr<SceNpCommunicationId> commId, vm::cptr<SceNpCommunicationSignature> commSign, u64 options) s32 sceNpTrophyCreateContext(vm::ptr<u32> context, vm::cptr<SceNpCommunicationId> commId, vm::cptr<SceNpCommunicationSignature> commSign, u64 options)
{ {
sceNpTrophy.warning("sceNpTrophyCreateContext(context=*0x%x, commId=*0x%x, commSign=*0x%x, options=0x%llx)", context, commId, commSign, options); sceNpTrophy.warning("sceNpTrophyCreateContext(context=*0x%x, commId=*0x%x, commSign=*0x%x, options=0x%llx)", context, commId, commSign, options);
// rough checks for further fmt::format call // rough checks for further fmt::format call
if (commId->term || commId->num > 99) if (commId->num > 99)
{ {
sceNpTrophy.error("sceNpTrophyCreateContext Invalid NP_COMM_ID");
return SCE_NP_TROPHY_ERROR_INVALID_NP_COMM_ID; return SCE_NP_TROPHY_ERROR_INVALID_NP_COMM_ID;
} }
// generate trophy context name // generate trophy context name
std::string name = fmt::format("%s_%02d", commId->data, commId->num); std::string name;
sceNpTrophy.warning("sceNpTrophyCreateContext term=%s data=%s num=%d", commId->term, commId->data, commId->num);
if (commId->term)
{
char trimchar[9];
strcpy(trimchar, commId->data);
deleteTerminateChar(trimchar,commId->term);
name = fmt::format("%s_%02d", trimchar, commId->num);
}
else
{
name = fmt::format("%s_%02d", commId->data,commId->num);
}
// open trophy pack file // open trophy pack file
fs::file stream(vfs::get("/app_home/../TROPDIR/" + name + "/TROPHY.TRP")); fs::file stream(vfs::get("/app_home/../TROPDIR/" + name + "/TROPHY.TRP"));
@ -112,6 +135,7 @@ s32 sceNpTrophyCreateContext(vm::ptr<u32> context, vm::cptr<SceNpCommunicationId
// check if exists and opened // check if exists and opened
if (!stream) if (!stream)
{ {
sceNpTrophy.error("sceNpTrophyCreateContext CONF does not exist");
return SCE_NP_TROPHY_ERROR_CONF_DOES_NOT_EXIST; return SCE_NP_TROPHY_ERROR_CONF_DOES_NOT_EXIST;
} }

12
rpcs3/MMJoystickHandler.cpp
View file

@ -31,11 +31,11 @@ void MMJoystickHandler::Init(const u32 max_connect)
supportedJoysticks = joyGetNumDevs(); supportedJoysticks = joyGetNumDevs();
if (supportedJoysticks > 0) if (supportedJoysticks > 0)
{ {
LOG_ERROR(HLE, "Driver supports %u joysticks", supportedJoysticks); LOG_NOTICE(GENERAL, "Driver supports %u joysticks", supportedJoysticks);
} }
else else
{ {
LOG_ERROR(HLE, "Driver doesn't support Joysticks"); LOG_ERROR(GENERAL, "Driver doesn't support Joysticks");
} }
js_info.dwSize = sizeof(js_info); js_info.dwSize = sizeof(js_info);
js_info.dwFlags = JOY_RETURNALL; js_info.dwFlags = JOY_RETURNALL;
@ -43,8 +43,8 @@ void MMJoystickHandler::Init(const u32 max_connect)
bool JoyPresent = (joyGetPosEx(JOYSTICKID1, &js_info) == JOYERR_NOERROR); bool JoyPresent = (joyGetPosEx(JOYSTICKID1, &js_info) == JOYERR_NOERROR);
if (JoyPresent) if (JoyPresent)
{ {
LOG_ERROR(HLE, "Found connected joystick with %u buttons", js_caps.wNumButtons); LOG_NOTICE(GENERAL, "Found connected joystick with %u buttons and %u axes", js_caps.wNumButtons,js_caps.wNumAxes);
LOG_NOTICE(GENERAL, "Axes info %u %u %u %u %u %u %u %u", js_caps.wXmin, js_caps.wXmax,js_caps.wYmin,js_caps.wYmax,js_caps.wZmin,js_caps.wZmax,js_caps.wRmin,js_caps.wRmax);
std::memset(&m_info, 0, sizeof m_info); std::memset(&m_info, 0, sizeof m_info);
m_info.max_connect = max_connect; m_info.max_connect = max_connect;
@ -90,7 +90,7 @@ void MMJoystickHandler::Init(const u32 max_connect)
} }
else else
{ {
LOG_ERROR(HLE, "Joystick not found"); LOG_ERROR(GENERAL, "Joystick not found");
} }
} }
@ -102,7 +102,7 @@ void MMJoystickHandler::Close()
{ {
active = false; active = false;
if (WaitForSingleObject(thread, THREAD_TIMEOUT) != WAIT_OBJECT_0) if (WaitForSingleObject(thread, THREAD_TIMEOUT) != WAIT_OBJECT_0)
LOG_ERROR(HLE, "MMJoystick thread could not stop within %d milliseconds", (u32)THREAD_TIMEOUT); LOG_ERROR(GENERAL, "MMJoystick thread could not stop within %d milliseconds", (u32)THREAD_TIMEOUT);
thread = nullptr; thread = nullptr;
} }
} }