ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[XAM/User] XamUserCreateTitlesPlayedEnumerator - Skip titles without achievements 

It mimics behaviour of real 360 dashboard that
skips info about demos and system apps

also smaller code style changes
This commit is contained in:
Gliniak 2019-12-24 12:27:05 +01:00 committed by illusion
parent 120ce49328
commit a81346ac1e
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/xenia/kernel/xam/xam_user.cc
View File

@ -9,19 +9,17 @@
#include <cstring> #include <cstring>
#include "xenia/base/cvar.h"
#include "xenia/base/logging.h" #include "xenia/base/logging.h"
#include "xenia/kernel/kernel_state.h" #include "xenia/kernel/kernel_state.h"
#include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/util/shim_utils.h"
#include "xenia/kernel/xam/xam_private.h" #include "xenia/kernel/xam/xam_private.h"
#include "xenia/kernel/xam/xdbf/xdbf.h"
#include "xenia/kernel/xenumerator.h" #include "xenia/kernel/xenumerator.h"
#include "xenia/kernel/xthread.h" #include "xenia/kernel/xthread.h"
#include "xenia/xbox.h" #include "xenia/xbox.h"
#include "xenia/kernel/xam/xdbf/xdbf.h"
#include "xenia/base/cvar.h"
DEFINE_bool(signin_state, true, "User signed in", "Kernel");
DEFINE_bool(signin_state, true,
"User signed in", "Kernel");
namespace xe { namespace xe {
namespace kernel { namespace kernel {
@ -128,7 +126,7 @@ dword_result_t XamUserGetSigninState(dword_t user_index) {
if (user_index == 0 || (user_index & 0xFF) == 0xFF) { if (user_index == 0 || (user_index & 0xFF) == 0xFF) {
const auto& user_profile = kernel_state()->user_profile(); const auto& user_profile = kernel_state()->user_profile();
return ((cvars::signin_state) ? 1 : 0); return ((cvars::signin_state) ? 1 : 0);
} else { } else {
return 0; return 0;
} }
@ -157,7 +155,7 @@ X_HRESULT_result_t XamUserGetSigninInfo(dword_t user_index, dword_t flags,
} }
std::memset(info, 0, sizeof(X_USER_SIGNIN_INFO)); std::memset(info, 0, sizeof(X_USER_SIGNIN_INFO));
const auto& user_profile = kernel_state()->user_profile(); const auto& user_profile = kernel_state()->user_profile();
info->xuid = user_profile->xuid(); info->xuid = user_profile->xuid();
info->signin_state = ((cvars::signin_state) ? 1 : 0); info->signin_state = ((cvars::signin_state) ? 1 : 0);
@ -710,8 +708,13 @@ dword_result_t XamUserCreateTitlesPlayedEnumerator(
for (auto title : titles) { for (auto title : titles) {
// For some reason dashboard gpd stores info about itself // For some reason dashboard gpd stores info about itself
if (title.title_id == kDashboardID) if (title.title_id == kDashboardID)
continue; continue;
// TODO: Look for better check to provide information about demo title
// or system title
if (!title.gamerscore_total || !title.achievements_possible)
continue;
auto* details = (xdbf::X_XDBF_GPD_TITLEPLAYED*)e->AppendItem(); auto* details = (xdbf::X_XDBF_GPD_TITLEPLAYED*)e->AppendItem();
details->title_id = title.title_id; details->title_id = title.title_id;
@ -727,18 +730,18 @@ dword_result_t XamUserCreateTitlesPlayedEnumerator(
details->last_played = title.last_played; details->last_played = title.last_played;
xe::copy_and_swap<wchar_t>((wchar_t*)details->title_name, xe::copy_and_swap<wchar_t>((wchar_t*)details->title_name,
title.title_name.c_str(), title.title_name.c_str(),
title.title_name.size()); title.title_name.size());
} }
return X_ERROR_SUCCESS; return X_ERROR_SUCCESS;
} }
DECLARE_XAM_EXPORT1(XamUserCreateTitlesPlayedEnumerator, kUserProfiles, kImplemented); DECLARE_XAM_EXPORT1(XamUserCreateTitlesPlayedEnumerator, kUserProfiles,
kImplemented);
dword_result_t XamReadTile(dword_t section_id, dword_t game_id, qword_t item_id, dword_result_t XamReadTile(dword_t section_id, dword_t game_id, qword_t item_id,
dword_t offset, lpdword_t output_ptr, dword_t offset, lpdword_t output_ptr,
lpdword_t buffer_size_ptr, lpdword_t buffer_size_ptr, dword_t overlapped) {
dword_t overlapped) {
uint32_t buffer_size = buffer_size_ptr ? *buffer_size_ptr : 0; uint32_t buffer_size = buffer_size_ptr ? *buffer_size_ptr : 0;
if (!output_ptr) { if (!output_ptr) {
@ -753,7 +756,8 @@ dword_result_t XamReadTile(dword_t section_id, dword_t game_id, qword_t item_id,
} }
// Section 2 == images // Section 2 == images
Entry* entry = game_spa->GetEntry((uint16_t)SpaSection::kImage, item_id.value()); Entry* entry =
game_spa->GetEntry((uint16_t)SpaSection::kImage, item_id.value());
if (!buffer_size) { if (!buffer_size) {
buffer_size = entry->info.size; buffer_size = entry->info.size;
@ -769,9 +773,9 @@ dword_result_t XamReadTile(dword_t section_id, dword_t game_id, qword_t item_id,
} }
DECLARE_XAM_EXPORT1(XamReadTile, kUserProfiles, kSketchy); DECLARE_XAM_EXPORT1(XamReadTile, kUserProfiles, kSketchy);
dword_result_t XamReadTileEx(dword_t section_id, dword_t game_id, qword_t item_id, dword_result_t XamReadTileEx(dword_t section_id, dword_t game_id,
dword_t offset, dword_t unk1, qword_t item_id, dword_t offset, dword_t unk1,
dword_t unk2, lpdword_t output_ptr) { dword_t unk2, lpdword_t output_ptr) {
return XamReadTile(section_id, game_id, item_id, offset, output_ptr, 0, 0); return XamReadTile(section_id, game_id, item_id, offset, output_ptr, 0, 0);
} }
DECLARE_XAM_EXPORT1(XamReadTileEx, kUserProfiles, kSketchy); DECLARE_XAM_EXPORT1(XamReadTileEx, kUserProfiles, kSketchy);
@ -788,6 +792,5 @@ DECLARE_XAM_EXPORT1(XamUserIsOnlineEnabled, kUserProfiles, kStub);
} // namespace kernel } // namespace kernel
} // namespace xe } // namespace xe
void xe::kernel::xam::RegisterUserExports( void xe::kernel::xam::RegisterUserExports(
xe::cpu::ExportResolver* export_resolver, KernelState* kernel_state) {} xe::cpu::ExportResolver* export_resolver, KernelState* kernel_state) {}