generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-11-13 20:37:30 +01:00
Code Issues Projects Releases Wiki Activity

use Unicode file open API on Windows

Browse Source
This commit is contained in:
Guenter Obiltschnig
2014-05-26 09:42:46 +02:00
parent c0e1b8764e
commit 253cdbc90f
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SevenZip/src/Archive.cpp
View File

@@ -20,6 +20,7 @@
#include "Poco/TextConverter.h" #include "Poco/TextConverter.h"
#include "Poco/UTF8Encoding.h" #include "Poco/UTF8Encoding.h"
#include "Poco/UTF16Encoding.h" #include "Poco/UTF16Encoding.h"
#include "Poco/UnicodeConverter.h"
#include "Poco/FileStream.h" #include "Poco/FileStream.h"
#include "Poco/File.h" #include "Poco/File.h"
#include "Poco/Path.h" #include "Poco/Path.h"
@@ -156,11 +157,20 @@ protected:
{ {
checkFile(); checkFile();
#if defined(_WIN32) && defined(POCO_WIN32_UTF8)
std::wstring wpath;
Poco::UnicodeConverter::toUTF16(_path, wpath);
if (InFile_OpenW(&_archiveStream.file, wpath.c_str()) != SZ_OK)
{
throw Poco::OpenFileException(_path);
}
#else
if (InFile_Open(&_archiveStream.file, _path.c_str()) != SZ_OK) if (InFile_Open(&_archiveStream.file, _path.c_str()) != SZ_OK)
{ {
throw Poco::OpenFileException(_path); throw Poco::OpenFileException(_path);
} }
#endif
_lookStream.realStream = &_archiveStream.s; _lookStream.realStream = &_archiveStream.s;
LookToRead_Init(&_lookStream); LookToRead_Init(&_lookStream);