From 54952f6ad63015762b64fd9fbc1a9c9f2a17bff5 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Wed, 21 Aug 2019 20:33:49 +0300 Subject: [PATCH] Use g_fxo for LoadedNpdrmKeys_t Rename to loaded_npdrm_keys --- rpcs3/Crypto/unedat.h | 6 +++--- rpcs3/Emu/Cell/Modules/sceNp.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_fs.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_overlay.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_process.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_prx.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_spu.cpp | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rpcs3/Crypto/unedat.h b/rpcs3/Crypto/unedat.h index 57cdd7fd31..4a231486fb 100644 --- a/rpcs3/Crypto/unedat.h +++ b/rpcs3/Crypto/unedat.h @@ -14,7 +14,7 @@ constexpr u32 EDAT_FLAG_0x10 = 0x00000010; constexpr u32 EDAT_FLAG_0x20 = 0x00000020; constexpr u32 EDAT_DEBUG_DATA_FLAG = 0x80000000; -struct LoadedNpdrmKeys_t +struct loaded_npdrm_keys { std::array devKlic{}; std::array rifKey{}; @@ -77,7 +77,7 @@ public: : edata_file(std::move(input)), rif_key(rif_key), dev_key(dev_key) {} ~EDATADecrypter() override {} - // false if invalid + // false if invalid bool ReadHeader(); u64 ReadData(u64 pos, u8* data, u64 size); @@ -92,7 +92,7 @@ public: stats.mtime = -1; return stats; } - bool trunc(u64 length) override + bool trunc(u64 length) override { return true; } diff --git a/rpcs3/Emu/Cell/Modules/sceNp.cpp b/rpcs3/Emu/Cell/Modules/sceNp.cpp index 46794d8d90..af72e076d0 100644 --- a/rpcs3/Emu/Cell/Modules/sceNp.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNp.cpp @@ -60,7 +60,7 @@ s32 npDrmIsAvailable(vm::cptr k_licensee_addr, vm::cptr drm_path) return CELL_ENOENT; } - auto npdrmkeys = fxm::get_always(); + auto npdrmkeys = g_fxo->get(); npdrmkeys->devKlic.fill(0); npdrmkeys->rifKey.fill(0); diff --git a/rpcs3/Emu/Cell/lv2/sys_fs.cpp b/rpcs3/Emu/Cell/lv2/sys_fs.cpp index fa1f4610ce..6445f473d1 100644 --- a/rpcs3/Emu/Cell/lv2/sys_fs.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_fs.cpp @@ -357,7 +357,7 @@ error_code sys_fs_open(ppu_thread& ppu, vm::cptr path, s32 flags, vm::ptr< file.seek(0); if (magic == "NPD\0"_u32) { - auto edatkeys = fxm::get_always(); + auto edatkeys = g_fxo->get(); auto sdata_file = std::make_unique(std::move(file), edatkeys->devKlic, edatkeys->rifKey); if (!sdata_file->ReadHeader()) { diff --git a/rpcs3/Emu/Cell/lv2/sys_overlay.cpp b/rpcs3/Emu/Cell/lv2/sys_overlay.cpp index d63b5aa1d4..01a7b1fad4 100644 --- a/rpcs3/Emu/Cell/lv2/sys_overlay.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_overlay.cpp @@ -26,7 +26,7 @@ static error_code overlay_load_module(vm::ptr ovlmid, const std::string& vp src.open(path); } - const ppu_exec_object obj = decrypt_self(std::move(src), fxm::get_always()->devKlic.data()); + const ppu_exec_object obj = decrypt_self(std::move(src), g_fxo->get()->devKlic.data()); if (obj != elf_error::ok) { diff --git a/rpcs3/Emu/Cell/lv2/sys_process.cpp b/rpcs3/Emu/Cell/lv2/sys_process.cpp index e771b6d186..4d812530b6 100644 --- a/rpcs3/Emu/Cell/lv2/sys_process.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_process.cpp @@ -299,7 +299,7 @@ void _sys_process_exit2(ppu_thread& ppu, s32 status, vm::ptr ar vm::temporary_unlock(ppu); - Emu.CallAfter([path = std::move(path), argv = std::move(argv), envp = std::move(envp), data = std::move(data), disc = std::move(disc), klic = fxm::get_always()->devKlic]() mutable + Emu.CallAfter([path = std::move(path), argv = std::move(argv), envp = std::move(envp), data = std::move(data), disc = std::move(disc), klic = g_fxo->get()->devKlic]() mutable { sys_process.success("Process finished -> %s", argv[0]); Emu.SetForceBoot(true); diff --git a/rpcs3/Emu/Cell/lv2/sys_prx.cpp b/rpcs3/Emu/Cell/lv2/sys_prx.cpp index 3c98260527..f40c577c90 100644 --- a/rpcs3/Emu/Cell/lv2/sys_prx.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_prx.cpp @@ -157,7 +157,7 @@ static error_code prx_load_module(const std::string& vpath, u64 flags, vm::ptr()->devKlic.data()); + const ppu_prx_object obj = decrypt_self(std::move(src), g_fxo->get()->devKlic.data()); if (obj != elf_error::ok) { diff --git a/rpcs3/Emu/Cell/lv2/sys_spu.cpp b/rpcs3/Emu/Cell/lv2/sys_spu.cpp index 685518c72f..6769b4146c 100644 --- a/rpcs3/Emu/Cell/lv2/sys_spu.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_spu.cpp @@ -43,7 +43,7 @@ void sys_spu_image::load(const fs::file& stream) } type = SYS_SPU_IMAGE_TYPE_KERNEL; - + nsegs = sys_spu_image::get_nsegs(obj.progs); const u32 mem_size = nsegs * sizeof(sys_spu_segment) + ::size32(stream); @@ -184,7 +184,7 @@ error_code sys_spu_image_open(ppu_thread& ppu, vm::ptr img, vm::c sys_spu.warning("sys_spu_image_open(img=*0x%x, path=%s)", img, path); - const fs::file elf_file = decrypt_self(fs::file(vfs::get(path.get_ptr())), fxm::get_always()->devKlic.data()); + const fs::file elf_file = decrypt_self(fs::file(vfs::get(path.get_ptr())), g_fxo->get()->devKlic.data()); if (!elf_file) {