empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Linux: Fixed crash when loading 7zip files

Browse source
This commit is contained in:
Souryo 2016-12-19 22:16:29 -05:00
parent 5c9de5b887
commit fdfda87c9d
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Utilities/SZReader.cpp
View file

@ -29,7 +29,7 @@ bool SZReader::InternalLoadArchive(void* buffer, size_t size)
void SZReader::ExtractFile(string filename, uint8_t **fileBuffer, size_t &fileSize)
{
if(_initialized) {
wchar_t *utf16Filename = (wchar_t*)SzAlloc(nullptr, 2000);
char16_t *utf16Filename = (char16_t*)SzAlloc(nullptr, 2000);
uint32_t blockIndex = 0xFFFFFFFF;
uint8_t *outBuffer = 0;
@ -44,7 +44,7 @@ void SZReader::ExtractFile(string filename, uint8_t **fileBuffer, size_t &fileSi
}
SzArEx_GetFileNameUtf16(&_archive, i, (uint16_t*)utf16Filename);
string entryName = utf8::utf8::encode(std::wstring(utf16Filename));
string entryName = utf8::utf8::encode(std::u16string(utf16Filename));
if(filename == entryName) {
WRes res = SzArEx_Extract(&_archive, &_lookStream.s, i, &blockIndex, &outBuffer, &outBufferSize, &offset, &outSizeProcessed, &_allocImp, &_allocTempImp);
if(res == SZ_OK) {
@ -64,7 +64,7 @@ void SZReader::ExtractFile(string filename, uint8_t **fileBuffer, size_t &fileSi
vector<string> SZReader::InternalGetFileList()
{
vector<string> filenames;
wchar_t *utf16Filename = (wchar_t*)SzAlloc(nullptr, 2000);
char16_t *utf16Filename = (char16_t*)SzAlloc(nullptr, 2000);
if(_initialized) {
for(uint32_t i = 0; i < _archive.NumFiles; i++) {
@ -74,7 +74,7 @@ vector<string> SZReader::InternalGetFileList()
}
SzArEx_GetFileNameUtf16(&_archive, i, (uint16_t*)utf16Filename);
string filename = utf8::utf8::encode(std::wstring(utf16Filename));
string filename = utf8::utf8::encode(std::u16string(utf16Filename));
filenames.push_back(filename);
}
}

6
Utilities/UTF8Util.cpp
View file

@ -40,5 +40,11 @@ namespace utf8 {
std::wstring_convert<std::codecvt_utf8<wchar_t>> myconv;
return myconv.to_bytes(wstr);
}
std::string utf8::encode(const std::u16string &wstr)
{
std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> myconv;
return myconv.to_bytes(wstr);
}
}
#endif

1
Utilities/UTF8Util.h
View file

@ -8,6 +8,7 @@ namespace utf8 {
public:
static std::wstring decode(const std::string &str);
static std::string encode(const std::wstring &wstr);
static std::string encode(const std::u16string &wstr);
};
#ifdef _WIN32