From 4d242e7681ac7c69a80787e57e3a9469d2a11b67 Mon Sep 17 00:00:00 2001
From: emoose <abc@cock.li>
Date: Sat, 4 Jan 2020 11:52:41 +0000
Subject: [PATCH] [XAM/User] Allow titles to actually access title-specific
 settings Would only allow access to dash GPD previously... I'm not sure if we
 need to setup the XPROFILE_TITLE_SPECIFIC settings in advance or not though,
 really it should be on the games to do this themselves, but not sure whats
 actually needed...

This should probably fix games that would save progress to profile (Halo 3 progression, etc.), haven't actually noticed any changes myself yet though.
---
 src/xenia/kernel/xam/xam_user.cc | 40 +++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/xenia/kernel/xam/xam_user.cc b/src/xenia/kernel/xam/xam_user.cc
index a30b08e28..cefa73be8 100644
--- a/src/xenia/kernel/xam/xam_user.cc
+++ b/src/xenia/kernel/xam/xam_user.cc
@@ -239,9 +239,6 @@ dword_result_t XamUserReadProfileSettings(
     actual_user_index = 0;
   }
 
-  // Title ID = 0 means us.
-  // 0xfffe07d1 = profile?
-
   const auto& user_profile = kernel_state()->user_profile(actual_user_index);
   if (!user_profile) {
     if (overlapped_ptr) {
@@ -252,6 +249,11 @@ dword_result_t XamUserReadProfileSettings(
     return X_ERROR_NOT_FOUND;
   }
 
+  auto gpd = user_profile->GetDashboardGpd();
+  if (title_id != kDashboardID) {
+    gpd = user_profile->GetTitleGpd(title_id);
+  }
+
   // First call asks for size (fill buffer_size_ptr).
   // Second call asks for buffer contents with that size.
 
@@ -264,7 +266,15 @@ dword_result_t XamUserReadProfileSettings(
   for (uint32_t n = 0; n < setting_count; ++n) {
     auto setting_id = (xdbf::X_XDBF_SETTING_ID)(uint32_t)setting_ids[n];
     xdbf::Setting setting;
-    if (user_profile->GetDashboardGpd()->GetSetting(setting_id, &setting)) {
+    setting.id = setting_id;
+
+    auto this_gpd = gpd;
+    // TODO: should we really be doing this for every non-specific setting?
+    if (!setting.IsTitleSpecific()) {
+      this_gpd = user_profile->GetDashboardGpd();
+    }
+
+    if (this_gpd && this_gpd->GetSetting(setting_id, &setting)) {
       size_needed += (uint32_t)setting.extraData.size();
     } else {
       XELOGE("XamUserReadProfileSettings requested unimplemented setting %.8X",
@@ -293,13 +303,15 @@ dword_result_t XamUserReadProfileSettings(
   for (uint32_t n = 0; n < setting_count; ++n) {
     auto setting_id = (xdbf::X_XDBF_SETTING_ID)(uint32_t)setting_ids[n];
     xdbf::Setting setting;
+    setting.id = setting_id;
 
-    auto gpd = user_profile->GetDashboardGpd();
-    if (title_id != 0xFFFE07D1) {
-      gpd = user_profile->GetTitleGpd(title_id);
+    auto this_gpd = gpd;
+    // TODO: should we really be doing this for every non-specific setting?
+    if (!setting.IsTitleSpecific()) {
+      this_gpd = user_profile->GetDashboardGpd();
     }
 
-    bool exists = gpd && gpd->GetSetting(setting_id, &setting);
+    bool exists = this_gpd && this_gpd->GetSetting(setting_id, &setting);
 
     // TODO: fix this setting causing dash.xex to crash
     // (probably makes it call into avatar code)
@@ -390,7 +402,7 @@ dword_result_t XamUserWriteProfileSettings(
   }
 
   auto gpd = user_profile->GetDashboardGpd();
-  if (title_id != 0xFFFE07D1) {
+  if (title_id != kDashboardID) {
     gpd = user_profile->GetTitleGpd(title_id);
   }
 
@@ -417,8 +429,14 @@ dword_result_t XamUserWriteProfileSettings(
     setting.id = settings_data.setting.setting_id;
     setting.value.type = settings_data.setting.value.type;
 
+    auto this_gpd = gpd;
+    // TODO: should we really be doing this for every non-specific setting?
+    if (!setting.IsTitleSpecific()) {
+      this_gpd = user_profile->GetDashboardGpd();
+    }
+
     // Retrieve any existing setting data if we can
-    gpd->GetSetting(setting.id, &setting);
+    this_gpd->GetSetting(setting.id, &setting);
 
     // ... and then overwrite it
     memcpy(&setting.value, &settings_data.setting.value,
@@ -443,7 +461,7 @@ dword_result_t XamUserWriteProfileSettings(
       }
     }
 
-    gpd->UpdateSetting(setting);
+    this_gpd->UpdateSetting(setting);
   }
 
   user_profile->UpdateAllGpds();