Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unified to use ASCII for ZIP entries and fn_str() when passing archive name to unzip.c

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-12-27 08:52:05 +00:00
parent dac3065d25
commit 9d1f22e7c2
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/zipstrm.cpp
View File

@@ -40,13 +40,14 @@ wxZipInputStream::wxZipInputStream(const wxString& archive, const wxString& file
m_Pos = 0;
m_Size = 0;
m_Archive = (void*) unzOpen(archive.mb_str());
m_Archive = (void*) unzOpen(archive.fn_str());
if (m_Archive == NULL)
{
m_lasterror = wxSTREAM_READ_ERROR;
return;
}
if (unzLocateFile((unzFile)m_Archive, file.mb_str(), 0) != UNZ_OK)
// TODO what encoding does ZIP use?
if (unzLocateFile((unzFile)m_Archive, file.ToAscii(), 0) != UNZ_OK)
{
m_lasterror = wxSTREAM_READ_ERROR;
return;