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

fixed .cached files on big endian machines and cleaned the code up

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-01-23 00:13:27 +00:00
parent 54ffa10747
commit 4fd5055c0d
2 changed files with 63 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changes.txt
View File

@@ -104,6 +104,10 @@ wxGTK:
- wxButton now honours wxBU_EXACTFIT - wxButton now honours wxBU_EXACTFIT
- wxStaticBox now honours wxALIGN_XXX styles - wxStaticBox now honours wxALIGN_XXX styles
wxHTML:
- fixed wxHtmlHelpController's cache files on big endian machines
2.3.2 2.3.2
----- -----

131
src/html/helpdata.cpp
View File

@@ -295,78 +295,78 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c
inline static void CacheWriteInt32(wxOutputStream *f, wxInt32 value)
{
wxInt32 x = wxINT32_SWAP_ON_BE(value);
f->Write(&x, sizeof(x));
}
#if wxUSE_UNICODE inline static wxInt32 CacheReadInt32(wxInputStream *f)
{
wxInt32 x;
f->Read(&x, sizeof(x));
return wxINT32_SWAP_ON_BE(x);
}
#define READ_STRING(f, s, lng) { char tmpc; for (int i = 0; i < lng; i++) { f->Read(&tmpc, 1); s[i] = (wxChar)tmpc;} } inline static void CacheWriteString(wxOutputStream *f, const wxChar *str)
#define WRITE_STRING(f, s, lng) { char tmpc; for (int i = 0; i < lng; i++) { tmpc = (char)s[i]; f->Write(&tmpc, 1);} } {
size_t len = wxStrlen(str)+1;
CacheWriteInt32(f, len);
f->Write(str, len * sizeof(wxChar));
}
#else inline static wxChar *CacheReadString(wxInputStream *f)
{
wxChar *str;
size_t len = (size_t)CacheReadInt32(f);
str = new wxChar[len];
f->Read(str, len * sizeof(wxChar));
return str;
}
#define READ_STRING(f, s, lng) f->Read(s, lng * sizeof(char)); #define CURRENT_CACHED_BOOK_VERSION 2
#define WRITE_STRING(f, s, lng) f->Write(s, lng * sizeof(char));
#endif
#define CURRENT_CACHED_BOOK_VERSION 1
bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f) bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f)
{ {
int i, st; int i, st;
wxInt32 x;
wxInt32 version; wxInt32 version;
/* load header - version info : */ /* load header - version info : */
version = CacheReadInt32(f);
f->Read(&x, sizeof(x));
version = wxINT32_SWAP_ON_BE(x);
if (version != CURRENT_CACHED_BOOK_VERSION) if (version != CURRENT_CACHED_BOOK_VERSION)
{ {
wxLogError(_("Incorrect version of HTML help book")); // NB: We can just silently return FALSE here and don't worry about
// it anymore, because AddBookParam will load the MS project in
// absence of (properly versioned) .cached file and automatically
// create new .cached file immediately afterward.
return FALSE; return FALSE;
// NOTE: when adding new version, please ensure backward compatibility!
} }
/* load contents : */ /* load contents : */
f->Read(&x, sizeof(x));
st = m_ContentsCnt; st = m_ContentsCnt;
m_ContentsCnt += wxINT32_SWAP_ON_BE(x); m_ContentsCnt += CacheReadInt32(f);
m_Contents = (wxHtmlContentsItem*) realloc(m_Contents, m_Contents = (wxHtmlContentsItem*) realloc(m_Contents,
(m_ContentsCnt / wxHTML_REALLOC_STEP + 1) * (m_ContentsCnt / wxHTML_REALLOC_STEP + 1) *
wxHTML_REALLOC_STEP * sizeof(wxHtmlContentsItem)); wxHTML_REALLOC_STEP * sizeof(wxHtmlContentsItem));
for (i = st; i < m_ContentsCnt; i++) for (i = st; i < m_ContentsCnt; i++)
{ {
f->Read(&x, sizeof(x)); m_Contents[i].m_Level = CacheReadInt32(f);
m_Contents[i].m_Level = wxINT32_SWAP_ON_BE(x); m_Contents[i].m_ID = CacheReadInt32(f);
f->Read(&x, sizeof(x)); m_Contents[i].m_Name = CacheReadString(f);
m_Contents[i].m_ID = wxINT32_SWAP_ON_BE(x); m_Contents[i].m_Page = CacheReadString(f);
f->Read(&x, sizeof(x)); x = wxINT32_SWAP_ON_BE(x);
m_Contents[i].m_Name = new wxChar[x];
READ_STRING(f, m_Contents[i].m_Name, x);
f->Read(&x, sizeof(x)); x = wxINT32_SWAP_ON_BE(x);
m_Contents[i].m_Page = new wxChar[x];
READ_STRING(f, m_Contents[i].m_Page, x);
m_Contents[i].m_Book = book; m_Contents[i].m_Book = book;
} }
/* load index : */ /* load index : */
f->Read(&x, sizeof(x));
st = m_IndexCnt; st = m_IndexCnt;
m_IndexCnt += wxINT32_SWAP_ON_BE(x); m_IndexCnt += CacheReadInt32(f);
m_Index = (wxHtmlContentsItem*) realloc(m_Index, (m_IndexCnt / wxHTML_REALLOC_STEP + 1) * m_Index = (wxHtmlContentsItem*) realloc(m_Index, (m_IndexCnt / wxHTML_REALLOC_STEP + 1) *
wxHTML_REALLOC_STEP * sizeof(wxHtmlContentsItem)); wxHTML_REALLOC_STEP * sizeof(wxHtmlContentsItem));
for (i = st; i < m_IndexCnt; i++) for (i = st; i < m_IndexCnt; i++)
{ {
f->Read(&x, sizeof(x)); x = wxINT32_SWAP_ON_BE(x); m_Index[i].m_Name = CacheReadString(f);
m_Index[i].m_Name = new wxChar[x]; m_Index[i].m_Page = CacheReadString(f);
READ_STRING(f, m_Index[i].m_Name, x);
f->Read(&x, sizeof(x)); x = wxINT32_SWAP_ON_BE(x);
m_Index[i].m_Page = new wxChar[x];
READ_STRING(f, m_Index[i].m_Page, x);
m_Index[i].m_Book = book; m_Index[i].m_Book = book;
} }
return TRUE; return TRUE;
@@ -376,49 +376,39 @@ bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f)
bool wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f) bool wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f)
{ {
int i; int i;
wxInt32 x; wxInt32 cnt;
/* save header - version info : */ /* save header - version info : */
CacheWriteInt32(f, CURRENT_CACHED_BOOK_VERSION);
x = wxINT32_SWAP_ON_BE(CURRENT_CACHED_BOOK_VERSION);
f->Write(&x, sizeof(x));
/* save contents : */ /* save contents : */
for (cnt = 0, i = 0; i < m_ContentsCnt; i++)
if (m_Contents[i].m_Book == book && m_Contents[i].m_Level > 0)
cnt++;
CacheWriteInt32(f, cnt);
x = 0;
for (i = 0; i < m_ContentsCnt; i++) if (m_Contents[i].m_Book == book && m_Contents[i].m_Level > 0) x++;
x = wxINT32_SWAP_ON_BE(x);
f->Write(&x, sizeof(x));
for (i = 0; i < m_ContentsCnt; i++) for (i = 0; i < m_ContentsCnt; i++)
{ {
if (m_Contents[i].m_Book != book || m_Contents[i].m_Level == 0) continue; if (m_Contents[i].m_Book != book || m_Contents[i].m_Level == 0)
x = wxINT32_SWAP_ON_BE(m_Contents[i].m_Level); continue;
f->Write(&x, sizeof(x)); CacheWriteInt32(f, m_Contents[i].m_Level);
x = wxINT32_SWAP_ON_BE(m_Contents[i].m_ID); CacheWriteInt32(f, m_Contents[i].m_ID);
f->Write(&x, sizeof(x)); CacheWriteString(f, m_Contents[i].m_Name);
x = wxINT32_SWAP_ON_BE(wxStrlen(m_Contents[i].m_Name) + 1); CacheWriteString(f, m_Contents[i].m_Page);
f->Write(&x, sizeof(x));
WRITE_STRING(f, m_Contents[i].m_Name, x);
x = wxINT32_SWAP_ON_BE(wxStrlen(m_Contents[i].m_Page) + 1);
f->Write(&x, sizeof(x));
WRITE_STRING(f, m_Contents[i].m_Page, x);
} }
/* save index : */ /* save index : */
for (cnt = 0, i = 0; i < m_IndexCnt; i++)
if (m_Index[i].m_Book == book && m_Index[i].m_Level > 0)
cnt++;
CacheWriteInt32(f, cnt);
x = 0;
for (i = 0; i < m_IndexCnt; i++) if (m_Index[i].m_Book == book && m_Index[i].m_Level > 0) x++;
x = wxINT32_SWAP_ON_BE(x);
f->Write(&x, sizeof(x));
for (i = 0; i < m_IndexCnt; i++) for (i = 0; i < m_IndexCnt; i++)
{ {
if (m_Index[i].m_Book != book || m_Index[i].m_Level == 0) continue; if (m_Index[i].m_Book != book || m_Index[i].m_Level == 0)
x = wxINT32_SWAP_ON_BE(wxStrlen(m_Index[i].m_Name) + 1); continue;
f->Write(&x, sizeof(x)); CacheWriteString(f, m_Index[i].m_Name);
WRITE_STRING(f, m_Index[i].m_Name, x); CacheWriteString(f, m_Index[i].m_Page);
x = wxINT32_SWAP_ON_BE(wxStrlen(m_Index[i].m_Page) + 1);
f->Write(&x, sizeof(x));
WRITE_STRING(f, m_Index[i].m_Page, x);
} }
return TRUE; return TRUE;
} }
@@ -542,7 +532,6 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
{ {
if (book.Right(4).Lower() == wxT(".zip") || if (book.Right(4).Lower() == wxT(".zip") ||
book.Right(4).Lower() == wxT(".htb") /*html book*/) book.Right(4).Lower() == wxT(".htb") /*html book*/)
{ {
wxFileSystem fsys; wxFileSystem fsys;
wxString s; wxString s;
@@ -557,8 +546,6 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
return rt; return rt;
} }
else else
{ {
wxFSFile *fi; wxFSFile *fi;