citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Only serialize wchar paths on windows

This commit is contained in:
Hamish Milne 2020-03-28 19:29:29 +00:00
parent 38e9eb379d
commit de9ae14059
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/file_sys/archive_backend.h
View File

@ -77,6 +77,7 @@ private:
case LowPathType::Char: case LowPathType::Char:
ar& string; ar& string;
break; break;
#ifdef _WIN32
case LowPathType::Wchar: case LowPathType::Wchar:
static_assert(sizeof(wchar_t) == sizeof(char16_t)); static_assert(sizeof(wchar_t) == sizeof(char16_t));
{ {
@ -87,6 +88,7 @@ private:
} }
} }
break; break;
#endif
default: default:
break; break;
} }

3
src/core/hle/kernel/thread.cpp
View File

@ -63,8 +63,7 @@ void Thread::Acquire(Thread* thread) {
} }
Thread::Thread(KernelSystem& kernel, u32 core_id) Thread::Thread(KernelSystem& kernel, u32 core_id)
: WaitObject(kernel), context(kernel.GetThreadManager(core_id).NewContext()), : WaitObject(kernel), context(kernel.GetThreadManager(core_id).NewContext()), core_id(core_id),
core_id(core_id),
thread_manager(kernel.GetThreadManager(core_id)) {} thread_manager(kernel.GetThreadManager(core_id)) {}
Thread::~Thread() {} Thread::~Thread() {}

3
src/video_core/pica_state.h
View File

@ -239,7 +239,8 @@ private:
void load(Archive& ar, const unsigned int file_version) { void load(Archive& ar, const unsigned int file_version) {
u32 offset{}; u32 offset{};
ar >> offset; ar >> offset;
cmd_list.head_ptr = reinterpret_cast<u32*>(VideoCore::g_memory->GetPhysicalPointer(cmd_list.addr)); cmd_list.head_ptr =
reinterpret_cast<u32*>(VideoCore::g_memory->GetPhysicalPointer(cmd_list.addr));
cmd_list.current_ptr = cmd_list.head_ptr + offset; cmd_list.current_ptr = cmd_list.head_ptr + offset;
} }
}; };