From de9ae140593a67523c71fa3d66bfd02a89d532fb Mon Sep 17 00:00:00 2001 From: Hamish Milne Date: Sat, 28 Mar 2020 19:29:29 +0000 Subject: [PATCH] Only serialize wchar paths on windows --- src/core/file_sys/archive_backend.h | 2 ++ src/core/hle/kernel/thread.cpp | 3 +-- src/video_core/pica_state.h | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/file_sys/archive_backend.h b/src/core/file_sys/archive_backend.h index 658e6f20ca..87a42b028d 100644 --- a/src/core/file_sys/archive_backend.h +++ b/src/core/file_sys/archive_backend.h @@ -77,6 +77,7 @@ private: case LowPathType::Char: ar& string; break; +#ifdef _WIN32 case LowPathType::Wchar: static_assert(sizeof(wchar_t) == sizeof(char16_t)); { @@ -87,6 +88,7 @@ private: } } break; +#endif default: break; } diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 465ba46f5b..0567ef325b 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -63,8 +63,7 @@ void Thread::Acquire(Thread* thread) { } Thread::Thread(KernelSystem& kernel, u32 core_id) - : WaitObject(kernel), context(kernel.GetThreadManager(core_id).NewContext()), - core_id(core_id), + : WaitObject(kernel), context(kernel.GetThreadManager(core_id).NewContext()), core_id(core_id), thread_manager(kernel.GetThreadManager(core_id)) {} Thread::~Thread() {} diff --git a/src/video_core/pica_state.h b/src/video_core/pica_state.h index 1879528cb8..3a9ec79c52 100644 --- a/src/video_core/pica_state.h +++ b/src/video_core/pica_state.h @@ -239,7 +239,8 @@ private: void load(Archive& ar, const unsigned int file_version) { u32 offset{}; ar >> offset; - cmd_list.head_ptr = reinterpret_cast(VideoCore::g_memory->GetPhysicalPointer(cmd_list.addr)); + cmd_list.head_ptr = + reinterpret_cast(VideoCore::g_memory->GetPhysicalPointer(cmd_list.addr)); cmd_list.current_ptr = cmd_list.head_ptr + offset; } };