diff options
Diffstat (limited to 'src')
24 files changed, 46 insertions, 43 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 85485773f..566a4e4ad 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -349,7 +349,7 @@ struct System::Impl { | |||
| 349 | } | 349 | } |
| 350 | 350 | ||
| 351 | Service::Glue::ApplicationLaunchProperty launch{}; | 351 | Service::Glue::ApplicationLaunchProperty launch{}; |
| 352 | launch.title_id = process.GetTitleID(); | 352 | launch.title_id = process.GetProgramID(); |
| 353 | 353 | ||
| 354 | FileSys::PatchManager pm{launch.title_id, fs_controller, *content_provider}; | 354 | FileSys::PatchManager pm{launch.title_id, fs_controller, *content_provider}; |
| 355 | launch.version = pm.GetGameVersion().value_or(0); | 355 | launch.version = pm.GetGameVersion().value_or(0); |
diff --git a/src/core/file_sys/savedata_factory.cpp b/src/core/file_sys/savedata_factory.cpp index 0c8ec4ba2..764205831 100644 --- a/src/core/file_sys/savedata_factory.cpp +++ b/src/core/file_sys/savedata_factory.cpp | |||
| @@ -143,7 +143,7 @@ std::string SaveDataFactory::GetFullPath(Core::System& system, SaveDataSpaceId s | |||
| 143 | // be interpreted as the title id of the current process. | 143 | // be interpreted as the title id of the current process. |
| 144 | if (type == SaveDataType::SaveData || type == SaveDataType::DeviceSaveData) { | 144 | if (type == SaveDataType::SaveData || type == SaveDataType::DeviceSaveData) { |
| 145 | if (title_id == 0) { | 145 | if (title_id == 0) { |
| 146 | title_id = system.CurrentProcess()->GetTitleID(); | 146 | title_id = system.CurrentProcess()->GetProgramID(); |
| 147 | } | 147 | } |
| 148 | } | 148 | } |
| 149 | 149 | ||
diff --git a/src/core/hle/kernel/k_process.h b/src/core/hle/kernel/k_process.h index 76ece119f..8a8c1fcbb 100644 --- a/src/core/hle/kernel/k_process.h +++ b/src/core/hle/kernel/k_process.h | |||
| @@ -154,8 +154,8 @@ public: | |||
| 154 | return process_id; | 154 | return process_id; |
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | /// Gets the title ID corresponding to this process. | 157 | /// Gets the program ID corresponding to this process. |
| 158 | u64 GetTitleID() const { | 158 | u64 GetProgramID() const { |
| 159 | return program_id; | 159 | return program_id; |
| 160 | } | 160 | } |
| 161 | 161 | ||
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index fbfe6fc1a..f9d99bc51 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -768,7 +768,7 @@ static ResultCode GetInfo(Core::System& system, u64* result, u64 info_id, Handle | |||
| 768 | return ResultSuccess; | 768 | return ResultSuccess; |
| 769 | 769 | ||
| 770 | case GetInfoType::TitleId: | 770 | case GetInfoType::TitleId: |
| 771 | *result = process->GetTitleID(); | 771 | *result = process->GetProgramID(); |
| 772 | return ResultSuccess; | 772 | return ResultSuccess; |
| 773 | 773 | ||
| 774 | case GetInfoType::UserExceptionContextAddr: | 774 | case GetInfoType::UserExceptionContextAddr: |
diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index 4af2c3a8d..4d4fa5ee7 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp | |||
| @@ -761,7 +761,7 @@ ResultCode Module::Interface::InitializeApplicationInfoBase() { | |||
| 761 | // our own process | 761 | // our own process |
| 762 | const auto& current_process = system.Kernel().CurrentProcess(); | 762 | const auto& current_process = system.Kernel().CurrentProcess(); |
| 763 | const auto launch_property = | 763 | const auto launch_property = |
| 764 | system.GetARPManager().GetLaunchProperty(current_process->GetTitleID()); | 764 | system.GetARPManager().GetLaunchProperty(current_process->GetProgramID()); |
| 765 | 765 | ||
| 766 | if (launch_property.Failed()) { | 766 | if (launch_property.Failed()) { |
| 767 | LOG_ERROR(Service_ACC, "Failed to get launch property"); | 767 | LOG_ERROR(Service_ACC, "Failed to get launch property"); |
| @@ -805,7 +805,7 @@ void Module::Interface::IsUserAccountSwitchLocked(Kernel::HLERequestContext& ctx | |||
| 805 | bool is_locked = false; | 805 | bool is_locked = false; |
| 806 | 806 | ||
| 807 | if (res != Loader::ResultStatus::Success) { | 807 | if (res != Loader::ResultStatus::Success) { |
| 808 | const FileSys::PatchManager pm{system.CurrentProcess()->GetTitleID(), | 808 | const FileSys::PatchManager pm{system.CurrentProcess()->GetProgramID(), |
| 809 | system.GetFileSystemController(), | 809 | system.GetFileSystemController(), |
| 810 | system.GetContentProvider()}; | 810 | system.GetContentProvider()}; |
| 811 | const auto nacp_unique = pm.GetControlMetadata().first; | 811 | const auto nacp_unique = pm.GetControlMetadata().first; |
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 99bf1d84d..0d514d876 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp | |||
| @@ -1429,7 +1429,8 @@ void IApplicationFunctions::PopLaunchParameter(Kernel::HLERequestContext& ctx) { | |||
| 1429 | u64 build_id{}; | 1429 | u64 build_id{}; |
| 1430 | std::memcpy(&build_id, build_id_full.data(), sizeof(u64)); | 1430 | std::memcpy(&build_id, build_id_full.data(), sizeof(u64)); |
| 1431 | 1431 | ||
| 1432 | auto data = backend->GetLaunchParameter({system.CurrentProcess()->GetTitleID(), build_id}); | 1432 | auto data = |
| 1433 | backend->GetLaunchParameter({system.CurrentProcess()->GetProgramID(), build_id}); | ||
| 1433 | if (data.has_value()) { | 1434 | if (data.has_value()) { |
| 1434 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; | 1435 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; |
| 1435 | rb.Push(ResultSuccess); | 1436 | rb.Push(ResultSuccess); |
| @@ -1481,7 +1482,7 @@ void IApplicationFunctions::EnsureSaveData(Kernel::HLERequestContext& ctx) { | |||
| 1481 | LOG_DEBUG(Service_AM, "called, uid={:016X}{:016X}", user_id[1], user_id[0]); | 1482 | LOG_DEBUG(Service_AM, "called, uid={:016X}{:016X}", user_id[1], user_id[0]); |
| 1482 | 1483 | ||
| 1483 | FileSys::SaveDataAttribute attribute{}; | 1484 | FileSys::SaveDataAttribute attribute{}; |
| 1484 | attribute.title_id = system.CurrentProcess()->GetTitleID(); | 1485 | attribute.title_id = system.CurrentProcess()->GetProgramID(); |
| 1485 | attribute.user_id = user_id; | 1486 | attribute.user_id = user_id; |
| 1486 | attribute.type = FileSys::SaveDataType::SaveData; | 1487 | attribute.type = FileSys::SaveDataType::SaveData; |
| 1487 | const auto res = system.GetFileSystemController().CreateSaveData( | 1488 | const auto res = system.GetFileSystemController().CreateSaveData( |
| @@ -1511,7 +1512,7 @@ void IApplicationFunctions::GetDisplayVersion(Kernel::HLERequestContext& ctx) { | |||
| 1511 | std::array<u8, 0x10> version_string{}; | 1512 | std::array<u8, 0x10> version_string{}; |
| 1512 | 1513 | ||
| 1513 | const auto res = [this] { | 1514 | const auto res = [this] { |
| 1514 | const auto title_id = system.CurrentProcess()->GetTitleID(); | 1515 | const auto title_id = system.CurrentProcess()->GetProgramID(); |
| 1515 | 1516 | ||
| 1516 | const FileSys::PatchManager pm{title_id, system.GetFileSystemController(), | 1517 | const FileSys::PatchManager pm{title_id, system.GetFileSystemController(), |
| 1517 | system.GetContentProvider()}; | 1518 | system.GetContentProvider()}; |
| @@ -1548,7 +1549,7 @@ void IApplicationFunctions::GetDesiredLanguage(Kernel::HLERequestContext& ctx) { | |||
| 1548 | u32 supported_languages = 0; | 1549 | u32 supported_languages = 0; |
| 1549 | 1550 | ||
| 1550 | const auto res = [this] { | 1551 | const auto res = [this] { |
| 1551 | const auto title_id = system.CurrentProcess()->GetTitleID(); | 1552 | const auto title_id = system.CurrentProcess()->GetProgramID(); |
| 1552 | 1553 | ||
| 1553 | const FileSys::PatchManager pm{title_id, system.GetFileSystemController(), | 1554 | const FileSys::PatchManager pm{title_id, system.GetFileSystemController(), |
| 1554 | system.GetContentProvider()}; | 1555 | system.GetContentProvider()}; |
| @@ -1656,7 +1657,8 @@ void IApplicationFunctions::ExtendSaveData(Kernel::HLERequestContext& ctx) { | |||
| 1656 | static_cast<u8>(type), user_id[1], user_id[0], new_normal_size, new_journal_size); | 1657 | static_cast<u8>(type), user_id[1], user_id[0], new_normal_size, new_journal_size); |
| 1657 | 1658 | ||
| 1658 | system.GetFileSystemController().WriteSaveDataSize( | 1659 | system.GetFileSystemController().WriteSaveDataSize( |
| 1659 | type, system.CurrentProcess()->GetTitleID(), user_id, {new_normal_size, new_journal_size}); | 1660 | type, system.CurrentProcess()->GetProgramID(), user_id, |
| 1661 | {new_normal_size, new_journal_size}); | ||
| 1660 | 1662 | ||
| 1661 | IPC::ResponseBuilder rb{ctx, 4}; | 1663 | IPC::ResponseBuilder rb{ctx, 4}; |
| 1662 | rb.Push(ResultSuccess); | 1664 | rb.Push(ResultSuccess); |
| @@ -1680,7 +1682,7 @@ void IApplicationFunctions::GetSaveDataSize(Kernel::HLERequestContext& ctx) { | |||
| 1680 | user_id[0]); | 1682 | user_id[0]); |
| 1681 | 1683 | ||
| 1682 | const auto size = system.GetFileSystemController().ReadSaveDataSize( | 1684 | const auto size = system.GetFileSystemController().ReadSaveDataSize( |
| 1683 | type, system.CurrentProcess()->GetTitleID(), user_id); | 1685 | type, system.CurrentProcess()->GetProgramID(), user_id); |
| 1684 | 1686 | ||
| 1685 | IPC::ResponseBuilder rb{ctx, 6}; | 1687 | IPC::ResponseBuilder rb{ctx, 6}; |
| 1686 | rb.Push(ResultSuccess); | 1688 | rb.Push(ResultSuccess); |
diff --git a/src/core/hle/service/am/applets/applet_error.cpp b/src/core/hle/service/am/applets/applet_error.cpp index 36a4aa9cd..117897aa5 100644 --- a/src/core/hle/service/am/applets/applet_error.cpp +++ b/src/core/hle/service/am/applets/applet_error.cpp | |||
| @@ -167,7 +167,7 @@ void Error::Execute() { | |||
| 167 | } | 167 | } |
| 168 | 168 | ||
| 169 | const auto callback = [this] { DisplayCompleted(); }; | 169 | const auto callback = [this] { DisplayCompleted(); }; |
| 170 | const auto title_id = system.CurrentProcess()->GetTitleID(); | 170 | const auto title_id = system.CurrentProcess()->GetProgramID(); |
| 171 | const auto& reporter{system.GetReporter()}; | 171 | const auto& reporter{system.GetReporter()}; |
| 172 | 172 | ||
| 173 | switch (mode) { | 173 | switch (mode) { |
diff --git a/src/core/hle/service/am/applets/applet_general_backend.cpp b/src/core/hle/service/am/applets/applet_general_backend.cpp index 770a8eef2..3c730c69f 100644 --- a/src/core/hle/service/am/applets/applet_general_backend.cpp +++ b/src/core/hle/service/am/applets/applet_general_backend.cpp | |||
| @@ -187,7 +187,7 @@ void PhotoViewer::Execute() { | |||
| 187 | const auto callback = [this] { ViewFinished(); }; | 187 | const auto callback = [this] { ViewFinished(); }; |
| 188 | switch (mode) { | 188 | switch (mode) { |
| 189 | case PhotoViewerAppletMode::CurrentApp: | 189 | case PhotoViewerAppletMode::CurrentApp: |
| 190 | frontend.ShowPhotosForApplication(system.CurrentProcess()->GetTitleID(), callback); | 190 | frontend.ShowPhotosForApplication(system.CurrentProcess()->GetProgramID(), callback); |
| 191 | break; | 191 | break; |
| 192 | case PhotoViewerAppletMode::AllApps: | 192 | case PhotoViewerAppletMode::AllApps: |
| 193 | frontend.ShowAllPhotos(callback); | 193 | frontend.ShowAllPhotos(callback); |
diff --git a/src/core/hle/service/am/applets/applet_web_browser.cpp b/src/core/hle/service/am/applets/applet_web_browser.cpp index 927eeefff..da41d4594 100644 --- a/src/core/hle/service/am/applets/applet_web_browser.cpp +++ b/src/core/hle/service/am/applets/applet_web_browser.cpp | |||
| @@ -395,7 +395,7 @@ void WebBrowser::InitializeOffline() { | |||
| 395 | switch (document_kind) { | 395 | switch (document_kind) { |
| 396 | case DocumentKind::OfflineHtmlPage: | 396 | case DocumentKind::OfflineHtmlPage: |
| 397 | default: | 397 | default: |
| 398 | title_id = system.CurrentProcess()->GetTitleID(); | 398 | title_id = system.CurrentProcess()->GetProgramID(); |
| 399 | nca_type = FileSys::ContentRecordType::HtmlDocument; | 399 | nca_type = FileSys::ContentRecordType::HtmlDocument; |
| 400 | additional_paths = "html-document"; | 400 | additional_paths = "html-document"; |
| 401 | break; | 401 | break; |
diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/aoc_u.cpp index 9565f76d4..cbf403cfe 100644 --- a/src/core/hle/service/aoc/aoc_u.cpp +++ b/src/core/hle/service/aoc/aoc_u.cpp | |||
| @@ -152,7 +152,7 @@ void AOC_U::CountAddOnContent(Kernel::HLERequestContext& ctx) { | |||
| 152 | IPC::ResponseBuilder rb{ctx, 3}; | 152 | IPC::ResponseBuilder rb{ctx, 3}; |
| 153 | rb.Push(ResultSuccess); | 153 | rb.Push(ResultSuccess); |
| 154 | 154 | ||
| 155 | const auto current = system.CurrentProcess()->GetTitleID(); | 155 | const auto current = system.CurrentProcess()->GetProgramID(); |
| 156 | 156 | ||
| 157 | const auto& disabled = Settings::values.disabled_addons[current]; | 157 | const auto& disabled = Settings::values.disabled_addons[current]; |
| 158 | if (std::find(disabled.begin(), disabled.end(), "DLC") != disabled.end()) { | 158 | if (std::find(disabled.begin(), disabled.end(), "DLC") != disabled.end()) { |
| @@ -179,7 +179,7 @@ void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) { | |||
| 179 | LOG_DEBUG(Service_AOC, "called with offset={}, count={}, process_id={}", offset, count, | 179 | LOG_DEBUG(Service_AOC, "called with offset={}, count={}, process_id={}", offset, count, |
| 180 | process_id); | 180 | process_id); |
| 181 | 181 | ||
| 182 | const auto current = system.CurrentProcess()->GetTitleID(); | 182 | const auto current = system.CurrentProcess()->GetProgramID(); |
| 183 | 183 | ||
| 184 | std::vector<u32> out; | 184 | std::vector<u32> out; |
| 185 | const auto& disabled = Settings::values.disabled_addons[current]; | 185 | const auto& disabled = Settings::values.disabled_addons[current]; |
| @@ -225,7 +225,7 @@ void AOC_U::GetAddOnContentBaseId(Kernel::HLERequestContext& ctx) { | |||
| 225 | IPC::ResponseBuilder rb{ctx, 4}; | 225 | IPC::ResponseBuilder rb{ctx, 4}; |
| 226 | rb.Push(ResultSuccess); | 226 | rb.Push(ResultSuccess); |
| 227 | 227 | ||
| 228 | const auto title_id = system.CurrentProcess()->GetTitleID(); | 228 | const auto title_id = system.CurrentProcess()->GetProgramID(); |
| 229 | const FileSys::PatchManager pm{title_id, system.GetFileSystemController(), | 229 | const FileSys::PatchManager pm{title_id, system.GetFileSystemController(), |
| 230 | system.GetContentProvider()}; | 230 | system.GetContentProvider()}; |
| 231 | 231 | ||
diff --git a/src/core/hle/service/bcat/bcat_module.cpp b/src/core/hle/service/bcat/bcat_module.cpp index 36bd2a052..c2feba887 100644 --- a/src/core/hle/service/bcat/bcat_module.cpp +++ b/src/core/hle/service/bcat/bcat_module.cpp | |||
| @@ -178,7 +178,7 @@ private: | |||
| 178 | void RequestSyncDeliveryCache(Kernel::HLERequestContext& ctx) { | 178 | void RequestSyncDeliveryCache(Kernel::HLERequestContext& ctx) { |
| 179 | LOG_DEBUG(Service_BCAT, "called"); | 179 | LOG_DEBUG(Service_BCAT, "called"); |
| 180 | 180 | ||
| 181 | backend.Synchronize({system.CurrentProcess()->GetTitleID(), | 181 | backend.Synchronize({system.CurrentProcess()->GetProgramID(), |
| 182 | GetCurrentBuildID(system.GetCurrentProcessBuildID())}, | 182 | GetCurrentBuildID(system.GetCurrentProcessBuildID())}, |
| 183 | GetProgressBackend(SyncType::Normal)); | 183 | GetProgressBackend(SyncType::Normal)); |
| 184 | 184 | ||
| @@ -195,7 +195,7 @@ private: | |||
| 195 | 195 | ||
| 196 | LOG_DEBUG(Service_BCAT, "called, name={}", name); | 196 | LOG_DEBUG(Service_BCAT, "called, name={}", name); |
| 197 | 197 | ||
| 198 | backend.SynchronizeDirectory({system.CurrentProcess()->GetTitleID(), | 198 | backend.SynchronizeDirectory({system.CurrentProcess()->GetProgramID(), |
| 199 | GetCurrentBuildID(system.GetCurrentProcessBuildID())}, | 199 | GetCurrentBuildID(system.GetCurrentProcessBuildID())}, |
| 200 | name, GetProgressBackend(SyncType::Directory)); | 200 | name, GetProgressBackend(SyncType::Directory)); |
| 201 | 201 | ||
| @@ -556,7 +556,7 @@ private: | |||
| 556 | void Module::Interface::CreateDeliveryCacheStorageService(Kernel::HLERequestContext& ctx) { | 556 | void Module::Interface::CreateDeliveryCacheStorageService(Kernel::HLERequestContext& ctx) { |
| 557 | LOG_DEBUG(Service_BCAT, "called"); | 557 | LOG_DEBUG(Service_BCAT, "called"); |
| 558 | 558 | ||
| 559 | const auto title_id = system.CurrentProcess()->GetTitleID(); | 559 | const auto title_id = system.CurrentProcess()->GetProgramID(); |
| 560 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; | 560 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; |
| 561 | rb.Push(ResultSuccess); | 561 | rb.Push(ResultSuccess); |
| 562 | rb.PushIpcInterface<IDeliveryCacheStorageService>(system, fsc.GetBCATDirectory(title_id)); | 562 | rb.PushIpcInterface<IDeliveryCacheStorageService>(system, fsc.GetBCATDirectory(title_id)); |
diff --git a/src/core/hle/service/fatal/fatal.cpp b/src/core/hle/service/fatal/fatal.cpp index 2c2619a7d..3d3d11d79 100644 --- a/src/core/hle/service/fatal/fatal.cpp +++ b/src/core/hle/service/fatal/fatal.cpp | |||
| @@ -66,7 +66,7 @@ enum class FatalType : u32 { | |||
| 66 | 66 | ||
| 67 | static void GenerateErrorReport(Core::System& system, ResultCode error_code, | 67 | static void GenerateErrorReport(Core::System& system, ResultCode error_code, |
| 68 | const FatalInfo& info) { | 68 | const FatalInfo& info) { |
| 69 | const auto title_id = system.CurrentProcess()->GetTitleID(); | 69 | const auto title_id = system.CurrentProcess()->GetProgramID(); |
| 70 | std::string crash_report = fmt::format( | 70 | std::string crash_report = fmt::format( |
| 71 | "Yuzu {}-{} crash report\n" | 71 | "Yuzu {}-{} crash report\n" |
| 72 | "Title ID: {:016x}\n" | 72 | "Title ID: {:016x}\n" |
diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/core/hle/service/filesystem/filesystem.cpp index 6422dec4e..194562f37 100644 --- a/src/core/hle/service/filesystem/filesystem.cpp +++ b/src/core/hle/service/filesystem/filesystem.cpp | |||
| @@ -320,7 +320,7 @@ ResultVal<FileSys::VirtualFile> FileSystemController::OpenRomFSCurrentProcess() | |||
| 320 | return ResultUnknown; | 320 | return ResultUnknown; |
| 321 | } | 321 | } |
| 322 | 322 | ||
| 323 | return romfs_factory->OpenCurrentProcess(system.CurrentProcess()->GetTitleID()); | 323 | return romfs_factory->OpenCurrentProcess(system.CurrentProcess()->GetProgramID()); |
| 324 | } | 324 | } |
| 325 | 325 | ||
| 326 | ResultVal<FileSys::VirtualFile> FileSystemController::OpenPatchedRomFS( | 326 | ResultVal<FileSys::VirtualFile> FileSystemController::OpenPatchedRomFS( |
| @@ -505,7 +505,7 @@ FileSys::SaveDataSize FileSystemController::ReadSaveDataSize(FileSys::SaveDataTy | |||
| 505 | const auto res = system.GetAppLoader().ReadControlData(nacp); | 505 | const auto res = system.GetAppLoader().ReadControlData(nacp); |
| 506 | 506 | ||
| 507 | if (res != Loader::ResultStatus::Success) { | 507 | if (res != Loader::ResultStatus::Success) { |
| 508 | const FileSys::PatchManager pm{system.CurrentProcess()->GetTitleID(), | 508 | const FileSys::PatchManager pm{system.CurrentProcess()->GetProgramID(), |
| 509 | system.GetFileSystemController(), | 509 | system.GetFileSystemController(), |
| 510 | system.GetContentProvider()}; | 510 | system.GetContentProvider()}; |
| 511 | const auto metadata = pm.GetControlMetadata(); | 511 | const auto metadata = pm.GetControlMetadata(); |
diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp index 50c788dd6..5082530fa 100644 --- a/src/core/hle/service/filesystem/fsp_srv.cpp +++ b/src/core/hle/service/filesystem/fsp_srv.cpp | |||
| @@ -1034,8 +1034,9 @@ void FSP_SRV::OpenDataStorageWithProgramIndex(Kernel::HLERequestContext& ctx) { | |||
| 1034 | 1034 | ||
| 1035 | LOG_DEBUG(Service_FS, "called, program_index={}", program_index); | 1035 | LOG_DEBUG(Service_FS, "called, program_index={}", program_index); |
| 1036 | 1036 | ||
| 1037 | auto patched_romfs = fsc.OpenPatchedRomFSWithProgramIndex( | 1037 | auto patched_romfs = |
| 1038 | system.CurrentProcess()->GetTitleID(), program_index, FileSys::ContentRecordType::Program); | 1038 | fsc.OpenPatchedRomFSWithProgramIndex(system.CurrentProcess()->GetProgramID(), program_index, |
| 1039 | FileSys::ContentRecordType::Program); | ||
| 1039 | 1040 | ||
| 1040 | if (patched_romfs.Failed()) { | 1041 | if (patched_romfs.Failed()) { |
| 1041 | // TODO: Find the right error code to use here | 1042 | // TODO: Find the right error code to use here |
diff --git a/src/core/hle/service/glue/arp.cpp b/src/core/hle/service/glue/arp.cpp index 6c8ea7f0b..2feead2aa 100644 --- a/src/core/hle/service/glue/arp.cpp +++ b/src/core/hle/service/glue/arp.cpp | |||
| @@ -26,7 +26,7 @@ std::optional<u64> GetTitleIDForProcessID(const Core::System& system, u64 proces | |||
| 26 | return std::nullopt; | 26 | return std::nullopt; |
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | return (*iter)->GetTitleID(); | 29 | return (*iter)->GetProgramID(); |
| 30 | } | 30 | } |
| 31 | } // Anonymous namespace | 31 | } // Anonymous namespace |
| 32 | 32 | ||
diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp index e4b97c1f6..92720a5b8 100644 --- a/src/core/hle/service/ldr/ldr.cpp +++ b/src/core/hle/service/ldr/ldr.cpp | |||
| @@ -247,7 +247,7 @@ public: | |||
| 247 | return; | 247 | return; |
| 248 | } | 248 | } |
| 249 | 249 | ||
| 250 | if (system.CurrentProcess()->GetTitleID() != header.application_id) { | 250 | if (system.CurrentProcess()->GetProgramID() != header.application_id) { |
| 251 | LOG_ERROR(Service_LDR, | 251 | LOG_ERROR(Service_LDR, |
| 252 | "Attempting to load NRR with title ID other than current process. (actual " | 252 | "Attempting to load NRR with title ID other than current process. (actual " |
| 253 | "{:016X})!", | 253 | "{:016X})!", |
diff --git a/src/core/hle/service/pctl/pctl_module.cpp b/src/core/hle/service/pctl/pctl_module.cpp index 6949fcf3b..229dade31 100644 --- a/src/core/hle/service/pctl/pctl_module.cpp +++ b/src/core/hle/service/pctl/pctl_module.cpp | |||
| @@ -189,7 +189,7 @@ private: | |||
| 189 | 189 | ||
| 190 | // TODO(ogniK): Recovery flag initialization for pctl:r | 190 | // TODO(ogniK): Recovery flag initialization for pctl:r |
| 191 | 191 | ||
| 192 | const auto tid = system.CurrentProcess()->GetTitleID(); | 192 | const auto tid = system.CurrentProcess()->GetProgramID(); |
| 193 | if (tid != 0) { | 193 | if (tid != 0) { |
| 194 | const FileSys::PatchManager pm{tid, system.GetFileSystemController(), | 194 | const FileSys::PatchManager pm{tid, system.GetFileSystemController(), |
| 195 | system.GetContentProvider()}; | 195 | system.GetContentProvider()}; |
diff --git a/src/core/hle/service/pm/pm.cpp b/src/core/hle/service/pm/pm.cpp index f675740b4..88fc5b5cc 100644 --- a/src/core/hle/service/pm/pm.cpp +++ b/src/core/hle/service/pm/pm.cpp | |||
| @@ -101,7 +101,7 @@ private: | |||
| 101 | 101 | ||
| 102 | const auto process = | 102 | const auto process = |
| 103 | SearchProcessList(kernel.GetProcessList(), [title_id](const auto& proc) { | 103 | SearchProcessList(kernel.GetProcessList(), [title_id](const auto& proc) { |
| 104 | return proc->GetTitleID() == title_id; | 104 | return proc->GetProgramID() == title_id; |
| 105 | }); | 105 | }); |
| 106 | 106 | ||
| 107 | if (!process.has_value()) { | 107 | if (!process.has_value()) { |
| @@ -152,7 +152,7 @@ private: | |||
| 152 | 152 | ||
| 153 | IPC::ResponseBuilder rb{ctx, 4}; | 153 | IPC::ResponseBuilder rb{ctx, 4}; |
| 154 | rb.Push(ResultSuccess); | 154 | rb.Push(ResultSuccess); |
| 155 | rb.Push((*process)->GetTitleID()); | 155 | rb.Push((*process)->GetProgramID()); |
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | const std::vector<Kernel::KProcess*>& process_list; | 158 | const std::vector<Kernel::KProcess*>& process_list; |
diff --git a/src/core/hle/service/prepo/prepo.cpp b/src/core/hle/service/prepo/prepo.cpp index 32db6834c..c13349386 100644 --- a/src/core/hle/service/prepo/prepo.cpp +++ b/src/core/hle/service/prepo/prepo.cpp | |||
| @@ -73,7 +73,7 @@ private: | |||
| 73 | Type, process_id, data1.size(), data2.size()); | 73 | Type, process_id, data1.size(), data2.size()); |
| 74 | 74 | ||
| 75 | const auto& reporter{system.GetReporter()}; | 75 | const auto& reporter{system.GetReporter()}; |
| 76 | reporter.SavePlayReport(Type, system.CurrentProcess()->GetTitleID(), {data1, data2}, | 76 | reporter.SavePlayReport(Type, system.CurrentProcess()->GetProgramID(), {data1, data2}, |
| 77 | process_id); | 77 | process_id); |
| 78 | 78 | ||
| 79 | IPC::ResponseBuilder rb{ctx, 2}; | 79 | IPC::ResponseBuilder rb{ctx, 2}; |
| @@ -101,7 +101,7 @@ private: | |||
| 101 | Type, user_id[1], user_id[0], process_id, data1.size(), data2.size()); | 101 | Type, user_id[1], user_id[0], process_id, data1.size(), data2.size()); |
| 102 | 102 | ||
| 103 | const auto& reporter{system.GetReporter()}; | 103 | const auto& reporter{system.GetReporter()}; |
| 104 | reporter.SavePlayReport(Type, system.CurrentProcess()->GetTitleID(), {data1, data2}, | 104 | reporter.SavePlayReport(Type, system.CurrentProcess()->GetProgramID(), {data1, data2}, |
| 105 | process_id, user_id); | 105 | process_id, user_id); |
| 106 | 106 | ||
| 107 | IPC::ResponseBuilder rb{ctx, 2}; | 107 | IPC::ResponseBuilder rb{ctx, 2}; |
diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cpp index 863dc0769..bb9198cd1 100644 --- a/src/core/memory/cheat_engine.cpp +++ b/src/core/memory/cheat_engine.cpp | |||
| @@ -192,7 +192,7 @@ void CheatEngine::Initialize() { | |||
| 192 | core_timing.ScheduleEvent(CHEAT_ENGINE_NS, event); | 192 | core_timing.ScheduleEvent(CHEAT_ENGINE_NS, event); |
| 193 | 193 | ||
| 194 | metadata.process_id = system.CurrentProcess()->GetProcessID(); | 194 | metadata.process_id = system.CurrentProcess()->GetProcessID(); |
| 195 | metadata.title_id = system.CurrentProcess()->GetTitleID(); | 195 | metadata.title_id = system.CurrentProcess()->GetProgramID(); |
| 196 | 196 | ||
| 197 | const auto& page_table = system.CurrentProcess()->PageTable(); | 197 | const auto& page_table = system.CurrentProcess()->PageTable(); |
| 198 | metadata.heap_extents = { | 198 | metadata.heap_extents = { |
diff --git a/src/core/reporter.cpp b/src/core/reporter.cpp index 365b8f906..71bc32d51 100644 --- a/src/core/reporter.cpp +++ b/src/core/reporter.cpp | |||
| @@ -236,7 +236,7 @@ void Reporter::SaveSvcBreakReport(u32 type, bool signal_debugger, u64 info1, u64 | |||
| 236 | } | 236 | } |
| 237 | 237 | ||
| 238 | const auto timestamp = GetTimestamp(); | 238 | const auto timestamp = GetTimestamp(); |
| 239 | const auto title_id = system.CurrentProcess()->GetTitleID(); | 239 | const auto title_id = system.CurrentProcess()->GetProgramID(); |
| 240 | auto out = GetFullDataAuto(timestamp, title_id, system); | 240 | auto out = GetFullDataAuto(timestamp, title_id, system); |
| 241 | 241 | ||
| 242 | auto break_out = json{ | 242 | auto break_out = json{ |
| @@ -263,7 +263,7 @@ void Reporter::SaveUnimplementedFunctionReport(Kernel::HLERequestContext& ctx, u | |||
| 263 | } | 263 | } |
| 264 | 264 | ||
| 265 | const auto timestamp = GetTimestamp(); | 265 | const auto timestamp = GetTimestamp(); |
| 266 | const auto title_id = system.CurrentProcess()->GetTitleID(); | 266 | const auto title_id = system.CurrentProcess()->GetProgramID(); |
| 267 | auto out = GetFullDataAuto(timestamp, title_id, system); | 267 | auto out = GetFullDataAuto(timestamp, title_id, system); |
| 268 | 268 | ||
| 269 | auto function_out = GetHLERequestContextData(ctx, system.Memory()); | 269 | auto function_out = GetHLERequestContextData(ctx, system.Memory()); |
| @@ -285,7 +285,7 @@ void Reporter::SaveUnimplementedAppletReport( | |||
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | const auto timestamp = GetTimestamp(); | 287 | const auto timestamp = GetTimestamp(); |
| 288 | const auto title_id = system.CurrentProcess()->GetTitleID(); | 288 | const auto title_id = system.CurrentProcess()->GetProgramID(); |
| 289 | auto out = GetFullDataAuto(timestamp, title_id, system); | 289 | auto out = GetFullDataAuto(timestamp, title_id, system); |
| 290 | 290 | ||
| 291 | out["applet_common_args"] = { | 291 | out["applet_common_args"] = { |
| @@ -377,7 +377,7 @@ void Reporter::SaveUserReport() const { | |||
| 377 | } | 377 | } |
| 378 | 378 | ||
| 379 | const auto timestamp = GetTimestamp(); | 379 | const auto timestamp = GetTimestamp(); |
| 380 | const auto title_id = system.CurrentProcess()->GetTitleID(); | 380 | const auto title_id = system.CurrentProcess()->GetProgramID(); |
| 381 | 381 | ||
| 382 | SaveToFile(GetFullDataAuto(timestamp, title_id, system), | 382 | SaveToFile(GetFullDataAuto(timestamp, title_id, system), |
| 383 | GetPath("user_report", title_id, timestamp)); | 383 | GetPath("user_report", title_id, timestamp)); |
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 40fd47406..dd6c5953d 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp | |||
| @@ -66,7 +66,7 @@ void EmuThread::run() { | |||
| 66 | 66 | ||
| 67 | if (Settings::values.use_disk_shader_cache.GetValue()) { | 67 | if (Settings::values.use_disk_shader_cache.GetValue()) { |
| 68 | system.Renderer().ReadRasterizer()->LoadDiskResources( | 68 | system.Renderer().ReadRasterizer()->LoadDiskResources( |
| 69 | system.CurrentProcess()->GetTitleID(), stop_token, | 69 | system.CurrentProcess()->GetProgramID(), stop_token, |
| 70 | [this](VideoCore::LoadCallbackStage stage, std::size_t value, std::size_t total) { | 70 | [this](VideoCore::LoadCallbackStage stage, std::size_t value, std::size_t total) { |
| 71 | emit LoadProgress(stage, value, total); | 71 | emit LoadProgress(stage, value, total); |
| 72 | }); | 72 | }); |
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index e871fee36..f8c55f99b 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -2762,7 +2762,7 @@ void GMainWindow::OnConfigureTas() { | |||
| 2762 | } | 2762 | } |
| 2763 | 2763 | ||
| 2764 | void GMainWindow::OnConfigurePerGame() { | 2764 | void GMainWindow::OnConfigurePerGame() { |
| 2765 | const u64 title_id = system->CurrentProcess()->GetTitleID(); | 2765 | const u64 title_id = system->CurrentProcess()->GetProgramID(); |
| 2766 | OpenPerGameConfiguration(title_id, game_path.toStdString()); | 2766 | OpenPerGameConfiguration(title_id, game_path.toStdString()); |
| 2767 | } | 2767 | } |
| 2768 | 2768 | ||
| @@ -2861,7 +2861,7 @@ void GMainWindow::OnToggleFilterBar() { | |||
| 2861 | } | 2861 | } |
| 2862 | 2862 | ||
| 2863 | void GMainWindow::OnCaptureScreenshot() { | 2863 | void GMainWindow::OnCaptureScreenshot() { |
| 2864 | const u64 title_id = system->CurrentProcess()->GetTitleID(); | 2864 | const u64 title_id = system->CurrentProcess()->GetProgramID(); |
| 2865 | const auto screenshot_path = | 2865 | const auto screenshot_path = |
| 2866 | QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::ScreenshotsDir)); | 2866 | QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::ScreenshotsDir)); |
| 2867 | const auto date = | 2867 | const auto date = |
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 67587cc54..47d90d7b3 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp | |||
| @@ -203,7 +203,7 @@ int main(int argc, char** argv) { | |||
| 203 | 203 | ||
| 204 | if (Settings::values.use_disk_shader_cache.GetValue()) { | 204 | if (Settings::values.use_disk_shader_cache.GetValue()) { |
| 205 | system.Renderer().ReadRasterizer()->LoadDiskResources( | 205 | system.Renderer().ReadRasterizer()->LoadDiskResources( |
| 206 | system.CurrentProcess()->GetTitleID(), std::stop_token{}, | 206 | system.CurrentProcess()->GetProgramID(), std::stop_token{}, |
| 207 | [](VideoCore::LoadCallbackStage, size_t value, size_t total) {}); | 207 | [](VideoCore::LoadCallbackStage, size_t value, size_t total) {}); |
| 208 | } | 208 | } |
| 209 | 209 | ||