AxioDL
/
nod
mirror of https://github.com/AxioDL/nod.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Shift-JIS support 

When converting to and from WStrings, the Shift-JIS codepage is now being used instead of the UTF-8 codepage.

Fixed a bug in nod::DiscBuilderBase::PartitionBuilderBase::addBuildName(nod::SystemStringView) that corrupted the filesystem table if the multibyte string is longer than the wstring it came from.
This commit is contained in:
Minty-Meeo 2021-04-08 00:47:45 -05:00
parent fdc8be487d
commit 9329092757
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nod/DiscBase.hpp
View File

@ -412,7 +412,7 @@ public:
void addBuildName(SystemStringView str) {
SystemUTF8Conv utf8View(str);
m_buildNames.emplace_back(utf8View.utf8_str());
m_buildNameOff += str.size() + 1;
m_buildNameOff += utf8View.utf8_str().size() + 1;
}
DiscBuilderBase& m_parent;

9
include/nod/Util.hpp
View File

@ -3,6 +3,7 @@
#if _WIN32 && UNICODE
#include <cwctype>
#include <direct.h>
#define CP_SHIFT_JIS 932
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN 1
#endif
@ -97,9 +98,9 @@ class SystemUTF8Conv {
public:
explicit SystemUTF8Conv(SystemStringView str) {
int len = WideCharToMultiByte(CP_UTF8, 0, str.data(), str.size(), nullptr, 0, nullptr, nullptr);
const size_t len = WideCharToMultiByte(CP_SHIFT_JIS, 0, str.data(), str.size(), nullptr, 0, nullptr, nullptr);
m_utf8.assign(len, '\0');
WideCharToMultiByte(CP_UTF8, 0, str.data(), str.size(), &m_utf8[0], len, nullptr, nullptr);
WideCharToMultiByte(CP_SHIFT_JIS, 0, str.data(), str.size(), &m_utf8[0], len, nullptr, nullptr);
}
std::string_view utf8_str() const { return m_utf8; }
const char* c_str() const { return m_utf8.c_str(); }
@ -109,9 +110,9 @@ class SystemStringConv {
public:
explicit SystemStringConv(std::string_view str) {
int len = MultiByteToWideChar(CP_UTF8, 0, str.data(), str.size(), nullptr, 0);
const size_t len = MultiByteToWideChar(CP_SHIFT_JIS, 0, str.data(), str.size(), nullptr, 0);
m_sys.assign(len, L'\0');
MultiByteToWideChar(CP_UTF8, 0, str.data(), str.size(), &m_sys[0], len);
MultiByteToWideChar(CP_SHIFT_JIS, 0, str.data(), str.size(), &m_sys[0], len);
}
SystemStringView sys_str() const { return m_sys; }
const SystemChar* c_str() const { return m_sys.c_str(); }