RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-04 22:19:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More rFile cleanups and fixes.

Browse source 
Was using fileExists/dirExists before when really should have just been exists. File or Dir doesn't matter and would only create false negatives.
Current working directory shouldn't really be used at all. This is just the folder the application is run from (not even where the .exe resides).
Some of the infos required by vfsLocalDir such as executable may not be portable. Not sure of their intended function as they are never used.
This commit is contained in:
Sacha 2014-08-01 04:20:00 +10:00
parent 6cb083be1a
commit e8525a6f14
15 changed files with 180 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rpcs3/Emu/SysCalls/Modules/sceNp.cpp
View file

@ -53,10 +53,12 @@ int sceNpDrmIsAvailable(u32 k_licensee_addr, u32 drm_path_addr)
//make more explicit what this actually does (currently everything after the third slash and before the fourth slash)
std::string titleID = fmt::BeforeFirst(fmt::AfterFirst(fmt::AfterFirst(fmt::AfterFirst(drm_path,'/'),'/'),'/'),'/');
std::string enc_drm_path = rGetCwd() + drm_path;
std::string dec_drm_path = rGetCwd() + "/dev_hdd1/" + titleID + "/" + drm_file_name;
// TODO: These shouldn't use current dir
std::string enc_drm_path = drm_path;
drm_path.insert(0, 1, '.');
std::string dec_drm_path = "./dev_hdd1/" + titleID + "/" + drm_file_name;
std::string rap_dir_path = rGetCwd() + "/dev_usb000/";
std::string rap_dir_path = "./dev_usb000/";
std::string rap_file_path = rap_dir_path;
// Search dev_usb000 for a compatible RAP file.
@ -77,9 +79,10 @@ int sceNpDrmIsAvailable(u32 k_licensee_addr, u32 drm_path_addr)
}
// Create a new directory under dev_hdd1/titleID to hold the decrypted data.
std::string tmp_dir = rGetCwd() + "/dev_hdd1/" + titleID;
if (!rDir::Exists(tmp_dir))
rMkdir(rGetCwd() + "/dev_hdd1/" + titleID);
// TODO: These shouldn't use current dir
std::string tmp_dir = "./dev_hdd1/" + titleID;
if (!rExists(tmp_dir))
rMkdir("./dev_hdd1/" + titleID);
// Decrypt this EDAT using the supplied k_licensee and matching RAP file.
DecryptEDAT(enc_drm_path, dec_drm_path, 8, rap_file_path, k_licensee, false);