cast both ints to doubles for the X and Y scale factors

[wxWidgets.git] / src / html / chm.cpp

diff --git a/src/html/chm.cpp b/src/html/chm.cpp
index c0d24cdc01b5899576d8c28cb77e61a685e116ea..288305d60600e73ce2120ebdee455f30f106804d 100644 (file)
--- a/src/html/chm.cpp
+++ b/src/html/chm.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        chm.cpp
+// Name:        src/html/chm.cpp

 // Purpose:     CHM (Help) support for wxHTML
 // Author:      Markus Sinner
 // Copyright:   (c) 2003 Herd Software Development
 // Purpose:     CHM (Help) support for wxHTML
 // Author:      Markus Sinner
 // Copyright:   (c) 2003 Herd Software Development


@@ -10,19 +10,19 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_LIBMSPACK
 
 #include <mspack.h>
 
 #endif
 
 #if wxUSE_LIBMSPACK
 
 #include <mspack.h>
 

-#ifndef WXPRECOMP
-#include "wx/intl.h"
-#include "wx/log.h"
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/module.h"

 #include "wx/filesys.h"
 #include "wx/mstream.h"
 #include "wx/wfstream.h"
 #include "wx/filesys.h"
 #include "wx/mstream.h"
 #include "wx/wfstream.h"


@@ -70,7 +70,7 @@ public:
     /// check archive for a file
     bool Contains(const wxString& pattern);
 
     /// check archive for a file
     bool Contains(const wxString& pattern);
 

-    /// get a string for the last error occured
+    /// get a string for the last error which occurred

     const wxString GetLastErrorMessage();
 
     /// Last Error
     const wxString GetLastErrorMessage();
 
     /// Last Error


@@ -122,7 +122,7 @@ wxChmTools::wxChmTools(const wxFileName &archive)
     //     strdup() [libmspack-20030726], which would cause crashes in
     //     Unicode build when mb_str() returns temporary buffer
     m_chmFileNameANSI = strdup((const char*)m_chmFileName.mb_str(wxConvFile));
     //     strdup() [libmspack-20030726], which would cause crashes in
     //     Unicode build when mb_str() returns temporary buffer
     m_chmFileNameANSI = strdup((const char*)m_chmFileName.mb_str(wxConvFile));

-    
+

     // Open the archive and store it in class:
     if ( (chmh = chmd->open(chmd, (char*)m_chmFileNameANSI)) )
     {
     // Open the archive and store it in class:
     if ( (chmh = chmd->open(chmd, (char*)m_chmFileNameANSI)) )
     {


@@ -204,7 +204,7 @@ bool wxChmTools::Contains(const wxString& pattern)
  *
  * Finds the next file descibed by a pattern in the archive, starting
  * the file given by second parameter
  *
  * Finds the next file descibed by a pattern in the archive, starting
  * the file given by second parameter

- * 
+ *

  * @param pattern   The file-pattern to search for. May contain '*' and/or '?'
  * @param startfrom The filename which the search should start after
  * @returns         The full pathname of the found file
  * @param pattern   The file-pattern to search for. May contain '*' and/or '?'
  * @param startfrom The filename which the search should start after
  * @returns         The full pathname of the found file


@@ -364,7 +364,7 @@ public:
     wxChmInputStream(const wxString& archive,
                      const wxString& file, bool simulate = false);
     /// Destructor
     wxChmInputStream(const wxString& archive,
                      const wxString& file, bool simulate = false);
     /// Destructor

-    ~wxChmInputStream();
+    virtual ~wxChmInputStream();

 
     /// Return the size of the accessed file in archive
     virtual size_t GetSize() const { return m_size; }
 
     /// Return the size of the accessed file in archive
     virtual size_t GetSize() const { return m_size; }


@@ -377,13 +377,13 @@ protected:
     /// See wxInputStream
     virtual size_t OnSysRead(void *buffer, size_t bufsize);
     /// See wxInputStream
     /// See wxInputStream
     virtual size_t OnSysRead(void *buffer, size_t bufsize);
     /// See wxInputStream

-    virtual off_t OnSysSeek(off_t seek, wxSeekMode mode);
+    virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);

     /// See wxInputStream
     /// See wxInputStream

-    virtual off_t OnSysTell() const { return m_pos; }
+    virtual wxFileOffset OnSysTell() const { return m_pos; }

 
 private:
     size_t m_size;
 
 private:
     size_t m_size;

-    off_t m_pos;
+    wxFileOffset m_pos;

     bool m_simulateHHP;
 
     char * m_content;
     bool m_simulateHHP;
 
     char * m_content;


@@ -414,7 +414,7 @@ private:
  *                 be local file accesible via fopen, fread functions!
  * @param filename The Name of the file to be extracted from archive
  * @param simulate if true than class should simulate .HHP-File based on #SYSTEM
  *                 be local file accesible via fopen, fread functions!
  * @param filename The Name of the file to be extracted from archive
  * @param simulate if true than class should simulate .HHP-File based on #SYSTEM

- *                 if false than class does nothing if it doesnt find .hhp
+ *                 if false than class does nothing if it doesn't find .hhp

  */
 wxChmInputStream::wxChmInputStream(const wxString& archive,
                                    const wxString& filename, bool simulate)
  */
 wxChmInputStream::wxChmInputStream(const wxString& archive,
                                    const wxString& filename, bool simulate)


@@ -501,7 +501,7 @@ size_t wxChmInputStream::OnSysRead(void *buffer, size_t bufsize)
 
 
 
 
 
 

-off_t wxChmInputStream::OnSysSeek(off_t seek, wxSeekMode mode)
+wxFileOffset wxChmInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)

 {
     wxString mode_str = wxEmptyString;
 
 {
     wxString mode_str = wxEmptyString;
 


@@ -512,7 +512,7 @@ off_t wxChmInputStream::OnSysSeek(off_t seek, wxSeekMode mode)
     }
     m_lasterror = wxSTREAM_NO_ERROR;
 
     }
     m_lasterror = wxSTREAM_NO_ERROR;
 

-    off_t nextpos;
+    wxFileOffset nextpos;

 
     switch ( mode )
     {
 
     switch ( mode )
     {


@@ -541,7 +541,7 @@ off_t wxChmInputStream::OnSysSeek(off_t seek, wxSeekMode mode)
 /**
  * Help Browser tries to read the contents of the
  * file by interpreting a .hhp file in the Archiv.
 /**
  * Help Browser tries to read the contents of the
  * file by interpreting a .hhp file in the Archiv.

- * For .chm doesnt include such a file, we need
+ * For .chm doesn't include such a file, we need

  * to rebuild the information based on stored
  * system-files.
  */
  * to rebuild the information based on stored
  * system-files.
  */


@@ -561,7 +561,7 @@ wxChmInputStream::CreateHHPStream()
     if ( ! m_chm->Contains(_T("/#SYSTEM")) )
     {
 #ifdef DEBUG
     if ( ! m_chm->Contains(_T("/#SYSTEM")) )
     {
 #ifdef DEBUG

-        wxLogDebug(_("Archive doesnt contain #SYSTEM file"));
+        wxLogDebug("Archive doesn't contain #SYSTEM file");

 #endif
         return;
     }
 #endif
         return;
     }


@@ -595,7 +595,9 @@ wxChmInputStream::CreateHHPStream()
         {
             // Read #SYSTEM-Code and length
             i->Read(&code, 2);
         {
             // Read #SYSTEM-Code and length
             i->Read(&code, 2);

+            code = wxUINT16_SWAP_ON_BE( code ) ;

             i->Read(&len, 2);
             i->Read(&len, 2);

+            len = wxUINT16_SWAP_ON_BE( len ) ;

             // data
             buf = malloc(len);
             i->Read(buf, len);
             // data
             buf = malloc(len);
             i->Read(buf, len);


@@ -625,7 +627,19 @@ wxChmInputStream::CreateHHPStream()
                     out->Write( (const void *) tmp, strlen(tmp));
                     tmp = NULL;
                     break;
                     out->Write( (const void *) tmp, strlen(tmp));
                     tmp = NULL;
                     break;

-                case 4: // STRUCT
+                case 4: // STRUCT SYSTEM INFO
+                    tmp = NULL ;
+                    if ( len >= 28 )
+                    {
+                        char *structptr = (char*) buf ;
+                        // LCID at position 0
+                        wxUint32 dummy = *((wxUint32 *)(structptr+0)) ;
+                        wxUint32 lcid = wxUINT32_SWAP_ON_BE( dummy ) ;
+                        wxString msg ;
+                        msg.Printf(_T("Language=0x%X\r\n"),lcid) ;
+                        out->Write(msg.c_str() , msg.length() ) ;
+                    }
+                    break ;

                 default:
                     tmp=NULL;
             }
                 default:
                     tmp=NULL;
             }


@@ -682,7 +696,7 @@ wxChmInputStream::CreateHHPStream()
 bool wxChmInputStream::CreateFileStream(const wxString& pattern)
 {
     wxFileInputStream * fin;
 bool wxChmInputStream::CreateFileStream(const wxString& pattern)
 {
     wxFileInputStream * fin;

-    wxString tmpfile = wxFileName::CreateTempFileName(_T("chmstrm"), NULL);
+    wxString tmpfile = wxFileName::CreateTempFileName(_T("chmstrm"));

 
     if ( tmpfile.empty() )
     {
 
     if ( tmpfile.empty() )
     {


@@ -729,15 +743,15 @@ class wxChmFSHandler : public wxFileSystemHandler
 public:
     /// Constructor and Destructor
     wxChmFSHandler();
 public:
     /// Constructor and Destructor
     wxChmFSHandler();

-    ~wxChmFSHandler();
+    virtual ~wxChmFSHandler();

 
     /// Is able to open location?
     virtual bool CanOpen(const wxString& location);
     /// Open a file
     virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
 
     /// Is able to open location?
     virtual bool CanOpen(const wxString& location);
     /// Open a file
     virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);

-    /// Find first occurence of spec
+    /// Find first occurrence of spec

     virtual wxString FindFirst(const wxString& spec, int flags = 0);
     virtual wxString FindFirst(const wxString& spec, int flags = 0);

-    /// Find next occurence of spec
+    /// Find next occurrence of spec

     virtual wxString FindNext();
 
 private:
     virtual wxString FindNext();
 
 private:


@@ -811,13 +825,11 @@ wxFSFile* wxChmFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
     // Open a stream to read the content of the chm-file
     s = new wxChmInputStream(leftFilename.GetFullPath(), right, true);
 
     // Open a stream to read the content of the chm-file
     s = new wxChmInputStream(leftFilename.GetFullPath(), right, true);
 

-    wxString mime = GetMimeTypeFromExt(location);
-

     if ( s )
     {
         return new wxFSFile(s,
                             left + _T("#chm:") + right,
     if ( s )
     {
         return new wxFSFile(s,
                             left + _T("#chm:") + right,

-                            mime,
+                            wxEmptyString,

                             GetAnchor(location),
                             wxDateTime(wxFileModificationTime(left)));
     }
                             GetAnchor(location),
                             wxDateTime(wxFileModificationTime(left)));
     }