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

Merge pull request #1244 from emoose/bugfixes 

[Kernel] Fixes for _snwprintf and xmp_app
This commit is contained in:
Rick Gibbed 2018-10-22 12:30:10 -05:00 committed by GitHub
parent 2fa7607547 bf039172cf
commit 1ae9b8263d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/xenia/kernel/xam/apps/xmp_app.cc
View File

@ -55,34 +55,41 @@ X_RESULT XmpApp::XMPCreateTitlePlaylist(uint32_t songs_ptr, uint32_t song_count,
playlist->handle = ++next_playlist_handle_; playlist->handle = ++next_playlist_handle_;
playlist->name = std::move(playlist_name); playlist->name = std::move(playlist_name);
playlist->flags = flags; playlist->flags = flags;
if (songs_ptr) {
for (uint32_t i = 0; i < song_count; ++i) { for (uint32_t i = 0; i < song_count; ++i) {
auto song = std::make_unique<Song>(); auto song = std::make_unique<Song>();
song->handle = ++next_song_handle_; song->handle = ++next_song_handle_;
uint8_t* song_base = memory_->TranslateVirtual(songs_ptr + (i * 36)); uint8_t* song_base = memory_->TranslateVirtual(songs_ptr + (i * 36));
song->file_path = xe::load_and_swap<std::wstring>( song->file_path =
memory_->TranslateVirtual(xe::load_and_swap<uint32_t>(song_base + 0))); xe::load_and_swap<std::wstring>(memory_->TranslateVirtual(
song->name = xe::load_and_swap<std::wstring>( xe::load_and_swap<uint32_t>(song_base + 0)));
memory_->TranslateVirtual(xe::load_and_swap<uint32_t>(song_base + 4))); song->name = xe::load_and_swap<std::wstring>(memory_->TranslateVirtual(
song->artist = xe::load_and_swap<std::wstring>( xe::load_and_swap<uint32_t>(song_base + 4)));
memory_->TranslateVirtual(xe::load_and_swap<uint32_t>(song_base + 8))); song->artist = xe::load_and_swap<std::wstring>(memory_->TranslateVirtual(
song->album = xe::load_and_swap<std::wstring>( xe::load_and_swap<uint32_t>(song_base + 8)));
memory_->TranslateVirtual(xe::load_and_swap<uint32_t>(song_base + 12))); song->album = xe::load_and_swap<std::wstring>(memory_->TranslateVirtual(
song->album_artist = xe::load_and_swap<std::wstring>( xe::load_and_swap<uint32_t>(song_base + 12)));
memory_->TranslateVirtual(xe::load_and_swap<uint32_t>(song_base + 16))); song->album_artist =
song->genre = xe::load_and_swap<std::wstring>( xe::load_and_swap<std::wstring>(memory_->TranslateVirtual(
memory_->TranslateVirtual(xe::load_and_swap<uint32_t>(song_base + 20))); xe::load_and_swap<uint32_t>(song_base + 16)));
song->genre = xe::load_and_swap<std::wstring>(memory_->TranslateVirtual(
xe::load_and_swap<uint32_t>(song_base + 20)));
song->track_number = xe::load_and_swap<uint32_t>(song_base + 24); song->track_number = xe::load_and_swap<uint32_t>(song_base + 24);
song->duration_ms = xe::load_and_swap<uint32_t>(song_base + 28); song->duration_ms = xe::load_and_swap<uint32_t>(song_base + 28);
song->format = song->format = static_cast<Song::Format>(
static_cast<Song::Format>(xe::load_and_swap<uint32_t>(song_base + 32)); xe::load_and_swap<uint32_t>(song_base + 32));
if (out_song_handles) { if (out_song_handles) {
xe::store_and_swap<uint32_t>( xe::store_and_swap<uint32_t>(
memory_->TranslateVirtual(out_song_handles + (i * 4)), song->handle); memory_->TranslateVirtual(out_song_handles + (i * 4)),
song->handle);
} }
playlist->songs.emplace_back(std::move(song)); playlist->songs.emplace_back(std::move(song));
} }
}
if (out_playlist_handle) {
xe::store_and_swap<uint32_t>(memory_->TranslateVirtual(out_playlist_handle), xe::store_and_swap<uint32_t>(memory_->TranslateVirtual(out_playlist_handle),
playlist->handle); playlist->handle);
}
auto global_lock = global_critical_region_.Acquire(); auto global_lock = global_critical_region_.Acquire();
playlists_.insert({playlist->handle, playlist.get()}); playlists_.insert({playlist->handle, playlist.get()});
@ -404,12 +411,19 @@ X_RESULT XmpApp::DispatchMessageSync(uint32_t message, uint32_t buffer_ptr,
assert_true(xmp_client == 0x00000002); assert_true(xmp_client == 0x00000002);
XELOGD("XMPGetPlaybackBehavior(%.8X, %.8X, %.8X)", playback_mode_ptr, XELOGD("XMPGetPlaybackBehavior(%.8X, %.8X, %.8X)", playback_mode_ptr,
repeat_mode_ptr, unk3_ptr); repeat_mode_ptr, unk3_ptr);
xe::store_and_swap<uint32_t>(memory_->TranslateVirtual(playback_mode_ptr), if (playback_mode_ptr) {
xe::store_and_swap<uint32_t>(
memory_->TranslateVirtual(playback_mode_ptr),
static_cast<uint32_t>(playback_mode_)); static_cast<uint32_t>(playback_mode_));
}
if (repeat_mode_ptr) {
xe::store_and_swap<uint32_t>(memory_->TranslateVirtual(repeat_mode_ptr), xe::store_and_swap<uint32_t>(memory_->TranslateVirtual(repeat_mode_ptr),
static_cast<uint32_t>(repeat_mode_)); static_cast<uint32_t>(repeat_mode_));
}
if (unk3_ptr) {
xe::store_and_swap<uint32_t>(memory_->TranslateVirtual(unk3_ptr), xe::store_and_swap<uint32_t>(memory_->TranslateVirtual(unk3_ptr),
unknown_flags_); unknown_flags_);
}
return X_ERROR_SUCCESS; return X_ERROR_SUCCESS;
} }
case 0x0007002E: { case 0x0007002E: {

2
src/xenia/kernel/xboxkrnl/xboxkrnl_strings.cc
View File

@ -925,7 +925,7 @@ SHIM_CALL _snwprintf_shim(PPCContext* ppc_context, KernelState* kernel_state) {
StackArgList args(ppc_context, 3); StackArgList args(ppc_context, 3);
WideStringFormatData data(format); WideStringFormatData data(format);
int32_t count = format_core(ppc_context, data, args, false); int32_t count = format_core(ppc_context, data, args, true);
if (count < 0) { if (count < 0) {
if (buffer_count > 0) { if (buffer_count > 0) {
buffer[0] = '\0'; // write a null, just to be safe buffer[0] = '\0'; // write a null, just to be safe