fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[XAM] Fixed issue with different param count in XamFormatDateString and XamFormatTimeString

Browse Source 
In older dashes filetime is in r4 then output buffer in r5
but on newer it's in r3 and r4
This commit is contained in:
Gliniak
2026-05-17 17:34:39 +02:00
parent a261b83def
commit 482629a3b1
1 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/xenia/kernel/xam/xam_locale.cc
View File

@@ -12,6 +12,7 @@
#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/util/xfiletime.h"
#include "xenia/kernel/xam/xam_private.h" #include "xenia/kernel/xam/xam_private.h"
#include "xenia/kernel/xenumerator.h" #include "xenia/kernel/xenumerator.h"
#include "xenia/kernel/xthread.h" #include "xenia/kernel/xthread.h"
@@ -456,9 +457,9 @@ dword_result_t XamGetLocaleDateFormat_entry(dword_t locale) {
DECLARE_XAM_EXPORT1(XamGetLocaleDateFormat, kLocale, kImplemented); DECLARE_XAM_EXPORT1(XamGetLocaleDateFormat, kLocale, kImplemented);
void XamFormatDateString_entry(dword_t locale_format, qword_t filetime, void XFormatDateString(uint64_t filetime, uint32_t buffer_address,
lpvoid_t output_buffer, dword_t output_count) { uint32_t buffer_size) {
output_buffer.Zero(output_count * sizeof(char16_t)); auto buffer = kernel_memory()->TranslateVirtual<char16_t*>(buffer_address);
auto tp = xe::chrono::WinSystemClock::to_sys( auto tp = xe::chrono::WinSystemClock::to_sys(
xe::chrono::WinSystemClock::from_file_time(filetime)); xe::chrono::WinSystemClock::from_file_time(filetime));
@@ -469,14 +470,25 @@ void XamFormatDateString_entry(dword_t locale_format, qword_t filetime,
static_cast<unsigned>(year_month_day.month()), static_cast<unsigned>(year_month_day.month()),
static_cast<unsigned>(year_month_day.day()), static_cast<unsigned>(year_month_day.day()),
static_cast<int>(year_month_day.year())); static_cast<int>(year_month_day.year()));
xe::string_util::copy_and_swap_truncating(output_buffer.as<char16_t*>(), str, xe::string_util::copy_and_swap_truncating(buffer, str, buffer_size);
output_count); }
void XamFormatDateString_entry(dword_t locale_format, qword_t filetime,
lpvoid_t output_buffer, dword_t output_count,
const ppc_context_t& ctx) {
// There is a different definition between dashboards.
// New dashboards do not have first param and everyting is shifted.
if (X_FILETIME(filetime).is_valid()) {
XFormatDateString(filetime, output_buffer.guest_address(), output_count);
} else {
XFormatDateString(ctx->r[3], ctx->r[4], ctx->r[5]);
}
} }
DECLARE_XAM_EXPORT1(XamFormatDateString, kNone, kImplemented); DECLARE_XAM_EXPORT1(XamFormatDateString, kNone, kImplemented);
void XamFormatTimeString_entry(dword_t user_index, qword_t filetime, void XFormatTimeString(uint64_t filetime, uint32_t buffer_address,
lpvoid_t output_buffer, dword_t output_count) { uint32_t buffer_size) {
output_buffer.Zero(output_count * sizeof(char16_t)); auto buffer = kernel_memory()->TranslateVirtual<char16_t*>(buffer_address);
auto tp = xe::chrono::WinSystemClock::to_sys( auto tp = xe::chrono::WinSystemClock::to_sys(
xe::chrono::WinSystemClock::from_file_time(filetime)); xe::chrono::WinSystemClock::from_file_time(filetime));
@@ -485,8 +497,19 @@ void XamFormatTimeString_entry(dword_t user_index, qword_t filetime,
auto str = fmt::format(u"{:02d}:{:02d}", time.hours().count(), auto str = fmt::format(u"{:02d}:{:02d}", time.hours().count(),
time.minutes().count()); time.minutes().count());
xe::string_util::copy_and_swap_truncating(output_buffer.as<char16_t*>(), str, xe::string_util::copy_and_swap_truncating(buffer, str, buffer_size);
output_count); }
void XamFormatTimeString_entry(dword_t user_index, qword_t filetime,
lpvoid_t output_buffer, dword_t output_count,
const ppc_context_t& ctx) {
// There is a different definition between dashboards.
// New dashboards do not have first param and everyting is shifted.
if (X_FILETIME(filetime).is_valid()) {
XFormatTimeString(filetime, output_buffer.guest_address(), output_count);
} else {
XFormatTimeString(ctx->r[3], ctx->r[4], ctx->r[5]);
}
} }
DECLARE_XAM_EXPORT1(XamFormatTimeString, kNone, kImplemented); DECLARE_XAM_EXPORT1(XamFormatTimeString, kNone, kImplemented);