unified to use ASCII for ZIP entries and fn_str() when passing archive name to unzip.c
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -151,7 +151,7 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
|
||||
|
||||
m_ZipFile = left;
|
||||
wxString nativename = wxFileSystem::URLToFileName(m_ZipFile).GetFullPath();
|
||||
m_Archive = (void*) unzOpen(nativename.mb_str());
|
||||
m_Archive = (void*) unzOpen(nativename.fn_str());
|
||||
m_Pattern = right.AfterLast(wxT('/'));
|
||||
m_BaseDir = right.BeforeLast(wxT('/'));
|
||||
|
||||
@@ -196,7 +196,7 @@ wxString wxZipFSHandler::DoFind()
|
||||
{
|
||||
unzGetCurrentFileInfo((unzFile)m_Archive, NULL, namebuf, 1024, NULL, 0, NULL, 0);
|
||||
for (c = namebuf; *c; c++) if (*c == '\\') *c = '/';
|
||||
namestr = wxString::FromAscii( namebuf ); // TODO what encoding does ZIP use?
|
||||
namestr = wxString::FromAscii(namebuf); // TODO what encoding does ZIP use?
|
||||
|
||||
if (m_AllowDirs)
|
||||
{
|
||||
|
Reference in New Issue
Block a user