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

A couple of fixes for wxChm

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2010-09-30 13:09:04 +00:00
parent 3a3349f518
commit 348a9a6ff2
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/html/chm.cpp
View File

@@ -619,8 +619,11 @@ wxChmInputStream::CreateHHPStream()
switch (code) switch (code)
{ {
case 0: // CONTENTS_FILE case 0: // CONTENTS_FILE
tmp = "Contents file="; if (len)
hhc=true; {
tmp = "Contents file=";
hhc=true;
}
break; break;
case 1: // INDEX_FILE case 1: // INDEX_FILE
tmp = "Index file="; tmp = "Index file=";
@@ -649,9 +652,10 @@ wxChmInputStream::CreateHHPStream()
// LCID at position 0 // LCID at position 0
wxUint32 dummy = *((wxUint32 *)(structptr+0)) ; wxUint32 dummy = *((wxUint32 *)(structptr+0)) ;
wxUint32 lcid = wxUINT32_SWAP_ON_BE( dummy ) ; wxUint32 lcid = wxUINT32_SWAP_ON_BE( dummy ) ;
wxString msg ; char msg[64];
msg.Printf(wxT("Language=0x%X\r\n"),lcid) ; int len = sprintf(msg, "Language=0x%X\r\n", lcid) ;
out->Write(msg.c_str() , msg.length() ) ; if (len > 0)
out->Write(msg, len) ;
} }
break ; break ;
default: default:
@@ -848,7 +852,7 @@ wxFSFile* wxChmFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
left + wxT("#chm:") + right, left + wxT("#chm:") + right,
wxEmptyString, wxEmptyString,
GetAnchor(location), GetAnchor(location),
wxDateTime(wxFileModificationTime(left))); wxDateTime(leftFilename.GetModificationTime()));
} }
delete s; delete s;