RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-23 03:02:53 +01:00
Code Issues Releases Wiki Activity

sceNp: Fix ExitSpawn, Implement VerifyUpgradeLicense (#2428)

Browse Source 
* sceNp: Fix ExitSpawn and ExitSpawn2

Fixes sceNpDrmProcessExitSpawn and sceNpDrmProcessExitSpawn2
functions

The problem was that first argument klicensee was missing, therefore
shifting every other argument out of place and throwing an access
violation at the end.

* Use npDrmIsAvailable on sceNpDrmProcessExitSpawn

Tries to decrypt DRM file with provided klicensee

* Implement sceNpDrmVerifyUpgradeLicense

Implements sceNpDrmVerifyUpgradeLicense / sceNpDrmVerifyUpgradeLicense2
This commit is contained in:
Ani 2017-02-26 20:44:48 +00:00 committed by Ivan
parent 0eb6bf6a67
commit 01ef9ecca4
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
rpcs3/Emu/Cell/Modules/sceNp.cpp
View File

@ -36,7 +36,7 @@ s32 sceNpTerm()
return CELL_OK; return CELL_OK;
} }
s32 npDrmIsAvailable(u32 k_licensee_addr, vm::cptr<char> drm_path) s32 npDrmIsAvailable(vm::cptr<u8> k_licensee_addr, vm::cptr<char> drm_path)
{ {
const std::string& enc_drm_path = drm_path.get_ptr(); const std::string& enc_drm_path = drm_path.get_ptr();
@ -51,9 +51,9 @@ s32 npDrmIsAvailable(u32 k_licensee_addr, vm::cptr<char> drm_path)
if (k_licensee_addr) if (k_licensee_addr)
{ {
for (s32 i = 0; i < 0x10; i++) for (s8 i = 0; i < 0x10; i++)
{ {
k_licensee[i] = vm::read8(k_licensee_addr + i); k_licensee[i] = *(k_licensee_addr + i);
k_licensee_str += fmt::format("%02x", k_licensee[i]); k_licensee_str += fmt::format("%02x", k_licensee[i]);
} }
} }
@ -101,14 +101,14 @@ s32 npDrmIsAvailable(u32 k_licensee_addr, vm::cptr<char> drm_path)
return CELL_OK; return CELL_OK;
} }
s32 sceNpDrmIsAvailable(u32 k_licensee_addr, vm::cptr<char> drm_path) s32 sceNpDrmIsAvailable(vm::cptr<u8> k_licensee_addr, vm::cptr<char> drm_path)
{ {
sceNp.warning("sceNpDrmIsAvailable(k_licensee=*0x%x, drm_path=%s)", k_licensee_addr, drm_path); sceNp.warning("sceNpDrmIsAvailable(k_licensee=*0x%x, drm_path=%s)", k_licensee_addr, drm_path);
return npDrmIsAvailable(k_licensee_addr, drm_path); return npDrmIsAvailable(k_licensee_addr, drm_path);
} }
s32 sceNpDrmIsAvailable2(u32 k_licensee_addr, vm::cptr<char> drm_path) s32 sceNpDrmIsAvailable2(vm::cptr<u8> k_licensee_addr, vm::cptr<char> drm_path)
{ {
sceNp.warning("sceNpDrmIsAvailable2(k_licensee=*0x%x, drm_path=%s)", k_licensee_addr, drm_path); sceNp.warning("sceNpDrmIsAvailable2(k_licensee=*0x%x, drm_path=%s)", k_licensee_addr, drm_path);
@ -117,15 +117,35 @@ s32 sceNpDrmIsAvailable2(u32 k_licensee_addr, vm::cptr<char> drm_path)
s32 sceNpDrmVerifyUpgradeLicense(vm::cptr<char> content_id) s32 sceNpDrmVerifyUpgradeLicense(vm::cptr<char> content_id)
{ {
sceNp.todo("sceNpDrmVerifyUpgradeLicense(content_id=%s)", content_id); sceNp.warning("sceNpDrmVerifyUpgradeLicense2(content_id=%s)", content_id);
std::string rap_name = *content_id + ".rap";
fs::file rap_file = fs::file(vfs::get("/dev_hdd0/home/00000001/exdata/" + rap_name));
if (!rap_file)
{
// Game hasn't been purchased therefore no RAP file present
return SCE_NP_DRM_ERROR_LICENSE_NOT_FOUND;
}
// Game has been purchased and there's a RAP file present
return CELL_OK; return CELL_OK;
} }
s32 sceNpDrmVerifyUpgradeLicense2(vm::cptr<char> content_id) s32 sceNpDrmVerifyUpgradeLicense2(vm::cptr<char> content_id)
{ {
sceNp.todo("sceNpDrmVerifyUpgradeLicense2(content_id=%s)", content_id); sceNp.warning("sceNpDrmVerifyUpgradeLicense2(content_id=%s)", content_id);
std::string rap_name = *content_id + ".rap";
fs::file rap_file = fs::file(vfs::get("/dev_hdd0/home/00000001/exdata/" + rap_name));
if (!rap_file)
{
// Game hasn't been purchased therefore no RAP file present
return SCE_NP_DRM_ERROR_LICENSE_NOT_FOUND;
}
// Game has been purchased and there's a RAP file present
return CELL_OK; return CELL_OK;
} }
@ -144,18 +164,24 @@ s32 sceNpDrmGetTimelimit(vm::cptr<char> path, vm::ptr<u64> time_remain)
return CELL_OK; return CELL_OK;
} }
s32 sceNpDrmProcessExitSpawn(vm::cptr<char> path, u32 argv_addr, u32 envp_addr, u32 data_addr, u32 data_size, u32 prio, u64 flags) s32 sceNpDrmProcessExitSpawn(vm::cptr<u8> klicensee, vm::cptr<char> path, u32 argv_addr, u32 envp_addr, u32 data_addr, u32 data_size, u32 prio, u64 flags)
{ {
sceNp.warning("sceNpDrmProcessExitSpawn() -> sys_game_process_exitspawn"); sceNp.warning("sceNpDrmProcessExitSpawn() -> sys_game_process_exitspawn");
sceNp.warning("klicensee: 0x%x", klicensee);
npDrmIsAvailable(klicensee, path);
sys_game_process_exitspawn(path, argv_addr, envp_addr, data_addr, data_size, prio, flags); sys_game_process_exitspawn(path, argv_addr, envp_addr, data_addr, data_size, prio, flags);
return CELL_OK; return CELL_OK;
} }
s32 sceNpDrmProcessExitSpawn2(vm::cptr<char> path, u32 argv_addr, u32 envp_addr, u32 data_addr, u32 data_size, u32 prio, u64 flags) s32 sceNpDrmProcessExitSpawn2(vm::cptr<u8> klicensee, vm::cptr<char> path, u32 argv_addr, u32 envp_addr, u32 data_addr, u32 data_size, u32 prio, u64 flags)
{ {
sceNp.warning("sceNpDrmProcessExitSpawn2() -> sys_game_process_exitspawn2"); sceNp.warning("sceNpDrmProcessExitSpawn2() -> sys_game_process_exitspawn2");
sceNp.warning("klicensee: 0x%x", klicensee);
npDrmIsAvailable(klicensee, path);
sys_game_process_exitspawn2(path, argv_addr, envp_addr, data_addr, data_size, prio, flags); sys_game_process_exitspawn2(path, argv_addr, envp_addr, data_addr, data_size, prio, flags);

3
rpcs3/Emu/Cell/Modules/sceNp.h
View File

@ -116,6 +116,9 @@ enum
SCE_NP_COMMUNITY_ERROR_TOO_LARGE_RANGE = 0x8002a1ae, SCE_NP_COMMUNITY_ERROR_TOO_LARGE_RANGE = 0x8002a1ae,
SCE_NP_COMMUNITY_ERROR_INVALID_PARTITION = 0x8002a1af, SCE_NP_COMMUNITY_ERROR_INVALID_PARTITION = 0x8002a1af,
SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID = 0x8002a1b1, SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID = 0x8002a1b1,
// DRM
SCE_NP_DRM_ERROR_LICENSE_NOT_FOUND = 0x80029521,
}; };
using SceNpBasicEventHandler = s32(s32 event, s32 retCode, u32 reqId, vm::ptr<void> arg); using SceNpBasicEventHandler = s32(s32 event, s32 retCode, u32 reqId, vm::ptr<void> arg);