From: Václav Slavík <vslavik@fastmail.fm>
Date: Wed, 8 Jan 2003 19:44:53 +0000 (+0000)
Subject: fixed ANSI/Unicode incompatibility of the cache (bug 663396)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d1a9c82bd1d01f51891aaa64b369767046752df5

fixed ANSI/Unicode incompatibility of the cache (bug 663396)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 8ebc82d3a5..256664f3f3 100644
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -339,7 +339,12 @@ inline static wxChar* CacheReadString(wxInputStream *f)
 #endif
 }
 
-#define CURRENT_CACHED_BOOK_VERSION     3
+#define CURRENT_CACHED_BOOK_VERSION     4
+
+// Additional flags to detect incompatibilities of the runtime environment:
+#define CACHED_BOOK_FORMAT_FLAGS \
+                     (wxUSE_UNICODE << 0)
+
 
 bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f)
 {
@@ -358,6 +363,9 @@ bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f)
         return FALSE;
     }
 
+    if (CacheReadInt32(f) != CACHED_BOOK_FORMAT_FLAGS)
+        return FALSE;
+
     /* load contents : */
     st = m_ContentsCnt;
     m_ContentsCnt += CacheReadInt32(f);
@@ -395,6 +403,7 @@ bool wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f)
 
     /* save header - version info : */
     CacheWriteInt32(f, CURRENT_CACHED_BOOK_VERSION);
+    CacheWriteInt32(f, CACHED_BOOK_FORMAT_FLAGS);
 
     /* save contents : */
     for (cnt = 0, i = 0; i < m_ContentsCnt; i++)