Delete the svn:executable property and set svn:eol-style to native for all those text files.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18012 a1c6a512-1295-4272-9138-f99709370657

142 files changed, 33915 insertions, 33915 deletions

diff --git a/utils/zenutils/CMakeLists.txt b/utils/zenutils/CMakeLists.txt
index 32798747cd..0983d394a7 100755..100644
--- a/utils/zenutils/CMakeLists.txt
+++ b/utils/zenutils/CMakeLists.txt
@@ -1,13 +1,13 @@
-PROJECT(zenutils)

-

-SET(EXECUTABLE_OUTPUT_PATH ${zenutils_SOURCE_DIR}/bin/${CMAKE_SYSTEM_NAME})

-

-SUBDIRS(source libraries)

-

-INCLUDE_DIRECTORIES(

-  ${zenutils_SOURCE_DIR}/libraries/beecrypt-4.1.2

-  ${zenutils_SOURCE_DIR}/libraries/getpot-c++-1.1.17

-  ${zenutils_SOURCE_DIR}/libraries/pelib-0.9

-  ${zenutils_SOURCE_DIR}/libraries/zlib123

-  ${zenutils_SOURCE_DIR}/source/shared

-)

+PROJECT(zenutils)
+
+SET(EXECUTABLE_OUTPUT_PATH ${zenutils_SOURCE_DIR}/bin/${CMAKE_SYSTEM_NAME})
+
+SUBDIRS(source libraries)
+
+INCLUDE_DIRECTORIES(
+  ${zenutils_SOURCE_DIR}/libraries/beecrypt-4.1.2
+  ${zenutils_SOURCE_DIR}/libraries/getpot-c++-1.1.17
+  ${zenutils_SOURCE_DIR}/libraries/pelib-0.9
+  ${zenutils_SOURCE_DIR}/libraries/zlib123
+  ${zenutils_SOURCE_DIR}/source/shared
+)
diff --git a/utils/zenutils/COPYING b/utils/zenutils/COPYING
index d511905c16..d511905c16 100755..100644
--- a/utils/zenutils/COPYING
+++ b/utils/zenutils/COPYING
diff --git a/utils/zenutils/libraries/CMakeLists.txt b/utils/zenutils/libraries/CMakeLists.txt
index 19297d7a2e..82f5824c81 100755..100644
--- a/utils/zenutils/libraries/CMakeLists.txt
+++ b/utils/zenutils/libraries/CMakeLists.txt
@@ -1,3 +1,3 @@
-ADD_SUBDIRECTORY(beecrypt-4.1.2)

-ADD_SUBDIRECTORY(pelib-0.9)

-ADD_SUBDIRECTORY(zlib123)

+ADD_SUBDIRECTORY(beecrypt-4.1.2)
+ADD_SUBDIRECTORY(pelib-0.9)
+ADD_SUBDIRECTORY(zlib123)
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/CMakeLists.txt b/utils/zenutils/libraries/beecrypt-4.1.2/CMakeLists.txt
index 83836af99d..7044ec090a 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/CMakeLists.txt
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/CMakeLists.txt
@@ -1,14 +1,14 @@
-PROJECT(beecrypt)

-

-# source files for beecrypt

-SET(beecrypt_srcs

-  beecrypt/blockmode.c

-  beecrypt/blowfish.c

-  beecrypt/endianness.c

-  beecrypt/hmac.c

-  beecrypt/hmacsha1.c

-  beecrypt/mp.c

-  beecrypt/sha1.c

-)

-

-ADD_LIBRARY(beecrypt ${beecrypt_srcs})

+PROJECT(beecrypt)
+
+# source files for beecrypt
+SET(beecrypt_srcs
+  beecrypt/blockmode.c
+  beecrypt/blowfish.c
+  beecrypt/endianness.c
+  beecrypt/hmac.c
+  beecrypt/hmacsha1.c
+  beecrypt/mp.c
+  beecrypt/sha1.c
+)
+
+ADD_LIBRARY(beecrypt ${beecrypt_srcs})
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/AUTHORS b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/AUTHORS
index 878abf5a3f..878abf5a3f 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/AUTHORS
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/AUTHORS
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/BENCHMARKS b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/BENCHMARKS
index 7919f340db..7919f340db 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/BENCHMARKS
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/BENCHMARKS
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/BUGS b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/BUGS
index 577c5adac5..577c5adac5 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/BUGS
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/BUGS
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/CONTRIBUTORS b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/CONTRIBUTORS
index 7f61011475..7f61011475 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/CONTRIBUTORS
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/CONTRIBUTORS
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/COPYING b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/COPYING
index a6d7d0188a..a6d7d0188a 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/COPYING
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/COPYING
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/COPYING.LIB b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/COPYING.LIB
index 223ede7de3..223ede7de3 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/COPYING.LIB
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/COPYING.LIB
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/ChangeLog b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/ChangeLog
index e69de29bb2..e69de29bb2 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/ChangeLog
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/ChangeLog
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/INSTALL b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/INSTALL
index bca44d042e..bca44d042e 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/INSTALL
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/INSTALL
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/NEWS b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/NEWS
index 6c6bbd0175..6c6bbd0175 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/NEWS
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/NEWS
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/README b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/README
index d875372c39..d875372c39 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/README
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/README
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/README.DLL b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/README.DLL
index 2131f87ce2..2131f87ce2 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/README.DLL
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/README.DLL
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/README.WIN32 b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/README.WIN32
index 411116fea2..411116fea2 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/README.WIN32
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/README.WIN32
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/api.h b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/api.h
index f5ef7ff04a..f5ef7ff04a 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/api.h
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/api.h
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/beecrypt.h b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/beecrypt.h
index a4c8780d03..a4c8780d03 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/beecrypt.h
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/beecrypt.h
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blockmode.c b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blockmode.c
index cfccd43337..cfccd43337 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blockmode.c
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blockmode.c
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blockmode.h b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blockmode.h
index 4f21b81f65..4f21b81f65 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blockmode.h
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blockmode.h
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blowfish.c b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blowfish.c
index a8b801e6ec..a8b801e6ec 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blowfish.c
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blowfish.c
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blowfish.h b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blowfish.h
index 1d95ddb4f2..1d95ddb4f2 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blowfish.h
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blowfish.h
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blowfishopt.h b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blowfishopt.h
index f38db94b52..f38db94b52 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blowfishopt.h
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/blowfishopt.h
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/endianness.c b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/endianness.c
index 8a0999b63e..8a0999b63e 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/endianness.c
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/endianness.c
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/endianness.h b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/endianness.h
index e136aa59f9..e136aa59f9 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/endianness.h
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/endianness.h
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/gnu.h b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/gnu.h
index 18386ef997..18386ef997 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/gnu.h
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/gnu.h
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/hmac.c b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/hmac.c
index c28770a05b..c28770a05b 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/hmac.c
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/hmac.c
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/hmac.h b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/hmac.h
index 709bb079f0..709bb079f0 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/hmac.h
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/hmac.h
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/hmacsha1.c b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/hmacsha1.c
index f201a45f0f..f201a45f0f 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/hmacsha1.c
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/hmacsha1.c
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/hmacsha1.h b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/hmacsha1.h
index 207f5df37f..207f5df37f 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/hmacsha1.h
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/hmacsha1.h
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/memchunk.h b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/memchunk.h
index 4778b7ca89..4778b7ca89 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/memchunk.h
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/memchunk.h
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/mp.c b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/mp.c
index 82d272c17a..82d272c17a 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/mp.c
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/mp.c
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/mp.h b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/mp.h
index 57a3e6c502..57a3e6c502 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/mp.h
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/mp.h
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/mpnumber.h b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/mpnumber.h
index f42e82a80f..f42e82a80f 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/mpnumber.h
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/mpnumber.h
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/mpopt.h b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/mpopt.h
index 7ba66bb5f9..7ba66bb5f9 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/mpopt.h
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/mpopt.h
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/rsa.h b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/rsa.h
index dbb0e45412..dbb0e45412 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/rsa.h
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/rsa.h
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/sha1.c b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/sha1.c
index fe7c2cd8b4..fe7c2cd8b4 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/sha1.c
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/sha1.c
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/sha1.h b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/sha1.h
index a35c917fdd..a35c917fdd 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/sha1.h
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/sha1.h
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/sha1opt.h b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/sha1opt.h
index 62ea87718f..62ea87718f 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/sha1opt.h
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/sha1opt.h
diff --git a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/win.h b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/win.h
index d578085c29..d578085c29 100755..100644
--- a/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/win.h
+++ b/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/win.h
diff --git a/utils/zenutils/libraries/getpot-c++-1.1.17/getpot/GetPot b/utils/zenutils/libraries/getpot-c++-1.1.17/getpot/GetPot
index 0663880990..0663880990 100755..100644
--- a/utils/zenutils/libraries/getpot-c++-1.1.17/getpot/GetPot
+++ b/utils/zenutils/libraries/getpot-c++-1.1.17/getpot/GetPot
diff --git a/utils/zenutils/libraries/getpot-c++-1.1.17/getpot/LPGL.txt b/utils/zenutils/libraries/getpot-c++-1.1.17/getpot/LPGL.txt
index b1e3f5a263..b1e3f5a263 100755..100644
--- a/utils/zenutils/libraries/getpot-c++-1.1.17/getpot/LPGL.txt
+++ b/utils/zenutils/libraries/getpot-c++-1.1.17/getpot/LPGL.txt
diff --git a/utils/zenutils/libraries/getpot-c++-1.1.17/getpot/README b/utils/zenutils/libraries/getpot-c++-1.1.17/getpot/README
index 3d55352a6b..3d55352a6b 100755..100644
--- a/utils/zenutils/libraries/getpot-c++-1.1.17/getpot/README
+++ b/utils/zenutils/libraries/getpot-c++-1.1.17/getpot/README
diff --git a/utils/zenutils/libraries/getpot-c++-1.1.17/getpot/getpot.hpp b/utils/zenutils/libraries/getpot-c++-1.1.17/getpot/getpot.hpp
index fe820c91a2..9986d17893 100755..100644
--- a/utils/zenutils/libraries/getpot-c++-1.1.17/getpot/getpot.hpp
+++ b/utils/zenutils/libraries/getpot-c++-1.1.17/getpot/getpot.hpp
@@ -1,2435 +1,2435 @@
-//  -*- c++ -*-

-//  GetPot Version $$Version$$                                    $$Date$$

-//

-//  WEBSITE: http://getpot.sourceforge.net

-//

-//  NOTE: The LPGL License for this library is only valid in case that 

-//        it is not used for the production or development of applications

-//        dedicated to military industry. This is what the author calls

-//        the 'unofficial peace version of the LPGL'.

-//

-//  This library is  free software; you can redistribute  it and/or modify

-//  it  under  the terms  of  the GNU  Lesser  General  Public License  as

-//  published by the  Free Software Foundation; either version  2.1 of the

-//  License, or (at your option) any later version.

-//

-//  This library  is distributed in the  hope that it will  be useful, but

-//  WITHOUT   ANY  WARRANTY;   without  even   the  implied   warranty  of

-//  MERCHANTABILITY  or FITNESS  FOR A  PARTICULAR PURPOSE.   See  the GNU

-//  Lesser General Public License for more details.

-//

-//  You  should have  received a  copy of  the GNU  Lesser  General Public

-//  License along  with this library; if  not, write to  the Free Software

-//  Foundation, Inc.,  59 Temple Place,  Suite 330, Boston,  MA 02111-1307

-//  USA

-//

-//  (C) 2001-2005 Frank R. Schaefer <fschaef@users.sf.net>

-//==========================================================================

-

-#ifndef __include_guard_GETPOT_H__

-#define __include_guard_GETPOT_H__

-

-#if defined(WIN32) || defined(SOLARIS_RAW) || (__GNUC__ == 2) || defined(__HP_aCC)

-#define strtok_r(a, b, c) strtok(a, b)

-#endif // WINDOWS or SOLARIS or gcc 2.* or HP aCC

-

-extern "C" {

-//   leave the 'extern C' to make it 100% sure to work -

-//   expecially with older distributions of header files.

-#ifndef WIN32

-// this is necessary (depending on OS)

-#include <ctype.h>

-#endif

-#include <stdio.h>

-#include <stdarg.h>

-#include <assert.h>

-}

-#include <cmath>

-#include <string>

-#include <vector>

-#include <algorithm>

-

-#include <fstream>

-#include <iostream> // not every compiler distribution includes <iostream> 

-//                  // with <fstream>

-

-typedef  std::vector<std::string>  STRING_VECTOR;

-

-#define victorate(TYPE, VARIABLE, ITERATOR)                        \

-  std::vector<TYPE>::const_iterator ITERATOR = (VARIABLE).begin(); \

-  for(; (ITERATOR) != (VARIABLE).end(); (ITERATOR)++)

-

-

-class GetPot {

-    //--------

-    inline void __basic_initialization();

-public:

-    // (*) constructors, destructor, assignment operator -----------------------

-    inline GetPot();

-    inline GetPot(const GetPot&);

-    inline GetPot(const int argc_, char** argv_, 

-                  const char* FieldSeparator=0x0);

-    inline GetPot(const char* FileName, 

-                  const char* CommentStart=0x0, const char* CommentEnd=0x0,

-                  const char* FieldSeparator=0x0);

-    inline ~GetPot();

-    inline GetPot& operator=(const GetPot&);

-

-

-    // (*) absorbing contents of another GetPot object

-    inline void            absorb(const GetPot& That);

-    //     -- for ufo detection: recording requested arguments, options etc.

-    inline void            clear_requests();

-    inline void            disable_request_recording() { __request_recording_f = false; }

-    inline void            enable_request_recording()  { __request_recording_f = true; }

-

-    // (*) direct access to command line arguments -----------------------------

-    inline const std::string    operator[](unsigned Idx) const;

-    inline int                  get(unsigned Idx, int           Default) const;

-    inline double               get(unsigned Idx, const double& Default) const;

-    inline const std::string    get(unsigned Idx, const char*   Default) const;

-    inline unsigned             size() const;

-

-    // (*) flags ---------------------------------------------------------------

-    inline bool            options_contain(const char* FlagList) const;

-    inline bool            argument_contains(unsigned Idx, const char* FlagList) const;

-

-    // (*) variables -----------------------------------------------------------

-    //     -- scalar values

-    inline int                operator()(const char* VarName, int           Default) const;

-    inline double             operator()(const char* VarName, const double& Default) const;

-    inline const std::string  operator()(const char* VarName, const char*   Default) const;

-    //     -- vectors

-    inline int                operator()(const char* VarName, int Default, unsigned Idx) const;

-    inline double             operator()(const char* VarName, const double& Default, unsigned Idx) const;

-    inline const std::string  operator()(const char* VarName, const char* Default, unsigned Idx) const;

-

-    //     -- setting variables

-    //                  i) from outside of GetPot (considering prefix etc.)

-    //                  ii) from inside, use '__set_variable()' below

-    inline void            set(const char* VarName, const char* Value, const bool Requested = true);

-    inline void            set(const char* VarName, const double& Value, const bool Requested = true);

-    inline void            set(const char* VarName, const int Value, const bool Requested = true);

-    

-    inline unsigned        vector_variable_size(const char* VarName) const;

-    inline STRING_VECTOR   get_variable_names() const;

-    inline STRING_VECTOR   get_section_names() const;

-    

-

-    // (*) cursor oriented functions -------------------------------------------

-    inline void            set_prefix(const char* Prefix) { prefix = std::string(Prefix); }

-    inline bool            search_failed() const { return search_failed_f; }

-

-    //     -- enable/disable search for an option in loop

-    inline void            disable_loop() { search_loop_f = false; }

-    inline void            enable_loop()  { search_loop_f = true; }

-

-    //     -- reset cursor to position '1'

-    inline void            reset_cursor();

-    inline void            init_multiple_occurrence();

-

-    //     -- search for a certain option and set cursor to position

-    inline bool            search(const char* option);

-    inline bool            search(unsigned No, const char* P, ...);

-    //     -- get argument at cursor++

-    inline int                next(int           Default);

-    inline double             next(const double& Default);

-    inline const std::string  next(const char*   Default);

-    //     -- search for option and get argument at cursor++

-    inline int                follow(int           Default, const char* Option);

-    inline double             follow(const double& Default, const char* Option);

-    inline const std::string  follow(const char*   Default, const char* Option);

-    //     -- search for one of the given options and get argument that follows it

-    inline int                follow(int           Default, unsigned No, const char* Option, ...);

-    inline double             follow(const double& Default, unsigned No, const char* Option, ...);

-    inline const std::string  follow(const char*   Default, unsigned No, const char* Option, ...);

-    //     -- lists of nominuses following an option

-    inline std::vector<std::string> nominus_followers(const char* Option);

-    inline std::vector<std::string> nominus_followers(unsigned No, ...);

-

-    //     -- directly followed arguments

-    inline int                direct_follow(int           Default, const char* Option);

-    inline double             direct_follow(const double& Default, const char* Option);

-    inline const std::string  direct_follow(const char*   Default, const char* Option);

-

-    inline std::vector<std::string>  string_tails(const char* StartString);

-    inline std::vector<int>          int_tails(const char* StartString, const int Default = 1);

-    inline std::vector<double>       double_tails(const char* StartString, const double Default = 1.0);

-

-    // (*) nominus arguments ---------------------------------------------------

-    inline STRING_VECTOR   nominus_vector() const;

-    inline unsigned        nominus_size() const  { return static_cast<unsigned int>(idx_nominus.size()); }

-    inline std::string     next_nominus();

-

-    // (*) unidentified flying objects -----------------------------------------

-    inline STRING_VECTOR   unidentified_arguments(unsigned Number, const char* Known, ...) const;

-    inline STRING_VECTOR   unidentified_arguments(const STRING_VECTOR& Knowns) const;

-    inline STRING_VECTOR   unidentified_arguments() const;

-

-    inline STRING_VECTOR   unidentified_options(unsigned Number, const char* Known, ...) const;

-    inline STRING_VECTOR   unidentified_options(const STRING_VECTOR& Knowns) const;

-    inline STRING_VECTOR   unidentified_options() const;

-

-    inline std::string     unidentified_flags(const char* Known,

-                                             int ArgumentNumber /* =-1 */) const;

-

-    inline STRING_VECTOR   unidentified_variables(unsigned Number, const char* Known, ...) const;

-    inline STRING_VECTOR   unidentified_variables(const STRING_VECTOR& Knowns) const;

-    inline STRING_VECTOR   unidentified_variables() const;

-

-    inline STRING_VECTOR   unidentified_sections(unsigned Number, const char* Known, ...) const;

-    inline STRING_VECTOR   unidentified_sections(const STRING_VECTOR& Knowns) const;

-    inline STRING_VECTOR   unidentified_sections() const;

-

-    inline STRING_VECTOR   unidentified_nominuses(unsigned Number, const char* Known, ...) const;

-    inline STRING_VECTOR   unidentified_nominuses(const STRING_VECTOR& Knowns) const;

-    inline STRING_VECTOR   unidentified_nominuses() const;

-

-    // (*) output --------------------------------------------------------------

-    inline int print() const;

-

-private:

-    // (*) Type Declaration ----------------------------------------------------

-    struct variable {

-        //-----------

-        // Variable to be specified on the command line or in input files.

-        // (i.e. of the form var='12 312 341')

-

-        // -- constructors, destructors, assignment operator

-        variable();

-        variable(const variable&);

-        variable(const char* Name, const char* Value, const char* FieldSeparator);

-        ~variable();

-        variable& operator=(const variable& That);

-

-        void      take(const char* Value, const char* FieldSeparator);

-

-        // -- get a specific element in the string vector

-        //    (return 0 if not present)

-        const std::string*  get_element(unsigned Idx) const;

-

-        // -- data memebers

-        std::string       name;      // identifier of variable

-        STRING_VECTOR     value;     // value of variable stored in vector

-        std::string       original;  // value of variable as given on command line

-    };

-

-    // (*) member variables --------------------------------------------------------------

-    std::string           prefix;          // prefix automatically added in queries

-    std::string           section;         // (for dollar bracket parsing)

-    STRING_VECTOR         section_list;    // list of all parsed sections

-    //     -- argument vector

-    STRING_VECTOR         argv;            // vector of command line arguments stored as strings

-    unsigned              cursor;          // cursor for argv

-    bool                  search_loop_f;   // shall search start at beginning after

-    //                                     // reaching end of arg array ?

-    bool                  search_failed_f; // flag indicating a failed search() operation

-    //                                     // (e.g. next() functions react with 'missed')

-

-    //     --  nominus vector

-    int                   nominus_cursor;  // cursor for nominus_pointers

-    std::vector<unsigned> idx_nominus;     // indecies of 'no minus' arguments

-

-    //     -- variables

-    //       (arguments of the form "variable=value")

-    std::vector<variable> variables;

-    

-    //     -- comment delimiters

-    std::string           _comment_start;

-    std::string           _comment_end;

-

-    //     -- field separator (separating elements of a vector)

-    std::string           _field_separator;

-

-    //     -- some functions return a char pointer to a temporarily existing string

-    //        this container makes them 'available' until the getpot object is destroyed.

-    std::vector<char*>    __internal_string_container;

-

-    //     -- keeping track about arguments that are requested, so that the UFO detection

-    //        can be simplified

-    STRING_VECTOR   _requested_arguments;

-    STRING_VECTOR   _requested_variables;

-    STRING_VECTOR   _requested_sections;

-

-    bool            __request_recording_f;   // speed: request recording can be turned off

-

-    //     -- if an argument is requested record it and the 'tag' the section branch to which 

-    //        it belongs. Caution: both functions mark the sections as 'tagged'.

-    void                      __record_argument_request(const std::string& Arg);

-    void                      __record_variable_request(const std::string& Arg);

-

-    // (*) helper functions ----------------------------------------------------

-    //                  set variable from inside GetPot (no prefix considered)

-    inline void               __set_variable(const char* VarName, const char* Value);

-

-    //     -- produce three basic data vectors:

-    //          - argument vector

-    //          - nominus vector

-    //          - variable dictionary

-    inline void               __parse_argument_vector(const STRING_VECTOR& ARGV);

-

-    //     -- helpers for argument list processing

-    //        * search for a variable in 'variables' array

-    inline const variable*    __find_variable(const char*) const;

-    //        * support finding directly followed arguments

-    inline const char*        __match_starting_string(const char* StartString);

-    //        * support search for flags in a specific argument

-    inline bool               __check_flags(const std::string& Str, const char* FlagList) const;

-    //        * type conversion if possible

-    inline int                __convert_to_type(const std::string& String, int Default) const;

-    inline double             __convert_to_type(const std::string& String, double Default) const;

-    //        * prefix extraction

-    const std::string         __get_remaining_string(const std::string& String, 

-                                                     const std::string& Start) const;

-    //        * search for a specific string

-    inline bool               __search_string_vector(const STRING_VECTOR& Vec,

-                                                     const std::string& Str) const;

-

-    //     -- helpers to parse input file

-    //        create an argument vector based on data found in an input file, i.e.:

-    //           1) delete comments (in between '_comment_start' '_comment_end')

-    //           2) contract assignment expressions, such as

-    //                   my-variable   =    '007 J. B.'

-    //             into

-    //                   my-variable='007 J. B.'

-    //           3) interprete sections like '[../my-section]' etc.

-    inline void               __skip_whitespace(std::istream& istr);

-    inline const std::string  __get_next_token(std::istream& istr);

-    inline const std::string  __get_string(std::istream& istr);

-    inline const std::string  __get_until_closing_bracket(std::istream& istr);

-

-    inline STRING_VECTOR      __read_in_stream(std::istream& istr);

-    inline STRING_VECTOR      __read_in_file(const char* FileName);

-    inline std::string        __process_section_label(const std::string& Section,

-                                                      STRING_VECTOR& section_stack);

-

-    //      -- dollar bracket expressions

-    std::string               __DBE_expand_string(const std::string str);

-    std::string               __DBE_expand(const std::string str);

-    const GetPot::variable*   __DBE_get_variable(const std::string str);

-    STRING_VECTOR             __DBE_get_expr_list(const std::string str, const unsigned ExpectedNumber);

-

-    std::string  __double2string(const double& Value) const {

-        // -- converts a double integer into a string

-        char* tmp = new char[128];

-#ifndef WIN32

-        snprintf(tmp, (int)sizeof(char)*128, "%e", Value);

-#else

-        _snprintf(tmp, sizeof(char)*128, "%e", Value);

-#endif

-        std::string result(tmp);

-        delete [] tmp;

-        return result;

-    }

-

-    std::string  __int2string(const int& Value) const {

-        // -- converts an integer into a string

-        char* tmp = new char[128];

-#ifndef WIN32

-        snprintf(tmp, (int)sizeof(char)*128, "%i", Value);

-#else

-        _snprintf(tmp, sizeof(char)*128, "%i", Value);

-#endif

-        std::string result(tmp);

-        delete [] tmp;

-        return result;

-    }

-

-    STRING_VECTOR __get_section_tree(const std::string& FullPath) {

-        // -- cuts a variable name into a tree of sub-sections. this is requested for recording

-        //    requested sections when dealing with 'ufo' detection.

-        STRING_VECTOR   result;

-        const char* Start = FullPath.c_str();

-

-        for(char *p = (char*)Start; *p ; p++) {

-            if( *p == '/' ) { 

-                *p = '\0';  // set terminating zero for convinience

-                const std::string Section = Start;

-                *p = '/';   // reset slash at place

-                result.push_back(Section);

-            }

-        }

-

-        return result;

-    }

-};

-

-

-///////////////////////////////////////////////////////////////////////////////

-// (*) constructors, destructor, assignment operator

-//.............................................................................

-//

-inline void

-GetPot::__basic_initialization()

-{

-    cursor = 0;              nominus_cursor = -1;

-    search_failed_f = true;  search_loop_f = true;

-    prefix = "";             section = "";

-    

-    // automatic request recording for later ufo detection

-    __request_recording_f = true;

-

-    // comment start and end strings

-    _comment_start = std::string("#");

-    _comment_end   = std::string("\n");

-

-    // default: separate vector elements by whitespaces

-    _field_separator = " \t\n";

-}

-

-inline

-GetPot::GetPot() 

-{ 

-    __basic_initialization(); 

-

-    STRING_VECTOR _apriori_argv;

-    _apriori_argv.push_back(std::string("Empty"));

-    __parse_argument_vector(_apriori_argv);

-}

-

-inline

-GetPot::GetPot(const int argc_, char ** argv_, 

-               const char* FieldSeparator /* =0x0 */)     

-    // leave 'char**' non-const to honor less capable compilers ... 

-{

-    // TODO: Ponder over the problem when the argument list is of size = 0.

-    //       This is 'sabotage', but it can still occur if the user specifies

-    //       it himself.

-    assert(argc_ >= 1);

-    __basic_initialization();

-

-    // if specified -> overwrite default string

-    if( FieldSeparator ) _field_separator = std::string(FieldSeparator);

-

-    // -- make an internal copy of the argument list:

-    STRING_VECTOR _apriori_argv;

-    // -- for the sake of clarity: we do want to include the first argument in the argument vector !

-    //    it will not be a nominus argument, though. This gives us a minimun vector size of one

-    //    which facilitates error checking in many functions. Also the user will be able to

-    //    retrieve the name of his application by "get[0]"

-    _apriori_argv.push_back(std::string(argv_[0]));

-    int i=1;

-    for(; i<argc_; ++i) {

-        std::string tmp(argv_[i]);   // recall the problem with temporaries,

-        _apriori_argv.push_back(tmp);       // reference counting in arguement lists ...

-    }

-    __parse_argument_vector(_apriori_argv);

-}

-

-

-inline

-GetPot::GetPot(const char* FileName,

-               const char* CommentStart  /* = 0x0 */, const char* CommentEnd /* = 0x0 */,

-               const char* FieldSeparator/* = 0x0 */)     

-{

-    __basic_initialization();

-

-    // if specified -> overwrite default strings

-    if( CommentStart )   _comment_start = std::string(CommentStart);

-    if( CommentEnd )     _comment_end   = std::string(CommentEnd);

-    if( FieldSeparator ) _field_separator = FieldSeparator;

-    

-    STRING_VECTOR _apriori_argv;

-    // -- file name is element of argument vector, however, it is not parsed for

-    //    variable assignments or nominuses.

-    _apriori_argv.push_back(std::string(FileName));

-

-    STRING_VECTOR args = __read_in_file(FileName);

-    _apriori_argv.insert(_apriori_argv.begin()+1, args.begin(), args.end());

-    __parse_argument_vector(_apriori_argv);

-}

-

-inline

-GetPot::GetPot(const GetPot& That)

-{ GetPot::operator=(That); }

-

-inline

-GetPot::~GetPot()

-{ 

-    // may be some return strings had to be created, delete now !

-    victorate(char*, __internal_string_container, it)

-        delete [] *it;  

-}

-

-inline GetPot&

-GetPot::operator=(const GetPot& That)

-{

-    if (&That == this) return *this;

-

-    _comment_start  = That._comment_start;

-    _comment_end    = That._comment_end;

-    argv            = That.argv;

-    variables       = That.variables;

-    prefix          = That.prefix;

-

-    cursor          = That.cursor;

-    nominus_cursor  = That.nominus_cursor;

-    search_failed_f = That.search_failed_f;

-

-    idx_nominus     = That.idx_nominus;

-    search_loop_f   = That.search_loop_f;

-

-    return *this;

-}

-

-

-inline void

-GetPot::absorb(const GetPot& That)

-{

-    if (&That == this) return;

-

-    STRING_VECTOR  __tmp(That.argv);

-

-    __tmp.erase(__tmp.begin());

-

-    __parse_argument_vector(__tmp);

-}

-

-inline void    

-GetPot::clear_requests()

-{

-    _requested_arguments.erase(_requested_arguments.begin(), _requested_arguments.end());

-    _requested_variables.erase(_requested_variables.begin(), _requested_variables.end());

-    _requested_sections.erase(_requested_sections.begin(), _requested_sections.end());

-}

-

-inline void

-GetPot::__parse_argument_vector(const STRING_VECTOR& ARGV)

-{

-    if( ARGV.size() == 0 ) return;

-

-    // build internal databases:

-    //   1) array with no-minus arguments (usually used as filenames)

-    //   2) variable assignments:

-    //             'variable name' '=' number | string

-    STRING_VECTOR                 section_stack;

-    STRING_VECTOR::const_iterator it = ARGV.begin();

-

-

-    section = "";

-

-    // -- do not parse the first argument, so that it is not interpreted a s a nominus or so.

-    argv.push_back(*it);

-    ++it;

-

-    // -- loop over remaining arguments

-    unsigned i=1;

-    for(; it != ARGV.end(); ++it, ++i) {

-        std::string arg = *it;

-

-        if( arg.length() == 0 ) continue;

-

-        // -- [section] labels

-        if( arg.length() > 1 && arg[0] == '[' && arg[arg.length()-1] == ']' ) {

-

-            // (*) sections are considered 'requested arguments'

-            if( __request_recording_f ) _requested_arguments.push_back(arg);

-            

-            const std::string Name = __DBE_expand_string(arg.substr(1, arg.length()-2));

-            section = __process_section_label(Name, section_stack);

-            // new section --> append to list of sections

-            if( find(section_list.begin(), section_list.end(), section) == section_list.end() )

-                if( section.length() != 0 ) section_list.push_back(section);

-            argv.push_back(arg);

-        }

-        else {

-            arg = section + __DBE_expand_string(arg);

-            argv.push_back(arg);

-        }

-

-        // -- separate array for nominus arguments

-        if( arg[0] != '-' ) idx_nominus.push_back(unsigned(i));

-

-        // -- variables: does arg contain a '=' operator ?

-        const char* p = arg.c_str();

-        for(; *p ; p++) {

-            if( *p == '=' ) {

-                // (*) record for later ufo detection

-                //     arguments carriying variables are always treated as 'requested' arguments. 

-                //     as a whole! That is 'x=4712' is  considered a requested argument.

-                //

-                //     unrequested variables have to be detected with the ufo-variable

-                //     detection routine.

-                if( __request_recording_f ) _requested_arguments.push_back(arg);

-

-                // set terminating 'zero' to treat first part as single string

-                // => arg (from start to 'p') = Name of variable

-                //    p+1     (until terminating zero) = value of variable

-                char* o = (char*)p++;

-                *o = '\0';                       // set temporary terminating zero

-                // __set_variable(...) 

-                // calls __find_variable(...) which registers the search

-                // temporarily disable this

-                const bool tmp = __request_recording_f;

-                __request_recording_f = false;

-                __set_variable(arg.c_str(), p);  // v-name = c_str() bis 'p', value = rest

-                __request_recording_f = tmp;

-                *o = '=';                        // reset the original '='

-                break;

-            }

-        }

-    }

-}

-

-

-inline STRING_VECTOR

-GetPot::__read_in_file(const char* FileName)

-{

-    std::ifstream  i(FileName);

-    if( ! i ) return STRING_VECTOR();

-    // argv[0] == the filename of the file that was read in

-    return __read_in_stream(i);

-}

-

-inline STRING_VECTOR

-GetPot::__read_in_stream(std::istream& istr)

-{

-    STRING_VECTOR  brute_tokens;

-    while(istr) {

-        __skip_whitespace(istr);

-

-        const std::string Token = __get_next_token(istr);

-        if( Token.length() == 0 || Token[0] == EOF) break;

-        brute_tokens.push_back(Token);

-    }

-

-    // -- reduce expressions of token1'='token2 to a single

-    //    string 'token1=token2'

-    // -- copy everything into 'argv'

-    // -- arguments preceded by something like '[' name ']' (section)

-    //    produce a second copy of each argument with a prefix '[name]argument'

-    unsigned i1 = 0;

-    unsigned i2 = 1;

-    unsigned i3 = 2;

-

-    STRING_VECTOR  arglist;

-    while( i1 < brute_tokens.size() ) {

-        const std::string& SRef = brute_tokens[i1];

-        // 1) concatinate 'abcdef' '=' 'efgasdef' to 'abcdef=efgasdef'

-        // note: java.lang.String: substring(a,b) = from a to b-1

-        //        C++ string:      substr(a,b)    = from a to a + b

-        if( i2 < brute_tokens.size() && brute_tokens[i2] == "=" ) {

-            if( i3 >= brute_tokens.size() )

-                arglist.push_back(brute_tokens[i1] + brute_tokens[i2]);

-            else

-                arglist.push_back(brute_tokens[i1] + brute_tokens[i2] + brute_tokens[i3]);

-            i1 = i3+1; i2 = i3+2; i3 = i3+3;

-            continue;

-        }

-        else {

-            arglist.push_back(SRef);

-            i1=i2; i2=i3; i3++;

-        }

-    }

-    return arglist;

-}

-

-inline void

-GetPot::__skip_whitespace(std::istream& istr)

-    // find next non-whitespace while deleting comments

-{

-    int tmp = istr.get();

-    do {

-        // -- search a non whitespace

-        while( isspace(tmp) ) {

-            tmp = istr.get();

-            if( ! istr ) return;

-        }

-

-        // -- look if characters match the comment starter string

-        const std::istream::pos_type  Pos = istr.tellg();

-        unsigned    i=0;

-        for(; i<_comment_start.length() ; ++i) {

-            if( tmp != _comment_start[i] ) { 

-// HACK: The following line throws off msvc8:

-//              istr.seekg(Pos);

-                // -- one step more backwards, since 'tmp' already at non-whitespace

-                istr.unget();

-                return; 

-            }

-            tmp = istr.get();

-            if( ! istr ) { istr.unget(); return; }

-        }

-        // 'tmp' contains last character of _comment_starter

-

-        // -- comment starter found -> search for comment ender

-        unsigned match_no=0;

-        while(1+1 == 2) {

-            tmp = istr.get();

-            if( ! istr ) { istr.unget(); return; }

-

-            if( tmp == _comment_end[match_no] ) { 

-                match_no++;

-                if( match_no == _comment_end.length() ) {

-                    istr.unget();

-                    break; // shuffle more whitespace, end of comment found

-                }

-            }

-            else

-                match_no = 0;

-        }

-

-        tmp = istr.get();

-

-    } while( istr );

-    istr.unget();

-}

-

-inline const std::string

-GetPot::__get_next_token(std::istream& istr)

-    // get next concatinates string token. consider quotes that embrace

-    // whitespaces

-{

-    std::string token;

-    int    tmp = 0;

-    int    last_letter = 0;

-    while(1+1 == 2) {

-        last_letter = tmp; tmp = istr.get();

-        if( tmp == EOF

-            || ((tmp == ' ' || tmp == '\t' || tmp == '\n') && last_letter != '\\') ) {

-            return token;

-        }

-        else if( tmp == '\'' && last_letter != '\\' ) {

-            // QUOTES: un-backslashed quotes => it's a string

-            token += __get_string(istr);

-            continue;

-        }

-        else if( tmp == '{' && last_letter == '$') {

-            token += '{' + __get_until_closing_bracket(istr);

-            continue;

-        }

-        else if( tmp == '$' && last_letter == '\\') {

-            token += tmp; tmp = 0;  //  so that last_letter will become = 0, not '$';

-            continue;

-        }

-        else if( tmp == '\\' && last_letter != '\\')

-            continue;              // don't append un-backslashed backslashes

-        token += tmp;

-    }

-}

-

-inline const std::string

-GetPot::__get_string(std::istream& istr)

-    // parse input until next matching '

-{

-    std::string str;

-    int    tmp = 0;

-    int    last_letter = 0;

-    while(1 + 1 == 2) {

-        last_letter = tmp; tmp = istr.get();

-        if( tmp == EOF)  return str;

-        // un-backslashed quotes => it's the end of the string

-        else if( tmp == '\'' && last_letter != '\\')  return str;

-        else if( tmp == '\\' && last_letter != '\\')  continue; // don't append

-

-        str += tmp;

-    }

-}

-

-inline const std::string

-GetPot::__get_until_closing_bracket(std::istream& istr)

-    // parse input until next matching }

-{

-    std::string str = "";

-    int    tmp = 0;

-    int    last_letter = 0;

-    int    brackets = 1;

-    while(1 + 1 == 2) {

-        last_letter = tmp; tmp = istr.get();

-        if( tmp == EOF) return str;

-        else if( tmp == '{' && last_letter == '$') brackets += 1;

-        else if( tmp == '}') {

-            brackets -= 1;

-            // un-backslashed brackets => it's the end of the string

-            if( brackets == 0) return str + '}';

-            else if( tmp == '\\' && last_letter != '\\')

-                continue;  // do not append an unbackslashed backslash

-        }

-        str += tmp;

-    }

-}

-

-inline std::string

-GetPot::__process_section_label(const std::string& Section,

-                                STRING_VECTOR& section_stack)

-{

-    std::string sname = Section;

-    //  1) subsection of actual section ('./' prefix)

-    if( sname.length() >= 2 && sname.substr(0, 2) == "./" ) {

-        sname = sname.substr(2);

-    }

-    //  2) subsection of parent section ('../' prefix)

-    else if( sname.length() >= 3 && sname.substr(0, 3) == "../" ) {

-        do {

-            if( section_stack.end() != section_stack.begin() )

-                section_stack.pop_back();

-            sname = sname.substr(3);

-        } while( sname.substr(0, 3) == "../" );

-    }

-    // 3) subsection of the root-section

-    else {

-        section_stack.erase(section_stack.begin(), section_stack.end());

-        // [] => back to root section

-    }

-

-    if( sname != "" ) {

-        // parse section name for 'slashes'

-        unsigned i=0;

-        while( i < sname.length() ) {

-            if( sname[i] == '/' ) {

-                section_stack.push_back(sname.substr(0,i));

-                if( i+1 < sname.length()-1 )

-                    sname = sname.substr(i+1);

-                i = 0;

-            }

-            else

-                ++i;

-        }

-        section_stack.push_back(sname);

-    }

-    std::string section = "";

-    if( section_stack.size() != 0 ) {

-        victorate(std::string, section_stack, it)

-            section += *it + "/";

-    }

-    return section;

-}

-

-

-// convert string to DOUBLE, if not possible return Default

-inline double

-GetPot::__convert_to_type(const std::string& String, double Default) const

-{

-    double tmp;

-    if( sscanf(String.c_str(),"%lf", &tmp) != 1 ) return Default;

-    return tmp;

-}

-

-// convert string to INT, if not possible return Default

-inline int

-GetPot::__convert_to_type(const std::string& String, int Default) const

-{

-    // NOTE: intermediate results may be floating points, so that the string

-    //       may look like 2.0e1 (i.e. float format) => use float conversion

-    //       in any case.

-    return (int)__convert_to_type(String, (double)Default);

-}

-

-//////////////////////////////////////////////////////////////////////////////

-// (*) cursor oriented functions

-//.............................................................................

-inline const std::string

-GetPot::__get_remaining_string(const std::string& String, const std::string& Start) const

-    // Checks if 'String' begins with 'Start' and returns the remaining String.

-    // Returns None if String does not begin with Start.

-{

-    if( Start == "" ) return String;

-    // note: java.lang.String: substring(a,b) = from a to b-1

-    //        C++ string:      substr(a,b)    = from a to a + b

-    if( String.find(Start) == 0 ) return String.substr(Start.length());

-    else                          return "";

-}

-

-//     -- search for a certain argument and set cursor to position

-inline bool

-GetPot::search(const char* Option)

-{    

-    unsigned           OldCursor  = cursor;

-    const std::string  SearchTerm = prefix + Option;

-

-    // (*) record requested arguments for later ufo detection

-    __record_argument_request(SearchTerm);                             

-

-    if( OldCursor >= argv.size() ) OldCursor = static_cast<unsigned int>(argv.size()) - 1;

-    search_failed_f = true;

-

-    // (*) first loop from cursor position until end

-    unsigned  c = cursor;

-    for(; c < argv.size(); c++) {

-        if( argv[c] == SearchTerm )

-        { cursor = c; search_failed_f = false; return true; }

-    }

-    if( ! search_loop_f ) return false;

-

-    // (*) second loop from 0 to old cursor position

-    for(c = 1; c < OldCursor; c++) {

-        if( argv[c] == SearchTerm )

-        { cursor = c; search_failed_f = false; return true; }

-    }

-    // in case nothing is found the cursor stays where it was

-    return false;

-}

-

-

-inline bool

-GetPot::search(unsigned No, const char* P, ...)

-{

-    // (*) recording the requested arguments happens in subroutine 'search'

-    if( No == 0 ) return false;

-

-    // search for the first argument

-    if( search(P) == true ) return true;

-

-    // start interpreting variable argument list

-    va_list ap;

-    va_start(ap, P);

-    unsigned i = 1;

-    for(; i < No; ++i) {

-        char* Opt = va_arg(ap, char *);

-        if( search(Opt) == true ) break;

-    }

-    

-    if( i < No ) {

-        ++i;

-        // loop was left before end of array --> hit but 

-        // make sure that the rest of the search terms is marked

-        // as requested.

-        for(; i < No; ++i) {

-            char* Opt = va_arg(ap, char *);

-            // (*) record requested arguments for later ufo detection

-            __record_argument_request(Opt);

-        }

-        va_end(ap);

-        return true;

-    }

-

-    va_end(ap);

-    // loop was left normally --> no hit

-    return false;

-}

-

-inline void

-GetPot::reset_cursor()

-{ search_failed_f = false; cursor = 0; }

-

-inline void

-GetPot::init_multiple_occurrence()

-{ disable_loop(); reset_cursor(); }

-///////////////////////////////////////////////////////////////////////////////

-// (*) direct access to command line arguments

-//.............................................................................

-//

-inline const std::string

-GetPot::operator[](unsigned idx) const

-{ return idx < argv.size() ? argv[idx] : ""; }

-

-inline int

-GetPot::get(unsigned Idx, int Default) const

-{

-    if( Idx >= argv.size() ) return Default;

-    return __convert_to_type(argv[Idx], Default);

-}

-

-inline double

-GetPot::get(unsigned Idx, const double& Default) const

-{

-    if( Idx >= argv.size() ) return Default;

-    return __convert_to_type(argv[Idx], Default);

-}

-

-inline const std::string

-GetPot::get(unsigned Idx, const char* Default) const

-{

-    if( Idx >= argv.size() ) return Default;

-    else                     return argv[Idx];

-}

-

-inline unsigned

-GetPot::size() const

-{ return static_cast<unsigned int>(argv.size()); }

-

-

-//     -- next() function group

-inline int

-GetPot::next(int Default)

-{

-    if( search_failed_f ) return Default;

-    cursor++;

-    if( cursor >= argv.size() )  

-    { cursor = static_cast<unsigned int>(argv.size()); return Default; }

-

-    // (*) record requested argument for later ufo detection

-    __record_argument_request(argv[cursor]);

-

-    const std::string Remain = __get_remaining_string(argv[cursor], prefix);

-

-    return Remain != "" ? __convert_to_type(Remain, Default) : Default;

-}

-

-inline double

-GetPot::next(const double& Default)

-{

-    if( search_failed_f ) return Default;

-    cursor++;

-

-    if( cursor >= argv.size() )

-    { cursor = static_cast<unsigned int>(argv.size()); return Default; }

-

-    // (*) record requested argument for later ufo detection

-    __record_argument_request(argv[cursor]);

-

-    std::string Remain = __get_remaining_string(argv[cursor], prefix);

-

-    return Remain != "" ? __convert_to_type(Remain, Default) : Default;

-}

-

-inline const std::string

-GetPot::next(const char* Default)

-{

-    if( search_failed_f ) return Default;

-    cursor++;

-

-    if( cursor >= argv.size() )

-    { cursor = static_cast<unsigned int>(argv.size()); return Default; }

-

-    // (*) record requested argument for later ufo detection

-    __record_argument_request(argv[cursor]);

-

-    const std::string Remain = __get_remaining_string(argv[cursor], prefix);

-

-    if( Remain == "" ) return Default;

-

-

-    // (*) function returns a pointer to a char array (inside Remain)

-    //     this array will be deleted, though after this function call.

-    //     To ensure propper functioning, create a copy inside *this

-    //     object and only delete it, when *this is deleted.

-    char* result = new char[Remain.length()+1];

-    strncpy(result, Remain.c_str(), Remain.length()+1);

-

-    // store the created string internally, delete if when object deleted

-    __internal_string_container.push_back(result);

-

-    return result;

-}

-

-//     -- follow() function group

-//        distinct option to be searched for

-inline int

-GetPot::follow(int Default, const char* Option)

-{

-    // (*) record requested of argument is entirely handled in 'search()' and 'next()'

-    if( search(Option) == false ) return Default;

-    return next(Default);

-}

-

-inline double

-GetPot::follow(const double& Default, const char* Option)

-{

-    // (*) record requested of argument is entirely handled in 'search()' and 'next()'

-    if( search(Option) == false ) return Default;

-    return next(Default);

-}

-

-inline const std::string

-GetPot::follow(const char* Default, const char* Option)

-{

-    // (*) record requested of argument is entirely handled in 'search()' and 'next()'

-    if( search(Option) == false ) return Default;

-    return next(Default);

-}

-

-//     -- second follow() function group

-//        multiple option to be searched for

-inline int

-GetPot::follow(int Default, unsigned No, const char* P, ...)

-{

-    // (*) record requested of argument is entirely handled in 'search()' and 'next()'

-    if( No == 0 ) return Default;

-    if( search(P) == true ) return next(Default);

-

-    va_list ap;

-    va_start(ap, P);

-    unsigned i=1;

-    for(; i<No; ++i) {

-        char* Opt = va_arg(ap, char *);

-        if( search(Opt) == true ) {

-            va_end(ap);

-            return next(Default);

-        }

-    }

-    va_end(ap);

-    return Default;

-}

-

-inline double

-GetPot::follow(const double& Default, unsigned No, const char* P, ...)

-{

-    // (*) record requested of argument is entirely handled in 'search()' and 'next()'

-    if( No == 0 ) return Default;

-    if( search(P) == true ) return next(Default);

-

-    va_list ap;

-    va_start(ap, P);

-    for(unsigned i=1; i<No; ++i) {

-        char* Opt = va_arg(ap, char *);

-        if( search(Opt) == true ) {

-            va_end(ap);

-            return next(Default);

-        }

-    }

-    va_end(ap);

-    return Default;

-}

-

-inline const std::string

-GetPot::follow(const char* Default, unsigned No, const char* P, ...)

-{

-    // (*) record requested of argument is entirely handled in 'search()' and 'next()'

-    if( No == 0 ) return Default;

-    if( search(P) == true ) return next(Default);

-

-    va_list ap;

-    va_start(ap, P);

-    unsigned i=1;

-    for(; i<No; ++i) {

-        char* Opt = va_arg(ap, char *);

-        if( search(Opt) == true ) {

-            va_end(ap);

-            return next(Default);

-        }

-    }

-    va_end(ap);

-    return Default;

-}

-

-

-///////////////////////////////////////////////////////////////////////////////

-// (*) lists of nominus following an option

-//.............................................................................

-//

-inline std::vector<std::string> 

-GetPot::nominus_followers(const char* Option)

-{

-    std::vector<std::string>  result_list;

-    if( search(Option) == false ) return result_list;

-    while( 1 + 1 == 2 ) {

-        ++cursor;

-        if( cursor >= argv.size() ) { 

-            cursor = argv.size() - 1;

-            return result_list;

-        }

-        if( argv[cursor].length() >= 1 ) {

-            if( argv[cursor][0] == '-' ) {

-                return result_list;

-            }

-            // -- record for later ufo-detection

-            __record_argument_request(argv[cursor]);

-            // -- append to the result list

-            result_list.push_back(argv[cursor]);

-        }

-    }

-}

-

-inline std::vector<std::string> 

-GetPot::nominus_followers(unsigned No, ...)

-{

-    std::vector<std::string>  result_list;

-    // (*) record requested of argument is entirely handled in 'search()' 

-    //     and 'nominus_followers()'

-    if( No == 0 ) return result_list;

-

-    va_list ap;

-    va_start(ap, No);   

-    for(unsigned i=0; i<No; ++i) {

-        char* Option = va_arg(ap, char *);

-        std::vector<std::string> tmp = nominus_followers(Option);

-        result_list.insert(result_list.end(), tmp.begin(), tmp.end());

-

-        // std::cerr << "option = '" << Option << "'" << std::endl;

-        // std::cerr << "length = " << tmp.size() << std::endl;

-        // std::cerr << "new result list = <";

-        // for(std::vector<std::string>::const_iterator it = result_list.begin();

-        //    it != result_list.end(); ++it) 

-        //    std::cerr << *it << ", ";

-        // std::cerr << ">\n";

-    }

-    va_end(ap);

-    return result_list;

-}

-

-

-///////////////////////////////////////////////////////////////////////////////

-// (*) directly connected options

-//.............................................................................

-//

-inline int

-GetPot::direct_follow(int Default, const char* Option)

-{

-    const char* FollowStr = __match_starting_string(Option);

-    if( FollowStr == 0x0 )  return Default;

-

-    // (*) record requested of argument for later ufo-detection

-    __record_argument_request(std::string(Option) + FollowStr);

-

-    if( ++cursor >= static_cast<unsigned int>(argv.size()) ) cursor = static_cast<unsigned int>(argv.size());

-    return __convert_to_type(FollowStr, Default);

-}

-

-inline double

-GetPot::direct_follow(const double& Default, const char* Option)

-{

-    const char* FollowStr = __match_starting_string(Option);

-    if( FollowStr == 0 )  return Default;

-

-    // (*) record requested of argument for later ufo-detection

-    __record_argument_request(std::string(Option) + FollowStr);

-

-    if( ++cursor >= static_cast<unsigned int>(argv.size()) ) cursor = static_cast<unsigned int>(argv.size());

-    return __convert_to_type(FollowStr, Default);

-}

-

-inline const std::string

-GetPot::direct_follow(const char* Default, const char* Option)

-{

-    if( search_failed_f ) return Default;

-    const char* FollowStr = __match_starting_string(Option);

-    if( FollowStr == 0 )  return Default;

-

-    // (*) record requested of argument for later ufo-detection

-    if( FollowStr ) __record_argument_request(std::string(Option) + FollowStr);

-

-    if( ++cursor >= static_cast<unsigned int>(argv.size()) ) cursor = static_cast<unsigned int>(argv.size());

-    return std::string(FollowStr);

-}

-

-inline std::vector<std::string>

-GetPot::string_tails(const char* StartString)

-{

-    std::vector<std::string>  result;

-    const unsigned            N = static_cast<unsigned int>(strlen(StartString));

-

-    std::vector<std::string>::iterator it = argv.begin();

-

-    unsigned idx = 0;

-    while( it != argv.end() ) {

-        // (*) does start string match the given option?

-        //     NO -> goto next option

-        if( strncmp(StartString, (*it).c_str(), N) != 0) { ++it; ++idx; continue; }

-

-        // append the found tail to the result vector

-        result.push_back((*it).substr(N));

-                

-        // adapt the nominus vector

-        std::vector<unsigned>::iterator nit = idx_nominus.begin();

-        for(; nit != idx_nominus.end(); ++nit) {

-            if( *nit == idx ) {

-                idx_nominus.erase(nit);

-                for(; nit != idx_nominus.end(); ++nit) *nit -= 1;

-                break;

-            }

-        }

-        

-        // erase the found option

-        argv.erase(it);

-

-        // 100% safe solution: set iterator back to the beginning.

-        // (normally, 'it--' would be enough, but who knows how the

-        // iterator is implemented and .erase() definitely invalidates

-        // the current iterator position.

-        if( argv.empty() ) break;

-        it = argv.begin();

-    }

-    cursor = 0;

-    nominus_cursor = -1;

-    return result;

-}

-

-inline std::vector<int>

-GetPot::int_tails(const char* StartString, const int Default /* = -1 */)

-{

-    std::vector<int>  result;

-    const unsigned    N = static_cast<unsigned int>(strlen(StartString));

-

-    std::vector<std::string>::iterator it = argv.begin();

-

-    unsigned idx = 0;

-    while( it != argv.end() ) {

-        // (*) does start string match the given option?

-        //     NO -> goto next option

-        if( strncmp(StartString, (*it).c_str(), N) != 0) { ++it; ++idx; continue; }

-            

-        // append the found tail to the result vector

-        result.push_back(__convert_to_type((*it).substr(N), Default));

-

-        // adapt the nominus vector

-        std::vector<unsigned>::iterator nit = idx_nominus.begin();

-        for(; nit != idx_nominus.end(); ++nit) {

-            if( *nit == idx ) {

-                idx_nominus.erase(nit);

-                for(; nit != idx_nominus.end(); ++nit) *nit -= 1;

-                break;

-            }

-        }

-

-        // erase the found option

-        argv.erase(it);

-        

-        // 100% safe solution: set iterator back to the beginning.

-        // (normally, 'it--' would be enough, but who knows how the

-        // iterator is implemented and .erase() definitely invalidates

-        // the current iterator position.

-        if( argv.empty() ) break;

-        it = argv.begin();

-    }

-    cursor = 0;

-    nominus_cursor = -1;

-    return result;

-}

-

-inline std::vector<double>

-GetPot::double_tails(const char*  StartString, 

-                     const double Default /* = -1.0 */)

-{

-    std::vector<double>  result;

-    const unsigned       N = static_cast<unsigned int>(strlen(StartString));

-

-    std::vector<std::string>::iterator it = argv.begin();

-    unsigned                           idx = 0;

-    while( it != argv.end() ) {

-        // (*) does start string match the given option?

-        //     NO -> goto next option

-        if( strncmp(StartString, (*it).c_str(), N) != 0) { ++it; ++idx; continue; }

-            

-        // append the found tail to the result vector

-        result.push_back(__convert_to_type((*it).substr(N), Default));

-

-        // adapt the nominus vector

-        std::vector<unsigned>::iterator nit = idx_nominus.begin();

-        for(; nit != idx_nominus.end(); ++nit) {

-            if( *nit == idx ) {

-                idx_nominus.erase(nit);

-                for(; nit != idx_nominus.end(); ++nit) *nit -= 1;

-                break;

-            }

-        }

-

-        // erase the found option

-        argv.erase(it);

-        

-        // 100% safe solution: set iterator back to the beginning.

-        // (normally, 'it--' would be enough, but who knows how the

-        // iterator is implemented and .erase() definitely invalidates

-        // the current iterator position.

-        if( argv.empty() ) break;

-        it = argv.begin();

-    }

-    cursor = 0;

-    nominus_cursor = -1;

-    return result;

-}

-

-

-

-

-

-inline const char*

-GetPot::__match_starting_string(const char* StartString)

-    // pointer  to the place where the string after

-    //          the match inside the found argument starts.

-    // 0        no argument matches the starting string.

-{

-    const unsigned N         = static_cast<unsigned int>(strlen(StartString));

-    unsigned       OldCursor = cursor;

-

-    if( OldCursor >= static_cast<unsigned int>(argv.size()) ) OldCursor = static_cast<unsigned int>(argv.size()) - 1;

-    search_failed_f = true;

-

-    // (*) first loop from cursor position until end

-    unsigned c = cursor;

-    for(; c < argv.size(); c++) {

-        if( strncmp(StartString, argv[c].c_str(), N) == 0)

-        { cursor = c; search_failed_f = false; return &(argv[c].c_str()[N]); }

-    }

-

-    if( ! search_loop_f ) return false;

-

-    // (*) second loop from 0 to old cursor position

-    for(c = 1; c < OldCursor; c++) {

-        if( strncmp(StartString, argv[c].c_str(), N) == 0)

-        { cursor = c; search_failed_f = false; return &(argv[c].c_str()[N]); }

-    }

-    return 0;

-}

-

-///////////////////////////////////////////////////////////////////////////////

-// (*) search for flags

-//.............................................................................

-//

-inline bool

-GetPot::options_contain(const char* FlagList) const

-{

-    // go through all arguments that start with a '-' (but not '--')

-    std::string str;

-    STRING_VECTOR::const_iterator it = argv.begin();

-    for(; it != argv.end(); ++it) {

-        str = __get_remaining_string(*it, prefix);

-

-        if( str.length() >= 2 && str[0] == '-' && str[1] != '-' )

-            if( __check_flags(str, FlagList) ) return true;

-    }

-    return false;

-}

-

-inline bool

-GetPot::argument_contains(unsigned Idx, const char* FlagList) const

-{

-    if( Idx >= argv.size() ) return false;

-

-    // (*) record requested of argument for later ufo-detection

-    //     an argument that is checked for flags is considered to be 'requested'

-    ((GetPot*)this)->__record_argument_request(argv[Idx]);

-

-    if( prefix == "" )

-        // search argument for any flag in flag list

-        return __check_flags(argv[Idx], FlagList);

-

-    // if a prefix is set, then the argument index is the index

-    //   inside the 'namespace'

-    // => only check list of arguments that start with prefix

-    unsigned no_matches = 0;

-    unsigned i=0;

-    for(; i<argv.size(); ++i) {

-        const std::string Remain = __get_remaining_string(argv[i], prefix);

-        if( Remain != "") {

-            no_matches += 1;

-            if( no_matches == Idx)

-                return __check_flags(Remain, FlagList);

-        }

-    }

-    // no argument in this namespace

-    return false;

-}

-

-inline bool

-GetPot::__check_flags(const std::string& Str, const char* FlagList) const

-{

-    const char* p=FlagList;

-    for(; *p != '\0' ; p++)

-        if( Str.find(*p) != std::string::npos ) return true; // found something

-    return false;

-}

-

-///////////////////////////////////////////////////////////////////////////////

-// (*) nominus arguments

-inline STRING_VECTOR

-GetPot::nominus_vector() const

-    // return vector of nominus arguments

-{

-    STRING_VECTOR nv;

-    std::vector<unsigned>::const_iterator it = idx_nominus.begin();

-    for(; it != idx_nominus.end(); ++it) {

-        nv.push_back(argv[*it]);

-

-        // (*) record for later ufo-detection

-        //     when a nominus vector is requested, the entire set of nominus arguments are 

-        //     tagged as 'requested'

-        ((GetPot*)this)->__record_argument_request(argv[*it]);

-    }

-    return nv;

-}

-

-inline std::string

-GetPot::next_nominus()

-{

-    if( nominus_cursor < int(idx_nominus.size()) - 1 ) {

-        const std::string Tmp = argv[idx_nominus[++nominus_cursor]];

-

-        // (*) record for later ufo-detection

-        __record_argument_request(Tmp);

-

-        // -- cannot use the Tmp variable, since it is temporary and c_str() will return a pointer

-        //    to something that does no longer exist.

-        return Tmp; 

-    }

-    return std::string("");

-}

-

-///////////////////////////////////////////////////////////////////////////////

-// (*) variables

-//.............................................................................

-//

-inline int

-GetPot::operator()(const char* VarName, int Default) const

-{

-    // (*) recording of requested variables happens in '__find_variable()'

-    const variable*  sv = __find_variable(VarName);

-    if( sv == 0 ) return Default;

-    return __convert_to_type(sv->original, Default);

-}

-

-inline double

-GetPot::operator()(const char* VarName, const double& Default) const

-{

-    // (*) recording of requested variables happens in '__find_variable()'

-    const variable*  sv = __find_variable(VarName);

-    if( sv == 0 ) return Default;

-    return __convert_to_type(sv->original, Default);

-}

-

-inline const std::string

-GetPot::operator()(const char* VarName, const char* Default) const

-{

-    // (*) recording of requested variables happens in '__find_variable()'

-    const variable*  sv = __find_variable(VarName);

-    if( sv == 0 ) return Default;

-    // -- returning a c_str() pointer is OK here, since the variable remains existant,

-    //    while 'sv' of course is delete at the end of the function.

-    return sv->original;

-}

-

-inline int

-GetPot::operator()(const char* VarName, int Default, unsigned Idx) const

-{

-    // (*) recording of requested variables happens in '__find_variable()'

-    const variable* sv = __find_variable(VarName);

-    if( sv == 0 ) return Default;

-    const std::string*  element = sv->get_element(Idx);

-    if( element == 0 ) return Default;

-    return __convert_to_type(*element, Default);

-}

-

-inline double

-GetPot::operator()(const char* VarName, const double& Default, unsigned Idx) const

-{

-    // (*) recording of requested variables happens in '__find_variable()'

-    const variable* sv = __find_variable(VarName);

-    if( sv == 0 ) return Default;

-    const std::string*  element = sv->get_element(Idx);

-    if( element == 0 ) return Default;

-    return __convert_to_type(*element, Default);

-}

-

-inline const std::string

-GetPot::operator()(const char* VarName, const char* Default, unsigned Idx) const

-{

-    // (*) recording of requested variables happens in '__find_variable()'

-    const variable*  sv = __find_variable(VarName);

-    if( sv == 0 ) return Default;

-    const std::string* element = sv->get_element(Idx);

-    if( element == 0 )  return Default;

-    return *element;

-}

-

-inline void 

-GetPot::__record_argument_request(const std::string& Name)

-{

-    if( ! __request_recording_f ) return; 

-

-    // (*) record requested variable for later ufo detection

-    _requested_arguments.push_back(Name);

-

-    // (*) record considered section for ufo detection

-    STRING_VECTOR      STree = __get_section_tree(Name);

-    victorate(std::string, STree, it)

-        if( find(_requested_sections.begin(), _requested_sections.end(), *it) == _requested_sections.end() )

-            if( section.length() != 0 ) _requested_sections.push_back(*it);

-}

-

-inline void 

-GetPot::__record_variable_request(const std::string& Name)

-{

-    if( ! __request_recording_f ) return; 

-

-    // (*) record requested variable for later ufo detection

-    _requested_variables.push_back(Name);

-

-    // (*) record considered section for ufo detection

-    STRING_VECTOR      STree = __get_section_tree(Name);

-    victorate(std::string, STree, it)

-        if( find(_requested_sections.begin(), _requested_sections.end(), *it) == _requested_sections.end() )

-            if( section.length() != 0 ) _requested_sections.push_back(*it);

-}

-

-// (*) following functions are to be used from 'outside', after getpot has parsed its

-//     arguments => append an argument in the argument vector that reflects the addition

-inline void

-GetPot::__set_variable(const char* VarName, const char* Value)

-{

-    const GetPot::variable* Var = __find_variable(VarName);

-    if( Var == 0 ) variables.push_back(variable(VarName, Value, _field_separator.c_str()));

-    else           ((GetPot::variable*)Var)->take(Value, _field_separator.c_str());    

-}

-

-inline void

-GetPot::set(const char* VarName, const char* Value, const bool Requested /* = yes */)

-{     

-    const std::string Arg = prefix + std::string(VarName) + std::string("=") + std::string(Value);

-    argv.push_back(Arg);

-    __set_variable(VarName, Value);

-

-    // if user does not specify the variable as 'not being requested' it will be 

-    // considered amongst the requested variables

-    if( Requested ) __record_variable_request(Arg);

-}

-

-inline void

-GetPot::set(const char* VarName, const double& Value, const bool Requested /* = yes */)

-{ __set_variable(VarName, __double2string(Value).c_str()); }

-

-inline void 

-GetPot::set(const char* VarName, const int Value, const bool Requested /* = yes */)

-{ __set_variable(VarName, __int2string(Value).c_str()); }

-

-

-inline unsigned

-GetPot::vector_variable_size(const char* VarName) const

-{

-    const variable*  sv = __find_variable(VarName);

-    if( sv == 0 ) return 0;

-    return static_cast<unsigned int>(sv->value.size());

-}

-

-inline STRING_VECTOR

-GetPot::get_variable_names() const

-{

-    STRING_VECTOR  result;

-    std::vector<GetPot::variable>::const_iterator it = variables.begin();

-    for(; it != variables.end(); ++it) {

-        const std::string Tmp = __get_remaining_string((*it).name, prefix);

-        if( Tmp != "" ) result.push_back(Tmp);

-    }

-    return result;

-}

-

-inline STRING_VECTOR

-GetPot::get_section_names() const

-{ return section_list; }

-

-inline const GetPot::variable*

-GetPot::__find_variable(const char* VarName) const

-{

-    const std::string Name = prefix + VarName;

-

-    // (*) record requested variable for later ufo detection

-    ((GetPot*)this)->__record_variable_request(Name);

-

-    std::vector<variable>::const_iterator it = variables.begin();

-    for(; it != variables.end(); ++it) {

-        if( (*it).name == Name ) return &(*it);

-    }

-    return 0;

-}

-

-///////////////////////////////////////////////////////////////////////////////

-// (*) ouput (basically for debugging reasons

-//.............................................................................

-//

-inline int

-GetPot::print() const

-{

-    std::cout << "argc = " << static_cast<unsigned int>(argv.size()) << std::endl;

-    STRING_VECTOR::const_iterator it = argv.begin();

-    for(; it != argv.end(); ++it)

-        std::cout << *it << std::endl;

-    std::cout << std::endl;

-    return 1;

-}

-

-// (*) dollar bracket expressions (DBEs) ------------------------------------

-//

-//     1) Entry Function: __DBE_expand_string()

-//        Takes a string such as

-//

-//          "${+ ${x} ${y}}   Subject-${& ${section} ${subsection}}:   ${title}"

-//

-//        calls __DBE_expand() for each of the expressions

-//

-//           ${+ ${x} ${y}}

-//           ${& ${section} ${subsection}}

-//           ${Title}

-//

-//        and returns the string

-//

-//          "4711 Subject-1.01:   Mit den Clowns kamen die Schwaene"

-//

-//        assuming that

-//            x          = "4699"

-//            y          = "12"

-//            section    = "1."

-//            subsection = "01"

-//            title      = "Mit den Clowns kamen die Schwaene"

-//

-//      2) __DBE_expand():

-//

-//           checks for the command, i.e. the 'sign' that follows '${'

-//           divides the argument list into sub-expressions using

-//           __DBE_get_expr_list()

-//

-//           ${+ ${x} ${y}}                 -> "${x}"  "${y}"

-//           ${& ${section} ${subsection}}  -> "${section}" "${subsection}"

-//           ${Title}                       -> Nothing, variable expansion

-//

-//      3) __DBE_expression_list():

-//

-//           builds a vector of unbracketed whitespace separated strings, i.e.

-//

-//           "  ${Number}.a ${: Das Marmorbild} AB-${& Author= ${Eichendorf}-1870}"

-//

-//           is split into a vector

-//

-//              [0] ${Number}.a

-//              [1] ${: Das Marmorbild}

-//              [2] AB-${& Author= ${Eichendorf}}-1870

-//

-//           Each sub-expression is expanded using expand().

-//---------------------------------------------------------------------------

-inline std::string

-GetPot::__DBE_expand_string(const std::string str)

-{

-    // Parses for closing operators '${ }' and expands them letting

-    // white spaces and other letters as they are.

-    std::string   new_string = "";

-    unsigned open_brackets = 0;

-    unsigned first = 0;

-    unsigned i = 0;

-    for(;  i<str.size(); ++i) {

-        if( i < str.size() - 2 && str.substr(i, 2) == "${" ) {

-            if( open_brackets == 0 ) first = i+2;

-            open_brackets++;

-        }

-        else if( str[i] == '}' && open_brackets > 0) {

-            open_brackets -= 1;

-            if( open_brackets == 0 ) {

-                const std::string Replacement = __DBE_expand(str.substr(first, i - first));

-                new_string += Replacement;

-            }

-        }

-        else if( open_brackets == 0 )

-            new_string += str[i];

-    }

-    return new_string;

-}

-

-inline STRING_VECTOR

-GetPot::__DBE_get_expr_list(const std::string str_, const unsigned ExpectedNumber)

-    // ensures that the resulting vector has the expected number

-    // of arguments, but they may contain an error message

-{

-    std::string str = str_;

-    // Separates expressions by non-bracketed whitespaces, expands them

-    // and puts them into a list.

-

-    unsigned i=0;

-    // (1) eat initial whitespaces

-    for(; i < str.size(); ++i)

-        if( ! isspace(str[i]) ) break;

-

-    STRING_VECTOR   expr_list;

-    unsigned         open_brackets = 0;

-    std::vector<unsigned> start_idx;

-    unsigned         start_new_string = i;

-    unsigned         l = static_cast<unsigned int>(str.size());

-

-    // (2) search for ${ } expressions ...

-    while( i < l ) {

-        const char letter = str[i];

-        // whitespace -> end of expression

-        if( isspace(letter) && open_brackets == 0) {

-            expr_list.push_back(str.substr(start_new_string, i - start_new_string));

-            bool no_breakout_f = true;

-            for(++i; i < l ; ++i) {

-                if( ! isspace(str[i]) )

-                { no_breakout_f = false; start_new_string = i; break; }

-            }

-            if( no_breakout_f ) {

-                // end of expression list

-                if( expr_list.size() < ExpectedNumber ) {

-                    const std::string   pre_tmp("<< ${ }: missing arguments>>");

-                    STRING_VECTOR tmp(ExpectedNumber - expr_list.size(), pre_tmp);

-                    expr_list.insert(expr_list.end(), tmp.begin(), tmp.end());

-                }

-                return expr_list;

-            }

-        }

-

-        // dollar-bracket expression

-        if( str.length() >= i+2 && str.substr(i, 2) == "${" ) {

-            open_brackets++;

-            start_idx.push_back(i+2);

-        }

-        else if( letter == '}' && open_brackets > 0) {

-            int start = start_idx[start_idx.size()-1];

-            start_idx.pop_back();

-            const std::string Replacement = __DBE_expand(str.substr(start, i-start));

-            if( start - 3 < (int)0)

-                str = Replacement + str.substr(i+1);

-            else

-                str = str.substr(0, start-2) + Replacement + str.substr(i+1);

-            l = static_cast<unsigned int>(str.size());

-            i = start + static_cast<unsigned int>(Replacement.size()) - 3;

-            open_brackets--;

-        }

-        ++i;

-    }

-

-    // end of expression list

-    expr_list.push_back(str.substr(start_new_string, i-start_new_string));

-

-    if( expr_list.size() < ExpectedNumber ) {

-        const std::string   pre_tmp("<< ${ }: missing arguments>>");

-        STRING_VECTOR tmp(ExpectedNumber - expr_list.size(), pre_tmp);

-        expr_list.insert(expr_list.end(), tmp.begin(), tmp.end());

-    }

-

-    return expr_list;

-}

-

-inline const GetPot::variable*

-GetPot::__DBE_get_variable(std::string VarName)

-{

-    static GetPot::variable ev;

-    std::string secure_Prefix = prefix;

-

-    prefix = section;

-    // (1) first search in currently active section

-    const GetPot::variable* var = __find_variable(VarName.c_str());

-    if( var != 0 ) { prefix = secure_Prefix; return var; }

-

-    // (2) search in root name space

-    prefix = "";

-    var = __find_variable(VarName.c_str());

-    if( var != 0 ) { prefix = secure_Prefix; return var; }

-

-    prefix = secure_Prefix;

-

-    // error occured => variable name == ""

-    char* tmp = new char[VarName.length() + 25];

-#ifndef WIN32

-    snprintf(tmp, (int)sizeof(char)*(VarName.length() + 25), 

-#else

-    _snprintf(tmp, sizeof(char)*(VarName.length() + 25), 

-#endif

-             "<<${ } variable '%s' undefined>>", VarName.c_str());

-    ev.name = "";

-    ev.original = std::string(tmp);

-    delete [] tmp;

-    return &ev;

-}

-

-inline std::string

-GetPot::__DBE_expand(const std::string expr)

-{

-    // ${: } pure text

-    if( expr[0] == ':' )

-        return expr.substr(1);

-

-    // ${& expr expr ... } text concatination

-    else if( expr[0] == '&' ) {

-        const STRING_VECTOR A = __DBE_get_expr_list(expr.substr(1), 1);

-

-        STRING_VECTOR::const_iterator it = A.begin();

-        std::string result = *it++;

-        for(; it != A.end(); ++it) result += *it;

-

-        return result;

-    }

-

-    // ${<-> expr expr expr} text replacement

-    else if( expr.length() >= 3 && expr.substr(0, 3) == "<->" ) {

-        STRING_VECTOR A = __DBE_get_expr_list(expr.substr(3), 3);

-        std::string::size_type tmp = 0;

-        const std::string::size_type L = A[1].length();

-        while( (tmp = A[0].find(A[1])) != std::string::npos ) {

-            A[0].replace(tmp, L, A[2]);

-        }

-        return A[0];

-    }

-    // ${+ ...}, ${- ...}, ${* ...}, ${/ ...} expressions

-    else if( expr[0] == '+' ) {

-        STRING_VECTOR A = __DBE_get_expr_list(expr.substr(1), 2);

-        STRING_VECTOR::const_iterator it = A.begin();

-        double result = __convert_to_type(*it++, 0.0);

-        for(; it != A.end(); ++it)

-            result += __convert_to_type(*it, 0.0);

-

-        return __double2string(result);

-    }

-    else if( expr[0] == '-' ) {

-        STRING_VECTOR A = __DBE_get_expr_list(expr.substr(1), 2);

-        STRING_VECTOR::const_iterator it = A.begin();

-        double result = __convert_to_type(*it++, 0.0);

-        for(; it != A.end(); ++it)

-            result -= __convert_to_type(*it, 0.0);

-

-        return __double2string(result);

-    }

-    else if( expr[0] == '*' ) {

-        STRING_VECTOR A = __DBE_get_expr_list(expr.substr(1), 2);

-        STRING_VECTOR::const_iterator it = A.begin();

-        double result = __convert_to_type(*it++, 0.0);

-        for(; it != A.end(); ++it)

-            result *= __convert_to_type(*it, 0.0);

-

-        return __double2string(result);

-    }

-    else if( expr[0] == '/' ) {

-

-        STRING_VECTOR A = __DBE_get_expr_list(expr.substr(1), 2);

-        STRING_VECTOR::const_iterator it = A.begin();

-        double result = __convert_to_type(*it++, 0.0);

-        if( result == 0 ) return "0.0";

-        for(; it != A.end(); ++it) {

-            const double Q = __convert_to_type(*it, 0.0);

-            if( Q == 0.0 ) return "0.0";

-            result /= Q;

-        }

-        return __double2string(result);

-    }

-

-    // ${^ ... } power expressions

-    else if( expr[0] == '^' ) {

-        STRING_VECTOR A = __DBE_get_expr_list(expr.substr(1), 2);

-        STRING_VECTOR::const_iterator it = A.begin();

-        double result = __convert_to_type(*it++, 0.0);

-        for(; it != A.end(); ++it)

-            result = pow(result, __convert_to_type(*it, 0.0));

-        return __double2string(result);

-    }

-

-    // ${==  } ${<=  } ${>= } comparisons (return the number of the first 'match'

-    else if( expr.length() >= 2 &&

-             ( expr.substr(0,2) == "==" || expr.substr(0,2) == ">=" ||

-               expr.substr(0,2) == "<=" || expr[0] == '>'           || expr[0] == '<')) {

-        // differentiate between two and one sign operators

-        unsigned op = 0;

-        enum { EQ, GEQ, LEQ, GT, LT };

-        if      ( expr.substr(0, 2) == "==" ) op = EQ;

-        else if ( expr.substr(0, 2) == ">=" ) op = GEQ;

-        else if ( expr.substr(0, 2) == "<=" ) op = LEQ;

-        else if ( expr[0] == '>' )            op = GT;

-        else    /*                     "<" */ op = LT;

-

-        STRING_VECTOR a;

-        if ( op == GT || op == LT ) a = __DBE_get_expr_list(expr.substr(1), 2);

-        else                        a = __DBE_get_expr_list(expr.substr(2), 2);

-

-        std::string   x_orig = a[0];

-        double   x = __convert_to_type(x_orig, 1e37);

-        unsigned i = 1;

-

-        STRING_VECTOR::const_iterator y_orig = a.begin();

-        for(y_orig++; y_orig != a.end(); y_orig++) {

-            double y = __convert_to_type(*y_orig, 1e37);

-

-            // set the strings as reference if one wasn't a number

-            if ( x == 1e37 || y == 1e37 ) {

-                // it's a string comparison

-                if( (op == EQ  && x_orig == *y_orig) || (op == GEQ && x_orig >= *y_orig) ||

-                    (op == LEQ && x_orig <= *y_orig) || (op == GT  && x_orig >  *y_orig) ||

-                    (op == LT  && x_orig <  *y_orig) )

-                    return __int2string(i);

-            }

-            else {

-                // it's a number comparison

-                if( (op == EQ  && x == y) || (op == GEQ && x >= y) ||

-                    (op == LEQ && x <= y) || (op == GT  && x >  y) ||

-                    (op == LT  && x <  y) )

-                    return __int2string(i);

-            }

-            ++i;

-        }

-

-        // nothing fulfills the condition => return 0

-        return "0";

-    }

-    // ${?? expr expr} select

-    else if( expr.length() >= 2 && expr.substr(0, 2) == "??" ) {

-        STRING_VECTOR a = __DBE_get_expr_list(expr.substr(2), 2);

-        double x = __convert_to_type(a[0], 1e37);

-        // last element is always the default argument

-        if( x == 1e37 || x < 0 || x >= a.size() - 1 ) return a[a.size()-1];

-

-        // round x to closest integer

-        return a[int(x+0.5)];

-    }

-    // ${? expr expr expr} if then else conditions

-    else if( expr[0] == '?' ) {

-        STRING_VECTOR a = __DBE_get_expr_list(expr.substr(1), 2);

-        if( __convert_to_type(a[0], 0.0) == 1.0 ) return a[1];

-        else if( a.size() > 2 ) return a[2];

-    }

-    // ${! expr} maxro expansion

-    else if( expr[0] == '!' ) {

-        const GetPot::variable* Var = __DBE_get_variable(expr.substr(1));

-        // error

-        if( Var->name == "" ) return std::string(Var->original);

-

-        const STRING_VECTOR A = __DBE_get_expr_list(Var->original, 2);

-        return A[0];

-    }

-    // ${@: } - string subscription

-    else if( expr.length() >= 2 && expr.substr(0,2) == "@:" ) {

-        const STRING_VECTOR A = __DBE_get_expr_list(expr.substr(2), 2);

-        double x = __convert_to_type(A[1], 1e37);

-

-        // last element is always the default argument

-        if( x == 1e37 || x < 0 || x >= A[0].size() - 1)

-            return "<<1st index out of range>>";

-

-        if( A.size() > 2 ) {

-            double y = __convert_to_type(A[2], 1e37);

-            if ( y != 1e37 && y > 0 && y <= A[0].size() - 1 && y > x )

-                return A[0].substr(int(x+0.5), int(y+1.5) - int(x+0.5));

-            else if( y == -1 )

-                return A[0].substr(int(x+0.5));

-            return "<<2nd index out of range>>";

-        }

-        else {

-            char* tmp = new char[2];

-            tmp[0] = A[0][int(x+0.5)]; tmp[1] = '\0';

-            std::string result(tmp);

-            delete [] tmp;

-            return result;

-        }

-    }

-    // ${@ } - vector subscription

-    else if( expr[0] == '@' ) {

-        STRING_VECTOR          A   = __DBE_get_expr_list(expr.substr(1), 2);

-        const GetPot::variable* Var = __DBE_get_variable(A[0]);

-        // error

-        if( Var->name == "" ) {

-            // make a copy of the string if an error occured

-            // (since the error variable is a static variable inside get_variable())

-            return std::string(Var->original);

-        }

-

-        double x = __convert_to_type(A[1], 1e37);

-

-        // last element is always the default argument

-        if (x == 1e37 || x < 0 || x >= Var->value.size() )

-            return "<<1st index out of range>>";

-

-        if ( A.size() > 2) {

-            double y = __convert_to_type(A[2], 1e37);

-            int    begin = int(x+0.5);

-            int    end = 0;

-            if ( y != 1e37 && y > 0 && y <= Var->value.size() && y > x)

-                end = int(y+1.5);

-            else if( y == -1 )

-                end = static_cast<unsigned int>(Var->value.size());

-            else

-                return "<<2nd index out of range>>";

-

-            std::string result = *(Var->get_element(begin));

-            int i = begin+1;

-            for(; i < end; ++i)

-                result += std::string(" ") + *(Var->get_element(i));

-            return result;

-        }

-        else

-            return *(Var->get_element(int(x+0.5)));

-    }

-

-    const STRING_VECTOR    A = __DBE_get_expr_list(expr, 1);

-    const GetPot::variable* B = __DBE_get_variable(A[0]);

-

-    // make a copy of the string if an error occured

-    // (since the error variable is a static variable inside get_variable())

-    if( B->name == "" ) return std::string(B->original);

-    // (psuggs@pobox.com mentioned to me the warning MSVC++6.0 produces

-    //  with:  else return B->original (thanks))

-    return B->original;

-}

-

-

-///////////////////////////////////////////////////////////////////////////////

-// (*) unidentified flying objects

-//.............................................................................

-//

-inline bool

-GetPot::__search_string_vector(const STRING_VECTOR& VecStr, const std::string& Str) const

-{

-    victorate(std::string, VecStr, itk) {

-        if( *itk == Str ) return true;

-    }

-    return false;

-}

-

-inline STRING_VECTOR

-GetPot::unidentified_arguments(unsigned Number,

-                               const char* KnownArgument1, ...) const

-{

-    STRING_VECTOR known_arguments;

-

-    // (1) create a vector of known arguments

-    if( Number == 0 ) return STRING_VECTOR();

-

-    va_list ap;

-    va_start(ap, KnownArgument1);

-    known_arguments.push_back(std::string(KnownArgument1));

-    unsigned i=1;

-    for(; i<Number; ++i)

-        known_arguments.push_back(std::string(va_arg(ap, char *)));

-    va_end(ap);

-

-    return unidentified_arguments(known_arguments);

-}

-

-inline STRING_VECTOR

-GetPot::unidentified_arguments() const

-{ return unidentified_arguments(_requested_arguments); }

-

-inline STRING_VECTOR

-GetPot::unidentified_arguments(const STRING_VECTOR& Knowns) const

-{

-    STRING_VECTOR ufos;

-    STRING_VECTOR::const_iterator it = argv.begin();

-    ++it; // forget about argv[0] (application or filename)

-    for(; it != argv.end(); ++it) {

-        // -- argument belongs to prefixed section ?

-        const std::string arg = __get_remaining_string(*it, prefix);

-        if( arg == "" ) continue;

-

-        // -- check if in list

-        if( __search_string_vector(Knowns, arg) == false)

-            ufos.push_back(*it);

-    }

-    return ufos;

-}

-

-inline STRING_VECTOR

-GetPot::unidentified_options(unsigned Number,

-                             const char* KnownOption1, ...) const

-{

-    STRING_VECTOR known_options;

-

-    // (1) create a vector of known arguments

-    if( Number == 0 ) return STRING_VECTOR();

-

-    va_list ap;

-    va_start(ap, KnownOption1);

-    known_options.push_back(std::string(KnownOption1));

-    unsigned i=1;

-    for(; i<Number; ++i)

-        known_options.push_back(std::string(va_arg(ap, char *)));

-    va_end(ap);

-

-    return unidentified_options(known_options);

-}

-

-inline STRING_VECTOR

-GetPot::unidentified_options() const

-{ 

-    // -- every option is an argument. 

-    // -- the set of requested arguments contains the set of requested options. 

-    // -- IF the set of requested arguments contains unrequested options, 

-    //    THEN they were requested as 'follow' and 'next' arguments and not as real options.

-    //

-    // => it is not necessary to separate requested options from the list

-    STRING_VECTOR option_list;

-    victorate(std::string, _requested_arguments, it) {

-        const std::string arg = *it;

-        if( arg.length() == 0 ) continue;

-        if( arg[0] == '-' )     option_list.push_back(arg);

-    }   

-    return unidentified_options(option_list); 

-}

-

-inline STRING_VECTOR

-GetPot::unidentified_options(const STRING_VECTOR& Knowns) const

-{

-    STRING_VECTOR ufos;

-    STRING_VECTOR::const_iterator it = argv.begin();

-    ++it; // forget about argv[0] (application or filename)

-    for(; it != argv.end(); ++it) {

-        // -- argument belongs to prefixed section ?

-        const std::string arg = __get_remaining_string(*it, prefix);

-        if( arg == "" ) continue;

-

-        // is argument really an option (starting with '-') ?

-        if( arg.length() < 1 || arg[0] != '-' ) continue;

-

-        if( __search_string_vector(Knowns, arg) == false)

-            ufos.push_back(*it);

-    }

-

-    return ufos;

-}

-

-inline std::string

-GetPot::unidentified_flags(const char* KnownFlagList, int ArgumentNumber=-1) const

-    // Two modes:

-    //  ArgumentNumber >= 0 check specific argument

-    //  ArgumentNumber == -1 check all options starting with one '-'

-    //                       for flags

-{

-    std::string         ufos;

-    STRING_VECTOR known_arguments;

-    std::string         KFL(KnownFlagList);

-

-    // (2) iteration over '-' arguments (options)

-    if( ArgumentNumber == -1 ) {

-        STRING_VECTOR::const_iterator it = argv.begin();

-        ++it; // forget about argv[0] (application or filename)

-        for(; it != argv.end(); ++it) {

-            // -- argument belongs to prefixed section ?

-            const std::string arg = __get_remaining_string(*it, prefix);

-            if( arg == "" ) continue;

-

-            // -- does arguments start with '-' (but not '--')

-            if     ( arg.length() < 2 ) continue;

-            else if( arg[0] != '-' )    continue;

-            else if( arg[1] == '-' )    continue;

-

-            // -- check out if flags inside option are contained in KnownFlagList

-            const char* p=arg.c_str();

-            p++; // skip starting minus

-            for(; *p != '\0' ; p++)

-                if( KFL.find(*p) == std::string::npos ) ufos += *p;

-        }

-    }

-    // (1) check specific argument

-    else {

-        // -- only check arguments that start with prefix

-        int no_matches = 0;

-        unsigned i=1;

-        for(; i<argv.size(); ++i) {

-            const std::string Remain = __get_remaining_string(argv[i], prefix);

-            if( Remain != "") {

-                no_matches++;

-                if( no_matches == ArgumentNumber) {

-                    // -- the right argument number inside the section is found

-                    // => check it for flags

-                    const char* p = Remain.c_str();

-                    p++; // skip starting minus

-                    for(; *p != '\0' ; p++)

-                        if( KFL.find(*p) == std::string::npos ) ufos += *p;

-                    return ufos;

-                }

-            }

-        }

-    }

-    return ufos;

-}

-

-inline STRING_VECTOR

-GetPot::unidentified_variables(unsigned Number,

-                               const char* KnownVariable1, ...) const

-{

-    STRING_VECTOR known_variables;

-

-    // create vector of known arguments

-    if( Number == 0 ) return STRING_VECTOR();

-

-    va_list ap;

-    va_start(ap, KnownVariable1);

-    known_variables.push_back(std::string(KnownVariable1));

-    unsigned i=1;

-    for(; i<Number; ++i)

-        known_variables.push_back(std::string(va_arg(ap, char *)));

-    va_end(ap);

-

-    return unidentified_variables(known_variables);

-}

-

-inline STRING_VECTOR

-GetPot::unidentified_variables(const STRING_VECTOR& Knowns) const

-{

-    STRING_VECTOR ufos;

-

-    victorate(GetPot::variable, variables, it) {

-        // -- check if variable has specific prefix

-        const std::string var_name = __get_remaining_string((*it).name, prefix);

-        if( var_name == "" ) continue;

-

-        // -- check if variable is known

-        if( __search_string_vector(Knowns, var_name) == false)

-            ufos.push_back((*it).name);

-    }

-    return ufos;

-}

-

-inline STRING_VECTOR

-GetPot::unidentified_variables() const

-{  return unidentified_variables(_requested_variables); }

-

-

-inline STRING_VECTOR

-GetPot::unidentified_sections(unsigned Number,

-                              const char* KnownSection1, ...) const

-{

-    STRING_VECTOR known_sections;

-

-    // (1) create a vector of known arguments

-    if( Number == 0 ) return STRING_VECTOR();

-

-    va_list ap;

-    va_start(ap, KnownSection1);

-    known_sections.push_back(std::string(KnownSection1));

-    unsigned i=1;

-    for(; i<Number; ++i) {

-        std::string tmp = std::string(va_arg(ap, char *));

-        if( tmp.length() == 0 ) continue;

-        if( tmp[tmp.length()-1] != '/' ) tmp += '/';

-        known_sections.push_back(tmp);

-    }

-    va_end(ap);

-

-    return unidentified_sections(known_sections);

-}

-

-inline STRING_VECTOR

-GetPot::unidentified_sections() const

-{ return unidentified_sections(_requested_sections); }

-

-inline STRING_VECTOR

-GetPot::unidentified_sections(const STRING_VECTOR& Knowns) const

-{

-    STRING_VECTOR ufos;

-

-    victorate(std::string, section_list, it) {

-        // -- check if section conform to prefix

-        const std::string sec_name = __get_remaining_string(*it, prefix);

-        if( sec_name == "" ) continue;

-

-        // -- check if section is known

-        if( __search_string_vector(Knowns, sec_name) == false )

-            ufos.push_back(*it);

-    }

-

-    return ufos;

-}

-

-

-inline STRING_VECTOR

-GetPot::unidentified_nominuses(unsigned Number, const char* Known, ...) const

-{

-    STRING_VECTOR known_nominuses;

-

-    // create vector of known arguments

-    if( Number == 0 ) return STRING_VECTOR();

-

-    va_list ap;

-    va_start(ap, Known);

-    known_nominuses.push_back(std::string(Known));

-    unsigned i=1;

-    for(; i<Number; ++i) {

-        std::string tmp = std::string(va_arg(ap, char *));

-        if( tmp.length() == 0 ) continue;

-        known_nominuses.push_back(tmp);

-    }

-    va_end(ap);

-

-    return unidentified_nominuses(known_nominuses);

-}

-

-inline STRING_VECTOR

-GetPot::unidentified_nominuses() const {

-    // -- every nominus is an argument. 

-    // -- the set of requested arguments contains the set of requested nominuss. 

-    // -- IF the set of requested arguments contains unrequested nominuss, 

-    //    THEN they were requested as 'follow' and 'next' arguments and not as real nominuses.

-    //

-    // => it is not necessary to separate requested nominus from the list

-

-    return unidentified_nominuses(_requested_arguments);

-}

-

-inline STRING_VECTOR

-GetPot::unidentified_nominuses(const STRING_VECTOR& Knowns) const

-{

-    STRING_VECTOR ufos;

-

-    // (2) iterate over all arguments

-    STRING_VECTOR::const_iterator it = argv.begin();

-    ++it; // forget about argv[0] (application or filename)

-    for(; it != argv.end(); ++it) {

-        // -- check if nominus part of prefix

-        const std::string arg = __get_remaining_string(*it, prefix);

-        if( arg == "" )                                         continue;

-

-        if( arg.length() < 1 )                                  continue;

-        // option ? --> not a nomius

-        if( arg[0] == '-' )                                     continue;

-        // section ? --> not a real nominus

-        if( arg[0] == '[' && arg[arg.length()-1] == ']' )       continue;

-        // variable definition ? --> not a real nominus

-        bool continue_f = false;

-        unsigned i=0;

-        for(; i<arg.length() ; ++i)

-            if( arg[i] == '=' ) { continue_f = true; break; }

-        if( continue_f )                                        continue;

-

-        // real nominuses are compared with the given list

-        if( __search_string_vector(Knowns, arg) == false )

-            ufos.push_back(*it);

-    }

-    return ufos;

-}

-

-

-///////////////////////////////////////////////////////////////////////////////

-// (*) variable class

-//.............................................................................

-//

-inline

-GetPot::variable::variable()

-{}

-

-inline

-GetPot::variable::variable(const variable& That)

-{

-#ifdef WIN32

-    operator=(That);

-#else

-    GetPot::variable::operator=(That);

-#endif

-}

-

-

-inline

-GetPot::variable::variable(const char* Name, const char* Value, const char* FieldSeparator)

-    : name(Name)

-{

-    // make a copy of the 'Value'

-    take(Value, FieldSeparator);

-}

-

-inline const std::string*

-GetPot::variable::get_element(unsigned Idx) const

-{ if( Idx >= value.size() ) return 0; else return &(value[Idx]); }

-

-inline void

-GetPot::variable::take(const char* Value, const char* FieldSeparator)

-{

-    original = std::string(Value);

-

-    // separate string by white space delimiters using 'strtok'

-    // thread safe usage of strtok (no static members)

-    char* spt = 0;

-    // make a copy of the 'Value'

-    char* copy = new char[strlen(Value)+1];

-    strcpy(copy, Value);

-    char* follow_token = strtok_r(copy, FieldSeparator, &spt);

-    if( value.size() != 0 ) value.erase(value.begin(), value.end());

-    while(follow_token != 0) {

-        value.push_back(std::string(follow_token));

-        follow_token = strtok_r(NULL, FieldSeparator, &spt);

-    }

-

-    delete [] copy;

-}

-

-inline

-GetPot::variable::~variable()

-{}

-

-inline GetPot::variable&

-GetPot::variable::operator=(const GetPot::variable& That)

-{

-    if( &That != this) {

-        name     = That.name;

-        value    = That.value;

-        original = That.original;

-    }

-    return *this;

-}

-

-#undef victorate

-

-

-#endif // __include_guard_GETPOT_H__

-

-

-

+//  -*- c++ -*-
+//  GetPot Version $$Version$$                                    $$Date$$
+//
+//  WEBSITE: http://getpot.sourceforge.net
+//
+//  NOTE: The LPGL License for this library is only valid in case that 
+//        it is not used for the production or development of applications
+//        dedicated to military industry. This is what the author calls
+//        the 'unofficial peace version of the LPGL'.
+//
+//  This library is  free software; you can redistribute  it and/or modify
+//  it  under  the terms  of  the GNU  Lesser  General  Public License  as
+//  published by the  Free Software Foundation; either version  2.1 of the
+//  License, or (at your option) any later version.
+//
+//  This library  is distributed in the  hope that it will  be useful, but
+//  WITHOUT   ANY  WARRANTY;   without  even   the  implied   warranty  of
+//  MERCHANTABILITY  or FITNESS  FOR A  PARTICULAR PURPOSE.   See  the GNU
+//  Lesser General Public License for more details.
+//
+//  You  should have  received a  copy of  the GNU  Lesser  General Public
+//  License along  with this library; if  not, write to  the Free Software
+//  Foundation, Inc.,  59 Temple Place,  Suite 330, Boston,  MA 02111-1307
+//  USA
+//
+//  (C) 2001-2005 Frank R. Schaefer <fschaef@users.sf.net>
+//==========================================================================
+
+#ifndef __include_guard_GETPOT_H__
+#define __include_guard_GETPOT_H__
+
+#if defined(WIN32) || defined(SOLARIS_RAW) || (__GNUC__ == 2) || defined(__HP_aCC)
+#define strtok_r(a, b, c) strtok(a, b)
+#endif // WINDOWS or SOLARIS or gcc 2.* or HP aCC
+
+extern "C" {
+//   leave the 'extern C' to make it 100% sure to work -
+//   expecially with older distributions of header files.
+#ifndef WIN32
+// this is necessary (depending on OS)
+#include <ctype.h>
+#endif
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+}
+#include <cmath>
+#include <string>
+#include <vector>
+#include <algorithm>
+
+#include <fstream>
+#include <iostream> // not every compiler distribution includes <iostream> 
+//                  // with <fstream>
+
+typedef  std::vector<std::string>  STRING_VECTOR;
+
+#define victorate(TYPE, VARIABLE, ITERATOR)                        \
+  std::vector<TYPE>::const_iterator ITERATOR = (VARIABLE).begin(); \
+  for(; (ITERATOR) != (VARIABLE).end(); (ITERATOR)++)
+
+
+class GetPot {
+    //--------
+    inline void __basic_initialization();
+public:
+    // (*) constructors, destructor, assignment operator -----------------------
+    inline GetPot();
+    inline GetPot(const GetPot&);
+    inline GetPot(const int argc_, char** argv_, 
+                  const char* FieldSeparator=0x0);
+    inline GetPot(const char* FileName, 
+                  const char* CommentStart=0x0, const char* CommentEnd=0x0,
+                  const char* FieldSeparator=0x0);
+    inline ~GetPot();
+    inline GetPot& operator=(const GetPot&);
+
+
+    // (*) absorbing contents of another GetPot object
+    inline void            absorb(const GetPot& That);
+    //     -- for ufo detection: recording requested arguments, options etc.
+    inline void            clear_requests();
+    inline void            disable_request_recording() { __request_recording_f = false; }
+    inline void            enable_request_recording()  { __request_recording_f = true; }
+
+    // (*) direct access to command line arguments -----------------------------
+    inline const std::string    operator[](unsigned Idx) const;
+    inline int                  get(unsigned Idx, int           Default) const;
+    inline double               get(unsigned Idx, const double& Default) const;
+    inline const std::string    get(unsigned Idx, const char*   Default) const;
+    inline unsigned             size() const;
+
+    // (*) flags ---------------------------------------------------------------
+    inline bool            options_contain(const char* FlagList) const;
+    inline bool            argument_contains(unsigned Idx, const char* FlagList) const;
+
+    // (*) variables -----------------------------------------------------------
+    //     -- scalar values
+    inline int                operator()(const char* VarName, int           Default) const;
+    inline double             operator()(const char* VarName, const double& Default) const;
+    inline const std::string  operator()(const char* VarName, const char*   Default) const;
+    //     -- vectors
+    inline int                operator()(const char* VarName, int Default, unsigned Idx) const;
+    inline double             operator()(const char* VarName, const double& Default, unsigned Idx) const;
+    inline const std::string  operator()(const char* VarName, const char* Default, unsigned Idx) const;
+
+    //     -- setting variables
+    //                  i) from outside of GetPot (considering prefix etc.)
+    //                  ii) from inside, use '__set_variable()' below
+    inline void            set(const char* VarName, const char* Value, const bool Requested = true);
+    inline void            set(const char* VarName, const double& Value, const bool Requested = true);
+    inline void            set(const char* VarName, const int Value, const bool Requested = true);
+    
+    inline unsigned        vector_variable_size(const char* VarName) const;
+    inline STRING_VECTOR   get_variable_names() const;
+    inline STRING_VECTOR   get_section_names() const;
+    
+
+    // (*) cursor oriented functions -------------------------------------------
+    inline void            set_prefix(const char* Prefix) { prefix = std::string(Prefix); }
+    inline bool            search_failed() const { return search_failed_f; }
+
+    //     -- enable/disable search for an option in loop
+    inline void            disable_loop() { search_loop_f = false; }
+    inline void            enable_loop()  { search_loop_f = true; }
+
+    //     -- reset cursor to position '1'
+    inline void            reset_cursor();
+    inline void            init_multiple_occurrence();
+
+    //     -- search for a certain option and set cursor to position
+    inline bool            search(const char* option);
+    inline bool            search(unsigned No, const char* P, ...);
+    //     -- get argument at cursor++
+    inline int                next(int           Default);
+    inline double             next(const double& Default);
+    inline const std::string  next(const char*   Default);
+    //     -- search for option and get argument at cursor++
+    inline int                follow(int           Default, const char* Option);
+    inline double             follow(const double& Default, const char* Option);
+    inline const std::string  follow(const char*   Default, const char* Option);
+    //     -- search for one of the given options and get argument that follows it
+    inline int                follow(int           Default, unsigned No, const char* Option, ...);
+    inline double             follow(const double& Default, unsigned No, const char* Option, ...);
+    inline const std::string  follow(const char*   Default, unsigned No, const char* Option, ...);
+    //     -- lists of nominuses following an option
+    inline std::vector<std::string> nominus_followers(const char* Option);
+    inline std::vector<std::string> nominus_followers(unsigned No, ...);
+
+    //     -- directly followed arguments
+    inline int                direct_follow(int           Default, const char* Option);
+    inline double             direct_follow(const double& Default, const char* Option);
+    inline const std::string  direct_follow(const char*   Default, const char* Option);
+
+    inline std::vector<std::string>  string_tails(const char* StartString);
+    inline std::vector<int>          int_tails(const char* StartString, const int Default = 1);
+    inline std::vector<double>       double_tails(const char* StartString, const double Default = 1.0);
+
+    // (*) nominus arguments ---------------------------------------------------
+    inline STRING_VECTOR   nominus_vector() const;
+    inline unsigned        nominus_size() const  { return static_cast<unsigned int>(idx_nominus.size()); }
+    inline std::string     next_nominus();
+
+    // (*) unidentified flying objects -----------------------------------------
+    inline STRING_VECTOR   unidentified_arguments(unsigned Number, const char* Known, ...) const;
+    inline STRING_VECTOR   unidentified_arguments(const STRING_VECTOR& Knowns) const;
+    inline STRING_VECTOR   unidentified_arguments() const;
+
+    inline STRING_VECTOR   unidentified_options(unsigned Number, const char* Known, ...) const;
+    inline STRING_VECTOR   unidentified_options(const STRING_VECTOR& Knowns) const;
+    inline STRING_VECTOR   unidentified_options() const;
+
+    inline std::string     unidentified_flags(const char* Known,
+                                             int ArgumentNumber /* =-1 */) const;
+
+    inline STRING_VECTOR   unidentified_variables(unsigned Number, const char* Known, ...) const;
+    inline STRING_VECTOR   unidentified_variables(const STRING_VECTOR& Knowns) const;
+    inline STRING_VECTOR   unidentified_variables() const;
+
+    inline STRING_VECTOR   unidentified_sections(unsigned Number, const char* Known, ...) const;
+    inline STRING_VECTOR   unidentified_sections(const STRING_VECTOR& Knowns) const;
+    inline STRING_VECTOR   unidentified_sections() const;
+
+    inline STRING_VECTOR   unidentified_nominuses(unsigned Number, const char* Known, ...) const;
+    inline STRING_VECTOR   unidentified_nominuses(const STRING_VECTOR& Knowns) const;
+    inline STRING_VECTOR   unidentified_nominuses() const;
+
+    // (*) output --------------------------------------------------------------
+    inline int print() const;
+
+private:
+    // (*) Type Declaration ----------------------------------------------------
+    struct variable {
+        //-----------
+        // Variable to be specified on the command line or in input files.
+        // (i.e. of the form var='12 312 341')
+
+        // -- constructors, destructors, assignment operator
+        variable();
+        variable(const variable&);
+        variable(const char* Name, const char* Value, const char* FieldSeparator);
+        ~variable();
+        variable& operator=(const variable& That);
+
+        void      take(const char* Value, const char* FieldSeparator);
+
+        // -- get a specific element in the string vector
+        //    (return 0 if not present)
+        const std::string*  get_element(unsigned Idx) const;
+
+        // -- data memebers
+        std::string       name;      // identifier of variable
+        STRING_VECTOR     value;     // value of variable stored in vector
+        std::string       original;  // value of variable as given on command line
+    };
+
+    // (*) member variables --------------------------------------------------------------
+    std::string           prefix;          // prefix automatically added in queries
+    std::string           section;         // (for dollar bracket parsing)
+    STRING_VECTOR         section_list;    // list of all parsed sections
+    //     -- argument vector
+    STRING_VECTOR         argv;            // vector of command line arguments stored as strings
+    unsigned              cursor;          // cursor for argv
+    bool                  search_loop_f;   // shall search start at beginning after
+    //                                     // reaching end of arg array ?
+    bool                  search_failed_f; // flag indicating a failed search() operation
+    //                                     // (e.g. next() functions react with 'missed')
+
+    //     --  nominus vector
+    int                   nominus_cursor;  // cursor for nominus_pointers
+    std::vector<unsigned> idx_nominus;     // indecies of 'no minus' arguments
+
+    //     -- variables
+    //       (arguments of the form "variable=value")
+    std::vector<variable> variables;
+    
+    //     -- comment delimiters
+    std::string           _comment_start;
+    std::string           _comment_end;
+
+    //     -- field separator (separating elements of a vector)
+    std::string           _field_separator;
+
+    //     -- some functions return a char pointer to a temporarily existing string
+    //        this container makes them 'available' until the getpot object is destroyed.
+    std::vector<char*>    __internal_string_container;
+
+    //     -- keeping track about arguments that are requested, so that the UFO detection
+    //        can be simplified
+    STRING_VECTOR   _requested_arguments;
+    STRING_VECTOR   _requested_variables;
+    STRING_VECTOR   _requested_sections;
+
+    bool            __request_recording_f;   // speed: request recording can be turned off
+
+    //     -- if an argument is requested record it and the 'tag' the section branch to which 
+    //        it belongs. Caution: both functions mark the sections as 'tagged'.
+    void                      __record_argument_request(const std::string& Arg);
+    void                      __record_variable_request(const std::string& Arg);
+
+    // (*) helper functions ----------------------------------------------------
+    //                  set variable from inside GetPot (no prefix considered)
+    inline void               __set_variable(const char* VarName, const char* Value);
+
+    //     -- produce three basic data vectors:
+    //          - argument vector
+    //          - nominus vector
+    //          - variable dictionary
+    inline void               __parse_argument_vector(const STRING_VECTOR& ARGV);
+
+    //     -- helpers for argument list processing
+    //        * search for a variable in 'variables' array
+    inline const variable*    __find_variable(const char*) const;
+    //        * support finding directly followed arguments
+    inline const char*        __match_starting_string(const char* StartString);
+    //        * support search for flags in a specific argument
+    inline bool               __check_flags(const std::string& Str, const char* FlagList) const;
+    //        * type conversion if possible
+    inline int                __convert_to_type(const std::string& String, int Default) const;
+    inline double             __convert_to_type(const std::string& String, double Default) const;
+    //        * prefix extraction
+    const std::string         __get_remaining_string(const std::string& String, 
+                                                     const std::string& Start) const;
+    //        * search for a specific string
+    inline bool               __search_string_vector(const STRING_VECTOR& Vec,
+                                                     const std::string& Str) const;
+
+    //     -- helpers to parse input file
+    //        create an argument vector based on data found in an input file, i.e.:
+    //           1) delete comments (in between '_comment_start' '_comment_end')
+    //           2) contract assignment expressions, such as
+    //                   my-variable   =    '007 J. B.'
+    //             into
+    //                   my-variable='007 J. B.'
+    //           3) interprete sections like '[../my-section]' etc.
+    inline void               __skip_whitespace(std::istream& istr);
+    inline const std::string  __get_next_token(std::istream& istr);
+    inline const std::string  __get_string(std::istream& istr);
+    inline const std::string  __get_until_closing_bracket(std::istream& istr);
+
+    inline STRING_VECTOR      __read_in_stream(std::istream& istr);
+    inline STRING_VECTOR      __read_in_file(const char* FileName);
+    inline std::string        __process_section_label(const std::string& Section,
+                                                      STRING_VECTOR& section_stack);
+
+    //      -- dollar bracket expressions
+    std::string               __DBE_expand_string(const std::string str);
+    std::string               __DBE_expand(const std::string str);
+    const GetPot::variable*   __DBE_get_variable(const std::string str);
+    STRING_VECTOR             __DBE_get_expr_list(const std::string str, const unsigned ExpectedNumber);
+
+    std::string  __double2string(const double& Value) const {
+        // -- converts a double integer into a string
+        char* tmp = new char[128];
+#ifndef WIN32
+        snprintf(tmp, (int)sizeof(char)*128, "%e", Value);
+#else
+        _snprintf(tmp, sizeof(char)*128, "%e", Value);
+#endif
+        std::string result(tmp);
+        delete [] tmp;
+        return result;
+    }
+
+    std::string  __int2string(const int& Value) const {
+        // -- converts an integer into a string
+        char* tmp = new char[128];
+#ifndef WIN32
+        snprintf(tmp, (int)sizeof(char)*128, "%i", Value);
+#else
+        _snprintf(tmp, sizeof(char)*128, "%i", Value);
+#endif
+        std::string result(tmp);
+        delete [] tmp;
+        return result;
+    }
+
+    STRING_VECTOR __get_section_tree(const std::string& FullPath) {
+        // -- cuts a variable name into a tree of sub-sections. this is requested for recording
+        //    requested sections when dealing with 'ufo' detection.
+        STRING_VECTOR   result;
+        const char* Start = FullPath.c_str();
+
+        for(char *p = (char*)Start; *p ; p++) {
+            if( *p == '/' ) { 
+                *p = '\0';  // set terminating zero for convinience
+                const std::string Section = Start;
+                *p = '/';   // reset slash at place
+                result.push_back(Section);
+            }
+        }
+
+        return result;
+    }
+};
+
+
+///////////////////////////////////////////////////////////////////////////////
+// (*) constructors, destructor, assignment operator
+//.............................................................................
+//
+inline void
+GetPot::__basic_initialization()
+{
+    cursor = 0;              nominus_cursor = -1;
+    search_failed_f = true;  search_loop_f = true;
+    prefix = "";             section = "";
+    
+    // automatic request recording for later ufo detection
+    __request_recording_f = true;
+
+    // comment start and end strings
+    _comment_start = std::string("#");
+    _comment_end   = std::string("\n");
+
+    // default: separate vector elements by whitespaces
+    _field_separator = " \t\n";
+}
+
+inline
+GetPot::GetPot() 
+{ 
+    __basic_initialization(); 
+
+    STRING_VECTOR _apriori_argv;
+    _apriori_argv.push_back(std::string("Empty"));
+    __parse_argument_vector(_apriori_argv);
+}
+
+inline
+GetPot::GetPot(const int argc_, char ** argv_, 
+               const char* FieldSeparator /* =0x0 */)     
+    // leave 'char**' non-const to honor less capable compilers ... 
+{
+    // TODO: Ponder over the problem when the argument list is of size = 0.
+    //       This is 'sabotage', but it can still occur if the user specifies
+    //       it himself.
+    assert(argc_ >= 1);
+    __basic_initialization();
+
+    // if specified -> overwrite default string
+    if( FieldSeparator ) _field_separator = std::string(FieldSeparator);
+
+    // -- make an internal copy of the argument list:
+    STRING_VECTOR _apriori_argv;
+    // -- for the sake of clarity: we do want to include the first argument in the argument vector !
+    //    it will not be a nominus argument, though. This gives us a minimun vector size of one
+    //    which facilitates error checking in many functions. Also the user will be able to
+    //    retrieve the name of his application by "get[0]"
+    _apriori_argv.push_back(std::string(argv_[0]));
+    int i=1;
+    for(; i<argc_; ++i) {
+        std::string tmp(argv_[i]);   // recall the problem with temporaries,
+        _apriori_argv.push_back(tmp);       // reference counting in arguement lists ...
+    }
+    __parse_argument_vector(_apriori_argv);
+}
+
+
+inline
+GetPot::GetPot(const char* FileName,
+               const char* CommentStart  /* = 0x0 */, const char* CommentEnd /* = 0x0 */,
+               const char* FieldSeparator/* = 0x0 */)     
+{
+    __basic_initialization();
+
+    // if specified -> overwrite default strings
+    if( CommentStart )   _comment_start = std::string(CommentStart);
+    if( CommentEnd )     _comment_end   = std::string(CommentEnd);
+    if( FieldSeparator ) _field_separator = FieldSeparator;
+    
+    STRING_VECTOR _apriori_argv;
+    // -- file name is element of argument vector, however, it is not parsed for
+    //    variable assignments or nominuses.
+    _apriori_argv.push_back(std::string(FileName));
+
+    STRING_VECTOR args = __read_in_file(FileName);
+    _apriori_argv.insert(_apriori_argv.begin()+1, args.begin(), args.end());
+    __parse_argument_vector(_apriori_argv);
+}
+
+inline
+GetPot::GetPot(const GetPot& That)
+{ GetPot::operator=(That); }
+
+inline
+GetPot::~GetPot()
+{ 
+    // may be some return strings had to be created, delete now !
+    victorate(char*, __internal_string_container, it)
+        delete [] *it;  
+}
+
+inline GetPot&
+GetPot::operator=(const GetPot& That)
+{
+    if (&That == this) return *this;
+
+    _comment_start  = That._comment_start;
+    _comment_end    = That._comment_end;
+    argv            = That.argv;
+    variables       = That.variables;
+    prefix          = That.prefix;
+
+    cursor          = That.cursor;
+    nominus_cursor  = That.nominus_cursor;
+    search_failed_f = That.search_failed_f;
+
+    idx_nominus     = That.idx_nominus;
+    search_loop_f   = That.search_loop_f;
+
+    return *this;
+}
+
+
+inline void
+GetPot::absorb(const GetPot& That)
+{
+    if (&That == this) return;
+
+    STRING_VECTOR  __tmp(That.argv);
+
+    __tmp.erase(__tmp.begin());
+
+    __parse_argument_vector(__tmp);
+}
+
+inline void    
+GetPot::clear_requests()
+{
+    _requested_arguments.erase(_requested_arguments.begin(), _requested_arguments.end());
+    _requested_variables.erase(_requested_variables.begin(), _requested_variables.end());
+    _requested_sections.erase(_requested_sections.begin(), _requested_sections.end());
+}
+
+inline void
+GetPot::__parse_argument_vector(const STRING_VECTOR& ARGV)
+{
+    if( ARGV.size() == 0 ) return;
+
+    // build internal databases:
+    //   1) array with no-minus arguments (usually used as filenames)
+    //   2) variable assignments:
+    //             'variable name' '=' number | string
+    STRING_VECTOR                 section_stack;
+    STRING_VECTOR::const_iterator it = ARGV.begin();
+
+
+    section = "";
+
+    // -- do not parse the first argument, so that it is not interpreted a s a nominus or so.
+    argv.push_back(*it);
+    ++it;
+
+    // -- loop over remaining arguments
+    unsigned i=1;
+    for(; it != ARGV.end(); ++it, ++i) {
+        std::string arg = *it;
+
+        if( arg.length() == 0 ) continue;
+
+        // -- [section] labels
+        if( arg.length() > 1 && arg[0] == '[' && arg[arg.length()-1] == ']' ) {
+
+            // (*) sections are considered 'requested arguments'
+            if( __request_recording_f ) _requested_arguments.push_back(arg);
+            
+            const std::string Name = __DBE_expand_string(arg.substr(1, arg.length()-2));
+            section = __process_section_label(Name, section_stack);
+            // new section --> append to list of sections
+            if( find(section_list.begin(), section_list.end(), section) == section_list.end() )
+                if( section.length() != 0 ) section_list.push_back(section);
+            argv.push_back(arg);
+        }
+        else {
+            arg = section + __DBE_expand_string(arg);
+            argv.push_back(arg);
+        }
+
+        // -- separate array for nominus arguments
+        if( arg[0] != '-' ) idx_nominus.push_back(unsigned(i));
+
+        // -- variables: does arg contain a '=' operator ?
+        const char* p = arg.c_str();
+        for(; *p ; p++) {
+            if( *p == '=' ) {
+                // (*) record for later ufo detection
+                //     arguments carriying variables are always treated as 'requested' arguments. 
+                //     as a whole! That is 'x=4712' is  considered a requested argument.
+                //
+                //     unrequested variables have to be detected with the ufo-variable
+                //     detection routine.
+                if( __request_recording_f ) _requested_arguments.push_back(arg);
+
+                // set terminating 'zero' to treat first part as single string
+                // => arg (from start to 'p') = Name of variable
+                //    p+1     (until terminating zero) = value of variable
+                char* o = (char*)p++;
+                *o = '\0';                       // set temporary terminating zero
+                // __set_variable(...) 
+                // calls __find_variable(...) which registers the search
+                // temporarily disable this
+                const bool tmp = __request_recording_f;
+                __request_recording_f = false;
+                __set_variable(arg.c_str(), p);  // v-name = c_str() bis 'p', value = rest
+                __request_recording_f = tmp;
+                *o = '=';                        // reset the original '='
+                break;
+            }
+        }
+    }
+}
+
+
+inline STRING_VECTOR
+GetPot::__read_in_file(const char* FileName)
+{
+    std::ifstream  i(FileName);
+    if( ! i ) return STRING_VECTOR();
+    // argv[0] == the filename of the file that was read in
+    return __read_in_stream(i);
+}
+
+inline STRING_VECTOR
+GetPot::__read_in_stream(std::istream& istr)
+{
+    STRING_VECTOR  brute_tokens;
+    while(istr) {
+        __skip_whitespace(istr);
+
+        const std::string Token = __get_next_token(istr);
+        if( Token.length() == 0 || Token[0] == EOF) break;
+        brute_tokens.push_back(Token);
+    }
+
+    // -- reduce expressions of token1'='token2 to a single
+    //    string 'token1=token2'
+    // -- copy everything into 'argv'
+    // -- arguments preceded by something like '[' name ']' (section)
+    //    produce a second copy of each argument with a prefix '[name]argument'
+    unsigned i1 = 0;
+    unsigned i2 = 1;
+    unsigned i3 = 2;
+
+    STRING_VECTOR  arglist;
+    while( i1 < brute_tokens.size() ) {
+        const std::string& SRef = brute_tokens[i1];
+        // 1) concatinate 'abcdef' '=' 'efgasdef' to 'abcdef=efgasdef'
+        // note: java.lang.String: substring(a,b) = from a to b-1
+        //        C++ string:      substr(a,b)    = from a to a + b
+        if( i2 < brute_tokens.size() && brute_tokens[i2] == "=" ) {
+            if( i3 >= brute_tokens.size() )
+                arglist.push_back(brute_tokens[i1] + brute_tokens[i2]);
+            else
+                arglist.push_back(brute_tokens[i1] + brute_tokens[i2] + brute_tokens[i3]);
+            i1 = i3+1; i2 = i3+2; i3 = i3+3;
+            continue;
+        }
+        else {
+            arglist.push_back(SRef);
+            i1=i2; i2=i3; i3++;
+        }
+    }
+    return arglist;
+}
+
+inline void
+GetPot::__skip_whitespace(std::istream& istr)
+    // find next non-whitespace while deleting comments
+{
+    int tmp = istr.get();
+    do {
+        // -- search a non whitespace
+        while( isspace(tmp) ) {
+            tmp = istr.get();
+            if( ! istr ) return;
+        }
+
+        // -- look if characters match the comment starter string
+        const std::istream::pos_type  Pos = istr.tellg();
+        unsigned    i=0;
+        for(; i<_comment_start.length() ; ++i) {
+            if( tmp != _comment_start[i] ) { 
+// HACK: The following line throws off msvc8:
+//              istr.seekg(Pos);
+                // -- one step more backwards, since 'tmp' already at non-whitespace
+                istr.unget();
+                return; 
+            }
+            tmp = istr.get();
+            if( ! istr ) { istr.unget(); return; }
+        }
+        // 'tmp' contains last character of _comment_starter
+
+        // -- comment starter found -> search for comment ender
+        unsigned match_no=0;
+        while(1+1 == 2) {
+            tmp = istr.get();
+            if( ! istr ) { istr.unget(); return; }
+
+            if( tmp == _comment_end[match_no] ) { 
+                match_no++;
+                if( match_no == _comment_end.length() ) {
+                    istr.unget();
+                    break; // shuffle more whitespace, end of comment found
+                }
+            }
+            else
+                match_no = 0;
+        }
+
+        tmp = istr.get();
+
+    } while( istr );
+    istr.unget();
+}
+
+inline const std::string
+GetPot::__get_next_token(std::istream& istr)
+    // get next concatinates string token. consider quotes that embrace
+    // whitespaces
+{
+    std::string token;
+    int    tmp = 0;
+    int    last_letter = 0;
+    while(1+1 == 2) {
+        last_letter = tmp; tmp = istr.get();
+        if( tmp == EOF
+            || ((tmp == ' ' || tmp == '\t' || tmp == '\n') && last_letter != '\\') ) {
+            return token;
+        }
+        else if( tmp == '\'' && last_letter != '\\' ) {
+            // QUOTES: un-backslashed quotes => it's a string
+            token += __get_string(istr);
+            continue;
+        }
+        else if( tmp == '{' && last_letter == '$') {
+            token += '{' + __get_until_closing_bracket(istr);
+            continue;
+        }
+        else if( tmp == '$' && last_letter == '\\') {
+            token += tmp; tmp = 0;  //  so that last_letter will become = 0, not '$';
+            continue;
+        }
+        else if( tmp == '\\' && last_letter != '\\')
+            continue;              // don't append un-backslashed backslashes
+        token += tmp;
+    }
+}
+
+inline const std::string
+GetPot::__get_string(std::istream& istr)
+    // parse input until next matching '
+{
+    std::string str;
+    int    tmp = 0;
+    int    last_letter = 0;
+    while(1 + 1 == 2) {
+        last_letter = tmp; tmp = istr.get();
+        if( tmp == EOF)  return str;
+        // un-backslashed quotes => it's the end of the string
+        else if( tmp == '\'' && last_letter != '\\')  return str;
+        else if( tmp == '\\' && last_letter != '\\')  continue; // don't append
+
+        str += tmp;
+    }
+}
+
+inline const std::string
+GetPot::__get_until_closing_bracket(std::istream& istr)
+    // parse input until next matching }
+{
+    std::string str = "";
+    int    tmp = 0;
+    int    last_letter = 0;
+    int    brackets = 1;
+    while(1 + 1 == 2) {
+        last_letter = tmp; tmp = istr.get();
+        if( tmp == EOF) return str;
+        else if( tmp == '{' && last_letter == '$') brackets += 1;
+        else if( tmp == '}') {
+            brackets -= 1;
+            // un-backslashed brackets => it's the end of the string
+            if( brackets == 0) return str + '}';
+            else if( tmp == '\\' && last_letter != '\\')
+                continue;  // do not append an unbackslashed backslash
+        }
+        str += tmp;
+    }
+}
+
+inline std::string
+GetPot::__process_section_label(const std::string& Section,
+                                STRING_VECTOR& section_stack)
+{
+    std::string sname = Section;
+    //  1) subsection of actual section ('./' prefix)
+    if( sname.length() >= 2 && sname.substr(0, 2) == "./" ) {
+        sname = sname.substr(2);
+    }
+    //  2) subsection of parent section ('../' prefix)
+    else if( sname.length() >= 3 && sname.substr(0, 3) == "../" ) {
+        do {
+            if( section_stack.end() != section_stack.begin() )
+                section_stack.pop_back();
+            sname = sname.substr(3);
+        } while( sname.substr(0, 3) == "../" );
+    }
+    // 3) subsection of the root-section
+    else {
+        section_stack.erase(section_stack.begin(), section_stack.end());
+        // [] => back to root section
+    }
+
+    if( sname != "" ) {
+        // parse section name for 'slashes'
+        unsigned i=0;
+        while( i < sname.length() ) {
+            if( sname[i] == '/' ) {
+                section_stack.push_back(sname.substr(0,i));
+                if( i+1 < sname.length()-1 )
+                    sname = sname.substr(i+1);
+                i = 0;
+            }
+            else
+                ++i;
+        }
+        section_stack.push_back(sname);
+    }
+    std::string section = "";
+    if( section_stack.size() != 0 ) {
+        victorate(std::string, section_stack, it)
+            section += *it + "/";
+    }
+    return section;
+}
+
+
+// convert string to DOUBLE, if not possible return Default
+inline double
+GetPot::__convert_to_type(const std::string& String, double Default) const
+{
+    double tmp;
+    if( sscanf(String.c_str(),"%lf", &tmp) != 1 ) return Default;
+    return tmp;
+}
+
+// convert string to INT, if not possible return Default
+inline int
+GetPot::__convert_to_type(const std::string& String, int Default) const
+{
+    // NOTE: intermediate results may be floating points, so that the string
+    //       may look like 2.0e1 (i.e. float format) => use float conversion
+    //       in any case.
+    return (int)__convert_to_type(String, (double)Default);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// (*) cursor oriented functions
+//.............................................................................
+inline const std::string
+GetPot::__get_remaining_string(const std::string& String, const std::string& Start) const
+    // Checks if 'String' begins with 'Start' and returns the remaining String.
+    // Returns None if String does not begin with Start.
+{
+    if( Start == "" ) return String;
+    // note: java.lang.String: substring(a,b) = from a to b-1
+    //        C++ string:      substr(a,b)    = from a to a + b
+    if( String.find(Start) == 0 ) return String.substr(Start.length());
+    else                          return "";
+}
+
+//     -- search for a certain argument and set cursor to position
+inline bool
+GetPot::search(const char* Option)
+{    
+    unsigned           OldCursor  = cursor;
+    const std::string  SearchTerm = prefix + Option;
+
+    // (*) record requested arguments for later ufo detection
+    __record_argument_request(SearchTerm);                             
+
+    if( OldCursor >= argv.size() ) OldCursor = static_cast<unsigned int>(argv.size()) - 1;
+    search_failed_f = true;
+
+    // (*) first loop from cursor position until end
+    unsigned  c = cursor;
+    for(; c < argv.size(); c++) {
+        if( argv[c] == SearchTerm )
+        { cursor = c; search_failed_f = false; return true; }
+    }
+    if( ! search_loop_f ) return false;
+
+    // (*) second loop from 0 to old cursor position
+    for(c = 1; c < OldCursor; c++) {
+        if( argv[c] == SearchTerm )
+        { cursor = c; search_failed_f = false; return true; }
+    }
+    // in case nothing is found the cursor stays where it was
+    return false;
+}
+
+
+inline bool
+GetPot::search(unsigned No, const char* P, ...)
+{
+    // (*) recording the requested arguments happens in subroutine 'search'
+    if( No == 0 ) return false;
+
+    // search for the first argument
+    if( search(P) == true ) return true;
+
+    // start interpreting variable argument list
+    va_list ap;
+    va_start(ap, P);
+    unsigned i = 1;
+    for(; i < No; ++i) {
+        char* Opt = va_arg(ap, char *);
+        if( search(Opt) == true ) break;
+    }
+    
+    if( i < No ) {
+        ++i;
+        // loop was left before end of array --> hit but 
+        // make sure that the rest of the search terms is marked
+        // as requested.
+        for(; i < No; ++i) {
+            char* Opt = va_arg(ap, char *);
+            // (*) record requested arguments for later ufo detection
+            __record_argument_request(Opt);
+        }
+        va_end(ap);
+        return true;
+    }
+
+    va_end(ap);
+    // loop was left normally --> no hit
+    return false;
+}
+
+inline void
+GetPot::reset_cursor()
+{ search_failed_f = false; cursor = 0; }
+
+inline void
+GetPot::init_multiple_occurrence()
+{ disable_loop(); reset_cursor(); }
+///////////////////////////////////////////////////////////////////////////////
+// (*) direct access to command line arguments
+//.............................................................................
+//
+inline const std::string
+GetPot::operator[](unsigned idx) const
+{ return idx < argv.size() ? argv[idx] : ""; }
+
+inline int
+GetPot::get(unsigned Idx, int Default) const
+{
+    if( Idx >= argv.size() ) return Default;
+    return __convert_to_type(argv[Idx], Default);
+}
+
+inline double
+GetPot::get(unsigned Idx, const double& Default) const
+{
+    if( Idx >= argv.size() ) return Default;
+    return __convert_to_type(argv[Idx], Default);
+}
+
+inline const std::string
+GetPot::get(unsigned Idx, const char* Default) const
+{
+    if( Idx >= argv.size() ) return Default;
+    else                     return argv[Idx];
+}
+
+inline unsigned
+GetPot::size() const
+{ return static_cast<unsigned int>(argv.size()); }
+
+
+//     -- next() function group
+inline int
+GetPot::next(int Default)
+{
+    if( search_failed_f ) return Default;
+    cursor++;
+    if( cursor >= argv.size() )  
+    { cursor = static_cast<unsigned int>(argv.size()); return Default; }
+
+    // (*) record requested argument for later ufo detection
+    __record_argument_request(argv[cursor]);
+
+    const std::string Remain = __get_remaining_string(argv[cursor], prefix);
+
+    return Remain != "" ? __convert_to_type(Remain, Default) : Default;
+}
+
+inline double
+GetPot::next(const double& Default)
+{
+    if( search_failed_f ) return Default;
+    cursor++;
+
+    if( cursor >= argv.size() )
+    { cursor = static_cast<unsigned int>(argv.size()); return Default; }
+
+    // (*) record requested argument for later ufo detection
+    __record_argument_request(argv[cursor]);
+
+    std::string Remain = __get_remaining_string(argv[cursor], prefix);
+
+    return Remain != "" ? __convert_to_type(Remain, Default) : Default;
+}
+
+inline const std::string
+GetPot::next(const char* Default)
+{
+    if( search_failed_f ) return Default;
+    cursor++;
+
+    if( cursor >= argv.size() )
+    { cursor = static_cast<unsigned int>(argv.size()); return Default; }
+
+    // (*) record requested argument for later ufo detection
+    __record_argument_request(argv[cursor]);
+
+    const std::string Remain = __get_remaining_string(argv[cursor], prefix);
+
+    if( Remain == "" ) return Default;
+
+
+    // (*) function returns a pointer to a char array (inside Remain)
+    //     this array will be deleted, though after this function call.
+    //     To ensure propper functioning, create a copy inside *this
+    //     object and only delete it, when *this is deleted.
+    char* result = new char[Remain.length()+1];
+    strncpy(result, Remain.c_str(), Remain.length()+1);
+
+    // store the created string internally, delete if when object deleted
+    __internal_string_container.push_back(result);
+
+    return result;
+}
+
+//     -- follow() function group
+//        distinct option to be searched for
+inline int
+GetPot::follow(int Default, const char* Option)
+{
+    // (*) record requested of argument is entirely handled in 'search()' and 'next()'
+    if( search(Option) == false ) return Default;
+    return next(Default);
+}
+
+inline double
+GetPot::follow(const double& Default, const char* Option)
+{
+    // (*) record requested of argument is entirely handled in 'search()' and 'next()'
+    if( search(Option) == false ) return Default;
+    return next(Default);
+}
+
+inline const std::string
+GetPot::follow(const char* Default, const char* Option)
+{
+    // (*) record requested of argument is entirely handled in 'search()' and 'next()'
+    if( search(Option) == false ) return Default;
+    return next(Default);
+}
+
+//     -- second follow() function group
+//        multiple option to be searched for
+inline int
+GetPot::follow(int Default, unsigned No, const char* P, ...)
+{
+    // (*) record requested of argument is entirely handled in 'search()' and 'next()'
+    if( No == 0 ) return Default;
+    if( search(P) == true ) return next(Default);
+
+    va_list ap;
+    va_start(ap, P);
+    unsigned i=1;
+    for(; i<No; ++i) {
+        char* Opt = va_arg(ap, char *);
+        if( search(Opt) == true ) {
+            va_end(ap);
+            return next(Default);
+        }
+    }
+    va_end(ap);
+    return Default;
+}
+
+inline double
+GetPot::follow(const double& Default, unsigned No, const char* P, ...)
+{
+    // (*) record requested of argument is entirely handled in 'search()' and 'next()'
+    if( No == 0 ) return Default;
+    if( search(P) == true ) return next(Default);
+
+    va_list ap;
+    va_start(ap, P);
+    for(unsigned i=1; i<No; ++i) {
+        char* Opt = va_arg(ap, char *);
+        if( search(Opt) == true ) {
+            va_end(ap);
+            return next(Default);
+        }
+    }
+    va_end(ap);
+    return Default;
+}
+
+inline const std::string
+GetPot::follow(const char* Default, unsigned No, const char* P, ...)
+{
+    // (*) record requested of argument is entirely handled in 'search()' and 'next()'
+    if( No == 0 ) return Default;
+    if( search(P) == true ) return next(Default);
+
+    va_list ap;
+    va_start(ap, P);
+    unsigned i=1;
+    for(; i<No; ++i) {
+        char* Opt = va_arg(ap, char *);
+        if( search(Opt) == true ) {
+            va_end(ap);
+            return next(Default);
+        }
+    }
+    va_end(ap);
+    return Default;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// (*) lists of nominus following an option
+//.............................................................................
+//
+inline std::vector<std::string> 
+GetPot::nominus_followers(const char* Option)
+{
+    std::vector<std::string>  result_list;
+    if( search(Option) == false ) return result_list;
+    while( 1 + 1 == 2 ) {
+        ++cursor;
+        if( cursor >= argv.size() ) { 
+            cursor = argv.size() - 1;
+            return result_list;
+        }
+        if( argv[cursor].length() >= 1 ) {
+            if( argv[cursor][0] == '-' ) {
+                return result_list;
+            }
+            // -- record for later ufo-detection
+            __record_argument_request(argv[cursor]);
+            // -- append to the result list
+            result_list.push_back(argv[cursor]);
+        }
+    }
+}
+
+inline std::vector<std::string> 
+GetPot::nominus_followers(unsigned No, ...)
+{
+    std::vector<std::string>  result_list;
+    // (*) record requested of argument is entirely handled in 'search()' 
+    //     and 'nominus_followers()'
+    if( No == 0 ) return result_list;
+
+    va_list ap;
+    va_start(ap, No);   
+    for(unsigned i=0; i<No; ++i) {
+        char* Option = va_arg(ap, char *);
+        std::vector<std::string> tmp = nominus_followers(Option);
+        result_list.insert(result_list.end(), tmp.begin(), tmp.end());
+
+        // std::cerr << "option = '" << Option << "'" << std::endl;
+        // std::cerr << "length = " << tmp.size() << std::endl;
+        // std::cerr << "new result list = <";
+        // for(std::vector<std::string>::const_iterator it = result_list.begin();
+        //    it != result_list.end(); ++it) 
+        //    std::cerr << *it << ", ";
+        // std::cerr << ">\n";
+    }
+    va_end(ap);
+    return result_list;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// (*) directly connected options
+//.............................................................................
+//
+inline int
+GetPot::direct_follow(int Default, const char* Option)
+{
+    const char* FollowStr = __match_starting_string(Option);
+    if( FollowStr == 0x0 )  return Default;
+
+    // (*) record requested of argument for later ufo-detection
+    __record_argument_request(std::string(Option) + FollowStr);
+
+    if( ++cursor >= static_cast<unsigned int>(argv.size()) ) cursor = static_cast<unsigned int>(argv.size());
+    return __convert_to_type(FollowStr, Default);
+}
+
+inline double
+GetPot::direct_follow(const double& Default, const char* Option)
+{
+    const char* FollowStr = __match_starting_string(Option);
+    if( FollowStr == 0 )  return Default;
+
+    // (*) record requested of argument for later ufo-detection
+    __record_argument_request(std::string(Option) + FollowStr);
+
+    if( ++cursor >= static_cast<unsigned int>(argv.size()) ) cursor = static_cast<unsigned int>(argv.size());
+    return __convert_to_type(FollowStr, Default);
+}
+
+inline const std::string
+GetPot::direct_follow(const char* Default, const char* Option)
+{
+    if( search_failed_f ) return Default;
+    const char* FollowStr = __match_starting_string(Option);
+    if( FollowStr == 0 )  return Default;
+
+    // (*) record requested of argument for later ufo-detection
+    if( FollowStr ) __record_argument_request(std::string(Option) + FollowStr);
+
+    if( ++cursor >= static_cast<unsigned int>(argv.size()) ) cursor = static_cast<unsigned int>(argv.size());
+    return std::string(FollowStr);
+}
+
+inline std::vector<std::string>
+GetPot::string_tails(const char* StartString)
+{
+    std::vector<std::string>  result;
+    const unsigned            N = static_cast<unsigned int>(strlen(StartString));
+
+    std::vector<std::string>::iterator it = argv.begin();
+
+    unsigned idx = 0;
+    while( it != argv.end() ) {
+        // (*) does start string match the given option?
+        //     NO -> goto next option
+        if( strncmp(StartString, (*it).c_str(), N) != 0) { ++it; ++idx; continue; }
+
+        // append the found tail to the result vector
+        result.push_back((*it).substr(N));
+                
+        // adapt the nominus vector
+        std::vector<unsigned>::iterator nit = idx_nominus.begin();
+        for(; nit != idx_nominus.end(); ++nit) {
+            if( *nit == idx ) {
+                idx_nominus.erase(nit);
+                for(; nit != idx_nominus.end(); ++nit) *nit -= 1;
+                break;
+            }
+        }
+        
+        // erase the found option
+        argv.erase(it);
+
+        // 100% safe solution: set iterator back to the beginning.
+        // (normally, 'it--' would be enough, but who knows how the
+        // iterator is implemented and .erase() definitely invalidates
+        // the current iterator position.
+        if( argv.empty() ) break;
+        it = argv.begin();
+    }
+    cursor = 0;
+    nominus_cursor = -1;
+    return result;
+}
+
+inline std::vector<int>
+GetPot::int_tails(const char* StartString, const int Default /* = -1 */)
+{
+    std::vector<int>  result;
+    const unsigned    N = static_cast<unsigned int>(strlen(StartString));
+
+    std::vector<std::string>::iterator it = argv.begin();
+
+    unsigned idx = 0;
+    while( it != argv.end() ) {
+        // (*) does start string match the given option?
+        //     NO -> goto next option
+        if( strncmp(StartString, (*it).c_str(), N) != 0) { ++it; ++idx; continue; }
+            
+        // append the found tail to the result vector
+        result.push_back(__convert_to_type((*it).substr(N), Default));
+
+        // adapt the nominus vector
+        std::vector<unsigned>::iterator nit = idx_nominus.begin();
+        for(; nit != idx_nominus.end(); ++nit) {
+            if( *nit == idx ) {
+                idx_nominus.erase(nit);
+                for(; nit != idx_nominus.end(); ++nit) *nit -= 1;
+                break;
+            }
+        }
+
+        // erase the found option
+        argv.erase(it);
+        
+        // 100% safe solution: set iterator back to the beginning.
+        // (normally, 'it--' would be enough, but who knows how the
+        // iterator is implemented and .erase() definitely invalidates
+        // the current iterator position.
+        if( argv.empty() ) break;
+        it = argv.begin();
+    }
+    cursor = 0;
+    nominus_cursor = -1;
+    return result;
+}
+
+inline std::vector<double>
+GetPot::double_tails(const char*  StartString, 
+                     const double Default /* = -1.0 */)
+{
+    std::vector<double>  result;
+    const unsigned       N = static_cast<unsigned int>(strlen(StartString));
+
+    std::vector<std::string>::iterator it = argv.begin();
+    unsigned                           idx = 0;
+    while( it != argv.end() ) {
+        // (*) does start string match the given option?
+        //     NO -> goto next option
+        if( strncmp(StartString, (*it).c_str(), N) != 0) { ++it; ++idx; continue; }
+            
+        // append the found tail to the result vector
+        result.push_back(__convert_to_type((*it).substr(N), Default));
+
+        // adapt the nominus vector
+        std::vector<unsigned>::iterator nit = idx_nominus.begin();
+        for(; nit != idx_nominus.end(); ++nit) {
+            if( *nit == idx ) {
+                idx_nominus.erase(nit);
+                for(; nit != idx_nominus.end(); ++nit) *nit -= 1;
+                break;
+            }
+        }
+
+        // erase the found option
+        argv.erase(it);
+        
+        // 100% safe solution: set iterator back to the beginning.
+        // (normally, 'it--' would be enough, but who knows how the
+        // iterator is implemented and .erase() definitely invalidates
+        // the current iterator position.
+        if( argv.empty() ) break;
+        it = argv.begin();
+    }
+    cursor = 0;
+    nominus_cursor = -1;
+    return result;
+}
+
+
+
+
+
+inline const char*
+GetPot::__match_starting_string(const char* StartString)
+    // pointer  to the place where the string after
+    //          the match inside the found argument starts.
+    // 0        no argument matches the starting string.
+{
+    const unsigned N         = static_cast<unsigned int>(strlen(StartString));
+    unsigned       OldCursor = cursor;
+
+    if( OldCursor >= static_cast<unsigned int>(argv.size()) ) OldCursor = static_cast<unsigned int>(argv.size()) - 1;
+    search_failed_f = true;
+
+    // (*) first loop from cursor position until end
+    unsigned c = cursor;
+    for(; c < argv.size(); c++) {
+        if( strncmp(StartString, argv[c].c_str(), N) == 0)
+        { cursor = c; search_failed_f = false; return &(argv[c].c_str()[N]); }
+    }
+
+    if( ! search_loop_f ) return false;
+
+    // (*) second loop from 0 to old cursor position
+    for(c = 1; c < OldCursor; c++) {
+        if( strncmp(StartString, argv[c].c_str(), N) == 0)
+        { cursor = c; search_failed_f = false; return &(argv[c].c_str()[N]); }
+    }
+    return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// (*) search for flags
+//.............................................................................
+//
+inline bool
+GetPot::options_contain(const char* FlagList) const
+{
+    // go through all arguments that start with a '-' (but not '--')
+    std::string str;
+    STRING_VECTOR::const_iterator it = argv.begin();
+    for(; it != argv.end(); ++it) {
+        str = __get_remaining_string(*it, prefix);
+
+        if( str.length() >= 2 && str[0] == '-' && str[1] != '-' )
+            if( __check_flags(str, FlagList) ) return true;
+    }
+    return false;
+}
+
+inline bool
+GetPot::argument_contains(unsigned Idx, const char* FlagList) const
+{
+    if( Idx >= argv.size() ) return false;
+
+    // (*) record requested of argument for later ufo-detection
+    //     an argument that is checked for flags is considered to be 'requested'
+    ((GetPot*)this)->__record_argument_request(argv[Idx]);
+
+    if( prefix == "" )
+        // search argument for any flag in flag list
+        return __check_flags(argv[Idx], FlagList);
+
+    // if a prefix is set, then the argument index is the index
+    //   inside the 'namespace'
+    // => only check list of arguments that start with prefix
+    unsigned no_matches = 0;
+    unsigned i=0;
+    for(; i<argv.size(); ++i) {
+        const std::string Remain = __get_remaining_string(argv[i], prefix);
+        if( Remain != "") {
+            no_matches += 1;
+            if( no_matches == Idx)
+                return __check_flags(Remain, FlagList);
+        }
+    }
+    // no argument in this namespace
+    return false;
+}
+
+inline bool
+GetPot::__check_flags(const std::string& Str, const char* FlagList) const
+{
+    const char* p=FlagList;
+    for(; *p != '\0' ; p++)
+        if( Str.find(*p) != std::string::npos ) return true; // found something
+    return false;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// (*) nominus arguments
+inline STRING_VECTOR
+GetPot::nominus_vector() const
+    // return vector of nominus arguments
+{
+    STRING_VECTOR nv;
+    std::vector<unsigned>::const_iterator it = idx_nominus.begin();
+    for(; it != idx_nominus.end(); ++it) {
+        nv.push_back(argv[*it]);
+
+        // (*) record for later ufo-detection
+        //     when a nominus vector is requested, the entire set of nominus arguments are 
+        //     tagged as 'requested'
+        ((GetPot*)this)->__record_argument_request(argv[*it]);
+    }
+    return nv;
+}
+
+inline std::string
+GetPot::next_nominus()
+{
+    if( nominus_cursor < int(idx_nominus.size()) - 1 ) {
+        const std::string Tmp = argv[idx_nominus[++nominus_cursor]];
+
+        // (*) record for later ufo-detection
+        __record_argument_request(Tmp);
+
+        // -- cannot use the Tmp variable, since it is temporary and c_str() will return a pointer
+        //    to something that does no longer exist.
+        return Tmp; 
+    }
+    return std::string("");
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// (*) variables
+//.............................................................................
+//
+inline int
+GetPot::operator()(const char* VarName, int Default) const
+{
+    // (*) recording of requested variables happens in '__find_variable()'
+    const variable*  sv = __find_variable(VarName);
+    if( sv == 0 ) return Default;
+    return __convert_to_type(sv->original, Default);
+}
+
+inline double
+GetPot::operator()(const char* VarName, const double& Default) const
+{
+    // (*) recording of requested variables happens in '__find_variable()'
+    const variable*  sv = __find_variable(VarName);
+    if( sv == 0 ) return Default;
+    return __convert_to_type(sv->original, Default);
+}
+
+inline const std::string
+GetPot::operator()(const char* VarName, const char* Default) const
+{
+    // (*) recording of requested variables happens in '__find_variable()'
+    const variable*  sv = __find_variable(VarName);
+    if( sv == 0 ) return Default;
+    // -- returning a c_str() pointer is OK here, since the variable remains existant,
+    //    while 'sv' of course is delete at the end of the function.
+    return sv->original;
+}
+
+inline int
+GetPot::operator()(const char* VarName, int Default, unsigned Idx) const
+{
+    // (*) recording of requested variables happens in '__find_variable()'
+    const variable* sv = __find_variable(VarName);
+    if( sv == 0 ) return Default;
+    const std::string*  element = sv->get_element(Idx);
+    if( element == 0 ) return Default;
+    return __convert_to_type(*element, Default);
+}
+
+inline double
+GetPot::operator()(const char* VarName, const double& Default, unsigned Idx) const
+{
+    // (*) recording of requested variables happens in '__find_variable()'
+    const variable* sv = __find_variable(VarName);
+    if( sv == 0 ) return Default;
+    const std::string*  element = sv->get_element(Idx);
+    if( element == 0 ) return Default;
+    return __convert_to_type(*element, Default);
+}
+
+inline const std::string
+GetPot::operator()(const char* VarName, const char* Default, unsigned Idx) const
+{
+    // (*) recording of requested variables happens in '__find_variable()'
+    const variable*  sv = __find_variable(VarName);
+    if( sv == 0 ) return Default;
+    const std::string* element = sv->get_element(Idx);
+    if( element == 0 )  return Default;
+    return *element;
+}
+
+inline void 
+GetPot::__record_argument_request(const std::string& Name)
+{
+    if( ! __request_recording_f ) return; 
+
+    // (*) record requested variable for later ufo detection
+    _requested_arguments.push_back(Name);
+
+    // (*) record considered section for ufo detection
+    STRING_VECTOR      STree = __get_section_tree(Name);
+    victorate(std::string, STree, it)
+        if( find(_requested_sections.begin(), _requested_sections.end(), *it) == _requested_sections.end() )
+            if( section.length() != 0 ) _requested_sections.push_back(*it);
+}
+
+inline void 
+GetPot::__record_variable_request(const std::string& Name)
+{
+    if( ! __request_recording_f ) return; 
+
+    // (*) record requested variable for later ufo detection
+    _requested_variables.push_back(Name);
+
+    // (*) record considered section for ufo detection
+    STRING_VECTOR      STree = __get_section_tree(Name);
+    victorate(std::string, STree, it)
+        if( find(_requested_sections.begin(), _requested_sections.end(), *it) == _requested_sections.end() )
+            if( section.length() != 0 ) _requested_sections.push_back(*it);
+}
+
+// (*) following functions are to be used from 'outside', after getpot has parsed its
+//     arguments => append an argument in the argument vector that reflects the addition
+inline void
+GetPot::__set_variable(const char* VarName, const char* Value)
+{
+    const GetPot::variable* Var = __find_variable(VarName);
+    if( Var == 0 ) variables.push_back(variable(VarName, Value, _field_separator.c_str()));
+    else           ((GetPot::variable*)Var)->take(Value, _field_separator.c_str());    
+}
+
+inline void
+GetPot::set(const char* VarName, const char* Value, const bool Requested /* = yes */)
+{     
+    const std::string Arg = prefix + std::string(VarName) + std::string("=") + std::string(Value);
+    argv.push_back(Arg);
+    __set_variable(VarName, Value);
+
+    // if user does not specify the variable as 'not being requested' it will be 
+    // considered amongst the requested variables
+    if( Requested ) __record_variable_request(Arg);
+}
+
+inline void
+GetPot::set(const char* VarName, const double& Value, const bool Requested /* = yes */)
+{ __set_variable(VarName, __double2string(Value).c_str()); }
+
+inline void 
+GetPot::set(const char* VarName, const int Value, const bool Requested /* = yes */)
+{ __set_variable(VarName, __int2string(Value).c_str()); }
+
+
+inline unsigned
+GetPot::vector_variable_size(const char* VarName) const
+{
+    const variable*  sv = __find_variable(VarName);
+    if( sv == 0 ) return 0;
+    return static_cast<unsigned int>(sv->value.size());
+}
+
+inline STRING_VECTOR
+GetPot::get_variable_names() const
+{
+    STRING_VECTOR  result;
+    std::vector<GetPot::variable>::const_iterator it = variables.begin();
+    for(; it != variables.end(); ++it) {
+        const std::string Tmp = __get_remaining_string((*it).name, prefix);
+        if( Tmp != "" ) result.push_back(Tmp);
+    }
+    return result;
+}
+
+inline STRING_VECTOR
+GetPot::get_section_names() const
+{ return section_list; }
+
+inline const GetPot::variable*
+GetPot::__find_variable(const char* VarName) const
+{
+    const std::string Name = prefix + VarName;
+
+    // (*) record requested variable for later ufo detection
+    ((GetPot*)this)->__record_variable_request(Name);
+
+    std::vector<variable>::const_iterator it = variables.begin();
+    for(; it != variables.end(); ++it) {
+        if( (*it).name == Name ) return &(*it);
+    }
+    return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// (*) ouput (basically for debugging reasons
+//.............................................................................
+//
+inline int
+GetPot::print() const
+{
+    std::cout << "argc = " << static_cast<unsigned int>(argv.size()) << std::endl;
+    STRING_VECTOR::const_iterator it = argv.begin();
+    for(; it != argv.end(); ++it)
+        std::cout << *it << std::endl;
+    std::cout << std::endl;
+    return 1;
+}
+
+// (*) dollar bracket expressions (DBEs) ------------------------------------
+//
+//     1) Entry Function: __DBE_expand_string()
+//        Takes a string such as
+//
+//          "${+ ${x} ${y}}   Subject-${& ${section} ${subsection}}:   ${title}"
+//
+//        calls __DBE_expand() for each of the expressions
+//
+//           ${+ ${x} ${y}}
+//           ${& ${section} ${subsection}}
+//           ${Title}
+//
+//        and returns the string
+//
+//          "4711 Subject-1.01:   Mit den Clowns kamen die Schwaene"
+//
+//        assuming that
+//            x          = "4699"
+//            y          = "12"
+//            section    = "1."
+//            subsection = "01"
+//            title      = "Mit den Clowns kamen die Schwaene"
+//
+//      2) __DBE_expand():
+//
+//           checks for the command, i.e. the 'sign' that follows '${'
+//           divides the argument list into sub-expressions using
+//           __DBE_get_expr_list()
+//
+//           ${+ ${x} ${y}}                 -> "${x}"  "${y}"
+//           ${& ${section} ${subsection}}  -> "${section}" "${subsection}"
+//           ${Title}                       -> Nothing, variable expansion
+//
+//      3) __DBE_expression_list():
+//
+//           builds a vector of unbracketed whitespace separated strings, i.e.
+//
+//           "  ${Number}.a ${: Das Marmorbild} AB-${& Author= ${Eichendorf}-1870}"
+//
+//           is split into a vector
+//
+//              [0] ${Number}.a
+//              [1] ${: Das Marmorbild}
+//              [2] AB-${& Author= ${Eichendorf}}-1870
+//
+//           Each sub-expression is expanded using expand().
+//---------------------------------------------------------------------------
+inline std::string
+GetPot::__DBE_expand_string(const std::string str)
+{
+    // Parses for closing operators '${ }' and expands them letting
+    // white spaces and other letters as they are.
+    std::string   new_string = "";
+    unsigned open_brackets = 0;
+    unsigned first = 0;
+    unsigned i = 0;
+    for(;  i<str.size(); ++i) {
+        if( i < str.size() - 2 && str.substr(i, 2) == "${" ) {
+            if( open_brackets == 0 ) first = i+2;
+            open_brackets++;
+        }
+        else if( str[i] == '}' && open_brackets > 0) {
+            open_brackets -= 1;
+            if( open_brackets == 0 ) {
+                const std::string Replacement = __DBE_expand(str.substr(first, i - first));
+                new_string += Replacement;
+            }
+        }
+        else if( open_brackets == 0 )
+            new_string += str[i];
+    }
+    return new_string;
+}
+
+inline STRING_VECTOR
+GetPot::__DBE_get_expr_list(const std::string str_, const unsigned ExpectedNumber)
+    // ensures that the resulting vector has the expected number
+    // of arguments, but they may contain an error message
+{
+    std::string str = str_;
+    // Separates expressions by non-bracketed whitespaces, expands them
+    // and puts them into a list.
+
+    unsigned i=0;
+    // (1) eat initial whitespaces
+    for(; i < str.size(); ++i)
+        if( ! isspace(str[i]) ) break;
+
+    STRING_VECTOR   expr_list;
+    unsigned         open_brackets = 0;
+    std::vector<unsigned> start_idx;
+    unsigned         start_new_string = i;
+    unsigned         l = static_cast<unsigned int>(str.size());
+
+    // (2) search for ${ } expressions ...
+    while( i < l ) {
+        const char letter = str[i];
+        // whitespace -> end of expression
+        if( isspace(letter) && open_brackets == 0) {
+            expr_list.push_back(str.substr(start_new_string, i - start_new_string));
+            bool no_breakout_f = true;
+            for(++i; i < l ; ++i) {
+                if( ! isspace(str[i]) )
+                { no_breakout_f = false; start_new_string = i; break; }
+            }
+            if( no_breakout_f ) {
+                // end of expression list
+                if( expr_list.size() < ExpectedNumber ) {
+                    const std::string   pre_tmp("<< ${ }: missing arguments>>");
+                    STRING_VECTOR tmp(ExpectedNumber - expr_list.size(), pre_tmp);
+                    expr_list.insert(expr_list.end(), tmp.begin(), tmp.end());
+                }
+                return expr_list;
+            }
+        }
+
+        // dollar-bracket expression
+        if( str.length() >= i+2 && str.substr(i, 2) == "${" ) {
+            open_brackets++;
+            start_idx.push_back(i+2);
+        }
+        else if( letter == '}' && open_brackets > 0) {
+            int start = start_idx[start_idx.size()-1];
+            start_idx.pop_back();
+            const std::string Replacement = __DBE_expand(str.substr(start, i-start));
+            if( start - 3 < (int)0)
+                str = Replacement + str.substr(i+1);
+            else
+                str = str.substr(0, start-2) + Replacement + str.substr(i+1);
+            l = static_cast<unsigned int>(str.size());
+            i = start + static_cast<unsigned int>(Replacement.size()) - 3;
+            open_brackets--;
+        }
+        ++i;
+    }
+
+    // end of expression list
+    expr_list.push_back(str.substr(start_new_string, i-start_new_string));
+
+    if( expr_list.size() < ExpectedNumber ) {
+        const std::string   pre_tmp("<< ${ }: missing arguments>>");
+        STRING_VECTOR tmp(ExpectedNumber - expr_list.size(), pre_tmp);
+        expr_list.insert(expr_list.end(), tmp.begin(), tmp.end());
+    }
+
+    return expr_list;
+}
+
+inline const GetPot::variable*
+GetPot::__DBE_get_variable(std::string VarName)
+{
+    static GetPot::variable ev;
+    std::string secure_Prefix = prefix;
+
+    prefix = section;
+    // (1) first search in currently active section
+    const GetPot::variable* var = __find_variable(VarName.c_str());
+    if( var != 0 ) { prefix = secure_Prefix; return var; }
+
+    // (2) search in root name space
+    prefix = "";
+    var = __find_variable(VarName.c_str());
+    if( var != 0 ) { prefix = secure_Prefix; return var; }
+
+    prefix = secure_Prefix;
+
+    // error occured => variable name == ""
+    char* tmp = new char[VarName.length() + 25];
+#ifndef WIN32
+    snprintf(tmp, (int)sizeof(char)*(VarName.length() + 25), 
+#else
+    _snprintf(tmp, sizeof(char)*(VarName.length() + 25), 
+#endif
+             "<<${ } variable '%s' undefined>>", VarName.c_str());
+    ev.name = "";
+    ev.original = std::string(tmp);
+    delete [] tmp;
+    return &ev;
+}
+
+inline std::string
+GetPot::__DBE_expand(const std::string expr)
+{
+    // ${: } pure text
+    if( expr[0] == ':' )
+        return expr.substr(1);
+
+    // ${& expr expr ... } text concatination
+    else if( expr[0] == '&' ) {
+        const STRING_VECTOR A = __DBE_get_expr_list(expr.substr(1), 1);
+
+        STRING_VECTOR::const_iterator it = A.begin();
+        std::string result = *it++;
+        for(; it != A.end(); ++it) result += *it;
+
+        return result;
+    }
+
+    // ${<-> expr expr expr} text replacement
+    else if( expr.length() >= 3 && expr.substr(0, 3) == "<->" ) {
+        STRING_VECTOR A = __DBE_get_expr_list(expr.substr(3), 3);
+        std::string::size_type tmp = 0;
+        const std::string::size_type L = A[1].length();
+        while( (tmp = A[0].find(A[1])) != std::string::npos ) {
+            A[0].replace(tmp, L, A[2]);
+        }
+        return A[0];
+    }
+    // ${+ ...}, ${- ...}, ${* ...}, ${/ ...} expressions
+    else if( expr[0] == '+' ) {
+        STRING_VECTOR A = __DBE_get_expr_list(expr.substr(1), 2);
+        STRING_VECTOR::const_iterator it = A.begin();
+        double result = __convert_to_type(*it++, 0.0);
+        for(; it != A.end(); ++it)
+            result += __convert_to_type(*it, 0.0);
+
+        return __double2string(result);
+    }
+    else if( expr[0] == '-' ) {
+        STRING_VECTOR A = __DBE_get_expr_list(expr.substr(1), 2);
+        STRING_VECTOR::const_iterator it = A.begin();
+        double result = __convert_to_type(*it++, 0.0);
+        for(; it != A.end(); ++it)
+            result -= __convert_to_type(*it, 0.0);
+
+        return __double2string(result);
+    }
+    else if( expr[0] == '*' ) {
+        STRING_VECTOR A = __DBE_get_expr_list(expr.substr(1), 2);
+        STRING_VECTOR::const_iterator it = A.begin();
+        double result = __convert_to_type(*it++, 0.0);
+        for(; it != A.end(); ++it)
+            result *= __convert_to_type(*it, 0.0);
+
+        return __double2string(result);
+    }
+    else if( expr[0] == '/' ) {
+
+        STRING_VECTOR A = __DBE_get_expr_list(expr.substr(1), 2);
+        STRING_VECTOR::const_iterator it = A.begin();
+        double result = __convert_to_type(*it++, 0.0);
+        if( result == 0 ) return "0.0";
+        for(; it != A.end(); ++it) {
+            const double Q = __convert_to_type(*it, 0.0);
+            if( Q == 0.0 ) return "0.0";
+            result /= Q;
+        }
+        return __double2string(result);
+    }
+
+    // ${^ ... } power expressions
+    else if( expr[0] == '^' ) {
+        STRING_VECTOR A = __DBE_get_expr_list(expr.substr(1), 2);
+        STRING_VECTOR::const_iterator it = A.begin();
+        double result = __convert_to_type(*it++, 0.0);
+        for(; it != A.end(); ++it)
+            result = pow(result, __convert_to_type(*it, 0.0));
+        return __double2string(result);
+    }
+
+    // ${==  } ${<=  } ${>= } comparisons (return the number of the first 'match'
+    else if( expr.length() >= 2 &&
+             ( expr.substr(0,2) == "==" || expr.substr(0,2) == ">=" ||
+               expr.substr(0,2) == "<=" || expr[0] == '>'           || expr[0] == '<')) {
+        // differentiate between two and one sign operators
+        unsigned op = 0;
+        enum { EQ, GEQ, LEQ, GT, LT };
+        if      ( expr.substr(0, 2) == "==" ) op = EQ;
+        else if ( expr.substr(0, 2) == ">=" ) op = GEQ;
+        else if ( expr.substr(0, 2) == "<=" ) op = LEQ;
+        else if ( expr[0] == '>' )            op = GT;
+        else    /*                     "<" */ op = LT;
+
+        STRING_VECTOR a;
+        if ( op == GT || op == LT ) a = __DBE_get_expr_list(expr.substr(1), 2);
+        else                        a = __DBE_get_expr_list(expr.substr(2), 2);
+
+        std::string   x_orig = a[0];
+        double   x = __convert_to_type(x_orig, 1e37);
+        unsigned i = 1;
+
+        STRING_VECTOR::const_iterator y_orig = a.begin();
+        for(y_orig++; y_orig != a.end(); y_orig++) {
+            double y = __convert_to_type(*y_orig, 1e37);
+
+            // set the strings as reference if one wasn't a number
+            if ( x == 1e37 || y == 1e37 ) {
+                // it's a string comparison
+                if( (op == EQ  && x_orig == *y_orig) || (op == GEQ && x_orig >= *y_orig) ||
+                    (op == LEQ && x_orig <= *y_orig) || (op == GT  && x_orig >  *y_orig) ||
+                    (op == LT  && x_orig <  *y_orig) )
+                    return __int2string(i);
+            }
+            else {
+                // it's a number comparison
+                if( (op == EQ  && x == y) || (op == GEQ && x >= y) ||
+                    (op == LEQ && x <= y) || (op == GT  && x >  y) ||
+                    (op == LT  && x <  y) )
+                    return __int2string(i);
+            }
+            ++i;
+        }
+
+        // nothing fulfills the condition => return 0
+        return "0";
+    }
+    // ${?? expr expr} select
+    else if( expr.length() >= 2 && expr.substr(0, 2) == "??" ) {
+        STRING_VECTOR a = __DBE_get_expr_list(expr.substr(2), 2);
+        double x = __convert_to_type(a[0], 1e37);
+        // last element is always the default argument
+        if( x == 1e37 || x < 0 || x >= a.size() - 1 ) return a[a.size()-1];
+
+        // round x to closest integer
+        return a[int(x+0.5)];
+    }
+    // ${? expr expr expr} if then else conditions
+    else if( expr[0] == '?' ) {
+        STRING_VECTOR a = __DBE_get_expr_list(expr.substr(1), 2);
+        if( __convert_to_type(a[0], 0.0) == 1.0 ) return a[1];
+        else if( a.size() > 2 ) return a[2];
+    }
+    // ${! expr} maxro expansion
+    else if( expr[0] == '!' ) {
+        const GetPot::variable* Var = __DBE_get_variable(expr.substr(1));
+        // error
+        if( Var->name == "" ) return std::string(Var->original);
+
+        const STRING_VECTOR A = __DBE_get_expr_list(Var->original, 2);
+        return A[0];
+    }
+    // ${@: } - string subscription
+    else if( expr.length() >= 2 && expr.substr(0,2) == "@:" ) {
+        const STRING_VECTOR A = __DBE_get_expr_list(expr.substr(2), 2);
+        double x = __convert_to_type(A[1], 1e37);
+
+        // last element is always the default argument
+        if( x == 1e37 || x < 0 || x >= A[0].size() - 1)
+            return "<<1st index out of range>>";
+
+        if( A.size() > 2 ) {
+            double y = __convert_to_type(A[2], 1e37);
+            if ( y != 1e37 && y > 0 && y <= A[0].size() - 1 && y > x )
+                return A[0].substr(int(x+0.5), int(y+1.5) - int(x+0.5));
+            else if( y == -1 )
+                return A[0].substr(int(x+0.5));
+            return "<<2nd index out of range>>";
+        }
+        else {
+            char* tmp = new char[2];
+            tmp[0] = A[0][int(x+0.5)]; tmp[1] = '\0';
+            std::string result(tmp);
+            delete [] tmp;
+            return result;
+        }
+    }
+    // ${@ } - vector subscription
+    else if( expr[0] == '@' ) {
+        STRING_VECTOR          A   = __DBE_get_expr_list(expr.substr(1), 2);
+        const GetPot::variable* Var = __DBE_get_variable(A[0]);
+        // error
+        if( Var->name == "" ) {
+            // make a copy of the string if an error occured
+            // (since the error variable is a static variable inside get_variable())
+            return std::string(Var->original);
+        }
+
+        double x = __convert_to_type(A[1], 1e37);
+
+        // last element is always the default argument
+        if (x == 1e37 || x < 0 || x >= Var->value.size() )
+            return "<<1st index out of range>>";
+
+        if ( A.size() > 2) {
+            double y = __convert_to_type(A[2], 1e37);
+            int    begin = int(x+0.5);
+            int    end = 0;
+            if ( y != 1e37 && y > 0 && y <= Var->value.size() && y > x)
+                end = int(y+1.5);
+            else if( y == -1 )
+                end = static_cast<unsigned int>(Var->value.size());
+            else
+                return "<<2nd index out of range>>";
+
+            std::string result = *(Var->get_element(begin));
+            int i = begin+1;
+            for(; i < end; ++i)
+                result += std::string(" ") + *(Var->get_element(i));
+            return result;
+        }
+        else
+            return *(Var->get_element(int(x+0.5)));
+    }
+
+    const STRING_VECTOR    A = __DBE_get_expr_list(expr, 1);
+    const GetPot::variable* B = __DBE_get_variable(A[0]);
+
+    // make a copy of the string if an error occured
+    // (since the error variable is a static variable inside get_variable())
+    if( B->name == "" ) return std::string(B->original);
+    // (psuggs@pobox.com mentioned to me the warning MSVC++6.0 produces
+    //  with:  else return B->original (thanks))
+    return B->original;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// (*) unidentified flying objects
+//.............................................................................
+//
+inline bool
+GetPot::__search_string_vector(const STRING_VECTOR& VecStr, const std::string& Str) const
+{
+    victorate(std::string, VecStr, itk) {
+        if( *itk == Str ) return true;
+    }
+    return false;
+}
+
+inline STRING_VECTOR
+GetPot::unidentified_arguments(unsigned Number,
+                               const char* KnownArgument1, ...) const
+{
+    STRING_VECTOR known_arguments;
+
+    // (1) create a vector of known arguments
+    if( Number == 0 ) return STRING_VECTOR();
+
+    va_list ap;
+    va_start(ap, KnownArgument1);
+    known_arguments.push_back(std::string(KnownArgument1));
+    unsigned i=1;
+    for(; i<Number; ++i)
+        known_arguments.push_back(std::string(va_arg(ap, char *)));
+    va_end(ap);
+
+    return unidentified_arguments(known_arguments);
+}
+
+inline STRING_VECTOR
+GetPot::unidentified_arguments() const
+{ return unidentified_arguments(_requested_arguments); }
+
+inline STRING_VECTOR
+GetPot::unidentified_arguments(const STRING_VECTOR& Knowns) const
+{
+    STRING_VECTOR ufos;
+    STRING_VECTOR::const_iterator it = argv.begin();
+    ++it; // forget about argv[0] (application or filename)
+    for(; it != argv.end(); ++it) {
+        // -- argument belongs to prefixed section ?
+        const std::string arg = __get_remaining_string(*it, prefix);
+        if( arg == "" ) continue;
+
+        // -- check if in list
+        if( __search_string_vector(Knowns, arg) == false)
+            ufos.push_back(*it);
+    }
+    return ufos;
+}
+
+inline STRING_VECTOR
+GetPot::unidentified_options(unsigned Number,
+                             const char* KnownOption1, ...) const
+{
+    STRING_VECTOR known_options;
+
+    // (1) create a vector of known arguments
+    if( Number == 0 ) return STRING_VECTOR();
+
+    va_list ap;
+    va_start(ap, KnownOption1);
+    known_options.push_back(std::string(KnownOption1));
+    unsigned i=1;
+    for(; i<Number; ++i)
+        known_options.push_back(std::string(va_arg(ap, char *)));
+    va_end(ap);
+
+    return unidentified_options(known_options);
+}
+
+inline STRING_VECTOR
+GetPot::unidentified_options() const
+{ 
+    // -- every option is an argument. 
+    // -- the set of requested arguments contains the set of requested options. 
+    // -- IF the set of requested arguments contains unrequested options, 
+    //    THEN they were requested as 'follow' and 'next' arguments and not as real options.
+    //
+    // => it is not necessary to separate requested options from the list
+    STRING_VECTOR option_list;
+    victorate(std::string, _requested_arguments, it) {
+        const std::string arg = *it;
+        if( arg.length() == 0 ) continue;
+        if( arg[0] == '-' )     option_list.push_back(arg);
+    }   
+    return unidentified_options(option_list); 
+}
+
+inline STRING_VECTOR
+GetPot::unidentified_options(const STRING_VECTOR& Knowns) const
+{
+    STRING_VECTOR ufos;
+    STRING_VECTOR::const_iterator it = argv.begin();
+    ++it; // forget about argv[0] (application or filename)
+    for(; it != argv.end(); ++it) {
+        // -- argument belongs to prefixed section ?
+        const std::string arg = __get_remaining_string(*it, prefix);
+        if( arg == "" ) continue;
+
+        // is argument really an option (starting with '-') ?
+        if( arg.length() < 1 || arg[0] != '-' ) continue;
+
+        if( __search_string_vector(Knowns, arg) == false)
+            ufos.push_back(*it);
+    }
+
+    return ufos;
+}
+
+inline std::string
+GetPot::unidentified_flags(const char* KnownFlagList, int ArgumentNumber=-1) const
+    // Two modes:
+    //  ArgumentNumber >= 0 check specific argument
+    //  ArgumentNumber == -1 check all options starting with one '-'
+    //                       for flags
+{
+    std::string         ufos;
+    STRING_VECTOR known_arguments;
+    std::string         KFL(KnownFlagList);
+
+    // (2) iteration over '-' arguments (options)
+    if( ArgumentNumber == -1 ) {
+        STRING_VECTOR::const_iterator it = argv.begin();
+        ++it; // forget about argv[0] (application or filename)
+        for(; it != argv.end(); ++it) {
+            // -- argument belongs to prefixed section ?
+            const std::string arg = __get_remaining_string(*it, prefix);
+            if( arg == "" ) continue;
+
+            // -- does arguments start with '-' (but not '--')
+            if     ( arg.length() < 2 ) continue;
+            else if( arg[0] != '-' )    continue;
+            else if( arg[1] == '-' )    continue;
+
+            // -- check out if flags inside option are contained in KnownFlagList
+            const char* p=arg.c_str();
+            p++; // skip starting minus
+            for(; *p != '\0' ; p++)
+                if( KFL.find(*p) == std::string::npos ) ufos += *p;
+        }
+    }
+    // (1) check specific argument
+    else {
+        // -- only check arguments that start with prefix
+        int no_matches = 0;
+        unsigned i=1;
+        for(; i<argv.size(); ++i) {
+            const std::string Remain = __get_remaining_string(argv[i], prefix);
+            if( Remain != "") {
+                no_matches++;
+                if( no_matches == ArgumentNumber) {
+                    // -- the right argument number inside the section is found
+                    // => check it for flags
+                    const char* p = Remain.c_str();
+                    p++; // skip starting minus
+                    for(; *p != '\0' ; p++)
+                        if( KFL.find(*p) == std::string::npos ) ufos += *p;
+                    return ufos;
+                }
+            }
+        }
+    }
+    return ufos;
+}
+
+inline STRING_VECTOR
+GetPot::unidentified_variables(unsigned Number,
+                               const char* KnownVariable1, ...) const
+{
+    STRING_VECTOR known_variables;
+
+    // create vector of known arguments
+    if( Number == 0 ) return STRING_VECTOR();
+
+    va_list ap;
+    va_start(ap, KnownVariable1);
+    known_variables.push_back(std::string(KnownVariable1));
+    unsigned i=1;
+    for(; i<Number; ++i)
+        known_variables.push_back(std::string(va_arg(ap, char *)));
+    va_end(ap);
+
+    return unidentified_variables(known_variables);
+}
+
+inline STRING_VECTOR
+GetPot::unidentified_variables(const STRING_VECTOR& Knowns) const
+{
+    STRING_VECTOR ufos;
+
+    victorate(GetPot::variable, variables, it) {
+        // -- check if variable has specific prefix
+        const std::string var_name = __get_remaining_string((*it).name, prefix);
+        if( var_name == "" ) continue;
+
+        // -- check if variable is known
+        if( __search_string_vector(Knowns, var_name) == false)
+            ufos.push_back((*it).name);
+    }
+    return ufos;
+}
+
+inline STRING_VECTOR
+GetPot::unidentified_variables() const
+{  return unidentified_variables(_requested_variables); }
+
+
+inline STRING_VECTOR
+GetPot::unidentified_sections(unsigned Number,
+                              const char* KnownSection1, ...) const
+{
+    STRING_VECTOR known_sections;
+
+    // (1) create a vector of known arguments
+    if( Number == 0 ) return STRING_VECTOR();
+
+    va_list ap;
+    va_start(ap, KnownSection1);
+    known_sections.push_back(std::string(KnownSection1));
+    unsigned i=1;
+    for(; i<Number; ++i) {
+        std::string tmp = std::string(va_arg(ap, char *));
+        if( tmp.length() == 0 ) continue;
+        if( tmp[tmp.length()-1] != '/' ) tmp += '/';
+        known_sections.push_back(tmp);
+    }
+    va_end(ap);
+
+    return unidentified_sections(known_sections);
+}
+
+inline STRING_VECTOR
+GetPot::unidentified_sections() const
+{ return unidentified_sections(_requested_sections); }
+
+inline STRING_VECTOR
+GetPot::unidentified_sections(const STRING_VECTOR& Knowns) const
+{
+    STRING_VECTOR ufos;
+
+    victorate(std::string, section_list, it) {
+        // -- check if section conform to prefix
+        const std::string sec_name = __get_remaining_string(*it, prefix);
+        if( sec_name == "" ) continue;
+
+        // -- check if section is known
+        if( __search_string_vector(Knowns, sec_name) == false )
+            ufos.push_back(*it);
+    }
+
+    return ufos;
+}
+
+
+inline STRING_VECTOR
+GetPot::unidentified_nominuses(unsigned Number, const char* Known, ...) const
+{
+    STRING_VECTOR known_nominuses;
+
+    // create vector of known arguments
+    if( Number == 0 ) return STRING_VECTOR();
+
+    va_list ap;
+    va_start(ap, Known);
+    known_nominuses.push_back(std::string(Known));
+    unsigned i=1;
+    for(; i<Number; ++i) {
+        std::string tmp = std::string(va_arg(ap, char *));
+        if( tmp.length() == 0 ) continue;
+        known_nominuses.push_back(tmp);
+    }
+    va_end(ap);
+
+    return unidentified_nominuses(known_nominuses);
+}
+
+inline STRING_VECTOR
+GetPot::unidentified_nominuses() const {
+    // -- every nominus is an argument. 
+    // -- the set of requested arguments contains the set of requested nominuss. 
+    // -- IF the set of requested arguments contains unrequested nominuss, 
+    //    THEN they were requested as 'follow' and 'next' arguments and not as real nominuses.
+    //
+    // => it is not necessary to separate requested nominus from the list
+
+    return unidentified_nominuses(_requested_arguments);
+}
+
+inline STRING_VECTOR
+GetPot::unidentified_nominuses(const STRING_VECTOR& Knowns) const
+{
+    STRING_VECTOR ufos;
+
+    // (2) iterate over all arguments
+    STRING_VECTOR::const_iterator it = argv.begin();
+    ++it; // forget about argv[0] (application or filename)
+    for(; it != argv.end(); ++it) {
+        // -- check if nominus part of prefix
+        const std::string arg = __get_remaining_string(*it, prefix);
+        if( arg == "" )                                         continue;
+
+        if( arg.length() < 1 )                                  continue;
+        // option ? --> not a nomius
+        if( arg[0] == '-' )                                     continue;
+        // section ? --> not a real nominus
+        if( arg[0] == '[' && arg[arg.length()-1] == ']' )       continue;
+        // variable definition ? --> not a real nominus
+        bool continue_f = false;
+        unsigned i=0;
+        for(; i<arg.length() ; ++i)
+            if( arg[i] == '=' ) { continue_f = true; break; }
+        if( continue_f )                                        continue;
+
+        // real nominuses are compared with the given list
+        if( __search_string_vector(Knowns, arg) == false )
+            ufos.push_back(*it);
+    }
+    return ufos;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// (*) variable class
+//.............................................................................
+//
+inline
+GetPot::variable::variable()
+{}
+
+inline
+GetPot::variable::variable(const variable& That)
+{
+#ifdef WIN32
+    operator=(That);
+#else
+    GetPot::variable::operator=(That);
+#endif
+}
+
+
+inline
+GetPot::variable::variable(const char* Name, const char* Value, const char* FieldSeparator)
+    : name(Name)
+{
+    // make a copy of the 'Value'
+    take(Value, FieldSeparator);
+}
+
+inline const std::string*
+GetPot::variable::get_element(unsigned Idx) const
+{ if( Idx >= value.size() ) return 0; else return &(value[Idx]); }
+
+inline void
+GetPot::variable::take(const char* Value, const char* FieldSeparator)
+{
+    original = std::string(Value);
+
+    // separate string by white space delimiters using 'strtok'
+    // thread safe usage of strtok (no static members)
+    char* spt = 0;
+    // make a copy of the 'Value'
+    char* copy = new char[strlen(Value)+1];
+    strcpy(copy, Value);
+    char* follow_token = strtok_r(copy, FieldSeparator, &spt);
+    if( value.size() != 0 ) value.erase(value.begin(), value.end());
+    while(follow_token != 0) {
+        value.push_back(std::string(follow_token));
+        follow_token = strtok_r(NULL, FieldSeparator, &spt);
+    }
+
+    delete [] copy;
+}
+
+inline
+GetPot::variable::~variable()
+{}
+
+inline GetPot::variable&
+GetPot::variable::operator=(const GetPot::variable& That)
+{
+    if( &That != this) {
+        name     = That.name;
+        value    = That.value;
+        original = That.original;
+    }
+    return *this;
+}
+
+#undef victorate
+
+
+#endif // __include_guard_GETPOT_H__
+
+
+
diff --git a/utils/zenutils/libraries/pelib-0.9/CMakeLists.txt b/utils/zenutils/libraries/pelib-0.9/CMakeLists.txt
index 540fa99c8c..3cdb6e71ff 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/CMakeLists.txt
+++ b/utils/zenutils/libraries/pelib-0.9/CMakeLists.txt
@@ -1,20 +1,20 @@
-PROJECT(pelib)

-

-# source files for pelib

-SET(pelib_srcs

-  pelib/BoundImportDirectory.cpp

-  pelib/ComHeaderDirectory.cpp

-  pelib/DebugDirectory.cpp

-  pelib/ExportDirectory.cpp

-  pelib/IatDirectory.cpp

-  pelib/MzHeader.cpp

-  pelib/PeFile.cpp

-  pelib/PeHeader.cpp

-  pelib/PeLibAux.cpp

-  pelib/RelocationsDirectory.cpp

-  pelib/ResourceDirectory.cpp

-  pelib/buffer/InputBuffer.cpp

-  pelib/buffer/OutputBuffer.cpp

-)

-

-ADD_LIBRARY(pelib ${pelib_srcs})

+PROJECT(pelib)
+
+# source files for pelib
+SET(pelib_srcs
+  pelib/BoundImportDirectory.cpp
+  pelib/ComHeaderDirectory.cpp
+  pelib/DebugDirectory.cpp
+  pelib/ExportDirectory.cpp
+  pelib/IatDirectory.cpp
+  pelib/MzHeader.cpp
+  pelib/PeFile.cpp
+  pelib/PeHeader.cpp
+  pelib/PeLibAux.cpp
+  pelib/RelocationsDirectory.cpp
+  pelib/ResourceDirectory.cpp
+  pelib/buffer/InputBuffer.cpp
+  pelib/buffer/OutputBuffer.cpp
+)
+
+ADD_LIBRARY(pelib ${pelib_srcs})
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/BoundImportDirectory.cpp b/utils/zenutils/libraries/pelib-0.9/pelib/BoundImportDirectory.cpp
index 5b84931838..7c5ff74f0e 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/BoundImportDirectory.cpp
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/BoundImportDirectory.cpp
@@ -1,511 +1,511 @@
-/*

-* BoundImportDirectory.cpp - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#include "PeLibInc.h"

-#include "BoundImportDirectory.h"

-#include <numeric>

-#include <set>

-#include <map>

-

-namespace PeLib

-{

-        /**

-        * Adds another bound import to the BoundImport directory.

-        * @param strModuleName Name of the PE file which will be imported.

-        * @param dwTds Value of the TimeDateStamp of the bound import field.

-        * @param wOmn Value of the OffsetModuleName of the bound import field.

-        * @param wWfr Value of the NumberOfModuleForwarderRefs of the bound import field.

-        **/

-        int BoundImportDirectory::addBoundImport(const std::string& strModuleName, dword dwTds, word wOmn, word wWfr)

-        {

-                for (unsigned int i=0;i<m_vIbd.size();i++)

-                {

-                        if (isEqualNc(strModuleName, m_vIbd[i].strModuleName))

-                        {

-                                return ERROR_DUPLICATE_ENTRY;

-                        }

-                }

-                

-                PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR ibidCurrent;

-                ibidCurrent.TimeDateStamp = dwTds;

-                ibidCurrent.OffsetModuleName = wOmn;

-                ibidCurrent.NumberOfModuleForwarderRefs = wWfr;

-                PELIB_IMAGE_BOUND_DIRECTORY ibdCurrent;

-                ibdCurrent.ibdDescriptor = ibidCurrent;

-                ibdCurrent.strModuleName = strModuleName;

-                m_vIbd.push_back(ibdCurrent);

-                

-                return NO_ERROR;

-        }

-

-        /**

-        * Searches for the first instance of a module with the given modulename.

-        * @param strModuleName The name of a module.

-        * @return The id of the module.

-        **/

-        int BoundImportDirectory::getModuleIndex(const std::string& strModuleName) const

-        {

-                std::vector<PELIB_IMAGE_BOUND_DIRECTORY>::const_iterator Iter = std::find_if(m_vIbd.begin(), m_vIbd.end(), std::bind2nd(std::mem_fun_ref(&PELIB_IMAGE_BOUND_DIRECTORY::equal), strModuleName));

-                

-                if (Iter == m_vIbd.end())

-                {

-                        return ERROR_ENTRY_NOT_FOUND;

-                }

-                

-                return static_cast<int>(std::distance(m_vIbd.begin(), Iter));

-        }

-

-        /**

-        * @return Number of files in the current BoundImport directory.

-        **/

-        unsigned int BoundImportDirectory::calcNumberOfModules() const

-        {

-                return static_cast<unsigned int>(m_vIbd.size());

-        }

-

-        int BoundImportDirectory::read(InputBuffer& inpBuffer, unsigned char* data, unsigned int dwSize)

-        {

-                std::vector<PELIB_IMAGE_BOUND_DIRECTORY> currentDirectory;

-                

-                do

-                {

-                        PELIB_IMAGE_BOUND_DIRECTORY ibdCurrent;

-                        

-                        inpBuffer >> ibdCurrent.ibdDescriptor.TimeDateStamp;

-                        inpBuffer >> ibdCurrent.ibdDescriptor.OffsetModuleName;

-                        inpBuffer >> ibdCurrent.ibdDescriptor.NumberOfModuleForwarderRefs;

-

-                        if (ibdCurrent.ibdDescriptor.TimeDateStamp == 0 && ibdCurrent.ibdDescriptor.OffsetModuleName == 0 && ibdCurrent.ibdDescriptor.NumberOfModuleForwarderRefs == 0) break;

-                        

-                        for (int i=0;i<ibdCurrent.ibdDescriptor.NumberOfModuleForwarderRefs;i++)

-                        {

-                                PELIB_IMAGE_BOUND_DIRECTORY currentForwarder;

-                                

-                                inpBuffer >> currentForwarder.ibdDescriptor.TimeDateStamp;

-                                inpBuffer >> currentForwarder.ibdDescriptor.OffsetModuleName;

-                                inpBuffer >> currentForwarder.ibdDescriptor.NumberOfModuleForwarderRefs;

-                                

-                                ibdCurrent.moduleForwarders.push_back(currentForwarder);

-                        }

-                        

-                        currentDirectory.push_back(ibdCurrent);

-                        ibdCurrent.moduleForwarders.clear();

-                } while (true);

-                

-                for (unsigned int i=0;i<currentDirectory.size();i++)

-                {

-                        dword wOmn = currentDirectory[i].ibdDescriptor.OffsetModuleName;

-                        if (wOmn > dwSize)

-                        {

-                                return ERROR_INVALID_FILE;

-                        }

-                        

-                        currentDirectory[i].strModuleName = "";

-                        for (int k=0;data[wOmn + k] != 0 && k + wOmn < dwSize;k++)

-                        {

-                                currentDirectory[i].strModuleName += data[wOmn + k];

-                        }

-                        

-                        for (unsigned int j=0;j<currentDirectory[i].moduleForwarders.size();j++)

-                        {

-                                dword wOmn = currentDirectory[i].moduleForwarders[j].ibdDescriptor.OffsetModuleName;

-                                

-                                if (wOmn > dwSize)

-                                {

-                                        return ERROR_INVALID_FILE;

-                                }

-                                

-//                              m_vIbd[i].moduleForwarders[j].strModuleName.assign((char*)(&vBimpDir[wOmn]));

-                                currentDirectory[i].moduleForwarders[j].strModuleName = "";

-                                for (int k=0;data[wOmn + k] != 0 && k + wOmn < dwSize;k++)

-                                {

-                                        currentDirectory[i].moduleForwarders[j].strModuleName += data[wOmn + k];

-                                }

-                        }

-                }

-                

-                std::swap(m_vIbd, currentDirectory);

-                

-                return NO_ERROR;

-        }

-

-        /**

-        * Reads the BoundImport directory from a PE file.

-        * @param strModuleName The name of the PE file from which the BoundImport directory is read.

-        * @param dwOffset The file offset where the BoundImport directory can be found (see #PeFile::PeHeader::getIDBoundImportRVA).

-        * @param dwSize The size of the BoundImport directory (see #PeFile::PeHeader::getIDBoundImportSize).

-        **/

-        int BoundImportDirectory::read(const std::string& strModuleName, dword dwOffset, unsigned int uiSize)

-        {

-                std::ifstream ifFile(strModuleName.c_str(), std::ios::binary);

-

-                if (!ifFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-                

-                if (fileSize(ifFile) < dwOffset + uiSize)

-                {

-                        return ERROR_INVALID_FILE;

-                }

-                

-                ifFile.seekg(dwOffset, std::ios::beg);

-                

-                std::vector<unsigned char> vBimpDir(uiSize);

-                ifFile.read(reinterpret_cast<char*>(&vBimpDir[0]), uiSize);

-

-                InputBuffer inpBuffer(vBimpDir);

-                

-                return read(inpBuffer, &vBimpDir[0], uiSize);

-        }

-        

-        int BoundImportDirectory::read(unsigned char* pcBuffer, unsigned int uiSize)

-        {

-                std::vector<unsigned char> vBimpDir(pcBuffer, pcBuffer + uiSize);

-                InputBuffer inpBuffer(vBimpDir);

-                

-                return read(inpBuffer, &vBimpDir[0], uiSize);

-        }

-        

-        unsigned int BoundImportDirectory::totalModules() const

-        {

-                unsigned int modules = static_cast<unsigned int>(m_vIbd.size());

-                

-                for (unsigned int i=0;i<m_vIbd.size();i++)

-                {

-                        modules += static_cast<unsigned int>(m_vIbd[i].moduleForwarders.size());

-                }

-                

-                return modules;

-        }

-

-        /**

-        * Rebuilds the BoundImport directory. The rebuilded BoundImport directory can then be

-        * written back to a PE file.

-        * @param vBuffer Buffer where the rebuilt BoundImport directory will be stored.

-        * @param fMakeValid If this flag is true a valid directory will be produced.

-        **/

-        void BoundImportDirectory::rebuild(std::vector<byte>& vBuffer, bool fMakeValid) const

-        {

-                std::map<std::string, word> filename_offsets;

-                

-                OutputBuffer obBuffer(vBuffer);

-                

-                word ulNameOffset = static_cast<word>((totalModules() + 1) * PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size());

-                

-                for (unsigned int i=0;i<m_vIbd.size();i++)

-                {

-                        obBuffer << m_vIbd[i].ibdDescriptor.TimeDateStamp;

-

-                        // Recalculate the offsets if a valid directory is wanted.

-                        if (fMakeValid)

-                        {

-                                if (filename_offsets.find(m_vIbd[i].strModuleName) == filename_offsets.end())

-                                {

-                                        filename_offsets[m_vIbd[i].strModuleName] = ulNameOffset;

-                                        obBuffer << ulNameOffset;

-                                        ulNameOffset += static_cast<word>(m_vIbd[i].strModuleName.size() + 1);

-                                }

-                                else

-                                {

-                                        obBuffer << filename_offsets[m_vIbd[i].strModuleName];

-                                }

-                        }

-                        else // Otherwise just copy the old values into the buffer.

-                        {

-                                obBuffer << m_vIbd[i].ibdDescriptor.OffsetModuleName;

-                        }

-

-                        obBuffer << m_vIbd[i].ibdDescriptor.NumberOfModuleForwarderRefs;

-                        

-                        for (int j=0;j<calcNumberOfModuleForwarderRefs(i);j++)

-                        {

-                                obBuffer << m_vIbd[i].moduleForwarders[j].ibdDescriptor.TimeDateStamp;

-                                

-                                if (fMakeValid)

-                                {

-                                        if (filename_offsets.find(m_vIbd[i].strModuleName) == filename_offsets.end())

-                                        {

-                                                filename_offsets[m_vIbd[i].moduleForwarders[j].strModuleName] = ulNameOffset;

-                                                obBuffer << ulNameOffset;

-                                                ulNameOffset += static_cast<word>(m_vIbd[i].moduleForwarders[j].strModuleName.size() + 1);

-                                        }

-                                        else

-                                        {

-                                                obBuffer << filename_offsets[m_vIbd[i].moduleForwarders[j].strModuleName];

-                                        }

-                                }

-                                else // Otherwise just copy the old values into the buffer.

-                                {

-                                        obBuffer << m_vIbd[i].moduleForwarders[j].ibdDescriptor.OffsetModuleName;

-                                }

-

-                                obBuffer << m_vIbd[i].moduleForwarders[j].ibdDescriptor.NumberOfModuleForwarderRefs;

-                        }

-                }

-                

-                obBuffer << static_cast<dword>(0);

-                obBuffer << static_cast<word>(0);

-                obBuffer << static_cast<word>(0);

-

-                for (unsigned int i=0;i<m_vIbd.size();i++)

-                {

-                        if (filename_offsets.find(m_vIbd[i].strModuleName) != filename_offsets.end())

-                        {

-                                obBuffer.add(getModuleName(i).c_str(), static_cast<unsigned long>(getModuleName(i).size() + 1));

-                                filename_offsets.erase(m_vIbd[i].strModuleName);

-                        }

-                        

-                        for (int j=0;j<calcNumberOfModuleForwarderRefs(i);j++)

-                        {

-                                if (filename_offsets.find(getModuleName(i, j)) != filename_offsets.end())

-                                {

-                                        obBuffer.add(getModuleName(i, j).c_str(), static_cast<unsigned long>(getModuleName(i, j).size() + 1));

-                                        filename_offsets.erase(getModuleName(i, j));

-                                }

-                        }

-                }

-        }

-

-        /**

-        * Removes all bound import files.

-        **/

-        void BoundImportDirectory::clear()

-        {

-                m_vIbd.clear();

-        }

-

-        /**

-        * Removes a field specified by the parameter filename from the BoundImport directory.

-        * @param strModuleName Name of the file whose field will be removed from the BoundImport directory.

-        **/

-        void BoundImportDirectory::removeBoundImport(const std::string& strModuleName)

-        {

-                m_vIbd.erase(std::remove_if(m_vIbd.begin(), m_vIbd.end(), std::bind2nd(std::mem_fun_ref(&PELIB_IMAGE_BOUND_DIRECTORY::equal), strModuleName)), m_vIbd.end());

-        }

-        

-        /**

-        * Returns the size of the rebuilt BoundImportDirectory.

-        * @return Size of the rebuilt BoundImportDirectory.

-        **/

-        unsigned int BoundImportDirectory::size() const

-        {

-                unsigned int size = PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size();

-                

-                std::set<std::string> filenames;

-                

-                for (unsigned int i = 0; i < m_vIbd.size(); i++)

-                {

-                        filenames.insert(m_vIbd[i].strModuleName);

-                        

-                        size += PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size();

-                        

-                        for (unsigned int j = 0; j < m_vIbd[i].moduleForwarders.size(); j++)

-                        {

-                                filenames.insert(m_vIbd[i].moduleForwarders[j].strModuleName);

-                                

-                                size += PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size();

-                        }

-                }

-                

-                for (std::set<std::string>::iterator iter = filenames.begin(); iter != filenames.end(); ++iter)

-                {

-                        size += static_cast<unsigned int>(iter->size()) + 1;

-                }

-                

-                return size;

-        }

-

-        /**

-        * @param strFilename Name of the file.

-        * @param dwOffset File offset the bound importdirectory will be written to.

-        * @param fMakeValid If this flag is true a valid directory will be produced.

-        **/

-        int BoundImportDirectory::write(const std::string& strFilename, dword dwOffset,  bool fMakeValid) const

-        {

-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);

-                

-                if (!ofFile)

-                {

-                        ofFile.clear();

-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);

-                }

-                else

-                {

-                        ofFile.close();

-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);

-                }

-

-                if (!ofFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-

-                ofFile.seekp(dwOffset, std::ios::beg);

-

-                std::vector<unsigned char> vBuffer;

-                rebuild(vBuffer, fMakeValid);

-

-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<std::streamsize>(vBuffer.size()));

-

-                ofFile.close();

-                

-                return NO_ERROR;

-        }

-

-        /**

-        * Retrieves the value of the TimeDateStamp value of a bound import field.

-        * @param dwBidnr Number of the bound import field.

-        * @return Value of the TimeDateStamp of the bound import field.

-        **/

-        dword BoundImportDirectory::getTimeDateStamp(dword dwBidnr) const

-        {

-                return m_vIbd[dwBidnr].ibdDescriptor.TimeDateStamp;

-        }

-        

-        /**

-        * Retrieves the value of the OffsetModuleName value of a bound import field. 

-        * @param dwBidnr Number of the bound import field.

-        * @return Value of the OffsetModuleName of the bound import field.

-        **/

-        word BoundImportDirectory::getOffsetModuleName(dword dwBidnr) const

-        {

-                return m_vIbd[dwBidnr].ibdDescriptor.OffsetModuleName;

-        }

-        

-        /**

-        * Retrieves the value of the NumberOfModuleForwarderRefs value of a bound import field.

-        * @param dwBidnr Number of the bound import field.

-        * @return Value of the NumberOfModuleForwarderRefs of the bound import field.

-        **/

-        word BoundImportDirectory::getNumberOfModuleForwarderRefs(dword dwBidnr) const

-        {

-                return m_vIbd[dwBidnr].ibdDescriptor.NumberOfModuleForwarderRefs;

-        }

-        

-        /**

-        * Retrieves the value of the ModuleName value of a bound import field.

-        * @param dwBidnr Number of the bound import field.

-        * @return Value of the ModuleName of the bound import field.

-        **/

-        std::string BoundImportDirectory::getModuleName(dword dwBidnr) const

-        {

-                return m_vIbd[dwBidnr].strModuleName;

-        }

-

-        /**

-        * Changes the TimeDateStamp value of an existing bound import field.

-        * @param dwBidnr Number of the bound import field which will be changed.

-        * @param dwTds New value of the TimeDateStamp of the bound import field.

-        **/

-        void BoundImportDirectory::setTimeDateStamp(dword dwBidnr, dword dwTds)

-        {

-                m_vIbd[dwBidnr].ibdDescriptor.TimeDateStamp = dwTds;

-        }

-

-        /**

-        * Changes the OffsetModuleName value of an existing bound import field.

-        * @param dwBidnr Number of the bound import field which will be changed.

-        * @param wOmn New value of the OffsetModuleName of the bound import field.

-        **/

-        void BoundImportDirectory::setOffsetModuleName(dword dwBidnr, word wOmn)

-        {

-                m_vIbd[dwBidnr].ibdDescriptor.OffsetModuleName = wOmn;

-        }

-        

-        /**

-        * Changes the NumberOfModuleForwarderRefs value of an existing bound import field.

-        * @param dwBidnr Number of the bound import field which will be changed.

-        * @param wMfr New value of the NumberOfModuleForwarderRefs of the bound import field.

-        **/

-        void BoundImportDirectory::setNumberOfModuleForwarderRefs(dword dwBidnr, word wMfr)

-        {

-                m_vIbd[dwBidnr].ibdDescriptor.NumberOfModuleForwarderRefs = wMfr;

-        }

-        

-        /**

-        * Changes the ModuleName value of an existing bound import field.

-        * @param dwBidnr Number of the bound import field which will be changed.

-        * @param strModuleName New value of the ModuleName of the bound import field.

-        **/

-        void BoundImportDirectory::setModuleName(dword dwBidnr, const std::string& strModuleName)

-        {

-                m_vIbd[dwBidnr].strModuleName = strModuleName;

-        }

-        

-        dword BoundImportDirectory::getTimeDateStamp(dword dwBidnr, dword forwardedModule) const

-        {

-                return m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.TimeDateStamp;

-        }

-        

-        word BoundImportDirectory::getOffsetModuleName(dword dwBidnr, dword forwardedModule) const

-        {

-                return m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.OffsetModuleName;

-        }

-        

-        word BoundImportDirectory::getNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule) const

-        {

-                return m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.NumberOfModuleForwarderRefs;

-        }

-        

-        std::string BoundImportDirectory::getModuleName(dword dwBidnr, dword forwardedModule) const

-        {

-                return m_vIbd[dwBidnr].moduleForwarders[forwardedModule].strModuleName;

-        }

-        

-        void BoundImportDirectory::setTimeDateStamp(dword dwBidnr, dword forwardedModule, dword dwTds)

-        {

-                m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.TimeDateStamp = dwTds;

-        }

-        

-        void BoundImportDirectory::setOffsetModuleName(dword dwBidnr, dword forwardedModule, word wOmn)

-        {

-                m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.OffsetModuleName = wOmn;

-        }

-        

-        void BoundImportDirectory::setNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule, word wMfr)

-        {

-                m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.NumberOfModuleForwarderRefs = wMfr;

-        }

-

-        void BoundImportDirectory::setModuleName(dword dwBidnr, dword forwardedModule, const std::string& strModuleName)

-        {

-                m_vIbd[dwBidnr].moduleForwarders[forwardedModule].strModuleName = strModuleName;

-        }

-        

-        word BoundImportDirectory::calcNumberOfModuleForwarderRefs(dword dwBidnr) const

-        {

-                return static_cast<word>(m_vIbd[dwBidnr].moduleForwarders.size());

-        }

-        

-        void BoundImportDirectory::addForwardedModule(dword dwBidnr, const std::string& name, dword timeStamp, word offsetModuleName, word forwardedModules)

-        {

-                // XXX: Maybe test if there are already 0xFFFF forwarded modules.

-                // XXX: Check for duplicate entries. Is it also necessary to check

-                //      non-forwarded entries and forwarded entries in other non-forwarded

-                //      entries?

-                // XXX: Can forwarders forward recursively?

-                

-                PELIB_IMAGE_BOUND_DIRECTORY ibdCurrent;

-                ibdCurrent.strModuleName = name;

-                ibdCurrent.ibdDescriptor.TimeDateStamp = timeStamp;

-                ibdCurrent.ibdDescriptor.OffsetModuleName = offsetModuleName;

-                ibdCurrent.ibdDescriptor.NumberOfModuleForwarderRefs = forwardedModules;

-                

-                m_vIbd[dwBidnr].moduleForwarders.push_back(ibdCurrent);

-        }

-        

-        void BoundImportDirectory::removeForwardedModule(dword dwBidnr, word forwardedModule)

-        {

-                m_vIbd[dwBidnr].moduleForwarders.erase(m_vIbd[dwBidnr].moduleForwarders.begin() + forwardedModule);

-        }

-}

+/*
+* BoundImportDirectory.cpp - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#include "PeLibInc.h"
+#include "BoundImportDirectory.h"
+#include <numeric>
+#include <set>
+#include <map>
+
+namespace PeLib
+{
+        /**
+        * Adds another bound import to the BoundImport directory.
+        * @param strModuleName Name of the PE file which will be imported.
+        * @param dwTds Value of the TimeDateStamp of the bound import field.
+        * @param wOmn Value of the OffsetModuleName of the bound import field.
+        * @param wWfr Value of the NumberOfModuleForwarderRefs of the bound import field.
+        **/
+        int BoundImportDirectory::addBoundImport(const std::string& strModuleName, dword dwTds, word wOmn, word wWfr)
+        {
+                for (unsigned int i=0;i<m_vIbd.size();i++)
+                {
+                        if (isEqualNc(strModuleName, m_vIbd[i].strModuleName))
+                        {
+                                return ERROR_DUPLICATE_ENTRY;
+                        }
+                }
+                
+                PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR ibidCurrent;
+                ibidCurrent.TimeDateStamp = dwTds;
+                ibidCurrent.OffsetModuleName = wOmn;
+                ibidCurrent.NumberOfModuleForwarderRefs = wWfr;
+                PELIB_IMAGE_BOUND_DIRECTORY ibdCurrent;
+                ibdCurrent.ibdDescriptor = ibidCurrent;
+                ibdCurrent.strModuleName = strModuleName;
+                m_vIbd.push_back(ibdCurrent);
+                
+                return NO_ERROR;
+        }
+
+        /**
+        * Searches for the first instance of a module with the given modulename.
+        * @param strModuleName The name of a module.
+        * @return The id of the module.
+        **/
+        int BoundImportDirectory::getModuleIndex(const std::string& strModuleName) const
+        {
+                std::vector<PELIB_IMAGE_BOUND_DIRECTORY>::const_iterator Iter = std::find_if(m_vIbd.begin(), m_vIbd.end(), std::bind2nd(std::mem_fun_ref(&PELIB_IMAGE_BOUND_DIRECTORY::equal), strModuleName));
+                
+                if (Iter == m_vIbd.end())
+                {
+                        return ERROR_ENTRY_NOT_FOUND;
+                }
+                
+                return static_cast<int>(std::distance(m_vIbd.begin(), Iter));
+        }
+
+        /**
+        * @return Number of files in the current BoundImport directory.
+        **/
+        unsigned int BoundImportDirectory::calcNumberOfModules() const
+        {
+                return static_cast<unsigned int>(m_vIbd.size());
+        }
+
+        int BoundImportDirectory::read(InputBuffer& inpBuffer, unsigned char* data, unsigned int dwSize)
+        {
+                std::vector<PELIB_IMAGE_BOUND_DIRECTORY> currentDirectory;
+                
+                do
+                {
+                        PELIB_IMAGE_BOUND_DIRECTORY ibdCurrent;
+                        
+                        inpBuffer >> ibdCurrent.ibdDescriptor.TimeDateStamp;
+                        inpBuffer >> ibdCurrent.ibdDescriptor.OffsetModuleName;
+                        inpBuffer >> ibdCurrent.ibdDescriptor.NumberOfModuleForwarderRefs;
+
+                        if (ibdCurrent.ibdDescriptor.TimeDateStamp == 0 && ibdCurrent.ibdDescriptor.OffsetModuleName == 0 && ibdCurrent.ibdDescriptor.NumberOfModuleForwarderRefs == 0) break;
+                        
+                        for (int i=0;i<ibdCurrent.ibdDescriptor.NumberOfModuleForwarderRefs;i++)
+                        {
+                                PELIB_IMAGE_BOUND_DIRECTORY currentForwarder;
+                                
+                                inpBuffer >> currentForwarder.ibdDescriptor.TimeDateStamp;
+                                inpBuffer >> currentForwarder.ibdDescriptor.OffsetModuleName;
+                                inpBuffer >> currentForwarder.ibdDescriptor.NumberOfModuleForwarderRefs;
+                                
+                                ibdCurrent.moduleForwarders.push_back(currentForwarder);
+                        }
+                        
+                        currentDirectory.push_back(ibdCurrent);
+                        ibdCurrent.moduleForwarders.clear();
+                } while (true);
+                
+                for (unsigned int i=0;i<currentDirectory.size();i++)
+                {
+                        dword wOmn = currentDirectory[i].ibdDescriptor.OffsetModuleName;
+                        if (wOmn > dwSize)
+                        {
+                                return ERROR_INVALID_FILE;
+                        }
+                        
+                        currentDirectory[i].strModuleName = "";
+                        for (int k=0;data[wOmn + k] != 0 && k + wOmn < dwSize;k++)
+                        {
+                                currentDirectory[i].strModuleName += data[wOmn + k];
+                        }
+                        
+                        for (unsigned int j=0;j<currentDirectory[i].moduleForwarders.size();j++)
+                        {
+                                dword wOmn = currentDirectory[i].moduleForwarders[j].ibdDescriptor.OffsetModuleName;
+                                
+                                if (wOmn > dwSize)
+                                {
+                                        return ERROR_INVALID_FILE;
+                                }
+                                
+//                              m_vIbd[i].moduleForwarders[j].strModuleName.assign((char*)(&vBimpDir[wOmn]));
+                                currentDirectory[i].moduleForwarders[j].strModuleName = "";
+                                for (int k=0;data[wOmn + k] != 0 && k + wOmn < dwSize;k++)
+                                {
+                                        currentDirectory[i].moduleForwarders[j].strModuleName += data[wOmn + k];
+                                }
+                        }
+                }
+                
+                std::swap(m_vIbd, currentDirectory);
+                
+                return NO_ERROR;
+        }
+
+        /**
+        * Reads the BoundImport directory from a PE file.
+        * @param strModuleName The name of the PE file from which the BoundImport directory is read.
+        * @param dwOffset The file offset where the BoundImport directory can be found (see #PeFile::PeHeader::getIDBoundImportRVA).
+        * @param dwSize The size of the BoundImport directory (see #PeFile::PeHeader::getIDBoundImportSize).
+        **/
+        int BoundImportDirectory::read(const std::string& strModuleName, dword dwOffset, unsigned int uiSize)
+        {
+                std::ifstream ifFile(strModuleName.c_str(), std::ios::binary);
+
+                if (!ifFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+                
+                if (fileSize(ifFile) < dwOffset + uiSize)
+                {
+                        return ERROR_INVALID_FILE;
+                }
+                
+                ifFile.seekg(dwOffset, std::ios::beg);
+                
+                std::vector<unsigned char> vBimpDir(uiSize);
+                ifFile.read(reinterpret_cast<char*>(&vBimpDir[0]), uiSize);
+
+                InputBuffer inpBuffer(vBimpDir);
+                
+                return read(inpBuffer, &vBimpDir[0], uiSize);
+        }
+        
+        int BoundImportDirectory::read(unsigned char* pcBuffer, unsigned int uiSize)
+        {
+                std::vector<unsigned char> vBimpDir(pcBuffer, pcBuffer + uiSize);
+                InputBuffer inpBuffer(vBimpDir);
+                
+                return read(inpBuffer, &vBimpDir[0], uiSize);
+        }
+        
+        unsigned int BoundImportDirectory::totalModules() const
+        {
+                unsigned int modules = static_cast<unsigned int>(m_vIbd.size());
+                
+                for (unsigned int i=0;i<m_vIbd.size();i++)
+                {
+                        modules += static_cast<unsigned int>(m_vIbd[i].moduleForwarders.size());
+                }
+                
+                return modules;
+        }
+
+        /**
+        * Rebuilds the BoundImport directory. The rebuilded BoundImport directory can then be
+        * written back to a PE file.
+        * @param vBuffer Buffer where the rebuilt BoundImport directory will be stored.
+        * @param fMakeValid If this flag is true a valid directory will be produced.
+        **/
+        void BoundImportDirectory::rebuild(std::vector<byte>& vBuffer, bool fMakeValid) const
+        {
+                std::map<std::string, word> filename_offsets;
+                
+                OutputBuffer obBuffer(vBuffer);
+                
+                word ulNameOffset = static_cast<word>((totalModules() + 1) * PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size());
+                
+                for (unsigned int i=0;i<m_vIbd.size();i++)
+                {
+                        obBuffer << m_vIbd[i].ibdDescriptor.TimeDateStamp;
+
+                        // Recalculate the offsets if a valid directory is wanted.
+                        if (fMakeValid)
+                        {
+                                if (filename_offsets.find(m_vIbd[i].strModuleName) == filename_offsets.end())
+                                {
+                                        filename_offsets[m_vIbd[i].strModuleName] = ulNameOffset;
+                                        obBuffer << ulNameOffset;
+                                        ulNameOffset += static_cast<word>(m_vIbd[i].strModuleName.size() + 1);
+                                }
+                                else
+                                {
+                                        obBuffer << filename_offsets[m_vIbd[i].strModuleName];
+                                }
+                        }
+                        else // Otherwise just copy the old values into the buffer.
+                        {
+                                obBuffer << m_vIbd[i].ibdDescriptor.OffsetModuleName;
+                        }
+
+                        obBuffer << m_vIbd[i].ibdDescriptor.NumberOfModuleForwarderRefs;
+                        
+                        for (int j=0;j<calcNumberOfModuleForwarderRefs(i);j++)
+                        {
+                                obBuffer << m_vIbd[i].moduleForwarders[j].ibdDescriptor.TimeDateStamp;
+                                
+                                if (fMakeValid)
+                                {
+                                        if (filename_offsets.find(m_vIbd[i].strModuleName) == filename_offsets.end())
+                                        {
+                                                filename_offsets[m_vIbd[i].moduleForwarders[j].strModuleName] = ulNameOffset;
+                                                obBuffer << ulNameOffset;
+                                                ulNameOffset += static_cast<word>(m_vIbd[i].moduleForwarders[j].strModuleName.size() + 1);
+                                        }
+                                        else
+                                        {
+                                                obBuffer << filename_offsets[m_vIbd[i].moduleForwarders[j].strModuleName];
+                                        }
+                                }
+                                else // Otherwise just copy the old values into the buffer.
+                                {
+                                        obBuffer << m_vIbd[i].moduleForwarders[j].ibdDescriptor.OffsetModuleName;
+                                }
+
+                                obBuffer << m_vIbd[i].moduleForwarders[j].ibdDescriptor.NumberOfModuleForwarderRefs;
+                        }
+                }
+                
+                obBuffer << static_cast<dword>(0);
+                obBuffer << static_cast<word>(0);
+                obBuffer << static_cast<word>(0);
+
+                for (unsigned int i=0;i<m_vIbd.size();i++)
+                {
+                        if (filename_offsets.find(m_vIbd[i].strModuleName) != filename_offsets.end())
+                        {
+                                obBuffer.add(getModuleName(i).c_str(), static_cast<unsigned long>(getModuleName(i).size() + 1));
+                                filename_offsets.erase(m_vIbd[i].strModuleName);
+                        }
+                        
+                        for (int j=0;j<calcNumberOfModuleForwarderRefs(i);j++)
+                        {
+                                if (filename_offsets.find(getModuleName(i, j)) != filename_offsets.end())
+                                {
+                                        obBuffer.add(getModuleName(i, j).c_str(), static_cast<unsigned long>(getModuleName(i, j).size() + 1));
+                                        filename_offsets.erase(getModuleName(i, j));
+                                }
+                        }
+                }
+        }
+
+        /**
+        * Removes all bound import files.
+        **/
+        void BoundImportDirectory::clear()
+        {
+                m_vIbd.clear();
+        }
+
+        /**
+        * Removes a field specified by the parameter filename from the BoundImport directory.
+        * @param strModuleName Name of the file whose field will be removed from the BoundImport directory.
+        **/
+        void BoundImportDirectory::removeBoundImport(const std::string& strModuleName)
+        {
+                m_vIbd.erase(std::remove_if(m_vIbd.begin(), m_vIbd.end(), std::bind2nd(std::mem_fun_ref(&PELIB_IMAGE_BOUND_DIRECTORY::equal), strModuleName)), m_vIbd.end());
+        }
+        
+        /**
+        * Returns the size of the rebuilt BoundImportDirectory.
+        * @return Size of the rebuilt BoundImportDirectory.
+        **/
+        unsigned int BoundImportDirectory::size() const
+        {
+                unsigned int size = PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size();
+                
+                std::set<std::string> filenames;
+                
+                for (unsigned int i = 0; i < m_vIbd.size(); i++)
+                {
+                        filenames.insert(m_vIbd[i].strModuleName);
+                        
+                        size += PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size();
+                        
+                        for (unsigned int j = 0; j < m_vIbd[i].moduleForwarders.size(); j++)
+                        {
+                                filenames.insert(m_vIbd[i].moduleForwarders[j].strModuleName);
+                                
+                                size += PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size();
+                        }
+                }
+                
+                for (std::set<std::string>::iterator iter = filenames.begin(); iter != filenames.end(); ++iter)
+                {
+                        size += static_cast<unsigned int>(iter->size()) + 1;
+                }
+                
+                return size;
+        }
+
+        /**
+        * @param strFilename Name of the file.
+        * @param dwOffset File offset the bound importdirectory will be written to.
+        * @param fMakeValid If this flag is true a valid directory will be produced.
+        **/
+        int BoundImportDirectory::write(const std::string& strFilename, dword dwOffset,  bool fMakeValid) const
+        {
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                
+                if (!ofFile)
+                {
+                        ofFile.clear();
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                }
+                else
+                {
+                        ofFile.close();
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                }
+
+                if (!ofFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+
+                ofFile.seekp(dwOffset, std::ios::beg);
+
+                std::vector<unsigned char> vBuffer;
+                rebuild(vBuffer, fMakeValid);
+
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<std::streamsize>(vBuffer.size()));
+
+                ofFile.close();
+                
+                return NO_ERROR;
+        }
+
+        /**
+        * Retrieves the value of the TimeDateStamp value of a bound import field.
+        * @param dwBidnr Number of the bound import field.
+        * @return Value of the TimeDateStamp of the bound import field.
+        **/
+        dword BoundImportDirectory::getTimeDateStamp(dword dwBidnr) const
+        {
+                return m_vIbd[dwBidnr].ibdDescriptor.TimeDateStamp;
+        }
+        
+        /**
+        * Retrieves the value of the OffsetModuleName value of a bound import field. 
+        * @param dwBidnr Number of the bound import field.
+        * @return Value of the OffsetModuleName of the bound import field.
+        **/
+        word BoundImportDirectory::getOffsetModuleName(dword dwBidnr) const
+        {
+                return m_vIbd[dwBidnr].ibdDescriptor.OffsetModuleName;
+        }
+        
+        /**
+        * Retrieves the value of the NumberOfModuleForwarderRefs value of a bound import field.
+        * @param dwBidnr Number of the bound import field.
+        * @return Value of the NumberOfModuleForwarderRefs of the bound import field.
+        **/
+        word BoundImportDirectory::getNumberOfModuleForwarderRefs(dword dwBidnr) const
+        {
+                return m_vIbd[dwBidnr].ibdDescriptor.NumberOfModuleForwarderRefs;
+        }
+        
+        /**
+        * Retrieves the value of the ModuleName value of a bound import field.
+        * @param dwBidnr Number of the bound import field.
+        * @return Value of the ModuleName of the bound import field.
+        **/
+        std::string BoundImportDirectory::getModuleName(dword dwBidnr) const
+        {
+                return m_vIbd[dwBidnr].strModuleName;
+        }
+
+        /**
+        * Changes the TimeDateStamp value of an existing bound import field.
+        * @param dwBidnr Number of the bound import field which will be changed.
+        * @param dwTds New value of the TimeDateStamp of the bound import field.
+        **/
+        void BoundImportDirectory::setTimeDateStamp(dword dwBidnr, dword dwTds)
+        {
+                m_vIbd[dwBidnr].ibdDescriptor.TimeDateStamp = dwTds;
+        }
+
+        /**
+        * Changes the OffsetModuleName value of an existing bound import field.
+        * @param dwBidnr Number of the bound import field which will be changed.
+        * @param wOmn New value of the OffsetModuleName of the bound import field.
+        **/
+        void BoundImportDirectory::setOffsetModuleName(dword dwBidnr, word wOmn)
+        {
+                m_vIbd[dwBidnr].ibdDescriptor.OffsetModuleName = wOmn;
+        }
+        
+        /**
+        * Changes the NumberOfModuleForwarderRefs value of an existing bound import field.
+        * @param dwBidnr Number of the bound import field which will be changed.
+        * @param wMfr New value of the NumberOfModuleForwarderRefs of the bound import field.
+        **/
+        void BoundImportDirectory::setNumberOfModuleForwarderRefs(dword dwBidnr, word wMfr)
+        {
+                m_vIbd[dwBidnr].ibdDescriptor.NumberOfModuleForwarderRefs = wMfr;
+        }
+        
+        /**
+        * Changes the ModuleName value of an existing bound import field.
+        * @param dwBidnr Number of the bound import field which will be changed.
+        * @param strModuleName New value of the ModuleName of the bound import field.
+        **/
+        void BoundImportDirectory::setModuleName(dword dwBidnr, const std::string& strModuleName)
+        {
+                m_vIbd[dwBidnr].strModuleName = strModuleName;
+        }
+        
+        dword BoundImportDirectory::getTimeDateStamp(dword dwBidnr, dword forwardedModule) const
+        {
+                return m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.TimeDateStamp;
+        }
+        
+        word BoundImportDirectory::getOffsetModuleName(dword dwBidnr, dword forwardedModule) const
+        {
+                return m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.OffsetModuleName;
+        }
+        
+        word BoundImportDirectory::getNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule) const
+        {
+                return m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.NumberOfModuleForwarderRefs;
+        }
+        
+        std::string BoundImportDirectory::getModuleName(dword dwBidnr, dword forwardedModule) const
+        {
+                return m_vIbd[dwBidnr].moduleForwarders[forwardedModule].strModuleName;
+        }
+        
+        void BoundImportDirectory::setTimeDateStamp(dword dwBidnr, dword forwardedModule, dword dwTds)
+        {
+                m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.TimeDateStamp = dwTds;
+        }
+        
+        void BoundImportDirectory::setOffsetModuleName(dword dwBidnr, dword forwardedModule, word wOmn)
+        {
+                m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.OffsetModuleName = wOmn;
+        }
+        
+        void BoundImportDirectory::setNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule, word wMfr)
+        {
+                m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.NumberOfModuleForwarderRefs = wMfr;
+        }
+
+        void BoundImportDirectory::setModuleName(dword dwBidnr, dword forwardedModule, const std::string& strModuleName)
+        {
+                m_vIbd[dwBidnr].moduleForwarders[forwardedModule].strModuleName = strModuleName;
+        }
+        
+        word BoundImportDirectory::calcNumberOfModuleForwarderRefs(dword dwBidnr) const
+        {
+                return static_cast<word>(m_vIbd[dwBidnr].moduleForwarders.size());
+        }
+        
+        void BoundImportDirectory::addForwardedModule(dword dwBidnr, const std::string& name, dword timeStamp, word offsetModuleName, word forwardedModules)
+        {
+                // XXX: Maybe test if there are already 0xFFFF forwarded modules.
+                // XXX: Check for duplicate entries. Is it also necessary to check
+                //      non-forwarded entries and forwarded entries in other non-forwarded
+                //      entries?
+                // XXX: Can forwarders forward recursively?
+                
+                PELIB_IMAGE_BOUND_DIRECTORY ibdCurrent;
+                ibdCurrent.strModuleName = name;
+                ibdCurrent.ibdDescriptor.TimeDateStamp = timeStamp;
+                ibdCurrent.ibdDescriptor.OffsetModuleName = offsetModuleName;
+                ibdCurrent.ibdDescriptor.NumberOfModuleForwarderRefs = forwardedModules;
+                
+                m_vIbd[dwBidnr].moduleForwarders.push_back(ibdCurrent);
+        }
+        
+        void BoundImportDirectory::removeForwardedModule(dword dwBidnr, word forwardedModule)
+        {
+                m_vIbd[dwBidnr].moduleForwarders.erase(m_vIbd[dwBidnr].moduleForwarders.begin() + forwardedModule);
+        }
+}
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/BoundImportDirectory.h b/utils/zenutils/libraries/pelib-0.9/pelib/BoundImportDirectory.h
index fd2bab56fd..142d78f710 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/BoundImportDirectory.h
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/BoundImportDirectory.h
@@ -1,87 +1,87 @@
-/*

-* BoundImportDirectory.h - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#ifndef BOUNDIMPORTDIRECTORY_H

-#define BOUNDIMPORTDIRECTORY_H

-

-#include "PeLibAux.h"

-

-namespace PeLib

-{

-        /// Class that handles the BoundImport directory.

-        /**

-        * This class can read and modify the BoundImport directory table of a PE file.

-        **/

-        class BoundImportDirectory

-        {

-                private:

-                  std::vector<PELIB_IMAGE_BOUND_DIRECTORY> m_vIbd; ///< Stores the individual BoundImport fields.

-                  

-                  int read(InputBuffer& inpBuffer, unsigned char* data, unsigned int dwSize);

-                  unsigned int totalModules() const;

-                public:

-                  /// Adds another bound import.

-                  int addBoundImport(const std::string& strModuleName, dword dwTds, word dwOmn, word wWfr); // EXPORT

-                  /// Identifies a module through it's name.

-                  int getModuleIndex(const std::string& strModuleName) const; // EXPORT

-                  /// Returns the number of files in the BoundImport directory.

-                  unsigned int calcNumberOfModules() const; // EXPORT

-                  /// Reads the BoundImport directory table from a PE file.

-                  int read(const std::string& strFileName, dword dwOffset, unsigned int uiSize); // EXPORT

-                  int read(unsigned char* pcBuffer, unsigned int uiSize); // EXPORT

-                  /// Rebuilds the BoundImport directory.

-                  void rebuild(std::vector<byte>& vBuffer, bool fMakeValid = true) const; // EXPORT

-                  /// Empties the BoundImport directory.

-                  void clear(); // EXPORT

-                  /// Removes a bound import.

-                  void removeBoundImport(const std::string& strModuleName); // EXPORT

-                  /// Returns the size of the BoundImport directory.

-                  unsigned int size() const; // EXPORT

-                  /// Writes the current bound import directory to a file.

-                  int write(const std::string& strFilename, dword dwOffset, bool fMakeValid = true) const; // EXPORT

-

-                  /// Retrieves the TimeDateStamp value of a bound import.

-                  dword getTimeDateStamp(dword dwBidnr) const; // EXPORT

-                  /// Retrieves the OffsetModuleName value of a bound import.

-                  word getOffsetModuleName(dword dwBidnr) const; // EXPORT

-                  /// Retrieves the NumberOfModuleForwarderRefs value of a bound import.

-                  word getNumberOfModuleForwarderRefs(dword dwBidnr) const; // EXPORT

-                  /// Retrieves the ModuleName value of a bound import.

-                  std::string getModuleName(dword dwBidnr) const; // EXPORT

-

-                  /// Updates the TimeDateStamp value of a bound import.

-                  void setTimeDateStamp(dword dwBidnr, dword dwTds); // EXPORT

-                  /// Updates the OffsetModuleName value of a bound import.

-                  void setOffsetModuleName(dword dwBidnr, word wOmn); // EXPORT

-                  /// Updates the NumberOfModuleForwarderRefs value of a bound import.

-                  void setNumberOfModuleForwarderRefs(dword dwBidnr, word wMfr); // EXPORT

-                  /// Updates the ModuleName value of a bound import.

-                  void setModuleName(dword dwBidnr, const std::string& strModuleName); // EXPORT

-                  

-                  dword getTimeDateStamp(dword dwBidnr, dword forwardedModule) const; // EXPORT _module

-                  word getOffsetModuleName(dword dwBidnr, dword forwardedModule) const; // EXPORT _module

-                  word getNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule) const; // EXPORT _module

-                  std::string getModuleName(dword dwBidnr, dword forwardedModule) const; // EXPORT _module

-

-                  void setTimeDateStamp(dword dwBidnr, dword forwardedModule, dword dwTds); // EXPORT _module

-                  void setOffsetModuleName(dword dwBidnr, dword forwardedModule, word wOmn); // EXPORT _module

-                  void setNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule, word wMfr); // EXPORT _module

-                  void setModuleName(dword dwBidnr, dword forwardedModule, const std::string& strModuleName); // EXPORT _module

-                  

-                  word calcNumberOfModuleForwarderRefs(dword dwBidnr) const; // EXPORT

-                  void addForwardedModule(dword dwBidnr, const std::string& name, dword timeStamp = 0, word offsetModuleName = 0, word forwardedModules = 0); // EXPORT

-                  void removeForwardedModule(dword dwBidnr, word forwardedModule); // EXPORT

-        };

-}

-

-

-#endif

+/*
+* BoundImportDirectory.h - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#ifndef BOUNDIMPORTDIRECTORY_H
+#define BOUNDIMPORTDIRECTORY_H
+
+#include "PeLibAux.h"
+
+namespace PeLib
+{
+        /// Class that handles the BoundImport directory.
+        /**
+        * This class can read and modify the BoundImport directory table of a PE file.
+        **/
+        class BoundImportDirectory
+        {
+                private:
+                  std::vector<PELIB_IMAGE_BOUND_DIRECTORY> m_vIbd; ///< Stores the individual BoundImport fields.
+                  
+                  int read(InputBuffer& inpBuffer, unsigned char* data, unsigned int dwSize);
+                  unsigned int totalModules() const;
+                public:
+                  /// Adds another bound import.
+                  int addBoundImport(const std::string& strModuleName, dword dwTds, word dwOmn, word wWfr); // EXPORT
+                  /// Identifies a module through it's name.
+                  int getModuleIndex(const std::string& strModuleName) const; // EXPORT
+                  /// Returns the number of files in the BoundImport directory.
+                  unsigned int calcNumberOfModules() const; // EXPORT
+                  /// Reads the BoundImport directory table from a PE file.
+                  int read(const std::string& strFileName, dword dwOffset, unsigned int uiSize); // EXPORT
+                  int read(unsigned char* pcBuffer, unsigned int uiSize); // EXPORT
+                  /// Rebuilds the BoundImport directory.
+                  void rebuild(std::vector<byte>& vBuffer, bool fMakeValid = true) const; // EXPORT
+                  /// Empties the BoundImport directory.
+                  void clear(); // EXPORT
+                  /// Removes a bound import.
+                  void removeBoundImport(const std::string& strModuleName); // EXPORT
+                  /// Returns the size of the BoundImport directory.
+                  unsigned int size() const; // EXPORT
+                  /// Writes the current bound import directory to a file.
+                  int write(const std::string& strFilename, dword dwOffset, bool fMakeValid = true) const; // EXPORT
+
+                  /// Retrieves the TimeDateStamp value of a bound import.
+                  dword getTimeDateStamp(dword dwBidnr) const; // EXPORT
+                  /// Retrieves the OffsetModuleName value of a bound import.
+                  word getOffsetModuleName(dword dwBidnr) const; // EXPORT
+                  /// Retrieves the NumberOfModuleForwarderRefs value of a bound import.
+                  word getNumberOfModuleForwarderRefs(dword dwBidnr) const; // EXPORT
+                  /// Retrieves the ModuleName value of a bound import.
+                  std::string getModuleName(dword dwBidnr) const; // EXPORT
+
+                  /// Updates the TimeDateStamp value of a bound import.
+                  void setTimeDateStamp(dword dwBidnr, dword dwTds); // EXPORT
+                  /// Updates the OffsetModuleName value of a bound import.
+                  void setOffsetModuleName(dword dwBidnr, word wOmn); // EXPORT
+                  /// Updates the NumberOfModuleForwarderRefs value of a bound import.
+                  void setNumberOfModuleForwarderRefs(dword dwBidnr, word wMfr); // EXPORT
+                  /// Updates the ModuleName value of a bound import.
+                  void setModuleName(dword dwBidnr, const std::string& strModuleName); // EXPORT
+                  
+                  dword getTimeDateStamp(dword dwBidnr, dword forwardedModule) const; // EXPORT _module
+                  word getOffsetModuleName(dword dwBidnr, dword forwardedModule) const; // EXPORT _module
+                  word getNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule) const; // EXPORT _module
+                  std::string getModuleName(dword dwBidnr, dword forwardedModule) const; // EXPORT _module
+
+                  void setTimeDateStamp(dword dwBidnr, dword forwardedModule, dword dwTds); // EXPORT _module
+                  void setOffsetModuleName(dword dwBidnr, dword forwardedModule, word wOmn); // EXPORT _module
+                  void setNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule, word wMfr); // EXPORT _module
+                  void setModuleName(dword dwBidnr, dword forwardedModule, const std::string& strModuleName); // EXPORT _module
+                  
+                  word calcNumberOfModuleForwarderRefs(dword dwBidnr) const; // EXPORT
+                  void addForwardedModule(dword dwBidnr, const std::string& name, dword timeStamp = 0, word offsetModuleName = 0, word forwardedModules = 0); // EXPORT
+                  void removeForwardedModule(dword dwBidnr, word forwardedModule); // EXPORT
+        };
+}
+
+
+#endif
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/ComHeaderDirectory.cpp b/utils/zenutils/libraries/pelib-0.9/pelib/ComHeaderDirectory.cpp
index 886348994e..fef12f4d8b 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/ComHeaderDirectory.cpp
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/ComHeaderDirectory.cpp
@@ -1,467 +1,467 @@
-/*

-* ComHeaderDirectory.cpp - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#include "PeLibInc.h"

-#include "ComHeaderDirectory.h"

-

-namespace PeLib

-{

-        void ComHeaderDirectory::read(InputBuffer& inputbuffer)

-        {

-                PELIB_IMAGE_COR20_HEADER ichCurr;

-                

-                inputbuffer >> ichCurr.cb;

-                inputbuffer >> ichCurr.MajorRuntimeVersion;

-                inputbuffer >> ichCurr.MinorRuntimeVersion;

-                inputbuffer >> ichCurr.MetaData.VirtualAddress;

-                inputbuffer >> ichCurr.MetaData.Size;

-                inputbuffer >> ichCurr.Flags;

-                inputbuffer >> ichCurr.EntryPointToken;

-                inputbuffer >> ichCurr.Resources.VirtualAddress;

-                inputbuffer >> ichCurr.Resources.Size;

-                inputbuffer >> ichCurr.StrongNameSignature.VirtualAddress;

-                inputbuffer >> ichCurr.StrongNameSignature.Size;

-                inputbuffer >> ichCurr.CodeManagerTable.VirtualAddress;

-                inputbuffer >> ichCurr.CodeManagerTable.Size;

-                inputbuffer >> ichCurr.VTableFixups.VirtualAddress;

-                inputbuffer >> ichCurr.VTableFixups.Size;

-                inputbuffer >> ichCurr.ExportAddressTableJumps.VirtualAddress;

-                inputbuffer >> ichCurr.ExportAddressTableJumps.Size;

-                inputbuffer >> ichCurr.ManagedNativeHeader.VirtualAddress;

-                inputbuffer >> ichCurr.ManagedNativeHeader.Size;

-                

-                std::swap(ichCurr, m_ichComHeader);

-        }

-        

-        int ComHeaderDirectory::read(unsigned char* buffer, unsigned int buffersize)

-        {

-                if (buffersize < PELIB_IMAGE_COR20_HEADER::size())

-                {

-                        return ERROR_INVALID_FILE;

-                }

-                

-                std::vector<byte> vComDescDirectory(buffer, buffer + buffersize);

-                

-                InputBuffer ibBuffer(vComDescDirectory);

-                read(ibBuffer);

-                return NO_ERROR;

-        }

-        

-        /**

-        * Reads a file's COM+ descriptor.

-        * @param strFilename Name of the file.

-        * @param uiOffset File offset of the COM+ descriptor.

-        * @param uiSize Size of the COM+ descriptor.

-        **/

-        int ComHeaderDirectory::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize)

-        {

-                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);

-                unsigned int ulFileSize = fileSize(ifFile);

-

-                if (!ifFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-                

-                if (ulFileSize < uiOffset + uiSize)

-                {

-                        return ERROR_INVALID_FILE;

-                }

-

-                ifFile.seekg(uiOffset, std::ios::beg);

-

-                std::vector<byte> vComDescDirectory(uiSize);

-                ifFile.read(reinterpret_cast<char*>(&vComDescDirectory[0]), uiSize);

-                

-                InputBuffer ibBuffer(vComDescDirectory);

-                read(ibBuffer);

-                return NO_ERROR;

-        }

-        

-        /**

-        * Rebuilds the current COM+ descriptor.

-        * @param vBuffer Buffer where the COM+ descriptor will be written to.

-        **/

-        void ComHeaderDirectory::rebuild(std::vector<byte>& vBuffer) const

-        {

-                OutputBuffer obBuffer(vBuffer);

-                

-                obBuffer << m_ichComHeader.cb;

-                obBuffer << m_ichComHeader.MajorRuntimeVersion;

-                obBuffer << m_ichComHeader.MinorRuntimeVersion;

-                obBuffer << m_ichComHeader.MetaData.VirtualAddress;

-                obBuffer << m_ichComHeader.MetaData.Size;

-                obBuffer << m_ichComHeader.Flags;

-                obBuffer << m_ichComHeader.EntryPointToken;

-                obBuffer << m_ichComHeader.Resources.VirtualAddress;

-                obBuffer << m_ichComHeader.Resources.Size;

-                obBuffer << m_ichComHeader.StrongNameSignature.VirtualAddress;

-                obBuffer << m_ichComHeader.StrongNameSignature.Size;

-                obBuffer << m_ichComHeader.CodeManagerTable.VirtualAddress;

-                obBuffer << m_ichComHeader.CodeManagerTable.Size;

-                obBuffer << m_ichComHeader.VTableFixups.VirtualAddress;

-                obBuffer << m_ichComHeader.VTableFixups.Size;

-                obBuffer << m_ichComHeader.ExportAddressTableJumps.VirtualAddress;

-                obBuffer << m_ichComHeader.ExportAddressTableJumps.Size;

-                obBuffer << m_ichComHeader.ManagedNativeHeader.VirtualAddress;

-                obBuffer << m_ichComHeader.ManagedNativeHeader.Size;

-        }

-

-        /**

-        * @return Size in bytes.

-        **/

-        unsigned int ComHeaderDirectory::size() const

-        {

-                return PELIB_IMAGE_COR20_HEADER::size();

-        }

-

-        /**

-        * @param strFilename Name of the file.

-        * @param dwOffset File offset the COM+ descriptor will be written to.

-        **/

-        int ComHeaderDirectory::write(const std::string& strFilename, unsigned int dwOffset) const

-        {

-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);

-                

-                if (!ofFile)

-                {

-                        ofFile.clear();

-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);

-                }

-                else

-                {

-                        ofFile.close();

-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);

-                }

-

-                if (!ofFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-

-                ofFile.seekp(dwOffset, std::ios::beg);

-

-                std::vector<unsigned char> vBuffer;

-                rebuild(vBuffer);

-

-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));

-

-                ofFile.close();

-                

-                return NO_ERROR;

-        }

-

-        /**

-        * @return SizeOfHeader value of the current COM+ descriptor.

-        **/

-        dword ComHeaderDirectory::getSizeOfHeader() const

-        {

-                return m_ichComHeader.cb;

-        }

-

-        /**

-        * @return MajorRuntimeVersion value of the current COM+ descriptor.

-        **/

-        word ComHeaderDirectory::getMajorRuntimeVersion() const

-        {

-                return m_ichComHeader.MajorRuntimeVersion;

-        }

-

-        /**

-        * @return MinorRuntimeVersion value of the current COM+ descriptor.

-        **/

-        word ComHeaderDirectory::getMinorRuntimeVersion() const

-        {

-                return m_ichComHeader.MinorRuntimeVersion;

-        }

-

-        /**

-        * @return MetaData (Virtual Address) value of the current COM+ descriptor.

-        **/

-        dword ComHeaderDirectory::getMetaDataVa() const

-        {

-                return m_ichComHeader.MetaData.VirtualAddress;

-        }

-

-        /**

-        * @return MetaData (Size) value of the current COM+ descriptor.

-        **/

-        dword ComHeaderDirectory::getMetaDataSize() const

-        {

-                return m_ichComHeader.MetaData.Size;

-        }

-

-        /**

-        * @return Flags value of the current COM+ descriptor.

-        **/

-        dword ComHeaderDirectory::getFlags() const

-        {

-                return m_ichComHeader.Flags;

-        }

-

-        /**

-        * @return EntryPointToken value of the current COM+ descriptor.

-        **/

-        dword ComHeaderDirectory::getEntryPointToken() const

-        {

-                return m_ichComHeader.EntryPointToken;

-        }

-

-        /**

-        * @return Resources (Virtual Address) value of the current COM+ descriptor.

-        **/

-        dword ComHeaderDirectory::getResourcesVa() const

-        {

-                return m_ichComHeader.Resources.VirtualAddress;

-        }

-

-        /**

-        * @return Resources (Size) value of the current COM+ descriptor.

-        **/

-        dword ComHeaderDirectory::getResourcesSize()

-        {

-                return m_ichComHeader.Resources.Size;

-        }

-

-        /**

-        * @return StrongNameSignature (Virtual Address) value of the current COM+ descriptor.

-        **/

-        dword ComHeaderDirectory::getStrongNameSignatureVa() const

-        {

-                return m_ichComHeader.StrongNameSignature.VirtualAddress;

-        }

-

-        /**

-        * @return StrongNameSignature (Size) value of the current COM+ descriptor.

-        **/

-        dword ComHeaderDirectory::getStrongNameSignagureSize() const

-        {

-                return m_ichComHeader.StrongNameSignature.Size;

-        }

-

-        /**

-        * @return CodeManagerTable (Virtual Address) value of the current COM+ descriptor.

-        **/

-        dword ComHeaderDirectory::getCodeManagerTableVa() const

-        {

-                return m_ichComHeader.CodeManagerTable.VirtualAddress;

-        }

-

-        /**

-        * @return CodeManagerTable (Size) value of the current COM+ descriptor.

-        **/

-        dword ComHeaderDirectory::getCodeManagerTableSize() const

-        {

-                return m_ichComHeader.CodeManagerTable.Size;

-        }

-

-        /**

-        * @return VTableFixups (Virtual Address) value of the current COM+ descriptor.

-        **/

-        dword ComHeaderDirectory::getVTableFixupsVa() const

-        {

-                return m_ichComHeader.VTableFixups.VirtualAddress;

-        }

-

-        /**

-        * @return VTableFixups (Size) value of the current COM+ descriptor.

-        **/

-        dword ComHeaderDirectory::getVTableFixupsSize() const

-        {

-                return m_ichComHeader.VTableFixups.Size;

-        }

-

-        /**

-        * @return ExportAddressTableJumps (Virtual Address) value of the current COM+ descriptor.

-        **/

-        dword ComHeaderDirectory::getExportAddressTableJumpsVa() const

-        {

-                return m_ichComHeader.ExportAddressTableJumps.VirtualAddress;

-        }

-

-        /**

-        * @return ExportAddressTableJumps (Size) value of the current COM+ descriptor.

-        **/

-        dword ComHeaderDirectory::getExportAddressTableJumpsSize() const

-        {

-                return m_ichComHeader.ExportAddressTableJumps.Size;

-        }

-

-        /**

-        * @return ManagedNativeHeader (Virtual Address) value of the current COM+ descriptor.

-        **/

-        dword ComHeaderDirectory::getManagedNativeHeaderVa() const

-        {

-                return m_ichComHeader.ManagedNativeHeader.VirtualAddress;

-        }

-

-        /**

-        * @return ManagedNativeHeader (Size) value of the current COM+ descriptor.

-        **/

-        dword ComHeaderDirectory::getManagedNativeHeaderSize() const

-        {

-                return m_ichComHeader.ManagedNativeHeader.Size;

-        }

-

-        /**

-        * @param dwValue New value for the current SizeOfHeader (cb) value.

-        **/

-        void ComHeaderDirectory::setSizeOfHeader(dword dwValue)

-        {

-                m_ichComHeader.cb = dwValue;

-        }

-

-        /**

-        * @param wValue New value for the current MajorRuntimeVersion value.

-        **/

-        void ComHeaderDirectory::setMajorRuntimeVersion(word wValue)

-        {

-                m_ichComHeader.MajorRuntimeVersion = wValue;

-        }

-

-        /**

-        * @param wValue New value for the current MinorRuntimeVersion value.

-        **/

-        void ComHeaderDirectory::setMinorRuntimeVersion(word wValue)

-        {

-                m_ichComHeader.MinorRuntimeVersion = wValue;

-        }

-

-        /**

-        * @param dwValue New value for the current MetaData (VirtualAddress) value.

-        **/

-        void ComHeaderDirectory::setMetaDataVa(dword dwValue)

-        {

-                m_ichComHeader.MetaData.VirtualAddress = dwValue;

-        }

-

-        /**

-        * @param dwValue New value for the current MetaData (Size) value.

-        **/

-        void ComHeaderDirectory::setMetaDataSize(dword dwValue)

-        {

-                m_ichComHeader.MetaData.Size = dwValue;

-        }

-

-        /**

-        * @param dwValue New value for the current Flags value.

-        **/

-        void ComHeaderDirectory::setFlags(dword dwValue)

-        {

-                m_ichComHeader.Flags = dwValue;

-        }

-

-        /**

-        * @param dwValue New value for the current EntryPointToken value.

-        **/

-        void ComHeaderDirectory::setEntryPointToken(dword dwValue)

-        {

-                m_ichComHeader.EntryPointToken = dwValue;

-        }

-

-        /**

-        * @param dwValue New value for the current Resources (VirtualAddress) value.

-        **/

-        void ComHeaderDirectory::setResourcesVa(dword dwValue)

-        {

-                m_ichComHeader.Resources.VirtualAddress = dwValue;

-        }

-

-        /**

-        * @param dwValue New value for the current Resources (Size) value.

-        **/

-        void ComHeaderDirectory::setResourcesSize(dword dwValue)

-        {

-                m_ichComHeader.Resources.Size = dwValue;

-        }

-

-        /**

-        * @param dwValue New value for the current StrongNameSignature (VirtualAddress) value.

-        **/

-        void ComHeaderDirectory::setStrongNameSignatureVa(dword dwValue)

-        {

-                m_ichComHeader.StrongNameSignature.VirtualAddress = dwValue;

-        }

-

-        /**

-        * @param dwValue New value for the current StrongNameSignature (Size) value.

-        **/

-        void ComHeaderDirectory::setStrongNameSignagureSize(dword dwValue)

-        {

-                m_ichComHeader.StrongNameSignature.Size = dwValue;

-        }

-

-        /**

-        * @param dwValue New value for the current CodeManagerTable (VirtualAddress) value.

-        **/

-        void ComHeaderDirectory::setCodeManagerTableVa(dword dwValue)

-        {

-                m_ichComHeader.CodeManagerTable.VirtualAddress = dwValue;

-        }

-

-        /**

-        * @param dwValue New value for the current CodeManagerTable (Size) value.

-        **/

-        void ComHeaderDirectory::setCodeManagerTableSize(dword dwValue)

-        {

-                m_ichComHeader.CodeManagerTable.Size = dwValue;

-        }

-

-        /**

-        * @param dwValue New value for the current VTableFixups (VirtualAddress) value.

-        **/

-        void ComHeaderDirectory::setVTableFixupsVa(dword dwValue)

-        {

-                m_ichComHeader.VTableFixups.VirtualAddress = dwValue;

-        }

-

-        /**

-        * @param dwValue New value for the current VTableFixups (Size) value.

-        **/

-        void ComHeaderDirectory::setVTableFixupsSize(dword dwValue)

-        {

-                m_ichComHeader.VTableFixups.Size = dwValue;

-        }

-

-        /**

-        * @param dwValue New value for the current ExportAddressTableJumps (VirtualAddress) value.

-        **/

-        void ComHeaderDirectory::setExportAddressTableJumpsVa(dword dwValue)

-        {

-                m_ichComHeader.ExportAddressTableJumps.VirtualAddress = dwValue;

-        }

-

-        /**

-        * @param dwValue New value for the current ExportAddressTableJumps (Size) value.

-        **/

-        void ComHeaderDirectory::setExportAddressTableJumpsSize(dword dwValue)

-        {

-                m_ichComHeader.ExportAddressTableJumps.Size = dwValue;

-        }

-

-        /**

-        * @param dwValue New value for the current ManagedNativeHeader (VirtualAddress) value.

-        **/

-        void ComHeaderDirectory::setManagedNativeHeaderVa(dword dwValue)

-        {

-                m_ichComHeader.ManagedNativeHeader.VirtualAddress = dwValue;

-        }

-

-        /**

-        * @param dwValue New value for the current ManagedNativeHeader (Size) value.

-        **/

-        void ComHeaderDirectory::setManagedNativeHeaderSize(dword dwValue)

-        {

-                m_ichComHeader.ManagedNativeHeader.Size = dwValue;

-        }

-

-}

+/*
+* ComHeaderDirectory.cpp - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#include "PeLibInc.h"
+#include "ComHeaderDirectory.h"
+
+namespace PeLib
+{
+        void ComHeaderDirectory::read(InputBuffer& inputbuffer)
+        {
+                PELIB_IMAGE_COR20_HEADER ichCurr;
+                
+                inputbuffer >> ichCurr.cb;
+                inputbuffer >> ichCurr.MajorRuntimeVersion;
+                inputbuffer >> ichCurr.MinorRuntimeVersion;
+                inputbuffer >> ichCurr.MetaData.VirtualAddress;
+                inputbuffer >> ichCurr.MetaData.Size;
+                inputbuffer >> ichCurr.Flags;
+                inputbuffer >> ichCurr.EntryPointToken;
+                inputbuffer >> ichCurr.Resources.VirtualAddress;
+                inputbuffer >> ichCurr.Resources.Size;
+                inputbuffer >> ichCurr.StrongNameSignature.VirtualAddress;
+                inputbuffer >> ichCurr.StrongNameSignature.Size;
+                inputbuffer >> ichCurr.CodeManagerTable.VirtualAddress;
+                inputbuffer >> ichCurr.CodeManagerTable.Size;
+                inputbuffer >> ichCurr.VTableFixups.VirtualAddress;
+                inputbuffer >> ichCurr.VTableFixups.Size;
+                inputbuffer >> ichCurr.ExportAddressTableJumps.VirtualAddress;
+                inputbuffer >> ichCurr.ExportAddressTableJumps.Size;
+                inputbuffer >> ichCurr.ManagedNativeHeader.VirtualAddress;
+                inputbuffer >> ichCurr.ManagedNativeHeader.Size;
+                
+                std::swap(ichCurr, m_ichComHeader);
+        }
+        
+        int ComHeaderDirectory::read(unsigned char* buffer, unsigned int buffersize)
+        {
+                if (buffersize < PELIB_IMAGE_COR20_HEADER::size())
+                {
+                        return ERROR_INVALID_FILE;
+                }
+                
+                std::vector<byte> vComDescDirectory(buffer, buffer + buffersize);
+                
+                InputBuffer ibBuffer(vComDescDirectory);
+                read(ibBuffer);
+                return NO_ERROR;
+        }
+        
+        /**
+        * Reads a file's COM+ descriptor.
+        * @param strFilename Name of the file.
+        * @param uiOffset File offset of the COM+ descriptor.
+        * @param uiSize Size of the COM+ descriptor.
+        **/
+        int ComHeaderDirectory::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize)
+        {
+                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
+                unsigned int ulFileSize = fileSize(ifFile);
+
+                if (!ifFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+                
+                if (ulFileSize < uiOffset + uiSize)
+                {
+                        return ERROR_INVALID_FILE;
+                }
+
+                ifFile.seekg(uiOffset, std::ios::beg);
+
+                std::vector<byte> vComDescDirectory(uiSize);
+                ifFile.read(reinterpret_cast<char*>(&vComDescDirectory[0]), uiSize);
+                
+                InputBuffer ibBuffer(vComDescDirectory);
+                read(ibBuffer);
+                return NO_ERROR;
+        }
+        
+        /**
+        * Rebuilds the current COM+ descriptor.
+        * @param vBuffer Buffer where the COM+ descriptor will be written to.
+        **/
+        void ComHeaderDirectory::rebuild(std::vector<byte>& vBuffer) const
+        {
+                OutputBuffer obBuffer(vBuffer);
+                
+                obBuffer << m_ichComHeader.cb;
+                obBuffer << m_ichComHeader.MajorRuntimeVersion;
+                obBuffer << m_ichComHeader.MinorRuntimeVersion;
+                obBuffer << m_ichComHeader.MetaData.VirtualAddress;
+                obBuffer << m_ichComHeader.MetaData.Size;
+                obBuffer << m_ichComHeader.Flags;
+                obBuffer << m_ichComHeader.EntryPointToken;
+                obBuffer << m_ichComHeader.Resources.VirtualAddress;
+                obBuffer << m_ichComHeader.Resources.Size;
+                obBuffer << m_ichComHeader.StrongNameSignature.VirtualAddress;
+                obBuffer << m_ichComHeader.StrongNameSignature.Size;
+                obBuffer << m_ichComHeader.CodeManagerTable.VirtualAddress;
+                obBuffer << m_ichComHeader.CodeManagerTable.Size;
+                obBuffer << m_ichComHeader.VTableFixups.VirtualAddress;
+                obBuffer << m_ichComHeader.VTableFixups.Size;
+                obBuffer << m_ichComHeader.ExportAddressTableJumps.VirtualAddress;
+                obBuffer << m_ichComHeader.ExportAddressTableJumps.Size;
+                obBuffer << m_ichComHeader.ManagedNativeHeader.VirtualAddress;
+                obBuffer << m_ichComHeader.ManagedNativeHeader.Size;
+        }
+
+        /**
+        * @return Size in bytes.
+        **/
+        unsigned int ComHeaderDirectory::size() const
+        {
+                return PELIB_IMAGE_COR20_HEADER::size();
+        }
+
+        /**
+        * @param strFilename Name of the file.
+        * @param dwOffset File offset the COM+ descriptor will be written to.
+        **/
+        int ComHeaderDirectory::write(const std::string& strFilename, unsigned int dwOffset) const
+        {
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                
+                if (!ofFile)
+                {
+                        ofFile.clear();
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                }
+                else
+                {
+                        ofFile.close();
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                }
+
+                if (!ofFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+
+                ofFile.seekp(dwOffset, std::ios::beg);
+
+                std::vector<unsigned char> vBuffer;
+                rebuild(vBuffer);
+
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
+
+                ofFile.close();
+                
+                return NO_ERROR;
+        }
+
+        /**
+        * @return SizeOfHeader value of the current COM+ descriptor.
+        **/
+        dword ComHeaderDirectory::getSizeOfHeader() const
+        {
+                return m_ichComHeader.cb;
+        }
+
+        /**
+        * @return MajorRuntimeVersion value of the current COM+ descriptor.
+        **/
+        word ComHeaderDirectory::getMajorRuntimeVersion() const
+        {
+                return m_ichComHeader.MajorRuntimeVersion;
+        }
+
+        /**
+        * @return MinorRuntimeVersion value of the current COM+ descriptor.
+        **/
+        word ComHeaderDirectory::getMinorRuntimeVersion() const
+        {
+                return m_ichComHeader.MinorRuntimeVersion;
+        }
+
+        /**
+        * @return MetaData (Virtual Address) value of the current COM+ descriptor.
+        **/
+        dword ComHeaderDirectory::getMetaDataVa() const
+        {
+                return m_ichComHeader.MetaData.VirtualAddress;
+        }
+
+        /**
+        * @return MetaData (Size) value of the current COM+ descriptor.
+        **/
+        dword ComHeaderDirectory::getMetaDataSize() const
+        {
+                return m_ichComHeader.MetaData.Size;
+        }
+
+        /**
+        * @return Flags value of the current COM+ descriptor.
+        **/
+        dword ComHeaderDirectory::getFlags() const
+        {
+                return m_ichComHeader.Flags;
+        }
+
+        /**
+        * @return EntryPointToken value of the current COM+ descriptor.
+        **/
+        dword ComHeaderDirectory::getEntryPointToken() const
+        {
+                return m_ichComHeader.EntryPointToken;
+        }
+
+        /**
+        * @return Resources (Virtual Address) value of the current COM+ descriptor.
+        **/
+        dword ComHeaderDirectory::getResourcesVa() const
+        {
+                return m_ichComHeader.Resources.VirtualAddress;
+        }
+
+        /**
+        * @return Resources (Size) value of the current COM+ descriptor.
+        **/
+        dword ComHeaderDirectory::getResourcesSize()
+        {
+                return m_ichComHeader.Resources.Size;
+        }
+
+        /**
+        * @return StrongNameSignature (Virtual Address) value of the current COM+ descriptor.
+        **/
+        dword ComHeaderDirectory::getStrongNameSignatureVa() const
+        {
+                return m_ichComHeader.StrongNameSignature.VirtualAddress;
+        }
+
+        /**
+        * @return StrongNameSignature (Size) value of the current COM+ descriptor.
+        **/
+        dword ComHeaderDirectory::getStrongNameSignagureSize() const
+        {
+                return m_ichComHeader.StrongNameSignature.Size;
+        }
+
+        /**
+        * @return CodeManagerTable (Virtual Address) value of the current COM+ descriptor.
+        **/
+        dword ComHeaderDirectory::getCodeManagerTableVa() const
+        {
+                return m_ichComHeader.CodeManagerTable.VirtualAddress;
+        }
+
+        /**
+        * @return CodeManagerTable (Size) value of the current COM+ descriptor.
+        **/
+        dword ComHeaderDirectory::getCodeManagerTableSize() const
+        {
+                return m_ichComHeader.CodeManagerTable.Size;
+        }
+
+        /**
+        * @return VTableFixups (Virtual Address) value of the current COM+ descriptor.
+        **/
+        dword ComHeaderDirectory::getVTableFixupsVa() const
+        {
+                return m_ichComHeader.VTableFixups.VirtualAddress;
+        }
+
+        /**
+        * @return VTableFixups (Size) value of the current COM+ descriptor.
+        **/
+        dword ComHeaderDirectory::getVTableFixupsSize() const
+        {
+                return m_ichComHeader.VTableFixups.Size;
+        }
+
+        /**
+        * @return ExportAddressTableJumps (Virtual Address) value of the current COM+ descriptor.
+        **/
+        dword ComHeaderDirectory::getExportAddressTableJumpsVa() const
+        {
+                return m_ichComHeader.ExportAddressTableJumps.VirtualAddress;
+        }
+
+        /**
+        * @return ExportAddressTableJumps (Size) value of the current COM+ descriptor.
+        **/
+        dword ComHeaderDirectory::getExportAddressTableJumpsSize() const
+        {
+                return m_ichComHeader.ExportAddressTableJumps.Size;
+        }
+
+        /**
+        * @return ManagedNativeHeader (Virtual Address) value of the current COM+ descriptor.
+        **/
+        dword ComHeaderDirectory::getManagedNativeHeaderVa() const
+        {
+                return m_ichComHeader.ManagedNativeHeader.VirtualAddress;
+        }
+
+        /**
+        * @return ManagedNativeHeader (Size) value of the current COM+ descriptor.
+        **/
+        dword ComHeaderDirectory::getManagedNativeHeaderSize() const
+        {
+                return m_ichComHeader.ManagedNativeHeader.Size;
+        }
+
+        /**
+        * @param dwValue New value for the current SizeOfHeader (cb) value.
+        **/
+        void ComHeaderDirectory::setSizeOfHeader(dword dwValue)
+        {
+                m_ichComHeader.cb = dwValue;
+        }
+
+        /**
+        * @param wValue New value for the current MajorRuntimeVersion value.
+        **/
+        void ComHeaderDirectory::setMajorRuntimeVersion(word wValue)
+        {
+                m_ichComHeader.MajorRuntimeVersion = wValue;
+        }
+
+        /**
+        * @param wValue New value for the current MinorRuntimeVersion value.
+        **/
+        void ComHeaderDirectory::setMinorRuntimeVersion(word wValue)
+        {
+                m_ichComHeader.MinorRuntimeVersion = wValue;
+        }
+
+        /**
+        * @param dwValue New value for the current MetaData (VirtualAddress) value.
+        **/
+        void ComHeaderDirectory::setMetaDataVa(dword dwValue)
+        {
+                m_ichComHeader.MetaData.VirtualAddress = dwValue;
+        }
+
+        /**
+        * @param dwValue New value for the current MetaData (Size) value.
+        **/
+        void ComHeaderDirectory::setMetaDataSize(dword dwValue)
+        {
+                m_ichComHeader.MetaData.Size = dwValue;
+        }
+
+        /**
+        * @param dwValue New value for the current Flags value.
+        **/
+        void ComHeaderDirectory::setFlags(dword dwValue)
+        {
+                m_ichComHeader.Flags = dwValue;
+        }
+
+        /**
+        * @param dwValue New value for the current EntryPointToken value.
+        **/
+        void ComHeaderDirectory::setEntryPointToken(dword dwValue)
+        {
+                m_ichComHeader.EntryPointToken = dwValue;
+        }
+
+        /**
+        * @param dwValue New value for the current Resources (VirtualAddress) value.
+        **/
+        void ComHeaderDirectory::setResourcesVa(dword dwValue)
+        {
+                m_ichComHeader.Resources.VirtualAddress = dwValue;
+        }
+
+        /**
+        * @param dwValue New value for the current Resources (Size) value.
+        **/
+        void ComHeaderDirectory::setResourcesSize(dword dwValue)
+        {
+                m_ichComHeader.Resources.Size = dwValue;
+        }
+
+        /**
+        * @param dwValue New value for the current StrongNameSignature (VirtualAddress) value.
+        **/
+        void ComHeaderDirectory::setStrongNameSignatureVa(dword dwValue)
+        {
+                m_ichComHeader.StrongNameSignature.VirtualAddress = dwValue;
+        }
+
+        /**
+        * @param dwValue New value for the current StrongNameSignature (Size) value.
+        **/
+        void ComHeaderDirectory::setStrongNameSignagureSize(dword dwValue)
+        {
+                m_ichComHeader.StrongNameSignature.Size = dwValue;
+        }
+
+        /**
+        * @param dwValue New value for the current CodeManagerTable (VirtualAddress) value.
+        **/
+        void ComHeaderDirectory::setCodeManagerTableVa(dword dwValue)
+        {
+                m_ichComHeader.CodeManagerTable.VirtualAddress = dwValue;
+        }
+
+        /**
+        * @param dwValue New value for the current CodeManagerTable (Size) value.
+        **/
+        void ComHeaderDirectory::setCodeManagerTableSize(dword dwValue)
+        {
+                m_ichComHeader.CodeManagerTable.Size = dwValue;
+        }
+
+        /**
+        * @param dwValue New value for the current VTableFixups (VirtualAddress) value.
+        **/
+        void ComHeaderDirectory::setVTableFixupsVa(dword dwValue)
+        {
+                m_ichComHeader.VTableFixups.VirtualAddress = dwValue;
+        }
+
+        /**
+        * @param dwValue New value for the current VTableFixups (Size) value.
+        **/
+        void ComHeaderDirectory::setVTableFixupsSize(dword dwValue)
+        {
+                m_ichComHeader.VTableFixups.Size = dwValue;
+        }
+
+        /**
+        * @param dwValue New value for the current ExportAddressTableJumps (VirtualAddress) value.
+        **/
+        void ComHeaderDirectory::setExportAddressTableJumpsVa(dword dwValue)
+        {
+                m_ichComHeader.ExportAddressTableJumps.VirtualAddress = dwValue;
+        }
+
+        /**
+        * @param dwValue New value for the current ExportAddressTableJumps (Size) value.
+        **/
+        void ComHeaderDirectory::setExportAddressTableJumpsSize(dword dwValue)
+        {
+                m_ichComHeader.ExportAddressTableJumps.Size = dwValue;
+        }
+
+        /**
+        * @param dwValue New value for the current ManagedNativeHeader (VirtualAddress) value.
+        **/
+        void ComHeaderDirectory::setManagedNativeHeaderVa(dword dwValue)
+        {
+                m_ichComHeader.ManagedNativeHeader.VirtualAddress = dwValue;
+        }
+
+        /**
+        * @param dwValue New value for the current ManagedNativeHeader (Size) value.
+        **/
+        void ComHeaderDirectory::setManagedNativeHeaderSize(dword dwValue)
+        {
+                m_ichComHeader.ManagedNativeHeader.Size = dwValue;
+        }
+
+}
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/ComHeaderDirectory.h b/utils/zenutils/libraries/pelib-0.9/pelib/ComHeaderDirectory.h
index 915813c1cc..cdc993df1f 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/ComHeaderDirectory.h
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/ComHeaderDirectory.h
@@ -1,120 +1,120 @@
-/*

-* ComHeaderDirectory.h - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#ifndef COMHEADERDIRECTORY_H

-#define COMHEADERDIRECTORY_H

-

-namespace PeLib

-{

-        /// Class that handles the COM+ descriptor directory.

-        /**

-        * This class handles the COM+ Descriptor directory which was added to PE files

-        * which work with the .NET runtime modules.

-        **/

-        class ComHeaderDirectory

-        {

-                private:

-                  PELIB_IMAGE_COR20_HEADER m_ichComHeader; ///< The COM+ descriptor.

-                  

-                  void read(InputBuffer& inputbuffer);

-

-                public:

-                  /// Read a file's COM+ runtime descriptor directory.

-                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize); // EXPORT

-                  int read(unsigned char* buffer, unsigned int buffersize); // EXPORT

-                  /// Rebuild the COM+ descriptor.

-                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT

-                  /// Returns the size of the current COM+ descriptor.

-                  unsigned int size() const; // EXPORT

-                  /// Writes the current COM+ descriptor directory to a file.

-                  int write(const std::string& strFilename, unsigned int dwOffset) const; // EXPORT

-

-                  /// Get the COM+ descriptor's SizeOfHeader (cb) value.

-                  dword getSizeOfHeader() const; // EXPORT

-                  /// Get the COM+ descriptor's MajorRuntimeVersion value.

-                  word getMajorRuntimeVersion() const; // EXPORT

-                  /// Get the COM+ descriptor's MinorRuntimeVersion value.

-                  word getMinorRuntimeVersion() const; // EXPORT

-                  /// Get the COM+ descriptor's MetaData (Virtual Address) value.

-                  dword getMetaDataVa() const; // EXPORT

-                  /// Get the COM+ descriptor's MetaData (Size) value.

-                  dword getMetaDataSize() const; // EXPORT

-                  /// Get the COM+ descriptor's Flags value.

-                  dword getFlags() const; // EXPORT

-                  /// Get the COM+ descriptor's EntryPointToken value.

-                  dword getEntryPointToken() const; // EXPORT

-                  /// Get the COM+ descriptor's Resources (Virtual Address) value.

-                  dword getResourcesVa() const; // EXPORT

-                  /// Get the COM+ descriptor's Resources (Size) value.

-                  dword getResourcesSize(); // EXPORT

-                  /// Get the COM+ descriptor's StrongNameSignature (Virtual Address) value.

-                  dword getStrongNameSignatureVa() const; // EXPORT

-                  /// Get the COM+ descriptor's StrongNameSignature (Size) value.

-                  dword getStrongNameSignagureSize() const; // EXPORT

-                  /// Get the COM+ descriptor's CodeManagerTable (Virtual Address) value.

-                  dword getCodeManagerTableVa() const; // EXPORT

-                  /// Get the COM+ descriptor's CodeManagerTable (Size) value.

-                  dword getCodeManagerTableSize() const; // EXPORT

-                  /// Get the COM+ descriptor's VTableFixup (Virtual Address) value.

-                  dword getVTableFixupsVa() const; // EXPORT

-                  /// Get the COM+ descriptor's VTableFixup (Size) value.

-                  dword getVTableFixupsSize() const; // EXPORT

-                  /// Get the COM+ descriptor's ExportAddressTable (Virtual Address) value.

-                  dword getExportAddressTableJumpsVa() const; // EXPORT

-                  /// Get the COM+ descriptor's ExportAddressTable (Size) value.

-                  dword getExportAddressTableJumpsSize() const; // EXPORT

-                  /// Get the COM+ descriptor's ManagedNativeHeader (Virtual Address) value.

-                  dword getManagedNativeHeaderVa() const; // EXPORT

-                  /// Get the COM+ descriptor's ManagedNativeHeader (Size) value.

-                  dword getManagedNativeHeaderSize() const; // EXPORT

-

-                  /// Change the COM+ descriptor's SizeOfHeader (cb) value.

-                  void setSizeOfHeader(dword dwValue); // EXPORT

-                  /// Change the COM+ descriptor's MajorRuntimeVersion value.

-                  void setMajorRuntimeVersion(word wValue); // EXPORT

-                  /// Change the COM+ descriptor's MinorRuntimeVersion value.

-                  void setMinorRuntimeVersion(word wValue); // EXPORT

-                  /// Change the COM+ descriptor's MetaData (VirtualAddress) value.

-                  void setMetaDataVa(dword dwValue); // EXPORT

-                  /// Change the COM+ descriptor's MetaData (Size) value.

-                  void setMetaDataSize(dword dwValue); // EXPORT

-                  /// Change the COM+ descriptor's Flags value.

-                  void setFlags(dword dwValue); // EXPORT

-                  /// Change the COM+ descriptor's EntryPointToken value.

-                  void setEntryPointToken(dword dwValue); // EXPORT

-                  /// Change the COM+ descriptor's Resources (VirtualAddress) value.

-                  void setResourcesVa(dword dwValue); // EXPORT

-                  /// Change the COM+ descriptor's Resources (Size) value.

-                  void setResourcesSize(dword dwValue); // EXPORT

-                  /// Change the COM+ descriptor's StrongNameSignatureVa (VirtualAddress) value.

-                  void setStrongNameSignatureVa(dword dwValue); // EXPORT

-                  /// Change the COM+ descriptor's StrongNameSignatureVa (Size) value.

-                  void setStrongNameSignagureSize(dword dwValue); // EXPORT

-                  /// Change the COM+ descriptor's CodeManagerTable (VirtualAddress) value.

-                  void setCodeManagerTableVa(dword dwValue); // EXPORT

-                  /// Change the COM+ descriptor's CodeManagerTable (Size) value.

-                  void setCodeManagerTableSize(dword dwValue); // EXPORT

-                  /// Change the COM+ descriptor's VTableFixups (VirtualAddress) value.

-                  void setVTableFixupsVa(dword dwValue); // EXPORT

-                  /// Change the COM+ descriptor's VTableFixups (Size) value.

-                  void setVTableFixupsSize(dword dwValue); // EXPORT

-                  /// Change the COM+ descriptor's ExportAddressTableJumps (VirtualAddress) value.

-                  void setExportAddressTableJumpsVa(dword dwValue); // EXPORT

-                  /// Change the COM+ descriptor's ExportAddressTableJumps (Size) value.

-                  void setExportAddressTableJumpsSize(dword dwValue); // EXPORT

-                  /// Change the COM+ descriptor's ManagedNativeHeader (VirtualAddress) value.

-                  void setManagedNativeHeaderVa(dword dwValue); // EXPORT

-                  /// Change the COM+ descriptor's ManagedNativeHeader (Size) value.

-                  void setManagedNativeHeaderSize(dword dwValue); // EXPORT

-        };

-}

-#endif

+/*
+* ComHeaderDirectory.h - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#ifndef COMHEADERDIRECTORY_H
+#define COMHEADERDIRECTORY_H
+
+namespace PeLib
+{
+        /// Class that handles the COM+ descriptor directory.
+        /**
+        * This class handles the COM+ Descriptor directory which was added to PE files
+        * which work with the .NET runtime modules.
+        **/
+        class ComHeaderDirectory
+        {
+                private:
+                  PELIB_IMAGE_COR20_HEADER m_ichComHeader; ///< The COM+ descriptor.
+                  
+                  void read(InputBuffer& inputbuffer);
+
+                public:
+                  /// Read a file's COM+ runtime descriptor directory.
+                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize); // EXPORT
+                  int read(unsigned char* buffer, unsigned int buffersize); // EXPORT
+                  /// Rebuild the COM+ descriptor.
+                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT
+                  /// Returns the size of the current COM+ descriptor.
+                  unsigned int size() const; // EXPORT
+                  /// Writes the current COM+ descriptor directory to a file.
+                  int write(const std::string& strFilename, unsigned int dwOffset) const; // EXPORT
+
+                  /// Get the COM+ descriptor's SizeOfHeader (cb) value.
+                  dword getSizeOfHeader() const; // EXPORT
+                  /// Get the COM+ descriptor's MajorRuntimeVersion value.
+                  word getMajorRuntimeVersion() const; // EXPORT
+                  /// Get the COM+ descriptor's MinorRuntimeVersion value.
+                  word getMinorRuntimeVersion() const; // EXPORT
+                  /// Get the COM+ descriptor's MetaData (Virtual Address) value.
+                  dword getMetaDataVa() const; // EXPORT
+                  /// Get the COM+ descriptor's MetaData (Size) value.
+                  dword getMetaDataSize() const; // EXPORT
+                  /// Get the COM+ descriptor's Flags value.
+                  dword getFlags() const; // EXPORT
+                  /// Get the COM+ descriptor's EntryPointToken value.
+                  dword getEntryPointToken() const; // EXPORT
+                  /// Get the COM+ descriptor's Resources (Virtual Address) value.
+                  dword getResourcesVa() const; // EXPORT
+                  /// Get the COM+ descriptor's Resources (Size) value.
+                  dword getResourcesSize(); // EXPORT
+                  /// Get the COM+ descriptor's StrongNameSignature (Virtual Address) value.
+                  dword getStrongNameSignatureVa() const; // EXPORT
+                  /// Get the COM+ descriptor's StrongNameSignature (Size) value.
+                  dword getStrongNameSignagureSize() const; // EXPORT
+                  /// Get the COM+ descriptor's CodeManagerTable (Virtual Address) value.
+                  dword getCodeManagerTableVa() const; // EXPORT
+                  /// Get the COM+ descriptor's CodeManagerTable (Size) value.
+                  dword getCodeManagerTableSize() const; // EXPORT
+                  /// Get the COM+ descriptor's VTableFixup (Virtual Address) value.
+                  dword getVTableFixupsVa() const; // EXPORT
+                  /// Get the COM+ descriptor's VTableFixup (Size) value.
+                  dword getVTableFixupsSize() const; // EXPORT
+                  /// Get the COM+ descriptor's ExportAddressTable (Virtual Address) value.
+                  dword getExportAddressTableJumpsVa() const; // EXPORT
+                  /// Get the COM+ descriptor's ExportAddressTable (Size) value.
+                  dword getExportAddressTableJumpsSize() const; // EXPORT
+                  /// Get the COM+ descriptor's ManagedNativeHeader (Virtual Address) value.
+                  dword getManagedNativeHeaderVa() const; // EXPORT
+                  /// Get the COM+ descriptor's ManagedNativeHeader (Size) value.
+                  dword getManagedNativeHeaderSize() const; // EXPORT
+
+                  /// Change the COM+ descriptor's SizeOfHeader (cb) value.
+                  void setSizeOfHeader(dword dwValue); // EXPORT
+                  /// Change the COM+ descriptor's MajorRuntimeVersion value.
+                  void setMajorRuntimeVersion(word wValue); // EXPORT
+                  /// Change the COM+ descriptor's MinorRuntimeVersion value.
+                  void setMinorRuntimeVersion(word wValue); // EXPORT
+                  /// Change the COM+ descriptor's MetaData (VirtualAddress) value.
+                  void setMetaDataVa(dword dwValue); // EXPORT
+                  /// Change the COM+ descriptor's MetaData (Size) value.
+                  void setMetaDataSize(dword dwValue); // EXPORT
+                  /// Change the COM+ descriptor's Flags value.
+                  void setFlags(dword dwValue); // EXPORT
+                  /// Change the COM+ descriptor's EntryPointToken value.
+                  void setEntryPointToken(dword dwValue); // EXPORT
+                  /// Change the COM+ descriptor's Resources (VirtualAddress) value.
+                  void setResourcesVa(dword dwValue); // EXPORT
+                  /// Change the COM+ descriptor's Resources (Size) value.
+                  void setResourcesSize(dword dwValue); // EXPORT
+                  /// Change the COM+ descriptor's StrongNameSignatureVa (VirtualAddress) value.
+                  void setStrongNameSignatureVa(dword dwValue); // EXPORT
+                  /// Change the COM+ descriptor's StrongNameSignatureVa (Size) value.
+                  void setStrongNameSignagureSize(dword dwValue); // EXPORT
+                  /// Change the COM+ descriptor's CodeManagerTable (VirtualAddress) value.
+                  void setCodeManagerTableVa(dword dwValue); // EXPORT
+                  /// Change the COM+ descriptor's CodeManagerTable (Size) value.
+                  void setCodeManagerTableSize(dword dwValue); // EXPORT
+                  /// Change the COM+ descriptor's VTableFixups (VirtualAddress) value.
+                  void setVTableFixupsVa(dword dwValue); // EXPORT
+                  /// Change the COM+ descriptor's VTableFixups (Size) value.
+                  void setVTableFixupsSize(dword dwValue); // EXPORT
+                  /// Change the COM+ descriptor's ExportAddressTableJumps (VirtualAddress) value.
+                  void setExportAddressTableJumpsVa(dword dwValue); // EXPORT
+                  /// Change the COM+ descriptor's ExportAddressTableJumps (Size) value.
+                  void setExportAddressTableJumpsSize(dword dwValue); // EXPORT
+                  /// Change the COM+ descriptor's ManagedNativeHeader (VirtualAddress) value.
+                  void setManagedNativeHeaderVa(dword dwValue); // EXPORT
+                  /// Change the COM+ descriptor's ManagedNativeHeader (Size) value.
+                  void setManagedNativeHeaderSize(dword dwValue); // EXPORT
+        };
+}
+#endif
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/DebugDirectory.cpp b/utils/zenutils/libraries/pelib-0.9/pelib/DebugDirectory.cpp
index eb3d5c5600..9a91c7b18c 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/DebugDirectory.cpp
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/DebugDirectory.cpp
@@ -1,383 +1,383 @@
-/*

-* DebugDirectory.cpp - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#include "PeLibInc.h"

-#include "DebugDirectory.h"

-

-namespace PeLib

-{

-        void DebugDirectory::clear()

-        {

-                m_vDebugInfo.clear();

-        }

-        

-        std::vector<PELIB_IMG_DEBUG_DIRECTORY> DebugDirectory::read(InputBuffer& ibBuffer, unsigned int uiSize)

-        {

-                std::vector<PELIB_IMG_DEBUG_DIRECTORY> currDebugInfo;

-                

-                PELIB_IMG_DEBUG_DIRECTORY iddCurr;

-                

-                for (unsigned int i=0;i<uiSize/PELIB_IMAGE_DEBUG_DIRECTORY::size();i++)

-                {

-                        

-                        ibBuffer >> iddCurr.idd.Characteristics;

-                        ibBuffer >> iddCurr.idd.TimeDateStamp;

-                        ibBuffer >> iddCurr.idd.MajorVersion;

-                        ibBuffer >> iddCurr.idd.MinorVersion;

-                        ibBuffer >> iddCurr.idd.Type;

-                        ibBuffer >> iddCurr.idd.SizeOfData;

-                        ibBuffer >> iddCurr.idd.AddressOfRawData;

-                        ibBuffer >> iddCurr.idd.PointerToRawData;

-                

-                        currDebugInfo.push_back(iddCurr);

-                }

-                

-                return currDebugInfo;

-        }

-        

-        int DebugDirectory::read(unsigned char* buffer, unsigned int buffersize)

-        {

-                // XXX: Note, debug data is not read at all. This might or might not change

-                //      in the future.

-                

-                std::vector<byte> vDebugDirectory(buffer, buffer + buffersize);

-                

-                InputBuffer ibBuffer(vDebugDirectory);

-                

-                std::vector<PELIB_IMG_DEBUG_DIRECTORY> currDebugInfo = read(ibBuffer, buffersize);

-                

-                std::swap(currDebugInfo, m_vDebugInfo);

-                

-                return NO_ERROR;

-        }

-        

-        /**

-        * @param strFilename Name of the file which will be read.

-        * @param uiOffset File offset of the Debug directory.

-        * @param uiSize Size of the Debug directory.

-        **/

-        int DebugDirectory::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize)

-        {

-                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);

-                unsigned int ulFileSize = fileSize(ifFile);

-

-                if (!ifFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-                

-                if (ulFileSize < uiOffset + uiSize)

-                {

-                        return ERROR_INVALID_FILE;

-                }

-

-                ifFile.seekg(uiOffset, std::ios::beg);

-

-                std::vector<byte> vDebugDirectory(uiSize);

-                ifFile.read(reinterpret_cast<char*>(&vDebugDirectory[0]), uiSize);

-                

-                InputBuffer ibBuffer(vDebugDirectory);

-                

-                std::vector<PELIB_IMG_DEBUG_DIRECTORY> currDebugInfo = read(ibBuffer, uiSize);

-                

-                for (unsigned int i=0;i<currDebugInfo.size();i++)

-                {

-                        ifFile.seekg(currDebugInfo[i].idd.PointerToRawData, std::ios::beg);

-                        currDebugInfo[i].data.resize(currDebugInfo[i].idd.SizeOfData);

-                        ifFile.read(reinterpret_cast<char*>(&currDebugInfo[i].data[0]), currDebugInfo[i].idd.SizeOfData);

-                        if (!ifFile) return ERROR_INVALID_FILE;

-                }

-                

-                std::swap(currDebugInfo, m_vDebugInfo);

-                

-                return NO_ERROR;

-        }

-        

-        /**

-        * Rebuilds the current debug directory.

-        * @param vBuffer Buffer where the rebuilt directory is stored.

-        **/

-        void DebugDirectory::rebuild(std::vector<byte>& vBuffer) const

-        {

-                OutputBuffer obBuffer(vBuffer);

-                

-                for (unsigned int i=0;i<m_vDebugInfo.size();i++)

-                {

-                        obBuffer << m_vDebugInfo[i].idd.Characteristics;

-                        obBuffer << m_vDebugInfo[i].idd.TimeDateStamp;

-                        obBuffer << m_vDebugInfo[i].idd.MajorVersion;

-                        obBuffer << m_vDebugInfo[i].idd.MinorVersion;

-                        obBuffer << m_vDebugInfo[i].idd.Type;

-                        obBuffer << m_vDebugInfo[i].idd.SizeOfData;

-                        obBuffer << m_vDebugInfo[i].idd.AddressOfRawData;

-                        obBuffer << m_vDebugInfo[i].idd.PointerToRawData;

-                }

-        }

-

-        /**

-        * @return Size of the debug directory.

-        **/

-        unsigned int DebugDirectory::size() const

-        {

-                return static_cast<unsigned int>(m_vDebugInfo.size()) * PELIB_IMAGE_DEBUG_DIRECTORY::size();

-        }

-

-        /**

-        * @param strFilename Name of the file which will be written.

-        * @param uiOffset File offset where the debug directory will be stored.

-        **/

-        int DebugDirectory::write(const std::string& strFilename, unsigned int uiOffset) const

-        {

-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);

-                

-                if (!ofFile)

-                {

-                        ofFile.clear();

-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);

-                }

-                else

-                {

-                        ofFile.close();

-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);

-                }

-

-                if (!ofFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-

-                ofFile.seekp(uiOffset, std::ios::beg);

-

-                std::vector<unsigned char> vBuffer;

-                rebuild(vBuffer);

-

-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));

-

-                ofFile.close();

-                

-                return NO_ERROR;

-        }

-

-        /**

-        * @return Number of debug structures in the current Debug directory.

-        **/

-        unsigned int DebugDirectory::calcNumberOfEntries() const

-        {

-                return static_cast<unsigned int>(m_vDebugInfo.size());

-        }

-

-        /**

-        * Adds a new debug structure to the debug directory. The initial values of all members of the structure

-        * are undefined.

-        **/

-        void DebugDirectory::addEntry()

-        {

-                PELIB_IMG_DEBUG_DIRECTORY p;

-                m_vDebugInfo.push_back(p);

-        }

-

-        /**

-        * Removes a debug structure from the current debug directory. If an invalid structure is specified

-        * by the parameter uiIndex the result will be undefined behaviour.

-        * @param uiIndex Identifies the debug structure.

-        **/

-        void DebugDirectory::removeEntry(unsigned int uiIndex)

-        {

-                m_vDebugInfo.erase(m_vDebugInfo.begin() + uiIndex);

-        }

-                  

-        /**

-        * Returns the Characteristics value of a debug structure. If an invalid structure is specified

-        * by the parameter uiIndex the result will be undefined behaviour.

-        * @param uiIndex Identifies the debug structure.

-        * @return Characteristics value of the debug structure.

-        **/

-        dword DebugDirectory::getCharacteristics(unsigned int uiIndex) const

-        {

-                return m_vDebugInfo[uiIndex].idd.Characteristics;

-        }

-        

-        /**

-        * Returns the TimeDateStamp value of a debug structure. If an invalid structure is specified

-        * by the parameter uiIndex the result will be undefined behaviour.

-        * @param uiIndex Identifies the debug structure.

-        * @return TimeDateStamp value of the debug structure.

-        **/

-        dword DebugDirectory::getTimeDateStamp(unsigned int uiIndex) const

-        {

-                return m_vDebugInfo[uiIndex].idd.TimeDateStamp;

-        }

-        

-        /**

-        * Returns the MajorVersion value of a debug structure. If an invalid structure is specified

-        * by the parameter uiIndex the result will be undefined behaviour.

-        * @param uiIndex Identifies the debug structure.

-        * @return MajorVersion value of the debug structure.

-        **/

-        word DebugDirectory::getMajorVersion(unsigned int uiIndex) const

-        {

-                return m_vDebugInfo[uiIndex].idd.MajorVersion;

-        }

-        

-        /**

-        * Returns the MinorVersion value of a debug structure. If an invalid structure is specified

-        * by the parameter uiIndex the result will be undefined behaviour.

-        * @param uiIndex Identifies the debug structure.

-        * @return MinorVersion value of the debug structure.

-        **/

-        word DebugDirectory::getMinorVersion(unsigned int uiIndex) const

-        {

-                return m_vDebugInfo[uiIndex].idd.MinorVersion;

-        }

-        

-        /**

-        * Returns the Type value of a debug structure. If an invalid structure is specified

-        * by the parameter uiIndex the result will be undefined behaviour.

-        * @param uiIndex Identifies the debug structure.

-        * @return Type value of the debug structure.

-        **/

-        dword DebugDirectory::getType(unsigned int uiIndex) const

-        {

-                return m_vDebugInfo[uiIndex].idd.Type;

-        }

-        

-        /**

-        * Returns the SizeOfData value of a debug structure. If an invalid structure is specified

-        * by the parameter uiIndex the result will be undefined behaviour.

-        * @param uiIndex Identifies the debug structure.

-        * @return SizeOfData value of the debug structure.

-        **/

-        dword DebugDirectory::getSizeOfData(unsigned int uiIndex) const

-        {

-                return m_vDebugInfo[uiIndex].idd.SizeOfData;

-        }

-        

-        /**

-        * Returns the AddressOfRawData value of a debug structure. If an invalid structure is specified

-        * by the parameter uiIndex the result will be undefined behaviour.

-        * @param uiIndex Identifies the debug structure.

-        * @return AddressOfRawData value of the debug structure.

-        **/

-        dword DebugDirectory::getAddressOfRawData(unsigned int uiIndex) const

-        {

-                return m_vDebugInfo[uiIndex].idd.AddressOfRawData;

-        }

-        

-        /**

-        * Returns the PointerToRawData value of a debug structure. If an invalid structure is specified

-        * by the parameter uiIndex the result will be undefined behaviour.

-        * @param uiIndex Identifies the debug structure.

-        * @return PointerToRawData value of the debug structure.

-        **/

-        dword DebugDirectory::getPointerToRawData(unsigned int uiIndex) const

-        {

-                return m_vDebugInfo[uiIndex].idd.PointerToRawData;

-        }

-        

-        std::vector<byte> DebugDirectory::getData(unsigned int index) const

-        {

-                return m_vDebugInfo[index].data;

-        }

-

-        /**

-        * Changes the Characteristics value of a debug structure. If an invalid structure is specified

-        * by the parameter uiIndex the result will be undefined behaviour.

-        * @param uiIndex Identifies the debug structure.

-        * @param dwValue New value of the Characteristics value of the debug structure.

-        **/

-        void DebugDirectory::setCharacteristics(unsigned int uiIndex, dword dwValue)

-        {

-                m_vDebugInfo[uiIndex].idd.Characteristics = dwValue;

-        }

-        

-        /**

-        * Changes the TimeDateStamp value of a debug structure. If an invalid structure is specified

-        * by the parameter uiIndex the result will be undefined behaviour.

-        * @param uiIndex Identifies the debug structure.

-        * @param dwValue New value of the TimeDateStamp value of the debug structure.

-        **/

-        void DebugDirectory::setTimeDateStamp(unsigned int uiIndex, dword dwValue)

-        {

-                m_vDebugInfo[uiIndex].idd.TimeDateStamp = dwValue;

-        }

-        

-        /**

-        * Changes the MajorVersion value of a debug structure. If an invalid structure is specified

-        * by the parameter uiIndex the result will be undefined behaviour.

-        * @param uiIndex Identifies the debug structure.

-        * @param wValue New value of the MajorVersion value of the debug structure.

-        **/

-        void DebugDirectory::setMajorVersion(unsigned int uiIndex, word wValue)

-        {

-                m_vDebugInfo[uiIndex].idd.MajorVersion = wValue;

-        }

-        

-        /**

-        * Changes the MinorVersion value of a debug structure. If an invalid structure is specified

-        * by the parameter uiIndex the result will be undefined behaviour.

-        * @param uiIndex Identifies the debug structure.

-        * @param wValue New value of the MinorVersion value of the debug structure.

-        **/

-        void DebugDirectory::setMinorVersion(unsigned int uiIndex, word wValue)

-        {

-                m_vDebugInfo[uiIndex].idd.MinorVersion = wValue;

-        }

-        

-        /**

-        * Changes the Type value of a debug structure. If an invalid structure is specified

-        * by the parameter uiIndex the result will be undefined behaviour.

-        * @param uiIndex Identifies the debug structure.

-        * @param dwValue New value of the Type value of the debug structure.

-        **/

-        void DebugDirectory::setType(unsigned int uiIndex, dword dwValue)

-        {

-                m_vDebugInfo[uiIndex].idd.Type = dwValue;

-        }

-        

-        /**

-        * Changes the SizeOfData value of a debug structure. If an invalid structure is specified

-        * by the parameter uiIndex the result will be undefined behaviour.

-        * @param uiIndex Identifies the debug structure.

-        * @param dwValue New value of the SizeOfData value of the debug structure.

-        **/

-        void DebugDirectory::setSizeOfData(unsigned int uiIndex, dword dwValue)

-        {

-                m_vDebugInfo[uiIndex].idd.SizeOfData = dwValue;

-        }

-        

-        /**

-        * Changes the AddressOfRawData value of a debug structure. If an invalid structure is specified

-        * by the parameter uiIndex the result will be undefined behaviour.

-        * @param uiIndex Identifies the debug structure.

-        * @param dwValue New value of the AddressOfRawData value of the debug structure.

-        **/

-        void DebugDirectory::setAddressOfRawData(unsigned int uiIndex, dword dwValue)

-        {

-                m_vDebugInfo[uiIndex].idd.AddressOfRawData = dwValue;

-        }

-        

-        /**

-        * Changes the PointerToRawData value of a debug structure. If an invalid structure is specified

-        * by the parameter uiIndex the result will be undefined behaviour.

-        * @param uiIndex Identifies the debug structure.

-        * @param dwValue New value of the PointerToRawData value of the debug structure.

-        **/

-        void DebugDirectory::setPointerToRawData(unsigned int uiIndex, dword dwValue)

-        {

-                m_vDebugInfo[uiIndex].idd.PointerToRawData = dwValue;

-        }

-        

-        void DebugDirectory::setData(unsigned int index, const std::vector<byte>& data)

-        {

-                m_vDebugInfo[index].data = data;

-        }

-}

+/*
+* DebugDirectory.cpp - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#include "PeLibInc.h"
+#include "DebugDirectory.h"
+
+namespace PeLib
+{
+        void DebugDirectory::clear()
+        {
+                m_vDebugInfo.clear();
+        }
+        
+        std::vector<PELIB_IMG_DEBUG_DIRECTORY> DebugDirectory::read(InputBuffer& ibBuffer, unsigned int uiSize)
+        {
+                std::vector<PELIB_IMG_DEBUG_DIRECTORY> currDebugInfo;
+                
+                PELIB_IMG_DEBUG_DIRECTORY iddCurr;
+                
+                for (unsigned int i=0;i<uiSize/PELIB_IMAGE_DEBUG_DIRECTORY::size();i++)
+                {
+                        
+                        ibBuffer >> iddCurr.idd.Characteristics;
+                        ibBuffer >> iddCurr.idd.TimeDateStamp;
+                        ibBuffer >> iddCurr.idd.MajorVersion;
+                        ibBuffer >> iddCurr.idd.MinorVersion;
+                        ibBuffer >> iddCurr.idd.Type;
+                        ibBuffer >> iddCurr.idd.SizeOfData;
+                        ibBuffer >> iddCurr.idd.AddressOfRawData;
+                        ibBuffer >> iddCurr.idd.PointerToRawData;
+                
+                        currDebugInfo.push_back(iddCurr);
+                }
+                
+                return currDebugInfo;
+        }
+        
+        int DebugDirectory::read(unsigned char* buffer, unsigned int buffersize)
+        {
+                // XXX: Note, debug data is not read at all. This might or might not change
+                //      in the future.
+                
+                std::vector<byte> vDebugDirectory(buffer, buffer + buffersize);
+                
+                InputBuffer ibBuffer(vDebugDirectory);
+                
+                std::vector<PELIB_IMG_DEBUG_DIRECTORY> currDebugInfo = read(ibBuffer, buffersize);
+                
+                std::swap(currDebugInfo, m_vDebugInfo);
+                
+                return NO_ERROR;
+        }
+        
+        /**
+        * @param strFilename Name of the file which will be read.
+        * @param uiOffset File offset of the Debug directory.
+        * @param uiSize Size of the Debug directory.
+        **/
+        int DebugDirectory::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize)
+        {
+                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
+                unsigned int ulFileSize = fileSize(ifFile);
+
+                if (!ifFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+                
+                if (ulFileSize < uiOffset + uiSize)
+                {
+                        return ERROR_INVALID_FILE;
+                }
+
+                ifFile.seekg(uiOffset, std::ios::beg);
+
+                std::vector<byte> vDebugDirectory(uiSize);
+                ifFile.read(reinterpret_cast<char*>(&vDebugDirectory[0]), uiSize);
+                
+                InputBuffer ibBuffer(vDebugDirectory);
+                
+                std::vector<PELIB_IMG_DEBUG_DIRECTORY> currDebugInfo = read(ibBuffer, uiSize);
+                
+                for (unsigned int i=0;i<currDebugInfo.size();i++)
+                {
+                        ifFile.seekg(currDebugInfo[i].idd.PointerToRawData, std::ios::beg);
+                        currDebugInfo[i].data.resize(currDebugInfo[i].idd.SizeOfData);
+                        ifFile.read(reinterpret_cast<char*>(&currDebugInfo[i].data[0]), currDebugInfo[i].idd.SizeOfData);
+                        if (!ifFile) return ERROR_INVALID_FILE;
+                }
+                
+                std::swap(currDebugInfo, m_vDebugInfo);
+                
+                return NO_ERROR;
+        }
+        
+        /**
+        * Rebuilds the current debug directory.
+        * @param vBuffer Buffer where the rebuilt directory is stored.
+        **/
+        void DebugDirectory::rebuild(std::vector<byte>& vBuffer) const
+        {
+                OutputBuffer obBuffer(vBuffer);
+                
+                for (unsigned int i=0;i<m_vDebugInfo.size();i++)
+                {
+                        obBuffer << m_vDebugInfo[i].idd.Characteristics;
+                        obBuffer << m_vDebugInfo[i].idd.TimeDateStamp;
+                        obBuffer << m_vDebugInfo[i].idd.MajorVersion;
+                        obBuffer << m_vDebugInfo[i].idd.MinorVersion;
+                        obBuffer << m_vDebugInfo[i].idd.Type;
+                        obBuffer << m_vDebugInfo[i].idd.SizeOfData;
+                        obBuffer << m_vDebugInfo[i].idd.AddressOfRawData;
+                        obBuffer << m_vDebugInfo[i].idd.PointerToRawData;
+                }
+        }
+
+        /**
+        * @return Size of the debug directory.
+        **/
+        unsigned int DebugDirectory::size() const
+        {
+                return static_cast<unsigned int>(m_vDebugInfo.size()) * PELIB_IMAGE_DEBUG_DIRECTORY::size();
+        }
+
+        /**
+        * @param strFilename Name of the file which will be written.
+        * @param uiOffset File offset where the debug directory will be stored.
+        **/
+        int DebugDirectory::write(const std::string& strFilename, unsigned int uiOffset) const
+        {
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                
+                if (!ofFile)
+                {
+                        ofFile.clear();
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                }
+                else
+                {
+                        ofFile.close();
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                }
+
+                if (!ofFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+
+                ofFile.seekp(uiOffset, std::ios::beg);
+
+                std::vector<unsigned char> vBuffer;
+                rebuild(vBuffer);
+
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
+
+                ofFile.close();
+                
+                return NO_ERROR;
+        }
+
+        /**
+        * @return Number of debug structures in the current Debug directory.
+        **/
+        unsigned int DebugDirectory::calcNumberOfEntries() const
+        {
+                return static_cast<unsigned int>(m_vDebugInfo.size());
+        }
+
+        /**
+        * Adds a new debug structure to the debug directory. The initial values of all members of the structure
+        * are undefined.
+        **/
+        void DebugDirectory::addEntry()
+        {
+                PELIB_IMG_DEBUG_DIRECTORY p;
+                m_vDebugInfo.push_back(p);
+        }
+
+        /**
+        * Removes a debug structure from the current debug directory. If an invalid structure is specified
+        * by the parameter uiIndex the result will be undefined behaviour.
+        * @param uiIndex Identifies the debug structure.
+        **/
+        void DebugDirectory::removeEntry(unsigned int uiIndex)
+        {
+                m_vDebugInfo.erase(m_vDebugInfo.begin() + uiIndex);
+        }
+                  
+        /**
+        * Returns the Characteristics value of a debug structure. If an invalid structure is specified
+        * by the parameter uiIndex the result will be undefined behaviour.
+        * @param uiIndex Identifies the debug structure.
+        * @return Characteristics value of the debug structure.
+        **/
+        dword DebugDirectory::getCharacteristics(unsigned int uiIndex) const
+        {
+                return m_vDebugInfo[uiIndex].idd.Characteristics;
+        }
+        
+        /**
+        * Returns the TimeDateStamp value of a debug structure. If an invalid structure is specified
+        * by the parameter uiIndex the result will be undefined behaviour.
+        * @param uiIndex Identifies the debug structure.
+        * @return TimeDateStamp value of the debug structure.
+        **/
+        dword DebugDirectory::getTimeDateStamp(unsigned int uiIndex) const
+        {
+                return m_vDebugInfo[uiIndex].idd.TimeDateStamp;
+        }
+        
+        /**
+        * Returns the MajorVersion value of a debug structure. If an invalid structure is specified
+        * by the parameter uiIndex the result will be undefined behaviour.
+        * @param uiIndex Identifies the debug structure.
+        * @return MajorVersion value of the debug structure.
+        **/
+        word DebugDirectory::getMajorVersion(unsigned int uiIndex) const
+        {
+                return m_vDebugInfo[uiIndex].idd.MajorVersion;
+        }
+        
+        /**
+        * Returns the MinorVersion value of a debug structure. If an invalid structure is specified
+        * by the parameter uiIndex the result will be undefined behaviour.
+        * @param uiIndex Identifies the debug structure.
+        * @return MinorVersion value of the debug structure.
+        **/
+        word DebugDirectory::getMinorVersion(unsigned int uiIndex) const
+        {
+                return m_vDebugInfo[uiIndex].idd.MinorVersion;
+        }
+        
+        /**
+        * Returns the Type value of a debug structure. If an invalid structure is specified
+        * by the parameter uiIndex the result will be undefined behaviour.
+        * @param uiIndex Identifies the debug structure.
+        * @return Type value of the debug structure.
+        **/
+        dword DebugDirectory::getType(unsigned int uiIndex) const
+        {
+                return m_vDebugInfo[uiIndex].idd.Type;
+        }
+        
+        /**
+        * Returns the SizeOfData value of a debug structure. If an invalid structure is specified
+        * by the parameter uiIndex the result will be undefined behaviour.
+        * @param uiIndex Identifies the debug structure.
+        * @return SizeOfData value of the debug structure.
+        **/
+        dword DebugDirectory::getSizeOfData(unsigned int uiIndex) const
+        {
+                return m_vDebugInfo[uiIndex].idd.SizeOfData;
+        }
+        
+        /**
+        * Returns the AddressOfRawData value of a debug structure. If an invalid structure is specified
+        * by the parameter uiIndex the result will be undefined behaviour.
+        * @param uiIndex Identifies the debug structure.
+        * @return AddressOfRawData value of the debug structure.
+        **/
+        dword DebugDirectory::getAddressOfRawData(unsigned int uiIndex) const
+        {
+                return m_vDebugInfo[uiIndex].idd.AddressOfRawData;
+        }
+        
+        /**
+        * Returns the PointerToRawData value of a debug structure. If an invalid structure is specified
+        * by the parameter uiIndex the result will be undefined behaviour.
+        * @param uiIndex Identifies the debug structure.
+        * @return PointerToRawData value of the debug structure.
+        **/
+        dword DebugDirectory::getPointerToRawData(unsigned int uiIndex) const
+        {
+                return m_vDebugInfo[uiIndex].idd.PointerToRawData;
+        }
+        
+        std::vector<byte> DebugDirectory::getData(unsigned int index) const
+        {
+                return m_vDebugInfo[index].data;
+        }
+
+        /**
+        * Changes the Characteristics value of a debug structure. If an invalid structure is specified
+        * by the parameter uiIndex the result will be undefined behaviour.
+        * @param uiIndex Identifies the debug structure.
+        * @param dwValue New value of the Characteristics value of the debug structure.
+        **/
+        void DebugDirectory::setCharacteristics(unsigned int uiIndex, dword dwValue)
+        {
+                m_vDebugInfo[uiIndex].idd.Characteristics = dwValue;
+        }
+        
+        /**
+        * Changes the TimeDateStamp value of a debug structure. If an invalid structure is specified
+        * by the parameter uiIndex the result will be undefined behaviour.
+        * @param uiIndex Identifies the debug structure.
+        * @param dwValue New value of the TimeDateStamp value of the debug structure.
+        **/
+        void DebugDirectory::setTimeDateStamp(unsigned int uiIndex, dword dwValue)
+        {
+                m_vDebugInfo[uiIndex].idd.TimeDateStamp = dwValue;
+        }
+        
+        /**
+        * Changes the MajorVersion value of a debug structure. If an invalid structure is specified
+        * by the parameter uiIndex the result will be undefined behaviour.
+        * @param uiIndex Identifies the debug structure.
+        * @param wValue New value of the MajorVersion value of the debug structure.
+        **/
+        void DebugDirectory::setMajorVersion(unsigned int uiIndex, word wValue)
+        {
+                m_vDebugInfo[uiIndex].idd.MajorVersion = wValue;
+        }
+        
+        /**
+        * Changes the MinorVersion value of a debug structure. If an invalid structure is specified
+        * by the parameter uiIndex the result will be undefined behaviour.
+        * @param uiIndex Identifies the debug structure.
+        * @param wValue New value of the MinorVersion value of the debug structure.
+        **/
+        void DebugDirectory::setMinorVersion(unsigned int uiIndex, word wValue)
+        {
+                m_vDebugInfo[uiIndex].idd.MinorVersion = wValue;
+        }
+        
+        /**
+        * Changes the Type value of a debug structure. If an invalid structure is specified
+        * by the parameter uiIndex the result will be undefined behaviour.
+        * @param uiIndex Identifies the debug structure.
+        * @param dwValue New value of the Type value of the debug structure.
+        **/
+        void DebugDirectory::setType(unsigned int uiIndex, dword dwValue)
+        {
+                m_vDebugInfo[uiIndex].idd.Type = dwValue;
+        }
+        
+        /**
+        * Changes the SizeOfData value of a debug structure. If an invalid structure is specified
+        * by the parameter uiIndex the result will be undefined behaviour.
+        * @param uiIndex Identifies the debug structure.
+        * @param dwValue New value of the SizeOfData value of the debug structure.
+        **/
+        void DebugDirectory::setSizeOfData(unsigned int uiIndex, dword dwValue)
+        {
+                m_vDebugInfo[uiIndex].idd.SizeOfData = dwValue;
+        }
+        
+        /**
+        * Changes the AddressOfRawData value of a debug structure. If an invalid structure is specified
+        * by the parameter uiIndex the result will be undefined behaviour.
+        * @param uiIndex Identifies the debug structure.
+        * @param dwValue New value of the AddressOfRawData value of the debug structure.
+        **/
+        void DebugDirectory::setAddressOfRawData(unsigned int uiIndex, dword dwValue)
+        {
+                m_vDebugInfo[uiIndex].idd.AddressOfRawData = dwValue;
+        }
+        
+        /**
+        * Changes the PointerToRawData value of a debug structure. If an invalid structure is specified
+        * by the parameter uiIndex the result will be undefined behaviour.
+        * @param uiIndex Identifies the debug structure.
+        * @param dwValue New value of the PointerToRawData value of the debug structure.
+        **/
+        void DebugDirectory::setPointerToRawData(unsigned int uiIndex, dword dwValue)
+        {
+                m_vDebugInfo[uiIndex].idd.PointerToRawData = dwValue;
+        }
+        
+        void DebugDirectory::setData(unsigned int index, const std::vector<byte>& data)
+        {
+                m_vDebugInfo[index].data = data;
+        }
+}
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/DebugDirectory.h b/utils/zenutils/libraries/pelib-0.9/pelib/DebugDirectory.h
index 0ffda38815..adfef6b52e 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/DebugDirectory.h
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/DebugDirectory.h
@@ -1,84 +1,84 @@
-/*

-* DebugDirectory.h - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#ifndef DEBUGDIRECTORY_H

-#define DEBUGDIRECTORY_H

-

-namespace PeLib

-{

-        /// Class that handles the Debug directory.

-        class DebugDirectory

-        {

-                private:

-                  /// Stores the various DebugDirectory structures.

-                  std::vector<PELIB_IMG_DEBUG_DIRECTORY> m_vDebugInfo;

-                  

-                  std::vector<PELIB_IMG_DEBUG_DIRECTORY> read(InputBuffer& ibBuffer, unsigned int uiSize);

-

-                public:

-                  void clear(); // EXPORT

-                  /// Reads the Debug directory from a file.

-                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize); // EXPORT

-                  int read(unsigned char* buffer, unsigned int buffersize);

-                  /// Rebuilds the current Debug directory.

-                  void rebuild(std::vector<byte>& obBuffer) const; // EXPORT

-                  /// Returns the size the current Debug directory needs after rebuilding.

-                  unsigned int size() const;

-                  /// Writes the current Debug directory back to a file.

-                  int write(const std::string& strFilename, unsigned int uiOffset) const; // EXPORT

-

-                  /// Returns the number of DebugDirectory image structures in the current DebugDirectory.

-                  unsigned int calcNumberOfEntries() const; // EXPORT

-                  

-                  /// Adds a new debug structure.

-                  void addEntry(); // EXPORT

-                  /// Removes a debug structure.

-                  void removeEntry(unsigned int uiIndex); // EXPORT

-                  

-                  /// Returns the Characteristics value of a debug structure.

-                  dword getCharacteristics(unsigned int uiIndex) const; // EXPORT

-                  /// Returns the TimeDateStamp value of a debug structure.

-                  dword getTimeDateStamp(unsigned int uiIndex) const; // EXPORT

-                  /// Returns the MajorVersion value of a debug structure.

-                  word getMajorVersion(unsigned int uiIndex) const; // EXPORT

-                  /// Returns the MinorVersion value of a debug structure.

-                  word getMinorVersion(unsigned int uiIndex) const; // EXPORT

-                  /// Returns the Type value of a debug structure.

-                  dword getType(unsigned int uiIndex) const; // EXPORT

-                  /// Returns the SizeOfData value of a debug structure.

-                  dword getSizeOfData(unsigned int uiIndex) const; // EXPORT

-                  /// Returns the AddressOfRawData value of a debug structure.

-                  dword getAddressOfRawData(unsigned int uiIndex) const; // EXPORT

-                  /// Returns the PointerToRawData value of a debug structure.

-                  dword getPointerToRawData(unsigned int uiIndex) const; // EXPORT

-                  std::vector<byte> getData(unsigned int index) const; // EXPORT

-                  

-                  /// Sets the Characteristics value of a debug structure.

-                  void setCharacteristics(unsigned int uiIndex, dword dwValue); // EXPORT

-                  /// Sets the TimeDateStamp value of a debug structure.

-                  void setTimeDateStamp(unsigned int uiIndex, dword dwValue); // EXPORT

-                  /// Sets the MajorVersion value of a debug structure.

-                  void setMajorVersion(unsigned int uiIndex, word wValue); // EXPORT

-                  /// Sets the MinorVersion value of a debug structure.

-                  void setMinorVersion(unsigned int uiIndex, word wValue); // EXPORT

-                  /// Sets the Type value of a debug structure.

-                  void setType(unsigned int uiIndex, dword dwValue); // EXPORT

-                  /// Sets the SizeOfData value of a debug structure.

-                  void setSizeOfData(unsigned int uiIndex, dword dwValue); // EXPORT

-                  /// Sets the AddressOfRawData value of a debug structure.

-                  void setAddressOfRawData(unsigned int uiIndex, dword dwValue); // EXPORT

-                  /// Sets the PointerToRawData value of a debug structure.

-                  void setPointerToRawData(unsigned int uiIndex, dword dwValue); // EXPORT

-                  void setData(unsigned int index, const std::vector<byte>& data); // EXPORT

-        };

-}

-#endif

+/*
+* DebugDirectory.h - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#ifndef DEBUGDIRECTORY_H
+#define DEBUGDIRECTORY_H
+
+namespace PeLib
+{
+        /// Class that handles the Debug directory.
+        class DebugDirectory
+        {
+                private:
+                  /// Stores the various DebugDirectory structures.
+                  std::vector<PELIB_IMG_DEBUG_DIRECTORY> m_vDebugInfo;
+                  
+                  std::vector<PELIB_IMG_DEBUG_DIRECTORY> read(InputBuffer& ibBuffer, unsigned int uiSize);
+
+                public:
+                  void clear(); // EXPORT
+                  /// Reads the Debug directory from a file.
+                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize); // EXPORT
+                  int read(unsigned char* buffer, unsigned int buffersize);
+                  /// Rebuilds the current Debug directory.
+                  void rebuild(std::vector<byte>& obBuffer) const; // EXPORT
+                  /// Returns the size the current Debug directory needs after rebuilding.
+                  unsigned int size() const;
+                  /// Writes the current Debug directory back to a file.
+                  int write(const std::string& strFilename, unsigned int uiOffset) const; // EXPORT
+
+                  /// Returns the number of DebugDirectory image structures in the current DebugDirectory.
+                  unsigned int calcNumberOfEntries() const; // EXPORT
+                  
+                  /// Adds a new debug structure.
+                  void addEntry(); // EXPORT
+                  /// Removes a debug structure.
+                  void removeEntry(unsigned int uiIndex); // EXPORT
+                  
+                  /// Returns the Characteristics value of a debug structure.
+                  dword getCharacteristics(unsigned int uiIndex) const; // EXPORT
+                  /// Returns the TimeDateStamp value of a debug structure.
+                  dword getTimeDateStamp(unsigned int uiIndex) const; // EXPORT
+                  /// Returns the MajorVersion value of a debug structure.
+                  word getMajorVersion(unsigned int uiIndex) const; // EXPORT
+                  /// Returns the MinorVersion value of a debug structure.
+                  word getMinorVersion(unsigned int uiIndex) const; // EXPORT
+                  /// Returns the Type value of a debug structure.
+                  dword getType(unsigned int uiIndex) const; // EXPORT
+                  /// Returns the SizeOfData value of a debug structure.
+                  dword getSizeOfData(unsigned int uiIndex) const; // EXPORT
+                  /// Returns the AddressOfRawData value of a debug structure.
+                  dword getAddressOfRawData(unsigned int uiIndex) const; // EXPORT
+                  /// Returns the PointerToRawData value of a debug structure.
+                  dword getPointerToRawData(unsigned int uiIndex) const; // EXPORT
+                  std::vector<byte> getData(unsigned int index) const; // EXPORT
+                  
+                  /// Sets the Characteristics value of a debug structure.
+                  void setCharacteristics(unsigned int uiIndex, dword dwValue); // EXPORT
+                  /// Sets the TimeDateStamp value of a debug structure.
+                  void setTimeDateStamp(unsigned int uiIndex, dword dwValue); // EXPORT
+                  /// Sets the MajorVersion value of a debug structure.
+                  void setMajorVersion(unsigned int uiIndex, word wValue); // EXPORT
+                  /// Sets the MinorVersion value of a debug structure.
+                  void setMinorVersion(unsigned int uiIndex, word wValue); // EXPORT
+                  /// Sets the Type value of a debug structure.
+                  void setType(unsigned int uiIndex, dword dwValue); // EXPORT
+                  /// Sets the SizeOfData value of a debug structure.
+                  void setSizeOfData(unsigned int uiIndex, dword dwValue); // EXPORT
+                  /// Sets the AddressOfRawData value of a debug structure.
+                  void setAddressOfRawData(unsigned int uiIndex, dword dwValue); // EXPORT
+                  /// Sets the PointerToRawData value of a debug structure.
+                  void setPointerToRawData(unsigned int uiIndex, dword dwValue); // EXPORT
+                  void setData(unsigned int index, const std::vector<byte>& data); // EXPORT
+        };
+}
+#endif
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/ExportDirectory.cpp b/utils/zenutils/libraries/pelib-0.9/pelib/ExportDirectory.cpp
index aa9c28a50f..83c4b4e69d 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/ExportDirectory.cpp
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/ExportDirectory.cpp
@@ -1,692 +1,692 @@
-/*

-* ExportDirectory.cpp - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-//#ifdef false

-

-#include "PeLibInc.h"

-#include "ExportDirectory.h"

-

-namespace PeLib

-{

-        /**

-        * @param strFuncname Name of the function.

-        * @param dwFuncAddr RVA of the function.

-        **/

-        void ExportDirectory::addFunction(const std::string& strFuncname, dword dwFuncAddr)

-        {

-                PELIB_EXP_FUNC_INFORMATION efiCurr;

-                efiCurr.funcname = strFuncname;

-                efiCurr.addroffunc = dwFuncAddr;

-                m_ied.functions.push_back(efiCurr);

-        }

-        

-        void ExportDirectory::removeFunction(unsigned int index)

-        {

-                m_ied.functions.erase(m_ied.functions.begin() + index);

-        }

-        

-        void ExportDirectory::clear()

-        {

-                m_ied.functions.clear();

-        }

-                

-        unsigned int ExportDirectory::calcNumberOfFunctions() const

-        {

-                return static_cast<unsigned int>(m_ied.functions.size());

-        }

-

-        /**

-        * Identifies an exported function through it's name.

-        * @param strFunctionName Name of the function

-        * @return Number which identifies the functions.

-        **/

-        int ExportDirectory::getFunctionIndex(const std::string& strFunctionName) const

-        {

-                std::vector<PELIB_EXP_FUNC_INFORMATION>::const_iterator Iter = std::find_if(m_ied.functions.begin(), m_ied.functions.end(), std::bind2nd(std::mem_fun_ref(&PELIB_EXP_FUNC_INFORMATION::equal), strFunctionName));

-                

-                if (Iter == m_ied.functions.end())

-                {

-//                      throw Exceptions::InvalidName(ExportDirectoryId, __LINE__);

-                        return -1;

-                }

-                

-                return static_cast<int>(std::distance(m_ied.functions.begin(), Iter));

-        }

-

-        /**

-        * @param strFilename Name of the file.

-        * @param uiOffset File offset of the export directory.

-        * @param uiSize Size of the export directory.

-        * @param pehHeader A valid PE header which is necessary because some RVA calculations need to be done.

-    * \todo: Proper use of InputBuffer

-        **/

-        int ExportDirectory::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, const PeHeader& pehHeader)

-        {

-                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);

-                

-                if (!ifFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-                

-                unsigned int filesize = fileSize(ifFile);

-                

-                if (filesize < uiOffset + uiSize)

-                {

-                        return ERROR_INVALID_FILE;

-                }

-

-                ifFile.seekg(uiOffset, std::ios::beg);

-

-                PELIB_IMAGE_EXP_DIRECTORY iedCurr;

-

-                std::vector<unsigned char> vExportdirectory(uiSize);

-                ifFile.read(reinterpret_cast<char*>(&vExportdirectory[0]), uiSize);

-

-                InputBuffer inpBuffer(vExportdirectory);

-

-                inpBuffer >> iedCurr.ied.Characteristics;

-                inpBuffer >> iedCurr.ied.TimeDateStamp;

-                inpBuffer >> iedCurr.ied.MajorVersion;

-                inpBuffer >> iedCurr.ied.MinorVersion;

-                inpBuffer >> iedCurr.ied.Name;

-                inpBuffer >> iedCurr.ied.Base;

-                inpBuffer >> iedCurr.ied.NumberOfFunctions;

-                inpBuffer >> iedCurr.ied.NumberOfNames;

-                inpBuffer >> iedCurr.ied.AddressOfFunctions;

-                inpBuffer >> iedCurr.ied.AddressOfNames;

-                inpBuffer >> iedCurr.ied.AddressOfNameOrdinals;

-

-                if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))

-                {

-                        unsigned int offset = p32->rvaToOffset(iedCurr.ied.Name);

-                        

-                        if (offset >= filesize)

-                                return ERROR_INVALID_FILE;

-                        

-                        ifFile.seekg(offset, std::ios::beg);

-                }

-                else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))

-                {

-                        // XXX: Files might be > 4 GB

-                        unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.Name));

-                        

-                        if (offset >= filesize)

-                                return ERROR_INVALID_FILE;

-                        

-                        ifFile.seekg(offset, std::ios::beg);

-                }

-                

-                char c = 0;

-                std::string strFname = "";

-                do

-                {

-                        ifFile.read(reinterpret_cast<char*>(&c), sizeof(c));

-                        if (!ifFile) return ERROR_INVALID_FILE;

-                        if (c) strFname += c;

-                }

-                while (c != 0);

-                iedCurr.name = strFname;

-

-                if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))

-                {

-                        unsigned int offset = p32->rvaToOffset(iedCurr.ied.AddressOfFunctions);

-                        

-                        if (offset >= filesize)

-                                return ERROR_INVALID_FILE;

-                        

-                        ifFile.seekg(offset, std::ios::beg);

-                }

-                else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))

-                {

-                        // XXX: File might be > 4 GB

-                        unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.AddressOfFunctions));

-                        

-                        if (offset >= filesize)

-                                return ERROR_INVALID_FILE;

-                                

-                        ifFile.seekg(offset, std::ios::beg);

-                }

-

-                PELIB_EXP_FUNC_INFORMATION efiCurr;

-                efiCurr.ordinal = 0; efiCurr.addroffunc = 0; efiCurr.addrofname = 0;

-

-                for (unsigned int i=0;i<iedCurr.ied.NumberOfFunctions;i++)

-                {

-                        if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))

-                        {

-                                unsigned int offset = p32->rvaToOffset(iedCurr.ied.AddressOfFunctions) + i*sizeof(efiCurr.addroffunc);

-                                

-                                if (offset >= filesize)

-                                        return ERROR_INVALID_FILE;

-                                        

-                                ifFile.seekg(offset, std::ios::beg);

-                        }

-                        else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))

-                        {

-                                // XXX: File might be > 4GB

-                                unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.AddressOfFunctions)) + i*sizeof(efiCurr.addroffunc);

-                                

-                                if (offset >= filesize)

-                                        return ERROR_INVALID_FILE;

-                                        

-                                ifFile.seekg(offset, std::ios::beg);

-                        }

-                        

-                        ifFile.read(reinterpret_cast<char*>(&efiCurr.addroffunc), sizeof(efiCurr.addroffunc));

-                        

-                        if (!ifFile)

-                                return ERROR_INVALID_FILE;

-                                

-                        efiCurr.ordinal = i;

-                        iedCurr.functions.push_back(efiCurr);

-                }

-

-                for (unsigned int i=0;i<iedCurr.ied.NumberOfNames;i++)

-                {

-                        if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))

-                        {

-                                unsigned int offset = p32->rvaToOffset(iedCurr.ied.AddressOfNameOrdinals) + i*sizeof(efiCurr.ordinal);

-                                

-                                if (offset >= filesize)

-                                        return ERROR_INVALID_FILE;

-                                

-                                ifFile.seekg(offset, std::ios::beg);

-                        }

-                        else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))

-                        {

-                                // XXX: File might be > 4 GB

-                                unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.AddressOfNameOrdinals)) + i*sizeof(efiCurr.ordinal);

-                                

-                                if (offset >= filesize)

-                                        return ERROR_INVALID_FILE;

-                                

-                                ifFile.seekg(offset, std::ios::beg);

-                        }

-

-                        word ordinal;

-                        ifFile.read(reinterpret_cast<char*>(&ordinal), sizeof(ordinal));

-                        

-                        if (!ifFile)

-                                return ERROR_INVALID_FILE;

-                        

-                        iedCurr.functions[ordinal].ordinal = ordinal;

-

-                        if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))

-                        {

-                                unsigned int offset = p32->rvaToOffset(iedCurr.ied.AddressOfNames) + i*sizeof(efiCurr.addrofname);

-                                

-                                if (offset >= filesize)

-                                        return ERROR_INVALID_FILE;

-                                

-                                ifFile.seekg(offset, std::ios::beg);

-                        }

-                        else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))

-                        {

-                                // XXX: File might be > 4 GB.

-                                unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.AddressOfNames)) + i*sizeof(efiCurr.addrofname);

-                                

-                                if (offset >= filesize)

-                                        return ERROR_INVALID_FILE;

-                                

-                                ifFile.seekg(offset, std::ios::beg);

-                        }

-                        

-                        ifFile.read(reinterpret_cast<char*>(&iedCurr.functions[ordinal].addrofname), sizeof(iedCurr.functions[ordinal].addrofname));

-                        

-                        if (!ifFile)

-                                return ERROR_INVALID_FILE;

-

-                        if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))

-                        {

-                                unsigned int offset = p32->rvaToOffset(iedCurr.functions[ordinal].addrofname);

-

-                                if (offset >= filesize)

-                                        return ERROR_INVALID_FILE;

-

-                                ifFile.seekg(offset, std::ios::beg);

-                        }

-                        else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))

-                        {

-                                // XXX: File might be > 4 GB.

-                                unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.functions[ordinal].addrofname));

-

-                                if (offset >= filesize)

-                                        return ERROR_INVALID_FILE;

-

-                                ifFile.seekg(static_cast<unsigned int>(p64->rvaToOffset(iedCurr.functions[ordinal].addrofname)), std::ios::beg);

-                        }

-

-                        char c = 0;

-                        std::string strFname = "";

-                        do

-                        {

-                                ifFile.read(reinterpret_cast<char*>(&c), sizeof(c));

-                                

-                                if (!ifFile)

-                                        return ERROR_INVALID_FILE;

-                                        

-                                if (c) strFname += c;

-                        }

-                        while (c != 0);

-

-                        iedCurr.functions[ordinal].funcname = strFname;

-                }

-

-                std::swap(m_ied, iedCurr);

-                

-                return NO_ERROR;

-        }

-

-        /**

-        * @param vBuffer Buffer where the rebuilt export directory is written to.

-        * @param dwRva RVA of the export directory.

-        * \todo fValid flag

-        **/

-        void ExportDirectory::rebuild(std::vector<byte>& vBuffer, dword dwRva) const

-        {

-                unsigned int uiSizeDirectory = sizeof(PELIB_IMAGE_EXPORT_DIRECTORY);

-

-                unsigned int uiSizeNames = 0;

-                unsigned int uiSizeAddrFuncs = 0;

-                unsigned int uiSizeAddrNames = 0;

-                unsigned int uiSizeOrdinals = 0;

-

-                for (unsigned int i=0;i<m_ied.functions.size();i++)

-                {

-                        uiSizeNames += (m_ied.functions[i].funcname.empty()) ? 0 : static_cast<unsigned int>(m_ied.functions[i].funcname.size()) + 1;

-                        uiSizeAddrFuncs += sizeof(m_ied.functions[i].addroffunc);

-                        uiSizeAddrNames += (m_ied.functions[i].funcname.empty()) ? 0 : sizeof(m_ied.functions[i].addrofname);

-                        uiSizeOrdinals += (m_ied.functions[i].funcname.empty()) ? 0 : sizeof(m_ied.functions[i].ordinal);

-                }

-                

-                unsigned int uiFilenameSize = static_cast<unsigned int>(m_ied.name.size()) + 1;

-                

-                OutputBuffer obBuffer(vBuffer);

-

-                obBuffer << m_ied.ied.Characteristics;

-                obBuffer << m_ied.ied.TimeDateStamp;

-                obBuffer << m_ied.ied.MajorVersion;

-                obBuffer << m_ied.ied.MinorVersion;

-                obBuffer << dwRva + uiSizeDirectory;

-                obBuffer << m_ied.ied.Base;

-                obBuffer << static_cast<unsigned int>(m_ied.functions.size());

-

-                // TODO: Not correct but sufficient for now. (Update: I forgot what this comment refers to, but I'll leave it in)

-                obBuffer << static_cast<unsigned int>(m_ied.functions.size());

-                obBuffer << dwRva + uiSizeDirectory + uiFilenameSize;

-                obBuffer << dwRva + uiSizeDirectory + uiFilenameSize + uiSizeAddrFuncs; 

-                obBuffer << dwRva + uiSizeDirectory + uiFilenameSize + uiSizeAddrFuncs + uiSizeAddrNames;

-

-                obBuffer.add(m_ied.name.c_str(), static_cast<unsigned int>(m_ied.name.size())+1);

-

-                for (unsigned int i=0;i<m_ied.functions.size();i++)

-                {

-                        obBuffer << m_ied.functions[i].addroffunc;

-                }

-

-                unsigned int ulFuncCounter = dwRva + uiSizeDirectory + uiFilenameSize + uiSizeAddrFuncs + uiSizeAddrNames + uiSizeOrdinals;

-                

-                for (unsigned int i=0;i<m_ied.functions.size();i++)

-                {

-                        if (!m_ied.functions[i].funcname.empty())

-                        {

-                                obBuffer << ulFuncCounter;

-                                ulFuncCounter += static_cast<unsigned int>(m_ied.functions[i].funcname.size()) + 1;

-                        }

-                }

-

-                for (unsigned int i=0;i<m_ied.functions.size();i++)

-                {

-                        if (!m_ied.functions[i].funcname.empty())

-                        {

-                                obBuffer <<  m_ied.functions[i].ordinal;

-                        }

-                }

-

-                for (unsigned int i=0;i<m_ied.functions.size();i++)

-                {

-                        if (m_ied.functions[i].funcname.empty() && m_ied.functions[i].addroffunc)

-                        {

-                                obBuffer <<  m_ied.functions[i].ordinal;

-                        }

-                }

-

-                for (unsigned int i=0;i<m_ied.functions.size();i++)

-                {

-                        if (!m_ied.functions[i].funcname.empty())

-                        {

-                                obBuffer.add(m_ied.functions[i].funcname.c_str(), static_cast<unsigned int>(m_ied.functions[i].funcname.size()) + 1);

-                        }

-                }

-        }

-

-        /**

-        * @return Size of the current export directory.

-        **/

-        unsigned int ExportDirectory::size() const

-        {

-                return m_ied.size();

-        }

-

-        /**

-        * @param strFilename Name of the file.

-        * @param uiOffset File offset the export directory will be written to.

-        * @param uiRva RVA of the export directory.

-        * \todo Check if ofFile.write succeeded.

-        **/

-        int ExportDirectory::write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva) const

-        {

-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);

-                

-                if (!ofFile)

-                {

-                        ofFile.clear();

-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);

-                }

-                else

-                {

-                        ofFile.close();

-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);

-                }

-                

-                if (!ofFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-

-                ofFile.seekp(uiOffset, std::ios::beg);

-

-                std::vector<unsigned char> vBuffer;

-                rebuild(vBuffer, uiRva);

-

-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));

-

-                ofFile.close();

-                

-                return NO_ERROR;

-        }

-

-        /**

-        * Changes the filename according to the export directory.

-        * @param strFilename New filename.

-        **/

-        void ExportDirectory::setNameString(const std::string& strFilename)

-        {

-                m_ied.name = strFilename;

-        }

-

-        std::string ExportDirectory::getNameString() const

-        {

-                return m_ied.name;

-        }

-

-        /**

-        * @param dwIndex Number which identifies an exported function.

-        * @return The name of that function.

-        **/

-        std::string ExportDirectory::getFunctionName(dword dwIndex) const

-        {

-                return m_ied.functions[dwIndex].funcname;

-        }

-

-        /**

-        * @param dwIndex Number which identifies an exported function.

-        * @return The ordinal of that function.

-        **/

-        word ExportDirectory::getFunctionOrdinal(dword dwIndex) const

-        {

-                return m_ied.functions[dwIndex].ordinal;

-        }

-

-        /**

-        * @param dwIndex Number which identifies an exported function.

-        * @return The RVA of the name string of that function.

-        **/

-        dword ExportDirectory::getAddressOfName(dword dwIndex) const

-        {

-                return m_ied.functions[dwIndex].addrofname;

-        }

-

-        /**

-        * @param dwIndex Number which identifies an exported function.

-        * @return The RVA of that function.

-        **/

-        dword ExportDirectory::getAddressOfFunction(dword dwIndex) const

-        {

-                return m_ied.functions[dwIndex].addroffunc;

-        }

-        

-        /**

-        * @param dwIndex Number which identifies an exported function.

-        * @param strName The name of that function.

-        **/

-        void ExportDirectory::setFunctionName(dword dwIndex, const std::string& strName)

-        {

-                m_ied.functions[dwIndex].funcname = strName;

-        }

-

-        /**

-        * @param dwIndex Number which identifies an exported function.

-        * @param wValue The ordinal of that function.

-        **/

-        void ExportDirectory::setFunctionOrdinal(dword dwIndex, word wValue)

-        {

-                m_ied.functions[dwIndex].ordinal = wValue;

-        }

-

-        /**

-        * @param dwIndex Number which identifies an exported function.

-        * @param dwValue The RVA of the name string of that function.

-        **/

-        void ExportDirectory::setAddressOfName(dword dwIndex, dword dwValue)

-        {

-                m_ied.functions[dwIndex].addrofname = dwValue;

-        }

-

-        /**

-        * @param dwIndex Number which identifies an exported function.

-        * @param dwValue The RVA of that function.

-        **/

-        void ExportDirectory::setAddressOfFunction(dword dwIndex, dword dwValue)

-        {

-                m_ied.functions[dwIndex].addroffunc = dwValue;

-        }

-

-        /**

-        * @return The ordinal base of the export directory.

-        **/

-        dword ExportDirectory::getBase() const

-        {

-                return m_ied.ied.Base;

-        }

-

-        /**

-        * @return The characteristics of the export directory.

-        **/

-        dword ExportDirectory::getCharacteristics() const

-        {

-                return m_ied.ied.Characteristics;

-        }

-

-        /**

-        * @return The time/date stamp of the export directory.

-        **/

-        dword ExportDirectory::getTimeDateStamp() const

-        {

-                return m_ied.ied.TimeDateStamp;

-        }

-

-        /**

-        * @return The MajorVersion of the export directory.

-        **/

-        word ExportDirectory::getMajorVersion() const

-        {

-                return m_ied.ied.MajorVersion;

-        }

-

-        /**

-        * @return The MinorVersion of the export directory.

-        **/

-        word ExportDirectory::getMinorVersion() const

-        {

-                return m_ied.ied.MinorVersion;

-        }

-

-        /**

-        * @return The RVA of the name of the file.

-        **/

-        dword ExportDirectory::getName() const

-        {

-                return m_ied.ied.Name;

-        }

-

-        /**

-        * @return The NumberOfFunctions of the export directory.

-        **/

-        dword ExportDirectory::getNumberOfFunctions() const

-        {

-                return m_ied.ied.NumberOfFunctions;

-        }

-

-        /**

-        * @return The NumberOfNames of the export directory.

-        **/

-        dword ExportDirectory::getNumberOfNames() const

-        {

-                return m_ied.ied.NumberOfNames;

-        }

-

-        /**

-        * @return The AddressOfFunctions of the export directory.

-        **/

-        dword ExportDirectory::getAddressOfFunctions() const

-        {

-                return m_ied.ied.AddressOfFunctions;

-        }

-

-        /**

-        * @return The AddressOfNames of the export directory.

-        **/

-        dword ExportDirectory::getAddressOfNames() const

-        {

-                return m_ied.ied.AddressOfNames;

-        }

-

-/*      dword ExportDirectory::getNumberOfNameOrdinals() const

-        {

-                return static_cast<dword>(m_ied.functions.size());

-        }

-

-        dword ExportDirectory::getNumberOfAddressOfFunctionNames() const

-        {

-                return static_cast<dword>(m_ied.functions.size());

-        }

-

-        dword ExportDirectory::getNumberOfAddressOfFunctions() const

-        {

-                return static_cast<dword>(m_ied.functions.size());

-        }

-*/

-        /**

-        * @return The AddressOfNameOrdinals of the export directory.

-        **/

-        dword ExportDirectory::getAddressOfNameOrdinals() const

-        {

-                return m_ied.ied.AddressOfNameOrdinals;

-        }

-

-        /**

-        * @param dwValue The ordinal base of the export directory.

-        **/

-        void ExportDirectory::setBase(dword dwValue)

-        {

-                m_ied.ied.Base = dwValue;

-        }

-

-        /**

-        * @param dwValue The Characteristics of the export directory.

-        **/

-        void ExportDirectory::setCharacteristics(dword dwValue)

-        {

-                m_ied.ied.Characteristics = dwValue;

-        }

-

-        /**

-        * @param dwValue The TimeDateStamp of the export directory.

-        **/

-        void ExportDirectory::setTimeDateStamp(dword dwValue)

-        {

-                m_ied.ied.TimeDateStamp = dwValue;

-        }

-

-        /**

-        * @param wValue The MajorVersion of the export directory.

-        **/

-        void ExportDirectory::setMajorVersion(word wValue)

-        {

-                m_ied.ied.MajorVersion = wValue;

-        }

-

-        /**

-        * @param wValue The MinorVersion of the export directory.

-        **/

-        void ExportDirectory::setMinorVersion(word wValue)

-        {

-                m_ied.ied.MinorVersion = wValue;

-        }

-

-        /**

-        * @param dwValue The Name of the export directory.

-        **/

-        void ExportDirectory::setName(dword dwValue)

-        {

-                m_ied.ied.Name = dwValue;

-        }

-

-        /**

-        * @param dwValue The NumberOfFunctions of the export directory.

-        **/

-        void ExportDirectory::setNumberOfFunctions(dword dwValue)

-        {

-                m_ied.ied.NumberOfFunctions = dwValue;

-        }

-

-        /**

-        * @param dwValue The NumberOfNames of the export directory.

-        **/

-        void ExportDirectory::setNumberOfNames(dword dwValue)

-        {

-                m_ied.ied.NumberOfNames = dwValue;

-        }

-

-        /**

-        * @param dwValue The AddressOfFunctions of the export directory.

-        **/

-        void ExportDirectory::setAddressOfFunctions(dword dwValue)

-        {

-                m_ied.ied.AddressOfFunctions = dwValue;

-        }

-

-        /**

-        * @param dwValue The AddressOfNames of the export directory.

-        **/

-        void ExportDirectory::setAddressOfNames(dword dwValue)

-        {

-                m_ied.ied.AddressOfNames = dwValue;

-        }

-        

-        void ExportDirectory::setAddressOfNameOrdinals(dword value)

-        {

-                m_ied.ied.AddressOfNameOrdinals = value;

-        }

-}

+/*
+* ExportDirectory.cpp - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+//#ifdef false
+
+#include "PeLibInc.h"
+#include "ExportDirectory.h"
+
+namespace PeLib
+{
+        /**
+        * @param strFuncname Name of the function.
+        * @param dwFuncAddr RVA of the function.
+        **/
+        void ExportDirectory::addFunction(const std::string& strFuncname, dword dwFuncAddr)
+        {
+                PELIB_EXP_FUNC_INFORMATION efiCurr;
+                efiCurr.funcname = strFuncname;
+                efiCurr.addroffunc = dwFuncAddr;
+                m_ied.functions.push_back(efiCurr);
+        }
+        
+        void ExportDirectory::removeFunction(unsigned int index)
+        {
+                m_ied.functions.erase(m_ied.functions.begin() + index);
+        }
+        
+        void ExportDirectory::clear()
+        {
+                m_ied.functions.clear();
+        }
+                
+        unsigned int ExportDirectory::calcNumberOfFunctions() const
+        {
+                return static_cast<unsigned int>(m_ied.functions.size());
+        }
+
+        /**
+        * Identifies an exported function through it's name.
+        * @param strFunctionName Name of the function
+        * @return Number which identifies the functions.
+        **/
+        int ExportDirectory::getFunctionIndex(const std::string& strFunctionName) const
+        {
+                std::vector<PELIB_EXP_FUNC_INFORMATION>::const_iterator Iter = std::find_if(m_ied.functions.begin(), m_ied.functions.end(), std::bind2nd(std::mem_fun_ref(&PELIB_EXP_FUNC_INFORMATION::equal), strFunctionName));
+                
+                if (Iter == m_ied.functions.end())
+                {
+//                      throw Exceptions::InvalidName(ExportDirectoryId, __LINE__);
+                        return -1;
+                }
+                
+                return static_cast<int>(std::distance(m_ied.functions.begin(), Iter));
+        }
+
+        /**
+        * @param strFilename Name of the file.
+        * @param uiOffset File offset of the export directory.
+        * @param uiSize Size of the export directory.
+        * @param pehHeader A valid PE header which is necessary because some RVA calculations need to be done.
+    * \todo: Proper use of InputBuffer
+        **/
+        int ExportDirectory::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, const PeHeader& pehHeader)
+        {
+                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
+                
+                if (!ifFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+                
+                unsigned int filesize = fileSize(ifFile);
+                
+                if (filesize < uiOffset + uiSize)
+                {
+                        return ERROR_INVALID_FILE;
+                }
+
+                ifFile.seekg(uiOffset, std::ios::beg);
+
+                PELIB_IMAGE_EXP_DIRECTORY iedCurr;
+
+                std::vector<unsigned char> vExportdirectory(uiSize);
+                ifFile.read(reinterpret_cast<char*>(&vExportdirectory[0]), uiSize);
+
+                InputBuffer inpBuffer(vExportdirectory);
+
+                inpBuffer >> iedCurr.ied.Characteristics;
+                inpBuffer >> iedCurr.ied.TimeDateStamp;
+                inpBuffer >> iedCurr.ied.MajorVersion;
+                inpBuffer >> iedCurr.ied.MinorVersion;
+                inpBuffer >> iedCurr.ied.Name;
+                inpBuffer >> iedCurr.ied.Base;
+                inpBuffer >> iedCurr.ied.NumberOfFunctions;
+                inpBuffer >> iedCurr.ied.NumberOfNames;
+                inpBuffer >> iedCurr.ied.AddressOfFunctions;
+                inpBuffer >> iedCurr.ied.AddressOfNames;
+                inpBuffer >> iedCurr.ied.AddressOfNameOrdinals;
+
+                if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))
+                {
+                        unsigned int offset = p32->rvaToOffset(iedCurr.ied.Name);
+                        
+                        if (offset >= filesize)
+                                return ERROR_INVALID_FILE;
+                        
+                        ifFile.seekg(offset, std::ios::beg);
+                }
+                else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))
+                {
+                        // XXX: Files might be > 4 GB
+                        unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.Name));
+                        
+                        if (offset >= filesize)
+                                return ERROR_INVALID_FILE;
+                        
+                        ifFile.seekg(offset, std::ios::beg);
+                }
+                
+                char c = 0;
+                std::string strFname = "";
+                do
+                {
+                        ifFile.read(reinterpret_cast<char*>(&c), sizeof(c));
+                        if (!ifFile) return ERROR_INVALID_FILE;
+                        if (c) strFname += c;
+                }
+                while (c != 0);
+                iedCurr.name = strFname;
+
+                if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))
+                {
+                        unsigned int offset = p32->rvaToOffset(iedCurr.ied.AddressOfFunctions);
+                        
+                        if (offset >= filesize)
+                                return ERROR_INVALID_FILE;
+                        
+                        ifFile.seekg(offset, std::ios::beg);
+                }
+                else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))
+                {
+                        // XXX: File might be > 4 GB
+                        unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.AddressOfFunctions));
+                        
+                        if (offset >= filesize)
+                                return ERROR_INVALID_FILE;
+                                
+                        ifFile.seekg(offset, std::ios::beg);
+                }
+
+                PELIB_EXP_FUNC_INFORMATION efiCurr;
+                efiCurr.ordinal = 0; efiCurr.addroffunc = 0; efiCurr.addrofname = 0;
+
+                for (unsigned int i=0;i<iedCurr.ied.NumberOfFunctions;i++)
+                {
+                        if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))
+                        {
+                                unsigned int offset = p32->rvaToOffset(iedCurr.ied.AddressOfFunctions) + i*sizeof(efiCurr.addroffunc);
+                                
+                                if (offset >= filesize)
+                                        return ERROR_INVALID_FILE;
+                                        
+                                ifFile.seekg(offset, std::ios::beg);
+                        }
+                        else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))
+                        {
+                                // XXX: File might be > 4GB
+                                unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.AddressOfFunctions)) + i*sizeof(efiCurr.addroffunc);
+                                
+                                if (offset >= filesize)
+                                        return ERROR_INVALID_FILE;
+                                        
+                                ifFile.seekg(offset, std::ios::beg);
+                        }
+                        
+                        ifFile.read(reinterpret_cast<char*>(&efiCurr.addroffunc), sizeof(efiCurr.addroffunc));
+                        
+                        if (!ifFile)
+                                return ERROR_INVALID_FILE;
+                                
+                        efiCurr.ordinal = i;
+                        iedCurr.functions.push_back(efiCurr);
+                }
+
+                for (unsigned int i=0;i<iedCurr.ied.NumberOfNames;i++)
+                {
+                        if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))
+                        {
+                                unsigned int offset = p32->rvaToOffset(iedCurr.ied.AddressOfNameOrdinals) + i*sizeof(efiCurr.ordinal);
+                                
+                                if (offset >= filesize)
+                                        return ERROR_INVALID_FILE;
+                                
+                                ifFile.seekg(offset, std::ios::beg);
+                        }
+                        else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))
+                        {
+                                // XXX: File might be > 4 GB
+                                unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.AddressOfNameOrdinals)) + i*sizeof(efiCurr.ordinal);
+                                
+                                if (offset >= filesize)
+                                        return ERROR_INVALID_FILE;
+                                
+                                ifFile.seekg(offset, std::ios::beg);
+                        }
+
+                        word ordinal;
+                        ifFile.read(reinterpret_cast<char*>(&ordinal), sizeof(ordinal));
+                        
+                        if (!ifFile)
+                                return ERROR_INVALID_FILE;
+                        
+                        iedCurr.functions[ordinal].ordinal = ordinal;
+
+                        if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))
+                        {
+                                unsigned int offset = p32->rvaToOffset(iedCurr.ied.AddressOfNames) + i*sizeof(efiCurr.addrofname);
+                                
+                                if (offset >= filesize)
+                                        return ERROR_INVALID_FILE;
+                                
+                                ifFile.seekg(offset, std::ios::beg);
+                        }
+                        else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))
+                        {
+                                // XXX: File might be > 4 GB.
+                                unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.AddressOfNames)) + i*sizeof(efiCurr.addrofname);
+                                
+                                if (offset >= filesize)
+                                        return ERROR_INVALID_FILE;
+                                
+                                ifFile.seekg(offset, std::ios::beg);
+                        }
+                        
+                        ifFile.read(reinterpret_cast<char*>(&iedCurr.functions[ordinal].addrofname), sizeof(iedCurr.functions[ordinal].addrofname));
+                        
+                        if (!ifFile)
+                                return ERROR_INVALID_FILE;
+
+                        if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))
+                        {
+                                unsigned int offset = p32->rvaToOffset(iedCurr.functions[ordinal].addrofname);
+
+                                if (offset >= filesize)
+                                        return ERROR_INVALID_FILE;
+
+                                ifFile.seekg(offset, std::ios::beg);
+                        }
+                        else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))
+                        {
+                                // XXX: File might be > 4 GB.
+                                unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.functions[ordinal].addrofname));
+
+                                if (offset >= filesize)
+                                        return ERROR_INVALID_FILE;
+
+                                ifFile.seekg(static_cast<unsigned int>(p64->rvaToOffset(iedCurr.functions[ordinal].addrofname)), std::ios::beg);
+                        }
+
+                        char c = 0;
+                        std::string strFname = "";
+                        do
+                        {
+                                ifFile.read(reinterpret_cast<char*>(&c), sizeof(c));
+                                
+                                if (!ifFile)
+                                        return ERROR_INVALID_FILE;
+                                        
+                                if (c) strFname += c;
+                        }
+                        while (c != 0);
+
+                        iedCurr.functions[ordinal].funcname = strFname;
+                }
+
+                std::swap(m_ied, iedCurr);
+                
+                return NO_ERROR;
+        }
+
+        /**
+        * @param vBuffer Buffer where the rebuilt export directory is written to.
+        * @param dwRva RVA of the export directory.
+        * \todo fValid flag
+        **/
+        void ExportDirectory::rebuild(std::vector<byte>& vBuffer, dword dwRva) const
+        {
+                unsigned int uiSizeDirectory = sizeof(PELIB_IMAGE_EXPORT_DIRECTORY);
+
+                unsigned int uiSizeNames = 0;
+                unsigned int uiSizeAddrFuncs = 0;
+                unsigned int uiSizeAddrNames = 0;
+                unsigned int uiSizeOrdinals = 0;
+
+                for (unsigned int i=0;i<m_ied.functions.size();i++)
+                {
+                        uiSizeNames += (m_ied.functions[i].funcname.empty()) ? 0 : static_cast<unsigned int>(m_ied.functions[i].funcname.size()) + 1;
+                        uiSizeAddrFuncs += sizeof(m_ied.functions[i].addroffunc);
+                        uiSizeAddrNames += (m_ied.functions[i].funcname.empty()) ? 0 : sizeof(m_ied.functions[i].addrofname);
+                        uiSizeOrdinals += (m_ied.functions[i].funcname.empty()) ? 0 : sizeof(m_ied.functions[i].ordinal);
+                }
+                
+                unsigned int uiFilenameSize = static_cast<unsigned int>(m_ied.name.size()) + 1;
+                
+                OutputBuffer obBuffer(vBuffer);
+
+                obBuffer << m_ied.ied.Characteristics;
+                obBuffer << m_ied.ied.TimeDateStamp;
+                obBuffer << m_ied.ied.MajorVersion;
+                obBuffer << m_ied.ied.MinorVersion;
+                obBuffer << dwRva + uiSizeDirectory;
+                obBuffer << m_ied.ied.Base;
+                obBuffer << static_cast<unsigned int>(m_ied.functions.size());
+
+                // TODO: Not correct but sufficient for now. (Update: I forgot what this comment refers to, but I'll leave it in)
+                obBuffer << static_cast<unsigned int>(m_ied.functions.size());
+                obBuffer << dwRva + uiSizeDirectory + uiFilenameSize;
+                obBuffer << dwRva + uiSizeDirectory + uiFilenameSize + uiSizeAddrFuncs; 
+                obBuffer << dwRva + uiSizeDirectory + uiFilenameSize + uiSizeAddrFuncs + uiSizeAddrNames;
+
+                obBuffer.add(m_ied.name.c_str(), static_cast<unsigned int>(m_ied.name.size())+1);
+
+                for (unsigned int i=0;i<m_ied.functions.size();i++)
+                {
+                        obBuffer << m_ied.functions[i].addroffunc;
+                }
+
+                unsigned int ulFuncCounter = dwRva + uiSizeDirectory + uiFilenameSize + uiSizeAddrFuncs + uiSizeAddrNames + uiSizeOrdinals;
+                
+                for (unsigned int i=0;i<m_ied.functions.size();i++)
+                {
+                        if (!m_ied.functions[i].funcname.empty())
+                        {
+                                obBuffer << ulFuncCounter;
+                                ulFuncCounter += static_cast<unsigned int>(m_ied.functions[i].funcname.size()) + 1;
+                        }
+                }
+
+                for (unsigned int i=0;i<m_ied.functions.size();i++)
+                {
+                        if (!m_ied.functions[i].funcname.empty())
+                        {
+                                obBuffer <<  m_ied.functions[i].ordinal;
+                        }
+                }
+
+                for (unsigned int i=0;i<m_ied.functions.size();i++)
+                {
+                        if (m_ied.functions[i].funcname.empty() && m_ied.functions[i].addroffunc)
+                        {
+                                obBuffer <<  m_ied.functions[i].ordinal;
+                        }
+                }
+
+                for (unsigned int i=0;i<m_ied.functions.size();i++)
+                {
+                        if (!m_ied.functions[i].funcname.empty())
+                        {
+                                obBuffer.add(m_ied.functions[i].funcname.c_str(), static_cast<unsigned int>(m_ied.functions[i].funcname.size()) + 1);
+                        }
+                }
+        }
+
+        /**
+        * @return Size of the current export directory.
+        **/
+        unsigned int ExportDirectory::size() const
+        {
+                return m_ied.size();
+        }
+
+        /**
+        * @param strFilename Name of the file.
+        * @param uiOffset File offset the export directory will be written to.
+        * @param uiRva RVA of the export directory.
+        * \todo Check if ofFile.write succeeded.
+        **/
+        int ExportDirectory::write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva) const
+        {
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                
+                if (!ofFile)
+                {
+                        ofFile.clear();
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                }
+                else
+                {
+                        ofFile.close();
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                }
+                
+                if (!ofFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+
+                ofFile.seekp(uiOffset, std::ios::beg);
+
+                std::vector<unsigned char> vBuffer;
+                rebuild(vBuffer, uiRva);
+
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
+
+                ofFile.close();
+                
+                return NO_ERROR;
+        }
+
+        /**
+        * Changes the filename according to the export directory.
+        * @param strFilename New filename.
+        **/
+        void ExportDirectory::setNameString(const std::string& strFilename)
+        {
+                m_ied.name = strFilename;
+        }
+
+        std::string ExportDirectory::getNameString() const
+        {
+                return m_ied.name;
+        }
+
+        /**
+        * @param dwIndex Number which identifies an exported function.
+        * @return The name of that function.
+        **/
+        std::string ExportDirectory::getFunctionName(dword dwIndex) const
+        {
+                return m_ied.functions[dwIndex].funcname;
+        }
+
+        /**
+        * @param dwIndex Number which identifies an exported function.
+        * @return The ordinal of that function.
+        **/
+        word ExportDirectory::getFunctionOrdinal(dword dwIndex) const
+        {
+                return m_ied.functions[dwIndex].ordinal;
+        }
+
+        /**
+        * @param dwIndex Number which identifies an exported function.
+        * @return The RVA of the name string of that function.
+        **/
+        dword ExportDirectory::getAddressOfName(dword dwIndex) const
+        {
+                return m_ied.functions[dwIndex].addrofname;
+        }
+
+        /**
+        * @param dwIndex Number which identifies an exported function.
+        * @return The RVA of that function.
+        **/
+        dword ExportDirectory::getAddressOfFunction(dword dwIndex) const
+        {
+                return m_ied.functions[dwIndex].addroffunc;
+        }
+        
+        /**
+        * @param dwIndex Number which identifies an exported function.
+        * @param strName The name of that function.
+        **/
+        void ExportDirectory::setFunctionName(dword dwIndex, const std::string& strName)
+        {
+                m_ied.functions[dwIndex].funcname = strName;
+        }
+
+        /**
+        * @param dwIndex Number which identifies an exported function.
+        * @param wValue The ordinal of that function.
+        **/
+        void ExportDirectory::setFunctionOrdinal(dword dwIndex, word wValue)
+        {
+                m_ied.functions[dwIndex].ordinal = wValue;
+        }
+
+        /**
+        * @param dwIndex Number which identifies an exported function.
+        * @param dwValue The RVA of the name string of that function.
+        **/
+        void ExportDirectory::setAddressOfName(dword dwIndex, dword dwValue)
+        {
+                m_ied.functions[dwIndex].addrofname = dwValue;
+        }
+
+        /**
+        * @param dwIndex Number which identifies an exported function.
+        * @param dwValue The RVA of that function.
+        **/
+        void ExportDirectory::setAddressOfFunction(dword dwIndex, dword dwValue)
+        {
+                m_ied.functions[dwIndex].addroffunc = dwValue;
+        }
+
+        /**
+        * @return The ordinal base of the export directory.
+        **/
+        dword ExportDirectory::getBase() const
+        {
+                return m_ied.ied.Base;
+        }
+
+        /**
+        * @return The characteristics of the export directory.
+        **/
+        dword ExportDirectory::getCharacteristics() const
+        {
+                return m_ied.ied.Characteristics;
+        }
+
+        /**
+        * @return The time/date stamp of the export directory.
+        **/
+        dword ExportDirectory::getTimeDateStamp() const
+        {
+                return m_ied.ied.TimeDateStamp;
+        }
+
+        /**
+        * @return The MajorVersion of the export directory.
+        **/
+        word ExportDirectory::getMajorVersion() const
+        {
+                return m_ied.ied.MajorVersion;
+        }
+
+        /**
+        * @return The MinorVersion of the export directory.
+        **/
+        word ExportDirectory::getMinorVersion() const
+        {
+                return m_ied.ied.MinorVersion;
+        }
+
+        /**
+        * @return The RVA of the name of the file.
+        **/
+        dword ExportDirectory::getName() const
+        {
+                return m_ied.ied.Name;
+        }
+
+        /**
+        * @return The NumberOfFunctions of the export directory.
+        **/
+        dword ExportDirectory::getNumberOfFunctions() const
+        {
+                return m_ied.ied.NumberOfFunctions;
+        }
+
+        /**
+        * @return The NumberOfNames of the export directory.
+        **/
+        dword ExportDirectory::getNumberOfNames() const
+        {
+                return m_ied.ied.NumberOfNames;
+        }
+
+        /**
+        * @return The AddressOfFunctions of the export directory.
+        **/
+        dword ExportDirectory::getAddressOfFunctions() const
+        {
+                return m_ied.ied.AddressOfFunctions;
+        }
+
+        /**
+        * @return The AddressOfNames of the export directory.
+        **/
+        dword ExportDirectory::getAddressOfNames() const
+        {
+                return m_ied.ied.AddressOfNames;
+        }
+
+/*      dword ExportDirectory::getNumberOfNameOrdinals() const
+        {
+                return static_cast<dword>(m_ied.functions.size());
+        }
+
+        dword ExportDirectory::getNumberOfAddressOfFunctionNames() const
+        {
+                return static_cast<dword>(m_ied.functions.size());
+        }
+
+        dword ExportDirectory::getNumberOfAddressOfFunctions() const
+        {
+                return static_cast<dword>(m_ied.functions.size());
+        }
+*/
+        /**
+        * @return The AddressOfNameOrdinals of the export directory.
+        **/
+        dword ExportDirectory::getAddressOfNameOrdinals() const
+        {
+                return m_ied.ied.AddressOfNameOrdinals;
+        }
+
+        /**
+        * @param dwValue The ordinal base of the export directory.
+        **/
+        void ExportDirectory::setBase(dword dwValue)
+        {
+                m_ied.ied.Base = dwValue;
+        }
+
+        /**
+        * @param dwValue The Characteristics of the export directory.
+        **/
+        void ExportDirectory::setCharacteristics(dword dwValue)
+        {
+                m_ied.ied.Characteristics = dwValue;
+        }
+
+        /**
+        * @param dwValue The TimeDateStamp of the export directory.
+        **/
+        void ExportDirectory::setTimeDateStamp(dword dwValue)
+        {
+                m_ied.ied.TimeDateStamp = dwValue;
+        }
+
+        /**
+        * @param wValue The MajorVersion of the export directory.
+        **/
+        void ExportDirectory::setMajorVersion(word wValue)
+        {
+                m_ied.ied.MajorVersion = wValue;
+        }
+
+        /**
+        * @param wValue The MinorVersion of the export directory.
+        **/
+        void ExportDirectory::setMinorVersion(word wValue)
+        {
+                m_ied.ied.MinorVersion = wValue;
+        }
+
+        /**
+        * @param dwValue The Name of the export directory.
+        **/
+        void ExportDirectory::setName(dword dwValue)
+        {
+                m_ied.ied.Name = dwValue;
+        }
+
+        /**
+        * @param dwValue The NumberOfFunctions of the export directory.
+        **/
+        void ExportDirectory::setNumberOfFunctions(dword dwValue)
+        {
+                m_ied.ied.NumberOfFunctions = dwValue;
+        }
+
+        /**
+        * @param dwValue The NumberOfNames of the export directory.
+        **/
+        void ExportDirectory::setNumberOfNames(dword dwValue)
+        {
+                m_ied.ied.NumberOfNames = dwValue;
+        }
+
+        /**
+        * @param dwValue The AddressOfFunctions of the export directory.
+        **/
+        void ExportDirectory::setAddressOfFunctions(dword dwValue)
+        {
+                m_ied.ied.AddressOfFunctions = dwValue;
+        }
+
+        /**
+        * @param dwValue The AddressOfNames of the export directory.
+        **/
+        void ExportDirectory::setAddressOfNames(dword dwValue)
+        {
+                m_ied.ied.AddressOfNames = dwValue;
+        }
+        
+        void ExportDirectory::setAddressOfNameOrdinals(dword value)
+        {
+                m_ied.ied.AddressOfNameOrdinals = value;
+        }
+}
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/ExportDirectory.h b/utils/zenutils/libraries/pelib-0.9/pelib/ExportDirectory.h
index 17a7e57020..19609b65a7 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/ExportDirectory.h
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/ExportDirectory.h
@@ -1,133 +1,133 @@
-/*

-* ExportDirectory.h - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#ifndef EXPORTDIRECTORY_H

-#define EXPORTDIRECTORY_H

-#include "PeHeader.h"

-

-namespace PeLib

-{

-        /// Class that handles the export directory.

-        /**

-        * This class handles the export directory.

-        * \todo getNameString

-        **/

-//      template<int bits>

-        class ExportDirectory

-        {

-                private:

-                  /// Used to store all necessary information about a file's exported functions.

-                  PELIB_IMAGE_EXP_DIRECTORY m_ied;

-

-                public:

-                  /// Add another function to be exported.

-                  void addFunction(const std::string& strFuncname, dword dwFuncAddr); // EXPORT

-                  unsigned int calcNumberOfFunctions() const; // EXPORT

-                  void clear(); // EXPORT

-                  /// Identifies a function through it's name.

-                  int getFunctionIndex(const std::string& strFunctionName) const; // EXPORT

-                  /// Read a file's export directory.

-                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, const PeHeader& pehHeader); // EXPORT

-                  /// Rebuild the current export directory.

-                  void rebuild(std::vector<byte>& vBuffer, dword dwRva) const; // EXPORT

-                  void removeFunction(unsigned int index); // EXPORT

-                  /// Returns the size of the current export directory.

-                  unsigned int size() const; // EXPORT

-                  /// Writes the current export directory to a file.

-                  int write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva) const; // EXPORT

-

-                  /// Changes the name of the file (according to the export directory).

-                  void setNameString(const std::string& strFilename); // EXPORT

-                  std::string getNameString() const; // EXPORT

-

-                  /// Get the name of an exported function.

-                  std::string getFunctionName(unsigned int index) const; // EXPORT

-                  /// Get the ordinal of an exported function.

-                  word getFunctionOrdinal(unsigned int index) const; // EXPORT

-                  /// Get the address of the name of an exported function.

-                  dword getAddressOfName(unsigned int index) const; // EXPORT

-                  /// Get the address of an exported function.

-                  dword getAddressOfFunction(unsigned int index) const; // EXPORT

-                  

-                  /// Change the name of an exported function.

-                  void setFunctionName(unsigned int index, const std::string& strName); // EXPORT

-                  /// Change the ordinal of an exported function.

-                  void setFunctionOrdinal(unsigned int index, word wValue); // EXPORT

-                  /// Change the address of the name of an exported function.

-                  void setAddressOfName(unsigned int index, dword dwValue); // EXPORT

-                  /// Change the address of an exported function.

-                  void setAddressOfFunction(unsigned int index, dword dwValue); // EXPORT

-                  

-                  /*

-                  word getFunctionOrdinal(std::string strFuncname) const;

-                  dword getAddressOfName(std::string strFuncname) const;

-                  dword getAddressOfFunction(std::string strFuncname) const;

-

-                  void setFunctionOrdinal(std::string strFuncname, word wValue);

-                  void setAddressOfName(std::string strFuncname, dword dwValue);

-                  void setAddressOfFunction(std::string strFuncname, dword dwValue);

-                  */

-

-                  /// Return the Base value of the export directory.

-                  dword getBase() const; // EXPORT

-                  /// Return the Characteristics value of the export directory.

-                  dword getCharacteristics() const; // EXPORT

-                  /// Return the TimeDateStamp value of the export directory.

-                  dword getTimeDateStamp() const; // EXPORT

-                  /// Return the MajorVersion value of the export directory.

-                  word getMajorVersion() const; // EXPORT

-                  /// Return the MinorVersion value of the export directory.

-                  word getMinorVersion() const; // EXPORT

-                  /// Return the Name value of the export directory.

-                  dword getName() const; // EXPORT

-                  /// Return the NumberOfFunctions value of the export directory.

-                  dword getNumberOfFunctions() const; // EXPORT

-                  /// Return the NumberOfNames value of the export directory.

-                  dword getNumberOfNames() const; // EXPORT

-                  /// Return the AddressOfFunctions value of the export directory.

-                  dword getAddressOfFunctions() const; // EXPORT

-                  /// Return the AddressOfNames value of the export directory.

-                  dword getAddressOfNames() const; // EXPORT

-                  /// Returns the AddressOfNameOrdinals value.

-                  dword getAddressOfNameOrdinals() const; // EXPORT

-

-/*                /// Returns the number of NameOrdinals.

-                  dword getNumberOfNameOrdinals() const; // EXPORT

-                  /// Returns the number of AddressOfFunctionNames values.

-                  dword getNumberOfAddressOfFunctionNames() const; // EXPORT

-                  /// Returns the number of AddressOfFunction values.

-                  dword getNumberOfAddressOfFunctions() const; // EXPORT

-*/

-                  /// Set the Base value of the export directory.

-                  void setBase(dword dwValue); // EXPORT

-                  /// Set the Characteristics value of the export directory.

-                  void setCharacteristics(dword dwValue); // EXPORT

-                  /// Set the TimeDateStamp value of the export directory.

-                  void setTimeDateStamp(dword dwValue); // EXPORT

-                  /// Set the MajorVersion value of the export directory.

-                  void setMajorVersion(word wValue); // EXPORT

-                  /// Set the MinorVersion value of the export directory.

-                  void setMinorVersion(word wValue); // EXPORT

-                  /// Set the Name value of the export directory.

-                  void setName(dword dwValue); // EXPORT

-                  /// Set the NumberOfFunctions value of the export directory.

-                  void setNumberOfFunctions(dword dwValue); // EXPORT

-                  /// Set the NumberOfNames value of the export directory.

-                  void setNumberOfNames(dword dwValue); // EXPORT

-                  /// Set the AddressOfFunctions value of the export directory.

-                  void setAddressOfFunctions(dword dwValue); // EXPORT

-                  /// Set the AddressOfNames value of the export directory.

-                  void setAddressOfNames(dword dwValue); // EXPORT

-                  void setAddressOfNameOrdinals(dword value); // EXPORT

-        };

-}

-#endif

+/*
+* ExportDirectory.h - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#ifndef EXPORTDIRECTORY_H
+#define EXPORTDIRECTORY_H
+#include "PeHeader.h"
+
+namespace PeLib
+{
+        /// Class that handles the export directory.
+        /**
+        * This class handles the export directory.
+        * \todo getNameString
+        **/
+//      template<int bits>
+        class ExportDirectory
+        {
+                private:
+                  /// Used to store all necessary information about a file's exported functions.
+                  PELIB_IMAGE_EXP_DIRECTORY m_ied;
+
+                public:
+                  /// Add another function to be exported.
+                  void addFunction(const std::string& strFuncname, dword dwFuncAddr); // EXPORT
+                  unsigned int calcNumberOfFunctions() const; // EXPORT
+                  void clear(); // EXPORT
+                  /// Identifies a function through it's name.
+                  int getFunctionIndex(const std::string& strFunctionName) const; // EXPORT
+                  /// Read a file's export directory.
+                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, const PeHeader& pehHeader); // EXPORT
+                  /// Rebuild the current export directory.
+                  void rebuild(std::vector<byte>& vBuffer, dword dwRva) const; // EXPORT
+                  void removeFunction(unsigned int index); // EXPORT
+                  /// Returns the size of the current export directory.
+                  unsigned int size() const; // EXPORT
+                  /// Writes the current export directory to a file.
+                  int write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva) const; // EXPORT
+
+                  /// Changes the name of the file (according to the export directory).
+                  void setNameString(const std::string& strFilename); // EXPORT
+                  std::string getNameString() const; // EXPORT
+
+                  /// Get the name of an exported function.
+                  std::string getFunctionName(unsigned int index) const; // EXPORT
+                  /// Get the ordinal of an exported function.
+                  word getFunctionOrdinal(unsigned int index) const; // EXPORT
+                  /// Get the address of the name of an exported function.
+                  dword getAddressOfName(unsigned int index) const; // EXPORT
+                  /// Get the address of an exported function.
+                  dword getAddressOfFunction(unsigned int index) const; // EXPORT
+                  
+                  /// Change the name of an exported function.
+                  void setFunctionName(unsigned int index, const std::string& strName); // EXPORT
+                  /// Change the ordinal of an exported function.
+                  void setFunctionOrdinal(unsigned int index, word wValue); // EXPORT
+                  /// Change the address of the name of an exported function.
+                  void setAddressOfName(unsigned int index, dword dwValue); // EXPORT
+                  /// Change the address of an exported function.
+                  void setAddressOfFunction(unsigned int index, dword dwValue); // EXPORT
+                  
+                  /*
+                  word getFunctionOrdinal(std::string strFuncname) const;
+                  dword getAddressOfName(std::string strFuncname) const;
+                  dword getAddressOfFunction(std::string strFuncname) const;
+
+                  void setFunctionOrdinal(std::string strFuncname, word wValue);
+                  void setAddressOfName(std::string strFuncname, dword dwValue);
+                  void setAddressOfFunction(std::string strFuncname, dword dwValue);
+                  */
+
+                  /// Return the Base value of the export directory.
+                  dword getBase() const; // EXPORT
+                  /// Return the Characteristics value of the export directory.
+                  dword getCharacteristics() const; // EXPORT
+                  /// Return the TimeDateStamp value of the export directory.
+                  dword getTimeDateStamp() const; // EXPORT
+                  /// Return the MajorVersion value of the export directory.
+                  word getMajorVersion() const; // EXPORT
+                  /// Return the MinorVersion value of the export directory.
+                  word getMinorVersion() const; // EXPORT
+                  /// Return the Name value of the export directory.
+                  dword getName() const; // EXPORT
+                  /// Return the NumberOfFunctions value of the export directory.
+                  dword getNumberOfFunctions() const; // EXPORT
+                  /// Return the NumberOfNames value of the export directory.
+                  dword getNumberOfNames() const; // EXPORT
+                  /// Return the AddressOfFunctions value of the export directory.
+                  dword getAddressOfFunctions() const; // EXPORT
+                  /// Return the AddressOfNames value of the export directory.
+                  dword getAddressOfNames() const; // EXPORT
+                  /// Returns the AddressOfNameOrdinals value.
+                  dword getAddressOfNameOrdinals() const; // EXPORT
+
+/*                /// Returns the number of NameOrdinals.
+                  dword getNumberOfNameOrdinals() const; // EXPORT
+                  /// Returns the number of AddressOfFunctionNames values.
+                  dword getNumberOfAddressOfFunctionNames() const; // EXPORT
+                  /// Returns the number of AddressOfFunction values.
+                  dword getNumberOfAddressOfFunctions() const; // EXPORT
+*/
+                  /// Set the Base value of the export directory.
+                  void setBase(dword dwValue); // EXPORT
+                  /// Set the Characteristics value of the export directory.
+                  void setCharacteristics(dword dwValue); // EXPORT
+                  /// Set the TimeDateStamp value of the export directory.
+                  void setTimeDateStamp(dword dwValue); // EXPORT
+                  /// Set the MajorVersion value of the export directory.
+                  void setMajorVersion(word wValue); // EXPORT
+                  /// Set the MinorVersion value of the export directory.
+                  void setMinorVersion(word wValue); // EXPORT
+                  /// Set the Name value of the export directory.
+                  void setName(dword dwValue); // EXPORT
+                  /// Set the NumberOfFunctions value of the export directory.
+                  void setNumberOfFunctions(dword dwValue); // EXPORT
+                  /// Set the NumberOfNames value of the export directory.
+                  void setNumberOfNames(dword dwValue); // EXPORT
+                  /// Set the AddressOfFunctions value of the export directory.
+                  void setAddressOfFunctions(dword dwValue); // EXPORT
+                  /// Set the AddressOfNames value of the export directory.
+                  void setAddressOfNames(dword dwValue); // EXPORT
+                  void setAddressOfNameOrdinals(dword value); // EXPORT
+        };
+}
+#endif
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/IatDirectory.cpp b/utils/zenutils/libraries/pelib-0.9/pelib/IatDirectory.cpp
index 36482fcbeb..b32cfb2a8e 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/IatDirectory.cpp
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/IatDirectory.cpp
@@ -1,179 +1,179 @@
-/*

-* IatDirectory.h - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#include "IatDirectory.h"

-

-namespace PeLib

-{

-        int IatDirectory::read(InputBuffer& inputBuffer, unsigned int size)

-        {

-                dword dwAddr;

-

-                std::vector<dword> vIat;

-

-                for (unsigned int i=0;i<size/sizeof(dword);i++)

-                {

-                        inputBuffer >> dwAddr;

-                        vIat.push_back(dwAddr);

-                }

-                

-                std::swap(vIat, m_vIat);

-                

-                return NO_ERROR;

-        }

-        

-        /**

-        * Reads the Import Address table from a file.

-        * @param strFilename Name of the file.

-        * @param dwOffset File offset of the IAT (see #PeFile::PeHeader::getIDIatRVA).

-        * @param dwSize Size of the IAT (see #PeFile::PeHeader::getIDIatSize).

-        **/

-        int IatDirectory::read(const std::string& strFilename, unsigned int dwOffset, unsigned int dwSize)

-        {

-                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);

-                

-                if (!ifFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-                

-                if (fileSize(ifFile) < dwOffset + dwSize)

-                {

-                        return ERROR_INVALID_FILE;

-                }

-                

-                ifFile.seekg(dwOffset, std::ios::beg);

-                

-                std::vector<byte> vBuffer(dwSize);

-                ifFile.read(reinterpret_cast<char*>(&vBuffer[0]), dwSize);

-

-                InputBuffer inpBuffer(vBuffer);

-                return read(inpBuffer, dwSize);

-        }

-        

-        int IatDirectory::read(unsigned char* buffer, unsigned int buffersize)

-        {

-                std::vector<byte> vBuffer(buffer, buffer + buffersize);

-                InputBuffer inpBuffer(vBuffer);

-                return read(inpBuffer, buffersize);

-        }

-        

-        /**

-        * Returns the number of fields in the IAT. This is equivalent to the number of

-        * imported functions.

-        * @return Number of fields in the IAT.

-        **/

-        unsigned int IatDirectory::calcNumberOfAddresses() const

-        {

-                return static_cast<unsigned int>(m_vIat.size());

-        }

-

-        /**

-        * Returns the dwValue of a field in the IAT.

-        * @param dwAddrnr Number identifying the field.

-        * @return dwValue of the field.

-        **/

-        dword IatDirectory::getAddress(unsigned int index) const

-        {

-                return m_vIat[index];

-        }

-        

-        /**

-        * Updates the dwValue of a field in the IAT.

-        * @param dwAddrnr Number identifying the field.

-        * @param dwValue New dwValue of the field.

-        **/

-        void IatDirectory::setAddress(dword dwAddrnr, dword dwValue)

-        {

-                m_vIat[dwAddrnr] = dwValue;

-        }

-

-        /**

-        * Adds another field to the IAT.

-        * @param dwValue dwValue of the new field.

-        **/

-        void IatDirectory::addAddress(dword dwValue)

-        {

-                m_vIat.push_back(dwValue);

-        }

-        

-        /**

-        * Removes an address from the IAT.

-        * @param dwAddrnr Number identifying the field.

-        **/

-        void IatDirectory::removeAddress(unsigned int index)

-        {

-                std::vector<dword>::iterator pos = m_vIat.begin() + index;

-                m_vIat.erase(pos);

-        }

-        

-        /**

-        * Delete all entries from the IAT.

-        **/

-        void IatDirectory::clear()

-        {

-                m_vIat.clear();

-        }

-        

-        /**

-        * Rebuilds the complete Import Address Table.

-        * @param vBuffer Buffer where the rebuilt IAT will be stored.

-        **/

-        void IatDirectory::rebuild(std::vector<byte>& vBuffer) const

-        {

-                vBuffer.reserve(size());

-                OutputBuffer obBuffer(vBuffer);

-        

-                for (unsigned int i=0;i<m_vIat.size();i++)

-                {

-                        obBuffer << m_vIat[i];

-                }

-        }

-

-        unsigned int IatDirectory::size() const

-        {

-                return static_cast<unsigned int>(m_vIat.size())* sizeof(dword);

-        }

-

-        /// Writes the current IAT to a file.

-        int IatDirectory::write(const std::string& strFilename, unsigned int uiOffset) const

-        {

-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);

-                

-                if (!ofFile)

-                {

-                        ofFile.clear();

-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);

-                }

-                else

-                {

-                        ofFile.close();

-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);

-                }

-

-                if (!ofFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-

-                ofFile.seekp(uiOffset, std::ios::beg);

-

-                std::vector<unsigned char> vBuffer;

-                rebuild(vBuffer);

-

-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));

-

-                ofFile.close();

-                

-                return NO_ERROR;

-        }

-}

+/*
+* IatDirectory.h - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#include "IatDirectory.h"
+
+namespace PeLib
+{
+        int IatDirectory::read(InputBuffer& inputBuffer, unsigned int size)
+        {
+                dword dwAddr;
+
+                std::vector<dword> vIat;
+
+                for (unsigned int i=0;i<size/sizeof(dword);i++)
+                {
+                        inputBuffer >> dwAddr;
+                        vIat.push_back(dwAddr);
+                }
+                
+                std::swap(vIat, m_vIat);
+                
+                return NO_ERROR;
+        }
+        
+        /**
+        * Reads the Import Address table from a file.
+        * @param strFilename Name of the file.
+        * @param dwOffset File offset of the IAT (see #PeFile::PeHeader::getIDIatRVA).
+        * @param dwSize Size of the IAT (see #PeFile::PeHeader::getIDIatSize).
+        **/
+        int IatDirectory::read(const std::string& strFilename, unsigned int dwOffset, unsigned int dwSize)
+        {
+                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
+                
+                if (!ifFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+                
+                if (fileSize(ifFile) < dwOffset + dwSize)
+                {
+                        return ERROR_INVALID_FILE;
+                }
+                
+                ifFile.seekg(dwOffset, std::ios::beg);
+                
+                std::vector<byte> vBuffer(dwSize);
+                ifFile.read(reinterpret_cast<char*>(&vBuffer[0]), dwSize);
+
+                InputBuffer inpBuffer(vBuffer);
+                return read(inpBuffer, dwSize);
+        }
+        
+        int IatDirectory::read(unsigned char* buffer, unsigned int buffersize)
+        {
+                std::vector<byte> vBuffer(buffer, buffer + buffersize);
+                InputBuffer inpBuffer(vBuffer);
+                return read(inpBuffer, buffersize);
+        }
+        
+        /**
+        * Returns the number of fields in the IAT. This is equivalent to the number of
+        * imported functions.
+        * @return Number of fields in the IAT.
+        **/
+        unsigned int IatDirectory::calcNumberOfAddresses() const
+        {
+                return static_cast<unsigned int>(m_vIat.size());
+        }
+
+        /**
+        * Returns the dwValue of a field in the IAT.
+        * @param dwAddrnr Number identifying the field.
+        * @return dwValue of the field.
+        **/
+        dword IatDirectory::getAddress(unsigned int index) const
+        {
+                return m_vIat[index];
+        }
+        
+        /**
+        * Updates the dwValue of a field in the IAT.
+        * @param dwAddrnr Number identifying the field.
+        * @param dwValue New dwValue of the field.
+        **/
+        void IatDirectory::setAddress(dword dwAddrnr, dword dwValue)
+        {
+                m_vIat[dwAddrnr] = dwValue;
+        }
+
+        /**
+        * Adds another field to the IAT.
+        * @param dwValue dwValue of the new field.
+        **/
+        void IatDirectory::addAddress(dword dwValue)
+        {
+                m_vIat.push_back(dwValue);
+        }
+        
+        /**
+        * Removes an address from the IAT.
+        * @param dwAddrnr Number identifying the field.
+        **/
+        void IatDirectory::removeAddress(unsigned int index)
+        {
+                std::vector<dword>::iterator pos = m_vIat.begin() + index;
+                m_vIat.erase(pos);
+        }
+        
+        /**
+        * Delete all entries from the IAT.
+        **/
+        void IatDirectory::clear()
+        {
+                m_vIat.clear();
+        }
+        
+        /**
+        * Rebuilds the complete Import Address Table.
+        * @param vBuffer Buffer where the rebuilt IAT will be stored.
+        **/
+        void IatDirectory::rebuild(std::vector<byte>& vBuffer) const
+        {
+                vBuffer.reserve(size());
+                OutputBuffer obBuffer(vBuffer);
+        
+                for (unsigned int i=0;i<m_vIat.size();i++)
+                {
+                        obBuffer << m_vIat[i];
+                }
+        }
+
+        unsigned int IatDirectory::size() const
+        {
+                return static_cast<unsigned int>(m_vIat.size())* sizeof(dword);
+        }
+
+        /// Writes the current IAT to a file.
+        int IatDirectory::write(const std::string& strFilename, unsigned int uiOffset) const
+        {
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                
+                if (!ofFile)
+                {
+                        ofFile.clear();
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                }
+                else
+                {
+                        ofFile.close();
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                }
+
+                if (!ofFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+
+                ofFile.seekp(uiOffset, std::ios::beg);
+
+                std::vector<unsigned char> vBuffer;
+                rebuild(vBuffer);
+
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
+
+                ofFile.close();
+                
+                return NO_ERROR;
+        }
+}
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/IatDirectory.h b/utils/zenutils/libraries/pelib-0.9/pelib/IatDirectory.h
index 81ef77ed6a..26c5d4009c 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/IatDirectory.h
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/IatDirectory.h
@@ -1,58 +1,58 @@
-/*

-* IatDirectory.h - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#ifndef IATDIRECTORY_H

-#define IATDIRECTORY_H

-

-#include "PeLibInc.h"

-

-namespace PeLib

-{

-        /// Class that handles the Import Address Table (IAT)

-        /**

-        * This class can read and modify the Import Address Table of a PE file.

-        **/

-        class IatDirectory

-        {

-                private:

-                  std::vector<dword> m_vIat; ///< Stores the individual IAT fields.

-                  

-                  int read(InputBuffer& inputBuffer, unsigned int size);

-                  

-                public:

-                  /// Reads the Import Address Table from a PE file.

-                  int read(const std::string& strFilename, unsigned int dwOffset, unsigned int dwSize); // EXPORT

-                  int read(unsigned char* buffer, unsigned int buffersize); // EXPORT

-                  /// Returns the number of fields in the IAT.

-                  unsigned int calcNumberOfAddresses() const; // EXPORT

-                  /// Adds another address to the IAT.

-                  void addAddress(dword dwValue); // EXPORT

-                  /// Removes an address from the IAT.

-                  void removeAddress(unsigned int index); // EXPORT

-                  /// Empties the IAT.

-                  void clear(); // EXPORT

-                  // Rebuilds the IAT.

-                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT

-                  /// Returns the size of the current IAT.

-                  unsigned int size() const; // EXPORT

-                  /// Writes the current IAT to a file.

-                  int write(const std::string& strFilename, unsigned int uiOffset) const; // EXPORT

-

-                  /// Retrieve the value of a field in the IAT.

-                  dword getAddress(unsigned int index) const; // EXPORT

-                  /// Change the value of a field in the IAT.

-                  void setAddress(dword dwAddrnr, dword dwValue); // EXPORT

-        };

-}

-

-#endif

-

+/*
+* IatDirectory.h - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#ifndef IATDIRECTORY_H
+#define IATDIRECTORY_H
+
+#include "PeLibInc.h"
+
+namespace PeLib
+{
+        /// Class that handles the Import Address Table (IAT)
+        /**
+        * This class can read and modify the Import Address Table of a PE file.
+        **/
+        class IatDirectory
+        {
+                private:
+                  std::vector<dword> m_vIat; ///< Stores the individual IAT fields.
+                  
+                  int read(InputBuffer& inputBuffer, unsigned int size);
+                  
+                public:
+                  /// Reads the Import Address Table from a PE file.
+                  int read(const std::string& strFilename, unsigned int dwOffset, unsigned int dwSize); // EXPORT
+                  int read(unsigned char* buffer, unsigned int buffersize); // EXPORT
+                  /// Returns the number of fields in the IAT.
+                  unsigned int calcNumberOfAddresses() const; // EXPORT
+                  /// Adds another address to the IAT.
+                  void addAddress(dword dwValue); // EXPORT
+                  /// Removes an address from the IAT.
+                  void removeAddress(unsigned int index); // EXPORT
+                  /// Empties the IAT.
+                  void clear(); // EXPORT
+                  // Rebuilds the IAT.
+                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT
+                  /// Returns the size of the current IAT.
+                  unsigned int size() const; // EXPORT
+                  /// Writes the current IAT to a file.
+                  int write(const std::string& strFilename, unsigned int uiOffset) const; // EXPORT
+
+                  /// Retrieve the value of a field in the IAT.
+                  dword getAddress(unsigned int index) const; // EXPORT
+                  /// Change the value of a field in the IAT.
+                  void setAddress(dword dwAddrnr, dword dwValue); // EXPORT
+        };
+}
+
+#endif
+
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/ImportDirectory.h b/utils/zenutils/libraries/pelib-0.9/pelib/ImportDirectory.h
index 6578f0712a..42526f0c3c 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/ImportDirectory.h
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/ImportDirectory.h
@@ -1,1139 +1,1139 @@
-/*

-* ImportDirectory.h - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#ifndef IMPORTDIRECTORY_H

-#define IMPORTDIRECTORY_H

-

-#include "PeLibAux.h"

-#include "PeHeader.h"

-

-namespace PeLib

-{

-        /// Parameter for functions that can operate on the OLDDIR or new import directory.

-        enum currdir {OLDDIR = 1, NEWDIR};

-                

-        class PeLibException;

-

-        /// Class that handles import directories.

-        /**

-        * This class can read import directories from existing PE files or start completely from scratch.

-        * Modifying import directories and writing them to files is also possible.

-        * It's worthy to note that many functions require an extra parameter of type currdir

-        * because the structure of import directories make it necessary that the OLDDIR import directory

-        * must be preserved. That's why some functions (like adding and removing) imported functions

-        * only exist for the new import directory, not for the one which is already written to the file.

-        * \todo Adding functions by ordinal doesn't work yet (rebuild needs to be changed).

-        * \todo Somehow store the rvas of the chunks in the file.

-        **/

-        template<int bits>

-        class ImportDirectory

-        {

-                typedef typename std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> >::iterator ImpDirFileIterator;

-                typedef typename std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> >::const_iterator ConstImpDirFileIterator;

-        

-                private:

-                  /// Stores information about already imported DLLs.

-                  std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> > m_vOldiid;

-                  /// Stores information about imported DLLs which will be added.

-                  std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> > m_vNewiid;

-

-                // I can't convince Borland C++ to compile the function outside of the class declaration.

-                // That's why the function definition is here.

-                /// Tests if a certain function is imported.

-                template<typename T> bool hasFunction(std::string strFilename, T value, bool(PELIB_THUNK_DATA<bits>::* comp)(T) const) const

-            {

-                        ConstImpDirFileIterator FileIter = m_vOldiid.begin();

-                        ConstImpDirFileIterator EndIter = m_vOldiid.end();

-                        

-                        for (int i=0;i<=1;i++) // Loop once for m_vOldiid and once for m_vNewiid

-                        {

-                                do

-                                {

-                                        FileIter = std::find_if(FileIter, EndIter, std::bind2nd(std::mem_fun_ref(&PELIB_IMAGE_IMPORT_DIRECTORY<bits>::operator==), strFilename));

-                                        

-                                        if (FileIter != EndIter)

-                                        {

-                                                typename std::vector<PELIB_THUNK_DATA<bits> >::const_iterator Iter = std::find_if(FileIter->originalfirstthunk.begin(), FileIter->originalfirstthunk.end(), std::bind2nd(std::mem_fun_ref(comp), value));

-                                                if (Iter != FileIter->originalfirstthunk.end())

-                                                {

-                                                        return true;

-                                                }

-                                                ++FileIter;

-                                        }

-                                }

-                                while (FileIter != EndIter);

-                                

-                                FileIter = m_vNewiid.begin();

-                                EndIter = m_vNewiid.end();

-                        }

-                        

-                        return false;

-                }

-        

-

-                public:

-

-                  /// Add a function to the import directory.

-                  int addFunction(const std::string& strFilename, word wHint); // EXPORT _byHint

-                  /// Add a function to the import directory.

-                  int addFunction(const std::string& strFilename, const std::string& strFuncname); // EXPORT _byName

-

-                  /// Get the ID of a file through it's name.

-                  unsigned int getFileIndex(const std::string& strFilename, currdir cdDir) const; // EXPORT

-                  /// Get the ID of a function through it's name.

-                  unsigned int getFunctionIndex(const std::string& strFilename, const std::string& strFuncname, currdir cdDir) const; // EXPORT

-

-                  /// Get the name of an imported file.

-                  std::string getFileName(dword dwFilenr, currdir cdDir) const; // EXPORT

-                  

-                  void setFileName(dword filenr, currdir dir, const std::string& name); // EXPORT

-                  

-                  /// Get the hint of an imported function.

-                  word getFunctionHint(dword dwFilenr, dword dwFuncnr, currdir cdDir) const; // EXPORT

-                  void setFunctionHint(dword dwFilenr, dword dwFuncnr, currdir cdDir, word value); // EXPORT

-                  /// Get the name of an imported function.

-                  std::string getFunctionName(dword dwFilenr, dword dwFuncnr, currdir cdDir) const; // EXPORT

-                  void setFunctionName(dword dwFilenr, dword dwFuncnr, currdir cdDir, const std::string& functionName); // EXPORT

-                  /// Get the number of files which are imported.

-                  dword getNumberOfFiles(currdir cdDir) const; // EXPORT

-                  /// Get the number of fucntions which are imported by a specific file.

-                  dword getNumberOfFunctions(dword dwFilenr, currdir cdDir) const; // EXPORT

-                  /// Read a file's import directory.

-                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, const PeHeaderT<bits>& pehHeader); // EXPORT

-                  /// Rebuild the import directory.

-                  void rebuild(std::vector<byte>& vBuffer, dword dwRva, bool fixEntries = true) const; // EXPORT

-                  /// Remove a file from the import directory.

-                  int removeFile(const std::string& strFilename); // EXPORT

-                  /// Remove a function from the import directory.

-                  int removeFunction(const std::string& strFilename, const std::string& strFuncname); // EXPORT _byName

-                  /// Remove a function from the import directory.

-                  int removeFunction(const std::string& strFilename, word wHint); // EXPORT _byHint

-                  /// Returns the size of the current import directory.

-                  unsigned int size() const; // EXPORT

-                  /// Writes the import directory to a file.

-                  int write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva); // EXPORT

-

-                  /// Returns the FirstThunk value of a function.

-                  dword getFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir) const; // EXPORT _byNumber

-                  void setFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir, dword value); // EXPORT _byNumber

-                  /// Returns the OriginalFirstThunk value of a function.

-                  dword getOriginalFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir) const; // EXPORT _byNumber

-                  void setOriginalFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir, dword value); // EXPORT

-

-//                dword getFirstThunk(const std::string& strFilename, const std::string& strFuncname, currdir cdDir) const throw (PeLibException);

-//                dword getOriginalFirstThunk(const std::string& strFilename, const std::string& strFuncname, currdir cdDir) const throw (PeLibException);

-

-                  /// Returns the FirstThunk value of a file.

-                  dword getFirstThunk(const std::string& strFilename, currdir cdDir) const; // EXPORT _byName

-                  /// Returns the OriginalFirstThunk value of a file.

-                  dword getOriginalFirstThunk(const std::string& strFilename, currdir cdDir) const; // EXPORT _byName

-                  /// Returns the ForwarderChain value of a file.

-                  dword getForwarderChain(const std::string& strFilename, currdir cdDir) const; // EXPORT _byName

-                  dword getRvaOfName(const std::string& strFilename, currdir cdDir) const; // EXPORT _byName

-                  /// Returns the TimeDateStamp value of a file.

-                  dword getTimeDateStamp(const std::string& strFilename, currdir cdDir) const; // EXPORT _byName

-

-                  /// Returns the FirstThunk value of a file.

-                  dword getFirstThunk(dword dwFilenr, currdir cdDir) const; // EXPORT

-                  void setFirstThunk(dword dwFilenr, currdir cdDir, dword value); // EXPORT _byNumber_function

-                  /// Returns the OriginalFirstThunk value of a file.

-                  dword getOriginalFirstThunk(dword dwFilenr, currdir cdDir) const; // EXPORT

-                  void setOriginalFirstThunk(dword dwFilenr, currdir cdDir, dword value); // EXPORT _byNumber_function

-                  /// Returns the ForwarderChain value of a file.

-                  dword getForwarderChain(dword dwFilenr, currdir cdDir) const; // EXPORT _byNumber

-                  void setForwarderChain(dword dwFilenr, currdir cdDir, dword value); // EXPORT _byNumber_function

-                  dword getRvaOfName(dword dwFilenr, currdir cdDir) const; // EXPORT _byNumber

-                  void setRvaOfName(dword dwFilenr, currdir cdDir, dword value); // EXPORT

-                  /// Returns the TimeDateStamp value of a file.

-                  dword getTimeDateStamp(dword dwFilenr, currdir cdDir) const; // EXPORT

-                  void setTimeDateStamp(dword dwFilenr, currdir cdDir, dword value); // EXPORT _byNumber

-

-//                word getFunctionHint(const std::string& strFilename, const std::string& strFuncname, currdir cdDir) const throw (PeLibException);

-        };

-

-        /**

-        * Add another import (by Ordinal) to the current file. Note that the import table is not automatically updated.

-        * The new imported functions will be added when you recalculate the import table as it's necessary

-        * to specify the address the import table will have in the file.

-        * @param strFilename The name of a DLL.

-        * @param wHint The ordinal of the function in the DLL.

-        **/

-        template<int bits>

-        int ImportDirectory<bits>::addFunction(const std::string& strFilename, word wHint)

-        {

-                if (hasFunction(strFilename, wHint, &PELIB_THUNK_DATA<bits>::equalHint))

-                {

-                        return ERROR_DUPLICATE_ENTRY;

-                }

-                

-                // Find the imported file.

-                ImpDirFileIterator FileIter = std::find_if(m_vNewiid.begin(), m_vNewiid.end(), std::bind2nd(std::mem_fun_ref(&PELIB_IMAGE_IMPORT_DIRECTORY<bits>::operator==), strFilename));

-

-                PELIB_IMAGE_IMPORT_DIRECTORY<bits> iid;

-                PELIB_THUNK_DATA<bits> td;

-                td.hint = wHint;

-                td.itd.Ordinal = wHint | PELIB_IMAGE_ORDINAL_FLAGS<bits>::IMAGE_ORDINAL_FLAG;

-                iid.name = strFilename;

-                if (FileIter == m_vNewiid.end())

-                {

-                        iid.originalfirstthunk.push_back(td);

-                        iid.firstthunk.push_back(td);

-                        m_vNewiid.push_back(iid);

-                }

-                else

-                {

-                        FileIter->originalfirstthunk.push_back(td);

-                        FileIter->firstthunk.push_back(td);

-                }

-                

-                return NO_ERROR;

-        }

-

-        /**

-        * Add a function to the Import Directory.

-        * @param strFilename Name of the file which will be imported

-        * @param strFuncname Name of the function which will be imported.

-        **/

-        template<int bits>

-        int ImportDirectory<bits>::addFunction(const std::string& strFilename, const std::string& strFuncname)

-        {

-                if (hasFunction(strFilename, strFuncname, &PELIB_THUNK_DATA<bits>::equalFunctionName))

-                {

-                        return ERROR_DUPLICATE_ENTRY;

-                }

-                

-                // Find the imported file.

-                ImpDirFileIterator FileIter = std::find_if(m_vNewiid.begin(), m_vNewiid.end(), std::bind2nd(std::mem_fun_ref(&PELIB_IMAGE_IMPORT_DIRECTORY<bits>::operator==), strFilename));

-

-                PELIB_IMAGE_IMPORT_DIRECTORY<bits> iid;

-                PELIB_THUNK_DATA<bits> td;

-                td.fname = strFuncname;

-                iid.name = strFilename;

-                if (FileIter == m_vNewiid.end())

-                {

-                        iid.originalfirstthunk.push_back(td);

-                        iid.firstthunk.push_back(td);

-                        m_vNewiid.push_back(iid);

-                }

-                else

-                {

-                        FileIter->originalfirstthunk.push_back(td);

-                        FileIter->firstthunk.push_back(td);

-                }

-                

-                return NO_ERROR;

-        }

-

-        /**

-        * Searches through the import directory and returns the number of the import

-        * directory entry which belongs to the given filename.

-        * @param strFilename Name of the imported file.

-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.

-        * @return The ID of an imported file.

-        **/

-        template<int bits>

-        unsigned int ImportDirectory<bits>::getFileIndex(const std::string& strFilename, currdir cdDir) const

-        {

-                const std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> >* currDir;

-                

-                if (cdDir == OLDDIR)

-                {

-                         currDir = &m_vOldiid;

-                }

-                else

-                {

-                         currDir = &m_vNewiid;

-                }

-

-                ConstImpDirFileIterator FileIter = std::find_if(currDir->begin(), currDir->end(), std::bind2nd(std::mem_fun_ref(&PELIB_IMAGE_IMPORT_DIRECTORY<bits>::operator==), strFilename));

-

-                if (FileIter != currDir->end())

-                {

-                        return static_cast<unsigned int>(std::distance(currDir->begin(), FileIter));

-                }

-                else

-                {

-                        return -1;

-                        // throw Exceptions::InvalidName(ImportDirectoryId, __LINE__);

-                }

-

-                return NO_ERROR;

-        }

-

-        /**

-        * Searches through an imported file for a specific function.

-        * @param strFilename Name of the imported file.

-        * @param strFuncname Name of the imported function.

-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.

-        * @return ID of the imported function.

-        **/

-        template<int bits>

-        unsigned int ImportDirectory<bits>::getFunctionIndex(const std::string& strFilename, const std::string& strFuncname, currdir cdDir) const

-        {

-                unsigned int uiFile = getFileIndex(strFilename, cdDir);

-

-                for (unsigned int i=0;i<getNumberOfFunctions(uiFile, cdDir);i++)

-                {

-                        if (getFunctionName(uiFile, i, cdDir) == strFuncname) return i;

-                }

-

-                return -1;

-        }

-

-        /**

-        * Get the name of an imported file.

-        * @param dwFilenr Identifies which file should be checked.

-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.

-        * @return Name of an imported file.

-        **/

-        template<int bits>

-        std::string ImportDirectory<bits>::getFileName(dword dwFilenr, currdir cdDir) const

-        {

-                if (cdDir == OLDDIR) return m_vOldiid[dwFilenr].name;

-                else return m_vNewiid[dwFilenr].name;

-        }

-

-        template<int bits>

-        void ImportDirectory<bits>::setFileName(dword filenr, currdir dir, const std::string& name)

-        {

-                if (dir == OLDDIR) m_vOldiid[filenr].name = name;

-                else m_vNewiid[filenr].name = name;

-        }

-

-        /**

-        * Get the name of an imported function.

-        * @param dwFilenr Identifies which file should be checked.

-        * @param dwFuncnr Identifies which function should be checked.

-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.

-        * @return Name of an imported function.

-        * \todo Marked line is unsafe (function should be rewritten).

-        **/

-        template<int bits>

-        std::string ImportDirectory<bits>::getFunctionName(dword dwFilenr, dword dwFuncnr, currdir cdDir) const

-        {

-                if (cdDir == OLDDIR)

-                {

-                        // Unsafe

-                        if (m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk)

-                        {

-                                return m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].fname;

-                        }

-                        else

-                        {

-                                return m_vOldiid[dwFilenr].firstthunk[dwFuncnr].fname;

-                        }

-                }

-                else

-                {

-                        if (m_vNewiid[dwFilenr].impdesc.OriginalFirstThunk)

-                        {

-                                return m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].fname;

-                        }

-                        else

-                        {

-                                return m_vNewiid[dwFilenr].firstthunk[dwFuncnr].fname;

-                        }

-                }

-        }

-

-        template<int bits>

-        void ImportDirectory<bits>::setFunctionName(dword dwFilenr, dword dwFuncnr, currdir cdDir, const std::string& functionName)

-        {

-                if (cdDir == OLDDIR)

-                {

-                        // Unsafe

-                        if (m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk)

-                        {

-                                m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].fname = functionName;

-                        }

-                        else

-                        {

-                                m_vOldiid[dwFilenr].firstthunk[dwFuncnr].fname = functionName;

-                        }

-                }

-                else

-                {

-                        if (m_vNewiid[dwFilenr].impdesc.OriginalFirstThunk)

-                        {

-                                m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].fname = functionName;

-                        }

-                        else

-                        {

-                                m_vNewiid[dwFilenr].firstthunk[dwFuncnr].fname = functionName;

-                        }

-                }

-        }

-

-        /**

-        * Get the hint of an imported function.

-        * @param dwFilenr Identifies which file should be checked.

-        * @param dwFuncnr Identifies which function should be checked.

-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.

-        * @return Hint of an imported function.

-        **/

-        template<int bits>

-        word ImportDirectory<bits>::getFunctionHint(dword dwFilenr, dword dwFuncnr, currdir cdDir) const

-        {

-                if (cdDir == OLDDIR)

-                {

-                        if (m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk)

-                        {

-                                return m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].hint;

-                        }

-                        else

-                        {

-                                return m_vOldiid[dwFilenr].firstthunk[dwFuncnr].hint;

-                        }

-                }

-                else return m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].hint;

-        }

-

-        template<int bits>

-        void ImportDirectory<bits>::setFunctionHint(dword dwFilenr, dword dwFuncnr, currdir cdDir, word value)

-        {

-                if (cdDir == OLDDIR)

-                {

-                        if (m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk)

-                        {

-                                m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].hint = value;

-                        }

-                        else

-                        {

-                                m_vOldiid[dwFilenr].firstthunk[dwFuncnr].hint = value;

-                        }

-                }

-                else m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].hint = value;

-        }

-

-        /**

-        * Get the number of files which are currently being imported.

-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.

-        * @return Number of files which are currently being imported.

-        **/

-        template<int bits>

-        dword ImportDirectory<bits>::getNumberOfFiles(currdir cdDir) const

-        {

-                if (cdDir == OLDDIR) return static_cast<dword>(m_vOldiid.size());

-                else return static_cast<dword>(m_vNewiid.size());

-        }

-

-        /**

-        * Get the number of functions which are currently being imported from a specific file.

-        * @param dwFilenr Identifies which file should be checked.

-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.

-        * @return Number of functions which are currently being imported from a specific file.

-        **/

-        template<int bits>

-        dword ImportDirectory<bits>::getNumberOfFunctions(dword dwFilenr, currdir cdDir) const

-        {

-                if (cdDir == OLDDIR) return static_cast<unsigned int>(m_vOldiid[dwFilenr].firstthunk.size());

-                else return static_cast<unsigned int>(m_vNewiid[dwFilenr].firstthunk.size());

-        }

-

-        /**

-        * Read an import directory from a file.

-        * \todo Check if streams failed.

-        * @param strFilename Name of the file which will be read.

-        * @param uiOffset Offset of the import directory (see #PeLib::PeHeader::getIDImportRVA).

-        * @param uiSize Size of the import directory (see #PeLib::PeHeader::getIDImportSize).

-        * @param pehHeader A valid PE header.

-        **/

-        template<int bits>

-        int ImportDirectory<bits>::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, const PeHeaderT<bits>& pehHeader)

-        {

-                std::ifstream ifFile(strFilename.c_str(), std::ios_base::binary);

-

-                if (!ifFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-                

-                unsigned int uiFileSize = fileSize(ifFile);

-                

-                if (uiFileSize < uiOffset + uiSize)

-                {

-                        return ERROR_INVALID_FILE;

-                }

-

-                ifFile.seekg(uiOffset, std::ios_base::beg);

-

-                std::vector<unsigned char> vImportdirectory(uiSize);

-                ifFile.read(reinterpret_cast<char*>(&vImportdirectory[0]), uiSize);

-

-                PELIB_IMAGE_IMPORT_DIRECTORY<bits> iidCurr;

-                unsigned int uiDesccounter = 0;

-

-                InputBuffer inpBuffer(vImportdirectory);

-

-                std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> > vOldIidCurr;

-

-                do // Read and store all descriptors

-                {

-                        inpBuffer >> iidCurr.impdesc.OriginalFirstThunk;

-                        inpBuffer >> iidCurr.impdesc.TimeDateStamp;

-                        inpBuffer >> iidCurr.impdesc.ForwarderChain;

-                        inpBuffer >> iidCurr.impdesc.Name;

-                        inpBuffer >> iidCurr.impdesc.FirstThunk;

-

-                        if (iidCurr.impdesc.OriginalFirstThunk != 0 || iidCurr.impdesc.TimeDateStamp != 0 || iidCurr.impdesc.ForwarderChain != 0 ||

-                        iidCurr.impdesc.Name != 0 || iidCurr.impdesc.FirstThunk != 0)

-                        {

-                                vOldIidCurr.push_back(iidCurr);

-                        }

-

-                        uiDesccounter++;

-

-                        if (uiSize < (uiDesccounter + 1) * PELIB_IMAGE_IMPORT_DESCRIPTOR::size()) break;

-                } while (iidCurr.impdesc.OriginalFirstThunk != 0 || iidCurr.impdesc.TimeDateStamp != 0 || iidCurr.impdesc.ForwarderChain != 0 ||

-                                iidCurr.impdesc.Name != 0 || iidCurr.impdesc.FirstThunk != 0);

-

-                char namebuffer[2] = {0};

-                        

-                // Name

-                for (unsigned int i=0;i<vOldIidCurr.size();i++)

-                {

-                        ifFile.seekg(static_cast<unsigned int>(pehHeader.rvaToOffset(vOldIidCurr[i].impdesc.Name)), std::ios_base::beg);

-

-                        std::string dllname = "";

-                        

-                        do

-                        {

-                                ifFile.read(namebuffer, 1);

-                                if (!ifFile || !namebuffer[0]) break; // reached end of file or 0-byte

-                                dllname += namebuffer;

-                        } while (true);

-                        

-                        vOldIidCurr[i].name = dllname;

-                        

-                }

-                

-                // OriginalFirstThunk

-                for (unsigned int i=0;i<vOldIidCurr.size();i++)

-                {

-                        PELIB_THUNK_DATA<bits> tdCurr;

-                        dword uiVaoft = vOldIidCurr[i].impdesc.OriginalFirstThunk;

-

-                        if (!uiVaoft)

-                        {

-                                continue;

-                        }

-

-                        ifFile.seekg(static_cast<unsigned int>(pehHeader.rvaToOffset(uiVaoft)), std::ios_base::beg);

-

-                        do

-                        {

-                                if (uiFileSize < pehHeader.rvaToOffset(uiVaoft) + sizeof(tdCurr.itd.Ordinal))

-                                {

-                                        return ERROR_INVALID_FILE;

-                                }

-                                uiVaoft += sizeof(tdCurr.itd.Ordinal);

-                                

-                                ifFile.read(reinterpret_cast<char*>(&tdCurr.itd.Ordinal), sizeof(tdCurr.itd.Ordinal));

-                                if (tdCurr.itd.Ordinal) vOldIidCurr[i].originalfirstthunk.push_back(tdCurr);

-                        } while (tdCurr.itd.Ordinal);

-                }

-

-                // FirstThunk

-                for (unsigned int i=0;i<vOldIidCurr.size();i++)

-                {

-                        dword uiVaoft = vOldIidCurr[i].impdesc.FirstThunk;

-                        PELIB_THUNK_DATA<bits> tdCurr;

-

-                        ifFile.seekg(static_cast<unsigned int>(pehHeader.rvaToOffset(uiVaoft)), std::ios_base::beg);

-

-                        do

-                        {

-                                if (uiFileSize < pehHeader.rvaToOffset(uiVaoft) + sizeof(tdCurr.itd.Ordinal))

-                                {

-                                        return ERROR_INVALID_FILE;

-                                }

-                                

-                                uiVaoft += sizeof(tdCurr.itd.Ordinal);

-                                

-                                ifFile.read(reinterpret_cast<char*>(&tdCurr.itd.Ordinal), sizeof(tdCurr.itd.Ordinal));

-                                if (tdCurr.itd.Ordinal) vOldIidCurr[i].firstthunk.push_back(tdCurr);

-                        } while (tdCurr.itd.Ordinal);

-                }

-

-                // Names

-                for (unsigned int i=0;i<vOldIidCurr.size();i++)

-                {

-                        if (vOldIidCurr[i].impdesc.OriginalFirstThunk)

-                        {

-                                for (unsigned int j=0;j<vOldIidCurr[i].originalfirstthunk.size();j++)

-                                {

-                                        if (vOldIidCurr[i].originalfirstthunk[j].itd.Ordinal & PELIB_IMAGE_ORDINAL_FLAGS<bits>::IMAGE_ORDINAL_FLAG)

-                                        {

-                                                vOldIidCurr[i].originalfirstthunk[j].hint = 0;

-                                                continue;

-                                        }

-

-                                        ifFile.seekg(static_cast<unsigned int>(pehHeader.rvaToOffset(vOldIidCurr[i].originalfirstthunk[j].itd.Ordinal)), std::ios_base::beg);

-

-                                        ifFile.read(reinterpret_cast<char*>(&vOldIidCurr[i].originalfirstthunk[j].hint), sizeof(vOldIidCurr[i].originalfirstthunk[j].hint));

-                                        

-                                        if (!ifFile)

-                                                return ERROR_INVALID_FILE;

-

-                                        std::string funcname = "";

-                                        do

-                                        {

-                                                ifFile.read(namebuffer, 1);

-                                                if (!ifFile || !namebuffer[0]) break; // reached end of file or 0-byte

-                                                funcname += namebuffer;

-                                        } while (true);

-                        

-                                        vOldIidCurr[i].originalfirstthunk[j].fname = funcname;

-                                }

-                        }

-                        else

-                        {

-                                for (unsigned int j=0;j<vOldIidCurr[i].firstthunk.size();j++)

-                                {

-                                        if (vOldIidCurr[i].firstthunk[j].itd.Ordinal & PELIB_IMAGE_ORDINAL_FLAGS<bits>::IMAGE_ORDINAL_FLAG)

-                                        {

-                                                continue;

-                                        }

-

-                                        ifFile.seekg(static_cast<unsigned int>(pehHeader.rvaToOffset(vOldIidCurr[i].firstthunk[j].itd.Ordinal)), std::ios_base::beg);

-

-                                        ifFile.read(reinterpret_cast<char*>(&vOldIidCurr[i].firstthunk[j].hint), sizeof(vOldIidCurr[i].firstthunk[j].hint));

-                                        

-                                        if (!ifFile)

-                                                return ERROR_INVALID_FILE;

-

-                                        std::string funcname = "";

-                                        do

-                                        {

-                                                ifFile.read(namebuffer, 1);

-                                                if (!ifFile || !namebuffer[0]) break; // reached end of file or 0-byte

-                                                funcname += namebuffer;

-                                        } while (true);

-                        

-                                        vOldIidCurr[i].firstthunk[j].fname = funcname;

-                                }

-                        }

-                }

-                std::swap(vOldIidCurr, m_vOldiid);

-                return NO_ERROR;

-        }

-

-        /**

-        * Rebuilds the import directory.

-        * @param vBuffer Buffer the rebuilt import directory will be written to.

-        * @param dwRva The RVA of the ImportDirectory in the file.

-        * \todo uiSizeoffuncnames is not used.

-        **/

-        template<int bits>

-        void ImportDirectory<bits>::rebuild(std::vector<byte>& vBuffer, dword dwRva, bool fixEntries) const

-        {

-                unsigned int uiImprva = dwRva;

-                unsigned int uiSizeofdescriptors = (static_cast<unsigned int>(m_vNewiid.size() + m_vOldiid.size()) + 1) * PELIB_IMAGE_IMPORT_DESCRIPTOR::size();

-                

-                unsigned int uiSizeofdllnames = 0, uiSizeoffuncnames = 0;

-                unsigned int uiSizeofoft = 0;

-

-                for (unsigned int i=0;i<m_vNewiid.size();i++)

-                {

-                        uiSizeofdllnames += static_cast<unsigned int>(m_vNewiid[i].name.size()) + 1;

-                        uiSizeofoft += (static_cast<unsigned int>(m_vNewiid[i].originalfirstthunk.size())+1) * PELIB_IMAGE_THUNK_DATA<bits>::size();

-

-                        for(unsigned int j=0;j<m_vNewiid[i].originalfirstthunk.size();j++)

-                        {

-                                // +3 for hint (word) and 00-byte

-                                uiSizeoffuncnames += (static_cast<unsigned int>(m_vNewiid[i].originalfirstthunk[j].fname.size()) + 3);

-                        }

-                }

-

-//              for (unsigned int i=0;i<m_vNewiid.size();i++)

-//              {

-//                      uiSizeofoft += (static_cast<unsigned int>(m_vNewiid[i].originalfirstthunk.size())+1) * PELIB_IMAGE_THUNK_DATA<bits>::size();

-//              }

-                

-                OutputBuffer obBuffer(vBuffer);

-

-                // Rebuild IMAGE_IMPORT_DESCRIPTORS

-                for (unsigned int i=0;i<m_vOldiid.size();i++)

-                {

-                        obBuffer << m_vOldiid[i].impdesc.OriginalFirstThunk;

-                        obBuffer << m_vOldiid[i].impdesc.TimeDateStamp;

-                        obBuffer << m_vOldiid[i].impdesc.ForwarderChain;

-                        obBuffer << m_vOldiid[i].impdesc.Name;

-                        obBuffer << m_vOldiid[i].impdesc.FirstThunk;

-                }

-

-                unsigned int dllsize = 0;

-

-                for (unsigned int i=0;i<m_vNewiid.size();i++)

-                {

-                        dword dwPoft = uiSizeofdescriptors + uiImprva;

-

-                        for (unsigned int j=1;j<=i;j++)

-                        {

-                                dwPoft += (static_cast<unsigned int>(m_vNewiid[j-1].originalfirstthunk.size()) + 1) * PELIB_IMAGE_THUNK_DATA<bits>::size();

-                        }

-

-                        obBuffer << (fixEntries ? dwPoft : m_vNewiid[i].impdesc.OriginalFirstThunk);

-                        obBuffer << m_vNewiid[i].impdesc.TimeDateStamp;

-                        obBuffer << m_vNewiid[i].impdesc.ForwarderChain;

-                        dword dwPdll = uiSizeofdescriptors + uiSizeofoft + uiImprva + dllsize;

-                        obBuffer << (fixEntries ? dwPdll : m_vNewiid[i].impdesc.Name);

-                        obBuffer << (fixEntries ? dwPoft : m_vNewiid[i].impdesc.FirstThunk);

-

-                        dllsize += static_cast<unsigned int>(m_vNewiid[i].name.size()) + 1;

-                }

-

-                obBuffer << (dword)0;

-                obBuffer << (dword)0;

-                obBuffer << (dword)0;

-                obBuffer << (dword)0;

-                obBuffer << (dword)0;

-

-                unsigned int uiPfunc = uiSizeofdescriptors + uiSizeofoft + uiSizeofdllnames + uiImprva;

-

-                // Rebuild original first thunk

-                for (unsigned int i=0;i<m_vNewiid.size();i++)

-                {

-                        for (unsigned int j=0;j<m_vNewiid[i].originalfirstthunk.size();j++)

-                        {

-                                if (m_vNewiid[i].originalfirstthunk[j].itd.Ordinal & PELIB_IMAGE_ORDINAL_FLAGS<bits>::IMAGE_ORDINAL_FLAG

-                                        || fixEntries == false)

-                                {

-                                        obBuffer << m_vNewiid[i].originalfirstthunk[j].itd.Ordinal;

-                                }

-                                else

-                                {

-                                        obBuffer << uiPfunc;

-                                }

-                                uiPfunc += static_cast<unsigned int>(m_vNewiid[i].originalfirstthunk[j].fname.size()) + 3;

-                        }

-                        obBuffer << (dword)0;

-                }

-

-                // Write dllnames into import directory

-                for (unsigned int i=0;i<m_vNewiid.size();i++)

-                {

-                        obBuffer.add(m_vNewiid[i].name.c_str(), static_cast<unsigned int>(m_vNewiid[i].name.size())+1);

-                }

-

-                // Write function names into directory

-                for (unsigned int i=0;i<m_vNewiid.size();i++)

-                {

-                        for (unsigned int j=0;j<m_vNewiid[i].originalfirstthunk.size();j++)

-                        {

-                                obBuffer << m_vNewiid[i].originalfirstthunk[j].hint;

-                                obBuffer.add(m_vNewiid[i].originalfirstthunk[j].fname.c_str(), static_cast<unsigned int>(m_vNewiid[i].originalfirstthunk[j].fname.size()) + 1);

-                        }

-                }

-        }

-

-        /**

-        * Removes a specific file and all functions of it from the import directory.

-        * @param strFilename Name of the file which will be removed.

-        **/

-        template<int bits>

-        int ImportDirectory<bits>::removeFile(const std::string& strFilename)

-        {

-                unsigned int oldSize = static_cast<unsigned int>(m_vNewiid.size());

-

-                m_vNewiid.erase(std::remove_if(m_vNewiid.begin(), m_vNewiid.end(), std::bind2nd(std::mem_fun_ref(&PELIB_IMAGE_IMPORT_DIRECTORY<bits>::operator==), strFilename)), m_vNewiid.end());

-                

-                return oldSize == m_vNewiid.size() ? 1 : 0;

-        }

-

-        /**

-        * Removes a specific function from the import directory.

-        * @param strFilename Name of the file which exports the function.

-        * @param strFuncname Name of the imported function.

-        **/

-        template<int bits>

-        int ImportDirectory<bits>::removeFunction(const std::string& strFilename, const std::string& strFuncname)

-        {

-                ImpDirFileIterator viPos = m_vNewiid.begin();

-

-                int notFound = 1;

-

-                while (viPos != m_vNewiid.end())

-                {

-                        if (isEqualNc(viPos->name, strFilename))

-                        {

-                                unsigned int oldSize = static_cast<unsigned int>(viPos->originalfirstthunk.size());

-                                viPos->originalfirstthunk.erase(std::remove_if(viPos->originalfirstthunk.begin(), viPos->originalfirstthunk.end(), std::bind2nd(std::mem_fun_ref(&PELIB_THUNK_DATA<bits>::equalFunctionName), strFuncname)), viPos->originalfirstthunk.end());

-                                //viPos->originalfirstthunk.erase(std::remove_if(viPos->originalfirstthunk.begin(), viPos->originalfirstthunk.end(), std::bind2nd(CompPolicy<PELIB_THUNK_DATA, std::string>(), strFuncname)));

-                                if (viPos->originalfirstthunk.size() != oldSize) notFound = 0;

-                        }

-                        ++viPos;

-                }

-                

-                return notFound;

-        }

-

-        /**

-        * Removes a specific function from the import directory.

-        * @param strFilename Name of the file which exports the function.

-        * @param wHint The hint of the function.

-        **/

-        template<int bits>

-        int ImportDirectory<bits>::removeFunction(const std::string& strFilename, word wHint)

-        {

-                ImpDirFileIterator viPos = m_vNewiid.begin();

-                int notFound = 1;

-

-                while (viPos != m_vNewiid.end())

-                {

-                        if (isEqualNc(viPos->name, strFilename))

-                        {

-                                unsigned int oldSize = static_cast<unsigned int>(viPos->originalfirstthunk.size());

-                                viPos->originalfirstthunk.erase(std::remove_if(viPos->originalfirstthunk.begin(), viPos->originalfirstthunk.end(), std::bind2nd(std::mem_fun_ref(&PELIB_THUNK_DATA<bits>::equalHint), wHint)), viPos->originalfirstthunk.end());

-                                unsigned int newPos = static_cast<unsigned int>(viPos->originalfirstthunk.size());

-                                if (viPos->originalfirstthunk.size() != oldSize) notFound = 0;

-                        }

-                        ++viPos;

-                }

-                

-                return notFound;

-        }

-

-        /**

-        * Writes the current import directory to a file.

-        * @param strFilename Name of the file.

-        * @param uiOffset File Offset of the new import directory.

-        * @param uiRva RVA which belongs to that file offset.

-        **/

-        template<int bits>

-        int ImportDirectory<bits>::write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva)

-        {

-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);

-                

-                if (!ofFile)

-                {

-                        ofFile.clear();

-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);

-                }

-                else

-                {

-                        ofFile.close();

-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);

-                }

-                

-                if (!ofFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-

-                ofFile.seekp(uiOffset, std::ios_base::beg);

-

-                std::vector<byte> vBuffer;

-

-                rebuild(vBuffer, uiRva);

-

-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), vBuffer.size());

-                ofFile.close();

-

-                std::copy(m_vNewiid.begin(), m_vNewiid.end(), std::back_inserter(m_vOldiid));

-                m_vNewiid.clear();

-                

-                return NO_ERROR;

-        }

-

-        /**

-        * Returns the size of the import directory.

-        * @return Size of the import directory.

-        **/

-        template<int bits>

-        unsigned int ImportDirectory<bits>::size() const

-        {

-                // Only the descriptors of m_vOldiid must be rebuilt, not the data they point to.

-                return std::accumulate(m_vNewiid.begin(), m_vNewiid.end(), 0, accumulate<PELIB_IMAGE_IMPORT_DIRECTORY<bits> >)

-                + (m_vOldiid.size() + 1) * PELIB_IMAGE_IMPORT_DESCRIPTOR::size();

-        }

-

-        /**

-        * @param strFilename Name of the imported file.

-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.

-        * @return FirstThunk value of an imported file.

-        **/

-        template<int bits>

-        dword ImportDirectory<bits>::getFirstThunk(const std::string& strFilename, currdir cdDir) const

-        {

-                if (cdDir == OLDDIR)

-                {

-                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.FirstThunk;

-                }

-                else

-                {

-                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.FirstThunk;

-                }

-        }

-

-        /**

-        * @param strFilename Name of the imported file.

-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.

-        * @return OriginalFirstThunk value of an imported file.

-        **/

-        template<int bits>

-        dword ImportDirectory<bits>::getOriginalFirstThunk(const std::string& strFilename, currdir cdDir) const

-        {

-                if (cdDir == OLDDIR)

-                {

-                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.OriginalFirstThunk;

-                }

-                else

-                {

-                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.OriginalFirstThunk;

-                }

-        }

-

-        /**

-        * @param strFilename Name of the imported file.

-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.

-        * @return ForwarderChain value of an imported file.

-        **/

-        template<int bits>

-        dword ImportDirectory<bits>::getForwarderChain(const std::string& strFilename, currdir cdDir) const

-        {

-                if (cdDir == OLDDIR)

-                {

-                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.ForwarderChain;

-                }

-                else

-                {

-                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.ForwarderChain;

-                }

-        }

-

-        /**

-        * @param strFilename Name of the imported file.

-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.

-        * @return TimeDateStamp value of an imported file.

-        **/

-        template<int bits>

-        dword ImportDirectory<bits>::getTimeDateStamp(const std::string& strFilename, currdir cdDir) const

-        {

-                if (cdDir == OLDDIR)

-                {

-                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.TimeDateStamp;

-                }

-                else

-                {

-                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.TimeDateStamp;

-                }

-        }

-

-        template<int bits>

-        dword ImportDirectory<bits>::getRvaOfName(const std::string& strFilename, currdir cdDir) const

-        {

-                if (cdDir == OLDDIR)

-                {

-                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.Name;

-                }

-                else

-                {

-                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.Name;

-                }

-        }

-

-        /**

-        * @param strFilename Name of the imported file.

-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.

-        * @return FirstThunk value of an imported file.

-        **/

-        template<int bits>

-        dword ImportDirectory<bits>::getFirstThunk(dword dwFilenr, currdir cdDir) const

-        {

-                if (cdDir == OLDDIR)

-                {

-                        return m_vOldiid[dwFilenr].impdesc.FirstThunk;

-                }

-                else

-                {

-                        return m_vNewiid[dwFilenr].impdesc.FirstThunk;

-                }

-        }

-

-        template<int bits>

-        void ImportDirectory<bits>::setFirstThunk(dword dwFilenr, currdir cdDir, dword value)

-        {

-                if (cdDir == OLDDIR)

-                {

-                        m_vOldiid[dwFilenr].impdesc.FirstThunk = value;

-                }

-                else

-                {

-                        m_vNewiid[dwFilenr].impdesc.FirstThunk = value;

-                }

-        }

-

-        /**

-        * @param strFilename Name of the imported file.

-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.

-        * @return OriginalFirstThunk value of an imported file.

-        **/

-        template<int bits>

-        dword ImportDirectory<bits>::getOriginalFirstThunk(dword dwFilenr, currdir cdDir) const

-        {

-                if (cdDir == OLDDIR)

-                {

-                        return m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk;

-                }

-                else

-                {

-                        return m_vNewiid[dwFilenr].impdesc.OriginalFirstThunk;

-                }

-        }

-

-        template<int bits>

-        void ImportDirectory<bits>::setOriginalFirstThunk(dword dwFilenr, currdir cdDir, dword value)

-        {

-                if (cdDir == OLDDIR)

-                {

-                        m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk = value;

-                }

-                else

-                {

-                        m_vNewiid[dwFilenr].impdesc.OriginalFirstThunk = value;

-                }

-        }

-

-        /**

-        * @param strFilename Name of the imported file.

-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.

-        * @return ForwarderChain value of an imported file.

-        **/

-        template<int bits>

-        dword ImportDirectory<bits>::getForwarderChain(dword dwFilenr, currdir cdDir) const

-        {

-                if (cdDir == OLDDIR)

-                {

-                        return m_vOldiid[dwFilenr].impdesc.ForwarderChain;

-                }

-                else

-                {

-                        return m_vNewiid[dwFilenr].impdesc.ForwarderChain;

-                }

-        }

-

-        template<int bits>

-        void ImportDirectory<bits>::setForwarderChain(dword dwFilenr, currdir cdDir, dword value)

-        {

-                if (cdDir == OLDDIR)

-                {

-                        m_vOldiid[dwFilenr].impdesc.ForwarderChain = value;

-                }

-                else

-                {

-                        m_vNewiid[dwFilenr].impdesc.ForwarderChain = value;

-                }

-        }

-

-        /**

-        * @param strFilename Name of the imported file.

-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.

-        * @return TimeDateStamp value of an imported file.

-        **/

-        template<int bits>

-        dword ImportDirectory<bits>::getTimeDateStamp(dword dwFilenr, currdir cdDir) const

-        {

-                if (cdDir == OLDDIR)

-                {

-                        return m_vOldiid[dwFilenr].impdesc.TimeDateStamp;

-                }

-                else

-                {

-                        return m_vNewiid[dwFilenr].impdesc.TimeDateStamp;

-                }

-        }

-

-        template<int bits>

-        void ImportDirectory<bits>::setTimeDateStamp(dword dwFilenr, currdir cdDir, dword value)

-        {

-                if (cdDir == OLDDIR)

-                {

-                        m_vOldiid[dwFilenr].impdesc.TimeDateStamp = value;

-                }

-                else

-                {

-                        m_vNewiid[dwFilenr].impdesc.TimeDateStamp = value;

-                }

-        }

-

-        template<int bits>

-        dword ImportDirectory<bits>::getRvaOfName(dword dwFilenr, currdir cdDir) const

-        {

-                if (cdDir == OLDDIR)

-                {

-                        return m_vOldiid[dwFilenr].impdesc.Name;

-                }

-                else

-                {

-                        return m_vNewiid[dwFilenr].impdesc.Name;

-                }

-        }

-

-        template<int bits>

-        void ImportDirectory<bits>::setRvaOfName(dword dwFilenr, currdir cdDir, dword value)

-        {

-                if (cdDir == OLDDIR)

-                {

-                        m_vOldiid[dwFilenr].impdesc.Name = value;

-                }

-                else

-                {

-                        m_vNewiid[dwFilenr].impdesc.Name = value;

-                }

-        }

-

-        /**

-        * @param dwFilenr ID of the imported file.

-        * @param dwFuncnr ID of the imported function.

-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.

-        * @return FirstThunk value of an imported function.

-        **/

-        template<int bits>

-        dword ImportDirectory<bits>::getFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir) const

-        {

-                if (cdDir == OLDDIR) return m_vOldiid[dwFilenr].firstthunk[dwFuncnr].itd.Ordinal;

-                else return m_vNewiid[dwFilenr].firstthunk[dwFuncnr].itd.Ordinal;

-        }

-        

-        template<int bits>

-        void ImportDirectory<bits>::setFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir, dword value)

-        {

-                if (cdDir == OLDDIR) m_vOldiid[dwFilenr].firstthunk[dwFuncnr].itd.Ordinal = value;

-                else m_vNewiid[dwFilenr].firstthunk[dwFuncnr].itd.Ordinal = value;

-        }

-        

-        /**

-        * @param dwFilenr ID of the imported file.

-        * @param dwFuncnr ID of the imported function.

-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.

-        * @return OriginalFirstThunk value of an imported function.

-        **/

-        template<int bits>

-        dword ImportDirectory<bits>::getOriginalFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir) const

-        {

-                if (cdDir == OLDDIR) return m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].itd.Ordinal;

-                else return m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].itd.Ordinal;

-        }

-

-        template<int bits>

-        void ImportDirectory<bits>::setOriginalFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir, dword value)

-        {

-                if (cdDir == OLDDIR) m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].itd.Ordinal = value;

-                else m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].itd.Ordinal = value;

-        }

-

-        typedef ImportDirectory<32> ImportDirectory32;

-        typedef ImportDirectory<64> ImportDirectory64;

-}

-

-#endif

+/*
+* ImportDirectory.h - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#ifndef IMPORTDIRECTORY_H
+#define IMPORTDIRECTORY_H
+
+#include "PeLibAux.h"
+#include "PeHeader.h"
+
+namespace PeLib
+{
+        /// Parameter for functions that can operate on the OLDDIR or new import directory.
+        enum currdir {OLDDIR = 1, NEWDIR};
+                
+        class PeLibException;
+
+        /// Class that handles import directories.
+        /**
+        * This class can read import directories from existing PE files or start completely from scratch.
+        * Modifying import directories and writing them to files is also possible.
+        * It's worthy to note that many functions require an extra parameter of type currdir
+        * because the structure of import directories make it necessary that the OLDDIR import directory
+        * must be preserved. That's why some functions (like adding and removing) imported functions
+        * only exist for the new import directory, not for the one which is already written to the file.
+        * \todo Adding functions by ordinal doesn't work yet (rebuild needs to be changed).
+        * \todo Somehow store the rvas of the chunks in the file.
+        **/
+        template<int bits>
+        class ImportDirectory
+        {
+                typedef typename std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> >::iterator ImpDirFileIterator;
+                typedef typename std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> >::const_iterator ConstImpDirFileIterator;
+        
+                private:
+                  /// Stores information about already imported DLLs.
+                  std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> > m_vOldiid;
+                  /// Stores information about imported DLLs which will be added.
+                  std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> > m_vNewiid;
+
+                // I can't convince Borland C++ to compile the function outside of the class declaration.
+                // That's why the function definition is here.
+                /// Tests if a certain function is imported.
+                template<typename T> bool hasFunction(std::string strFilename, T value, bool(PELIB_THUNK_DATA<bits>::* comp)(T) const) const
+            {
+                        ConstImpDirFileIterator FileIter = m_vOldiid.begin();
+                        ConstImpDirFileIterator EndIter = m_vOldiid.end();
+                        
+                        for (int i=0;i<=1;i++) // Loop once for m_vOldiid and once for m_vNewiid
+                        {
+                                do
+                                {
+                                        FileIter = std::find_if(FileIter, EndIter, std::bind2nd(std::mem_fun_ref(&PELIB_IMAGE_IMPORT_DIRECTORY<bits>::operator==), strFilename));
+                                        
+                                        if (FileIter != EndIter)
+                                        {
+                                                typename std::vector<PELIB_THUNK_DATA<bits> >::const_iterator Iter = std::find_if(FileIter->originalfirstthunk.begin(), FileIter->originalfirstthunk.end(), std::bind2nd(std::mem_fun_ref(comp), value));
+                                                if (Iter != FileIter->originalfirstthunk.end())
+                                                {
+                                                        return true;
+                                                }
+                                                ++FileIter;
+                                        }
+                                }
+                                while (FileIter != EndIter);
+                                
+                                FileIter = m_vNewiid.begin();
+                                EndIter = m_vNewiid.end();
+                        }
+                        
+                        return false;
+                }
+        
+
+                public:
+
+                  /// Add a function to the import directory.
+                  int addFunction(const std::string& strFilename, word wHint); // EXPORT _byHint
+                  /// Add a function to the import directory.
+                  int addFunction(const std::string& strFilename, const std::string& strFuncname); // EXPORT _byName
+
+                  /// Get the ID of a file through it's name.
+                  unsigned int getFileIndex(const std::string& strFilename, currdir cdDir) const; // EXPORT
+                  /// Get the ID of a function through it's name.
+                  unsigned int getFunctionIndex(const std::string& strFilename, const std::string& strFuncname, currdir cdDir) const; // EXPORT
+
+                  /// Get the name of an imported file.
+                  std::string getFileName(dword dwFilenr, currdir cdDir) const; // EXPORT
+                  
+                  void setFileName(dword filenr, currdir dir, const std::string& name); // EXPORT
+                  
+                  /// Get the hint of an imported function.
+                  word getFunctionHint(dword dwFilenr, dword dwFuncnr, currdir cdDir) const; // EXPORT
+                  void setFunctionHint(dword dwFilenr, dword dwFuncnr, currdir cdDir, word value); // EXPORT
+                  /// Get the name of an imported function.
+                  std::string getFunctionName(dword dwFilenr, dword dwFuncnr, currdir cdDir) const; // EXPORT
+                  void setFunctionName(dword dwFilenr, dword dwFuncnr, currdir cdDir, const std::string& functionName); // EXPORT
+                  /// Get the number of files which are imported.
+                  dword getNumberOfFiles(currdir cdDir) const; // EXPORT
+                  /// Get the number of fucntions which are imported by a specific file.
+                  dword getNumberOfFunctions(dword dwFilenr, currdir cdDir) const; // EXPORT
+                  /// Read a file's import directory.
+                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, const PeHeaderT<bits>& pehHeader); // EXPORT
+                  /// Rebuild the import directory.
+                  void rebuild(std::vector<byte>& vBuffer, dword dwRva, bool fixEntries = true) const; // EXPORT
+                  /// Remove a file from the import directory.
+                  int removeFile(const std::string& strFilename); // EXPORT
+                  /// Remove a function from the import directory.
+                  int removeFunction(const std::string& strFilename, const std::string& strFuncname); // EXPORT _byName
+                  /// Remove a function from the import directory.
+                  int removeFunction(const std::string& strFilename, word wHint); // EXPORT _byHint
+                  /// Returns the size of the current import directory.
+                  unsigned int size() const; // EXPORT
+                  /// Writes the import directory to a file.
+                  int write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva); // EXPORT
+
+                  /// Returns the FirstThunk value of a function.
+                  dword getFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir) const; // EXPORT _byNumber
+                  void setFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir, dword value); // EXPORT _byNumber
+                  /// Returns the OriginalFirstThunk value of a function.
+                  dword getOriginalFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir) const; // EXPORT _byNumber
+                  void setOriginalFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir, dword value); // EXPORT
+
+//                dword getFirstThunk(const std::string& strFilename, const std::string& strFuncname, currdir cdDir) const throw (PeLibException);
+//                dword getOriginalFirstThunk(const std::string& strFilename, const std::string& strFuncname, currdir cdDir) const throw (PeLibException);
+
+                  /// Returns the FirstThunk value of a file.
+                  dword getFirstThunk(const std::string& strFilename, currdir cdDir) const; // EXPORT _byName
+                  /// Returns the OriginalFirstThunk value of a file.
+                  dword getOriginalFirstThunk(const std::string& strFilename, currdir cdDir) const; // EXPORT _byName
+                  /// Returns the ForwarderChain value of a file.
+                  dword getForwarderChain(const std::string& strFilename, currdir cdDir) const; // EXPORT _byName
+                  dword getRvaOfName(const std::string& strFilename, currdir cdDir) const; // EXPORT _byName
+                  /// Returns the TimeDateStamp value of a file.
+                  dword getTimeDateStamp(const std::string& strFilename, currdir cdDir) const; // EXPORT _byName
+
+                  /// Returns the FirstThunk value of a file.
+                  dword getFirstThunk(dword dwFilenr, currdir cdDir) const; // EXPORT
+                  void setFirstThunk(dword dwFilenr, currdir cdDir, dword value); // EXPORT _byNumber_function
+                  /// Returns the OriginalFirstThunk value of a file.
+                  dword getOriginalFirstThunk(dword dwFilenr, currdir cdDir) const; // EXPORT
+                  void setOriginalFirstThunk(dword dwFilenr, currdir cdDir, dword value); // EXPORT _byNumber_function
+                  /// Returns the ForwarderChain value of a file.
+                  dword getForwarderChain(dword dwFilenr, currdir cdDir) const; // EXPORT _byNumber
+                  void setForwarderChain(dword dwFilenr, currdir cdDir, dword value); // EXPORT _byNumber_function
+                  dword getRvaOfName(dword dwFilenr, currdir cdDir) const; // EXPORT _byNumber
+                  void setRvaOfName(dword dwFilenr, currdir cdDir, dword value); // EXPORT
+                  /// Returns the TimeDateStamp value of a file.
+                  dword getTimeDateStamp(dword dwFilenr, currdir cdDir) const; // EXPORT
+                  void setTimeDateStamp(dword dwFilenr, currdir cdDir, dword value); // EXPORT _byNumber
+
+//                word getFunctionHint(const std::string& strFilename, const std::string& strFuncname, currdir cdDir) const throw (PeLibException);
+        };
+
+        /**
+        * Add another import (by Ordinal) to the current file. Note that the import table is not automatically updated.
+        * The new imported functions will be added when you recalculate the import table as it's necessary
+        * to specify the address the import table will have in the file.
+        * @param strFilename The name of a DLL.
+        * @param wHint The ordinal of the function in the DLL.
+        **/
+        template<int bits>
+        int ImportDirectory<bits>::addFunction(const std::string& strFilename, word wHint)
+        {
+                if (hasFunction(strFilename, wHint, &PELIB_THUNK_DATA<bits>::equalHint))
+                {
+                        return ERROR_DUPLICATE_ENTRY;
+                }
+                
+                // Find the imported file.
+                ImpDirFileIterator FileIter = std::find_if(m_vNewiid.begin(), m_vNewiid.end(), std::bind2nd(std::mem_fun_ref(&PELIB_IMAGE_IMPORT_DIRECTORY<bits>::operator==), strFilename));
+
+                PELIB_IMAGE_IMPORT_DIRECTORY<bits> iid;
+                PELIB_THUNK_DATA<bits> td;
+                td.hint = wHint;
+                td.itd.Ordinal = wHint | PELIB_IMAGE_ORDINAL_FLAGS<bits>::IMAGE_ORDINAL_FLAG;
+                iid.name = strFilename;
+                if (FileIter == m_vNewiid.end())
+                {
+                        iid.originalfirstthunk.push_back(td);
+                        iid.firstthunk.push_back(td);
+                        m_vNewiid.push_back(iid);
+                }
+                else
+                {
+                        FileIter->originalfirstthunk.push_back(td);
+                        FileIter->firstthunk.push_back(td);
+                }
+                
+                return NO_ERROR;
+        }
+
+        /**
+        * Add a function to the Import Directory.
+        * @param strFilename Name of the file which will be imported
+        * @param strFuncname Name of the function which will be imported.
+        **/
+        template<int bits>
+        int ImportDirectory<bits>::addFunction(const std::string& strFilename, const std::string& strFuncname)
+        {
+                if (hasFunction(strFilename, strFuncname, &PELIB_THUNK_DATA<bits>::equalFunctionName))
+                {
+                        return ERROR_DUPLICATE_ENTRY;
+                }
+                
+                // Find the imported file.
+                ImpDirFileIterator FileIter = std::find_if(m_vNewiid.begin(), m_vNewiid.end(), std::bind2nd(std::mem_fun_ref(&PELIB_IMAGE_IMPORT_DIRECTORY<bits>::operator==), strFilename));
+
+                PELIB_IMAGE_IMPORT_DIRECTORY<bits> iid;
+                PELIB_THUNK_DATA<bits> td;
+                td.fname = strFuncname;
+                iid.name = strFilename;
+                if (FileIter == m_vNewiid.end())
+                {
+                        iid.originalfirstthunk.push_back(td);
+                        iid.firstthunk.push_back(td);
+                        m_vNewiid.push_back(iid);
+                }
+                else
+                {
+                        FileIter->originalfirstthunk.push_back(td);
+                        FileIter->firstthunk.push_back(td);
+                }
+                
+                return NO_ERROR;
+        }
+
+        /**
+        * Searches through the import directory and returns the number of the import
+        * directory entry which belongs to the given filename.
+        * @param strFilename Name of the imported file.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @return The ID of an imported file.
+        **/
+        template<int bits>
+        unsigned int ImportDirectory<bits>::getFileIndex(const std::string& strFilename, currdir cdDir) const
+        {
+                const std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> >* currDir;
+                
+                if (cdDir == OLDDIR)
+                {
+                         currDir = &m_vOldiid;
+                }
+                else
+                {
+                         currDir = &m_vNewiid;
+                }
+
+                ConstImpDirFileIterator FileIter = std::find_if(currDir->begin(), currDir->end(), std::bind2nd(std::mem_fun_ref(&PELIB_IMAGE_IMPORT_DIRECTORY<bits>::operator==), strFilename));
+
+                if (FileIter != currDir->end())
+                {
+                        return static_cast<unsigned int>(std::distance(currDir->begin(), FileIter));
+                }
+                else
+                {
+                        return -1;
+                        // throw Exceptions::InvalidName(ImportDirectoryId, __LINE__);
+                }
+
+                return NO_ERROR;
+        }
+
+        /**
+        * Searches through an imported file for a specific function.
+        * @param strFilename Name of the imported file.
+        * @param strFuncname Name of the imported function.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @return ID of the imported function.
+        **/
+        template<int bits>
+        unsigned int ImportDirectory<bits>::getFunctionIndex(const std::string& strFilename, const std::string& strFuncname, currdir cdDir) const
+        {
+                unsigned int uiFile = getFileIndex(strFilename, cdDir);
+
+                for (unsigned int i=0;i<getNumberOfFunctions(uiFile, cdDir);i++)
+                {
+                        if (getFunctionName(uiFile, i, cdDir) == strFuncname) return i;
+                }
+
+                return -1;
+        }
+
+        /**
+        * Get the name of an imported file.
+        * @param dwFilenr Identifies which file should be checked.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @return Name of an imported file.
+        **/
+        template<int bits>
+        std::string ImportDirectory<bits>::getFileName(dword dwFilenr, currdir cdDir) const
+        {
+                if (cdDir == OLDDIR) return m_vOldiid[dwFilenr].name;
+                else return m_vNewiid[dwFilenr].name;
+        }
+
+        template<int bits>
+        void ImportDirectory<bits>::setFileName(dword filenr, currdir dir, const std::string& name)
+        {
+                if (dir == OLDDIR) m_vOldiid[filenr].name = name;
+                else m_vNewiid[filenr].name = name;
+        }
+
+        /**
+        * Get the name of an imported function.
+        * @param dwFilenr Identifies which file should be checked.
+        * @param dwFuncnr Identifies which function should be checked.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @return Name of an imported function.
+        * \todo Marked line is unsafe (function should be rewritten).
+        **/
+        template<int bits>
+        std::string ImportDirectory<bits>::getFunctionName(dword dwFilenr, dword dwFuncnr, currdir cdDir) const
+        {
+                if (cdDir == OLDDIR)
+                {
+                        // Unsafe
+                        if (m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk)
+                        {
+                                return m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].fname;
+                        }
+                        else
+                        {
+                                return m_vOldiid[dwFilenr].firstthunk[dwFuncnr].fname;
+                        }
+                }
+                else
+                {
+                        if (m_vNewiid[dwFilenr].impdesc.OriginalFirstThunk)
+                        {
+                                return m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].fname;
+                        }
+                        else
+                        {
+                                return m_vNewiid[dwFilenr].firstthunk[dwFuncnr].fname;
+                        }
+                }
+        }
+
+        template<int bits>
+        void ImportDirectory<bits>::setFunctionName(dword dwFilenr, dword dwFuncnr, currdir cdDir, const std::string& functionName)
+        {
+                if (cdDir == OLDDIR)
+                {
+                        // Unsafe
+                        if (m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk)
+                        {
+                                m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].fname = functionName;
+                        }
+                        else
+                        {
+                                m_vOldiid[dwFilenr].firstthunk[dwFuncnr].fname = functionName;
+                        }
+                }
+                else
+                {
+                        if (m_vNewiid[dwFilenr].impdesc.OriginalFirstThunk)
+                        {
+                                m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].fname = functionName;
+                        }
+                        else
+                        {
+                                m_vNewiid[dwFilenr].firstthunk[dwFuncnr].fname = functionName;
+                        }
+                }
+        }
+
+        /**
+        * Get the hint of an imported function.
+        * @param dwFilenr Identifies which file should be checked.
+        * @param dwFuncnr Identifies which function should be checked.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @return Hint of an imported function.
+        **/
+        template<int bits>
+        word ImportDirectory<bits>::getFunctionHint(dword dwFilenr, dword dwFuncnr, currdir cdDir) const
+        {
+                if (cdDir == OLDDIR)
+                {
+                        if (m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk)
+                        {
+                                return m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].hint;
+                        }
+                        else
+                        {
+                                return m_vOldiid[dwFilenr].firstthunk[dwFuncnr].hint;
+                        }
+                }
+                else return m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].hint;
+        }
+
+        template<int bits>
+        void ImportDirectory<bits>::setFunctionHint(dword dwFilenr, dword dwFuncnr, currdir cdDir, word value)
+        {
+                if (cdDir == OLDDIR)
+                {
+                        if (m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk)
+                        {
+                                m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].hint = value;
+                        }
+                        else
+                        {
+                                m_vOldiid[dwFilenr].firstthunk[dwFuncnr].hint = value;
+                        }
+                }
+                else m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].hint = value;
+        }
+
+        /**
+        * Get the number of files which are currently being imported.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @return Number of files which are currently being imported.
+        **/
+        template<int bits>
+        dword ImportDirectory<bits>::getNumberOfFiles(currdir cdDir) const
+        {
+                if (cdDir == OLDDIR) return static_cast<dword>(m_vOldiid.size());
+                else return static_cast<dword>(m_vNewiid.size());
+        }
+
+        /**
+        * Get the number of functions which are currently being imported from a specific file.
+        * @param dwFilenr Identifies which file should be checked.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @return Number of functions which are currently being imported from a specific file.
+        **/
+        template<int bits>
+        dword ImportDirectory<bits>::getNumberOfFunctions(dword dwFilenr, currdir cdDir) const
+        {
+                if (cdDir == OLDDIR) return static_cast<unsigned int>(m_vOldiid[dwFilenr].firstthunk.size());
+                else return static_cast<unsigned int>(m_vNewiid[dwFilenr].firstthunk.size());
+        }
+
+        /**
+        * Read an import directory from a file.
+        * \todo Check if streams failed.
+        * @param strFilename Name of the file which will be read.
+        * @param uiOffset Offset of the import directory (see #PeLib::PeHeader::getIDImportRVA).
+        * @param uiSize Size of the import directory (see #PeLib::PeHeader::getIDImportSize).
+        * @param pehHeader A valid PE header.
+        **/
+        template<int bits>
+        int ImportDirectory<bits>::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, const PeHeaderT<bits>& pehHeader)
+        {
+                std::ifstream ifFile(strFilename.c_str(), std::ios_base::binary);
+
+                if (!ifFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+                
+                unsigned int uiFileSize = fileSize(ifFile);
+                
+                if (uiFileSize < uiOffset + uiSize)
+                {
+                        return ERROR_INVALID_FILE;
+                }
+
+                ifFile.seekg(uiOffset, std::ios_base::beg);
+
+                std::vector<unsigned char> vImportdirectory(uiSize);
+                ifFile.read(reinterpret_cast<char*>(&vImportdirectory[0]), uiSize);
+
+                PELIB_IMAGE_IMPORT_DIRECTORY<bits> iidCurr;
+                unsigned int uiDesccounter = 0;
+
+                InputBuffer inpBuffer(vImportdirectory);
+
+                std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> > vOldIidCurr;
+
+                do // Read and store all descriptors
+                {
+                        inpBuffer >> iidCurr.impdesc.OriginalFirstThunk;
+                        inpBuffer >> iidCurr.impdesc.TimeDateStamp;
+                        inpBuffer >> iidCurr.impdesc.ForwarderChain;
+                        inpBuffer >> iidCurr.impdesc.Name;
+                        inpBuffer >> iidCurr.impdesc.FirstThunk;
+
+                        if (iidCurr.impdesc.OriginalFirstThunk != 0 || iidCurr.impdesc.TimeDateStamp != 0 || iidCurr.impdesc.ForwarderChain != 0 ||
+                        iidCurr.impdesc.Name != 0 || iidCurr.impdesc.FirstThunk != 0)
+                        {
+                                vOldIidCurr.push_back(iidCurr);
+                        }
+
+                        uiDesccounter++;
+
+                        if (uiSize < (uiDesccounter + 1) * PELIB_IMAGE_IMPORT_DESCRIPTOR::size()) break;
+                } while (iidCurr.impdesc.OriginalFirstThunk != 0 || iidCurr.impdesc.TimeDateStamp != 0 || iidCurr.impdesc.ForwarderChain != 0 ||
+                                iidCurr.impdesc.Name != 0 || iidCurr.impdesc.FirstThunk != 0);
+
+                char namebuffer[2] = {0};
+                        
+                // Name
+                for (unsigned int i=0;i<vOldIidCurr.size();i++)
+                {
+                        ifFile.seekg(static_cast<unsigned int>(pehHeader.rvaToOffset(vOldIidCurr[i].impdesc.Name)), std::ios_base::beg);
+
+                        std::string dllname = "";
+                        
+                        do
+                        {
+                                ifFile.read(namebuffer, 1);
+                                if (!ifFile || !namebuffer[0]) break; // reached end of file or 0-byte
+                                dllname += namebuffer;
+                        } while (true);
+                        
+                        vOldIidCurr[i].name = dllname;
+                        
+                }
+                
+                // OriginalFirstThunk
+                for (unsigned int i=0;i<vOldIidCurr.size();i++)
+                {
+                        PELIB_THUNK_DATA<bits> tdCurr;
+                        dword uiVaoft = vOldIidCurr[i].impdesc.OriginalFirstThunk;
+
+                        if (!uiVaoft)
+                        {
+                                continue;
+                        }
+
+                        ifFile.seekg(static_cast<unsigned int>(pehHeader.rvaToOffset(uiVaoft)), std::ios_base::beg);
+
+                        do
+                        {
+                                if (uiFileSize < pehHeader.rvaToOffset(uiVaoft) + sizeof(tdCurr.itd.Ordinal))
+                                {
+                                        return ERROR_INVALID_FILE;
+                                }
+                                uiVaoft += sizeof(tdCurr.itd.Ordinal);
+                                
+                                ifFile.read(reinterpret_cast<char*>(&tdCurr.itd.Ordinal), sizeof(tdCurr.itd.Ordinal));
+                                if (tdCurr.itd.Ordinal) vOldIidCurr[i].originalfirstthunk.push_back(tdCurr);
+                        } while (tdCurr.itd.Ordinal);
+                }
+
+                // FirstThunk
+                for (unsigned int i=0;i<vOldIidCurr.size();i++)
+                {
+                        dword uiVaoft = vOldIidCurr[i].impdesc.FirstThunk;
+                        PELIB_THUNK_DATA<bits> tdCurr;
+
+                        ifFile.seekg(static_cast<unsigned int>(pehHeader.rvaToOffset(uiVaoft)), std::ios_base::beg);
+
+                        do
+                        {
+                                if (uiFileSize < pehHeader.rvaToOffset(uiVaoft) + sizeof(tdCurr.itd.Ordinal))
+                                {
+                                        return ERROR_INVALID_FILE;
+                                }
+                                
+                                uiVaoft += sizeof(tdCurr.itd.Ordinal);
+                                
+                                ifFile.read(reinterpret_cast<char*>(&tdCurr.itd.Ordinal), sizeof(tdCurr.itd.Ordinal));
+                                if (tdCurr.itd.Ordinal) vOldIidCurr[i].firstthunk.push_back(tdCurr);
+                        } while (tdCurr.itd.Ordinal);
+                }
+
+                // Names
+                for (unsigned int i=0;i<vOldIidCurr.size();i++)
+                {
+                        if (vOldIidCurr[i].impdesc.OriginalFirstThunk)
+                        {
+                                for (unsigned int j=0;j<vOldIidCurr[i].originalfirstthunk.size();j++)
+                                {
+                                        if (vOldIidCurr[i].originalfirstthunk[j].itd.Ordinal & PELIB_IMAGE_ORDINAL_FLAGS<bits>::IMAGE_ORDINAL_FLAG)
+                                        {
+                                                vOldIidCurr[i].originalfirstthunk[j].hint = 0;
+                                                continue;
+                                        }
+
+                                        ifFile.seekg(static_cast<unsigned int>(pehHeader.rvaToOffset(vOldIidCurr[i].originalfirstthunk[j].itd.Ordinal)), std::ios_base::beg);
+
+                                        ifFile.read(reinterpret_cast<char*>(&vOldIidCurr[i].originalfirstthunk[j].hint), sizeof(vOldIidCurr[i].originalfirstthunk[j].hint));
+                                        
+                                        if (!ifFile)
+                                                return ERROR_INVALID_FILE;
+
+                                        std::string funcname = "";
+                                        do
+                                        {
+                                                ifFile.read(namebuffer, 1);
+                                                if (!ifFile || !namebuffer[0]) break; // reached end of file or 0-byte
+                                                funcname += namebuffer;
+                                        } while (true);
+                        
+                                        vOldIidCurr[i].originalfirstthunk[j].fname = funcname;
+                                }
+                        }
+                        else
+                        {
+                                for (unsigned int j=0;j<vOldIidCurr[i].firstthunk.size();j++)
+                                {
+                                        if (vOldIidCurr[i].firstthunk[j].itd.Ordinal & PELIB_IMAGE_ORDINAL_FLAGS<bits>::IMAGE_ORDINAL_FLAG)
+                                        {
+                                                continue;
+                                        }
+
+                                        ifFile.seekg(static_cast<unsigned int>(pehHeader.rvaToOffset(vOldIidCurr[i].firstthunk[j].itd.Ordinal)), std::ios_base::beg);
+
+                                        ifFile.read(reinterpret_cast<char*>(&vOldIidCurr[i].firstthunk[j].hint), sizeof(vOldIidCurr[i].firstthunk[j].hint));
+                                        
+                                        if (!ifFile)
+                                                return ERROR_INVALID_FILE;
+
+                                        std::string funcname = "";
+                                        do
+                                        {
+                                                ifFile.read(namebuffer, 1);
+                                                if (!ifFile || !namebuffer[0]) break; // reached end of file or 0-byte
+                                                funcname += namebuffer;
+                                        } while (true);
+                        
+                                        vOldIidCurr[i].firstthunk[j].fname = funcname;
+                                }
+                        }
+                }
+                std::swap(vOldIidCurr, m_vOldiid);
+                return NO_ERROR;
+        }
+
+        /**
+        * Rebuilds the import directory.
+        * @param vBuffer Buffer the rebuilt import directory will be written to.
+        * @param dwRva The RVA of the ImportDirectory in the file.
+        * \todo uiSizeoffuncnames is not used.
+        **/
+        template<int bits>
+        void ImportDirectory<bits>::rebuild(std::vector<byte>& vBuffer, dword dwRva, bool fixEntries) const
+        {
+                unsigned int uiImprva = dwRva;
+                unsigned int uiSizeofdescriptors = (static_cast<unsigned int>(m_vNewiid.size() + m_vOldiid.size()) + 1) * PELIB_IMAGE_IMPORT_DESCRIPTOR::size();
+                
+                unsigned int uiSizeofdllnames = 0, uiSizeoffuncnames = 0;
+                unsigned int uiSizeofoft = 0;
+
+                for (unsigned int i=0;i<m_vNewiid.size();i++)
+                {
+                        uiSizeofdllnames += static_cast<unsigned int>(m_vNewiid[i].name.size()) + 1;
+                        uiSizeofoft += (static_cast<unsigned int>(m_vNewiid[i].originalfirstthunk.size())+1) * PELIB_IMAGE_THUNK_DATA<bits>::size();
+
+                        for(unsigned int j=0;j<m_vNewiid[i].originalfirstthunk.size();j++)
+                        {
+                                // +3 for hint (word) and 00-byte
+                                uiSizeoffuncnames += (static_cast<unsigned int>(m_vNewiid[i].originalfirstthunk[j].fname.size()) + 3);
+                        }
+                }
+
+//              for (unsigned int i=0;i<m_vNewiid.size();i++)
+//              {
+//                      uiSizeofoft += (static_cast<unsigned int>(m_vNewiid[i].originalfirstthunk.size())+1) * PELIB_IMAGE_THUNK_DATA<bits>::size();
+//              }
+                
+                OutputBuffer obBuffer(vBuffer);
+
+                // Rebuild IMAGE_IMPORT_DESCRIPTORS
+                for (unsigned int i=0;i<m_vOldiid.size();i++)
+                {
+                        obBuffer << m_vOldiid[i].impdesc.OriginalFirstThunk;
+                        obBuffer << m_vOldiid[i].impdesc.TimeDateStamp;
+                        obBuffer << m_vOldiid[i].impdesc.ForwarderChain;
+                        obBuffer << m_vOldiid[i].impdesc.Name;
+                        obBuffer << m_vOldiid[i].impdesc.FirstThunk;
+                }
+
+                unsigned int dllsize = 0;
+
+                for (unsigned int i=0;i<m_vNewiid.size();i++)
+                {
+                        dword dwPoft = uiSizeofdescriptors + uiImprva;
+
+                        for (unsigned int j=1;j<=i;j++)
+                        {
+                                dwPoft += (static_cast<unsigned int>(m_vNewiid[j-1].originalfirstthunk.size()) + 1) * PELIB_IMAGE_THUNK_DATA<bits>::size();
+                        }
+
+                        obBuffer << (fixEntries ? dwPoft : m_vNewiid[i].impdesc.OriginalFirstThunk);
+                        obBuffer << m_vNewiid[i].impdesc.TimeDateStamp;
+                        obBuffer << m_vNewiid[i].impdesc.ForwarderChain;
+                        dword dwPdll = uiSizeofdescriptors + uiSizeofoft + uiImprva + dllsize;
+                        obBuffer << (fixEntries ? dwPdll : m_vNewiid[i].impdesc.Name);
+                        obBuffer << (fixEntries ? dwPoft : m_vNewiid[i].impdesc.FirstThunk);
+
+                        dllsize += static_cast<unsigned int>(m_vNewiid[i].name.size()) + 1;
+                }
+
+                obBuffer << (dword)0;
+                obBuffer << (dword)0;
+                obBuffer << (dword)0;
+                obBuffer << (dword)0;
+                obBuffer << (dword)0;
+
+                unsigned int uiPfunc = uiSizeofdescriptors + uiSizeofoft + uiSizeofdllnames + uiImprva;
+
+                // Rebuild original first thunk
+                for (unsigned int i=0;i<m_vNewiid.size();i++)
+                {
+                        for (unsigned int j=0;j<m_vNewiid[i].originalfirstthunk.size();j++)
+                        {
+                                if (m_vNewiid[i].originalfirstthunk[j].itd.Ordinal & PELIB_IMAGE_ORDINAL_FLAGS<bits>::IMAGE_ORDINAL_FLAG
+                                        || fixEntries == false)
+                                {
+                                        obBuffer << m_vNewiid[i].originalfirstthunk[j].itd.Ordinal;
+                                }
+                                else
+                                {
+                                        obBuffer << uiPfunc;
+                                }
+                                uiPfunc += static_cast<unsigned int>(m_vNewiid[i].originalfirstthunk[j].fname.size()) + 3;
+                        }
+                        obBuffer << (dword)0;
+                }
+
+                // Write dllnames into import directory
+                for (unsigned int i=0;i<m_vNewiid.size();i++)
+                {
+                        obBuffer.add(m_vNewiid[i].name.c_str(), static_cast<unsigned int>(m_vNewiid[i].name.size())+1);
+                }
+
+                // Write function names into directory
+                for (unsigned int i=0;i<m_vNewiid.size();i++)
+                {
+                        for (unsigned int j=0;j<m_vNewiid[i].originalfirstthunk.size();j++)
+                        {
+                                obBuffer << m_vNewiid[i].originalfirstthunk[j].hint;
+                                obBuffer.add(m_vNewiid[i].originalfirstthunk[j].fname.c_str(), static_cast<unsigned int>(m_vNewiid[i].originalfirstthunk[j].fname.size()) + 1);
+                        }
+                }
+        }
+
+        /**
+        * Removes a specific file and all functions of it from the import directory.
+        * @param strFilename Name of the file which will be removed.
+        **/
+        template<int bits>
+        int ImportDirectory<bits>::removeFile(const std::string& strFilename)
+        {
+                unsigned int oldSize = static_cast<unsigned int>(m_vNewiid.size());
+
+                m_vNewiid.erase(std::remove_if(m_vNewiid.begin(), m_vNewiid.end(), std::bind2nd(std::mem_fun_ref(&PELIB_IMAGE_IMPORT_DIRECTORY<bits>::operator==), strFilename)), m_vNewiid.end());
+                
+                return oldSize == m_vNewiid.size() ? 1 : 0;
+        }
+
+        /**
+        * Removes a specific function from the import directory.
+        * @param strFilename Name of the file which exports the function.
+        * @param strFuncname Name of the imported function.
+        **/
+        template<int bits>
+        int ImportDirectory<bits>::removeFunction(const std::string& strFilename, const std::string& strFuncname)
+        {
+                ImpDirFileIterator viPos = m_vNewiid.begin();
+
+                int notFound = 1;
+
+                while (viPos != m_vNewiid.end())
+                {
+                        if (isEqualNc(viPos->name, strFilename))
+                        {
+                                unsigned int oldSize = static_cast<unsigned int>(viPos->originalfirstthunk.size());
+                                viPos->originalfirstthunk.erase(std::remove_if(viPos->originalfirstthunk.begin(), viPos->originalfirstthunk.end(), std::bind2nd(std::mem_fun_ref(&PELIB_THUNK_DATA<bits>::equalFunctionName), strFuncname)), viPos->originalfirstthunk.end());
+                                //viPos->originalfirstthunk.erase(std::remove_if(viPos->originalfirstthunk.begin(), viPos->originalfirstthunk.end(), std::bind2nd(CompPolicy<PELIB_THUNK_DATA, std::string>(), strFuncname)));
+                                if (viPos->originalfirstthunk.size() != oldSize) notFound = 0;
+                        }
+                        ++viPos;
+                }
+                
+                return notFound;
+        }
+
+        /**
+        * Removes a specific function from the import directory.
+        * @param strFilename Name of the file which exports the function.
+        * @param wHint The hint of the function.
+        **/
+        template<int bits>
+        int ImportDirectory<bits>::removeFunction(const std::string& strFilename, word wHint)
+        {
+                ImpDirFileIterator viPos = m_vNewiid.begin();
+                int notFound = 1;
+
+                while (viPos != m_vNewiid.end())
+                {
+                        if (isEqualNc(viPos->name, strFilename))
+                        {
+                                unsigned int oldSize = static_cast<unsigned int>(viPos->originalfirstthunk.size());
+                                viPos->originalfirstthunk.erase(std::remove_if(viPos->originalfirstthunk.begin(), viPos->originalfirstthunk.end(), std::bind2nd(std::mem_fun_ref(&PELIB_THUNK_DATA<bits>::equalHint), wHint)), viPos->originalfirstthunk.end());
+                                unsigned int newPos = static_cast<unsigned int>(viPos->originalfirstthunk.size());
+                                if (viPos->originalfirstthunk.size() != oldSize) notFound = 0;
+                        }
+                        ++viPos;
+                }
+                
+                return notFound;
+        }
+
+        /**
+        * Writes the current import directory to a file.
+        * @param strFilename Name of the file.
+        * @param uiOffset File Offset of the new import directory.
+        * @param uiRva RVA which belongs to that file offset.
+        **/
+        template<int bits>
+        int ImportDirectory<bits>::write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva)
+        {
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                
+                if (!ofFile)
+                {
+                        ofFile.clear();
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                }
+                else
+                {
+                        ofFile.close();
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                }
+                
+                if (!ofFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+
+                ofFile.seekp(uiOffset, std::ios_base::beg);
+
+                std::vector<byte> vBuffer;
+
+                rebuild(vBuffer, uiRva);
+
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), vBuffer.size());
+                ofFile.close();
+
+                std::copy(m_vNewiid.begin(), m_vNewiid.end(), std::back_inserter(m_vOldiid));
+                m_vNewiid.clear();
+                
+                return NO_ERROR;
+        }
+
+        /**
+        * Returns the size of the import directory.
+        * @return Size of the import directory.
+        **/
+        template<int bits>
+        unsigned int ImportDirectory<bits>::size() const
+        {
+                // Only the descriptors of m_vOldiid must be rebuilt, not the data they point to.
+                return std::accumulate(m_vNewiid.begin(), m_vNewiid.end(), 0, accumulate<PELIB_IMAGE_IMPORT_DIRECTORY<bits> >)
+                + (m_vOldiid.size() + 1) * PELIB_IMAGE_IMPORT_DESCRIPTOR::size();
+        }
+
+        /**
+        * @param strFilename Name of the imported file.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @return FirstThunk value of an imported file.
+        **/
+        template<int bits>
+        dword ImportDirectory<bits>::getFirstThunk(const std::string& strFilename, currdir cdDir) const
+        {
+                if (cdDir == OLDDIR)
+                {
+                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.FirstThunk;
+                }
+                else
+                {
+                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.FirstThunk;
+                }
+        }
+
+        /**
+        * @param strFilename Name of the imported file.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @return OriginalFirstThunk value of an imported file.
+        **/
+        template<int bits>
+        dword ImportDirectory<bits>::getOriginalFirstThunk(const std::string& strFilename, currdir cdDir) const
+        {
+                if (cdDir == OLDDIR)
+                {
+                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.OriginalFirstThunk;
+                }
+                else
+                {
+                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.OriginalFirstThunk;
+                }
+        }
+
+        /**
+        * @param strFilename Name of the imported file.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @return ForwarderChain value of an imported file.
+        **/
+        template<int bits>
+        dword ImportDirectory<bits>::getForwarderChain(const std::string& strFilename, currdir cdDir) const
+        {
+                if (cdDir == OLDDIR)
+                {
+                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.ForwarderChain;
+                }
+                else
+                {
+                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.ForwarderChain;
+                }
+        }
+
+        /**
+        * @param strFilename Name of the imported file.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @return TimeDateStamp value of an imported file.
+        **/
+        template<int bits>
+        dword ImportDirectory<bits>::getTimeDateStamp(const std::string& strFilename, currdir cdDir) const
+        {
+                if (cdDir == OLDDIR)
+                {
+                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.TimeDateStamp;
+                }
+                else
+                {
+                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.TimeDateStamp;
+                }
+        }
+
+        template<int bits>
+        dword ImportDirectory<bits>::getRvaOfName(const std::string& strFilename, currdir cdDir) const
+        {
+                if (cdDir == OLDDIR)
+                {
+                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.Name;
+                }
+                else
+                {
+                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.Name;
+                }
+        }
+
+        /**
+        * @param strFilename Name of the imported file.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @return FirstThunk value of an imported file.
+        **/
+        template<int bits>
+        dword ImportDirectory<bits>::getFirstThunk(dword dwFilenr, currdir cdDir) const
+        {
+                if (cdDir == OLDDIR)
+                {
+                        return m_vOldiid[dwFilenr].impdesc.FirstThunk;
+                }
+                else
+                {
+                        return m_vNewiid[dwFilenr].impdesc.FirstThunk;
+                }
+        }
+
+        template<int bits>
+        void ImportDirectory<bits>::setFirstThunk(dword dwFilenr, currdir cdDir, dword value)
+        {
+                if (cdDir == OLDDIR)
+                {
+                        m_vOldiid[dwFilenr].impdesc.FirstThunk = value;
+                }
+                else
+                {
+                        m_vNewiid[dwFilenr].impdesc.FirstThunk = value;
+                }
+        }
+
+        /**
+        * @param strFilename Name of the imported file.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @return OriginalFirstThunk value of an imported file.
+        **/
+        template<int bits>
+        dword ImportDirectory<bits>::getOriginalFirstThunk(dword dwFilenr, currdir cdDir) const
+        {
+                if (cdDir == OLDDIR)
+                {
+                        return m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk;
+                }
+                else
+                {
+                        return m_vNewiid[dwFilenr].impdesc.OriginalFirstThunk;
+                }
+        }
+
+        template<int bits>
+        void ImportDirectory<bits>::setOriginalFirstThunk(dword dwFilenr, currdir cdDir, dword value)
+        {
+                if (cdDir == OLDDIR)
+                {
+                        m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk = value;
+                }
+                else
+                {
+                        m_vNewiid[dwFilenr].impdesc.OriginalFirstThunk = value;
+                }
+        }
+
+        /**
+        * @param strFilename Name of the imported file.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @return ForwarderChain value of an imported file.
+        **/
+        template<int bits>
+        dword ImportDirectory<bits>::getForwarderChain(dword dwFilenr, currdir cdDir) const
+        {
+                if (cdDir == OLDDIR)
+                {
+                        return m_vOldiid[dwFilenr].impdesc.ForwarderChain;
+                }
+                else
+                {
+                        return m_vNewiid[dwFilenr].impdesc.ForwarderChain;
+                }
+        }
+
+        template<int bits>
+        void ImportDirectory<bits>::setForwarderChain(dword dwFilenr, currdir cdDir, dword value)
+        {
+                if (cdDir == OLDDIR)
+                {
+                        m_vOldiid[dwFilenr].impdesc.ForwarderChain = value;
+                }
+                else
+                {
+                        m_vNewiid[dwFilenr].impdesc.ForwarderChain = value;
+                }
+        }
+
+        /**
+        * @param strFilename Name of the imported file.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @return TimeDateStamp value of an imported file.
+        **/
+        template<int bits>
+        dword ImportDirectory<bits>::getTimeDateStamp(dword dwFilenr, currdir cdDir) const
+        {
+                if (cdDir == OLDDIR)
+                {
+                        return m_vOldiid[dwFilenr].impdesc.TimeDateStamp;
+                }
+                else
+                {
+                        return m_vNewiid[dwFilenr].impdesc.TimeDateStamp;
+                }
+        }
+
+        template<int bits>
+        void ImportDirectory<bits>::setTimeDateStamp(dword dwFilenr, currdir cdDir, dword value)
+        {
+                if (cdDir == OLDDIR)
+                {
+                        m_vOldiid[dwFilenr].impdesc.TimeDateStamp = value;
+                }
+                else
+                {
+                        m_vNewiid[dwFilenr].impdesc.TimeDateStamp = value;
+                }
+        }
+
+        template<int bits>
+        dword ImportDirectory<bits>::getRvaOfName(dword dwFilenr, currdir cdDir) const
+        {
+                if (cdDir == OLDDIR)
+                {
+                        return m_vOldiid[dwFilenr].impdesc.Name;
+                }
+                else
+                {
+                        return m_vNewiid[dwFilenr].impdesc.Name;
+                }
+        }
+
+        template<int bits>
+        void ImportDirectory<bits>::setRvaOfName(dword dwFilenr, currdir cdDir, dword value)
+        {
+                if (cdDir == OLDDIR)
+                {
+                        m_vOldiid[dwFilenr].impdesc.Name = value;
+                }
+                else
+                {
+                        m_vNewiid[dwFilenr].impdesc.Name = value;
+                }
+        }
+
+        /**
+        * @param dwFilenr ID of the imported file.
+        * @param dwFuncnr ID of the imported function.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @return FirstThunk value of an imported function.
+        **/
+        template<int bits>
+        dword ImportDirectory<bits>::getFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir) const
+        {
+                if (cdDir == OLDDIR) return m_vOldiid[dwFilenr].firstthunk[dwFuncnr].itd.Ordinal;
+                else return m_vNewiid[dwFilenr].firstthunk[dwFuncnr].itd.Ordinal;
+        }
+        
+        template<int bits>
+        void ImportDirectory<bits>::setFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir, dword value)
+        {
+                if (cdDir == OLDDIR) m_vOldiid[dwFilenr].firstthunk[dwFuncnr].itd.Ordinal = value;
+                else m_vNewiid[dwFilenr].firstthunk[dwFuncnr].itd.Ordinal = value;
+        }
+        
+        /**
+        * @param dwFilenr ID of the imported file.
+        * @param dwFuncnr ID of the imported function.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @return OriginalFirstThunk value of an imported function.
+        **/
+        template<int bits>
+        dword ImportDirectory<bits>::getOriginalFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir) const
+        {
+                if (cdDir == OLDDIR) return m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].itd.Ordinal;
+                else return m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].itd.Ordinal;
+        }
+
+        template<int bits>
+        void ImportDirectory<bits>::setOriginalFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir, dword value)
+        {
+                if (cdDir == OLDDIR) m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].itd.Ordinal = value;
+                else m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].itd.Ordinal = value;
+        }
+
+        typedef ImportDirectory<32> ImportDirectory32;
+        typedef ImportDirectory<64> ImportDirectory64;
+}
+
+#endif
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/MzHeader.cpp b/utils/zenutils/libraries/pelib-0.9/pelib/MzHeader.cpp
index 39fe54d80d..3a2119b7ac 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/MzHeader.cpp
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/MzHeader.cpp
@@ -1,584 +1,584 @@
-/*

-* MzHeader.cpp - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#include "MzHeader.h"

-#include <iostream>

-

-namespace PeLib

-{

-        /**

-        * Reads data from an InputBuffer into the struct that represents the MZ header.

-        * It's required that the size of the input buffer is at least as big as the

-        * size of a MZ header. Otherwise we get undefined behaviour.

-        * @param ibBuffer InputBuffer that holds the data.

-        * @return A non-zero value is returned if a problem occured.

-        **/

-        void MzHeader::read(InputBuffer& ibBuffer)

-        {

-                ibBuffer >> m_idhHeader.e_magic;

-                ibBuffer >> m_idhHeader.e_cblp;

-                ibBuffer >> m_idhHeader.e_cp;

-                ibBuffer >> m_idhHeader.e_crlc;

-                ibBuffer >> m_idhHeader.e_cparhdr;

-                ibBuffer >> m_idhHeader.e_minalloc;

-                ibBuffer >> m_idhHeader.e_maxalloc;

-                ibBuffer >> m_idhHeader.e_ss;

-                ibBuffer >> m_idhHeader.e_sp;

-                ibBuffer >> m_idhHeader.e_csum;

-                ibBuffer >> m_idhHeader.e_ip;

-                ibBuffer >> m_idhHeader.e_cs;

-                ibBuffer >> m_idhHeader.e_lfarlc;

-                ibBuffer >> m_idhHeader.e_ovno;

-

-                for (unsigned int i=0;i<sizeof(m_idhHeader.e_res)/sizeof(m_idhHeader.e_res[0]);i++)

-                {

-                        ibBuffer >> m_idhHeader.e_res[i];

-                }

-

-                ibBuffer >> m_idhHeader.e_oemid;

-                ibBuffer >> m_idhHeader.e_oeminfo;

-

-                for (unsigned int i=0;i<sizeof(m_idhHeader.e_res2)/sizeof(m_idhHeader.e_res2[0]);i++)

-                {

-                        ibBuffer >> m_idhHeader.e_res2[i];

-                }

-

-                ibBuffer >> m_idhHeader.e_lfanew;

-        }

-        

-        /**

-        * Tests if the currently loaded MZ header is a valid MZ header. 

-        * Note that this function does not check if the address to the PE header is valid as this is not possible.

-        * Actually, the only thing this function checks is if the e_magic value is set to 0x5A4D (IMAGE_DOS_SIGNATURE).

-        * Everything else is not relevant for Windows 2000 and that's the system PeLib is focusing on for now.

-        * @return A boolean value that indicates if the MZ header is correct or not.

-        **/

-        bool MzHeader::isValid() const

-        {

-                // The only thing that matters on Windows 2K is the e_magic value. The entire rest is for DOS compatibility.

-                return isValid(e_magic);

-        }

-

-    bool MzHeader::isValid(Field f) const

-    {

-        if (f == e_magic)

-        {

-            return m_idhHeader.e_magic == PELIB_IMAGE_DOS_SIGNATURE;

-        }

-        else

-        {

-            return true;

-        }

-    }

-

-        /**

-        * Corrects all erroneous values of the current MZ header. Note that this function does not correct the

-        * pointer to the PE header.     

-        * Actually, the only thing this function corrects is the e_magic value.

-        * Everything else is not relevant for Windows 2000 and that's the system PeLib is focusing on for now.

-        **/

-        void MzHeader::makeValid()

-        {

-                // The only thing that matters on Windows is the e_magic value. The entire rest is for DOS compatibility.

-                setMagicNumber(PELIB_IMAGE_DOS_SIGNATURE);

-        }

-

-    void MzHeader::makeValid(Field f)

-    {

-        if (f == e_magic)

-        {

-            setMagicNumber(PELIB_IMAGE_DOS_SIGNATURE);

-        }

-    }

-

-        /**

-        * Reads the MZ header from a file. Note that this function does not verify if a file is actually a MZ file.

-        * For this purpose see #PeFile::MzHeader::isValid. The reason for this is simple: Otherwise it might not

-        * be possible to load damaged PE files to repair them.

-        * @param strFilename Name of the file which will be read.

-        * @return A non-zero value is returned if a problem occured.

-        **/

-        int MzHeader::read(const std::string& strFilename)

-        {

-                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);

-

-                if (!ifFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-

-                if (fileSize(ifFile) < PELIB_IMAGE_DOS_HEADER::size())

-                {

-                        return ERROR_INVALID_FILE;

-                }

-

-                ifFile.seekg(0, std::ios::beg);

-

-                originalOffset = 0;

-                

-                std::vector<byte> vBuffer(PELIB_IMAGE_DOS_HEADER::size());

-                ifFile.read(reinterpret_cast<char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));

-                ifFile.close();

-

-                InputBuffer ibBuffer(vBuffer);

-                read(ibBuffer);

-                return NO_ERROR;

-        }

-

-        /**

-        * Reads the MZ header from memory. A pointer to a location in memory is passed and the data

-        * at this location is treated like a MZ header structure. The MZ header does not need to be valid.

-        * @param pcBuffer Pointer to a MZ header.

-        * @param uiSize Length of the buffer.

-        * @return A non-zero value is returned if a problem occured.

-        **/

-        int MzHeader::read(unsigned char* pcBuffer, unsigned int uiSize, unsigned int originalOffs)

-        {

-                if (uiSize < PELIB_IMAGE_DOS_HEADER::size())

-                {

-                        return ERROR_INVALID_FILE;

-                }

-                

-                std::vector<byte> vBuffer(pcBuffer, pcBuffer + uiSize);

-                for (int i=0;i<0x40;i++) std::cout << std::hex << (int)vBuffer[i] << " ";

-

-                originalOffset = originalOffs;

-                

-                InputBuffer ibBuffer(vBuffer);

-                read(ibBuffer);

-                return NO_ERROR;

-        }

-

-        /**

-        * Rebuilds the MZ header so that it can be written to a file. It's not guaranteed that the

-        * MZ header will be valid. If you want to make sure that the MZ header will be valid you

-        * must call #PeLib::MzHeader::makeValid first.

-        * @param vBuffer Buffer where the rebuilt MZ header will be stored.

-        **/

-        void MzHeader::rebuild(std::vector<byte>& vBuffer) const

-        {

-                OutputBuffer obBuffer(vBuffer);

-

-                obBuffer << m_idhHeader.e_magic;

-                obBuffer << m_idhHeader.e_cblp;

-                obBuffer << m_idhHeader.e_cp;

-                obBuffer << m_idhHeader.e_crlc;

-                obBuffer << m_idhHeader.e_cparhdr;

-                obBuffer << m_idhHeader.e_minalloc;

-                obBuffer << m_idhHeader.e_maxalloc;

-                obBuffer << m_idhHeader.e_ss;

-                obBuffer << m_idhHeader.e_sp;

-                obBuffer << m_idhHeader.e_csum;

-                obBuffer << m_idhHeader.e_ip;

-                obBuffer << m_idhHeader.e_cs;

-                obBuffer << m_idhHeader.e_lfarlc;

-                obBuffer << m_idhHeader.e_ovno;

-

-                for (unsigned int i=0;i<sizeof(m_idhHeader.e_res)/sizeof(m_idhHeader.e_res[0]);i++)

-                {

-                        obBuffer << m_idhHeader.e_res[i];

-                }

-

-                obBuffer << m_idhHeader.e_oemid;

-                obBuffer << m_idhHeader.e_oeminfo;

-

-                for (unsigned int i=0;i<sizeof(m_idhHeader.e_res2)/sizeof(m_idhHeader.e_res2[0]);i++)

-                {

-                        obBuffer << m_idhHeader.e_res2[i];

-                }

-

-                obBuffer << m_idhHeader.e_lfanew;

-        }

-

-        /**

-        * Returns the size of the MZ header. This size is actually always sizeof(IMAGE_DOS_HEADER) (== 0x40)

-        * because the MZ header is a header of constant size if you disregard the dos stub. If you want to know the

-        * size of the MZ header + the size of the dos stub check #PeLib::MzHeader::getAddressOfPeHeader.

-        * @return Size of the MZ header.

-        **/

-        unsigned int MzHeader::size() const

-        {

-                return sizeof(m_idhHeader);

-        }

-

-        /**

-        * Writes the current MZ header to a file. The file does not have to exist. If it doesn't exist

-        * it will be created.

-        * @param strFilename Name of the file the header will be written to.

-        * @param dwOffset Offset the header will be written to (defaults to 0).

-        * @return A non-zero value is returned if a problem occured.

-        **/

-        int MzHeader::write(const std::string& strFilename, dword dwOffset = 0) const

-        {

-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);

-                

-                if (!ofFile)

-                {

-                        ofFile.clear();

-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);

-                }

-                else

-                {

-                        ofFile.close();

-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);

-                }

-                

-                if (!ofFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-

-                ofFile.seekp(dwOffset, std::ios::beg);

-

-                std::vector<unsigned char> vBuffer;

-

-                rebuild(vBuffer);

-

-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));

-

-                ofFile.close();

-                

-                return NO_ERROR;

-        }

-

-        /**

-        * Returns the MZ header's e_magic value.

-        **/

-        word MzHeader::getMagicNumber() const

-        {

-                return m_idhHeader.e_magic;

-        }

-

-        /**

-        * Returns the MZ header's e_cblp value.

-        **/

-        word MzHeader::getBytesOnLastPage() const

-        {

-                return m_idhHeader.e_cblp;

-        }

-

-        /**

-        * Returns the MZ header's e_cp value.

-        **/

-        word MzHeader::getPagesInFile() const

-        {

-                return m_idhHeader.e_cp;

-        }

-

-        /**

-        * Returns the MZ header's e_crlc value.

-        **/

-        word MzHeader::getRelocations() const

-        {

-                return m_idhHeader.e_crlc;

-        }

-

-        /**

-        * Returns the MZ header's e_cparhdr value.

-        **/

-        word MzHeader::getSizeOfHeader() const

-        {

-                return m_idhHeader.e_cparhdr;

-        }

-

-        /**

-        * Returns the MZ header's e_minalloc value.

-        **/

-        word MzHeader::getMinExtraParagraphs() const

-        {

-                return m_idhHeader.e_minalloc;

-        }

-

-        /**

-        * Returns the MZ header's e_maxalloc value.

-        **/

-        word MzHeader::getMaxExtraParagraphs() const

-        {

-                return m_idhHeader.e_maxalloc;

-        }

-

-        /**

-        * Returns the MZ header's e_ss value.

-        **/

-        word MzHeader::getSsValue() const

-        {

-                return m_idhHeader.e_ss;

-        }

-

-        /**

-        * Returns the MZ header's e_sp value.

-        **/

-        word MzHeader::getSpValue() const

-        {

-                return m_idhHeader.e_sp;

-        }

-

-        /**

-        * Returns the MZ header's e_csum value.

-        **/

-        word MzHeader::getChecksum() const

-        {

-                return m_idhHeader.e_csum;

-        }

-

-        /**

-        * Returns the MZ header's e_ip value.

-        **/

-        word MzHeader::getIpValue() const

-        {

-                return m_idhHeader.e_ip;

-        }

-

-        /**

-        * Returns the MZ header's e_cs value.

-        **/

-        word MzHeader::getCsValue() const

-        {

-                return m_idhHeader.e_cs;

-        }

-

-        /**

-        * Returns the MZ header's e_lfarlc value.

-        **/

-        word MzHeader::getAddrOfRelocationTable() const

-        {

-                return m_idhHeader.e_lfarlc;

-        }

-

-        /**

-        * Returns the MZ header's e_ovno value.

-        **/

-        word MzHeader::getOverlayNumber() const

-        {

-                return m_idhHeader.e_ovno;

-        }

-

-        /**

-        * Returns the MZ header's e_oemid value.

-        **/

-        word MzHeader::getOemIdentifier() const

-        {

-                return m_idhHeader.e_oemid;

-        }

-

-        /**

-        * Returns the MZ header's e_oeminfo value.

-        **/

-        word MzHeader::getOemInformation() const

-        {

-                return m_idhHeader.e_oeminfo;

-        }

-

-        /**

-        * Returns the MZ header's e_lfanew value.

-        **/

-        dword MzHeader::getAddressOfPeHeader() const

-        {

-                return m_idhHeader.e_lfanew;

-        }

-

-        /**

-        * Returns the MZ header's e_res[uiNr] value. If the parameter uiNr is out of range 

-        * you will get undefined behaviour.

-        * @param uiNr The index of the word in the e_res array (valid range: 0-3)

-        **/

-        word MzHeader::getReservedWords1(unsigned int uiNr) const

-        {

-                return m_idhHeader.e_res[uiNr];

-        }

-

-        /**

-        * Returns the MZ header's e_res2[uiNr] value. If the parameter uiNr is out of range 

-        * you will get undefined behaviour.

-        * @param uiNr The index of the word in the e_res array (valid range: 0-9)

-        **/

-        word MzHeader::getReservedWords2(unsigned int uiNr) const

-        {

-                return m_idhHeader.e_res2[uiNr];

-        }

-        

-        /**

-        * Sets the MZ header's e_magic value.

-        * @param wValue The new value of e_magic.

-        **/

-        void MzHeader::setMagicNumber(word wValue)

-        {

-                m_idhHeader.e_magic = wValue;

-        }

-

-        /**

-        * Sets the MZ header's e_cblp value.

-        * @param wValue The new value of e_cblp.

-        **/

-        void MzHeader::setBytesOnLastPage(word wValue)

-        {

-                m_idhHeader.e_cblp = wValue;

-        }

-

-        /**

-        * Sets the MZ header's e_cp value.

-        * @param wValue The new value of e_cp.

-        **/

-        void MzHeader::setPagesInFile(word wValue)

-        {

-                m_idhHeader.e_cp = wValue;

-        }

-

-        /**

-        * Sets the MZ header's e_crlc value.

-        * @param wValue The new value of e_crlc.

-        **/  

-        void MzHeader::setRelocations(word wValue)

-        {

-                m_idhHeader.e_crlc = wValue;

-        }

-

-        /**

-        * Sets the MZ header's e_cparhdr value.

-        * @param wValue The new value of e_cparhdr.

-        **/  

-        void MzHeader::setSizeOfHeader(word wValue)

-        {

-                m_idhHeader.e_cparhdr = wValue;

-        }

-

-        /**

-        * Sets the MZ header's e_minalloc value.

-        * @param wValue The new value of e_minalloc.

-        **/  

-        void MzHeader::setMinExtraParagraphs(word wValue)

-        {

-                m_idhHeader.e_minalloc = wValue;

-        }

-

-        /**

-        * Sets the MZ header's e_maxalloc value.

-        * @param wValue The new value of e_maxalloc.

-        **/  

-        void MzHeader::setMaxExtraParagraphs(word wValue)

-        {

-                m_idhHeader.e_maxalloc = wValue;

-        }

-

-        /**

-        * Sets the MZ header's e_ss value.

-        * @param wValue The new value of e_ss.

-        **/  

-        void MzHeader::setSsValue(word wValue)

-        {

-                m_idhHeader.e_ss = wValue;

-        }

-

-        /**

-        * Sets the MZ header's e_sp value.

-        * @param wValue The new value of e_sp.

-        **/  

-        void MzHeader::setSpValue(word wValue)

-        {

-                m_idhHeader.e_sp = wValue;

-        }

-

-        /**

-        * Sets the MZ header's e_csum value.

-        * @param wValue The new value of e_csum.

-        **/  

-        void MzHeader::setChecksum(word wValue)

-        {

-                m_idhHeader.e_csum = wValue;

-        }

-

-        /**

-        * Sets the MZ header's e_ip value.

-        * @param wValue The new value of e_ip.

-        **/  

-        void MzHeader::setIpValue(word wValue)

-        {

-                m_idhHeader.e_ip = wValue;

-        }

-

-        /**

-        * Sets the MZ header's e_cs value.

-        * @param wValue The new value of e_cs.

-        **/  

-        void MzHeader::setCsValue(word wValue)

-        {

-                m_idhHeader.e_cs = wValue;

-        }

-

-        /**

-        * Sets the MZ header's e_lfarlc value.

-        * @param wValue The new value of e_lfarlc.

-        **/  

-        void MzHeader::setAddrOfRelocationTable(word wValue)

-        {

-                m_idhHeader.e_lfarlc = wValue;

-        }

-

-        /**

-        * Sets the MZ header's e_ovno value.

-        * @param wValue The new value of e_ovno.

-        **/  

-        void MzHeader::setOverlayNumber(word wValue)

-        {

-                m_idhHeader.e_ovno = wValue;

-        }

-

-        /**

-        * Sets the MZ header's e_oemid value.

-        * @param wValue The new value of e_oemid.

-        **/  

-        void MzHeader::setOemIdentifier(word wValue)

-        {

-                m_idhHeader.e_oemid = wValue;

-        }

-

-        /**

-        * Sets the MZ header's e_oeminfo value.

-        * @param wValue The new value of e_oeminfo.

-        **/  

-        void MzHeader::setOemInformation(word wValue)

-        {

-                m_idhHeader.e_oeminfo = wValue;

-        }

-

-        /**

-        * Sets the MZ header's e_lfanew value.

-        * @param lValue The new value of e_lfanew.

-        **/  

-        void MzHeader::setAddressOfPeHeader(dword lValue)

-        {

-                m_idhHeader.e_lfanew = lValue;

-        }

-        

-        /**

-        * Sets the MZ header's e_res[uiNr] value. If the parameter uiNr is out of range 

-        * you will get undefined behaviour.

-        * @param uiNr The index of the word in the e_res array (valid range: 0-3)

-        * @param wValue The new value of e_res[nr].

-        **/

-        void MzHeader::setReservedWords1(unsigned int uiNr, word wValue)

-        {

-                m_idhHeader.e_res[uiNr] = wValue;

-        }

-

-        /**

-        * Sets the MZ header's e_res2[uiNr] value. If the parameter uiNr is out of range 

-        * you will get undefined behaviour.

-        * @param uiNr The index of the word in the e_res2 array (valid range: 0-9)

-        * @param wValue The new value of e_res[nr].

-        **/

-        void MzHeader::setReservedWords2(unsigned int uiNr, word wValue)

-        {

-                m_idhHeader.e_res2[uiNr] = wValue;

-        }

-

-}

+/*
+* MzHeader.cpp - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#include "MzHeader.h"
+#include <iostream>
+
+namespace PeLib
+{
+        /**
+        * Reads data from an InputBuffer into the struct that represents the MZ header.
+        * It's required that the size of the input buffer is at least as big as the
+        * size of a MZ header. Otherwise we get undefined behaviour.
+        * @param ibBuffer InputBuffer that holds the data.
+        * @return A non-zero value is returned if a problem occured.
+        **/
+        void MzHeader::read(InputBuffer& ibBuffer)
+        {
+                ibBuffer >> m_idhHeader.e_magic;
+                ibBuffer >> m_idhHeader.e_cblp;
+                ibBuffer >> m_idhHeader.e_cp;
+                ibBuffer >> m_idhHeader.e_crlc;
+                ibBuffer >> m_idhHeader.e_cparhdr;
+                ibBuffer >> m_idhHeader.e_minalloc;
+                ibBuffer >> m_idhHeader.e_maxalloc;
+                ibBuffer >> m_idhHeader.e_ss;
+                ibBuffer >> m_idhHeader.e_sp;
+                ibBuffer >> m_idhHeader.e_csum;
+                ibBuffer >> m_idhHeader.e_ip;
+                ibBuffer >> m_idhHeader.e_cs;
+                ibBuffer >> m_idhHeader.e_lfarlc;
+                ibBuffer >> m_idhHeader.e_ovno;
+
+                for (unsigned int i=0;i<sizeof(m_idhHeader.e_res)/sizeof(m_idhHeader.e_res[0]);i++)
+                {
+                        ibBuffer >> m_idhHeader.e_res[i];
+                }
+
+                ibBuffer >> m_idhHeader.e_oemid;
+                ibBuffer >> m_idhHeader.e_oeminfo;
+
+                for (unsigned int i=0;i<sizeof(m_idhHeader.e_res2)/sizeof(m_idhHeader.e_res2[0]);i++)
+                {
+                        ibBuffer >> m_idhHeader.e_res2[i];
+                }
+
+                ibBuffer >> m_idhHeader.e_lfanew;
+        }
+        
+        /**
+        * Tests if the currently loaded MZ header is a valid MZ header. 
+        * Note that this function does not check if the address to the PE header is valid as this is not possible.
+        * Actually, the only thing this function checks is if the e_magic value is set to 0x5A4D (IMAGE_DOS_SIGNATURE).
+        * Everything else is not relevant for Windows 2000 and that's the system PeLib is focusing on for now.
+        * @return A boolean value that indicates if the MZ header is correct or not.
+        **/
+        bool MzHeader::isValid() const
+        {
+                // The only thing that matters on Windows 2K is the e_magic value. The entire rest is for DOS compatibility.
+                return isValid(e_magic);
+        }
+
+    bool MzHeader::isValid(Field f) const
+    {
+        if (f == e_magic)
+        {
+            return m_idhHeader.e_magic == PELIB_IMAGE_DOS_SIGNATURE;
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+        /**
+        * Corrects all erroneous values of the current MZ header. Note that this function does not correct the
+        * pointer to the PE header.     
+        * Actually, the only thing this function corrects is the e_magic value.
+        * Everything else is not relevant for Windows 2000 and that's the system PeLib is focusing on for now.
+        **/
+        void MzHeader::makeValid()
+        {
+                // The only thing that matters on Windows is the e_magic value. The entire rest is for DOS compatibility.
+                setMagicNumber(PELIB_IMAGE_DOS_SIGNATURE);
+        }
+
+    void MzHeader::makeValid(Field f)
+    {
+        if (f == e_magic)
+        {
+            setMagicNumber(PELIB_IMAGE_DOS_SIGNATURE);
+        }
+    }
+
+        /**
+        * Reads the MZ header from a file. Note that this function does not verify if a file is actually a MZ file.
+        * For this purpose see #PeFile::MzHeader::isValid. The reason for this is simple: Otherwise it might not
+        * be possible to load damaged PE files to repair them.
+        * @param strFilename Name of the file which will be read.
+        * @return A non-zero value is returned if a problem occured.
+        **/
+        int MzHeader::read(const std::string& strFilename)
+        {
+                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
+
+                if (!ifFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+
+                if (fileSize(ifFile) < PELIB_IMAGE_DOS_HEADER::size())
+                {
+                        return ERROR_INVALID_FILE;
+                }
+
+                ifFile.seekg(0, std::ios::beg);
+
+                originalOffset = 0;
+                
+                std::vector<byte> vBuffer(PELIB_IMAGE_DOS_HEADER::size());
+                ifFile.read(reinterpret_cast<char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
+                ifFile.close();
+
+                InputBuffer ibBuffer(vBuffer);
+                read(ibBuffer);
+                return NO_ERROR;
+        }
+
+        /**
+        * Reads the MZ header from memory. A pointer to a location in memory is passed and the data
+        * at this location is treated like a MZ header structure. The MZ header does not need to be valid.
+        * @param pcBuffer Pointer to a MZ header.
+        * @param uiSize Length of the buffer.
+        * @return A non-zero value is returned if a problem occured.
+        **/
+        int MzHeader::read(unsigned char* pcBuffer, unsigned int uiSize, unsigned int originalOffs)
+        {
+                if (uiSize < PELIB_IMAGE_DOS_HEADER::size())
+                {
+                        return ERROR_INVALID_FILE;
+                }
+                
+                std::vector<byte> vBuffer(pcBuffer, pcBuffer + uiSize);
+                for (int i=0;i<0x40;i++) std::cout << std::hex << (int)vBuffer[i] << " ";
+
+                originalOffset = originalOffs;
+                
+                InputBuffer ibBuffer(vBuffer);
+                read(ibBuffer);
+                return NO_ERROR;
+        }
+
+        /**
+        * Rebuilds the MZ header so that it can be written to a file. It's not guaranteed that the
+        * MZ header will be valid. If you want to make sure that the MZ header will be valid you
+        * must call #PeLib::MzHeader::makeValid first.
+        * @param vBuffer Buffer where the rebuilt MZ header will be stored.
+        **/
+        void MzHeader::rebuild(std::vector<byte>& vBuffer) const
+        {
+                OutputBuffer obBuffer(vBuffer);
+
+                obBuffer << m_idhHeader.e_magic;
+                obBuffer << m_idhHeader.e_cblp;
+                obBuffer << m_idhHeader.e_cp;
+                obBuffer << m_idhHeader.e_crlc;
+                obBuffer << m_idhHeader.e_cparhdr;
+                obBuffer << m_idhHeader.e_minalloc;
+                obBuffer << m_idhHeader.e_maxalloc;
+                obBuffer << m_idhHeader.e_ss;
+                obBuffer << m_idhHeader.e_sp;
+                obBuffer << m_idhHeader.e_csum;
+                obBuffer << m_idhHeader.e_ip;
+                obBuffer << m_idhHeader.e_cs;
+                obBuffer << m_idhHeader.e_lfarlc;
+                obBuffer << m_idhHeader.e_ovno;
+
+                for (unsigned int i=0;i<sizeof(m_idhHeader.e_res)/sizeof(m_idhHeader.e_res[0]);i++)
+                {
+                        obBuffer << m_idhHeader.e_res[i];
+                }
+
+                obBuffer << m_idhHeader.e_oemid;
+                obBuffer << m_idhHeader.e_oeminfo;
+
+                for (unsigned int i=0;i<sizeof(m_idhHeader.e_res2)/sizeof(m_idhHeader.e_res2[0]);i++)
+                {
+                        obBuffer << m_idhHeader.e_res2[i];
+                }
+
+                obBuffer << m_idhHeader.e_lfanew;
+        }
+
+        /**
+        * Returns the size of the MZ header. This size is actually always sizeof(IMAGE_DOS_HEADER) (== 0x40)
+        * because the MZ header is a header of constant size if you disregard the dos stub. If you want to know the
+        * size of the MZ header + the size of the dos stub check #PeLib::MzHeader::getAddressOfPeHeader.
+        * @return Size of the MZ header.
+        **/
+        unsigned int MzHeader::size() const
+        {
+                return sizeof(m_idhHeader);
+        }
+
+        /**
+        * Writes the current MZ header to a file. The file does not have to exist. If it doesn't exist
+        * it will be created.
+        * @param strFilename Name of the file the header will be written to.
+        * @param dwOffset Offset the header will be written to (defaults to 0).
+        * @return A non-zero value is returned if a problem occured.
+        **/
+        int MzHeader::write(const std::string& strFilename, dword dwOffset = 0) const
+        {
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                
+                if (!ofFile)
+                {
+                        ofFile.clear();
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                }
+                else
+                {
+                        ofFile.close();
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                }
+                
+                if (!ofFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+
+                ofFile.seekp(dwOffset, std::ios::beg);
+
+                std::vector<unsigned char> vBuffer;
+
+                rebuild(vBuffer);
+
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
+
+                ofFile.close();
+                
+                return NO_ERROR;
+        }
+
+        /**
+        * Returns the MZ header's e_magic value.
+        **/
+        word MzHeader::getMagicNumber() const
+        {
+                return m_idhHeader.e_magic;
+        }
+
+        /**
+        * Returns the MZ header's e_cblp value.
+        **/
+        word MzHeader::getBytesOnLastPage() const
+        {
+                return m_idhHeader.e_cblp;
+        }
+
+        /**
+        * Returns the MZ header's e_cp value.
+        **/
+        word MzHeader::getPagesInFile() const
+        {
+                return m_idhHeader.e_cp;
+        }
+
+        /**
+        * Returns the MZ header's e_crlc value.
+        **/
+        word MzHeader::getRelocations() const
+        {
+                return m_idhHeader.e_crlc;
+        }
+
+        /**
+        * Returns the MZ header's e_cparhdr value.
+        **/
+        word MzHeader::getSizeOfHeader() const
+        {
+                return m_idhHeader.e_cparhdr;
+        }
+
+        /**
+        * Returns the MZ header's e_minalloc value.
+        **/
+        word MzHeader::getMinExtraParagraphs() const
+        {
+                return m_idhHeader.e_minalloc;
+        }
+
+        /**
+        * Returns the MZ header's e_maxalloc value.
+        **/
+        word MzHeader::getMaxExtraParagraphs() const
+        {
+                return m_idhHeader.e_maxalloc;
+        }
+
+        /**
+        * Returns the MZ header's e_ss value.
+        **/
+        word MzHeader::getSsValue() const
+        {
+                return m_idhHeader.e_ss;
+        }
+
+        /**
+        * Returns the MZ header's e_sp value.
+        **/
+        word MzHeader::getSpValue() const
+        {
+                return m_idhHeader.e_sp;
+        }
+
+        /**
+        * Returns the MZ header's e_csum value.
+        **/
+        word MzHeader::getChecksum() const
+        {
+                return m_idhHeader.e_csum;
+        }
+
+        /**
+        * Returns the MZ header's e_ip value.
+        **/
+        word MzHeader::getIpValue() const
+        {
+                return m_idhHeader.e_ip;
+        }
+
+        /**
+        * Returns the MZ header's e_cs value.
+        **/
+        word MzHeader::getCsValue() const
+        {
+                return m_idhHeader.e_cs;
+        }
+
+        /**
+        * Returns the MZ header's e_lfarlc value.
+        **/
+        word MzHeader::getAddrOfRelocationTable() const
+        {
+                return m_idhHeader.e_lfarlc;
+        }
+
+        /**
+        * Returns the MZ header's e_ovno value.
+        **/
+        word MzHeader::getOverlayNumber() const
+        {
+                return m_idhHeader.e_ovno;
+        }
+
+        /**
+        * Returns the MZ header's e_oemid value.
+        **/
+        word MzHeader::getOemIdentifier() const
+        {
+                return m_idhHeader.e_oemid;
+        }
+
+        /**
+        * Returns the MZ header's e_oeminfo value.
+        **/
+        word MzHeader::getOemInformation() const
+        {
+                return m_idhHeader.e_oeminfo;
+        }
+
+        /**
+        * Returns the MZ header's e_lfanew value.
+        **/
+        dword MzHeader::getAddressOfPeHeader() const
+        {
+                return m_idhHeader.e_lfanew;
+        }
+
+        /**
+        * Returns the MZ header's e_res[uiNr] value. If the parameter uiNr is out of range 
+        * you will get undefined behaviour.
+        * @param uiNr The index of the word in the e_res array (valid range: 0-3)
+        **/
+        word MzHeader::getReservedWords1(unsigned int uiNr) const
+        {
+                return m_idhHeader.e_res[uiNr];
+        }
+
+        /**
+        * Returns the MZ header's e_res2[uiNr] value. If the parameter uiNr is out of range 
+        * you will get undefined behaviour.
+        * @param uiNr The index of the word in the e_res array (valid range: 0-9)
+        **/
+        word MzHeader::getReservedWords2(unsigned int uiNr) const
+        {
+                return m_idhHeader.e_res2[uiNr];
+        }
+        
+        /**
+        * Sets the MZ header's e_magic value.
+        * @param wValue The new value of e_magic.
+        **/
+        void MzHeader::setMagicNumber(word wValue)
+        {
+                m_idhHeader.e_magic = wValue;
+        }
+
+        /**
+        * Sets the MZ header's e_cblp value.
+        * @param wValue The new value of e_cblp.
+        **/
+        void MzHeader::setBytesOnLastPage(word wValue)
+        {
+                m_idhHeader.e_cblp = wValue;
+        }
+
+        /**
+        * Sets the MZ header's e_cp value.
+        * @param wValue The new value of e_cp.
+        **/
+        void MzHeader::setPagesInFile(word wValue)
+        {
+                m_idhHeader.e_cp = wValue;
+        }
+
+        /**
+        * Sets the MZ header's e_crlc value.
+        * @param wValue The new value of e_crlc.
+        **/  
+        void MzHeader::setRelocations(word wValue)
+        {
+                m_idhHeader.e_crlc = wValue;
+        }
+
+        /**
+        * Sets the MZ header's e_cparhdr value.
+        * @param wValue The new value of e_cparhdr.
+        **/  
+        void MzHeader::setSizeOfHeader(word wValue)
+        {
+                m_idhHeader.e_cparhdr = wValue;
+        }
+
+        /**
+        * Sets the MZ header's e_minalloc value.
+        * @param wValue The new value of e_minalloc.
+        **/  
+        void MzHeader::setMinExtraParagraphs(word wValue)
+        {
+                m_idhHeader.e_minalloc = wValue;
+        }
+
+        /**
+        * Sets the MZ header's e_maxalloc value.
+        * @param wValue The new value of e_maxalloc.
+        **/  
+        void MzHeader::setMaxExtraParagraphs(word wValue)
+        {
+                m_idhHeader.e_maxalloc = wValue;
+        }
+
+        /**
+        * Sets the MZ header's e_ss value.
+        * @param wValue The new value of e_ss.
+        **/  
+        void MzHeader::setSsValue(word wValue)
+        {
+                m_idhHeader.e_ss = wValue;
+        }
+
+        /**
+        * Sets the MZ header's e_sp value.
+        * @param wValue The new value of e_sp.
+        **/  
+        void MzHeader::setSpValue(word wValue)
+        {
+                m_idhHeader.e_sp = wValue;
+        }
+
+        /**
+        * Sets the MZ header's e_csum value.
+        * @param wValue The new value of e_csum.
+        **/  
+        void MzHeader::setChecksum(word wValue)
+        {
+                m_idhHeader.e_csum = wValue;
+        }
+
+        /**
+        * Sets the MZ header's e_ip value.
+        * @param wValue The new value of e_ip.
+        **/  
+        void MzHeader::setIpValue(word wValue)
+        {
+                m_idhHeader.e_ip = wValue;
+        }
+
+        /**
+        * Sets the MZ header's e_cs value.
+        * @param wValue The new value of e_cs.
+        **/  
+        void MzHeader::setCsValue(word wValue)
+        {
+                m_idhHeader.e_cs = wValue;
+        }
+
+        /**
+        * Sets the MZ header's e_lfarlc value.
+        * @param wValue The new value of e_lfarlc.
+        **/  
+        void MzHeader::setAddrOfRelocationTable(word wValue)
+        {
+                m_idhHeader.e_lfarlc = wValue;
+        }
+
+        /**
+        * Sets the MZ header's e_ovno value.
+        * @param wValue The new value of e_ovno.
+        **/  
+        void MzHeader::setOverlayNumber(word wValue)
+        {
+                m_idhHeader.e_ovno = wValue;
+        }
+
+        /**
+        * Sets the MZ header's e_oemid value.
+        * @param wValue The new value of e_oemid.
+        **/  
+        void MzHeader::setOemIdentifier(word wValue)
+        {
+                m_idhHeader.e_oemid = wValue;
+        }
+
+        /**
+        * Sets the MZ header's e_oeminfo value.
+        * @param wValue The new value of e_oeminfo.
+        **/  
+        void MzHeader::setOemInformation(word wValue)
+        {
+                m_idhHeader.e_oeminfo = wValue;
+        }
+
+        /**
+        * Sets the MZ header's e_lfanew value.
+        * @param lValue The new value of e_lfanew.
+        **/  
+        void MzHeader::setAddressOfPeHeader(dword lValue)
+        {
+                m_idhHeader.e_lfanew = lValue;
+        }
+        
+        /**
+        * Sets the MZ header's e_res[uiNr] value. If the parameter uiNr is out of range 
+        * you will get undefined behaviour.
+        * @param uiNr The index of the word in the e_res array (valid range: 0-3)
+        * @param wValue The new value of e_res[nr].
+        **/
+        void MzHeader::setReservedWords1(unsigned int uiNr, word wValue)
+        {
+                m_idhHeader.e_res[uiNr] = wValue;
+        }
+
+        /**
+        * Sets the MZ header's e_res2[uiNr] value. If the parameter uiNr is out of range 
+        * you will get undefined behaviour.
+        * @param uiNr The index of the word in the e_res2 array (valid range: 0-9)
+        * @param wValue The new value of e_res[nr].
+        **/
+        void MzHeader::setReservedWords2(unsigned int uiNr, word wValue)
+        {
+                m_idhHeader.e_res2[uiNr] = wValue;
+        }
+
+}
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/MzHeader.h b/utils/zenutils/libraries/pelib-0.9/pelib/MzHeader.h
index 5aca6bfe59..4acb819727 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/MzHeader.h
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/MzHeader.h
@@ -1,148 +1,148 @@
-/*

-* MzHeader.h - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#ifndef MZHEADER_H

-#define MZHEADER_H

-

-#include "PeLibInc.h"

-

-namespace PeLib

-{

-        /// Class that handles the MZ header of files.

-        /**

-        * This class can read and modify MZ headers. It provides set- and get functions to access

-        * all individual members of a MZ header. Furthermore it's possible to validate and rebuild

-        * MZ headers.

-        **/

-        class MzHeader

-        {

-                private:

-                  PELIB_IMAGE_DOS_HEADER m_idhHeader; ///< Stores all MZ header information.

-                  

-                  /// Reads data from an InputBuffer into a MZ header struct.

-                  void read(InputBuffer& ibBuffer);

-                  

-                  /// Offset of the MZ header in the original file.

-                  unsigned int originalOffset;

-                  

-                public:

-

-          enum Field {e_magic, e_cblp, e_cp, e_crlc, e_cparhdr, e_minalloc, e_maxalloc,

-                        e_ss, e_sp, e_csum, e_ip, e_cs, e_lfarlc, e_ovno, e_res, e_oemid,

-                        e_oeminfo, e_res2, e_lfanew};

-

-                  /// Checks if the current MZ header is valid.

-                  bool isValid() const; // EXPORT

-          

-                  bool isValid(Field field) const; // EXPORT _field

-

-                  /// Corrects the current MZ header.

-                  void makeValid(); // EXPORT

-

-                  void makeValid(Field field); // EXPORT _field

-

-                  /// Reads the MZ header of a file.

-                  int read(const std::string& strFilename); // EXPORT

-

-                  /// Reads the MZ header from a memory location.

-                  int read(unsigned char* pcBuffer, unsigned int uiSize, unsigned int originalOffs = 0); // EXPORT _fromMemory

-

-                  /// Rebuild the MZ header.

-                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT

-

-                  /// Returns the size of the current MZ header.

-                  unsigned int size() const; // EXPORT

-

-                  /// Writes the current MZ header to offset 0 of a file.

-                  int write(const std::string& strFilename, dword dwOffset) const; // EXPORT

-

-                  /// Gets the e_magic value of the MZ header.

-                  word getMagicNumber() const; // EXPORT

-                  /// Gets the e_cblp value of the MZ header.

-                  word getBytesOnLastPage() const; // EXPORT

-                  /// Gets the e_cp value of the MZ header.

-                  word getPagesInFile() const; // EXPORT

-                  /// Gets the e_crlc value of the MZ header.

-                  word getRelocations() const; // EXPORT

-                  /// Gets the e_cparhdr value of the MZ header.

-                  word getSizeOfHeader() const; // EXPORT

-                  /// Gets the e_minalloc value of the MZ header.

-                  word getMinExtraParagraphs() const; // EXPORT

-                  /// Gets the e_maxalloc value of the MZ header.

-                  word getMaxExtraParagraphs() const; // EXPORT

-                  /// Gets the e_ss value of the MZ header.

-                  word getSsValue() const; // EXPORT

-                  /// Gets the e_sp value of the MZ header.

-                  word getSpValue() const; // EXPORT

-                  /// Gets the e_csum value of the MZ header.

-                  word getChecksum() const; // EXPORT

-                  /// Gets the e_ip value of the MZ header.

-                  word getIpValue() const; // EXPORT

-                  /// Gets the e_cs value of the MZ header.

-                  word getCsValue() const; // EXPORT

-                  /// Gets the e_lfarlc value of the MZ header.

-                  word getAddrOfRelocationTable() const; // EXPORT

-                  /// Gets the e_ovnovalue of the MZ header.

-                  word getOverlayNumber() const; // EXPORT

-                  /// Gets the e_oemid value of the MZ header.

-                  word getOemIdentifier() const; // EXPORT

-                  /// Gets the e_oeminfo value of the MZ header.

-                  word getOemInformation() const; // EXPORT

-                  /// Gets the e_lfanew value of the MZ header.

-                  dword getAddressOfPeHeader() const; // EXPORT

-                  /// Gets the e_res of the MZ header.

-                  word getReservedWords1(unsigned int uiNr) const; // EXPORT

-                  /// Gets the e_res2 of the MZ header.

-                  word getReservedWords2(unsigned int uiNr) const; // EXPORT

-        

-                  /// Sets the e_magic value of the MZ header.

-                  void setMagicNumber(word wValue); // EXPORT

-                  /// Sets the e_cblp value of the MZ header.

-                  void setBytesOnLastPage(word wValue); // EXPORT

-                  /// Sets the e_cp value of the MZ header.

-                  void setPagesInFile(word wValue); // EXPORT

-                  /// Sets the e_crlc value of the MZ header.

-                  void setRelocations(word wValue); // EXPORT

-                  /// Sets the e_cparhdr value of the MZ header.

-                  void setSizeOfHeader(word wValue); // EXPORT

-                  /// Sets the e_minalloc value of the MZ header.

-                  void setMinExtraParagraphs(word wValue); // EXPORT

-                  /// Sets the e_maxalloc value of the MZ header.

-                  void setMaxExtraParagraphs(word wValue); // EXPORT

-                  /// Sets the e_ss value of the MZ header.

-                  void setSsValue(word wValue); // EXPORT

-                  /// Sets the e_sp value of the MZ header.

-                  void setSpValue(word wValue); // EXPORT

-                  /// Sets the e_csum value of the MZ header.

-                  void setChecksum(word wValue); // EXPORT

-                  /// Sets the e_ip value of the MZ header.

-                  void setIpValue(word wValue); // EXPORT

-                  /// Sets the e_cs value of the MZ header.

-                  void setCsValue(word wValue); // EXPORT

-                  /// Sets the e_lfarlc value of the MZ header.

-                  void setAddrOfRelocationTable(word wValue); // EXPORT

-                  /// Sets the e_ovno value of the MZ header.

-                  void setOverlayNumber(word wValue); // EXPORT

-                  /// Sets the e_oemid value of the MZ header.

-                  void setOemIdentifier(word wValue); // EXPORT

-                  /// Sets the e_oeminfo value of the MZ header.

-                  void setOemInformation(word wValue); // EXPORT

-                  /// Sets the e_lfanew value of the MZ header.

-                  void setAddressOfPeHeader(dword dwValue); // EXPORT

-                  /// Sets the e_res value of the MZ header.

-                  void setReservedWords1(unsigned int uiNr, word wValue); // EXPORT

-                  /// Sets the e_res2 value of the MZ header.

-                  void setReservedWords2(unsigned int uiNr, word wValue); // EXPORT

-        };

-}

-

-#endif

+/*
+* MzHeader.h - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#ifndef MZHEADER_H
+#define MZHEADER_H
+
+#include "PeLibInc.h"
+
+namespace PeLib
+{
+        /// Class that handles the MZ header of files.
+        /**
+        * This class can read and modify MZ headers. It provides set- and get functions to access
+        * all individual members of a MZ header. Furthermore it's possible to validate and rebuild
+        * MZ headers.
+        **/
+        class MzHeader
+        {
+                private:
+                  PELIB_IMAGE_DOS_HEADER m_idhHeader; ///< Stores all MZ header information.
+                  
+                  /// Reads data from an InputBuffer into a MZ header struct.
+                  void read(InputBuffer& ibBuffer);
+                  
+                  /// Offset of the MZ header in the original file.
+                  unsigned int originalOffset;
+                  
+                public:
+
+          enum Field {e_magic, e_cblp, e_cp, e_crlc, e_cparhdr, e_minalloc, e_maxalloc,
+                        e_ss, e_sp, e_csum, e_ip, e_cs, e_lfarlc, e_ovno, e_res, e_oemid,
+                        e_oeminfo, e_res2, e_lfanew};
+
+                  /// Checks if the current MZ header is valid.
+                  bool isValid() const; // EXPORT
+          
+                  bool isValid(Field field) const; // EXPORT _field
+
+                  /// Corrects the current MZ header.
+                  void makeValid(); // EXPORT
+
+                  void makeValid(Field field); // EXPORT _field
+
+                  /// Reads the MZ header of a file.
+                  int read(const std::string& strFilename); // EXPORT
+
+                  /// Reads the MZ header from a memory location.
+                  int read(unsigned char* pcBuffer, unsigned int uiSize, unsigned int originalOffs = 0); // EXPORT _fromMemory
+
+                  /// Rebuild the MZ header.
+                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT
+
+                  /// Returns the size of the current MZ header.
+                  unsigned int size() const; // EXPORT
+
+                  /// Writes the current MZ header to offset 0 of a file.
+                  int write(const std::string& strFilename, dword dwOffset) const; // EXPORT
+
+                  /// Gets the e_magic value of the MZ header.
+                  word getMagicNumber() const; // EXPORT
+                  /// Gets the e_cblp value of the MZ header.
+                  word getBytesOnLastPage() const; // EXPORT
+                  /// Gets the e_cp value of the MZ header.
+                  word getPagesInFile() const; // EXPORT
+                  /// Gets the e_crlc value of the MZ header.
+                  word getRelocations() const; // EXPORT
+                  /// Gets the e_cparhdr value of the MZ header.
+                  word getSizeOfHeader() const; // EXPORT
+                  /// Gets the e_minalloc value of the MZ header.
+                  word getMinExtraParagraphs() const; // EXPORT
+                  /// Gets the e_maxalloc value of the MZ header.
+                  word getMaxExtraParagraphs() const; // EXPORT
+                  /// Gets the e_ss value of the MZ header.
+                  word getSsValue() const; // EXPORT
+                  /// Gets the e_sp value of the MZ header.
+                  word getSpValue() const; // EXPORT
+                  /// Gets the e_csum value of the MZ header.
+                  word getChecksum() const; // EXPORT
+                  /// Gets the e_ip value of the MZ header.
+                  word getIpValue() const; // EXPORT
+                  /// Gets the e_cs value of the MZ header.
+                  word getCsValue() const; // EXPORT
+                  /// Gets the e_lfarlc value of the MZ header.
+                  word getAddrOfRelocationTable() const; // EXPORT
+                  /// Gets the e_ovnovalue of the MZ header.
+                  word getOverlayNumber() const; // EXPORT
+                  /// Gets the e_oemid value of the MZ header.
+                  word getOemIdentifier() const; // EXPORT
+                  /// Gets the e_oeminfo value of the MZ header.
+                  word getOemInformation() const; // EXPORT
+                  /// Gets the e_lfanew value of the MZ header.
+                  dword getAddressOfPeHeader() const; // EXPORT
+                  /// Gets the e_res of the MZ header.
+                  word getReservedWords1(unsigned int uiNr) const; // EXPORT
+                  /// Gets the e_res2 of the MZ header.
+                  word getReservedWords2(unsigned int uiNr) const; // EXPORT
+        
+                  /// Sets the e_magic value of the MZ header.
+                  void setMagicNumber(word wValue); // EXPORT
+                  /// Sets the e_cblp value of the MZ header.
+                  void setBytesOnLastPage(word wValue); // EXPORT
+                  /// Sets the e_cp value of the MZ header.
+                  void setPagesInFile(word wValue); // EXPORT
+                  /// Sets the e_crlc value of the MZ header.
+                  void setRelocations(word wValue); // EXPORT
+                  /// Sets the e_cparhdr value of the MZ header.
+                  void setSizeOfHeader(word wValue); // EXPORT
+                  /// Sets the e_minalloc value of the MZ header.
+                  void setMinExtraParagraphs(word wValue); // EXPORT
+                  /// Sets the e_maxalloc value of the MZ header.
+                  void setMaxExtraParagraphs(word wValue); // EXPORT
+                  /// Sets the e_ss value of the MZ header.
+                  void setSsValue(word wValue); // EXPORT
+                  /// Sets the e_sp value of the MZ header.
+                  void setSpValue(word wValue); // EXPORT
+                  /// Sets the e_csum value of the MZ header.
+                  void setChecksum(word wValue); // EXPORT
+                  /// Sets the e_ip value of the MZ header.
+                  void setIpValue(word wValue); // EXPORT
+                  /// Sets the e_cs value of the MZ header.
+                  void setCsValue(word wValue); // EXPORT
+                  /// Sets the e_lfarlc value of the MZ header.
+                  void setAddrOfRelocationTable(word wValue); // EXPORT
+                  /// Sets the e_ovno value of the MZ header.
+                  void setOverlayNumber(word wValue); // EXPORT
+                  /// Sets the e_oemid value of the MZ header.
+                  void setOemIdentifier(word wValue); // EXPORT
+                  /// Sets the e_oeminfo value of the MZ header.
+                  void setOemInformation(word wValue); // EXPORT
+                  /// Sets the e_lfanew value of the MZ header.
+                  void setAddressOfPeHeader(dword dwValue); // EXPORT
+                  /// Sets the e_res value of the MZ header.
+                  void setReservedWords1(unsigned int uiNr, word wValue); // EXPORT
+                  /// Sets the e_res2 value of the MZ header.
+                  void setReservedWords2(unsigned int uiNr, word wValue); // EXPORT
+        };
+}
+
+#endif
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/PeFile.cpp b/utils/zenutils/libraries/pelib-0.9/pelib/PeFile.cpp
index 39f2488b81..9e9f2d8691 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/PeFile.cpp
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/PeFile.cpp
@@ -1,169 +1,169 @@
-/*

-* PeLib.cpp - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#include "PeFile.h"

-

-namespace PeLib

-{

-        PeFile::~PeFile()

-        {

-        }

-        

-        PeFile32::PeFile32() : PeFileT<32>()

-        {

-        }

-        

-        PeFile32::PeFile32(const std::string& strFlename) : PeFileT<32>(strFlename)

-        {

-        }

-        

-        PeFile64::PeFile64() : PeFileT<64>()

-        {

-        }

-        

-        PeFile64::PeFile64(const std::string& strFlename) : PeFileT<64>(strFlename)

-        {

-        }

-        

-        /**

-        * @return A reference to the file's MZ header.

-        **/

-        

-        const MzHeader& PeFile::mzHeader() const

-        {

-                return m_mzh;

-        }

-

-        /**

-        * @return A reference to the file's MZ header.

-        **/

-        

-        MzHeader& PeFile::mzHeader()

-        {

-                return m_mzh;

-        }

-

-        /**

-        * @return A reference to the file's export directory.

-        **/

-        

-        const ExportDirectory& PeFile::expDir() const

-        {

-                return m_expdir;

-        }

-

-        /**

-        * @return A reference to the file's export directory.

-        **/

-        

-        ExportDirectory& PeFile::expDir()

-        {

-                return m_expdir;

-        }

-        

-        /**

-        * @return A reference to the file's bound import directory.

-        **/

-        

-        const BoundImportDirectory& PeFile::boundImpDir() const

-        {

-                return m_boundimpdir;

-        }

-        

-        /**

-        * @return A reference to the file's bound import directory.

-        **/

-        

-        BoundImportDirectory& PeFile::boundImpDir()

-        {

-                return m_boundimpdir;

-        }

-        

-        /**

-        * @return A reference to the file's resource directory.

-        **/

-        

-        const ResourceDirectory& PeFile::resDir() const

-        {

-                return m_resdir;

-        }

-        

-        /**

-        * @return A reference to the file's resource directory.

-        **/

-        

-        ResourceDirectory& PeFile::resDir()

-        {

-                return m_resdir;

-        }

-        

-        /**

-        * @return A reference to the file's relocations directory.

-        **/

-        

-        const RelocationsDirectory& PeFile::relocDir() const

-        {

-                return m_relocs;

-        }

-

-        /**

-        * @return A reference to the file's relocations directory.

-        **/

-        

-        RelocationsDirectory& PeFile::relocDir()

-        {

-                return m_relocs;

-        }

-

-        /**

-        * @return A reference to the file's COM+ descriptor directory.

-        **/

-        

-        const ComHeaderDirectory& PeFile::comDir() const

-        {

-                return m_comdesc;

-        }

-

-        /**

-        * @return A reference to the file's COM+ descriptor directory.

-        **/

-        

-        ComHeaderDirectory & PeFile::comDir()

-        {

-                return m_comdesc;

-        }

-

-        

-        const IatDirectory& PeFile::iatDir() const

-        {

-                return m_iat;

-        }

-

-        

-        IatDirectory& PeFile::iatDir()

-        {

-                return m_iat;

-        }

-

-        

-        const DebugDirectory& PeFile::debugDir() const

-        {

-                return m_debugdir;

-        }

-

-        

-        DebugDirectory& PeFile::debugDir()

-        {

-                return m_debugdir;

-        }

-

-}

+/*
+* PeLib.cpp - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#include "PeFile.h"
+
+namespace PeLib
+{
+        PeFile::~PeFile()
+        {
+        }
+        
+        PeFile32::PeFile32() : PeFileT<32>()
+        {
+        }
+        
+        PeFile32::PeFile32(const std::string& strFlename) : PeFileT<32>(strFlename)
+        {
+        }
+        
+        PeFile64::PeFile64() : PeFileT<64>()
+        {
+        }
+        
+        PeFile64::PeFile64(const std::string& strFlename) : PeFileT<64>(strFlename)
+        {
+        }
+        
+        /**
+        * @return A reference to the file's MZ header.
+        **/
+        
+        const MzHeader& PeFile::mzHeader() const
+        {
+                return m_mzh;
+        }
+
+        /**
+        * @return A reference to the file's MZ header.
+        **/
+        
+        MzHeader& PeFile::mzHeader()
+        {
+                return m_mzh;
+        }
+
+        /**
+        * @return A reference to the file's export directory.
+        **/
+        
+        const ExportDirectory& PeFile::expDir() const
+        {
+                return m_expdir;
+        }
+
+        /**
+        * @return A reference to the file's export directory.
+        **/
+        
+        ExportDirectory& PeFile::expDir()
+        {
+                return m_expdir;
+        }
+        
+        /**
+        * @return A reference to the file's bound import directory.
+        **/
+        
+        const BoundImportDirectory& PeFile::boundImpDir() const
+        {
+                return m_boundimpdir;
+        }
+        
+        /**
+        * @return A reference to the file's bound import directory.
+        **/
+        
+        BoundImportDirectory& PeFile::boundImpDir()
+        {
+                return m_boundimpdir;
+        }
+        
+        /**
+        * @return A reference to the file's resource directory.
+        **/
+        
+        const ResourceDirectory& PeFile::resDir() const
+        {
+                return m_resdir;
+        }
+        
+        /**
+        * @return A reference to the file's resource directory.
+        **/
+        
+        ResourceDirectory& PeFile::resDir()
+        {
+                return m_resdir;
+        }
+        
+        /**
+        * @return A reference to the file's relocations directory.
+        **/
+        
+        const RelocationsDirectory& PeFile::relocDir() const
+        {
+                return m_relocs;
+        }
+
+        /**
+        * @return A reference to the file's relocations directory.
+        **/
+        
+        RelocationsDirectory& PeFile::relocDir()
+        {
+                return m_relocs;
+        }
+
+        /**
+        * @return A reference to the file's COM+ descriptor directory.
+        **/
+        
+        const ComHeaderDirectory& PeFile::comDir() const
+        {
+                return m_comdesc;
+        }
+
+        /**
+        * @return A reference to the file's COM+ descriptor directory.
+        **/
+        
+        ComHeaderDirectory & PeFile::comDir()
+        {
+                return m_comdesc;
+        }
+
+        
+        const IatDirectory& PeFile::iatDir() const
+        {
+                return m_iat;
+        }
+
+        
+        IatDirectory& PeFile::iatDir()
+        {
+                return m_iat;
+        }
+
+        
+        const DebugDirectory& PeFile::debugDir() const
+        {
+                return m_debugdir;
+        }
+
+        
+        DebugDirectory& PeFile::debugDir()
+        {
+                return m_debugdir;
+        }
+
+}
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/PeFile.h b/utils/zenutils/libraries/pelib-0.9/pelib/PeFile.h
index a2b02cdfa8..e08d8da309 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/PeFile.h
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/PeFile.h
@@ -1,451 +1,451 @@
-/*

-* PeFile.h - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#ifndef PEFILE_H

-#define PEFILE_H

-

-#include "PeLibInc.h"

-#include "MzHeader.h"

-#include "PeHeader.h"

-#include "ImportDirectory.h"

-#include "ExportDirectory.h"

-#include "BoundImportDirectory.h"

-#include "ResourceDirectory.h"

-#include "RelocationsDirectory.h"

-#include "ComHeaderDirectory.h"

-#include "IatDirectory.h"

-#include "DebugDirectory.h"

-#include "TlsDirectory.h"

-

-namespace PeLib

-{

-        class PeFile32;

-        class PeFile64;

-        

-        /**

-        * Visitor base class for PeFiles.

-        **/

-        class PeFileVisitor

-        {

-                public:

-                  virtual void callback(PeFile32 &file){}

-                  virtual void callback(PeFile64 &file){}

-                  virtual ~PeFileVisitor(){}

-        };

-

-        /**

-        * Traits class that's used to decide of what type the PeHeader in a PeFile is.

-        **/

-        template<int>

-        struct PeFile_Traits;

-

-        template<>

-        struct PeFile_Traits<32>

-        {

-                typedef PeHeader32 PeHeader32_64;

-        };

-        

-        template<>

-        struct PeFile_Traits<64>

-        {

-                typedef PeHeader64 PeHeader32_64;

-        };

-        

-        /**

-        * This class represents the common structures of PE and PE+ files.

-        **/

-        class PeFile

-        {

-                protected:

-                  std::string m_filename; ///< Name of the current file.

-                  MzHeader m_mzh; ///< MZ header of the current file.

-                  ExportDirectory m_expdir; ///< Export directory of the current file.

-                  BoundImportDirectory m_boundimpdir; ///< BoundImportDirectory of the current file.

-                  ResourceDirectory m_resdir; ///< ResourceDirectory of the current file.

-                  RelocationsDirectory m_relocs; ///< Relocations directory of the current file.

-                  ComHeaderDirectory m_comdesc; ///< COM+ descriptor directory of the current file.

-                  IatDirectory m_iat; ///< Import address table of the current file.

-                  DebugDirectory m_debugdir;

-                public:

-                  virtual ~PeFile();

-                  

-                  /// Returns the name of the current file.

-                  virtual std::string getFileName() const = 0; // EXPORT

-                  /// Changes the name of the current file.

-                  virtual void setFileName(std::string strFilename) = 0; // EXPORT

-                  

-                  virtual void visit(PeFileVisitor &v) = 0;

-                  

-                  /// Reads the MZ header of the current file from disc.

-                  virtual int readMzHeader() = 0; // EXPORT

-                  /// Reads the export directory of the current file from disc.

-                  virtual int readExportDirectory()  = 0; // EXPORT

-                  /// Reads the PE header of the current file from disc.

-                  virtual int readPeHeader()  = 0; // EXPORT

-                  /// Reads the import directory of the current file from disc.

-                  virtual int readImportDirectory()  = 0; // EXPORT

-                  /// Reads the bound import directory of the current file from disc.

-                  virtual int readBoundImportDirectory()  = 0; // EXPORT

-                  /// Reads the resource directory of the current file from disc.

-                  virtual int readResourceDirectory()  = 0; // EXPORT

-                  /// Reads the relocations directory of the current file from disc.

-                  virtual int readRelocationsDirectory()  = 0; // EXPORT

-                  /// Reads the COM+ descriptor directory of the current file from disc.

-                  virtual int readComHeaderDirectory()  = 0; // EXPORT

-                  /// Reads the IAT directory of the current file from disc.

-                  virtual int readIatDirectory()  = 0; // EXPORT

-                  /// Reads the Debug directory of the current file.              

-                  virtual int readDebugDirectory()  = 0; // EXPORT

-                  virtual int readTlsDirectory()  = 0; // EXPORT

-                  

-                  virtual unsigned int getBits() const = 0;

-

-                  /// Accessor function for the MZ header.

-                  const MzHeader& mzHeader() const;

-                  /// Accessor function for the MZ header.

-                  MzHeader& mzHeader(); // EXPORT

-

-                  /// Accessor function for the export directory.

-                  const ExportDirectory& expDir() const;

-                  /// Accessor function for the export directory.

-                  ExportDirectory& expDir(); // EXPORT

-                  

-                  /// Accessor function for the bound import directory.

-                  const BoundImportDirectory& boundImpDir() const;

-                  /// Accessor function for the bound import directory.

-                  BoundImportDirectory& boundImpDir(); // EXPORT

-                  

-                  /// Accessor function for the resource directory.

-                  const ResourceDirectory& resDir() const;

-                  /// Accessor function for the resource directory.

-                  ResourceDirectory& resDir(); // EXPORT

-

-                  /// Accessor function for the relocations directory.

-                  const RelocationsDirectory& relocDir() const;

-                  /// Accessor function for the relocations directory.

-                  RelocationsDirectory& relocDir(); // EXPORT

-

-                  /// Accessor function for the COM+ descriptor directory.

-                  const ComHeaderDirectory& comDir() const;

-                  /// Accessor function for the COM+ descriptor directory.

-                  ComHeaderDirectory& comDir(); // EXPORT

-

-                  /// Accessor function for the IAT directory.

-                  const IatDirectory& iatDir() const;

-                  /// Accessor function for the IAT directory.

-                  IatDirectory& iatDir(); // EXPORT

-                  

-                  /// Accessor function for the debug directory.

-                  const DebugDirectory& debugDir() const;

-                  /// Accessor function for the debug directory.

-                  DebugDirectory& debugDir(); // EXPORT

-                  

-        };

-        

-        /**

-        * This class implements the common structures of PE and PE+ files.

-        **/

-        template<int bits>

-        class PeFileT : public PeFile

-        {

-                typedef typename PeFile_Traits<bits>::PeHeader32_64 PeHeader32_64;

-                

-                private:

-                  PeHeader32_64 m_peh; ///< PE header of the current file.

-                  ImportDirectory<bits> m_impdir; ///< Import directory of the current file.

-                  TlsDirectory<bits> m_tlsdir;

-                

-                public:

-                  /// Default constructor which exists only for the sake of allowing to construct files without filenames.

-                  PeFileT();

-                  

-                  virtual ~PeFileT() {}

-                  

-                  /// Initializes a PeFile with a filename

-                  explicit PeFileT(const std::string& strFilename);

-                  

-                  /// Returns the name of the current file.

-                  std::string getFileName() const;

-                  /// Changes the name of the current file.

-                  void setFileName(std::string strFilename);

-

-                  /// Reads the MZ header of the current file from disc.

-                  int readMzHeader() ;

-                  /// Reads the export directory of the current file from disc.

-                  int readExportDirectory() ;

-                  /// Reads the PE header of the current file from disc.

-                  int readPeHeader() ;

-                  /// Reads the import directory of the current file from disc.

-                  int readImportDirectory() ;

-                  /// Reads the bound import directory of the current file from disc.

-                  int readBoundImportDirectory() ;

-                  /// Reads the resource directory of the current file from disc.

-                  int readResourceDirectory() ;

-                  /// Reads the relocations directory of the current file from disc.

-                  int readRelocationsDirectory() ;

-                  /// Reads the COM+ descriptor directory of the current file from disc.

-                  int readComHeaderDirectory() ;

-                  /// Reads the IAT directory of the current file from disc.

-                  int readIatDirectory() ;

-                  /// Reads the Debug directory of the current file.              

-                  int readDebugDirectory() ;

-                  int readTlsDirectory() ;

-                  

-                  unsigned int getBits() const

-                  {

-                          return bits;

-                  }

-                  

-                  /// Accessor function for the PE header.

-                  const PeHeader32_64& peHeader() const;

-                  /// Accessor function for the PE header.

-                  PeHeader32_64& peHeader();

-

-                  /// Accessor function for the import directory.

-                  const ImportDirectory<bits>& impDir() const;

-                  /// Accessor function for the import directory.

-                  ImportDirectory<bits>& impDir();

-                  

-                  const TlsDirectory<bits>& tlsDir() const;

-                  TlsDirectory<bits>& tlsDir();

-        };

-

-        /**

-        * This class is the main class for handling PE files.

-        **/

-        class PeFile32 : public PeFileT<32>

-        {

-                public:

-                  /// Default constructor which exists only for the sake of allowing to construct files without filenames.

-                  PeFile32();

-

-                  /// Initializes a PeFile with a filename

-                  explicit PeFile32(const std::string& strFlename);

-                  virtual void visit(PeFileVisitor &v) { v.callback( *this ); }

-        };

-        

-        /**

-        * This class is the main class for handling PE+ files.

-        **/

-        class PeFile64 : public PeFileT<64>

-        {

-                public:

-                  /// Default constructor which exists only for the sake of allowing to construct files without filenames.

-                  PeFile64();

-

-                  /// Initializes a PeFile with a filename

-                  explicit PeFile64(const std::string& strFlename);

-                  virtual void visit(PeFileVisitor &v) { v.callback( *this ); }

-        };

-        

-        //typedef PeFileT<32> PeFile32;

-        //typedef PeFileT<64> PeFile64;

-        

-        /**

-        * @param strFilename Name of the current file.

-        **/

-        template<int bits>

-        PeFileT<bits>::PeFileT(const std::string& strFilename)

-        {

-                m_filename = strFilename;

-        }

-

-        template<int bits>

-        PeFileT<bits>::PeFileT()

-        {

-        }

-

-        template<int bits>

-        int PeFileT<bits>::readPeHeader() 

-        {

-                return peHeader().read(getFileName(), mzHeader().getAddressOfPeHeader());

-        }

-

-        

-        template<int bits>

-        int PeFileT<bits>::readImportDirectory() 

-        {

-                if (peHeader().calcNumberOfRvaAndSizes() >= 2

-                        && peHeader().getIddImportRva()

-                        && peHeader().getIddImportSize())

-                {

-                        return impDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddImportRva())), peHeader().getIddImportSize(), peHeader());

-                }

-                return ERROR_DIRECTORY_DOES_NOT_EXIST;

-        }

-

-        /**

-        * @return A reference to the file's PE header.

-        **/

-        template<int bits>

-        const typename PeFile_Traits<bits>::PeHeader32_64& PeFileT<bits>::peHeader() const

-        {

-                return m_peh;

-        }

-

-        /**

-        * @return A reference to the file's PE header.

-        **/

-        template<int bits>

-        typename PeFile_Traits<bits>::PeHeader32_64& PeFileT<bits>::peHeader()

-        {

-                return m_peh;

-        }

-

-        /**

-        * @return A reference to the file's import directory.

-        **/

-        template<int bits>

-        const ImportDirectory<bits>& PeFileT<bits>::impDir() const

-        {

-                return m_impdir;

-        }

-

-        /**

-        * @return A reference to the file's import directory.

-        **/

-        template<int bits>

-        ImportDirectory<bits>& PeFileT<bits>::impDir()

-        {

-                return m_impdir;

-        }

-

-        template<int bits>

-        const TlsDirectory<bits>& PeFileT<bits>::tlsDir() const

-        {

-                return m_tlsdir;

-        }

-

-        template<int bits>

-        TlsDirectory<bits>& PeFileT<bits>::tlsDir()

-        {

-                return m_tlsdir;

-        }

-

-        /**

-        * @return Filename of the current file.

-        **/

-        template<int bits>

-        std::string PeFileT<bits>::getFileName() const

-        {

-                return m_filename;

-        }

-

-        /**

-        * @param strFilename New filename.

-        **/

-        template<int bits>

-        void PeFileT<bits>::setFileName(std::string strFilename)

-        {

-                m_filename = strFilename;

-        }

-

-        template<int bits>

-        int PeFileT<bits>::readMzHeader() 

-        {

-                return mzHeader().read(getFileName());

-        }

-        

-        template<int bits>

-        int PeFileT<bits>::readExportDirectory() 

-        {

-                if (peHeader().calcNumberOfRvaAndSizes() >= 1

-                        && peHeader().getIddExportRva() && peHeader().getIddExportSize())

-                {

-                        return expDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddExportRva())), peHeader().getIddExportSize(), peHeader());

-                }

-                return ERROR_DIRECTORY_DOES_NOT_EXIST;

-        }

-

-        

-        template<int bits>

-        int PeFileT<bits>::readBoundImportDirectory() 

-        {

-                if (peHeader().calcNumberOfRvaAndSizes() >= 12

-                        && peHeader().getIddBoundImportRva() && peHeader().getIddBoundImportSize())

-                {

-                        return boundImpDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddBoundImportRva())), peHeader().getIddBoundImportSize());

-                }

-                return ERROR_DIRECTORY_DOES_NOT_EXIST;

-        }

-

-        template<int bits>

-        int PeFileT<bits>::readResourceDirectory() 

-        {

-                if (peHeader().calcNumberOfRvaAndSizes() >= 3

-                        && peHeader().getIddResourceRva() && peHeader().getIddResourceSize())

-                {

-                        return resDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddResourceRva())), peHeader().getIddResourceSize(), peHeader().getIddResourceRva());

-                }

-                return ERROR_DIRECTORY_DOES_NOT_EXIST;

-        }

-

-        template<int bits>

-        int PeFileT<bits>::readRelocationsDirectory() 

-        {

-                if (peHeader().calcNumberOfRvaAndSizes() >= 6

-                        && peHeader().getIddBaseRelocRva() && peHeader().getIddBaseRelocSize())

-                {

-                        return relocDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddBaseRelocRva())), peHeader().getIddBaseRelocSize());

-                }

-                return ERROR_DIRECTORY_DOES_NOT_EXIST;

-        }

-

-        template<int bits>

-        int PeFileT<bits>::readComHeaderDirectory() 

-        {

-                if (peHeader().calcNumberOfRvaAndSizes() >= 15

-                        && peHeader().getIddComHeaderRva() && peHeader().getIddComHeaderSize())

-                {

-                        return comDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddComHeaderRva())), peHeader().getIddComHeaderSize());

-                }

-                        std::cout << peHeader().getIddComHeaderRva() << std::endl;

-                        std::exit(0);

-                return ERROR_DIRECTORY_DOES_NOT_EXIST;

-        }

-

-        template<int bits>

-        int PeFileT<bits>::readIatDirectory() 

-        {

-                if (peHeader().calcNumberOfRvaAndSizes() >= 13

-                        && peHeader().getIddIatRva() && peHeader().getIddIatSize())

-                {

-                        return iatDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddIatRva())), peHeader().getIddIatSize());

-                }

-                return ERROR_DIRECTORY_DOES_NOT_EXIST;

-        }

-

-        template<int bits>

-        int PeFileT<bits>::readDebugDirectory() 

-        {

-                if (peHeader().calcNumberOfRvaAndSizes() >= 7

-                        && peHeader().getIddDebugRva() && peHeader().getIddDebugSize())

-                {

-                        return debugDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddDebugRva())), peHeader().getIddDebugSize());

-                }

-                return ERROR_DIRECTORY_DOES_NOT_EXIST;

-        }

-

-        template<int bits>

-        int PeFileT<bits>::readTlsDirectory() 

-        {

-                if (peHeader().calcNumberOfRvaAndSizes() >= 10

-                        && peHeader().getIddTlsRva() && peHeader().getIddTlsSize())

-                {

-                        return tlsDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddTlsRva())), peHeader().getIddTlsSize());

-                }

-                return ERROR_DIRECTORY_DOES_NOT_EXIST;

-        }

-

-}

-

-#endif

+/*
+* PeFile.h - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#ifndef PEFILE_H
+#define PEFILE_H
+
+#include "PeLibInc.h"
+#include "MzHeader.h"
+#include "PeHeader.h"
+#include "ImportDirectory.h"
+#include "ExportDirectory.h"
+#include "BoundImportDirectory.h"
+#include "ResourceDirectory.h"
+#include "RelocationsDirectory.h"
+#include "ComHeaderDirectory.h"
+#include "IatDirectory.h"
+#include "DebugDirectory.h"
+#include "TlsDirectory.h"
+
+namespace PeLib
+{
+        class PeFile32;
+        class PeFile64;
+        
+        /**
+        * Visitor base class for PeFiles.
+        **/
+        class PeFileVisitor
+        {
+                public:
+                  virtual void callback(PeFile32 &file){}
+                  virtual void callback(PeFile64 &file){}
+                  virtual ~PeFileVisitor(){}
+        };
+
+        /**
+        * Traits class that's used to decide of what type the PeHeader in a PeFile is.
+        **/
+        template<int>
+        struct PeFile_Traits;
+
+        template<>
+        struct PeFile_Traits<32>
+        {
+                typedef PeHeader32 PeHeader32_64;
+        };
+        
+        template<>
+        struct PeFile_Traits<64>
+        {
+                typedef PeHeader64 PeHeader32_64;
+        };
+        
+        /**
+        * This class represents the common structures of PE and PE+ files.
+        **/
+        class PeFile
+        {
+                protected:
+                  std::string m_filename; ///< Name of the current file.
+                  MzHeader m_mzh; ///< MZ header of the current file.
+                  ExportDirectory m_expdir; ///< Export directory of the current file.
+                  BoundImportDirectory m_boundimpdir; ///< BoundImportDirectory of the current file.
+                  ResourceDirectory m_resdir; ///< ResourceDirectory of the current file.
+                  RelocationsDirectory m_relocs; ///< Relocations directory of the current file.
+                  ComHeaderDirectory m_comdesc; ///< COM+ descriptor directory of the current file.
+                  IatDirectory m_iat; ///< Import address table of the current file.
+                  DebugDirectory m_debugdir;
+                public:
+                  virtual ~PeFile();
+                  
+                  /// Returns the name of the current file.
+                  virtual std::string getFileName() const = 0; // EXPORT
+                  /// Changes the name of the current file.
+                  virtual void setFileName(std::string strFilename) = 0; // EXPORT
+                  
+                  virtual void visit(PeFileVisitor &v) = 0;
+                  
+                  /// Reads the MZ header of the current file from disc.
+                  virtual int readMzHeader() = 0; // EXPORT
+                  /// Reads the export directory of the current file from disc.
+                  virtual int readExportDirectory()  = 0; // EXPORT
+                  /// Reads the PE header of the current file from disc.
+                  virtual int readPeHeader()  = 0; // EXPORT
+                  /// Reads the import directory of the current file from disc.
+                  virtual int readImportDirectory()  = 0; // EXPORT
+                  /// Reads the bound import directory of the current file from disc.
+                  virtual int readBoundImportDirectory()  = 0; // EXPORT
+                  /// Reads the resource directory of the current file from disc.
+                  virtual int readResourceDirectory()  = 0; // EXPORT
+                  /// Reads the relocations directory of the current file from disc.
+                  virtual int readRelocationsDirectory()  = 0; // EXPORT
+                  /// Reads the COM+ descriptor directory of the current file from disc.
+                  virtual int readComHeaderDirectory()  = 0; // EXPORT
+                  /// Reads the IAT directory of the current file from disc.
+                  virtual int readIatDirectory()  = 0; // EXPORT
+                  /// Reads the Debug directory of the current file.              
+                  virtual int readDebugDirectory()  = 0; // EXPORT
+                  virtual int readTlsDirectory()  = 0; // EXPORT
+                  
+                  virtual unsigned int getBits() const = 0;
+
+                  /// Accessor function for the MZ header.
+                  const MzHeader& mzHeader() const;
+                  /// Accessor function for the MZ header.
+                  MzHeader& mzHeader(); // EXPORT
+
+                  /// Accessor function for the export directory.
+                  const ExportDirectory& expDir() const;
+                  /// Accessor function for the export directory.
+                  ExportDirectory& expDir(); // EXPORT
+                  
+                  /// Accessor function for the bound import directory.
+                  const BoundImportDirectory& boundImpDir() const;
+                  /// Accessor function for the bound import directory.
+                  BoundImportDirectory& boundImpDir(); // EXPORT
+                  
+                  /// Accessor function for the resource directory.
+                  const ResourceDirectory& resDir() const;
+                  /// Accessor function for the resource directory.
+                  ResourceDirectory& resDir(); // EXPORT
+
+                  /// Accessor function for the relocations directory.
+                  const RelocationsDirectory& relocDir() const;
+                  /// Accessor function for the relocations directory.
+                  RelocationsDirectory& relocDir(); // EXPORT
+
+                  /// Accessor function for the COM+ descriptor directory.
+                  const ComHeaderDirectory& comDir() const;
+                  /// Accessor function for the COM+ descriptor directory.
+                  ComHeaderDirectory& comDir(); // EXPORT
+
+                  /// Accessor function for the IAT directory.
+                  const IatDirectory& iatDir() const;
+                  /// Accessor function for the IAT directory.
+                  IatDirectory& iatDir(); // EXPORT
+                  
+                  /// Accessor function for the debug directory.
+                  const DebugDirectory& debugDir() const;
+                  /// Accessor function for the debug directory.
+                  DebugDirectory& debugDir(); // EXPORT
+                  
+        };
+        
+        /**
+        * This class implements the common structures of PE and PE+ files.
+        **/
+        template<int bits>
+        class PeFileT : public PeFile
+        {
+                typedef typename PeFile_Traits<bits>::PeHeader32_64 PeHeader32_64;
+                
+                private:
+                  PeHeader32_64 m_peh; ///< PE header of the current file.
+                  ImportDirectory<bits> m_impdir; ///< Import directory of the current file.
+                  TlsDirectory<bits> m_tlsdir;
+                
+                public:
+                  /// Default constructor which exists only for the sake of allowing to construct files without filenames.
+                  PeFileT();
+                  
+                  virtual ~PeFileT() {}
+                  
+                  /// Initializes a PeFile with a filename
+                  explicit PeFileT(const std::string& strFilename);
+                  
+                  /// Returns the name of the current file.
+                  std::string getFileName() const;
+                  /// Changes the name of the current file.
+                  void setFileName(std::string strFilename);
+
+                  /// Reads the MZ header of the current file from disc.
+                  int readMzHeader() ;
+                  /// Reads the export directory of the current file from disc.
+                  int readExportDirectory() ;
+                  /// Reads the PE header of the current file from disc.
+                  int readPeHeader() ;
+                  /// Reads the import directory of the current file from disc.
+                  int readImportDirectory() ;
+                  /// Reads the bound import directory of the current file from disc.
+                  int readBoundImportDirectory() ;
+                  /// Reads the resource directory of the current file from disc.
+                  int readResourceDirectory() ;
+                  /// Reads the relocations directory of the current file from disc.
+                  int readRelocationsDirectory() ;
+                  /// Reads the COM+ descriptor directory of the current file from disc.
+                  int readComHeaderDirectory() ;
+                  /// Reads the IAT directory of the current file from disc.
+                  int readIatDirectory() ;
+                  /// Reads the Debug directory of the current file.              
+                  int readDebugDirectory() ;
+                  int readTlsDirectory() ;
+                  
+                  unsigned int getBits() const
+                  {
+                          return bits;
+                  }
+                  
+                  /// Accessor function for the PE header.
+                  const PeHeader32_64& peHeader() const;
+                  /// Accessor function for the PE header.
+                  PeHeader32_64& peHeader();
+
+                  /// Accessor function for the import directory.
+                  const ImportDirectory<bits>& impDir() const;
+                  /// Accessor function for the import directory.
+                  ImportDirectory<bits>& impDir();
+                  
+                  const TlsDirectory<bits>& tlsDir() const;
+                  TlsDirectory<bits>& tlsDir();
+        };
+
+        /**
+        * This class is the main class for handling PE files.
+        **/
+        class PeFile32 : public PeFileT<32>
+        {
+                public:
+                  /// Default constructor which exists only for the sake of allowing to construct files without filenames.
+                  PeFile32();
+
+                  /// Initializes a PeFile with a filename
+                  explicit PeFile32(const std::string& strFlename);
+                  virtual void visit(PeFileVisitor &v) { v.callback( *this ); }
+        };
+        
+        /**
+        * This class is the main class for handling PE+ files.
+        **/
+        class PeFile64 : public PeFileT<64>
+        {
+                public:
+                  /// Default constructor which exists only for the sake of allowing to construct files without filenames.
+                  PeFile64();
+
+                  /// Initializes a PeFile with a filename
+                  explicit PeFile64(const std::string& strFlename);
+                  virtual void visit(PeFileVisitor &v) { v.callback( *this ); }
+        };
+        
+        //typedef PeFileT<32> PeFile32;
+        //typedef PeFileT<64> PeFile64;
+        
+        /**
+        * @param strFilename Name of the current file.
+        **/
+        template<int bits>
+        PeFileT<bits>::PeFileT(const std::string& strFilename)
+        {
+                m_filename = strFilename;
+        }
+
+        template<int bits>
+        PeFileT<bits>::PeFileT()
+        {
+        }
+
+        template<int bits>
+        int PeFileT<bits>::readPeHeader() 
+        {
+                return peHeader().read(getFileName(), mzHeader().getAddressOfPeHeader());
+        }
+
+        
+        template<int bits>
+        int PeFileT<bits>::readImportDirectory() 
+        {
+                if (peHeader().calcNumberOfRvaAndSizes() >= 2
+                        && peHeader().getIddImportRva()
+                        && peHeader().getIddImportSize())
+                {
+                        return impDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddImportRva())), peHeader().getIddImportSize(), peHeader());
+                }
+                return ERROR_DIRECTORY_DOES_NOT_EXIST;
+        }
+
+        /**
+        * @return A reference to the file's PE header.
+        **/
+        template<int bits>
+        const typename PeFile_Traits<bits>::PeHeader32_64& PeFileT<bits>::peHeader() const
+        {
+                return m_peh;
+        }
+
+        /**
+        * @return A reference to the file's PE header.
+        **/
+        template<int bits>
+        typename PeFile_Traits<bits>::PeHeader32_64& PeFileT<bits>::peHeader()
+        {
+                return m_peh;
+        }
+
+        /**
+        * @return A reference to the file's import directory.
+        **/
+        template<int bits>
+        const ImportDirectory<bits>& PeFileT<bits>::impDir() const
+        {
+                return m_impdir;
+        }
+
+        /**
+        * @return A reference to the file's import directory.
+        **/
+        template<int bits>
+        ImportDirectory<bits>& PeFileT<bits>::impDir()
+        {
+                return m_impdir;
+        }
+
+        template<int bits>
+        const TlsDirectory<bits>& PeFileT<bits>::tlsDir() const
+        {
+                return m_tlsdir;
+        }
+
+        template<int bits>
+        TlsDirectory<bits>& PeFileT<bits>::tlsDir()
+        {
+                return m_tlsdir;
+        }
+
+        /**
+        * @return Filename of the current file.
+        **/
+        template<int bits>
+        std::string PeFileT<bits>::getFileName() const
+        {
+                return m_filename;
+        }
+
+        /**
+        * @param strFilename New filename.
+        **/
+        template<int bits>
+        void PeFileT<bits>::setFileName(std::string strFilename)
+        {
+                m_filename = strFilename;
+        }
+
+        template<int bits>
+        int PeFileT<bits>::readMzHeader() 
+        {
+                return mzHeader().read(getFileName());
+        }
+        
+        template<int bits>
+        int PeFileT<bits>::readExportDirectory() 
+        {
+                if (peHeader().calcNumberOfRvaAndSizes() >= 1
+                        && peHeader().getIddExportRva() && peHeader().getIddExportSize())
+                {
+                        return expDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddExportRva())), peHeader().getIddExportSize(), peHeader());
+                }
+                return ERROR_DIRECTORY_DOES_NOT_EXIST;
+        }
+
+        
+        template<int bits>
+        int PeFileT<bits>::readBoundImportDirectory() 
+        {
+                if (peHeader().calcNumberOfRvaAndSizes() >= 12
+                        && peHeader().getIddBoundImportRva() && peHeader().getIddBoundImportSize())
+                {
+                        return boundImpDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddBoundImportRva())), peHeader().getIddBoundImportSize());
+                }
+                return ERROR_DIRECTORY_DOES_NOT_EXIST;
+        }
+
+        template<int bits>
+        int PeFileT<bits>::readResourceDirectory() 
+        {
+                if (peHeader().calcNumberOfRvaAndSizes() >= 3
+                        && peHeader().getIddResourceRva() && peHeader().getIddResourceSize())
+                {
+                        return resDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddResourceRva())), peHeader().getIddResourceSize(), peHeader().getIddResourceRva());
+                }
+                return ERROR_DIRECTORY_DOES_NOT_EXIST;
+        }
+
+        template<int bits>
+        int PeFileT<bits>::readRelocationsDirectory() 
+        {
+                if (peHeader().calcNumberOfRvaAndSizes() >= 6
+                        && peHeader().getIddBaseRelocRva() && peHeader().getIddBaseRelocSize())
+                {
+                        return relocDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddBaseRelocRva())), peHeader().getIddBaseRelocSize());
+                }
+                return ERROR_DIRECTORY_DOES_NOT_EXIST;
+        }
+
+        template<int bits>
+        int PeFileT<bits>::readComHeaderDirectory() 
+        {
+                if (peHeader().calcNumberOfRvaAndSizes() >= 15
+                        && peHeader().getIddComHeaderRva() && peHeader().getIddComHeaderSize())
+                {
+                        return comDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddComHeaderRva())), peHeader().getIddComHeaderSize());
+                }
+                        std::cout << peHeader().getIddComHeaderRva() << std::endl;
+                        std::exit(0);
+                return ERROR_DIRECTORY_DOES_NOT_EXIST;
+        }
+
+        template<int bits>
+        int PeFileT<bits>::readIatDirectory() 
+        {
+                if (peHeader().calcNumberOfRvaAndSizes() >= 13
+                        && peHeader().getIddIatRva() && peHeader().getIddIatSize())
+                {
+                        return iatDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddIatRva())), peHeader().getIddIatSize());
+                }
+                return ERROR_DIRECTORY_DOES_NOT_EXIST;
+        }
+
+        template<int bits>
+        int PeFileT<bits>::readDebugDirectory() 
+        {
+                if (peHeader().calcNumberOfRvaAndSizes() >= 7
+                        && peHeader().getIddDebugRva() && peHeader().getIddDebugSize())
+                {
+                        return debugDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddDebugRva())), peHeader().getIddDebugSize());
+                }
+                return ERROR_DIRECTORY_DOES_NOT_EXIST;
+        }
+
+        template<int bits>
+        int PeFileT<bits>::readTlsDirectory() 
+        {
+                if (peHeader().calcNumberOfRvaAndSizes() >= 10
+                        && peHeader().getIddTlsRva() && peHeader().getIddTlsSize())
+                {
+                        return tlsDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddTlsRva())), peHeader().getIddTlsSize());
+                }
+                return ERROR_DIRECTORY_DOES_NOT_EXIST;
+        }
+
+}
+
+#endif
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/PeHeader.cpp b/utils/zenutils/libraries/pelib-0.9/pelib/PeHeader.cpp
index fe7011072c..1199e6bdd1 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/PeHeader.cpp
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/PeHeader.cpp
@@ -1,90 +1,90 @@
-/*

-* PeHeader.cpp - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#include "PeLibInc.h"

-#include "PeHeader.h"

-

-namespace PeLib

-{

-        template<>

-        void PeHeaderT<32>::readBaseOfData(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<32>& header) const

-        {

-                ibBuffer >> header.OptionalHeader.BaseOfData;

-        }

-        

-        template<>

-        void PeHeaderT<64>::readBaseOfData(InputBuffer&, PELIB_IMAGE_NT_HEADERS<64>&) const

-        {

-        }

-        

-        template<>

-        void PeHeaderT<32>::rebuildBaseOfData(OutputBuffer& obBuffer) const

-        {

-                obBuffer << m_inthHeader.OptionalHeader.BaseOfData;

-        }

-        

-        template<>

-        void PeHeaderT<64>::rebuildBaseOfData(OutputBuffer&) const

-        {

-        }

-        

-    template<>

-    bool PeHeaderT<32>::isValid() const

-    {

-                return true;

-    }

-    

-    template<>

-    bool PeHeaderT<64>::isValid() const

-    {

-                return true;

-    }

-    

-    template<>

-    bool PeHeaderT<32>::isValid(unsigned int pehf) const

-    {

-    /*

-        if (pehf == NtSignature)

-        {

-            return m_inthHeader.Signature == IMAGE_NT_SIGNATURE;

-        }

-        else if (pehf == NumberOfSections)

-        {

-            return getNumberOfSections() == calcNumberOfSections();

-        }      */

-        return false;

-    }

-

-    template<>

-    bool PeHeaderT<64>::isValid(unsigned int pehf) const

-    {

-        return false;

-    }

-

-        /**

-        * @return The BaseOfData value from the PE header.

-        **/

-        dword PeHeader32::getBaseOfData() const

-        {

-                return m_inthHeader.OptionalHeader.BaseOfData;

-        }

-

-        /**

-        * Changes the file's BaseOfData.

-        * @param dwValue New value.

-        **/

-        void PeHeader32::setBaseOfData(dword dwValue)

-        {

-                m_inthHeader.OptionalHeader.BaseOfData = dwValue;

-        }

-

-}

+/*
+* PeHeader.cpp - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#include "PeLibInc.h"
+#include "PeHeader.h"
+
+namespace PeLib
+{
+        template<>
+        void PeHeaderT<32>::readBaseOfData(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<32>& header) const
+        {
+                ibBuffer >> header.OptionalHeader.BaseOfData;
+        }
+        
+        template<>
+        void PeHeaderT<64>::readBaseOfData(InputBuffer&, PELIB_IMAGE_NT_HEADERS<64>&) const
+        {
+        }
+        
+        template<>
+        void PeHeaderT<32>::rebuildBaseOfData(OutputBuffer& obBuffer) const
+        {
+                obBuffer << m_inthHeader.OptionalHeader.BaseOfData;
+        }
+        
+        template<>
+        void PeHeaderT<64>::rebuildBaseOfData(OutputBuffer&) const
+        {
+        }
+        
+    template<>
+    bool PeHeaderT<32>::isValid() const
+    {
+                return true;
+    }
+    
+    template<>
+    bool PeHeaderT<64>::isValid() const
+    {
+                return true;
+    }
+    
+    template<>
+    bool PeHeaderT<32>::isValid(unsigned int pehf) const
+    {
+    /*
+        if (pehf == NtSignature)
+        {
+            return m_inthHeader.Signature == IMAGE_NT_SIGNATURE;
+        }
+        else if (pehf == NumberOfSections)
+        {
+            return getNumberOfSections() == calcNumberOfSections();
+        }      */
+        return false;
+    }
+
+    template<>
+    bool PeHeaderT<64>::isValid(unsigned int pehf) const
+    {
+        return false;
+    }
+
+        /**
+        * @return The BaseOfData value from the PE header.
+        **/
+        dword PeHeader32::getBaseOfData() const
+        {
+                return m_inthHeader.OptionalHeader.BaseOfData;
+        }
+
+        /**
+        * Changes the file's BaseOfData.
+        * @param dwValue New value.
+        **/
+        void PeHeader32::setBaseOfData(dword dwValue)
+        {
+                m_inthHeader.OptionalHeader.BaseOfData = dwValue;
+        }
+
+}
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/PeHeader.h b/utils/zenutils/libraries/pelib-0.9/pelib/PeHeader.h
index 08eaca4072..d5c1748233 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/PeHeader.h
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/PeHeader.h
@@ -1,2685 +1,2685 @@
-/*

-* PeHeader.h - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#ifndef PEHEADER_H

-#define PEHEADER_H

-

-#include "PeLibAux.h"

-

-namespace PeLib

-{

-        class PeHeader

-        {

-//              protected:

-//                      virtual void readBaseOfData(InputBuffer& ibBuffer) = 0;

-//                      virtual void rebuildBaseOfData(OutputBuffer& obBuffer) const = 0;

-                        

-                public:

-                        virtual ~PeHeader(){};

-        };

-        

-        /// Class that handles the PE header of files.

-        /**

-        * This class can read and modify PE headers. It provides set- and get functions to access

-        * all individual members of a PE header. Furthermore it's possible to validate and rebuild

-        * PE headers. A PE header includes the IMAGE_Nt_HEADERS and the section definitions of a PE file.

-        * \todo getIdReservedRva

-        **/

-        template<int x>

-        class PeHeaderT : public PeHeader

-        {

-                private:

-                        void readBaseOfData(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const;

-                        void rebuildBaseOfData(OutputBuffer& obBuffer) const;

-                

-                protected:

-                  std::vector<PELIB_IMAGE_SECTION_HEADER> m_vIsh; ///< Stores section header information.

-                  PELIB_IMAGE_NT_HEADERS<x> m_inthHeader; ///< Stores Nt header information.

-                  dword m_uiOffset; ///< Equivalent to the value returned by #PeLib::MzHeader::getAddressOfPeFile

-

-                public:

-                  typedef typename FieldSizes<x>::VAR4_8 VAR4_8;

-                

-                  PeHeaderT() : m_uiOffset(0)

-                  {

-                  }

-                        

-                  /// Add a section to the header.

-                  int addSection(const std::string& strName, dword dwSize); // EXPORT

-                  

-                  unsigned int calcSizeOfImage() const; // EXPORT

-                  

-                  /// Returns the unused space after the header.

-                  unsigned int calcSpaceAfterHeader() const; // EXPORT

-                  

-                  /// Returns the address of the physically first section (not the first defined section).

-                  unsigned int calcStartOfCode() const; // EXPORT

-

-                  /// Calculates the offset for a new section of size uiSize.

-                  unsigned int calcOffset() const; // EXPORT

-

-                  /// Calculates the Rva for a new section of size uiSize.

-                  unsigned int calcRva() const; // EXPORT

-                  

-                  /// Returns the number of sections in the current file.

-                  word calcNumberOfSections() const; // EXPORT

-

-                  void enlargeLastSection(unsigned int uiSize); // EXPORT

-                  

-                  /// Returns the section Id of the section that contains the offset.

-                  word getSectionWithOffset(VAR4_8 dwOffset) const; // EXPORT

-

-                  /// Returns the number of the section which the given relative address points to.

-                  word getSectionWithRva(VAR4_8 rva) const; // EXPORT

-

-          bool isValid() const; // EXPORT

-          bool isValid(unsigned int foo) const; // EXPORT

-

-                  /// Corrects the current PE header.

-                  void makeValid(dword dwOffset); // EXPORT

-

-                  /// Converts a file offset to a relative virtual offset.

-                  unsigned int offsetToRva(VAR4_8 dwOffset) const; // EXPORT

-

-                  /// Converts a file offset to a virtual address.

-                  unsigned int offsetToVa(VAR4_8 dwOffset) const; // EXPORT

-

-                  /// Reads the PE header of a file.

-                  int read(std::string strFilename, unsigned int uiOffset); // EXPORT

-

-                  int read(const unsigned char* pcBuffer, unsigned int uiSize, unsigned int uiOffset); // EXPORT

-

-                  void readHeader(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const;

-                  void readDataDirectories(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const;

-                  std::vector<PELIB_IMAGE_SECTION_HEADER> readSections(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const;

-        

-                  /// Rebuilds the current PE header.

-                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT

-

-                  /// Converts a relative virtual address to a file offset.

-                  VAR4_8 rvaToOffset(VAR4_8 dwRva) const; // EXPORT

-

-                  /// Converts a relative virtual address to a virtual address.

-                  VAR4_8 rvaToVa(VAR4_8 dwRva) const; // EXPORT

-

-                  /// Calculates the size for the current PE header including all section definitions.

-                  unsigned int size() const;

-

-                  VAR4_8 vaToRva(VAR4_8 dwRva) const; // EXPORT

-                  VAR4_8 vaToOffset(VAR4_8 dwRva) const; // EXPORT

-

-                  /// Save the PE header to a file.

-                  int write(std::string strFilename, unsigned int uiOffset) const; // EXPORT

-

-                  /// Writes sections to a file.

-                  int writeSections(const std::string& strFilename) const; // EXPORT

-                  /// Overwrites a section with new data.

-                  int writeSectionData(const std::string& strFilename, word wSecnr, const std::vector<byte>& vBuffer) const; // EXPORT

-

-// header getters

-                  /// Returns the Signature value of the header.

-                  dword getNtSignature() const; // EXPORT

-                  /// Returns the Machine value of the header.

-                  word getMachine() const; // EXPORT

-                  /// Returns the Sections value of the header.

-                  word getNumberOfSections() const; // EXPORT

-                  /// Returns the TimeDateStamp value of the header.

-                  dword getTimeDateStamp() const; // EXPORT

-                  /// Returns the PointerToSymbolTable value of the header.

-                  dword getPointerToSymbolTable() const; // EXPORT

-                  /// Returns the NumberOfSymbols value of the header.

-                  dword getNumberOfSymbols() const; // EXPORT

-                  /// Returns the SizeOfOptionalHeader value of the header.

-                  word getSizeOfOptionalHeader() const; // EXPORT

-                  /// Returns the Characteristics value of the header.

-                  word getCharacteristics() const; // EXPORT

-

-                  /// Returns the Magic value of the header.

-                  word getMagic() const; // EXPORT

-                  /// Returns the MajorLinkerVersion value of the header.

-                  byte getMajorLinkerVersion() const; // EXPORT

-                  /// Returns the MinorLinkerVersion value of the header.

-                  byte getMinorLinkerVersion() const; // EXPORT

-                  /// Returns the SizeOfCode value of the header.

-                  dword getSizeOfCode() const; // EXPORT

-                  /// Returns the SizeOfInitializedData value of the header.

-                  dword getSizeOfInitializedData() const; // EXPORT

-                  /// Returns the SizeOfUninitializedData value of the header.

-                  dword getSizeOfUninitializedData() const; // EXPORT

-                  /// Returns the AddressOfEntryPoint value of the header.

-                  dword getAddressOfEntryPoint() const; // EXPORT

-                  /// Returns the BaseOfCode value of the header.

-                  dword getBaseOfCode() const; // EXPORT

-                  /// Returns the ImageBase value of the header.

-                  VAR4_8 getImageBase() const; // EXPORT

-                  /// Returns the SectionAlignment value of the header.

-                  dword getSectionAlignment() const; // EXPORT

-                  /// Returns the FileAlignment value of the header.

-                  dword getFileAlignment() const; // EXPORT

-                  /// Returns the MajorOperatingSystemVersion value of the header.

-                  word getMajorOperatingSystemVersion() const; // EXPORT

-                  /// Returns the MinorOperatingSystemVersion value of the header.

-                  word getMinorOperatingSystemVersion() const; // EXPORT

-                  /// Returns the MajorImageVersion value of the header.

-                  word getMajorImageVersion() const; // EXPORT

-                  /// Returns the MinorImageVersion value of the header.

-                  word getMinorImageVersion() const; // EXPORT

-                  /// Returns the MajorSubsystemVersion value of the header.

-                  word getMajorSubsystemVersion() const; // EXPORT

-                  /// Returns the MinorSubsystemVersion value of the header.

-                  word getMinorSubsystemVersion() const; // EXPORT

-                  /// Returns the Reserved1 value of the header.

-                  dword getWin32VersionValue() const; // EXPORT

-                  /// Returns the SizeOfImage value of the header.

-                  dword getSizeOfImage() const; // EXPORT

-                  /// Returns the SizeOfHeaders value of the header.

-                  dword getSizeOfHeaders() const; // EXPORT

-                  /// Returns the CheckSum value of the header.

-                  dword getCheckSum() const; // EXPORT

-                  /// Returns the Subsystem value of the header.

-                  word getSubsystem() const; // EXPORT

-                  /// Returns the DllCharacteristics value of the header.

-                  word getDllCharacteristics() const; // EXPORT

-                  /// Returns the SizeOfStackReserve value of the header.

-                  VAR4_8 getSizeOfStackReserve() const; // EXPORT

-                  /// Returns the SizeOfStackCommit value of the header.

-                  VAR4_8 getSizeOfStackCommit() const; // EXPORT

-                  /// Returns the SizeOfHeapReserve value of the header.

-                  VAR4_8 getSizeOfHeapReserve() const; // EXPORT

-                  /// Returns the SizeOfHeapCommit value of the header.

-                  VAR4_8 getSizeOfHeapCommit() const; // EXPORT

-                  /// Returns the LoaderFlags value of the header.

-                  dword getLoaderFlags() const; // EXPORT

-                  /// Returns the NumberOfRvaAndSizes value of the header.

-                  dword getNumberOfRvaAndSizes() const; // EXPORT

-                  dword calcNumberOfRvaAndSizes() const; // EXPORT

-

-                  void addDataDirectory(); // EXPORT

-                  void removeDataDirectory(dword index); // EXPORT

-                  

-// image directory getters

-                  /// Returns the relative virtual address of the image directory Export.

-                  dword getIddExportRva() const; // EXPORT

-                  /// Returns the size of the image directory Export.

-                  dword getIddExportSize() const; // EXPORT

-                  /// Returns the relative virtual address of the image directory Import.

-                  dword getIddImportRva() const; // EXPORT

-                  /// Returns the size of the image directory Import.

-                  dword getIddImportSize() const; // EXPORT

-                  /// Returns the relative virtual address of the image directory Resource.

-                  dword getIddResourceRva() const; // EXPORT

-                  /// Returns the size of the image directory Resource.

-                  dword getIddResourceSize() const; // EXPORT

-                  /// Returns the relative virtual address of the image directory Exception.

-                  dword getIddExceptionRva() const; // EXPORT

-                  /// Returns the size of the image directory Exception.

-                  dword getIddExceptionSize() const; // EXPORT

-                  /// Returns the relative virtual address of the image directory Security.

-                  dword getIddSecurityRva() const; // EXPORT

-                  /// Returns the size of the image directory Security.

-                  dword getIddSecuritySize() const; // EXPORT

-                  /// Returns the relative virtual address of the image directory Base Reloc.

-                  dword getIddBaseRelocRva() const; // EXPORT

-                  /// Returns the size of the image directory Base Reloc.

-                  dword getIddBaseRelocSize() const; // EXPORT

-                  /// Returns the relative virtual address of the image directory Debug.

-                  dword getIddDebugRva() const; // EXPORT

-                  /// Returns the size of the image directory Debug.

-                  dword getIddDebugSize() const; // EXPORT

-                  /// Returns the relative virtual address of the image directory Architecture.

-                  dword getIddArchitectureRva() const; // EXPORT

-                  /// Returns the size of the image directory Architecture.

-                  dword getIddArchitectureSize() const; // EXPORT

-                  /// Returns the relative virtual address of the image directory GlobalPtr.

-                  dword getIddGlobalPtrRva() const; // EXPORT

-                  /// Returns the size of the image directory GlobalPtr.

-                  dword getIddGlobalPtrSize() const; // EXPORT

-                  /// Returns the relative virtual address of the image directory Tls.

-                  dword getIddTlsRva() const; // EXPORT

-                  /// Returns the size of the image directory Tls.

-                  dword getIddTlsSize() const; // EXPORT

-                  /// Returns the relative virtual address of the image directory LoadConfig.

-                  dword getIddLoadConfigRva() const; // EXPORT

-                  /// Returns the size of the image directory LoadConfig.

-                  dword getIddLoadConfigSize() const; // EXPORT

-                  /// Returns the relative virtual address of the image directory BoundImport.

-                  dword getIddBoundImportRva() const; // EXPORT

-                  /// Returns the size of the image directory BoundImport.

-                  dword getIddBoundImportSize() const; // EXPORT

-                  /// Returns the relative virtual address of the image directory Iat.

-                  dword getIddIatRva() const; // EXPORT

-                  /// Returns the size of the image directory Iat.

-                  dword getIddIatSize() const; // EXPORT

-                  /// Returns the relative virtual address of the image directory DelayImport.

-                  dword getIddDelayImportRva() const; // EXPORT

-                  /// Returns the size of the image directory DelayImport.

-                  dword getIddDelayImportSize() const; // EXPORT

-                  /// Returns the relative virtual address of the image directory COM Descriptor.

-                  dword getIddComHeaderRva() const; // EXPORT

-                  /// Returns the size of the image directory COM Descriptor.

-                  dword getIddComHeaderSize() const; // EXPORT

-

-                  /// Returns the relative virtual address of an image directory.

-                  dword getImageDataDirectoryRva(dword dwDirectory) const; // EXPORT

-                  /// Returns the size of an image directory.

-                  dword getImageDataDirectorySize(dword dwDirectory) const; // EXPORT

-                  

-                  void setImageDataDirectoryRva(dword dwDirectory, dword value); // EXPORT

-                  void setImageDataDirectorySize(dword dwDirectory, dword value); // EXPORT

-

-// section getters

-                  /// Returns the name of a section.

-                  std::string getSectionName(word uiSectionnr) const; // EXPORT

-                  /// Returns the virtual size of a section.

-                  dword getVirtualSize(word uiSectionnr) const; // EXPORT

-                  /// Returns the virtual address of a section.

-                  dword getVirtualAddress(word uiSectionnr) const; // EXPORT

-                  /// Returns the size of a section's raw data.

-                  dword getSizeOfRawData(word uiSectionnr) const; // EXPORT

-                  /// Returns file offset of the data of a section.

-                  dword getPointerToRawData(word uiSectionnr) const; // EXPORT

-                  /// Returns the rva of the relocations of a section.

-                  dword getPointerToRelocations(word uiSectionnr) const; // EXPORT

-                  /// Returns the rva of the line numbers of a section.

-                  dword getPointerToLinenumbers(word uiSectionnr) const; // EXPORT

-                  /// Returns the number of relocations of a section.

-                  dword getNumberOfRelocations(word uiSectionnr) const; // EXPORT

-                  /// Returns the number of line numbers of a section.

-                  dword getNumberOfLinenumbers(word uiSectionnr) const; // EXPORT

-                  /// Returns the characteristics of a section.

-                  dword getCharacteristics(word uiSectionnr) const; // EXPORT _section

-

-// header setters

-                  /// Sets the Signature value of the header.

-                  void setNtSignature(dword value); // EXPORT

-                  /// Sets the Machine value of the header.

-                  void setMachine(word value); // EXPORT

-                  /// Sets the Sections value of the header.

-                  void setNumberOfSections(word value); // EXPORT

-                  /// Sets the TimeDateStamp value of the header.

-                  void setTimeDateStamp(dword value); // EXPORT

-                  /// Sets the PointerToSymbolTable value of the header.

-                  void setPointerToSymbolTable(dword value); // EXPORT

-                  /// Sets the NumberOfSymbols value of the header.

-                  void setNumberOfSymbols(dword value); // EXPORT

-                  /// Sets the SizeOfOptionalHeader value of the header.

-                  void setSizeOfOptionalHeader(word value); // EXPORT

-                  /// Sets the Characteristics value of the header.

-                  void setCharacteristics(word value); // EXPORT _section

-

-                  /// Sets the Magic value of the header.

-                  void setMagic(word value); // EXPORT

-                  /// Sets the MajorLinkerVersion value of the header.

-                  void setMajorLinkerVersion(byte value); // EXPORT

-                  /// Sets the MinorLinkerVersion value of the header.

-                  void setMinorLinkerVersion(byte value); // EXPORT

-                  /// Sets the SizeOfCode value of the header.

-                  void setSizeOfCode(dword value); // EXPORT

-                  /// Sets the SizeOfInitializedData value of the header.

-                  void setSizeOfInitializedData(dword value); // EXPORT

-                  /// Sets the SizeOfUninitializedData value of the header.

-                  void setSizeOfUninitializedData(dword value); // EXPORT

-                  /// Sets the AddressOfEntryPoint value of the header.

-                  void setAddressOfEntryPoint(dword value); // EXPORT

-                  /// Sets the BaseOfCode value of the header.

-                  void setBaseOfCode(dword value); // EXPORT

-                  /// Sets the ImageBase value of the header.

-                  void setImageBase(VAR4_8 value); // EXPORT

-                  /// Sets the SectionAlignment value of the header.

-                  void setSectionAlignment(dword value); // EXPORT

-                  /// Sets the FileAlignment value of the header.

-                  void setFileAlignment(dword value); // EXPORT

-                  /// Sets the MajorOperatingSystemVersion value of the header.

-                  void setMajorOperatingSystemVersion(word value); // EXPORT

-                  /// Sets the MinorOperatingSystemVersion value of the header.

-                  void setMinorOperatingSystemVersion(word value); // EXPORT

-                  /// Sets the MajorImageVersion value of the header.

-                  void setMajorImageVersion(word value); // EXPORT

-                  /// Sets the MinorImageVersion value of the header.

-                  void setMinorImageVersion(word value); // EXPORT

-                  /// Sets the MajorSubsystemVersion value of the header.

-                  void setMajorSubsystemVersion(word value); // EXPORT

-                  /// Sets the MinorSubsystemVersion value of the header.

-                  void setMinorSubsystemVersion(word value); // EXPORT

-                  /// Sets the Reserved1 value of the header.

-                  void setWin32VersionValue(dword value); // EXPORT

-                  /// Sets the SizeOfImage value of the header.

-                  void setSizeOfImage(dword value); // EXPORT

-                  /// Sets the SizeOfHeaders value of the header.

-                  void setSizeOfHeaders(dword value); // EXPORT

-                  /// Sets the CheckSum value of the header.

-                  void setCheckSum(dword value); // EXPORT

-                  /// Sets the Subsystem value of the header.

-                  void setSubsystem(word value); // EXPORT

-                  /// Sets the DllCharacteristics value of the header.

-                  void setDllCharacteristics(word value); // EXPORT

-                  /// Sets the SizeOfStackReserve value of the header.

-                  void setSizeOfStackReserve(VAR4_8 value); // EXPORT

-                  /// Sets the SizeOfStackCommit value of the header.

-                  void setSizeOfStackCommit(VAR4_8 value); // EXPORT

-                  /// Sets the SizeOfHeapReserve value of the header.

-                  void setSizeOfHeapReserve(VAR4_8 value); // EXPORT

-                  /// Sets the SizeOfHeapCommit value of the header.

-                  void setSizeOfHeapCommit(VAR4_8 value); // EXPORT

-                  /// Sets the LoaderFlags value of the header.

-                  void setLoaderFlags(dword value); // EXPORT

-                  /// Sets the NumberOfRvaAndSizes value of the header.

-                  void setNumberOfRvaAndSizes(dword value); // EXPORT

-

-// image directory getters

-                  void setIddDebugRva(dword dwValue); // EXPORT

-                  void setIddDebugSize(dword dwValue); // EXPORT

-                  void setIddDelayImportRva(dword dwValue); // EXPORT

-                  void setIddDelayImportSize(dword dwValue); // EXPORT

-                  void setIddExceptionRva(dword dwValue); // EXPORT

-                  void setIddExceptionSize(dword dwValue); // EXPORT

-                  void setIddGlobalPtrRva(dword dwValue); // EXPORT

-                  void setIddGlobalPtrSize(dword dwValue); // EXPORT

-                  void setIddIatRva(dword dwValue); // EXPORT

-                  void setIddIatSize(dword dwValue); // EXPORT

-                  void setIddLoadConfigRva(dword dwValue); // EXPORT

-                  void setIddLoadConfigSize(dword dwValue); // EXPORT

-                  void setIddResourceRva(dword dwValue); // EXPORT

-                  void setIddResourceSize(dword dwValue); // EXPORT

-                  void setIddSecurityRva(dword dwValue); // EXPORT

-                  void setIddSecuritySize(dword dwValue); // EXPORT

-                  void setIddTlsRva(dword dwValue); // EXPORT

-                  void setIddTlsSize(dword dwValue); // EXPORT

-

-                  void setIddImportRva(dword dwValue); // EXPORT

-                  void setIddImportSize(dword dwValue); // EXPORT

-                  void setIddExportRva(dword dwValue); // EXPORT

-                  void setIddExportSize(dword dwValue); // EXPORT

-                  

-                  void setIddBaseRelocRva(dword value); // EXPORT

-                  void setIddBaseRelocSize(dword value); // EXPORT

-                  void setIddArchitectureRva(dword value); // EXPORT

-                  void setIddArchitectureSize(dword value); // EXPORT

-                  void setIddComHeaderRva(dword value); // EXPORT

-                  void setIddComHeaderSize(dword value); // EXPORT

-

-                  /// Set the name of a section.

-                  void setSectionName(word uiSectionnr, std::string strName); // EXPORT

-                  /// Set the virtual size of a section.

-                  void setVirtualSize(word uiSectionnr, dword dwValue); // EXPORT

-                  /// Set the virtual address of a section.

-                  void setVirtualAddress(word uiSectionnr, dword dwValue); // EXPORT

-                  /// Set the size of raw data of a section.

-                  void setSizeOfRawData(word uiSectionnr, dword dwValue); // EXPORT

-                  /// Set the file offset of a section.

-                  void setPointerToRawData(word uiSectionnr, dword dwValue); // EXPORT

-                  /// Set the pointer to relocations of a section.

-                  void setPointerToRelocations(word uiSectionnr, dword dwValue); // EXPORT

-                  /// Set the pointer to linenumbers of a section.

-                  void setPointerToLinenumbers(word uiSectionnr, dword dwValue); // EXPORT

-                  /// Set the number of relocations a section.

-                  void setNumberOfRelocations(word uiSectionnr, dword dwValue); // EXPORT

-                  /// Set the number of linenumbers section.

-                  void setNumberOfLinenumbers(word uiSectionnr, dword dwValue); // EXPORT

-                  /// Set the characteristics of a section.

-                  void setCharacteristics(word uiSectionnr, dword dwValue); // EXPORT

-        };

-        

-        class PeHeader32 : public PeHeaderT<32>

-        {

-                public:

-                  /// Returns the BaseOfData value of the header.

-                  dword getBaseOfData() const; // EXPORT

-                  /// Sets the BaseOfData value of the header.

-                  void setBaseOfData(dword value); // EXPORT

-        };

-        

-        class PeHeader64 : public PeHeaderT<64>

-        {

-        };

-        

-        template<int x>

-        void PeHeaderT<x>::addDataDirectory()

-        {

-                m_inthHeader.dataDirectories.push_back(PELIB_IMAGE_DATA_DIRECTORY());

-        }

-

-        template<int x>

-        void PeHeaderT<x>::removeDataDirectory(dword index)

-        {

-                m_inthHeader.dataDirectories.erase(m_inthHeader.dataDirectories.begin() + index);

-        }

-                  

-        /**

-        * Adds a new section to the header. The physical and virtual address as well as the virtual

-        * size of the section will be determined automatically from the raw size. The section

-        * characteristics will be set to IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_READ |

-        * IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_CNT_CODE. All other values will be set to 0.

-        * Note: It's important that if the current header's FileAlignment and/or SectionAlignment values are

-        * 0 this function will fail.

-        * @param strName Name of the new section. If this name is longer than 8 bytes only the first 8 bytes will be used.

-        * @param dwSize Physical size of the new section in bytes.

-        * \todo Better code that handles files with 0 sections.

-        **/

-        template<int x>

-        int PeHeaderT<x>::addSection(const std::string& strName, dword dwSize)

-        {

-                unsigned int uiSecnr = calcNumberOfSections();

-

-                if (!getFileAlignment())

-                {

-                        return ERROR_NO_FILE_ALIGNMENT;

-                }

-                else if (!getSectionAlignment())

-                {

-                        return ERROR_NO_SECTION_ALIGNMENT;

-                }

-                        

-                if (uiSecnr) // Always allow 1 section.

-                {

-                        if (uiSecnr == 0xFFFF)

-                        {

-                                return ERROR_TOO_MANY_SECTIONS;

-                        }

-                        else if (calcSpaceAfterHeader() < PELIB_IMAGE_SECTION_HEADER::size())

-                        {

-                                return ERROR_NOT_ENOUGH_SPACE;

-                        }

-                }

-

-                dword dwOffset = calcOffset(/*dwSize*/);

-                dword dwRva = calcRva(/*dwSize*/);

-

-                PELIB_IMAGE_SECTION_HEADER ishdCurr;

-                m_vIsh.push_back(ishdCurr);

-

-                setSectionName(uiSecnr, strName);

-                setSizeOfRawData(uiSecnr, alignOffset(dwSize, getFileAlignment()));

-                setPointerToRawData(uiSecnr, dwOffset);

-                setVirtualSize(uiSecnr, alignOffset(dwSize, getSectionAlignment()));

-                setVirtualAddress(uiSecnr, dwRva);

-                setCharacteristics(uiSecnr, PELIB_IMAGE_SCN_MEM_WRITE | PELIB_IMAGE_SCN_MEM_READ | PELIB_IMAGE_SCN_CNT_INITIALIZED_DATA | PELIB_IMAGE_SCN_CNT_CODE);

-                

-                return NO_ERROR;

-        }

-

-        /**

-        * Calculates a valid SizeOfImage value given the information from the current PE header.

-        * Note that this calculation works in Win2K but probably does not work in Win9X. I didn't test that though.

-        * @return Valid SizeOfImage value.

-        **/

-        template<int x>

-        unsigned int PeHeaderT<x>::calcSizeOfImage() const

-        {

-                // Major note here: It's possible for sections to exist with a Virtual Size of 0.

-                //                  That's why it's necessary to use std::max(Vsize, RawSize) here.

-                //                  An example for such a file is dbeng6.exe (made by Sybase).

-                //                  In this file each and every section has a VSize of 0 but it still runs.

-                

-                std::vector<PELIB_IMAGE_SECTION_HEADER>::const_iterator ishLastSection = std::max_element(m_vIsh.begin(), m_vIsh.end(), std::mem_fun_ref(&PELIB_IMAGE_SECTION_HEADER::biggerVirtualAddress));

-                if (ishLastSection->VirtualSize != 0) return ishLastSection->VirtualAddress + ishLastSection->VirtualSize;

-                return ishLastSection->VirtualAddress + std::max(ishLastSection->VirtualSize, ishLastSection->SizeOfRawData);

-        }

-

-        /**

-        * Calculates the space between the last byte of the header and the first byte that's used for something

-        * else (that's either the first section or an image directory).

-        * @return Unused space after the header.

-        * \todo There are PE files with sections beginning at offset 0. They

-        * need to be considered.

-        **/

-        template<int x>

-        unsigned int PeHeaderT<x>::calcSpaceAfterHeader() const

-        {

-                return (calcStartOfCode() > size() + m_uiOffset) ? calcStartOfCode() - (size() + m_uiOffset) : 0;

-        }

-

-        /**

-        * Returns the first offset of the file that's actually used for something different than the header.

-        * That something is not necessarily code, it can be a data directory too.

-        * This offset can be the beginning of a section or the beginning of a directory.

-        * \todo Some optimizization is surely possible here.

-        * \todo There are PE files with sections beginning at offset 0. They

-        * need to be considered. Returning 0 for these files doesn't really make sense.

-        * So far these sections are disregarded.

-        **/

-        template<int x>

-        unsigned int PeHeaderT<x>::calcStartOfCode() const

-        {

-                unsigned int directories = calcNumberOfRvaAndSizes();

-                dword dwMinOffset = 0xFFFFFFFF;

-                if (directories >= 1 && getIddExportRva() && rvaToOffset(getIddExportRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddExportRva());

-                if (directories >= 2 && getIddImportRva() && rvaToOffset(getIddImportRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddImportRva());

-                if (directories >= 3 && getIddResourceRva() && rvaToOffset(getIddResourceRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddResourceRva());

-                if (directories >= 4 && getIddExceptionRva()  && rvaToOffset(getIddExceptionRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddExceptionRva());

-                if (directories >= 5 && getIddSecurityRva()  && rvaToOffset(getIddSecurityRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddSecurityRva());

-                if (directories >= 6 && getIddBaseRelocRva()  && rvaToOffset(getIddBaseRelocRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddBaseRelocRva());

-                if (directories >= 7 && getIddDebugRva()  && rvaToOffset(getIddDebugRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddDebugRva());

-                if (directories >= 8 && getIddArchitectureRva()  && rvaToOffset(getIddArchitectureRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddArchitectureRva());

-                if (directories >= 9 && getIddGlobalPtrRva()  && rvaToOffset(getIddGlobalPtrRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddGlobalPtrRva());

-                if (directories >= 10 && getIddTlsRva()  && rvaToOffset(getIddTlsRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddTlsRva());

-                if (directories >= 11 && getIddLoadConfigRva()  && rvaToOffset(getIddLoadConfigRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddLoadConfigRva());

-                if (directories >= 12 && getIddBoundImportRva()  && rvaToOffset(getIddBoundImportRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddBoundImportRva());

-                if (directories >= 13 && getIddIatRva()  && rvaToOffset(getIddIatRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddIatRva());

-                if (directories >= 14 && getIddDelayImportRva()  && rvaToOffset(getIddDelayImportRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddDelayImportRva());

-                if (directories >= 15 && getIddComHeaderRva()  && rvaToOffset(getIddComHeaderRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddComHeaderRva());

-                

-                for (word i=0;i<calcNumberOfSections();i++)

-                {

-                        if ((getPointerToRawData(i) < dwMinOffset || dwMinOffset == 0xFFFFFFFF) && getSizeOfRawData(i))

-                        {

-                                if (getPointerToRawData(i)) dwMinOffset = getPointerToRawData(i);

-                        }

-                }

-                return dwMinOffset;

-        }

-

-        /**

-        * Calculates the file offset for a new section. The file offset will already be aligned to the file's FileAlignment.

-        * @return Aligned file offset.

-        * \todo uiSize isn't used yet. Will be used later on to search for caves.

-        **/

-        template<int x>

-        unsigned int PeHeaderT<x>::calcOffset(/*unsigned int uiSize*/) const

-        {

-                unsigned int maxoffset = size();

-

-                for (word i=0;i<calcNumberOfSections();i++)

-                {

-                        if (getPointerToRawData(i) + getSizeOfRawData(i) > maxoffset) maxoffset = getPointerToRawData(i) + getSizeOfRawData(i);

-                }

-

-                return alignOffset(maxoffset, getFileAlignment());

-        }

-

-        /**

-        * Calculates the Rva for a new section. The Rva will already be aligned to the file's SectionAlignment.

-        * \todo uiSize isn't used yet. Will be used later on to search for caves.

-        * @return Aligned Rva.

-        **/

-        template<int x>

-        unsigned int PeHeaderT<x>::calcRva(/*unsigned int uiSize*/) const

-        {

-                // Major note here: It's possible for sections to exist with a Virtual Size of 0.

-                //                  That's why it's necessary to use std::max(Vsize, RawSize) here.

-                //                  An example for such a file is dbeng6.exe (made by Sybase).

-                //                  In this file each and every section has a VSize of 0 but it still runs.

-                

-                unsigned int maxoffset = size();

-                for (word i=0;i<calcNumberOfSections();i++)

-                {

-                        if (getVirtualAddress(i) + std::max(getVirtualSize(i), getSizeOfRawData(i)) > maxoffset) maxoffset = getVirtualAddress(i) + std::max(getVirtualSize(i), getSizeOfRawData(i));

-                }

-

-                return alignOffset(maxoffset, getSectionAlignment());

-        }

-

-        /**

-        * Returns the number of currently defined sections. Note that this value can be different from the number

-        * of sections according to the header (see #PeLib::PeHeaderT<x>::getNumberOfSections).

-        * @return Number of currently defined sections.

-        **/

-        template<int x>

-        word PeHeaderT<x>::calcNumberOfSections() const

-        {

-                return static_cast<PeLib::word>(m_vIsh.size());

-        }

-

-        /**

-        * Enlarges the physically last section in the file.

-        * @param uiSize Additional size that's added to the section's size.

-        **/

-        template<int x>

-        void PeHeaderT<x>::enlargeLastSection(unsigned int uiSize)

-        {

-                std::vector<PELIB_IMAGE_SECTION_HEADER>::iterator ishLastSection = std::max_element(m_vIsh.begin(), m_vIsh.end(), std::mem_fun_ref(&PELIB_IMAGE_SECTION_HEADER::biggerFileOffset));

-                unsigned int uiRawDataSize = alignOffset(ishLastSection->SizeOfRawData + uiSize, getFileAlignment());

-                

-                ishLastSection->SizeOfRawData = uiRawDataSize;

-                ishLastSection->VirtualSize = ishLastSection->SizeOfRawData;

-                

-                setSizeOfImage(calcSizeOfImage());

-        }

-

-        /**

-        * Determines the section which contains the file offset.

-        * @param dwOffset File offset.

-        * @return Section Id of the section which contains the offset.

-        **/

-        template<int x>

-        word PeHeaderT<x>::getSectionWithOffset(VAR4_8 dwOffset) const

-        {

-                // Offset = 0 must be handled explicitly as there are files

-                // with sections that begin at offset 0, that means the section

-                // only exists in memory.

-                

-                if (!dwOffset) return std::numeric_limits<word>::max();

-                

-                for (word i=0;i<calcNumberOfSections();i++)

-                {

-                        // Explicity exclude sections with raw pointer = 0.

-                        dword rawptr = getPointerToRawData(i);

-                        if (rawptr && rawptr <= dwOffset && rawptr + getSizeOfRawData(i) > dwOffset) return i;

-                }

-                

-                return std::numeric_limits<word>::max();

-        }

-

-        /**

-        * Determines the section which contains the Rva.

-        * @param dwRva A relative virtual address.

-        * @return Section Id of the section which contains the Rva.

-        **/

-        template<int x>

-        word PeHeaderT<x>::getSectionWithRva(VAR4_8 dwRva) const

-        {

-                // Major note here: It's possible for sections to exist with a Virtual Size of 0.

-                //                  That's why it's necessary to use std::max(Vsize, RawSize) here.

-                //                  An example for such a file is dbeng6.exe (made by Sybase).

-                //                  In this file each and every section has a VSize of 0 but it still runs.

-                

-                for (word i=0;i<calcNumberOfSections();i++)

-                {

-                        // Weird VC++7 error doesn't allow me to use std::max here.

-                        dword max = getVirtualSize(i) >= getSizeOfRawData(i) ? getVirtualSize(i) : getSizeOfRawData(i);

-                        if (getVirtualAddress(i) <= dwRva && getVirtualAddress(i) + max > dwRva) return i;

-                }

-                

-                return -1;

-        }

-

-        /**

-        * Corrects all faulty values of the current PE header. The following values will be corrected: NtSignature,

-        * NumberOfSections, SizeOfOptionalHeader, FileAlignment (will be aligned to n*0x200),

-        * SectionAlignment (will be aligned to n*0x1000), NumberOfRvaAndSizes, SizeOfHeaders, SizeOfImage,

-        * Magic, Characteristics.

-        * @param dwOffset Beginning of PeHeader (see #PeLib::MzHeader::getAddressOfPeHeader).

-    * \todo 32bit and 64bit versions.

-        **/

-        template<int x>

-        void PeHeaderT<x>::makeValid(dword dwOffset)

-        {

-                setNtSignature(PELIB_IMAGE_NT_SIGNATURE); // 'PE'

-                setMachine(PELIB_IMAGE_FILE_MACHINE_I386);

-                setNumberOfSections(calcNumberOfSections());

-                

-                // Check if 64 bits.

-                setSizeOfOptionalHeader(PELIB_IMAGE_OPTIONAL_HEADER<x>::size() + calcNumberOfRvaAndSizes() * 8);

-

-                // Check if 64 bits.

-                dword dwCharacteristics = PELIB_IMAGE_FILE_EXECUTABLE_IMAGE | PELIB_IMAGE_FILE_32BIT_MACHINE;

-                setCharacteristics(dwCharacteristics);

-

-                // Check if 64 bits.

-                setMagic(PELIB_IMAGE_NT_OPTIONAL_HDR32_MAGIC);

-

-                // setImageBase(0x01000000);

-

-                // Align file and section alignment values

-                unsigned int dwAlignedOffset = alignOffset(getSectionAlignment(), 0x1000);

-                setSectionAlignment(dwAlignedOffset ? dwAlignedOffset : 0x1000);

-

-                dwAlignedOffset = alignOffset(getFileAlignment(), 0x200);

-                setFileAlignment(dwAlignedOffset ? dwAlignedOffset : 0x200);

-

-//              setMajorSubsystemVersion(4);

-//              setSubsystem(IMAGE_SUBSYSTEM_WINDOWS_GUI);

-                setNumberOfRvaAndSizes(calcNumberOfRvaAndSizes());

-                

-                // Code below depends on code above. Don't change the order.

-                dword dwSizeOfHeaders = alignOffset(dwOffset + size(), getFileAlignment());

-                setSizeOfHeaders(dwSizeOfHeaders);

-

-                dword dwSizeOfImage = alignOffset(dwSizeOfHeaders, getSectionAlignment());

-

-                for (int i=0;i<calcNumberOfSections();i++)

-                {

-                        dwSizeOfImage += alignOffset(getVirtualSize(i), getSectionAlignment());

-                }

-

-                dwSizeOfImage = alignOffset(dwSizeOfImage, getSectionAlignment());

-                setSizeOfImage(dwSizeOfImage);

-        }

-

-        template<int x>

-        unsigned int PeHeaderT<x>::offsetToRva(VAR4_8 dwOffset) const

-        {

-                if (dwOffset < calcStartOfCode()) return dwOffset;

-        

-                PeLib::word uiSecnr = getSectionWithOffset(dwOffset);

-                

-                if (uiSecnr == 0xFFFF) return -1;

-                

-                return getVirtualAddress(uiSecnr) + dwOffset - getPointerToRawData(uiSecnr);

-        }

-

-        /**

-        * Converts a file offset to a virtual address.

-        * @param dwOffset File offset.

-        * @return Virtual Address.

-        **/

-        template<int x>

-        unsigned int PeHeaderT<x>::offsetToVa(VAR4_8 dwOffset) const

-        {

-                if (dwOffset < calcStartOfCode()) return getImageBase() + dwOffset;

-                

-                PeLib::word uiSecnr = getSectionWithOffset(dwOffset);

-                

-                if (uiSecnr == 0xFFFF) return -1;

-                

-                return getImageBase() + getVirtualAddress(uiSecnr) + dwOffset - getPointerToRawData(uiSecnr);

-        }

-

-        template<int x>

-        void PeHeaderT<x>::readHeader(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const

-        {

-                ibBuffer >> header.Signature;

-                

-                ibBuffer >> header.FileHeader.Machine;

-                ibBuffer >> header.FileHeader.NumberOfSections;

-                ibBuffer >> header.FileHeader.TimeDateStamp;

-                ibBuffer >> header.FileHeader.PointerToSymbolTable;

-                ibBuffer >> header.FileHeader.NumberOfSymbols;

-                ibBuffer >> header.FileHeader.SizeOfOptionalHeader;

-                ibBuffer >> header.FileHeader.Characteristics;

-                ibBuffer >> header.OptionalHeader.Magic;

-

-                ibBuffer >> header.OptionalHeader.MajorLinkerVersion;

-                ibBuffer >> header.OptionalHeader.MinorLinkerVersion;

-                ibBuffer >> header.OptionalHeader.SizeOfCode;

-                ibBuffer >> header.OptionalHeader.SizeOfInitializedData;

-                ibBuffer >> header.OptionalHeader.SizeOfUninitializedData;

-                ibBuffer >> header.OptionalHeader.AddressOfEntryPoint;

-                ibBuffer >> header.OptionalHeader.BaseOfCode;

-                readBaseOfData(ibBuffer, header);

-                ibBuffer >> header.OptionalHeader.ImageBase;

-                ibBuffer >> header.OptionalHeader.SectionAlignment;

-                ibBuffer >> header.OptionalHeader.FileAlignment;

-                ibBuffer >> header.OptionalHeader.MajorOperatingSystemVersion;

-                ibBuffer >> header.OptionalHeader.MinorOperatingSystemVersion;

-                ibBuffer >> header.OptionalHeader.MajorImageVersion;

-                ibBuffer >> header.OptionalHeader.MinorImageVersion;

-                ibBuffer >> header.OptionalHeader.MajorSubsystemVersion;

-                ibBuffer >> header.OptionalHeader.MinorSubsystemVersion;

-                ibBuffer >> header.OptionalHeader.Win32VersionValue;

-                ibBuffer >> header.OptionalHeader.SizeOfImage;

-                ibBuffer >> header.OptionalHeader.SizeOfHeaders;

-                ibBuffer >> header.OptionalHeader.CheckSum;

-                ibBuffer >> header.OptionalHeader.Subsystem;

-                ibBuffer >> header.OptionalHeader.DllCharacteristics;

-                ibBuffer >> header.OptionalHeader.SizeOfStackReserve;

-                ibBuffer >> header.OptionalHeader.SizeOfStackCommit;

-                ibBuffer >> header.OptionalHeader.SizeOfHeapReserve;

-                ibBuffer >> header.OptionalHeader.SizeOfHeapCommit;

-                ibBuffer >> header.OptionalHeader.LoaderFlags;

-                ibBuffer >> header.OptionalHeader.NumberOfRvaAndSizes;

-        }

-        

-        template<int x>

-        void PeHeaderT<x>::readDataDirectories(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const

-        {

-                PELIB_IMAGE_DATA_DIRECTORY idd;

-

-                for (unsigned int i=0;i<header.OptionalHeader.NumberOfRvaAndSizes;i++)

-                {

-                        ibBuffer >> idd.VirtualAddress;

-                        ibBuffer >> idd.Size;

-                        header.dataDirectories.push_back(idd);

-                }

-        }

-        

-        template<int x>

-        std::vector<PELIB_IMAGE_SECTION_HEADER> PeHeaderT<x>::readSections(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const

-        {

-                const unsigned int nrSections = header.FileHeader.NumberOfSections;

-                PELIB_IMAGE_SECTION_HEADER ishCurr;

-

-                std::vector<PELIB_IMAGE_SECTION_HEADER> vIshdCurr;

-

-                for (unsigned int i=0;i<nrSections;i++)

-                {

-                        ibBuffer.read(reinterpret_cast<char*>(ishCurr.Name), 8);

-                        ibBuffer >> ishCurr.VirtualSize;

-                        ibBuffer >> ishCurr.VirtualAddress;

-                        ibBuffer >> ishCurr.SizeOfRawData;

-                        ibBuffer >> ishCurr.PointerToRawData;

-                        ibBuffer >> ishCurr.PointerToRelocations;

-                        ibBuffer >> ishCurr.PointerToLinenumbers;

-                        ibBuffer >> ishCurr.NumberOfRelocations;

-                        ibBuffer >> ishCurr.NumberOfLinenumbers;

-                        ibBuffer >> ishCurr.Characteristics;

-                        vIshdCurr.push_back(ishCurr);

-                }

-

-                return vIshdCurr;

-        }

-        

-        template<int x>

-        int PeHeaderT<x>::read(const unsigned char* pcBuffer, unsigned int uiSize, unsigned int uiOffset)

-        {

-                if (uiSize < m_inthHeader.size())

-                {

-                        return ERROR_INVALID_FILE;

-                }

-                

-                std::vector<unsigned char> vBuffer(pcBuffer, pcBuffer + m_inthHeader.size());

-

-                InputBuffer ibBuffer(vBuffer);

-                PELIB_IMAGE_NT_HEADERS<x> header;

-                

-                readHeader(ibBuffer, header);

-                

-                if (uiSize < m_inthHeader.size() + header.OptionalHeader.NumberOfRvaAndSizes * 8 + header.FileHeader.NumberOfSections * 0x28)

-                {

-                        return ERROR_INVALID_FILE;

-                }

-                

-                vBuffer.resize(header.OptionalHeader.NumberOfRvaAndSizes * 8 + header.FileHeader.NumberOfSections * 0x28);

-                vBuffer.assign(pcBuffer + m_inthHeader.size(), pcBuffer + m_inthHeader.size() + header.OptionalHeader.NumberOfRvaAndSizes * 8 + header.FileHeader.NumberOfSections * 0x28);

-                

-                ibBuffer.setBuffer(vBuffer);

-                

-                readDataDirectories(ibBuffer, header);

-                

-                m_vIsh = readSections(ibBuffer, header);

-

-                std::swap(m_inthHeader, header);

-

-                m_uiOffset = uiOffset;

-

-                return NO_ERROR;

-        }

-        

-        /**

-        * Reads the PE header from a file Note that this function does not verify if a file is actually a MZ file.

-        * For this purpose see #PeLib::PeHeaderT<x>::isValid. The only check this function makes is a check to see if

-        * the file is large enough to be a PE header. If the data is valid doesn't matter.

-        * @param strFilename Name of the file which will be read.

-        * @param uiOffset File offset of PE header (see #PeLib::MzHeader::getAddressOfPeHeader).

-        **/

-        template<int x>

-        int PeHeaderT<x>::read(std::string strFilename, unsigned int uiOffset)

-        {

-                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);

-                

-                if (!ifFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-                

-                // File too small

-                if (fileSize(ifFile) < uiOffset + m_inthHeader.size())

-                {

-                        return ERROR_INVALID_FILE;

-                }

-                

-                std::vector<unsigned char> vBuffer(m_inthHeader.size());

-

-                ifFile.seekg(uiOffset, std::ios::beg);

-                ifFile.read(reinterpret_cast<char*>(&vBuffer[0]), static_cast<std::streamsize>(vBuffer.size()));

-

-                InputBuffer ibBuffer(vBuffer);

-                PELIB_IMAGE_NT_HEADERS<x> header;

-                

-                readHeader(ibBuffer, header);

-

-                vBuffer.resize(header.OptionalHeader.NumberOfRvaAndSizes * 8 + header.FileHeader.NumberOfSections * 0x28);

-

-                ifFile.read(reinterpret_cast<char*>(&vBuffer[0]), static_cast<std::streamsize>(vBuffer.size()));

-                if (!ifFile)

-                {

-                        return ERROR_INVALID_FILE;

-                }

-

-                ibBuffer.setBuffer(vBuffer);

-                

-                readDataDirectories(ibBuffer, header);

-                

-                // Sections

-//              const unsigned int nrSections = header.FileHeader.NumberOfSections;

-//              if (fileSize(ifFile) < uiOffset + m_inthHeader.size() + nrSections * PELIB_IMAGE_SECTION_HEADER::size())

-//              {

-//                      return ERROR_INVALID_FILE;

-//              }

-                

-                m_vIsh = readSections(ibBuffer, header);

-

-                std::swap(m_inthHeader, header);

-

-                m_uiOffset = uiOffset;

-

-                ifFile.close();

-                

-                return NO_ERROR;

-        }

-

-        /**

-        * Rebuilds the PE header so that it can be written to a file. It's not guaranteed that the

-        * header will be valid. If you want to make sure that the header will be valid you

-        * must call #PeLib::PeHeaderT<x>::makeValid first.

-        * @param vBuffer Buffer where the rebuilt header will be stored.

-        **/

-        template<int x>

-        void PeHeaderT<x>::rebuild(std::vector<byte>& vBuffer) const

-        {

-                OutputBuffer obBuffer(vBuffer);

-

-                obBuffer << m_inthHeader.Signature;

-

-                obBuffer << m_inthHeader.FileHeader.Machine;

-                obBuffer << m_inthHeader.FileHeader.NumberOfSections;

-                obBuffer << m_inthHeader.FileHeader.TimeDateStamp;

-                obBuffer << m_inthHeader.FileHeader.PointerToSymbolTable;

-                obBuffer << m_inthHeader.FileHeader.NumberOfSymbols;

-                obBuffer << m_inthHeader.FileHeader.SizeOfOptionalHeader;

-                obBuffer << m_inthHeader.FileHeader.Characteristics;

-                obBuffer << m_inthHeader.OptionalHeader.Magic;

-                obBuffer << m_inthHeader.OptionalHeader.MajorLinkerVersion;

-                obBuffer << m_inthHeader.OptionalHeader.MinorLinkerVersion;

-                obBuffer << m_inthHeader.OptionalHeader.SizeOfCode;

-                obBuffer << m_inthHeader.OptionalHeader.SizeOfInitializedData;

-                obBuffer << m_inthHeader.OptionalHeader.SizeOfUninitializedData;

-                obBuffer << m_inthHeader.OptionalHeader.AddressOfEntryPoint;

-                obBuffer << m_inthHeader.OptionalHeader.BaseOfCode;

-                rebuildBaseOfData(obBuffer);

-//              obBuffer << m_inthHeader.OptionalHeader.BaseOfData;

-                obBuffer << m_inthHeader.OptionalHeader.ImageBase;

-                obBuffer << m_inthHeader.OptionalHeader.SectionAlignment;

-                obBuffer << m_inthHeader.OptionalHeader.FileAlignment;

-                obBuffer << m_inthHeader.OptionalHeader.MajorOperatingSystemVersion;

-                obBuffer << m_inthHeader.OptionalHeader.MinorOperatingSystemVersion;

-                obBuffer << m_inthHeader.OptionalHeader.MajorImageVersion;

-                obBuffer << m_inthHeader.OptionalHeader.MinorImageVersion;

-                obBuffer << m_inthHeader.OptionalHeader.MajorSubsystemVersion;

-                obBuffer << m_inthHeader.OptionalHeader.MinorSubsystemVersion;

-                obBuffer << m_inthHeader.OptionalHeader.Win32VersionValue;

-                obBuffer << m_inthHeader.OptionalHeader.SizeOfImage;

-                obBuffer << m_inthHeader.OptionalHeader.SizeOfHeaders;

-                obBuffer << m_inthHeader.OptionalHeader.CheckSum;

-                obBuffer << m_inthHeader.OptionalHeader.Subsystem;

-                obBuffer << m_inthHeader.OptionalHeader.DllCharacteristics;

-                obBuffer << m_inthHeader.OptionalHeader.SizeOfStackReserve;

-                obBuffer << m_inthHeader.OptionalHeader.SizeOfStackCommit;

-                obBuffer << m_inthHeader.OptionalHeader.SizeOfHeapReserve;

-                obBuffer << m_inthHeader.OptionalHeader.SizeOfHeapCommit;

-                obBuffer << m_inthHeader.OptionalHeader.LoaderFlags;

-                obBuffer << m_inthHeader.OptionalHeader.NumberOfRvaAndSizes;

-

-                // The 0x10 data directories

-                for (unsigned int i=0;i<calcNumberOfRvaAndSizes();i++)

-                {

-                        obBuffer << m_inthHeader.dataDirectories[i].VirtualAddress;

-                        obBuffer << m_inthHeader.dataDirectories[i].Size;

-                }

-                

-                // The section definitions

-                const unsigned int nrSections = calcNumberOfSections();

-                for (unsigned int i=0;i<nrSections;i++)

-                {

-                        char temp[9] = {0};

-                        strcpy(temp, getSectionName(i).c_str());

-                        obBuffer.add(temp, 8);

-                        obBuffer << m_vIsh[i].VirtualSize;

-                        obBuffer << m_vIsh[i].VirtualAddress;

-                        obBuffer << m_vIsh[i].SizeOfRawData;

-                        obBuffer << m_vIsh[i].PointerToRawData;

-                        obBuffer << m_vIsh[i].PointerToRelocations;

-                        obBuffer << m_vIsh[i].PointerToLinenumbers;

-                        obBuffer << m_vIsh[i].NumberOfRelocations;

-                        obBuffer << m_vIsh[i].NumberOfLinenumbers;

-                        obBuffer << m_vIsh[i].Characteristics;

-                }

-        }

-

-        /**

-        * Converts a relative virtual offset to a file offset.

-        * @param dwRva A relative virtual offset.

-        * @return A file offset.

-        * \todo It's not always 0x1000.

-        **/

-        template<int x>

-        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::rvaToOffset(VAR4_8 dwRva) const

-        {

-                // XXX: Not correct

-                if (dwRva < 0x1000) return dwRva;

-                

-                PeLib::word uiSecnr = getSectionWithRva(dwRva);

-                if (uiSecnr == 0xFFFF || dwRva > getVirtualAddress(uiSecnr) + getSizeOfRawData(uiSecnr))

-                {

-                        return std::numeric_limits<VAR4_8>::max();

-                }

-                

-                return getPointerToRawData(uiSecnr) + dwRva - getVirtualAddress(uiSecnr);

-        }

-

-        /**

-        * Converts a relative virtual offset to a virtual offset.

-        * @param dwRva A relative virtual offset.

-        * @return A virtual offset.

-        **/

-        template<int x>

-        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::rvaToVa(VAR4_8 dwRva) const

-        {

-                return getImageBase() + dwRva;

-        }

-

-        /**

-        * Calculates the size of the current PE header. This includes the actual header and the section definitions.

-        * @return Size of the current PE header.

-        * \todo Better handling of files with less than 0x10 directories.

-        **/

-        template<int x>

-        unsigned int PeHeaderT<x>::size() const

-        {

-                return m_inthHeader.size() + getNumberOfSections() * PELIB_IMAGE_SECTION_HEADER::size();

-        }

-

-        // \todo Not sure if this works.

-        template<int x>

-        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::vaToRva(VAR4_8 dwRva) const

-        {

-                if (dwRva - getImageBase() < calcStartOfCode()) return dwRva - getImageBase();

-                

-                if (getSectionWithRva(dwRva - getImageBase()) == 0xFFFF) return -1;

-                

-                return dwRva - getImageBase();

-        }

-

-        template<int x>

-        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::vaToOffset(VAR4_8 dwRva) const

-        {

-                return rvaToOffset(dwRva - getImageBase());

-        }

-

-        /**

-        * Saves the PE header to a file. Note that this only saves the header information, if you have added sections

-        * and want to save these to the file you have to call #PeLib::PeHeaderT<x>::saveSections too. This function also

-        * does not verify if the PE header is correct. If you want to make sure that the current PE header is valid,

-        * call #PeLib::PeHeaderT<x>::isValid and #PeLib::PeHeaderT<x>::makeValid first.

-        * @param strFilename Filename of the file the header will be written to.

-        * @param uiOffset File offset the header will be written to.

-        **/

-        template<int x>

-        int PeHeaderT<x>::write(std::string strFilename, unsigned int uiOffset) const

-        {

-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);

-                

-                if (!ofFile)

-                {

-                        ofFile.clear();

-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);

-                }

-                else

-                {

-                        ofFile.close();

-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);

-                }

-                

-                if (!ofFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-                

-                ofFile.seekp(uiOffset, std::ios::beg);

-

-                std::vector<unsigned char> vBuffer;

-

-                rebuild(vBuffer);

-

-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));

-

-                ofFile.close();

-                

-                return NO_ERROR;

-        }

-

-

-        /**

-        * Overwrites a section's data.

-        * @param wSecnr Number of the section which will be overwritten.

-        * @param strFilename Name of the file where the section will be written to.

-        * @param wSecnr Number of the section that will be written.

-        * @param vBuffer New data of the section.

-        **/

-        template<int x>

-        int PeHeaderT<x>::writeSectionData(const std::string& strFilename, word wSecnr, const std::vector<byte>& vBuffer) const

-        {

-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);

-                

-                if (!ofFile)

-                {

-                        ofFile.clear();

-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);

-                }

-                else

-                {

-                        ofFile.close();

-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);

-                }

-

-                if (!ofFile)

-                {

-                        ofFile.clear();

-

-                        return ERROR_OPENING_FILE;

-                }

-

-                ofFile.seekp(getPointerToRawData(wSecnr), std::ios::beg);

-

-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), std::min(static_cast<unsigned int>(vBuffer.size()), getSizeOfRawData(wSecnr)));

-

-                ofFile.close();

-                

-                return NO_ERROR;

-        }

-

-        template<int x>

-        int PeHeaderT<x>::writeSections(const std::string& strFilename) const

-        {

-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);

-                

-                if (!ofFile)

-                {

-                        ofFile.clear();

-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);

-                }

-                else

-                {

-                        ofFile.close();

-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);

-                }

-

-                if (!ofFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-

-                unsigned int uiFilesize = fileSize(ofFile);

-

-                for (int i=0;i<calcNumberOfSections();i++)

-                {

-                        if (uiFilesize < getPointerToRawData(i) + getSizeOfRawData(i))

-                        {

-                                unsigned int uiToWrite = getPointerToRawData(i) + getSizeOfRawData(i) - uiFilesize;

-                                std::vector<char> vBuffer(uiToWrite);

-                                ofFile.seekp(0, std::ios::end);

-                                ofFile.write(&vBuffer[0], static_cast<unsigned int>(vBuffer.size()));

-                                uiFilesize = getPointerToRawData(i) + getSizeOfRawData(i);

-                        }

-                }

-

-                ofFile.close();

-                

-                return NO_ERROR;

-        }

-

-        /**

-        * Returns the file's Nt signature.

-        * @return The Nt signature value from the PE header.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getNtSignature() const

-        {

-                return m_inthHeader.Signature;

-        }

-

-        /**

-        * Returns the file's machine.

-        * @return The Machine value from the PE header.

-        **/

-        template<int x>

-        word PeHeaderT<x>::getMachine() const

-        {

-                return m_inthHeader.FileHeader.Machine;

-        }

-

-

-        /**

-        * Returns the file's number of sections as defined in the header. Note that this value can be different

-        * from the number of defined sections (#see PeLib::PeHeaderT<x>::getNumberOfSections).

-        * @return The NumberOfSections value from the PE header.

-        **/

-        template<int x>

-        word PeHeaderT<x>::getNumberOfSections() const

-        {

-                return m_inthHeader.FileHeader.NumberOfSections;

-        }

-

-        /** 

-        * Returns the file's TimeDateStamp.

-        * @return The TimeDateStamp value from the PE header.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getTimeDateStamp() const

-        {

-                return m_inthHeader.FileHeader.TimeDateStamp;

-        }

-

-        /**

-        * Returns the relative virtual address of the file's symbol table.

-        * @return The PointerToSymbolTable value from the PE header.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getPointerToSymbolTable() const

-        {

-                return m_inthHeader.FileHeader.PointerToSymbolTable;

-        }

-

-        /**

-        * Returns the number of symbols of the file's symbol table.

-        * @return The NumberOfSymbols value from the PE header.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getNumberOfSymbols() const

-        {

-                return m_inthHeader.FileHeader.NumberOfSymbols;

-        }

-

-        /**

-        * Returns the size of optional header of the file.

-        * @return The SizeOfOptionalHeader value from the PE header.

-        **/

-        template<int x>

-        word PeHeaderT<x>::getSizeOfOptionalHeader() const

-        {

-                return m_inthHeader.FileHeader.SizeOfOptionalHeader;

-        }

-

-        /**

-        * @return The Characteristics value from the PE header.

-        **/

-        template<int x>

-        word PeHeaderT<x>::getCharacteristics() const

-        {

-                return m_inthHeader.FileHeader.Characteristics;

-        }

-

-        /**

-        * @return The Magic value from the PE header.

-        **/

-        template<int x>

-        word PeHeaderT<x>::getMagic() const

-        {

-                return m_inthHeader.OptionalHeader.Magic;

-        }

-

-        /**

-        * @return The MajorLinkerVersion value from the PE header.

-        **/

-        template<int x>

-        byte PeHeaderT<x>::getMajorLinkerVersion() const

-        {

-                return m_inthHeader.OptionalHeader.MajorLinkerVersion;

-        }

-

-        /**

-        * @return The MinorLinkerVersion value from the PE header.

-        **/

-        template<int x>

-        byte PeHeaderT<x>::getMinorLinkerVersion() const

-        {

-                return m_inthHeader.OptionalHeader.MinorLinkerVersion;

-        }

-

-        /**

-        * @return The SizeOfCode value from the PE header.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getSizeOfCode() const

-        {

-                return m_inthHeader.OptionalHeader.SizeOfCode;

-        }

-

-        /**

-        * @return The SizeOfInitializedData value from the PE header.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getSizeOfInitializedData() const

-        {

-                return m_inthHeader.OptionalHeader.SizeOfInitializedData;

-        }

-

-        /**

-        * @return The SizeOfUninitializedData value from the PE header.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getSizeOfUninitializedData() const

-        {

-                return m_inthHeader.OptionalHeader.SizeOfUninitializedData;

-        }

-

-        /**

-        * @return The AddressOfEntryPoint value from the PE header.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getAddressOfEntryPoint() const

-        {

-                return m_inthHeader.OptionalHeader.AddressOfEntryPoint;

-        }

-

-        /**

-        * @return The BaseOfCode value from the PE header.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getBaseOfCode() const

-        {

-                return m_inthHeader.OptionalHeader.BaseOfCode;

-        }

-

-        /**

-        * @return The ImageBase value from the PE header.

-        **/

-        template<int x>

-        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::getImageBase() const

-        {

-                return m_inthHeader.OptionalHeader.ImageBase;

-        }

-

-        /**

-        * @return The SectionAlignment value from the PE header.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getSectionAlignment() const

-        {

-                return m_inthHeader.OptionalHeader.SectionAlignment;

-        }

-

-        /**

-        * @return The FileAlignment value from the PE header.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getFileAlignment() const

-        {

-                return m_inthHeader.OptionalHeader.FileAlignment;

-        }

-

-        /**

-        * @return The MajorOperatingSystemVersion value from the PE header.

-        **/

-        template<int x>

-        word PeHeaderT<x>::getMajorOperatingSystemVersion() const

-        {

-                return m_inthHeader.OptionalHeader.MajorOperatingSystemVersion;

-        }

-

-        /**

-        * @return The MinorOperatingSystemVersion value from the PE header.

-        **/

-        template<int x>

-        word PeHeaderT<x>::getMinorOperatingSystemVersion() const

-        {

-                return m_inthHeader.OptionalHeader.MinorOperatingSystemVersion;

-        }

-

-        /**

-        * @return The MajorImageVersion value from the PE header.

-        **/

-        template<int x>

-        word PeHeaderT<x>::getMajorImageVersion() const

-        {

-                return m_inthHeader.OptionalHeader.MajorImageVersion;

-        }

-

-        /**

-        * @return The MinorImageVersion value from the PE header.

-        **/

-        template<int x>

-        word PeHeaderT<x>::getMinorImageVersion() const

-        {

-                return m_inthHeader.OptionalHeader.MinorImageVersion;

-        }

-

-        /**

-        * @return The MajorSubsystemVersion value from the PE header.

-        **/

-        template<int x>

-        word PeHeaderT<x>::getMajorSubsystemVersion() const

-        {

-                return m_inthHeader.OptionalHeader.MajorSubsystemVersion;

-        }

-

-        /**

-        * @return The MinorSubsystemVersion value from the PE header.

-        **/

-        template<int x>

-        word PeHeaderT<x>::getMinorSubsystemVersion() const

-        {

-                return m_inthHeader.OptionalHeader.MinorSubsystemVersion;

-        }

-

-        /**

-        * @return The WinVersionValue value from the PE header.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getWin32VersionValue() const

-        {

-                return m_inthHeader.OptionalHeader.Win32VersionValue;

-        }

-

-        /**

-        * @return The SizeOfImage value from the PE header.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getSizeOfImage() const

-        {

-                return m_inthHeader.OptionalHeader.SizeOfImage;

-        }

-

-        /**

-        * @return The SizeOfHeaders value from the PE header.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getSizeOfHeaders() const

-        {

-                return m_inthHeader.OptionalHeader.SizeOfHeaders;

-        }

-

-        /**

-        * @return The CheckSums value from the PE header.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getCheckSum() const

-        {

-                return m_inthHeader.OptionalHeader.CheckSum;

-        }

-

-        /**

-        * @return The Subsystem value from the PE header.

-        **/

-        template<int x>

-        word PeHeaderT<x>::getSubsystem() const

-        {

-                return m_inthHeader.OptionalHeader.Subsystem;

-        }

-

-        /**

-        * @return The DllCharacteristics value from the PE header.

-        **/

-        template<int x>

-        word PeHeaderT<x>::getDllCharacteristics() const

-        {

-                return m_inthHeader.OptionalHeader.DllCharacteristics;

-        }

-

-        /**

-        * @return The SizeOfStackReserve value from the PE header.

-        **/

-        template<int x>

-        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::getSizeOfStackReserve() const

-        {

-                return m_inthHeader.OptionalHeader.SizeOfStackReserve;

-        }

-

-        /**

-        * @return The SizeOfStackCommit value from the PE header.

-        **/

-        template<int x>

-        typename FieldSizes<x>::VAR4_8  PeHeaderT<x>::getSizeOfStackCommit() const

-        {

-                return m_inthHeader.OptionalHeader.SizeOfStackCommit;

-        }

-

-        /**

-        * @return The SizeOfHeapReserve value from the PE header.

-        **/

-        template<int x>

-        typename FieldSizes<x>::VAR4_8  PeHeaderT<x>::getSizeOfHeapReserve() const

-        {

-                return m_inthHeader.OptionalHeader.SizeOfHeapReserve;

-        }

-

-        /**

-        * @return The SizeOfHeapCommit value from the PE header.

-        **/

-        template<int x>

-        typename FieldSizes<x>::VAR4_8  PeHeaderT<x>::getSizeOfHeapCommit() const

-        {

-                return m_inthHeader.OptionalHeader.SizeOfHeapCommit;

-        }

-

-        /**

-        * @return The LoaderFlags value from the PE header.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getLoaderFlags() const

-        {

-                return m_inthHeader.OptionalHeader.LoaderFlags;

-        }

-

-        /**

-        * @return The NumberOfRvaAndSizes value from the PE header.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getNumberOfRvaAndSizes() const

-        {

-                return m_inthHeader.OptionalHeader.NumberOfRvaAndSizes;

-        }

-

-        template<int x>

-        dword PeHeaderT<x>::calcNumberOfRvaAndSizes() const

-        {

-                return static_cast<dword>(m_inthHeader.dataDirectories.size());

-        }

-

-        /**

-        * Returns the relative virtual address of the current file's export directory.

-        * @return The Rva of the Export directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddExportRva() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress;

-        }

-

-        /**

-        * Returns the size of the current file's export directory.

-        * @return The sizeof the Export directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddExportSize() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT].Size;

-        }

-

-        /**

-        * Returns the relative virtual address of the current file's import directory.

-        * @return The Rva of the Import directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddImportRva() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress;

-        }

-

-        /**

-        * Returns the size of the current file's import directory.

-        * @return The size of the Import directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddImportSize() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT].Size;

-        }

-

-        /**

-        * Returns the relative virtual address of the current file's resource directory.

-        * @return The Rva of the Resource directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddResourceRva() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress;

-        }

-

-        /**

-        * Returns the size of the current file'resource resource directory.

-        * @return The size of the Resource directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddResourceSize() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE].Size;

-        }

-

-        /**

-        * Returns the relative virtual address of the current file's exception directory.

-        * @return The Rva of the Exception directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddExceptionRva() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION].VirtualAddress;

-        }

-

-        /**

-        * Returns the size of the current file's exception directory.

-        * @return The size of the Exception directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddExceptionSize() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION].Size;

-        }

-

-        /**

-        * Returns the relative virtual address of the current file's security directory.

-        * @return The Rva of the Security directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddSecurityRva() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY].VirtualAddress;

-        }

-

-        /**

-        * Returns the size of the current file's security directory.

-        * @return The size of the Security directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddSecuritySize() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY].Size;

-        }

-

-        /**

-        * Returns the relative virtual address of the current file's base reloc directory.

-        * @return The Rva of the Base Reloc directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddBaseRelocRva() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress;

-        }

-

-        /**

-        * Returns the size of the current file's base reloc directory.

-        * @return The size of the Base Reloc directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddBaseRelocSize() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size;

-        }

-

-        /**

-        * Returns the relative virtual address of the current file's debug directory.

-        * @return The Rva of the Debug directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddDebugRva() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress;

-        }

-

-        /**

-        * Returns the size of the current file's debug directory.

-        * @return The size of the Debug directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddDebugSize() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG].Size;

-        }

-

-        /**

-        * Returns the relative virtual address of the current file's Architecture directory.

-        * @return The Rva of the Architecture directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddArchitectureRva() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE].VirtualAddress;

-        }

-

-        /**

-        * Returns the size of the current file's Architecture directory.

-        * @return The size of the Architecture directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddArchitectureSize() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE].Size;

-        }

-

-        /**

-        * Returns the relative virtual address of the current file's global ptr directory.

-        * @return The Rva of the GlobalPtr directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddGlobalPtrRva() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR].VirtualAddress;

-        }

-

-        /**

-        * Returns the size of the current file's global ptr directory.

-        * @return The size of the GlobalPtr directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddGlobalPtrSize() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR].Size;

-        }

-

-        /**

-        * Returns the relative virtual address of the current file's TLS directory.

-        * @return The Rva of the Tls directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddTlsRva() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_TLS].VirtualAddress;

-        }

-

-        /**

-        * Returns the size of the current file's TLS directory.

-        * @return The size of the Tls directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddTlsSize() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_TLS].Size;

-        }

-

-        /**

-        * Returns the relative virtual address of the current file's load config directory.

-        * @return The Rva of the LoadConfig directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddLoadConfigRva() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].VirtualAddress;

-        }

-

-        /**

-        * Returns the size of the current file's load config directory.

-        * @return The size of the LoadConfig directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddLoadConfigSize() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].Size;

-        }

-

-        /**

-        * Returns the relative virtual address of the current file's bound import directory.

-        * @return The Rva of the BoundImport directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddBoundImportRva() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT].VirtualAddress;

-        }

-

-        /**

-        * Returns the size of the current file's bound import directory.

-        * @return The size of the BoundImport directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddBoundImportSize() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT].Size;

-        }

-

-        /**

-        * Returns the relative virtual address of the current file's IAT directory.

-        * @return The Rva of the IAT directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddIatRva() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IAT].VirtualAddress;

-        }

-

-        /**

-        * Returns the size of the current file's IAT directory.

-        * @return The size of the IAT directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddIatSize() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IAT].Size;

-        }

-

-        /**

-        * Returns the relative virtual address of the current file's Delay Import directory.

-        * @return The Rva of the DelayImport directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddDelayImportRva() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress;

-        }

-

-        /**

-        * Returns the size of the current file's Delay Import directory.

-        * @return The size of the DelayImport directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddDelayImportSize() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].Size;

-        }

-

-        /**

-        * Returns the relative virtual address of the current file's COM Descriptor directory.

-        * @return The Rva of the COM Descriptor directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddComHeaderRva() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress;

-        }

-        

-        /**

-        * Returns the size of the current file's COM Descriptor directory.

-        * @return The Rva of the COM Descriptor directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getIddComHeaderSize() const

-        {

-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size;

-        }

-

-        /**

-        * Returns the relative virtual address of an image directory.

-        * @param dwDirectory The identifier of an image directory.

-        * @return The Rva of the image directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getImageDataDirectoryRva(dword dwDirectory) const

-        {

-                return m_inthHeader.dataDirectories[dwDirectory].VirtualAddress;

-        }

-

-        template<int x>

-        void PeHeaderT<x>::setImageDataDirectoryRva(dword dwDirectory, dword value)

-        {

-                m_inthHeader.dataDirectories[dwDirectory].VirtualAddress = value;

-        }

-

-        /**

-        * Returns the size of an image directory.

-        * @param dwDirectory The identifier of an image directory.

-        * @return The size of the image directory.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getImageDataDirectorySize(dword dwDirectory) const

-        {

-                return m_inthHeader.dataDirectories[dwDirectory].Size;

-        }

-

-        template<int x>

-        void PeHeaderT<x>::setImageDataDirectorySize(dword dwDirectory, dword value)

-        {

-                m_inthHeader.dataDirectories[dwDirectory].Size = value;

-        }

-

-        /**

-        * Returns the name of the section which is specified by the parameter wSectionnr.

-        * @param wSectionnr Index of the section.

-        * @return The name of the section.

-        **/

-        template<int x>

-        std::string PeHeaderT<x>::getSectionName(word wSectionnr) const

-        {

-                std::string sectionName = "";

-                

-                for (unsigned int i=0;i<sizeof(m_vIsh[wSectionnr].Name);i++)

-                {

-                        if (m_vIsh[wSectionnr].Name[i]) sectionName += m_vIsh[wSectionnr].Name[i];

-                }

-                

-                return sectionName;

-        }

-        

-        /**

-        * Returns the virtual size of the section which is specified by the parameter wSectionnr.

-        * @param wSectionnr Index of the section.

-        * @return The virtual size of the section.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getVirtualSize(word wSectionnr) const

-        {

-                return m_vIsh[wSectionnr].VirtualSize;

-        }

-        

-        /**

-        * Returns the relative virtual address of the section which is specified by the parameter wSectionnr.

-        * @param wSectionnr Index of the section.

-        * @return The Rva of the section.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getVirtualAddress(word wSectionnr) const

-        {

-                return m_vIsh[wSectionnr].VirtualAddress;

-        }

-        

-        /**

-        * Returns the size of raw data of the section which is specified by the parameter wSectionnr.

-        * @param wSectionnr Index of the section.

-        * @return The size of raw data of the section.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getSizeOfRawData(word wSectionnr) const

-        {

-                return m_vIsh[wSectionnr].SizeOfRawData;

-        }

-

-        /**

-        * Returns the file offset of the section which is specified by the parameter wSectionnr.

-        * @param wSectionnr Index of the section.

-        * @return The file offset of the section.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getPointerToRawData(word wSectionnr) const

-        {

-                return m_vIsh[wSectionnr].PointerToRawData;

-        }

-

-        /**

-        * Returns the pointer to relocations of the section which is specified by the parameter wSectionnr.

-        * @param wSectionnr Index of the section.

-        * @return The pointer to relocations of the section.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getPointerToRelocations(word wSectionnr) const

-        {

-                return m_vIsh[wSectionnr].PointerToRelocations;

-        }

-

-        /**

-        * Returns the poiner to line numbers of the section which is specified by the parameter wSectionnr.

-        * @param wSectionnr Index of the section.

-        * @return The pointer to line numbers of the section.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getPointerToLinenumbers(word wSectionnr) const

-        {

-                return m_vIsh[wSectionnr].PointerToLinenumbers;

-        }

-

-        /**

-        * Returns the number of relocations of the section which is specified by the parameter wSectionnr.

-        * @param wSectionnr Index of the section.

-        * @return The number of relocations of the section.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getNumberOfRelocations(word wSectionnr) const

-        {

-                return m_vIsh[wSectionnr].NumberOfRelocations;

-        }

-

-        /**

-        * Returns the number of line numbers of the section which is specified by the parameter wSectionnr.

-        * @param wSectionnr Index of the section.

-        * @return The number of line numbers of the section.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getNumberOfLinenumbers(word wSectionnr) const

-        {

-                return m_vIsh[wSectionnr].NumberOfLinenumbers;

-        }

-

-        /**

-        * Returns the characteristics of the section which is specified by the parameter wSectionnr.

-        * @param wSectionnr Index of the section.

-        * @return The characteristics of the section.

-        **/

-        template<int x>

-        dword PeHeaderT<x>::getCharacteristics(word wSectionnr) const

-        {

-                return m_vIsh[wSectionnr].Characteristics;

-        }

-

-        /**

-        * Changes the file's Nt signature.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setNtSignature(dword dwValue)

-        {

-                m_inthHeader.Signature = dwValue;

-        }

-

-        /**

-        * Changes the file's Machine.

-        * @param wValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setMachine(word wValue)

-        {

-                m_inthHeader.FileHeader.Machine = wValue;

-        }

-

-        /**

-        * Changes the number of sections.

-        * @param wValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setNumberOfSections(word wValue)

-        {

-                m_inthHeader.FileHeader.NumberOfSections = wValue;

-        }

-

-        /**

-        * Changes the file's TimeDateStamp.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setTimeDateStamp(dword dwValue)

-        {

-                m_inthHeader.FileHeader.TimeDateStamp = dwValue;

-        }

-

-        /**

-        * Changes the file's PointerToSymbolTable.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setPointerToSymbolTable(dword dwValue)

-        {

-                m_inthHeader.FileHeader.PointerToSymbolTable = dwValue;

-        }

-

-        /**

-        * Changes the file's NumberOfSymbols.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setNumberOfSymbols(dword dwValue)

-        {

-                m_inthHeader.FileHeader.NumberOfSymbols = dwValue;

-        }

-

-        /**

-        * Changes the file's SizeOfOptionalHeader.

-        * @param wValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setSizeOfOptionalHeader(word wValue)

-        {

-                m_inthHeader.FileHeader.SizeOfOptionalHeader = wValue;

-        }

-

-        /**

-        * Changes the file's Characteristics.

-        * @param wValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setCharacteristics(word wValue)

-        {

-                m_inthHeader.FileHeader.Characteristics = wValue;

-        }

-

-        /**

-        * Changes the file's Magic.

-        * @param wValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setMagic(word wValue)

-        {

-                m_inthHeader.OptionalHeader.Magic = wValue;

-        }

-

-        /**

-        * Changes the file's MajorLinkerVersion.

-        * @param bValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setMajorLinkerVersion(byte bValue)

-        {

-                m_inthHeader.OptionalHeader.MajorLinkerVersion = bValue;

-        }

-

-        /**

-        * Changes the file's MinorLinkerVersion.

-        * @param bValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setMinorLinkerVersion(byte bValue)

-        {

-                m_inthHeader.OptionalHeader.MinorLinkerVersion = bValue;

-        }

-

-        /**

-        * Changes the file's SizeOfCode.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setSizeOfCode(dword dwValue)

-        {

-                m_inthHeader.OptionalHeader.SizeOfCode = dwValue;

-        }

-

-        /**

-        * Changes the file's SizeOfInitializedData.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setSizeOfInitializedData(dword dwValue)

-        {

-                m_inthHeader.OptionalHeader.SizeOfInitializedData = dwValue;

-        }

-

-        /**

-        * Changes the file's SizeOfUninitializedData.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setSizeOfUninitializedData(dword dwValue)

-        {

-                m_inthHeader.OptionalHeader.SizeOfUninitializedData = dwValue;

-        }

-

-        /**

-        * Changes the file's AddressOfEntryPoint.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setAddressOfEntryPoint(dword dwValue)

-        {

-                m_inthHeader.OptionalHeader.AddressOfEntryPoint = dwValue;

-        }

-

-        /**

-        * Changes the file's BaseOfCode.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setBaseOfCode(dword dwValue)

-        {

-                m_inthHeader.OptionalHeader.BaseOfCode = dwValue;

-        }

-

-        /**

-        * Changes the file's ImageBase.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setImageBase(typename FieldSizes<x>::VAR4_8 dwValue)

-        {

-                m_inthHeader.OptionalHeader.ImageBase = dwValue;

-        }

-

-        /**

-        * Changes the file's SectionAlignment.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setSectionAlignment(dword dwValue)

-        {

-                m_inthHeader.OptionalHeader.SectionAlignment = dwValue;

-        }

-

-        /**

-        * Changes the file's FileAlignment.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setFileAlignment(dword dwValue)

-        {

-                m_inthHeader.OptionalHeader.FileAlignment = dwValue;

-        }

-

-        /**

-        * Changes the file's MajorOperatingSystemVersion.

-        * @param wValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setMajorOperatingSystemVersion(word wValue)

-        {

-                m_inthHeader.OptionalHeader.MajorOperatingSystemVersion = wValue;

-        }

-

-        /**

-        * Changes the file's MinorOperatingSystemVersion.

-        * @param wValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setMinorOperatingSystemVersion(word wValue)

-        {

-                m_inthHeader.OptionalHeader.MinorOperatingSystemVersion = wValue;

-        }

-

-        /**

-        * Changes the file's MajorImageVersion.

-        * @param wValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setMajorImageVersion(word wValue)

-        {

-                m_inthHeader.OptionalHeader.MajorImageVersion = wValue;

-        }

-

-        /**

-        * Changes the file's MinorImageVersion.

-        * @param wValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setMinorImageVersion(word wValue)

-        {

-                m_inthHeader.OptionalHeader.MinorImageVersion = wValue;

-        }

-

-        /**

-        * Changes the file's MajorSubsystemVersion.

-        * @param wValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setMajorSubsystemVersion(word wValue)

-        {

-                m_inthHeader.OptionalHeader.MajorSubsystemVersion = wValue;

-        }

-

-        /**

-        * Changes the file's MinorSubsystemVersion.

-        * @param wValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setMinorSubsystemVersion(word wValue)

-        {

-                m_inthHeader.OptionalHeader.MinorSubsystemVersion = wValue;

-        }

-

-        /**

-        * Changes the file's Win32VersionValue.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setWin32VersionValue(dword dwValue)

-        {

-                m_inthHeader.OptionalHeader.Win32VersionValue = dwValue;

-        }

-

-        /**

-        * Changes the file's SizeOfImage.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setSizeOfImage(dword dwValue)

-        {

-                m_inthHeader.OptionalHeader.SizeOfImage = dwValue;

-        }

-

-        /**

-        * Changes the file's SizeOfHeaders.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setSizeOfHeaders(dword dwValue)

-        {

-                m_inthHeader.OptionalHeader.SizeOfHeaders = dwValue;

-        }

-

-        /**

-        * Changes the file's CheckSum.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setCheckSum(dword dwValue)

-        {

-                m_inthHeader.OptionalHeader.CheckSum = dwValue;

-        }

-

-        /**

-        * Changes the file's Subsystem.

-        * @param wValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setSubsystem(word wValue)

-        {

-                m_inthHeader.OptionalHeader.Subsystem = wValue;

-        }

-

-        /**

-        * Changes the file's DllCharacteristics.

-        * @param wValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setDllCharacteristics(word wValue)

-        {

-                m_inthHeader.OptionalHeader.DllCharacteristics = wValue;

-        }

-

-        /**

-        * Changes the file's SizeOfStackReserve.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setSizeOfStackReserve(typename FieldSizes<x>::VAR4_8 dwValue)

-        {

-                m_inthHeader.OptionalHeader.SizeOfStackReserve = dwValue;

-        }

-

-        /**

-        * Changes the file's SizeOfStackCommit.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setSizeOfStackCommit(typename FieldSizes<x>::VAR4_8 dwValue)

-        {

-                m_inthHeader.OptionalHeader.SizeOfStackCommit = dwValue;

-        }

-

-        /**

-        * Changes the file's SizeOfHeapReserve.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setSizeOfHeapReserve(typename FieldSizes<x>::VAR4_8 dwValue)

-        {

-                m_inthHeader.OptionalHeader.SizeOfHeapReserve = dwValue;

-        }

-

-        /**

-        * Changes the file's SizeOfHeapCommit.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setSizeOfHeapCommit(typename FieldSizes<x>::VAR4_8 dwValue)

-        {

-                m_inthHeader.OptionalHeader.SizeOfHeapCommit = dwValue;

-        }

-

-        /**

-        * Changes the file's LoaderFlags.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setLoaderFlags(dword dwValue)

-        {

-                m_inthHeader.OptionalHeader.LoaderFlags = dwValue;

-        }

-

-        /**

-        * Changes the file's NumberOfRvaAndSizes.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setNumberOfRvaAndSizes(dword dwValue)

-        {

-                m_inthHeader.OptionalHeader.NumberOfRvaAndSizes = dwValue;

-        }

-

-        template<int x>

-        void PeHeaderT<x>::setIddDebugRva(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress = dwValue;

-        }

-

-        template<int x>

-        void PeHeaderT<x>::setIddDebugSize(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG].Size = dwValue;

-        }

-        

-        template<int x>

-        void PeHeaderT<x>::setIddDelayImportRva(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress = dwValue;

-        }

-

-        template<int x>

-        void PeHeaderT<x>::setIddDelayImportSize(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].Size = dwValue;

-        }

-        

-        template<int x>

-        void PeHeaderT<x>::setIddExceptionRva(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION].VirtualAddress = dwValue;

-        }

-

-        template<int x>

-        void PeHeaderT<x>::setIddExceptionSize(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION].Size = dwValue;

-        }

-        

-        template<int x>

-        void PeHeaderT<x>::setIddGlobalPtrRva(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR].VirtualAddress = dwValue;

-        }

-

-        template<int x>

-        void PeHeaderT<x>::setIddGlobalPtrSize(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR].Size = dwValue;

-        }

-        

-        template<int x>

-        void PeHeaderT<x>::setIddIatRva(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IAT].VirtualAddress = dwValue;

-        }

-

-        template<int x>

-        void PeHeaderT<x>::setIddIatSize(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IAT].Size = dwValue;

-        }

-        

-        template<int x>

-        void PeHeaderT<x>::setIddLoadConfigRva(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].VirtualAddress = dwValue;

-        }

-

-        template<int x>

-        void PeHeaderT<x>::setIddLoadConfigSize(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].Size = dwValue;

-        }

-        

-        template<int x>

-        void PeHeaderT<x>::setIddResourceRva(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = dwValue;

-        }

-

-        template<int x>

-        void PeHeaderT<x>::setIddResourceSize(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = dwValue;

-        }

-        

-        template<int x>

-        void PeHeaderT<x>::setIddSecurityRva(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY].VirtualAddress = dwValue;

-        }

-

-        template<int x>

-        void PeHeaderT<x>::setIddSecuritySize(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY].Size = dwValue;

-        }

-        

-        template<int x>

-        void PeHeaderT<x>::setIddTlsRva(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_TLS].VirtualAddress = dwValue;

-        }

-

-        template<int x>

-        void PeHeaderT<x>::setIddTlsSize(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_TLS].Size = dwValue;

-        }

-        

-        /**

-        * Changes the rva of the file's export directory.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setIddExportRva(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress = dwValue;

-        }

-

-        /**

-        * Changes the size of the file's export directory.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setIddExportSize(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT].Size = dwValue;

-        }

-

-        template<int x>

-        void PeHeaderT<x>::setIddBaseRelocRva(dword value)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = value;

-        }

-

-        template<int x>

-        void PeHeaderT<x>::setIddBaseRelocSize(dword value)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = value;

-        }

-

-        template<int x>

-        void PeHeaderT<x>::setIddArchitectureRva(dword value)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE].VirtualAddress = value;

-        }

-

-        template<int x>

-        void PeHeaderT<x>::setIddArchitectureSize(dword value)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE].Size = value;

-        }

-

-        template<int x>

-        void PeHeaderT<x>::setIddComHeaderRva(dword value)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress = value;

-        }

-

-        template<int x>

-        void PeHeaderT<x>::setIddComHeaderSize(dword value)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size = value;

-        }

-

-        /**

-        * Changes the rva of the file's import directory.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setIddImportRva(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress = dwValue;

-        }

-

-        /**

-        * Changes the size of the file's import directory.

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setIddImportSize(dword dwValue)

-        {

-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT].Size = dwValue;

-        }

-

-        /**

-        * Changes the name of a section.

-        * @param wSectionnr Identifier of the section

-        * @param strName New name.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setSectionName(word wSectionnr, std::string strName)

-        {

-                strncpy(reinterpret_cast<char*>(m_vIsh[wSectionnr].Name), strName.c_str(), sizeof(m_vIsh[wSectionnr].Name));

-        }

-

-        /**

-        * Changes the virtual size of a section.

-        * @param wSectionnr Identifier of the section

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setVirtualSize(word wSectionnr, dword dwValue)

-        {

-                m_vIsh[wSectionnr].VirtualSize = dwValue;

-        }

-

-        /**

-        * Changes the virtual address of a section.

-        * @param wSectionnr Identifier of the section

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setVirtualAddress(word wSectionnr, dword dwValue)

-        {

-                m_vIsh[wSectionnr].VirtualAddress = dwValue;

-        }

-

-        /**

-        * Changes the size of raw data of a section.

-        * @param wSectionnr Identifier of the section

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setSizeOfRawData(word wSectionnr, dword dwValue)

-        {

-                m_vIsh[wSectionnr].SizeOfRawData = dwValue;

-        }

-

-        /**

-        * Changes the size of raw data of a section.

-        * @param wSectionnr Identifier of the section

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setPointerToRawData(word wSectionnr, dword dwValue)

-        {

-                m_vIsh[wSectionnr].PointerToRawData = dwValue;

-        }

-

-        /**

-        * Changes the pointer to relocations of a section.

-        * @param wSectionnr Identifier of the section

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setPointerToRelocations(word wSectionnr, dword dwValue)

-        {

-                m_vIsh[wSectionnr].PointerToRelocations = dwValue;

-        }

-

-        /**

-        * Changes the pointer to line numbers of a section.

-        * @param wSectionnr Identifier of the section

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setPointerToLinenumbers(word wSectionnr, dword dwValue)

-        {

-                m_vIsh[wSectionnr].PointerToLinenumbers = dwValue;

-        }

-

-        /**

-        * Changes the number of relocations of a section.

-        * @param wSectionnr Identifier of the section

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setNumberOfRelocations(word wSectionnr, dword dwValue)

-        {

-                m_vIsh[wSectionnr].NumberOfRelocations = dwValue;

-        }

-

-        /**

-        * Changes the number of line numbers of a section.

-        * @param wSectionnr Identifier of the section

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setNumberOfLinenumbers(word wSectionnr, dword dwValue)

-        {

-                m_vIsh[wSectionnr].NumberOfLinenumbers = dwValue;

-        }

-

-        /**

-        * Changes the characteristics of a section.

-        * @param wSectionnr Identifier of the section

-        * @param dwValue New value.

-        **/

-        template<int x>

-        void PeHeaderT<x>::setCharacteristics(word wSectionnr, dword dwValue)

-        {

-                m_vIsh[wSectionnr].Characteristics = dwValue;

-        }

-

-}

-

-#endif

+/*
+* PeHeader.h - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#ifndef PEHEADER_H
+#define PEHEADER_H
+
+#include "PeLibAux.h"
+
+namespace PeLib
+{
+        class PeHeader
+        {
+//              protected:
+//                      virtual void readBaseOfData(InputBuffer& ibBuffer) = 0;
+//                      virtual void rebuildBaseOfData(OutputBuffer& obBuffer) const = 0;
+                        
+                public:
+                        virtual ~PeHeader(){};
+        };
+        
+        /// Class that handles the PE header of files.
+        /**
+        * This class can read and modify PE headers. It provides set- and get functions to access
+        * all individual members of a PE header. Furthermore it's possible to validate and rebuild
+        * PE headers. A PE header includes the IMAGE_Nt_HEADERS and the section definitions of a PE file.
+        * \todo getIdReservedRva
+        **/
+        template<int x>
+        class PeHeaderT : public PeHeader
+        {
+                private:
+                        void readBaseOfData(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const;
+                        void rebuildBaseOfData(OutputBuffer& obBuffer) const;
+                
+                protected:
+                  std::vector<PELIB_IMAGE_SECTION_HEADER> m_vIsh; ///< Stores section header information.
+                  PELIB_IMAGE_NT_HEADERS<x> m_inthHeader; ///< Stores Nt header information.
+                  dword m_uiOffset; ///< Equivalent to the value returned by #PeLib::MzHeader::getAddressOfPeFile
+
+                public:
+                  typedef typename FieldSizes<x>::VAR4_8 VAR4_8;
+                
+                  PeHeaderT() : m_uiOffset(0)
+                  {
+                  }
+                        
+                  /// Add a section to the header.
+                  int addSection(const std::string& strName, dword dwSize); // EXPORT
+                  
+                  unsigned int calcSizeOfImage() const; // EXPORT
+                  
+                  /// Returns the unused space after the header.
+                  unsigned int calcSpaceAfterHeader() const; // EXPORT
+                  
+                  /// Returns the address of the physically first section (not the first defined section).
+                  unsigned int calcStartOfCode() const; // EXPORT
+
+                  /// Calculates the offset for a new section of size uiSize.
+                  unsigned int calcOffset() const; // EXPORT
+
+                  /// Calculates the Rva for a new section of size uiSize.
+                  unsigned int calcRva() const; // EXPORT
+                  
+                  /// Returns the number of sections in the current file.
+                  word calcNumberOfSections() const; // EXPORT
+
+                  void enlargeLastSection(unsigned int uiSize); // EXPORT
+                  
+                  /// Returns the section Id of the section that contains the offset.
+                  word getSectionWithOffset(VAR4_8 dwOffset) const; // EXPORT
+
+                  /// Returns the number of the section which the given relative address points to.
+                  word getSectionWithRva(VAR4_8 rva) const; // EXPORT
+
+          bool isValid() const; // EXPORT
+          bool isValid(unsigned int foo) const; // EXPORT
+
+                  /// Corrects the current PE header.
+                  void makeValid(dword dwOffset); // EXPORT
+
+                  /// Converts a file offset to a relative virtual offset.
+                  unsigned int offsetToRva(VAR4_8 dwOffset) const; // EXPORT
+
+                  /// Converts a file offset to a virtual address.
+                  unsigned int offsetToVa(VAR4_8 dwOffset) const; // EXPORT
+
+                  /// Reads the PE header of a file.
+                  int read(std::string strFilename, unsigned int uiOffset); // EXPORT
+
+                  int read(const unsigned char* pcBuffer, unsigned int uiSize, unsigned int uiOffset); // EXPORT
+
+                  void readHeader(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const;
+                  void readDataDirectories(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const;
+                  std::vector<PELIB_IMAGE_SECTION_HEADER> readSections(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const;
+        
+                  /// Rebuilds the current PE header.
+                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT
+
+                  /// Converts a relative virtual address to a file offset.
+                  VAR4_8 rvaToOffset(VAR4_8 dwRva) const; // EXPORT
+
+                  /// Converts a relative virtual address to a virtual address.
+                  VAR4_8 rvaToVa(VAR4_8 dwRva) const; // EXPORT
+
+                  /// Calculates the size for the current PE header including all section definitions.
+                  unsigned int size() const;
+
+                  VAR4_8 vaToRva(VAR4_8 dwRva) const; // EXPORT
+                  VAR4_8 vaToOffset(VAR4_8 dwRva) const; // EXPORT
+
+                  /// Save the PE header to a file.
+                  int write(std::string strFilename, unsigned int uiOffset) const; // EXPORT
+
+                  /// Writes sections to a file.
+                  int writeSections(const std::string& strFilename) const; // EXPORT
+                  /// Overwrites a section with new data.
+                  int writeSectionData(const std::string& strFilename, word wSecnr, const std::vector<byte>& vBuffer) const; // EXPORT
+
+// header getters
+                  /// Returns the Signature value of the header.
+                  dword getNtSignature() const; // EXPORT
+                  /// Returns the Machine value of the header.
+                  word getMachine() const; // EXPORT
+                  /// Returns the Sections value of the header.
+                  word getNumberOfSections() const; // EXPORT
+                  /// Returns the TimeDateStamp value of the header.
+                  dword getTimeDateStamp() const; // EXPORT
+                  /// Returns the PointerToSymbolTable value of the header.
+                  dword getPointerToSymbolTable() const; // EXPORT
+                  /// Returns the NumberOfSymbols value of the header.
+                  dword getNumberOfSymbols() const; // EXPORT
+                  /// Returns the SizeOfOptionalHeader value of the header.
+                  word getSizeOfOptionalHeader() const; // EXPORT
+                  /// Returns the Characteristics value of the header.
+                  word getCharacteristics() const; // EXPORT
+
+                  /// Returns the Magic value of the header.
+                  word getMagic() const; // EXPORT
+                  /// Returns the MajorLinkerVersion value of the header.
+                  byte getMajorLinkerVersion() const; // EXPORT
+                  /// Returns the MinorLinkerVersion value of the header.
+                  byte getMinorLinkerVersion() const; // EXPORT
+                  /// Returns the SizeOfCode value of the header.
+                  dword getSizeOfCode() const; // EXPORT
+                  /// Returns the SizeOfInitializedData value of the header.
+                  dword getSizeOfInitializedData() const; // EXPORT
+                  /// Returns the SizeOfUninitializedData value of the header.
+                  dword getSizeOfUninitializedData() const; // EXPORT
+                  /// Returns the AddressOfEntryPoint value of the header.
+                  dword getAddressOfEntryPoint() const; // EXPORT
+                  /// Returns the BaseOfCode value of the header.
+                  dword getBaseOfCode() const; // EXPORT
+                  /// Returns the ImageBase value of the header.
+                  VAR4_8 getImageBase() const; // EXPORT
+                  /// Returns the SectionAlignment value of the header.
+                  dword getSectionAlignment() const; // EXPORT
+                  /// Returns the FileAlignment value of the header.
+                  dword getFileAlignment() const; // EXPORT
+                  /// Returns the MajorOperatingSystemVersion value of the header.
+                  word getMajorOperatingSystemVersion() const; // EXPORT
+                  /// Returns the MinorOperatingSystemVersion value of the header.
+                  word getMinorOperatingSystemVersion() const; // EXPORT
+                  /// Returns the MajorImageVersion value of the header.
+                  word getMajorImageVersion() const; // EXPORT
+                  /// Returns the MinorImageVersion value of the header.
+                  word getMinorImageVersion() const; // EXPORT
+                  /// Returns the MajorSubsystemVersion value of the header.
+                  word getMajorSubsystemVersion() const; // EXPORT
+                  /// Returns the MinorSubsystemVersion value of the header.
+                  word getMinorSubsystemVersion() const; // EXPORT
+                  /// Returns the Reserved1 value of the header.
+                  dword getWin32VersionValue() const; // EXPORT
+                  /// Returns the SizeOfImage value of the header.
+                  dword getSizeOfImage() const; // EXPORT
+                  /// Returns the SizeOfHeaders value of the header.
+                  dword getSizeOfHeaders() const; // EXPORT
+                  /// Returns the CheckSum value of the header.
+                  dword getCheckSum() const; // EXPORT
+                  /// Returns the Subsystem value of the header.
+                  word getSubsystem() const; // EXPORT
+                  /// Returns the DllCharacteristics value of the header.
+                  word getDllCharacteristics() const; // EXPORT
+                  /// Returns the SizeOfStackReserve value of the header.
+                  VAR4_8 getSizeOfStackReserve() const; // EXPORT
+                  /// Returns the SizeOfStackCommit value of the header.
+                  VAR4_8 getSizeOfStackCommit() const; // EXPORT
+                  /// Returns the SizeOfHeapReserve value of the header.
+                  VAR4_8 getSizeOfHeapReserve() const; // EXPORT
+                  /// Returns the SizeOfHeapCommit value of the header.
+                  VAR4_8 getSizeOfHeapCommit() const; // EXPORT
+                  /// Returns the LoaderFlags value of the header.
+                  dword getLoaderFlags() const; // EXPORT
+                  /// Returns the NumberOfRvaAndSizes value of the header.
+                  dword getNumberOfRvaAndSizes() const; // EXPORT
+                  dword calcNumberOfRvaAndSizes() const; // EXPORT
+
+                  void addDataDirectory(); // EXPORT
+                  void removeDataDirectory(dword index); // EXPORT
+                  
+// image directory getters
+                  /// Returns the relative virtual address of the image directory Export.
+                  dword getIddExportRva() const; // EXPORT
+                  /// Returns the size of the image directory Export.
+                  dword getIddExportSize() const; // EXPORT
+                  /// Returns the relative virtual address of the image directory Import.
+                  dword getIddImportRva() const; // EXPORT
+                  /// Returns the size of the image directory Import.
+                  dword getIddImportSize() const; // EXPORT
+                  /// Returns the relative virtual address of the image directory Resource.
+                  dword getIddResourceRva() const; // EXPORT
+                  /// Returns the size of the image directory Resource.
+                  dword getIddResourceSize() const; // EXPORT
+                  /// Returns the relative virtual address of the image directory Exception.
+                  dword getIddExceptionRva() const; // EXPORT
+                  /// Returns the size of the image directory Exception.
+                  dword getIddExceptionSize() const; // EXPORT
+                  /// Returns the relative virtual address of the image directory Security.
+                  dword getIddSecurityRva() const; // EXPORT
+                  /// Returns the size of the image directory Security.
+                  dword getIddSecuritySize() const; // EXPORT
+                  /// Returns the relative virtual address of the image directory Base Reloc.
+                  dword getIddBaseRelocRva() const; // EXPORT
+                  /// Returns the size of the image directory Base Reloc.
+                  dword getIddBaseRelocSize() const; // EXPORT
+                  /// Returns the relative virtual address of the image directory Debug.
+                  dword getIddDebugRva() const; // EXPORT
+                  /// Returns the size of the image directory Debug.
+                  dword getIddDebugSize() const; // EXPORT
+                  /// Returns the relative virtual address of the image directory Architecture.
+                  dword getIddArchitectureRva() const; // EXPORT
+                  /// Returns the size of the image directory Architecture.
+                  dword getIddArchitectureSize() const; // EXPORT
+                  /// Returns the relative virtual address of the image directory GlobalPtr.
+                  dword getIddGlobalPtrRva() const; // EXPORT
+                  /// Returns the size of the image directory GlobalPtr.
+                  dword getIddGlobalPtrSize() const; // EXPORT
+                  /// Returns the relative virtual address of the image directory Tls.
+                  dword getIddTlsRva() const; // EXPORT
+                  /// Returns the size of the image directory Tls.
+                  dword getIddTlsSize() const; // EXPORT
+                  /// Returns the relative virtual address of the image directory LoadConfig.
+                  dword getIddLoadConfigRva() const; // EXPORT
+                  /// Returns the size of the image directory LoadConfig.
+                  dword getIddLoadConfigSize() const; // EXPORT
+                  /// Returns the relative virtual address of the image directory BoundImport.
+                  dword getIddBoundImportRva() const; // EXPORT
+                  /// Returns the size of the image directory BoundImport.
+                  dword getIddBoundImportSize() const; // EXPORT
+                  /// Returns the relative virtual address of the image directory Iat.
+                  dword getIddIatRva() const; // EXPORT
+                  /// Returns the size of the image directory Iat.
+                  dword getIddIatSize() const; // EXPORT
+                  /// Returns the relative virtual address of the image directory DelayImport.
+                  dword getIddDelayImportRva() const; // EXPORT
+                  /// Returns the size of the image directory DelayImport.
+                  dword getIddDelayImportSize() const; // EXPORT
+                  /// Returns the relative virtual address of the image directory COM Descriptor.
+                  dword getIddComHeaderRva() const; // EXPORT
+                  /// Returns the size of the image directory COM Descriptor.
+                  dword getIddComHeaderSize() const; // EXPORT
+
+                  /// Returns the relative virtual address of an image directory.
+                  dword getImageDataDirectoryRva(dword dwDirectory) const; // EXPORT
+                  /// Returns the size of an image directory.
+                  dword getImageDataDirectorySize(dword dwDirectory) const; // EXPORT
+                  
+                  void setImageDataDirectoryRva(dword dwDirectory, dword value); // EXPORT
+                  void setImageDataDirectorySize(dword dwDirectory, dword value); // EXPORT
+
+// section getters
+                  /// Returns the name of a section.
+                  std::string getSectionName(word uiSectionnr) const; // EXPORT
+                  /// Returns the virtual size of a section.
+                  dword getVirtualSize(word uiSectionnr) const; // EXPORT
+                  /// Returns the virtual address of a section.
+                  dword getVirtualAddress(word uiSectionnr) const; // EXPORT
+                  /// Returns the size of a section's raw data.
+                  dword getSizeOfRawData(word uiSectionnr) const; // EXPORT
+                  /// Returns file offset of the data of a section.
+                  dword getPointerToRawData(word uiSectionnr) const; // EXPORT
+                  /// Returns the rva of the relocations of a section.
+                  dword getPointerToRelocations(word uiSectionnr) const; // EXPORT
+                  /// Returns the rva of the line numbers of a section.
+                  dword getPointerToLinenumbers(word uiSectionnr) const; // EXPORT
+                  /// Returns the number of relocations of a section.
+                  dword getNumberOfRelocations(word uiSectionnr) const; // EXPORT
+                  /// Returns the number of line numbers of a section.
+                  dword getNumberOfLinenumbers(word uiSectionnr) const; // EXPORT
+                  /// Returns the characteristics of a section.
+                  dword getCharacteristics(word uiSectionnr) const; // EXPORT _section
+
+// header setters
+                  /// Sets the Signature value of the header.
+                  void setNtSignature(dword value); // EXPORT
+                  /// Sets the Machine value of the header.
+                  void setMachine(word value); // EXPORT
+                  /// Sets the Sections value of the header.
+                  void setNumberOfSections(word value); // EXPORT
+                  /// Sets the TimeDateStamp value of the header.
+                  void setTimeDateStamp(dword value); // EXPORT
+                  /// Sets the PointerToSymbolTable value of the header.
+                  void setPointerToSymbolTable(dword value); // EXPORT
+                  /// Sets the NumberOfSymbols value of the header.
+                  void setNumberOfSymbols(dword value); // EXPORT
+                  /// Sets the SizeOfOptionalHeader value of the header.
+                  void setSizeOfOptionalHeader(word value); // EXPORT
+                  /// Sets the Characteristics value of the header.
+                  void setCharacteristics(word value); // EXPORT _section
+
+                  /// Sets the Magic value of the header.
+                  void setMagic(word value); // EXPORT
+                  /// Sets the MajorLinkerVersion value of the header.
+                  void setMajorLinkerVersion(byte value); // EXPORT
+                  /// Sets the MinorLinkerVersion value of the header.
+                  void setMinorLinkerVersion(byte value); // EXPORT
+                  /// Sets the SizeOfCode value of the header.
+                  void setSizeOfCode(dword value); // EXPORT
+                  /// Sets the SizeOfInitializedData value of the header.
+                  void setSizeOfInitializedData(dword value); // EXPORT
+                  /// Sets the SizeOfUninitializedData value of the header.
+                  void setSizeOfUninitializedData(dword value); // EXPORT
+                  /// Sets the AddressOfEntryPoint value of the header.
+                  void setAddressOfEntryPoint(dword value); // EXPORT
+                  /// Sets the BaseOfCode value of the header.
+                  void setBaseOfCode(dword value); // EXPORT
+                  /// Sets the ImageBase value of the header.
+                  void setImageBase(VAR4_8 value); // EXPORT
+                  /// Sets the SectionAlignment value of the header.
+                  void setSectionAlignment(dword value); // EXPORT
+                  /// Sets the FileAlignment value of the header.
+                  void setFileAlignment(dword value); // EXPORT
+                  /// Sets the MajorOperatingSystemVersion value of the header.
+                  void setMajorOperatingSystemVersion(word value); // EXPORT
+                  /// Sets the MinorOperatingSystemVersion value of the header.
+                  void setMinorOperatingSystemVersion(word value); // EXPORT
+                  /// Sets the MajorImageVersion value of the header.
+                  void setMajorImageVersion(word value); // EXPORT
+                  /// Sets the MinorImageVersion value of the header.
+                  void setMinorImageVersion(word value); // EXPORT
+                  /// Sets the MajorSubsystemVersion value of the header.
+                  void setMajorSubsystemVersion(word value); // EXPORT
+                  /// Sets the MinorSubsystemVersion value of the header.
+                  void setMinorSubsystemVersion(word value); // EXPORT
+                  /// Sets the Reserved1 value of the header.
+                  void setWin32VersionValue(dword value); // EXPORT
+                  /// Sets the SizeOfImage value of the header.
+                  void setSizeOfImage(dword value); // EXPORT
+                  /// Sets the SizeOfHeaders value of the header.
+                  void setSizeOfHeaders(dword value); // EXPORT
+                  /// Sets the CheckSum value of the header.
+                  void setCheckSum(dword value); // EXPORT
+                  /// Sets the Subsystem value of the header.
+                  void setSubsystem(word value); // EXPORT
+                  /// Sets the DllCharacteristics value of the header.
+                  void setDllCharacteristics(word value); // EXPORT
+                  /// Sets the SizeOfStackReserve value of the header.
+                  void setSizeOfStackReserve(VAR4_8 value); // EXPORT
+                  /// Sets the SizeOfStackCommit value of the header.
+                  void setSizeOfStackCommit(VAR4_8 value); // EXPORT
+                  /// Sets the SizeOfHeapReserve value of the header.
+                  void setSizeOfHeapReserve(VAR4_8 value); // EXPORT
+                  /// Sets the SizeOfHeapCommit value of the header.
+                  void setSizeOfHeapCommit(VAR4_8 value); // EXPORT
+                  /// Sets the LoaderFlags value of the header.
+                  void setLoaderFlags(dword value); // EXPORT
+                  /// Sets the NumberOfRvaAndSizes value of the header.
+                  void setNumberOfRvaAndSizes(dword value); // EXPORT
+
+// image directory getters
+                  void setIddDebugRva(dword dwValue); // EXPORT
+                  void setIddDebugSize(dword dwValue); // EXPORT
+                  void setIddDelayImportRva(dword dwValue); // EXPORT
+                  void setIddDelayImportSize(dword dwValue); // EXPORT
+                  void setIddExceptionRva(dword dwValue); // EXPORT
+                  void setIddExceptionSize(dword dwValue); // EXPORT
+                  void setIddGlobalPtrRva(dword dwValue); // EXPORT
+                  void setIddGlobalPtrSize(dword dwValue); // EXPORT
+                  void setIddIatRva(dword dwValue); // EXPORT
+                  void setIddIatSize(dword dwValue); // EXPORT
+                  void setIddLoadConfigRva(dword dwValue); // EXPORT
+                  void setIddLoadConfigSize(dword dwValue); // EXPORT
+                  void setIddResourceRva(dword dwValue); // EXPORT
+                  void setIddResourceSize(dword dwValue); // EXPORT
+                  void setIddSecurityRva(dword dwValue); // EXPORT
+                  void setIddSecuritySize(dword dwValue); // EXPORT
+                  void setIddTlsRva(dword dwValue); // EXPORT
+                  void setIddTlsSize(dword dwValue); // EXPORT
+
+                  void setIddImportRva(dword dwValue); // EXPORT
+                  void setIddImportSize(dword dwValue); // EXPORT
+                  void setIddExportRva(dword dwValue); // EXPORT
+                  void setIddExportSize(dword dwValue); // EXPORT
+                  
+                  void setIddBaseRelocRva(dword value); // EXPORT
+                  void setIddBaseRelocSize(dword value); // EXPORT
+                  void setIddArchitectureRva(dword value); // EXPORT
+                  void setIddArchitectureSize(dword value); // EXPORT
+                  void setIddComHeaderRva(dword value); // EXPORT
+                  void setIddComHeaderSize(dword value); // EXPORT
+
+                  /// Set the name of a section.
+                  void setSectionName(word uiSectionnr, std::string strName); // EXPORT
+                  /// Set the virtual size of a section.
+                  void setVirtualSize(word uiSectionnr, dword dwValue); // EXPORT
+                  /// Set the virtual address of a section.
+                  void setVirtualAddress(word uiSectionnr, dword dwValue); // EXPORT
+                  /// Set the size of raw data of a section.
+                  void setSizeOfRawData(word uiSectionnr, dword dwValue); // EXPORT
+                  /// Set the file offset of a section.
+                  void setPointerToRawData(word uiSectionnr, dword dwValue); // EXPORT
+                  /// Set the pointer to relocations of a section.
+                  void setPointerToRelocations(word uiSectionnr, dword dwValue); // EXPORT
+                  /// Set the pointer to linenumbers of a section.
+                  void setPointerToLinenumbers(word uiSectionnr, dword dwValue); // EXPORT
+                  /// Set the number of relocations a section.
+                  void setNumberOfRelocations(word uiSectionnr, dword dwValue); // EXPORT
+                  /// Set the number of linenumbers section.
+                  void setNumberOfLinenumbers(word uiSectionnr, dword dwValue); // EXPORT
+                  /// Set the characteristics of a section.
+                  void setCharacteristics(word uiSectionnr, dword dwValue); // EXPORT
+        };
+        
+        class PeHeader32 : public PeHeaderT<32>
+        {
+                public:
+                  /// Returns the BaseOfData value of the header.
+                  dword getBaseOfData() const; // EXPORT
+                  /// Sets the BaseOfData value of the header.
+                  void setBaseOfData(dword value); // EXPORT
+        };
+        
+        class PeHeader64 : public PeHeaderT<64>
+        {
+        };
+        
+        template<int x>
+        void PeHeaderT<x>::addDataDirectory()
+        {
+                m_inthHeader.dataDirectories.push_back(PELIB_IMAGE_DATA_DIRECTORY());
+        }
+
+        template<int x>
+        void PeHeaderT<x>::removeDataDirectory(dword index)
+        {
+                m_inthHeader.dataDirectories.erase(m_inthHeader.dataDirectories.begin() + index);
+        }
+                  
+        /**
+        * Adds a new section to the header. The physical and virtual address as well as the virtual
+        * size of the section will be determined automatically from the raw size. The section
+        * characteristics will be set to IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_READ |
+        * IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_CNT_CODE. All other values will be set to 0.
+        * Note: It's important that if the current header's FileAlignment and/or SectionAlignment values are
+        * 0 this function will fail.
+        * @param strName Name of the new section. If this name is longer than 8 bytes only the first 8 bytes will be used.
+        * @param dwSize Physical size of the new section in bytes.
+        * \todo Better code that handles files with 0 sections.
+        **/
+        template<int x>
+        int PeHeaderT<x>::addSection(const std::string& strName, dword dwSize)
+        {
+                unsigned int uiSecnr = calcNumberOfSections();
+
+                if (!getFileAlignment())
+                {
+                        return ERROR_NO_FILE_ALIGNMENT;
+                }
+                else if (!getSectionAlignment())
+                {
+                        return ERROR_NO_SECTION_ALIGNMENT;
+                }
+                        
+                if (uiSecnr) // Always allow 1 section.
+                {
+                        if (uiSecnr == 0xFFFF)
+                        {
+                                return ERROR_TOO_MANY_SECTIONS;
+                        }
+                        else if (calcSpaceAfterHeader() < PELIB_IMAGE_SECTION_HEADER::size())
+                        {
+                                return ERROR_NOT_ENOUGH_SPACE;
+                        }
+                }
+
+                dword dwOffset = calcOffset(/*dwSize*/);
+                dword dwRva = calcRva(/*dwSize*/);
+
+                PELIB_IMAGE_SECTION_HEADER ishdCurr;
+                m_vIsh.push_back(ishdCurr);
+
+                setSectionName(uiSecnr, strName);
+                setSizeOfRawData(uiSecnr, alignOffset(dwSize, getFileAlignment()));
+                setPointerToRawData(uiSecnr, dwOffset);
+                setVirtualSize(uiSecnr, alignOffset(dwSize, getSectionAlignment()));
+                setVirtualAddress(uiSecnr, dwRva);
+                setCharacteristics(uiSecnr, PELIB_IMAGE_SCN_MEM_WRITE | PELIB_IMAGE_SCN_MEM_READ | PELIB_IMAGE_SCN_CNT_INITIALIZED_DATA | PELIB_IMAGE_SCN_CNT_CODE);
+                
+                return NO_ERROR;
+        }
+
+        /**
+        * Calculates a valid SizeOfImage value given the information from the current PE header.
+        * Note that this calculation works in Win2K but probably does not work in Win9X. I didn't test that though.
+        * @return Valid SizeOfImage value.
+        **/
+        template<int x>
+        unsigned int PeHeaderT<x>::calcSizeOfImage() const
+        {
+                // Major note here: It's possible for sections to exist with a Virtual Size of 0.
+                //                  That's why it's necessary to use std::max(Vsize, RawSize) here.
+                //                  An example for such a file is dbeng6.exe (made by Sybase).
+                //                  In this file each and every section has a VSize of 0 but it still runs.
+                
+                std::vector<PELIB_IMAGE_SECTION_HEADER>::const_iterator ishLastSection = std::max_element(m_vIsh.begin(), m_vIsh.end(), std::mem_fun_ref(&PELIB_IMAGE_SECTION_HEADER::biggerVirtualAddress));
+                if (ishLastSection->VirtualSize != 0) return ishLastSection->VirtualAddress + ishLastSection->VirtualSize;
+                return ishLastSection->VirtualAddress + std::max(ishLastSection->VirtualSize, ishLastSection->SizeOfRawData);
+        }
+
+        /**
+        * Calculates the space between the last byte of the header and the first byte that's used for something
+        * else (that's either the first section or an image directory).
+        * @return Unused space after the header.
+        * \todo There are PE files with sections beginning at offset 0. They
+        * need to be considered.
+        **/
+        template<int x>
+        unsigned int PeHeaderT<x>::calcSpaceAfterHeader() const
+        {
+                return (calcStartOfCode() > size() + m_uiOffset) ? calcStartOfCode() - (size() + m_uiOffset) : 0;
+        }
+
+        /**
+        * Returns the first offset of the file that's actually used for something different than the header.
+        * That something is not necessarily code, it can be a data directory too.
+        * This offset can be the beginning of a section or the beginning of a directory.
+        * \todo Some optimizization is surely possible here.
+        * \todo There are PE files with sections beginning at offset 0. They
+        * need to be considered. Returning 0 for these files doesn't really make sense.
+        * So far these sections are disregarded.
+        **/
+        template<int x>
+        unsigned int PeHeaderT<x>::calcStartOfCode() const
+        {
+                unsigned int directories = calcNumberOfRvaAndSizes();
+                dword dwMinOffset = 0xFFFFFFFF;
+                if (directories >= 1 && getIddExportRva() && rvaToOffset(getIddExportRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddExportRva());
+                if (directories >= 2 && getIddImportRva() && rvaToOffset(getIddImportRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddImportRva());
+                if (directories >= 3 && getIddResourceRva() && rvaToOffset(getIddResourceRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddResourceRva());
+                if (directories >= 4 && getIddExceptionRva()  && rvaToOffset(getIddExceptionRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddExceptionRva());
+                if (directories >= 5 && getIddSecurityRva()  && rvaToOffset(getIddSecurityRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddSecurityRva());
+                if (directories >= 6 && getIddBaseRelocRva()  && rvaToOffset(getIddBaseRelocRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddBaseRelocRva());
+                if (directories >= 7 && getIddDebugRva()  && rvaToOffset(getIddDebugRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddDebugRva());
+                if (directories >= 8 && getIddArchitectureRva()  && rvaToOffset(getIddArchitectureRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddArchitectureRva());
+                if (directories >= 9 && getIddGlobalPtrRva()  && rvaToOffset(getIddGlobalPtrRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddGlobalPtrRva());
+                if (directories >= 10 && getIddTlsRva()  && rvaToOffset(getIddTlsRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddTlsRva());
+                if (directories >= 11 && getIddLoadConfigRva()  && rvaToOffset(getIddLoadConfigRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddLoadConfigRva());
+                if (directories >= 12 && getIddBoundImportRva()  && rvaToOffset(getIddBoundImportRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddBoundImportRva());
+                if (directories >= 13 && getIddIatRva()  && rvaToOffset(getIddIatRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddIatRva());
+                if (directories >= 14 && getIddDelayImportRva()  && rvaToOffset(getIddDelayImportRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddDelayImportRva());
+                if (directories >= 15 && getIddComHeaderRva()  && rvaToOffset(getIddComHeaderRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddComHeaderRva());
+                
+                for (word i=0;i<calcNumberOfSections();i++)
+                {
+                        if ((getPointerToRawData(i) < dwMinOffset || dwMinOffset == 0xFFFFFFFF) && getSizeOfRawData(i))
+                        {
+                                if (getPointerToRawData(i)) dwMinOffset = getPointerToRawData(i);
+                        }
+                }
+                return dwMinOffset;
+        }
+
+        /**
+        * Calculates the file offset for a new section. The file offset will already be aligned to the file's FileAlignment.
+        * @return Aligned file offset.
+        * \todo uiSize isn't used yet. Will be used later on to search for caves.
+        **/
+        template<int x>
+        unsigned int PeHeaderT<x>::calcOffset(/*unsigned int uiSize*/) const
+        {
+                unsigned int maxoffset = size();
+
+                for (word i=0;i<calcNumberOfSections();i++)
+                {
+                        if (getPointerToRawData(i) + getSizeOfRawData(i) > maxoffset) maxoffset = getPointerToRawData(i) + getSizeOfRawData(i);
+                }
+
+                return alignOffset(maxoffset, getFileAlignment());
+        }
+
+        /**
+        * Calculates the Rva for a new section. The Rva will already be aligned to the file's SectionAlignment.
+        * \todo uiSize isn't used yet. Will be used later on to search for caves.
+        * @return Aligned Rva.
+        **/
+        template<int x>
+        unsigned int PeHeaderT<x>::calcRva(/*unsigned int uiSize*/) const
+        {
+                // Major note here: It's possible for sections to exist with a Virtual Size of 0.
+                //                  That's why it's necessary to use std::max(Vsize, RawSize) here.
+                //                  An example for such a file is dbeng6.exe (made by Sybase).
+                //                  In this file each and every section has a VSize of 0 but it still runs.
+                
+                unsigned int maxoffset = size();
+                for (word i=0;i<calcNumberOfSections();i++)
+                {
+                        if (getVirtualAddress(i) + std::max(getVirtualSize(i), getSizeOfRawData(i)) > maxoffset) maxoffset = getVirtualAddress(i) + std::max(getVirtualSize(i), getSizeOfRawData(i));
+                }
+
+                return alignOffset(maxoffset, getSectionAlignment());
+        }
+
+        /**
+        * Returns the number of currently defined sections. Note that this value can be different from the number
+        * of sections according to the header (see #PeLib::PeHeaderT<x>::getNumberOfSections).
+        * @return Number of currently defined sections.
+        **/
+        template<int x>
+        word PeHeaderT<x>::calcNumberOfSections() const
+        {
+                return static_cast<PeLib::word>(m_vIsh.size());
+        }
+
+        /**
+        * Enlarges the physically last section in the file.
+        * @param uiSize Additional size that's added to the section's size.
+        **/
+        template<int x>
+        void PeHeaderT<x>::enlargeLastSection(unsigned int uiSize)
+        {
+                std::vector<PELIB_IMAGE_SECTION_HEADER>::iterator ishLastSection = std::max_element(m_vIsh.begin(), m_vIsh.end(), std::mem_fun_ref(&PELIB_IMAGE_SECTION_HEADER::biggerFileOffset));
+                unsigned int uiRawDataSize = alignOffset(ishLastSection->SizeOfRawData + uiSize, getFileAlignment());
+                
+                ishLastSection->SizeOfRawData = uiRawDataSize;
+                ishLastSection->VirtualSize = ishLastSection->SizeOfRawData;
+                
+                setSizeOfImage(calcSizeOfImage());
+        }
+
+        /**
+        * Determines the section which contains the file offset.
+        * @param dwOffset File offset.
+        * @return Section Id of the section which contains the offset.
+        **/
+        template<int x>
+        word PeHeaderT<x>::getSectionWithOffset(VAR4_8 dwOffset) const
+        {
+                // Offset = 0 must be handled explicitly as there are files
+                // with sections that begin at offset 0, that means the section
+                // only exists in memory.
+                
+                if (!dwOffset) return std::numeric_limits<word>::max();
+                
+                for (word i=0;i<calcNumberOfSections();i++)
+                {
+                        // Explicity exclude sections with raw pointer = 0.
+                        dword rawptr = getPointerToRawData(i);
+                        if (rawptr && rawptr <= dwOffset && rawptr + getSizeOfRawData(i) > dwOffset) return i;
+                }
+                
+                return std::numeric_limits<word>::max();
+        }
+
+        /**
+        * Determines the section which contains the Rva.
+        * @param dwRva A relative virtual address.
+        * @return Section Id of the section which contains the Rva.
+        **/
+        template<int x>
+        word PeHeaderT<x>::getSectionWithRva(VAR4_8 dwRva) const
+        {
+                // Major note here: It's possible for sections to exist with a Virtual Size of 0.
+                //                  That's why it's necessary to use std::max(Vsize, RawSize) here.
+                //                  An example for such a file is dbeng6.exe (made by Sybase).
+                //                  In this file each and every section has a VSize of 0 but it still runs.
+                
+                for (word i=0;i<calcNumberOfSections();i++)
+                {
+                        // Weird VC++7 error doesn't allow me to use std::max here.
+                        dword max = getVirtualSize(i) >= getSizeOfRawData(i) ? getVirtualSize(i) : getSizeOfRawData(i);
+                        if (getVirtualAddress(i) <= dwRva && getVirtualAddress(i) + max > dwRva) return i;
+                }
+                
+                return -1;
+        }
+
+        /**
+        * Corrects all faulty values of the current PE header. The following values will be corrected: NtSignature,
+        * NumberOfSections, SizeOfOptionalHeader, FileAlignment (will be aligned to n*0x200),
+        * SectionAlignment (will be aligned to n*0x1000), NumberOfRvaAndSizes, SizeOfHeaders, SizeOfImage,
+        * Magic, Characteristics.
+        * @param dwOffset Beginning of PeHeader (see #PeLib::MzHeader::getAddressOfPeHeader).
+    * \todo 32bit and 64bit versions.
+        **/
+        template<int x>
+        void PeHeaderT<x>::makeValid(dword dwOffset)
+        {
+                setNtSignature(PELIB_IMAGE_NT_SIGNATURE); // 'PE'
+                setMachine(PELIB_IMAGE_FILE_MACHINE_I386);
+                setNumberOfSections(calcNumberOfSections());
+                
+                // Check if 64 bits.
+                setSizeOfOptionalHeader(PELIB_IMAGE_OPTIONAL_HEADER<x>::size() + calcNumberOfRvaAndSizes() * 8);
+
+                // Check if 64 bits.
+                dword dwCharacteristics = PELIB_IMAGE_FILE_EXECUTABLE_IMAGE | PELIB_IMAGE_FILE_32BIT_MACHINE;
+                setCharacteristics(dwCharacteristics);
+
+                // Check if 64 bits.
+                setMagic(PELIB_IMAGE_NT_OPTIONAL_HDR32_MAGIC);
+
+                // setImageBase(0x01000000);
+
+                // Align file and section alignment values
+                unsigned int dwAlignedOffset = alignOffset(getSectionAlignment(), 0x1000);
+                setSectionAlignment(dwAlignedOffset ? dwAlignedOffset : 0x1000);
+
+                dwAlignedOffset = alignOffset(getFileAlignment(), 0x200);
+                setFileAlignment(dwAlignedOffset ? dwAlignedOffset : 0x200);
+
+//              setMajorSubsystemVersion(4);
+//              setSubsystem(IMAGE_SUBSYSTEM_WINDOWS_GUI);
+                setNumberOfRvaAndSizes(calcNumberOfRvaAndSizes());
+                
+                // Code below depends on code above. Don't change the order.
+                dword dwSizeOfHeaders = alignOffset(dwOffset + size(), getFileAlignment());
+                setSizeOfHeaders(dwSizeOfHeaders);
+
+                dword dwSizeOfImage = alignOffset(dwSizeOfHeaders, getSectionAlignment());
+
+                for (int i=0;i<calcNumberOfSections();i++)
+                {
+                        dwSizeOfImage += alignOffset(getVirtualSize(i), getSectionAlignment());
+                }
+
+                dwSizeOfImage = alignOffset(dwSizeOfImage, getSectionAlignment());
+                setSizeOfImage(dwSizeOfImage);
+        }
+
+        template<int x>
+        unsigned int PeHeaderT<x>::offsetToRva(VAR4_8 dwOffset) const
+        {
+                if (dwOffset < calcStartOfCode()) return dwOffset;
+        
+                PeLib::word uiSecnr = getSectionWithOffset(dwOffset);
+                
+                if (uiSecnr == 0xFFFF) return -1;
+                
+                return getVirtualAddress(uiSecnr) + dwOffset - getPointerToRawData(uiSecnr);
+        }
+
+        /**
+        * Converts a file offset to a virtual address.
+        * @param dwOffset File offset.
+        * @return Virtual Address.
+        **/
+        template<int x>
+        unsigned int PeHeaderT<x>::offsetToVa(VAR4_8 dwOffset) const
+        {
+                if (dwOffset < calcStartOfCode()) return getImageBase() + dwOffset;
+                
+                PeLib::word uiSecnr = getSectionWithOffset(dwOffset);
+                
+                if (uiSecnr == 0xFFFF) return -1;
+                
+                return getImageBase() + getVirtualAddress(uiSecnr) + dwOffset - getPointerToRawData(uiSecnr);
+        }
+
+        template<int x>
+        void PeHeaderT<x>::readHeader(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const
+        {
+                ibBuffer >> header.Signature;
+                
+                ibBuffer >> header.FileHeader.Machine;
+                ibBuffer >> header.FileHeader.NumberOfSections;
+                ibBuffer >> header.FileHeader.TimeDateStamp;
+                ibBuffer >> header.FileHeader.PointerToSymbolTable;
+                ibBuffer >> header.FileHeader.NumberOfSymbols;
+                ibBuffer >> header.FileHeader.SizeOfOptionalHeader;
+                ibBuffer >> header.FileHeader.Characteristics;
+                ibBuffer >> header.OptionalHeader.Magic;
+
+                ibBuffer >> header.OptionalHeader.MajorLinkerVersion;
+                ibBuffer >> header.OptionalHeader.MinorLinkerVersion;
+                ibBuffer >> header.OptionalHeader.SizeOfCode;
+                ibBuffer >> header.OptionalHeader.SizeOfInitializedData;
+                ibBuffer >> header.OptionalHeader.SizeOfUninitializedData;
+                ibBuffer >> header.OptionalHeader.AddressOfEntryPoint;
+                ibBuffer >> header.OptionalHeader.BaseOfCode;
+                readBaseOfData(ibBuffer, header);
+                ibBuffer >> header.OptionalHeader.ImageBase;
+                ibBuffer >> header.OptionalHeader.SectionAlignment;
+                ibBuffer >> header.OptionalHeader.FileAlignment;
+                ibBuffer >> header.OptionalHeader.MajorOperatingSystemVersion;
+                ibBuffer >> header.OptionalHeader.MinorOperatingSystemVersion;
+                ibBuffer >> header.OptionalHeader.MajorImageVersion;
+                ibBuffer >> header.OptionalHeader.MinorImageVersion;
+                ibBuffer >> header.OptionalHeader.MajorSubsystemVersion;
+                ibBuffer >> header.OptionalHeader.MinorSubsystemVersion;
+                ibBuffer >> header.OptionalHeader.Win32VersionValue;
+                ibBuffer >> header.OptionalHeader.SizeOfImage;
+                ibBuffer >> header.OptionalHeader.SizeOfHeaders;
+                ibBuffer >> header.OptionalHeader.CheckSum;
+                ibBuffer >> header.OptionalHeader.Subsystem;
+                ibBuffer >> header.OptionalHeader.DllCharacteristics;
+                ibBuffer >> header.OptionalHeader.SizeOfStackReserve;
+                ibBuffer >> header.OptionalHeader.SizeOfStackCommit;
+                ibBuffer >> header.OptionalHeader.SizeOfHeapReserve;
+                ibBuffer >> header.OptionalHeader.SizeOfHeapCommit;
+                ibBuffer >> header.OptionalHeader.LoaderFlags;
+                ibBuffer >> header.OptionalHeader.NumberOfRvaAndSizes;
+        }
+        
+        template<int x>
+        void PeHeaderT<x>::readDataDirectories(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const
+        {
+                PELIB_IMAGE_DATA_DIRECTORY idd;
+
+                for (unsigned int i=0;i<header.OptionalHeader.NumberOfRvaAndSizes;i++)
+                {
+                        ibBuffer >> idd.VirtualAddress;
+                        ibBuffer >> idd.Size;
+                        header.dataDirectories.push_back(idd);
+                }
+        }
+        
+        template<int x>
+        std::vector<PELIB_IMAGE_SECTION_HEADER> PeHeaderT<x>::readSections(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const
+        {
+                const unsigned int nrSections = header.FileHeader.NumberOfSections;
+                PELIB_IMAGE_SECTION_HEADER ishCurr;
+
+                std::vector<PELIB_IMAGE_SECTION_HEADER> vIshdCurr;
+
+                for (unsigned int i=0;i<nrSections;i++)
+                {
+                        ibBuffer.read(reinterpret_cast<char*>(ishCurr.Name), 8);
+                        ibBuffer >> ishCurr.VirtualSize;
+                        ibBuffer >> ishCurr.VirtualAddress;
+                        ibBuffer >> ishCurr.SizeOfRawData;
+                        ibBuffer >> ishCurr.PointerToRawData;
+                        ibBuffer >> ishCurr.PointerToRelocations;
+                        ibBuffer >> ishCurr.PointerToLinenumbers;
+                        ibBuffer >> ishCurr.NumberOfRelocations;
+                        ibBuffer >> ishCurr.NumberOfLinenumbers;
+                        ibBuffer >> ishCurr.Characteristics;
+                        vIshdCurr.push_back(ishCurr);
+                }
+
+                return vIshdCurr;
+        }
+        
+        template<int x>
+        int PeHeaderT<x>::read(const unsigned char* pcBuffer, unsigned int uiSize, unsigned int uiOffset)
+        {
+                if (uiSize < m_inthHeader.size())
+                {
+                        return ERROR_INVALID_FILE;
+                }
+                
+                std::vector<unsigned char> vBuffer(pcBuffer, pcBuffer + m_inthHeader.size());
+
+                InputBuffer ibBuffer(vBuffer);
+                PELIB_IMAGE_NT_HEADERS<x> header;
+                
+                readHeader(ibBuffer, header);
+                
+                if (uiSize < m_inthHeader.size() + header.OptionalHeader.NumberOfRvaAndSizes * 8 + header.FileHeader.NumberOfSections * 0x28)
+                {
+                        return ERROR_INVALID_FILE;
+                }
+                
+                vBuffer.resize(header.OptionalHeader.NumberOfRvaAndSizes * 8 + header.FileHeader.NumberOfSections * 0x28);
+                vBuffer.assign(pcBuffer + m_inthHeader.size(), pcBuffer + m_inthHeader.size() + header.OptionalHeader.NumberOfRvaAndSizes * 8 + header.FileHeader.NumberOfSections * 0x28);
+                
+                ibBuffer.setBuffer(vBuffer);
+                
+                readDataDirectories(ibBuffer, header);
+                
+                m_vIsh = readSections(ibBuffer, header);
+
+                std::swap(m_inthHeader, header);
+
+                m_uiOffset = uiOffset;
+
+                return NO_ERROR;
+        }
+        
+        /**
+        * Reads the PE header from a file Note that this function does not verify if a file is actually a MZ file.
+        * For this purpose see #PeLib::PeHeaderT<x>::isValid. The only check this function makes is a check to see if
+        * the file is large enough to be a PE header. If the data is valid doesn't matter.
+        * @param strFilename Name of the file which will be read.
+        * @param uiOffset File offset of PE header (see #PeLib::MzHeader::getAddressOfPeHeader).
+        **/
+        template<int x>
+        int PeHeaderT<x>::read(std::string strFilename, unsigned int uiOffset)
+        {
+                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
+                
+                if (!ifFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+                
+                // File too small
+                if (fileSize(ifFile) < uiOffset + m_inthHeader.size())
+                {
+                        return ERROR_INVALID_FILE;
+                }
+                
+                std::vector<unsigned char> vBuffer(m_inthHeader.size());
+
+                ifFile.seekg(uiOffset, std::ios::beg);
+                ifFile.read(reinterpret_cast<char*>(&vBuffer[0]), static_cast<std::streamsize>(vBuffer.size()));
+
+                InputBuffer ibBuffer(vBuffer);
+                PELIB_IMAGE_NT_HEADERS<x> header;
+                
+                readHeader(ibBuffer, header);
+
+                vBuffer.resize(header.OptionalHeader.NumberOfRvaAndSizes * 8 + header.FileHeader.NumberOfSections * 0x28);
+
+                ifFile.read(reinterpret_cast<char*>(&vBuffer[0]), static_cast<std::streamsize>(vBuffer.size()));
+                if (!ifFile)
+                {
+                        return ERROR_INVALID_FILE;
+                }
+
+                ibBuffer.setBuffer(vBuffer);
+                
+                readDataDirectories(ibBuffer, header);
+                
+                // Sections
+//              const unsigned int nrSections = header.FileHeader.NumberOfSections;
+//              if (fileSize(ifFile) < uiOffset + m_inthHeader.size() + nrSections * PELIB_IMAGE_SECTION_HEADER::size())
+//              {
+//                      return ERROR_INVALID_FILE;
+//              }
+                
+                m_vIsh = readSections(ibBuffer, header);
+
+                std::swap(m_inthHeader, header);
+
+                m_uiOffset = uiOffset;
+
+                ifFile.close();
+                
+                return NO_ERROR;
+        }
+
+        /**
+        * Rebuilds the PE header so that it can be written to a file. It's not guaranteed that the
+        * header will be valid. If you want to make sure that the header will be valid you
+        * must call #PeLib::PeHeaderT<x>::makeValid first.
+        * @param vBuffer Buffer where the rebuilt header will be stored.
+        **/
+        template<int x>
+        void PeHeaderT<x>::rebuild(std::vector<byte>& vBuffer) const
+        {
+                OutputBuffer obBuffer(vBuffer);
+
+                obBuffer << m_inthHeader.Signature;
+
+                obBuffer << m_inthHeader.FileHeader.Machine;
+                obBuffer << m_inthHeader.FileHeader.NumberOfSections;
+                obBuffer << m_inthHeader.FileHeader.TimeDateStamp;
+                obBuffer << m_inthHeader.FileHeader.PointerToSymbolTable;
+                obBuffer << m_inthHeader.FileHeader.NumberOfSymbols;
+                obBuffer << m_inthHeader.FileHeader.SizeOfOptionalHeader;
+                obBuffer << m_inthHeader.FileHeader.Characteristics;
+                obBuffer << m_inthHeader.OptionalHeader.Magic;
+                obBuffer << m_inthHeader.OptionalHeader.MajorLinkerVersion;
+                obBuffer << m_inthHeader.OptionalHeader.MinorLinkerVersion;
+                obBuffer << m_inthHeader.OptionalHeader.SizeOfCode;
+                obBuffer << m_inthHeader.OptionalHeader.SizeOfInitializedData;
+                obBuffer << m_inthHeader.OptionalHeader.SizeOfUninitializedData;
+                obBuffer << m_inthHeader.OptionalHeader.AddressOfEntryPoint;
+                obBuffer << m_inthHeader.OptionalHeader.BaseOfCode;
+                rebuildBaseOfData(obBuffer);
+//              obBuffer << m_inthHeader.OptionalHeader.BaseOfData;
+                obBuffer << m_inthHeader.OptionalHeader.ImageBase;
+                obBuffer << m_inthHeader.OptionalHeader.SectionAlignment;
+                obBuffer << m_inthHeader.OptionalHeader.FileAlignment;
+                obBuffer << m_inthHeader.OptionalHeader.MajorOperatingSystemVersion;
+                obBuffer << m_inthHeader.OptionalHeader.MinorOperatingSystemVersion;
+                obBuffer << m_inthHeader.OptionalHeader.MajorImageVersion;
+                obBuffer << m_inthHeader.OptionalHeader.MinorImageVersion;
+                obBuffer << m_inthHeader.OptionalHeader.MajorSubsystemVersion;
+                obBuffer << m_inthHeader.OptionalHeader.MinorSubsystemVersion;
+                obBuffer << m_inthHeader.OptionalHeader.Win32VersionValue;
+                obBuffer << m_inthHeader.OptionalHeader.SizeOfImage;
+                obBuffer << m_inthHeader.OptionalHeader.SizeOfHeaders;
+                obBuffer << m_inthHeader.OptionalHeader.CheckSum;
+                obBuffer << m_inthHeader.OptionalHeader.Subsystem;
+                obBuffer << m_inthHeader.OptionalHeader.DllCharacteristics;
+                obBuffer << m_inthHeader.OptionalHeader.SizeOfStackReserve;
+                obBuffer << m_inthHeader.OptionalHeader.SizeOfStackCommit;
+                obBuffer << m_inthHeader.OptionalHeader.SizeOfHeapReserve;
+                obBuffer << m_inthHeader.OptionalHeader.SizeOfHeapCommit;
+                obBuffer << m_inthHeader.OptionalHeader.LoaderFlags;
+                obBuffer << m_inthHeader.OptionalHeader.NumberOfRvaAndSizes;
+
+                // The 0x10 data directories
+                for (unsigned int i=0;i<calcNumberOfRvaAndSizes();i++)
+                {
+                        obBuffer << m_inthHeader.dataDirectories[i].VirtualAddress;
+                        obBuffer << m_inthHeader.dataDirectories[i].Size;
+                }
+                
+                // The section definitions
+                const unsigned int nrSections = calcNumberOfSections();
+                for (unsigned int i=0;i<nrSections;i++)
+                {
+                        char temp[9] = {0};
+                        strcpy(temp, getSectionName(i).c_str());
+                        obBuffer.add(temp, 8);
+                        obBuffer << m_vIsh[i].VirtualSize;
+                        obBuffer << m_vIsh[i].VirtualAddress;
+                        obBuffer << m_vIsh[i].SizeOfRawData;
+                        obBuffer << m_vIsh[i].PointerToRawData;
+                        obBuffer << m_vIsh[i].PointerToRelocations;
+                        obBuffer << m_vIsh[i].PointerToLinenumbers;
+                        obBuffer << m_vIsh[i].NumberOfRelocations;
+                        obBuffer << m_vIsh[i].NumberOfLinenumbers;
+                        obBuffer << m_vIsh[i].Characteristics;
+                }
+        }
+
+        /**
+        * Converts a relative virtual offset to a file offset.
+        * @param dwRva A relative virtual offset.
+        * @return A file offset.
+        * \todo It's not always 0x1000.
+        **/
+        template<int x>
+        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::rvaToOffset(VAR4_8 dwRva) const
+        {
+                // XXX: Not correct
+                if (dwRva < 0x1000) return dwRva;
+                
+                PeLib::word uiSecnr = getSectionWithRva(dwRva);
+                if (uiSecnr == 0xFFFF || dwRva > getVirtualAddress(uiSecnr) + getSizeOfRawData(uiSecnr))
+                {
+                        return std::numeric_limits<VAR4_8>::max();
+                }
+                
+                return getPointerToRawData(uiSecnr) + dwRva - getVirtualAddress(uiSecnr);
+        }
+
+        /**
+        * Converts a relative virtual offset to a virtual offset.
+        * @param dwRva A relative virtual offset.
+        * @return A virtual offset.
+        **/
+        template<int x>
+        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::rvaToVa(VAR4_8 dwRva) const
+        {
+                return getImageBase() + dwRva;
+        }
+
+        /**
+        * Calculates the size of the current PE header. This includes the actual header and the section definitions.
+        * @return Size of the current PE header.
+        * \todo Better handling of files with less than 0x10 directories.
+        **/
+        template<int x>
+        unsigned int PeHeaderT<x>::size() const
+        {
+                return m_inthHeader.size() + getNumberOfSections() * PELIB_IMAGE_SECTION_HEADER::size();
+        }
+
+        // \todo Not sure if this works.
+        template<int x>
+        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::vaToRva(VAR4_8 dwRva) const
+        {
+                if (dwRva - getImageBase() < calcStartOfCode()) return dwRva - getImageBase();
+                
+                if (getSectionWithRva(dwRva - getImageBase()) == 0xFFFF) return -1;
+                
+                return dwRva - getImageBase();
+        }
+
+        template<int x>
+        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::vaToOffset(VAR4_8 dwRva) const
+        {
+                return rvaToOffset(dwRva - getImageBase());
+        }
+
+        /**
+        * Saves the PE header to a file. Note that this only saves the header information, if you have added sections
+        * and want to save these to the file you have to call #PeLib::PeHeaderT<x>::saveSections too. This function also
+        * does not verify if the PE header is correct. If you want to make sure that the current PE header is valid,
+        * call #PeLib::PeHeaderT<x>::isValid and #PeLib::PeHeaderT<x>::makeValid first.
+        * @param strFilename Filename of the file the header will be written to.
+        * @param uiOffset File offset the header will be written to.
+        **/
+        template<int x>
+        int PeHeaderT<x>::write(std::string strFilename, unsigned int uiOffset) const
+        {
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                
+                if (!ofFile)
+                {
+                        ofFile.clear();
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                }
+                else
+                {
+                        ofFile.close();
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                }
+                
+                if (!ofFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+                
+                ofFile.seekp(uiOffset, std::ios::beg);
+
+                std::vector<unsigned char> vBuffer;
+
+                rebuild(vBuffer);
+
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
+
+                ofFile.close();
+                
+                return NO_ERROR;
+        }
+
+
+        /**
+        * Overwrites a section's data.
+        * @param wSecnr Number of the section which will be overwritten.
+        * @param strFilename Name of the file where the section will be written to.
+        * @param wSecnr Number of the section that will be written.
+        * @param vBuffer New data of the section.
+        **/
+        template<int x>
+        int PeHeaderT<x>::writeSectionData(const std::string& strFilename, word wSecnr, const std::vector<byte>& vBuffer) const
+        {
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                
+                if (!ofFile)
+                {
+                        ofFile.clear();
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                }
+                else
+                {
+                        ofFile.close();
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                }
+
+                if (!ofFile)
+                {
+                        ofFile.clear();
+
+                        return ERROR_OPENING_FILE;
+                }
+
+                ofFile.seekp(getPointerToRawData(wSecnr), std::ios::beg);
+
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), std::min(static_cast<unsigned int>(vBuffer.size()), getSizeOfRawData(wSecnr)));
+
+                ofFile.close();
+                
+                return NO_ERROR;
+        }
+
+        template<int x>
+        int PeHeaderT<x>::writeSections(const std::string& strFilename) const
+        {
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                
+                if (!ofFile)
+                {
+                        ofFile.clear();
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                }
+                else
+                {
+                        ofFile.close();
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                }
+
+                if (!ofFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+
+                unsigned int uiFilesize = fileSize(ofFile);
+
+                for (int i=0;i<calcNumberOfSections();i++)
+                {
+                        if (uiFilesize < getPointerToRawData(i) + getSizeOfRawData(i))
+                        {
+                                unsigned int uiToWrite = getPointerToRawData(i) + getSizeOfRawData(i) - uiFilesize;
+                                std::vector<char> vBuffer(uiToWrite);
+                                ofFile.seekp(0, std::ios::end);
+                                ofFile.write(&vBuffer[0], static_cast<unsigned int>(vBuffer.size()));
+                                uiFilesize = getPointerToRawData(i) + getSizeOfRawData(i);
+                        }
+                }
+
+                ofFile.close();
+                
+                return NO_ERROR;
+        }
+
+        /**
+        * Returns the file's Nt signature.
+        * @return The Nt signature value from the PE header.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getNtSignature() const
+        {
+                return m_inthHeader.Signature;
+        }
+
+        /**
+        * Returns the file's machine.
+        * @return The Machine value from the PE header.
+        **/
+        template<int x>
+        word PeHeaderT<x>::getMachine() const
+        {
+                return m_inthHeader.FileHeader.Machine;
+        }
+
+
+        /**
+        * Returns the file's number of sections as defined in the header. Note that this value can be different
+        * from the number of defined sections (#see PeLib::PeHeaderT<x>::getNumberOfSections).
+        * @return The NumberOfSections value from the PE header.
+        **/
+        template<int x>
+        word PeHeaderT<x>::getNumberOfSections() const
+        {
+                return m_inthHeader.FileHeader.NumberOfSections;
+        }
+
+        /** 
+        * Returns the file's TimeDateStamp.
+        * @return The TimeDateStamp value from the PE header.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getTimeDateStamp() const
+        {
+                return m_inthHeader.FileHeader.TimeDateStamp;
+        }
+
+        /**
+        * Returns the relative virtual address of the file's symbol table.
+        * @return The PointerToSymbolTable value from the PE header.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getPointerToSymbolTable() const
+        {
+                return m_inthHeader.FileHeader.PointerToSymbolTable;
+        }
+
+        /**
+        * Returns the number of symbols of the file's symbol table.
+        * @return The NumberOfSymbols value from the PE header.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getNumberOfSymbols() const
+        {
+                return m_inthHeader.FileHeader.NumberOfSymbols;
+        }
+
+        /**
+        * Returns the size of optional header of the file.
+        * @return The SizeOfOptionalHeader value from the PE header.
+        **/
+        template<int x>
+        word PeHeaderT<x>::getSizeOfOptionalHeader() const
+        {
+                return m_inthHeader.FileHeader.SizeOfOptionalHeader;
+        }
+
+        /**
+        * @return The Characteristics value from the PE header.
+        **/
+        template<int x>
+        word PeHeaderT<x>::getCharacteristics() const
+        {
+                return m_inthHeader.FileHeader.Characteristics;
+        }
+
+        /**
+        * @return The Magic value from the PE header.
+        **/
+        template<int x>
+        word PeHeaderT<x>::getMagic() const
+        {
+                return m_inthHeader.OptionalHeader.Magic;
+        }
+
+        /**
+        * @return The MajorLinkerVersion value from the PE header.
+        **/
+        template<int x>
+        byte PeHeaderT<x>::getMajorLinkerVersion() const
+        {
+                return m_inthHeader.OptionalHeader.MajorLinkerVersion;
+        }
+
+        /**
+        * @return The MinorLinkerVersion value from the PE header.
+        **/
+        template<int x>
+        byte PeHeaderT<x>::getMinorLinkerVersion() const
+        {
+                return m_inthHeader.OptionalHeader.MinorLinkerVersion;
+        }
+
+        /**
+        * @return The SizeOfCode value from the PE header.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getSizeOfCode() const
+        {
+                return m_inthHeader.OptionalHeader.SizeOfCode;
+        }
+
+        /**
+        * @return The SizeOfInitializedData value from the PE header.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getSizeOfInitializedData() const
+        {
+                return m_inthHeader.OptionalHeader.SizeOfInitializedData;
+        }
+
+        /**
+        * @return The SizeOfUninitializedData value from the PE header.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getSizeOfUninitializedData() const
+        {
+                return m_inthHeader.OptionalHeader.SizeOfUninitializedData;
+        }
+
+        /**
+        * @return The AddressOfEntryPoint value from the PE header.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getAddressOfEntryPoint() const
+        {
+                return m_inthHeader.OptionalHeader.AddressOfEntryPoint;
+        }
+
+        /**
+        * @return The BaseOfCode value from the PE header.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getBaseOfCode() const
+        {
+                return m_inthHeader.OptionalHeader.BaseOfCode;
+        }
+
+        /**
+        * @return The ImageBase value from the PE header.
+        **/
+        template<int x>
+        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::getImageBase() const
+        {
+                return m_inthHeader.OptionalHeader.ImageBase;
+        }
+
+        /**
+        * @return The SectionAlignment value from the PE header.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getSectionAlignment() const
+        {
+                return m_inthHeader.OptionalHeader.SectionAlignment;
+        }
+
+        /**
+        * @return The FileAlignment value from the PE header.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getFileAlignment() const
+        {
+                return m_inthHeader.OptionalHeader.FileAlignment;
+        }
+
+        /**
+        * @return The MajorOperatingSystemVersion value from the PE header.
+        **/
+        template<int x>
+        word PeHeaderT<x>::getMajorOperatingSystemVersion() const
+        {
+                return m_inthHeader.OptionalHeader.MajorOperatingSystemVersion;
+        }
+
+        /**
+        * @return The MinorOperatingSystemVersion value from the PE header.
+        **/
+        template<int x>
+        word PeHeaderT<x>::getMinorOperatingSystemVersion() const
+        {
+                return m_inthHeader.OptionalHeader.MinorOperatingSystemVersion;
+        }
+
+        /**
+        * @return The MajorImageVersion value from the PE header.
+        **/
+        template<int x>
+        word PeHeaderT<x>::getMajorImageVersion() const
+        {
+                return m_inthHeader.OptionalHeader.MajorImageVersion;
+        }
+
+        /**
+        * @return The MinorImageVersion value from the PE header.
+        **/
+        template<int x>
+        word PeHeaderT<x>::getMinorImageVersion() const
+        {
+                return m_inthHeader.OptionalHeader.MinorImageVersion;
+        }
+
+        /**
+        * @return The MajorSubsystemVersion value from the PE header.
+        **/
+        template<int x>
+        word PeHeaderT<x>::getMajorSubsystemVersion() const
+        {
+                return m_inthHeader.OptionalHeader.MajorSubsystemVersion;
+        }
+
+        /**
+        * @return The MinorSubsystemVersion value from the PE header.
+        **/
+        template<int x>
+        word PeHeaderT<x>::getMinorSubsystemVersion() const
+        {
+                return m_inthHeader.OptionalHeader.MinorSubsystemVersion;
+        }
+
+        /**
+        * @return The WinVersionValue value from the PE header.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getWin32VersionValue() const
+        {
+                return m_inthHeader.OptionalHeader.Win32VersionValue;
+        }
+
+        /**
+        * @return The SizeOfImage value from the PE header.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getSizeOfImage() const
+        {
+                return m_inthHeader.OptionalHeader.SizeOfImage;
+        }
+
+        /**
+        * @return The SizeOfHeaders value from the PE header.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getSizeOfHeaders() const
+        {
+                return m_inthHeader.OptionalHeader.SizeOfHeaders;
+        }
+
+        /**
+        * @return The CheckSums value from the PE header.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getCheckSum() const
+        {
+                return m_inthHeader.OptionalHeader.CheckSum;
+        }
+
+        /**
+        * @return The Subsystem value from the PE header.
+        **/
+        template<int x>
+        word PeHeaderT<x>::getSubsystem() const
+        {
+                return m_inthHeader.OptionalHeader.Subsystem;
+        }
+
+        /**
+        * @return The DllCharacteristics value from the PE header.
+        **/
+        template<int x>
+        word PeHeaderT<x>::getDllCharacteristics() const
+        {
+                return m_inthHeader.OptionalHeader.DllCharacteristics;
+        }
+
+        /**
+        * @return The SizeOfStackReserve value from the PE header.
+        **/
+        template<int x>
+        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::getSizeOfStackReserve() const
+        {
+                return m_inthHeader.OptionalHeader.SizeOfStackReserve;
+        }
+
+        /**
+        * @return The SizeOfStackCommit value from the PE header.
+        **/
+        template<int x>
+        typename FieldSizes<x>::VAR4_8  PeHeaderT<x>::getSizeOfStackCommit() const
+        {
+                return m_inthHeader.OptionalHeader.SizeOfStackCommit;
+        }
+
+        /**
+        * @return The SizeOfHeapReserve value from the PE header.
+        **/
+        template<int x>
+        typename FieldSizes<x>::VAR4_8  PeHeaderT<x>::getSizeOfHeapReserve() const
+        {
+                return m_inthHeader.OptionalHeader.SizeOfHeapReserve;
+        }
+
+        /**
+        * @return The SizeOfHeapCommit value from the PE header.
+        **/
+        template<int x>
+        typename FieldSizes<x>::VAR4_8  PeHeaderT<x>::getSizeOfHeapCommit() const
+        {
+                return m_inthHeader.OptionalHeader.SizeOfHeapCommit;
+        }
+
+        /**
+        * @return The LoaderFlags value from the PE header.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getLoaderFlags() const
+        {
+                return m_inthHeader.OptionalHeader.LoaderFlags;
+        }
+
+        /**
+        * @return The NumberOfRvaAndSizes value from the PE header.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getNumberOfRvaAndSizes() const
+        {
+                return m_inthHeader.OptionalHeader.NumberOfRvaAndSizes;
+        }
+
+        template<int x>
+        dword PeHeaderT<x>::calcNumberOfRvaAndSizes() const
+        {
+                return static_cast<dword>(m_inthHeader.dataDirectories.size());
+        }
+
+        /**
+        * Returns the relative virtual address of the current file's export directory.
+        * @return The Rva of the Export directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddExportRva() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress;
+        }
+
+        /**
+        * Returns the size of the current file's export directory.
+        * @return The sizeof the Export directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddExportSize() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT].Size;
+        }
+
+        /**
+        * Returns the relative virtual address of the current file's import directory.
+        * @return The Rva of the Import directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddImportRva() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress;
+        }
+
+        /**
+        * Returns the size of the current file's import directory.
+        * @return The size of the Import directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddImportSize() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT].Size;
+        }
+
+        /**
+        * Returns the relative virtual address of the current file's resource directory.
+        * @return The Rva of the Resource directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddResourceRva() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress;
+        }
+
+        /**
+        * Returns the size of the current file'resource resource directory.
+        * @return The size of the Resource directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddResourceSize() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE].Size;
+        }
+
+        /**
+        * Returns the relative virtual address of the current file's exception directory.
+        * @return The Rva of the Exception directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddExceptionRva() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION].VirtualAddress;
+        }
+
+        /**
+        * Returns the size of the current file's exception directory.
+        * @return The size of the Exception directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddExceptionSize() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION].Size;
+        }
+
+        /**
+        * Returns the relative virtual address of the current file's security directory.
+        * @return The Rva of the Security directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddSecurityRva() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY].VirtualAddress;
+        }
+
+        /**
+        * Returns the size of the current file's security directory.
+        * @return The size of the Security directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddSecuritySize() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY].Size;
+        }
+
+        /**
+        * Returns the relative virtual address of the current file's base reloc directory.
+        * @return The Rva of the Base Reloc directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddBaseRelocRva() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress;
+        }
+
+        /**
+        * Returns the size of the current file's base reloc directory.
+        * @return The size of the Base Reloc directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddBaseRelocSize() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size;
+        }
+
+        /**
+        * Returns the relative virtual address of the current file's debug directory.
+        * @return The Rva of the Debug directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddDebugRva() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress;
+        }
+
+        /**
+        * Returns the size of the current file's debug directory.
+        * @return The size of the Debug directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddDebugSize() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG].Size;
+        }
+
+        /**
+        * Returns the relative virtual address of the current file's Architecture directory.
+        * @return The Rva of the Architecture directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddArchitectureRva() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE].VirtualAddress;
+        }
+
+        /**
+        * Returns the size of the current file's Architecture directory.
+        * @return The size of the Architecture directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddArchitectureSize() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE].Size;
+        }
+
+        /**
+        * Returns the relative virtual address of the current file's global ptr directory.
+        * @return The Rva of the GlobalPtr directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddGlobalPtrRva() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR].VirtualAddress;
+        }
+
+        /**
+        * Returns the size of the current file's global ptr directory.
+        * @return The size of the GlobalPtr directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddGlobalPtrSize() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR].Size;
+        }
+
+        /**
+        * Returns the relative virtual address of the current file's TLS directory.
+        * @return The Rva of the Tls directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddTlsRva() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_TLS].VirtualAddress;
+        }
+
+        /**
+        * Returns the size of the current file's TLS directory.
+        * @return The size of the Tls directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddTlsSize() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_TLS].Size;
+        }
+
+        /**
+        * Returns the relative virtual address of the current file's load config directory.
+        * @return The Rva of the LoadConfig directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddLoadConfigRva() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].VirtualAddress;
+        }
+
+        /**
+        * Returns the size of the current file's load config directory.
+        * @return The size of the LoadConfig directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddLoadConfigSize() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].Size;
+        }
+
+        /**
+        * Returns the relative virtual address of the current file's bound import directory.
+        * @return The Rva of the BoundImport directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddBoundImportRva() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT].VirtualAddress;
+        }
+
+        /**
+        * Returns the size of the current file's bound import directory.
+        * @return The size of the BoundImport directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddBoundImportSize() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT].Size;
+        }
+
+        /**
+        * Returns the relative virtual address of the current file's IAT directory.
+        * @return The Rva of the IAT directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddIatRva() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IAT].VirtualAddress;
+        }
+
+        /**
+        * Returns the size of the current file's IAT directory.
+        * @return The size of the IAT directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddIatSize() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IAT].Size;
+        }
+
+        /**
+        * Returns the relative virtual address of the current file's Delay Import directory.
+        * @return The Rva of the DelayImport directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddDelayImportRva() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress;
+        }
+
+        /**
+        * Returns the size of the current file's Delay Import directory.
+        * @return The size of the DelayImport directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddDelayImportSize() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].Size;
+        }
+
+        /**
+        * Returns the relative virtual address of the current file's COM Descriptor directory.
+        * @return The Rva of the COM Descriptor directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddComHeaderRva() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress;
+        }
+        
+        /**
+        * Returns the size of the current file's COM Descriptor directory.
+        * @return The Rva of the COM Descriptor directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getIddComHeaderSize() const
+        {
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size;
+        }
+
+        /**
+        * Returns the relative virtual address of an image directory.
+        * @param dwDirectory The identifier of an image directory.
+        * @return The Rva of the image directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getImageDataDirectoryRva(dword dwDirectory) const
+        {
+                return m_inthHeader.dataDirectories[dwDirectory].VirtualAddress;
+        }
+
+        template<int x>
+        void PeHeaderT<x>::setImageDataDirectoryRva(dword dwDirectory, dword value)
+        {
+                m_inthHeader.dataDirectories[dwDirectory].VirtualAddress = value;
+        }
+
+        /**
+        * Returns the size of an image directory.
+        * @param dwDirectory The identifier of an image directory.
+        * @return The size of the image directory.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getImageDataDirectorySize(dword dwDirectory) const
+        {
+                return m_inthHeader.dataDirectories[dwDirectory].Size;
+        }
+
+        template<int x>
+        void PeHeaderT<x>::setImageDataDirectorySize(dword dwDirectory, dword value)
+        {
+                m_inthHeader.dataDirectories[dwDirectory].Size = value;
+        }
+
+        /**
+        * Returns the name of the section which is specified by the parameter wSectionnr.
+        * @param wSectionnr Index of the section.
+        * @return The name of the section.
+        **/
+        template<int x>
+        std::string PeHeaderT<x>::getSectionName(word wSectionnr) const
+        {
+                std::string sectionName = "";
+                
+                for (unsigned int i=0;i<sizeof(m_vIsh[wSectionnr].Name);i++)
+                {
+                        if (m_vIsh[wSectionnr].Name[i]) sectionName += m_vIsh[wSectionnr].Name[i];
+                }
+                
+                return sectionName;
+        }
+        
+        /**
+        * Returns the virtual size of the section which is specified by the parameter wSectionnr.
+        * @param wSectionnr Index of the section.
+        * @return The virtual size of the section.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getVirtualSize(word wSectionnr) const
+        {
+                return m_vIsh[wSectionnr].VirtualSize;
+        }
+        
+        /**
+        * Returns the relative virtual address of the section which is specified by the parameter wSectionnr.
+        * @param wSectionnr Index of the section.
+        * @return The Rva of the section.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getVirtualAddress(word wSectionnr) const
+        {
+                return m_vIsh[wSectionnr].VirtualAddress;
+        }
+        
+        /**
+        * Returns the size of raw data of the section which is specified by the parameter wSectionnr.
+        * @param wSectionnr Index of the section.
+        * @return The size of raw data of the section.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getSizeOfRawData(word wSectionnr) const
+        {
+                return m_vIsh[wSectionnr].SizeOfRawData;
+        }
+
+        /**
+        * Returns the file offset of the section which is specified by the parameter wSectionnr.
+        * @param wSectionnr Index of the section.
+        * @return The file offset of the section.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getPointerToRawData(word wSectionnr) const
+        {
+                return m_vIsh[wSectionnr].PointerToRawData;
+        }
+
+        /**
+        * Returns the pointer to relocations of the section which is specified by the parameter wSectionnr.
+        * @param wSectionnr Index of the section.
+        * @return The pointer to relocations of the section.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getPointerToRelocations(word wSectionnr) const
+        {
+                return m_vIsh[wSectionnr].PointerToRelocations;
+        }
+
+        /**
+        * Returns the poiner to line numbers of the section which is specified by the parameter wSectionnr.
+        * @param wSectionnr Index of the section.
+        * @return The pointer to line numbers of the section.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getPointerToLinenumbers(word wSectionnr) const
+        {
+                return m_vIsh[wSectionnr].PointerToLinenumbers;
+        }
+
+        /**
+        * Returns the number of relocations of the section which is specified by the parameter wSectionnr.
+        * @param wSectionnr Index of the section.
+        * @return The number of relocations of the section.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getNumberOfRelocations(word wSectionnr) const
+        {
+                return m_vIsh[wSectionnr].NumberOfRelocations;
+        }
+
+        /**
+        * Returns the number of line numbers of the section which is specified by the parameter wSectionnr.
+        * @param wSectionnr Index of the section.
+        * @return The number of line numbers of the section.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getNumberOfLinenumbers(word wSectionnr) const
+        {
+                return m_vIsh[wSectionnr].NumberOfLinenumbers;
+        }
+
+        /**
+        * Returns the characteristics of the section which is specified by the parameter wSectionnr.
+        * @param wSectionnr Index of the section.
+        * @return The characteristics of the section.
+        **/
+        template<int x>
+        dword PeHeaderT<x>::getCharacteristics(word wSectionnr) const
+        {
+                return m_vIsh[wSectionnr].Characteristics;
+        }
+
+        /**
+        * Changes the file's Nt signature.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setNtSignature(dword dwValue)
+        {
+                m_inthHeader.Signature = dwValue;
+        }
+
+        /**
+        * Changes the file's Machine.
+        * @param wValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setMachine(word wValue)
+        {
+                m_inthHeader.FileHeader.Machine = wValue;
+        }
+
+        /**
+        * Changes the number of sections.
+        * @param wValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setNumberOfSections(word wValue)
+        {
+                m_inthHeader.FileHeader.NumberOfSections = wValue;
+        }
+
+        /**
+        * Changes the file's TimeDateStamp.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setTimeDateStamp(dword dwValue)
+        {
+                m_inthHeader.FileHeader.TimeDateStamp = dwValue;
+        }
+
+        /**
+        * Changes the file's PointerToSymbolTable.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setPointerToSymbolTable(dword dwValue)
+        {
+                m_inthHeader.FileHeader.PointerToSymbolTable = dwValue;
+        }
+
+        /**
+        * Changes the file's NumberOfSymbols.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setNumberOfSymbols(dword dwValue)
+        {
+                m_inthHeader.FileHeader.NumberOfSymbols = dwValue;
+        }
+
+        /**
+        * Changes the file's SizeOfOptionalHeader.
+        * @param wValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setSizeOfOptionalHeader(word wValue)
+        {
+                m_inthHeader.FileHeader.SizeOfOptionalHeader = wValue;
+        }
+
+        /**
+        * Changes the file's Characteristics.
+        * @param wValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setCharacteristics(word wValue)
+        {
+                m_inthHeader.FileHeader.Characteristics = wValue;
+        }
+
+        /**
+        * Changes the file's Magic.
+        * @param wValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setMagic(word wValue)
+        {
+                m_inthHeader.OptionalHeader.Magic = wValue;
+        }
+
+        /**
+        * Changes the file's MajorLinkerVersion.
+        * @param bValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setMajorLinkerVersion(byte bValue)
+        {
+                m_inthHeader.OptionalHeader.MajorLinkerVersion = bValue;
+        }
+
+        /**
+        * Changes the file's MinorLinkerVersion.
+        * @param bValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setMinorLinkerVersion(byte bValue)
+        {
+                m_inthHeader.OptionalHeader.MinorLinkerVersion = bValue;
+        }
+
+        /**
+        * Changes the file's SizeOfCode.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setSizeOfCode(dword dwValue)
+        {
+                m_inthHeader.OptionalHeader.SizeOfCode = dwValue;
+        }
+
+        /**
+        * Changes the file's SizeOfInitializedData.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setSizeOfInitializedData(dword dwValue)
+        {
+                m_inthHeader.OptionalHeader.SizeOfInitializedData = dwValue;
+        }
+
+        /**
+        * Changes the file's SizeOfUninitializedData.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setSizeOfUninitializedData(dword dwValue)
+        {
+                m_inthHeader.OptionalHeader.SizeOfUninitializedData = dwValue;
+        }
+
+        /**
+        * Changes the file's AddressOfEntryPoint.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setAddressOfEntryPoint(dword dwValue)
+        {
+                m_inthHeader.OptionalHeader.AddressOfEntryPoint = dwValue;
+        }
+
+        /**
+        * Changes the file's BaseOfCode.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setBaseOfCode(dword dwValue)
+        {
+                m_inthHeader.OptionalHeader.BaseOfCode = dwValue;
+        }
+
+        /**
+        * Changes the file's ImageBase.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setImageBase(typename FieldSizes<x>::VAR4_8 dwValue)
+        {
+                m_inthHeader.OptionalHeader.ImageBase = dwValue;
+        }
+
+        /**
+        * Changes the file's SectionAlignment.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setSectionAlignment(dword dwValue)
+        {
+                m_inthHeader.OptionalHeader.SectionAlignment = dwValue;
+        }
+
+        /**
+        * Changes the file's FileAlignment.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setFileAlignment(dword dwValue)
+        {
+                m_inthHeader.OptionalHeader.FileAlignment = dwValue;
+        }
+
+        /**
+        * Changes the file's MajorOperatingSystemVersion.
+        * @param wValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setMajorOperatingSystemVersion(word wValue)
+        {
+                m_inthHeader.OptionalHeader.MajorOperatingSystemVersion = wValue;
+        }
+
+        /**
+        * Changes the file's MinorOperatingSystemVersion.
+        * @param wValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setMinorOperatingSystemVersion(word wValue)
+        {
+                m_inthHeader.OptionalHeader.MinorOperatingSystemVersion = wValue;
+        }
+
+        /**
+        * Changes the file's MajorImageVersion.
+        * @param wValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setMajorImageVersion(word wValue)
+        {
+                m_inthHeader.OptionalHeader.MajorImageVersion = wValue;
+        }
+
+        /**
+        * Changes the file's MinorImageVersion.
+        * @param wValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setMinorImageVersion(word wValue)
+        {
+                m_inthHeader.OptionalHeader.MinorImageVersion = wValue;
+        }
+
+        /**
+        * Changes the file's MajorSubsystemVersion.
+        * @param wValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setMajorSubsystemVersion(word wValue)
+        {
+                m_inthHeader.OptionalHeader.MajorSubsystemVersion = wValue;
+        }
+
+        /**
+        * Changes the file's MinorSubsystemVersion.
+        * @param wValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setMinorSubsystemVersion(word wValue)
+        {
+                m_inthHeader.OptionalHeader.MinorSubsystemVersion = wValue;
+        }
+
+        /**
+        * Changes the file's Win32VersionValue.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setWin32VersionValue(dword dwValue)
+        {
+                m_inthHeader.OptionalHeader.Win32VersionValue = dwValue;
+        }
+
+        /**
+        * Changes the file's SizeOfImage.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setSizeOfImage(dword dwValue)
+        {
+                m_inthHeader.OptionalHeader.SizeOfImage = dwValue;
+        }
+
+        /**
+        * Changes the file's SizeOfHeaders.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setSizeOfHeaders(dword dwValue)
+        {
+                m_inthHeader.OptionalHeader.SizeOfHeaders = dwValue;
+        }
+
+        /**
+        * Changes the file's CheckSum.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setCheckSum(dword dwValue)
+        {
+                m_inthHeader.OptionalHeader.CheckSum = dwValue;
+        }
+
+        /**
+        * Changes the file's Subsystem.
+        * @param wValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setSubsystem(word wValue)
+        {
+                m_inthHeader.OptionalHeader.Subsystem = wValue;
+        }
+
+        /**
+        * Changes the file's DllCharacteristics.
+        * @param wValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setDllCharacteristics(word wValue)
+        {
+                m_inthHeader.OptionalHeader.DllCharacteristics = wValue;
+        }
+
+        /**
+        * Changes the file's SizeOfStackReserve.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setSizeOfStackReserve(typename FieldSizes<x>::VAR4_8 dwValue)
+        {
+                m_inthHeader.OptionalHeader.SizeOfStackReserve = dwValue;
+        }
+
+        /**
+        * Changes the file's SizeOfStackCommit.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setSizeOfStackCommit(typename FieldSizes<x>::VAR4_8 dwValue)
+        {
+                m_inthHeader.OptionalHeader.SizeOfStackCommit = dwValue;
+        }
+
+        /**
+        * Changes the file's SizeOfHeapReserve.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setSizeOfHeapReserve(typename FieldSizes<x>::VAR4_8 dwValue)
+        {
+                m_inthHeader.OptionalHeader.SizeOfHeapReserve = dwValue;
+        }
+
+        /**
+        * Changes the file's SizeOfHeapCommit.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setSizeOfHeapCommit(typename FieldSizes<x>::VAR4_8 dwValue)
+        {
+                m_inthHeader.OptionalHeader.SizeOfHeapCommit = dwValue;
+        }
+
+        /**
+        * Changes the file's LoaderFlags.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setLoaderFlags(dword dwValue)
+        {
+                m_inthHeader.OptionalHeader.LoaderFlags = dwValue;
+        }
+
+        /**
+        * Changes the file's NumberOfRvaAndSizes.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setNumberOfRvaAndSizes(dword dwValue)
+        {
+                m_inthHeader.OptionalHeader.NumberOfRvaAndSizes = dwValue;
+        }
+
+        template<int x>
+        void PeHeaderT<x>::setIddDebugRva(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress = dwValue;
+        }
+
+        template<int x>
+        void PeHeaderT<x>::setIddDebugSize(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG].Size = dwValue;
+        }
+        
+        template<int x>
+        void PeHeaderT<x>::setIddDelayImportRva(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress = dwValue;
+        }
+
+        template<int x>
+        void PeHeaderT<x>::setIddDelayImportSize(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].Size = dwValue;
+        }
+        
+        template<int x>
+        void PeHeaderT<x>::setIddExceptionRva(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION].VirtualAddress = dwValue;
+        }
+
+        template<int x>
+        void PeHeaderT<x>::setIddExceptionSize(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION].Size = dwValue;
+        }
+        
+        template<int x>
+        void PeHeaderT<x>::setIddGlobalPtrRva(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR].VirtualAddress = dwValue;
+        }
+
+        template<int x>
+        void PeHeaderT<x>::setIddGlobalPtrSize(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR].Size = dwValue;
+        }
+        
+        template<int x>
+        void PeHeaderT<x>::setIddIatRva(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IAT].VirtualAddress = dwValue;
+        }
+
+        template<int x>
+        void PeHeaderT<x>::setIddIatSize(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IAT].Size = dwValue;
+        }
+        
+        template<int x>
+        void PeHeaderT<x>::setIddLoadConfigRva(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].VirtualAddress = dwValue;
+        }
+
+        template<int x>
+        void PeHeaderT<x>::setIddLoadConfigSize(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].Size = dwValue;
+        }
+        
+        template<int x>
+        void PeHeaderT<x>::setIddResourceRva(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = dwValue;
+        }
+
+        template<int x>
+        void PeHeaderT<x>::setIddResourceSize(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = dwValue;
+        }
+        
+        template<int x>
+        void PeHeaderT<x>::setIddSecurityRva(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY].VirtualAddress = dwValue;
+        }
+
+        template<int x>
+        void PeHeaderT<x>::setIddSecuritySize(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY].Size = dwValue;
+        }
+        
+        template<int x>
+        void PeHeaderT<x>::setIddTlsRva(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_TLS].VirtualAddress = dwValue;
+        }
+
+        template<int x>
+        void PeHeaderT<x>::setIddTlsSize(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_TLS].Size = dwValue;
+        }
+        
+        /**
+        * Changes the rva of the file's export directory.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setIddExportRva(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress = dwValue;
+        }
+
+        /**
+        * Changes the size of the file's export directory.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setIddExportSize(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT].Size = dwValue;
+        }
+
+        template<int x>
+        void PeHeaderT<x>::setIddBaseRelocRva(dword value)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = value;
+        }
+
+        template<int x>
+        void PeHeaderT<x>::setIddBaseRelocSize(dword value)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = value;
+        }
+
+        template<int x>
+        void PeHeaderT<x>::setIddArchitectureRva(dword value)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE].VirtualAddress = value;
+        }
+
+        template<int x>
+        void PeHeaderT<x>::setIddArchitectureSize(dword value)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE].Size = value;
+        }
+
+        template<int x>
+        void PeHeaderT<x>::setIddComHeaderRva(dword value)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress = value;
+        }
+
+        template<int x>
+        void PeHeaderT<x>::setIddComHeaderSize(dword value)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size = value;
+        }
+
+        /**
+        * Changes the rva of the file's import directory.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setIddImportRva(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress = dwValue;
+        }
+
+        /**
+        * Changes the size of the file's import directory.
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setIddImportSize(dword dwValue)
+        {
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT].Size = dwValue;
+        }
+
+        /**
+        * Changes the name of a section.
+        * @param wSectionnr Identifier of the section
+        * @param strName New name.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setSectionName(word wSectionnr, std::string strName)
+        {
+                strncpy(reinterpret_cast<char*>(m_vIsh[wSectionnr].Name), strName.c_str(), sizeof(m_vIsh[wSectionnr].Name));
+        }
+
+        /**
+        * Changes the virtual size of a section.
+        * @param wSectionnr Identifier of the section
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setVirtualSize(word wSectionnr, dword dwValue)
+        {
+                m_vIsh[wSectionnr].VirtualSize = dwValue;
+        }
+
+        /**
+        * Changes the virtual address of a section.
+        * @param wSectionnr Identifier of the section
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setVirtualAddress(word wSectionnr, dword dwValue)
+        {
+                m_vIsh[wSectionnr].VirtualAddress = dwValue;
+        }
+
+        /**
+        * Changes the size of raw data of a section.
+        * @param wSectionnr Identifier of the section
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setSizeOfRawData(word wSectionnr, dword dwValue)
+        {
+                m_vIsh[wSectionnr].SizeOfRawData = dwValue;
+        }
+
+        /**
+        * Changes the size of raw data of a section.
+        * @param wSectionnr Identifier of the section
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setPointerToRawData(word wSectionnr, dword dwValue)
+        {
+                m_vIsh[wSectionnr].PointerToRawData = dwValue;
+        }
+
+        /**
+        * Changes the pointer to relocations of a section.
+        * @param wSectionnr Identifier of the section
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setPointerToRelocations(word wSectionnr, dword dwValue)
+        {
+                m_vIsh[wSectionnr].PointerToRelocations = dwValue;
+        }
+
+        /**
+        * Changes the pointer to line numbers of a section.
+        * @param wSectionnr Identifier of the section
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setPointerToLinenumbers(word wSectionnr, dword dwValue)
+        {
+                m_vIsh[wSectionnr].PointerToLinenumbers = dwValue;
+        }
+
+        /**
+        * Changes the number of relocations of a section.
+        * @param wSectionnr Identifier of the section
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setNumberOfRelocations(word wSectionnr, dword dwValue)
+        {
+                m_vIsh[wSectionnr].NumberOfRelocations = dwValue;
+        }
+
+        /**
+        * Changes the number of line numbers of a section.
+        * @param wSectionnr Identifier of the section
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setNumberOfLinenumbers(word wSectionnr, dword dwValue)
+        {
+                m_vIsh[wSectionnr].NumberOfLinenumbers = dwValue;
+        }
+
+        /**
+        * Changes the characteristics of a section.
+        * @param wSectionnr Identifier of the section
+        * @param dwValue New value.
+        **/
+        template<int x>
+        void PeHeaderT<x>::setCharacteristics(word wSectionnr, dword dwValue)
+        {
+                m_vIsh[wSectionnr].Characteristics = dwValue;
+        }
+
+}
+
+#endif
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/PeLib.h b/utils/zenutils/libraries/pelib-0.9/pelib/PeLib.h
index 870c873606..12f9693dda 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/PeLib.h
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/PeLib.h
@@ -1,27 +1,27 @@
-/*

-* PeLib.h - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-

-/** \mainpage PeLib - An open-source C++ library to modify PE files.

-*

-* \section intro Introduction

-*

-* <b>What is PeLib?</b><br>

-* PeLib is an open source C++ library with the purpose to ease the access and modification of PE (Portable executable) files. This is done through a multitude of classes which represent all important PE header and directory structures and which provide the necessary functions to read, modify and write these structures. As this library is fully ISO C++ compliant it should compile with all popular compilers for the Windows platform. For people who don't use C++ in their projects a dynamic link library is provided which encapsulates all of PeLib's functionality so that projects using programming languages as diverse as Win32 assembler, C# or Delphi can still benefit from PeLib's power

-*/

-

-#ifndef PELIB_H

-#define PELIB_H

-

-#include "PeFile.h"

-

-#endif

+/*
+* PeLib.h - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+
+/** \mainpage PeLib - An open-source C++ library to modify PE files.
+*
+* \section intro Introduction
+*
+* <b>What is PeLib?</b><br>
+* PeLib is an open source C++ library with the purpose to ease the access and modification of PE (Portable executable) files. This is done through a multitude of classes which represent all important PE header and directory structures and which provide the necessary functions to read, modify and write these structures. As this library is fully ISO C++ compliant it should compile with all popular compilers for the Windows platform. For people who don't use C++ in their projects a dynamic link library is provided which encapsulates all of PeLib's functionality so that projects using programming languages as diverse as Win32 assembler, C# or Delphi can still benefit from PeLib's power
+*/
+
+#ifndef PELIB_H
+#define PELIB_H
+
+#include "PeFile.h"
+
+#endif
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/PeLibAux.cpp b/utils/zenutils/libraries/pelib-0.9/pelib/PeLibAux.cpp
index 1e06bae620..0a420ebecf 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/PeLibAux.cpp
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/PeLibAux.cpp
@@ -1,275 +1,275 @@
-/*

-* PeLibAux.cpp - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#include "PeLibInc.h"

-#include "PeLibAux.h"

-#include "PeFile.h"

-

-#ifdef _MSC_VER

-        #include <ctype.h>

-#endif

-

-namespace PeLib

-{

-    const qword PELIB_IMAGE_ORDINAL_FLAGS<64>::IMAGE_ORDINAL_FLAG = 0x8000000000000000ULL;

-        

-        bool PELIB_IMAGE_SECTION_HEADER::biggerFileOffset(const PELIB_IMAGE_SECTION_HEADER& ish) const

-        {

-                return PointerToRawData < ish.PointerToRawData;

-        }

-

-        bool PELIB_IMAGE_SECTION_HEADER::biggerVirtualAddress(const PELIB_IMAGE_SECTION_HEADER& ish) const

-        {

-                return VirtualAddress < ish.VirtualAddress;

-        }

-

-        unsigned int alignOffset(unsigned int uiOffset, unsigned int uiAlignment)

-        {

-                if (!uiAlignment) return uiAlignment;

-                return (uiOffset % uiAlignment) ? uiOffset + (uiAlignment - uiOffset % uiAlignment) : uiOffset;

-        }

-

-        unsigned int fileSize(const std::string& filename)

-        {

-                std::fstream file(filename.c_str());

-                file.seekg(0, std::ios::end);

-                return file.tellg();

-        }

-

-        unsigned int fileSize(std::ifstream& file)

-        {

-                unsigned int oldpos = file.tellg();

-                file.seekg(0, std::ios::end);

-                unsigned int filesize = file.tellg();

-                file.seekg(oldpos, std::ios::beg);

-                return filesize;

-        }

-        

-        unsigned int fileSize(std::fstream& file)

-        {

-                unsigned int oldpos = file.tellg();

-                file.seekg(0, std::ios::end);

-                unsigned int filesize = file.tellg();

-                file.seekg(oldpos, std::ios::beg);

-                return filesize;

-        }

-        

-        unsigned int fileSize(std::ofstream& file)

-        {

-                unsigned int oldpos = file.tellp();

-                file.seekp(0, std::ios::end);

-                unsigned int filesize = file.tellp();

-                file.seekp(oldpos, std::ios::beg);

-                return filesize;

-        }

-        

-        bool isEqualNc(const std::string& s1, const std::string& s2)

-        {

-                std::string t1 = s1;

-                std::string t2 = s2;

-        

-                // No std:: to make VC++ happy

-                #ifdef _MSC_VER

-                        std::transform(t1.begin(), t1.end(), t1.begin(), toupper);

-                        std::transform(t2.begin(), t2.end(), t2.begin(), toupper);

-                #else

-                        // Weird syntax to make Borland C++ happy

-                        std::transform(t1.begin(), t1.end(), t1.begin(), (int(*)(int))std::toupper);

-                        std::transform(t2.begin(), t2.end(), t2.begin(), (int(*)(int))std::toupper);

-                #endif

-                return t1 == t2;

-        }

-

-        PELIB_IMAGE_DOS_HEADER::PELIB_IMAGE_DOS_HEADER()

-        {

-                e_magic = 0;

-                e_cblp = 0;

-                e_cp = 0;

-                e_crlc = 0;

-                e_cparhdr = 0;

-                e_minalloc = 0;

-                e_maxalloc = 0;

-                e_ss = 0;

-                e_sp = 0;

-                e_csum = 0;

-                e_ip = 0;

-                e_cs = 0;

-                e_lfarlc = 0;

-                e_ovno = 0;

-

-                for (unsigned int i=0;i<sizeof(e_res)/sizeof(e_res[0]);i++)

-                {

-                        e_res[i] = 0;

-                }

-

-                e_oemid = 0;

-                e_oeminfo = 0;

-

-                for (unsigned int i=0;i<sizeof(e_res2)/sizeof(e_res2[0]);i++)

-                {

-                        e_res2[i] = 0;

-                }

-

-                e_lfanew = 0;

-        }

-

-        PELIB_EXP_FUNC_INFORMATION::PELIB_EXP_FUNC_INFORMATION()

-        {

-                addroffunc = 0;

-                addrofname = 0;

-                ordinal = 0;

-        }

-

-        PELIB_IMAGE_RESOURCE_DIRECTORY::PELIB_IMAGE_RESOURCE_DIRECTORY()

-        {

-                Characteristics = 0;

-                TimeDateStamp = 0;

-                MajorVersion = 0;

-                MinorVersion = 0;

-                NumberOfNamedEntries = 0;

-                NumberOfIdEntries = 0;

-        }

-

-        PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY::PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY()

-        {

-                Name = 0;

-                OffsetToData = 0;

-        }

-

-        bool PELIB_IMG_RES_DIR_ENTRY::operator<(const PELIB_IMG_RES_DIR_ENTRY& first) const

-        {

-                if (irde.Name & PELIB_IMAGE_RESOURCE_NAME_IS_STRING && first.irde.Name & PELIB_IMAGE_RESOURCE_NAME_IS_STRING)

-                {

-                        return wstrName < first.wstrName;

-                }

-                else if (irde.Name & PELIB_IMAGE_RESOURCE_NAME_IS_STRING)

-                {

-                        return true;

-                }

-                else if (first.irde.Name & PELIB_IMAGE_RESOURCE_NAME_IS_STRING)

-                {

-                        return false;

-                }

-                else

-                {

-                        return irde.Name < first.irde.Name;

-                }

-        }

-

-        PELIB_IMAGE_BASE_RELOCATION::PELIB_IMAGE_BASE_RELOCATION()

-        {

-                VirtualAddress = 0;

-                SizeOfBlock = 0;

-        }

-

-        PELIB_IMAGE_COR20_HEADER::PELIB_IMAGE_COR20_HEADER()

-        {

-                cb = 0;

-                MajorRuntimeVersion = 0;

-                MinorRuntimeVersion = 0;

-                MetaData.VirtualAddress = 0;

-                MetaData.Size = 0;

-                Flags = 0;

-                EntryPointToken = 0;

-                Resources.VirtualAddress = 0;

-                Resources.Size = 0;

-                StrongNameSignature.VirtualAddress = 0;

-                StrongNameSignature.Size = 0;

-                CodeManagerTable.VirtualAddress = 0;

-                CodeManagerTable.Size = 0;

-                VTableFixups.VirtualAddress = 0;

-                VTableFixups.Size = 0;

-                ExportAddressTableJumps.VirtualAddress = 0;

-                ExportAddressTableJumps.Size = 0;

-                ManagedNativeHeader.VirtualAddress = 0;

-                ManagedNativeHeader.Size = 0;

-        }

-

-        /** Compares the passed filename to the struct's filename.

-        * @param strModuleName A filename.

-        * @return True, if the passed filename equals the struct's filename. The comparison is case-sensitive.

-        **/

-        bool PELIB_IMAGE_BOUND_DIRECTORY::equal(const std::string strModuleName) const

-        {

-                return this->strModuleName == strModuleName;

-        }

-

-        bool PELIB_EXP_FUNC_INFORMATION::equal(const std::string strFunctionName) const

-        {

-                return isEqualNc(this->funcname, strFunctionName);

-        }

-        

-        /**

-        * @param strFilename Name of a file.

-        * @return Either PEFILE32, PEFILE64 or PEFILE_UNKNOWN

-        **/

-        unsigned int getFileType(const std::string strFilename)

-        {

-                word machine, magic;

-                

-                PeFile32 pef(strFilename);

-                if (pef.readMzHeader() != NO_ERROR) return PEFILE_UNKNOWN;

-                if (pef.readPeHeader() != NO_ERROR) return PEFILE_UNKNOWN;

-                        

-                machine = pef.peHeader().getMachine();

-                magic = pef.peHeader().getMagic();

-        

-                if (machine == PELIB_IMAGE_FILE_MACHINE_I386 && magic == PELIB_IMAGE_NT_OPTIONAL_HDR32_MAGIC)

-                {

-                        return PEFILE32;

-                }

-                // 0x8664 == AMD64; no named constant yet

-                else if ((machine == 0x8664 || machine == PELIB_IMAGE_FILE_MACHINE_IA64) && magic == PELIB_IMAGE_NT_OPTIONAL_HDR64_MAGIC)

-                {

-                        return PEFILE64;

-                }

-                else

-                {

-                        return PEFILE_UNKNOWN;

-                }

-        }

-        

-        /**

-        * Opens a PE file. The return type is either PeFile32 or PeFile64 object. If an error occurs the return

-        * value is 0.

-        * @param strFilename Name of a file.

-        * @return Either a PeFile32 object, a PeFil64 object or 0.

-        **/

-        PeFile* openPeFile(const std::string& strFilename)

-        {

-                unsigned int type = getFileType(strFilename);

-                

-                if (type == PEFILE32)

-                {

-                        return new PeFile32(strFilename);

-                }

-                else if (type == PEFILE64)

-                {

-                        return new PeFile64(strFilename);

-                }

-                else

-                {

-                        return 0;

-                }

-        }

-        

-        unsigned int PELIB_IMAGE_BOUND_DIRECTORY::size() const

-        {

-                unsigned int size = 0;

-                for (unsigned int i=0;i<moduleForwarders.size();i++)

-                {

-                        size += moduleForwarders[i].size();

-                }

-

-                return size + PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size() + strModuleName.size() + 1;

-        }

-}

+/*
+* PeLibAux.cpp - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#include "PeLibInc.h"
+#include "PeLibAux.h"
+#include "PeFile.h"
+
+#ifdef _MSC_VER
+        #include <ctype.h>
+#endif
+
+namespace PeLib
+{
+    const qword PELIB_IMAGE_ORDINAL_FLAGS<64>::IMAGE_ORDINAL_FLAG = 0x8000000000000000ULL;
+        
+        bool PELIB_IMAGE_SECTION_HEADER::biggerFileOffset(const PELIB_IMAGE_SECTION_HEADER& ish) const
+        {
+                return PointerToRawData < ish.PointerToRawData;
+        }
+
+        bool PELIB_IMAGE_SECTION_HEADER::biggerVirtualAddress(const PELIB_IMAGE_SECTION_HEADER& ish) const
+        {
+                return VirtualAddress < ish.VirtualAddress;
+        }
+
+        unsigned int alignOffset(unsigned int uiOffset, unsigned int uiAlignment)
+        {
+                if (!uiAlignment) return uiAlignment;
+                return (uiOffset % uiAlignment) ? uiOffset + (uiAlignment - uiOffset % uiAlignment) : uiOffset;
+        }
+
+        unsigned int fileSize(const std::string& filename)
+        {
+                std::fstream file(filename.c_str());
+                file.seekg(0, std::ios::end);
+                return file.tellg();
+        }
+
+        unsigned int fileSize(std::ifstream& file)
+        {
+                unsigned int oldpos = file.tellg();
+                file.seekg(0, std::ios::end);
+                unsigned int filesize = file.tellg();
+                file.seekg(oldpos, std::ios::beg);
+                return filesize;
+        }
+        
+        unsigned int fileSize(std::fstream& file)
+        {
+                unsigned int oldpos = file.tellg();
+                file.seekg(0, std::ios::end);
+                unsigned int filesize = file.tellg();
+                file.seekg(oldpos, std::ios::beg);
+                return filesize;
+        }
+        
+        unsigned int fileSize(std::ofstream& file)
+        {
+                unsigned int oldpos = file.tellp();
+                file.seekp(0, std::ios::end);
+                unsigned int filesize = file.tellp();
+                file.seekp(oldpos, std::ios::beg);
+                return filesize;
+        }
+        
+        bool isEqualNc(const std::string& s1, const std::string& s2)
+        {
+                std::string t1 = s1;
+                std::string t2 = s2;
+        
+                // No std:: to make VC++ happy
+                #ifdef _MSC_VER
+                        std::transform(t1.begin(), t1.end(), t1.begin(), toupper);
+                        std::transform(t2.begin(), t2.end(), t2.begin(), toupper);
+                #else
+                        // Weird syntax to make Borland C++ happy
+                        std::transform(t1.begin(), t1.end(), t1.begin(), (int(*)(int))std::toupper);
+                        std::transform(t2.begin(), t2.end(), t2.begin(), (int(*)(int))std::toupper);
+                #endif
+                return t1 == t2;
+        }
+
+        PELIB_IMAGE_DOS_HEADER::PELIB_IMAGE_DOS_HEADER()
+        {
+                e_magic = 0;
+                e_cblp = 0;
+                e_cp = 0;
+                e_crlc = 0;
+                e_cparhdr = 0;
+                e_minalloc = 0;
+                e_maxalloc = 0;
+                e_ss = 0;
+                e_sp = 0;
+                e_csum = 0;
+                e_ip = 0;
+                e_cs = 0;
+                e_lfarlc = 0;
+                e_ovno = 0;
+
+                for (unsigned int i=0;i<sizeof(e_res)/sizeof(e_res[0]);i++)
+                {
+                        e_res[i] = 0;
+                }
+
+                e_oemid = 0;
+                e_oeminfo = 0;
+
+                for (unsigned int i=0;i<sizeof(e_res2)/sizeof(e_res2[0]);i++)
+                {
+                        e_res2[i] = 0;
+                }
+
+                e_lfanew = 0;
+        }
+
+        PELIB_EXP_FUNC_INFORMATION::PELIB_EXP_FUNC_INFORMATION()
+        {
+                addroffunc = 0;
+                addrofname = 0;
+                ordinal = 0;
+        }
+
+        PELIB_IMAGE_RESOURCE_DIRECTORY::PELIB_IMAGE_RESOURCE_DIRECTORY()
+        {
+                Characteristics = 0;
+                TimeDateStamp = 0;
+                MajorVersion = 0;
+                MinorVersion = 0;
+                NumberOfNamedEntries = 0;
+                NumberOfIdEntries = 0;
+        }
+
+        PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY::PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY()
+        {
+                Name = 0;
+                OffsetToData = 0;
+        }
+
+        bool PELIB_IMG_RES_DIR_ENTRY::operator<(const PELIB_IMG_RES_DIR_ENTRY& first) const
+        {
+                if (irde.Name & PELIB_IMAGE_RESOURCE_NAME_IS_STRING && first.irde.Name & PELIB_IMAGE_RESOURCE_NAME_IS_STRING)
+                {
+                        return wstrName < first.wstrName;
+                }
+                else if (irde.Name & PELIB_IMAGE_RESOURCE_NAME_IS_STRING)
+                {
+                        return true;
+                }
+                else if (first.irde.Name & PELIB_IMAGE_RESOURCE_NAME_IS_STRING)
+                {
+                        return false;
+                }
+                else
+                {
+                        return irde.Name < first.irde.Name;
+                }
+        }
+
+        PELIB_IMAGE_BASE_RELOCATION::PELIB_IMAGE_BASE_RELOCATION()
+        {
+                VirtualAddress = 0;
+                SizeOfBlock = 0;
+        }
+
+        PELIB_IMAGE_COR20_HEADER::PELIB_IMAGE_COR20_HEADER()
+        {
+                cb = 0;
+                MajorRuntimeVersion = 0;
+                MinorRuntimeVersion = 0;
+                MetaData.VirtualAddress = 0;
+                MetaData.Size = 0;
+                Flags = 0;
+                EntryPointToken = 0;
+                Resources.VirtualAddress = 0;
+                Resources.Size = 0;
+                StrongNameSignature.VirtualAddress = 0;
+                StrongNameSignature.Size = 0;
+                CodeManagerTable.VirtualAddress = 0;
+                CodeManagerTable.Size = 0;
+                VTableFixups.VirtualAddress = 0;
+                VTableFixups.Size = 0;
+                ExportAddressTableJumps.VirtualAddress = 0;
+                ExportAddressTableJumps.Size = 0;
+                ManagedNativeHeader.VirtualAddress = 0;
+                ManagedNativeHeader.Size = 0;
+        }
+
+        /** Compares the passed filename to the struct's filename.
+        * @param strModuleName A filename.
+        * @return True, if the passed filename equals the struct's filename. The comparison is case-sensitive.
+        **/
+        bool PELIB_IMAGE_BOUND_DIRECTORY::equal(const std::string strModuleName) const
+        {
+                return this->strModuleName == strModuleName;
+        }
+
+        bool PELIB_EXP_FUNC_INFORMATION::equal(const std::string strFunctionName) const
+        {
+                return isEqualNc(this->funcname, strFunctionName);
+        }
+        
+        /**
+        * @param strFilename Name of a file.
+        * @return Either PEFILE32, PEFILE64 or PEFILE_UNKNOWN
+        **/
+        unsigned int getFileType(const std::string strFilename)
+        {
+                word machine, magic;
+                
+                PeFile32 pef(strFilename);
+                if (pef.readMzHeader() != NO_ERROR) return PEFILE_UNKNOWN;
+                if (pef.readPeHeader() != NO_ERROR) return PEFILE_UNKNOWN;
+                        
+                machine = pef.peHeader().getMachine();
+                magic = pef.peHeader().getMagic();
+        
+                if (machine == PELIB_IMAGE_FILE_MACHINE_I386 && magic == PELIB_IMAGE_NT_OPTIONAL_HDR32_MAGIC)
+                {
+                        return PEFILE32;
+                }
+                // 0x8664 == AMD64; no named constant yet
+                else if ((machine == 0x8664 || machine == PELIB_IMAGE_FILE_MACHINE_IA64) && magic == PELIB_IMAGE_NT_OPTIONAL_HDR64_MAGIC)
+                {
+                        return PEFILE64;
+                }
+                else
+                {
+                        return PEFILE_UNKNOWN;
+                }
+        }
+        
+        /**
+        * Opens a PE file. The return type is either PeFile32 or PeFile64 object. If an error occurs the return
+        * value is 0.
+        * @param strFilename Name of a file.
+        * @return Either a PeFile32 object, a PeFil64 object or 0.
+        **/
+        PeFile* openPeFile(const std::string& strFilename)
+        {
+                unsigned int type = getFileType(strFilename);
+                
+                if (type == PEFILE32)
+                {
+                        return new PeFile32(strFilename);
+                }
+                else if (type == PEFILE64)
+                {
+                        return new PeFile64(strFilename);
+                }
+                else
+                {
+                        return 0;
+                }
+        }
+        
+        unsigned int PELIB_IMAGE_BOUND_DIRECTORY::size() const
+        {
+                unsigned int size = 0;
+                for (unsigned int i=0;i<moduleForwarders.size();i++)
+                {
+                        size += moduleForwarders[i].size();
+                }
+
+                return size + PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size() + strModuleName.size() + 1;
+        }
+}
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/PeLibAux.h b/utils/zenutils/libraries/pelib-0.9/pelib/PeLibAux.h
index 4aed866a7d..cfce60796f 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/PeLibAux.h
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/PeLibAux.h
@@ -1,884 +1,884 @@
-/*

-* PeLibAux.cpp - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#ifndef PELIBAUX_H

-#define PELIBAUX_H

-

-//#include "PeLibInc.h"

-//#include "PeHeader.h"

-#include "buffer/OutputBuffer.h"

-#include "buffer/InputBuffer.h"

-//#include "buffer/ResTree.h"

-#include <numeric>

-#include <limits>

-

-namespace PeLib

-{

-        enum errorCodes

-        {

-                NO_ERROR = 0,

-                ERROR_OPENING_FILE = -1,

-                ERROR_INVALID_FILE = -2,

-                ERROR_TOO_MANY_SECTIONS = -3,

-                ERROR_NOT_ENOUGH_SPACE = -4,

-                ERROR_NO_FILE_ALIGNMENT = -5,

-                ERROR_NO_SECTION_ALIGNMENT = -6,

-                ERROR_ENTRY_NOT_FOUND = -7,

-                ERROR_DUPLICATE_ENTRY = -8,

-                ERROR_DIRECTORY_DOES_NOT_EXIST = -9

-        };

-

-        class PeFile;

-        bool isEqualNc(const std::string& s1, const std::string& s2);

-        

-// It's necessary to make sure that a byte has 8 bits and that the platform has a 8 bit type,

-// a 16bit type and a bit type. That's because binary PE files are pretty picky about their

-// structure.

-

-        #if CHAR_BIT == 8

-                #if UCHAR_MAX == 255

-                        typedef unsigned char byte;

-        //              typedef std::bitset<8> byte;

-                #else

-                        #error You need to change some typedefs (Code: 8). Please read the PeLib documentation.

-                #endif

-        

-                #if USHRT_MAX == 65535U

-                        typedef unsigned short word;

-        //              typedef std::bitset<16> word;

-                #else

-                        #error You need to change some typedefs (Code: 16). Please read the PeLib documentation.

-                #endif

-        

-                #if UINT_MAX == 4294967295UL

-                        typedef unsigned int dword;

-        //              typedef std::bitset<32> dword;

-                #else

-                        #error You need to change some typedefs (Code: 32). Please read the PeLib documentation.

-                #endif

-

-                typedef unsigned long long qword;

-        

-//              #if ULLONG_MAX == 18446744073709551615

-//                      typedef unsigned long long qword;

-//              #else

-//                      #error You need to change some typedefs (Code: 32). Please read the PeLib documentation.

-//              #endif

-        #else

-                #error You need to change some typedefs. Please read the PeLib documentation.

-        #endif

-

-

-/*      enum bits {BITS_BYTE = 8, BITS_WORD = 16, BITS_DWORD = 32};

-

-        template<bits value>

-        class DataType

-        {

-                private:

-                  std::bitset<value> bsValue;

-                  unsigned long ulValue;

-          

-                public:

-                  void operator=(unsigned long ulValue)

-                  {

-                        bsValue = ulValue;

-                  }

-

-                  operator unsigned long() const

-                  {

-                        return bsValue.to_ulong();

-                  }

-                  

-                  const int operator&()

-                  {

-                        ulValue = bsValue;

-                        return ulValue; 

-                  }

-

-        };

-

-        typedef DataType<BITS_BYTE> byte;

-        typedef DataType<BITS_WORD> word;

-        typedef DataType<BITS_DWORD> dword;

-*/

-

-        enum {PEFILE32 = 32,

-                  PEFILE64 = 64,

-                  PEFILE_UNKNOWN = 0};

-

-        enum {BoundImportDirectoryId = 1,

-              ComHeaderDirectoryId,

-              ExportDirectoryId,

-              IatDirectoryId,

-              ImportDirectoryId,

-              MzHeaderId,

-              PeHeaderId,

-              RelocationsId,

-              PeFileId,

-              ResourceDirectoryId,

-              DebugDirectoryId,

-              TlsDirectoryId

-        };

-

-        const word PELIB_IMAGE_DOS_SIGNATURE = 0x5A4D;

-        

-        const dword PELIB_IMAGE_NT_SIGNATURE = 0x00004550;

-

-        template<int bits>

-        struct PELIB_IMAGE_ORDINAL_FLAGS;

-        

-        template<>

-        struct PELIB_IMAGE_ORDINAL_FLAGS<32>

-        {

-                static const dword IMAGE_ORDINAL_FLAG = 0x80000000;

-        };

-        

-        template<>

-        struct PELIB_IMAGE_ORDINAL_FLAGS<64>

-        {

-                static const qword IMAGE_ORDINAL_FLAG;

-        };

-

-        const unsigned long PELIB_IMAGE_NUMBEROF_DIRECTORY_ENTRIES = 16;

-

-        const unsigned long PELIB_IMAGE_RESOURCE_NAME_IS_STRING = 0x80000000;

-

-        const unsigned long PELIB_IMAGE_RESOURCE_DATA_IS_DIRECTORY = 0x80000000;

-

-        enum

-        {

-                PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT,             // OK

-                PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT,             // OK

-                PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE,           // OK

-                PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION,

-                PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY,

-                PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC,  // OK

-                PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG,

-                PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE,

-                PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR,

-                PELIB_IMAGE_DIRECTORY_ENTRY_TLS,

-                PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG,

-                PELIB_IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT,       // OK

-                PELIB_IMAGE_DIRECTORY_ENTRY_IAT,                // OK

-                PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT,

-                PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR

-        };

-

-        enum

-        {

-                PELIB_IMAGE_SCN_TYPE_NO_PAD             = 0x00000008,

-                PELIB_IMAGE_SCN_CNT_CODE                   = 0x00000020,

-                PELIB_IMAGE_SCN_CNT_INITIALIZED_DATA       = 0x00000040,

-                PELIB_IMAGE_SCN_CNT_UNINITIALIZED_DATA     = 0x00000080,

-                PELIB_IMAGE_SCN_LNK_OTHER                 = 0x00000100,

-                PELIB_IMAGE_SCN_LNK_INFO                   = 0x00000200,

-                PELIB_IMAGE_SCN_LNK_REMOVE               = 0x00000800,

-                PELIB_IMAGE_SCN_LNK_COMDAT               = 0x00001000,

-                PELIB_IMAGE_SCN_NO_DEFER_SPEC_EXC         = 0x00004000,

-                PELIB_IMAGE_SCN_GPREL                 = 0x00008000,

-                PELIB_IMAGE_SCN_MEM_FARDATA             = 0x00008000,

-                PELIB_IMAGE_SCN_MEM_PURGEABLE         = 0x00020000,

-                PELIB_IMAGE_SCN_MEM_16BIT                 = 0x00020000,

-                PELIB_IMAGE_SCN_MEM_LOCKED               = 0x00040000,

-                PELIB_IMAGE_SCN_MEM_PRELOAD             = 0x00080000,

-                PELIB_IMAGE_SCN_ALIGN_1BYTES           = 0x00100000,

-                PELIB_IMAGE_SCN_ALIGN_2BYTES           = 0x00200000,

-                PELIB_IMAGE_SCN_ALIGN_4BYTES           = 0x00300000,

-                PELIB_IMAGE_SCN_ALIGN_8BYTES           = 0x00400000,

-                PELIB_IMAGE_SCN_ALIGN_16BYTES         = 0x00500000,

-                PELIB_IMAGE_SCN_ALIGN_BYTES             = 0x00600000,

-                PELIB_IMAGE_SCN_ALIGN_64BYTES         = 0x00700000,

-                PELIB_IMAGE_SCN_ALIGN_128BYTES       = 0x00800000,

-                PELIB_IMAGE_SCN_ALIGN_256BYTES       = 0x00900000,

-                PELIB_IMAGE_SCN_ALIGN_512BYTES       = 0x00A00000,

-                PELIB_IMAGE_SCN_ALIGN_1024BYTES     = 0x00B00000,

-                PELIB_IMAGE_SCN_ALIGN_2048BYTES     = 0x00C00000,

-                PELIB_IMAGE_SCN_ALIGN_4096BYTES     = 0x00D00000,

-                PELIB_IMAGE_SCN_ALIGN_8192BYTES     = 0x00E00000,

-                PELIB_IMAGE_SCN_LNK_NRELOC_OVFL     = 0x01000000,

-                PELIB_IMAGE_SCN_MEM_DISCARDABLE     = 0x02000000,

-                PELIB_IMAGE_SCN_MEM_NOT_CACHED       = 0x04000000,

-                PELIB_IMAGE_SCN_MEM_NOT_PAGED         = 0x08000000,

-                PELIB_IMAGE_SCN_MEM_SHARED               = 0x10000000,

-                PELIB_IMAGE_SCN_MEM_EXECUTE             = 0x20000000,

-                PELIB_IMAGE_SCN_MEM_READ                   = 0x40000000,

-                PELIB_IMAGE_SCN_MEM_WRITE                 = 0x80000000

-        };

-

-        enum

-        {

-                PELIB_IMAGE_FILE_MACHINE_UNKNOWN           = 0,

-                PELIB_IMAGE_FILE_MACHINE_I386         = 0x014c,

-                PELIB_IMAGE_FILE_MACHINE_R3000       = 0x0162,

-                PELIB_IMAGE_FILE_MACHINE_R4000       = 0x0166,

-                PELIB_IMAGE_FILE_MACHINE_R10000     = 0x0168,

-                PELIB_IMAGE_FILE_MACHINE_WCEMIPSV2       = 0x0169,

-                PELIB_IMAGE_FILE_MACHINE_ALPHA       = 0x0184,

-                PELIB_IMAGE_FILE_MACHINE_POWERPC           = 0x01F0,

-                PELIB_IMAGE_FILE_MACHINE_SH3           = 0x01a2,

-                PELIB_IMAGE_FILE_MACHINE_SH3E         = 0x01a4,

-                PELIB_IMAGE_FILE_MACHINE_SH4           = 0x01a6,

-                PELIB_IMAGE_FILE_MACHINE_ARM           = 0x01c0,

-                PELIB_IMAGE_FILE_MACHINE_THUMB       = 0x01c2,

-                PELIB_IMAGE_FILE_MACHINE_IA64         = 0x0200,

-                PELIB_IMAGE_FILE_MACHINE_MIPS16     = 0x0266,

-                PELIB_IMAGE_FILE_MACHINE_MIPSFPU           = 0x0366,

-                PELIB_IMAGE_FILE_MACHINE_MIPSFPU16       = 0x0466,

-                PELIB_IMAGE_FILE_MACHINE_ALPHA64           = 0x0284,

-                PELIB_IMAGE_FILE_MACHINE_AXP64       = PELIB_IMAGE_FILE_MACHINE_ALPHA64

-        };

-

-        enum

-        {

-                PELIB_IMAGE_FILE_RELOCS_STRIPPED           = 0x0001,

-                PELIB_IMAGE_FILE_EXECUTABLE_IMAGE         = 0x0002,

-                PELIB_IMAGE_FILE_LINE_NUMS_STRIPPED     = 0x0004,

-                PELIB_IMAGE_FILE_LOCAL_SYMS_STRIPPED       = 0x0008,

-                PELIB_IMAGE_FILE_AGGRESIVE_WS_TRIM       = 0x0010,

-                PELIB_IMAGE_FILE_LARGE_ADDRESS_AWARE       = 0x0020,

-                PELIB_IMAGE_FILE_BYTES_REVERSED_LO       = 0x0080,

-                PELIB_IMAGE_FILE_32BIT_MACHINE       = 0x0100,

-                PELIB_IMAGE_FILE_DEBUG_STRIPPED     = 0x0200,

-                PELIB_IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP   = 0x0400,

-                PELIB_IMAGE_FILE_NET_RUN_FROM_SWAP       = 0x0800,

-                PELIB_IMAGE_FILE_SYSTEM             = 0x1000,

-                PELIB_IMAGE_FILE_DLL                   = 0x2000,

-                PELIB_IMAGE_FILE_UP_SYSTEM_ONLY     = 0x4000,

-                PELIB_IMAGE_FILE_BYTES_REVERSED_HI       = 0x8000

-        };

-

-        enum

-        {

-                PELIB_IMAGE_NT_OPTIONAL_HDR32_MAGIC      = 0x10b,

-                PELIB_IMAGE_NT_OPTIONAL_HDR64_MAGIC      = 0x20b,

-                PELIB_IMAGE_ROM_OPTIONAL_HDR_MAGIC       = 0x107

-        };

-

-        enum

-        {

-                PELIB_IMAGE_SUBSYSTEM_UNKNOWN         = 0,

-                PELIB_IMAGE_SUBSYSTEM_NATIVE           = 1,

-                PELIB_IMAGE_SUBSYSTEM_WINDOWS_GUI         = 2,

-                PELIB_IMAGE_SUBSYSTEM_WINDOWS_CUI         = 3,

-                PELIB_IMAGE_SUBSYSTEM_OS2_CUI         = 5,

-                PELIB_IMAGE_SUBSYSTEM_POSIX_CUI     = 7,

-                PELIB_IMAGE_SUBSYSTEM_NATIVE_WINDOWS       = 8,

-                PELIB_IMAGE_SUBSYSTEM_WINDOWS_CE_GUI       = 9

-        };

-

-        enum

-        {

-                PELIB_RT_CURSOR = 1,            // 1

-                PELIB_RT_BITMAP,                        // 2

-                PELIB_RT_ICON,                  // 3

-                PELIB_RT_MENU,                  // 4

-                PELIB_RT_DIALOG,                        // 5

-                PELIB_RT_STRING,                        // 6

-                PELIB_RT_FONTDIR,                       // 7

-                PELIB_RT_FONT,                  // 8

-                PELIB_RT_ACCELERATOR,           // 9

-                PELIB_RT_RCDATA,                        // 10

-                PELIB_RT_MESSAGETABLE,  // 11

-                PELIB_RT_GROUP_CURSOR,  // 12

-                PELIB_RT_GROUP_ICON = 14,       // 14

-                PELIB_RT_VERSION = 16,

-                PELIB_RT_DLGINCLUDE,

-                PELIB_RT_PLUGPLAY = 19,

-                PELIB_RT_VXD,

-                PELIB_RT_ANICURSOR,

-                PELIB_RT_ANIICON,

-                PELIB_RT_HTML,

-                PELIB_RT_MANIFEST

-        };

-        

-        template<typename T>

-        unsigned int accumulate(unsigned int size, const T& v)

-        {

-                return size + v.size();

-        }

-

-        

-        struct PELIB_IMAGE_DOS_HEADER

-        {

-                word   e_magic;

-                word   e_cblp;

-                word   e_cp;

-                word   e_crlc;

-                word   e_cparhdr;

-                word   e_minalloc;

-                word   e_maxalloc;

-                word   e_ss;

-                word   e_sp;

-                word   e_csum;

-                word   e_ip;

-                word   e_cs;

-                word   e_lfarlc;

-                word   e_ovno;

-                word   e_res[4];

-                word   e_oemid;

-                word   e_oeminfo;

-                word   e_res2[10];

-                dword   e_lfanew;

-                

-                PELIB_IMAGE_DOS_HEADER();

-                

-                static inline unsigned int size() {return 64;}

-        };

-

-        struct PELIB_IMAGE_FILE_HEADER

-        {

-                word    Machine;

-                word    NumberOfSections;

-                dword   TimeDateStamp;

-                dword   PointerToSymbolTable;

-                dword   NumberOfSymbols;

-                word    SizeOfOptionalHeader;

-                word    Characteristics;

-                

-                PELIB_IMAGE_FILE_HEADER()

-                {

-                        Machine = 0;

-                        NumberOfSections = 0;

-                        TimeDateStamp = 0;

-                        PointerToSymbolTable = 0;

-                        NumberOfSymbols = 0;

-                        SizeOfOptionalHeader = 0;

-                        Characteristics = 0;

-                }

-                

-                static inline unsigned int size() {return 20;}

-        };

-

-        struct PELIB_IMAGE_DATA_DIRECTORY

-        {

-                dword   VirtualAddress;

-                dword   Size;

-                

-                PELIB_IMAGE_DATA_DIRECTORY()

-                {

-                        VirtualAddress = 0;

-                        Size = 0;

-                }

-                

-                static inline unsigned int size() {return 8;}

-        };

-

-        template<int>

-        struct FieldSizes;

-        

-        template<>

-        struct FieldSizes<32>

-        {

-                typedef dword VAR4_8;

-        };

-        

-        template<>

-        struct FieldSizes<64>

-        {

-                typedef qword VAR4_8;

-        };

-        

-        template<int x>

-        struct PELIB_IMAGE_OPTIONAL_HEADER_BASE

-        {

-                typedef typename FieldSizes<x>::VAR4_8 VAR4_8;

-                

-                word    Magic;

-                byte    MajorLinkerVersion;

-                byte    MinorLinkerVersion;

-                dword   SizeOfCode;

-                dword   SizeOfInitializedData;

-                dword   SizeOfUninitializedData;

-                dword   AddressOfEntryPoint;

-                dword   BaseOfCode;

-                dword   BaseOfData;

-                VAR4_8  ImageBase;

-                dword   SectionAlignment;

-                dword   FileAlignment;

-                word    MajorOperatingSystemVersion;

-                word    MinorOperatingSystemVersion;

-                word    MajorImageVersion;

-                word    MinorImageVersion;

-                word    MajorSubsystemVersion;

-                word    MinorSubsystemVersion;

-                dword   Win32VersionValue;

-                dword   SizeOfImage;

-                dword   SizeOfHeaders;

-                dword   CheckSum;

-                word    Subsystem;

-                word    DllCharacteristics;

-                VAR4_8  SizeOfStackReserve;

-                VAR4_8  SizeOfStackCommit;

-                VAR4_8  SizeOfHeapReserve;

-                VAR4_8  SizeOfHeapCommit;

-                dword   LoaderFlags;

-                dword   NumberOfRvaAndSizes;

-//              PELIB_IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];

-                

-                PELIB_IMAGE_OPTIONAL_HEADER_BASE();

-        };

-        

-        template<int x>

-        PELIB_IMAGE_OPTIONAL_HEADER_BASE<x>::PELIB_IMAGE_OPTIONAL_HEADER_BASE()

-        {

-                Magic = 0;

-                MajorLinkerVersion = 0;

-                MinorLinkerVersion = 0;

-                SizeOfCode = 0;

-                SizeOfInitializedData = 0;

-                SizeOfUninitializedData = 0;

-                AddressOfEntryPoint = 0;

-                BaseOfCode = 0;

-//              BaseOfData = 0;

-                ImageBase = 0;

-                SectionAlignment = 0;

-                FileAlignment = 0;

-                MajorOperatingSystemVersion = 0;

-                MinorOperatingSystemVersion = 0;

-                MajorImageVersion = 0;

-                MinorImageVersion = 0;

-                MajorSubsystemVersion = 0;

-                MinorSubsystemVersion = 0;

-                Win32VersionValue = 0;

-                SizeOfImage = 0;

-                SizeOfHeaders = 0;

-                CheckSum = 0;

-                Subsystem = 0;

-                DllCharacteristics = 0;

-                SizeOfStackReserve = 0;

-                SizeOfStackCommit = 0;

-                SizeOfHeapReserve = 0;

-                SizeOfHeapCommit = 0;

-                LoaderFlags = 0;

-                NumberOfRvaAndSizes = 0;

-        }

-

-        template<int>

-        struct PELIB_IMAGE_OPTIONAL_HEADER;

-        

-        template<>

-        struct PELIB_IMAGE_OPTIONAL_HEADER<32> : public PELIB_IMAGE_OPTIONAL_HEADER_BASE<32>

-        {

-                dword  BaseOfData;

-                

-                static inline unsigned int size() {return 224 - 0x10 * 8;}

-        };

-        

-        template<>

-        struct PELIB_IMAGE_OPTIONAL_HEADER<64> : public PELIB_IMAGE_OPTIONAL_HEADER_BASE<64>

-        {

-                static inline unsigned int size() {return 240 - 0x10 * 8;}

-        };

-        

-        template<int x>

-        struct PELIB_IMAGE_NT_HEADERS

-        {

-                dword Signature;

-                PELIB_IMAGE_FILE_HEADER FileHeader;

-                PELIB_IMAGE_OPTIONAL_HEADER<x> OptionalHeader;

-                std::vector<PELIB_IMAGE_DATA_DIRECTORY> dataDirectories;

-                

-                unsigned int size() const

-                {

-                        return sizeof(dword)

-                                + PELIB_IMAGE_FILE_HEADER::size()

-                                + PELIB_IMAGE_OPTIONAL_HEADER<x>::size()

-                                + static_cast<unsigned int>(dataDirectories.size()) * PELIB_IMAGE_DATA_DIRECTORY::size();

-                }

-                

-                PELIB_IMAGE_NT_HEADERS()

-                {

-                        Signature = 0;

-                }

-        };

-

-        const unsigned int PELIB_IMAGE_SIZEOF_SHORT_NAME  = 8;

-

-        struct PELIB_IMAGE_SECTION_HEADER

-        {

-                byte Name[PELIB_IMAGE_SIZEOF_SHORT_NAME];

-                dword   VirtualSize;

-                dword   VirtualAddress;

-                dword   SizeOfRawData;

-                dword   PointerToRawData;

-                dword   PointerToRelocations;

-                dword   PointerToLinenumbers;

-                word    NumberOfRelocations;

-                word    NumberOfLinenumbers;

-                dword   Characteristics;

-                

-                PELIB_IMAGE_SECTION_HEADER()

-                {

-                        VirtualSize = 0;

-                        VirtualAddress = 0;

-                        SizeOfRawData = 0;

-                        PointerToRawData = 0;

-                        PointerToRelocations = 0;

-                        PointerToLinenumbers = 0;

-                        NumberOfRelocations = 0;

-                        NumberOfLinenumbers = 0;

-                        Characteristics = 0;

-                }

-                

-                static inline unsigned int size() {return 40;}

-                bool biggerFileOffset(const PELIB_IMAGE_SECTION_HEADER& ish) const;

-                bool biggerVirtualAddress(const PELIB_IMAGE_SECTION_HEADER& ish) const;

-        };

-

-        template<int bits>

-        struct PELIB_IMAGE_THUNK_DATA

-        {

-                typename FieldSizes<bits>::VAR4_8 Ordinal;

-

-                PELIB_IMAGE_THUNK_DATA()

-                {

-                        Ordinal = 0;

-                }

-                

-                static inline unsigned int size() {return 4;}

-        };

-

-        struct PELIB_IMAGE_IMPORT_DESCRIPTOR

-        {

-                dword   OriginalFirstThunk;

-                dword   TimeDateStamp;

-                dword   ForwarderChain;

-                dword   Name;

-                dword   FirstThunk;

-                

-                PELIB_IMAGE_IMPORT_DESCRIPTOR()

-                {

-                        OriginalFirstThunk = 0;

-                        TimeDateStamp = 0;

-                        ForwarderChain = 0;

-                        Name = 0;

-                        FirstThunk = 0;

-                }

-                

-                static inline unsigned int size() {return 20;}

-        };

-        

-        struct PELIB_IMAGE_EXPORT_DIRECTORY

-        {

-                dword   Characteristics;

-                dword   TimeDateStamp;

-                word    MajorVersion;

-                word    MinorVersion;

-                dword   Name;

-                dword   Base;

-                dword   NumberOfFunctions;

-                dword   NumberOfNames;

-                dword   AddressOfFunctions;

-                dword   AddressOfNames;

-                dword   AddressOfNameOrdinals;

-                

-                PELIB_IMAGE_EXPORT_DIRECTORY()

-                {

-                        Characteristics = 0;

-                        TimeDateStamp = 0;

-                        MajorVersion = 0;

-                        MinorVersion = 0;

-                        Name = 0;

-                        Base = 0;

-                        NumberOfFunctions = 0;

-                        NumberOfNames = 0;

-                        AddressOfFunctions = 0;

-                        NumberOfNames = 0;

-                        AddressOfNameOrdinals = 0;

-                }

-                

-                static inline unsigned int size() {return 40;}

-        };

-        

-        struct PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR

-        {

-                dword   TimeDateStamp;

-                word    OffsetModuleName;

-                word    NumberOfModuleForwarderRefs;

-                

-                PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR()

-                {

-                        TimeDateStamp = 0;

-                        OffsetModuleName = 0;

-                        NumberOfModuleForwarderRefs = 0;

-                }

-

-                static unsigned int size()

-                {

-                        return 8;

-                }

-        };

-        

-        // Stores all necessary information about a BoundImport field.

-        struct PELIB_IMAGE_BOUND_DIRECTORY

-        {

-                PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR ibdDescriptor; ///< Information about the imported file.

-                std::string strModuleName; ///< Name of the imported file.

-                std::vector<PELIB_IMAGE_BOUND_DIRECTORY> moduleForwarders;

-

-                // Will be used in std::find_if

-                // Passing by-reference not possible (see C++ Standard Core Language Defect Reports, Revision 29, Issue 106)

-                /// Compares the passed filename to the struct's filename.

-                bool equal(const std::string strModuleName) const;

-                

-                unsigned int size() const;

-        };

-

-        struct PELIB_EXP_FUNC_INFORMATION

-        {

-                dword addroffunc;

-                dword addrofname;

-                word ordinal;

-                std::string funcname;

-                

-                PELIB_EXP_FUNC_INFORMATION();

-

-                bool equal(const std::string strFunctionName) const;

-                inline unsigned int size() const

-                {

-                        unsigned int uiSize = 4;

-                        if (addroffunc) uiSize += 2;// + 4;

-                        if (!funcname.empty()) uiSize += 4 + (unsigned int)funcname.size() + 1;

-                        return uiSize;

-                }

-        };

-

-        struct PELIB_IMAGE_RESOURCE_DIRECTORY

-        {

-                dword Characteristics;

-                dword TimeDateStamp;

-                word MajorVersion;

-                word MinorVersion;

-                word NumberOfNamedEntries;

-                word NumberOfIdEntries;

-                

-                PELIB_IMAGE_RESOURCE_DIRECTORY();

-

-                static inline unsigned int size() {return 16;}

-        };

-

-        struct PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY

-        {

-                dword Name;

-                dword OffsetToData;

-                PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY();

-                static inline unsigned int size() {return 8;}

-        };

-

-        const unsigned int PELIB_IMAGE_SIZEOF_BASE_RELOCATION = 8;

-

-        struct PELIB_IMG_RES_DIR_ENTRY

-        {

-                PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY irde;

-                std::string wstrName;

-

-                bool operator<(const PELIB_IMG_RES_DIR_ENTRY& first) const;

-

-        };

-        

-        struct PELIB_IMAGE_BASE_RELOCATION

-        {

-                dword VirtualAddress;

-                dword SizeOfBlock;

-                

-                PELIB_IMAGE_BASE_RELOCATION();

-                static inline unsigned int size() {return 8;}

-        };

-

-        struct PELIB_IMAGE_COR20_HEADER

-        {

-                dword cb;

-                word MajorRuntimeVersion;

-                word MinorRuntimeVersion;

-                PELIB_IMAGE_DATA_DIRECTORY MetaData;

-                dword Flags;

-                dword EntryPointToken;

-                PELIB_IMAGE_DATA_DIRECTORY Resources;

-                PELIB_IMAGE_DATA_DIRECTORY StrongNameSignature;

-                PELIB_IMAGE_DATA_DIRECTORY CodeManagerTable;

-                PELIB_IMAGE_DATA_DIRECTORY VTableFixups;

-                PELIB_IMAGE_DATA_DIRECTORY ExportAddressTableJumps;

-                PELIB_IMAGE_DATA_DIRECTORY ManagedNativeHeader;

-                

-                PELIB_IMAGE_COR20_HEADER();

-                static inline unsigned int size() {return 72;}

-        };

-

-        // Used to store a file's export table.

-        struct PELIB_IMAGE_EXP_DIRECTORY

-        {

-                /// The IMAGE_EXPORTED_DIRECTORY of a file's export table.

-                PELIB_IMAGE_EXPORT_DIRECTORY ied;

-                /// The original filename of current file.

-                std::string name;

-                std::vector<PELIB_EXP_FUNC_INFORMATION> functions;

-                inline unsigned int size() const

-                {

-                        return PELIB_IMAGE_EXPORT_DIRECTORY::size() + name.size() + 1 + 

-                        std::accumulate(functions.begin(), functions.end(), 0, accumulate<PELIB_EXP_FUNC_INFORMATION>);

-                }

-        };

-

-        // Used for parsing a file's import table. It combines the function name, the hint

-        // and the IMAGE_THUNK_DATA of an imported function.

-        template<int bits>

-        struct PELIB_THUNK_DATA

-        {

-                /// The IMAGE_THUNK_DATA struct of an imported function.

-                PELIB_IMAGE_THUNK_DATA<bits> itd;

-                /// The hint of an imported function.

-                word hint;

-                /// The function name of an imported function.

-                std::string fname;

-                

-                bool equalHint(word wHint) const

-                {

-                        return hint == wHint;

-//                      return itd.Ordinal == (wHint | IMAGE_ORDINAL_FLAGS<bits>::IMAGE_ORDINAL_FLAG);

-                }

-                

-                bool equalFunctionName(std::string strFunctionName) const

-                {

-                        return isEqualNc(fname, strFunctionName);

-                }

-                

-                unsigned int size() const {return PELIB_IMAGE_THUNK_DATA<bits>::size() + fname.size() + 1 + sizeof(hint);}

-        };

-

-        // Used to store a file's import table. Every struct of this sort

-        // can store import information of one DLL.

-        template<int bits>

-        struct PELIB_IMAGE_IMPORT_DIRECTORY

-        {

-                /// The IMAGE_IMPORT_DESCRIPTOR of an imported DLL.

-                PELIB_IMAGE_IMPORT_DESCRIPTOR impdesc;

-                /// The name of an imported DLL.

-                std::string name;

-                /// All original first thunk values of an imported DLL.

-                std::vector<PELIB_THUNK_DATA<bits> > originalfirstthunk;

-                /// All first thunk value of an imported DLL.

-                std::vector<PELIB_THUNK_DATA<bits> > firstthunk;

-                

-//              bool operator==(std::string strFilename) const;

-                inline unsigned int size() const

-                {

-                        return PELIB_IMAGE_IMPORT_DESCRIPTOR::size() + name.size() + 1 + // descriptor + dllname

-                        std::accumulate(originalfirstthunk.begin(), originalfirstthunk.end(), 0, accumulate<PELIB_THUNK_DATA<bits> >) + // thunks (PeLib uses only one thunk)

-                        PELIB_IMAGE_THUNK_DATA<bits>::size(); // zero-termination

-                }

-                

-                bool operator==(std::string strFilename) const

-                {

-                        return isEqualNc(this->name, strFilename);

-                }

-        };

-

-    struct PELIB_IMAGE_RESOURCE_DATA_ENTRY

-    {

-            dword OffsetToData;

-            dword Size;

-            dword CodePage;

-            dword Reserved;

-

-                static inline unsigned int size() {return 16;}

-    };

-

-    struct PELIB_IMAGE_RESOURCE_DATA

-    {

-            PELIB_IMAGE_RESOURCE_DATA_ENTRY irdEntry;

-            std::vector<byte> vData;

-    };

-

-        struct IMG_BASE_RELOC

-    {

-                PELIB_IMAGE_BASE_RELOCATION ibrRelocation;

-                std::vector<word> vRelocData;

-        };

-        

-        struct PELIB_IMAGE_DEBUG_DIRECTORY

-        {

-                dword Characteristics;

-                dword TimeDateStamp;

-                word MajorVersion;

-                word MinorVersion;

-                dword Type;

-                dword SizeOfData;

-                dword AddressOfRawData;

-                dword PointerToRawData;

-                

-                static unsigned int size() {return 28;}

-        };

-        

-        struct PELIB_IMG_DEBUG_DIRECTORY

-        {

-                PELIB_IMAGE_DEBUG_DIRECTORY idd;

-                std::vector<byte> data;

-        };

-

-        template<int bits>

-        struct PELIB_IMAGE_TLS_DIRECTORY_BASE

-        {

-            typename FieldSizes<bits>::VAR4_8 StartAddressOfRawData;

-            typename FieldSizes<bits>::VAR4_8 EndAddressOfRawData;

-            typename FieldSizes<bits>::VAR4_8 AddressOfIndex;

-            typename FieldSizes<bits>::VAR4_8 AddressOfCallBacks;

-            dword SizeOfZeroFill;

-            dword Characteristics;

-        };    

-        

-        template<int bits>

-        struct PELIB_IMAGE_TLS_DIRECTORY;// : public PELIB_IMAGE_TLS_DIRECTORY_BASE<bits>

-        

-        template<>

-        struct PELIB_IMAGE_TLS_DIRECTORY<32> : public PELIB_IMAGE_TLS_DIRECTORY_BASE<32>

-        {

-//              enum {size = 24};

-            static unsigned int size(){return 24;}

-        };

-

-        template<>

-        struct PELIB_IMAGE_TLS_DIRECTORY<64> : public PELIB_IMAGE_TLS_DIRECTORY_BASE<64>

-        {

-//              enum {size = 40};

-            static unsigned int size(){return 40;}

-        };

-

-        unsigned int fileSize(const std::string& filename);

-        unsigned int fileSize(std::ifstream& file);

-        unsigned int fileSize(std::ofstream& file);

-        unsigned int fileSize(std::fstream& file);

-        unsigned int alignOffset(unsigned int uiOffset, unsigned int uiAlignment);

-        

-        /// Determines if a file is a 32bit or 64bit PE file.

-        unsigned int getFileType(const std::string strFilename);

-        

-        /// Opens a PE file.

-        PeFile* openPeFile(const std::string& strFilename);

-

-  /*  enum MzHeader_Field {e_magic, e_cblp, e_cp, e_crlc, e_cparhdr, e_minalloc, e_maxalloc,

-                        e_ss, e_sp, e_csum, e_ip, e_cs, e_lfarlc, e_ovno, e_res, e_oemid,

-                        e_oeminfo, e_res2, e_lfanew};

-    enum PeHeader_Field {NtSignature, Machine, NumberOfSections, TimeDateStamp, PointerToSymbolTable,

-                        NumberOfSymbols, SizeOfOptionalHeader, Characteristics, Magic,

-                        MajorLinkerVersion, MinorLinkerVersion, SizeOfCode, SizeOfInitializedData,

-                        SizeOfUninitializedData, AddressOfEntryPoint, BaseOfCode, BaseOfData, ImageBase,

-                        SectionAlignment, FileAlignment, MajorOperatingSystemVersion, MinorOperatingSystemVersion,

-                        MajorImageVersion, MinorImageVersion, MajorSubsystemVersion, MinorSubsystemVersion,

-                        Win32VersionValue, SizeOfImage, SizeOfHeaders, CheckSum, Subsystem, DllCharacteristics,

-                        SizeOfStackReserve, SizeOfStackCommit, SizeOfHeapReserve, SizeOfHeapCommit,

-                        LoaderFlags, NumberOfRvaAndSizes, DataDirectoryRva, DataDirectorySize};

-    enum Section_Field {SectionName, VirtualSize, VirtualAddress, SizeOfRawData, PointerToRawData, PointerToRelocations,

-                        PointerToLinenumbers, NumberOfRelocations, NumberOfLinenumbers, SectionCharacteristics};

-*/

-}

-

-#endif

+/*
+* PeLibAux.cpp - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#ifndef PELIBAUX_H
+#define PELIBAUX_H
+
+//#include "PeLibInc.h"
+//#include "PeHeader.h"
+#include "buffer/OutputBuffer.h"
+#include "buffer/InputBuffer.h"
+//#include "buffer/ResTree.h"
+#include <numeric>
+#include <limits>
+
+namespace PeLib
+{
+        enum errorCodes
+        {
+                NO_ERROR = 0,
+                ERROR_OPENING_FILE = -1,
+                ERROR_INVALID_FILE = -2,
+                ERROR_TOO_MANY_SECTIONS = -3,
+                ERROR_NOT_ENOUGH_SPACE = -4,
+                ERROR_NO_FILE_ALIGNMENT = -5,
+                ERROR_NO_SECTION_ALIGNMENT = -6,
+                ERROR_ENTRY_NOT_FOUND = -7,
+                ERROR_DUPLICATE_ENTRY = -8,
+                ERROR_DIRECTORY_DOES_NOT_EXIST = -9
+        };
+
+        class PeFile;
+        bool isEqualNc(const std::string& s1, const std::string& s2);
+        
+// It's necessary to make sure that a byte has 8 bits and that the platform has a 8 bit type,
+// a 16bit type and a bit type. That's because binary PE files are pretty picky about their
+// structure.
+
+        #if CHAR_BIT == 8
+                #if UCHAR_MAX == 255
+                        typedef unsigned char byte;
+        //              typedef std::bitset<8> byte;
+                #else
+                        #error You need to change some typedefs (Code: 8). Please read the PeLib documentation.
+                #endif
+        
+                #if USHRT_MAX == 65535U
+                        typedef unsigned short word;
+        //              typedef std::bitset<16> word;
+                #else
+                        #error You need to change some typedefs (Code: 16). Please read the PeLib documentation.
+                #endif
+        
+                #if UINT_MAX == 4294967295UL
+                        typedef unsigned int dword;
+        //              typedef std::bitset<32> dword;
+                #else
+                        #error You need to change some typedefs (Code: 32). Please read the PeLib documentation.
+                #endif
+
+                typedef unsigned long long qword;
+        
+//              #if ULLONG_MAX == 18446744073709551615
+//                      typedef unsigned long long qword;
+//              #else
+//                      #error You need to change some typedefs (Code: 32). Please read the PeLib documentation.
+//              #endif
+        #else
+                #error You need to change some typedefs. Please read the PeLib documentation.
+        #endif
+
+
+/*      enum bits {BITS_BYTE = 8, BITS_WORD = 16, BITS_DWORD = 32};
+
+        template<bits value>
+        class DataType
+        {
+                private:
+                  std::bitset<value> bsValue;
+                  unsigned long ulValue;
+          
+                public:
+                  void operator=(unsigned long ulValue)
+                  {
+                        bsValue = ulValue;
+                  }
+
+                  operator unsigned long() const
+                  {
+                        return bsValue.to_ulong();
+                  }
+                  
+                  const int operator&()
+                  {
+                        ulValue = bsValue;
+                        return ulValue; 
+                  }
+
+        };
+
+        typedef DataType<BITS_BYTE> byte;
+        typedef DataType<BITS_WORD> word;
+        typedef DataType<BITS_DWORD> dword;
+*/
+
+        enum {PEFILE32 = 32,
+                  PEFILE64 = 64,
+                  PEFILE_UNKNOWN = 0};
+
+        enum {BoundImportDirectoryId = 1,
+              ComHeaderDirectoryId,
+              ExportDirectoryId,
+              IatDirectoryId,
+              ImportDirectoryId,
+              MzHeaderId,
+              PeHeaderId,
+              RelocationsId,
+              PeFileId,
+              ResourceDirectoryId,
+              DebugDirectoryId,
+              TlsDirectoryId
+        };
+
+        const word PELIB_IMAGE_DOS_SIGNATURE = 0x5A4D;
+        
+        const dword PELIB_IMAGE_NT_SIGNATURE = 0x00004550;
+
+        template<int bits>
+        struct PELIB_IMAGE_ORDINAL_FLAGS;
+        
+        template<>
+        struct PELIB_IMAGE_ORDINAL_FLAGS<32>
+        {
+                static const dword IMAGE_ORDINAL_FLAG = 0x80000000;
+        };
+        
+        template<>
+        struct PELIB_IMAGE_ORDINAL_FLAGS<64>
+        {
+                static const qword IMAGE_ORDINAL_FLAG;
+        };
+
+        const unsigned long PELIB_IMAGE_NUMBEROF_DIRECTORY_ENTRIES = 16;
+
+        const unsigned long PELIB_IMAGE_RESOURCE_NAME_IS_STRING = 0x80000000;
+
+        const unsigned long PELIB_IMAGE_RESOURCE_DATA_IS_DIRECTORY = 0x80000000;
+
+        enum
+        {
+                PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT,             // OK
+                PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT,             // OK
+                PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE,           // OK
+                PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION,
+                PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY,
+                PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC,  // OK
+                PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG,
+                PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE,
+                PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR,
+                PELIB_IMAGE_DIRECTORY_ENTRY_TLS,
+                PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG,
+                PELIB_IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT,       // OK
+                PELIB_IMAGE_DIRECTORY_ENTRY_IAT,                // OK
+                PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT,
+                PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR
+        };
+
+        enum
+        {
+                PELIB_IMAGE_SCN_TYPE_NO_PAD             = 0x00000008,
+                PELIB_IMAGE_SCN_CNT_CODE                   = 0x00000020,
+                PELIB_IMAGE_SCN_CNT_INITIALIZED_DATA       = 0x00000040,
+                PELIB_IMAGE_SCN_CNT_UNINITIALIZED_DATA     = 0x00000080,
+                PELIB_IMAGE_SCN_LNK_OTHER                 = 0x00000100,
+                PELIB_IMAGE_SCN_LNK_INFO                   = 0x00000200,
+                PELIB_IMAGE_SCN_LNK_REMOVE               = 0x00000800,
+                PELIB_IMAGE_SCN_LNK_COMDAT               = 0x00001000,
+                PELIB_IMAGE_SCN_NO_DEFER_SPEC_EXC         = 0x00004000,
+                PELIB_IMAGE_SCN_GPREL                 = 0x00008000,
+                PELIB_IMAGE_SCN_MEM_FARDATA             = 0x00008000,
+                PELIB_IMAGE_SCN_MEM_PURGEABLE         = 0x00020000,
+                PELIB_IMAGE_SCN_MEM_16BIT                 = 0x00020000,
+                PELIB_IMAGE_SCN_MEM_LOCKED               = 0x00040000,
+                PELIB_IMAGE_SCN_MEM_PRELOAD             = 0x00080000,
+                PELIB_IMAGE_SCN_ALIGN_1BYTES           = 0x00100000,
+                PELIB_IMAGE_SCN_ALIGN_2BYTES           = 0x00200000,
+                PELIB_IMAGE_SCN_ALIGN_4BYTES           = 0x00300000,
+                PELIB_IMAGE_SCN_ALIGN_8BYTES           = 0x00400000,
+                PELIB_IMAGE_SCN_ALIGN_16BYTES         = 0x00500000,
+                PELIB_IMAGE_SCN_ALIGN_BYTES             = 0x00600000,
+                PELIB_IMAGE_SCN_ALIGN_64BYTES         = 0x00700000,
+                PELIB_IMAGE_SCN_ALIGN_128BYTES       = 0x00800000,
+                PELIB_IMAGE_SCN_ALIGN_256BYTES       = 0x00900000,
+                PELIB_IMAGE_SCN_ALIGN_512BYTES       = 0x00A00000,
+                PELIB_IMAGE_SCN_ALIGN_1024BYTES     = 0x00B00000,
+                PELIB_IMAGE_SCN_ALIGN_2048BYTES     = 0x00C00000,
+                PELIB_IMAGE_SCN_ALIGN_4096BYTES     = 0x00D00000,
+                PELIB_IMAGE_SCN_ALIGN_8192BYTES     = 0x00E00000,
+                PELIB_IMAGE_SCN_LNK_NRELOC_OVFL     = 0x01000000,
+                PELIB_IMAGE_SCN_MEM_DISCARDABLE     = 0x02000000,
+                PELIB_IMAGE_SCN_MEM_NOT_CACHED       = 0x04000000,
+                PELIB_IMAGE_SCN_MEM_NOT_PAGED         = 0x08000000,
+                PELIB_IMAGE_SCN_MEM_SHARED               = 0x10000000,
+                PELIB_IMAGE_SCN_MEM_EXECUTE             = 0x20000000,
+                PELIB_IMAGE_SCN_MEM_READ                   = 0x40000000,
+                PELIB_IMAGE_SCN_MEM_WRITE                 = 0x80000000
+        };
+
+        enum
+        {
+                PELIB_IMAGE_FILE_MACHINE_UNKNOWN           = 0,
+                PELIB_IMAGE_FILE_MACHINE_I386         = 0x014c,
+                PELIB_IMAGE_FILE_MACHINE_R3000       = 0x0162,
+                PELIB_IMAGE_FILE_MACHINE_R4000       = 0x0166,
+                PELIB_IMAGE_FILE_MACHINE_R10000     = 0x0168,
+                PELIB_IMAGE_FILE_MACHINE_WCEMIPSV2       = 0x0169,
+                PELIB_IMAGE_FILE_MACHINE_ALPHA       = 0x0184,
+                PELIB_IMAGE_FILE_MACHINE_POWERPC           = 0x01F0,
+                PELIB_IMAGE_FILE_MACHINE_SH3           = 0x01a2,
+                PELIB_IMAGE_FILE_MACHINE_SH3E         = 0x01a4,
+                PELIB_IMAGE_FILE_MACHINE_SH4           = 0x01a6,
+                PELIB_IMAGE_FILE_MACHINE_ARM           = 0x01c0,
+                PELIB_IMAGE_FILE_MACHINE_THUMB       = 0x01c2,
+                PELIB_IMAGE_FILE_MACHINE_IA64         = 0x0200,
+                PELIB_IMAGE_FILE_MACHINE_MIPS16     = 0x0266,
+                PELIB_IMAGE_FILE_MACHINE_MIPSFPU           = 0x0366,
+                PELIB_IMAGE_FILE_MACHINE_MIPSFPU16       = 0x0466,
+                PELIB_IMAGE_FILE_MACHINE_ALPHA64           = 0x0284,
+                PELIB_IMAGE_FILE_MACHINE_AXP64       = PELIB_IMAGE_FILE_MACHINE_ALPHA64
+        };
+
+        enum
+        {
+                PELIB_IMAGE_FILE_RELOCS_STRIPPED           = 0x0001,
+                PELIB_IMAGE_FILE_EXECUTABLE_IMAGE         = 0x0002,
+                PELIB_IMAGE_FILE_LINE_NUMS_STRIPPED     = 0x0004,
+                PELIB_IMAGE_FILE_LOCAL_SYMS_STRIPPED       = 0x0008,
+                PELIB_IMAGE_FILE_AGGRESIVE_WS_TRIM       = 0x0010,
+                PELIB_IMAGE_FILE_LARGE_ADDRESS_AWARE       = 0x0020,
+                PELIB_IMAGE_FILE_BYTES_REVERSED_LO       = 0x0080,
+                PELIB_IMAGE_FILE_32BIT_MACHINE       = 0x0100,
+                PELIB_IMAGE_FILE_DEBUG_STRIPPED     = 0x0200,
+                PELIB_IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP   = 0x0400,
+                PELIB_IMAGE_FILE_NET_RUN_FROM_SWAP       = 0x0800,
+                PELIB_IMAGE_FILE_SYSTEM             = 0x1000,
+                PELIB_IMAGE_FILE_DLL                   = 0x2000,
+                PELIB_IMAGE_FILE_UP_SYSTEM_ONLY     = 0x4000,
+                PELIB_IMAGE_FILE_BYTES_REVERSED_HI       = 0x8000
+        };
+
+        enum
+        {
+                PELIB_IMAGE_NT_OPTIONAL_HDR32_MAGIC      = 0x10b,
+                PELIB_IMAGE_NT_OPTIONAL_HDR64_MAGIC      = 0x20b,
+                PELIB_IMAGE_ROM_OPTIONAL_HDR_MAGIC       = 0x107
+        };
+
+        enum
+        {
+                PELIB_IMAGE_SUBSYSTEM_UNKNOWN         = 0,
+                PELIB_IMAGE_SUBSYSTEM_NATIVE           = 1,
+                PELIB_IMAGE_SUBSYSTEM_WINDOWS_GUI         = 2,
+                PELIB_IMAGE_SUBSYSTEM_WINDOWS_CUI         = 3,
+                PELIB_IMAGE_SUBSYSTEM_OS2_CUI         = 5,
+                PELIB_IMAGE_SUBSYSTEM_POSIX_CUI     = 7,
+                PELIB_IMAGE_SUBSYSTEM_NATIVE_WINDOWS       = 8,
+                PELIB_IMAGE_SUBSYSTEM_WINDOWS_CE_GUI       = 9
+        };
+
+        enum
+        {
+                PELIB_RT_CURSOR = 1,            // 1
+                PELIB_RT_BITMAP,                        // 2
+                PELIB_RT_ICON,                  // 3
+                PELIB_RT_MENU,                  // 4
+                PELIB_RT_DIALOG,                        // 5
+                PELIB_RT_STRING,                        // 6
+                PELIB_RT_FONTDIR,                       // 7
+                PELIB_RT_FONT,                  // 8
+                PELIB_RT_ACCELERATOR,           // 9
+                PELIB_RT_RCDATA,                        // 10
+                PELIB_RT_MESSAGETABLE,  // 11
+                PELIB_RT_GROUP_CURSOR,  // 12
+                PELIB_RT_GROUP_ICON = 14,       // 14
+                PELIB_RT_VERSION = 16,
+                PELIB_RT_DLGINCLUDE,
+                PELIB_RT_PLUGPLAY = 19,
+                PELIB_RT_VXD,
+                PELIB_RT_ANICURSOR,
+                PELIB_RT_ANIICON,
+                PELIB_RT_HTML,
+                PELIB_RT_MANIFEST
+        };
+        
+        template<typename T>
+        unsigned int accumulate(unsigned int size, const T& v)
+        {
+                return size + v.size();
+        }
+
+        
+        struct PELIB_IMAGE_DOS_HEADER
+        {
+                word   e_magic;
+                word   e_cblp;
+                word   e_cp;
+                word   e_crlc;
+                word   e_cparhdr;
+                word   e_minalloc;
+                word   e_maxalloc;
+                word   e_ss;
+                word   e_sp;
+                word   e_csum;
+                word   e_ip;
+                word   e_cs;
+                word   e_lfarlc;
+                word   e_ovno;
+                word   e_res[4];
+                word   e_oemid;
+                word   e_oeminfo;
+                word   e_res2[10];
+                dword   e_lfanew;
+                
+                PELIB_IMAGE_DOS_HEADER();
+                
+                static inline unsigned int size() {return 64;}
+        };
+
+        struct PELIB_IMAGE_FILE_HEADER
+        {
+                word    Machine;
+                word    NumberOfSections;
+                dword   TimeDateStamp;
+                dword   PointerToSymbolTable;
+                dword   NumberOfSymbols;
+                word    SizeOfOptionalHeader;
+                word    Characteristics;
+                
+                PELIB_IMAGE_FILE_HEADER()
+                {
+                        Machine = 0;
+                        NumberOfSections = 0;
+                        TimeDateStamp = 0;
+                        PointerToSymbolTable = 0;
+                        NumberOfSymbols = 0;
+                        SizeOfOptionalHeader = 0;
+                        Characteristics = 0;
+                }
+                
+                static inline unsigned int size() {return 20;}
+        };
+
+        struct PELIB_IMAGE_DATA_DIRECTORY
+        {
+                dword   VirtualAddress;
+                dword   Size;
+                
+                PELIB_IMAGE_DATA_DIRECTORY()
+                {
+                        VirtualAddress = 0;
+                        Size = 0;
+                }
+                
+                static inline unsigned int size() {return 8;}
+        };
+
+        template<int>
+        struct FieldSizes;
+        
+        template<>
+        struct FieldSizes<32>
+        {
+                typedef dword VAR4_8;
+        };
+        
+        template<>
+        struct FieldSizes<64>
+        {
+                typedef qword VAR4_8;
+        };
+        
+        template<int x>
+        struct PELIB_IMAGE_OPTIONAL_HEADER_BASE
+        {
+                typedef typename FieldSizes<x>::VAR4_8 VAR4_8;
+                
+                word    Magic;
+                byte    MajorLinkerVersion;
+                byte    MinorLinkerVersion;
+                dword   SizeOfCode;
+                dword   SizeOfInitializedData;
+                dword   SizeOfUninitializedData;
+                dword   AddressOfEntryPoint;
+                dword   BaseOfCode;
+                dword   BaseOfData;
+                VAR4_8  ImageBase;
+                dword   SectionAlignment;
+                dword   FileAlignment;
+                word    MajorOperatingSystemVersion;
+                word    MinorOperatingSystemVersion;
+                word    MajorImageVersion;
+                word    MinorImageVersion;
+                word    MajorSubsystemVersion;
+                word    MinorSubsystemVersion;
+                dword   Win32VersionValue;
+                dword   SizeOfImage;
+                dword   SizeOfHeaders;
+                dword   CheckSum;
+                word    Subsystem;
+                word    DllCharacteristics;
+                VAR4_8  SizeOfStackReserve;
+                VAR4_8  SizeOfStackCommit;
+                VAR4_8  SizeOfHeapReserve;
+                VAR4_8  SizeOfHeapCommit;
+                dword   LoaderFlags;
+                dword   NumberOfRvaAndSizes;
+//              PELIB_IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
+                
+                PELIB_IMAGE_OPTIONAL_HEADER_BASE();
+        };
+        
+        template<int x>
+        PELIB_IMAGE_OPTIONAL_HEADER_BASE<x>::PELIB_IMAGE_OPTIONAL_HEADER_BASE()
+        {
+                Magic = 0;
+                MajorLinkerVersion = 0;
+                MinorLinkerVersion = 0;
+                SizeOfCode = 0;
+                SizeOfInitializedData = 0;
+                SizeOfUninitializedData = 0;
+                AddressOfEntryPoint = 0;
+                BaseOfCode = 0;
+//              BaseOfData = 0;
+                ImageBase = 0;
+                SectionAlignment = 0;
+                FileAlignment = 0;
+                MajorOperatingSystemVersion = 0;
+                MinorOperatingSystemVersion = 0;
+                MajorImageVersion = 0;
+                MinorImageVersion = 0;
+                MajorSubsystemVersion = 0;
+                MinorSubsystemVersion = 0;
+                Win32VersionValue = 0;
+                SizeOfImage = 0;
+                SizeOfHeaders = 0;
+                CheckSum = 0;
+                Subsystem = 0;
+                DllCharacteristics = 0;
+                SizeOfStackReserve = 0;
+                SizeOfStackCommit = 0;
+                SizeOfHeapReserve = 0;
+                SizeOfHeapCommit = 0;
+                LoaderFlags = 0;
+                NumberOfRvaAndSizes = 0;
+        }
+
+        template<int>
+        struct PELIB_IMAGE_OPTIONAL_HEADER;
+        
+        template<>
+        struct PELIB_IMAGE_OPTIONAL_HEADER<32> : public PELIB_IMAGE_OPTIONAL_HEADER_BASE<32>
+        {
+                dword  BaseOfData;
+                
+                static inline unsigned int size() {return 224 - 0x10 * 8;}
+        };
+        
+        template<>
+        struct PELIB_IMAGE_OPTIONAL_HEADER<64> : public PELIB_IMAGE_OPTIONAL_HEADER_BASE<64>
+        {
+                static inline unsigned int size() {return 240 - 0x10 * 8;}
+        };
+        
+        template<int x>
+        struct PELIB_IMAGE_NT_HEADERS
+        {
+                dword Signature;
+                PELIB_IMAGE_FILE_HEADER FileHeader;
+                PELIB_IMAGE_OPTIONAL_HEADER<x> OptionalHeader;
+                std::vector<PELIB_IMAGE_DATA_DIRECTORY> dataDirectories;
+                
+                unsigned int size() const
+                {
+                        return sizeof(dword)
+                                + PELIB_IMAGE_FILE_HEADER::size()
+                                + PELIB_IMAGE_OPTIONAL_HEADER<x>::size()
+                                + static_cast<unsigned int>(dataDirectories.size()) * PELIB_IMAGE_DATA_DIRECTORY::size();
+                }
+                
+                PELIB_IMAGE_NT_HEADERS()
+                {
+                        Signature = 0;
+                }
+        };
+
+        const unsigned int PELIB_IMAGE_SIZEOF_SHORT_NAME  = 8;
+
+        struct PELIB_IMAGE_SECTION_HEADER
+        {
+                byte Name[PELIB_IMAGE_SIZEOF_SHORT_NAME];
+                dword   VirtualSize;
+                dword   VirtualAddress;
+                dword   SizeOfRawData;
+                dword   PointerToRawData;
+                dword   PointerToRelocations;
+                dword   PointerToLinenumbers;
+                word    NumberOfRelocations;
+                word    NumberOfLinenumbers;
+                dword   Characteristics;
+                
+                PELIB_IMAGE_SECTION_HEADER()
+                {
+                        VirtualSize = 0;
+                        VirtualAddress = 0;
+                        SizeOfRawData = 0;
+                        PointerToRawData = 0;
+                        PointerToRelocations = 0;
+                        PointerToLinenumbers = 0;
+                        NumberOfRelocations = 0;
+                        NumberOfLinenumbers = 0;
+                        Characteristics = 0;
+                }
+                
+                static inline unsigned int size() {return 40;}
+                bool biggerFileOffset(const PELIB_IMAGE_SECTION_HEADER& ish) const;
+                bool biggerVirtualAddress(const PELIB_IMAGE_SECTION_HEADER& ish) const;
+        };
+
+        template<int bits>
+        struct PELIB_IMAGE_THUNK_DATA
+        {
+                typename FieldSizes<bits>::VAR4_8 Ordinal;
+
+                PELIB_IMAGE_THUNK_DATA()
+                {
+                        Ordinal = 0;
+                }
+                
+                static inline unsigned int size() {return 4;}
+        };
+
+        struct PELIB_IMAGE_IMPORT_DESCRIPTOR
+        {
+                dword   OriginalFirstThunk;
+                dword   TimeDateStamp;
+                dword   ForwarderChain;
+                dword   Name;
+                dword   FirstThunk;
+                
+                PELIB_IMAGE_IMPORT_DESCRIPTOR()
+                {
+                        OriginalFirstThunk = 0;
+                        TimeDateStamp = 0;
+                        ForwarderChain = 0;
+                        Name = 0;
+                        FirstThunk = 0;
+                }
+                
+                static inline unsigned int size() {return 20;}
+        };
+        
+        struct PELIB_IMAGE_EXPORT_DIRECTORY
+        {
+                dword   Characteristics;
+                dword   TimeDateStamp;
+                word    MajorVersion;
+                word    MinorVersion;
+                dword   Name;
+                dword   Base;
+                dword   NumberOfFunctions;
+                dword   NumberOfNames;
+                dword   AddressOfFunctions;
+                dword   AddressOfNames;
+                dword   AddressOfNameOrdinals;
+                
+                PELIB_IMAGE_EXPORT_DIRECTORY()
+                {
+                        Characteristics = 0;
+                        TimeDateStamp = 0;
+                        MajorVersion = 0;
+                        MinorVersion = 0;
+                        Name = 0;
+                        Base = 0;
+                        NumberOfFunctions = 0;
+                        NumberOfNames = 0;
+                        AddressOfFunctions = 0;
+                        NumberOfNames = 0;
+                        AddressOfNameOrdinals = 0;
+                }
+                
+                static inline unsigned int size() {return 40;}
+        };
+        
+        struct PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR
+        {
+                dword   TimeDateStamp;
+                word    OffsetModuleName;
+                word    NumberOfModuleForwarderRefs;
+                
+                PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR()
+                {
+                        TimeDateStamp = 0;
+                        OffsetModuleName = 0;
+                        NumberOfModuleForwarderRefs = 0;
+                }
+
+                static unsigned int size()
+                {
+                        return 8;
+                }
+        };
+        
+        // Stores all necessary information about a BoundImport field.
+        struct PELIB_IMAGE_BOUND_DIRECTORY
+        {
+                PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR ibdDescriptor; ///< Information about the imported file.
+                std::string strModuleName; ///< Name of the imported file.
+                std::vector<PELIB_IMAGE_BOUND_DIRECTORY> moduleForwarders;
+
+                // Will be used in std::find_if
+                // Passing by-reference not possible (see C++ Standard Core Language Defect Reports, Revision 29, Issue 106)
+                /// Compares the passed filename to the struct's filename.
+                bool equal(const std::string strModuleName) const;
+                
+                unsigned int size() const;
+        };
+
+        struct PELIB_EXP_FUNC_INFORMATION
+        {
+                dword addroffunc;
+                dword addrofname;
+                word ordinal;
+                std::string funcname;
+                
+                PELIB_EXP_FUNC_INFORMATION();
+
+                bool equal(const std::string strFunctionName) const;
+                inline unsigned int size() const
+                {
+                        unsigned int uiSize = 4;
+                        if (addroffunc) uiSize += 2;// + 4;
+                        if (!funcname.empty()) uiSize += 4 + (unsigned int)funcname.size() + 1;
+                        return uiSize;
+                }
+        };
+
+        struct PELIB_IMAGE_RESOURCE_DIRECTORY
+        {
+                dword Characteristics;
+                dword TimeDateStamp;
+                word MajorVersion;
+                word MinorVersion;
+                word NumberOfNamedEntries;
+                word NumberOfIdEntries;
+                
+                PELIB_IMAGE_RESOURCE_DIRECTORY();
+
+                static inline unsigned int size() {return 16;}
+        };
+
+        struct PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY
+        {
+                dword Name;
+                dword OffsetToData;
+                PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY();
+                static inline unsigned int size() {return 8;}
+        };
+
+        const unsigned int PELIB_IMAGE_SIZEOF_BASE_RELOCATION = 8;
+
+        struct PELIB_IMG_RES_DIR_ENTRY
+        {
+                PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY irde;
+                std::string wstrName;
+
+                bool operator<(const PELIB_IMG_RES_DIR_ENTRY& first) const;
+
+        };
+        
+        struct PELIB_IMAGE_BASE_RELOCATION
+        {
+                dword VirtualAddress;
+                dword SizeOfBlock;
+                
+                PELIB_IMAGE_BASE_RELOCATION();
+                static inline unsigned int size() {return 8;}
+        };
+
+        struct PELIB_IMAGE_COR20_HEADER
+        {
+                dword cb;
+                word MajorRuntimeVersion;
+                word MinorRuntimeVersion;
+                PELIB_IMAGE_DATA_DIRECTORY MetaData;
+                dword Flags;
+                dword EntryPointToken;
+                PELIB_IMAGE_DATA_DIRECTORY Resources;
+                PELIB_IMAGE_DATA_DIRECTORY StrongNameSignature;
+                PELIB_IMAGE_DATA_DIRECTORY CodeManagerTable;
+                PELIB_IMAGE_DATA_DIRECTORY VTableFixups;
+                PELIB_IMAGE_DATA_DIRECTORY ExportAddressTableJumps;
+                PELIB_IMAGE_DATA_DIRECTORY ManagedNativeHeader;
+                
+                PELIB_IMAGE_COR20_HEADER();
+                static inline unsigned int size() {return 72;}
+        };
+
+        // Used to store a file's export table.
+        struct PELIB_IMAGE_EXP_DIRECTORY
+        {
+                /// The IMAGE_EXPORTED_DIRECTORY of a file's export table.
+                PELIB_IMAGE_EXPORT_DIRECTORY ied;
+                /// The original filename of current file.
+                std::string name;
+                std::vector<PELIB_EXP_FUNC_INFORMATION> functions;
+                inline unsigned int size() const
+                {
+                        return PELIB_IMAGE_EXPORT_DIRECTORY::size() + name.size() + 1 + 
+                        std::accumulate(functions.begin(), functions.end(), 0, accumulate<PELIB_EXP_FUNC_INFORMATION>);
+                }
+        };
+
+        // Used for parsing a file's import table. It combines the function name, the hint
+        // and the IMAGE_THUNK_DATA of an imported function.
+        template<int bits>
+        struct PELIB_THUNK_DATA
+        {
+                /// The IMAGE_THUNK_DATA struct of an imported function.
+                PELIB_IMAGE_THUNK_DATA<bits> itd;
+                /// The hint of an imported function.
+                word hint;
+                /// The function name of an imported function.
+                std::string fname;
+                
+                bool equalHint(word wHint) const
+                {
+                        return hint == wHint;
+//                      return itd.Ordinal == (wHint | IMAGE_ORDINAL_FLAGS<bits>::IMAGE_ORDINAL_FLAG);
+                }
+                
+                bool equalFunctionName(std::string strFunctionName) const
+                {
+                        return isEqualNc(fname, strFunctionName);
+                }
+                
+                unsigned int size() const {return PELIB_IMAGE_THUNK_DATA<bits>::size() + fname.size() + 1 + sizeof(hint);}
+        };
+
+        // Used to store a file's import table. Every struct of this sort
+        // can store import information of one DLL.
+        template<int bits>
+        struct PELIB_IMAGE_IMPORT_DIRECTORY
+        {
+                /// The IMAGE_IMPORT_DESCRIPTOR of an imported DLL.
+                PELIB_IMAGE_IMPORT_DESCRIPTOR impdesc;
+                /// The name of an imported DLL.
+                std::string name;
+                /// All original first thunk values of an imported DLL.
+                std::vector<PELIB_THUNK_DATA<bits> > originalfirstthunk;
+                /// All first thunk value of an imported DLL.
+                std::vector<PELIB_THUNK_DATA<bits> > firstthunk;
+                
+//              bool operator==(std::string strFilename) const;
+                inline unsigned int size() const
+                {
+                        return PELIB_IMAGE_IMPORT_DESCRIPTOR::size() + name.size() + 1 + // descriptor + dllname
+                        std::accumulate(originalfirstthunk.begin(), originalfirstthunk.end(), 0, accumulate<PELIB_THUNK_DATA<bits> >) + // thunks (PeLib uses only one thunk)
+                        PELIB_IMAGE_THUNK_DATA<bits>::size(); // zero-termination
+                }
+                
+                bool operator==(std::string strFilename) const
+                {
+                        return isEqualNc(this->name, strFilename);
+                }
+        };
+
+    struct PELIB_IMAGE_RESOURCE_DATA_ENTRY
+    {
+            dword OffsetToData;
+            dword Size;
+            dword CodePage;
+            dword Reserved;
+
+                static inline unsigned int size() {return 16;}
+    };
+
+    struct PELIB_IMAGE_RESOURCE_DATA
+    {
+            PELIB_IMAGE_RESOURCE_DATA_ENTRY irdEntry;
+            std::vector<byte> vData;
+    };
+
+        struct IMG_BASE_RELOC
+    {
+                PELIB_IMAGE_BASE_RELOCATION ibrRelocation;
+                std::vector<word> vRelocData;
+        };
+        
+        struct PELIB_IMAGE_DEBUG_DIRECTORY
+        {
+                dword Characteristics;
+                dword TimeDateStamp;
+                word MajorVersion;
+                word MinorVersion;
+                dword Type;
+                dword SizeOfData;
+                dword AddressOfRawData;
+                dword PointerToRawData;
+                
+                static unsigned int size() {return 28;}
+        };
+        
+        struct PELIB_IMG_DEBUG_DIRECTORY
+        {
+                PELIB_IMAGE_DEBUG_DIRECTORY idd;
+                std::vector<byte> data;
+        };
+
+        template<int bits>
+        struct PELIB_IMAGE_TLS_DIRECTORY_BASE
+        {
+            typename FieldSizes<bits>::VAR4_8 StartAddressOfRawData;
+            typename FieldSizes<bits>::VAR4_8 EndAddressOfRawData;
+            typename FieldSizes<bits>::VAR4_8 AddressOfIndex;
+            typename FieldSizes<bits>::VAR4_8 AddressOfCallBacks;
+            dword SizeOfZeroFill;
+            dword Characteristics;
+        };    
+        
+        template<int bits>
+        struct PELIB_IMAGE_TLS_DIRECTORY;// : public PELIB_IMAGE_TLS_DIRECTORY_BASE<bits>
+        
+        template<>
+        struct PELIB_IMAGE_TLS_DIRECTORY<32> : public PELIB_IMAGE_TLS_DIRECTORY_BASE<32>
+        {
+//              enum {size = 24};
+            static unsigned int size(){return 24;}
+        };
+
+        template<>
+        struct PELIB_IMAGE_TLS_DIRECTORY<64> : public PELIB_IMAGE_TLS_DIRECTORY_BASE<64>
+        {
+//              enum {size = 40};
+            static unsigned int size(){return 40;}
+        };
+
+        unsigned int fileSize(const std::string& filename);
+        unsigned int fileSize(std::ifstream& file);
+        unsigned int fileSize(std::ofstream& file);
+        unsigned int fileSize(std::fstream& file);
+        unsigned int alignOffset(unsigned int uiOffset, unsigned int uiAlignment);
+        
+        /// Determines if a file is a 32bit or 64bit PE file.
+        unsigned int getFileType(const std::string strFilename);
+        
+        /// Opens a PE file.
+        PeFile* openPeFile(const std::string& strFilename);
+
+  /*  enum MzHeader_Field {e_magic, e_cblp, e_cp, e_crlc, e_cparhdr, e_minalloc, e_maxalloc,
+                        e_ss, e_sp, e_csum, e_ip, e_cs, e_lfarlc, e_ovno, e_res, e_oemid,
+                        e_oeminfo, e_res2, e_lfanew};
+    enum PeHeader_Field {NtSignature, Machine, NumberOfSections, TimeDateStamp, PointerToSymbolTable,
+                        NumberOfSymbols, SizeOfOptionalHeader, Characteristics, Magic,
+                        MajorLinkerVersion, MinorLinkerVersion, SizeOfCode, SizeOfInitializedData,
+                        SizeOfUninitializedData, AddressOfEntryPoint, BaseOfCode, BaseOfData, ImageBase,
+                        SectionAlignment, FileAlignment, MajorOperatingSystemVersion, MinorOperatingSystemVersion,
+                        MajorImageVersion, MinorImageVersion, MajorSubsystemVersion, MinorSubsystemVersion,
+                        Win32VersionValue, SizeOfImage, SizeOfHeaders, CheckSum, Subsystem, DllCharacteristics,
+                        SizeOfStackReserve, SizeOfStackCommit, SizeOfHeapReserve, SizeOfHeapCommit,
+                        LoaderFlags, NumberOfRvaAndSizes, DataDirectoryRva, DataDirectorySize};
+    enum Section_Field {SectionName, VirtualSize, VirtualAddress, SizeOfRawData, PointerToRawData, PointerToRelocations,
+                        PointerToLinenumbers, NumberOfRelocations, NumberOfLinenumbers, SectionCharacteristics};
+*/
+}
+
+#endif
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/PeLibInc.h b/utils/zenutils/libraries/pelib-0.9/pelib/PeLibInc.h
index 84538bd2dd..7d3cabaa6b 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/PeLibInc.h
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/PeLibInc.h
@@ -1,32 +1,32 @@
-/*

-* PeLibInc.h - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#ifndef STD_H

-#define STD_H

-

-#ifdef _MSC_VER

-        #ifndef for

-                #define for if (0) {} else for

-        #endif

-#endif

-

-#include <algorithm>

-#include <climits>

-#include <fstream>

-#include <iostream>

-#include <string>

-#include <vector>

-#include <functional>

-// #include "PeLib.h"

-#include "PeLibAux.h"

-

-#endif

+/*
+* PeLibInc.h - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#ifndef STD_H
+#define STD_H
+
+#ifdef _MSC_VER
+        #ifndef for
+                #define for if (0) {} else for
+        #endif
+#endif
+
+#include <algorithm>
+#include <climits>
+#include <fstream>
+#include <iostream>
+#include <string>
+#include <vector>
+#include <functional>
+// #include "PeLib.h"
+#include "PeLibAux.h"
+
+#endif
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/RelocationsDirectory.cpp b/utils/zenutils/libraries/pelib-0.9/pelib/RelocationsDirectory.cpp
index d8b5035abf..392261d242 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/RelocationsDirectory.cpp
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/RelocationsDirectory.cpp
@@ -1,211 +1,211 @@
-/*

-* Relocations.cpp - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#include "PeLibInc.h"

-#include "RelocationsDirectory.h"

-

-namespace PeLib

-{

-        void RelocationsDirectory::setRelocationData(unsigned int ulRelocation, unsigned int ulDataNumber, word wData)

-        {

-                m_vRelocations[ulRelocation].vRelocData[ulDataNumber] = wData;

-        }

-        

-        void RelocationsDirectory::read(InputBuffer& inputbuffer, unsigned int uiSize)

-        {

-                IMG_BASE_RELOC ibrCurr;

-

-                std::vector<IMG_BASE_RELOC> vCurrReloc;

-

-                do

-                {

-                        inputbuffer >> ibrCurr.ibrRelocation.VirtualAddress;

-                        inputbuffer >> ibrCurr.ibrRelocation.SizeOfBlock;

-

-                        ibrCurr.vRelocData.clear();

-

-                        // That's not how to check if there are relocations, some DLLs start at VA 0.

-                        // if (!ibrCurr.ibrRelocation.VirtualAddress) break;

-

-                        for (unsigned int i=0;i<(ibrCurr.ibrRelocation.SizeOfBlock - PELIB_IMAGE_SIZEOF_BASE_RELOCATION) / sizeof(word);i++)

-                        {

-                                word wData;

-                                inputbuffer >> wData;

-                                ibrCurr.vRelocData.push_back(wData);

-                        }

-

-                        vCurrReloc.push_back(ibrCurr);

-                } while (ibrCurr.ibrRelocation.VirtualAddress && inputbuffer.get() < uiSize);

-

-                std::swap(vCurrReloc, m_vRelocations);

-        }

-        

-        // TODO: Return value is wrong if buffer was too small.

-        int RelocationsDirectory::read(const unsigned char* buffer, unsigned int buffersize)

-        {

-                std::vector<unsigned char> vRelocDirectory(buffer, buffer + buffersize);

-

-                InputBuffer ibBuffer(vRelocDirectory);

-                read(ibBuffer, buffersize);

-        

-                return NO_ERROR;

-        }

-

-        int RelocationsDirectory::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize)

-        {

-                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);

-                unsigned int ulFileSize = fileSize(ifFile);

-

-                if (!ifFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-                

-                if (ulFileSize < uiOffset + uiSize)

-                {

-                        return ERROR_INVALID_FILE;

-                }

-

-                ifFile.seekg(uiOffset, std::ios::beg);

-

-                std::vector<unsigned char> vRelocDirectory(uiSize);

-                ifFile.read(reinterpret_cast<char*>(&vRelocDirectory[0]), uiSize);

-

-                InputBuffer ibBuffer(vRelocDirectory);

-                read(ibBuffer, uiSize);

-                

-                return NO_ERROR;

-        }

-        

-        unsigned int RelocationsDirectory::size() const

-        {

-                unsigned int size = static_cast<unsigned int>(m_vRelocations.size()) * PELIB_IMAGE_BASE_RELOCATION::size();

-                

-                for (unsigned int i=0;i<m_vRelocations.size();i++)

-                {

-                        size += static_cast<unsigned int>(m_vRelocations[i].vRelocData.size()) * sizeof(word);

-                }

-                

-                return size;

-        }

-        

-        void RelocationsDirectory::rebuild(std::vector<byte>& vBuffer) const

-        {

-                OutputBuffer obBuffer(vBuffer);

-                

-                for (unsigned int i=0;i<m_vRelocations.size();i++)

-                {

-                        obBuffer << m_vRelocations[i].ibrRelocation.VirtualAddress;

-                        obBuffer << m_vRelocations[i].ibrRelocation.SizeOfBlock;

-

-                        for (unsigned int j=0;j<m_vRelocations[i].vRelocData.size();j++)

-                        {

-                                obBuffer << m_vRelocations[i].vRelocData[j];

-                        }

-                }

-        }

-

-        unsigned int RelocationsDirectory::calcNumberOfRelocations() const

-        {

-                return static_cast<unsigned int>(m_vRelocations.size());

-        }

-

-        dword RelocationsDirectory::getVirtualAddress(unsigned int ulRelocation) const

-        {

-                return m_vRelocations[ulRelocation].ibrRelocation.VirtualAddress;

-        }

-

-        dword RelocationsDirectory::getSizeOfBlock(unsigned int ulRelocation) const

-        {

-                return m_vRelocations[ulRelocation].ibrRelocation.SizeOfBlock;

-        }

-

-        unsigned int RelocationsDirectory::calcNumberOfRelocationData(unsigned int ulRelocation) const

-        {

-                return static_cast<unsigned int>(m_vRelocations[ulRelocation].vRelocData.size());

-        }

-

-        word RelocationsDirectory::getRelocationData(unsigned int ulRelocation, unsigned int ulDataNumber) const

-        {

-                return m_vRelocations[ulRelocation].vRelocData[ulDataNumber];

-        }

-

-        void RelocationsDirectory::setVirtualAddress(unsigned int ulRelocation, dword dwValue)

-        {

-                m_vRelocations[ulRelocation].ibrRelocation.VirtualAddress = dwValue;

-        }

-

-        void RelocationsDirectory::setSizeOfBlock(unsigned int ulRelocation, dword dwValue)

-        {

-                m_vRelocations[ulRelocation].ibrRelocation.SizeOfBlock = dwValue;

-        }

-        

-        void RelocationsDirectory::addRelocation()

-        {

-                IMG_BASE_RELOC newrelocation;

-                m_vRelocations.push_back(newrelocation);

-        }

-

-        void RelocationsDirectory::addRelocationData(unsigned int ulRelocation, word wValue)

-        {

-                m_vRelocations[ulRelocation].vRelocData.push_back(wValue);

-        }

-

-/*      void RelocationsDirectory::removeRelocationData(unsigned int ulRelocation, word wValue)

-        {

-                // If you get an error with Borland C++ here you have two options: Upgrade your compiler

-                // or use the commented line instead of the line below.

-                m_vRelocations[ulRelocation].vRelocData.erase(std::remove(m_vRelocations[ulRelocation].vRelocData.begin(), m_vRelocations[ulRelocation].vRelocData.end(), wValue), m_vRelocations[ulRelocation].vRelocData.end());

-        }

-*/

-        void RelocationsDirectory::removeRelocation(unsigned int index)

-        {

-                m_vRelocations.erase(m_vRelocations.begin() + index);

-        }

-        

-        void RelocationsDirectory::removeRelocationData(unsigned int relocindex, unsigned int dataindex)

-        {

-                m_vRelocations[relocindex].vRelocData.erase(m_vRelocations[relocindex].vRelocData.begin() + dataindex);

-        }

-                  

-        int RelocationsDirectory::write(const std::string& strFilename, unsigned int uiOffset) const

-        {

-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);

-                

-                if (!ofFile)

-                {

-                        ofFile.clear();

-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);

-                }

-                else

-                {

-                        ofFile.close();

-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);

-                }

-                

-                if (!ofFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-

-                ofFile.seekp(uiOffset, std::ios::beg);

-

-                std::vector<unsigned char> vBuffer;

-                rebuild(vBuffer);

-

-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<std::streamsize>(vBuffer.size()));

-

-                ofFile.close();

-                

-                return NO_ERROR;

-        }

-}

+/*
+* Relocations.cpp - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#include "PeLibInc.h"
+#include "RelocationsDirectory.h"
+
+namespace PeLib
+{
+        void RelocationsDirectory::setRelocationData(unsigned int ulRelocation, unsigned int ulDataNumber, word wData)
+        {
+                m_vRelocations[ulRelocation].vRelocData[ulDataNumber] = wData;
+        }
+        
+        void RelocationsDirectory::read(InputBuffer& inputbuffer, unsigned int uiSize)
+        {
+                IMG_BASE_RELOC ibrCurr;
+
+                std::vector<IMG_BASE_RELOC> vCurrReloc;
+
+                do
+                {
+                        inputbuffer >> ibrCurr.ibrRelocation.VirtualAddress;
+                        inputbuffer >> ibrCurr.ibrRelocation.SizeOfBlock;
+
+                        ibrCurr.vRelocData.clear();
+
+                        // That's not how to check if there are relocations, some DLLs start at VA 0.
+                        // if (!ibrCurr.ibrRelocation.VirtualAddress) break;
+
+                        for (unsigned int i=0;i<(ibrCurr.ibrRelocation.SizeOfBlock - PELIB_IMAGE_SIZEOF_BASE_RELOCATION) / sizeof(word);i++)
+                        {
+                                word wData;
+                                inputbuffer >> wData;
+                                ibrCurr.vRelocData.push_back(wData);
+                        }
+
+                        vCurrReloc.push_back(ibrCurr);
+                } while (ibrCurr.ibrRelocation.VirtualAddress && inputbuffer.get() < uiSize);
+
+                std::swap(vCurrReloc, m_vRelocations);
+        }
+        
+        // TODO: Return value is wrong if buffer was too small.
+        int RelocationsDirectory::read(const unsigned char* buffer, unsigned int buffersize)
+        {
+                std::vector<unsigned char> vRelocDirectory(buffer, buffer + buffersize);
+
+                InputBuffer ibBuffer(vRelocDirectory);
+                read(ibBuffer, buffersize);
+        
+                return NO_ERROR;
+        }
+
+        int RelocationsDirectory::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize)
+        {
+                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
+                unsigned int ulFileSize = fileSize(ifFile);
+
+                if (!ifFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+                
+                if (ulFileSize < uiOffset + uiSize)
+                {
+                        return ERROR_INVALID_FILE;
+                }
+
+                ifFile.seekg(uiOffset, std::ios::beg);
+
+                std::vector<unsigned char> vRelocDirectory(uiSize);
+                ifFile.read(reinterpret_cast<char*>(&vRelocDirectory[0]), uiSize);
+
+                InputBuffer ibBuffer(vRelocDirectory);
+                read(ibBuffer, uiSize);
+                
+                return NO_ERROR;
+        }
+        
+        unsigned int RelocationsDirectory::size() const
+        {
+                unsigned int size = static_cast<unsigned int>(m_vRelocations.size()) * PELIB_IMAGE_BASE_RELOCATION::size();
+                
+                for (unsigned int i=0;i<m_vRelocations.size();i++)
+                {
+                        size += static_cast<unsigned int>(m_vRelocations[i].vRelocData.size()) * sizeof(word);
+                }
+                
+                return size;
+        }
+        
+        void RelocationsDirectory::rebuild(std::vector<byte>& vBuffer) const
+        {
+                OutputBuffer obBuffer(vBuffer);
+                
+                for (unsigned int i=0;i<m_vRelocations.size();i++)
+                {
+                        obBuffer << m_vRelocations[i].ibrRelocation.VirtualAddress;
+                        obBuffer << m_vRelocations[i].ibrRelocation.SizeOfBlock;
+
+                        for (unsigned int j=0;j<m_vRelocations[i].vRelocData.size();j++)
+                        {
+                                obBuffer << m_vRelocations[i].vRelocData[j];
+                        }
+                }
+        }
+
+        unsigned int RelocationsDirectory::calcNumberOfRelocations() const
+        {
+                return static_cast<unsigned int>(m_vRelocations.size());
+        }
+
+        dword RelocationsDirectory::getVirtualAddress(unsigned int ulRelocation) const
+        {
+                return m_vRelocations[ulRelocation].ibrRelocation.VirtualAddress;
+        }
+
+        dword RelocationsDirectory::getSizeOfBlock(unsigned int ulRelocation) const
+        {
+                return m_vRelocations[ulRelocation].ibrRelocation.SizeOfBlock;
+        }
+
+        unsigned int RelocationsDirectory::calcNumberOfRelocationData(unsigned int ulRelocation) const
+        {
+                return static_cast<unsigned int>(m_vRelocations[ulRelocation].vRelocData.size());
+        }
+
+        word RelocationsDirectory::getRelocationData(unsigned int ulRelocation, unsigned int ulDataNumber) const
+        {
+                return m_vRelocations[ulRelocation].vRelocData[ulDataNumber];
+        }
+
+        void RelocationsDirectory::setVirtualAddress(unsigned int ulRelocation, dword dwValue)
+        {
+                m_vRelocations[ulRelocation].ibrRelocation.VirtualAddress = dwValue;
+        }
+
+        void RelocationsDirectory::setSizeOfBlock(unsigned int ulRelocation, dword dwValue)
+        {
+                m_vRelocations[ulRelocation].ibrRelocation.SizeOfBlock = dwValue;
+        }
+        
+        void RelocationsDirectory::addRelocation()
+        {
+                IMG_BASE_RELOC newrelocation;
+                m_vRelocations.push_back(newrelocation);
+        }
+
+        void RelocationsDirectory::addRelocationData(unsigned int ulRelocation, word wValue)
+        {
+                m_vRelocations[ulRelocation].vRelocData.push_back(wValue);
+        }
+
+/*      void RelocationsDirectory::removeRelocationData(unsigned int ulRelocation, word wValue)
+        {
+                // If you get an error with Borland C++ here you have two options: Upgrade your compiler
+                // or use the commented line instead of the line below.
+                m_vRelocations[ulRelocation].vRelocData.erase(std::remove(m_vRelocations[ulRelocation].vRelocData.begin(), m_vRelocations[ulRelocation].vRelocData.end(), wValue), m_vRelocations[ulRelocation].vRelocData.end());
+        }
+*/
+        void RelocationsDirectory::removeRelocation(unsigned int index)
+        {
+                m_vRelocations.erase(m_vRelocations.begin() + index);
+        }
+        
+        void RelocationsDirectory::removeRelocationData(unsigned int relocindex, unsigned int dataindex)
+        {
+                m_vRelocations[relocindex].vRelocData.erase(m_vRelocations[relocindex].vRelocData.begin() + dataindex);
+        }
+                  
+        int RelocationsDirectory::write(const std::string& strFilename, unsigned int uiOffset) const
+        {
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                
+                if (!ofFile)
+                {
+                        ofFile.clear();
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                }
+                else
+                {
+                        ofFile.close();
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                }
+                
+                if (!ofFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+
+                ofFile.seekp(uiOffset, std::ios::beg);
+
+                std::vector<unsigned char> vBuffer;
+                rebuild(vBuffer);
+
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<std::streamsize>(vBuffer.size()));
+
+                ofFile.close();
+                
+                return NO_ERROR;
+        }
+}
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/RelocationsDirectory.h b/utils/zenutils/libraries/pelib-0.9/pelib/RelocationsDirectory.h
index 60383381a3..0fc10500e0 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/RelocationsDirectory.h
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/RelocationsDirectory.h
@@ -1,70 +1,70 @@
-/*

-* Relocations.h - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#ifndef RELOCATIONSDIRECTORY_H

-#define RELOCATIONSDIRECTORY_H

-

-namespace PeLib

-{

-        /// Class that handles the relocations directory.

-        /**

-        * This class handles the relocations directory.

-        **/

-        class RelocationsDirectory

-        {

-                private:

-                  std::vector<IMG_BASE_RELOC> m_vRelocations; ///< Used to store the relocation data.

-

-                  void read(InputBuffer& inputbuffer, unsigned int uiSize);

-

-                public:

-                  /// Returns the number of relocations in the relocations directory.

-                  unsigned int calcNumberOfRelocations() const; // EXPORT

-                  /// Returns the number of relocation data entries of a specific relocation.

-                  unsigned int calcNumberOfRelocationData(unsigned int ulRelocation) const; // EXPORT

-

-                  /// Read a file's relocations directory.

-                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize); // EXPORT

-                  int read(const unsigned char* buffer, unsigned int buffersize); // EXPORT

-                  /// Rebuilds the relocations directory.

-                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT

-                  /// Returns the size of the relocations directory.

-                  unsigned int size() const; // EXPORT

-                  /// Writes the relocations directory to a file.

-                  int write(const std::string& strFilename, unsigned int dwOffset) const; // EXPORT

-

-                  /// Returns the VA of a relocation.

-                  dword getVirtualAddress(unsigned int ulRelocation) const; // EXPORT

-                  /// Returns the SizeOfBlock value of a relocation.

-                  dword getSizeOfBlock(unsigned int ulRelocation) const; // EXPORT

-                  /// Returns the RelocationData of a relocation.

-                  word getRelocationData(unsigned int ulRelocation, unsigned int ulDataNumber) const; // EXPORT

-                  

-                  /// Changes the relocation data of a relocation.

-                  void setRelocationData(unsigned int ulRelocation, unsigned int ulDataNumber, word wData); // EXPORT

-                  

-                  /// Changes the VirtualAddress of a relocation.

-                  void setVirtualAddress(unsigned int ulRelocation, dword dwValue); // EXPORT

-                  /// Changes the SizeOfBlock of a relocation.

-                  void setSizeOfBlock(unsigned int ulRelocation, dword dwValue); // EXPORT

-                  

-                  void addRelocation(); // EXPORT

-                  /// Adds new data to a relocation.

-                  void addRelocationData(unsigned int ulRelocation, word wValue); // EXPORT

-                  /// Removes data from a relocation.

-//                void removeRelocationData(unsigned int ulRelocation, word wValue); // EXPORT

-                  void removeRelocation(unsigned int index); // EXPORT

-                  void removeRelocationData(unsigned int relocindex, unsigned int dataindex); // EXPORT

-        };

-}

-

-#endif

+/*
+* Relocations.h - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#ifndef RELOCATIONSDIRECTORY_H
+#define RELOCATIONSDIRECTORY_H
+
+namespace PeLib
+{
+        /// Class that handles the relocations directory.
+        /**
+        * This class handles the relocations directory.
+        **/
+        class RelocationsDirectory
+        {
+                private:
+                  std::vector<IMG_BASE_RELOC> m_vRelocations; ///< Used to store the relocation data.
+
+                  void read(InputBuffer& inputbuffer, unsigned int uiSize);
+
+                public:
+                  /// Returns the number of relocations in the relocations directory.
+                  unsigned int calcNumberOfRelocations() const; // EXPORT
+                  /// Returns the number of relocation data entries of a specific relocation.
+                  unsigned int calcNumberOfRelocationData(unsigned int ulRelocation) const; // EXPORT
+
+                  /// Read a file's relocations directory.
+                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize); // EXPORT
+                  int read(const unsigned char* buffer, unsigned int buffersize); // EXPORT
+                  /// Rebuilds the relocations directory.
+                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT
+                  /// Returns the size of the relocations directory.
+                  unsigned int size() const; // EXPORT
+                  /// Writes the relocations directory to a file.
+                  int write(const std::string& strFilename, unsigned int dwOffset) const; // EXPORT
+
+                  /// Returns the VA of a relocation.
+                  dword getVirtualAddress(unsigned int ulRelocation) const; // EXPORT
+                  /// Returns the SizeOfBlock value of a relocation.
+                  dword getSizeOfBlock(unsigned int ulRelocation) const; // EXPORT
+                  /// Returns the RelocationData of a relocation.
+                  word getRelocationData(unsigned int ulRelocation, unsigned int ulDataNumber) const; // EXPORT
+                  
+                  /// Changes the relocation data of a relocation.
+                  void setRelocationData(unsigned int ulRelocation, unsigned int ulDataNumber, word wData); // EXPORT
+                  
+                  /// Changes the VirtualAddress of a relocation.
+                  void setVirtualAddress(unsigned int ulRelocation, dword dwValue); // EXPORT
+                  /// Changes the SizeOfBlock of a relocation.
+                  void setSizeOfBlock(unsigned int ulRelocation, dword dwValue); // EXPORT
+                  
+                  void addRelocation(); // EXPORT
+                  /// Adds new data to a relocation.
+                  void addRelocationData(unsigned int ulRelocation, word wValue); // EXPORT
+                  /// Removes data from a relocation.
+//                void removeRelocationData(unsigned int ulRelocation, word wValue); // EXPORT
+                  void removeRelocation(unsigned int index); // EXPORT
+                  void removeRelocationData(unsigned int relocindex, unsigned int dataindex); // EXPORT
+        };
+}
+
+#endif
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/ResourceDirectory.cpp b/utils/zenutils/libraries/pelib-0.9/pelib/ResourceDirectory.cpp
index 5e4d3010bf..d1e4c59e5a 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/ResourceDirectory.cpp
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/ResourceDirectory.cpp
@@ -1,1497 +1,1497 @@
-/*

-* ResourceDirectory.h - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#include "ResourceDirectory.h"

-

-namespace PeLib

-{

-// -------------------------------------------------- ResourceChild -------------------------------------------

-

-        ResourceChild::ResourceChild()

-        {

-        }

-        

-        ResourceChild::ResourceChild(const ResourceChild& rhs)

-        {

-                if (dynamic_cast<ResourceNode*>(rhs.child))

-                {

-                        ResourceNode* oldnode = static_cast<ResourceNode*>(rhs.child);

-                        

-                        entry = rhs.entry;

-

-                        child = new ResourceNode;

-                        child->uiElementRva = rhs.child->getElementRva();

-                        static_cast<ResourceNode*>(child)->header = oldnode->header;

-                        static_cast<ResourceNode*>(child)->children = oldnode->children;

-                }

-                else

-                {

-                        ResourceLeaf* oldnode = static_cast<ResourceLeaf*>(rhs.child);

-                        

-                        child = new ResourceLeaf;

-                        child->uiElementRva = rhs.child->getElementRva();

-                        static_cast<ResourceLeaf*>(child)->m_data = oldnode->m_data;

-                        static_cast<ResourceLeaf*>(child)->entry = oldnode->entry;

-                }

-        }

-        

-        ResourceChild& ResourceChild::operator=(const ResourceChild& rhs)

-        {

-                if (this != &rhs)

-                {

-                        if (dynamic_cast<ResourceNode*>(rhs.child))

-                        {

-                                ResourceNode* oldnode = static_cast<ResourceNode*>(rhs.child);

-                                

-                                entry = rhs.entry;

-        

-                                child = new ResourceNode;

-                                child->uiElementRva = rhs.child->getElementRva();

-                                static_cast<ResourceNode*>(child)->header = oldnode->header;

-                                static_cast<ResourceNode*>(child)->children = oldnode->children;

-                        }

-                        else

-                        {

-                                ResourceLeaf* oldnode = static_cast<ResourceLeaf*>(rhs.child);

-                                

-                                child = new ResourceLeaf;

-                                child->uiElementRva = rhs.child->getElementRva();

-                                static_cast<ResourceLeaf*>(child)->m_data = oldnode->m_data;

-                                static_cast<ResourceLeaf*>(child)->entry = oldnode->entry;

-                        }

-                }

-                

-                return *this;

-        }

-        

-        ResourceChild::~ResourceChild()

-        {

-                delete child;

-        }

-

-        /**

-        * Compares the resource child's id to the parameter dwId.

-        * @param dwId ID of a resource.

-        * @return True, if the resource child's id equals the parameter.

-        **/

-        bool ResourceChild::equalId(dword dwId) const

-        {

-                return entry.irde.Name == dwId;

-        }

-        

-        /**

-        * Compares the resource child's name to the parameter strName.

-        * @param strName ID of a resource.

-        * @return True, if the resource child's name equals the parameter.

-        **/

-        bool ResourceChild::equalName(std::string strName) const

-        {

-                return entry.wstrName == strName;

-        }

-        

-        /**

-        * Returns true if the resource was given a name.

-        **/

-        bool ResourceChild::isNamedResource() const

-        {

-                return entry.wstrName.size() != 0;

-        }

-        

-        /**

-        * The children of a resource must be ordered in a certain way. First come the named resources

-        * in sorted order, afterwards followed the unnamed resources in sorted order.

-        **/

-        bool ResourceChild::operator<(const ResourceChild& rc) const

-        {

-                if (this->isNamedResource() && !rc.isNamedResource())

-                {

-                        return true;

-                }

-                else if (!this->isNamedResource() && rc.isNamedResource())

-                {

-                        return false;

-                }

-                else if (this->isNamedResource() && rc.isNamedResource())

-                {

-                        return this->entry.wstrName < rc.entry.wstrName;

-                }

-                else

-                {

-                        return this->entry.irde.Name < rc.entry.irde.Name;

-                }

-        }

-        

-/*      unsigned int ResourceChild::size() const

-        {

-                return PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY::size()

-                       + child->size()

-                       + (entry.wstrName.size() ? entry.wstrName.size() + 2 : 0);

-        }

-*/

-// -------------------------------------------------- ResourceElement -------------------------------------------

-

-        /**

-        * Returns the RVA of a ResourceElement. This is the RVA where the ResourceElement can be

-        * found in the file.

-        * @return RVA of the ResourceElement.

-        **/

-        unsigned int ResourceElement::getElementRva() const

-        {

-                return uiElementRva;

-        }

-

-// -------------------------------------------------- ResourceLeaf -------------------------------------------

-

-        /**

-        * Checks if a ResourceElement is a leaf or not.

-        * @return Always returns true.

-        **/

-        bool ResourceLeaf::isLeaf() const

-        {

-                return true;

-        }

-        

-        /**

-        * Reads the next resource leaf from the InputBuffer.

-        * @param inpBuffer An InputBuffer that holds the complete resource directory.

-        * @param uiOffset Offset of the resource leaf that's to be read.

-        * @param uiRva RVA of the beginning of the resource directory.

-        * @param pad Used for debugging purposes.

-        **/

-        int ResourceLeaf::read(InputBuffer& inpBuffer, unsigned int uiOffset, unsigned int uiRva/*, const std::string& pad*/)

-        {

-//              std::cout << pad << "Leaf:" << std::endl;

-                

-                // Invalid leaf.

-                if (uiOffset + PELIB_IMAGE_RESOURCE_DATA_ENTRY::size() > inpBuffer.size())

-                {

-                        return 1;

-                }

-

-                uiElementRva = uiOffset + uiRva;

-

-                inpBuffer.set(uiOffset);

-                

-                inpBuffer >> entry.OffsetToData;

-                inpBuffer >> entry.Size;

-                inpBuffer >> entry.CodePage;

-                inpBuffer >> entry.Reserved;

-

-/*              std::cout << pad << std::hex << "Offset: " << entry.OffsetToData << std::endl;

-                std::cout << pad << std::hex << "Size: " << entry.Size << std::endl;

-                std::cout << pad << std::hex << "CodePage: " << entry.CodePage << std::endl;

-                std::cout << pad << std::hex << "Reserved: " << entry.Reserved << std::endl;

-*/              

-                // Invalid leaf.

-                if (entry.OffsetToData - uiRva + entry.Size > inpBuffer.size())

-                {

-//                      std::cout << entry.OffsetToData << " XXX " << uiRva << " - " << entry.Size << " - " << inpBuffer.size() << std::endl;

-                        return 1;

-                }

-                

-//              std::cout << entry.OffsetToData << " - " << uiRva << " - " << entry.Size << " - " << inpBuffer.size() << std::endl;

-                inpBuffer.set(entry.OffsetToData - uiRva);

-                m_data.assign(inpBuffer.data() + inpBuffer.get(), inpBuffer.data() + inpBuffer.get() + entry.Size);

-//              std::cout << pad << std::hex << "Vector: " << m_data.size() << std::endl;

-//              std::copy(m_data.begin(), m_data.end(), std::ostream_iterator<int>(std::cout << std::hex, " "));

-                return 0;

-        }

-

-        /**

-        * Rebuilds the current resource leaf.

-        * @param obBuffer OutputBuffer where the rebuilt resource leaf is stored.

-        * @param uiOffset Offset of the resource leaf inside the resource directory.

-        * @param uiRva RVA of the resource directory.

-        **/

-        void ResourceLeaf::rebuild(OutputBuffer& obBuffer, unsigned int& uiOffset, unsigned int uiRva, const std::string&) const

-        {

-//              std::cout << std::hex << pad << "Leaf: " << uiOffset << std::endl;

-                uiOffset += PELIB_IMAGE_RESOURCE_DATA_ENTRY::size();

-                

-//              obBuffer << entry.OffsetToData;

-//              obBuffer << uiOffset;

-                obBuffer << uiRva + uiOffset + (uiOffset % 4);

-                obBuffer << entry.Size;

-                obBuffer << entry.CodePage;

-                obBuffer << entry.Reserved;

-                

-                while (uiOffset % 4)

-                {

-                        uiOffset++;

-                        obBuffer << (byte)0;

-                }

-                

-                uiOffset += static_cast<unsigned int>(m_data.size());

-

-                for (unsigned int i=0;i<m_data.size();i++)

-                {

-                        obBuffer << m_data[i];

-                }

-//              std::cout << "LeafChild: " << std::endl;

-        }

-

-        void ResourceLeaf::makeValid()

-        {

-                entry.Size = static_cast<unsigned int>(m_data.size());

-        }

-        

-/*      /// Returns the size of a resource leaf.

-        unsigned int ResourceLeaf::size() const

-        {

-                return PELIB_IMAGE_RESOURCE_DATA_ENTRY::size() + m_data.size();

-        }

-*/

-

-        /**

-        * Returns a vector that contains the raw data of a resource leaf.

-        * @return Raw data of the resource.

-        **/

-        std::vector<byte> ResourceLeaf::getData() const

-        {

-                return m_data;

-        }

-        

-        /**

-        * Overwrites the raw data of a resource.

-        * @param vData New data of the resource.

-        **/

-        void ResourceLeaf::setData(const std::vector<byte>& vData)

-        {

-                m_data = vData;

-        }

-

-        /**

-        * Returns the leaf's OffsetToData value. That's the RVA where the raw data of the resource

-        * can be found.

-        * @return The leaf's OffsetToData value.

-        **/

-        dword ResourceLeaf::getOffsetToData() const

-        {

-                return entry.OffsetToData;

-        }

-        

-        /**

-        * Returns the leaf's Size value. That's the size of the raw data of the resource.

-        * @return The leaf's Size value.

-        **/

-        dword ResourceLeaf::getSize() const

-        {

-                return entry.Size;

-        }

-        

-        /**

-        * Returns the leaf's CodePage value.

-        * @return The leaf's CodePage value.

-        **/

-        dword ResourceLeaf::getCodePage() const

-        {

-                return entry.CodePage;

-        }

-        

-        /**

-        * Returns the leaf's Reserved value.

-        * @return The leaf's Reserved value.

-        **/

-        dword ResourceLeaf::getReserved() const

-        {

-                return entry.Reserved;

-        }

-        

-        /**

-        * Sets the leaf's OffsetToData value.

-        * @param dwValue The leaf's new OffsetToData value.

-        **/

-        void ResourceLeaf::setOffsetToData(dword dwValue)

-        {

-                entry.OffsetToData = dwValue;

-        }

-        

-        /**

-        * Sets the leaf's Size value.

-        * @param dwValue The leaf's new Size value.

-        **/

-        void ResourceLeaf::setSize(dword dwValue)

-        {

-                entry.Size = dwValue;

-        }

-        

-        /**

-        * Sets the leaf's CodePage value.

-        * @param dwValue The leaf's new CodePage value.

-        **/

-        void ResourceLeaf::setCodePage(dword dwValue)

-        {

-                entry.CodePage = dwValue;

-        }

-        

-        /**

-        * Sets the leaf's Reserved value.

-        * @param dwValue The leaf's new Reserved value.

-        **/

-        void ResourceLeaf::setReserved(dword dwValue)

-        {

-                entry.Reserved = dwValue;

-        }

-        

-

-// -------------------------------------------------- ResourceNode -------------------------------------------

-

-        /**

-        * Checks if a ResourceElement is a leaf or not.

-        * @return Always returns false.

-        **/

-        bool ResourceNode::isLeaf() const

-        {

-                return false;

-        }

-        

-        /**

-        * Sorts the node's children and corrects the node's header.

-        **/

-        void ResourceNode::makeValid()

-        {

-                std::sort(children.begin(), children.end());

-                header.NumberOfNamedEntries = static_cast<PeLib::word>(std::count_if(children.begin(), children.end(), std::mem_fun_ref(&ResourceChild::isNamedResource)));

-                header.NumberOfIdEntries = static_cast<unsigned int>(children.size()) - header.NumberOfNamedEntries;

-        }

-

-        /**

-        * Rebuilds the current resource node.

-        * @param obBuffer OutputBuffer where the rebuilt resource node is stored.

-        * @param uiOffset Offset of the resource node inside the resource directory.

-        * @param uiRva RVA of the resource directory.

-        * @param pad Used for debugging.

-        **/

-        void ResourceNode::rebuild(OutputBuffer& obBuffer, unsigned int& uiOffset, unsigned int uiRva, const std::string& pad) const

-        {

-/*              std::cout << std::hex << pad << uiOffset << std::endl;

-                

-                std::cout << std::hex << pad << "header.Characteristics: " << header.Characteristics << std::endl;

-                std::cout << std::hex << pad << "header.TimeDateStamp: " << header.TimeDateStamp << std::endl;

-                std::cout << std::hex << pad << "header.MajorVersion: "  << header.MajorVersion << std::endl;

-                std::cout << std::hex << pad << "header.MinorVersion: "  << header.MinorVersion << std::endl;

-                std::cout << std::hex << pad << "header.NumberOfNamedEntries: "  << header.NumberOfNamedEntries << std::endl;

-                std::cout << std::hex << pad << "header.NumberOfIdEntries: "  << header.NumberOfIdEntries << std::endl;

-*/              

-                obBuffer << header.Characteristics;

-                obBuffer << header.TimeDateStamp;

-                obBuffer << header.MajorVersion;

-                obBuffer << header.MinorVersion;

-                //std::cout << pad << "Children: " << children.size() << std::endl;

-                //std::cout << pad << std::count_if(children.begin(), children.end(), std::mem_fun_ref(&ResourceChild::isNamedResource)) << std::endl;

-                //std::cout << pad << children.size() - std::count_if(children.begin(), children.end(), std::mem_fun_ref(&ResourceChild::isNamedResource)) << std::endl;

-//              obBuffer << std::count_if(children.begin(), children.end(), std::mem_fun_ref(&ResourceChild::isNamedResource));

-//              obBuffer << children.size() - std::count_if(children.begin(), children.end(), std::mem_fun_ref(&ResourceChild::isNamedResource));

-                obBuffer << header.NumberOfNamedEntries;

-                obBuffer << header.NumberOfIdEntries;

-

-                uiOffset += PELIB_IMAGE_RESOURCE_DIRECTORY::size();

-                

-                for (unsigned int i=0;i<children.size();i++)

-                {

-                        obBuffer << (dword)0;

-                        obBuffer << (dword)0;

-                }

-

-                unsigned int newoffs = (uiOffset + children.size() * 8);

-                

-                for (unsigned int i=0;i<children.size();i++)

-                {

-                        if (!children[i].entry.wstrName.size())

-                        {

-                                obBuffer.update(uiOffset, children[i].entry.irde.Name);

-                        }

-                        else

-                        {

-                                obBuffer.update(uiOffset, newoffs | PELIB_IMAGE_RESOURCE_NAME_IS_STRING);

-                                obBuffer << (word)children[i].entry.wstrName.size();

-                                newoffs += 2;

-                                for (unsigned int j=0;j<children[i].entry.wstrName.size();j++)

-                                {

-//                                      std::cout << children[i].entry.wstrName[j];

-                                        obBuffer << (word)children[i].entry.wstrName[j];

-                                        newoffs += 2;

-                                }

-                        }

-                        uiOffset += 4;

-//                      obBuffer << children[i].entry.OffsetToData;

-                        obBuffer.update(uiOffset, newoffs | (children[i].entry.irde.OffsetToData & PELIB_IMAGE_RESOURCE_DATA_IS_DIRECTORY));

-                        uiOffset += 4;

-                        children[i].child->rebuild(obBuffer, newoffs, uiRva, pad + "  ");

-                }

-                uiOffset = newoffs;

-        }

-

-        /**

-        * Reads the next resource node from the InputBuffer.

-        * @param inpBuffer An InputBuffer that holds the complete resource directory.

-        * @param uiOffset Offset of the resource node that's to be read.

-        * @param uiRva RVA of the beginning of the resource directory.

-        * @param pad Something I need for debugging. Will be removed soon.

-        **/

-        int ResourceNode::read(InputBuffer& inpBuffer, unsigned int uiOffset, unsigned int uiRva/*, const std::string& pad*/)

-        {

-                // Not enough space to be a valid node.

-                if (uiOffset + PELIB_IMAGE_RESOURCE_DIRECTORY::size() > inpBuffer.size())

-                {

-                        return 1;

-                }

-                

-                uiElementRva = uiOffset + uiRva;

-                

-                inpBuffer.set(uiOffset);

-                

-                inpBuffer >> header.Characteristics;

-                inpBuffer >> header.TimeDateStamp;

-                inpBuffer >> header.MajorVersion;

-                inpBuffer >> header.MinorVersion;

-                inpBuffer >> header.NumberOfNamedEntries;

-                inpBuffer >> header.NumberOfIdEntries;

-                        

-                // Not enough space to be a valid node.

-                if (uiOffset + PELIB_IMAGE_RESOURCE_DIRECTORY::size()

-                   + (header.NumberOfNamedEntries + header.NumberOfIdEntries) * PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY::size()

-                   > inpBuffer.size())

-                {

-                        return 1;

-                }

-                

-//              std::cout << std::hex << pad << "Characteristics: " << header.Characteristics << std::endl;

-//              std::cout << std::hex << pad << "TimeDateStamp: " << header.TimeDateStamp << std::endl;

-//              std::cout << std::hex << pad << "MajorVersion: " << header.MajorVersion << std::endl;

-//              std::cout << std::hex << pad << "MinorVersion: " << header.MinorVersion << std::endl;

-//              std::cout << std::hex << pad << "NumberOfNamedEntries: " << header.NumberOfNamedEntries << std::endl;

-//              std::cout << std::hex << pad << "NumberOfIdEntries: " << header.NumberOfIdEntries << std::endl;

-                        

-                for (int i=0;i<header.NumberOfNamedEntries + header.NumberOfIdEntries;i++)

-                {

-                        ResourceChild rc;

-                        inpBuffer >> rc.entry.irde.Name;

-                        inpBuffer >> rc.entry.irde.OffsetToData;

-                        

-                        unsigned int lastPos = inpBuffer.get();

-

-                        if (rc.entry.irde.Name & PELIB_IMAGE_RESOURCE_NAME_IS_STRING)

-                        {

-                                // Enough space to read string length?

-                                if ((rc.entry.irde.Name & ~PELIB_IMAGE_RESOURCE_NAME_IS_STRING) + 2 < inpBuffer.size())

-                                {

-                                        inpBuffer.set(rc.entry.irde.Name & ~PELIB_IMAGE_RESOURCE_NAME_IS_STRING);

-                                        word strlen;

-                                        inpBuffer >> strlen;

-                                        

-                                        // Enough space to read string?

-                                        if ((rc.entry.irde.Name & ~PELIB_IMAGE_RESOURCE_NAME_IS_STRING) + 2 * strlen < inpBuffer.size())

-                                        {

-                                                wchar_t c;

-                                                for (word i=0;i<strlen;i++)

-                                                {

-                                                        inpBuffer >> c;

-                                                        rc.entry.wstrName += c;

-                                                }

-                                        }

-                                }

-                                

-//                              std::wcout << rc.entry.wstrName << std::endl;

-                                

-//                              std::cout << strlen << std::endl;

-                                inpBuffer.set(lastPos);

-                        }

-                        

-                        if (rc.entry.irde.OffsetToData & PELIB_IMAGE_RESOURCE_DATA_IS_DIRECTORY)

-                        {

-                                rc.child = new ResourceNode;

-                                rc.child->read(inpBuffer, rc.entry.irde.OffsetToData & ~PELIB_IMAGE_RESOURCE_DATA_IS_DIRECTORY, uiRva/*, pad + "  "*/);

-                        }

-                        else

-                        {

-                                rc.child = new ResourceLeaf;

-                                rc.child->read(inpBuffer, rc.entry.irde.OffsetToData, uiRva/*, pad + "  "*/);

-                        }

-//                      std::cout << std::hex << pad << "Entry " << i << "(Name): " << rc.entry.irde.Name << std::endl;

-//                      std::cout << std::hex << pad << "Entry " << i << "(Offset): " << rc.entry.irde.OffsetToData << std::endl;

-

-                        children.push_back(rc);

-                        inpBuffer.set(lastPos);

-                }

-                

-                return 0;

-        }

-        

-        /**

-        * Returns the number of children of the current node. Note that this number is the number

-        * of defined children, not the value from the header.

-        * @return Number of node's children.

-        **/

-        unsigned int ResourceNode::getNumberOfChildren() const

-        {

-                return static_cast<unsigned int>(children.size());

-        }

-        

-        /**

-        * Adds another child to the current node.

-        **/

-        void ResourceNode::addChild()

-        {

-                ResourceChild c;

-                c.child = 0;

-                children.push_back(c);

-        }

-                  

-        /**

-        * Returns a node's child.

-        * @param uiIndex Index of the child.

-        * @return The child identified by uiIndex. This child can be either a ResourceNode or a ResourceLeaf.

-        **/

-        ResourceElement* ResourceNode::getChild(unsigned int uiIndex)

-        {

-                return children[uiIndex].child;

-        }

-        

-        /**

-        * Removes a child from the current node.

-        * @param uiIndex Index of the child.

-        **/

-        void ResourceNode::removeChild(unsigned int uiIndex)

-        {

-                children.erase(children.begin() + uiIndex);

-        }

-                  

-        /**

-        * Returns the name of a child.

-        * @param uiIndex Index of the child.

-        * @return Either the name of the specified child or an empty string.

-        **/

-        std::string ResourceNode::getChildName(unsigned int uiIndex) const

-        {

-                return children[uiIndex].entry.wstrName;

-        }

-        

-        /**

-        * Returns the Name value of a child.

-        * @param uiIndex Index of the child.

-        * @return Name value of a child.

-        **/

-        dword ResourceNode::getOffsetToChildName(unsigned int uiIndex) const

-        {

-                return children[uiIndex].entry.irde.Name;

-        }

-        

-        /**

-        * Returns the OffsetToData value of a child.

-        * @param uiIndex Index of the child.

-        * @return OffsetToData value of a child.

-        **/

-        dword ResourceNode::getOffsetToChildData(unsigned int uiIndex) const

-        {

-                return children[uiIndex].entry.irde.OffsetToData;

-        }

-        

-                  

-        /**

-        * Sets the name of a child.

-        * @param uiIndex Index of the child.

-        * @param strNewName New name of the resource.

-        **/

-        void ResourceNode::setChildName(unsigned int uiIndex, const std::string& strNewName)

-        {

-                children[uiIndex].entry.wstrName = strNewName;

-        }

-        

-        /**

-        * Sets the Name value of a child.

-        * @param uiIndex Index of the child.

-        * @param dwNewOffset New Name value of the resource.

-        **/

-        void ResourceNode::setOffsetToChildName(unsigned int uiIndex, dword dwNewOffset)

-        {

-                children[uiIndex].entry.irde.Name = dwNewOffset;

-        }

-        

-        /**

-        * Sets the OffsetToData value of a child.

-        * @param uiIndex Index of the child.

-        * @param dwNewOffset New OffsetToData value of the resource.

-        **/

-        void ResourceNode::setOffsetToChildData(unsigned int uiIndex, dword dwNewOffset)

-        {

-                children[uiIndex].entry.irde.OffsetToData = dwNewOffset;

-        }

-                  

-        /**

-        * Returns the Characteristics value of the node.

-        * @return Characteristics value of the node.

-        **/

-        dword ResourceNode::getCharacteristics() const

-        {

-                return header.Characteristics;

-        }

-        

-        /**

-        * Returns the TimeDateStamp value of the node.

-        * @return TimeDateStamp value of the node.

-        **/

-        dword ResourceNode::getTimeDateStamp() const

-        {

-                return header.TimeDateStamp;

-        }

-        

-        /**

-        * Returns the MajorVersion value of the node.

-        * @return MajorVersion value of the node.

-        **/

-        word ResourceNode::getMajorVersion() const

-        {

-                return header.MajorVersion;

-        }

-        

-        /**

-        * Returns the MinorVersion value of the node.

-        * @return MinorVersion value of the node.

-        **/

-        word ResourceNode::getMinorVersion() const

-        {

-                return header.MinorVersion;

-        }

-        

-        /**

-        * Returns the NumberOfNamedEntries value of the node.

-        * @return NumberOfNamedEntries value of the node.

-        **/

-        word ResourceNode::getNumberOfNamedEntries() const

-        {

-                return header.NumberOfNamedEntries;

-        }

-        

-        /**

-        * Returns the NumberOfIdEntries value of the node.

-        * @return NumberOfIdEntries value of the node.

-        **/

-        word ResourceNode::getNumberOfIdEntries() const

-        {

-                return header.NumberOfIdEntries;

-        }

-                  

-        /**

-        * Sets the Characteristics value of the node.

-        * @param value New Characteristics value of the node.

-        **/

-        void ResourceNode::setCharacteristics(dword value)

-        {

-                header.Characteristics = value;

-        }

-        

-        /**

-        * Sets the TimeDateStamp value of the node.

-        * @param value New TimeDateStamp value of the node.

-        **/

-        void ResourceNode::setTimeDateStamp(dword value)

-        {

-                header.TimeDateStamp = value;

-        }

-        

-        /**

-        * Sets the MajorVersion value of the node.

-        * @param value New MajorVersion value of the node.

-        **/

-        void ResourceNode::setMajorVersion(word value)

-        {

-                header.MajorVersion = value;

-        }

-        

-        /**

-        * Sets the MinorVersion value of the node.

-        * @param value New MinorVersion value of the node.

-        **/

-        void ResourceNode::setMinorVersion(word value)

-        {

-                header.MinorVersion = value;

-        }

-        

-        /**

-        * Sets the NumberOfNamedEntries value of the node.

-        * @param value New NumberOfNamedEntries value of the node.

-        **/

-        void ResourceNode::setNumberOfNamedEntries(word value)

-        {

-                header.NumberOfNamedEntries = value;

-        }

-        

-        /**

-        * Sets the NumberOfIdEntries value of the node.

-        * @param value New NumberOfIdEntries value of the node.

-        **/

-        void ResourceNode::setNumberOfIdEntries(word value)

-        {

-                header.NumberOfIdEntries = value;

-        }

-        

-                  

-/*      /// Returns the size of a resource node.

-        unsigned int ResourceNode::size() const

-        {

-                if (children.size())

-                {

-                        std::cout << std::accumulate(children.begin(), children.end(), 0, accumulate<ResourceChild>) << std::endl;

-                        return PELIB_IMAGE_RESOURCE_DIRECTORY::size()

-                                 + std::accumulate(children.begin(), children.end(), 0, accumulate<ResourceChild>);

-                }

-                else

-                {

-                        return 0;

-                }

-        }

-*/      

-// -------------------------------------------------- ResourceDirectory -------------------------------------------

-        

-        /**

-        * Returns the root node of the resource directory.

-        * @return Root node of the resource directory.

-        **/

-        ResourceNode* ResourceDirectory::getRoot()

-        {

-                return &m_rnRoot;

-        }

-

-        /**

-        * Correctly sorts the resource nodes of the resource tree. This function should be called

-        * before calling rebuild.

-        **/

-        void ResourceDirectory::makeValid()

-        {

-                m_rnRoot.makeValid();

-        }

-

-        /**

-        * Reads the resource directory from a file.

-        * @param strFilename Name of the file.

-        * @param uiOffset File offset of the resource directory.

-        * @param uiSize Raw size of the resource directory.

-        * @param uiResDirRva RVA of the beginning of the resource directory.

-        **/

-        int ResourceDirectory::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, unsigned int uiResDirRva)

-        {

-                if (!uiSize || !uiOffset)

-                {

-                        return 1;

-                }

-                

-                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);

-                

-                if (!ifFile)

-                {

-//                      throw Exceptions::CannotOpenFile(ResourceDirectoryId, __LINE__);

-                        return 1;

-                }

-                

-                if (fileSize(ifFile) < uiOffset + uiSize)

-                {

-//                      throw Exceptions::InvalidFormat(ResourceDirectoryId, __LINE__);

-                        return 1;

-                }

-

-                ifFile.seekg(uiOffset, std::ios::beg);

-                

-                PELIB_IMAGE_RESOURCE_DIRECTORY irdCurrRoot;

-                

-                std::vector<byte> vResourceDirectory(uiSize);

-                ifFile.read(reinterpret_cast<char*>(&vResourceDirectory[0]), uiSize);

-

-                InputBuffer inpBuffer(vResourceDirectory);

-                

-//              ResourceNode currNode;

-                return m_rnRoot.read(inpBuffer, 0, uiResDirRva/*, ""*/);

-//              std::swap(currNode, m_rnRoot);

-        }

-

-        /**

-        * Rebuilds the resource directory.

-        * @param vBuffer Buffer the source directory will be written to.

-        * @param uiRva RVA of the resource directory.

-        **/

-        void ResourceDirectory::rebuild(std::vector<byte>& vBuffer, unsigned int uiRva) const

-        {

-                OutputBuffer obBuffer(vBuffer);

-                unsigned int offs = 0;

-//              std::cout << "Root: " << m_rnRoot.children.size() << std::endl;

-                m_rnRoot.rebuild(obBuffer, offs, uiRva, "");

-        }

-        

-        /**

-        * Returns the size of the entire rebuilt resource directory. That's the size of the entire

-        * structure as it's written back to a file.

-        **/

-/*      unsigned int ResourceDirectory::size() const

-        {

-                return m_rnRoot.size();

-        }

-*/      

-        /**

-        * Writes the current resource directory back into a file.

-        * @param strFilename Name of the output file.

-        * @param uiOffset File offset where the resource directory will be written to.

-        * @param uiRva RVA of the file offset.

-        **/

-        int ResourceDirectory::write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva) const

-        {

-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);

-                

-                if (!ofFile)

-                {

-                        ofFile.clear();

-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);

-                }

-                else

-                {

-                        ofFile.close();

-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);

-                }

-                

-                if (!ofFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-

-                ofFile.seekp(uiOffset, std::ios::beg);

-

-                std::vector<unsigned char> vBuffer;

-                rebuild(vBuffer, uiRva);

-

-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));

-

-                ofFile.close();

-                

-                return 0;

-        }

-        

-        /**

-        * Adds another resource type. The new resource type is identified by the ID dwResTypeId.

-        * @param dwResTypeId ID which identifies the resource type.

-        **/

-        int ResourceDirectory::addResourceType(dword dwResTypeId)

-        {

-                std::vector<ResourceChild>::iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(&ResourceChild::equalId), dwResTypeId));

-                if (Iter != m_rnRoot.children.end())

-                {

-                        return 1;

-                        // throw Exceptions::EntryAlreadyExists(ResourceDirectoryId, __LINE__);

-                }

-                

-                ResourceChild rcCurr;

-                rcCurr.child = new ResourceNode;

-                rcCurr.entry.irde.Name = dwResTypeId;

-                m_rnRoot.children.push_back(rcCurr);

-                

-                return 0;

-        }

-        

-        /**

-        * Adds another resource type. The new resource type is identified by the name strResTypeName.

-        * @param strResTypeName Name which identifies the resource type.

-        **/

-        int ResourceDirectory::addResourceType(const std::string& strResTypeName)

-        {

-                std::vector<ResourceChild>::iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(&ResourceChild::equalName), strResTypeName));

-                if (Iter != m_rnRoot.children.end())

-                {

-                        return 1;

-//                      throw Exceptions::EntryAlreadyExists(ResourceDirectoryId, __LINE__);

-                }

-                

-                ResourceChild rcCurr;

-                rcCurr.entry.wstrName = strResTypeName;

-                rcCurr.child = new ResourceNode;

-                m_rnRoot.children.push_back(rcCurr);

-                

-                return 0;

-        }

-        

-        /**

-        * Removes the resource type identified by the ID dwResTypeId.

-        * @param dwResTypeId ID which identifies the resource type.

-        **/

-        int ResourceDirectory::removeResourceType(dword dwResTypeId)

-        {

-                std::vector<ResourceChild>::iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(&ResourceChild::equalId), dwResTypeId));

-                if (Iter == m_rnRoot.children.end())

-                {

-                        return 1;

-//                      throw Exceptions::ResourceTypeDoesNotExist(ResourceDirectoryId, __LINE__);

-                }

-                

-                bool isNamed = false;

-                if (Iter->isNamedResource()) isNamed = true;

-

-                m_rnRoot.children.erase(Iter);

-                

-                if (isNamed) m_rnRoot.header.NumberOfNamedEntries = static_cast<PeLib::word>(m_rnRoot.children.size());

-                else m_rnRoot.header.NumberOfIdEntries = static_cast<PeLib::word>(m_rnRoot.children.size());

-                

-                return 0;

-        }

-        

-        /**

-        * Removes the resource type identified by the name strResTypeName.

-        * @param strResTypeName Name which identifies the resource type.

-        **/

-        int ResourceDirectory::removeResourceType(const std::string& strResTypeName)

-        {

-                std::vector<ResourceChild>::iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(&ResourceChild::equalName), strResTypeName));

-                if (Iter == m_rnRoot.children.end())

-                {

-                        return 1;

-                //      throw Exceptions::ResourceTypeDoesNotExist(ResourceDirectoryId, __LINE__);

-                }

-                

-                bool isNamed = false;

-                if (Iter->isNamedResource()) isNamed = true;

-                

-                m_rnRoot.children.erase(Iter);

-                

-                if (isNamed) m_rnRoot.header.NumberOfNamedEntries = static_cast<PeLib::word>(m_rnRoot.children.size());

-                else m_rnRoot.header.NumberOfIdEntries = static_cast<PeLib::word>(m_rnRoot.children.size());

-                

-                return 0;

-        }

-

-        /**

-        * Removes the resource type identified by the index uiIndex.

-        * @param uiIndex Index which identifies the resource type.

-        **/

-        int ResourceDirectory::removeResourceTypeByIndex(unsigned int uiIndex)

-        {

-                bool isNamed = false;

-                if (m_rnRoot.children[uiIndex].isNamedResource()) isNamed = true;

-                

-                m_rnRoot.children.erase(m_rnRoot.children.begin() + uiIndex);

-                

-                if (isNamed) m_rnRoot.header.NumberOfNamedEntries = static_cast<PeLib::word>(m_rnRoot.children.size());

-                else m_rnRoot.header.NumberOfIdEntries = static_cast<PeLib::word>(m_rnRoot.children.size());

-                

-                return 0;

-        }

-                  

-        /**

-        * Adds another resource to the resource tree. The first parameter identifies the resource type

-        * of the new resource, the second parameter identifies the resource itself.

-        * @param dwResTypeId ID of the resource type.

-        * @param dwResId ID of the resource.

-        **/

-        int ResourceDirectory::addResource(dword dwResTypeId, dword dwResId)

-        {

-                ResourceChild rcCurr;

-                rcCurr.entry.irde.Name = dwResId;

-                return addResourceT(dwResTypeId, dwResId, rcCurr);

-        }

-        

-        /**

-        * Adds another resource to the resource tree. The first parameter identifies the resource type

-        * of the new resource, the second parameter identifies the resource itself.

-        * @param dwResTypeId ID of the resource type.

-        * @param strResName Name of the resource.

-        **/

-        int ResourceDirectory::addResource(dword dwResTypeId, const std::string& strResName)

-        {

-                ResourceChild rcCurr;

-                rcCurr.entry.wstrName = strResName;

-                return addResourceT(dwResTypeId, strResName, rcCurr);

-        }

-        

-        /**

-        * Adds another resource to the resource tree. The first parameter identifies the resource type

-        * of the new resource, the second parameter identifies the resource itself.

-        * @param strResTypeName Name of the resource type.

-        * @param dwResId ID of the resource.

-        **/

-        int ResourceDirectory::addResource(const std::string& strResTypeName, dword dwResId)

-        {

-                ResourceChild rcCurr;

-                rcCurr.entry.irde.Name = dwResId;

-                return addResourceT(strResTypeName, dwResId, rcCurr);

-        }

-

-        /**

-        * Adds another resource to the resource tree. The first parameter identifies the resource type

-        * of the new resource, the second parameter identifies the resource itself.

-        * @param strResTypeName Name of the resource type.

-        * @param strResName Name of the resource.

-        **/

-        int ResourceDirectory::addResource(const std::string& strResTypeName, const std::string& strResName)

-        {

-                ResourceChild rcCurr;

-                rcCurr.entry.wstrName = strResName;

-                return addResourceT(strResTypeName, strResName, rcCurr);

-        }

-

-        /**

-        * Removes a resource from the resource tree. The first parameter identifies the resource type

-        * of the new resource, the second parameter identifies the resource itself.

-        * @param dwResTypeIndex ID of the resource type.

-        * @param dwResId ID of the resource.

-        **/

-        int ResourceDirectory::removeResource(dword dwResTypeIndex, dword dwResId)

-        {

-                return removeResourceT(dwResTypeIndex, dwResId);

-        }

-        

-        /**

-        * Removes a resource from the resource tree. The first parameter identifies the resource type

-        * of the new resource, the second parameter identifies the resource itself.

-        * @param dwResTypeIndex ID of the resource type.

-        * @param strResName Name of the resource.

-        **/

-        int ResourceDirectory::removeResource(dword dwResTypeIndex, const std::string& strResName)

-        {

-                return removeResourceT(dwResTypeIndex, strResName);

-        }

-        

-        /**

-        * Removes a resource from the resource tree. The first parameter identifies the resource type

-        * of the new resource, the second parameter identifies the resource itself.

-        * @param strResTypeName Name of the resource type.

-        * @param dwResId ID of the resource.

-        **/

-        int ResourceDirectory::removeResource(const std::string& strResTypeName, dword dwResId)

-        {

-                return removeResourceT(strResTypeName, dwResId);

-        }

-        

-        /**

-        * Removes a resource from the resource tree. The first parameter identifies the resource type

-        * of the new resource, the second parameter identifies the resource itself.

-        * @param strResTypeName Name of the resource type.

-        * @param strResName Name of the resource.

-        **/

-        int ResourceDirectory::removeResource(const std::string& strResTypeName, const std::string& strResName)

-        {

-                return removeResourceT(strResTypeName, strResName);

-        }

-                  

-        /**

-        * Returns the number of resource types.

-        **/

-        unsigned int ResourceDirectory::getNumberOfResourceTypes() const

-        {

-                return static_cast<unsigned int>(m_rnRoot.children.size());

-        }

-

-        /**

-        * Returns the ID of a resource type which was specified through an index.

-        * The valid range of the parameter uiIndex is 0...getNumberOfResourceTypes() - 1.

-        * Leaving the invalid range leads to undefined behaviour.

-        * @param uiIndex Index which identifies a resource type.

-        * @return The ID of the specified resource type.

-        **/

-        dword ResourceDirectory::getResourceTypeIdByIndex(unsigned int uiIndex) const

-        {

-                return m_rnRoot.children[uiIndex].entry.irde.Name;

-        }

-        

-        /**

-        * Returns the name of a resource type which was specified through an index.

-        * The valid range of the parameter uiIndex is 0...getNumberOfResourceTypes() - 1.

-        * Leaving the invalid range leads to undefined behaviour.

-        * @param uiIndex Index which identifies a resource type.

-        * @return The name of the specified resource type.

-        **/

-        std::string ResourceDirectory::getResourceTypeNameByIndex(unsigned int uiIndex) const

-        {

-                return m_rnRoot.children[uiIndex].entry.wstrName;

-        }

-

-        /**

-        * Converts the ID of a resource type to an index.

-        * @param dwResTypeId ID of the resource type.

-        * @return Index of that resource type.

-        **/

-        int ResourceDirectory::resourceTypeIdToIndex(dword dwResTypeId) const

-        {

-                std::vector<ResourceChild>::const_iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(&ResourceChild::equalId), dwResTypeId));

-                if (Iter == m_rnRoot.children.end()) return -1;

-                return static_cast<unsigned int>(std::distance(m_rnRoot.children.begin(), Iter));

-        }

-        

-        /**

-        * Converts the name of a resource type to an index.

-        * @param strResTypeName ID of the resource type.

-        * @return Index of that resource type.

-        **/

-        int ResourceDirectory::resourceTypeNameToIndex(const std::string& strResTypeName) const

-        {

-                std::vector<ResourceChild>::const_iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(&ResourceChild::equalName), strResTypeName));

-                if (Iter == m_rnRoot.children.end()) return -1;

-                return static_cast<unsigned int>(std::distance(m_rnRoot.children.begin(), Iter));

-        }

-        

-        /**

-        * Returns the number of resources of a specific resource type.

-        * @param dwId ID of the resource type.

-        * @return Number of resources of resource type dwId.

-        **/

-        unsigned int ResourceDirectory::getNumberOfResources(dword dwId) const

-        {

-//              std::vector<ResourceChild>::const_iterator IterD = m_rnRoot.children.begin();

-//              std::cout << dwId << std::endl;

-//              while (IterD != m_rnRoot.children.end())

-//              {

-//                      std::cout << IterD->entry.irde.Name << std::endl;

-//                      ++IterD;

-//              }

-                

-                std::vector<ResourceChild>::const_iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(&ResourceChild::equalId), dwId));

-                if (Iter == m_rnRoot.children.end())

-                {

-                        return 0xFFFFFFFF;

-                }

-                else

-                {

-                        ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);

-                        return static_cast<unsigned int>(currNode->children.size());

-                }

-        }

-

-        /**

-        * Returns the number of resources of a specific resource type.

-        * @param strResTypeName Name of the resource type.

-        * @return Number of resources of resource type strResTypeName.

-        **/

-        unsigned int ResourceDirectory::getNumberOfResources(const std::string& strResTypeName) const

-        {

-                std::vector<ResourceChild>::const_iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(&ResourceChild::equalName), strResTypeName));

-                if (Iter == m_rnRoot.children.end())

-                {

-                        return 0xFFFFFFFF;

-                }

-                else

-                {

-                        ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);

-                        return static_cast<unsigned int>(currNode->children.size());

-                }

-        }

-

-        /**

-        * Returns the number of resources of a resource type which was specified through an index.

-        * The valid range of the parameter uiIndex is 0...getNumberOfResourceTypes() - 1.

-        * Leaving the invalid range leads to undefined behaviour.

-        * @param uiIndex Index which identifies a resource type.

-        * @return The number of resources of the specified resource type.

-        **/

-        unsigned int ResourceDirectory::getNumberOfResourcesByIndex(unsigned int uiIndex) const

-        {

-                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiIndex].child);

-                return static_cast<unsigned int>(currNode->children.size());

-        }

-        

-        /**

-        * Gets the resource data of a specific resource.

-        * @param dwResTypeId Identifies the resource type of the resource.

-        * @param dwResId Identifies the resource.

-        * @param data Vector where the data is stored.

-        **/

-        void ResourceDirectory::getResourceData(dword dwResTypeId, dword dwResId, std::vector<byte>& data) const

-        {

-                getResourceDataT(dwResTypeId, dwResId, data);

-        }

-        

-        /**

-        * Gets the resource data of a specific resource.

-        * @param dwResTypeId Identifies the resource type of the resource.

-        * @param strResName Identifies the resource.

-        * @param data Vector where the data is stored.

-        **/

-        void ResourceDirectory::getResourceData(dword dwResTypeId, const std::string& strResName, std::vector<byte>& data) const

-        {

-                getResourceDataT(dwResTypeId, strResName, data);

-        }

-        

-        /**

-        * Gets the resource data of a specific resource.

-        * @param strResTypeName Identifies the resource type of the resource.

-        * @param dwResId Identifies the resource.

-        * @param data Vector where the data is stored.

-        **/

-        void ResourceDirectory::getResourceData(const std::string& strResTypeName, dword dwResId, std::vector<byte>& data) const

-        {

-                getResourceDataT(strResTypeName, dwResId, data);

-        }

-        

-        /**

-        * Gets the resource data of a specific resource.

-        * @param strResTypeName Identifies the resource type of the resource.

-        * @param strResName Identifies the resource.

-        * @param data Vector where the data is stored.

-        **/

-        void ResourceDirectory::getResourceData(const std::string& strResTypeName, const std::string& strResName, std::vector<byte>& data) const

-        {

-                getResourceDataT(strResTypeName, strResName, data);

-        }

-        

-        /**

-        * Gets the resource data of a specific resource by index.

-        * The valid range of the parameter uiResTypeIndex is 0...getNumberOfResourceTypes() - 1.

-        * The valid range of the parameter uiResIndex is 0...getNumberOfResources() - 1.

-        * Leaving the invalid range leads to undefined behaviour.

-        * @param uiResTypeIndex Identifies the resource type of the resource.

-        * @param uiResIndex Identifies the resource.

-        * @param data Vector where the data is stored.

-        **/

-        void ResourceDirectory::getResourceDataByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, std::vector<byte>& data) const

-        {

-                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);

-                currNode = static_cast<ResourceNode*>(currNode->children[uiResIndex].child);

-                ResourceLeaf* currLeaf = static_cast<ResourceLeaf*>(currNode->children[0].child);

-                

-                data.assign(currLeaf->m_data.begin(), currLeaf->m_data.end());

-        }

-                  

-        /**

-        * Sets the resource data of a specific resource.

-        * @param dwResTypeId Identifies the resource type of the resource.

-        * @param dwResId Identifies the resource.

-        * @param data The new resource data.

-        **/

-        void ResourceDirectory::setResourceData(dword dwResTypeId, dword dwResId, std::vector<byte>& data)

-        {

-                setResourceDataT(dwResTypeId, dwResId, data);

-        }

-        

-        /**

-        * Sets the resource data of a specific resource.

-        * @param dwResTypeId Identifies the resource type of the resource.

-        * @param strResName Identifies the resource.

-        * @param data The new resource data.

-        **/

-        void ResourceDirectory::setResourceData(dword dwResTypeId, const std::string& strResName, std::vector<byte>& data)

-        {

-                setResourceDataT(dwResTypeId, strResName, data);

-        }

-        

-        /**

-        * Sets the resource data of a specific resource.

-        * @param strResTypeName Identifies the resource type of the resource.

-        * @param dwResId Identifies the resource.

-        * @param data The new resource data.

-        **/

-        void ResourceDirectory::setResourceData(const std::string& strResTypeName, dword dwResId, std::vector<byte>& data)

-        {

-                setResourceDataT(strResTypeName, dwResId, data);

-        }

-        

-        /**

-        * Sets the resource data of a specific resource.

-        * @param strResTypeName Identifies the resource type of the resource.

-        * @param strResName Identifies the resource.

-        * @param data The new resource data.

-        **/

-        void ResourceDirectory::setResourceData(const std::string& strResTypeName, const std::string& strResName, std::vector<byte>& data)

-        {

-                setResourceDataT(strResTypeName, strResName, data);

-        }

-        

-        /**

-        * Sets the resource data of a specific resource by index.

-        * The valid range of the parameter uiResTypeIndex is 0...getNumberOfResourceTypes() - 1.

-        * The valid range of the parameter uiResIndex is 0...getNumberOfResources() - 1.

-        * Leaving the invalid range leads to undefined behaviour.

-        * @param uiResTypeIndex Identifies the resource type of the resource.

-        * @param uiResIndex Identifies the resource.

-        * @param data The new resource data.

-        **/

-        void ResourceDirectory::setResourceDataByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, std::vector<byte>& data)

-        {

-                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);

-                currNode = static_cast<ResourceNode*>(currNode->children[uiResIndex].child);

-                ResourceLeaf* currLeaf = static_cast<ResourceLeaf*>(currNode->children[0].child);

-                currLeaf->m_data.assign(data.begin(), data.end());

-        }

-                  

-        /**

-        * Gets the ID of a specific resource.

-        * @param dwResTypeId Identifies the resource type of the resource.

-        * @param strResName Identifies the resource.

-        * @return ID of the specified resource.

-        **/

-        dword ResourceDirectory::getResourceId(dword dwResTypeId, const std::string& strResName) const

-        {

-                return getResourceIdT(dwResTypeId, strResName);

-        }

-        

-        /**

-        * Gets the ID of a specific resource.

-        * @param strResTypeName Identifies the resource type of the resource.

-        * @param strResName Identifies the resource.

-        * @return ID of the specified resource.

-        **/

-        dword ResourceDirectory::getResourceId(const std::string& strResTypeName, const std::string& strResName) const

-        {

-                return getResourceIdT(strResTypeName, strResName);

-        }

-        

-        /**

-        * Gets the ID of a specific resource by index.

-        * @param uiResTypeIndex Identifies the resource type of the resource.

-        * @param uiResIndex Identifies the resource.

-        * @return ID of the specified resource.

-        **/

-        dword ResourceDirectory::getResourceIdByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex) const

-        {

-                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);

-                return currNode->children[uiResIndex].entry.irde.Name;

-        }

-

-        /**

-        * Sets the ID of a specific resource.

-        * @param dwResTypeId Identifies the resource type of the resource.

-        * @param dwResId Identifies the resource.

-        * @param dwNewResId New ID of the resource.

-        **/

-        void ResourceDirectory::setResourceId(dword dwResTypeId, dword dwResId, dword dwNewResId)

-        {

-                setResourceIdT(dwResTypeId, dwResId, dwNewResId);

-        }

-        

-        /**

-        * Sets the ID of a specific resource.

-        * @param dwResTypeId Identifies the resource type of the resource.

-        * @param strResName Identifies the resource.

-        * @param dwNewResId New ID of the resource.

-        **/

-        void ResourceDirectory::setResourceId(dword dwResTypeId, const std::string& strResName, dword dwNewResId)

-        {

-                setResourceIdT(dwResTypeId, strResName, dwNewResId);

-        }

-        

-        /**

-        * Sets the ID of a specific resource.

-        * @param strResTypeName Identifies the resource type of the resource.

-        * @param dwResId Identifies the resource.

-        * @param dwNewResId New ID of the resource.

-        **/

-        void ResourceDirectory::setResourceId(const std::string& strResTypeName, dword dwResId, dword dwNewResId)

-        {

-                setResourceIdT(strResTypeName, dwResId, dwNewResId);

-        }

-        

-        /**

-        * Sets the ID of a specific resource.

-        * @param strResTypeName Identifies the resource type of the resource.

-        * @param strResName Identifies the resource.

-        * @param dwNewResId New ID of the resource.

-        **/

-        void ResourceDirectory::setResourceId(const std::string& strResTypeName, const std::string& strResName, dword dwNewResId)

-        {

-                setResourceIdT(strResTypeName, strResName, dwNewResId);

-        }

-        

-        /**

-        * Sets the ID of a specific resource by index.

-        * @param uiResTypeIndex Identifies the resource type of the resource.

-        * @param uiResIndex Identifies the resource.

-        * @param dwNewResId New ID of the specified resource.

-        **/

-        void ResourceDirectory::setResourceIdByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, dword dwNewResId)

-        {

-                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);

-                currNode->children[uiResIndex].entry.irde.Name = dwNewResId;

-        }

-

-        /**

-        * Gets the Name of a specific resource.

-        * @param dwResTypeId Identifies the resource type of the resource.

-        * @param dwResId Identifies the resource.

-        * @return Name of the specified resource.

-        **/

-        std::string ResourceDirectory::getResourceName(dword dwResTypeId, dword dwResId) const

-        {

-                return getResourceNameT(dwResTypeId, dwResId);

-        }

-        

-        /**

-        * Gets the Name of a specific resource.

-        * @param strResTypeName Identifies the resource type of the resource.

-        * @param dwResId Identifies the resource.

-        * @return Name of the specified resource.

-        **/

-        std::string ResourceDirectory::getResourceName(const std::string& strResTypeName, dword dwResId) const

-        {

-                return getResourceNameT(strResTypeName, dwResId);

-        }

-        

-        /**

-        * Gets the name of a specific resource by index.

-        * @param uiResTypeIndex Identifies the resource type of the resource.

-        * @param uiResIndex Identifies the resource.

-        * @return Name of the specified resource.

-        **/

-        std::string ResourceDirectory::getResourceNameByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex) const

-        {

-                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);

-                return currNode->children[uiResIndex].entry.wstrName;

-        }

-

-        /**

-        * Sets the name of a specific resource.

-        * @param dwResTypeId Identifies the resource type of the resource.

-        * @param dwResId Identifies the resource.

-        * @param strNewResName New name of the specified resource.

-        **/

-        void ResourceDirectory::setResourceName(dword dwResTypeId, dword dwResId, const std::string& strNewResName)

-        {

-                setResourceNameT(dwResTypeId, dwResId, strNewResName);

-        }

-        

-        /**

-        * Sets the name of a specific resource.

-        * @param dwResTypeId Identifies the resource type of the resource.

-        * @param strResName Identifies the resource.

-        * @param strNewResName New name of the specified resource.

-        **/

-        void ResourceDirectory::setResourceName(dword dwResTypeId, const std::string& strResName, const std::string& strNewResName)

-        {

-                setResourceNameT(dwResTypeId, strResName, strNewResName);

-        }

-        

-        /**

-        * Sets the name of a specific resource.

-        * @param strResTypeName Identifies the resource type of the resource.

-        * @param dwResId Identifies the resource.

-        * @param strNewResName New name of the specified resource.

-        **/

-        void ResourceDirectory::setResourceName(const std::string& strResTypeName, dword dwResId, const std::string& strNewResName)

-        {

-                setResourceNameT(strResTypeName, dwResId, strNewResName);

-        }

-        

-        /**

-        * Sets the name of a specific resource.

-        * @param strResTypeName Identifies the resource type of the resource.

-        * @param strResName Identifies the resource.

-        * @param strNewResName New name of the specified resource.

-        **/

-        void ResourceDirectory::setResourceName(const std::string& strResTypeName, const std::string& strResName, const std::string& strNewResName)

-        {

-                setResourceNameT(strResTypeName, strResName, strNewResName);

-        }

-                  

-        /**

-        * Sets the name of a specific resource by index.

-        * @param uiResTypeIndex Identifies the resource type of the resource.

-        * @param uiResIndex Identifies the resource.

-        * @param strNewResName New name of the specified resource.

-        **/

-        void ResourceDirectory::setResourceNameByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, const std::string& strNewResName)

-        {

-                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);

-                currNode->children[uiResIndex].entry.wstrName = strNewResName;

-        }

-        

-}

+/*
+* ResourceDirectory.h - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#include "ResourceDirectory.h"
+
+namespace PeLib
+{
+// -------------------------------------------------- ResourceChild -------------------------------------------
+
+        ResourceChild::ResourceChild()
+        {
+        }
+        
+        ResourceChild::ResourceChild(const ResourceChild& rhs)
+        {
+                if (dynamic_cast<ResourceNode*>(rhs.child))
+                {
+                        ResourceNode* oldnode = static_cast<ResourceNode*>(rhs.child);
+                        
+                        entry = rhs.entry;
+
+                        child = new ResourceNode;
+                        child->uiElementRva = rhs.child->getElementRva();
+                        static_cast<ResourceNode*>(child)->header = oldnode->header;
+                        static_cast<ResourceNode*>(child)->children = oldnode->children;
+                }
+                else
+                {
+                        ResourceLeaf* oldnode = static_cast<ResourceLeaf*>(rhs.child);
+                        
+                        child = new ResourceLeaf;
+                        child->uiElementRva = rhs.child->getElementRva();
+                        static_cast<ResourceLeaf*>(child)->m_data = oldnode->m_data;
+                        static_cast<ResourceLeaf*>(child)->entry = oldnode->entry;
+                }
+        }
+        
+        ResourceChild& ResourceChild::operator=(const ResourceChild& rhs)
+        {
+                if (this != &rhs)
+                {
+                        if (dynamic_cast<ResourceNode*>(rhs.child))
+                        {
+                                ResourceNode* oldnode = static_cast<ResourceNode*>(rhs.child);
+                                
+                                entry = rhs.entry;
+        
+                                child = new ResourceNode;
+                                child->uiElementRva = rhs.child->getElementRva();
+                                static_cast<ResourceNode*>(child)->header = oldnode->header;
+                                static_cast<ResourceNode*>(child)->children = oldnode->children;
+                        }
+                        else
+                        {
+                                ResourceLeaf* oldnode = static_cast<ResourceLeaf*>(rhs.child);
+                                
+                                child = new ResourceLeaf;
+                                child->uiElementRva = rhs.child->getElementRva();
+                                static_cast<ResourceLeaf*>(child)->m_data = oldnode->m_data;
+                                static_cast<ResourceLeaf*>(child)->entry = oldnode->entry;
+                        }
+                }
+                
+                return *this;
+        }
+        
+        ResourceChild::~ResourceChild()
+        {
+                delete child;
+        }
+
+        /**
+        * Compares the resource child's id to the parameter dwId.
+        * @param dwId ID of a resource.
+        * @return True, if the resource child's id equals the parameter.
+        **/
+        bool ResourceChild::equalId(dword dwId) const
+        {
+                return entry.irde.Name == dwId;
+        }
+        
+        /**
+        * Compares the resource child's name to the parameter strName.
+        * @param strName ID of a resource.
+        * @return True, if the resource child's name equals the parameter.
+        **/
+        bool ResourceChild::equalName(std::string strName) const
+        {
+                return entry.wstrName == strName;
+        }
+        
+        /**
+        * Returns true if the resource was given a name.
+        **/
+        bool ResourceChild::isNamedResource() const
+        {
+                return entry.wstrName.size() != 0;
+        }
+        
+        /**
+        * The children of a resource must be ordered in a certain way. First come the named resources
+        * in sorted order, afterwards followed the unnamed resources in sorted order.
+        **/
+        bool ResourceChild::operator<(const ResourceChild& rc) const
+        {
+                if (this->isNamedResource() && !rc.isNamedResource())
+                {
+                        return true;
+                }
+                else if (!this->isNamedResource() && rc.isNamedResource())
+                {
+                        return false;
+                }
+                else if (this->isNamedResource() && rc.isNamedResource())
+                {
+                        return this->entry.wstrName < rc.entry.wstrName;
+                }
+                else
+                {
+                        return this->entry.irde.Name < rc.entry.irde.Name;
+                }
+        }
+        
+/*      unsigned int ResourceChild::size() const
+        {
+                return PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY::size()
+                       + child->size()
+                       + (entry.wstrName.size() ? entry.wstrName.size() + 2 : 0);
+        }
+*/
+// -------------------------------------------------- ResourceElement -------------------------------------------
+
+        /**
+        * Returns the RVA of a ResourceElement. This is the RVA where the ResourceElement can be
+        * found in the file.
+        * @return RVA of the ResourceElement.
+        **/
+        unsigned int ResourceElement::getElementRva() const
+        {
+                return uiElementRva;
+        }
+
+// -------------------------------------------------- ResourceLeaf -------------------------------------------
+
+        /**
+        * Checks if a ResourceElement is a leaf or not.
+        * @return Always returns true.
+        **/
+        bool ResourceLeaf::isLeaf() const
+        {
+                return true;
+        }
+        
+        /**
+        * Reads the next resource leaf from the InputBuffer.
+        * @param inpBuffer An InputBuffer that holds the complete resource directory.
+        * @param uiOffset Offset of the resource leaf that's to be read.
+        * @param uiRva RVA of the beginning of the resource directory.
+        * @param pad Used for debugging purposes.
+        **/
+        int ResourceLeaf::read(InputBuffer& inpBuffer, unsigned int uiOffset, unsigned int uiRva/*, const std::string& pad*/)
+        {
+//              std::cout << pad << "Leaf:" << std::endl;
+                
+                // Invalid leaf.
+                if (uiOffset + PELIB_IMAGE_RESOURCE_DATA_ENTRY::size() > inpBuffer.size())
+                {
+                        return 1;
+                }
+
+                uiElementRva = uiOffset + uiRva;
+
+                inpBuffer.set(uiOffset);
+                
+                inpBuffer >> entry.OffsetToData;
+                inpBuffer >> entry.Size;
+                inpBuffer >> entry.CodePage;
+                inpBuffer >> entry.Reserved;
+
+/*              std::cout << pad << std::hex << "Offset: " << entry.OffsetToData << std::endl;
+                std::cout << pad << std::hex << "Size: " << entry.Size << std::endl;
+                std::cout << pad << std::hex << "CodePage: " << entry.CodePage << std::endl;
+                std::cout << pad << std::hex << "Reserved: " << entry.Reserved << std::endl;
+*/              
+                // Invalid leaf.
+                if (entry.OffsetToData - uiRva + entry.Size > inpBuffer.size())
+                {
+//                      std::cout << entry.OffsetToData << " XXX " << uiRva << " - " << entry.Size << " - " << inpBuffer.size() << std::endl;
+                        return 1;
+                }
+                
+//              std::cout << entry.OffsetToData << " - " << uiRva << " - " << entry.Size << " - " << inpBuffer.size() << std::endl;
+                inpBuffer.set(entry.OffsetToData - uiRva);
+                m_data.assign(inpBuffer.data() + inpBuffer.get(), inpBuffer.data() + inpBuffer.get() + entry.Size);
+//              std::cout << pad << std::hex << "Vector: " << m_data.size() << std::endl;
+//              std::copy(m_data.begin(), m_data.end(), std::ostream_iterator<int>(std::cout << std::hex, " "));
+                return 0;
+        }
+
+        /**
+        * Rebuilds the current resource leaf.
+        * @param obBuffer OutputBuffer where the rebuilt resource leaf is stored.
+        * @param uiOffset Offset of the resource leaf inside the resource directory.
+        * @param uiRva RVA of the resource directory.
+        **/
+        void ResourceLeaf::rebuild(OutputBuffer& obBuffer, unsigned int& uiOffset, unsigned int uiRva, const std::string&) const
+        {
+//              std::cout << std::hex << pad << "Leaf: " << uiOffset << std::endl;
+                uiOffset += PELIB_IMAGE_RESOURCE_DATA_ENTRY::size();
+                
+//              obBuffer << entry.OffsetToData;
+//              obBuffer << uiOffset;
+                obBuffer << uiRva + uiOffset + (uiOffset % 4);
+                obBuffer << entry.Size;
+                obBuffer << entry.CodePage;
+                obBuffer << entry.Reserved;
+                
+                while (uiOffset % 4)
+                {
+                        uiOffset++;
+                        obBuffer << (byte)0;
+                }
+                
+                uiOffset += static_cast<unsigned int>(m_data.size());
+
+                for (unsigned int i=0;i<m_data.size();i++)
+                {
+                        obBuffer << m_data[i];
+                }
+//              std::cout << "LeafChild: " << std::endl;
+        }
+
+        void ResourceLeaf::makeValid()
+        {
+                entry.Size = static_cast<unsigned int>(m_data.size());
+        }
+        
+/*      /// Returns the size of a resource leaf.
+        unsigned int ResourceLeaf::size() const
+        {
+                return PELIB_IMAGE_RESOURCE_DATA_ENTRY::size() + m_data.size();
+        }
+*/
+
+        /**
+        * Returns a vector that contains the raw data of a resource leaf.
+        * @return Raw data of the resource.
+        **/
+        std::vector<byte> ResourceLeaf::getData() const
+        {
+                return m_data;
+        }
+        
+        /**
+        * Overwrites the raw data of a resource.
+        * @param vData New data of the resource.
+        **/
+        void ResourceLeaf::setData(const std::vector<byte>& vData)
+        {
+                m_data = vData;
+        }
+
+        /**
+        * Returns the leaf's OffsetToData value. That's the RVA where the raw data of the resource
+        * can be found.
+        * @return The leaf's OffsetToData value.
+        **/
+        dword ResourceLeaf::getOffsetToData() const
+        {
+                return entry.OffsetToData;
+        }
+        
+        /**
+        * Returns the leaf's Size value. That's the size of the raw data of the resource.
+        * @return The leaf's Size value.
+        **/
+        dword ResourceLeaf::getSize() const
+        {
+                return entry.Size;
+        }
+        
+        /**
+        * Returns the leaf's CodePage value.
+        * @return The leaf's CodePage value.
+        **/
+        dword ResourceLeaf::getCodePage() const
+        {
+                return entry.CodePage;
+        }
+        
+        /**
+        * Returns the leaf's Reserved value.
+        * @return The leaf's Reserved value.
+        **/
+        dword ResourceLeaf::getReserved() const
+        {
+                return entry.Reserved;
+        }
+        
+        /**
+        * Sets the leaf's OffsetToData value.
+        * @param dwValue The leaf's new OffsetToData value.
+        **/
+        void ResourceLeaf::setOffsetToData(dword dwValue)
+        {
+                entry.OffsetToData = dwValue;
+        }
+        
+        /**
+        * Sets the leaf's Size value.
+        * @param dwValue The leaf's new Size value.
+        **/
+        void ResourceLeaf::setSize(dword dwValue)
+        {
+                entry.Size = dwValue;
+        }
+        
+        /**
+        * Sets the leaf's CodePage value.
+        * @param dwValue The leaf's new CodePage value.
+        **/
+        void ResourceLeaf::setCodePage(dword dwValue)
+        {
+                entry.CodePage = dwValue;
+        }
+        
+        /**
+        * Sets the leaf's Reserved value.
+        * @param dwValue The leaf's new Reserved value.
+        **/
+        void ResourceLeaf::setReserved(dword dwValue)
+        {
+                entry.Reserved = dwValue;
+        }
+        
+
+// -------------------------------------------------- ResourceNode -------------------------------------------
+
+        /**
+        * Checks if a ResourceElement is a leaf or not.
+        * @return Always returns false.
+        **/
+        bool ResourceNode::isLeaf() const
+        {
+                return false;
+        }
+        
+        /**
+        * Sorts the node's children and corrects the node's header.
+        **/
+        void ResourceNode::makeValid()
+        {
+                std::sort(children.begin(), children.end());
+                header.NumberOfNamedEntries = static_cast<PeLib::word>(std::count_if(children.begin(), children.end(), std::mem_fun_ref(&ResourceChild::isNamedResource)));
+                header.NumberOfIdEntries = static_cast<unsigned int>(children.size()) - header.NumberOfNamedEntries;
+        }
+
+        /**
+        * Rebuilds the current resource node.
+        * @param obBuffer OutputBuffer where the rebuilt resource node is stored.
+        * @param uiOffset Offset of the resource node inside the resource directory.
+        * @param uiRva RVA of the resource directory.
+        * @param pad Used for debugging.
+        **/
+        void ResourceNode::rebuild(OutputBuffer& obBuffer, unsigned int& uiOffset, unsigned int uiRva, const std::string& pad) const
+        {
+/*              std::cout << std::hex << pad << uiOffset << std::endl;
+                
+                std::cout << std::hex << pad << "header.Characteristics: " << header.Characteristics << std::endl;
+                std::cout << std::hex << pad << "header.TimeDateStamp: " << header.TimeDateStamp << std::endl;
+                std::cout << std::hex << pad << "header.MajorVersion: "  << header.MajorVersion << std::endl;
+                std::cout << std::hex << pad << "header.MinorVersion: "  << header.MinorVersion << std::endl;
+                std::cout << std::hex << pad << "header.NumberOfNamedEntries: "  << header.NumberOfNamedEntries << std::endl;
+                std::cout << std::hex << pad << "header.NumberOfIdEntries: "  << header.NumberOfIdEntries << std::endl;
+*/              
+                obBuffer << header.Characteristics;
+                obBuffer << header.TimeDateStamp;
+                obBuffer << header.MajorVersion;
+                obBuffer << header.MinorVersion;
+                //std::cout << pad << "Children: " << children.size() << std::endl;
+                //std::cout << pad << std::count_if(children.begin(), children.end(), std::mem_fun_ref(&ResourceChild::isNamedResource)) << std::endl;
+                //std::cout << pad << children.size() - std::count_if(children.begin(), children.end(), std::mem_fun_ref(&ResourceChild::isNamedResource)) << std::endl;
+//              obBuffer << std::count_if(children.begin(), children.end(), std::mem_fun_ref(&ResourceChild::isNamedResource));
+//              obBuffer << children.size() - std::count_if(children.begin(), children.end(), std::mem_fun_ref(&ResourceChild::isNamedResource));
+                obBuffer << header.NumberOfNamedEntries;
+                obBuffer << header.NumberOfIdEntries;
+
+                uiOffset += PELIB_IMAGE_RESOURCE_DIRECTORY::size();
+                
+                for (unsigned int i=0;i<children.size();i++)
+                {
+                        obBuffer << (dword)0;
+                        obBuffer << (dword)0;
+                }
+
+                unsigned int newoffs = (uiOffset + children.size() * 8);
+                
+                for (unsigned int i=0;i<children.size();i++)
+                {
+                        if (!children[i].entry.wstrName.size())
+                        {
+                                obBuffer.update(uiOffset, children[i].entry.irde.Name);
+                        }
+                        else
+                        {
+                                obBuffer.update(uiOffset, newoffs | PELIB_IMAGE_RESOURCE_NAME_IS_STRING);
+                                obBuffer << (word)children[i].entry.wstrName.size();
+                                newoffs += 2;
+                                for (unsigned int j=0;j<children[i].entry.wstrName.size();j++)
+                                {
+//                                      std::cout << children[i].entry.wstrName[j];
+                                        obBuffer << (word)children[i].entry.wstrName[j];
+                                        newoffs += 2;
+                                }
+                        }
+                        uiOffset += 4;
+//                      obBuffer << children[i].entry.OffsetToData;
+                        obBuffer.update(uiOffset, newoffs | (children[i].entry.irde.OffsetToData & PELIB_IMAGE_RESOURCE_DATA_IS_DIRECTORY));
+                        uiOffset += 4;
+                        children[i].child->rebuild(obBuffer, newoffs, uiRva, pad + "  ");
+                }
+                uiOffset = newoffs;
+        }
+
+        /**
+        * Reads the next resource node from the InputBuffer.
+        * @param inpBuffer An InputBuffer that holds the complete resource directory.
+        * @param uiOffset Offset of the resource node that's to be read.
+        * @param uiRva RVA of the beginning of the resource directory.
+        * @param pad Something I need for debugging. Will be removed soon.
+        **/
+        int ResourceNode::read(InputBuffer& inpBuffer, unsigned int uiOffset, unsigned int uiRva/*, const std::string& pad*/)
+        {
+                // Not enough space to be a valid node.
+                if (uiOffset + PELIB_IMAGE_RESOURCE_DIRECTORY::size() > inpBuffer.size())
+                {
+                        return 1;
+                }
+                
+                uiElementRva = uiOffset + uiRva;
+                
+                inpBuffer.set(uiOffset);
+                
+                inpBuffer >> header.Characteristics;
+                inpBuffer >> header.TimeDateStamp;
+                inpBuffer >> header.MajorVersion;
+                inpBuffer >> header.MinorVersion;
+                inpBuffer >> header.NumberOfNamedEntries;
+                inpBuffer >> header.NumberOfIdEntries;
+                        
+                // Not enough space to be a valid node.
+                if (uiOffset + PELIB_IMAGE_RESOURCE_DIRECTORY::size()
+                   + (header.NumberOfNamedEntries + header.NumberOfIdEntries) * PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY::size()
+                   > inpBuffer.size())
+                {
+                        return 1;
+                }
+                
+//              std::cout << std::hex << pad << "Characteristics: " << header.Characteristics << std::endl;
+//              std::cout << std::hex << pad << "TimeDateStamp: " << header.TimeDateStamp << std::endl;
+//              std::cout << std::hex << pad << "MajorVersion: " << header.MajorVersion << std::endl;
+//              std::cout << std::hex << pad << "MinorVersion: " << header.MinorVersion << std::endl;
+//              std::cout << std::hex << pad << "NumberOfNamedEntries: " << header.NumberOfNamedEntries << std::endl;
+//              std::cout << std::hex << pad << "NumberOfIdEntries: " << header.NumberOfIdEntries << std::endl;
+                        
+                for (int i=0;i<header.NumberOfNamedEntries + header.NumberOfIdEntries;i++)
+                {
+                        ResourceChild rc;
+                        inpBuffer >> rc.entry.irde.Name;
+                        inpBuffer >> rc.entry.irde.OffsetToData;
+                        
+                        unsigned int lastPos = inpBuffer.get();
+
+                        if (rc.entry.irde.Name & PELIB_IMAGE_RESOURCE_NAME_IS_STRING)
+                        {
+                                // Enough space to read string length?
+                                if ((rc.entry.irde.Name & ~PELIB_IMAGE_RESOURCE_NAME_IS_STRING) + 2 < inpBuffer.size())
+                                {
+                                        inpBuffer.set(rc.entry.irde.Name & ~PELIB_IMAGE_RESOURCE_NAME_IS_STRING);
+                                        word strlen;
+                                        inpBuffer >> strlen;
+                                        
+                                        // Enough space to read string?
+                                        if ((rc.entry.irde.Name & ~PELIB_IMAGE_RESOURCE_NAME_IS_STRING) + 2 * strlen < inpBuffer.size())
+                                        {
+                                                wchar_t c;
+                                                for (word i=0;i<strlen;i++)
+                                                {
+                                                        inpBuffer >> c;
+                                                        rc.entry.wstrName += c;
+                                                }
+                                        }
+                                }
+                                
+//                              std::wcout << rc.entry.wstrName << std::endl;
+                                
+//                              std::cout << strlen << std::endl;
+                                inpBuffer.set(lastPos);
+                        }
+                        
+                        if (rc.entry.irde.OffsetToData & PELIB_IMAGE_RESOURCE_DATA_IS_DIRECTORY)
+                        {
+                                rc.child = new ResourceNode;
+                                rc.child->read(inpBuffer, rc.entry.irde.OffsetToData & ~PELIB_IMAGE_RESOURCE_DATA_IS_DIRECTORY, uiRva/*, pad + "  "*/);
+                        }
+                        else
+                        {
+                                rc.child = new ResourceLeaf;
+                                rc.child->read(inpBuffer, rc.entry.irde.OffsetToData, uiRva/*, pad + "  "*/);
+                        }
+//                      std::cout << std::hex << pad << "Entry " << i << "(Name): " << rc.entry.irde.Name << std::endl;
+//                      std::cout << std::hex << pad << "Entry " << i << "(Offset): " << rc.entry.irde.OffsetToData << std::endl;
+
+                        children.push_back(rc);
+                        inpBuffer.set(lastPos);
+                }
+                
+                return 0;
+        }
+        
+        /**
+        * Returns the number of children of the current node. Note that this number is the number
+        * of defined children, not the value from the header.
+        * @return Number of node's children.
+        **/
+        unsigned int ResourceNode::getNumberOfChildren() const
+        {
+                return static_cast<unsigned int>(children.size());
+        }
+        
+        /**
+        * Adds another child to the current node.
+        **/
+        void ResourceNode::addChild()
+        {
+                ResourceChild c;
+                c.child = 0;
+                children.push_back(c);
+        }
+                  
+        /**
+        * Returns a node's child.
+        * @param uiIndex Index of the child.
+        * @return The child identified by uiIndex. This child can be either a ResourceNode or a ResourceLeaf.
+        **/
+        ResourceElement* ResourceNode::getChild(unsigned int uiIndex)
+        {
+                return children[uiIndex].child;
+        }
+        
+        /**
+        * Removes a child from the current node.
+        * @param uiIndex Index of the child.
+        **/
+        void ResourceNode::removeChild(unsigned int uiIndex)
+        {
+                children.erase(children.begin() + uiIndex);
+        }
+                  
+        /**
+        * Returns the name of a child.
+        * @param uiIndex Index of the child.
+        * @return Either the name of the specified child or an empty string.
+        **/
+        std::string ResourceNode::getChildName(unsigned int uiIndex) const
+        {
+                return children[uiIndex].entry.wstrName;
+        }
+        
+        /**
+        * Returns the Name value of a child.
+        * @param uiIndex Index of the child.
+        * @return Name value of a child.
+        **/
+        dword ResourceNode::getOffsetToChildName(unsigned int uiIndex) const
+        {
+                return children[uiIndex].entry.irde.Name;
+        }
+        
+        /**
+        * Returns the OffsetToData value of a child.
+        * @param uiIndex Index of the child.
+        * @return OffsetToData value of a child.
+        **/
+        dword ResourceNode::getOffsetToChildData(unsigned int uiIndex) const
+        {
+                return children[uiIndex].entry.irde.OffsetToData;
+        }
+        
+                  
+        /**
+        * Sets the name of a child.
+        * @param uiIndex Index of the child.
+        * @param strNewName New name of the resource.
+        **/
+        void ResourceNode::setChildName(unsigned int uiIndex, const std::string& strNewName)
+        {
+                children[uiIndex].entry.wstrName = strNewName;
+        }
+        
+        /**
+        * Sets the Name value of a child.
+        * @param uiIndex Index of the child.
+        * @param dwNewOffset New Name value of the resource.
+        **/
+        void ResourceNode::setOffsetToChildName(unsigned int uiIndex, dword dwNewOffset)
+        {
+                children[uiIndex].entry.irde.Name = dwNewOffset;
+        }
+        
+        /**
+        * Sets the OffsetToData value of a child.
+        * @param uiIndex Index of the child.
+        * @param dwNewOffset New OffsetToData value of the resource.
+        **/
+        void ResourceNode::setOffsetToChildData(unsigned int uiIndex, dword dwNewOffset)
+        {
+                children[uiIndex].entry.irde.OffsetToData = dwNewOffset;
+        }
+                  
+        /**
+        * Returns the Characteristics value of the node.
+        * @return Characteristics value of the node.
+        **/
+        dword ResourceNode::getCharacteristics() const
+        {
+                return header.Characteristics;
+        }
+        
+        /**
+        * Returns the TimeDateStamp value of the node.
+        * @return TimeDateStamp value of the node.
+        **/
+        dword ResourceNode::getTimeDateStamp() const
+        {
+                return header.TimeDateStamp;
+        }
+        
+        /**
+        * Returns the MajorVersion value of the node.
+        * @return MajorVersion value of the node.
+        **/
+        word ResourceNode::getMajorVersion() const
+        {
+                return header.MajorVersion;
+        }
+        
+        /**
+        * Returns the MinorVersion value of the node.
+        * @return MinorVersion value of the node.
+        **/
+        word ResourceNode::getMinorVersion() const
+        {
+                return header.MinorVersion;
+        }
+        
+        /**
+        * Returns the NumberOfNamedEntries value of the node.
+        * @return NumberOfNamedEntries value of the node.
+        **/
+        word ResourceNode::getNumberOfNamedEntries() const
+        {
+                return header.NumberOfNamedEntries;
+        }
+        
+        /**
+        * Returns the NumberOfIdEntries value of the node.
+        * @return NumberOfIdEntries value of the node.
+        **/
+        word ResourceNode::getNumberOfIdEntries() const
+        {
+                return header.NumberOfIdEntries;
+        }
+                  
+        /**
+        * Sets the Characteristics value of the node.
+        * @param value New Characteristics value of the node.
+        **/
+        void ResourceNode::setCharacteristics(dword value)
+        {
+                header.Characteristics = value;
+        }
+        
+        /**
+        * Sets the TimeDateStamp value of the node.
+        * @param value New TimeDateStamp value of the node.
+        **/
+        void ResourceNode::setTimeDateStamp(dword value)
+        {
+                header.TimeDateStamp = value;
+        }
+        
+        /**
+        * Sets the MajorVersion value of the node.
+        * @param value New MajorVersion value of the node.
+        **/
+        void ResourceNode::setMajorVersion(word value)
+        {
+                header.MajorVersion = value;
+        }
+        
+        /**
+        * Sets the MinorVersion value of the node.
+        * @param value New MinorVersion value of the node.
+        **/
+        void ResourceNode::setMinorVersion(word value)
+        {
+                header.MinorVersion = value;
+        }
+        
+        /**
+        * Sets the NumberOfNamedEntries value of the node.
+        * @param value New NumberOfNamedEntries value of the node.
+        **/
+        void ResourceNode::setNumberOfNamedEntries(word value)
+        {
+                header.NumberOfNamedEntries = value;
+        }
+        
+        /**
+        * Sets the NumberOfIdEntries value of the node.
+        * @param value New NumberOfIdEntries value of the node.
+        **/
+        void ResourceNode::setNumberOfIdEntries(word value)
+        {
+                header.NumberOfIdEntries = value;
+        }
+        
+                  
+/*      /// Returns the size of a resource node.
+        unsigned int ResourceNode::size() const
+        {
+                if (children.size())
+                {
+                        std::cout << std::accumulate(children.begin(), children.end(), 0, accumulate<ResourceChild>) << std::endl;
+                        return PELIB_IMAGE_RESOURCE_DIRECTORY::size()
+                                 + std::accumulate(children.begin(), children.end(), 0, accumulate<ResourceChild>);
+                }
+                else
+                {
+                        return 0;
+                }
+        }
+*/      
+// -------------------------------------------------- ResourceDirectory -------------------------------------------
+        
+        /**
+        * Returns the root node of the resource directory.
+        * @return Root node of the resource directory.
+        **/
+        ResourceNode* ResourceDirectory::getRoot()
+        {
+                return &m_rnRoot;
+        }
+
+        /**
+        * Correctly sorts the resource nodes of the resource tree. This function should be called
+        * before calling rebuild.
+        **/
+        void ResourceDirectory::makeValid()
+        {
+                m_rnRoot.makeValid();
+        }
+
+        /**
+        * Reads the resource directory from a file.
+        * @param strFilename Name of the file.
+        * @param uiOffset File offset of the resource directory.
+        * @param uiSize Raw size of the resource directory.
+        * @param uiResDirRva RVA of the beginning of the resource directory.
+        **/
+        int ResourceDirectory::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, unsigned int uiResDirRva)
+        {
+                if (!uiSize || !uiOffset)
+                {
+                        return 1;
+                }
+                
+                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
+                
+                if (!ifFile)
+                {
+//                      throw Exceptions::CannotOpenFile(ResourceDirectoryId, __LINE__);
+                        return 1;
+                }
+                
+                if (fileSize(ifFile) < uiOffset + uiSize)
+                {
+//                      throw Exceptions::InvalidFormat(ResourceDirectoryId, __LINE__);
+                        return 1;
+                }
+
+                ifFile.seekg(uiOffset, std::ios::beg);
+                
+                PELIB_IMAGE_RESOURCE_DIRECTORY irdCurrRoot;
+                
+                std::vector<byte> vResourceDirectory(uiSize);
+                ifFile.read(reinterpret_cast<char*>(&vResourceDirectory[0]), uiSize);
+
+                InputBuffer inpBuffer(vResourceDirectory);
+                
+//              ResourceNode currNode;
+                return m_rnRoot.read(inpBuffer, 0, uiResDirRva/*, ""*/);
+//              std::swap(currNode, m_rnRoot);
+        }
+
+        /**
+        * Rebuilds the resource directory.
+        * @param vBuffer Buffer the source directory will be written to.
+        * @param uiRva RVA of the resource directory.
+        **/
+        void ResourceDirectory::rebuild(std::vector<byte>& vBuffer, unsigned int uiRva) const
+        {
+                OutputBuffer obBuffer(vBuffer);
+                unsigned int offs = 0;
+//              std::cout << "Root: " << m_rnRoot.children.size() << std::endl;
+                m_rnRoot.rebuild(obBuffer, offs, uiRva, "");
+        }
+        
+        /**
+        * Returns the size of the entire rebuilt resource directory. That's the size of the entire
+        * structure as it's written back to a file.
+        **/
+/*      unsigned int ResourceDirectory::size() const
+        {
+                return m_rnRoot.size();
+        }
+*/      
+        /**
+        * Writes the current resource directory back into a file.
+        * @param strFilename Name of the output file.
+        * @param uiOffset File offset where the resource directory will be written to.
+        * @param uiRva RVA of the file offset.
+        **/
+        int ResourceDirectory::write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva) const
+        {
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                
+                if (!ofFile)
+                {
+                        ofFile.clear();
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                }
+                else
+                {
+                        ofFile.close();
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                }
+                
+                if (!ofFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+
+                ofFile.seekp(uiOffset, std::ios::beg);
+
+                std::vector<unsigned char> vBuffer;
+                rebuild(vBuffer, uiRva);
+
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
+
+                ofFile.close();
+                
+                return 0;
+        }
+        
+        /**
+        * Adds another resource type. The new resource type is identified by the ID dwResTypeId.
+        * @param dwResTypeId ID which identifies the resource type.
+        **/
+        int ResourceDirectory::addResourceType(dword dwResTypeId)
+        {
+                std::vector<ResourceChild>::iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(&ResourceChild::equalId), dwResTypeId));
+                if (Iter != m_rnRoot.children.end())
+                {
+                        return 1;
+                        // throw Exceptions::EntryAlreadyExists(ResourceDirectoryId, __LINE__);
+                }
+                
+                ResourceChild rcCurr;
+                rcCurr.child = new ResourceNode;
+                rcCurr.entry.irde.Name = dwResTypeId;
+                m_rnRoot.children.push_back(rcCurr);
+                
+                return 0;
+        }
+        
+        /**
+        * Adds another resource type. The new resource type is identified by the name strResTypeName.
+        * @param strResTypeName Name which identifies the resource type.
+        **/
+        int ResourceDirectory::addResourceType(const std::string& strResTypeName)
+        {
+                std::vector<ResourceChild>::iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(&ResourceChild::equalName), strResTypeName));
+                if (Iter != m_rnRoot.children.end())
+                {
+                        return 1;
+//                      throw Exceptions::EntryAlreadyExists(ResourceDirectoryId, __LINE__);
+                }
+                
+                ResourceChild rcCurr;
+                rcCurr.entry.wstrName = strResTypeName;
+                rcCurr.child = new ResourceNode;
+                m_rnRoot.children.push_back(rcCurr);
+                
+                return 0;
+        }
+        
+        /**
+        * Removes the resource type identified by the ID dwResTypeId.
+        * @param dwResTypeId ID which identifies the resource type.
+        **/
+        int ResourceDirectory::removeResourceType(dword dwResTypeId)
+        {
+                std::vector<ResourceChild>::iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(&ResourceChild::equalId), dwResTypeId));
+                if (Iter == m_rnRoot.children.end())
+                {
+                        return 1;
+//                      throw Exceptions::ResourceTypeDoesNotExist(ResourceDirectoryId, __LINE__);
+                }
+                
+                bool isNamed = false;
+                if (Iter->isNamedResource()) isNamed = true;
+
+                m_rnRoot.children.erase(Iter);
+                
+                if (isNamed) m_rnRoot.header.NumberOfNamedEntries = static_cast<PeLib::word>(m_rnRoot.children.size());
+                else m_rnRoot.header.NumberOfIdEntries = static_cast<PeLib::word>(m_rnRoot.children.size());
+                
+                return 0;
+        }
+        
+        /**
+        * Removes the resource type identified by the name strResTypeName.
+        * @param strResTypeName Name which identifies the resource type.
+        **/
+        int ResourceDirectory::removeResourceType(const std::string& strResTypeName)
+        {
+                std::vector<ResourceChild>::iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(&ResourceChild::equalName), strResTypeName));
+                if (Iter == m_rnRoot.children.end())
+                {
+                        return 1;
+                //      throw Exceptions::ResourceTypeDoesNotExist(ResourceDirectoryId, __LINE__);
+                }
+                
+                bool isNamed = false;
+                if (Iter->isNamedResource()) isNamed = true;
+                
+                m_rnRoot.children.erase(Iter);
+                
+                if (isNamed) m_rnRoot.header.NumberOfNamedEntries = static_cast<PeLib::word>(m_rnRoot.children.size());
+                else m_rnRoot.header.NumberOfIdEntries = static_cast<PeLib::word>(m_rnRoot.children.size());
+                
+                return 0;
+        }
+
+        /**
+        * Removes the resource type identified by the index uiIndex.
+        * @param uiIndex Index which identifies the resource type.
+        **/
+        int ResourceDirectory::removeResourceTypeByIndex(unsigned int uiIndex)
+        {
+                bool isNamed = false;
+                if (m_rnRoot.children[uiIndex].isNamedResource()) isNamed = true;
+                
+                m_rnRoot.children.erase(m_rnRoot.children.begin() + uiIndex);
+                
+                if (isNamed) m_rnRoot.header.NumberOfNamedEntries = static_cast<PeLib::word>(m_rnRoot.children.size());
+                else m_rnRoot.header.NumberOfIdEntries = static_cast<PeLib::word>(m_rnRoot.children.size());
+                
+                return 0;
+        }
+                  
+        /**
+        * Adds another resource to the resource tree. The first parameter identifies the resource type
+        * of the new resource, the second parameter identifies the resource itself.
+        * @param dwResTypeId ID of the resource type.
+        * @param dwResId ID of the resource.
+        **/
+        int ResourceDirectory::addResource(dword dwResTypeId, dword dwResId)
+        {
+                ResourceChild rcCurr;
+                rcCurr.entry.irde.Name = dwResId;
+                return addResourceT(dwResTypeId, dwResId, rcCurr);
+        }
+        
+        /**
+        * Adds another resource to the resource tree. The first parameter identifies the resource type
+        * of the new resource, the second parameter identifies the resource itself.
+        * @param dwResTypeId ID of the resource type.
+        * @param strResName Name of the resource.
+        **/
+        int ResourceDirectory::addResource(dword dwResTypeId, const std::string& strResName)
+        {
+                ResourceChild rcCurr;
+                rcCurr.entry.wstrName = strResName;
+                return addResourceT(dwResTypeId, strResName, rcCurr);
+        }
+        
+        /**
+        * Adds another resource to the resource tree. The first parameter identifies the resource type
+        * of the new resource, the second parameter identifies the resource itself.
+        * @param strResTypeName Name of the resource type.
+        * @param dwResId ID of the resource.
+        **/
+        int ResourceDirectory::addResource(const std::string& strResTypeName, dword dwResId)
+        {
+                ResourceChild rcCurr;
+                rcCurr.entry.irde.Name = dwResId;
+                return addResourceT(strResTypeName, dwResId, rcCurr);
+        }
+
+        /**
+        * Adds another resource to the resource tree. The first parameter identifies the resource type
+        * of the new resource, the second parameter identifies the resource itself.
+        * @param strResTypeName Name of the resource type.
+        * @param strResName Name of the resource.
+        **/
+        int ResourceDirectory::addResource(const std::string& strResTypeName, const std::string& strResName)
+        {
+                ResourceChild rcCurr;
+                rcCurr.entry.wstrName = strResName;
+                return addResourceT(strResTypeName, strResName, rcCurr);
+        }
+
+        /**
+        * Removes a resource from the resource tree. The first parameter identifies the resource type
+        * of the new resource, the second parameter identifies the resource itself.
+        * @param dwResTypeIndex ID of the resource type.
+        * @param dwResId ID of the resource.
+        **/
+        int ResourceDirectory::removeResource(dword dwResTypeIndex, dword dwResId)
+        {
+                return removeResourceT(dwResTypeIndex, dwResId);
+        }
+        
+        /**
+        * Removes a resource from the resource tree. The first parameter identifies the resource type
+        * of the new resource, the second parameter identifies the resource itself.
+        * @param dwResTypeIndex ID of the resource type.
+        * @param strResName Name of the resource.
+        **/
+        int ResourceDirectory::removeResource(dword dwResTypeIndex, const std::string& strResName)
+        {
+                return removeResourceT(dwResTypeIndex, strResName);
+        }
+        
+        /**
+        * Removes a resource from the resource tree. The first parameter identifies the resource type
+        * of the new resource, the second parameter identifies the resource itself.
+        * @param strResTypeName Name of the resource type.
+        * @param dwResId ID of the resource.
+        **/
+        int ResourceDirectory::removeResource(const std::string& strResTypeName, dword dwResId)
+        {
+                return removeResourceT(strResTypeName, dwResId);
+        }
+        
+        /**
+        * Removes a resource from the resource tree. The first parameter identifies the resource type
+        * of the new resource, the second parameter identifies the resource itself.
+        * @param strResTypeName Name of the resource type.
+        * @param strResName Name of the resource.
+        **/
+        int ResourceDirectory::removeResource(const std::string& strResTypeName, const std::string& strResName)
+        {
+                return removeResourceT(strResTypeName, strResName);
+        }
+                  
+        /**
+        * Returns the number of resource types.
+        **/
+        unsigned int ResourceDirectory::getNumberOfResourceTypes() const
+        {
+                return static_cast<unsigned int>(m_rnRoot.children.size());
+        }
+
+        /**
+        * Returns the ID of a resource type which was specified through an index.
+        * The valid range of the parameter uiIndex is 0...getNumberOfResourceTypes() - 1.
+        * Leaving the invalid range leads to undefined behaviour.
+        * @param uiIndex Index which identifies a resource type.
+        * @return The ID of the specified resource type.
+        **/
+        dword ResourceDirectory::getResourceTypeIdByIndex(unsigned int uiIndex) const
+        {
+                return m_rnRoot.children[uiIndex].entry.irde.Name;
+        }
+        
+        /**
+        * Returns the name of a resource type which was specified through an index.
+        * The valid range of the parameter uiIndex is 0...getNumberOfResourceTypes() - 1.
+        * Leaving the invalid range leads to undefined behaviour.
+        * @param uiIndex Index which identifies a resource type.
+        * @return The name of the specified resource type.
+        **/
+        std::string ResourceDirectory::getResourceTypeNameByIndex(unsigned int uiIndex) const
+        {
+                return m_rnRoot.children[uiIndex].entry.wstrName;
+        }
+
+        /**
+        * Converts the ID of a resource type to an index.
+        * @param dwResTypeId ID of the resource type.
+        * @return Index of that resource type.
+        **/
+        int ResourceDirectory::resourceTypeIdToIndex(dword dwResTypeId) const
+        {
+                std::vector<ResourceChild>::const_iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(&ResourceChild::equalId), dwResTypeId));
+                if (Iter == m_rnRoot.children.end()) return -1;
+                return static_cast<unsigned int>(std::distance(m_rnRoot.children.begin(), Iter));
+        }
+        
+        /**
+        * Converts the name of a resource type to an index.
+        * @param strResTypeName ID of the resource type.
+        * @return Index of that resource type.
+        **/
+        int ResourceDirectory::resourceTypeNameToIndex(const std::string& strResTypeName) const
+        {
+                std::vector<ResourceChild>::const_iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(&ResourceChild::equalName), strResTypeName));
+                if (Iter == m_rnRoot.children.end()) return -1;
+                return static_cast<unsigned int>(std::distance(m_rnRoot.children.begin(), Iter));
+        }
+        
+        /**
+        * Returns the number of resources of a specific resource type.
+        * @param dwId ID of the resource type.
+        * @return Number of resources of resource type dwId.
+        **/
+        unsigned int ResourceDirectory::getNumberOfResources(dword dwId) const
+        {
+//              std::vector<ResourceChild>::const_iterator IterD = m_rnRoot.children.begin();
+//              std::cout << dwId << std::endl;
+//              while (IterD != m_rnRoot.children.end())
+//              {
+//                      std::cout << IterD->entry.irde.Name << std::endl;
+//                      ++IterD;
+//              }
+                
+                std::vector<ResourceChild>::const_iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(&ResourceChild::equalId), dwId));
+                if (Iter == m_rnRoot.children.end())
+                {
+                        return 0xFFFFFFFF;
+                }
+                else
+                {
+                        ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);
+                        return static_cast<unsigned int>(currNode->children.size());
+                }
+        }
+
+        /**
+        * Returns the number of resources of a specific resource type.
+        * @param strResTypeName Name of the resource type.
+        * @return Number of resources of resource type strResTypeName.
+        **/
+        unsigned int ResourceDirectory::getNumberOfResources(const std::string& strResTypeName) const
+        {
+                std::vector<ResourceChild>::const_iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(&ResourceChild::equalName), strResTypeName));
+                if (Iter == m_rnRoot.children.end())
+                {
+                        return 0xFFFFFFFF;
+                }
+                else
+                {
+                        ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);
+                        return static_cast<unsigned int>(currNode->children.size());
+                }
+        }
+
+        /**
+        * Returns the number of resources of a resource type which was specified through an index.
+        * The valid range of the parameter uiIndex is 0...getNumberOfResourceTypes() - 1.
+        * Leaving the invalid range leads to undefined behaviour.
+        * @param uiIndex Index which identifies a resource type.
+        * @return The number of resources of the specified resource type.
+        **/
+        unsigned int ResourceDirectory::getNumberOfResourcesByIndex(unsigned int uiIndex) const
+        {
+                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiIndex].child);
+                return static_cast<unsigned int>(currNode->children.size());
+        }
+        
+        /**
+        * Gets the resource data of a specific resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param dwResId Identifies the resource.
+        * @param data Vector where the data is stored.
+        **/
+        void ResourceDirectory::getResourceData(dword dwResTypeId, dword dwResId, std::vector<byte>& data) const
+        {
+                getResourceDataT(dwResTypeId, dwResId, data);
+        }
+        
+        /**
+        * Gets the resource data of a specific resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param strResName Identifies the resource.
+        * @param data Vector where the data is stored.
+        **/
+        void ResourceDirectory::getResourceData(dword dwResTypeId, const std::string& strResName, std::vector<byte>& data) const
+        {
+                getResourceDataT(dwResTypeId, strResName, data);
+        }
+        
+        /**
+        * Gets the resource data of a specific resource.
+        * @param strResTypeName Identifies the resource type of the resource.
+        * @param dwResId Identifies the resource.
+        * @param data Vector where the data is stored.
+        **/
+        void ResourceDirectory::getResourceData(const std::string& strResTypeName, dword dwResId, std::vector<byte>& data) const
+        {
+                getResourceDataT(strResTypeName, dwResId, data);
+        }
+        
+        /**
+        * Gets the resource data of a specific resource.
+        * @param strResTypeName Identifies the resource type of the resource.
+        * @param strResName Identifies the resource.
+        * @param data Vector where the data is stored.
+        **/
+        void ResourceDirectory::getResourceData(const std::string& strResTypeName, const std::string& strResName, std::vector<byte>& data) const
+        {
+                getResourceDataT(strResTypeName, strResName, data);
+        }
+        
+        /**
+        * Gets the resource data of a specific resource by index.
+        * The valid range of the parameter uiResTypeIndex is 0...getNumberOfResourceTypes() - 1.
+        * The valid range of the parameter uiResIndex is 0...getNumberOfResources() - 1.
+        * Leaving the invalid range leads to undefined behaviour.
+        * @param uiResTypeIndex Identifies the resource type of the resource.
+        * @param uiResIndex Identifies the resource.
+        * @param data Vector where the data is stored.
+        **/
+        void ResourceDirectory::getResourceDataByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, std::vector<byte>& data) const
+        {
+                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);
+                currNode = static_cast<ResourceNode*>(currNode->children[uiResIndex].child);
+                ResourceLeaf* currLeaf = static_cast<ResourceLeaf*>(currNode->children[0].child);
+                
+                data.assign(currLeaf->m_data.begin(), currLeaf->m_data.end());
+        }
+                  
+        /**
+        * Sets the resource data of a specific resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param dwResId Identifies the resource.
+        * @param data The new resource data.
+        **/
+        void ResourceDirectory::setResourceData(dword dwResTypeId, dword dwResId, std::vector<byte>& data)
+        {
+                setResourceDataT(dwResTypeId, dwResId, data);
+        }
+        
+        /**
+        * Sets the resource data of a specific resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param strResName Identifies the resource.
+        * @param data The new resource data.
+        **/
+        void ResourceDirectory::setResourceData(dword dwResTypeId, const std::string& strResName, std::vector<byte>& data)
+        {
+                setResourceDataT(dwResTypeId, strResName, data);
+        }
+        
+        /**
+        * Sets the resource data of a specific resource.
+        * @param strResTypeName Identifies the resource type of the resource.
+        * @param dwResId Identifies the resource.
+        * @param data The new resource data.
+        **/
+        void ResourceDirectory::setResourceData(const std::string& strResTypeName, dword dwResId, std::vector<byte>& data)
+        {
+                setResourceDataT(strResTypeName, dwResId, data);
+        }
+        
+        /**
+        * Sets the resource data of a specific resource.
+        * @param strResTypeName Identifies the resource type of the resource.
+        * @param strResName Identifies the resource.
+        * @param data The new resource data.
+        **/
+        void ResourceDirectory::setResourceData(const std::string& strResTypeName, const std::string& strResName, std::vector<byte>& data)
+        {
+                setResourceDataT(strResTypeName, strResName, data);
+        }
+        
+        /**
+        * Sets the resource data of a specific resource by index.
+        * The valid range of the parameter uiResTypeIndex is 0...getNumberOfResourceTypes() - 1.
+        * The valid range of the parameter uiResIndex is 0...getNumberOfResources() - 1.
+        * Leaving the invalid range leads to undefined behaviour.
+        * @param uiResTypeIndex Identifies the resource type of the resource.
+        * @param uiResIndex Identifies the resource.
+        * @param data The new resource data.
+        **/
+        void ResourceDirectory::setResourceDataByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, std::vector<byte>& data)
+        {
+                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);
+                currNode = static_cast<ResourceNode*>(currNode->children[uiResIndex].child);
+                ResourceLeaf* currLeaf = static_cast<ResourceLeaf*>(currNode->children[0].child);
+                currLeaf->m_data.assign(data.begin(), data.end());
+        }
+                  
+        /**
+        * Gets the ID of a specific resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param strResName Identifies the resource.
+        * @return ID of the specified resource.
+        **/
+        dword ResourceDirectory::getResourceId(dword dwResTypeId, const std::string& strResName) const
+        {
+                return getResourceIdT(dwResTypeId, strResName);
+        }
+        
+        /**
+        * Gets the ID of a specific resource.
+        * @param strResTypeName Identifies the resource type of the resource.
+        * @param strResName Identifies the resource.
+        * @return ID of the specified resource.
+        **/
+        dword ResourceDirectory::getResourceId(const std::string& strResTypeName, const std::string& strResName) const
+        {
+                return getResourceIdT(strResTypeName, strResName);
+        }
+        
+        /**
+        * Gets the ID of a specific resource by index.
+        * @param uiResTypeIndex Identifies the resource type of the resource.
+        * @param uiResIndex Identifies the resource.
+        * @return ID of the specified resource.
+        **/
+        dword ResourceDirectory::getResourceIdByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex) const
+        {
+                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);
+                return currNode->children[uiResIndex].entry.irde.Name;
+        }
+
+        /**
+        * Sets the ID of a specific resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param dwResId Identifies the resource.
+        * @param dwNewResId New ID of the resource.
+        **/
+        void ResourceDirectory::setResourceId(dword dwResTypeId, dword dwResId, dword dwNewResId)
+        {
+                setResourceIdT(dwResTypeId, dwResId, dwNewResId);
+        }
+        
+        /**
+        * Sets the ID of a specific resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param strResName Identifies the resource.
+        * @param dwNewResId New ID of the resource.
+        **/
+        void ResourceDirectory::setResourceId(dword dwResTypeId, const std::string& strResName, dword dwNewResId)
+        {
+                setResourceIdT(dwResTypeId, strResName, dwNewResId);
+        }
+        
+        /**
+        * Sets the ID of a specific resource.
+        * @param strResTypeName Identifies the resource type of the resource.
+        * @param dwResId Identifies the resource.
+        * @param dwNewResId New ID of the resource.
+        **/
+        void ResourceDirectory::setResourceId(const std::string& strResTypeName, dword dwResId, dword dwNewResId)
+        {
+                setResourceIdT(strResTypeName, dwResId, dwNewResId);
+        }
+        
+        /**
+        * Sets the ID of a specific resource.
+        * @param strResTypeName Identifies the resource type of the resource.
+        * @param strResName Identifies the resource.
+        * @param dwNewResId New ID of the resource.
+        **/
+        void ResourceDirectory::setResourceId(const std::string& strResTypeName, const std::string& strResName, dword dwNewResId)
+        {
+                setResourceIdT(strResTypeName, strResName, dwNewResId);
+        }
+        
+        /**
+        * Sets the ID of a specific resource by index.
+        * @param uiResTypeIndex Identifies the resource type of the resource.
+        * @param uiResIndex Identifies the resource.
+        * @param dwNewResId New ID of the specified resource.
+        **/
+        void ResourceDirectory::setResourceIdByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, dword dwNewResId)
+        {
+                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);
+                currNode->children[uiResIndex].entry.irde.Name = dwNewResId;
+        }
+
+        /**
+        * Gets the Name of a specific resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param dwResId Identifies the resource.
+        * @return Name of the specified resource.
+        **/
+        std::string ResourceDirectory::getResourceName(dword dwResTypeId, dword dwResId) const
+        {
+                return getResourceNameT(dwResTypeId, dwResId);
+        }
+        
+        /**
+        * Gets the Name of a specific resource.
+        * @param strResTypeName Identifies the resource type of the resource.
+        * @param dwResId Identifies the resource.
+        * @return Name of the specified resource.
+        **/
+        std::string ResourceDirectory::getResourceName(const std::string& strResTypeName, dword dwResId) const
+        {
+                return getResourceNameT(strResTypeName, dwResId);
+        }
+        
+        /**
+        * Gets the name of a specific resource by index.
+        * @param uiResTypeIndex Identifies the resource type of the resource.
+        * @param uiResIndex Identifies the resource.
+        * @return Name of the specified resource.
+        **/
+        std::string ResourceDirectory::getResourceNameByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex) const
+        {
+                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);
+                return currNode->children[uiResIndex].entry.wstrName;
+        }
+
+        /**
+        * Sets the name of a specific resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param dwResId Identifies the resource.
+        * @param strNewResName New name of the specified resource.
+        **/
+        void ResourceDirectory::setResourceName(dword dwResTypeId, dword dwResId, const std::string& strNewResName)
+        {
+                setResourceNameT(dwResTypeId, dwResId, strNewResName);
+        }
+        
+        /**
+        * Sets the name of a specific resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param strResName Identifies the resource.
+        * @param strNewResName New name of the specified resource.
+        **/
+        void ResourceDirectory::setResourceName(dword dwResTypeId, const std::string& strResName, const std::string& strNewResName)
+        {
+                setResourceNameT(dwResTypeId, strResName, strNewResName);
+        }
+        
+        /**
+        * Sets the name of a specific resource.
+        * @param strResTypeName Identifies the resource type of the resource.
+        * @param dwResId Identifies the resource.
+        * @param strNewResName New name of the specified resource.
+        **/
+        void ResourceDirectory::setResourceName(const std::string& strResTypeName, dword dwResId, const std::string& strNewResName)
+        {
+                setResourceNameT(strResTypeName, dwResId, strNewResName);
+        }
+        
+        /**
+        * Sets the name of a specific resource.
+        * @param strResTypeName Identifies the resource type of the resource.
+        * @param strResName Identifies the resource.
+        * @param strNewResName New name of the specified resource.
+        **/
+        void ResourceDirectory::setResourceName(const std::string& strResTypeName, const std::string& strResName, const std::string& strNewResName)
+        {
+                setResourceNameT(strResTypeName, strResName, strNewResName);
+        }
+                  
+        /**
+        * Sets the name of a specific resource by index.
+        * @param uiResTypeIndex Identifies the resource type of the resource.
+        * @param uiResIndex Identifies the resource.
+        * @param strNewResName New name of the specified resource.
+        **/
+        void ResourceDirectory::setResourceNameByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, const std::string& strNewResName)
+        {
+                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);
+                currNode->children[uiResIndex].entry.wstrName = strNewResName;
+        }
+        
+}
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/ResourceDirectory.h b/utils/zenutils/libraries/pelib-0.9/pelib/ResourceDirectory.h
index a0bba4c9b3..6a3dc3caef 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/ResourceDirectory.h
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/ResourceDirectory.h
@@ -1,735 +1,735 @@
-/*

-* ResourceDirectory.cpp - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#ifndef RESOURCEDIRECTORY_H

-#define RESOURCEDIRECTORY_H

-

-#include "PeLibInc.h"

-

-namespace PeLib

-{

-        class ResourceElement;

-        

-        /// The class ResourceChild is used to store information about a resource node.

-        class ResourceChild

-        {

-                friend class ResourceElement;

-                friend class ResourceDirectory;

-                friend class ResourceNode;

-                friend class ResourceLeaf;

-                

-                /// Stores name and offset of a resource node.

-                PELIB_IMG_RES_DIR_ENTRY entry;

-                /// A pointer to one of the node's child nodes.

-                ResourceElement* child;

-                

-                public:

-                  /// Function which compares a resource ID to the node's resource ID.

-                  bool equalId(dword wId) const; // EXPORT

-                  /// Function which compares a string to the node's resource name.

-                  bool equalName(std::string strName) const; // EXPORT

-                  /// Predicate that determines if a child is identified by name or by ID.

-                  bool isNamedResource() const; // EXPORT

-                  /// Used for sorting a node's children.

-                  bool operator<(const ResourceChild& rc) const; // EXPORT

-                  /// Returns the size of a resource child.

-//              unsigned int size() const;

-

-                  /// Standard constructor. Does absolutely nothing.

-                  ResourceChild();

-                  /// Makes a deep copy of a ResourceChild object.

-                  ResourceChild(const ResourceChild& rhs);

-                  /// Makes a deep copy of a ResourceChild object.

-                  ResourceChild& operator=(const ResourceChild& rhs);

-                  /// Deletes a ResourceChild object.

-                  ~ResourceChild();

-        };

-        

-        /// Base class for ResourceNode and ResourceLeaf, the elements of the resource tree.

-        /// \todo write

-        class ResourceElement

-        {

-                friend class ResourceChild;

-                friend class ResourceNode;

-                friend class ResourceLeaf;

-                

-                protected:

-                  /// Stores RVA of the resource element in the file.

-                  unsigned int uiElementRva;

-                

-                  /// Reads the next resource element from the InputBuffer.

-                  virtual int read(InputBuffer&, unsigned int, unsigned int/*, const std::string&*/) = 0;

-                  /// Writes the next resource element into the OutputBuffer.

-                  virtual void rebuild(OutputBuffer&, unsigned int&, unsigned int, const std::string&) const = 0;

-                  

-                public:

-                  /// Returns the RVA of the element in the file.

-                  unsigned int getElementRva() const; // EXPORT

-                  /// Indicates if the resource element is a leaf or a node.

-                  virtual bool isLeaf() const = 0; // EXPORT

-                  /// Corrects erroneous valeus in the ResourceElement.

-                  virtual void makeValid() = 0; // EXPORT

-                  /// Returns the size of a resource element.

-//                virtual unsigned int size() const = 0;

-                  /// Necessary virtual destructor.

-                  virtual ~ResourceElement() {}

-        };

-        

-        /// ResourceLeafs represent the leafs of the resource tree: The actual resources.

-        class ResourceLeaf : public ResourceElement

-        {

-                friend class ResourceChild;

-                friend class ResourceDirectory;

-                template<typename T> friend struct fixNumberOfEntries;

-                

-                private:

-                  /// The resource data.

-                  std::vector<byte> m_data;

-                  /// PeLib equivalent of the Win32 structure IMAGE_RESOURCE_DATA_ENTRY

-                  PELIB_IMAGE_RESOURCE_DATA_ENTRY entry;

-                  

-                protected:

-                  int read(InputBuffer& inpBuffer, unsigned int uiOffset, unsigned int rva/*, const std::string&*/);

-                  /// Writes the next resource leaf into the OutputBuffer.

-                  void rebuild(OutputBuffer&, unsigned int& uiOffset, unsigned int uiRva, const std::string&) const;

-                

-                public:

-                  /// Indicates if the resource element is a leaf or a node.

-                  bool isLeaf() const; // EXPORT

-                  /// Corrects erroneous valeus in the ResourceLeaf.

-                  void makeValid(); // EXPORT

-                  /// Reads the next resource leaf from the InputBuffer.

-                  /// Returns the size of a resource lead.

-//                unsigned int size() const;

-

-                  /// Returns the resource data of this resource leaf.

-                  std::vector<byte> getData() const; // EXPORT

-                  /// Sets the resource data of this resource leaf.

-                  void setData(const std::vector<byte>& vData); // EXPORT

-

-                  /// Returns the OffsetToData value of this resource leaf.

-                  dword getOffsetToData() const; // EXPORT

-                  /// Returns the Size value of this resource leaf.

-                  dword getSize() const; // EXPORT

-                  /// Returns the CodePage value of this resource leaf.

-                  dword getCodePage() const; // EXPORT

-                  /// Returns the Reserved value of this resource leaf.

-                  dword getReserved() const; // EXPORT

-                  

-                  /// Sets the OffsetToData value of this resource leaf.

-                  void setOffsetToData(dword dwValue); // EXPORT

-                  /// Sets the Size value of this resource leaf.

-                  void setSize(dword dwValue); // EXPORT

-                  /// Sets the CodePage value of this resource leaf.

-                  void setCodePage(dword dwValue); // EXPORT

-                  /// Sets the Reserved value of this resource leaf.

-                  void setReserved(dword dwValue); // EXPORT

-        };

-        

-        /// ResourceNodes represent the nodes in the resource tree.

-        class ResourceNode : public ResourceElement

-        {

-                friend class ResourceChild;

-                friend class ResourceDirectory;

-                template<typename T> friend struct fixNumberOfEntries;

-                

-                /// The node's children.

-                std::vector<ResourceChild> children;

-                /// The node's header. Equivalent to IMAGE_RESOURCE_DIRECTORY from the Win32 API.

-                PELIB_IMAGE_RESOURCE_DIRECTORY header;

-                

-                protected:

-                  /// Reads the next resource node.

-                  int read(InputBuffer& inpBuffer, unsigned int uiOffset, unsigned int rva/*, const std::string&*/);

-                  /// Writes the next resource node into the OutputBuffer.

-                  void rebuild(OutputBuffer&, unsigned int& uiOffset, unsigned int uiRva, const std::string&) const;

-                  

-                public:

-                  /// Indicates if the resource element is a leaf or a node.

-                  bool isLeaf() const; // EXPORT

-                  /// Corrects erroneous valeus in the ResourceNode.

-                  void makeValid(); // EXPORT

-                  

-                  /// Returns the node's number of children.

-                  unsigned int getNumberOfChildren() const; // EXPORT

-                  /// Adds another child to node.

-                  void addChild(); // EXPORT

-                  /// Returns a node's child.

-                  ResourceElement* getChild(unsigned int uiIndex); // EXPORT

-                  /// Removes a node's child.

-                  void removeChild(unsigned int uiIndex); // EXPORT

-                  

-                  /// Returns the name of one of the node's children.

-                  std::string getChildName(unsigned int uiIndex) const; // EXPORT

-                  /// Returns the Name value of one of the node's children.

-                  dword getOffsetToChildName(unsigned int uiIndex) const; // EXPORT

-                  /// Returns the OffsetToData value of one of the node's children.

-                  dword getOffsetToChildData(unsigned int uiIndex) const; // EXPORT

-                  

-                  /// Sets the name of one of the node's children.

-                  void setChildName(unsigned int uiIndex, const std::string& strNewName); // EXPORT

-                  /// Sets the Name value of one of the node's children.

-                  void setOffsetToChildName(unsigned int uiIndex, dword dwNewOffset); // EXPORT

-                  /// Sets the OffsetToData value of one of the node's children.

-                  void setOffsetToChildData(unsigned int uiIndex, dword dwNewOffset); // EXPORT

-                  

-                  /// Returns the node's Characteristics value.

-                  dword getCharacteristics() const; // EXPORT

-                  /// Returns the node's TimeDateStamp value.

-                  dword getTimeDateStamp() const; // EXPORT

-                  /// Returns the node's MajorVersion value.

-                  word getMajorVersion() const; // EXPORT

-                  /// Returns the node's MinorVersion value.

-                  word getMinorVersion() const; // EXPORT

-                  /// Returns the node's NumberOfNamedEntries value.

-                  word getNumberOfNamedEntries() const; // EXPORT

-                  /// Returns the node's NumberOfIdEntries value.

-                  word getNumberOfIdEntries() const; // EXPORT

-                  

-                  /// Sets the node's Characteristics value.

-                  void setCharacteristics(dword value); // EXPORT

-                  /// Sets the node's TimeDateStamp value.

-                  void setTimeDateStamp(dword value); // EXPORT

-                  /// Sets the node's MajorVersion value.

-                  void setMajorVersion(word value); // EXPORT

-                  /// Sets the node's MinorVersion value.

-                  void setMinorVersion(word value); // EXPORT

-                  /// Sets the node's NumberOfNamedEntries value.

-                  void setNumberOfNamedEntries(word value); // EXPORT

-                  /// Sets the node's NumberOfIdEntries value.

-                  void setNumberOfIdEntries(word value); // EXPORT

-                  

-                  /// Returns the size of a resource node.

-//              unsigned int size() const;

-        };

-

-        /// Auxiliary functor which is used to search through the resource tree.

-        /**

-        * Traits class for the template functions of ResourceDirectory.

-        * It's used to find out which function to use when searching for resource nodes or resource leafs

-        * in a node's children vector.

-        **/

-        template<typename T>

-        struct ResComparer

-        {

-                /// Pointer to a member function of ResourceChild

-                typedef bool(ResourceChild::*CompFunc)(T) const;

-                 

-                /// Return 0 for all unspecialized versions of ResComparer.

-                static CompFunc comp();

-        };

-

-        /// Auxiliary functor which is used to search through the resource tree.

-        /**

-        * ResComparer<dword> is used when a resource element is searched for by ID.

-        **/

-        template<>

-        struct ResComparer<dword>

-        {

-                /// Pointer to a member function of ResourceChild

-                typedef bool(ResourceChild::*CompFunc)(dword) const;

-                 

-                /// Return the address of the ResourceChild member function that compares the ids of resource elements.

-                static CompFunc comp()

-                {

-                        return &ResourceChild::equalId;

-                }

-        };

-

-        /// Auxiliary functor which is used to search through the resource tree.

-        /**

-        * This specializd version of ResComparer is used when a resource element is searched for by name.

-        **/

-        template<>

-        struct ResComparer<std::string>

-        {

-                /// Pointer to a member function of ResourceChild

-                typedef bool(ResourceChild::*CompFunc)(std::string) const;

-                 

-                /// Return the address of the ResourceChild member function that compares the names of resource elements.

-                static CompFunc comp()

-                {

-                        return &ResourceChild::equalName;

-                }

-        };

-

-        /// Unspecialized function that's used as base template for the specialized versions below.

-        template<typename T>

-        struct fixNumberOfEntries

-        {

-                /// Fixes a resource node's header.

-                static void fix(ResourceNode*);

-        };

-                  

-        /// Fixes NumberOfIdEntries value of a node.

-        template<>

-        struct fixNumberOfEntries<dword>

-        {

-                /// Fixes a resource node's NumberOfIdEntries value.

-                static void fix(ResourceNode* node)

-                {

-                        node->header.NumberOfIdEntries = (unsigned int)node->children.size() - std::count_if(node->children.begin(), node->children.end(), std::mem_fun_ref(&ResourceChild::isNamedResource));

-                }

-        };

-

-        /// Fixes NumberOfNamedEntries value of a node.

-        template<>

-        struct fixNumberOfEntries<std::string>

-        {

-                /// Fixes a resource node's NumberOfNamedEntries value.

-                static void fix(ResourceNode* node)

-                {

-                        node->header.NumberOfNamedEntries = static_cast<PeLib::word>(std::count_if(node->children.begin(), node->children.end(), std::mem_fun_ref(&ResourceChild::isNamedResource)));

-                }

-        };

-        

-        /// Class that represents the resource directory of a PE file.    

-        /**

-        * The class ResourceDirectory represents the resource directory of a PE file. This class is fundamentally

-        * different from the other classes of the PeLib library due to the structure of the ResourceDirectory.

-        * For once, it's possible to manipulate the ResourceDirectory through a set of "high level" functions and

-        * and through a set of "low level" functions. The "high level" functions are the functions inside the

-        * ResourceDirectory class with the exception of getRoot.<br><br>

-        * getRoot on the other hand is the first "low level" function. Use it to retrieve the root node of the

-        * resource tree. Then you can traverse through the tree and manipulate individual nodes and leafs

-        * directly using the functions provided by the classes ResourceNode and ResourceLeaf.<br><br>

-        * There's another difference between the ResourceDirectory class and the other PeLib classes, which is

-        * once again caused by the special structure of the PE resource directory. The nodes of the resource

-        * tree must be in a certain order. Manipulating the resource tree does not directly sort the nodes

-        * correctly as this would cause more trouble than it fixes. That means it's your responsibility to 

-        * fix the resource tree after manipulating it. PeLib makes the job easy for you, just call the

-        * ResourceDirectory::makeValid function.<br><br>

-        * You might also wonder why there's no size() function in this class. I did not forget it. It's just

-        * that it's impossible to calculate the size of the resource directory without rebuilding it. So why

-        * should PeLib do this if you can do it just as easily by calling rebuild() and then checking the length

-        * of the returned vector.<br><br>

-        * There are also different ways to serialize (rebuild) the resource tree as it's not a fixed structure

-        * that can easily be minimized like most other PE directories.<br><br>

-        * This means it's entirely possible that the resource tree you read from a file differs from the one

-        * PeLib creates. This might cause a minor issue. The original resource tree might be smaller (due to

-        * different padding) so it's crucial that you check if there's enough space in the original resource

-        * directory before you write the rebuilt resource directory back to the file.

-        **/

-        class ResourceDirectory

-        {

-                private:

-                  /// The root node of the resource directory.

-                  ResourceNode m_rnRoot;

-

-                  // Prepare for some crazy syntax below to make Digital Mars happy.

-                  

-                  /// Retrieves an iterator to a specified resource child.

-                  template<typename S, typename T>

-                  std::vector<ResourceChild>::const_iterator locateResourceT(S restypeid, T resid) const;

-                  

-                  /// Retrieves an iterator to a specified resource child.

-                  template<typename S, typename T>

-                  std::vector<ResourceChild>::iterator locateResourceT(S restypeid, T resid);

-                  

-                  /// Adds a new resource.

-                  template<typename S, typename T>

-                  int addResourceT(S restypeid, T resid, ResourceChild& rc);

-                  

-                  /// Removes new resource.

-                  template<typename S, typename T>

-                  int removeResourceT(S restypeid, T resid);

-                  

-                  /// Returns the data of a resource.

-                  template<typename S, typename T>

-                  int getResourceDataT(S restypeid, T resid, std::vector<byte>& data) const;

-                  

-                  /// Sets the data of a resource.

-                  template<typename S, typename T>

-                  int setResourceDataT(S restypeid, T resid, std::vector<byte>& data);

-                  

-                  /// Returns the ID of a resource.

-                  template<typename S, typename T>

-                  dword getResourceIdT(S restypeid, T resid) const;

-                  

-                  /// Sets the ID of a resource.

-                  template<typename S, typename T>

-                  int setResourceIdT(S restypeid, T resid, dword dwNewResId);

-                  

-                  /// Returns the name of a resource.

-                  template<typename S, typename T>

-                  std::string getResourceNameT(S restypeid, T resid) const;

-                  

-                  /// Sets the name of a resource.

-                  template<typename S, typename T>

-                  int setResourceNameT(S restypeid, T resid, std::string strNewResName);

-                  

-                public:

-                  ResourceNode* getRoot();

-                  /// Corrects a erroneous resource directory.

-                  void makeValid();

-                  /// Reads the resource directory from a file.

-                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, unsigned int uiResDirRva);

-                  /// Rebuilds the resource directory.

-                  void rebuild(std::vector<byte>& vBuffer, unsigned int uiRva) const;

-                  /// Returns the size of the rebuilt resource directory.

-//                unsigned int size() const;

-                  /// Writes the resource directory to a file.

-                  int write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva) const;

-

-                  /// Adds a new resource type.

-                  int addResourceType(dword dwResTypeId);

-                  /// Adds a new resource type.

-                  int addResourceType(const std::string& strResTypeName);

-                  

-                  /// Removes a resource type and all of it's resources.

-                  int removeResourceType(dword dwResTypeId);

-                  /// Removes a resource type and all of it's resources.

-                  int removeResourceType(const std::string& strResTypeName);

-                  

-                  /// Removes a resource type and all of it's resources.

-                  int removeResourceTypeByIndex(unsigned int uiIndex);

-                  

-                  /// Adds a new resource.

-                  int addResource(dword dwResTypeId, dword dwResId);

-                  /// Adds a new resource.

-                  int addResource(dword dwResTypeId, const std::string& strResName);

-                  /// Adds a new resource.

-                  int addResource(const std::string& strResTypeName, dword dwResId);

-                  /// Adds a new resource.

-                  int addResource(const std::string& strResTypeName, const std::string& strResName);

-

-                  /// Removes a resource.

-                  int removeResource(dword dwResTypeId, dword dwResId);

-                  /// Removes a resource.

-                  int removeResource(dword dwResTypeId, const std::string& strResName);

-                  /// Removes a resource.

-                  int removeResource(const std::string& strResTypeName, dword dwResId);

-                  /// Removes a resource.

-                  int removeResource(const std::string& strResTypeName, const std::string& strResName);

-

-                  /// Returns the number of resource types.

-                  unsigned int getNumberOfResourceTypes() const;

-                  

-                  /// Returns the ID of a resource type.

-                  dword getResourceTypeIdByIndex(unsigned int uiIndex) const;

-                  /// Returns the name of a resource type.

-                  std::string getResourceTypeNameByIndex(unsigned int uiIndex) const;

-                  

-                  /// Converts a resource type ID to an index.

-                  int resourceTypeIdToIndex(dword dwResTypeId) const;

-                  /// Converts a resource type name to an index.

-                  int resourceTypeNameToIndex(const std::string& strResTypeName) const;

-                  

-                  /// Returns the number of resources of a certain resource type.

-                  unsigned int getNumberOfResources(dword dwId) const;

-                  /// Returns the number of resources of a certain resource type.

-                  unsigned int getNumberOfResources(const std::string& strResTypeName) const;

-                  

-                  /// Returns the number of resources of a certain resource type.

-                  unsigned int getNumberOfResourcesByIndex(unsigned int uiIndex) const;

-                  

-                  /// Returns the data of a certain resource.

-                  void getResourceData(dword dwResTypeId, dword dwResId, std::vector<byte>& data) const;

-                  /// Returns the data of a certain resource.

-                  void getResourceData(dword dwResTypeId, const std::string& strResName, std::vector<byte>& data) const;

-                  /// Returns the data of a certain resource.

-                  void getResourceData(const std::string& strResTypeName, dword dwResId, std::vector<byte>& data) const;

-                  /// Returns the data of a certain resource.

-                  void getResourceData(const std::string& strResTypeName, const std::string& strResName, std::vector<byte>& data) const;

-                  

-                  /// Returns the data of a certain resource.

-                  void getResourceDataByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, std::vector<byte>& data) const;

-                  

-                  /// Sets the data of a certain resource.

-                  void setResourceData(dword dwResTypeId, dword dwResId, std::vector<byte>& data);

-                  /// Sets the data of a certain resource.

-                  void setResourceData(dword dwResTypeId, const std::string& strResName, std::vector<byte>& data);

-                  /// Sets the data of a certain resource.

-                  void setResourceData(const std::string& strResTypeName, dword dwResId, std::vector<byte>& data);

-                  /// Sets the data of a certain resource.

-                  void setResourceData(const std::string& strResTypeName, const std::string& strResName, std::vector<byte>& data);

-                  

-                  /// Sets the data of a certain resource.

-                  void setResourceDataByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, std::vector<byte>& data);

-

-                  /// Returns the ID of a certain resource.

-                  dword getResourceId(dword dwResTypeId, const std::string& strResName) const;

-                  /// Returns the ID of a certain resource.

-                  dword getResourceId(const std::string& strResTypeName, const std::string& strResName) const;

-                  

-                  /// Returns the ID of a certain resource.

-                  dword getResourceIdByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex) const;

-                  

-                  /// Sets the ID of a certain resource.

-                  void setResourceId(dword dwResTypeId, dword dwResId, dword dwNewResId);

-                  /// Sets the ID of a certain resource.

-                  void setResourceId(dword dwResTypeId, const std::string& strResName, dword dwNewResId);

-                  /// Sets the ID of a certain resource.

-                  void setResourceId(const std::string& strResTypeName, dword dwResId, dword dwNewResId);

-                  /// Sets the ID of a certain resource.

-                  void setResourceId(const std::string& strResTypeName, const std::string& strResName, dword dwNewResId);

-                  

-                  /// Sets the ID of a certain resource.

-                  void setResourceIdByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, dword dwNewResId);

-                  

-                  /// Returns the name of a certain resource.

-                  std::string getResourceName(dword dwResTypeId, dword dwResId) const;

-                  /// Returns the name of a certain resource.

-                  std::string getResourceName(const std::string& strResTypeName, dword dwResId) const;

-                  

-                  /// Returns the name of a certain resource.

-                  std::string getResourceNameByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex) const;

-                  

-                  /// Sets the name of a certain resource.

-                  void setResourceName(dword dwResTypeId, dword dwResId, const std::string& strNewResName);

-                  /// Sets the name of a certain resource.

-                  void setResourceName(dword dwResTypeId, const std::string& strResName, const std::string& strNewResName);

-                  /// Sets the name of a certain resource.

-                  void setResourceName(const std::string& strResTypeName, dword dwResId, const std::string& strNewResName);

-                  /// Sets the name of a certain resource.

-                  void setResourceName(const std::string& strResTypeName, const std::string& strResName, const std::string& strNewResName);

-                  

-                  /// Sets the name of a certain resource.

-                  void setResourceNameByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, const std::string& strNewResName);

-        };

-        

-        /**

-        * Looks through the entire resource tree and returns a const_iterator to the resource specified

-        * by the parameters.

-        * @param restypeid Identifier of the resource type (either ID or name).

-        * @param resid Identifier of the resource (either ID or name).

-        * @return A const_iterator to the specified resource.

-        **/

-        template<typename S, typename T>

-        std::vector<ResourceChild>::const_iterator ResourceDirectory::locateResourceT(S restypeid, T resid) const

-        {

-                typedef bool(ResourceChild::*CompFunc1)(S) const;

-                typedef bool(ResourceChild::*CompFunc2)(T) const;

-                

-                CompFunc1 comp1 = ResComparer<S>::comp();

-                CompFunc2 comp2 = ResComparer<T>::comp();

-

-                std::vector<ResourceChild>::const_iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(comp1), restypeid));

-                if (Iter == m_rnRoot.children.end())

-                {

-                        return Iter;

-                }

-                

-                ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);

-                std::vector<ResourceChild>::const_iterator ResIter = std::find_if(currNode->children.begin(), currNode->children.end(), std::bind2nd(std::mem_fun_ref(comp2), resid));

-                if (ResIter == currNode->children.end())

-                {

-                        return ResIter;

-                }

-                        

-                return ResIter;

-        }

-        

-        /**

-        * Looks through the entire resource tree and returns an iterator to the resource specified

-        * by the parameters.

-        * @param restypeid Identifier of the resource type (either ID or name).

-        * @param resid Identifier of the resource (either ID or name).

-        * @return An iterator to the specified resource.

-        **/

-        template<typename S, typename T>

-        std::vector<ResourceChild>::iterator ResourceDirectory::locateResourceT(S restypeid, T resid)

-        {

-                typedef bool(ResourceChild::*CompFunc1)(S) const;

-                typedef bool(ResourceChild::*CompFunc2)(T) const;

-                

-                CompFunc1 comp1 = ResComparer<S>::comp();

-                CompFunc2 comp2 = ResComparer<T>::comp();

-

-                std::vector<ResourceChild>::iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(comp1), restypeid));

-                if (Iter == m_rnRoot.children.end())

-                {

-                        return Iter;

-                }

-                

-                ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);

-                std::vector<ResourceChild>::iterator ResIter = std::find_if(currNode->children.begin(), currNode->children.end(), std::bind2nd(std::mem_fun_ref(comp2), resid));

-                if (ResIter == currNode->children.end())

-                {

-                        return ResIter;

-                }

-                        

-                return ResIter;

-        }

-        

-        /**

-        * Adds a new resource, resource type and ID are specified by the parameters.

-        * @param restypeid Identifier of the resource type (either ID or name).

-        * @param resid Identifier of the resource (either ID or name).

-        * @param rc ResourceChild that will be added.

-        **/

-        template<typename S, typename T>

-        int ResourceDirectory::addResourceT(S restypeid, T resid, ResourceChild& rc)

-        {

-                typedef bool(ResourceChild::*CompFunc1)(S) const;

-                typedef bool(ResourceChild::*CompFunc2)(T) const;

-                

-                CompFunc1 comp1 = ResComparer<S>::comp();

-                CompFunc2 comp2 = ResComparer<T>::comp();

-

-                std::vector<ResourceChild>::iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(comp1), restypeid));

-                if (Iter == m_rnRoot.children.end())

-                {

-                        return 1;

-                        // throw Exceptions::ResourceTypeDoesNotExist(ResourceDirectoryId, __LINE__);

-                }

-                

-                ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);

-                std::vector<ResourceChild>::iterator ResIter = std::find_if(currNode->children.begin(), currNode->children.end(), std::bind2nd(std::mem_fun_ref(comp2), resid));

-                if (ResIter != currNode->children.end())

-                {

-                        return 1;

-//                      throw Exceptions::EntryAlreadyExists(ResourceDirectoryId, __LINE__);

-                }

-                                

-                rc.child = new ResourceNode;

-                ResourceChild rlnew;

-                rlnew.child = new ResourceLeaf;

-                ResourceNode* currNode2 = static_cast<ResourceNode*>(rc.child);

-                currNode2->children.push_back(rlnew);

-                currNode->children.push_back(rc);

-                

-                fixNumberOfEntries<T>::fix(currNode);

-                fixNumberOfEntries<T>::fix(currNode2);

-                

-                return 0;

-        }

-        

-        /**

-        * Removes a resource, resource type and ID are specified by the parameters.

-        * @param restypeid Identifier of the resource type (either ID or name).

-        * @param resid Identifier of the resource (either ID or name).

-        **/

-        template<typename S, typename T>

-        int ResourceDirectory::removeResourceT(S restypeid, T resid)

-        {

-                typedef bool(ResourceChild::*CompFunc1)(S) const;

-                typedef bool(ResourceChild::*CompFunc2)(T) const;

-                

-                CompFunc1 comp1 = ResComparer<S>::comp();

-                CompFunc2 comp2 = ResComparer<T>::comp();

-                

-                std::vector<ResourceChild>::iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(comp1), restypeid));

-                if (Iter == m_rnRoot.children.end())

-                {

-                        return 1;

-                        //throw Exceptions::ResourceTypeDoesNotExist(ResourceDirectoryId, __LINE__);

-                }

-                

-                ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);

-                std::vector<ResourceChild>::iterator ResIter = std::find_if(currNode->children.begin(), currNode->children.end(), std::bind2nd(std::mem_fun_ref(comp2), resid));

-                if (ResIter == currNode->children.end())

-                {

-                        return 1;

-                        // throw Exceptions::InvalidName(ResourceDirectoryId, __LINE__);

-                }

-                        

-                currNode->children.erase(ResIter);

-                

-                fixNumberOfEntries<T>::fix(currNode);

-                

-                return 0;

-        }

-        

-        /**

-        * Returns the data of a resource, resource type and ID are specified by the parameters.

-        * @param restypeid Identifier of the resource type (either ID or name).

-        * @param resid Identifier of the resource (either ID or name).

-        * @param data The data of the resource will be written into this vector.

-        **/

-        template<typename S, typename T>

-        int ResourceDirectory::getResourceDataT(S restypeid, T resid, std::vector<byte>& data) const

-        {

-                std::vector<ResourceChild>::const_iterator ResIter = locateResourceT(restypeid, resid);

-                ResourceNode* currNode = static_cast<ResourceNode*>(ResIter->child);

-                ResourceLeaf* currLeaf = static_cast<ResourceLeaf*>(currNode->children[0].child);

-                data.assign(currLeaf->m_data.begin(), currLeaf->m_data.end());

-                

-                return 0;

-        }

-        

-        /**

-        * Sets the data of a resource, resource type and ID are specified by the parameters.

-        * @param restypeid Identifier of the resource type (either ID or name).

-        * @param resid Identifier of the resource (either ID or name).

-        * @param data The new data of the resource is taken from this vector.

-        **/

-        template<typename S, typename T>

-        int ResourceDirectory::setResourceDataT(S restypeid, T resid, std::vector<byte>& data)

-        {

-                std::vector<ResourceChild>::iterator ResIter = locateResourceT(restypeid, resid);

-                ResourceNode* currNode = static_cast<ResourceNode*>(ResIter->child);

-                ResourceLeaf* currLeaf = static_cast<ResourceLeaf*>(currNode->children[0].child);

-                currLeaf->m_data.assign(data.begin(), data.end());

-                

-                return 0;

-        }

-        

-        /**

-        * Returns the id of a resource, resource type and ID are specified by the parameters.

-        * Note: Calling this function with resid == the ID of the resource makes no sense at all.

-        * @param restypeid Identifier of the resource type (either ID or name).

-        * @param resid Identifier of the resource (either ID or name).

-        * @return The ID of the specified resource.

-        **/

-        template<typename S, typename T>

-        dword ResourceDirectory::getResourceIdT(S restypeid, T resid) const

-        {

-                std::vector<ResourceChild>::const_iterator ResIter = locateResourceT(restypeid, resid);

-                return ResIter->entry.irde.Name;

-        }

-        

-        /**

-        * Sets the id of a resource, resource type and ID are specified by the parameters.

-        * @param restypeid Identifier of the resource type (either ID or name).

-        * @param resid Identifier of the resource (either ID or name).

-        * @param dwNewResId New ID of the resource.

-        **/

-        template<typename S, typename T>

-        int ResourceDirectory::setResourceIdT(S restypeid, T resid, dword dwNewResId)

-        {

-                std::vector<ResourceChild>::iterator ResIter = locateResourceT(restypeid, resid);

-                ResIter->entry.irde.Name = dwNewResId;

-                return 0;

-        }

-                  

-        /**

-        * Returns the name of a resource, resource type and ID are specified by the parameters.

-        * Note: Calling this function with resid == the name of the resource makes no sense at all.

-        * @param restypeid Identifier of the resource type (either ID or name).

-        * @param resid Identifier of the resource (either ID or name).

-        * @return The name of the specified resource.

-        **/

-        template<typename S, typename T>

-        std::string ResourceDirectory::getResourceNameT(S restypeid, T resid) const

-        {

-                std::vector<ResourceChild>::const_iterator ResIter = locateResourceT(restypeid, resid);

-                return ResIter->entry.wstrName;

-        }

-                  

-        /**

-        * Sets the name of a resource, resource type and ID are specified by the parameters.

-        * @param restypeid Identifier of the resource type (either ID or name).

-        * @param resid Identifier of the resource (either ID or name).

-        * @param strNewResName The new name of the resource.

-        **/

-        template<typename S, typename T>

-        int ResourceDirectory::setResourceNameT(S restypeid, T resid, std::string strNewResName)

-        {

-                std::vector<ResourceChild>::iterator ResIter = locateResourceT(restypeid, resid);

-                ResIter->entry.wstrName = strNewResName;

-                

-                return 0;

-        }

-}

-

-#endif

+/*
+* ResourceDirectory.cpp - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#ifndef RESOURCEDIRECTORY_H
+#define RESOURCEDIRECTORY_H
+
+#include "PeLibInc.h"
+
+namespace PeLib
+{
+        class ResourceElement;
+        
+        /// The class ResourceChild is used to store information about a resource node.
+        class ResourceChild
+        {
+                friend class ResourceElement;
+                friend class ResourceDirectory;
+                friend class ResourceNode;
+                friend class ResourceLeaf;
+                
+                /// Stores name and offset of a resource node.
+                PELIB_IMG_RES_DIR_ENTRY entry;
+                /// A pointer to one of the node's child nodes.
+                ResourceElement* child;
+                
+                public:
+                  /// Function which compares a resource ID to the node's resource ID.
+                  bool equalId(dword wId) const; // EXPORT
+                  /// Function which compares a string to the node's resource name.
+                  bool equalName(std::string strName) const; // EXPORT
+                  /// Predicate that determines if a child is identified by name or by ID.
+                  bool isNamedResource() const; // EXPORT
+                  /// Used for sorting a node's children.
+                  bool operator<(const ResourceChild& rc) const; // EXPORT
+                  /// Returns the size of a resource child.
+//              unsigned int size() const;
+
+                  /// Standard constructor. Does absolutely nothing.
+                  ResourceChild();
+                  /// Makes a deep copy of a ResourceChild object.
+                  ResourceChild(const ResourceChild& rhs);
+                  /// Makes a deep copy of a ResourceChild object.
+                  ResourceChild& operator=(const ResourceChild& rhs);
+                  /// Deletes a ResourceChild object.
+                  ~ResourceChild();
+        };
+        
+        /// Base class for ResourceNode and ResourceLeaf, the elements of the resource tree.
+        /// \todo write
+        class ResourceElement
+        {
+                friend class ResourceChild;
+                friend class ResourceNode;
+                friend class ResourceLeaf;
+                
+                protected:
+                  /// Stores RVA of the resource element in the file.
+                  unsigned int uiElementRva;
+                
+                  /// Reads the next resource element from the InputBuffer.
+                  virtual int read(InputBuffer&, unsigned int, unsigned int/*, const std::string&*/) = 0;
+                  /// Writes the next resource element into the OutputBuffer.
+                  virtual void rebuild(OutputBuffer&, unsigned int&, unsigned int, const std::string&) const = 0;
+                  
+                public:
+                  /// Returns the RVA of the element in the file.
+                  unsigned int getElementRva() const; // EXPORT
+                  /// Indicates if the resource element is a leaf or a node.
+                  virtual bool isLeaf() const = 0; // EXPORT
+                  /// Corrects erroneous valeus in the ResourceElement.
+                  virtual void makeValid() = 0; // EXPORT
+                  /// Returns the size of a resource element.
+//                virtual unsigned int size() const = 0;
+                  /// Necessary virtual destructor.
+                  virtual ~ResourceElement() {}
+        };
+        
+        /// ResourceLeafs represent the leafs of the resource tree: The actual resources.
+        class ResourceLeaf : public ResourceElement
+        {
+                friend class ResourceChild;
+                friend class ResourceDirectory;
+                template<typename T> friend struct fixNumberOfEntries;
+                
+                private:
+                  /// The resource data.
+                  std::vector<byte> m_data;
+                  /// PeLib equivalent of the Win32 structure IMAGE_RESOURCE_DATA_ENTRY
+                  PELIB_IMAGE_RESOURCE_DATA_ENTRY entry;
+                  
+                protected:
+                  int read(InputBuffer& inpBuffer, unsigned int uiOffset, unsigned int rva/*, const std::string&*/);
+                  /// Writes the next resource leaf into the OutputBuffer.
+                  void rebuild(OutputBuffer&, unsigned int& uiOffset, unsigned int uiRva, const std::string&) const;
+                
+                public:
+                  /// Indicates if the resource element is a leaf or a node.
+                  bool isLeaf() const; // EXPORT
+                  /// Corrects erroneous valeus in the ResourceLeaf.
+                  void makeValid(); // EXPORT
+                  /// Reads the next resource leaf from the InputBuffer.
+                  /// Returns the size of a resource lead.
+//                unsigned int size() const;
+
+                  /// Returns the resource data of this resource leaf.
+                  std::vector<byte> getData() const; // EXPORT
+                  /// Sets the resource data of this resource leaf.
+                  void setData(const std::vector<byte>& vData); // EXPORT
+
+                  /// Returns the OffsetToData value of this resource leaf.
+                  dword getOffsetToData() const; // EXPORT
+                  /// Returns the Size value of this resource leaf.
+                  dword getSize() const; // EXPORT
+                  /// Returns the CodePage value of this resource leaf.
+                  dword getCodePage() const; // EXPORT
+                  /// Returns the Reserved value of this resource leaf.
+                  dword getReserved() const; // EXPORT
+                  
+                  /// Sets the OffsetToData value of this resource leaf.
+                  void setOffsetToData(dword dwValue); // EXPORT
+                  /// Sets the Size value of this resource leaf.
+                  void setSize(dword dwValue); // EXPORT
+                  /// Sets the CodePage value of this resource leaf.
+                  void setCodePage(dword dwValue); // EXPORT
+                  /// Sets the Reserved value of this resource leaf.
+                  void setReserved(dword dwValue); // EXPORT
+        };
+        
+        /// ResourceNodes represent the nodes in the resource tree.
+        class ResourceNode : public ResourceElement
+        {
+                friend class ResourceChild;
+                friend class ResourceDirectory;
+                template<typename T> friend struct fixNumberOfEntries;
+                
+                /// The node's children.
+                std::vector<ResourceChild> children;
+                /// The node's header. Equivalent to IMAGE_RESOURCE_DIRECTORY from the Win32 API.
+                PELIB_IMAGE_RESOURCE_DIRECTORY header;
+                
+                protected:
+                  /// Reads the next resource node.
+                  int read(InputBuffer& inpBuffer, unsigned int uiOffset, unsigned int rva/*, const std::string&*/);
+                  /// Writes the next resource node into the OutputBuffer.
+                  void rebuild(OutputBuffer&, unsigned int& uiOffset, unsigned int uiRva, const std::string&) const;
+                  
+                public:
+                  /// Indicates if the resource element is a leaf or a node.
+                  bool isLeaf() const; // EXPORT
+                  /// Corrects erroneous valeus in the ResourceNode.
+                  void makeValid(); // EXPORT
+                  
+                  /// Returns the node's number of children.
+                  unsigned int getNumberOfChildren() const; // EXPORT
+                  /// Adds another child to node.
+                  void addChild(); // EXPORT
+                  /// Returns a node's child.
+                  ResourceElement* getChild(unsigned int uiIndex); // EXPORT
+                  /// Removes a node's child.
+                  void removeChild(unsigned int uiIndex); // EXPORT
+                  
+                  /// Returns the name of one of the node's children.
+                  std::string getChildName(unsigned int uiIndex) const; // EXPORT
+                  /// Returns the Name value of one of the node's children.
+                  dword getOffsetToChildName(unsigned int uiIndex) const; // EXPORT
+                  /// Returns the OffsetToData value of one of the node's children.
+                  dword getOffsetToChildData(unsigned int uiIndex) const; // EXPORT
+                  
+                  /// Sets the name of one of the node's children.
+                  void setChildName(unsigned int uiIndex, const std::string& strNewName); // EXPORT
+                  /// Sets the Name value of one of the node's children.
+                  void setOffsetToChildName(unsigned int uiIndex, dword dwNewOffset); // EXPORT
+                  /// Sets the OffsetToData value of one of the node's children.
+                  void setOffsetToChildData(unsigned int uiIndex, dword dwNewOffset); // EXPORT
+                  
+                  /// Returns the node's Characteristics value.
+                  dword getCharacteristics() const; // EXPORT
+                  /// Returns the node's TimeDateStamp value.
+                  dword getTimeDateStamp() const; // EXPORT
+                  /// Returns the node's MajorVersion value.
+                  word getMajorVersion() const; // EXPORT
+                  /// Returns the node's MinorVersion value.
+                  word getMinorVersion() const; // EXPORT
+                  /// Returns the node's NumberOfNamedEntries value.
+                  word getNumberOfNamedEntries() const; // EXPORT
+                  /// Returns the node's NumberOfIdEntries value.
+                  word getNumberOfIdEntries() const; // EXPORT
+                  
+                  /// Sets the node's Characteristics value.
+                  void setCharacteristics(dword value); // EXPORT
+                  /// Sets the node's TimeDateStamp value.
+                  void setTimeDateStamp(dword value); // EXPORT
+                  /// Sets the node's MajorVersion value.
+                  void setMajorVersion(word value); // EXPORT
+                  /// Sets the node's MinorVersion value.
+                  void setMinorVersion(word value); // EXPORT
+                  /// Sets the node's NumberOfNamedEntries value.
+                  void setNumberOfNamedEntries(word value); // EXPORT
+                  /// Sets the node's NumberOfIdEntries value.
+                  void setNumberOfIdEntries(word value); // EXPORT
+                  
+                  /// Returns the size of a resource node.
+//              unsigned int size() const;
+        };
+
+        /// Auxiliary functor which is used to search through the resource tree.
+        /**
+        * Traits class for the template functions of ResourceDirectory.
+        * It's used to find out which function to use when searching for resource nodes or resource leafs
+        * in a node's children vector.
+        **/
+        template<typename T>
+        struct ResComparer
+        {
+                /// Pointer to a member function of ResourceChild
+                typedef bool(ResourceChild::*CompFunc)(T) const;
+                 
+                /// Return 0 for all unspecialized versions of ResComparer.
+                static CompFunc comp();
+        };
+
+        /// Auxiliary functor which is used to search through the resource tree.
+        /**
+        * ResComparer<dword> is used when a resource element is searched for by ID.
+        **/
+        template<>
+        struct ResComparer<dword>
+        {
+                /// Pointer to a member function of ResourceChild
+                typedef bool(ResourceChild::*CompFunc)(dword) const;
+                 
+                /// Return the address of the ResourceChild member function that compares the ids of resource elements.
+                static CompFunc comp()
+                {
+                        return &ResourceChild::equalId;
+                }
+        };
+
+        /// Auxiliary functor which is used to search through the resource tree.
+        /**
+        * This specializd version of ResComparer is used when a resource element is searched for by name.
+        **/
+        template<>
+        struct ResComparer<std::string>
+        {
+                /// Pointer to a member function of ResourceChild
+                typedef bool(ResourceChild::*CompFunc)(std::string) const;
+                 
+                /// Return the address of the ResourceChild member function that compares the names of resource elements.
+                static CompFunc comp()
+                {
+                        return &ResourceChild::equalName;
+                }
+        };
+
+        /// Unspecialized function that's used as base template for the specialized versions below.
+        template<typename T>
+        struct fixNumberOfEntries
+        {
+                /// Fixes a resource node's header.
+                static void fix(ResourceNode*);
+        };
+                  
+        /// Fixes NumberOfIdEntries value of a node.
+        template<>
+        struct fixNumberOfEntries<dword>
+        {
+                /// Fixes a resource node's NumberOfIdEntries value.
+                static void fix(ResourceNode* node)
+                {
+                        node->header.NumberOfIdEntries = (unsigned int)node->children.size() - std::count_if(node->children.begin(), node->children.end(), std::mem_fun_ref(&ResourceChild::isNamedResource));
+                }
+        };
+
+        /// Fixes NumberOfNamedEntries value of a node.
+        template<>
+        struct fixNumberOfEntries<std::string>
+        {
+                /// Fixes a resource node's NumberOfNamedEntries value.
+                static void fix(ResourceNode* node)
+                {
+                        node->header.NumberOfNamedEntries = static_cast<PeLib::word>(std::count_if(node->children.begin(), node->children.end(), std::mem_fun_ref(&ResourceChild::isNamedResource)));
+                }
+        };
+        
+        /// Class that represents the resource directory of a PE file.    
+        /**
+        * The class ResourceDirectory represents the resource directory of a PE file. This class is fundamentally
+        * different from the other classes of the PeLib library due to the structure of the ResourceDirectory.
+        * For once, it's possible to manipulate the ResourceDirectory through a set of "high level" functions and
+        * and through a set of "low level" functions. The "high level" functions are the functions inside the
+        * ResourceDirectory class with the exception of getRoot.<br><br>
+        * getRoot on the other hand is the first "low level" function. Use it to retrieve the root node of the
+        * resource tree. Then you can traverse through the tree and manipulate individual nodes and leafs
+        * directly using the functions provided by the classes ResourceNode and ResourceLeaf.<br><br>
+        * There's another difference between the ResourceDirectory class and the other PeLib classes, which is
+        * once again caused by the special structure of the PE resource directory. The nodes of the resource
+        * tree must be in a certain order. Manipulating the resource tree does not directly sort the nodes
+        * correctly as this would cause more trouble than it fixes. That means it's your responsibility to 
+        * fix the resource tree after manipulating it. PeLib makes the job easy for you, just call the
+        * ResourceDirectory::makeValid function.<br><br>
+        * You might also wonder why there's no size() function in this class. I did not forget it. It's just
+        * that it's impossible to calculate the size of the resource directory without rebuilding it. So why
+        * should PeLib do this if you can do it just as easily by calling rebuild() and then checking the length
+        * of the returned vector.<br><br>
+        * There are also different ways to serialize (rebuild) the resource tree as it's not a fixed structure
+        * that can easily be minimized like most other PE directories.<br><br>
+        * This means it's entirely possible that the resource tree you read from a file differs from the one
+        * PeLib creates. This might cause a minor issue. The original resource tree might be smaller (due to
+        * different padding) so it's crucial that you check if there's enough space in the original resource
+        * directory before you write the rebuilt resource directory back to the file.
+        **/
+        class ResourceDirectory
+        {
+                private:
+                  /// The root node of the resource directory.
+                  ResourceNode m_rnRoot;
+
+                  // Prepare for some crazy syntax below to make Digital Mars happy.
+                  
+                  /// Retrieves an iterator to a specified resource child.
+                  template<typename S, typename T>
+                  std::vector<ResourceChild>::const_iterator locateResourceT(S restypeid, T resid) const;
+                  
+                  /// Retrieves an iterator to a specified resource child.
+                  template<typename S, typename T>
+                  std::vector<ResourceChild>::iterator locateResourceT(S restypeid, T resid);
+                  
+                  /// Adds a new resource.
+                  template<typename S, typename T>
+                  int addResourceT(S restypeid, T resid, ResourceChild& rc);
+                  
+                  /// Removes new resource.
+                  template<typename S, typename T>
+                  int removeResourceT(S restypeid, T resid);
+                  
+                  /// Returns the data of a resource.
+                  template<typename S, typename T>
+                  int getResourceDataT(S restypeid, T resid, std::vector<byte>& data) const;
+                  
+                  /// Sets the data of a resource.
+                  template<typename S, typename T>
+                  int setResourceDataT(S restypeid, T resid, std::vector<byte>& data);
+                  
+                  /// Returns the ID of a resource.
+                  template<typename S, typename T>
+                  dword getResourceIdT(S restypeid, T resid) const;
+                  
+                  /// Sets the ID of a resource.
+                  template<typename S, typename T>
+                  int setResourceIdT(S restypeid, T resid, dword dwNewResId);
+                  
+                  /// Returns the name of a resource.
+                  template<typename S, typename T>
+                  std::string getResourceNameT(S restypeid, T resid) const;
+                  
+                  /// Sets the name of a resource.
+                  template<typename S, typename T>
+                  int setResourceNameT(S restypeid, T resid, std::string strNewResName);
+                  
+                public:
+                  ResourceNode* getRoot();
+                  /// Corrects a erroneous resource directory.
+                  void makeValid();
+                  /// Reads the resource directory from a file.
+                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, unsigned int uiResDirRva);
+                  /// Rebuilds the resource directory.
+                  void rebuild(std::vector<byte>& vBuffer, unsigned int uiRva) const;
+                  /// Returns the size of the rebuilt resource directory.
+//                unsigned int size() const;
+                  /// Writes the resource directory to a file.
+                  int write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva) const;
+
+                  /// Adds a new resource type.
+                  int addResourceType(dword dwResTypeId);
+                  /// Adds a new resource type.
+                  int addResourceType(const std::string& strResTypeName);
+                  
+                  /// Removes a resource type and all of it's resources.
+                  int removeResourceType(dword dwResTypeId);
+                  /// Removes a resource type and all of it's resources.
+                  int removeResourceType(const std::string& strResTypeName);
+                  
+                  /// Removes a resource type and all of it's resources.
+                  int removeResourceTypeByIndex(unsigned int uiIndex);
+                  
+                  /// Adds a new resource.
+                  int addResource(dword dwResTypeId, dword dwResId);
+                  /// Adds a new resource.
+                  int addResource(dword dwResTypeId, const std::string& strResName);
+                  /// Adds a new resource.
+                  int addResource(const std::string& strResTypeName, dword dwResId);
+                  /// Adds a new resource.
+                  int addResource(const std::string& strResTypeName, const std::string& strResName);
+
+                  /// Removes a resource.
+                  int removeResource(dword dwResTypeId, dword dwResId);
+                  /// Removes a resource.
+                  int removeResource(dword dwResTypeId, const std::string& strResName);
+                  /// Removes a resource.
+                  int removeResource(const std::string& strResTypeName, dword dwResId);
+                  /// Removes a resource.
+                  int removeResource(const std::string& strResTypeName, const std::string& strResName);
+
+                  /// Returns the number of resource types.
+                  unsigned int getNumberOfResourceTypes() const;
+                  
+                  /// Returns the ID of a resource type.
+                  dword getResourceTypeIdByIndex(unsigned int uiIndex) const;
+                  /// Returns the name of a resource type.
+                  std::string getResourceTypeNameByIndex(unsigned int uiIndex) const;
+                  
+                  /// Converts a resource type ID to an index.
+                  int resourceTypeIdToIndex(dword dwResTypeId) const;
+                  /// Converts a resource type name to an index.
+                  int resourceTypeNameToIndex(const std::string& strResTypeName) const;
+                  
+                  /// Returns the number of resources of a certain resource type.
+                  unsigned int getNumberOfResources(dword dwId) const;
+                  /// Returns the number of resources of a certain resource type.
+                  unsigned int getNumberOfResources(const std::string& strResTypeName) const;
+                  
+                  /// Returns the number of resources of a certain resource type.
+                  unsigned int getNumberOfResourcesByIndex(unsigned int uiIndex) const;
+                  
+                  /// Returns the data of a certain resource.
+                  void getResourceData(dword dwResTypeId, dword dwResId, std::vector<byte>& data) const;
+                  /// Returns the data of a certain resource.
+                  void getResourceData(dword dwResTypeId, const std::string& strResName, std::vector<byte>& data) const;
+                  /// Returns the data of a certain resource.
+                  void getResourceData(const std::string& strResTypeName, dword dwResId, std::vector<byte>& data) const;
+                  /// Returns the data of a certain resource.
+                  void getResourceData(const std::string& strResTypeName, const std::string& strResName, std::vector<byte>& data) const;
+                  
+                  /// Returns the data of a certain resource.
+                  void getResourceDataByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, std::vector<byte>& data) const;
+                  
+                  /// Sets the data of a certain resource.
+                  void setResourceData(dword dwResTypeId, dword dwResId, std::vector<byte>& data);
+                  /// Sets the data of a certain resource.
+                  void setResourceData(dword dwResTypeId, const std::string& strResName, std::vector<byte>& data);
+                  /// Sets the data of a certain resource.
+                  void setResourceData(const std::string& strResTypeName, dword dwResId, std::vector<byte>& data);
+                  /// Sets the data of a certain resource.
+                  void setResourceData(const std::string& strResTypeName, const std::string& strResName, std::vector<byte>& data);
+                  
+                  /// Sets the data of a certain resource.
+                  void setResourceDataByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, std::vector<byte>& data);
+
+                  /// Returns the ID of a certain resource.
+                  dword getResourceId(dword dwResTypeId, const std::string& strResName) const;
+                  /// Returns the ID of a certain resource.
+                  dword getResourceId(const std::string& strResTypeName, const std::string& strResName) const;
+                  
+                  /// Returns the ID of a certain resource.
+                  dword getResourceIdByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex) const;
+                  
+                  /// Sets the ID of a certain resource.
+                  void setResourceId(dword dwResTypeId, dword dwResId, dword dwNewResId);
+                  /// Sets the ID of a certain resource.
+                  void setResourceId(dword dwResTypeId, const std::string& strResName, dword dwNewResId);
+                  /// Sets the ID of a certain resource.
+                  void setResourceId(const std::string& strResTypeName, dword dwResId, dword dwNewResId);
+                  /// Sets the ID of a certain resource.
+                  void setResourceId(const std::string& strResTypeName, const std::string& strResName, dword dwNewResId);
+                  
+                  /// Sets the ID of a certain resource.
+                  void setResourceIdByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, dword dwNewResId);
+                  
+                  /// Returns the name of a certain resource.
+                  std::string getResourceName(dword dwResTypeId, dword dwResId) const;
+                  /// Returns the name of a certain resource.
+                  std::string getResourceName(const std::string& strResTypeName, dword dwResId) const;
+                  
+                  /// Returns the name of a certain resource.
+                  std::string getResourceNameByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex) const;
+                  
+                  /// Sets the name of a certain resource.
+                  void setResourceName(dword dwResTypeId, dword dwResId, const std::string& strNewResName);
+                  /// Sets the name of a certain resource.
+                  void setResourceName(dword dwResTypeId, const std::string& strResName, const std::string& strNewResName);
+                  /// Sets the name of a certain resource.
+                  void setResourceName(const std::string& strResTypeName, dword dwResId, const std::string& strNewResName);
+                  /// Sets the name of a certain resource.
+                  void setResourceName(const std::string& strResTypeName, const std::string& strResName, const std::string& strNewResName);
+                  
+                  /// Sets the name of a certain resource.
+                  void setResourceNameByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, const std::string& strNewResName);
+        };
+        
+        /**
+        * Looks through the entire resource tree and returns a const_iterator to the resource specified
+        * by the parameters.
+        * @param restypeid Identifier of the resource type (either ID or name).
+        * @param resid Identifier of the resource (either ID or name).
+        * @return A const_iterator to the specified resource.
+        **/
+        template<typename S, typename T>
+        std::vector<ResourceChild>::const_iterator ResourceDirectory::locateResourceT(S restypeid, T resid) const
+        {
+                typedef bool(ResourceChild::*CompFunc1)(S) const;
+                typedef bool(ResourceChild::*CompFunc2)(T) const;
+                
+                CompFunc1 comp1 = ResComparer<S>::comp();
+                CompFunc2 comp2 = ResComparer<T>::comp();
+
+                std::vector<ResourceChild>::const_iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(comp1), restypeid));
+                if (Iter == m_rnRoot.children.end())
+                {
+                        return Iter;
+                }
+                
+                ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);
+                std::vector<ResourceChild>::const_iterator ResIter = std::find_if(currNode->children.begin(), currNode->children.end(), std::bind2nd(std::mem_fun_ref(comp2), resid));
+                if (ResIter == currNode->children.end())
+                {
+                        return ResIter;
+                }
+                        
+                return ResIter;
+        }
+        
+        /**
+        * Looks through the entire resource tree and returns an iterator to the resource specified
+        * by the parameters.
+        * @param restypeid Identifier of the resource type (either ID or name).
+        * @param resid Identifier of the resource (either ID or name).
+        * @return An iterator to the specified resource.
+        **/
+        template<typename S, typename T>
+        std::vector<ResourceChild>::iterator ResourceDirectory::locateResourceT(S restypeid, T resid)
+        {
+                typedef bool(ResourceChild::*CompFunc1)(S) const;
+                typedef bool(ResourceChild::*CompFunc2)(T) const;
+                
+                CompFunc1 comp1 = ResComparer<S>::comp();
+                CompFunc2 comp2 = ResComparer<T>::comp();
+
+                std::vector<ResourceChild>::iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(comp1), restypeid));
+                if (Iter == m_rnRoot.children.end())
+                {
+                        return Iter;
+                }
+                
+                ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);
+                std::vector<ResourceChild>::iterator ResIter = std::find_if(currNode->children.begin(), currNode->children.end(), std::bind2nd(std::mem_fun_ref(comp2), resid));
+                if (ResIter == currNode->children.end())
+                {
+                        return ResIter;
+                }
+                        
+                return ResIter;
+        }
+        
+        /**
+        * Adds a new resource, resource type and ID are specified by the parameters.
+        * @param restypeid Identifier of the resource type (either ID or name).
+        * @param resid Identifier of the resource (either ID or name).
+        * @param rc ResourceChild that will be added.
+        **/
+        template<typename S, typename T>
+        int ResourceDirectory::addResourceT(S restypeid, T resid, ResourceChild& rc)
+        {
+                typedef bool(ResourceChild::*CompFunc1)(S) const;
+                typedef bool(ResourceChild::*CompFunc2)(T) const;
+                
+                CompFunc1 comp1 = ResComparer<S>::comp();
+                CompFunc2 comp2 = ResComparer<T>::comp();
+
+                std::vector<ResourceChild>::iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(comp1), restypeid));
+                if (Iter == m_rnRoot.children.end())
+                {
+                        return 1;
+                        // throw Exceptions::ResourceTypeDoesNotExist(ResourceDirectoryId, __LINE__);
+                }
+                
+                ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);
+                std::vector<ResourceChild>::iterator ResIter = std::find_if(currNode->children.begin(), currNode->children.end(), std::bind2nd(std::mem_fun_ref(comp2), resid));
+                if (ResIter != currNode->children.end())
+                {
+                        return 1;
+//                      throw Exceptions::EntryAlreadyExists(ResourceDirectoryId, __LINE__);
+                }
+                                
+                rc.child = new ResourceNode;
+                ResourceChild rlnew;
+                rlnew.child = new ResourceLeaf;
+                ResourceNode* currNode2 = static_cast<ResourceNode*>(rc.child);
+                currNode2->children.push_back(rlnew);
+                currNode->children.push_back(rc);
+                
+                fixNumberOfEntries<T>::fix(currNode);
+                fixNumberOfEntries<T>::fix(currNode2);
+                
+                return 0;
+        }
+        
+        /**
+        * Removes a resource, resource type and ID are specified by the parameters.
+        * @param restypeid Identifier of the resource type (either ID or name).
+        * @param resid Identifier of the resource (either ID or name).
+        **/
+        template<typename S, typename T>
+        int ResourceDirectory::removeResourceT(S restypeid, T resid)
+        {
+                typedef bool(ResourceChild::*CompFunc1)(S) const;
+                typedef bool(ResourceChild::*CompFunc2)(T) const;
+                
+                CompFunc1 comp1 = ResComparer<S>::comp();
+                CompFunc2 comp2 = ResComparer<T>::comp();
+                
+                std::vector<ResourceChild>::iterator Iter = std::find_if(m_rnRoot.children.begin(), m_rnRoot.children.end(), std::bind2nd(std::mem_fun_ref(comp1), restypeid));
+                if (Iter == m_rnRoot.children.end())
+                {
+                        return 1;
+                        //throw Exceptions::ResourceTypeDoesNotExist(ResourceDirectoryId, __LINE__);
+                }
+                
+                ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);
+                std::vector<ResourceChild>::iterator ResIter = std::find_if(currNode->children.begin(), currNode->children.end(), std::bind2nd(std::mem_fun_ref(comp2), resid));
+                if (ResIter == currNode->children.end())
+                {
+                        return 1;
+                        // throw Exceptions::InvalidName(ResourceDirectoryId, __LINE__);
+                }
+                        
+                currNode->children.erase(ResIter);
+                
+                fixNumberOfEntries<T>::fix(currNode);
+                
+                return 0;
+        }
+        
+        /**
+        * Returns the data of a resource, resource type and ID are specified by the parameters.
+        * @param restypeid Identifier of the resource type (either ID or name).
+        * @param resid Identifier of the resource (either ID or name).
+        * @param data The data of the resource will be written into this vector.
+        **/
+        template<typename S, typename T>
+        int ResourceDirectory::getResourceDataT(S restypeid, T resid, std::vector<byte>& data) const
+        {
+                std::vector<ResourceChild>::const_iterator ResIter = locateResourceT(restypeid, resid);
+                ResourceNode* currNode = static_cast<ResourceNode*>(ResIter->child);
+                ResourceLeaf* currLeaf = static_cast<ResourceLeaf*>(currNode->children[0].child);
+                data.assign(currLeaf->m_data.begin(), currLeaf->m_data.end());
+                
+                return 0;
+        }
+        
+        /**
+        * Sets the data of a resource, resource type and ID are specified by the parameters.
+        * @param restypeid Identifier of the resource type (either ID or name).
+        * @param resid Identifier of the resource (either ID or name).
+        * @param data The new data of the resource is taken from this vector.
+        **/
+        template<typename S, typename T>
+        int ResourceDirectory::setResourceDataT(S restypeid, T resid, std::vector<byte>& data)
+        {
+                std::vector<ResourceChild>::iterator ResIter = locateResourceT(restypeid, resid);
+                ResourceNode* currNode = static_cast<ResourceNode*>(ResIter->child);
+                ResourceLeaf* currLeaf = static_cast<ResourceLeaf*>(currNode->children[0].child);
+                currLeaf->m_data.assign(data.begin(), data.end());
+                
+                return 0;
+        }
+        
+        /**
+        * Returns the id of a resource, resource type and ID are specified by the parameters.
+        * Note: Calling this function with resid == the ID of the resource makes no sense at all.
+        * @param restypeid Identifier of the resource type (either ID or name).
+        * @param resid Identifier of the resource (either ID or name).
+        * @return The ID of the specified resource.
+        **/
+        template<typename S, typename T>
+        dword ResourceDirectory::getResourceIdT(S restypeid, T resid) const
+        {
+                std::vector<ResourceChild>::const_iterator ResIter = locateResourceT(restypeid, resid);
+                return ResIter->entry.irde.Name;
+        }
+        
+        /**
+        * Sets the id of a resource, resource type and ID are specified by the parameters.
+        * @param restypeid Identifier of the resource type (either ID or name).
+        * @param resid Identifier of the resource (either ID or name).
+        * @param dwNewResId New ID of the resource.
+        **/
+        template<typename S, typename T>
+        int ResourceDirectory::setResourceIdT(S restypeid, T resid, dword dwNewResId)
+        {
+                std::vector<ResourceChild>::iterator ResIter = locateResourceT(restypeid, resid);
+                ResIter->entry.irde.Name = dwNewResId;
+                return 0;
+        }
+                  
+        /**
+        * Returns the name of a resource, resource type and ID are specified by the parameters.
+        * Note: Calling this function with resid == the name of the resource makes no sense at all.
+        * @param restypeid Identifier of the resource type (either ID or name).
+        * @param resid Identifier of the resource (either ID or name).
+        * @return The name of the specified resource.
+        **/
+        template<typename S, typename T>
+        std::string ResourceDirectory::getResourceNameT(S restypeid, T resid) const
+        {
+                std::vector<ResourceChild>::const_iterator ResIter = locateResourceT(restypeid, resid);
+                return ResIter->entry.wstrName;
+        }
+                  
+        /**
+        * Sets the name of a resource, resource type and ID are specified by the parameters.
+        * @param restypeid Identifier of the resource type (either ID or name).
+        * @param resid Identifier of the resource (either ID or name).
+        * @param strNewResName The new name of the resource.
+        **/
+        template<typename S, typename T>
+        int ResourceDirectory::setResourceNameT(S restypeid, T resid, std::string strNewResName)
+        {
+                std::vector<ResourceChild>::iterator ResIter = locateResourceT(restypeid, resid);
+                ResIter->entry.wstrName = strNewResName;
+                
+                return 0;
+        }
+}
+
+#endif
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/TlsDirectory.h b/utils/zenutils/libraries/pelib-0.9/pelib/TlsDirectory.h
index ebea929f94..8190e65c3c 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/TlsDirectory.h
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/TlsDirectory.h
@@ -1,304 +1,304 @@
-/*

-* TlsDirectory.h - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#ifndef TLSDIRECTORY_H

-#define TLSDIRECTORY_H

-

-namespace PeLib

-{

-        /// Class that handles the TLS directory.

-        /**

-        * This class handles the TLS (Thread Local Storage) directory.

-        **/

-        template<int bits>

-        class TlsDirectory

-        {

-                private:

-                  PELIB_IMAGE_TLS_DIRECTORY<bits> m_tls; ///< Structure that holds all information about the directory.

-

-                  void read(InputBuffer& inputbuffer);

-

-                public:

-                  /// Reads a file's TLS directory.

-                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize); // EXPORT

-                  int read(unsigned char* buffer, unsigned int buffersize); // EXPORT

-                  /// Rebuilds the TLS directory.

-                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT

-                  /// Returns the size of the TLS Directory.

-                  unsigned int size() const; // EXPORT

-                  /// Writes the TLS directory to a file.

-                  int write(const std::string& strFilename, unsigned int dwOffset) const; // EXPORT

-

-                  /// Returns the StartAddressOfRawData value of the TLS header.

-                  dword getStartAddressOfRawData() const; // EXPORT

-                  /// Returns the EndAddressOfRawData value of the TLS header.

-                  dword getEndAddressOfRawData() const; // EXPORT

-                  /// Returns the AddressOfIndex value of the TLS header.

-                  dword getAddressOfIndex() const; // EXPORT

-                  /// Returns the AddressOfCallBacks value of the TLS header.

-                  dword getAddressOfCallBacks() const; // EXPORT

-                  /// Returns the SizeOfZeroFill value of the TLS header.

-                  dword getSizeOfZeroFill() const; // EXPORT

-                  /// Returns the Characteristics value of the TLS header.

-                  dword getCharacteristics() const; // EXPORT

-                  

-                  /// Sets the StartAddressOfRawData value of the TLS header.

-                  void setStartAddressOfRawData(dword dwValue); // EXPORT

-                  /// Sets the EndAddressOfRawData value of the TLS header.

-                  void setEndAddressOfRawData(dword dwValue); // EXPORT

-                  /// Sets the AddressOfIndex value of the TLS header.

-                  void setAddressOfIndex(dword dwValue); // EXPORT

-                  /// Sets the AddressOfCallBacks value of the TLS header.

-                  void setAddressOfCallBacks(dword dwValue); // EXPORT

-                  /// Sets the SizeOfZeroFill value of the TLS header.

-                  void setSizeOfZeroFill(dword dwValue); // EXPORT

-                  /// Sets the Characteristics value of the TLS header.

-                  void setCharacteristics(dword dwValue); // EXPORT

-        };

-        

-        template<int bits>

-        void TlsDirectory<bits>::read(InputBuffer& inputBuffer)

-        {

-                PELIB_IMAGE_TLS_DIRECTORY<bits> itdCurr;

-                

-                inputBuffer >> itdCurr.StartAddressOfRawData;

-                inputBuffer >> itdCurr.EndAddressOfRawData;

-                inputBuffer >> itdCurr.AddressOfIndex;

-                inputBuffer >> itdCurr.AddressOfCallBacks;

-                inputBuffer >> itdCurr.SizeOfZeroFill;

-                inputBuffer >> itdCurr.Characteristics;

-                

-                std::swap(itdCurr, m_tls);

-        }

-        

-        template<int bits>

-        int TlsDirectory<bits>::read(unsigned char* buffer, unsigned int buffersize)

-        {

-                if (buffersize < PELIB_IMAGE_TLS_DIRECTORY<bits>::size())

-                {

-                        return ERROR_INVALID_FILE;

-                }

-

-                std::vector<byte> vTlsDirectory(buffer, buffer + buffersize);

-                

-                InputBuffer ibBuffer(vTlsDirectory);

-                read(ibBuffer);

-                return NO_ERROR;

-        }

-        

-        /**

-        * Reads a file's TLS directory.

-        * @param strFilename Name of the file.

-        * @param uiOffset File offset of the TLS directory.

-        * @param uiSize Size of the TLS directory.

-        **/

-        template<int bits>

-        int TlsDirectory<bits>::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize)

-        {

-                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);

-                unsigned int ulFileSize = fileSize(ifFile);

-

-                if (!ifFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-                

-                if (ulFileSize < uiOffset + uiSize)

-                {

-                        return ERROR_INVALID_FILE;

-                }

-

-                ifFile.seekg(uiOffset, std::ios::beg);

-

-                std::vector<byte> vTlsDirectory(uiSize);

-                ifFile.read(reinterpret_cast<char*>(&vTlsDirectory[0]), uiSize);

-                

-                InputBuffer ibBuffer(vTlsDirectory);

-                read(ibBuffer);

-                return NO_ERROR;

-        }

-        

-        /**

-        * Rebuilds the current TLS Directory.

-        * @param vBuffer Buffer where the TLS directory will be written to.

-        **/

-        template<int bits>

-        void TlsDirectory<bits>::rebuild(std::vector<byte>& vBuffer) const

-        {

-                OutputBuffer obBuffer(vBuffer);

-                

-                obBuffer << m_tls.StartAddressOfRawData;

-                obBuffer << m_tls.EndAddressOfRawData;

-                obBuffer << m_tls.AddressOfIndex;

-                obBuffer << m_tls.AddressOfCallBacks;

-                obBuffer << m_tls.SizeOfZeroFill;

-                obBuffer << m_tls.Characteristics;

-        }

-

-        /**

-        * Returns the size of the TLS directory. Due to the static nature of this structure the return value

-        * will always be 24.

-        * @return Size in bytes.

-        **/

-        template<int bits>

-        unsigned int TlsDirectory<bits>::size() const

-        {

-                return PELIB_IMAGE_TLS_DIRECTORY<bits>::size();

-        }

-

-        /**

-        * @param strFilename Name of the file.

-        * @param dwOffset File offset the TLS Directory will be written to.

-        **/

-        template<int bits>

-        int TlsDirectory<bits>::write(const std::string& strFilename, unsigned int dwOffset) const

-        {

-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);

-                

-                if (!ofFile)

-                {

-                        ofFile.clear();

-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);

-                }

-                else

-                {

-                        ofFile.close();

-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);

-                }

-

-                if (!ofFile)

-                {

-                        return ERROR_OPENING_FILE;

-                }

-

-                ofFile.seekp(dwOffset, std::ios::beg);

-

-                std::vector<unsigned char> vBuffer;

-                rebuild(vBuffer);

-

-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), vBuffer.size());

-

-                ofFile.close();

-                

-                return NO_ERROR;

-        }

-

-        /**

-        * @return The StartAddressOfRawData value of the TLS directory.

-        **/

-        template<int bits>

-        dword TlsDirectory<bits>::getStartAddressOfRawData() const

-        {

-                return m_tls.StartAddressOfRawData;

-        }

-        

-        /**

-        * @return The EndAddressOfRawData value of the TLS directory.

-        **/

-        template<int bits>

-        dword TlsDirectory<bits>::getEndAddressOfRawData() const

-        {

-                return m_tls.EndAddressOfRawData;

-        }

-        

-        /**

-        * @return The AddressOfIndex value of the TLS directory.

-        **/

-        template<int bits>

-        dword TlsDirectory<bits>::getAddressOfIndex() const

-        {

-                return m_tls.AddressOfIndex;

-        }

-        

-        /**

-        * @return The AddressOfCallBacks value of the TLS directory.

-        **/

-        template<int bits>

-        dword TlsDirectory<bits>::getAddressOfCallBacks() const

-        {

-                return m_tls.AddressOfCallBacks;

-        }

-        

-        /**

-        * @return The SizeOfZeroFill value of the TLS directory.

-        **/

-        template<int bits>

-        dword TlsDirectory<bits>::getSizeOfZeroFill() const

-        {

-                return m_tls.SizeOfZeroFill;

-        }

-        

-        /**

-        * @return The Characteristics value of the TLS directory.

-        **/

-        template<int bits>

-        dword TlsDirectory<bits>::getCharacteristics() const

-        {

-                return m_tls.Characteristics;

-        }

-

-        /**

-        * @param dwValue The new StartAddressOfRawData value of the TLS directory.

-        **/

-        template<int bits>

-        void TlsDirectory<bits>::setStartAddressOfRawData(dword dwValue)

-        {

-                m_tls.StartAddressOfRawData = dwValue;

-        }

-        

-        /**

-        * @param dwValue The new EndAddressOfRawData value of the TLS directory.

-        **/

-        template<int bits>

-        void TlsDirectory<bits>::setEndAddressOfRawData(dword dwValue)

-        {

-                m_tls.EndAddressOfRawData = dwValue;

-        }

-        

-        /**

-        * @param dwValue The new AddressOfIndex value of the TLS directory.

-        **/

-        template<int bits>

-        void TlsDirectory<bits>::setAddressOfIndex(dword dwValue)

-        {

-                m_tls.AddressOfIndex = dwValue;

-        }

-        

-        /**

-        * @param dwValue The new AddressOfCallBacks value of the TLS directory.

-        **/

-        template<int bits>

-        void TlsDirectory<bits>::setAddressOfCallBacks(dword dwValue)

-        {

-                m_tls.AddressOfCallBacks = dwValue;

-        }

-        

-        /**

-        * @param dwValue The new SizeOfZeroFill value of the TLS directory.

-        **/

-        template<int bits>

-        void TlsDirectory<bits>::setSizeOfZeroFill(dword dwValue)

-        {

-                m_tls.SizeOfZeroFill = dwValue;

-        }

-        

-        /**

-        * @param dwValue The new Characteristics value of the TLS directory.

-        **/

-        template<int bits>

-        void TlsDirectory<bits>::setCharacteristics(dword dwValue)

-        {

-                m_tls.Characteristics = dwValue;

-        }

-        

-}

-#endif

+/*
+* TlsDirectory.h - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#ifndef TLSDIRECTORY_H
+#define TLSDIRECTORY_H
+
+namespace PeLib
+{
+        /// Class that handles the TLS directory.
+        /**
+        * This class handles the TLS (Thread Local Storage) directory.
+        **/
+        template<int bits>
+        class TlsDirectory
+        {
+                private:
+                  PELIB_IMAGE_TLS_DIRECTORY<bits> m_tls; ///< Structure that holds all information about the directory.
+
+                  void read(InputBuffer& inputbuffer);
+
+                public:
+                  /// Reads a file's TLS directory.
+                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize); // EXPORT
+                  int read(unsigned char* buffer, unsigned int buffersize); // EXPORT
+                  /// Rebuilds the TLS directory.
+                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT
+                  /// Returns the size of the TLS Directory.
+                  unsigned int size() const; // EXPORT
+                  /// Writes the TLS directory to a file.
+                  int write(const std::string& strFilename, unsigned int dwOffset) const; // EXPORT
+
+                  /// Returns the StartAddressOfRawData value of the TLS header.
+                  dword getStartAddressOfRawData() const; // EXPORT
+                  /// Returns the EndAddressOfRawData value of the TLS header.
+                  dword getEndAddressOfRawData() const; // EXPORT
+                  /// Returns the AddressOfIndex value of the TLS header.
+                  dword getAddressOfIndex() const; // EXPORT
+                  /// Returns the AddressOfCallBacks value of the TLS header.
+                  dword getAddressOfCallBacks() const; // EXPORT
+                  /// Returns the SizeOfZeroFill value of the TLS header.
+                  dword getSizeOfZeroFill() const; // EXPORT
+                  /// Returns the Characteristics value of the TLS header.
+                  dword getCharacteristics() const; // EXPORT
+                  
+                  /// Sets the StartAddressOfRawData value of the TLS header.
+                  void setStartAddressOfRawData(dword dwValue); // EXPORT
+                  /// Sets the EndAddressOfRawData value of the TLS header.
+                  void setEndAddressOfRawData(dword dwValue); // EXPORT
+                  /// Sets the AddressOfIndex value of the TLS header.
+                  void setAddressOfIndex(dword dwValue); // EXPORT
+                  /// Sets the AddressOfCallBacks value of the TLS header.
+                  void setAddressOfCallBacks(dword dwValue); // EXPORT
+                  /// Sets the SizeOfZeroFill value of the TLS header.
+                  void setSizeOfZeroFill(dword dwValue); // EXPORT
+                  /// Sets the Characteristics value of the TLS header.
+                  void setCharacteristics(dword dwValue); // EXPORT
+        };
+        
+        template<int bits>
+        void TlsDirectory<bits>::read(InputBuffer& inputBuffer)
+        {
+                PELIB_IMAGE_TLS_DIRECTORY<bits> itdCurr;
+                
+                inputBuffer >> itdCurr.StartAddressOfRawData;
+                inputBuffer >> itdCurr.EndAddressOfRawData;
+                inputBuffer >> itdCurr.AddressOfIndex;
+                inputBuffer >> itdCurr.AddressOfCallBacks;
+                inputBuffer >> itdCurr.SizeOfZeroFill;
+                inputBuffer >> itdCurr.Characteristics;
+                
+                std::swap(itdCurr, m_tls);
+        }
+        
+        template<int bits>
+        int TlsDirectory<bits>::read(unsigned char* buffer, unsigned int buffersize)
+        {
+                if (buffersize < PELIB_IMAGE_TLS_DIRECTORY<bits>::size())
+                {
+                        return ERROR_INVALID_FILE;
+                }
+
+                std::vector<byte> vTlsDirectory(buffer, buffer + buffersize);
+                
+                InputBuffer ibBuffer(vTlsDirectory);
+                read(ibBuffer);
+                return NO_ERROR;
+        }
+        
+        /**
+        * Reads a file's TLS directory.
+        * @param strFilename Name of the file.
+        * @param uiOffset File offset of the TLS directory.
+        * @param uiSize Size of the TLS directory.
+        **/
+        template<int bits>
+        int TlsDirectory<bits>::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize)
+        {
+                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
+                unsigned int ulFileSize = fileSize(ifFile);
+
+                if (!ifFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+                
+                if (ulFileSize < uiOffset + uiSize)
+                {
+                        return ERROR_INVALID_FILE;
+                }
+
+                ifFile.seekg(uiOffset, std::ios::beg);
+
+                std::vector<byte> vTlsDirectory(uiSize);
+                ifFile.read(reinterpret_cast<char*>(&vTlsDirectory[0]), uiSize);
+                
+                InputBuffer ibBuffer(vTlsDirectory);
+                read(ibBuffer);
+                return NO_ERROR;
+        }
+        
+        /**
+        * Rebuilds the current TLS Directory.
+        * @param vBuffer Buffer where the TLS directory will be written to.
+        **/
+        template<int bits>
+        void TlsDirectory<bits>::rebuild(std::vector<byte>& vBuffer) const
+        {
+                OutputBuffer obBuffer(vBuffer);
+                
+                obBuffer << m_tls.StartAddressOfRawData;
+                obBuffer << m_tls.EndAddressOfRawData;
+                obBuffer << m_tls.AddressOfIndex;
+                obBuffer << m_tls.AddressOfCallBacks;
+                obBuffer << m_tls.SizeOfZeroFill;
+                obBuffer << m_tls.Characteristics;
+        }
+
+        /**
+        * Returns the size of the TLS directory. Due to the static nature of this structure the return value
+        * will always be 24.
+        * @return Size in bytes.
+        **/
+        template<int bits>
+        unsigned int TlsDirectory<bits>::size() const
+        {
+                return PELIB_IMAGE_TLS_DIRECTORY<bits>::size();
+        }
+
+        /**
+        * @param strFilename Name of the file.
+        * @param dwOffset File offset the TLS Directory will be written to.
+        **/
+        template<int bits>
+        int TlsDirectory<bits>::write(const std::string& strFilename, unsigned int dwOffset) const
+        {
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                
+                if (!ofFile)
+                {
+                        ofFile.clear();
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                }
+                else
+                {
+                        ofFile.close();
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                }
+
+                if (!ofFile)
+                {
+                        return ERROR_OPENING_FILE;
+                }
+
+                ofFile.seekp(dwOffset, std::ios::beg);
+
+                std::vector<unsigned char> vBuffer;
+                rebuild(vBuffer);
+
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), vBuffer.size());
+
+                ofFile.close();
+                
+                return NO_ERROR;
+        }
+
+        /**
+        * @return The StartAddressOfRawData value of the TLS directory.
+        **/
+        template<int bits>
+        dword TlsDirectory<bits>::getStartAddressOfRawData() const
+        {
+                return m_tls.StartAddressOfRawData;
+        }
+        
+        /**
+        * @return The EndAddressOfRawData value of the TLS directory.
+        **/
+        template<int bits>
+        dword TlsDirectory<bits>::getEndAddressOfRawData() const
+        {
+                return m_tls.EndAddressOfRawData;
+        }
+        
+        /**
+        * @return The AddressOfIndex value of the TLS directory.
+        **/
+        template<int bits>
+        dword TlsDirectory<bits>::getAddressOfIndex() const
+        {
+                return m_tls.AddressOfIndex;
+        }
+        
+        /**
+        * @return The AddressOfCallBacks value of the TLS directory.
+        **/
+        template<int bits>
+        dword TlsDirectory<bits>::getAddressOfCallBacks() const
+        {
+                return m_tls.AddressOfCallBacks;
+        }
+        
+        /**
+        * @return The SizeOfZeroFill value of the TLS directory.
+        **/
+        template<int bits>
+        dword TlsDirectory<bits>::getSizeOfZeroFill() const
+        {
+                return m_tls.SizeOfZeroFill;
+        }
+        
+        /**
+        * @return The Characteristics value of the TLS directory.
+        **/
+        template<int bits>
+        dword TlsDirectory<bits>::getCharacteristics() const
+        {
+                return m_tls.Characteristics;
+        }
+
+        /**
+        * @param dwValue The new StartAddressOfRawData value of the TLS directory.
+        **/
+        template<int bits>
+        void TlsDirectory<bits>::setStartAddressOfRawData(dword dwValue)
+        {
+                m_tls.StartAddressOfRawData = dwValue;
+        }
+        
+        /**
+        * @param dwValue The new EndAddressOfRawData value of the TLS directory.
+        **/
+        template<int bits>
+        void TlsDirectory<bits>::setEndAddressOfRawData(dword dwValue)
+        {
+                m_tls.EndAddressOfRawData = dwValue;
+        }
+        
+        /**
+        * @param dwValue The new AddressOfIndex value of the TLS directory.
+        **/
+        template<int bits>
+        void TlsDirectory<bits>::setAddressOfIndex(dword dwValue)
+        {
+                m_tls.AddressOfIndex = dwValue;
+        }
+        
+        /**
+        * @param dwValue The new AddressOfCallBacks value of the TLS directory.
+        **/
+        template<int bits>
+        void TlsDirectory<bits>::setAddressOfCallBacks(dword dwValue)
+        {
+                m_tls.AddressOfCallBacks = dwValue;
+        }
+        
+        /**
+        * @param dwValue The new SizeOfZeroFill value of the TLS directory.
+        **/
+        template<int bits>
+        void TlsDirectory<bits>::setSizeOfZeroFill(dword dwValue)
+        {
+                m_tls.SizeOfZeroFill = dwValue;
+        }
+        
+        /**
+        * @param dwValue The new Characteristics value of the TLS directory.
+        **/
+        template<int bits>
+        void TlsDirectory<bits>::setCharacteristics(dword dwValue)
+        {
+                m_tls.Characteristics = dwValue;
+        }
+        
+}
+#endif
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/buffer/InputBuffer.cpp b/utils/zenutils/libraries/pelib-0.9/pelib/buffer/InputBuffer.cpp
index ae2584edb1..579b152659 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/buffer/InputBuffer.cpp
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/buffer/InputBuffer.cpp
@@ -1,58 +1,58 @@
-/*

-* InputBuffer.cpp - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#include "InputBuffer.h"

-

-namespace PeLib

-{

-        unsigned long InputBuffer::get()

-        {

-                return ulIndex;

-        }

-

-        InputBuffer::InputBuffer(std::vector<unsigned char>& vBuffer) : m_vBuffer(vBuffer), ulIndex(0)

-        {

-        }

-

-        const unsigned char* InputBuffer::data() const

-        {

-                return &m_vBuffer[0];

-        }

-

-        unsigned long InputBuffer::size()

-        {

-                return static_cast<unsigned long>(m_vBuffer.size());

-        }

-

-        void InputBuffer::read(char* lpBuffer, unsigned long ulSize)

-        {

-                std::copy(&m_vBuffer[ulIndex], &m_vBuffer[ulIndex + ulSize], lpBuffer);

-                ulIndex += ulSize;

-        }

-

-        void InputBuffer::reset()

-        {

-                m_vBuffer.clear();

-        }

-

-        void InputBuffer::set(unsigned long ulIndex)

-        {

-                this->ulIndex = ulIndex;

-        }

-

-        void InputBuffer::setBuffer(std::vector<unsigned char>& vBuffer)

-        {

-                m_vBuffer = vBuffer;

-                ulIndex = 0;

-        }

-}

-

+/*
+* InputBuffer.cpp - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#include "InputBuffer.h"
+
+namespace PeLib
+{
+        unsigned long InputBuffer::get()
+        {
+                return ulIndex;
+        }
+
+        InputBuffer::InputBuffer(std::vector<unsigned char>& vBuffer) : m_vBuffer(vBuffer), ulIndex(0)
+        {
+        }
+
+        const unsigned char* InputBuffer::data() const
+        {
+                return &m_vBuffer[0];
+        }
+
+        unsigned long InputBuffer::size()
+        {
+                return static_cast<unsigned long>(m_vBuffer.size());
+        }
+
+        void InputBuffer::read(char* lpBuffer, unsigned long ulSize)
+        {
+                std::copy(&m_vBuffer[ulIndex], &m_vBuffer[ulIndex + ulSize], lpBuffer);
+                ulIndex += ulSize;
+        }
+
+        void InputBuffer::reset()
+        {
+                m_vBuffer.clear();
+        }
+
+        void InputBuffer::set(unsigned long ulIndex)
+        {
+                this->ulIndex = ulIndex;
+        }
+
+        void InputBuffer::setBuffer(std::vector<unsigned char>& vBuffer)
+        {
+                m_vBuffer = vBuffer;
+                ulIndex = 0;
+        }
+}
+
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/buffer/InputBuffer.h b/utils/zenutils/libraries/pelib-0.9/pelib/buffer/InputBuffer.h
index fc5a14e357..18a7b1b7bc 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/buffer/InputBuffer.h
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/buffer/InputBuffer.h
@@ -1,52 +1,52 @@
-/*

-* InputBuffer.h - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#ifndef INPUTBUFFER_H

-#define INPUTBUFFER_H

-

-#include <vector>

-#include <iterator>

-#include <cassert>

-

-namespace PeLib

-{

-        class InputBuffer

-        {

-                private:

-                  std::vector<unsigned char>& m_vBuffer;

-                  unsigned long ulIndex;

-                  

-                public:

-                  InputBuffer(std::vector<unsigned char>& vBuffer);

-                  

-                  const unsigned char* data() const;

-                  unsigned long size();

-

-                  template<typename T>

-                  InputBuffer& operator>>(T& value)

-                  {

-                        assert(ulIndex + sizeof(value) <= m_vBuffer.size());

-                        value = *(T*)(&m_vBuffer[ulIndex]);//reinterpret_cast<T*>(&m_vBuffer[ulIndex]);

-                        ulIndex += sizeof(T);

-                        return *this;

-                  }

-

-                  void read(char* lpBuffer, unsigned long ulSize);

-                  void reset();

-                  void set(unsigned long ulIndex);

-                  unsigned long get();

-                  void setBuffer(std::vector<unsigned char>& vBuffer);

-//                void updateData(unsigned long ulIndex,

-        };

-}

-

-#endif

+/*
+* InputBuffer.h - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#ifndef INPUTBUFFER_H
+#define INPUTBUFFER_H
+
+#include <vector>
+#include <iterator>
+#include <cassert>
+
+namespace PeLib
+{
+        class InputBuffer
+        {
+                private:
+                  std::vector<unsigned char>& m_vBuffer;
+                  unsigned long ulIndex;
+                  
+                public:
+                  InputBuffer(std::vector<unsigned char>& vBuffer);
+                  
+                  const unsigned char* data() const;
+                  unsigned long size();
+
+                  template<typename T>
+                  InputBuffer& operator>>(T& value)
+                  {
+                        assert(ulIndex + sizeof(value) <= m_vBuffer.size());
+                        value = *(T*)(&m_vBuffer[ulIndex]);//reinterpret_cast<T*>(&m_vBuffer[ulIndex]);
+                        ulIndex += sizeof(T);
+                        return *this;
+                  }
+
+                  void read(char* lpBuffer, unsigned long ulSize);
+                  void reset();
+                  void set(unsigned long ulIndex);
+                  unsigned long get();
+                  void setBuffer(std::vector<unsigned char>& vBuffer);
+//                void updateData(unsigned long ulIndex,
+        };
+}
+
+#endif
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/buffer/OutputBuffer.cpp b/utils/zenutils/libraries/pelib-0.9/pelib/buffer/OutputBuffer.cpp
index b47fbb6ff8..4ad8471d83 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/buffer/OutputBuffer.cpp
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/buffer/OutputBuffer.cpp
@@ -1,41 +1,41 @@
-/*

-* OutputBuffer.cpp - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#include "OutputBuffer.h"

-

-namespace PeLib

-{

-        OutputBuffer::OutputBuffer(std::vector<unsigned char>& vBuffer) : m_vBuffer(vBuffer)

-        {

-                m_vBuffer.clear();

-        }

-

-        const unsigned char* OutputBuffer::data() const

-        {

-                return &m_vBuffer[0];

-        }

-

-        unsigned long OutputBuffer::size()

-        {

-                return static_cast<unsigned long>(m_vBuffer.size());

-        }

-

-        void OutputBuffer::add(const char* lpBuffer, unsigned long ulSize)

-        {

-                std::copy(lpBuffer, lpBuffer + ulSize, std::back_inserter(m_vBuffer));

-        }

-

-        void OutputBuffer::reset()

-        {

-                m_vBuffer.clear();

-        }

-}

+/*
+* OutputBuffer.cpp - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#include "OutputBuffer.h"
+
+namespace PeLib
+{
+        OutputBuffer::OutputBuffer(std::vector<unsigned char>& vBuffer) : m_vBuffer(vBuffer)
+        {
+                m_vBuffer.clear();
+        }
+
+        const unsigned char* OutputBuffer::data() const
+        {
+                return &m_vBuffer[0];
+        }
+
+        unsigned long OutputBuffer::size()
+        {
+                return static_cast<unsigned long>(m_vBuffer.size());
+        }
+
+        void OutputBuffer::add(const char* lpBuffer, unsigned long ulSize)
+        {
+                std::copy(lpBuffer, lpBuffer + ulSize, std::back_inserter(m_vBuffer));
+        }
+
+        void OutputBuffer::reset()
+        {
+                m_vBuffer.clear();
+        }
+}
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/buffer/OutputBuffer.h b/utils/zenutils/libraries/pelib-0.9/pelib/buffer/OutputBuffer.h
index f1ab99039b..06049ddd9d 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/buffer/OutputBuffer.h
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/buffer/OutputBuffer.h
@@ -1,51 +1,51 @@
-/*

-* OutputBuffer.h - Part of the PeLib library.

-*

-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)

-* All rights reserved.

-*

-* This software is licensed under the zlib/libpng License.

-* For more details see http://www.opensource.org/licenses/zlib-license.php

-* or the license information file (license.htm) in the root directory 

-* of PeLib.

-*/

-

-#ifndef OUTPUTBUFFER_H

-#define OUTPUTBUFFER_H

-

-#include <vector>

-#include <iterator>

-

-namespace PeLib

-{

-        class OutputBuffer

-        {

-                private:

-                  std::vector<unsigned char>& m_vBuffer;

-                  

-                public:

-                  OutputBuffer(std::vector<unsigned char>& vBuffer);

-                  const unsigned char* data() const;

-                  unsigned long size();

-

-                  template<typename T>

-                  OutputBuffer& operator<<(const T& value)

-                  {

-                        const unsigned char* p = reinterpret_cast<const unsigned char*>(&value);

-                        std::copy(p, p + sizeof(value), std::back_inserter(m_vBuffer));

-                        return *this;

-                  }

-                  void add(const char* lpBuffer, unsigned long ulSize);

-                  void reset();

-                  void resize(unsigned int uiSize);

-                  void set(unsigned int uiPosition);

-

-                  template<typename T>

-                  void update(unsigned long ulIndex, const T& value)

-                  {

-                        *(T*)(&m_vBuffer[ulIndex]) = value;

-                  }

-        };

-}

-

-#endif

+/*
+* OutputBuffer.h - Part of the PeLib library.
+*
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* All rights reserved.
+*
+* This software is licensed under the zlib/libpng License.
+* For more details see http://www.opensource.org/licenses/zlib-license.php
+* or the license information file (license.htm) in the root directory 
+* of PeLib.
+*/
+
+#ifndef OUTPUTBUFFER_H
+#define OUTPUTBUFFER_H
+
+#include <vector>
+#include <iterator>
+
+namespace PeLib
+{
+        class OutputBuffer
+        {
+                private:
+                  std::vector<unsigned char>& m_vBuffer;
+                  
+                public:
+                  OutputBuffer(std::vector<unsigned char>& vBuffer);
+                  const unsigned char* data() const;
+                  unsigned long size();
+
+                  template<typename T>
+                  OutputBuffer& operator<<(const T& value)
+                  {
+                        const unsigned char* p = reinterpret_cast<const unsigned char*>(&value);
+                        std::copy(p, p + sizeof(value), std::back_inserter(m_vBuffer));
+                        return *this;
+                  }
+                  void add(const char* lpBuffer, unsigned long ulSize);
+                  void reset();
+                  void resize(unsigned int uiSize);
+                  void set(unsigned int uiPosition);
+
+                  template<typename T>
+                  void update(unsigned long ulIndex, const T& value)
+                  {
+                        *(T*)(&m_vBuffer[ulIndex]) = value;
+                  }
+        };
+}
+
+#endif
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/changelog.txt b/utils/zenutils/libraries/pelib-0.9/pelib/changelog.txt
index 37a7c36229..8099edf3db 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/changelog.txt
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/changelog.txt
@@ -1,321 +1,321 @@
-PeLib 0.09 alpha (February 09, 2005)

-

-Added:

-- Added PeHeaderT<x>::setIddBaseRelocRva(dword value)

-- Added PeHeaderT<x>::setIddBaseRelocSize(dword value)

-- Added PeHeaderT<x>::setIddArchitectureRva(dword value)

-- Added PeHeaderT<x>::setIddArchitectureSize(dword value)

-- Added PeHeaderT<x>::setIddComHeaderRva(dword value)

-- Added PeHeaderT<x>::setIddComHeaderSize(dword value)

-- Added void PeHeaderT<x>::setImageDataDirectoryRva(dword dwDirectory, dword value)

-- Added void PeHeaderT<x>::setImageDataDirectorySize(dword dwDirectory, dword value)

-- Added bool PeHeaderT<x>::isValid() const

-- Added int PeHeaderT<x>::read(const unsigned char* pcBuffer, unsigned int uiSize, unsigned int uiOffset);

-- Added int BoundImportDirectory::read(unsigned char* pcBuffer, unsigned int uiSize);

-- Added int BoundImportDirectory::read(InputBuffer& inpBuffer, unsigned char* data, unsigned int dwSize);

-- Added unsigned int BoundImportDirectory::totalModules()

-- Added DebugDirectory::setData to set the debug data of individual entries in the DebugDirectory.

-- Added DebugDirectory::getData to get the debug data of individual entries in the DebugDirectory.

-- Added int IatDirectory::read(unsigned char* buffer, unsigned int buffersize)

-- Optimized the size and rebuild methods to avoid duplicate strings for files that appear

-  more than once in the BoundImport Directory.

-- Added two read functions to TlsDirectory and updated the return values of the old read function.

-- Added two read functions to ComHeaderDirectory and updated the return values of the old read function.

-- Added two read functions to RelocationsDirectory and updated the return values of the old read function.

-- Added void RelocationsDirectory::addRelocation()

-- Added void RelocationsDirectory::removeRelocation(unsigned int index)

-- Added void DebugDirectory::clear()

-- Added void ExportDirectory::removeFunction(unsigned int index)

-- Added void ExportDirectory::clear()

-- Added unsigned int ExportDirectory::calcNumberOfFunctions()

-- Added void ExportDirectory::setAddressOfNameOrdinals(dword value)

-

-Bugfixes:

-- Fixed a bug in TlsDirectory<bits>::size()

-- Fixed a bug in PeHeaderT<64>::isValid(dword)

-- Fixed a bug in PeHeaderT<bits>::removeDataDirectory(dword)

-- Fixed a bug in BoundImportDirectory::rebuild()

-- Fixed a bug in BoundImportDirectory::read() (Potential buffer overflow)

-- Fixed a bug in BoundImportDirectory::read() (Bug caused incorrect results when reading the directory more than once)

-- Fixed a bug when reading the debug data of individual DebugDirectory entries.

-- Fixed a bug that caused non-existing data directories to be read (PeFile).

-- Fixed a bug that caused problems when reading import directories that were located close to the end of the file (ImportDirectory).

-- Fixed a minor bug in PeHeader::calcSizeOfImage

-- Fixed some return values and removed all exception handling blocks.

-

-Changes:

-- Changed return values of PeHeader::addSection

-- Changed return values of PeHeader::read

-- Changed behaviour: PeHeader::m_uiOffset is initialized to 0 in default constructors.

-- Changed return value of BoundImportDirectory::getNumberOfModules() from int to unsigned int

-- Changed name of BoundImportDirectory::getNumberOfModules to calcNumberOfModules

-- Changed the return values of the PeFile::read* functions.

-- Renamed IatDirectory::removeAll to IatDirectory::clear

-- Renamed IatDirectory::numberOfAddresses to IatDirectory::calcNumberOfAddresses

-- Changed the parameter types of IatDirectory::getAddress from dword to unsigned int

-- Changed the parameter types of IatDirectory::removeAddress from dword to unsigned int

-- All constants taken from windows.h that were redefined in PeLibAux.h now have the prefix PELIB_ to avoid

-  conflicts with windows.h if both files are included to a project.

-- Changed PELIB_IMAGE_TLS_DIRECTORY<bits>::size from an enum to a function.

-- Changed the name of RelocationsDirectory::getNumberOfRelocationData to calcNumberOfRelocationData

-- Changed void RelocationsDirectory::removeRelocationData(unsigned int ulRelocation, word wValue)

-  to      void RelocationsDirectory::removeRelocationData(unsigned int relocindex, unsigned int dataindex)

-- Removed dword ExportDirectory::getNumberOfNameOrdinals()

-- Removed dword ExportDirectory::getNumberOfAddressOfFunctionNames()

-- Removed dword ExportDirectory::getNumberOfAddressOfFunctions()

-- Changed the parameters of some functions in ExportDirectory from dword to unsigned int.

-

-

-January 16, 2005 PeLib 0.08 alpha

-

-Added:

-- Added std::string ExportDirectory::getNameString()

-- Added resource type RT_MANIFEST to PeLibAux.h

-- Added the following functions of PeHeaderT<int x>: setIddDebugRva, setIddDebugSize,

-  setIddDelayImportRva, setIddDelayImportSize, setIddExceptionRva, setIddExceptionSize, setIddGlobalPtrRva,

-  setIddGlobalPtrSize, setIddIatRva, setIddIatSize, setIddLoadConfigRva, setIddLoadConfigSize,

-  setIddResourceRva, setIddResourceSize, setIddResourceRva, setIddResourceSize, setIddSecurityRva,

-  setIddSecuritySize, setIddTlsRva, setIddTlsSize

-- ImportDirectory32 and ImportDirectory64 are now available.

-- Added ImportDirectory<bits>::setFileName(dword, currdir, const std::string&)

-- Added ImportDirectory<bits>::setFirstThunk(dword, currdir, dword)

-- Added ImportDirectory<bits>::setForwarderChain(dword, currdir, dword)

-- Added ImportDirectory<bits>::setRvaOfName(dword, currdir, dword)

-- Added ImportDirectory<bits>::setOriginalFirstThunk(dword, currdir, dword)

-- Added ImportDirectory<bits>::setTimeDateStamp(dword, currdir, dword)

-- Added ImportDirectory<bits>::setOriginalFirstThunk(dword, dword, currdir, dword)

-- Added ImportDirectory<bits>::setFirstThunk(dword, dword, currdir, dword)

-- Added ImportDirectory<bits>::setFunctionHint(dword, dword, currdir, word)

-- Added ImportDirectory<bits>::setFunctionName(dword, dword, currdir, const std::string&)

-- Added dword BoundImportDirectory::getTimeDateStamp(dword dwBidnr, dword forwardedModule) const

-- Added word BoundImportDirectory::getOffsetModuleName(dword dwBidnr, dword forwardedModule) const

-- Added word BoundImportDirectory::getNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule) const

-- Added std::string BoundImportDirectory::getModuleName(dword dwBidnr, dword forwardedModule) const

-- Added void BoundImportDirectory::setTimeDateStamp(dword dwBidnr, dword forwardedModule, dword dwTds)

-- Added void BoundImportDirectory::setOffsetModuleName(dword dwBidnr, dword forwardedModule, word wOmn)

-- Added void BoundImportDirectory::setNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule, word wMfr)

-- Added void BoundImportDirectory::setModuleName(dword dwBidnr, dword forwardedModule, const std::string& strModuleName)

-- Added word calcNumberOfModuleForwarderRefs(dword dwBidnr) const

-- Added void addForwardedModule(dword dwBidnr, const std::string& name, dword timeStamp = 0, word offsetModuleName = 0, word forwardedModules = 0)

-- Added void removeForwardedModule(dword dwBidnr, word forwardedModule)

-- Added PeHeaderT<x>::addDataDirectory()

-- Added PeHeaderT<x>::removeDataDirectory(dword)

-

-Bugfixes:

-- Fixed a bug in MzHeader::isValid

-- Fixed a bug in PeHeaderT<x>::size()

-- Fixed a bug in PeHeaderT<x>::calcRva()

-- Fixed a bug in PeHeaderT<x>::calcSizeOfImage()

-- Fixed a bug in PeHeaderT<x>::getSectionName(dword)

-- Fixed a bug in PeHeaderT<x>::calcStartOfCode()

-- Fixed a bug in PELIB_THUNK_DATA<bits>::bool equalHint(word wHint) const

-- Fixed a bug in PELIB_IMAGE_THUNK_DATA<bits>::bool equalHint(word wHint) const

-- Fixed a bug in int ImportDirectory<bits>::removeFunction(const std::string& strFilename, word wHint)

-- Fixed a bug in int ImportDirectory<bits>::removeFile(const std::string& strFilename)

-- Function hints are now properly added when rebuilding import directories.

-- Reading and rebuilding bound import directories now works with forwarded modules.

-

-Changes:

-- Changed behaviour: Removed all exceptions from the MzHeader class. The functions work with return values now.

-- Changed behaviour: The MzHeader::read() functions stopped checking if the MzHeader begins with "MZ".

-- Changed behaviour: PeHeaderT<int x>::addSection(std::string, dword) doesn't use exceptions anymore.

-                     Return values now indicate if the function succeeded or failed.

-- Changed behaviour: PeHeaderT<int x>::getSectionWithOffset(dword) doesn't use exceptions anymore.

-                     Return values now indicate if the function succeeded or failed.

-- Changed behaviour: PeHeaderT<int x>::getSectionWithRva(dword) doesn't use exceptions anymore.

-                     Return values now indicate if the function succeeded or failed.

-- Changed behaviour: PeHeaderT<int x>::rvaToOffset(dword) doesn't use exceptions anymore.

-                     Return values now indicate if the function succeeded or failed.

-- Changed behaviour: PeHeaderT<int x>::write(std::string, unsigned int) doesn't use exceptions anymore.

-                     Return values now indicate if the function succeeded or failed.

-- Changed behaviour: PeHeaderT<int x>::writeSectionData(const std::string& strFilename, word wSecnr,

-                                         const std::vector<byte>& vBuffer) doesn't use exceptions anymore.

-                     Return values now indicate if the function succeeded or failed.

-- Changed behaviour: PeHeaderT<int x>::writeSections(std::string) doesn't use exceptions anymore.

-                     Return values now indicate if the function succeeded or failed.

-- Changed behaviour: Return value of PeHeaderT<x>::calcSpaceAfterHeader() changed from unsigned long

-                                         to unsigned int.

-- Changed behaviour: Return value of PeHeaderT<x>::calcStartOfCode() changed from unsigned long

-                                         to unsigned int.

-- Changed behaviour: Return value of PeHeaderT<x>::calcOffset() changed from unsigned long

-                                         to unsigned int.

-- Changed behaviour: Return value of PeHeaderT<x>::offsetToRva(dword) changed from unsigned long

-                                         to unsigned int.

-- Changed behaviour: Return value of PeHeaderT<x>::offsetToVa(dword) changed from unsigned long

-                                         to unsigned int.

-- Renamed ExportDirectory::setName(std::string) to ExportDirectory::setNameString(std::string)

-- Renamed the PeHeaderT::getId* functions to PeHeaderT::getIdd*

-- Renamed PeHeaderT::getImageDirectoryRva to PeHeaderT::getImageDataDirectoryRva

-- Renamed PeHeaderT::getImageDirectorySize to PeHeaderT::getImageDataDirectorySize

-- Renamed void PeHeaderT<x>::setWinVersionValue(dword dwValue) to void PeHeaderT<x>::setWin32VersionValue(dword dwValue)

-- Renamed the following functions of PeHeaderT<int x>: setIdImportRva to setIddImportRva,

-  setIdImportSize to setIddImportSize, setIdExportRva to setIddExportRva, setIdExportSize to setIddExportSize

-- Renamed dword ImportDirectory<bits>::getName to dword ImportDirectory<bits>::getRvaOfName

-- Changed behaviour: All removeFunction and removeFile functions from ImportDirectory.h return int instead

-  of void now.

-- Changed behavior: ResourceDirectory::resourceTypeNameToIndex returns int instead of unsigned int.

-  

--------------------------------------------------------------------------------------------------------------

-

-July 18, 2004 PeLib 0.07 alpha

-

-Added:

-- Full support of the PE+ format.

-- ImportDirectory::getName(string, currdir)

-- ImportDirectory::getFirstThunk(dword, currdir)

-- ImportDirectory::getOriginalFirstThunk(dword, currdir)

-- ImportDirectory::getForwarderChain(dword, currdir)

-- ImportDirectory::getName(dword, currdir)

-- ImportDirectory::getTimeDateStamp(dword, currdir)

-- PeLib::getFileType(string)

-- PeLib::openPeFile(string)

-- Added class PeFileVisitor

-- Added PeFile::visit(PeFileVisitor&)

-

-Bugfixes:

-- Fixed a bug in PeHeader::rvaToOffset

-

-Changes:

-- Renamed ImportDirectory::OLD to PeLib::OLDDIR and ImportDirectory::NEW to PeLib::NEWDIR

-- Renamed Relocations to RelocationsDirectory

-- Renamed ImportAddressTable to IatDirectory

-- Renamed ComDescriptor to ComHeader

-- Renamed PeFile::comDescDir to PeFile::comDir

-- Changed unsigned long ExportDirectory::getFunctionIndex to unsigned int ExportDirectory::getFunctionIndex

-

--------------------------------------------------------------------------------------------------------------

-

-July 4, 2004 PeLib 0.06 alpha

-

-Added:

-- TlsDirectory class

-

-Changes:

-- ResourceElement::read and ResourceElement::rebuild are now protected.

-

-Bugfixes:

-- Fixed a bug in PeHeader::rvaToOffset

-

--------------------------------------------------------------------------------------------------------------

-

-June 26, 2004 PeLib 0.05 alpha

-

-Added:

-- Constructor, Copy constructor, assignment operator and destructor for ResourceChild.

-- ResourceDirectory::getRoot()

-- ResourceElement::isLeaf()

-- ResourceElement::getElementRva

-- 10 new functions in ResourceLeaf.

-- 22 new functions in ResourceNode.

-- Added the RT_* constants which identify resource types to PeLibAux.h

-- Added a new example (examples/ResourceTree) which shows how to use low level ResourceDirectory functions.

-- Added PELIB_IMAGE_DEBUG_DIRECTORY and PELIB_IMG_DEBUG_DIRECTORY

-- Added the new class DebugDirectory which handles the debug directory of PE files.

-- Added readDebugDirectory() and debugDir() to PeFile.

-

-Removed:

-- ~ResourceNode()

-

--------------------------------------------------------------------------------------------------------------

-

-June 12, 2004 PeLib 0.04 alpha

-

-New:

-- Finally implemented the class ResourceDirectory. That means lots of new functions I won't explicitly list here.

-  Check the documentation.

-

-Removed:

-- The files buffer/ResTree.cpp and buffer/ResTree.h are obsolete and were removed.

-

-Bugfixes:

-- Fixed PeHeader::calcStartOfCode

-- Fixed PeHeader::getSectionWithRva

-

-Changes:

-- Changed PeHeader::read to throw an exception if the NT signature is not 'PE'\0\0

-- Changed the 2nd parameter of void MzHeader::read(unsigned char*, unsigned long) from unsigned long to unsigned int.

-- Changed the return value of MzHeader::size from long to int.

-- Changed parameters of MzHeader::getReservedWords1, MzHeader::getReservedWords2, MzHeader::setReservedWords1 and

-  MzHeader::setReservedWords2 from long to int.

-- Changed MzHeader::read(std::string) to MzHeader::read(const std::string&)

-- Changed return value of BoundImportDirectory::getModuleIndex from long to int.

-- Changed return value of BoundImportDirectory::size from long to int.

-- Changed return value of ComDescriptor::size from long to int.

-- Changed return value of ImportAddressTable::size from long to int.

-- Changed return value of Relocations::getNumberOfRelocations from long to int.

-- Changed return value of Relocations::getNumberOfRelocationData from long to int.

-- Changed return value of Relocations::size from long to int.

-- Changed parameter of Relocations::getVirtualAddress from long to int.

-- Changed parameter of Relocations::getSizeOfBlock from long to int.

-- Changed parameter of Relocations::getRelocationData from long to int.

-- Changed parameters of Relocations::setRelocationData from long to int.

-- Changed parameters of Relocations::setVirtualAddress from long to int.

-- Changed parameters of Relocations::setSizeOfBlock from long to int.

-- Changed parameters of Relocations::addRelocationData from long to int.

-- Changed parameters of Relocations::removeRelocationData from long to int.

-- Changed return value of ExportDirectory::getFunctionIndex(const std::string&) const from unsigned int to int.

-

--------------------------------------------------------------------------------------------------------------

-

-May 31, 2004: PeLib 0.03 alpha

-

-Bugfixes:

-- Fixed some bugs in FileDump.cpp

-

-Changes:

-- Modified PeLibAux.cpp to make PeLib VC++ 7.1 compatible.

-- Changed vector access from .at to operator[] all over the project.

-  Real undefined behaviour is probably better than spontaniously terminating applications.

-

-New:

-- Added makefiles for Borland C++ commandline tools (tested on version 5.6.4)

-- Added makefiles for Digital Mars Compiler (tested on version 8.38n)

-  Note that support for DMC is not yet complete. PeLib compiles though, the examples don't yet but the

-  reason for this is that I am unable to correctly specifiy the PeLib object files when compiling.

-- Added makefiles for Visual C++ 7.1 (tested on compiler Version 13.10.3052)

-

--------------------------------------------------------------------------------------------------------------

-

-Mai 1, 2004: PeLib 0.02 alpha

-

-Bugfixes:

-- Fixed a bug in FileDump's and OON2's makefile.g++

-- Fixed ImportDirectory::size

-- Changed parameter of PELIB_THUNK_DATA::equalHint from dword to word

-- Fixed a bug in PeHeader::read (PeLib always assumed 0x10 data directories in version 0.01 alpha)

-

-Changes:

-- Slightly changed ImportDirectory::removeFile (Changed function's signature)

-- Moved the definitions of byte, word and dword into the PeLib namespace.

-- Renamed PELIB_THUNK_DATA::equalName to PELIB_THUNK_DATA::equalFunctionName

-- Started to add size() functions to structs defined in PeLibAux.h

-- Moved PeFile::writeSectionData to PeHeader::writeSectionData

-- Moved PeFile::writeSections to PeHeader::writeSections

-

-New:

-- Added ImportDirectory::hasFunction

-- Wrote BoundImportDirectory::size

-- Added accumulate function to PeLibAux.h

-- Added PELIB_IMAGE_SECTION_HEADER::biggerFileOffset

-- Added PELIB_IMAGE_SECTION_HEADER::biggerVirtualAddress

-- Added PeHeader::calcSizeOfImage

-- Added PeHeader::enlargeLastSection

-

-Removed:

-- Removed PeFile::write

-- Removed PeFile::writeImportDirectory

-

-Other changes:

-- Rewrote parts of ImportDirectory::read

-- Rewrote ImportDirectory::removeFunction (both version).

-- Changed std::ios:: to std::ios_base:: in ImportDirectory

-- Changed ImportDirectory::addFunction (both versions)

-- Changed ExportDirectory::rebuild

-- Changed ExportDirectory::size

-- Rewrote ImportDirectory::size

-- Rewrote PeHeader::size

-- Rewrote ComDescriptor::size

-

--------------------------------------------------------------------------------------------------------------

-

+PeLib 0.09 alpha (February 09, 2005)
+
+Added:
+- Added PeHeaderT<x>::setIddBaseRelocRva(dword value)
+- Added PeHeaderT<x>::setIddBaseRelocSize(dword value)
+- Added PeHeaderT<x>::setIddArchitectureRva(dword value)
+- Added PeHeaderT<x>::setIddArchitectureSize(dword value)
+- Added PeHeaderT<x>::setIddComHeaderRva(dword value)
+- Added PeHeaderT<x>::setIddComHeaderSize(dword value)
+- Added void PeHeaderT<x>::setImageDataDirectoryRva(dword dwDirectory, dword value)
+- Added void PeHeaderT<x>::setImageDataDirectorySize(dword dwDirectory, dword value)
+- Added bool PeHeaderT<x>::isValid() const
+- Added int PeHeaderT<x>::read(const unsigned char* pcBuffer, unsigned int uiSize, unsigned int uiOffset);
+- Added int BoundImportDirectory::read(unsigned char* pcBuffer, unsigned int uiSize);
+- Added int BoundImportDirectory::read(InputBuffer& inpBuffer, unsigned char* data, unsigned int dwSize);
+- Added unsigned int BoundImportDirectory::totalModules()
+- Added DebugDirectory::setData to set the debug data of individual entries in the DebugDirectory.
+- Added DebugDirectory::getData to get the debug data of individual entries in the DebugDirectory.
+- Added int IatDirectory::read(unsigned char* buffer, unsigned int buffersize)
+- Optimized the size and rebuild methods to avoid duplicate strings for files that appear
+  more than once in the BoundImport Directory.
+- Added two read functions to TlsDirectory and updated the return values of the old read function.
+- Added two read functions to ComHeaderDirectory and updated the return values of the old read function.
+- Added two read functions to RelocationsDirectory and updated the return values of the old read function.
+- Added void RelocationsDirectory::addRelocation()
+- Added void RelocationsDirectory::removeRelocation(unsigned int index)
+- Added void DebugDirectory::clear()
+- Added void ExportDirectory::removeFunction(unsigned int index)
+- Added void ExportDirectory::clear()
+- Added unsigned int ExportDirectory::calcNumberOfFunctions()
+- Added void ExportDirectory::setAddressOfNameOrdinals(dword value)
+
+Bugfixes:
+- Fixed a bug in TlsDirectory<bits>::size()
+- Fixed a bug in PeHeaderT<64>::isValid(dword)
+- Fixed a bug in PeHeaderT<bits>::removeDataDirectory(dword)
+- Fixed a bug in BoundImportDirectory::rebuild()
+- Fixed a bug in BoundImportDirectory::read() (Potential buffer overflow)
+- Fixed a bug in BoundImportDirectory::read() (Bug caused incorrect results when reading the directory more than once)
+- Fixed a bug when reading the debug data of individual DebugDirectory entries.
+- Fixed a bug that caused non-existing data directories to be read (PeFile).
+- Fixed a bug that caused problems when reading import directories that were located close to the end of the file (ImportDirectory).
+- Fixed a minor bug in PeHeader::calcSizeOfImage
+- Fixed some return values and removed all exception handling blocks.
+
+Changes:
+- Changed return values of PeHeader::addSection
+- Changed return values of PeHeader::read
+- Changed behaviour: PeHeader::m_uiOffset is initialized to 0 in default constructors.
+- Changed return value of BoundImportDirectory::getNumberOfModules() from int to unsigned int
+- Changed name of BoundImportDirectory::getNumberOfModules to calcNumberOfModules
+- Changed the return values of the PeFile::read* functions.
+- Renamed IatDirectory::removeAll to IatDirectory::clear
+- Renamed IatDirectory::numberOfAddresses to IatDirectory::calcNumberOfAddresses
+- Changed the parameter types of IatDirectory::getAddress from dword to unsigned int
+- Changed the parameter types of IatDirectory::removeAddress from dword to unsigned int
+- All constants taken from windows.h that were redefined in PeLibAux.h now have the prefix PELIB_ to avoid
+  conflicts with windows.h if both files are included to a project.
+- Changed PELIB_IMAGE_TLS_DIRECTORY<bits>::size from an enum to a function.
+- Changed the name of RelocationsDirectory::getNumberOfRelocationData to calcNumberOfRelocationData
+- Changed void RelocationsDirectory::removeRelocationData(unsigned int ulRelocation, word wValue)
+  to      void RelocationsDirectory::removeRelocationData(unsigned int relocindex, unsigned int dataindex)
+- Removed dword ExportDirectory::getNumberOfNameOrdinals()
+- Removed dword ExportDirectory::getNumberOfAddressOfFunctionNames()
+- Removed dword ExportDirectory::getNumberOfAddressOfFunctions()
+- Changed the parameters of some functions in ExportDirectory from dword to unsigned int.
+
+
+January 16, 2005 PeLib 0.08 alpha
+
+Added:
+- Added std::string ExportDirectory::getNameString()
+- Added resource type RT_MANIFEST to PeLibAux.h
+- Added the following functions of PeHeaderT<int x>: setIddDebugRva, setIddDebugSize,
+  setIddDelayImportRva, setIddDelayImportSize, setIddExceptionRva, setIddExceptionSize, setIddGlobalPtrRva,
+  setIddGlobalPtrSize, setIddIatRva, setIddIatSize, setIddLoadConfigRva, setIddLoadConfigSize,
+  setIddResourceRva, setIddResourceSize, setIddResourceRva, setIddResourceSize, setIddSecurityRva,
+  setIddSecuritySize, setIddTlsRva, setIddTlsSize
+- ImportDirectory32 and ImportDirectory64 are now available.
+- Added ImportDirectory<bits>::setFileName(dword, currdir, const std::string&)
+- Added ImportDirectory<bits>::setFirstThunk(dword, currdir, dword)
+- Added ImportDirectory<bits>::setForwarderChain(dword, currdir, dword)
+- Added ImportDirectory<bits>::setRvaOfName(dword, currdir, dword)
+- Added ImportDirectory<bits>::setOriginalFirstThunk(dword, currdir, dword)
+- Added ImportDirectory<bits>::setTimeDateStamp(dword, currdir, dword)
+- Added ImportDirectory<bits>::setOriginalFirstThunk(dword, dword, currdir, dword)
+- Added ImportDirectory<bits>::setFirstThunk(dword, dword, currdir, dword)
+- Added ImportDirectory<bits>::setFunctionHint(dword, dword, currdir, word)
+- Added ImportDirectory<bits>::setFunctionName(dword, dword, currdir, const std::string&)
+- Added dword BoundImportDirectory::getTimeDateStamp(dword dwBidnr, dword forwardedModule) const
+- Added word BoundImportDirectory::getOffsetModuleName(dword dwBidnr, dword forwardedModule) const
+- Added word BoundImportDirectory::getNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule) const
+- Added std::string BoundImportDirectory::getModuleName(dword dwBidnr, dword forwardedModule) const
+- Added void BoundImportDirectory::setTimeDateStamp(dword dwBidnr, dword forwardedModule, dword dwTds)
+- Added void BoundImportDirectory::setOffsetModuleName(dword dwBidnr, dword forwardedModule, word wOmn)
+- Added void BoundImportDirectory::setNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule, word wMfr)
+- Added void BoundImportDirectory::setModuleName(dword dwBidnr, dword forwardedModule, const std::string& strModuleName)
+- Added word calcNumberOfModuleForwarderRefs(dword dwBidnr) const
+- Added void addForwardedModule(dword dwBidnr, const std::string& name, dword timeStamp = 0, word offsetModuleName = 0, word forwardedModules = 0)
+- Added void removeForwardedModule(dword dwBidnr, word forwardedModule)
+- Added PeHeaderT<x>::addDataDirectory()
+- Added PeHeaderT<x>::removeDataDirectory(dword)
+
+Bugfixes:
+- Fixed a bug in MzHeader::isValid
+- Fixed a bug in PeHeaderT<x>::size()
+- Fixed a bug in PeHeaderT<x>::calcRva()
+- Fixed a bug in PeHeaderT<x>::calcSizeOfImage()
+- Fixed a bug in PeHeaderT<x>::getSectionName(dword)
+- Fixed a bug in PeHeaderT<x>::calcStartOfCode()
+- Fixed a bug in PELIB_THUNK_DATA<bits>::bool equalHint(word wHint) const
+- Fixed a bug in PELIB_IMAGE_THUNK_DATA<bits>::bool equalHint(word wHint) const
+- Fixed a bug in int ImportDirectory<bits>::removeFunction(const std::string& strFilename, word wHint)
+- Fixed a bug in int ImportDirectory<bits>::removeFile(const std::string& strFilename)
+- Function hints are now properly added when rebuilding import directories.
+- Reading and rebuilding bound import directories now works with forwarded modules.
+
+Changes:
+- Changed behaviour: Removed all exceptions from the MzHeader class. The functions work with return values now.
+- Changed behaviour: The MzHeader::read() functions stopped checking if the MzHeader begins with "MZ".
+- Changed behaviour: PeHeaderT<int x>::addSection(std::string, dword) doesn't use exceptions anymore.
+                     Return values now indicate if the function succeeded or failed.
+- Changed behaviour: PeHeaderT<int x>::getSectionWithOffset(dword) doesn't use exceptions anymore.
+                     Return values now indicate if the function succeeded or failed.
+- Changed behaviour: PeHeaderT<int x>::getSectionWithRva(dword) doesn't use exceptions anymore.
+                     Return values now indicate if the function succeeded or failed.
+- Changed behaviour: PeHeaderT<int x>::rvaToOffset(dword) doesn't use exceptions anymore.
+                     Return values now indicate if the function succeeded or failed.
+- Changed behaviour: PeHeaderT<int x>::write(std::string, unsigned int) doesn't use exceptions anymore.
+                     Return values now indicate if the function succeeded or failed.
+- Changed behaviour: PeHeaderT<int x>::writeSectionData(const std::string& strFilename, word wSecnr,
+                                         const std::vector<byte>& vBuffer) doesn't use exceptions anymore.
+                     Return values now indicate if the function succeeded or failed.
+- Changed behaviour: PeHeaderT<int x>::writeSections(std::string) doesn't use exceptions anymore.
+                     Return values now indicate if the function succeeded or failed.
+- Changed behaviour: Return value of PeHeaderT<x>::calcSpaceAfterHeader() changed from unsigned long
+                                         to unsigned int.
+- Changed behaviour: Return value of PeHeaderT<x>::calcStartOfCode() changed from unsigned long
+                                         to unsigned int.
+- Changed behaviour: Return value of PeHeaderT<x>::calcOffset() changed from unsigned long
+                                         to unsigned int.
+- Changed behaviour: Return value of PeHeaderT<x>::offsetToRva(dword) changed from unsigned long
+                                         to unsigned int.
+- Changed behaviour: Return value of PeHeaderT<x>::offsetToVa(dword) changed from unsigned long
+                                         to unsigned int.
+- Renamed ExportDirectory::setName(std::string) to ExportDirectory::setNameString(std::string)
+- Renamed the PeHeaderT::getId* functions to PeHeaderT::getIdd*
+- Renamed PeHeaderT::getImageDirectoryRva to PeHeaderT::getImageDataDirectoryRva
+- Renamed PeHeaderT::getImageDirectorySize to PeHeaderT::getImageDataDirectorySize
+- Renamed void PeHeaderT<x>::setWinVersionValue(dword dwValue) to void PeHeaderT<x>::setWin32VersionValue(dword dwValue)
+- Renamed the following functions of PeHeaderT<int x>: setIdImportRva to setIddImportRva,
+  setIdImportSize to setIddImportSize, setIdExportRva to setIddExportRva, setIdExportSize to setIddExportSize
+- Renamed dword ImportDirectory<bits>::getName to dword ImportDirectory<bits>::getRvaOfName
+- Changed behaviour: All removeFunction and removeFile functions from ImportDirectory.h return int instead
+  of void now.
+- Changed behavior: ResourceDirectory::resourceTypeNameToIndex returns int instead of unsigned int.
+  
+-------------------------------------------------------------------------------------------------------------
+
+July 18, 2004 PeLib 0.07 alpha
+
+Added:
+- Full support of the PE+ format.
+- ImportDirectory::getName(string, currdir)
+- ImportDirectory::getFirstThunk(dword, currdir)
+- ImportDirectory::getOriginalFirstThunk(dword, currdir)
+- ImportDirectory::getForwarderChain(dword, currdir)
+- ImportDirectory::getName(dword, currdir)
+- ImportDirectory::getTimeDateStamp(dword, currdir)
+- PeLib::getFileType(string)
+- PeLib::openPeFile(string)
+- Added class PeFileVisitor
+- Added PeFile::visit(PeFileVisitor&)
+
+Bugfixes:
+- Fixed a bug in PeHeader::rvaToOffset
+
+Changes:
+- Renamed ImportDirectory::OLD to PeLib::OLDDIR and ImportDirectory::NEW to PeLib::NEWDIR
+- Renamed Relocations to RelocationsDirectory
+- Renamed ImportAddressTable to IatDirectory
+- Renamed ComDescriptor to ComHeader
+- Renamed PeFile::comDescDir to PeFile::comDir
+- Changed unsigned long ExportDirectory::getFunctionIndex to unsigned int ExportDirectory::getFunctionIndex
+
+-------------------------------------------------------------------------------------------------------------
+
+July 4, 2004 PeLib 0.06 alpha
+
+Added:
+- TlsDirectory class
+
+Changes:
+- ResourceElement::read and ResourceElement::rebuild are now protected.
+
+Bugfixes:
+- Fixed a bug in PeHeader::rvaToOffset
+
+-------------------------------------------------------------------------------------------------------------
+
+June 26, 2004 PeLib 0.05 alpha
+
+Added:
+- Constructor, Copy constructor, assignment operator and destructor for ResourceChild.
+- ResourceDirectory::getRoot()
+- ResourceElement::isLeaf()
+- ResourceElement::getElementRva
+- 10 new functions in ResourceLeaf.
+- 22 new functions in ResourceNode.
+- Added the RT_* constants which identify resource types to PeLibAux.h
+- Added a new example (examples/ResourceTree) which shows how to use low level ResourceDirectory functions.
+- Added PELIB_IMAGE_DEBUG_DIRECTORY and PELIB_IMG_DEBUG_DIRECTORY
+- Added the new class DebugDirectory which handles the debug directory of PE files.
+- Added readDebugDirectory() and debugDir() to PeFile.
+
+Removed:
+- ~ResourceNode()
+
+-------------------------------------------------------------------------------------------------------------
+
+June 12, 2004 PeLib 0.04 alpha
+
+New:
+- Finally implemented the class ResourceDirectory. That means lots of new functions I won't explicitly list here.
+  Check the documentation.
+
+Removed:
+- The files buffer/ResTree.cpp and buffer/ResTree.h are obsolete and were removed.
+
+Bugfixes:
+- Fixed PeHeader::calcStartOfCode
+- Fixed PeHeader::getSectionWithRva
+
+Changes:
+- Changed PeHeader::read to throw an exception if the NT signature is not 'PE'\0\0
+- Changed the 2nd parameter of void MzHeader::read(unsigned char*, unsigned long) from unsigned long to unsigned int.
+- Changed the return value of MzHeader::size from long to int.
+- Changed parameters of MzHeader::getReservedWords1, MzHeader::getReservedWords2, MzHeader::setReservedWords1 and
+  MzHeader::setReservedWords2 from long to int.
+- Changed MzHeader::read(std::string) to MzHeader::read(const std::string&)
+- Changed return value of BoundImportDirectory::getModuleIndex from long to int.
+- Changed return value of BoundImportDirectory::size from long to int.
+- Changed return value of ComDescriptor::size from long to int.
+- Changed return value of ImportAddressTable::size from long to int.
+- Changed return value of Relocations::getNumberOfRelocations from long to int.
+- Changed return value of Relocations::getNumberOfRelocationData from long to int.
+- Changed return value of Relocations::size from long to int.
+- Changed parameter of Relocations::getVirtualAddress from long to int.
+- Changed parameter of Relocations::getSizeOfBlock from long to int.
+- Changed parameter of Relocations::getRelocationData from long to int.
+- Changed parameters of Relocations::setRelocationData from long to int.
+- Changed parameters of Relocations::setVirtualAddress from long to int.
+- Changed parameters of Relocations::setSizeOfBlock from long to int.
+- Changed parameters of Relocations::addRelocationData from long to int.
+- Changed parameters of Relocations::removeRelocationData from long to int.
+- Changed return value of ExportDirectory::getFunctionIndex(const std::string&) const from unsigned int to int.
+
+-------------------------------------------------------------------------------------------------------------
+
+May 31, 2004: PeLib 0.03 alpha
+
+Bugfixes:
+- Fixed some bugs in FileDump.cpp
+
+Changes:
+- Modified PeLibAux.cpp to make PeLib VC++ 7.1 compatible.
+- Changed vector access from .at to operator[] all over the project.
+  Real undefined behaviour is probably better than spontaniously terminating applications.
+
+New:
+- Added makefiles for Borland C++ commandline tools (tested on version 5.6.4)
+- Added makefiles for Digital Mars Compiler (tested on version 8.38n)
+  Note that support for DMC is not yet complete. PeLib compiles though, the examples don't yet but the
+  reason for this is that I am unable to correctly specifiy the PeLib object files when compiling.
+- Added makefiles for Visual C++ 7.1 (tested on compiler Version 13.10.3052)
+
+-------------------------------------------------------------------------------------------------------------
+
+Mai 1, 2004: PeLib 0.02 alpha
+
+Bugfixes:
+- Fixed a bug in FileDump's and OON2's makefile.g++
+- Fixed ImportDirectory::size
+- Changed parameter of PELIB_THUNK_DATA::equalHint from dword to word
+- Fixed a bug in PeHeader::read (PeLib always assumed 0x10 data directories in version 0.01 alpha)
+
+Changes:
+- Slightly changed ImportDirectory::removeFile (Changed function's signature)
+- Moved the definitions of byte, word and dword into the PeLib namespace.
+- Renamed PELIB_THUNK_DATA::equalName to PELIB_THUNK_DATA::equalFunctionName
+- Started to add size() functions to structs defined in PeLibAux.h
+- Moved PeFile::writeSectionData to PeHeader::writeSectionData
+- Moved PeFile::writeSections to PeHeader::writeSections
+
+New:
+- Added ImportDirectory::hasFunction
+- Wrote BoundImportDirectory::size
+- Added accumulate function to PeLibAux.h
+- Added PELIB_IMAGE_SECTION_HEADER::biggerFileOffset
+- Added PELIB_IMAGE_SECTION_HEADER::biggerVirtualAddress
+- Added PeHeader::calcSizeOfImage
+- Added PeHeader::enlargeLastSection
+
+Removed:
+- Removed PeFile::write
+- Removed PeFile::writeImportDirectory
+
+Other changes:
+- Rewrote parts of ImportDirectory::read
+- Rewrote ImportDirectory::removeFunction (both version).
+- Changed std::ios:: to std::ios_base:: in ImportDirectory
+- Changed ImportDirectory::addFunction (both versions)
+- Changed ExportDirectory::rebuild
+- Changed ExportDirectory::size
+- Rewrote ImportDirectory::size
+- Rewrote PeHeader::size
+- Rewrote ComDescriptor::size
+
+-------------------------------------------------------------------------------------------------------------
+
 April 9, 2004: PeLib 0.01 alpha Initial release
\ No newline at end of file
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/license.htm b/utils/zenutils/libraries/pelib-0.9/pelib/license.htm
index 2978aa7920..74f3b5a83c 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/license.htm
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/license.htm
@@ -1,35 +1,35 @@
-<html>

-<body>

-<h1>The zlib/libpng License</h1>

-

-<tt>

-

-<p>Copyright (c) 2004 - Sebastian Porst</p>

-

-  <p>This software is provided 'as-is', without any express or implied

-  warranty.  In no event will the authors be held liable for any damages

-  arising from the use of this software.</p>

-

-  <p>Permission is granted to anyone to use this software for any purpose,

-  including commercial applications, and to alter it and redistribute it

-  freely, subject to the following restrictions:</p>

-

-<blockquote>

-

-  <p>1. The origin of this software must not be misrepresented; you must not

-     claim that you wrote the original software. If you use this software

-     in a product, an acknowledgment in the product documentation would be

-     appreciated but is not required.</p>

-

-  <p>2. Altered source versions must be plainly marked as such, and must not be

-     misrepresented as being the original software.</p>

-

-  <p>3. This notice may not be removed or altered from any source

- distribution.</p>

-

-</blockquote>

-

-</tt>

-

-</body>

+<html>
+<body>
+<h1>The zlib/libpng License</h1>
+
+<tt>
+
+<p>Copyright (c) 2004 - Sebastian Porst</p>
+
+  <p>This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.</p>
+
+  <p>Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:</p>
+
+<blockquote>
+
+  <p>1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.</p>
+
+  <p>2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.</p>
+
+  <p>3. This notice may not be removed or altered from any source
+ distribution.</p>
+
+</blockquote>
+
+</tt>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/utils/zenutils/libraries/pelib-0.9/pelib/readme.txt b/utils/zenutils/libraries/pelib-0.9/pelib/readme.txt
index b26a3e5287..65f289a8fe 100755..100644
--- a/utils/zenutils/libraries/pelib-0.9/pelib/readme.txt
+++ b/utils/zenutils/libraries/pelib-0.9/pelib/readme.txt
@@ -1,44 +1,44 @@
-PeLib - Version 0.09 (alpha release)

-=========================================

-

-Copyright 2004 by Sebastian Porst

-WWW: http://www.pelib.com

-E-Mail: webmaster@the-interweb.com

-

-=========================================

-

-1. What is PeLib?

-2. Where can I find a documentation of PeLib DLL?

-3. Which license is used for PeLib?

-4. Which compilers are being supported?

-5. How do I compile PeLib?

-

-1. What is PeLib DLL?

-   PeLib is an open-source C++ library to modify

-   PE files. See http://www.pelib.com for more details.

-

-2. Where can I find a documentation of PeLib DLL?

-   http://www.pelib.com

-

-3. All parts of PeLib are distributed under the zlib/libpng license.

-   See license.htm for details.

-   

-4. The following compilers have been tested:

-   MingW with g++ 3.2.3

-   Visual C++ 7.1 / Compiler version 13.10.3052

-   Borland C++ 5.6.4 (currently not supported)

-   Digital Mars Compiler 8.38n (currently not supported)

-

-5. Go into the PeLib/source directory and enter the following lines

-   depending on which compiler you use.

-   

-   g++: make -f makefile.g++

-   Borland C++: make -f makefile.bcc (currently not supported)

-   Visual C++ 7.1: nmake makefile.vc7

-   Digital Mars: make makefile.dmc (currently not supported)

-   

-   If the compilation is succesful there should be some *.o/*.obj files

-   and (if you used g++) a PeLib.a file in the lib directory.

-   Then go to the examples directory and pick one example (I

-   suggest FileDump) and try to build it with the same make

+PeLib - Version 0.09 (alpha release)
+=========================================
+
+Copyright 2004 by Sebastian Porst
+WWW: http://www.pelib.com
+E-Mail: webmaster@the-interweb.com
+
+=========================================
+
+1. What is PeLib?
+2. Where can I find a documentation of PeLib DLL?
+3. Which license is used for PeLib?
+4. Which compilers are being supported?
+5. How do I compile PeLib?
+
+1. What is PeLib DLL?
+   PeLib is an open-source C++ library to modify
+   PE files. See http://www.pelib.com for more details.
+
+2. Where can I find a documentation of PeLib DLL?
+   http://www.pelib.com
+
+3. All parts of PeLib are distributed under the zlib/libpng license.
+   See license.htm for details.
+   
+4. The following compilers have been tested:
+   MingW with g++ 3.2.3
+   Visual C++ 7.1 / Compiler version 13.10.3052
+   Borland C++ 5.6.4 (currently not supported)
+   Digital Mars Compiler 8.38n (currently not supported)
+
+5. Go into the PeLib/source directory and enter the following lines
+   depending on which compiler you use.
+   
+   g++: make -f makefile.g++
+   Borland C++: make -f makefile.bcc (currently not supported)
+   Visual C++ 7.1: nmake makefile.vc7
+   Digital Mars: make makefile.dmc (currently not supported)
+   
+   If the compilation is succesful there should be some *.o/*.obj files
+   and (if you used g++) a PeLib.a file in the lib directory.
+   Then go to the examples directory and pick one example (I
+   suggest FileDump) and try to build it with the same make
    command as above.
\ No newline at end of file
diff --git a/utils/zenutils/libraries/zlib123/CMakeLists.txt b/utils/zenutils/libraries/zlib123/CMakeLists.txt
index 05e949567d..32c1fa667b 100755..100644
--- a/utils/zenutils/libraries/zlib123/CMakeLists.txt
+++ b/utils/zenutils/libraries/zlib123/CMakeLists.txt
@@ -1,19 +1,19 @@
-PROJECT(zlib)

-

-# source files for zlib

-SET(zlib_src

-  zlib/adler32.c

-  zlib/compress.c

-  zlib/crc32.c

-  zlib/deflate.c

-  zlib/gzio.c

-  zlib/infback.c

-  zlib/inffast.c

-  zlib/inflate.c

-  zlib/inftrees.c

-  zlib/trees.c

-  zlib/uncompr.c

-  zlib/zutil.c

-)

-

-ADD_LIBRARY(zlib ${zlib_src})

+PROJECT(zlib)
+
+# source files for zlib
+SET(zlib_src
+  zlib/adler32.c
+  zlib/compress.c
+  zlib/crc32.c
+  zlib/deflate.c
+  zlib/gzio.c
+  zlib/infback.c
+  zlib/inffast.c
+  zlib/inflate.c
+  zlib/inftrees.c
+  zlib/trees.c
+  zlib/uncompr.c
+  zlib/zutil.c
+)
+
+ADD_LIBRARY(zlib ${zlib_src})
diff --git a/utils/zenutils/libraries/zlib123/zlib/ChangeLog b/utils/zenutils/libraries/zlib123/zlib/ChangeLog
index 1ac946309b..7f6869d323 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/ChangeLog
+++ b/utils/zenutils/libraries/zlib123/zlib/ChangeLog
@@ -1,855 +1,855 @@
-

-                ChangeLog file for zlib

-

-Changes in 1.2.3 (18 July 2005)

-- Apply security vulnerability fixes to contrib/infback9 as well

-- Clean up some text files (carriage returns, trailing space)

-- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant]

-

-Changes in 1.2.2.4 (11 July 2005)

-- Add inflatePrime() function for starting inflation at bit boundary

-- Avoid some Visual C warnings in deflate.c

-- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit

-  compile

-- Fix some spelling errors in comments [Betts]

-- Correct inflateInit2() error return documentation in zlib.h

-- Added zran.c example of compressed data random access to examples

-  directory, shows use of inflatePrime()

-- Fix cast for assignments to strm->state in inflate.c and infback.c

-- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer]

-- Move declarations of gf2 functions to right place in crc32.c [Oberhumer]

-- Add cast in trees.c t avoid a warning [Oberhumer]

-- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer]

-- Update make_vms.com [Zinser]

-- Initialize state->write in inflateReset() since copied in inflate_fast()

-- Be more strict on incomplete code sets in inflate_table() and increase

-  ENOUGH and MAXD -- this repairs a possible security vulnerability for

-  invalid inflate input.  Thanks to Tavis Ormandy and Markus Oberhumer for

-  discovering the vulnerability and providing test cases.

-- Add ia64 support to configure for HP-UX [Smith]

-- Add error return to gzread() for format or i/o error [Levin]

-- Use malloc.h for OS/2 [Necasek]

-

-Changes in 1.2.2.3 (27 May 2005)

-- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile

-- Typecast fread() return values in gzio.c [Vollant]

-- Remove trailing space in minigzip.c outmode (VC++ can't deal with it)

-- Fix crc check bug in gzread() after gzungetc() [Heiner]

-- Add the deflateTune() function to adjust internal compression parameters

-- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack)

-- Remove an incorrect assertion in examples/zpipe.c

-- Add C++ wrapper in infback9.h [Donais]

-- Fix bug in inflateCopy() when decoding fixed codes

-- Note in zlib.h how much deflateSetDictionary() actually uses

-- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used)

-- Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer]

-- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer]

-- Add gzdirect() function to indicate transparent reads

-- Update contrib/minizip [Vollant]

-- Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer]

-- Add casts in crc32.c to avoid warnings [Oberhumer]

-- Add contrib/masmx64 [Vollant]

-- Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant]

-

-Changes in 1.2.2.2 (30 December 2004)

-- Replace structure assignments in deflate.c and inflate.c with zmemcpy to

-  avoid implicit memcpy calls (portability for no-library compilation)

-- Increase sprintf() buffer size in gzdopen() to allow for large numbers

-- Add INFLATE_STRICT to check distances against zlib header

-- Improve WinCE errno handling and comments [Chang]

-- Remove comment about no gzip header processing in FAQ

-- Add Z_FIXED strategy option to deflateInit2() to force fixed trees

-- Add updated make_vms.com [Coghlan], update README

-- Create a new "examples" directory, move gzappend.c there, add zpipe.c,

-  fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html.

-- Add FAQ entry and comments in deflate.c on uninitialized memory access

-- Add Solaris 9 make options in configure [Gilbert]

-- Allow strerror() usage in gzio.c for STDC

-- Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer]

-- Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant]

-- Use z_off_t for adler32_combine() and crc32_combine() lengths

-- Make adler32() much faster for small len

-- Use OS_CODE in deflate() default gzip header

-

-Changes in 1.2.2.1 (31 October 2004)

-- Allow inflateSetDictionary() call for raw inflate

-- Fix inflate header crc check bug for file names and comments

-- Add deflateSetHeader() and gz_header structure for custom gzip headers

-- Add inflateGetheader() to retrieve gzip headers

-- Add crc32_combine() and adler32_combine() functions

-- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list

-- Use zstreamp consistently in zlib.h (inflate_back functions)

-- Remove GUNZIP condition from definition of inflate_mode in inflate.h

-  and in contrib/inflate86/inffast.S [Truta, Anderson]

-- Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson]

-- Update projects/README.projects and projects/visualc6 [Truta]

-- Update win32/DLL_FAQ.txt [Truta]

-- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta]

-- Deprecate Z_ASCII; use Z_TEXT instead [Truta]

-- Use a new algorithm for setting strm->data_type in trees.c [Truta]

-- Do not define an exit() prototype in zutil.c unless DEBUG defined

-- Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta]

-- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate()

-- Fix Darwin build version identification [Peterson]

-

-Changes in 1.2.2 (3 October 2004)

-- Update zlib.h comments on gzip in-memory processing

-- Set adler to 1 in inflateReset() to support Java test suite [Walles]

-- Add contrib/dotzlib [Ravn]

-- Update win32/DLL_FAQ.txt [Truta]

-- Update contrib/minizip [Vollant]

-- Move contrib/visual-basic.txt to old/ [Truta]

-- Fix assembler builds in projects/visualc6/ [Truta]

-

-Changes in 1.2.1.2 (9 September 2004)

-- Update INDEX file

-- Fix trees.c to update strm->data_type (no one ever noticed!)

-- Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown]

-- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE)

-- Add limited multitasking protection to DYNAMIC_CRC_TABLE

-- Add NO_vsnprintf for VMS in zutil.h [Mozilla]

-- Don't declare strerror() under VMS [Mozilla]

-- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize

-- Update contrib/ada [Anisimkov]

-- Update contrib/minizip [Vollant]

-- Fix configure to not hardcode directories for Darwin [Peterson]

-- Fix gzio.c to not return error on empty files [Brown]

-- Fix indentation; update version in contrib/delphi/ZLib.pas and

-  contrib/pascal/zlibpas.pas [Truta]

-- Update mkasm.bat in contrib/masmx86 [Truta]

-- Update contrib/untgz [Truta]

-- Add projects/README.projects [Truta]

-- Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta]

-- Update win32/DLL_FAQ.txt [Truta]

-- Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta]

-- Remove an unnecessary assignment to curr in inftrees.c [Truta]

-- Add OS/2 to exe builds in configure [Poltorak]

-- Remove err dummy parameter in zlib.h [Kientzle]

-

-Changes in 1.2.1.1 (9 January 2004)

-- Update email address in README

-- Several FAQ updates

-- Fix a big fat bug in inftrees.c that prevented decoding valid

-  dynamic blocks with only literals and no distance codes --

-  Thanks to "Hot Emu" for the bug report and sample file

-- Add a note to puff.c on no distance codes case.

-

-Changes in 1.2.1 (17 November 2003)

-- Remove a tab in contrib/gzappend/gzappend.c

-- Update some interfaces in contrib for new zlib functions

-- Update zlib version number in some contrib entries

-- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta]

-- Support shared libraries on Hurd and KFreeBSD [Brown]

-- Fix error in NO_DIVIDE option of adler32.c

-

-Changes in 1.2.0.8 (4 November 2003)

-- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas

-- Add experimental NO_DIVIDE #define in adler32.c

-    - Possibly faster on some processors (let me know if it is)

-- Correct Z_BLOCK to not return on first inflate call if no wrap

-- Fix strm->data_type on inflate() return to correctly indicate EOB

-- Add deflatePrime() function for appending in the middle of a byte

-- Add contrib/gzappend for an example of appending to a stream

-- Update win32/DLL_FAQ.txt [Truta]

-- Delete Turbo C comment in README [Truta]

-- Improve some indentation in zconf.h [Truta]

-- Fix infinite loop on bad input in configure script [Church]

-- Fix gzeof() for concatenated gzip files [Johnson]

-- Add example to contrib/visual-basic.txt [Michael B.]

-- Add -p to mkdir's in Makefile.in [vda]

-- Fix configure to properly detect presence or lack of printf functions

-- Add AS400 support [Monnerat]

-- Add a little Cygwin support [Wilson]

-

-Changes in 1.2.0.7 (21 September 2003)

-- Correct some debug formats in contrib/infback9

-- Cast a type in a debug statement in trees.c

-- Change search and replace delimiter in configure from % to # [Beebe]

-- Update contrib/untgz to 0.2 with various fixes [Truta]

-- Add build support for Amiga [Nikl]

-- Remove some directories in old that have been updated to 1.2

-- Add dylib building for Mac OS X in configure and Makefile.in

-- Remove old distribution stuff from Makefile

-- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X

-- Update links in README

-

-Changes in 1.2.0.6 (13 September 2003)

-- Minor FAQ updates

-- Update contrib/minizip to 1.00 [Vollant]

-- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta]

-- Update POSTINC comment for 68060 [Nikl]

-- Add contrib/infback9 with deflate64 decoding (unsupported)

-- For MVS define NO_vsnprintf and undefine FAR [van Burik]

-- Add pragma for fdopen on MVS [van Burik]

-

-Changes in 1.2.0.5 (8 September 2003)

-- Add OF to inflateBackEnd() declaration in zlib.h

-- Remember start when using gzdopen in the middle of a file

-- Use internal off_t counters in gz* functions to properly handle seeks

-- Perform more rigorous check for distance-too-far in inffast.c

-- Add Z_BLOCK flush option to return from inflate at block boundary

-- Set strm->data_type on return from inflate

-    - Indicate bits unused, if at block boundary, and if in last block

-- Replace size_t with ptrdiff_t in crc32.c, and check for correct size

-- Add condition so old NO_DEFLATE define still works for compatibility

-- FAQ update regarding the Windows DLL [Truta]

-- INDEX update: add qnx entry, remove aix entry [Truta]

-- Install zlib.3 into mandir [Wilson]

-- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta]

-- Adapt the zlib interface to the new DLL convention guidelines [Truta]

-- Introduce ZLIB_WINAPI macro to allow the export of functions using

-  the WINAPI calling convention, for Visual Basic [Vollant, Truta]

-- Update msdos and win32 scripts and makefiles [Truta]

-- Export symbols by name, not by ordinal, in win32/zlib.def [Truta]

-- Add contrib/ada [Anisimkov]

-- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta]

-- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant]

-- Add contrib/masm686 [Truta]

-- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm

-  [Truta, Vollant]

-- Update contrib/delphi; rename to contrib/pascal; add example [Truta]

-- Remove contrib/delphi2; add a new contrib/delphi [Truta]

-- Avoid inclusion of the nonstandard <memory.h> in contrib/iostream,

-  and fix some method prototypes [Truta]

-- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip

-  [Truta]

-- Avoid the use of backslash (\) in contrib/minizip [Vollant]

-- Fix file time handling in contrib/untgz; update makefiles [Truta]

-- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines

-  [Vollant]

-- Remove contrib/vstudio/vc15_16 [Vollant]

-- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta]

-- Update README.contrib [Truta]

-- Invert the assignment order of match_head and s->prev[...] in

-  INSERT_STRING [Truta]

-- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings

-  [Truta]

-- Compare function pointers with 0, not with NULL or Z_NULL [Truta]

-- Fix prototype of syncsearch in inflate.c [Truta]

-- Introduce ASMINF macro to be enabled when using an ASM implementation

-  of inflate_fast [Truta]

-- Change NO_DEFLATE to NO_GZCOMPRESS [Truta]

-- Modify test_gzio in example.c to take a single file name as a

-  parameter [Truta]

-- Exit the example.c program if gzopen fails [Truta]

-- Add type casts around strlen in example.c [Truta]

-- Remove casting to sizeof in minigzip.c; give a proper type

-  to the variable compared with SUFFIX_LEN [Truta]

-- Update definitions of STDC and STDC99 in zconf.h [Truta]

-- Synchronize zconf.h with the new Windows DLL interface [Truta]

-- Use SYS16BIT instead of __32BIT__ to distinguish between

-  16- and 32-bit platforms [Truta]

-- Use far memory allocators in small 16-bit memory models for

-  Turbo C [Truta]

-- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in

-  zlibCompileFlags [Truta]

-- Cygwin has vsnprintf [Wilson]

-- In Windows16, OS_CODE is 0, as in MSDOS [Truta]

-- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson]

-

-Changes in 1.2.0.4 (10 August 2003)

-- Minor FAQ updates

-- Be more strict when checking inflateInit2's windowBits parameter

-- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well

-- Add gzip wrapper option to deflateInit2 using windowBits

-- Add updated QNX rule in configure and qnx directory [Bonnefoy]

-- Make inflate distance-too-far checks more rigorous

-- Clean up FAR usage in inflate

-- Add casting to sizeof() in gzio.c and minigzip.c

-

-Changes in 1.2.0.3 (19 July 2003)

-- Fix silly error in gzungetc() implementation [Vollant]

-- Update contrib/minizip and contrib/vstudio [Vollant]

-- Fix printf format in example.c

-- Correct cdecl support in zconf.in.h [Anisimkov]

-- Minor FAQ updates

-

-Changes in 1.2.0.2 (13 July 2003)

-- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons

-- Attempt to avoid warnings in crc32.c for pointer-int conversion

-- Add AIX to configure, remove aix directory [Bakker]

-- Add some casts to minigzip.c

-- Improve checking after insecure sprintf() or vsprintf() calls

-- Remove #elif's from crc32.c

-- Change leave label to inf_leave in inflate.c and infback.c to avoid

-  library conflicts

-- Remove inflate gzip decoding by default--only enable gzip decoding by

-  special request for stricter backward compatibility

-- Add zlibCompileFlags() function to return compilation information

-- More typecasting in deflate.c to avoid warnings

-- Remove leading underscore from _Capital #defines [Truta]

-- Fix configure to link shared library when testing

-- Add some Windows CE target adjustments [Mai]

-- Remove #define ZLIB_DLL in zconf.h [Vollant]

-- Add zlib.3 [Rodgers]

-- Update RFC URL in deflate.c and algorithm.txt [Mai]

-- Add zlib_dll_FAQ.txt to contrib [Truta]

-- Add UL to some constants [Truta]

-- Update minizip and vstudio [Vollant]

-- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h

-- Expand use of NO_DUMMY_DECL to avoid all dummy structures

-- Added iostream3 to contrib [Schwardt]

-- Replace rewind() with fseek() for WinCE [Truta]

-- Improve setting of zlib format compression level flags

-    - Report 0 for huffman and rle strategies and for level == 0 or 1

-    - Report 2 only for level == 6

-- Only deal with 64K limit when necessary at compile time [Truta]

-- Allow TOO_FAR check to be turned off at compile time [Truta]

-- Add gzclearerr() function [Souza]

-- Add gzungetc() function

-

-Changes in 1.2.0.1 (17 March 2003)

-- Add Z_RLE strategy for run-length encoding [Truta]

-    - When Z_RLE requested, restrict matches to distance one

-    - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE

-- Correct FASTEST compilation to allow level == 0

-- Clean up what gets compiled for FASTEST

-- Incorporate changes to zconf.in.h [Vollant]

-    - Refine detection of Turbo C need for dummy returns

-    - Refine ZLIB_DLL compilation

-    - Include additional header file on VMS for off_t typedef

-- Try to use _vsnprintf where it supplants vsprintf [Vollant]

-- Add some casts in inffast.c

-- Enchance comments in zlib.h on what happens if gzprintf() tries to

-  write more than 4095 bytes before compression

-- Remove unused state from inflateBackEnd()

-- Remove exit(0) from minigzip.c, example.c

-- Get rid of all those darn tabs

-- Add "check" target to Makefile.in that does the same thing as "test"

-- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in

-- Update contrib/inflate86 [Anderson]

-- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant]

-- Add msdos and win32 directories with makefiles [Truta]

-- More additions and improvements to the FAQ

-

-Changes in 1.2.0 (9 March 2003)

-- New and improved inflate code

-    - About 20% faster

-    - Does not allocate 32K window unless and until needed

-    - Automatically detects and decompresses gzip streams

-    - Raw inflate no longer needs an extra dummy byte at end

-    - Added inflateBack functions using a callback interface--even faster

-      than inflate, useful for file utilities (gzip, zip)

-    - Added inflateCopy() function to record state for random access on

-      externally generated deflate streams (e.g. in gzip files)

-    - More readable code (I hope)

-- New and improved crc32()

-    - About 50% faster, thanks to suggestions from Rodney Brown

-- Add deflateBound() and compressBound() functions

-- Fix memory leak in deflateInit2()

-- Permit setting dictionary for raw deflate (for parallel deflate)

-- Fix const declaration for gzwrite()

-- Check for some malloc() failures in gzio.c

-- Fix bug in gzopen() on single-byte file 0x1f

-- Fix bug in gzread() on concatenated file with 0x1f at end of buffer

-  and next buffer doesn't start with 0x8b

-- Fix uncompress() to return Z_DATA_ERROR on truncated input

-- Free memory at end of example.c

-- Remove MAX #define in trees.c (conflicted with some libraries)

-- Fix static const's in deflate.c, gzio.c, and zutil.[ch]

-- Declare malloc() and free() in gzio.c if STDC not defined

-- Use malloc() instead of calloc() in zutil.c if int big enough

-- Define STDC for AIX

-- Add aix/ with approach for compiling shared library on AIX

-- Add HP-UX support for shared libraries in configure

-- Add OpenUNIX support for shared libraries in configure

-- Use $cc instead of gcc to build shared library

-- Make prefix directory if needed when installing

-- Correct Macintosh avoidance of typedef Byte in zconf.h

-- Correct Turbo C memory allocation when under Linux

-- Use libz.a instead of -lz in Makefile (assure use of compiled library)

-- Update configure to check for snprintf or vsnprintf functions and their

-  return value, warn during make if using an insecure function

-- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that

-  is lost when library is used--resolution is to build new zconf.h

-- Documentation improvements (in zlib.h):

-    - Document raw deflate and inflate

-    - Update RFCs URL

-    - Point out that zlib and gzip formats are different

-    - Note that Z_BUF_ERROR is not fatal

-    - Document string limit for gzprintf() and possible buffer overflow

-    - Note requirement on avail_out when flushing

-    - Note permitted values of flush parameter of inflate()

-- Add some FAQs (and even answers) to the FAQ

-- Add contrib/inflate86/ for x86 faster inflate

-- Add contrib/blast/ for PKWare Data Compression Library decompression

-- Add contrib/puff/ simple inflate for deflate format description

-

-Changes in 1.1.4 (11 March 2002)

-- ZFREE was repeated on same allocation on some error conditions.

-  This creates a security problem described in

-  http://www.zlib.org/advisory-2002-03-11.txt

-- Returned incorrect error (Z_MEM_ERROR) on some invalid data

-- Avoid accesses before window for invalid distances with inflate window

-  less than 32K.

-- force windowBits > 8 to avoid a bug in the encoder for a window size

-  of 256 bytes. (A complete fix will be available in 1.1.5).

-

-Changes in 1.1.3 (9 July 1998)

-- fix "an inflate input buffer bug that shows up on rare but persistent

-  occasions" (Mark)

-- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)

-- fix gzseek(..., SEEK_SET) in write mode

-- fix crc check after a gzeek (Frank Faubert)

-- fix miniunzip when the last entry in a zip file is itself a zip file

-  (J Lillge)

-- add contrib/asm586 and contrib/asm686 (Brian Raiter)

-  See http://www.muppetlabs.com/~breadbox/software/assembly.html

-- add support for Delphi 3 in contrib/delphi (Bob Dellaca)

-- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)

-- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)

-- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)

-- added a FAQ file

-

-- Support gzdopen on Mac with Metrowerks (Jason Linhart)

-- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart)

-- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young)

-- avoid some warnings with Borland C (Tom Tanner)

-- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant)

-- emulate utime() for WIN32 in contrib/untgz  (Gilles Vollant)

-- allow several arguments to configure (Tim Mooney, Frodo Looijaard)

-- use libdir and includedir in Makefile.in (Tim Mooney)

-- support shared libraries on OSF1 V4 (Tim Mooney)

-- remove so_locations in "make clean"  (Tim Mooney)

-- fix maketree.c compilation error (Glenn, Mark)

-- Python interface to zlib now in Python 1.5 (Jeremy Hylton)

-- new Makefile.riscos (Rich Walker)

-- initialize static descriptors in trees.c for embedded targets (Nick Smith)

-- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith)

-- add the OS/2 files in Makefile.in too (Andrew Zabolotny)

-- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane)

-- fix maketree.c to allow clean compilation of inffixed.h (Mark)

-- fix parameter check in deflateCopy (Gunther Nikl)

-- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler)

-- Many portability patches by Christian Spieler:

-  . zutil.c, zutil.h: added "const" for zmem*

-  . Make_vms.com: fixed some typos

-  . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists

-  . msdos/Makefile.msc: remove "default rtl link library" info from obj files

-  . msdos/Makefile.*: use model-dependent name for the built zlib library

-  . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc:

-     new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT)

-- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane)

-- replace __far with _far for better portability (Christian Spieler, Tom Lane)

-- fix test for errno.h in configure (Tim Newsham)

-

-Changes in 1.1.2 (19 March 98)

-- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant)

-  See http://www.winimage.com/zLibDll/unzip.html

-- preinitialize the inflate tables for fixed codes, to make the code

-  completely thread safe (Mark)

-- some simplifications and slight speed-up to the inflate code (Mark)

-- fix gzeof on non-compressed files (Allan Schrum)

-- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs)

-- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn)

-- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny)

-- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori)

-- do not wrap extern "C" around system includes (Tom Lane)

-- mention zlib binding for TCL in README (Andreas Kupries)

-- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert)

-- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson)

-- allow "configure --prefix $HOME" (Tim Mooney)

-- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson)

-- move Makefile.sas to amiga/Makefile.sas

-

-Changes in 1.1.1 (27 Feb 98)

-- fix macros _tr_tally_* in deflate.h for debug mode  (Glenn Randers-Pehrson)

-- remove block truncation heuristic which had very marginal effect for zlib

-  (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the

-  compression ratio on some files. This also allows inlining _tr_tally for

-  matches in deflate_slow.

-- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)

-

-Changes in 1.1.0 (24 Feb 98)

-- do not return STREAM_END prematurely in inflate (John Bowler)

-- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler)

-- compile with -DFASTEST to get compression code optimized for speed only

-- in minigzip, try mmap'ing the input file first (Miguel Albrecht)

-- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain

-  on Sun but significant on HP)

-

-- add a pointer to experimental unzip library in README (Gilles Vollant)

-- initialize variable gcc in configure (Chris Herborth)

-

-Changes in 1.0.9 (17 Feb 1998)

-- added gzputs and gzgets functions

-- do not clear eof flag in gzseek (Mark Diekhans)

-- fix gzseek for files in transparent mode (Mark Diekhans)

-- do not assume that vsprintf returns the number of bytes written (Jens Krinke)

-- replace EXPORT with ZEXPORT to avoid conflict with other programs

-- added compress2 in zconf.h, zlib.def, zlib.dnt

-- new asm code from Gilles Vollant in contrib/asm386

-- simplify the inflate code (Mark):

- . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new()

- . ZALLOC the length list in inflate_trees_fixed() instead of using stack

- . ZALLOC the value area for huft_build() instead of using stack

- . Simplify Z_FINISH check in inflate()

-

-- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8

-- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)

-- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with

-  the declaration of FAR (Gilles VOllant)

-- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)

-- read_buf buf parameter of type Bytef* instead of charf*

-- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)

-- do not redeclare unlink in minigzip.c for WIN32 (John Bowler)

-- fix check for presence of directories in "make install" (Ian Willis)

-

-Changes in 1.0.8 (27 Jan 1998)

-- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant)

-- fix gzgetc and gzputc for big endian systems (Markus Oberhumer)

-- added compress2() to allow setting the compression level

-- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)

-- use constant arrays for the static trees in trees.c instead of computing

-  them at run time (thanks to Ken Raeburn for this suggestion). To create

-  trees.h, compile with GEN_TREES_H and run "make test".

-- check return code of example in "make test" and display result

-- pass minigzip command line options to file_compress

-- simplifying code of inflateSync to avoid gcc 2.8 bug

-

-- support CC="gcc -Wall" in configure -s (QingLong)

-- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)

-- fix test for shared library support to avoid compiler warnings

-- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)

-- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)

-- do not use fdopen for Metrowerks on Mac (Brad Pettit))

-- add checks for gzputc and gzputc in example.c

-- avoid warnings in gzio.c and deflate.c (Andreas Kleinert)

-- use const for the CRC table (Ken Raeburn)

-- fixed "make uninstall" for shared libraries

-- use Tracev instead of Trace in infblock.c

-- in example.c use correct compressed length for test_sync

-- suppress +vnocompatwarnings in configure for HPUX (not always supported)

-

-Changes in 1.0.7 (20 Jan 1998)

-- fix gzseek which was broken in write mode

-- return error for gzseek to negative absolute position

-- fix configure for Linux (Chun-Chung Chen)

-- increase stack space for MSC (Tim Wegner)

-- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant)

-- define EXPORTVA for gzprintf (Gilles Vollant)

-- added man page zlib.3 (Rick Rodgers)

-- for contrib/untgz, fix makedir() and improve Makefile

-

-- check gzseek in write mode in example.c

-- allocate extra buffer for seeks only if gzseek is actually called

-- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant)

-- add inflateSyncPoint in zconf.h

-- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def

-

-Changes in 1.0.6 (19 Jan 1998)

-- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and

-  gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)

-- Fix a deflate bug occurring only with compression level 0 (thanks to

-  Andy Buckler for finding this one).

-- In minigzip, pass transparently also the first byte for .Z files.

-- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()

-- check Z_FINISH in inflate (thanks to Marc Schluper)

-- Implement deflateCopy (thanks to Adam Costello)

-- make static libraries by default in configure, add --shared option.

-- move MSDOS or Windows specific files to directory msdos

-- suppress the notion of partial flush to simplify the interface

-  (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)

-- suppress history buffer provided by application to simplify the interface

-  (this feature was not implemented anyway in 1.0.4)

-- next_in and avail_in must be initialized before calling inflateInit or

-  inflateInit2

-- add EXPORT in all exported functions (for Windows DLL)

-- added Makefile.nt (thanks to Stephen Williams)

-- added the unsupported "contrib" directory:

-   contrib/asm386/ by Gilles Vollant <info@winimage.com>

-        386 asm code replacing longest_match().

-   contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>

-        A C++ I/O streams interface to the zlib gz* functions

-   contrib/iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>

-        Another C++ I/O streams interface

-   contrib/untgz/  by "Pedro A. Aranda Guti\irrez" <paag@tid.es>

-        A very simple tar.gz file extractor using zlib

-   contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>

-        How to use compress(), uncompress() and the gz* functions from VB.

-- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression

-  level) in minigzip (thanks to Tom Lane)

-

-- use const for rommable constants in deflate

-- added test for gzseek and gztell in example.c

-- add undocumented function inflateSyncPoint() (hack for Paul Mackerras)

-- add undocumented function zError to convert error code to string

-  (for Tim Smithers)

-- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code.

-- Use default memcpy for Symantec MSDOS compiler.

-- Add EXPORT keyword for check_func (needed for Windows DLL)

-- add current directory to LD_LIBRARY_PATH for "make test"

-- create also a link for libz.so.1

-- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura)

-- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX)

-- added -soname for Linux in configure (Chun-Chung Chen,

-- assign numbers to the exported functions in zlib.def (for Windows DLL)

-- add advice in zlib.h for best usage of deflateSetDictionary

-- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn)

-- allow compilation with ANSI keywords only enabled for TurboC in large model

-- avoid "versionString"[0] (Borland bug)

-- add NEED_DUMMY_RETURN for Borland

-- use variable z_verbose for tracing in debug mode (L. Peter Deutsch).

-- allow compilation with CC

-- defined STDC for OS/2 (David Charlap)

-- limit external names to 8 chars for MVS (Thomas Lund)

-- in minigzip.c, use static buffers only for 16-bit systems

-- fix suffix check for "minigzip -d foo.gz"

-- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee)

-- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)

-- added makelcc.bat for lcc-win32 (Tom St Denis)

-- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)

-- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.

-- check for unistd.h in configure (for off_t)

-- remove useless check parameter in inflate_blocks_free

-- avoid useless assignment of s->check to itself in inflate_blocks_new

-- do not flush twice in gzclose (thanks to Ken Raeburn)

-- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h

-- use NO_ERRNO_H instead of enumeration of operating systems with errno.h

-- work around buggy fclose on pipes for HP/UX

-- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson)

-- fix configure if CC is already equal to gcc

-

-Changes in 1.0.5 (3 Jan 98)

-- Fix inflate to terminate gracefully when fed corrupted or invalid data

-- Use const for rommable constants in inflate

-- Eliminate memory leaks on error conditions in inflate

-- Removed some vestigial code in inflate

-- Update web address in README

-

-Changes in 1.0.4 (24 Jul 96)

-- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF

-  bit, so the decompressor could decompress all the correct data but went

-  on to attempt decompressing extra garbage data. This affected minigzip too.

-- zlibVersion and gzerror return const char* (needed for DLL)

-- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)

-- use z_error only for DEBUG (avoid problem with DLLs)

-

-Changes in 1.0.3 (2 Jul 96)

-- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS

-  small and medium models; this makes the library incompatible with previous

-  versions for these models. (No effect in large model or on other systems.)

-- return OK instead of BUF_ERROR if previous deflate call returned with

-  avail_out as zero but there is nothing to do

-- added memcmp for non STDC compilers

-- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly)

-- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO)

-- better check for 16-bit mode MSC (avoids problem with Symantec)

-

-Changes in 1.0.2 (23 May 96)

-- added Windows DLL support

-- added a function zlibVersion (for the DLL support)

-- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model)

-- Bytef is define's instead of typedef'd only for Borland C

-- avoid reading uninitialized memory in example.c

-- mention in README that the zlib format is now RFC1950

-- updated Makefile.dj2

-- added algorithm.doc

-

-Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]

-- fix array overlay in deflate.c which sometimes caused bad compressed data

-- fix inflate bug with empty stored block

-- fix MSDOS medium model which was broken in 0.99

-- fix deflateParams() which could generated bad compressed data.

-- Bytef is define'd instead of typedef'ed (work around Borland bug)

-- added an INDEX file

-- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),

-  Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)

-- speed up adler32 for modern machines without auto-increment

-- added -ansi for IRIX in configure

-- static_init_done in trees.c is an int

-- define unlink as delete for VMS

-- fix configure for QNX

-- add configure branch for SCO and HPUX

-- avoid many warnings (unused variables, dead assignments, etc...)

-- no fdopen for BeOS

-- fix the Watcom fix for 32 bit mode (define FAR as empty)

-- removed redefinition of Byte for MKWERKS

-- work around an MWKERKS bug (incorrect merge of all .h files)

-

-Changes in 0.99 (27 Jan 96)

-- allow preset dictionary shared between compressor and decompressor

-- allow compression level 0 (no compression)

-- add deflateParams in zlib.h: allow dynamic change of compression level

-  and compression strategy.

-- test large buffers and deflateParams in example.c

-- add optional "configure" to build zlib as a shared library

-- suppress Makefile.qnx, use configure instead

-- fixed deflate for 64-bit systems (detected on Cray)

-- fixed inflate_blocks for 64-bit systems (detected on Alpha)

-- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)

-- always return Z_BUF_ERROR when deflate() has nothing to do

-- deflateInit and inflateInit are now macros to allow version checking

-- prefix all global functions and types with z_ with -DZ_PREFIX

-- make falloc completely reentrant (inftrees.c)

-- fixed very unlikely race condition in ct_static_init

-- free in reverse order of allocation to help memory manager

-- use zlib-1.0/* instead of zlib/* inside the tar.gz

-- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith

-  -Wconversion -Wstrict-prototypes -Wmissing-prototypes"

-- allow gzread on concatenated .gz files

-- deflateEnd now returns Z_DATA_ERROR if it was premature

-- deflate is finally (?) fully deterministic (no matches beyond end of input)

-- Document Z_SYNC_FLUSH

-- add uninstall in Makefile

-- Check for __cpluplus in zlib.h

-- Better test in ct_align for partial flush

-- avoid harmless warnings for Borland C++

-- initialize hash_head in deflate.c

-- avoid warning on fdopen (gzio.c) for HP cc -Aa

-- include stdlib.h for STDC compilers

-- include errno.h for Cray

-- ignore error if ranlib doesn't exist

-- call ranlib twice for NeXTSTEP

-- use exec_prefix instead of prefix for libz.a

-- renamed ct_* as _tr_* to avoid conflict with applications

-- clear z->msg in inflateInit2 before any error return

-- initialize opaque in example.c, gzio.c, deflate.c and inflate.c

-- fixed typo in zconf.h (_GNUC__ => __GNUC__)

-- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)

-- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)

-- in fcalloc, normalize pointer if size > 65520 bytes

-- don't use special fcalloc for 32 bit Borland C++

-- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...

-- use Z_BINARY instead of BINARY

-- document that gzclose after gzdopen will close the file

-- allow "a" as mode in gzopen.

-- fix error checking in gzread

-- allow skipping .gz extra-field on pipes

-- added reference to Perl interface in README

-- put the crc table in FAR data (I dislike more and more the medium model :)

-- added get_crc_table

-- added a dimension to all arrays (Borland C can't count).

-- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast

-- guard against multiple inclusion of *.h (for precompiled header on Mac)

-- Watcom C pretends to be Microsoft C small model even in 32 bit mode.

-- don't use unsized arrays to avoid silly warnings by Visual C++:

-     warning C4746: 'inflate_mask' : unsized array treated as  '__far'

-     (what's wrong with far data in far model?).

-- define enum out of inflate_blocks_state to allow compilation with C++

-

-Changes in 0.95 (16 Aug 95)

-- fix MSDOS small and medium model (now easier to adapt to any compiler)

-- inlined send_bits

-- fix the final (:-) bug for deflate with flush (output was correct but

-  not completely flushed in rare occasions).

-- default window size is same for compression and decompression

-  (it's now sufficient to set MAX_WBITS in zconf.h).

-- voidp -> voidpf and voidnp -> voidp (for consistency with other

-  typedefs and because voidnp was not near in large model).

-

-Changes in 0.94 (13 Aug 95)

-- support MSDOS medium model

-- fix deflate with flush (could sometimes generate bad output)

-- fix deflateReset (zlib header was incorrectly suppressed)

-- added support for VMS

-- allow a compression level in gzopen()

-- gzflush now calls fflush

-- For deflate with flush, flush even if no more input is provided.

-- rename libgz.a as libz.a

-- avoid complex expression in infcodes.c triggering Turbo C bug

-- work around a problem with gcc on Alpha (in INSERT_STRING)

-- don't use inline functions (problem with some gcc versions)

-- allow renaming of Byte, uInt, etc... with #define.

-- avoid warning about (unused) pointer before start of array in deflate.c

-- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c

-- avoid reserved word 'new' in trees.c

-

-Changes in 0.93 (25 June 95)

-- temporarily disable inline functions

-- make deflate deterministic

-- give enough lookahead for PARTIAL_FLUSH

-- Set binary mode for stdin/stdout in minigzip.c for OS/2

-- don't even use signed char in inflate (not portable enough)

-- fix inflate memory leak for segmented architectures

-

-Changes in 0.92 (3 May 95)

-- don't assume that char is signed (problem on SGI)

-- Clear bit buffer when starting a stored block

-- no memcpy on Pyramid

-- suppressed inftest.c

-- optimized fill_window, put longest_match inline for gcc

-- optimized inflate on stored blocks.

-- untabify all sources to simplify patches

-

-Changes in 0.91 (2 May 95)

-- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h

-- Document the memory requirements in zconf.h

-- added "make install"

-- fix sync search logic in inflateSync

-- deflate(Z_FULL_FLUSH) now works even if output buffer too short

-- after inflateSync, don't scare people with just "lo world"

-- added support for DJGPP

-

-Changes in 0.9 (1 May 95)

-- don't assume that zalloc clears the allocated memory (the TurboC bug

-  was Mark's bug after all :)

-- let again gzread copy uncompressed data unchanged (was working in 0.71)

-- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented

-- added a test of inflateSync in example.c

-- moved MAX_WBITS to zconf.h because users might want to change that.

-- document explicitly that zalloc(64K) on MSDOS must return a normalized

-  pointer (zero offset)

-- added Makefiles for Microsoft C, Turbo C, Borland C++

-- faster crc32()

-

-Changes in 0.8 (29 April 95)

-- added fast inflate (inffast.c)

-- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this

-  is incompatible with previous versions of zlib which returned Z_OK.

-- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)

-  (actually that was not a compiler bug, see 0.81 above)

-- gzread no longer reads one extra byte in certain cases

-- In gzio destroy(), don't reference a freed structure

-- avoid many warnings for MSDOS

-- avoid the ERROR symbol which is used by MS Windows

-

-Changes in 0.71 (14 April 95)

-- Fixed more MSDOS compilation problems :( There is still a bug with

-  TurboC large model.

-

-Changes in 0.7 (14 April 95)

-- Added full inflate support.

-- Simplified the crc32() interface. The pre- and post-conditioning

-  (one's complement) is now done inside crc32(). WARNING: this is

-  incompatible with previous versions; see zlib.h for the new usage.

-

-Changes in 0.61 (12 April 95)

-- workaround for a bug in TurboC. example and minigzip now work on MSDOS.

-

-Changes in 0.6 (11 April 95)

-- added minigzip.c

-- added gzdopen to reopen a file descriptor as gzFile

-- added transparent reading of non-gziped files in gzread.

-- fixed bug in gzread (don't read crc as data)

-- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose).

-- don't allocate big arrays in the stack (for MSDOS)

-- fix some MSDOS compilation problems

-

-Changes in 0.5:

-- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but

-  not yet Z_FULL_FLUSH.

-- support decompression but only in a single step (forced Z_FINISH)

-- added opaque object for zalloc and zfree.

-- added deflateReset and inflateReset

-- added a variable zlib_version for consistency checking.

-- renamed the 'filter' parameter of deflateInit2 as 'strategy'.

-  Added Z_FILTERED and Z_HUFFMAN_ONLY constants.

-

-Changes in 0.4:

-- avoid "zip" everywhere, use zlib instead of ziplib.

-- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush

-  if compression method == 8.

-- added adler32 and crc32

-- renamed deflateOptions as deflateInit2, call one or the other but not both

-- added the method parameter for deflateInit2.

-- added inflateInit2

-- simplied considerably deflateInit and inflateInit by not supporting

-  user-provided history buffer. This is supported only in deflateInit2

-  and inflateInit2.

-

-Changes in 0.3:

-- prefix all macro names with Z_

-- use Z_FINISH instead of deflateEnd to finish compression.

-- added Z_HUFFMAN_ONLY

-- added gzerror()

+
+                ChangeLog file for zlib
+
+Changes in 1.2.3 (18 July 2005)
+- Apply security vulnerability fixes to contrib/infback9 as well
+- Clean up some text files (carriage returns, trailing space)
+- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant]
+
+Changes in 1.2.2.4 (11 July 2005)
+- Add inflatePrime() function for starting inflation at bit boundary
+- Avoid some Visual C warnings in deflate.c
+- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit
+  compile
+- Fix some spelling errors in comments [Betts]
+- Correct inflateInit2() error return documentation in zlib.h
+- Added zran.c example of compressed data random access to examples
+  directory, shows use of inflatePrime()
+- Fix cast for assignments to strm->state in inflate.c and infback.c
+- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer]
+- Move declarations of gf2 functions to right place in crc32.c [Oberhumer]
+- Add cast in trees.c t avoid a warning [Oberhumer]
+- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer]
+- Update make_vms.com [Zinser]
+- Initialize state->write in inflateReset() since copied in inflate_fast()
+- Be more strict on incomplete code sets in inflate_table() and increase
+  ENOUGH and MAXD -- this repairs a possible security vulnerability for
+  invalid inflate input.  Thanks to Tavis Ormandy and Markus Oberhumer for
+  discovering the vulnerability and providing test cases.
+- Add ia64 support to configure for HP-UX [Smith]
+- Add error return to gzread() for format or i/o error [Levin]
+- Use malloc.h for OS/2 [Necasek]
+
+Changes in 1.2.2.3 (27 May 2005)
+- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile
+- Typecast fread() return values in gzio.c [Vollant]
+- Remove trailing space in minigzip.c outmode (VC++ can't deal with it)
+- Fix crc check bug in gzread() after gzungetc() [Heiner]
+- Add the deflateTune() function to adjust internal compression parameters
+- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack)
+- Remove an incorrect assertion in examples/zpipe.c
+- Add C++ wrapper in infback9.h [Donais]
+- Fix bug in inflateCopy() when decoding fixed codes
+- Note in zlib.h how much deflateSetDictionary() actually uses
+- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used)
+- Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer]
+- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer]
+- Add gzdirect() function to indicate transparent reads
+- Update contrib/minizip [Vollant]
+- Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer]
+- Add casts in crc32.c to avoid warnings [Oberhumer]
+- Add contrib/masmx64 [Vollant]
+- Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant]
+
+Changes in 1.2.2.2 (30 December 2004)
+- Replace structure assignments in deflate.c and inflate.c with zmemcpy to
+  avoid implicit memcpy calls (portability for no-library compilation)
+- Increase sprintf() buffer size in gzdopen() to allow for large numbers
+- Add INFLATE_STRICT to check distances against zlib header
+- Improve WinCE errno handling and comments [Chang]
+- Remove comment about no gzip header processing in FAQ
+- Add Z_FIXED strategy option to deflateInit2() to force fixed trees
+- Add updated make_vms.com [Coghlan], update README
+- Create a new "examples" directory, move gzappend.c there, add zpipe.c,
+  fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html.
+- Add FAQ entry and comments in deflate.c on uninitialized memory access
+- Add Solaris 9 make options in configure [Gilbert]
+- Allow strerror() usage in gzio.c for STDC
+- Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer]
+- Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant]
+- Use z_off_t for adler32_combine() and crc32_combine() lengths
+- Make adler32() much faster for small len
+- Use OS_CODE in deflate() default gzip header
+
+Changes in 1.2.2.1 (31 October 2004)
+- Allow inflateSetDictionary() call for raw inflate
+- Fix inflate header crc check bug for file names and comments
+- Add deflateSetHeader() and gz_header structure for custom gzip headers
+- Add inflateGetheader() to retrieve gzip headers
+- Add crc32_combine() and adler32_combine() functions
+- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list
+- Use zstreamp consistently in zlib.h (inflate_back functions)
+- Remove GUNZIP condition from definition of inflate_mode in inflate.h
+  and in contrib/inflate86/inffast.S [Truta, Anderson]
+- Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson]
+- Update projects/README.projects and projects/visualc6 [Truta]
+- Update win32/DLL_FAQ.txt [Truta]
+- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta]
+- Deprecate Z_ASCII; use Z_TEXT instead [Truta]
+- Use a new algorithm for setting strm->data_type in trees.c [Truta]
+- Do not define an exit() prototype in zutil.c unless DEBUG defined
+- Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta]
+- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate()
+- Fix Darwin build version identification [Peterson]
+
+Changes in 1.2.2 (3 October 2004)
+- Update zlib.h comments on gzip in-memory processing
+- Set adler to 1 in inflateReset() to support Java test suite [Walles]
+- Add contrib/dotzlib [Ravn]
+- Update win32/DLL_FAQ.txt [Truta]
+- Update contrib/minizip [Vollant]
+- Move contrib/visual-basic.txt to old/ [Truta]
+- Fix assembler builds in projects/visualc6/ [Truta]
+
+Changes in 1.2.1.2 (9 September 2004)
+- Update INDEX file
+- Fix trees.c to update strm->data_type (no one ever noticed!)
+- Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown]
+- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE)
+- Add limited multitasking protection to DYNAMIC_CRC_TABLE
+- Add NO_vsnprintf for VMS in zutil.h [Mozilla]
+- Don't declare strerror() under VMS [Mozilla]
+- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
+- Update contrib/ada [Anisimkov]
+- Update contrib/minizip [Vollant]
+- Fix configure to not hardcode directories for Darwin [Peterson]
+- Fix gzio.c to not return error on empty files [Brown]
+- Fix indentation; update version in contrib/delphi/ZLib.pas and
+  contrib/pascal/zlibpas.pas [Truta]
+- Update mkasm.bat in contrib/masmx86 [Truta]
+- Update contrib/untgz [Truta]
+- Add projects/README.projects [Truta]
+- Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta]
+- Update win32/DLL_FAQ.txt [Truta]
+- Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta]
+- Remove an unnecessary assignment to curr in inftrees.c [Truta]
+- Add OS/2 to exe builds in configure [Poltorak]
+- Remove err dummy parameter in zlib.h [Kientzle]
+
+Changes in 1.2.1.1 (9 January 2004)
+- Update email address in README
+- Several FAQ updates
+- Fix a big fat bug in inftrees.c that prevented decoding valid
+  dynamic blocks with only literals and no distance codes --
+  Thanks to "Hot Emu" for the bug report and sample file
+- Add a note to puff.c on no distance codes case.
+
+Changes in 1.2.1 (17 November 2003)
+- Remove a tab in contrib/gzappend/gzappend.c
+- Update some interfaces in contrib for new zlib functions
+- Update zlib version number in some contrib entries
+- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta]
+- Support shared libraries on Hurd and KFreeBSD [Brown]
+- Fix error in NO_DIVIDE option of adler32.c
+
+Changes in 1.2.0.8 (4 November 2003)
+- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas
+- Add experimental NO_DIVIDE #define in adler32.c
+    - Possibly faster on some processors (let me know if it is)
+- Correct Z_BLOCK to not return on first inflate call if no wrap
+- Fix strm->data_type on inflate() return to correctly indicate EOB
+- Add deflatePrime() function for appending in the middle of a byte
+- Add contrib/gzappend for an example of appending to a stream
+- Update win32/DLL_FAQ.txt [Truta]
+- Delete Turbo C comment in README [Truta]
+- Improve some indentation in zconf.h [Truta]
+- Fix infinite loop on bad input in configure script [Church]
+- Fix gzeof() for concatenated gzip files [Johnson]
+- Add example to contrib/visual-basic.txt [Michael B.]
+- Add -p to mkdir's in Makefile.in [vda]
+- Fix configure to properly detect presence or lack of printf functions
+- Add AS400 support [Monnerat]
+- Add a little Cygwin support [Wilson]
+
+Changes in 1.2.0.7 (21 September 2003)
+- Correct some debug formats in contrib/infback9
+- Cast a type in a debug statement in trees.c
+- Change search and replace delimiter in configure from % to # [Beebe]
+- Update contrib/untgz to 0.2 with various fixes [Truta]
+- Add build support for Amiga [Nikl]
+- Remove some directories in old that have been updated to 1.2
+- Add dylib building for Mac OS X in configure and Makefile.in
+- Remove old distribution stuff from Makefile
+- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X
+- Update links in README
+
+Changes in 1.2.0.6 (13 September 2003)
+- Minor FAQ updates
+- Update contrib/minizip to 1.00 [Vollant]
+- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta]
+- Update POSTINC comment for 68060 [Nikl]
+- Add contrib/infback9 with deflate64 decoding (unsupported)
+- For MVS define NO_vsnprintf and undefine FAR [van Burik]
+- Add pragma for fdopen on MVS [van Burik]
+
+Changes in 1.2.0.5 (8 September 2003)
+- Add OF to inflateBackEnd() declaration in zlib.h
+- Remember start when using gzdopen in the middle of a file
+- Use internal off_t counters in gz* functions to properly handle seeks
+- Perform more rigorous check for distance-too-far in inffast.c
+- Add Z_BLOCK flush option to return from inflate at block boundary
+- Set strm->data_type on return from inflate
+    - Indicate bits unused, if at block boundary, and if in last block
+- Replace size_t with ptrdiff_t in crc32.c, and check for correct size
+- Add condition so old NO_DEFLATE define still works for compatibility
+- FAQ update regarding the Windows DLL [Truta]
+- INDEX update: add qnx entry, remove aix entry [Truta]
+- Install zlib.3 into mandir [Wilson]
+- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta]
+- Adapt the zlib interface to the new DLL convention guidelines [Truta]
+- Introduce ZLIB_WINAPI macro to allow the export of functions using
+  the WINAPI calling convention, for Visual Basic [Vollant, Truta]
+- Update msdos and win32 scripts and makefiles [Truta]
+- Export symbols by name, not by ordinal, in win32/zlib.def [Truta]
+- Add contrib/ada [Anisimkov]
+- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta]
+- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant]
+- Add contrib/masm686 [Truta]
+- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm
+  [Truta, Vollant]
+- Update contrib/delphi; rename to contrib/pascal; add example [Truta]
+- Remove contrib/delphi2; add a new contrib/delphi [Truta]
+- Avoid inclusion of the nonstandard <memory.h> in contrib/iostream,
+  and fix some method prototypes [Truta]
+- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip
+  [Truta]
+- Avoid the use of backslash (\) in contrib/minizip [Vollant]
+- Fix file time handling in contrib/untgz; update makefiles [Truta]
+- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines
+  [Vollant]
+- Remove contrib/vstudio/vc15_16 [Vollant]
+- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta]
+- Update README.contrib [Truta]
+- Invert the assignment order of match_head and s->prev[...] in
+  INSERT_STRING [Truta]
+- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings
+  [Truta]
+- Compare function pointers with 0, not with NULL or Z_NULL [Truta]
+- Fix prototype of syncsearch in inflate.c [Truta]
+- Introduce ASMINF macro to be enabled when using an ASM implementation
+  of inflate_fast [Truta]
+- Change NO_DEFLATE to NO_GZCOMPRESS [Truta]
+- Modify test_gzio in example.c to take a single file name as a
+  parameter [Truta]
+- Exit the example.c program if gzopen fails [Truta]
+- Add type casts around strlen in example.c [Truta]
+- Remove casting to sizeof in minigzip.c; give a proper type
+  to the variable compared with SUFFIX_LEN [Truta]
+- Update definitions of STDC and STDC99 in zconf.h [Truta]
+- Synchronize zconf.h with the new Windows DLL interface [Truta]
+- Use SYS16BIT instead of __32BIT__ to distinguish between
+  16- and 32-bit platforms [Truta]
+- Use far memory allocators in small 16-bit memory models for
+  Turbo C [Truta]
+- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in
+  zlibCompileFlags [Truta]
+- Cygwin has vsnprintf [Wilson]
+- In Windows16, OS_CODE is 0, as in MSDOS [Truta]
+- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson]
+
+Changes in 1.2.0.4 (10 August 2003)
+- Minor FAQ updates
+- Be more strict when checking inflateInit2's windowBits parameter
+- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well
+- Add gzip wrapper option to deflateInit2 using windowBits
+- Add updated QNX rule in configure and qnx directory [Bonnefoy]
+- Make inflate distance-too-far checks more rigorous
+- Clean up FAR usage in inflate
+- Add casting to sizeof() in gzio.c and minigzip.c
+
+Changes in 1.2.0.3 (19 July 2003)
+- Fix silly error in gzungetc() implementation [Vollant]
+- Update contrib/minizip and contrib/vstudio [Vollant]
+- Fix printf format in example.c
+- Correct cdecl support in zconf.in.h [Anisimkov]
+- Minor FAQ updates
+
+Changes in 1.2.0.2 (13 July 2003)
+- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons
+- Attempt to avoid warnings in crc32.c for pointer-int conversion
+- Add AIX to configure, remove aix directory [Bakker]
+- Add some casts to minigzip.c
+- Improve checking after insecure sprintf() or vsprintf() calls
+- Remove #elif's from crc32.c
+- Change leave label to inf_leave in inflate.c and infback.c to avoid
+  library conflicts
+- Remove inflate gzip decoding by default--only enable gzip decoding by
+  special request for stricter backward compatibility
+- Add zlibCompileFlags() function to return compilation information
+- More typecasting in deflate.c to avoid warnings
+- Remove leading underscore from _Capital #defines [Truta]
+- Fix configure to link shared library when testing
+- Add some Windows CE target adjustments [Mai]
+- Remove #define ZLIB_DLL in zconf.h [Vollant]
+- Add zlib.3 [Rodgers]
+- Update RFC URL in deflate.c and algorithm.txt [Mai]
+- Add zlib_dll_FAQ.txt to contrib [Truta]
+- Add UL to some constants [Truta]
+- Update minizip and vstudio [Vollant]
+- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h
+- Expand use of NO_DUMMY_DECL to avoid all dummy structures
+- Added iostream3 to contrib [Schwardt]
+- Replace rewind() with fseek() for WinCE [Truta]
+- Improve setting of zlib format compression level flags
+    - Report 0 for huffman and rle strategies and for level == 0 or 1
+    - Report 2 only for level == 6
+- Only deal with 64K limit when necessary at compile time [Truta]
+- Allow TOO_FAR check to be turned off at compile time [Truta]
+- Add gzclearerr() function [Souza]
+- Add gzungetc() function
+
+Changes in 1.2.0.1 (17 March 2003)
+- Add Z_RLE strategy for run-length encoding [Truta]
+    - When Z_RLE requested, restrict matches to distance one
+    - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE
+- Correct FASTEST compilation to allow level == 0
+- Clean up what gets compiled for FASTEST
+- Incorporate changes to zconf.in.h [Vollant]
+    - Refine detection of Turbo C need for dummy returns
+    - Refine ZLIB_DLL compilation
+    - Include additional header file on VMS for off_t typedef
+- Try to use _vsnprintf where it supplants vsprintf [Vollant]
+- Add some casts in inffast.c
+- Enchance comments in zlib.h on what happens if gzprintf() tries to
+  write more than 4095 bytes before compression
+- Remove unused state from inflateBackEnd()
+- Remove exit(0) from minigzip.c, example.c
+- Get rid of all those darn tabs
+- Add "check" target to Makefile.in that does the same thing as "test"
+- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in
+- Update contrib/inflate86 [Anderson]
+- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant]
+- Add msdos and win32 directories with makefiles [Truta]
+- More additions and improvements to the FAQ
+
+Changes in 1.2.0 (9 March 2003)
+- New and improved inflate code
+    - About 20% faster
+    - Does not allocate 32K window unless and until needed
+    - Automatically detects and decompresses gzip streams
+    - Raw inflate no longer needs an extra dummy byte at end
+    - Added inflateBack functions using a callback interface--even faster
+      than inflate, useful for file utilities (gzip, zip)
+    - Added inflateCopy() function to record state for random access on
+      externally generated deflate streams (e.g. in gzip files)
+    - More readable code (I hope)
+- New and improved crc32()
+    - About 50% faster, thanks to suggestions from Rodney Brown
+- Add deflateBound() and compressBound() functions
+- Fix memory leak in deflateInit2()
+- Permit setting dictionary for raw deflate (for parallel deflate)
+- Fix const declaration for gzwrite()
+- Check for some malloc() failures in gzio.c
+- Fix bug in gzopen() on single-byte file 0x1f
+- Fix bug in gzread() on concatenated file with 0x1f at end of buffer
+  and next buffer doesn't start with 0x8b
+- Fix uncompress() to return Z_DATA_ERROR on truncated input
+- Free memory at end of example.c
+- Remove MAX #define in trees.c (conflicted with some libraries)
+- Fix static const's in deflate.c, gzio.c, and zutil.[ch]
+- Declare malloc() and free() in gzio.c if STDC not defined
+- Use malloc() instead of calloc() in zutil.c if int big enough
+- Define STDC for AIX
+- Add aix/ with approach for compiling shared library on AIX
+- Add HP-UX support for shared libraries in configure
+- Add OpenUNIX support for shared libraries in configure
+- Use $cc instead of gcc to build shared library
+- Make prefix directory if needed when installing
+- Correct Macintosh avoidance of typedef Byte in zconf.h
+- Correct Turbo C memory allocation when under Linux
+- Use libz.a instead of -lz in Makefile (assure use of compiled library)
+- Update configure to check for snprintf or vsnprintf functions and their
+  return value, warn during make if using an insecure function
+- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that
+  is lost when library is used--resolution is to build new zconf.h
+- Documentation improvements (in zlib.h):
+    - Document raw deflate and inflate
+    - Update RFCs URL
+    - Point out that zlib and gzip formats are different
+    - Note that Z_BUF_ERROR is not fatal
+    - Document string limit for gzprintf() and possible buffer overflow
+    - Note requirement on avail_out when flushing
+    - Note permitted values of flush parameter of inflate()
+- Add some FAQs (and even answers) to the FAQ
+- Add contrib/inflate86/ for x86 faster inflate
+- Add contrib/blast/ for PKWare Data Compression Library decompression
+- Add contrib/puff/ simple inflate for deflate format description
+
+Changes in 1.1.4 (11 March 2002)
+- ZFREE was repeated on same allocation on some error conditions.
+  This creates a security problem described in
+  http://www.zlib.org/advisory-2002-03-11.txt
+- Returned incorrect error (Z_MEM_ERROR) on some invalid data
+- Avoid accesses before window for invalid distances with inflate window
+  less than 32K.
+- force windowBits > 8 to avoid a bug in the encoder for a window size
+  of 256 bytes. (A complete fix will be available in 1.1.5).
+
+Changes in 1.1.3 (9 July 1998)
+- fix "an inflate input buffer bug that shows up on rare but persistent
+  occasions" (Mark)
+- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
+- fix gzseek(..., SEEK_SET) in write mode
+- fix crc check after a gzeek (Frank Faubert)
+- fix miniunzip when the last entry in a zip file is itself a zip file
+  (J Lillge)
+- add contrib/asm586 and contrib/asm686 (Brian Raiter)
+  See http://www.muppetlabs.com/~breadbox/software/assembly.html
+- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
+- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
+- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
+- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
+- added a FAQ file
+
+- Support gzdopen on Mac with Metrowerks (Jason Linhart)
+- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart)
+- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young)
+- avoid some warnings with Borland C (Tom Tanner)
+- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant)
+- emulate utime() for WIN32 in contrib/untgz  (Gilles Vollant)
+- allow several arguments to configure (Tim Mooney, Frodo Looijaard)
+- use libdir and includedir in Makefile.in (Tim Mooney)
+- support shared libraries on OSF1 V4 (Tim Mooney)
+- remove so_locations in "make clean"  (Tim Mooney)
+- fix maketree.c compilation error (Glenn, Mark)
+- Python interface to zlib now in Python 1.5 (Jeremy Hylton)
+- new Makefile.riscos (Rich Walker)
+- initialize static descriptors in trees.c for embedded targets (Nick Smith)
+- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith)
+- add the OS/2 files in Makefile.in too (Andrew Zabolotny)
+- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane)
+- fix maketree.c to allow clean compilation of inffixed.h (Mark)
+- fix parameter check in deflateCopy (Gunther Nikl)
+- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler)
+- Many portability patches by Christian Spieler:
+  . zutil.c, zutil.h: added "const" for zmem*
+  . Make_vms.com: fixed some typos
+  . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists
+  . msdos/Makefile.msc: remove "default rtl link library" info from obj files
+  . msdos/Makefile.*: use model-dependent name for the built zlib library
+  . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc:
+     new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT)
+- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane)
+- replace __far with _far for better portability (Christian Spieler, Tom Lane)
+- fix test for errno.h in configure (Tim Newsham)
+
+Changes in 1.1.2 (19 March 98)
+- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant)
+  See http://www.winimage.com/zLibDll/unzip.html
+- preinitialize the inflate tables for fixed codes, to make the code
+  completely thread safe (Mark)
+- some simplifications and slight speed-up to the inflate code (Mark)
+- fix gzeof on non-compressed files (Allan Schrum)
+- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs)
+- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn)
+- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny)
+- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori)
+- do not wrap extern "C" around system includes (Tom Lane)
+- mention zlib binding for TCL in README (Andreas Kupries)
+- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert)
+- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson)
+- allow "configure --prefix $HOME" (Tim Mooney)
+- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson)
+- move Makefile.sas to amiga/Makefile.sas
+
+Changes in 1.1.1 (27 Feb 98)
+- fix macros _tr_tally_* in deflate.h for debug mode  (Glenn Randers-Pehrson)
+- remove block truncation heuristic which had very marginal effect for zlib
+  (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
+  compression ratio on some files. This also allows inlining _tr_tally for
+  matches in deflate_slow.
+- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)
+
+Changes in 1.1.0 (24 Feb 98)
+- do not return STREAM_END prematurely in inflate (John Bowler)
+- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler)
+- compile with -DFASTEST to get compression code optimized for speed only
+- in minigzip, try mmap'ing the input file first (Miguel Albrecht)
+- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain
+  on Sun but significant on HP)
+
+- add a pointer to experimental unzip library in README (Gilles Vollant)
+- initialize variable gcc in configure (Chris Herborth)
+
+Changes in 1.0.9 (17 Feb 1998)
+- added gzputs and gzgets functions
+- do not clear eof flag in gzseek (Mark Diekhans)
+- fix gzseek for files in transparent mode (Mark Diekhans)
+- do not assume that vsprintf returns the number of bytes written (Jens Krinke)
+- replace EXPORT with ZEXPORT to avoid conflict with other programs
+- added compress2 in zconf.h, zlib.def, zlib.dnt
+- new asm code from Gilles Vollant in contrib/asm386
+- simplify the inflate code (Mark):
+ . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new()
+ . ZALLOC the length list in inflate_trees_fixed() instead of using stack
+ . ZALLOC the value area for huft_build() instead of using stack
+ . Simplify Z_FINISH check in inflate()
+
+- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
+- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
+- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
+  the declaration of FAR (Gilles VOllant)
+- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
+- read_buf buf parameter of type Bytef* instead of charf*
+- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
+- do not redeclare unlink in minigzip.c for WIN32 (John Bowler)
+- fix check for presence of directories in "make install" (Ian Willis)
+
+Changes in 1.0.8 (27 Jan 1998)
+- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant)
+- fix gzgetc and gzputc for big endian systems (Markus Oberhumer)
+- added compress2() to allow setting the compression level
+- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)
+- use constant arrays for the static trees in trees.c instead of computing
+  them at run time (thanks to Ken Raeburn for this suggestion). To create
+  trees.h, compile with GEN_TREES_H and run "make test".
+- check return code of example in "make test" and display result
+- pass minigzip command line options to file_compress
+- simplifying code of inflateSync to avoid gcc 2.8 bug
+
+- support CC="gcc -Wall" in configure -s (QingLong)
+- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)
+- fix test for shared library support to avoid compiler warnings
+- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)
+- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)
+- do not use fdopen for Metrowerks on Mac (Brad Pettit))
+- add checks for gzputc and gzputc in example.c
+- avoid warnings in gzio.c and deflate.c (Andreas Kleinert)
+- use const for the CRC table (Ken Raeburn)
+- fixed "make uninstall" for shared libraries
+- use Tracev instead of Trace in infblock.c
+- in example.c use correct compressed length for test_sync
+- suppress +vnocompatwarnings in configure for HPUX (not always supported)
+
+Changes in 1.0.7 (20 Jan 1998)
+- fix gzseek which was broken in write mode
+- return error for gzseek to negative absolute position
+- fix configure for Linux (Chun-Chung Chen)
+- increase stack space for MSC (Tim Wegner)
+- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant)
+- define EXPORTVA for gzprintf (Gilles Vollant)
+- added man page zlib.3 (Rick Rodgers)
+- for contrib/untgz, fix makedir() and improve Makefile
+
+- check gzseek in write mode in example.c
+- allocate extra buffer for seeks only if gzseek is actually called
+- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant)
+- add inflateSyncPoint in zconf.h
+- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def
+
+Changes in 1.0.6 (19 Jan 1998)
+- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
+  gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
+- Fix a deflate bug occurring only with compression level 0 (thanks to
+  Andy Buckler for finding this one).
+- In minigzip, pass transparently also the first byte for .Z files.
+- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
+- check Z_FINISH in inflate (thanks to Marc Schluper)
+- Implement deflateCopy (thanks to Adam Costello)
+- make static libraries by default in configure, add --shared option.
+- move MSDOS or Windows specific files to directory msdos
+- suppress the notion of partial flush to simplify the interface
+  (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)
+- suppress history buffer provided by application to simplify the interface
+  (this feature was not implemented anyway in 1.0.4)
+- next_in and avail_in must be initialized before calling inflateInit or
+  inflateInit2
+- add EXPORT in all exported functions (for Windows DLL)
+- added Makefile.nt (thanks to Stephen Williams)
+- added the unsupported "contrib" directory:
+   contrib/asm386/ by Gilles Vollant <info@winimage.com>
+        386 asm code replacing longest_match().
+   contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
+        A C++ I/O streams interface to the zlib gz* functions
+   contrib/iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>
+        Another C++ I/O streams interface
+   contrib/untgz/  by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
+        A very simple tar.gz file extractor using zlib
+   contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
+        How to use compress(), uncompress() and the gz* functions from VB.
+- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
+  level) in minigzip (thanks to Tom Lane)
+
+- use const for rommable constants in deflate
+- added test for gzseek and gztell in example.c
+- add undocumented function inflateSyncPoint() (hack for Paul Mackerras)
+- add undocumented function zError to convert error code to string
+  (for Tim Smithers)
+- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code.
+- Use default memcpy for Symantec MSDOS compiler.
+- Add EXPORT keyword for check_func (needed for Windows DLL)
+- add current directory to LD_LIBRARY_PATH for "make test"
+- create also a link for libz.so.1
+- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura)
+- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX)
+- added -soname for Linux in configure (Chun-Chung Chen,
+- assign numbers to the exported functions in zlib.def (for Windows DLL)
+- add advice in zlib.h for best usage of deflateSetDictionary
+- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn)
+- allow compilation with ANSI keywords only enabled for TurboC in large model
+- avoid "versionString"[0] (Borland bug)
+- add NEED_DUMMY_RETURN for Borland
+- use variable z_verbose for tracing in debug mode (L. Peter Deutsch).
+- allow compilation with CC
+- defined STDC for OS/2 (David Charlap)
+- limit external names to 8 chars for MVS (Thomas Lund)
+- in minigzip.c, use static buffers only for 16-bit systems
+- fix suffix check for "minigzip -d foo.gz"
+- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee)
+- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
+- added makelcc.bat for lcc-win32 (Tom St Denis)
+- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
+- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
+- check for unistd.h in configure (for off_t)
+- remove useless check parameter in inflate_blocks_free
+- avoid useless assignment of s->check to itself in inflate_blocks_new
+- do not flush twice in gzclose (thanks to Ken Raeburn)
+- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h
+- use NO_ERRNO_H instead of enumeration of operating systems with errno.h
+- work around buggy fclose on pipes for HP/UX
+- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson)
+- fix configure if CC is already equal to gcc
+
+Changes in 1.0.5 (3 Jan 98)
+- Fix inflate to terminate gracefully when fed corrupted or invalid data
+- Use const for rommable constants in inflate
+- Eliminate memory leaks on error conditions in inflate
+- Removed some vestigial code in inflate
+- Update web address in README
+
+Changes in 1.0.4 (24 Jul 96)
+- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
+  bit, so the decompressor could decompress all the correct data but went
+  on to attempt decompressing extra garbage data. This affected minigzip too.
+- zlibVersion and gzerror return const char* (needed for DLL)
+- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)
+- use z_error only for DEBUG (avoid problem with DLLs)
+
+Changes in 1.0.3 (2 Jul 96)
+- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS
+  small and medium models; this makes the library incompatible with previous
+  versions for these models. (No effect in large model or on other systems.)
+- return OK instead of BUF_ERROR if previous deflate call returned with
+  avail_out as zero but there is nothing to do
+- added memcmp for non STDC compilers
+- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly)
+- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO)
+- better check for 16-bit mode MSC (avoids problem with Symantec)
+
+Changes in 1.0.2 (23 May 96)
+- added Windows DLL support
+- added a function zlibVersion (for the DLL support)
+- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model)
+- Bytef is define's instead of typedef'd only for Borland C
+- avoid reading uninitialized memory in example.c
+- mention in README that the zlib format is now RFC1950
+- updated Makefile.dj2
+- added algorithm.doc
+
+Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
+- fix array overlay in deflate.c which sometimes caused bad compressed data
+- fix inflate bug with empty stored block
+- fix MSDOS medium model which was broken in 0.99
+- fix deflateParams() which could generated bad compressed data.
+- Bytef is define'd instead of typedef'ed (work around Borland bug)
+- added an INDEX file
+- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
+  Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
+- speed up adler32 for modern machines without auto-increment
+- added -ansi for IRIX in configure
+- static_init_done in trees.c is an int
+- define unlink as delete for VMS
+- fix configure for QNX
+- add configure branch for SCO and HPUX
+- avoid many warnings (unused variables, dead assignments, etc...)
+- no fdopen for BeOS
+- fix the Watcom fix for 32 bit mode (define FAR as empty)
+- removed redefinition of Byte for MKWERKS
+- work around an MWKERKS bug (incorrect merge of all .h files)
+
+Changes in 0.99 (27 Jan 96)
+- allow preset dictionary shared between compressor and decompressor
+- allow compression level 0 (no compression)
+- add deflateParams in zlib.h: allow dynamic change of compression level
+  and compression strategy.
+- test large buffers and deflateParams in example.c
+- add optional "configure" to build zlib as a shared library
+- suppress Makefile.qnx, use configure instead
+- fixed deflate for 64-bit systems (detected on Cray)
+- fixed inflate_blocks for 64-bit systems (detected on Alpha)
+- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
+- always return Z_BUF_ERROR when deflate() has nothing to do
+- deflateInit and inflateInit are now macros to allow version checking
+- prefix all global functions and types with z_ with -DZ_PREFIX
+- make falloc completely reentrant (inftrees.c)
+- fixed very unlikely race condition in ct_static_init
+- free in reverse order of allocation to help memory manager
+- use zlib-1.0/* instead of zlib/* inside the tar.gz
+- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith
+  -Wconversion -Wstrict-prototypes -Wmissing-prototypes"
+- allow gzread on concatenated .gz files
+- deflateEnd now returns Z_DATA_ERROR if it was premature
+- deflate is finally (?) fully deterministic (no matches beyond end of input)
+- Document Z_SYNC_FLUSH
+- add uninstall in Makefile
+- Check for __cpluplus in zlib.h
+- Better test in ct_align for partial flush
+- avoid harmless warnings for Borland C++
+- initialize hash_head in deflate.c
+- avoid warning on fdopen (gzio.c) for HP cc -Aa
+- include stdlib.h for STDC compilers
+- include errno.h for Cray
+- ignore error if ranlib doesn't exist
+- call ranlib twice for NeXTSTEP
+- use exec_prefix instead of prefix for libz.a
+- renamed ct_* as _tr_* to avoid conflict with applications
+- clear z->msg in inflateInit2 before any error return
+- initialize opaque in example.c, gzio.c, deflate.c and inflate.c
+- fixed typo in zconf.h (_GNUC__ => __GNUC__)
+- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
+- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
+- in fcalloc, normalize pointer if size > 65520 bytes
+- don't use special fcalloc for 32 bit Borland C++
+- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
+- use Z_BINARY instead of BINARY
+- document that gzclose after gzdopen will close the file
+- allow "a" as mode in gzopen.
+- fix error checking in gzread
+- allow skipping .gz extra-field on pipes
+- added reference to Perl interface in README
+- put the crc table in FAR data (I dislike more and more the medium model :)
+- added get_crc_table
+- added a dimension to all arrays (Borland C can't count).
+- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
+- guard against multiple inclusion of *.h (for precompiled header on Mac)
+- Watcom C pretends to be Microsoft C small model even in 32 bit mode.
+- don't use unsized arrays to avoid silly warnings by Visual C++:
+     warning C4746: 'inflate_mask' : unsized array treated as  '__far'
+     (what's wrong with far data in far model?).
+- define enum out of inflate_blocks_state to allow compilation with C++
+
+Changes in 0.95 (16 Aug 95)
+- fix MSDOS small and medium model (now easier to adapt to any compiler)
+- inlined send_bits
+- fix the final (:-) bug for deflate with flush (output was correct but
+  not completely flushed in rare occasions).
+- default window size is same for compression and decompression
+  (it's now sufficient to set MAX_WBITS in zconf.h).
+- voidp -> voidpf and voidnp -> voidp (for consistency with other
+  typedefs and because voidnp was not near in large model).
+
+Changes in 0.94 (13 Aug 95)
+- support MSDOS medium model
+- fix deflate with flush (could sometimes generate bad output)
+- fix deflateReset (zlib header was incorrectly suppressed)
+- added support for VMS
+- allow a compression level in gzopen()
+- gzflush now calls fflush
+- For deflate with flush, flush even if no more input is provided.
+- rename libgz.a as libz.a
+- avoid complex expression in infcodes.c triggering Turbo C bug
+- work around a problem with gcc on Alpha (in INSERT_STRING)
+- don't use inline functions (problem with some gcc versions)
+- allow renaming of Byte, uInt, etc... with #define.
+- avoid warning about (unused) pointer before start of array in deflate.c
+- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
+- avoid reserved word 'new' in trees.c
+
+Changes in 0.93 (25 June 95)
+- temporarily disable inline functions
+- make deflate deterministic
+- give enough lookahead for PARTIAL_FLUSH
+- Set binary mode for stdin/stdout in minigzip.c for OS/2
+- don't even use signed char in inflate (not portable enough)
+- fix inflate memory leak for segmented architectures
+
+Changes in 0.92 (3 May 95)
+- don't assume that char is signed (problem on SGI)
+- Clear bit buffer when starting a stored block
+- no memcpy on Pyramid
+- suppressed inftest.c
+- optimized fill_window, put longest_match inline for gcc
+- optimized inflate on stored blocks.
+- untabify all sources to simplify patches
+
+Changes in 0.91 (2 May 95)
+- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
+- Document the memory requirements in zconf.h
+- added "make install"
+- fix sync search logic in inflateSync
+- deflate(Z_FULL_FLUSH) now works even if output buffer too short
+- after inflateSync, don't scare people with just "lo world"
+- added support for DJGPP
+
+Changes in 0.9 (1 May 95)
+- don't assume that zalloc clears the allocated memory (the TurboC bug
+  was Mark's bug after all :)
+- let again gzread copy uncompressed data unchanged (was working in 0.71)
+- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
+- added a test of inflateSync in example.c
+- moved MAX_WBITS to zconf.h because users might want to change that.
+- document explicitly that zalloc(64K) on MSDOS must return a normalized
+  pointer (zero offset)
+- added Makefiles for Microsoft C, Turbo C, Borland C++
+- faster crc32()
+
+Changes in 0.8 (29 April 95)
+- added fast inflate (inffast.c)
+- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
+  is incompatible with previous versions of zlib which returned Z_OK.
+- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
+  (actually that was not a compiler bug, see 0.81 above)
+- gzread no longer reads one extra byte in certain cases
+- In gzio destroy(), don't reference a freed structure
+- avoid many warnings for MSDOS
+- avoid the ERROR symbol which is used by MS Windows
+
+Changes in 0.71 (14 April 95)
+- Fixed more MSDOS compilation problems :( There is still a bug with
+  TurboC large model.
+
+Changes in 0.7 (14 April 95)
+- Added full inflate support.
+- Simplified the crc32() interface. The pre- and post-conditioning
+  (one's complement) is now done inside crc32(). WARNING: this is
+  incompatible with previous versions; see zlib.h for the new usage.
+
+Changes in 0.61 (12 April 95)
+- workaround for a bug in TurboC. example and minigzip now work on MSDOS.
+
+Changes in 0.6 (11 April 95)
+- added minigzip.c
+- added gzdopen to reopen a file descriptor as gzFile
+- added transparent reading of non-gziped files in gzread.
+- fixed bug in gzread (don't read crc as data)
+- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose).
+- don't allocate big arrays in the stack (for MSDOS)
+- fix some MSDOS compilation problems
+
+Changes in 0.5:
+- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but
+  not yet Z_FULL_FLUSH.
+- support decompression but only in a single step (forced Z_FINISH)
+- added opaque object for zalloc and zfree.
+- added deflateReset and inflateReset
+- added a variable zlib_version for consistency checking.
+- renamed the 'filter' parameter of deflateInit2 as 'strategy'.
+  Added Z_FILTERED and Z_HUFFMAN_ONLY constants.
+
+Changes in 0.4:
+- avoid "zip" everywhere, use zlib instead of ziplib.
+- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush
+  if compression method == 8.
+- added adler32 and crc32
+- renamed deflateOptions as deflateInit2, call one or the other but not both
+- added the method parameter for deflateInit2.
+- added inflateInit2
+- simplied considerably deflateInit and inflateInit by not supporting
+  user-provided history buffer. This is supported only in deflateInit2
+  and inflateInit2.
+
+Changes in 0.3:
+- prefix all macro names with Z_
+- use Z_FINISH instead of deflateEnd to finish compression.
+- added Z_HUFFMAN_ONLY
+- added gzerror()
diff --git a/utils/zenutils/libraries/zlib123/zlib/FAQ b/utils/zenutils/libraries/zlib123/zlib/FAQ
index 15d043615e..441d910daa 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/FAQ
+++ b/utils/zenutils/libraries/zlib123/zlib/FAQ
@@ -1,339 +1,339 @@
-

-                Frequently Asked Questions about zlib

-

-

-If your question is not there, please check the zlib home page

-http://www.zlib.org which may have more recent information.

-The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html

-

-

- 1. Is zlib Y2K-compliant?

-

-    Yes. zlib doesn't handle dates.

-

- 2. Where can I get a Windows DLL version?

-

-    The zlib sources can be compiled without change to produce a DLL.

-    See the file win32/DLL_FAQ.txt in the zlib distribution.

-    Pointers to the precompiled DLL are found in the zlib web site at

-    http://www.zlib.org.

-

- 3. Where can I get a Visual Basic interface to zlib?

-

-    See

-        * http://www.dogma.net/markn/articles/zlibtool/zlibtool.htm

-        * contrib/visual-basic.txt in the zlib distribution

-        * win32/DLL_FAQ.txt in the zlib distribution

-

- 4. compress() returns Z_BUF_ERROR.

-

-    Make sure that before the call of compress, the length of the compressed

-    buffer is equal to the total size of the compressed buffer and not

-    zero. For Visual Basic, check that this parameter is passed by reference

-    ("as any"), not by value ("as long").

-

- 5. deflate() or inflate() returns Z_BUF_ERROR.

-

-    Before making the call, make sure that avail_in and avail_out are not

-    zero. When setting the parameter flush equal to Z_FINISH, also make sure

-    that avail_out is big enough to allow processing all pending input.

-    Note that a Z_BUF_ERROR is not fatal--another call to deflate() or

-    inflate() can be made with more input or output space. A Z_BUF_ERROR

-    may in fact be unavoidable depending on how the functions are used, since

-    it is not possible to tell whether or not there is more output pending

-    when strm.avail_out returns with zero.

-

- 6. Where's the zlib documentation (man pages, etc.)?

-

-    It's in zlib.h for the moment, and Francis S. Lin has converted it to a

-    web page zlib.html. Volunteers to transform this to Unix-style man pages,

-    please contact us (zlib@gzip.org). Examples of zlib usage are in the files

-    example.c and minigzip.c.

-

- 7. Why don't you use GNU autoconf or libtool or ...?

-

-    Because we would like to keep zlib as a very small and simple

-    package. zlib is rather portable and doesn't need much configuration.

-

- 8. I found a bug in zlib.

-

-    Most of the time, such problems are due to an incorrect usage of

-    zlib. Please try to reproduce the problem with a small program and send

-    the corresponding source to us at zlib@gzip.org . Do not send

-    multi-megabyte data files without prior agreement.

-

- 9. Why do I get "undefined reference to gzputc"?

-

-    If "make test" produces something like

-

-       example.o(.text+0x154): undefined reference to `gzputc'

-

-    check that you don't have old files libz.* in /usr/lib, /usr/local/lib or

-    /usr/X11R6/lib. Remove any old versions, then do "make install".

-

-10. I need a Delphi interface to zlib.

-

-    See the contrib/delphi directory in the zlib distribution.

-

-11. Can zlib handle .zip archives?

-

-    Not by itself, no.  See the directory contrib/minizip in the zlib

-    distribution.

-

-12. Can zlib handle .Z files?

-

-    No, sorry. You have to spawn an uncompress or gunzip subprocess, or adapt

-    the code of uncompress on your own.

-

-13. How can I make a Unix shared library?

-

-    make clean

-    ./configure -s

-    make

-

-14. How do I install a shared zlib library on Unix?

-

-    After the above, then:

-

-    make install

-

-    However, many flavors of Unix come with a shared zlib already installed.

-    Before going to the trouble of compiling a shared version of zlib and

-    trying to install it, you may want to check if it's already there! If you

-    can #include <zlib.h>, it's there. The -lz option will probably link to it.

-

-15. I have a question about OttoPDF.

-

-    We are not the authors of OttoPDF. The real author is on the OttoPDF web

-    site: Joel Hainley, jhainley@myndkryme.com.

-

-16. Can zlib decode Flate data in an Adobe PDF file?

-

-    Yes. See http://www.fastio.com/ (ClibPDF), or http://www.pdflib.com/ .

-    To modify PDF forms, see http://sourceforge.net/projects/acroformtool/ .

-

-17. Why am I getting this "register_frame_info not found" error on Solaris?

-

-    After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib

-    generates an error such as:

-

-        ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so:

-        symbol __register_frame_info: referenced symbol not found

-

-    The symbol __register_frame_info is not part of zlib, it is generated by

-    the C compiler (cc or gcc). You must recompile applications using zlib

-    which have this problem. This problem is specific to Solaris. See

-    http://www.sunfreeware.com for Solaris versions of zlib and applications

-    using zlib.

-

-18. Why does gzip give an error on a file I make with compress/deflate?

-

-    The compress and deflate functions produce data in the zlib format, which

-    is different and incompatible with the gzip format. The gz* functions in

-    zlib on the other hand use the gzip format. Both the zlib and gzip

-    formats use the same compressed data format internally, but have different

-    headers and trailers around the compressed data.

-

-19. Ok, so why are there two different formats?

-

-    The gzip format was designed to retain the directory information about

-    a single file, such as the name and last modification date. The zlib

-    format on the other hand was designed for in-memory and communication

-    channel applications, and has a much more compact header and trailer and

-    uses a faster integrity check than gzip.

-

-20. Well that's nice, but how do I make a gzip file in memory?

-

-    You can request that deflate write the gzip format instead of the zlib

-    format using deflateInit2(). You can also request that inflate decode

-    the gzip format using inflateInit2(). Read zlib.h for more details.

-

-21. Is zlib thread-safe?

-

-    Yes. However any library routines that zlib uses and any application-

-    provided memory allocation routines must also be thread-safe. zlib's gz*

-    functions use stdio library routines, and most of zlib's functions use the

-    library memory allocation routines by default. zlib's Init functions allow

-    for the application to provide custom memory allocation routines.

-

-    Of course, you should only operate on any given zlib or gzip stream from a

-    single thread at a time.

-

-22. Can I use zlib in my commercial application?

-

-    Yes. Please read the license in zlib.h.

-

-23. Is zlib under the GNU license?

-

-    No. Please read the license in zlib.h.

-

-24. The license says that altered source versions must be "plainly marked". So

-    what exactly do I need to do to meet that requirement?

-

-    You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h. In

-    particular, the final version number needs to be changed to "f", and an

-    identification string should be appended to ZLIB_VERSION. Version numbers

-    x.x.x.f are reserved for modifications to zlib by others than the zlib

-    maintainers. For example, if the version of the base zlib you are altering

-    is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and

-    ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3". You can also

-    update the version strings in deflate.c and inftrees.c.

-

-    For altered source distributions, you should also note the origin and

-    nature of the changes in zlib.h, as well as in ChangeLog and README, along

-    with the dates of the alterations. The origin should include at least your

-    name (or your company's name), and an email address to contact for help or

-    issues with the library.

-

-    Note that distributing a compiled zlib library along with zlib.h and

-    zconf.h is also a source distribution, and so you should change

-    ZLIB_VERSION and ZLIB_VERNUM and note the origin and nature of the changes

-    in zlib.h as you would for a full source distribution.

-

-25. Will zlib work on a big-endian or little-endian architecture, and can I

-    exchange compressed data between them?

-

-    Yes and yes.

-

-26. Will zlib work on a 64-bit machine?

-

-    It should. It has been tested on 64-bit machines, and has no dependence

-    on any data types being limited to 32-bits in length. If you have any

-    difficulties, please provide a complete problem report to zlib@gzip.org

-

-27. Will zlib decompress data from the PKWare Data Compression Library?

-

-    No. The PKWare DCL uses a completely different compressed data format

-    than does PKZIP and zlib. However, you can look in zlib's contrib/blast

-    directory for a possible solution to your problem.

-

-28. Can I access data randomly in a compressed stream?

-

-    No, not without some preparation. If when compressing you periodically

-    use Z_FULL_FLUSH, carefully write all the pending data at those points,

-    and keep an index of those locations, then you can start decompression

-    at those points. You have to be careful to not use Z_FULL_FLUSH too

-    often, since it can significantly degrade compression.

-

-29. Does zlib work on MVS, OS/390, CICS, etc.?

-

-    We don't know for sure. We have heard occasional reports of success on

-    these systems. If you do use it on one of these, please provide us with

-    a report, instructions, and patches that we can reference when we get

-    these questions. Thanks.

-

-30. Is there some simpler, easier to read version of inflate I can look at

-    to understand the deflate format?

-

-    First off, you should read RFC 1951. Second, yes. Look in zlib's

-    contrib/puff directory.

-

-31. Does zlib infringe on any patents?

-

-    As far as we know, no. In fact, that was originally the whole point behind

-    zlib. Look here for some more information:

-

-    http://www.gzip.org/#faq11

-

-32. Can zlib work with greater than 4 GB of data?

-

-    Yes. inflate() and deflate() will process any amount of data correctly.

-    Each call of inflate() or deflate() is limited to input and output chunks

-    of the maximum value that can be stored in the compiler's "unsigned int"

-    type, but there is no limit to the number of chunks. Note however that the

-    strm.total_in and strm_total_out counters may be limited to 4 GB. These

-    counters are provided as a convenience and are not used internally by

-    inflate() or deflate(). The application can easily set up its own counters

-    updated after each call of inflate() or deflate() to count beyond 4 GB.

-    compress() and uncompress() may be limited to 4 GB, since they operate in a

-    single call. gzseek() and gztell() may be limited to 4 GB depending on how

-    zlib is compiled. See the zlibCompileFlags() function in zlib.h.

-

-    The word "may" appears several times above since there is a 4 GB limit

-    only if the compiler's "long" type is 32 bits. If the compiler's "long"

-    type is 64 bits, then the limit is 16 exabytes.

-

-33. Does zlib have any security vulnerabilities?

-

-    The only one that we are aware of is potentially in gzprintf(). If zlib

-    is compiled to use sprintf() or vsprintf(), then there is no protection

-    against a buffer overflow of a 4K string space, other than the caller of

-    gzprintf() assuring that the output will not exceed 4K. On the other

-    hand, if zlib is compiled to use snprintf() or vsnprintf(), which should

-    normally be the case, then there is no vulnerability. The ./configure

-    script will display warnings if an insecure variation of sprintf() will

-    be used by gzprintf(). Also the zlibCompileFlags() function will return

-    information on what variant of sprintf() is used by gzprintf().

-

-    If you don't have snprintf() or vsnprintf() and would like one, you can

-    find a portable implementation here:

-

-        http://www.ijs.si/software/snprintf/

-

-    Note that you should be using the most recent version of zlib. Versions

-    1.1.3 and before were subject to a double-free vulnerability.

-

-34. Is there a Java version of zlib?

-

-    Probably what you want is to use zlib in Java. zlib is already included

-    as part of the Java SDK in the java.util.zip package. If you really want

-    a version of zlib written in the Java language, look on the zlib home

-    page for links: http://www.zlib.org/

-

-35. I get this or that compiler or source-code scanner warning when I crank it

-    up to maximally-pedantic. Can't you guys write proper code?

-

-    Many years ago, we gave up attempting to avoid warnings on every compiler

-    in the universe. It just got to be a waste of time, and some compilers

-    were downright silly. So now, we simply make sure that the code always

-    works.

-

-36. Valgrind (or some similar memory access checker) says that deflate is

-    performing a conditional jump that depends on an uninitialized value.

-    Isn't that a bug?

-

-    No.  That is intentional for performance reasons, and the output of

-    deflate is not affected.  This only started showing up recently since

-    zlib 1.2.x uses malloc() by default for allocations, whereas earlier

-    versions used calloc(), which zeros out the allocated memory.

-

-37. Will zlib read the (insert any ancient or arcane format here) compressed

-    data format?

-

-    Probably not. Look in the comp.compression FAQ for pointers to various

-    formats and associated software.

-

-38. How can I encrypt/decrypt zip files with zlib?

-

-    zlib doesn't support encryption. The original PKZIP encryption is very weak

-    and can be broken with freely available programs. To get strong encryption,

-    use GnuPG, http://www.gnupg.org/ , which already includes zlib compression.

-    For PKZIP compatible "encryption", look at http://www.info-zip.org/

-

-39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings?

-

-    "gzip" is the gzip format, and "deflate" is the zlib format. They should

-    probably have called the second one "zlib" instead to avoid confusion

-    with the raw deflate compressed data format. While the HTTP 1.1 RFC 2616

-    correctly points to the zlib specification in RFC 1950 for the "deflate"

-    transfer encoding, there have been reports of servers and browsers that

-    incorrectly produce or expect raw deflate data per the deflate

-    specficiation in RFC 1951, most notably Microsoft. So even though the

-    "deflate" transfer encoding using the zlib format would be the more

-    efficient approach (and in fact exactly what the zlib format was designed

-    for), using the "gzip" transfer encoding is probably more reliable due to

-    an unfortunate choice of name on the part of the HTTP 1.1 authors.

-

-    Bottom line: use the gzip format for HTTP 1.1 encoding.

-

-40. Does zlib support the new "Deflate64" format introduced by PKWare?

-

-    No. PKWare has apparently decided to keep that format proprietary, since

-    they have not documented it as they have previous compression formats.

-    In any case, the compression improvements are so modest compared to other

-    more modern approaches, that it's not worth the effort to implement.

-

-41. Can you please sign these lengthy legal documents and fax them back to us

-    so that we can use your software in our product?

-

-    No. Go away. Shoo.

+
+                Frequently Asked Questions about zlib
+
+
+If your question is not there, please check the zlib home page
+http://www.zlib.org which may have more recent information.
+The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html
+
+
+ 1. Is zlib Y2K-compliant?
+
+    Yes. zlib doesn't handle dates.
+
+ 2. Where can I get a Windows DLL version?
+
+    The zlib sources can be compiled without change to produce a DLL.
+    See the file win32/DLL_FAQ.txt in the zlib distribution.
+    Pointers to the precompiled DLL are found in the zlib web site at
+    http://www.zlib.org.
+
+ 3. Where can I get a Visual Basic interface to zlib?
+
+    See
+        * http://www.dogma.net/markn/articles/zlibtool/zlibtool.htm
+        * contrib/visual-basic.txt in the zlib distribution
+        * win32/DLL_FAQ.txt in the zlib distribution
+
+ 4. compress() returns Z_BUF_ERROR.
+
+    Make sure that before the call of compress, the length of the compressed
+    buffer is equal to the total size of the compressed buffer and not
+    zero. For Visual Basic, check that this parameter is passed by reference
+    ("as any"), not by value ("as long").
+
+ 5. deflate() or inflate() returns Z_BUF_ERROR.
+
+    Before making the call, make sure that avail_in and avail_out are not
+    zero. When setting the parameter flush equal to Z_FINISH, also make sure
+    that avail_out is big enough to allow processing all pending input.
+    Note that a Z_BUF_ERROR is not fatal--another call to deflate() or
+    inflate() can be made with more input or output space. A Z_BUF_ERROR
+    may in fact be unavoidable depending on how the functions are used, since
+    it is not possible to tell whether or not there is more output pending
+    when strm.avail_out returns with zero.
+
+ 6. Where's the zlib documentation (man pages, etc.)?
+
+    It's in zlib.h for the moment, and Francis S. Lin has converted it to a
+    web page zlib.html. Volunteers to transform this to Unix-style man pages,
+    please contact us (zlib@gzip.org). Examples of zlib usage are in the files
+    example.c and minigzip.c.
+
+ 7. Why don't you use GNU autoconf or libtool or ...?
+
+    Because we would like to keep zlib as a very small and simple
+    package. zlib is rather portable and doesn't need much configuration.
+
+ 8. I found a bug in zlib.
+
+    Most of the time, such problems are due to an incorrect usage of
+    zlib. Please try to reproduce the problem with a small program and send
+    the corresponding source to us at zlib@gzip.org . Do not send
+    multi-megabyte data files without prior agreement.
+
+ 9. Why do I get "undefined reference to gzputc"?
+
+    If "make test" produces something like
+
+       example.o(.text+0x154): undefined reference to `gzputc'
+
+    check that you don't have old files libz.* in /usr/lib, /usr/local/lib or
+    /usr/X11R6/lib. Remove any old versions, then do "make install".
+
+10. I need a Delphi interface to zlib.
+
+    See the contrib/delphi directory in the zlib distribution.
+
+11. Can zlib handle .zip archives?
+
+    Not by itself, no.  See the directory contrib/minizip in the zlib
+    distribution.
+
+12. Can zlib handle .Z files?
+
+    No, sorry. You have to spawn an uncompress or gunzip subprocess, or adapt
+    the code of uncompress on your own.
+
+13. How can I make a Unix shared library?
+
+    make clean
+    ./configure -s
+    make
+
+14. How do I install a shared zlib library on Unix?
+
+    After the above, then:
+
+    make install
+
+    However, many flavors of Unix come with a shared zlib already installed.
+    Before going to the trouble of compiling a shared version of zlib and
+    trying to install it, you may want to check if it's already there! If you
+    can #include <zlib.h>, it's there. The -lz option will probably link to it.
+
+15. I have a question about OttoPDF.
+
+    We are not the authors of OttoPDF. The real author is on the OttoPDF web
+    site: Joel Hainley, jhainley@myndkryme.com.
+
+16. Can zlib decode Flate data in an Adobe PDF file?
+
+    Yes. See http://www.fastio.com/ (ClibPDF), or http://www.pdflib.com/ .
+    To modify PDF forms, see http://sourceforge.net/projects/acroformtool/ .
+
+17. Why am I getting this "register_frame_info not found" error on Solaris?
+
+    After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib
+    generates an error such as:
+
+        ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so:
+        symbol __register_frame_info: referenced symbol not found
+
+    The symbol __register_frame_info is not part of zlib, it is generated by
+    the C compiler (cc or gcc). You must recompile applications using zlib
+    which have this problem. This problem is specific to Solaris. See
+    http://www.sunfreeware.com for Solaris versions of zlib and applications
+    using zlib.
+
+18. Why does gzip give an error on a file I make with compress/deflate?
+
+    The compress and deflate functions produce data in the zlib format, which
+    is different and incompatible with the gzip format. The gz* functions in
+    zlib on the other hand use the gzip format. Both the zlib and gzip
+    formats use the same compressed data format internally, but have different
+    headers and trailers around the compressed data.
+
+19. Ok, so why are there two different formats?
+
+    The gzip format was designed to retain the directory information about
+    a single file, such as the name and last modification date. The zlib
+    format on the other hand was designed for in-memory and communication
+    channel applications, and has a much more compact header and trailer and
+    uses a faster integrity check than gzip.
+
+20. Well that's nice, but how do I make a gzip file in memory?
+
+    You can request that deflate write the gzip format instead of the zlib
+    format using deflateInit2(). You can also request that inflate decode
+    the gzip format using inflateInit2(). Read zlib.h for more details.
+
+21. Is zlib thread-safe?
+
+    Yes. However any library routines that zlib uses and any application-
+    provided memory allocation routines must also be thread-safe. zlib's gz*
+    functions use stdio library routines, and most of zlib's functions use the
+    library memory allocation routines by default. zlib's Init functions allow
+    for the application to provide custom memory allocation routines.
+
+    Of course, you should only operate on any given zlib or gzip stream from a
+    single thread at a time.
+
+22. Can I use zlib in my commercial application?
+
+    Yes. Please read the license in zlib.h.
+
+23. Is zlib under the GNU license?
+
+    No. Please read the license in zlib.h.
+
+24. The license says that altered source versions must be "plainly marked". So
+    what exactly do I need to do to meet that requirement?
+
+    You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h. In
+    particular, the final version number needs to be changed to "f", and an
+    identification string should be appended to ZLIB_VERSION. Version numbers
+    x.x.x.f are reserved for modifications to zlib by others than the zlib
+    maintainers. For example, if the version of the base zlib you are altering
+    is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and
+    ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3". You can also
+    update the version strings in deflate.c and inftrees.c.
+
+    For altered source distributions, you should also note the origin and
+    nature of the changes in zlib.h, as well as in ChangeLog and README, along
+    with the dates of the alterations. The origin should include at least your
+    name (or your company's name), and an email address to contact for help or
+    issues with the library.
+
+    Note that distributing a compiled zlib library along with zlib.h and
+    zconf.h is also a source distribution, and so you should change
+    ZLIB_VERSION and ZLIB_VERNUM and note the origin and nature of the changes
+    in zlib.h as you would for a full source distribution.
+
+25. Will zlib work on a big-endian or little-endian architecture, and can I
+    exchange compressed data between them?
+
+    Yes and yes.
+
+26. Will zlib work on a 64-bit machine?
+
+    It should. It has been tested on 64-bit machines, and has no dependence
+    on any data types being limited to 32-bits in length. If you have any
+    difficulties, please provide a complete problem report to zlib@gzip.org
+
+27. Will zlib decompress data from the PKWare Data Compression Library?
+
+    No. The PKWare DCL uses a completely different compressed data format
+    than does PKZIP and zlib. However, you can look in zlib's contrib/blast
+    directory for a possible solution to your problem.
+
+28. Can I access data randomly in a compressed stream?
+
+    No, not without some preparation. If when compressing you periodically
+    use Z_FULL_FLUSH, carefully write all the pending data at those points,
+    and keep an index of those locations, then you can start decompression
+    at those points. You have to be careful to not use Z_FULL_FLUSH too
+    often, since it can significantly degrade compression.
+
+29. Does zlib work on MVS, OS/390, CICS, etc.?
+
+    We don't know for sure. We have heard occasional reports of success on
+    these systems. If you do use it on one of these, please provide us with
+    a report, instructions, and patches that we can reference when we get
+    these questions. Thanks.
+
+30. Is there some simpler, easier to read version of inflate I can look at
+    to understand the deflate format?
+
+    First off, you should read RFC 1951. Second, yes. Look in zlib's
+    contrib/puff directory.
+
+31. Does zlib infringe on any patents?
+
+    As far as we know, no. In fact, that was originally the whole point behind
+    zlib. Look here for some more information:
+
+    http://www.gzip.org/#faq11
+
+32. Can zlib work with greater than 4 GB of data?
+
+    Yes. inflate() and deflate() will process any amount of data correctly.
+    Each call of inflate() or deflate() is limited to input and output chunks
+    of the maximum value that can be stored in the compiler's "unsigned int"
+    type, but there is no limit to the number of chunks. Note however that the
+    strm.total_in and strm_total_out counters may be limited to 4 GB. These
+    counters are provided as a convenience and are not used internally by
+    inflate() or deflate(). The application can easily set up its own counters
+    updated after each call of inflate() or deflate() to count beyond 4 GB.
+    compress() and uncompress() may be limited to 4 GB, since they operate in a
+    single call. gzseek() and gztell() may be limited to 4 GB depending on how
+    zlib is compiled. See the zlibCompileFlags() function in zlib.h.
+
+    The word "may" appears several times above since there is a 4 GB limit
+    only if the compiler's "long" type is 32 bits. If the compiler's "long"
+    type is 64 bits, then the limit is 16 exabytes.
+
+33. Does zlib have any security vulnerabilities?
+
+    The only one that we are aware of is potentially in gzprintf(). If zlib
+    is compiled to use sprintf() or vsprintf(), then there is no protection
+    against a buffer overflow of a 4K string space, other than the caller of
+    gzprintf() assuring that the output will not exceed 4K. On the other
+    hand, if zlib is compiled to use snprintf() or vsnprintf(), which should
+    normally be the case, then there is no vulnerability. The ./configure
+    script will display warnings if an insecure variation of sprintf() will
+    be used by gzprintf(). Also the zlibCompileFlags() function will return
+    information on what variant of sprintf() is used by gzprintf().
+
+    If you don't have snprintf() or vsnprintf() and would like one, you can
+    find a portable implementation here:
+
+        http://www.ijs.si/software/snprintf/
+
+    Note that you should be using the most recent version of zlib. Versions
+    1.1.3 and before were subject to a double-free vulnerability.
+
+34. Is there a Java version of zlib?
+
+    Probably what you want is to use zlib in Java. zlib is already included
+    as part of the Java SDK in the java.util.zip package. If you really want
+    a version of zlib written in the Java language, look on the zlib home
+    page for links: http://www.zlib.org/
+
+35. I get this or that compiler or source-code scanner warning when I crank it
+    up to maximally-pedantic. Can't you guys write proper code?
+
+    Many years ago, we gave up attempting to avoid warnings on every compiler
+    in the universe. It just got to be a waste of time, and some compilers
+    were downright silly. So now, we simply make sure that the code always
+    works.
+
+36. Valgrind (or some similar memory access checker) says that deflate is
+    performing a conditional jump that depends on an uninitialized value.
+    Isn't that a bug?
+
+    No.  That is intentional for performance reasons, and the output of
+    deflate is not affected.  This only started showing up recently since
+    zlib 1.2.x uses malloc() by default for allocations, whereas earlier
+    versions used calloc(), which zeros out the allocated memory.
+
+37. Will zlib read the (insert any ancient or arcane format here) compressed
+    data format?
+
+    Probably not. Look in the comp.compression FAQ for pointers to various
+    formats and associated software.
+
+38. How can I encrypt/decrypt zip files with zlib?
+
+    zlib doesn't support encryption. The original PKZIP encryption is very weak
+    and can be broken with freely available programs. To get strong encryption,
+    use GnuPG, http://www.gnupg.org/ , which already includes zlib compression.
+    For PKZIP compatible "encryption", look at http://www.info-zip.org/
+
+39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings?
+
+    "gzip" is the gzip format, and "deflate" is the zlib format. They should
+    probably have called the second one "zlib" instead to avoid confusion
+    with the raw deflate compressed data format. While the HTTP 1.1 RFC 2616
+    correctly points to the zlib specification in RFC 1950 for the "deflate"
+    transfer encoding, there have been reports of servers and browsers that
+    incorrectly produce or expect raw deflate data per the deflate
+    specficiation in RFC 1951, most notably Microsoft. So even though the
+    "deflate" transfer encoding using the zlib format would be the more
+    efficient approach (and in fact exactly what the zlib format was designed
+    for), using the "gzip" transfer encoding is probably more reliable due to
+    an unfortunate choice of name on the part of the HTTP 1.1 authors.
+
+    Bottom line: use the gzip format for HTTP 1.1 encoding.
+
+40. Does zlib support the new "Deflate64" format introduced by PKWare?
+
+    No. PKWare has apparently decided to keep that format proprietary, since
+    they have not documented it as they have previous compression formats.
+    In any case, the compression improvements are so modest compared to other
+    more modern approaches, that it's not worth the effort to implement.
+
+41. Can you please sign these lengthy legal documents and fax them back to us
+    so that we can use your software in our product?
+
+    No. Go away. Shoo.
diff --git a/utils/zenutils/libraries/zlib123/zlib/INDEX b/utils/zenutils/libraries/zlib123/zlib/INDEX
index 4d7eac44bc..0587e5902b 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/INDEX
+++ b/utils/zenutils/libraries/zlib123/zlib/INDEX
@@ -1,51 +1,51 @@
-ChangeLog       history of changes

-FAQ             Frequently Asked Questions about zlib

-INDEX           this file

-Makefile        makefile for Unix (generated by configure)

-Makefile.in     makefile for Unix (template for configure)

-README          guess what

-algorithm.txt   description of the (de)compression algorithm

-configure       configure script for Unix

-zconf.in.h      template for zconf.h (used by configure)

-

-amiga/          makefiles for Amiga SAS C

-as400/          makefiles for IBM AS/400

-msdos/          makefiles for MSDOS

-old/            makefiles for various architectures and zlib documentation

-                files that have not yet been updated for zlib 1.2.x

-projects/       projects for various Integrated Development Environments

-qnx/            makefiles for QNX

-win32/          makefiles for Windows

-

-                zlib public header files (must be kept):

-zconf.h

-zlib.h

-

-                private source files used to build the zlib library:

-adler32.c

-compress.c

-crc32.c

-crc32.h

-deflate.c

-deflate.h

-gzio.c

-infback.c

-inffast.c

-inffast.h

-inffixed.h

-inflate.c

-inflate.h

-inftrees.c

-inftrees.h

-trees.c

-trees.h

-uncompr.c

-zutil.c

-zutil.h

-

-                source files for sample programs:

-example.c

-minigzip.c

-

-                unsupported contribution by third parties

-See contrib/README.contrib

+ChangeLog       history of changes
+FAQ             Frequently Asked Questions about zlib
+INDEX           this file
+Makefile        makefile for Unix (generated by configure)
+Makefile.in     makefile for Unix (template for configure)
+README          guess what
+algorithm.txt   description of the (de)compression algorithm
+configure       configure script for Unix
+zconf.in.h      template for zconf.h (used by configure)
+
+amiga/          makefiles for Amiga SAS C
+as400/          makefiles for IBM AS/400
+msdos/          makefiles for MSDOS
+old/            makefiles for various architectures and zlib documentation
+                files that have not yet been updated for zlib 1.2.x
+projects/       projects for various Integrated Development Environments
+qnx/            makefiles for QNX
+win32/          makefiles for Windows
+
+                zlib public header files (must be kept):
+zconf.h
+zlib.h
+
+                private source files used to build the zlib library:
+adler32.c
+compress.c
+crc32.c
+crc32.h
+deflate.c
+deflate.h
+gzio.c
+infback.c
+inffast.c
+inffast.h
+inffixed.h
+inflate.c
+inflate.h
+inftrees.c
+inftrees.h
+trees.c
+trees.h
+uncompr.c
+zutil.c
+zutil.h
+
+                source files for sample programs:
+example.c
+minigzip.c
+
+                unsupported contribution by third parties
+See contrib/README.contrib
diff --git a/utils/zenutils/libraries/zlib123/zlib/Makefile b/utils/zenutils/libraries/zlib123/zlib/Makefile
index a4954c8f97..2fd6e45c48 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/Makefile
+++ b/utils/zenutils/libraries/zlib123/zlib/Makefile
@@ -1,154 +1,154 @@
-# Makefile for zlib

-# Copyright (C) 1995-2005 Jean-loup Gailly.

-# For conditions of distribution and use, see copyright notice in zlib.h

-

-# To compile and test, type:

-#    ./configure; make test

-# The call of configure is optional if you don't have special requirements

-# If you wish to build zlib as a shared library, use: ./configure -s

-

-# To use the asm code, type:

-#    cp contrib/asm?86/match.S ./match.S

-#    make LOC=-DASMV OBJA=match.o

-

-# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:

-#    make install

-# To install in $HOME instead of /usr/local, use:

-#    make install prefix=$HOME

-

-CC=cc

-

-CFLAGS=-O

-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7

-#CFLAGS=-g -DDEBUG

-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \

-#           -Wstrict-prototypes -Wmissing-prototypes

-

-LDFLAGS=libz.a

-LDSHARED=$(CC)

-CPP=$(CC) -E

-

-LIBS=libz.a

-SHAREDLIB=libz.so

-SHAREDLIBV=libz.so.1.2.3

-SHAREDLIBM=libz.so.1

-

-AR=ar rc

-RANLIB=ranlib

-TAR=tar

-SHELL=/bin/sh

-EXE=

-

-prefix = /usr/local

-exec_prefix = ${prefix}

-libdir = ${exec_prefix}/lib

-includedir = ${prefix}/include

-mandir = ${prefix}/share/man

-man3dir = ${mandir}/man3

-

-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \

-       zutil.o inflate.o infback.o inftrees.o inffast.o

-

-OBJA =

-# to use the asm code: make OBJA=match.o

-

-TEST_OBJS = example.o minigzip.o

-

-all: example$(EXE) minigzip$(EXE)

-

-check: test

-test: all

-        @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \

-        echo hello world | ./minigzip | ./minigzip -d || \

-          echo '                *** minigzip test FAILED ***' ; \

-        if ./example; then \

-          echo '                *** zlib test OK ***'; \

-        else \

-          echo '                *** zlib test FAILED ***'; \

-        fi

-

-libz.a: $(OBJS) $(OBJA)

-        $(AR) $@ $(OBJS) $(OBJA)

-        -@ ($(RANLIB) $@ || true) >/dev/null 2>&1

-

-match.o: match.S

-        $(CPP) match.S > _match.s

-        $(CC) -c _match.s

-        mv _match.o match.o

-        rm -f _match.s

-

-$(SHAREDLIBV): $(OBJS)

-        $(LDSHARED) -o $@ $(OBJS)

-        rm -f $(SHAREDLIB) $(SHAREDLIBM)

-        ln -s $@ $(SHAREDLIB)

-        ln -s $@ $(SHAREDLIBM)

-

-example$(EXE): example.o $(LIBS)

-        $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)

-

-minigzip$(EXE): minigzip.o $(LIBS)

-        $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)

-

-install: $(LIBS)

-        -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi

-        -@if [ ! -d $(includedir)  ]; then mkdir -p $(includedir); fi

-        -@if [ ! -d $(libdir)      ]; then mkdir -p $(libdir); fi

-        -@if [ ! -d $(man3dir)     ]; then mkdir -p $(man3dir); fi

-        cp zlib.h zconf.h $(includedir)

-        chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h

-        cp $(LIBS) $(libdir)

-        cd $(libdir); chmod 755 $(LIBS)

-        -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1

-        cd $(libdir); if test -f $(SHAREDLIBV); then \

-          rm -f $(SHAREDLIB) $(SHAREDLIBM); \

-          ln -s $(SHAREDLIBV) $(SHAREDLIB); \

-          ln -s $(SHAREDLIBV) $(SHAREDLIBM); \

-          (ldconfig || true)  >/dev/null 2>&1; \

-        fi

-        cp zlib.3 $(man3dir)

-        chmod 644 $(man3dir)/zlib.3

-# The ranlib in install is needed on NeXTSTEP which checks file times

-# ldconfig is for Linux

-

-uninstall:

-        cd $(includedir); \

-        cd $(libdir); rm -f libz.a; \

-        if test -f $(SHAREDLIBV); then \

-          rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \

-        fi

-        cd $(man3dir); rm -f zlib.3

-

-mostlyclean: clean

-clean:

-        rm -f *.o *~ example$(EXE) minigzip$(EXE) \

-           libz.* foo.gz so_locations \

-           _match.s maketree contrib/infback9/*.o

-

-maintainer-clean: distclean

-distclean: clean

-        cp -p Makefile.in Makefile

-        cp -p zconf.in.h zconf.h

-        rm -f .DS_Store

-

-tags:

-        etags *.[ch]

-

-depend:

-        makedepend -- $(CFLAGS) -- *.[ch]

-

-# DO NOT DELETE THIS LINE -- make depend depends on it.

-

-adler32.o: zlib.h zconf.h

-compress.o: zlib.h zconf.h

-crc32.o: crc32.h zlib.h zconf.h

-deflate.o: deflate.h zutil.h zlib.h zconf.h

-example.o: zlib.h zconf.h

-gzio.o: zutil.h zlib.h zconf.h

-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h

-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h

-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h

-inftrees.o: zutil.h zlib.h zconf.h inftrees.h

-minigzip.o: zlib.h zconf.h

-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h

-uncompr.o: zlib.h zconf.h

-zutil.o: zutil.h zlib.h zconf.h

+# Makefile for zlib
+# Copyright (C) 1995-2005 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h
+
+# To compile and test, type:
+#    ./configure; make test
+# The call of configure is optional if you don't have special requirements
+# If you wish to build zlib as a shared library, use: ./configure -s
+
+# To use the asm code, type:
+#    cp contrib/asm?86/match.S ./match.S
+#    make LOC=-DASMV OBJA=match.o
+
+# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
+#    make install
+# To install in $HOME instead of /usr/local, use:
+#    make install prefix=$HOME
+
+CC=cc
+
+CFLAGS=-O
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-g -DDEBUG
+#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+#           -Wstrict-prototypes -Wmissing-prototypes
+
+LDFLAGS=libz.a
+LDSHARED=$(CC)
+CPP=$(CC) -E
+
+LIBS=libz.a
+SHAREDLIB=libz.so
+SHAREDLIBV=libz.so.1.2.3
+SHAREDLIBM=libz.so.1
+
+AR=ar rc
+RANLIB=ranlib
+TAR=tar
+SHELL=/bin/sh
+EXE=
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+libdir = ${exec_prefix}/lib
+includedir = ${prefix}/include
+mandir = ${prefix}/share/man
+man3dir = ${mandir}/man3
+
+OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
+       zutil.o inflate.o infback.o inftrees.o inffast.o
+
+OBJA =
+# to use the asm code: make OBJA=match.o
+
+TEST_OBJS = example.o minigzip.o
+
+all: example$(EXE) minigzip$(EXE)
+
+check: test
+test: all
+        @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
+        echo hello world | ./minigzip | ./minigzip -d || \
+          echo '                *** minigzip test FAILED ***' ; \
+        if ./example; then \
+          echo '                *** zlib test OK ***'; \
+        else \
+          echo '                *** zlib test FAILED ***'; \
+        fi
+
+libz.a: $(OBJS) $(OBJA)
+        $(AR) $@ $(OBJS) $(OBJA)
+        -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
+
+match.o: match.S
+        $(CPP) match.S > _match.s
+        $(CC) -c _match.s
+        mv _match.o match.o
+        rm -f _match.s
+
+$(SHAREDLIBV): $(OBJS)
+        $(LDSHARED) -o $@ $(OBJS)
+        rm -f $(SHAREDLIB) $(SHAREDLIBM)
+        ln -s $@ $(SHAREDLIB)
+        ln -s $@ $(SHAREDLIBM)
+
+example$(EXE): example.o $(LIBS)
+        $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
+
+minigzip$(EXE): minigzip.o $(LIBS)
+        $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
+
+install: $(LIBS)
+        -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
+        -@if [ ! -d $(includedir)  ]; then mkdir -p $(includedir); fi
+        -@if [ ! -d $(libdir)      ]; then mkdir -p $(libdir); fi
+        -@if [ ! -d $(man3dir)     ]; then mkdir -p $(man3dir); fi
+        cp zlib.h zconf.h $(includedir)
+        chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
+        cp $(LIBS) $(libdir)
+        cd $(libdir); chmod 755 $(LIBS)
+        -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
+        cd $(libdir); if test -f $(SHAREDLIBV); then \
+          rm -f $(SHAREDLIB) $(SHAREDLIBM); \
+          ln -s $(SHAREDLIBV) $(SHAREDLIB); \
+          ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
+          (ldconfig || true)  >/dev/null 2>&1; \
+        fi
+        cp zlib.3 $(man3dir)
+        chmod 644 $(man3dir)/zlib.3
+# The ranlib in install is needed on NeXTSTEP which checks file times
+# ldconfig is for Linux
+
+uninstall:
+        cd $(includedir); \
+        cd $(libdir); rm -f libz.a; \
+        if test -f $(SHAREDLIBV); then \
+          rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
+        fi
+        cd $(man3dir); rm -f zlib.3
+
+mostlyclean: clean
+clean:
+        rm -f *.o *~ example$(EXE) minigzip$(EXE) \
+           libz.* foo.gz so_locations \
+           _match.s maketree contrib/infback9/*.o
+
+maintainer-clean: distclean
+distclean: clean
+        cp -p Makefile.in Makefile
+        cp -p zconf.in.h zconf.h
+        rm -f .DS_Store
+
+tags:
+        etags *.[ch]
+
+depend:
+        makedepend -- $(CFLAGS) -- *.[ch]
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+adler32.o: zlib.h zconf.h
+compress.o: zlib.h zconf.h
+crc32.o: crc32.h zlib.h zconf.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h
+example.o: zlib.h zconf.h
+gzio.o: zutil.h zlib.h zconf.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+minigzip.o: zlib.h zconf.h
+trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
+uncompr.o: zlib.h zconf.h
+zutil.o: zutil.h zlib.h zconf.h
diff --git a/utils/zenutils/libraries/zlib123/zlib/Makefile.in b/utils/zenutils/libraries/zlib123/zlib/Makefile.in
index a4954c8f97..2fd6e45c48 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/Makefile.in
+++ b/utils/zenutils/libraries/zlib123/zlib/Makefile.in
@@ -1,154 +1,154 @@
-# Makefile for zlib

-# Copyright (C) 1995-2005 Jean-loup Gailly.

-# For conditions of distribution and use, see copyright notice in zlib.h

-

-# To compile and test, type:

-#    ./configure; make test

-# The call of configure is optional if you don't have special requirements

-# If you wish to build zlib as a shared library, use: ./configure -s

-

-# To use the asm code, type:

-#    cp contrib/asm?86/match.S ./match.S

-#    make LOC=-DASMV OBJA=match.o

-

-# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:

-#    make install

-# To install in $HOME instead of /usr/local, use:

-#    make install prefix=$HOME

-

-CC=cc

-

-CFLAGS=-O

-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7

-#CFLAGS=-g -DDEBUG

-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \

-#           -Wstrict-prototypes -Wmissing-prototypes

-

-LDFLAGS=libz.a

-LDSHARED=$(CC)

-CPP=$(CC) -E

-

-LIBS=libz.a

-SHAREDLIB=libz.so

-SHAREDLIBV=libz.so.1.2.3

-SHAREDLIBM=libz.so.1

-

-AR=ar rc

-RANLIB=ranlib

-TAR=tar

-SHELL=/bin/sh

-EXE=

-

-prefix = /usr/local

-exec_prefix = ${prefix}

-libdir = ${exec_prefix}/lib

-includedir = ${prefix}/include

-mandir = ${prefix}/share/man

-man3dir = ${mandir}/man3

-

-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \

-       zutil.o inflate.o infback.o inftrees.o inffast.o

-

-OBJA =

-# to use the asm code: make OBJA=match.o

-

-TEST_OBJS = example.o minigzip.o

-

-all: example$(EXE) minigzip$(EXE)

-

-check: test

-test: all

-        @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \

-        echo hello world | ./minigzip | ./minigzip -d || \

-          echo '                *** minigzip test FAILED ***' ; \

-        if ./example; then \

-          echo '                *** zlib test OK ***'; \

-        else \

-          echo '                *** zlib test FAILED ***'; \

-        fi

-

-libz.a: $(OBJS) $(OBJA)

-        $(AR) $@ $(OBJS) $(OBJA)

-        -@ ($(RANLIB) $@ || true) >/dev/null 2>&1

-

-match.o: match.S

-        $(CPP) match.S > _match.s

-        $(CC) -c _match.s

-        mv _match.o match.o

-        rm -f _match.s

-

-$(SHAREDLIBV): $(OBJS)

-        $(LDSHARED) -o $@ $(OBJS)

-        rm -f $(SHAREDLIB) $(SHAREDLIBM)

-        ln -s $@ $(SHAREDLIB)

-        ln -s $@ $(SHAREDLIBM)

-

-example$(EXE): example.o $(LIBS)

-        $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)

-

-minigzip$(EXE): minigzip.o $(LIBS)

-        $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)

-

-install: $(LIBS)

-        -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi

-        -@if [ ! -d $(includedir)  ]; then mkdir -p $(includedir); fi

-        -@if [ ! -d $(libdir)      ]; then mkdir -p $(libdir); fi

-        -@if [ ! -d $(man3dir)     ]; then mkdir -p $(man3dir); fi

-        cp zlib.h zconf.h $(includedir)

-        chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h

-        cp $(LIBS) $(libdir)

-        cd $(libdir); chmod 755 $(LIBS)

-        -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1

-        cd $(libdir); if test -f $(SHAREDLIBV); then \

-          rm -f $(SHAREDLIB) $(SHAREDLIBM); \

-          ln -s $(SHAREDLIBV) $(SHAREDLIB); \

-          ln -s $(SHAREDLIBV) $(SHAREDLIBM); \

-          (ldconfig || true)  >/dev/null 2>&1; \

-        fi

-        cp zlib.3 $(man3dir)

-        chmod 644 $(man3dir)/zlib.3

-# The ranlib in install is needed on NeXTSTEP which checks file times

-# ldconfig is for Linux

-

-uninstall:

-        cd $(includedir); \

-        cd $(libdir); rm -f libz.a; \

-        if test -f $(SHAREDLIBV); then \

-          rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \

-        fi

-        cd $(man3dir); rm -f zlib.3

-

-mostlyclean: clean

-clean:

-        rm -f *.o *~ example$(EXE) minigzip$(EXE) \

-           libz.* foo.gz so_locations \

-           _match.s maketree contrib/infback9/*.o

-

-maintainer-clean: distclean

-distclean: clean

-        cp -p Makefile.in Makefile

-        cp -p zconf.in.h zconf.h

-        rm -f .DS_Store

-

-tags:

-        etags *.[ch]

-

-depend:

-        makedepend -- $(CFLAGS) -- *.[ch]

-

-# DO NOT DELETE THIS LINE -- make depend depends on it.

-

-adler32.o: zlib.h zconf.h

-compress.o: zlib.h zconf.h

-crc32.o: crc32.h zlib.h zconf.h

-deflate.o: deflate.h zutil.h zlib.h zconf.h

-example.o: zlib.h zconf.h

-gzio.o: zutil.h zlib.h zconf.h

-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h

-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h

-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h

-inftrees.o: zutil.h zlib.h zconf.h inftrees.h

-minigzip.o: zlib.h zconf.h

-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h

-uncompr.o: zlib.h zconf.h

-zutil.o: zutil.h zlib.h zconf.h

+# Makefile for zlib
+# Copyright (C) 1995-2005 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h
+
+# To compile and test, type:
+#    ./configure; make test
+# The call of configure is optional if you don't have special requirements
+# If you wish to build zlib as a shared library, use: ./configure -s
+
+# To use the asm code, type:
+#    cp contrib/asm?86/match.S ./match.S
+#    make LOC=-DASMV OBJA=match.o
+
+# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
+#    make install
+# To install in $HOME instead of /usr/local, use:
+#    make install prefix=$HOME
+
+CC=cc
+
+CFLAGS=-O
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-g -DDEBUG
+#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+#           -Wstrict-prototypes -Wmissing-prototypes
+
+LDFLAGS=libz.a
+LDSHARED=$(CC)
+CPP=$(CC) -E
+
+LIBS=libz.a
+SHAREDLIB=libz.so
+SHAREDLIBV=libz.so.1.2.3
+SHAREDLIBM=libz.so.1
+
+AR=ar rc
+RANLIB=ranlib
+TAR=tar
+SHELL=/bin/sh
+EXE=
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+libdir = ${exec_prefix}/lib
+includedir = ${prefix}/include
+mandir = ${prefix}/share/man
+man3dir = ${mandir}/man3
+
+OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
+       zutil.o inflate.o infback.o inftrees.o inffast.o
+
+OBJA =
+# to use the asm code: make OBJA=match.o
+
+TEST_OBJS = example.o minigzip.o
+
+all: example$(EXE) minigzip$(EXE)
+
+check: test
+test: all
+        @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
+        echo hello world | ./minigzip | ./minigzip -d || \
+          echo '                *** minigzip test FAILED ***' ; \
+        if ./example; then \
+          echo '                *** zlib test OK ***'; \
+        else \
+          echo '                *** zlib test FAILED ***'; \
+        fi
+
+libz.a: $(OBJS) $(OBJA)
+        $(AR) $@ $(OBJS) $(OBJA)
+        -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
+
+match.o: match.S
+        $(CPP) match.S > _match.s
+        $(CC) -c _match.s
+        mv _match.o match.o
+        rm -f _match.s
+
+$(SHAREDLIBV): $(OBJS)
+        $(LDSHARED) -o $@ $(OBJS)
+        rm -f $(SHAREDLIB) $(SHAREDLIBM)
+        ln -s $@ $(SHAREDLIB)
+        ln -s $@ $(SHAREDLIBM)
+
+example$(EXE): example.o $(LIBS)
+        $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
+
+minigzip$(EXE): minigzip.o $(LIBS)
+        $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
+
+install: $(LIBS)
+        -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
+        -@if [ ! -d $(includedir)  ]; then mkdir -p $(includedir); fi
+        -@if [ ! -d $(libdir)      ]; then mkdir -p $(libdir); fi
+        -@if [ ! -d $(man3dir)     ]; then mkdir -p $(man3dir); fi
+        cp zlib.h zconf.h $(includedir)
+        chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
+        cp $(LIBS) $(libdir)
+        cd $(libdir); chmod 755 $(LIBS)
+        -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
+        cd $(libdir); if test -f $(SHAREDLIBV); then \
+          rm -f $(SHAREDLIB) $(SHAREDLIBM); \
+          ln -s $(SHAREDLIBV) $(SHAREDLIB); \
+          ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
+          (ldconfig || true)  >/dev/null 2>&1; \
+        fi
+        cp zlib.3 $(man3dir)
+        chmod 644 $(man3dir)/zlib.3
+# The ranlib in install is needed on NeXTSTEP which checks file times
+# ldconfig is for Linux
+
+uninstall:
+        cd $(includedir); \
+        cd $(libdir); rm -f libz.a; \
+        if test -f $(SHAREDLIBV); then \
+          rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
+        fi
+        cd $(man3dir); rm -f zlib.3
+
+mostlyclean: clean
+clean:
+        rm -f *.o *~ example$(EXE) minigzip$(EXE) \
+           libz.* foo.gz so_locations \
+           _match.s maketree contrib/infback9/*.o
+
+maintainer-clean: distclean
+distclean: clean
+        cp -p Makefile.in Makefile
+        cp -p zconf.in.h zconf.h
+        rm -f .DS_Store
+
+tags:
+        etags *.[ch]
+
+depend:
+        makedepend -- $(CFLAGS) -- *.[ch]
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+adler32.o: zlib.h zconf.h
+compress.o: zlib.h zconf.h
+crc32.o: crc32.h zlib.h zconf.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h
+example.o: zlib.h zconf.h
+gzio.o: zutil.h zlib.h zconf.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+minigzip.o: zlib.h zconf.h
+trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
+uncompr.o: zlib.h zconf.h
+zutil.o: zutil.h zlib.h zconf.h
diff --git a/utils/zenutils/libraries/zlib123/zlib/README b/utils/zenutils/libraries/zlib123/zlib/README
index 80f71ae856..758cc50020 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/README
+++ b/utils/zenutils/libraries/zlib123/zlib/README
@@ -1,125 +1,125 @@
-ZLIB DATA COMPRESSION LIBRARY

-

-zlib 1.2.3 is a general purpose data compression library.  All the code is

-thread safe.  The data format used by the zlib library is described by RFCs

-(Request for Comments) 1950 to 1952 in the files

-http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)

-and rfc1952.txt (gzip format). These documents are also available in other

-formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html

-

-All functions of the compression library are documented in the file zlib.h

-(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example

-of the library is given in the file example.c which also tests that the library

-is working correctly. Another example is given in the file minigzip.c. The

-compression library itself is composed of all source files except example.c and

-minigzip.c.

-

-To compile all files and run the test program, follow the instructions given at

-the top of Makefile. In short "make test; make install" should work for most

-machines. For Unix: "./configure; make test; make install". For MSDOS, use one

-of the special makefiles such as Makefile.msc. For VMS, use make_vms.com.

-

-Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant

-<info@winimage.com> for the Windows DLL version. The zlib home page is

-http://www.zlib.org or http://www.gzip.org/zlib/ Before reporting a problem,

-please check this site to verify that you have the latest version of zlib;

-otherwise get the latest version and check whether the problem still exists or

-not.

-

-PLEASE read the zlib FAQ http://www.gzip.org/zlib/zlib_faq.html before asking

-for help.

-

-Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997

-issue of  Dr. Dobb's Journal; a copy of the article is available in

-http://dogma.net/markn/articles/zlibtool/zlibtool.htm

-

-The changes made in version 1.2.3 are documented in the file ChangeLog.

-

-Unsupported third party contributions are provided in directory "contrib".

-

-A Java implementation of zlib is available in the Java Development Kit

-http://java.sun.com/j2se/1.4.2/docs/api/java/util/zip/package-summary.html

-See the zlib home page http://www.zlib.org for details.

-

-A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is in the

-CPAN (Comprehensive Perl Archive Network) sites

-http://www.cpan.org/modules/by-module/Compress/

-

-A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is

-available in Python 1.5 and later versions, see

-http://www.python.org/doc/lib/module-zlib.html

-

-A zlib binding for TCL written by Andreas Kupries <a.kupries@westend.com> is

-availlable at http://www.oche.de/~akupries/soft/trf/trf_zip.html

-

-An experimental package to read and write files in .zip format, written on top

-of zlib by Gilles Vollant <info@winimage.com>, is available in the

-contrib/minizip directory of zlib.

-

-

-Notes for some targets:

-

-- For Windows DLL versions, please see win32/DLL_FAQ.txt

-

-- For 64-bit Irix, deflate.c must be compiled without any optimization. With

-  -O, one libpng test fails. The test works in 32 bit mode (with the -n32

-  compiler flag). The compiler bug has been reported to SGI.

-

-- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works

-  when compiled with cc.

-

-- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is

-  necessary to get gzprintf working correctly. This is done by configure.

-

-- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with

-  other compilers. Use "make test" to check your compiler.

-

-- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers.

-

-- For PalmOs, see http://palmzlib.sourceforge.net/

-

-- When building a shared, i.e. dynamic library on Mac OS X, the library must be

-  installed before testing (do "make install" before "make test"), since the

-  library location is specified in the library.

-

-

-Acknowledgments:

-

-  The deflate format used by zlib was defined by Phil Katz. The deflate

-  and zlib specifications were written by L. Peter Deutsch. Thanks to all the

-  people who reported problems and suggested various improvements in zlib;

-  they are too numerous to cite here.

-

-Copyright notice:

-

- (C) 1995-2004 Jean-loup Gailly and Mark Adler

-

-  This software is provided 'as-is', without any express or implied

-  warranty.  In no event will the authors be held liable for any damages

-  arising from the use of this software.

-

-  Permission is granted to anyone to use this software for any purpose,

-  including commercial applications, and to alter it and redistribute it

-  freely, subject to the following restrictions:

-

-  1. The origin of this software must not be misrepresented; you must not

-     claim that you wrote the original software. If you use this software

-     in a product, an acknowledgment in the product documentation would be

-     appreciated but is not required.

-  2. Altered source versions must be plainly marked as such, and must not be

-     misrepresented as being the original software.

-  3. This notice may not be removed or altered from any source distribution.

-

-  Jean-loup Gailly        Mark Adler

-  jloup@gzip.org          madler@alumni.caltech.edu

-

-If you use the zlib library in a product, we would appreciate *not*

-receiving lengthy legal documents to sign. The sources are provided

-for free but without warranty of any kind.  The library has been

-entirely written by Jean-loup Gailly and Mark Adler; it does not

-include third-party code.

-

-If you redistribute modified sources, we would appreciate that you include

-in the file ChangeLog history information documenting your changes. Please

-read the FAQ for more information on the distribution of modified source

-versions.

+ZLIB DATA COMPRESSION LIBRARY
+
+zlib 1.2.3 is a general purpose data compression library.  All the code is
+thread safe.  The data format used by the zlib library is described by RFCs
+(Request for Comments) 1950 to 1952 in the files
+http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
+and rfc1952.txt (gzip format). These documents are also available in other
+formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html
+
+All functions of the compression library are documented in the file zlib.h
+(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example
+of the library is given in the file example.c which also tests that the library
+is working correctly. Another example is given in the file minigzip.c. The
+compression library itself is composed of all source files except example.c and
+minigzip.c.
+
+To compile all files and run the test program, follow the instructions given at
+the top of Makefile. In short "make test; make install" should work for most
+machines. For Unix: "./configure; make test; make install". For MSDOS, use one
+of the special makefiles such as Makefile.msc. For VMS, use make_vms.com.
+
+Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
+<info@winimage.com> for the Windows DLL version. The zlib home page is
+http://www.zlib.org or http://www.gzip.org/zlib/ Before reporting a problem,
+please check this site to verify that you have the latest version of zlib;
+otherwise get the latest version and check whether the problem still exists or
+not.
+
+PLEASE read the zlib FAQ http://www.gzip.org/zlib/zlib_faq.html before asking
+for help.
+
+Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
+issue of  Dr. Dobb's Journal; a copy of the article is available in
+http://dogma.net/markn/articles/zlibtool/zlibtool.htm
+
+The changes made in version 1.2.3 are documented in the file ChangeLog.
+
+Unsupported third party contributions are provided in directory "contrib".
+
+A Java implementation of zlib is available in the Java Development Kit
+http://java.sun.com/j2se/1.4.2/docs/api/java/util/zip/package-summary.html
+See the zlib home page http://www.zlib.org for details.
+
+A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is in the
+CPAN (Comprehensive Perl Archive Network) sites
+http://www.cpan.org/modules/by-module/Compress/
+
+A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
+available in Python 1.5 and later versions, see
+http://www.python.org/doc/lib/module-zlib.html
+
+A zlib binding for TCL written by Andreas Kupries <a.kupries@westend.com> is
+availlable at http://www.oche.de/~akupries/soft/trf/trf_zip.html
+
+An experimental package to read and write files in .zip format, written on top
+of zlib by Gilles Vollant <info@winimage.com>, is available in the
+contrib/minizip directory of zlib.
+
+
+Notes for some targets:
+
+- For Windows DLL versions, please see win32/DLL_FAQ.txt
+
+- For 64-bit Irix, deflate.c must be compiled without any optimization. With
+  -O, one libpng test fails. The test works in 32 bit mode (with the -n32
+  compiler flag). The compiler bug has been reported to SGI.
+
+- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
+  when compiled with cc.
+
+- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
+  necessary to get gzprintf working correctly. This is done by configure.
+
+- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
+  other compilers. Use "make test" to check your compiler.
+
+- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers.
+
+- For PalmOs, see http://palmzlib.sourceforge.net/
+
+- When building a shared, i.e. dynamic library on Mac OS X, the library must be
+  installed before testing (do "make install" before "make test"), since the
+  library location is specified in the library.
+
+
+Acknowledgments:
+
+  The deflate format used by zlib was defined by Phil Katz. The deflate
+  and zlib specifications were written by L. Peter Deutsch. Thanks to all the
+  people who reported problems and suggested various improvements in zlib;
+  they are too numerous to cite here.
+
+Copyright notice:
+
+ (C) 1995-2004 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+If you use the zlib library in a product, we would appreciate *not*
+receiving lengthy legal documents to sign. The sources are provided
+for free but without warranty of any kind.  The library has been
+entirely written by Jean-loup Gailly and Mark Adler; it does not
+include third-party code.
+
+If you redistribute modified sources, we would appreciate that you include
+in the file ChangeLog history information documenting your changes. Please
+read the FAQ for more information on the distribution of modified source
+versions.
diff --git a/utils/zenutils/libraries/zlib123/zlib/adler32.c b/utils/zenutils/libraries/zlib123/zlib/adler32.c
index f201d6701e..007ba26277 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/adler32.c
+++ b/utils/zenutils/libraries/zlib123/zlib/adler32.c
@@ -1,149 +1,149 @@
-/* adler32.c -- compute the Adler-32 checksum of a data stream

- * Copyright (C) 1995-2004 Mark Adler

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* @(#) $Id$ */

-

-#define ZLIB_INTERNAL

-#include "zlib.h"

-

-#define BASE 65521UL    /* largest prime smaller than 65536 */

-#define NMAX 5552

-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */

-

-#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}

-#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);

-#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);

-#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);

-#define DO16(buf)   DO8(buf,0); DO8(buf,8);

-

-/* use NO_DIVIDE if your processor does not do division in hardware */

-#ifdef NO_DIVIDE

-#  define MOD(a) \

-    do { \

-        if (a >= (BASE << 16)) a -= (BASE << 16); \

-        if (a >= (BASE << 15)) a -= (BASE << 15); \

-        if (a >= (BASE << 14)) a -= (BASE << 14); \

-        if (a >= (BASE << 13)) a -= (BASE << 13); \

-        if (a >= (BASE << 12)) a -= (BASE << 12); \

-        if (a >= (BASE << 11)) a -= (BASE << 11); \

-        if (a >= (BASE << 10)) a -= (BASE << 10); \

-        if (a >= (BASE << 9)) a -= (BASE << 9); \

-        if (a >= (BASE << 8)) a -= (BASE << 8); \

-        if (a >= (BASE << 7)) a -= (BASE << 7); \

-        if (a >= (BASE << 6)) a -= (BASE << 6); \

-        if (a >= (BASE << 5)) a -= (BASE << 5); \

-        if (a >= (BASE << 4)) a -= (BASE << 4); \

-        if (a >= (BASE << 3)) a -= (BASE << 3); \

-        if (a >= (BASE << 2)) a -= (BASE << 2); \

-        if (a >= (BASE << 1)) a -= (BASE << 1); \

-        if (a >= BASE) a -= BASE; \

-    } while (0)

-#  define MOD4(a) \

-    do { \

-        if (a >= (BASE << 4)) a -= (BASE << 4); \

-        if (a >= (BASE << 3)) a -= (BASE << 3); \

-        if (a >= (BASE << 2)) a -= (BASE << 2); \

-        if (a >= (BASE << 1)) a -= (BASE << 1); \

-        if (a >= BASE) a -= BASE; \

-    } while (0)

-#else

-#  define MOD(a) a %= BASE

-#  define MOD4(a) a %= BASE

-#endif

-

-/* ========================================================================= */

-uLong ZEXPORT adler32(adler, buf, len)

-    uLong adler;

-    const Bytef *buf;

-    uInt len;

-{

-    unsigned long sum2;

-    unsigned n;

-

-    /* split Adler-32 into component sums */

-    sum2 = (adler >> 16) & 0xffff;

-    adler &= 0xffff;

-

-    /* in case user likes doing a byte at a time, keep it fast */

-    if (len == 1) {

-        adler += buf[0];

-        if (adler >= BASE)

-            adler -= BASE;

-        sum2 += adler;

-        if (sum2 >= BASE)

-            sum2 -= BASE;

-        return adler | (sum2 << 16);

-    }

-

-    /* initial Adler-32 value (deferred check for len == 1 speed) */

-    if (buf == Z_NULL)

-        return 1L;

-

-    /* in case short lengths are provided, keep it somewhat fast */

-    if (len < 16) {

-        while (len--) {

-            adler += *buf++;

-            sum2 += adler;

-        }

-        if (adler >= BASE)

-            adler -= BASE;

-        MOD4(sum2);             /* only added so many BASE's */

-        return adler | (sum2 << 16);

-    }

-

-    /* do length NMAX blocks -- requires just one modulo operation */

-    while (len >= NMAX) {

-        len -= NMAX;

-        n = NMAX / 16;          /* NMAX is divisible by 16 */

-        do {

-            DO16(buf);          /* 16 sums unrolled */

-            buf += 16;

-        } while (--n);

-        MOD(adler);

-        MOD(sum2);

-    }

-

-    /* do remaining bytes (less than NMAX, still just one modulo) */

-    if (len) {                  /* avoid modulos if none remaining */

-        while (len >= 16) {

-            len -= 16;

-            DO16(buf);

-            buf += 16;

-        }

-        while (len--) {

-            adler += *buf++;

-            sum2 += adler;

-        }

-        MOD(adler);

-        MOD(sum2);

-    }

-

-    /* return recombined sums */

-    return adler | (sum2 << 16);

-}

-

-/* ========================================================================= */

-uLong ZEXPORT adler32_combine(adler1, adler2, len2)

-    uLong adler1;

-    uLong adler2;

-    z_off_t len2;

-{

-    unsigned long sum1;

-    unsigned long sum2;

-    unsigned rem;

-

-    /* the derivation of this formula is left as an exercise for the reader */

-    rem = (unsigned)(len2 % BASE);

-    sum1 = adler1 & 0xffff;

-    sum2 = rem * sum1;

-    MOD(sum2);

-    sum1 += (adler2 & 0xffff) + BASE - 1;

-    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;

-    if (sum1 > BASE) sum1 -= BASE;

-    if (sum1 > BASE) sum1 -= BASE;

-    if (sum2 > (BASE << 1)) sum2 -= (BASE << 1);

-    if (sum2 > BASE) sum2 -= BASE;

-    return sum1 | (sum2 << 16);

-}

+/* adler32.c -- compute the Adler-32 checksum of a data stream
+ * Copyright (C) 1995-2004 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#define ZLIB_INTERNAL
+#include "zlib.h"
+
+#define BASE 65521UL    /* largest prime smaller than 65536 */
+#define NMAX 5552
+/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
+
+#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}
+#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
+#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
+#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
+#define DO16(buf)   DO8(buf,0); DO8(buf,8);
+
+/* use NO_DIVIDE if your processor does not do division in hardware */
+#ifdef NO_DIVIDE
+#  define MOD(a) \
+    do { \
+        if (a >= (BASE << 16)) a -= (BASE << 16); \
+        if (a >= (BASE << 15)) a -= (BASE << 15); \
+        if (a >= (BASE << 14)) a -= (BASE << 14); \
+        if (a >= (BASE << 13)) a -= (BASE << 13); \
+        if (a >= (BASE << 12)) a -= (BASE << 12); \
+        if (a >= (BASE << 11)) a -= (BASE << 11); \
+        if (a >= (BASE << 10)) a -= (BASE << 10); \
+        if (a >= (BASE << 9)) a -= (BASE << 9); \
+        if (a >= (BASE << 8)) a -= (BASE << 8); \
+        if (a >= (BASE << 7)) a -= (BASE << 7); \
+        if (a >= (BASE << 6)) a -= (BASE << 6); \
+        if (a >= (BASE << 5)) a -= (BASE << 5); \
+        if (a >= (BASE << 4)) a -= (BASE << 4); \
+        if (a >= (BASE << 3)) a -= (BASE << 3); \
+        if (a >= (BASE << 2)) a -= (BASE << 2); \
+        if (a >= (BASE << 1)) a -= (BASE << 1); \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#  define MOD4(a) \
+    do { \
+        if (a >= (BASE << 4)) a -= (BASE << 4); \
+        if (a >= (BASE << 3)) a -= (BASE << 3); \
+        if (a >= (BASE << 2)) a -= (BASE << 2); \
+        if (a >= (BASE << 1)) a -= (BASE << 1); \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#else
+#  define MOD(a) a %= BASE
+#  define MOD4(a) a %= BASE
+#endif
+
+/* ========================================================================= */
+uLong ZEXPORT adler32(adler, buf, len)
+    uLong adler;
+    const Bytef *buf;
+    uInt len;
+{
+    unsigned long sum2;
+    unsigned n;
+
+    /* split Adler-32 into component sums */
+    sum2 = (adler >> 16) & 0xffff;
+    adler &= 0xffff;
+
+    /* in case user likes doing a byte at a time, keep it fast */
+    if (len == 1) {
+        adler += buf[0];
+        if (adler >= BASE)
+            adler -= BASE;
+        sum2 += adler;
+        if (sum2 >= BASE)
+            sum2 -= BASE;
+        return adler | (sum2 << 16);
+    }
+
+    /* initial Adler-32 value (deferred check for len == 1 speed) */
+    if (buf == Z_NULL)
+        return 1L;
+
+    /* in case short lengths are provided, keep it somewhat fast */
+    if (len < 16) {
+        while (len--) {
+            adler += *buf++;
+            sum2 += adler;
+        }
+        if (adler >= BASE)
+            adler -= BASE;
+        MOD4(sum2);             /* only added so many BASE's */
+        return adler | (sum2 << 16);
+    }
+
+    /* do length NMAX blocks -- requires just one modulo operation */
+    while (len >= NMAX) {
+        len -= NMAX;
+        n = NMAX / 16;          /* NMAX is divisible by 16 */
+        do {
+            DO16(buf);          /* 16 sums unrolled */
+            buf += 16;
+        } while (--n);
+        MOD(adler);
+        MOD(sum2);
+    }
+
+    /* do remaining bytes (less than NMAX, still just one modulo) */
+    if (len) {                  /* avoid modulos if none remaining */
+        while (len >= 16) {
+            len -= 16;
+            DO16(buf);
+            buf += 16;
+        }
+        while (len--) {
+            adler += *buf++;
+            sum2 += adler;
+        }
+        MOD(adler);
+        MOD(sum2);
+    }
+
+    /* return recombined sums */
+    return adler | (sum2 << 16);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT adler32_combine(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off_t len2;
+{
+    unsigned long sum1;
+    unsigned long sum2;
+    unsigned rem;
+
+    /* the derivation of this formula is left as an exercise for the reader */
+    rem = (unsigned)(len2 % BASE);
+    sum1 = adler1 & 0xffff;
+    sum2 = rem * sum1;
+    MOD(sum2);
+    sum1 += (adler2 & 0xffff) + BASE - 1;
+    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
+    if (sum1 > BASE) sum1 -= BASE;
+    if (sum1 > BASE) sum1 -= BASE;
+    if (sum2 > (BASE << 1)) sum2 -= (BASE << 1);
+    if (sum2 > BASE) sum2 -= BASE;
+    return sum1 | (sum2 << 16);
+}
diff --git a/utils/zenutils/libraries/zlib123/zlib/algorithm.txt b/utils/zenutils/libraries/zlib123/zlib/algorithm.txt
index 9f6b06808c..b022dde312 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/algorithm.txt
+++ b/utils/zenutils/libraries/zlib123/zlib/algorithm.txt
@@ -1,209 +1,209 @@
-1. Compression algorithm (deflate)

-

-The deflation algorithm used by gzip (also zip and zlib) is a variation of

-LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in

-the input data.  The second occurrence of a string is replaced by a

-pointer to the previous string, in the form of a pair (distance,

-length).  Distances are limited to 32K bytes, and lengths are limited

-to 258 bytes. When a string does not occur anywhere in the previous

-32K bytes, it is emitted as a sequence of literal bytes.  (In this

-description, `string' must be taken as an arbitrary sequence of bytes,

-and is not restricted to printable characters.)

-

-Literals or match lengths are compressed with one Huffman tree, and

-match distances are compressed with another tree. The trees are stored

-in a compact form at the start of each block. The blocks can have any

-size (except that the compressed data for one block must fit in

-available memory). A block is terminated when deflate() determines that

-it would be useful to start another block with fresh trees. (This is

-somewhat similar to the behavior of LZW-based _compress_.)

-

-Duplicated strings are found using a hash table. All input strings of

-length 3 are inserted in the hash table. A hash index is computed for

-the next 3 bytes. If the hash chain for this index is not empty, all

-strings in the chain are compared with the current input string, and

-the longest match is selected.

-

-The hash chains are searched starting with the most recent strings, to

-favor small distances and thus take advantage of the Huffman encoding.

-The hash chains are singly linked. There are no deletions from the

-hash chains, the algorithm simply discards matches that are too old.

-

-To avoid a worst-case situation, very long hash chains are arbitrarily

-truncated at a certain length, determined by a runtime option (level

-parameter of deflateInit). So deflate() does not always find the longest

-possible match but generally finds a match which is long enough.

-

-deflate() also defers the selection of matches with a lazy evaluation

-mechanism. After a match of length N has been found, deflate() searches for

-a longer match at the next input byte. If a longer match is found, the

-previous match is truncated to a length of one (thus producing a single

-literal byte) and the process of lazy evaluation begins again. Otherwise,

-the original match is kept, and the next match search is attempted only N

-steps later.

-

-The lazy match evaluation is also subject to a runtime parameter. If

-the current match is long enough, deflate() reduces the search for a longer

-match, thus speeding up the whole process. If compression ratio is more

-important than speed, deflate() attempts a complete second search even if

-the first match is already long enough.

-

-The lazy match evaluation is not performed for the fastest compression

-modes (level parameter 1 to 3). For these fast modes, new strings

-are inserted in the hash table only when no match was found, or

-when the match is not too long. This degrades the compression ratio

-but saves time since there are both fewer insertions and fewer searches.

-

-

-2. Decompression algorithm (inflate)

-

-2.1 Introduction

-

-The key question is how to represent a Huffman code (or any prefix code) so

-that you can decode fast.  The most important characteristic is that shorter

-codes are much more common than longer codes, so pay attention to decoding the

-short codes fast, and let the long codes take longer to decode.

-

-inflate() sets up a first level table that covers some number of bits of

-input less than the length of longest code.  It gets that many bits from the

-stream, and looks it up in the table.  The table will tell if the next

-code is that many bits or less and how many, and if it is, it will tell

-the value, else it will point to the next level table for which inflate()

-grabs more bits and tries to decode a longer code.

-

-How many bits to make the first lookup is a tradeoff between the time it

-takes to decode and the time it takes to build the table.  If building the

-table took no time (and if you had infinite memory), then there would only

-be a first level table to cover all the way to the longest code.  However,

-building the table ends up taking a lot longer for more bits since short

-codes are replicated many times in such a table.  What inflate() does is

-simply to make the number of bits in the first table a variable, and  then

-to set that variable for the maximum speed.

-

-For inflate, which has 286 possible codes for the literal/length tree, the size

-of the first table is nine bits.  Also the distance trees have 30 possible

-values, and the size of the first table is six bits.  Note that for each of

-those cases, the table ended up one bit longer than the ``average'' code

-length, i.e. the code length of an approximately flat code which would be a

-little more than eight bits for 286 symbols and a little less than five bits

-for 30 symbols.

-

-

-2.2 More details on the inflate table lookup

-

-Ok, you want to know what this cleverly obfuscated inflate tree actually

-looks like.  You are correct that it's not a Huffman tree.  It is simply a

-lookup table for the first, let's say, nine bits of a Huffman symbol.  The

-symbol could be as short as one bit or as long as 15 bits.  If a particular

-symbol is shorter than nine bits, then that symbol's translation is duplicated

-in all those entries that start with that symbol's bits.  For example, if the

-symbol is four bits, then it's duplicated 32 times in a nine-bit table.  If a

-symbol is nine bits long, it appears in the table once.

-

-If the symbol is longer than nine bits, then that entry in the table points

-to another similar table for the remaining bits.  Again, there are duplicated

-entries as needed.  The idea is that most of the time the symbol will be short

-and there will only be one table look up.  (That's whole idea behind data

-compression in the first place.)  For the less frequent long symbols, there

-will be two lookups.  If you had a compression method with really long

-symbols, you could have as many levels of lookups as is efficient.  For

-inflate, two is enough.

-

-So a table entry either points to another table (in which case nine bits in

-the above example are gobbled), or it contains the translation for the symbol

-and the number of bits to gobble.  Then you start again with the next

-ungobbled bit.

-

-You may wonder: why not just have one lookup table for how ever many bits the

-longest symbol is?  The reason is that if you do that, you end up spending

-more time filling in duplicate symbol entries than you do actually decoding.

-At least for deflate's output that generates new trees every several 10's of

-kbytes.  You can imagine that filling in a 2^15 entry table for a 15-bit code

-would take too long if you're only decoding several thousand symbols.  At the

-other extreme, you could make a new table for every bit in the code.  In fact,

-that's essentially a Huffman tree.  But then you spend two much time

-traversing the tree while decoding, even for short symbols.

-

-So the number of bits for the first lookup table is a trade of the time to

-fill out the table vs. the time spent looking at the second level and above of

-the table.

-

-Here is an example, scaled down:

-

-The code being decoded, with 10 symbols, from 1 to 6 bits long:

-

-A: 0

-B: 10

-C: 1100

-D: 11010

-E: 11011

-F: 11100

-G: 11101

-H: 11110

-I: 111110

-J: 111111

-

-Let's make the first table three bits long (eight entries):

-

-000: A,1

-001: A,1

-010: A,1

-011: A,1

-100: B,2

-101: B,2

-110: -> table X (gobble 3 bits)

-111: -> table Y (gobble 3 bits)

-

-Each entry is what the bits decode as and how many bits that is, i.e. how

-many bits to gobble.  Or the entry points to another table, with the number of

-bits to gobble implicit in the size of the table.

-

-Table X is two bits long since the longest code starting with 110 is five bits

-long:

-

-00: C,1

-01: C,1

-10: D,2

-11: E,2

-

-Table Y is three bits long since the longest code starting with 111 is six

-bits long:

-

-000: F,2

-001: F,2

-010: G,2

-011: G,2

-100: H,2

-101: H,2

-110: I,3

-111: J,3

-

-So what we have here are three tables with a total of 20 entries that had to

-be constructed.  That's compared to 64 entries for a single table.  Or

-compared to 16 entries for a Huffman tree (six two entry tables and one four

-entry table).  Assuming that the code ideally represents the probability of

-the symbols, it takes on the average 1.25 lookups per symbol.  That's compared

-to one lookup for the single table, or 1.66 lookups per symbol for the

-Huffman tree.

-

-There, I think that gives you a picture of what's going on.  For inflate, the

-meaning of a particular symbol is often more than just a letter.  It can be a

-byte (a "literal"), or it can be either a length or a distance which

-indicates a base value and a number of bits to fetch after the code that is

-added to the base value.  Or it might be the special end-of-block code.  The

-data structures created in inftrees.c try to encode all that information

-compactly in the tables.

-

-

-Jean-loup Gailly        Mark Adler

-jloup@gzip.org          madler@alumni.caltech.edu

-

-

-References:

-

-[LZ77] Ziv J., Lempel A., ``A Universal Algorithm for Sequential Data

-Compression,'' IEEE Transactions on Information Theory, Vol. 23, No. 3,

-pp. 337-343.

-

-``DEFLATE Compressed Data Format Specification'' available in

-http://www.ietf.org/rfc/rfc1951.txt

+1. Compression algorithm (deflate)
+
+The deflation algorithm used by gzip (also zip and zlib) is a variation of
+LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in
+the input data.  The second occurrence of a string is replaced by a
+pointer to the previous string, in the form of a pair (distance,
+length).  Distances are limited to 32K bytes, and lengths are limited
+to 258 bytes. When a string does not occur anywhere in the previous
+32K bytes, it is emitted as a sequence of literal bytes.  (In this
+description, `string' must be taken as an arbitrary sequence of bytes,
+and is not restricted to printable characters.)
+
+Literals or match lengths are compressed with one Huffman tree, and
+match distances are compressed with another tree. The trees are stored
+in a compact form at the start of each block. The blocks can have any
+size (except that the compressed data for one block must fit in
+available memory). A block is terminated when deflate() determines that
+it would be useful to start another block with fresh trees. (This is
+somewhat similar to the behavior of LZW-based _compress_.)
+
+Duplicated strings are found using a hash table. All input strings of
+length 3 are inserted in the hash table. A hash index is computed for
+the next 3 bytes. If the hash chain for this index is not empty, all
+strings in the chain are compared with the current input string, and
+the longest match is selected.
+
+The hash chains are searched starting with the most recent strings, to
+favor small distances and thus take advantage of the Huffman encoding.
+The hash chains are singly linked. There are no deletions from the
+hash chains, the algorithm simply discards matches that are too old.
+
+To avoid a worst-case situation, very long hash chains are arbitrarily
+truncated at a certain length, determined by a runtime option (level
+parameter of deflateInit). So deflate() does not always find the longest
+possible match but generally finds a match which is long enough.
+
+deflate() also defers the selection of matches with a lazy evaluation
+mechanism. After a match of length N has been found, deflate() searches for
+a longer match at the next input byte. If a longer match is found, the
+previous match is truncated to a length of one (thus producing a single
+literal byte) and the process of lazy evaluation begins again. Otherwise,
+the original match is kept, and the next match search is attempted only N
+steps later.
+
+The lazy match evaluation is also subject to a runtime parameter. If
+the current match is long enough, deflate() reduces the search for a longer
+match, thus speeding up the whole process. If compression ratio is more
+important than speed, deflate() attempts a complete second search even if
+the first match is already long enough.
+
+The lazy match evaluation is not performed for the fastest compression
+modes (level parameter 1 to 3). For these fast modes, new strings
+are inserted in the hash table only when no match was found, or
+when the match is not too long. This degrades the compression ratio
+but saves time since there are both fewer insertions and fewer searches.
+
+
+2. Decompression algorithm (inflate)
+
+2.1 Introduction
+
+The key question is how to represent a Huffman code (or any prefix code) so
+that you can decode fast.  The most important characteristic is that shorter
+codes are much more common than longer codes, so pay attention to decoding the
+short codes fast, and let the long codes take longer to decode.
+
+inflate() sets up a first level table that covers some number of bits of
+input less than the length of longest code.  It gets that many bits from the
+stream, and looks it up in the table.  The table will tell if the next
+code is that many bits or less and how many, and if it is, it will tell
+the value, else it will point to the next level table for which inflate()
+grabs more bits and tries to decode a longer code.
+
+How many bits to make the first lookup is a tradeoff between the time it
+takes to decode and the time it takes to build the table.  If building the
+table took no time (and if you had infinite memory), then there would only
+be a first level table to cover all the way to the longest code.  However,
+building the table ends up taking a lot longer for more bits since short
+codes are replicated many times in such a table.  What inflate() does is
+simply to make the number of bits in the first table a variable, and  then
+to set that variable for the maximum speed.
+
+For inflate, which has 286 possible codes for the literal/length tree, the size
+of the first table is nine bits.  Also the distance trees have 30 possible
+values, and the size of the first table is six bits.  Note that for each of
+those cases, the table ended up one bit longer than the ``average'' code
+length, i.e. the code length of an approximately flat code which would be a
+little more than eight bits for 286 symbols and a little less than five bits
+for 30 symbols.
+
+
+2.2 More details on the inflate table lookup
+
+Ok, you want to know what this cleverly obfuscated inflate tree actually
+looks like.  You are correct that it's not a Huffman tree.  It is simply a
+lookup table for the first, let's say, nine bits of a Huffman symbol.  The
+symbol could be as short as one bit or as long as 15 bits.  If a particular
+symbol is shorter than nine bits, then that symbol's translation is duplicated
+in all those entries that start with that symbol's bits.  For example, if the
+symbol is four bits, then it's duplicated 32 times in a nine-bit table.  If a
+symbol is nine bits long, it appears in the table once.
+
+If the symbol is longer than nine bits, then that entry in the table points
+to another similar table for the remaining bits.  Again, there are duplicated
+entries as needed.  The idea is that most of the time the symbol will be short
+and there will only be one table look up.  (That's whole idea behind data
+compression in the first place.)  For the less frequent long symbols, there
+will be two lookups.  If you had a compression method with really long
+symbols, you could have as many levels of lookups as is efficient.  For
+inflate, two is enough.
+
+So a table entry either points to another table (in which case nine bits in
+the above example are gobbled), or it contains the translation for the symbol
+and the number of bits to gobble.  Then you start again with the next
+ungobbled bit.
+
+You may wonder: why not just have one lookup table for how ever many bits the
+longest symbol is?  The reason is that if you do that, you end up spending
+more time filling in duplicate symbol entries than you do actually decoding.
+At least for deflate's output that generates new trees every several 10's of
+kbytes.  You can imagine that filling in a 2^15 entry table for a 15-bit code
+would take too long if you're only decoding several thousand symbols.  At the
+other extreme, you could make a new table for every bit in the code.  In fact,
+that's essentially a Huffman tree.  But then you spend two much time
+traversing the tree while decoding, even for short symbols.
+
+So the number of bits for the first lookup table is a trade of the time to
+fill out the table vs. the time spent looking at the second level and above of
+the table.
+
+Here is an example, scaled down:
+
+The code being decoded, with 10 symbols, from 1 to 6 bits long:
+
+A: 0
+B: 10
+C: 1100
+D: 11010
+E: 11011
+F: 11100
+G: 11101
+H: 11110
+I: 111110
+J: 111111
+
+Let's make the first table three bits long (eight entries):
+
+000: A,1
+001: A,1
+010: A,1
+011: A,1
+100: B,2
+101: B,2
+110: -> table X (gobble 3 bits)
+111: -> table Y (gobble 3 bits)
+
+Each entry is what the bits decode as and how many bits that is, i.e. how
+many bits to gobble.  Or the entry points to another table, with the number of
+bits to gobble implicit in the size of the table.
+
+Table X is two bits long since the longest code starting with 110 is five bits
+long:
+
+00: C,1
+01: C,1
+10: D,2
+11: E,2
+
+Table Y is three bits long since the longest code starting with 111 is six
+bits long:
+
+000: F,2
+001: F,2
+010: G,2
+011: G,2
+100: H,2
+101: H,2
+110: I,3
+111: J,3
+
+So what we have here are three tables with a total of 20 entries that had to
+be constructed.  That's compared to 64 entries for a single table.  Or
+compared to 16 entries for a Huffman tree (six two entry tables and one four
+entry table).  Assuming that the code ideally represents the probability of
+the symbols, it takes on the average 1.25 lookups per symbol.  That's compared
+to one lookup for the single table, or 1.66 lookups per symbol for the
+Huffman tree.
+
+There, I think that gives you a picture of what's going on.  For inflate, the
+meaning of a particular symbol is often more than just a letter.  It can be a
+byte (a "literal"), or it can be either a length or a distance which
+indicates a base value and a number of bits to fetch after the code that is
+added to the base value.  Or it might be the special end-of-block code.  The
+data structures created in inftrees.c try to encode all that information
+compactly in the tables.
+
+
+Jean-loup Gailly        Mark Adler
+jloup@gzip.org          madler@alumni.caltech.edu
+
+
+References:
+
+[LZ77] Ziv J., Lempel A., ``A Universal Algorithm for Sequential Data
+Compression,'' IEEE Transactions on Information Theory, Vol. 23, No. 3,
+pp. 337-343.
+
+``DEFLATE Compressed Data Format Specification'' available in
+http://www.ietf.org/rfc/rfc1951.txt
diff --git a/utils/zenutils/libraries/zlib123/zlib/compress.c b/utils/zenutils/libraries/zlib123/zlib/compress.c
index d37e84f5e3..df04f0148e 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/compress.c
+++ b/utils/zenutils/libraries/zlib123/zlib/compress.c
@@ -1,79 +1,79 @@
-/* compress.c -- compress a memory buffer

- * Copyright (C) 1995-2003 Jean-loup Gailly.

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* @(#) $Id$ */

-

-#define ZLIB_INTERNAL

-#include "zlib.h"

-

-/* ===========================================================================

-     Compresses the source buffer into the destination buffer. The level

-   parameter has the same meaning as in deflateInit.  sourceLen is the byte

-   length of the source buffer. Upon entry, destLen is the total size of the

-   destination buffer, which must be at least 0.1% larger than sourceLen plus

-   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.

-

-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough

-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,

-   Z_STREAM_ERROR if the level parameter is invalid.

-*/

-int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)

-    Bytef *dest;

-    uLongf *destLen;

-    const Bytef *source;

-    uLong sourceLen;

-    int level;

-{

-    z_stream stream;

-    int err;

-

-    stream.next_in = (Bytef*)source;

-    stream.avail_in = (uInt)sourceLen;

-#ifdef MAXSEG_64K

-    /* Check for source > 64K on 16-bit machine: */

-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;

-#endif

-    stream.next_out = dest;

-    stream.avail_out = (uInt)*destLen;

-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;

-

-    stream.zalloc = (alloc_func)0;

-    stream.zfree = (free_func)0;

-    stream.opaque = (voidpf)0;

-

-    err = deflateInit(&stream, level);

-    if (err != Z_OK) return err;

-

-    err = deflate(&stream, Z_FINISH);

-    if (err != Z_STREAM_END) {

-        deflateEnd(&stream);

-        return err == Z_OK ? Z_BUF_ERROR : err;

-    }

-    *destLen = stream.total_out;

-

-    err = deflateEnd(&stream);

-    return err;

-}

-

-/* ===========================================================================

- */

-int ZEXPORT compress (dest, destLen, source, sourceLen)

-    Bytef *dest;

-    uLongf *destLen;

-    const Bytef *source;

-    uLong sourceLen;

-{

-    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);

-}

-

-/* ===========================================================================

-     If the default memLevel or windowBits for deflateInit() is changed, then

-   this function needs to be updated.

- */

-uLong ZEXPORT compressBound (sourceLen)

-    uLong sourceLen;

-{

-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11;

-}

+/* compress.c -- compress a memory buffer
+ * Copyright (C) 1995-2003 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#define ZLIB_INTERNAL
+#include "zlib.h"
+
+/* ===========================================================================
+     Compresses the source buffer into the destination buffer. The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer. Upon entry, destLen is the total size of the
+   destination buffer, which must be at least 0.1% larger than sourceLen plus
+   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
+
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+   Z_STREAM_ERROR if the level parameter is invalid.
+*/
+int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+    int level;
+{
+    z_stream stream;
+    int err;
+
+    stream.next_in = (Bytef*)source;
+    stream.avail_in = (uInt)sourceLen;
+#ifdef MAXSEG_64K
+    /* Check for source > 64K on 16-bit machine: */
+    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
+#endif
+    stream.next_out = dest;
+    stream.avail_out = (uInt)*destLen;
+    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
+
+    stream.zalloc = (alloc_func)0;
+    stream.zfree = (free_func)0;
+    stream.opaque = (voidpf)0;
+
+    err = deflateInit(&stream, level);
+    if (err != Z_OK) return err;
+
+    err = deflate(&stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        deflateEnd(&stream);
+        return err == Z_OK ? Z_BUF_ERROR : err;
+    }
+    *destLen = stream.total_out;
+
+    err = deflateEnd(&stream);
+    return err;
+}
+
+/* ===========================================================================
+ */
+int ZEXPORT compress (dest, destLen, source, sourceLen)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+{
+    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
+}
+
+/* ===========================================================================
+     If the default memLevel or windowBits for deflateInit() is changed, then
+   this function needs to be updated.
+ */
+uLong ZEXPORT compressBound (sourceLen)
+    uLong sourceLen;
+{
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11;
+}
diff --git a/utils/zenutils/libraries/zlib123/zlib/configure b/utils/zenutils/libraries/zlib123/zlib/configure
index 212e92ed27..d7ffdc3458 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/configure
+++ b/utils/zenutils/libraries/zlib123/zlib/configure
@@ -1,459 +1,459 @@
-#!/bin/sh

-# configure script for zlib. This script is needed only if

-# you wish to build a shared library and your system supports them,

-# of if you need special compiler, flags or install directory.

-# Otherwise, you can just use directly "make test; make install"

-#

-# To create a shared library, use "configure --shared"; by default a static

-# library is created. If the primitive shared library support provided here

-# does not work, use ftp://prep.ai.mit.edu/pub/gnu/libtool-*.tar.gz

-#

-# To impose specific compiler or flags or install directory, use for example:

-#    prefix=$HOME CC=cc CFLAGS="-O4" ./configure

-# or for csh/tcsh users:

-#    (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure)

-# LDSHARED is the command to be used to create a shared library

-

-# Incorrect settings of CC or CFLAGS may prevent creating a shared library.

-# If you have problems, try without defining CC and CFLAGS before reporting

-# an error.

-

-LIBS=libz.a

-LDFLAGS="-L. ${LIBS}"

-VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`

-VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`

-VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`

-AR=${AR-"ar rc"}

-RANLIB=${RANLIB-"ranlib"}

-prefix=${prefix-/usr/local}

-exec_prefix=${exec_prefix-'${prefix}'}

-libdir=${libdir-'${exec_prefix}/lib'}

-includedir=${includedir-'${prefix}/include'}

-mandir=${mandir-'${prefix}/share/man'}

-shared_ext='.so'

-shared=0

-gcc=0

-old_cc="$CC"

-old_cflags="$CFLAGS"

-

-while test $# -ge 1

-do

-case "$1" in

-    -h* | --h*)

-      echo 'usage:'

-      echo '  configure [--shared] [--prefix=PREFIX]  [--exec_prefix=EXPREFIX]'

-      echo '     [--libdir=LIBDIR] [--includedir=INCLUDEDIR]'

-        exit 0;;

-    -p*=* | --p*=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;

-    -e*=* | --e*=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;

-    -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;

-    -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift;;

-    -p* | --p*) prefix="$2"; shift; shift;;

-    -e* | --e*) exec_prefix="$2"; shift; shift;;

-    -l* | --l*) libdir="$2"; shift; shift;;

-    -i* | --i*) includedir="$2"; shift; shift;;

-    -s* | --s*) shared=1; shift;;

-    *) echo "unknown option: $1"; echo "$0 --help for help"; exit 1;;

-    esac

-done

-

-test=ztest$$

-cat > $test.c <<EOF

-extern int getchar();

-int hello() {return getchar();}

-EOF

-

-test -z "$CC" && echo Checking for gcc...

-cc=${CC-gcc}

-cflags=${CFLAGS-"-O3"}

-# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure

-case "$cc" in

-  *gcc*) gcc=1;;

-esac

-

-if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then

-  CC="$cc"

-  SFLAGS=${CFLAGS-"-fPIC -O3"}

-  CFLAGS="$cflags"

-  case `(uname -s || echo unknown) 2>/dev/null` in

-  Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;

-  CYGWIN* | Cygwin* | cygwin* | OS/2* )

-             EXE='.exe';;

-  QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4

-         # (alain.bonnefoy@icbt.com)

-                 LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"};;

-  HP-UX*)

-         LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}

-         case `(uname -m || echo unknown) 2>/dev/null` in

-         ia64)

-                 shared_ext='.so'

-                 SHAREDLIB='libz.so';;

-         *)

-                 shared_ext='.sl'

-                 SHAREDLIB='libz.sl';;

-         esac;;

-  Darwin*)   shared_ext='.dylib'

-             SHAREDLIB=libz$shared_ext

-             SHAREDLIBV=libz.$VER$shared_ext

-             SHAREDLIBM=libz.$VER1$shared_ext

-             LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};;

-  *)             LDSHARED=${LDSHARED-"$cc -shared"};;

-  esac

-else

-  # find system name and corresponding cc options

-  CC=${CC-cc}

-  case `(uname -sr || echo unknown) 2>/dev/null` in

-  HP-UX*)    SFLAGS=${CFLAGS-"-O +z"}

-             CFLAGS=${CFLAGS-"-O"}

-#            LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"}

-             LDSHARED=${LDSHARED-"ld -b"}

-         case `(uname -m || echo unknown) 2>/dev/null` in

-         ia64)

-             shared_ext='.so'

-             SHAREDLIB='libz.so';;

-         *)

-             shared_ext='.sl'

-             SHAREDLIB='libz.sl';;

-         esac;;

-  IRIX*)     SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."}

-             CFLAGS=${CFLAGS-"-ansi -O2"}

-             LDSHARED=${LDSHARED-"cc -shared"};;

-  OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"}

-             CFLAGS=${CFLAGS-"-O -std1"}

-             LDSHARED=${LDSHARED-"cc -shared  -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"};;

-  OSF1*)     SFLAGS=${CFLAGS-"-O -std1"}

-             CFLAGS=${CFLAGS-"-O -std1"}

-             LDSHARED=${LDSHARED-"cc -shared"};;

-  QNX*)      SFLAGS=${CFLAGS-"-4 -O"}

-             CFLAGS=${CFLAGS-"-4 -O"}

-             LDSHARED=${LDSHARED-"cc"}

-             RANLIB=${RANLIB-"true"}

-             AR="cc -A";;

-  SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "}

-             CFLAGS=${CFLAGS-"-O3"}

-             LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};;

-  SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."}

-             CFLAGS=${CFLAGS-"-fast -xcg89"}

-             LDSHARED=${LDSHARED-"cc -G"};;

-  SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}

-             CFLAGS=${CFLAGS-"-O2"}

-             LDSHARED=${LDSHARED-"ld"};;

-  SunStudio\ 9*) SFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"}

-             CFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xtarget=ultra3 -xarch=v9b"}

-             LDSHARED=${LDSHARED-"cc -xarch=v9b"};;

-  UNIX_System_V\ 4.2.0)

-             SFLAGS=${CFLAGS-"-KPIC -O"}

-             CFLAGS=${CFLAGS-"-O"}

-             LDSHARED=${LDSHARED-"cc -G"};;

-  UNIX_SV\ 4.2MP)

-             SFLAGS=${CFLAGS-"-Kconform_pic -O"}

-             CFLAGS=${CFLAGS-"-O"}

-             LDSHARED=${LDSHARED-"cc -G"};;

-  OpenUNIX\ 5)

-             SFLAGS=${CFLAGS-"-KPIC -O"}

-             CFLAGS=${CFLAGS-"-O"}

-             LDSHARED=${LDSHARED-"cc -G"};;

-  AIX*)  # Courtesy of dbakker@arrayasolutions.com

-             SFLAGS=${CFLAGS-"-O -qmaxmem=8192"}

-             CFLAGS=${CFLAGS-"-O -qmaxmem=8192"}

-             LDSHARED=${LDSHARED-"xlc -G"};;

-  # send working options for other systems to support@gzip.org

-  *)         SFLAGS=${CFLAGS-"-O"}

-             CFLAGS=${CFLAGS-"-O"}

-             LDSHARED=${LDSHARED-"cc -shared"};;

-  esac

-fi

-

-SHAREDLIB=${SHAREDLIB-"libz$shared_ext"}

-SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"}

-SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"}

-

-if test $shared -eq 1; then

-  echo Checking for shared library support...

-  # we must test in two steps (cc then ld), required at least on SunOS 4.x

-  if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&

-     test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then

-    CFLAGS="$SFLAGS"

-    LIBS="$SHAREDLIBV"

-    echo Building shared library $SHAREDLIBV with $CC.

-  elif test -z "$old_cc" -a -z "$old_cflags"; then

-    echo No shared library support.

-    shared=0;

-  else

-    echo 'No shared library support; try without defining CC and CFLAGS'

-    shared=0;

-  fi

-fi

-if test $shared -eq 0; then

-  LDSHARED="$CC"

-  echo Building static library $LIBS version $VER with $CC.

-else

-  LDFLAGS="-L. ${SHAREDLIBV}"

-fi

-

-cat > $test.c <<EOF

-#include <unistd.h>

-int main() { return 0; }

-EOF

-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then

-  sed < zconf.in.h "/HAVE_UNISTD_H/s%0%1%" > zconf.h

-  echo "Checking for unistd.h... Yes."

-else

-  cp -p zconf.in.h zconf.h

-  echo "Checking for unistd.h... No."

-fi

-

-cat > $test.c <<EOF

-#include <stdio.h>

-#include <stdarg.h>

-#include "zconf.h"

-

-int main()

-{

-#ifndef STDC

-  choke me

-#endif

-

-  return 0;

-}

-EOF

-

-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then

-  echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()"

-

-  cat > $test.c <<EOF

-#include <stdio.h>

-#include <stdarg.h>

-

-int mytest(char *fmt, ...)

-{

-  char buf[20];

-  va_list ap;

-

-  va_start(ap, fmt);

-  vsnprintf(buf, sizeof(buf), fmt, ap);

-  va_end(ap);

-  return 0;

-}

-

-int main()

-{

-  return (mytest("Hello%d\n", 1));

-}

-EOF

-

-  if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then

-    echo "Checking for vsnprintf() in stdio.h... Yes."

-

-    cat >$test.c <<EOF

-#include <stdio.h>

-#include <stdarg.h>

-

-int mytest(char *fmt, ...)

-{

-  int n;

-  char buf[20];

-  va_list ap;

-

-  va_start(ap, fmt);

-  n = vsnprintf(buf, sizeof(buf), fmt, ap);

-  va_end(ap);

-  return n;

-}

-

-int main()

-{

-  return (mytest("Hello%d\n", 1));

-}

-EOF

-

-    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then

-      echo "Checking for return value of vsnprintf()... Yes."

-    else

-      CFLAGS="$CFLAGS -DHAS_vsnprintf_void"

-      echo "Checking for return value of vsnprintf()... No."

-      echo "  WARNING: apparently vsnprintf() does not return a value. zlib"

-      echo "  can build but will be open to possible string-format security"

-      echo "  vulnerabilities."

-    fi

-  else

-    CFLAGS="$CFLAGS -DNO_vsnprintf"

-    echo "Checking for vsnprintf() in stdio.h... No."

-    echo "  WARNING: vsnprintf() not found, falling back to vsprintf(). zlib"

-    echo "  can build but will be open to possible buffer-overflow security"

-    echo "  vulnerabilities."

-

-    cat >$test.c <<EOF

-#include <stdio.h>

-#include <stdarg.h>

-

-int mytest(char *fmt, ...)

-{

-  int n;

-  char buf[20];

-  va_list ap;

-

-  va_start(ap, fmt);

-  n = vsprintf(buf, fmt, ap);

-  va_end(ap);

-  return n;

-}

-

-int main()

-{

-  return (mytest("Hello%d\n", 1));

-}

-EOF

-

-    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then

-      echo "Checking for return value of vsprintf()... Yes."

-    else

-      CFLAGS="$CFLAGS -DHAS_vsprintf_void"

-      echo "Checking for return value of vsprintf()... No."

-      echo "  WARNING: apparently vsprintf() does not return a value. zlib"

-      echo "  can build but will be open to possible string-format security"

-      echo "  vulnerabilities."

-    fi

-  fi

-else

-  echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()"

-

-  cat >$test.c <<EOF

-#include <stdio.h>

-

-int mytest()

-{

-  char buf[20];

-

-  snprintf(buf, sizeof(buf), "%s", "foo");

-  return 0;

-}

-

-int main()

-{

-  return (mytest());

-}

-EOF

-

-  if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then

-    echo "Checking for snprintf() in stdio.h... Yes."

-

-    cat >$test.c <<EOF

-#include <stdio.h>

-

-int mytest()

-{

-  char buf[20];

-

-  return snprintf(buf, sizeof(buf), "%s", "foo");

-}

-

-int main()

-{

-  return (mytest());

-}

-EOF

-

-    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then

-      echo "Checking for return value of snprintf()... Yes."

-    else

-      CFLAGS="$CFLAGS -DHAS_snprintf_void"

-      echo "Checking for return value of snprintf()... No."

-      echo "  WARNING: apparently snprintf() does not return a value. zlib"

-      echo "  can build but will be open to possible string-format security"

-      echo "  vulnerabilities."

-    fi

-  else

-    CFLAGS="$CFLAGS -DNO_snprintf"

-    echo "Checking for snprintf() in stdio.h... No."

-    echo "  WARNING: snprintf() not found, falling back to sprintf(). zlib"

-    echo "  can build but will be open to possible buffer-overflow security"

-    echo "  vulnerabilities."

-

-    cat >$test.c <<EOF

-#include <stdio.h>

-

-int mytest()

-{

-  char buf[20];

-

-  return sprintf(buf, "%s", "foo");

-}

-

-int main()

-{

-  return (mytest());

-}

-EOF

-

-    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then

-      echo "Checking for return value of sprintf()... Yes."

-    else

-      CFLAGS="$CFLAGS -DHAS_sprintf_void"

-      echo "Checking for return value of sprintf()... No."

-      echo "  WARNING: apparently sprintf() does not return a value. zlib"

-      echo "  can build but will be open to possible string-format security"

-      echo "  vulnerabilities."

-    fi

-  fi

-fi

-

-cat >$test.c <<EOF

-#include <errno.h>

-int main() { return 0; }

-EOF

-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then

-  echo "Checking for errno.h... Yes."

-else

-  echo "Checking for errno.h... No."

-  CFLAGS="$CFLAGS -DNO_ERRNO_H"

-fi

-

-cat > $test.c <<EOF

-#include <sys/types.h>

-#include <sys/mman.h>

-#include <sys/stat.h>

-caddr_t hello() {

-  return mmap((caddr_t)0, (off_t)0, PROT_READ, MAP_SHARED, 0, (off_t)0);

-}

-EOF

-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then

-  CFLAGS="$CFLAGS -DUSE_MMAP"

-  echo Checking for mmap support... Yes.

-else

-  echo Checking for mmap support... No.

-fi

-

-CPP=${CPP-"$CC -E"}

-case $CFLAGS in

-  *ASMV*)

-    if test "`nm $test.o | grep _hello`" = ""; then

-      CPP="$CPP -DNO_UNDERLINE"

-      echo Checking for underline in external names... No.

-    else

-      echo Checking for underline in external names... Yes.

-    fi;;

-esac

-

-rm -f $test.[co] $test $test$shared_ext

-

-# udpate Makefile

-sed < Makefile.in "

-/^CC *=/s#=.*#=$CC#

-/^CFLAGS *=/s#=.*#=$CFLAGS#

-/^CPP *=/s#=.*#=$CPP#

-/^LDSHARED *=/s#=.*#=$LDSHARED#

-/^LIBS *=/s#=.*#=$LIBS#

-/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#

-/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#

-/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#

-/^AR *=/s#=.*#=$AR#

-/^RANLIB *=/s#=.*#=$RANLIB#

-/^EXE *=/s#=.*#=$EXE#

-/^prefix *=/s#=.*#=$prefix#

-/^exec_prefix *=/s#=.*#=$exec_prefix#

-/^libdir *=/s#=.*#=$libdir#

-/^includedir *=/s#=.*#=$includedir#

-/^mandir *=/s#=.*#=$mandir#

-/^LDFLAGS *=/s#=.*#=$LDFLAGS#

-" > Makefile

+#!/bin/sh
+# configure script for zlib. This script is needed only if
+# you wish to build a shared library and your system supports them,
+# of if you need special compiler, flags or install directory.
+# Otherwise, you can just use directly "make test; make install"
+#
+# To create a shared library, use "configure --shared"; by default a static
+# library is created. If the primitive shared library support provided here
+# does not work, use ftp://prep.ai.mit.edu/pub/gnu/libtool-*.tar.gz
+#
+# To impose specific compiler or flags or install directory, use for example:
+#    prefix=$HOME CC=cc CFLAGS="-O4" ./configure
+# or for csh/tcsh users:
+#    (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure)
+# LDSHARED is the command to be used to create a shared library
+
+# Incorrect settings of CC or CFLAGS may prevent creating a shared library.
+# If you have problems, try without defining CC and CFLAGS before reporting
+# an error.
+
+LIBS=libz.a
+LDFLAGS="-L. ${LIBS}"
+VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
+VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
+VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
+AR=${AR-"ar rc"}
+RANLIB=${RANLIB-"ranlib"}
+prefix=${prefix-/usr/local}
+exec_prefix=${exec_prefix-'${prefix}'}
+libdir=${libdir-'${exec_prefix}/lib'}
+includedir=${includedir-'${prefix}/include'}
+mandir=${mandir-'${prefix}/share/man'}
+shared_ext='.so'
+shared=0
+gcc=0
+old_cc="$CC"
+old_cflags="$CFLAGS"
+
+while test $# -ge 1
+do
+case "$1" in
+    -h* | --h*)
+      echo 'usage:'
+      echo '  configure [--shared] [--prefix=PREFIX]  [--exec_prefix=EXPREFIX]'
+      echo '     [--libdir=LIBDIR] [--includedir=INCLUDEDIR]'
+        exit 0;;
+    -p*=* | --p*=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
+    -e*=* | --e*=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
+    -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
+    -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift;;
+    -p* | --p*) prefix="$2"; shift; shift;;
+    -e* | --e*) exec_prefix="$2"; shift; shift;;
+    -l* | --l*) libdir="$2"; shift; shift;;
+    -i* | --i*) includedir="$2"; shift; shift;;
+    -s* | --s*) shared=1; shift;;
+    *) echo "unknown option: $1"; echo "$0 --help for help"; exit 1;;
+    esac
+done
+
+test=ztest$$
+cat > $test.c <<EOF
+extern int getchar();
+int hello() {return getchar();}
+EOF
+
+test -z "$CC" && echo Checking for gcc...
+cc=${CC-gcc}
+cflags=${CFLAGS-"-O3"}
+# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
+case "$cc" in
+  *gcc*) gcc=1;;
+esac
+
+if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
+  CC="$cc"
+  SFLAGS=${CFLAGS-"-fPIC -O3"}
+  CFLAGS="$cflags"
+  case `(uname -s || echo unknown) 2>/dev/null` in
+  Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
+  CYGWIN* | Cygwin* | cygwin* | OS/2* )
+             EXE='.exe';;
+  QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
+         # (alain.bonnefoy@icbt.com)
+                 LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"};;
+  HP-UX*)
+         LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}
+         case `(uname -m || echo unknown) 2>/dev/null` in
+         ia64)
+                 shared_ext='.so'
+                 SHAREDLIB='libz.so';;
+         *)
+                 shared_ext='.sl'
+                 SHAREDLIB='libz.sl';;
+         esac;;
+  Darwin*)   shared_ext='.dylib'
+             SHAREDLIB=libz$shared_ext
+             SHAREDLIBV=libz.$VER$shared_ext
+             SHAREDLIBM=libz.$VER1$shared_ext
+             LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};;
+  *)             LDSHARED=${LDSHARED-"$cc -shared"};;
+  esac
+else
+  # find system name and corresponding cc options
+  CC=${CC-cc}
+  case `(uname -sr || echo unknown) 2>/dev/null` in
+  HP-UX*)    SFLAGS=${CFLAGS-"-O +z"}
+             CFLAGS=${CFLAGS-"-O"}
+#            LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"}
+             LDSHARED=${LDSHARED-"ld -b"}
+         case `(uname -m || echo unknown) 2>/dev/null` in
+         ia64)
+             shared_ext='.so'
+             SHAREDLIB='libz.so';;
+         *)
+             shared_ext='.sl'
+             SHAREDLIB='libz.sl';;
+         esac;;
+  IRIX*)     SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."}
+             CFLAGS=${CFLAGS-"-ansi -O2"}
+             LDSHARED=${LDSHARED-"cc -shared"};;
+  OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"}
+             CFLAGS=${CFLAGS-"-O -std1"}
+             LDSHARED=${LDSHARED-"cc -shared  -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"};;
+  OSF1*)     SFLAGS=${CFLAGS-"-O -std1"}
+             CFLAGS=${CFLAGS-"-O -std1"}
+             LDSHARED=${LDSHARED-"cc -shared"};;
+  QNX*)      SFLAGS=${CFLAGS-"-4 -O"}
+             CFLAGS=${CFLAGS-"-4 -O"}
+             LDSHARED=${LDSHARED-"cc"}
+             RANLIB=${RANLIB-"true"}
+             AR="cc -A";;
+  SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "}
+             CFLAGS=${CFLAGS-"-O3"}
+             LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};;
+  SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."}
+             CFLAGS=${CFLAGS-"-fast -xcg89"}
+             LDSHARED=${LDSHARED-"cc -G"};;
+  SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
+             CFLAGS=${CFLAGS-"-O2"}
+             LDSHARED=${LDSHARED-"ld"};;
+  SunStudio\ 9*) SFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"}
+             CFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xtarget=ultra3 -xarch=v9b"}
+             LDSHARED=${LDSHARED-"cc -xarch=v9b"};;
+  UNIX_System_V\ 4.2.0)
+             SFLAGS=${CFLAGS-"-KPIC -O"}
+             CFLAGS=${CFLAGS-"-O"}
+             LDSHARED=${LDSHARED-"cc -G"};;
+  UNIX_SV\ 4.2MP)
+             SFLAGS=${CFLAGS-"-Kconform_pic -O"}
+             CFLAGS=${CFLAGS-"-O"}
+             LDSHARED=${LDSHARED-"cc -G"};;
+  OpenUNIX\ 5)
+             SFLAGS=${CFLAGS-"-KPIC -O"}
+             CFLAGS=${CFLAGS-"-O"}
+             LDSHARED=${LDSHARED-"cc -G"};;
+  AIX*)  # Courtesy of dbakker@arrayasolutions.com
+             SFLAGS=${CFLAGS-"-O -qmaxmem=8192"}
+             CFLAGS=${CFLAGS-"-O -qmaxmem=8192"}
+             LDSHARED=${LDSHARED-"xlc -G"};;
+  # send working options for other systems to support@gzip.org
+  *)         SFLAGS=${CFLAGS-"-O"}
+             CFLAGS=${CFLAGS-"-O"}
+             LDSHARED=${LDSHARED-"cc -shared"};;
+  esac
+fi
+
+SHAREDLIB=${SHAREDLIB-"libz$shared_ext"}
+SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"}
+SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"}
+
+if test $shared -eq 1; then
+  echo Checking for shared library support...
+  # we must test in two steps (cc then ld), required at least on SunOS 4.x
+  if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&
+     test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then
+    CFLAGS="$SFLAGS"
+    LIBS="$SHAREDLIBV"
+    echo Building shared library $SHAREDLIBV with $CC.
+  elif test -z "$old_cc" -a -z "$old_cflags"; then
+    echo No shared library support.
+    shared=0;
+  else
+    echo 'No shared library support; try without defining CC and CFLAGS'
+    shared=0;
+  fi
+fi
+if test $shared -eq 0; then
+  LDSHARED="$CC"
+  echo Building static library $LIBS version $VER with $CC.
+else
+  LDFLAGS="-L. ${SHAREDLIBV}"
+fi
+
+cat > $test.c <<EOF
+#include <unistd.h>
+int main() { return 0; }
+EOF
+if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
+  sed < zconf.in.h "/HAVE_UNISTD_H/s%0%1%" > zconf.h
+  echo "Checking for unistd.h... Yes."
+else
+  cp -p zconf.in.h zconf.h
+  echo "Checking for unistd.h... No."
+fi
+
+cat > $test.c <<EOF
+#include <stdio.h>
+#include <stdarg.h>
+#include "zconf.h"
+
+int main()
+{
+#ifndef STDC
+  choke me
+#endif
+
+  return 0;
+}
+EOF
+
+if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
+  echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()"
+
+  cat > $test.c <<EOF
+#include <stdio.h>
+#include <stdarg.h>
+
+int mytest(char *fmt, ...)
+{
+  char buf[20];
+  va_list ap;
+
+  va_start(ap, fmt);
+  vsnprintf(buf, sizeof(buf), fmt, ap);
+  va_end(ap);
+  return 0;
+}
+
+int main()
+{
+  return (mytest("Hello%d\n", 1));
+}
+EOF
+
+  if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then
+    echo "Checking for vsnprintf() in stdio.h... Yes."
+
+    cat >$test.c <<EOF
+#include <stdio.h>
+#include <stdarg.h>
+
+int mytest(char *fmt, ...)
+{
+  int n;
+  char buf[20];
+  va_list ap;
+
+  va_start(ap, fmt);
+  n = vsnprintf(buf, sizeof(buf), fmt, ap);
+  va_end(ap);
+  return n;
+}
+
+int main()
+{
+  return (mytest("Hello%d\n", 1));
+}
+EOF
+
+    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
+      echo "Checking for return value of vsnprintf()... Yes."
+    else
+      CFLAGS="$CFLAGS -DHAS_vsnprintf_void"
+      echo "Checking for return value of vsnprintf()... No."
+      echo "  WARNING: apparently vsnprintf() does not return a value. zlib"
+      echo "  can build but will be open to possible string-format security"
+      echo "  vulnerabilities."
+    fi
+  else
+    CFLAGS="$CFLAGS -DNO_vsnprintf"
+    echo "Checking for vsnprintf() in stdio.h... No."
+    echo "  WARNING: vsnprintf() not found, falling back to vsprintf(). zlib"
+    echo "  can build but will be open to possible buffer-overflow security"
+    echo "  vulnerabilities."
+
+    cat >$test.c <<EOF
+#include <stdio.h>
+#include <stdarg.h>
+
+int mytest(char *fmt, ...)
+{
+  int n;
+  char buf[20];
+  va_list ap;
+
+  va_start(ap, fmt);
+  n = vsprintf(buf, fmt, ap);
+  va_end(ap);
+  return n;
+}
+
+int main()
+{
+  return (mytest("Hello%d\n", 1));
+}
+EOF
+
+    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
+      echo "Checking for return value of vsprintf()... Yes."
+    else
+      CFLAGS="$CFLAGS -DHAS_vsprintf_void"
+      echo "Checking for return value of vsprintf()... No."
+      echo "  WARNING: apparently vsprintf() does not return a value. zlib"
+      echo "  can build but will be open to possible string-format security"
+      echo "  vulnerabilities."
+    fi
+  fi
+else
+  echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()"
+
+  cat >$test.c <<EOF
+#include <stdio.h>
+
+int mytest()
+{
+  char buf[20];
+
+  snprintf(buf, sizeof(buf), "%s", "foo");
+  return 0;
+}
+
+int main()
+{
+  return (mytest());
+}
+EOF
+
+  if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then
+    echo "Checking for snprintf() in stdio.h... Yes."
+
+    cat >$test.c <<EOF
+#include <stdio.h>
+
+int mytest()
+{
+  char buf[20];
+
+  return snprintf(buf, sizeof(buf), "%s", "foo");
+}
+
+int main()
+{
+  return (mytest());
+}
+EOF
+
+    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
+      echo "Checking for return value of snprintf()... Yes."
+    else
+      CFLAGS="$CFLAGS -DHAS_snprintf_void"
+      echo "Checking for return value of snprintf()... No."
+      echo "  WARNING: apparently snprintf() does not return a value. zlib"
+      echo "  can build but will be open to possible string-format security"
+      echo "  vulnerabilities."
+    fi
+  else
+    CFLAGS="$CFLAGS -DNO_snprintf"
+    echo "Checking for snprintf() in stdio.h... No."
+    echo "  WARNING: snprintf() not found, falling back to sprintf(). zlib"
+    echo "  can build but will be open to possible buffer-overflow security"
+    echo "  vulnerabilities."
+
+    cat >$test.c <<EOF
+#include <stdio.h>
+
+int mytest()
+{
+  char buf[20];
+
+  return sprintf(buf, "%s", "foo");
+}
+
+int main()
+{
+  return (mytest());
+}
+EOF
+
+    if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
+      echo "Checking for return value of sprintf()... Yes."
+    else
+      CFLAGS="$CFLAGS -DHAS_sprintf_void"
+      echo "Checking for return value of sprintf()... No."
+      echo "  WARNING: apparently sprintf() does not return a value. zlib"
+      echo "  can build but will be open to possible string-format security"
+      echo "  vulnerabilities."
+    fi
+  fi
+fi
+
+cat >$test.c <<EOF
+#include <errno.h>
+int main() { return 0; }
+EOF
+if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
+  echo "Checking for errno.h... Yes."
+else
+  echo "Checking for errno.h... No."
+  CFLAGS="$CFLAGS -DNO_ERRNO_H"
+fi
+
+cat > $test.c <<EOF
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+caddr_t hello() {
+  return mmap((caddr_t)0, (off_t)0, PROT_READ, MAP_SHARED, 0, (off_t)0);
+}
+EOF
+if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
+  CFLAGS="$CFLAGS -DUSE_MMAP"
+  echo Checking for mmap support... Yes.
+else
+  echo Checking for mmap support... No.
+fi
+
+CPP=${CPP-"$CC -E"}
+case $CFLAGS in
+  *ASMV*)
+    if test "`nm $test.o | grep _hello`" = ""; then
+      CPP="$CPP -DNO_UNDERLINE"
+      echo Checking for underline in external names... No.
+    else
+      echo Checking for underline in external names... Yes.
+    fi;;
+esac
+
+rm -f $test.[co] $test $test$shared_ext
+
+# udpate Makefile
+sed < Makefile.in "
+/^CC *=/s#=.*#=$CC#
+/^CFLAGS *=/s#=.*#=$CFLAGS#
+/^CPP *=/s#=.*#=$CPP#
+/^LDSHARED *=/s#=.*#=$LDSHARED#
+/^LIBS *=/s#=.*#=$LIBS#
+/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
+/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
+/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
+/^AR *=/s#=.*#=$AR#
+/^RANLIB *=/s#=.*#=$RANLIB#
+/^EXE *=/s#=.*#=$EXE#
+/^prefix *=/s#=.*#=$prefix#
+/^exec_prefix *=/s#=.*#=$exec_prefix#
+/^libdir *=/s#=.*#=$libdir#
+/^includedir *=/s#=.*#=$includedir#
+/^mandir *=/s#=.*#=$mandir#
+/^LDFLAGS *=/s#=.*#=$LDFLAGS#
+" > Makefile
diff --git a/utils/zenutils/libraries/zlib123/zlib/crc32.c b/utils/zenutils/libraries/zlib123/zlib/crc32.c
index 32814c20c8..f658a9ef55 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/crc32.c
+++ b/utils/zenutils/libraries/zlib123/zlib/crc32.c
@@ -1,423 +1,423 @@
-/* crc32.c -- compute the CRC-32 of a data stream

- * Copyright (C) 1995-2005 Mark Adler

- * For conditions of distribution and use, see copyright notice in zlib.h

- *

- * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster

- * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing

- * tables for updating the shift register in one step with three exclusive-ors

- * instead of four steps with four exclusive-ors.  This results in about a

- * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.

- */

-

-/* @(#) $Id$ */

-

-/*

-  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore

-  protection on the static variables used to control the first-use generation

-  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should

-  first call get_crc_table() to initialize the tables before allowing more than

-  one thread to use crc32().

- */

-

-#ifdef MAKECRCH

-#  include <stdio.h>

-#  ifndef DYNAMIC_CRC_TABLE

-#    define DYNAMIC_CRC_TABLE

-#  endif /* !DYNAMIC_CRC_TABLE */

-#endif /* MAKECRCH */

-

-#include "zutil.h"      /* for STDC and FAR definitions */

-

-#define local static

-

-/* Find a four-byte integer type for crc32_little() and crc32_big(). */

-#ifndef NOBYFOUR

-#  ifdef STDC           /* need ANSI C limits.h to determine sizes */

-#    include <limits.h>

-#    define BYFOUR

-#    if (UINT_MAX == 0xffffffffUL)

-       typedef unsigned int u4;

-#    else

-#      if (ULONG_MAX == 0xffffffffUL)

-         typedef unsigned long u4;

-#      else

-#        if (USHRT_MAX == 0xffffffffUL)

-           typedef unsigned short u4;

-#        else

-#          undef BYFOUR     /* can't find a four-byte integer type! */

-#        endif

-#      endif

-#    endif

-#  endif /* STDC */

-#endif /* !NOBYFOUR */

-

-/* Definitions for doing the crc four data bytes at a time. */

-#ifdef BYFOUR

-#  define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \

-                (((w)&0xff00)<<8)+(((w)&0xff)<<24))

-   local unsigned long crc32_little OF((unsigned long,

-                        const unsigned char FAR *, unsigned));

-   local unsigned long crc32_big OF((unsigned long,

-                        const unsigned char FAR *, unsigned));

-#  define TBLS 8

-#else

-#  define TBLS 1

-#endif /* BYFOUR */

-

-/* Local functions for crc concatenation */

-local unsigned long gf2_matrix_times OF((unsigned long *mat,

-                                         unsigned long vec));

-local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));

-

-#ifdef DYNAMIC_CRC_TABLE

-

-local volatile int crc_table_empty = 1;

-local unsigned long FAR crc_table[TBLS][256];

-local void make_crc_table OF((void));

-#ifdef MAKECRCH

-   local void write_table OF((FILE *, const unsigned long FAR *));

-#endif /* MAKECRCH */

-/*

-  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:

-  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.

-

-  Polynomials over GF(2) are represented in binary, one bit per coefficient,

-  with the lowest powers in the most significant bit.  Then adding polynomials

-  is just exclusive-or, and multiplying a polynomial by x is a right shift by

-  one.  If we call the above polynomial p, and represent a byte as the

-  polynomial q, also with the lowest power in the most significant bit (so the

-  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,

-  where a mod b means the remainder after dividing a by b.

-

-  This calculation is done using the shift-register method of multiplying and

-  taking the remainder.  The register is initialized to zero, and for each

-  incoming bit, x^32 is added mod p to the register if the bit is a one (where

-  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by

-  x (which is shifting right by one and adding x^32 mod p if the bit shifted

-  out is a one).  We start with the highest power (least significant bit) of

-  q and repeat for all eight bits of q.

-

-  The first table is simply the CRC of all possible eight bit values.  This is

-  all the information needed to generate CRCs on data a byte at a time for all

-  combinations of CRC register values and incoming bytes.  The remaining tables

-  allow for word-at-a-time CRC calculation for both big-endian and little-

-  endian machines, where a word is four bytes.

-*/

-local void make_crc_table()

-{

-    unsigned long c;

-    int n, k;

-    unsigned long poly;                 /* polynomial exclusive-or pattern */

-    /* terms of polynomial defining this crc (except x^32): */

-    static volatile int first = 1;      /* flag to limit concurrent making */

-    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};

-

-    /* See if another task is already doing this (not thread-safe, but better

-       than nothing -- significantly reduces duration of vulnerability in

-       case the advice about DYNAMIC_CRC_TABLE is ignored) */

-    if (first) {

-        first = 0;

-

-        /* make exclusive-or pattern from polynomial (0xedb88320UL) */

-        poly = 0UL;

-        for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)

-            poly |= 1UL << (31 - p[n]);

-

-        /* generate a crc for every 8-bit value */

-        for (n = 0; n < 256; n++) {

-            c = (unsigned long)n;

-            for (k = 0; k < 8; k++)

-                c = c & 1 ? poly ^ (c >> 1) : c >> 1;

-            crc_table[0][n] = c;

-        }

-

-#ifdef BYFOUR

-        /* generate crc for each value followed by one, two, and three zeros,

-           and then the byte reversal of those as well as the first table */

-        for (n = 0; n < 256; n++) {

-            c = crc_table[0][n];

-            crc_table[4][n] = REV(c);

-            for (k = 1; k < 4; k++) {

-                c = crc_table[0][c & 0xff] ^ (c >> 8);

-                crc_table[k][n] = c;

-                crc_table[k + 4][n] = REV(c);

-            }

-        }

-#endif /* BYFOUR */

-

-        crc_table_empty = 0;

-    }

-    else {      /* not first */

-        /* wait for the other guy to finish (not efficient, but rare) */

-        while (crc_table_empty)

-            ;

-    }

-

-#ifdef MAKECRCH

-    /* write out CRC tables to crc32.h */

-    {

-        FILE *out;

-

-        out = fopen("crc32.h", "w");

-        if (out == NULL) return;

-        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");

-        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");

-        fprintf(out, "local const unsigned long FAR ");

-        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");

-        write_table(out, crc_table[0]);

-#  ifdef BYFOUR

-        fprintf(out, "#ifdef BYFOUR\n");

-        for (k = 1; k < 8; k++) {

-            fprintf(out, "  },\n  {\n");

-            write_table(out, crc_table[k]);

-        }

-        fprintf(out, "#endif\n");

-#  endif /* BYFOUR */

-        fprintf(out, "  }\n};\n");

-        fclose(out);

-    }

-#endif /* MAKECRCH */

-}

-

-#ifdef MAKECRCH

-local void write_table(out, table)

-    FILE *out;

-    const unsigned long FAR *table;

-{

-    int n;

-

-    for (n = 0; n < 256; n++)

-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ", table[n],

-                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));

-}

-#endif /* MAKECRCH */

-

-#else /* !DYNAMIC_CRC_TABLE */

-/* ========================================================================

- * Tables of CRC-32s of all single-byte values, made by make_crc_table().

- */

-#include "crc32.h"

-#endif /* DYNAMIC_CRC_TABLE */

-

-/* =========================================================================

- * This function can be used by asm versions of crc32()

- */

-const unsigned long FAR * ZEXPORT get_crc_table()

-{

-#ifdef DYNAMIC_CRC_TABLE

-    if (crc_table_empty)

-        make_crc_table();

-#endif /* DYNAMIC_CRC_TABLE */

-    return (const unsigned long FAR *)crc_table;

-}

-

-/* ========================================================================= */

-#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)

-#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1

-

-/* ========================================================================= */

-unsigned long ZEXPORT crc32(crc, buf, len)

-    unsigned long crc;

-    const unsigned char FAR *buf;

-    unsigned len;

-{

-    if (buf == Z_NULL) return 0UL;

-

-#ifdef DYNAMIC_CRC_TABLE

-    if (crc_table_empty)

-        make_crc_table();

-#endif /* DYNAMIC_CRC_TABLE */

-

-#ifdef BYFOUR

-    if (sizeof(void *) == sizeof(ptrdiff_t)) {

-        u4 endian;

-

-        endian = 1;

-        if (*((unsigned char *)(&endian)))

-            return crc32_little(crc, buf, len);

-        else

-            return crc32_big(crc, buf, len);

-    }

-#endif /* BYFOUR */

-    crc = crc ^ 0xffffffffUL;

-    while (len >= 8) {

-        DO8;

-        len -= 8;

-    }

-    if (len) do {

-        DO1;

-    } while (--len);

-    return crc ^ 0xffffffffUL;

-}

-

-#ifdef BYFOUR

-

-/* ========================================================================= */

-#define DOLIT4 c ^= *buf4++; \

-        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \

-            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]

-#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4

-

-/* ========================================================================= */

-local unsigned long crc32_little(crc, buf, len)

-    unsigned long crc;

-    const unsigned char FAR *buf;

-    unsigned len;

-{

-    register u4 c;

-    register const u4 FAR *buf4;

-

-    c = (u4)crc;

-    c = ~c;

-    while (len && ((ptrdiff_t)buf & 3)) {

-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);

-        len--;

-    }

-

-    buf4 = (const u4 FAR *)(const void FAR *)buf;

-    while (len >= 32) {

-        DOLIT32;

-        len -= 32;

-    }

-    while (len >= 4) {

-        DOLIT4;

-        len -= 4;

-    }

-    buf = (const unsigned char FAR *)buf4;

-

-    if (len) do {

-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);

-    } while (--len);

-    c = ~c;

-    return (unsigned long)c;

-}

-

-/* ========================================================================= */

-#define DOBIG4 c ^= *++buf4; \

-        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \

-            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]

-#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4

-

-/* ========================================================================= */

-local unsigned long crc32_big(crc, buf, len)

-    unsigned long crc;

-    const unsigned char FAR *buf;

-    unsigned len;

-{

-    register u4 c;

-    register const u4 FAR *buf4;

-

-    c = REV((u4)crc);

-    c = ~c;

-    while (len && ((ptrdiff_t)buf & 3)) {

-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);

-        len--;

-    }

-

-    buf4 = (const u4 FAR *)(const void FAR *)buf;

-    buf4--;

-    while (len >= 32) {

-        DOBIG32;

-        len -= 32;

-    }

-    while (len >= 4) {

-        DOBIG4;

-        len -= 4;

-    }

-    buf4++;

-    buf = (const unsigned char FAR *)buf4;

-

-    if (len) do {

-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);

-    } while (--len);

-    c = ~c;

-    return (unsigned long)(REV(c));

-}

-

-#endif /* BYFOUR */

-

-#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */

-

-/* ========================================================================= */

-local unsigned long gf2_matrix_times(mat, vec)

-    unsigned long *mat;

-    unsigned long vec;

-{

-    unsigned long sum;

-

-    sum = 0;

-    while (vec) {

-        if (vec & 1)

-            sum ^= *mat;

-        vec >>= 1;

-        mat++;

-    }

-    return sum;

-}

-

-/* ========================================================================= */

-local void gf2_matrix_square(square, mat)

-    unsigned long *square;

-    unsigned long *mat;

-{

-    int n;

-

-    for (n = 0; n < GF2_DIM; n++)

-        square[n] = gf2_matrix_times(mat, mat[n]);

-}

-

-/* ========================================================================= */

-uLong ZEXPORT crc32_combine(crc1, crc2, len2)

-    uLong crc1;

-    uLong crc2;

-    z_off_t len2;

-{

-    int n;

-    unsigned long row;

-    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */

-    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */

-

-    /* degenerate case */

-    if (len2 == 0)

-        return crc1;

-

-    /* put operator for one zero bit in odd */

-    odd[0] = 0xedb88320L;           /* CRC-32 polynomial */

-    row = 1;

-    for (n = 1; n < GF2_DIM; n++) {

-        odd[n] = row;

-        row <<= 1;

-    }

-

-    /* put operator for two zero bits in even */

-    gf2_matrix_square(even, odd);

-

-    /* put operator for four zero bits in odd */

-    gf2_matrix_square(odd, even);

-

-    /* apply len2 zeros to crc1 (first square will put the operator for one

-       zero byte, eight zero bits, in even) */

-    do {

-        /* apply zeros operator for this bit of len2 */

-        gf2_matrix_square(even, odd);

-        if (len2 & 1)

-            crc1 = gf2_matrix_times(even, crc1);

-        len2 >>= 1;

-

-        /* if no more bits set, then done */

-        if (len2 == 0)

-            break;

-

-        /* another iteration of the loop with odd and even swapped */

-        gf2_matrix_square(odd, even);

-        if (len2 & 1)

-            crc1 = gf2_matrix_times(odd, crc1);

-        len2 >>= 1;

-

-        /* if no more bits set, then done */

-    } while (len2 != 0);

-

-    /* return combined crc */

-    crc1 ^= crc2;

-    return crc1;

-}

+/* crc32.c -- compute the CRC-32 of a data stream
+ * Copyright (C) 1995-2005 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
+ * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
+ * tables for updating the shift register in one step with three exclusive-ors
+ * instead of four steps with four exclusive-ors.  This results in about a
+ * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
+ */
+
+/* @(#) $Id$ */
+
+/*
+  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
+  protection on the static variables used to control the first-use generation
+  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
+  first call get_crc_table() to initialize the tables before allowing more than
+  one thread to use crc32().
+ */
+
+#ifdef MAKECRCH
+#  include <stdio.h>
+#  ifndef DYNAMIC_CRC_TABLE
+#    define DYNAMIC_CRC_TABLE
+#  endif /* !DYNAMIC_CRC_TABLE */
+#endif /* MAKECRCH */
+
+#include "zutil.h"      /* for STDC and FAR definitions */
+
+#define local static
+
+/* Find a four-byte integer type for crc32_little() and crc32_big(). */
+#ifndef NOBYFOUR
+#  ifdef STDC           /* need ANSI C limits.h to determine sizes */
+#    include <limits.h>
+#    define BYFOUR
+#    if (UINT_MAX == 0xffffffffUL)
+       typedef unsigned int u4;
+#    else
+#      if (ULONG_MAX == 0xffffffffUL)
+         typedef unsigned long u4;
+#      else
+#        if (USHRT_MAX == 0xffffffffUL)
+           typedef unsigned short u4;
+#        else
+#          undef BYFOUR     /* can't find a four-byte integer type! */
+#        endif
+#      endif
+#    endif
+#  endif /* STDC */
+#endif /* !NOBYFOUR */
+
+/* Definitions for doing the crc four data bytes at a time. */
+#ifdef BYFOUR
+#  define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \
+                (((w)&0xff00)<<8)+(((w)&0xff)<<24))
+   local unsigned long crc32_little OF((unsigned long,
+                        const unsigned char FAR *, unsigned));
+   local unsigned long crc32_big OF((unsigned long,
+                        const unsigned char FAR *, unsigned));
+#  define TBLS 8
+#else
+#  define TBLS 1
+#endif /* BYFOUR */
+
+/* Local functions for crc concatenation */
+local unsigned long gf2_matrix_times OF((unsigned long *mat,
+                                         unsigned long vec));
+local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
+
+#ifdef DYNAMIC_CRC_TABLE
+
+local volatile int crc_table_empty = 1;
+local unsigned long FAR crc_table[TBLS][256];
+local void make_crc_table OF((void));
+#ifdef MAKECRCH
+   local void write_table OF((FILE *, const unsigned long FAR *));
+#endif /* MAKECRCH */
+/*
+  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
+  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
+
+  Polynomials over GF(2) are represented in binary, one bit per coefficient,
+  with the lowest powers in the most significant bit.  Then adding polynomials
+  is just exclusive-or, and multiplying a polynomial by x is a right shift by
+  one.  If we call the above polynomial p, and represent a byte as the
+  polynomial q, also with the lowest power in the most significant bit (so the
+  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
+  where a mod b means the remainder after dividing a by b.
+
+  This calculation is done using the shift-register method of multiplying and
+  taking the remainder.  The register is initialized to zero, and for each
+  incoming bit, x^32 is added mod p to the register if the bit is a one (where
+  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
+  x (which is shifting right by one and adding x^32 mod p if the bit shifted
+  out is a one).  We start with the highest power (least significant bit) of
+  q and repeat for all eight bits of q.
+
+  The first table is simply the CRC of all possible eight bit values.  This is
+  all the information needed to generate CRCs on data a byte at a time for all
+  combinations of CRC register values and incoming bytes.  The remaining tables
+  allow for word-at-a-time CRC calculation for both big-endian and little-
+  endian machines, where a word is four bytes.
+*/
+local void make_crc_table()
+{
+    unsigned long c;
+    int n, k;
+    unsigned long poly;                 /* polynomial exclusive-or pattern */
+    /* terms of polynomial defining this crc (except x^32): */
+    static volatile int first = 1;      /* flag to limit concurrent making */
+    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
+
+    /* See if another task is already doing this (not thread-safe, but better
+       than nothing -- significantly reduces duration of vulnerability in
+       case the advice about DYNAMIC_CRC_TABLE is ignored) */
+    if (first) {
+        first = 0;
+
+        /* make exclusive-or pattern from polynomial (0xedb88320UL) */
+        poly = 0UL;
+        for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)
+            poly |= 1UL << (31 - p[n]);
+
+        /* generate a crc for every 8-bit value */
+        for (n = 0; n < 256; n++) {
+            c = (unsigned long)n;
+            for (k = 0; k < 8; k++)
+                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
+            crc_table[0][n] = c;
+        }
+
+#ifdef BYFOUR
+        /* generate crc for each value followed by one, two, and three zeros,
+           and then the byte reversal of those as well as the first table */
+        for (n = 0; n < 256; n++) {
+            c = crc_table[0][n];
+            crc_table[4][n] = REV(c);
+            for (k = 1; k < 4; k++) {
+                c = crc_table[0][c & 0xff] ^ (c >> 8);
+                crc_table[k][n] = c;
+                crc_table[k + 4][n] = REV(c);
+            }
+        }
+#endif /* BYFOUR */
+
+        crc_table_empty = 0;
+    }
+    else {      /* not first */
+        /* wait for the other guy to finish (not efficient, but rare) */
+        while (crc_table_empty)
+            ;
+    }
+
+#ifdef MAKECRCH
+    /* write out CRC tables to crc32.h */
+    {
+        FILE *out;
+
+        out = fopen("crc32.h", "w");
+        if (out == NULL) return;
+        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
+        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
+        fprintf(out, "local const unsigned long FAR ");
+        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
+        write_table(out, crc_table[0]);
+#  ifdef BYFOUR
+        fprintf(out, "#ifdef BYFOUR\n");
+        for (k = 1; k < 8; k++) {
+            fprintf(out, "  },\n  {\n");
+            write_table(out, crc_table[k]);
+        }
+        fprintf(out, "#endif\n");
+#  endif /* BYFOUR */
+        fprintf(out, "  }\n};\n");
+        fclose(out);
+    }
+#endif /* MAKECRCH */
+}
+
+#ifdef MAKECRCH
+local void write_table(out, table)
+    FILE *out;
+    const unsigned long FAR *table;
+{
+    int n;
+
+    for (n = 0; n < 256; n++)
+        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ", table[n],
+                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
+}
+#endif /* MAKECRCH */
+
+#else /* !DYNAMIC_CRC_TABLE */
+/* ========================================================================
+ * Tables of CRC-32s of all single-byte values, made by make_crc_table().
+ */
+#include "crc32.h"
+#endif /* DYNAMIC_CRC_TABLE */
+
+/* =========================================================================
+ * This function can be used by asm versions of crc32()
+ */
+const unsigned long FAR * ZEXPORT get_crc_table()
+{
+#ifdef DYNAMIC_CRC_TABLE
+    if (crc_table_empty)
+        make_crc_table();
+#endif /* DYNAMIC_CRC_TABLE */
+    return (const unsigned long FAR *)crc_table;
+}
+
+/* ========================================================================= */
+#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
+#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+
+/* ========================================================================= */
+unsigned long ZEXPORT crc32(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    unsigned len;
+{
+    if (buf == Z_NULL) return 0UL;
+
+#ifdef DYNAMIC_CRC_TABLE
+    if (crc_table_empty)
+        make_crc_table();
+#endif /* DYNAMIC_CRC_TABLE */
+
+#ifdef BYFOUR
+    if (sizeof(void *) == sizeof(ptrdiff_t)) {
+        u4 endian;
+
+        endian = 1;
+        if (*((unsigned char *)(&endian)))
+            return crc32_little(crc, buf, len);
+        else
+            return crc32_big(crc, buf, len);
+    }
+#endif /* BYFOUR */
+    crc = crc ^ 0xffffffffUL;
+    while (len >= 8) {
+        DO8;
+        len -= 8;
+    }
+    if (len) do {
+        DO1;
+    } while (--len);
+    return crc ^ 0xffffffffUL;
+}
+
+#ifdef BYFOUR
+
+/* ========================================================================= */
+#define DOLIT4 c ^= *buf4++; \
+        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
+            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
+#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
+
+/* ========================================================================= */
+local unsigned long crc32_little(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    unsigned len;
+{
+    register u4 c;
+    register const u4 FAR *buf4;
+
+    c = (u4)crc;
+    c = ~c;
+    while (len && ((ptrdiff_t)buf & 3)) {
+        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
+        len--;
+    }
+
+    buf4 = (const u4 FAR *)(const void FAR *)buf;
+    while (len >= 32) {
+        DOLIT32;
+        len -= 32;
+    }
+    while (len >= 4) {
+        DOLIT4;
+        len -= 4;
+    }
+    buf = (const unsigned char FAR *)buf4;
+
+    if (len) do {
+        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
+    } while (--len);
+    c = ~c;
+    return (unsigned long)c;
+}
+
+/* ========================================================================= */
+#define DOBIG4 c ^= *++buf4; \
+        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
+            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
+#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
+
+/* ========================================================================= */
+local unsigned long crc32_big(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    unsigned len;
+{
+    register u4 c;
+    register const u4 FAR *buf4;
+
+    c = REV((u4)crc);
+    c = ~c;
+    while (len && ((ptrdiff_t)buf & 3)) {
+        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
+        len--;
+    }
+
+    buf4 = (const u4 FAR *)(const void FAR *)buf;
+    buf4--;
+    while (len >= 32) {
+        DOBIG32;
+        len -= 32;
+    }
+    while (len >= 4) {
+        DOBIG4;
+        len -= 4;
+    }
+    buf4++;
+    buf = (const unsigned char FAR *)buf4;
+
+    if (len) do {
+        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
+    } while (--len);
+    c = ~c;
+    return (unsigned long)(REV(c));
+}
+
+#endif /* BYFOUR */
+
+#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
+
+/* ========================================================================= */
+local unsigned long gf2_matrix_times(mat, vec)
+    unsigned long *mat;
+    unsigned long vec;
+{
+    unsigned long sum;
+
+    sum = 0;
+    while (vec) {
+        if (vec & 1)
+            sum ^= *mat;
+        vec >>= 1;
+        mat++;
+    }
+    return sum;
+}
+
+/* ========================================================================= */
+local void gf2_matrix_square(square, mat)
+    unsigned long *square;
+    unsigned long *mat;
+{
+    int n;
+
+    for (n = 0; n < GF2_DIM; n++)
+        square[n] = gf2_matrix_times(mat, mat[n]);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off_t len2;
+{
+    int n;
+    unsigned long row;
+    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
+    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
+
+    /* degenerate case */
+    if (len2 == 0)
+        return crc1;
+
+    /* put operator for one zero bit in odd */
+    odd[0] = 0xedb88320L;           /* CRC-32 polynomial */
+    row = 1;
+    for (n = 1; n < GF2_DIM; n++) {
+        odd[n] = row;
+        row <<= 1;
+    }
+
+    /* put operator for two zero bits in even */
+    gf2_matrix_square(even, odd);
+
+    /* put operator for four zero bits in odd */
+    gf2_matrix_square(odd, even);
+
+    /* apply len2 zeros to crc1 (first square will put the operator for one
+       zero byte, eight zero bits, in even) */
+    do {
+        /* apply zeros operator for this bit of len2 */
+        gf2_matrix_square(even, odd);
+        if (len2 & 1)
+            crc1 = gf2_matrix_times(even, crc1);
+        len2 >>= 1;
+
+        /* if no more bits set, then done */
+        if (len2 == 0)
+            break;
+
+        /* another iteration of the loop with odd and even swapped */
+        gf2_matrix_square(odd, even);
+        if (len2 & 1)
+            crc1 = gf2_matrix_times(odd, crc1);
+        len2 >>= 1;
+
+        /* if no more bits set, then done */
+    } while (len2 != 0);
+
+    /* return combined crc */
+    crc1 ^= crc2;
+    return crc1;
+}
diff --git a/utils/zenutils/libraries/zlib123/zlib/crc32.h b/utils/zenutils/libraries/zlib123/zlib/crc32.h
index 5de49bc978..8053b6117c 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/crc32.h
+++ b/utils/zenutils/libraries/zlib123/zlib/crc32.h
@@ -1,441 +1,441 @@
-/* crc32.h -- tables for rapid CRC calculation

- * Generated automatically by crc32.c

- */

-

-local const unsigned long FAR crc_table[TBLS][256] =

-{

-  {

-    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,

-    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,

-    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,

-    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,

-    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,

-    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,

-    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,

-    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,

-    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,

-    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,

-    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,

-    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,

-    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,

-    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,

-    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,

-    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,

-    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,

-    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,

-    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,

-    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,

-    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,

-    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,

-    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,

-    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,

-    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,

-    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,

-    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,

-    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,

-    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,

-    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,

-    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,

-    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,

-    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,

-    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,

-    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,

-    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,

-    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,

-    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,

-    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,

-    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,

-    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,

-    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,

-    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,

-    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,

-    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,

-    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,

-    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,

-    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,

-    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,

-    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,

-    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,

-    0x2d02ef8dUL

-#ifdef BYFOUR

-  },

-  {

-    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,

-    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,

-    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,

-    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,

-    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,

-    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,

-    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,

-    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,

-    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,

-    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,

-    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,

-    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,

-    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,

-    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,

-    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,

-    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,

-    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,

-    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,

-    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,

-    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,

-    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,

-    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,

-    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,

-    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,

-    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,

-    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,

-    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,

-    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,

-    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,

-    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,

-    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,

-    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,

-    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,

-    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,

-    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,

-    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,

-    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,

-    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,

-    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,

-    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,

-    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,

-    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,

-    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,

-    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,

-    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,

-    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,

-    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,

-    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,

-    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,

-    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,

-    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,

-    0x9324fd72UL

-  },

-  {

-    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,

-    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,

-    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,

-    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,

-    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,

-    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,

-    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,

-    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,

-    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,

-    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,

-    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,

-    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,

-    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,

-    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,

-    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,

-    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,

-    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,

-    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,

-    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,

-    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,

-    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,

-    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,

-    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,

-    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,

-    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,

-    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,

-    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,

-    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,

-    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,

-    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,

-    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,

-    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,

-    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,

-    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,

-    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,

-    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,

-    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,

-    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,

-    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,

-    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,

-    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,

-    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,

-    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,

-    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,

-    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,

-    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,

-    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,

-    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,

-    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,

-    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,

-    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,

-    0xbe9834edUL

-  },

-  {

-    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,

-    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,

-    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,

-    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,

-    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,

-    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,

-    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,

-    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,

-    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,

-    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,

-    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,

-    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,

-    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,

-    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,

-    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,

-    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,

-    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,

-    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,

-    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,

-    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,

-    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,

-    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,

-    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,

-    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,

-    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,

-    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,

-    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,

-    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,

-    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,

-    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,

-    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,

-    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,

-    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,

-    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,

-    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,

-    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,

-    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,

-    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,

-    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,

-    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,

-    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,

-    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,

-    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,

-    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,

-    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,

-    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,

-    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,

-    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,

-    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,

-    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,

-    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,

-    0xde0506f1UL

-  },

-  {

-    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,

-    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,

-    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,

-    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,

-    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,

-    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,

-    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,

-    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,

-    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,

-    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,

-    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,

-    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,

-    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,

-    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,

-    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,

-    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,

-    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,

-    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,

-    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,

-    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,

-    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,

-    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,

-    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,

-    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,

-    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,

-    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,

-    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,

-    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,

-    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,

-    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,

-    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,

-    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,

-    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,

-    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,

-    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,

-    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,

-    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,

-    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,

-    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,

-    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,

-    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,

-    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,

-    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,

-    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,

-    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,

-    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,

-    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,

-    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,

-    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,

-    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,

-    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,

-    0x8def022dUL

-  },

-  {

-    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,

-    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,

-    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,

-    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,

-    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,

-    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,

-    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,

-    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,

-    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,

-    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,

-    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,

-    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,

-    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,

-    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,

-    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,

-    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,

-    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,

-    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,

-    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,

-    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,

-    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,

-    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,

-    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,

-    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,

-    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,

-    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,

-    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,

-    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,

-    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,

-    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,

-    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,

-    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,

-    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,

-    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,

-    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,

-    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,

-    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,

-    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,

-    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,

-    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,

-    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,

-    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,

-    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,

-    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,

-    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,

-    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,

-    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,

-    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,

-    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,

-    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,

-    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,

-    0x72fd2493UL

-  },

-  {

-    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,

-    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,

-    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,

-    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,

-    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,

-    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,

-    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,

-    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,

-    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,

-    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,

-    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,

-    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,

-    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,

-    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,

-    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,

-    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,

-    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,

-    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,

-    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,

-    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,

-    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,

-    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,

-    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,

-    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,

-    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,

-    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,

-    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,

-    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,

-    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,

-    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,

-    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,

-    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,

-    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,

-    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,

-    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,

-    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,

-    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,

-    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,

-    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,

-    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,

-    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,

-    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,

-    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,

-    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,

-    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,

-    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,

-    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,

-    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,

-    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,

-    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,

-    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,

-    0xed3498beUL

-  },

-  {

-    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,

-    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,

-    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,

-    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,

-    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,

-    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,

-    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,

-    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,

-    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,

-    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,

-    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,

-    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,

-    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,

-    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,

-    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,

-    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,

-    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,

-    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,

-    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,

-    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,

-    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,

-    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,

-    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,

-    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,

-    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,

-    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,

-    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,

-    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,

-    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,

-    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,

-    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,

-    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,

-    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,

-    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,

-    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,

-    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,

-    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,

-    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,

-    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,

-    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,

-    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,

-    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,

-    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,

-    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,

-    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,

-    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,

-    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,

-    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,

-    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,

-    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,

-    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,

-    0xf10605deUL

-#endif

-  }

-};

+/* crc32.h -- tables for rapid CRC calculation
+ * Generated automatically by crc32.c
+ */
+
+local const unsigned long FAR crc_table[TBLS][256] =
+{
+  {
+    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
+    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
+    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
+    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
+    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
+    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
+    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
+    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
+    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
+    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
+    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
+    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
+    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
+    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
+    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
+    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
+    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
+    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
+    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
+    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
+    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
+    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
+    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
+    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
+    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
+    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
+    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
+    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
+    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
+    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
+    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
+    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
+    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
+    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
+    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
+    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
+    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
+    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
+    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
+    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
+    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
+    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
+    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
+    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
+    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
+    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
+    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
+    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
+    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
+    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
+    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
+    0x2d02ef8dUL
+#ifdef BYFOUR
+  },
+  {
+    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
+    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
+    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
+    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
+    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
+    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
+    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
+    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
+    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
+    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
+    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
+    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
+    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
+    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
+    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
+    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
+    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
+    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
+    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
+    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
+    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
+    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
+    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
+    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
+    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
+    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
+    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
+    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
+    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
+    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
+    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
+    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
+    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
+    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
+    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
+    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
+    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
+    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
+    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
+    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
+    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
+    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
+    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
+    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
+    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
+    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
+    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
+    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
+    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
+    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
+    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
+    0x9324fd72UL
+  },
+  {
+    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
+    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
+    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
+    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
+    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
+    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
+    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
+    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
+    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
+    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
+    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
+    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
+    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
+    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
+    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
+    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
+    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
+    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
+    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
+    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
+    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
+    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
+    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
+    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
+    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
+    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
+    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
+    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
+    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
+    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
+    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
+    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
+    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
+    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
+    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
+    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
+    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
+    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
+    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
+    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
+    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
+    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
+    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
+    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
+    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
+    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
+    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
+    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
+    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
+    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
+    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
+    0xbe9834edUL
+  },
+  {
+    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
+    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
+    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
+    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
+    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
+    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
+    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
+    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
+    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
+    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
+    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
+    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
+    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
+    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
+    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
+    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
+    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
+    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
+    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
+    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
+    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
+    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
+    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
+    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
+    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
+    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
+    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
+    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
+    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
+    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
+    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
+    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
+    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
+    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
+    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
+    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
+    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
+    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
+    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
+    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
+    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
+    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
+    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
+    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
+    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
+    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
+    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
+    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
+    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
+    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
+    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
+    0xde0506f1UL
+  },
+  {
+    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
+    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
+    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
+    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
+    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
+    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
+    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
+    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
+    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
+    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
+    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
+    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
+    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
+    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
+    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
+    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
+    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
+    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
+    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
+    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
+    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
+    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
+    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
+    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
+    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
+    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
+    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
+    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
+    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
+    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
+    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
+    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
+    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
+    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
+    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
+    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
+    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
+    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
+    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
+    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
+    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
+    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
+    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
+    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
+    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
+    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
+    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
+    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
+    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
+    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
+    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
+    0x8def022dUL
+  },
+  {
+    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
+    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
+    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
+    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
+    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
+    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
+    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
+    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
+    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
+    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
+    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
+    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
+    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
+    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
+    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
+    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
+    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
+    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
+    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
+    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
+    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
+    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
+    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
+    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
+    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
+    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
+    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
+    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
+    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
+    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
+    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
+    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
+    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
+    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
+    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
+    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
+    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
+    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
+    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
+    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
+    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
+    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
+    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
+    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
+    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
+    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
+    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
+    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
+    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
+    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
+    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
+    0x72fd2493UL
+  },
+  {
+    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
+    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
+    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
+    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
+    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
+    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
+    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
+    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
+    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
+    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
+    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
+    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
+    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
+    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
+    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
+    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
+    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
+    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
+    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
+    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
+    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
+    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
+    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
+    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
+    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
+    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
+    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
+    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
+    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
+    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
+    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
+    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
+    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
+    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
+    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
+    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
+    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
+    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
+    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
+    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
+    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
+    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
+    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
+    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
+    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
+    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
+    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
+    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
+    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
+    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
+    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
+    0xed3498beUL
+  },
+  {
+    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
+    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
+    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
+    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
+    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
+    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
+    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
+    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
+    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
+    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
+    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
+    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
+    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
+    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
+    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
+    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
+    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
+    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
+    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
+    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
+    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
+    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
+    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
+    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
+    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
+    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
+    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
+    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
+    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
+    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
+    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
+    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
+    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
+    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
+    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
+    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
+    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
+    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
+    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
+    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
+    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
+    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
+    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
+    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
+    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
+    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
+    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
+    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
+    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
+    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
+    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
+    0xf10605deUL
+#endif
+  }
+};
diff --git a/utils/zenutils/libraries/zlib123/zlib/deflate.c b/utils/zenutils/libraries/zlib123/zlib/deflate.c
index 529f716b7a..29ce1f64a5 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/deflate.c
+++ b/utils/zenutils/libraries/zlib123/zlib/deflate.c
@@ -1,1736 +1,1736 @@
-/* deflate.c -- compress data using the deflation algorithm

- * Copyright (C) 1995-2005 Jean-loup Gailly.

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/*

- *  ALGORITHM

- *

- *      The "deflation" process depends on being able to identify portions

- *      of the input text which are identical to earlier input (within a

- *      sliding window trailing behind the input currently being processed).

- *

- *      The most straightforward technique turns out to be the fastest for

- *      most input files: try all possible matches and select the longest.

- *      The key feature of this algorithm is that insertions into the string

- *      dictionary are very simple and thus fast, and deletions are avoided

- *      completely. Insertions are performed at each input character, whereas

- *      string matches are performed only when the previous match ends. So it

- *      is preferable to spend more time in matches to allow very fast string

- *      insertions and avoid deletions. The matching algorithm for small

- *      strings is inspired from that of Rabin & Karp. A brute force approach

- *      is used to find longer strings when a small match has been found.

- *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze

- *      (by Leonid Broukhis).

- *         A previous version of this file used a more sophisticated algorithm

- *      (by Fiala and Greene) which is guaranteed to run in linear amortized

- *      time, but has a larger average cost, uses more memory and is patented.

- *      However the F&G algorithm may be faster for some highly redundant

- *      files if the parameter max_chain_length (described below) is too large.

- *

- *  ACKNOWLEDGEMENTS

- *

- *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and

- *      I found it in 'freeze' written by Leonid Broukhis.

- *      Thanks to many people for bug reports and testing.

- *

- *  REFERENCES

- *

- *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".

- *      Available in http://www.ietf.org/rfc/rfc1951.txt

- *

- *      A description of the Rabin and Karp algorithm is given in the book

- *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.

- *

- *      Fiala,E.R., and Greene,D.H.

- *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595

- *

- */

-

-/* @(#) $Id$ */

-

-#include "deflate.h"

-

-const char deflate_copyright[] =

-   " deflate 1.2.3 Copyright 1995-2005 Jean-loup Gailly ";

-/*

-  If you use the zlib library in a product, an acknowledgment is welcome

-  in the documentation of your product. If for some reason you cannot

-  include such an acknowledgment, I would appreciate that you keep this

-  copyright string in the executable of your product.

- */

-

-/* ===========================================================================

- *  Function prototypes.

- */

-typedef enum {

-    need_more,      /* block not completed, need more input or more output */

-    block_done,     /* block flush performed */

-    finish_started, /* finish started, need only more output at next deflate */

-    finish_done     /* finish done, accept no more input or output */

-} block_state;

-

-typedef block_state (*compress_func) OF((deflate_state *s, int flush));

-/* Compression function. Returns the block state after the call. */

-

-local void fill_window    OF((deflate_state *s));

-local block_state deflate_stored OF((deflate_state *s, int flush));

-local block_state deflate_fast   OF((deflate_state *s, int flush));

-#ifndef FASTEST

-local block_state deflate_slow   OF((deflate_state *s, int flush));

-#endif

-local void lm_init        OF((deflate_state *s));

-local void putShortMSB    OF((deflate_state *s, uInt b));

-local void flush_pending  OF((z_streamp strm));

-local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));

-#ifndef FASTEST

-#ifdef ASMV

-      void match_init OF((void)); /* asm code initialization */

-      uInt longest_match  OF((deflate_state *s, IPos cur_match));

-#else

-local uInt longest_match  OF((deflate_state *s, IPos cur_match));

-#endif

-#endif

-local uInt longest_match_fast OF((deflate_state *s, IPos cur_match));

-

-#ifdef DEBUG

-local  void check_match OF((deflate_state *s, IPos start, IPos match,

-                            int length));

-#endif

-

-/* ===========================================================================

- * Local data

- */

-

-#define NIL 0

-/* Tail of hash chains */

-

-#ifndef TOO_FAR

-#  define TOO_FAR 4096

-#endif

-/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */

-

-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)

-/* Minimum amount of lookahead, except at the end of the input file.

- * See deflate.c for comments about the MIN_MATCH+1.

- */

-

-/* Values for max_lazy_match, good_match and max_chain_length, depending on

- * the desired pack level (0..9). The values given below have been tuned to

- * exclude worst case performance for pathological files. Better values may be

- * found for specific files.

- */

-typedef struct config_s {

-   ush good_length; /* reduce lazy search above this match length */

-   ush max_lazy;    /* do not perform lazy search above this match length */

-   ush nice_length; /* quit search above this match length */

-   ush max_chain;

-   compress_func func;

-} config;

-

-#ifdef FASTEST

-local const config configuration_table[2] = {

-/*      good lazy nice chain */

-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */

-/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */

-#else

-local const config configuration_table[10] = {

-/*      good lazy nice chain */

-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */

-/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */

-/* 2 */ {4,    5, 16,    8, deflate_fast},

-/* 3 */ {4,    6, 32,   32, deflate_fast},

-

-/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */

-/* 5 */ {8,   16, 32,   32, deflate_slow},

-/* 6 */ {8,   16, 128, 128, deflate_slow},

-/* 7 */ {8,   32, 128, 256, deflate_slow},

-/* 8 */ {32, 128, 258, 1024, deflate_slow},

-/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */

-#endif

-

-/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4

- * For deflate_fast() (levels <= 3) good is ignored and lazy has a different

- * meaning.

- */

-

-#define EQUAL 0

-/* result of memcmp for equal strings */

-

-#ifndef NO_DUMMY_DECL

-struct static_tree_desc_s {int dummy;}; /* for buggy compilers */

-#endif

-

-/* ===========================================================================

- * Update a hash value with the given input byte

- * IN  assertion: all calls to to UPDATE_HASH are made with consecutive

- *    input characters, so that a running hash key can be computed from the

- *    previous key instead of complete recalculation each time.

- */

-#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)

-

-

-/* ===========================================================================

- * Insert string str in the dictionary and set match_head to the previous head

- * of the hash chain (the most recent string with same hash key). Return

- * the previous length of the hash chain.

- * If this file is compiled with -DFASTEST, the compression level is forced

- * to 1, and no hash chains are maintained.

- * IN  assertion: all calls to to INSERT_STRING are made with consecutive

- *    input characters and the first MIN_MATCH bytes of str are valid

- *    (except for the last MIN_MATCH-1 bytes of the input file).

- */

-#ifdef FASTEST

-#define INSERT_STRING(s, str, match_head) \

-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \

-    match_head = s->head[s->ins_h], \

-    s->head[s->ins_h] = (Pos)(str))

-#else

-#define INSERT_STRING(s, str, match_head) \

-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \

-    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \

-    s->head[s->ins_h] = (Pos)(str))

-#endif

-

-/* ===========================================================================

- * Initialize the hash table (avoiding 64K overflow for 16 bit systems).

- * prev[] will be initialized on the fly.

- */

-#define CLEAR_HASH(s) \

-    s->head[s->hash_size-1] = NIL; \

-    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));

-

-/* ========================================================================= */

-int ZEXPORT deflateInit_(strm, level, version, stream_size)

-    z_streamp strm;

-    int level;

-    const char *version;

-    int stream_size;

-{

-    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,

-                         Z_DEFAULT_STRATEGY, version, stream_size);

-    /* To do: ignore strm->next_in if we use it as window */

-}

-

-/* ========================================================================= */

-int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,

-                  version, stream_size)

-    z_streamp strm;

-    int  level;

-    int  method;

-    int  windowBits;

-    int  memLevel;

-    int  strategy;

-    const char *version;

-    int stream_size;

-{

-    deflate_state *s;

-    int wrap = 1;

-    static const char my_version[] = ZLIB_VERSION;

-

-    ushf *overlay;

-    /* We overlay pending_buf and d_buf+l_buf. This works since the average

-     * output size for (length,distance) codes is <= 24 bits.

-     */

-

-    if (version == Z_NULL || version[0] != my_version[0] ||

-        stream_size != sizeof(z_stream)) {

-        return Z_VERSION_ERROR;

-    }

-    if (strm == Z_NULL) return Z_STREAM_ERROR;

-

-    strm->msg = Z_NULL;

-    if (strm->zalloc == (alloc_func)0) {

-        strm->zalloc = zcalloc;

-        strm->opaque = (voidpf)0;

-    }

-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;

-

-#ifdef FASTEST

-    if (level != 0) level = 1;

-#else

-    if (level == Z_DEFAULT_COMPRESSION) level = 6;

-#endif

-

-    if (windowBits < 0) { /* suppress zlib wrapper */

-        wrap = 0;

-        windowBits = -windowBits;

-    }

-#ifdef GZIP

-    else if (windowBits > 15) {

-        wrap = 2;       /* write gzip wrapper instead */

-        windowBits -= 16;

-    }

-#endif

-    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||

-        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||

-        strategy < 0 || strategy > Z_FIXED) {

-        return Z_STREAM_ERROR;

-    }

-    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */

-    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));

-    if (s == Z_NULL) return Z_MEM_ERROR;

-    strm->state = (struct internal_state FAR *)s;

-    s->strm = strm;

-

-    s->wrap = wrap;

-    s->gzhead = Z_NULL;

-    s->w_bits = windowBits;

-    s->w_size = 1 << s->w_bits;

-    s->w_mask = s->w_size - 1;

-

-    s->hash_bits = memLevel + 7;

-    s->hash_size = 1 << s->hash_bits;

-    s->hash_mask = s->hash_size - 1;

-    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);

-

-    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));

-    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));

-    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));

-

-    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */

-

-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);

-    s->pending_buf = (uchf *) overlay;

-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);

-

-    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||

-        s->pending_buf == Z_NULL) {

-        s->status = FINISH_STATE;

-        strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);

-        deflateEnd (strm);

-        return Z_MEM_ERROR;

-    }

-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);

-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;

-

-    s->level = level;

-    s->strategy = strategy;

-    s->method = (Byte)method;

-

-    return deflateReset(strm);

-}

-

-/* ========================================================================= */

-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)

-    z_streamp strm;

-    const Bytef *dictionary;

-    uInt  dictLength;

-{

-    deflate_state *s;

-    uInt length = dictLength;

-    uInt n;

-    IPos hash_head = 0;

-

-    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||

-        strm->state->wrap == 2 ||

-        (strm->state->wrap == 1 && strm->state->status != INIT_STATE))

-        return Z_STREAM_ERROR;

-

-    s = strm->state;

-    if (s->wrap)

-        strm->adler = adler32(strm->adler, dictionary, dictLength);

-

-    if (length < MIN_MATCH) return Z_OK;

-    if (length > MAX_DIST(s)) {

-        length = MAX_DIST(s);

-        dictionary += dictLength - length; /* use the tail of the dictionary */

-    }

-    zmemcpy(s->window, dictionary, length);

-    s->strstart = length;

-    s->block_start = (long)length;

-

-    /* Insert all strings in the hash table (except for the last two bytes).

-     * s->lookahead stays null, so s->ins_h will be recomputed at the next

-     * call of fill_window.

-     */

-    s->ins_h = s->window[0];

-    UPDATE_HASH(s, s->ins_h, s->window[1]);

-    for (n = 0; n <= length - MIN_MATCH; n++) {

-        INSERT_STRING(s, n, hash_head);

-    }

-    if (hash_head) hash_head = 0;  /* to make compiler happy */

-    return Z_OK;

-}

-

-/* ========================================================================= */

-int ZEXPORT deflateReset (strm)

-    z_streamp strm;

-{

-    deflate_state *s;

-

-    if (strm == Z_NULL || strm->state == Z_NULL ||

-        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {

-        return Z_STREAM_ERROR;

-    }

-

-    strm->total_in = strm->total_out = 0;

-    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */

-    strm->data_type = Z_UNKNOWN;

-

-    s = (deflate_state *)strm->state;

-    s->pending = 0;

-    s->pending_out = s->pending_buf;

-

-    if (s->wrap < 0) {

-        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */

-    }

-    s->status = s->wrap ? INIT_STATE : BUSY_STATE;

-    strm->adler =

-#ifdef GZIP

-        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :

-#endif

-        adler32(0L, Z_NULL, 0);

-    s->last_flush = Z_NO_FLUSH;

-

-    _tr_init(s);

-    lm_init(s);

-

-    return Z_OK;

-}

-

-/* ========================================================================= */

-int ZEXPORT deflateSetHeader (strm, head)

-    z_streamp strm;

-    gz_headerp head;

-{

-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-    if (strm->state->wrap != 2) return Z_STREAM_ERROR;

-    strm->state->gzhead = head;

-    return Z_OK;

-}

-

-/* ========================================================================= */

-int ZEXPORT deflatePrime (strm, bits, value)

-    z_streamp strm;

-    int bits;

-    int value;

-{

-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-    strm->state->bi_valid = bits;

-    strm->state->bi_buf = (ush)(value & ((1 << bits) - 1));

-    return Z_OK;

-}

-

-/* ========================================================================= */

-int ZEXPORT deflateParams(strm, level, strategy)

-    z_streamp strm;

-    int level;

-    int strategy;

-{

-    deflate_state *s;

-    compress_func func;

-    int err = Z_OK;

-

-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-    s = strm->state;

-

-#ifdef FASTEST

-    if (level != 0) level = 1;

-#else

-    if (level == Z_DEFAULT_COMPRESSION) level = 6;

-#endif

-    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {

-        return Z_STREAM_ERROR;

-    }

-    func = configuration_table[s->level].func;

-

-    if (func != configuration_table[level].func && strm->total_in != 0) {

-        /* Flush the last buffer: */

-        err = deflate(strm, Z_PARTIAL_FLUSH);

-    }

-    if (s->level != level) {

-        s->level = level;

-        s->max_lazy_match   = configuration_table[level].max_lazy;

-        s->good_match       = configuration_table[level].good_length;

-        s->nice_match       = configuration_table[level].nice_length;

-        s->max_chain_length = configuration_table[level].max_chain;

-    }

-    s->strategy = strategy;

-    return err;

-}

-

-/* ========================================================================= */

-int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)

-    z_streamp strm;

-    int good_length;

-    int max_lazy;

-    int nice_length;

-    int max_chain;

-{

-    deflate_state *s;

-

-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-    s = strm->state;

-    s->good_match = good_length;

-    s->max_lazy_match = max_lazy;

-    s->nice_match = nice_length;

-    s->max_chain_length = max_chain;

-    return Z_OK;

-}

-

-/* =========================================================================

- * For the default windowBits of 15 and memLevel of 8, this function returns

- * a close to exact, as well as small, upper bound on the compressed size.

- * They are coded as constants here for a reason--if the #define's are

- * changed, then this function needs to be changed as well.  The return

- * value for 15 and 8 only works for those exact settings.

- *

- * For any setting other than those defaults for windowBits and memLevel,

- * the value returned is a conservative worst case for the maximum expansion

- * resulting from using fixed blocks instead of stored blocks, which deflate

- * can emit on compressed data for some combinations of the parameters.

- *

- * This function could be more sophisticated to provide closer upper bounds

- * for every combination of windowBits and memLevel, as well as wrap.

- * But even the conservative upper bound of about 14% expansion does not

- * seem onerous for output buffer allocation.

- */

-uLong ZEXPORT deflateBound(strm, sourceLen)

-    z_streamp strm;

-    uLong sourceLen;

-{

-    deflate_state *s;

-    uLong destLen;

-

-    /* conservative upper bound */

-    destLen = sourceLen +

-              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 11;

-

-    /* if can't get parameters, return conservative bound */

-    if (strm == Z_NULL || strm->state == Z_NULL)

-        return destLen;

-

-    /* if not default parameters, return conservative bound */

-    s = strm->state;

-    if (s->w_bits != 15 || s->hash_bits != 8 + 7)

-        return destLen;

-

-    /* default settings: return tight bound for that case */

-    return compressBound(sourceLen);

-}

-

-/* =========================================================================

- * Put a short in the pending buffer. The 16-bit value is put in MSB order.

- * IN assertion: the stream state is correct and there is enough room in

- * pending_buf.

- */

-local void putShortMSB (s, b)

-    deflate_state *s;

-    uInt b;

-{

-    put_byte(s, (Byte)(b >> 8));

-    put_byte(s, (Byte)(b & 0xff));

-}

-

-/* =========================================================================

- * Flush as much pending output as possible. All deflate() output goes

- * through this function so some applications may wish to modify it

- * to avoid allocating a large strm->next_out buffer and copying into it.

- * (See also read_buf()).

- */

-local void flush_pending(strm)

-    z_streamp strm;

-{

-    unsigned len = strm->state->pending;

-

-    if (len > strm->avail_out) len = strm->avail_out;

-    if (len == 0) return;

-

-    zmemcpy(strm->next_out, strm->state->pending_out, len);

-    strm->next_out  += len;

-    strm->state->pending_out  += len;

-    strm->total_out += len;

-    strm->avail_out  -= len;

-    strm->state->pending -= len;

-    if (strm->state->pending == 0) {

-        strm->state->pending_out = strm->state->pending_buf;

-    }

-}

-

-/* ========================================================================= */

-int ZEXPORT deflate (strm, flush)

-    z_streamp strm;

-    int flush;

-{

-    int old_flush; /* value of flush param for previous deflate call */

-    deflate_state *s;

-

-    if (strm == Z_NULL || strm->state == Z_NULL ||

-        flush > Z_FINISH || flush < 0) {

-        return Z_STREAM_ERROR;

-    }

-    s = strm->state;

-

-    if (strm->next_out == Z_NULL ||

-        (strm->next_in == Z_NULL && strm->avail_in != 0) ||

-        (s->status == FINISH_STATE && flush != Z_FINISH)) {

-        ERR_RETURN(strm, Z_STREAM_ERROR);

-    }

-    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);

-

-    s->strm = strm; /* just in case */

-    old_flush = s->last_flush;

-    s->last_flush = flush;

-

-    /* Write the header */

-    if (s->status == INIT_STATE) {

-#ifdef GZIP

-        if (s->wrap == 2) {

-            strm->adler = crc32(0L, Z_NULL, 0);

-            put_byte(s, 31);

-            put_byte(s, 139);

-            put_byte(s, 8);

-            if (s->gzhead == NULL) {

-                put_byte(s, 0);

-                put_byte(s, 0);

-                put_byte(s, 0);

-                put_byte(s, 0);

-                put_byte(s, 0);

-                put_byte(s, s->level == 9 ? 2 :

-                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?

-                             4 : 0));

-                put_byte(s, OS_CODE);

-                s->status = BUSY_STATE;

-            }

-            else {

-                put_byte(s, (s->gzhead->text ? 1 : 0) +

-                            (s->gzhead->hcrc ? 2 : 0) +

-                            (s->gzhead->extra == Z_NULL ? 0 : 4) +

-                            (s->gzhead->name == Z_NULL ? 0 : 8) +

-                            (s->gzhead->comment == Z_NULL ? 0 : 16)

-                        );

-                put_byte(s, (Byte)(s->gzhead->time & 0xff));

-                put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));

-                put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));

-                put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));

-                put_byte(s, s->level == 9 ? 2 :

-                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?

-                             4 : 0));

-                put_byte(s, s->gzhead->os & 0xff);

-                if (s->gzhead->extra != NULL) {

-                    put_byte(s, s->gzhead->extra_len & 0xff);

-                    put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);

-                }

-                if (s->gzhead->hcrc)

-                    strm->adler = crc32(strm->adler, s->pending_buf,

-                                        s->pending);

-                s->gzindex = 0;

-                s->status = EXTRA_STATE;

-            }

-        }

-        else

-#endif

-        {

-            uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;

-            uInt level_flags;

-

-            if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)

-                level_flags = 0;

-            else if (s->level < 6)

-                level_flags = 1;

-            else if (s->level == 6)

-                level_flags = 2;

-            else

-                level_flags = 3;

-            header |= (level_flags << 6);

-            if (s->strstart != 0) header |= PRESET_DICT;

-            header += 31 - (header % 31);

-

-            s->status = BUSY_STATE;

-            putShortMSB(s, header);

-

-            /* Save the adler32 of the preset dictionary: */

-            if (s->strstart != 0) {

-                putShortMSB(s, (uInt)(strm->adler >> 16));

-                putShortMSB(s, (uInt)(strm->adler & 0xffff));

-            }

-            strm->adler = adler32(0L, Z_NULL, 0);

-        }

-    }

-#ifdef GZIP

-    if (s->status == EXTRA_STATE) {

-        if (s->gzhead->extra != NULL) {

-            uInt beg = s->pending;  /* start of bytes to update crc */

-

-            while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {

-                if (s->pending == s->pending_buf_size) {

-                    if (s->gzhead->hcrc && s->pending > beg)

-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,

-                                            s->pending - beg);

-                    flush_pending(strm);

-                    beg = s->pending;

-                    if (s->pending == s->pending_buf_size)

-                        break;

-                }

-                put_byte(s, s->gzhead->extra[s->gzindex]);

-                s->gzindex++;

-            }

-            if (s->gzhead->hcrc && s->pending > beg)

-                strm->adler = crc32(strm->adler, s->pending_buf + beg,

-                                    s->pending - beg);

-            if (s->gzindex == s->gzhead->extra_len) {

-                s->gzindex = 0;

-                s->status = NAME_STATE;

-            }

-        }

-        else

-            s->status = NAME_STATE;

-    }

-    if (s->status == NAME_STATE) {

-        if (s->gzhead->name != NULL) {

-            uInt beg = s->pending;  /* start of bytes to update crc */

-            int val;

-

-            do {

-                if (s->pending == s->pending_buf_size) {

-                    if (s->gzhead->hcrc && s->pending > beg)

-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,

-                                            s->pending - beg);

-                    flush_pending(strm);

-                    beg = s->pending;

-                    if (s->pending == s->pending_buf_size) {

-                        val = 1;

-                        break;

-                    }

-                }

-                val = s->gzhead->name[s->gzindex++];

-                put_byte(s, val);

-            } while (val != 0);

-            if (s->gzhead->hcrc && s->pending > beg)

-                strm->adler = crc32(strm->adler, s->pending_buf + beg,

-                                    s->pending - beg);

-            if (val == 0) {

-                s->gzindex = 0;

-                s->status = COMMENT_STATE;

-            }

-        }

-        else

-            s->status = COMMENT_STATE;

-    }

-    if (s->status == COMMENT_STATE) {

-        if (s->gzhead->comment != NULL) {

-            uInt beg = s->pending;  /* start of bytes to update crc */

-            int val;

-

-            do {

-                if (s->pending == s->pending_buf_size) {

-                    if (s->gzhead->hcrc && s->pending > beg)

-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,

-                                            s->pending - beg);

-                    flush_pending(strm);

-                    beg = s->pending;

-                    if (s->pending == s->pending_buf_size) {

-                        val = 1;

-                        break;

-                    }

-                }

-                val = s->gzhead->comment[s->gzindex++];

-                put_byte(s, val);

-            } while (val != 0);

-            if (s->gzhead->hcrc && s->pending > beg)

-                strm->adler = crc32(strm->adler, s->pending_buf + beg,

-                                    s->pending - beg);

-            if (val == 0)

-                s->status = HCRC_STATE;

-        }

-        else

-            s->status = HCRC_STATE;

-    }

-    if (s->status == HCRC_STATE) {

-        if (s->gzhead->hcrc) {

-            if (s->pending + 2 > s->pending_buf_size)

-                flush_pending(strm);

-            if (s->pending + 2 <= s->pending_buf_size) {

-                put_byte(s, (Byte)(strm->adler & 0xff));

-                put_byte(s, (Byte)((strm->adler >> 8) & 0xff));

-                strm->adler = crc32(0L, Z_NULL, 0);

-                s->status = BUSY_STATE;

-            }

-        }

-        else

-            s->status = BUSY_STATE;

-    }

-#endif

-

-    /* Flush as much pending output as possible */

-    if (s->pending != 0) {

-        flush_pending(strm);

-        if (strm->avail_out == 0) {

-            /* Since avail_out is 0, deflate will be called again with

-             * more output space, but possibly with both pending and

-             * avail_in equal to zero. There won't be anything to do,

-             * but this is not an error situation so make sure we

-             * return OK instead of BUF_ERROR at next call of deflate:

-             */

-            s->last_flush = -1;

-            return Z_OK;

-        }

-

-    /* Make sure there is something to do and avoid duplicate consecutive

-     * flushes. For repeated and useless calls with Z_FINISH, we keep

-     * returning Z_STREAM_END instead of Z_BUF_ERROR.

-     */

-    } else if (strm->avail_in == 0 && flush <= old_flush &&

-               flush != Z_FINISH) {

-        ERR_RETURN(strm, Z_BUF_ERROR);

-    }

-

-    /* User must not provide more input after the first FINISH: */

-    if (s->status == FINISH_STATE && strm->avail_in != 0) {

-        ERR_RETURN(strm, Z_BUF_ERROR);

-    }

-

-    /* Start a new block or continue the current one.

-     */

-    if (strm->avail_in != 0 || s->lookahead != 0 ||

-        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {

-        block_state bstate;

-

-        bstate = (*(configuration_table[s->level].func))(s, flush);

-

-        if (bstate == finish_started || bstate == finish_done) {

-            s->status = FINISH_STATE;

-        }

-        if (bstate == need_more || bstate == finish_started) {

-            if (strm->avail_out == 0) {

-                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */

-            }

-            return Z_OK;

-            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call

-             * of deflate should use the same flush parameter to make sure

-             * that the flush is complete. So we don't have to output an

-             * empty block here, this will be done at next call. This also

-             * ensures that for a very small output buffer, we emit at most

-             * one empty block.

-             */

-        }

-        if (bstate == block_done) {

-            if (flush == Z_PARTIAL_FLUSH) {

-                _tr_align(s);

-            } else { /* FULL_FLUSH or SYNC_FLUSH */

-                _tr_stored_block(s, (char*)0, 0L, 0);

-                /* For a full flush, this empty block will be recognized

-                 * as a special marker by inflate_sync().

-                 */

-                if (flush == Z_FULL_FLUSH) {

-                    CLEAR_HASH(s);             /* forget history */

-                }

-            }

-            flush_pending(strm);

-            if (strm->avail_out == 0) {

-              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */

-              return Z_OK;

-            }

-        }

-    }

-    Assert(strm->avail_out > 0, "bug2");

-

-    if (flush != Z_FINISH) return Z_OK;

-    if (s->wrap <= 0) return Z_STREAM_END;

-

-    /* Write the trailer */

-#ifdef GZIP

-    if (s->wrap == 2) {

-        put_byte(s, (Byte)(strm->adler & 0xff));

-        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));

-        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));

-        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));

-        put_byte(s, (Byte)(strm->total_in & 0xff));

-        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));

-        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));

-        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));

-    }

-    else

-#endif

-    {

-        putShortMSB(s, (uInt)(strm->adler >> 16));

-        putShortMSB(s, (uInt)(strm->adler & 0xffff));

-    }

-    flush_pending(strm);

-    /* If avail_out is zero, the application will call deflate again

-     * to flush the rest.

-     */

-    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */

-    return s->pending != 0 ? Z_OK : Z_STREAM_END;

-}

-

-/* ========================================================================= */

-int ZEXPORT deflateEnd (strm)

-    z_streamp strm;

-{

-    int status;

-

-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-

-    status = strm->state->status;

-    if (status != INIT_STATE &&

-        status != EXTRA_STATE &&

-        status != NAME_STATE &&

-        status != COMMENT_STATE &&

-        status != HCRC_STATE &&

-        status != BUSY_STATE &&

-        status != FINISH_STATE) {

-      return Z_STREAM_ERROR;

-    }

-

-    /* Deallocate in reverse order of allocations: */

-    TRY_FREE(strm, strm->state->pending_buf);

-    TRY_FREE(strm, strm->state->head);

-    TRY_FREE(strm, strm->state->prev);

-    TRY_FREE(strm, strm->state->window);

-

-    ZFREE(strm, strm->state);

-    strm->state = Z_NULL;

-

-    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;

-}

-

-/* =========================================================================

- * Copy the source state to the destination state.

- * To simplify the source, this is not supported for 16-bit MSDOS (which

- * doesn't have enough memory anyway to duplicate compression states).

- */

-int ZEXPORT deflateCopy (dest, source)

-    z_streamp dest;

-    z_streamp source;

-{

-#ifdef MAXSEG_64K

-    return Z_STREAM_ERROR;

-#else

-    deflate_state *ds;

-    deflate_state *ss;

-    ushf *overlay;

-

-

-    if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {

-        return Z_STREAM_ERROR;

-    }

-

-    ss = source->state;

-

-    zmemcpy(dest, source, sizeof(z_stream));

-

-    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));

-    if (ds == Z_NULL) return Z_MEM_ERROR;

-    dest->state = (struct internal_state FAR *) ds;

-    zmemcpy(ds, ss, sizeof(deflate_state));

-    ds->strm = dest;

-

-    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));

-    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));

-    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));

-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);

-    ds->pending_buf = (uchf *) overlay;

-

-    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||

-        ds->pending_buf == Z_NULL) {

-        deflateEnd (dest);

-        return Z_MEM_ERROR;

-    }

-    /* following zmemcpy do not work for 16-bit MSDOS */

-    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));

-    zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));

-    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));

-    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);

-

-    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);

-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);

-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;

-

-    ds->l_desc.dyn_tree = ds->dyn_ltree;

-    ds->d_desc.dyn_tree = ds->dyn_dtree;

-    ds->bl_desc.dyn_tree = ds->bl_tree;

-

-    return Z_OK;

-#endif /* MAXSEG_64K */

-}

-

-/* ===========================================================================

- * Read a new buffer from the current input stream, update the adler32

- * and total number of bytes read.  All deflate() input goes through

- * this function so some applications may wish to modify it to avoid

- * allocating a large strm->next_in buffer and copying from it.

- * (See also flush_pending()).

- */

-local int read_buf(strm, buf, size)

-    z_streamp strm;

-    Bytef *buf;

-    unsigned size;

-{

-    unsigned len = strm->avail_in;

-

-    if (len > size) len = size;

-    if (len == 0) return 0;

-

-    strm->avail_in  -= len;

-

-    if (strm->state->wrap == 1) {

-        strm->adler = adler32(strm->adler, strm->next_in, len);

-    }

-#ifdef GZIP

-    else if (strm->state->wrap == 2) {

-        strm->adler = crc32(strm->adler, strm->next_in, len);

-    }

-#endif

-    zmemcpy(buf, strm->next_in, len);

-    strm->next_in  += len;

-    strm->total_in += len;

-

-    return (int)len;

-}

-

-/* ===========================================================================

- * Initialize the "longest match" routines for a new zlib stream

- */

-local void lm_init (s)

-    deflate_state *s;

-{

-    s->window_size = (ulg)2L*s->w_size;

-

-    CLEAR_HASH(s);

-

-    /* Set the default configuration parameters:

-     */

-    s->max_lazy_match   = configuration_table[s->level].max_lazy;

-    s->good_match       = configuration_table[s->level].good_length;

-    s->nice_match       = configuration_table[s->level].nice_length;

-    s->max_chain_length = configuration_table[s->level].max_chain;

-

-    s->strstart = 0;

-    s->block_start = 0L;

-    s->lookahead = 0;

-    s->match_length = s->prev_length = MIN_MATCH-1;

-    s->match_available = 0;

-    s->ins_h = 0;

-#ifndef FASTEST

-#ifdef ASMV

-    match_init(); /* initialize the asm code */

-#endif

-#endif

-}

-

-#ifndef FASTEST

-/* ===========================================================================

- * Set match_start to the longest match starting at the given string and

- * return its length. Matches shorter or equal to prev_length are discarded,

- * in which case the result is equal to prev_length and match_start is

- * garbage.

- * IN assertions: cur_match is the head of the hash chain for the current

- *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1

- * OUT assertion: the match length is not greater than s->lookahead.

- */

-#ifndef ASMV

-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or

- * match.S. The code will be functionally equivalent.

- */

-local uInt longest_match(s, cur_match)

-    deflate_state *s;

-    IPos cur_match;                             /* current match */

-{

-    unsigned chain_length = s->max_chain_length;/* max hash chain length */

-    register Bytef *scan = s->window + s->strstart; /* current string */

-    register Bytef *match;                       /* matched string */

-    register int len;                           /* length of current match */

-    int best_len = s->prev_length;              /* best match length so far */

-    int nice_match = s->nice_match;             /* stop if match long enough */

-    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?

-        s->strstart - (IPos)MAX_DIST(s) : NIL;

-    /* Stop when cur_match becomes <= limit. To simplify the code,

-     * we prevent matches with the string of window index 0.

-     */

-    Posf *prev = s->prev;

-    uInt wmask = s->w_mask;

-

-#ifdef UNALIGNED_OK

-    /* Compare two bytes at a time. Note: this is not always beneficial.

-     * Try with and without -DUNALIGNED_OK to check.

-     */

-    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;

-    register ush scan_start = *(ushf*)scan;

-    register ush scan_end   = *(ushf*)(scan+best_len-1);

-#else

-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;

-    register Byte scan_end1  = scan[best_len-1];

-    register Byte scan_end   = scan[best_len];

-#endif

-

-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.

-     * It is easy to get rid of this optimization if necessary.

-     */

-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");

-

-    /* Do not waste too much time if we already have a good match: */

-    if (s->prev_length >= s->good_match) {

-        chain_length >>= 2;

-    }

-    /* Do not look for matches beyond the end of the input. This is necessary

-     * to make deflate deterministic.

-     */

-    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;

-

-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");

-

-    do {

-        Assert(cur_match < s->strstart, "no future");

-        match = s->window + cur_match;

-

-        /* Skip to next match if the match length cannot increase

-         * or if the match length is less than 2.  Note that the checks below

-         * for insufficient lookahead only occur occasionally for performance

-         * reasons.  Therefore uninitialized memory will be accessed, and

-         * conditional jumps will be made that depend on those values.

-         * However the length of the match is limited to the lookahead, so

-         * the output of deflate is not affected by the uninitialized values.

-         */

-#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)

-        /* This code assumes sizeof(unsigned short) == 2. Do not use

-         * UNALIGNED_OK if your compiler uses a different size.

-         */

-        if (*(ushf*)(match+best_len-1) != scan_end ||

-            *(ushf*)match != scan_start) continue;

-

-        /* It is not necessary to compare scan[2] and match[2] since they are

-         * always equal when the other bytes match, given that the hash keys

-         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at

-         * strstart+3, +5, ... up to strstart+257. We check for insufficient

-         * lookahead only every 4th comparison; the 128th check will be made

-         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is

-         * necessary to put more guard bytes at the end of the window, or

-         * to check more often for insufficient lookahead.

-         */

-        Assert(scan[2] == match[2], "scan[2]?");

-        scan++, match++;

-        do {

-        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&

-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&

-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&

-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&

-                 scan < strend);

-        /* The funny "do {}" generates better code on most compilers */

-

-        /* Here, scan <= window+strstart+257 */

-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");

-        if (*scan == *match) scan++;

-

-        len = (MAX_MATCH - 1) - (int)(strend-scan);

-        scan = strend - (MAX_MATCH-1);

-

-#else /* UNALIGNED_OK */

-

-        if (match[best_len]   != scan_end  ||

-            match[best_len-1] != scan_end1 ||

-            *match            != *scan     ||

-            *++match          != scan[1])      continue;

-

-        /* The check at best_len-1 can be removed because it will be made

-         * again later. (This heuristic is not always a win.)

-         * It is not necessary to compare scan[2] and match[2] since they

-         * are always equal when the other bytes match, given that

-         * the hash keys are equal and that HASH_BITS >= 8.

-         */

-        scan += 2, match++;

-        Assert(*scan == *match, "match[2]?");

-

-        /* We check for insufficient lookahead only every 8th comparison;

-         * the 256th check will be made at strstart+258.

-         */

-        do {

-        } while (*++scan == *++match && *++scan == *++match &&

-                 *++scan == *++match && *++scan == *++match &&

-                 *++scan == *++match && *++scan == *++match &&

-                 *++scan == *++match && *++scan == *++match &&

-                 scan < strend);

-

-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");

-

-        len = MAX_MATCH - (int)(strend - scan);

-        scan = strend - MAX_MATCH;

-

-#endif /* UNALIGNED_OK */

-

-        if (len > best_len) {

-            s->match_start = cur_match;

-            best_len = len;

-            if (len >= nice_match) break;

-#ifdef UNALIGNED_OK

-            scan_end = *(ushf*)(scan+best_len-1);

-#else

-            scan_end1  = scan[best_len-1];

-            scan_end   = scan[best_len];

-#endif

-        }

-    } while ((cur_match = prev[cur_match & wmask]) > limit

-             && --chain_length != 0);

-

-    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;

-    return s->lookahead;

-}

-#endif /* ASMV */

-#endif /* FASTEST */

-

-/* ---------------------------------------------------------------------------

- * Optimized version for level == 1 or strategy == Z_RLE only

- */

-local uInt longest_match_fast(s, cur_match)

-    deflate_state *s;

-    IPos cur_match;                             /* current match */

-{

-    register Bytef *scan = s->window + s->strstart; /* current string */

-    register Bytef *match;                       /* matched string */

-    register int len;                           /* length of current match */

-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;

-

-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.

-     * It is easy to get rid of this optimization if necessary.

-     */

-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");

-

-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");

-

-    Assert(cur_match < s->strstart, "no future");

-

-    match = s->window + cur_match;

-

-    /* Return failure if the match length is less than 2:

-     */

-    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;

-

-    /* The check at best_len-1 can be removed because it will be made

-     * again later. (This heuristic is not always a win.)

-     * It is not necessary to compare scan[2] and match[2] since they

-     * are always equal when the other bytes match, given that

-     * the hash keys are equal and that HASH_BITS >= 8.

-     */

-    scan += 2, match += 2;

-    Assert(*scan == *match, "match[2]?");

-

-    /* We check for insufficient lookahead only every 8th comparison;

-     * the 256th check will be made at strstart+258.

-     */

-    do {

-    } while (*++scan == *++match && *++scan == *++match &&

-             *++scan == *++match && *++scan == *++match &&

-             *++scan == *++match && *++scan == *++match &&

-             *++scan == *++match && *++scan == *++match &&

-             scan < strend);

-

-    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");

-

-    len = MAX_MATCH - (int)(strend - scan);

-

-    if (len < MIN_MATCH) return MIN_MATCH - 1;

-

-    s->match_start = cur_match;

-    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;

-}

-

-#ifdef DEBUG

-/* ===========================================================================

- * Check that the match at match_start is indeed a match.

- */

-local void check_match(s, start, match, length)

-    deflate_state *s;

-    IPos start, match;

-    int length;

-{

-    /* check that the match is indeed a match */

-    if (zmemcmp(s->window + match,

-                s->window + start, length) != EQUAL) {

-        fprintf(stderr, " start %u, match %u, length %d\n",

-                start, match, length);

-        do {

-            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);

-        } while (--length != 0);

-        z_error("invalid match");

-    }

-    if (z_verbose > 1) {

-        fprintf(stderr,"\\[%d,%d]", start-match, length);

-        do { putc(s->window[start++], stderr); } while (--length != 0);

-    }

-}

-#else

-#  define check_match(s, start, match, length)

-#endif /* DEBUG */

-

-/* ===========================================================================

- * Fill the window when the lookahead becomes insufficient.

- * Updates strstart and lookahead.

- *

- * IN assertion: lookahead < MIN_LOOKAHEAD

- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD

- *    At least one byte has been read, or avail_in == 0; reads are

- *    performed for at least two bytes (required for the zip translate_eol

- *    option -- not supported here).

- */

-local void fill_window(s)

-    deflate_state *s;

-{

-    register unsigned n, m;

-    register Posf *p;

-    unsigned more;    /* Amount of free space at the end of the window. */

-    uInt wsize = s->w_size;

-

-    do {

-        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);

-

-        /* Deal with !@#$% 64K limit: */

-        if (sizeof(int) <= 2) {

-            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {

-                more = wsize;

-

-            } else if (more == (unsigned)(-1)) {

-                /* Very unlikely, but possible on 16 bit machine if

-                 * strstart == 0 && lookahead == 1 (input done a byte at time)

-                 */

-                more--;

-            }

-        }

-

-        /* If the window is almost full and there is insufficient lookahead,

-         * move the upper half to the lower one to make room in the upper half.

-         */

-        if (s->strstart >= wsize+MAX_DIST(s)) {

-

-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);

-            s->match_start -= wsize;

-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */

-            s->block_start -= (long) wsize;

-

-            /* Slide the hash table (could be avoided with 32 bit values

-               at the expense of memory usage). We slide even when level == 0

-               to keep the hash table consistent if we switch back to level > 0

-               later. (Using level 0 permanently is not an optimal usage of

-               zlib, so we don't care about this pathological case.)

-             */

-            /* %%% avoid this when Z_RLE */

-            n = s->hash_size;

-            p = &s->head[n];

-            do {

-                m = *--p;

-                *p = (Pos)(m >= wsize ? m-wsize : NIL);

-            } while (--n);

-

-            n = wsize;

-#ifndef FASTEST

-            p = &s->prev[n];

-            do {

-                m = *--p;

-                *p = (Pos)(m >= wsize ? m-wsize : NIL);

-                /* If n is not on any hash chain, prev[n] is garbage but

-                 * its value will never be used.

-                 */

-            } while (--n);

-#endif

-            more += wsize;

-        }

-        if (s->strm->avail_in == 0) return;

-

-        /* If there was no sliding:

-         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&

-         *    more == window_size - lookahead - strstart

-         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)

-         * => more >= window_size - 2*WSIZE + 2

-         * In the BIG_MEM or MMAP case (not yet supported),

-         *   window_size == input_size + MIN_LOOKAHEAD  &&

-         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.

-         * Otherwise, window_size == 2*WSIZE so more >= 2.

-         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.

-         */

-        Assert(more >= 2, "more < 2");

-

-        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);

-        s->lookahead += n;

-

-        /* Initialize the hash value now that we have some input: */

-        if (s->lookahead >= MIN_MATCH) {

-            s->ins_h = s->window[s->strstart];

-            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);

-#if MIN_MATCH != 3

-            Call UPDATE_HASH() MIN_MATCH-3 more times

-#endif

-        }

-        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,

-         * but this is not important since only literal bytes will be emitted.

-         */

-

-    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);

-}

-

-/* ===========================================================================

- * Flush the current block, with given end-of-file flag.

- * IN assertion: strstart is set to the end of the current match.

- */

-#define FLUSH_BLOCK_ONLY(s, eof) { \

-   _tr_flush_block(s, (s->block_start >= 0L ? \

-                   (charf *)&s->window[(unsigned)s->block_start] : \

-                   (charf *)Z_NULL), \

-                (ulg)((long)s->strstart - s->block_start), \

-                (eof)); \

-   s->block_start = s->strstart; \

-   flush_pending(s->strm); \

-   Tracev((stderr,"[FLUSH]")); \

-}

-

-/* Same but force premature exit if necessary. */

-#define FLUSH_BLOCK(s, eof) { \

-   FLUSH_BLOCK_ONLY(s, eof); \

-   if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \

-}

-

-/* ===========================================================================

- * Copy without compression as much as possible from the input stream, return

- * the current block state.

- * This function does not insert new strings in the dictionary since

- * uncompressible data is probably not useful. This function is used

- * only for the level=0 compression option.

- * NOTE: this function should be optimized to avoid extra copying from

- * window to pending_buf.

- */

-local block_state deflate_stored(s, flush)

-    deflate_state *s;

-    int flush;

-{

-    /* Stored blocks are limited to 0xffff bytes, pending_buf is limited

-     * to pending_buf_size, and each stored block has a 5 byte header:

-     */

-    ulg max_block_size = 0xffff;

-    ulg max_start;

-

-    if (max_block_size > s->pending_buf_size - 5) {

-        max_block_size = s->pending_buf_size - 5;

-    }

-

-    /* Copy as much as possible from input to output: */

-    for (;;) {

-        /* Fill the window as much as possible: */

-        if (s->lookahead <= 1) {

-

-            Assert(s->strstart < s->w_size+MAX_DIST(s) ||

-                   s->block_start >= (long)s->w_size, "slide too late");

-

-            fill_window(s);

-            if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;

-

-            if (s->lookahead == 0) break; /* flush the current block */

-        }

-        Assert(s->block_start >= 0L, "block gone");

-

-        s->strstart += s->lookahead;

-        s->lookahead = 0;

-

-        /* Emit a stored block if pending_buf will be full: */

-        max_start = s->block_start + max_block_size;

-        if (s->strstart == 0 || (ulg)s->strstart >= max_start) {

-            /* strstart == 0 is possible when wraparound on 16-bit machine */

-            s->lookahead = (uInt)(s->strstart - max_start);

-            s->strstart = (uInt)max_start;

-            FLUSH_BLOCK(s, 0);

-        }

-        /* Flush if we may have to slide, otherwise block_start may become

-         * negative and the data will be gone:

-         */

-        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {

-            FLUSH_BLOCK(s, 0);

-        }

-    }

-    FLUSH_BLOCK(s, flush == Z_FINISH);

-    return flush == Z_FINISH ? finish_done : block_done;

-}

-

-/* ===========================================================================

- * Compress as much as possible from the input stream, return the current

- * block state.

- * This function does not perform lazy evaluation of matches and inserts

- * new strings in the dictionary only for unmatched strings or for short

- * matches. It is used only for the fast compression options.

- */

-local block_state deflate_fast(s, flush)

-    deflate_state *s;

-    int flush;

-{

-    IPos hash_head = NIL; /* head of the hash chain */

-    int bflush;           /* set if current block must be flushed */

-

-    for (;;) {

-        /* Make sure that we always have enough lookahead, except

-         * at the end of the input file. We need MAX_MATCH bytes

-         * for the next match, plus MIN_MATCH bytes to insert the

-         * string following the next match.

-         */

-        if (s->lookahead < MIN_LOOKAHEAD) {

-            fill_window(s);

-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {

-                return need_more;

-            }

-            if (s->lookahead == 0) break; /* flush the current block */

-        }

-

-        /* Insert the string window[strstart .. strstart+2] in the

-         * dictionary, and set hash_head to the head of the hash chain:

-         */

-        if (s->lookahead >= MIN_MATCH) {

-            INSERT_STRING(s, s->strstart, hash_head);

-        }

-

-        /* Find the longest match, discarding those <= prev_length.

-         * At this point we have always match_length < MIN_MATCH

-         */

-        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {

-            /* To simplify the code, we prevent matches with the string

-             * of window index 0 (in particular we have to avoid a match

-             * of the string with itself at the start of the input file).

-             */

-#ifdef FASTEST

-            if ((s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) ||

-                (s->strategy == Z_RLE && s->strstart - hash_head == 1)) {

-                s->match_length = longest_match_fast (s, hash_head);

-            }

-#else

-            if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) {

-                s->match_length = longest_match (s, hash_head);

-            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {

-                s->match_length = longest_match_fast (s, hash_head);

-            }

-#endif

-            /* longest_match() or longest_match_fast() sets match_start */

-        }

-        if (s->match_length >= MIN_MATCH) {

-            check_match(s, s->strstart, s->match_start, s->match_length);

-

-            _tr_tally_dist(s, s->strstart - s->match_start,

-                           s->match_length - MIN_MATCH, bflush);

-

-            s->lookahead -= s->match_length;

-

-            /* Insert new strings in the hash table only if the match length

-             * is not too large. This saves time but degrades compression.

-             */

-#ifndef FASTEST

-            if (s->match_length <= s->max_insert_length &&

-                s->lookahead >= MIN_MATCH) {

-                s->match_length--; /* string at strstart already in table */

-                do {

-                    s->strstart++;

-                    INSERT_STRING(s, s->strstart, hash_head);

-                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are

-                     * always MIN_MATCH bytes ahead.

-                     */

-                } while (--s->match_length != 0);

-                s->strstart++;

-            } else

-#endif

-            {

-                s->strstart += s->match_length;

-                s->match_length = 0;

-                s->ins_h = s->window[s->strstart];

-                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);

-#if MIN_MATCH != 3

-                Call UPDATE_HASH() MIN_MATCH-3 more times

-#endif

-                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not

-                 * matter since it will be recomputed at next deflate call.

-                 */

-            }

-        } else {

-            /* No match, output a literal byte */

-            Tracevv((stderr,"%c", s->window[s->strstart]));

-            _tr_tally_lit (s, s->window[s->strstart], bflush);

-            s->lookahead--;

-            s->strstart++;

-        }

-        if (bflush) FLUSH_BLOCK(s, 0);

-    }

-    FLUSH_BLOCK(s, flush == Z_FINISH);

-    return flush == Z_FINISH ? finish_done : block_done;

-}

-

-#ifndef FASTEST

-/* ===========================================================================

- * Same as above, but achieves better compression. We use a lazy

- * evaluation for matches: a match is finally adopted only if there is

- * no better match at the next window position.

- */

-local block_state deflate_slow(s, flush)

-    deflate_state *s;

-    int flush;

-{

-    IPos hash_head = NIL;    /* head of hash chain */

-    int bflush;              /* set if current block must be flushed */

-

-    /* Process the input block. */

-    for (;;) {

-        /* Make sure that we always have enough lookahead, except

-         * at the end of the input file. We need MAX_MATCH bytes

-         * for the next match, plus MIN_MATCH bytes to insert the

-         * string following the next match.

-         */

-        if (s->lookahead < MIN_LOOKAHEAD) {

-            fill_window(s);

-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {

-                return need_more;

-            }

-            if (s->lookahead == 0) break; /* flush the current block */

-        }

-

-        /* Insert the string window[strstart .. strstart+2] in the

-         * dictionary, and set hash_head to the head of the hash chain:

-         */

-        if (s->lookahead >= MIN_MATCH) {

-            INSERT_STRING(s, s->strstart, hash_head);

-        }

-

-        /* Find the longest match, discarding those <= prev_length.

-         */

-        s->prev_length = s->match_length, s->prev_match = s->match_start;

-        s->match_length = MIN_MATCH-1;

-

-        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&

-            s->strstart - hash_head <= MAX_DIST(s)) {

-            /* To simplify the code, we prevent matches with the string

-             * of window index 0 (in particular we have to avoid a match

-             * of the string with itself at the start of the input file).

-             */

-            if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) {

-                s->match_length = longest_match (s, hash_head);

-            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {

-                s->match_length = longest_match_fast (s, hash_head);

-            }

-            /* longest_match() or longest_match_fast() sets match_start */

-

-            if (s->match_length <= 5 && (s->strategy == Z_FILTERED

-#if TOO_FAR <= 32767

-                || (s->match_length == MIN_MATCH &&

-                    s->strstart - s->match_start > TOO_FAR)

-#endif

-                )) {

-

-                /* If prev_match is also MIN_MATCH, match_start is garbage

-                 * but we will ignore the current match anyway.

-                 */

-                s->match_length = MIN_MATCH-1;

-            }

-        }

-        /* If there was a match at the previous step and the current

-         * match is not better, output the previous match:

-         */

-        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {

-            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;

-            /* Do not insert strings in hash table beyond this. */

-

-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);

-

-            _tr_tally_dist(s, s->strstart -1 - s->prev_match,

-                           s->prev_length - MIN_MATCH, bflush);

-

-            /* Insert in hash table all strings up to the end of the match.

-             * strstart-1 and strstart are already inserted. If there is not

-             * enough lookahead, the last two strings are not inserted in

-             * the hash table.

-             */

-            s->lookahead -= s->prev_length-1;

-            s->prev_length -= 2;

-            do {

-                if (++s->strstart <= max_insert) {

-                    INSERT_STRING(s, s->strstart, hash_head);

-                }

-            } while (--s->prev_length != 0);

-            s->match_available = 0;

-            s->match_length = MIN_MATCH-1;

-            s->strstart++;

-

-            if (bflush) FLUSH_BLOCK(s, 0);

-

-        } else if (s->match_available) {

-            /* If there was no match at the previous position, output a

-             * single literal. If there was a match but the current match

-             * is longer, truncate the previous match to a single literal.

-             */

-            Tracevv((stderr,"%c", s->window[s->strstart-1]));

-            _tr_tally_lit(s, s->window[s->strstart-1], bflush);

-            if (bflush) {

-                FLUSH_BLOCK_ONLY(s, 0);

-            }

-            s->strstart++;

-            s->lookahead--;

-            if (s->strm->avail_out == 0) return need_more;

-        } else {

-            /* There is no previous match to compare with, wait for

-             * the next step to decide.

-             */

-            s->match_available = 1;

-            s->strstart++;

-            s->lookahead--;

-        }

-    }

-    Assert (flush != Z_NO_FLUSH, "no flush?");

-    if (s->match_available) {

-        Tracevv((stderr,"%c", s->window[s->strstart-1]));

-        _tr_tally_lit(s, s->window[s->strstart-1], bflush);

-        s->match_available = 0;

-    }

-    FLUSH_BLOCK(s, flush == Z_FINISH);

-    return flush == Z_FINISH ? finish_done : block_done;

-}

-#endif /* FASTEST */

-

-#if 0

-/* ===========================================================================

- * For Z_RLE, simply look for runs of bytes, generate matches only of distance

- * one.  Do not maintain a hash table.  (It will be regenerated if this run of

- * deflate switches away from Z_RLE.)

- */

-local block_state deflate_rle(s, flush)

-    deflate_state *s;

-    int flush;

-{

-    int bflush;         /* set if current block must be flushed */

-    uInt run;           /* length of run */

-    uInt max;           /* maximum length of run */

-    uInt prev;          /* byte at distance one to match */

-    Bytef *scan;        /* scan for end of run */

-

-    for (;;) {

-        /* Make sure that we always have enough lookahead, except

-         * at the end of the input file. We need MAX_MATCH bytes

-         * for the longest encodable run.

-         */

-        if (s->lookahead < MAX_MATCH) {

-            fill_window(s);

-            if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) {

-                return need_more;

-            }

-            if (s->lookahead == 0) break; /* flush the current block */

-        }

-

-        /* See how many times the previous byte repeats */

-        run = 0;

-        if (s->strstart > 0) {      /* if there is a previous byte, that is */

-            max = s->lookahead < MAX_MATCH ? s->lookahead : MAX_MATCH;

-            scan = s->window + s->strstart - 1;

-            prev = *scan++;

-            do {

-                if (*scan++ != prev)

-                    break;

-            } while (++run < max);

-        }

-

-        /* Emit match if have run of MIN_MATCH or longer, else emit literal */

-        if (run >= MIN_MATCH) {

-            check_match(s, s->strstart, s->strstart - 1, run);

-            _tr_tally_dist(s, 1, run - MIN_MATCH, bflush);

-            s->lookahead -= run;

-            s->strstart += run;

-        } else {

-            /* No match, output a literal byte */

-            Tracevv((stderr,"%c", s->window[s->strstart]));

-            _tr_tally_lit (s, s->window[s->strstart], bflush);

-            s->lookahead--;

-            s->strstart++;

-        }

-        if (bflush) FLUSH_BLOCK(s, 0);

-    }

-    FLUSH_BLOCK(s, flush == Z_FINISH);

-    return flush == Z_FINISH ? finish_done : block_done;

-}

-#endif

+/* deflate.c -- compress data using the deflation algorithm
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ *  ALGORITHM
+ *
+ *      The "deflation" process depends on being able to identify portions
+ *      of the input text which are identical to earlier input (within a
+ *      sliding window trailing behind the input currently being processed).
+ *
+ *      The most straightforward technique turns out to be the fastest for
+ *      most input files: try all possible matches and select the longest.
+ *      The key feature of this algorithm is that insertions into the string
+ *      dictionary are very simple and thus fast, and deletions are avoided
+ *      completely. Insertions are performed at each input character, whereas
+ *      string matches are performed only when the previous match ends. So it
+ *      is preferable to spend more time in matches to allow very fast string
+ *      insertions and avoid deletions. The matching algorithm for small
+ *      strings is inspired from that of Rabin & Karp. A brute force approach
+ *      is used to find longer strings when a small match has been found.
+ *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
+ *      (by Leonid Broukhis).
+ *         A previous version of this file used a more sophisticated algorithm
+ *      (by Fiala and Greene) which is guaranteed to run in linear amortized
+ *      time, but has a larger average cost, uses more memory and is patented.
+ *      However the F&G algorithm may be faster for some highly redundant
+ *      files if the parameter max_chain_length (described below) is too large.
+ *
+ *  ACKNOWLEDGEMENTS
+ *
+ *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
+ *      I found it in 'freeze' written by Leonid Broukhis.
+ *      Thanks to many people for bug reports and testing.
+ *
+ *  REFERENCES
+ *
+ *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
+ *      Available in http://www.ietf.org/rfc/rfc1951.txt
+ *
+ *      A description of the Rabin and Karp algorithm is given in the book
+ *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
+ *
+ *      Fiala,E.R., and Greene,D.H.
+ *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
+ *
+ */
+
+/* @(#) $Id$ */
+
+#include "deflate.h"
+
+const char deflate_copyright[] =
+   " deflate 1.2.3 Copyright 1995-2005 Jean-loup Gailly ";
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+
+/* ===========================================================================
+ *  Function prototypes.
+ */
+typedef enum {
+    need_more,      /* block not completed, need more input or more output */
+    block_done,     /* block flush performed */
+    finish_started, /* finish started, need only more output at next deflate */
+    finish_done     /* finish done, accept no more input or output */
+} block_state;
+
+typedef block_state (*compress_func) OF((deflate_state *s, int flush));
+/* Compression function. Returns the block state after the call. */
+
+local void fill_window    OF((deflate_state *s));
+local block_state deflate_stored OF((deflate_state *s, int flush));
+local block_state deflate_fast   OF((deflate_state *s, int flush));
+#ifndef FASTEST
+local block_state deflate_slow   OF((deflate_state *s, int flush));
+#endif
+local void lm_init        OF((deflate_state *s));
+local void putShortMSB    OF((deflate_state *s, uInt b));
+local void flush_pending  OF((z_streamp strm));
+local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
+#ifndef FASTEST
+#ifdef ASMV
+      void match_init OF((void)); /* asm code initialization */
+      uInt longest_match  OF((deflate_state *s, IPos cur_match));
+#else
+local uInt longest_match  OF((deflate_state *s, IPos cur_match));
+#endif
+#endif
+local uInt longest_match_fast OF((deflate_state *s, IPos cur_match));
+
+#ifdef DEBUG
+local  void check_match OF((deflate_state *s, IPos start, IPos match,
+                            int length));
+#endif
+
+/* ===========================================================================
+ * Local data
+ */
+
+#define NIL 0
+/* Tail of hash chains */
+
+#ifndef TOO_FAR
+#  define TOO_FAR 4096
+#endif
+/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
+
+#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
+/* Minimum amount of lookahead, except at the end of the input file.
+ * See deflate.c for comments about the MIN_MATCH+1.
+ */
+
+/* Values for max_lazy_match, good_match and max_chain_length, depending on
+ * the desired pack level (0..9). The values given below have been tuned to
+ * exclude worst case performance for pathological files. Better values may be
+ * found for specific files.
+ */
+typedef struct config_s {
+   ush good_length; /* reduce lazy search above this match length */
+   ush max_lazy;    /* do not perform lazy search above this match length */
+   ush nice_length; /* quit search above this match length */
+   ush max_chain;
+   compress_func func;
+} config;
+
+#ifdef FASTEST
+local const config configuration_table[2] = {
+/*      good lazy nice chain */
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */
+#else
+local const config configuration_table[10] = {
+/*      good lazy nice chain */
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
+/* 2 */ {4,    5, 16,    8, deflate_fast},
+/* 3 */ {4,    6, 32,   32, deflate_fast},
+
+/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
+/* 5 */ {8,   16, 32,   32, deflate_slow},
+/* 6 */ {8,   16, 128, 128, deflate_slow},
+/* 7 */ {8,   32, 128, 256, deflate_slow},
+/* 8 */ {32, 128, 258, 1024, deflate_slow},
+/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
+#endif
+
+/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
+ * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
+ * meaning.
+ */
+
+#define EQUAL 0
+/* result of memcmp for equal strings */
+
+#ifndef NO_DUMMY_DECL
+struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
+#endif
+
+/* ===========================================================================
+ * Update a hash value with the given input byte
+ * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
+ *    input characters, so that a running hash key can be computed from the
+ *    previous key instead of complete recalculation each time.
+ */
+#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
+
+
+/* ===========================================================================
+ * Insert string str in the dictionary and set match_head to the previous head
+ * of the hash chain (the most recent string with same hash key). Return
+ * the previous length of the hash chain.
+ * If this file is compiled with -DFASTEST, the compression level is forced
+ * to 1, and no hash chains are maintained.
+ * IN  assertion: all calls to to INSERT_STRING are made with consecutive
+ *    input characters and the first MIN_MATCH bytes of str are valid
+ *    (except for the last MIN_MATCH-1 bytes of the input file).
+ */
+#ifdef FASTEST
+#define INSERT_STRING(s, str, match_head) \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+    match_head = s->head[s->ins_h], \
+    s->head[s->ins_h] = (Pos)(str))
+#else
+#define INSERT_STRING(s, str, match_head) \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
+    s->head[s->ins_h] = (Pos)(str))
+#endif
+
+/* ===========================================================================
+ * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
+ * prev[] will be initialized on the fly.
+ */
+#define CLEAR_HASH(s) \
+    s->head[s->hash_size-1] = NIL; \
+    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+
+/* ========================================================================= */
+int ZEXPORT deflateInit_(strm, level, version, stream_size)
+    z_streamp strm;
+    int level;
+    const char *version;
+    int stream_size;
+{
+    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
+                         Z_DEFAULT_STRATEGY, version, stream_size);
+    /* To do: ignore strm->next_in if we use it as window */
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+                  version, stream_size)
+    z_streamp strm;
+    int  level;
+    int  method;
+    int  windowBits;
+    int  memLevel;
+    int  strategy;
+    const char *version;
+    int stream_size;
+{
+    deflate_state *s;
+    int wrap = 1;
+    static const char my_version[] = ZLIB_VERSION;
+
+    ushf *overlay;
+    /* We overlay pending_buf and d_buf+l_buf. This works since the average
+     * output size for (length,distance) codes is <= 24 bits.
+     */
+
+    if (version == Z_NULL || version[0] != my_version[0] ||
+        stream_size != sizeof(z_stream)) {
+        return Z_VERSION_ERROR;
+    }
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+
+    strm->msg = Z_NULL;
+    if (strm->zalloc == (alloc_func)0) {
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+    }
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+
+#ifdef FASTEST
+    if (level != 0) level = 1;
+#else
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+
+    if (windowBits < 0) { /* suppress zlib wrapper */
+        wrap = 0;
+        windowBits = -windowBits;
+    }
+#ifdef GZIP
+    else if (windowBits > 15) {
+        wrap = 2;       /* write gzip wrapper instead */
+        windowBits -= 16;
+    }
+#endif
+    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
+        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
+        strategy < 0 || strategy > Z_FIXED) {
+        return Z_STREAM_ERROR;
+    }
+    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
+    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
+    if (s == Z_NULL) return Z_MEM_ERROR;
+    strm->state = (struct internal_state FAR *)s;
+    s->strm = strm;
+
+    s->wrap = wrap;
+    s->gzhead = Z_NULL;
+    s->w_bits = windowBits;
+    s->w_size = 1 << s->w_bits;
+    s->w_mask = s->w_size - 1;
+
+    s->hash_bits = memLevel + 7;
+    s->hash_size = 1 << s->hash_bits;
+    s->hash_mask = s->hash_size - 1;
+    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
+
+    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
+    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
+    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
+
+    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
+
+    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
+    s->pending_buf = (uchf *) overlay;
+    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
+
+    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
+        s->pending_buf == Z_NULL) {
+        s->status = FINISH_STATE;
+        strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
+        deflateEnd (strm);
+        return Z_MEM_ERROR;
+    }
+    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
+    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
+
+    s->level = level;
+    s->strategy = strategy;
+    s->method = (Byte)method;
+
+    return deflateReset(strm);
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
+    z_streamp strm;
+    const Bytef *dictionary;
+    uInt  dictLength;
+{
+    deflate_state *s;
+    uInt length = dictLength;
+    uInt n;
+    IPos hash_head = 0;
+
+    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||
+        strm->state->wrap == 2 ||
+        (strm->state->wrap == 1 && strm->state->status != INIT_STATE))
+        return Z_STREAM_ERROR;
+
+    s = strm->state;
+    if (s->wrap)
+        strm->adler = adler32(strm->adler, dictionary, dictLength);
+
+    if (length < MIN_MATCH) return Z_OK;
+    if (length > MAX_DIST(s)) {
+        length = MAX_DIST(s);
+        dictionary += dictLength - length; /* use the tail of the dictionary */
+    }
+    zmemcpy(s->window, dictionary, length);
+    s->strstart = length;
+    s->block_start = (long)length;
+
+    /* Insert all strings in the hash table (except for the last two bytes).
+     * s->lookahead stays null, so s->ins_h will be recomputed at the next
+     * call of fill_window.
+     */
+    s->ins_h = s->window[0];
+    UPDATE_HASH(s, s->ins_h, s->window[1]);
+    for (n = 0; n <= length - MIN_MATCH; n++) {
+        INSERT_STRING(s, n, hash_head);
+    }
+    if (hash_head) hash_head = 0;  /* to make compiler happy */
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateReset (strm)
+    z_streamp strm;
+{
+    deflate_state *s;
+
+    if (strm == Z_NULL || strm->state == Z_NULL ||
+        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
+        return Z_STREAM_ERROR;
+    }
+
+    strm->total_in = strm->total_out = 0;
+    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
+    strm->data_type = Z_UNKNOWN;
+
+    s = (deflate_state *)strm->state;
+    s->pending = 0;
+    s->pending_out = s->pending_buf;
+
+    if (s->wrap < 0) {
+        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
+    }
+    s->status = s->wrap ? INIT_STATE : BUSY_STATE;
+    strm->adler =
+#ifdef GZIP
+        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
+#endif
+        adler32(0L, Z_NULL, 0);
+    s->last_flush = Z_NO_FLUSH;
+
+    _tr_init(s);
+    lm_init(s);
+
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateSetHeader (strm, head)
+    z_streamp strm;
+    gz_headerp head;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (strm->state->wrap != 2) return Z_STREAM_ERROR;
+    strm->state->gzhead = head;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflatePrime (strm, bits, value)
+    z_streamp strm;
+    int bits;
+    int value;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    strm->state->bi_valid = bits;
+    strm->state->bi_buf = (ush)(value & ((1 << bits) - 1));
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateParams(strm, level, strategy)
+    z_streamp strm;
+    int level;
+    int strategy;
+{
+    deflate_state *s;
+    compress_func func;
+    int err = Z_OK;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    s = strm->state;
+
+#ifdef FASTEST
+    if (level != 0) level = 1;
+#else
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
+        return Z_STREAM_ERROR;
+    }
+    func = configuration_table[s->level].func;
+
+    if (func != configuration_table[level].func && strm->total_in != 0) {
+        /* Flush the last buffer: */
+        err = deflate(strm, Z_PARTIAL_FLUSH);
+    }
+    if (s->level != level) {
+        s->level = level;
+        s->max_lazy_match   = configuration_table[level].max_lazy;
+        s->good_match       = configuration_table[level].good_length;
+        s->nice_match       = configuration_table[level].nice_length;
+        s->max_chain_length = configuration_table[level].max_chain;
+    }
+    s->strategy = strategy;
+    return err;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
+    z_streamp strm;
+    int good_length;
+    int max_lazy;
+    int nice_length;
+    int max_chain;
+{
+    deflate_state *s;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    s = strm->state;
+    s->good_match = good_length;
+    s->max_lazy_match = max_lazy;
+    s->nice_match = nice_length;
+    s->max_chain_length = max_chain;
+    return Z_OK;
+}
+
+/* =========================================================================
+ * For the default windowBits of 15 and memLevel of 8, this function returns
+ * a close to exact, as well as small, upper bound on the compressed size.
+ * They are coded as constants here for a reason--if the #define's are
+ * changed, then this function needs to be changed as well.  The return
+ * value for 15 and 8 only works for those exact settings.
+ *
+ * For any setting other than those defaults for windowBits and memLevel,
+ * the value returned is a conservative worst case for the maximum expansion
+ * resulting from using fixed blocks instead of stored blocks, which deflate
+ * can emit on compressed data for some combinations of the parameters.
+ *
+ * This function could be more sophisticated to provide closer upper bounds
+ * for every combination of windowBits and memLevel, as well as wrap.
+ * But even the conservative upper bound of about 14% expansion does not
+ * seem onerous for output buffer allocation.
+ */
+uLong ZEXPORT deflateBound(strm, sourceLen)
+    z_streamp strm;
+    uLong sourceLen;
+{
+    deflate_state *s;
+    uLong destLen;
+
+    /* conservative upper bound */
+    destLen = sourceLen +
+              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 11;
+
+    /* if can't get parameters, return conservative bound */
+    if (strm == Z_NULL || strm->state == Z_NULL)
+        return destLen;
+
+    /* if not default parameters, return conservative bound */
+    s = strm->state;
+    if (s->w_bits != 15 || s->hash_bits != 8 + 7)
+        return destLen;
+
+    /* default settings: return tight bound for that case */
+    return compressBound(sourceLen);
+}
+
+/* =========================================================================
+ * Put a short in the pending buffer. The 16-bit value is put in MSB order.
+ * IN assertion: the stream state is correct and there is enough room in
+ * pending_buf.
+ */
+local void putShortMSB (s, b)
+    deflate_state *s;
+    uInt b;
+{
+    put_byte(s, (Byte)(b >> 8));
+    put_byte(s, (Byte)(b & 0xff));
+}
+
+/* =========================================================================
+ * Flush as much pending output as possible. All deflate() output goes
+ * through this function so some applications may wish to modify it
+ * to avoid allocating a large strm->next_out buffer and copying into it.
+ * (See also read_buf()).
+ */
+local void flush_pending(strm)
+    z_streamp strm;
+{
+    unsigned len = strm->state->pending;
+
+    if (len > strm->avail_out) len = strm->avail_out;
+    if (len == 0) return;
+
+    zmemcpy(strm->next_out, strm->state->pending_out, len);
+    strm->next_out  += len;
+    strm->state->pending_out  += len;
+    strm->total_out += len;
+    strm->avail_out  -= len;
+    strm->state->pending -= len;
+    if (strm->state->pending == 0) {
+        strm->state->pending_out = strm->state->pending_buf;
+    }
+}
+
+/* ========================================================================= */
+int ZEXPORT deflate (strm, flush)
+    z_streamp strm;
+    int flush;
+{
+    int old_flush; /* value of flush param for previous deflate call */
+    deflate_state *s;
+
+    if (strm == Z_NULL || strm->state == Z_NULL ||
+        flush > Z_FINISH || flush < 0) {
+        return Z_STREAM_ERROR;
+    }
+    s = strm->state;
+
+    if (strm->next_out == Z_NULL ||
+        (strm->next_in == Z_NULL && strm->avail_in != 0) ||
+        (s->status == FINISH_STATE && flush != Z_FINISH)) {
+        ERR_RETURN(strm, Z_STREAM_ERROR);
+    }
+    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
+
+    s->strm = strm; /* just in case */
+    old_flush = s->last_flush;
+    s->last_flush = flush;
+
+    /* Write the header */
+    if (s->status == INIT_STATE) {
+#ifdef GZIP
+        if (s->wrap == 2) {
+            strm->adler = crc32(0L, Z_NULL, 0);
+            put_byte(s, 31);
+            put_byte(s, 139);
+            put_byte(s, 8);
+            if (s->gzhead == NULL) {
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, s->level == 9 ? 2 :
+                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                             4 : 0));
+                put_byte(s, OS_CODE);
+                s->status = BUSY_STATE;
+            }
+            else {
+                put_byte(s, (s->gzhead->text ? 1 : 0) +
+                            (s->gzhead->hcrc ? 2 : 0) +
+                            (s->gzhead->extra == Z_NULL ? 0 : 4) +
+                            (s->gzhead->name == Z_NULL ? 0 : 8) +
+                            (s->gzhead->comment == Z_NULL ? 0 : 16)
+                        );
+                put_byte(s, (Byte)(s->gzhead->time & 0xff));
+                put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
+                put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
+                put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
+                put_byte(s, s->level == 9 ? 2 :
+                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                             4 : 0));
+                put_byte(s, s->gzhead->os & 0xff);
+                if (s->gzhead->extra != NULL) {
+                    put_byte(s, s->gzhead->extra_len & 0xff);
+                    put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
+                }
+                if (s->gzhead->hcrc)
+                    strm->adler = crc32(strm->adler, s->pending_buf,
+                                        s->pending);
+                s->gzindex = 0;
+                s->status = EXTRA_STATE;
+            }
+        }
+        else
+#endif
+        {
+            uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
+            uInt level_flags;
+
+            if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
+                level_flags = 0;
+            else if (s->level < 6)
+                level_flags = 1;
+            else if (s->level == 6)
+                level_flags = 2;
+            else
+                level_flags = 3;
+            header |= (level_flags << 6);
+            if (s->strstart != 0) header |= PRESET_DICT;
+            header += 31 - (header % 31);
+
+            s->status = BUSY_STATE;
+            putShortMSB(s, header);
+
+            /* Save the adler32 of the preset dictionary: */
+            if (s->strstart != 0) {
+                putShortMSB(s, (uInt)(strm->adler >> 16));
+                putShortMSB(s, (uInt)(strm->adler & 0xffff));
+            }
+            strm->adler = adler32(0L, Z_NULL, 0);
+        }
+    }
+#ifdef GZIP
+    if (s->status == EXTRA_STATE) {
+        if (s->gzhead->extra != NULL) {
+            uInt beg = s->pending;  /* start of bytes to update crc */
+
+            while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {
+                if (s->pending == s->pending_buf_size) {
+                    if (s->gzhead->hcrc && s->pending > beg)
+                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                            s->pending - beg);
+                    flush_pending(strm);
+                    beg = s->pending;
+                    if (s->pending == s->pending_buf_size)
+                        break;
+                }
+                put_byte(s, s->gzhead->extra[s->gzindex]);
+                s->gzindex++;
+            }
+            if (s->gzhead->hcrc && s->pending > beg)
+                strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                    s->pending - beg);
+            if (s->gzindex == s->gzhead->extra_len) {
+                s->gzindex = 0;
+                s->status = NAME_STATE;
+            }
+        }
+        else
+            s->status = NAME_STATE;
+    }
+    if (s->status == NAME_STATE) {
+        if (s->gzhead->name != NULL) {
+            uInt beg = s->pending;  /* start of bytes to update crc */
+            int val;
+
+            do {
+                if (s->pending == s->pending_buf_size) {
+                    if (s->gzhead->hcrc && s->pending > beg)
+                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                            s->pending - beg);
+                    flush_pending(strm);
+                    beg = s->pending;
+                    if (s->pending == s->pending_buf_size) {
+                        val = 1;
+                        break;
+                    }
+                }
+                val = s->gzhead->name[s->gzindex++];
+                put_byte(s, val);
+            } while (val != 0);
+            if (s->gzhead->hcrc && s->pending > beg)
+                strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                    s->pending - beg);
+            if (val == 0) {
+                s->gzindex = 0;
+                s->status = COMMENT_STATE;
+            }
+        }
+        else
+            s->status = COMMENT_STATE;
+    }
+    if (s->status == COMMENT_STATE) {
+        if (s->gzhead->comment != NULL) {
+            uInt beg = s->pending;  /* start of bytes to update crc */
+            int val;
+
+            do {
+                if (s->pending == s->pending_buf_size) {
+                    if (s->gzhead->hcrc && s->pending > beg)
+                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                            s->pending - beg);
+                    flush_pending(strm);
+                    beg = s->pending;
+                    if (s->pending == s->pending_buf_size) {
+                        val = 1;
+                        break;
+                    }
+                }
+                val = s->gzhead->comment[s->gzindex++];
+                put_byte(s, val);
+            } while (val != 0);
+            if (s->gzhead->hcrc && s->pending > beg)
+                strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                    s->pending - beg);
+            if (val == 0)
+                s->status = HCRC_STATE;
+        }
+        else
+            s->status = HCRC_STATE;
+    }
+    if (s->status == HCRC_STATE) {
+        if (s->gzhead->hcrc) {
+            if (s->pending + 2 > s->pending_buf_size)
+                flush_pending(strm);
+            if (s->pending + 2 <= s->pending_buf_size) {
+                put_byte(s, (Byte)(strm->adler & 0xff));
+                put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+                strm->adler = crc32(0L, Z_NULL, 0);
+                s->status = BUSY_STATE;
+            }
+        }
+        else
+            s->status = BUSY_STATE;
+    }
+#endif
+
+    /* Flush as much pending output as possible */
+    if (s->pending != 0) {
+        flush_pending(strm);
+        if (strm->avail_out == 0) {
+            /* Since avail_out is 0, deflate will be called again with
+             * more output space, but possibly with both pending and
+             * avail_in equal to zero. There won't be anything to do,
+             * but this is not an error situation so make sure we
+             * return OK instead of BUF_ERROR at next call of deflate:
+             */
+            s->last_flush = -1;
+            return Z_OK;
+        }
+
+    /* Make sure there is something to do and avoid duplicate consecutive
+     * flushes. For repeated and useless calls with Z_FINISH, we keep
+     * returning Z_STREAM_END instead of Z_BUF_ERROR.
+     */
+    } else if (strm->avail_in == 0 && flush <= old_flush &&
+               flush != Z_FINISH) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
+    /* User must not provide more input after the first FINISH: */
+    if (s->status == FINISH_STATE && strm->avail_in != 0) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
+    /* Start a new block or continue the current one.
+     */
+    if (strm->avail_in != 0 || s->lookahead != 0 ||
+        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
+        block_state bstate;
+
+        bstate = (*(configuration_table[s->level].func))(s, flush);
+
+        if (bstate == finish_started || bstate == finish_done) {
+            s->status = FINISH_STATE;
+        }
+        if (bstate == need_more || bstate == finish_started) {
+            if (strm->avail_out == 0) {
+                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
+            }
+            return Z_OK;
+            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
+             * of deflate should use the same flush parameter to make sure
+             * that the flush is complete. So we don't have to output an
+             * empty block here, this will be done at next call. This also
+             * ensures that for a very small output buffer, we emit at most
+             * one empty block.
+             */
+        }
+        if (bstate == block_done) {
+            if (flush == Z_PARTIAL_FLUSH) {
+                _tr_align(s);
+            } else { /* FULL_FLUSH or SYNC_FLUSH */
+                _tr_stored_block(s, (char*)0, 0L, 0);
+                /* For a full flush, this empty block will be recognized
+                 * as a special marker by inflate_sync().
+                 */
+                if (flush == Z_FULL_FLUSH) {
+                    CLEAR_HASH(s);             /* forget history */
+                }
+            }
+            flush_pending(strm);
+            if (strm->avail_out == 0) {
+              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
+              return Z_OK;
+            }
+        }
+    }
+    Assert(strm->avail_out > 0, "bug2");
+
+    if (flush != Z_FINISH) return Z_OK;
+    if (s->wrap <= 0) return Z_STREAM_END;
+
+    /* Write the trailer */
+#ifdef GZIP
+    if (s->wrap == 2) {
+        put_byte(s, (Byte)(strm->adler & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
+        put_byte(s, (Byte)(strm->total_in & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
+    }
+    else
+#endif
+    {
+        putShortMSB(s, (uInt)(strm->adler >> 16));
+        putShortMSB(s, (uInt)(strm->adler & 0xffff));
+    }
+    flush_pending(strm);
+    /* If avail_out is zero, the application will call deflate again
+     * to flush the rest.
+     */
+    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
+    return s->pending != 0 ? Z_OK : Z_STREAM_END;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateEnd (strm)
+    z_streamp strm;
+{
+    int status;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+
+    status = strm->state->status;
+    if (status != INIT_STATE &&
+        status != EXTRA_STATE &&
+        status != NAME_STATE &&
+        status != COMMENT_STATE &&
+        status != HCRC_STATE &&
+        status != BUSY_STATE &&
+        status != FINISH_STATE) {
+      return Z_STREAM_ERROR;
+    }
+
+    /* Deallocate in reverse order of allocations: */
+    TRY_FREE(strm, strm->state->pending_buf);
+    TRY_FREE(strm, strm->state->head);
+    TRY_FREE(strm, strm->state->prev);
+    TRY_FREE(strm, strm->state->window);
+
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+
+    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
+}
+
+/* =========================================================================
+ * Copy the source state to the destination state.
+ * To simplify the source, this is not supported for 16-bit MSDOS (which
+ * doesn't have enough memory anyway to duplicate compression states).
+ */
+int ZEXPORT deflateCopy (dest, source)
+    z_streamp dest;
+    z_streamp source;
+{
+#ifdef MAXSEG_64K
+    return Z_STREAM_ERROR;
+#else
+    deflate_state *ds;
+    deflate_state *ss;
+    ushf *overlay;
+
+
+    if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
+        return Z_STREAM_ERROR;
+    }
+
+    ss = source->state;
+
+    zmemcpy(dest, source, sizeof(z_stream));
+
+    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
+    if (ds == Z_NULL) return Z_MEM_ERROR;
+    dest->state = (struct internal_state FAR *) ds;
+    zmemcpy(ds, ss, sizeof(deflate_state));
+    ds->strm = dest;
+
+    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
+    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
+    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
+    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
+    ds->pending_buf = (uchf *) overlay;
+
+    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
+        ds->pending_buf == Z_NULL) {
+        deflateEnd (dest);
+        return Z_MEM_ERROR;
+    }
+    /* following zmemcpy do not work for 16-bit MSDOS */
+    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
+    zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));
+    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
+    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
+
+    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
+    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
+    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
+
+    ds->l_desc.dyn_tree = ds->dyn_ltree;
+    ds->d_desc.dyn_tree = ds->dyn_dtree;
+    ds->bl_desc.dyn_tree = ds->bl_tree;
+
+    return Z_OK;
+#endif /* MAXSEG_64K */
+}
+
+/* ===========================================================================
+ * Read a new buffer from the current input stream, update the adler32
+ * and total number of bytes read.  All deflate() input goes through
+ * this function so some applications may wish to modify it to avoid
+ * allocating a large strm->next_in buffer and copying from it.
+ * (See also flush_pending()).
+ */
+local int read_buf(strm, buf, size)
+    z_streamp strm;
+    Bytef *buf;
+    unsigned size;
+{
+    unsigned len = strm->avail_in;
+
+    if (len > size) len = size;
+    if (len == 0) return 0;
+
+    strm->avail_in  -= len;
+
+    if (strm->state->wrap == 1) {
+        strm->adler = adler32(strm->adler, strm->next_in, len);
+    }
+#ifdef GZIP
+    else if (strm->state->wrap == 2) {
+        strm->adler = crc32(strm->adler, strm->next_in, len);
+    }
+#endif
+    zmemcpy(buf, strm->next_in, len);
+    strm->next_in  += len;
+    strm->total_in += len;
+
+    return (int)len;
+}
+
+/* ===========================================================================
+ * Initialize the "longest match" routines for a new zlib stream
+ */
+local void lm_init (s)
+    deflate_state *s;
+{
+    s->window_size = (ulg)2L*s->w_size;
+
+    CLEAR_HASH(s);
+
+    /* Set the default configuration parameters:
+     */
+    s->max_lazy_match   = configuration_table[s->level].max_lazy;
+    s->good_match       = configuration_table[s->level].good_length;
+    s->nice_match       = configuration_table[s->level].nice_length;
+    s->max_chain_length = configuration_table[s->level].max_chain;
+
+    s->strstart = 0;
+    s->block_start = 0L;
+    s->lookahead = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    s->ins_h = 0;
+#ifndef FASTEST
+#ifdef ASMV
+    match_init(); /* initialize the asm code */
+#endif
+#endif
+}
+
+#ifndef FASTEST
+/* ===========================================================================
+ * Set match_start to the longest match starting at the given string and
+ * return its length. Matches shorter or equal to prev_length are discarded,
+ * in which case the result is equal to prev_length and match_start is
+ * garbage.
+ * IN assertions: cur_match is the head of the hash chain for the current
+ *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
+ * OUT assertion: the match length is not greater than s->lookahead.
+ */
+#ifndef ASMV
+/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
+ * match.S. The code will be functionally equivalent.
+ */
+local uInt longest_match(s, cur_match)
+    deflate_state *s;
+    IPos cur_match;                             /* current match */
+{
+    unsigned chain_length = s->max_chain_length;/* max hash chain length */
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                       /* matched string */
+    register int len;                           /* length of current match */
+    int best_len = s->prev_length;              /* best match length so far */
+    int nice_match = s->nice_match;             /* stop if match long enough */
+    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
+        s->strstart - (IPos)MAX_DIST(s) : NIL;
+    /* Stop when cur_match becomes <= limit. To simplify the code,
+     * we prevent matches with the string of window index 0.
+     */
+    Posf *prev = s->prev;
+    uInt wmask = s->w_mask;
+
+#ifdef UNALIGNED_OK
+    /* Compare two bytes at a time. Note: this is not always beneficial.
+     * Try with and without -DUNALIGNED_OK to check.
+     */
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
+    register ush scan_start = *(ushf*)scan;
+    register ush scan_end   = *(ushf*)(scan+best_len-1);
+#else
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+    register Byte scan_end1  = scan[best_len-1];
+    register Byte scan_end   = scan[best_len];
+#endif
+
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+     * It is easy to get rid of this optimization if necessary.
+     */
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+    /* Do not waste too much time if we already have a good match: */
+    if (s->prev_length >= s->good_match) {
+        chain_length >>= 2;
+    }
+    /* Do not look for matches beyond the end of the input. This is necessary
+     * to make deflate deterministic.
+     */
+    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
+
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+    do {
+        Assert(cur_match < s->strstart, "no future");
+        match = s->window + cur_match;
+
+        /* Skip to next match if the match length cannot increase
+         * or if the match length is less than 2.  Note that the checks below
+         * for insufficient lookahead only occur occasionally for performance
+         * reasons.  Therefore uninitialized memory will be accessed, and
+         * conditional jumps will be made that depend on those values.
+         * However the length of the match is limited to the lookahead, so
+         * the output of deflate is not affected by the uninitialized values.
+         */
+#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
+        /* This code assumes sizeof(unsigned short) == 2. Do not use
+         * UNALIGNED_OK if your compiler uses a different size.
+         */
+        if (*(ushf*)(match+best_len-1) != scan_end ||
+            *(ushf*)match != scan_start) continue;
+
+        /* It is not necessary to compare scan[2] and match[2] since they are
+         * always equal when the other bytes match, given that the hash keys
+         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
+         * strstart+3, +5, ... up to strstart+257. We check for insufficient
+         * lookahead only every 4th comparison; the 128th check will be made
+         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
+         * necessary to put more guard bytes at the end of the window, or
+         * to check more often for insufficient lookahead.
+         */
+        Assert(scan[2] == match[2], "scan[2]?");
+        scan++, match++;
+        do {
+        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 scan < strend);
+        /* The funny "do {}" generates better code on most compilers */
+
+        /* Here, scan <= window+strstart+257 */
+        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+        if (*scan == *match) scan++;
+
+        len = (MAX_MATCH - 1) - (int)(strend-scan);
+        scan = strend - (MAX_MATCH-1);
+
+#else /* UNALIGNED_OK */
+
+        if (match[best_len]   != scan_end  ||
+            match[best_len-1] != scan_end1 ||
+            *match            != *scan     ||
+            *++match          != scan[1])      continue;
+
+        /* The check at best_len-1 can be removed because it will be made
+         * again later. (This heuristic is not always a win.)
+         * It is not necessary to compare scan[2] and match[2] since they
+         * are always equal when the other bytes match, given that
+         * the hash keys are equal and that HASH_BITS >= 8.
+         */
+        scan += 2, match++;
+        Assert(*scan == *match, "match[2]?");
+
+        /* We check for insufficient lookahead only every 8th comparison;
+         * the 256th check will be made at strstart+258.
+         */
+        do {
+        } while (*++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 scan < strend);
+
+        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+        len = MAX_MATCH - (int)(strend - scan);
+        scan = strend - MAX_MATCH;
+
+#endif /* UNALIGNED_OK */
+
+        if (len > best_len) {
+            s->match_start = cur_match;
+            best_len = len;
+            if (len >= nice_match) break;
+#ifdef UNALIGNED_OK
+            scan_end = *(ushf*)(scan+best_len-1);
+#else
+            scan_end1  = scan[best_len-1];
+            scan_end   = scan[best_len];
+#endif
+        }
+    } while ((cur_match = prev[cur_match & wmask]) > limit
+             && --chain_length != 0);
+
+    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
+    return s->lookahead;
+}
+#endif /* ASMV */
+#endif /* FASTEST */
+
+/* ---------------------------------------------------------------------------
+ * Optimized version for level == 1 or strategy == Z_RLE only
+ */
+local uInt longest_match_fast(s, cur_match)
+    deflate_state *s;
+    IPos cur_match;                             /* current match */
+{
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                       /* matched string */
+    register int len;                           /* length of current match */
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+     * It is easy to get rid of this optimization if necessary.
+     */
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+    Assert(cur_match < s->strstart, "no future");
+
+    match = s->window + cur_match;
+
+    /* Return failure if the match length is less than 2:
+     */
+    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
+
+    /* The check at best_len-1 can be removed because it will be made
+     * again later. (This heuristic is not always a win.)
+     * It is not necessary to compare scan[2] and match[2] since they
+     * are always equal when the other bytes match, given that
+     * the hash keys are equal and that HASH_BITS >= 8.
+     */
+    scan += 2, match += 2;
+    Assert(*scan == *match, "match[2]?");
+
+    /* We check for insufficient lookahead only every 8th comparison;
+     * the 256th check will be made at strstart+258.
+     */
+    do {
+    } while (*++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             scan < strend);
+
+    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+    len = MAX_MATCH - (int)(strend - scan);
+
+    if (len < MIN_MATCH) return MIN_MATCH - 1;
+
+    s->match_start = cur_match;
+    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
+}
+
+#ifdef DEBUG
+/* ===========================================================================
+ * Check that the match at match_start is indeed a match.
+ */
+local void check_match(s, start, match, length)
+    deflate_state *s;
+    IPos start, match;
+    int length;
+{
+    /* check that the match is indeed a match */
+    if (zmemcmp(s->window + match,
+                s->window + start, length) != EQUAL) {
+        fprintf(stderr, " start %u, match %u, length %d\n",
+                start, match, length);
+        do {
+            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
+        } while (--length != 0);
+        z_error("invalid match");
+    }
+    if (z_verbose > 1) {
+        fprintf(stderr,"\\[%d,%d]", start-match, length);
+        do { putc(s->window[start++], stderr); } while (--length != 0);
+    }
+}
+#else
+#  define check_match(s, start, match, length)
+#endif /* DEBUG */
+
+/* ===========================================================================
+ * Fill the window when the lookahead becomes insufficient.
+ * Updates strstart and lookahead.
+ *
+ * IN assertion: lookahead < MIN_LOOKAHEAD
+ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
+ *    At least one byte has been read, or avail_in == 0; reads are
+ *    performed for at least two bytes (required for the zip translate_eol
+ *    option -- not supported here).
+ */
+local void fill_window(s)
+    deflate_state *s;
+{
+    register unsigned n, m;
+    register Posf *p;
+    unsigned more;    /* Amount of free space at the end of the window. */
+    uInt wsize = s->w_size;
+
+    do {
+        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
+
+        /* Deal with !@#$% 64K limit: */
+        if (sizeof(int) <= 2) {
+            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
+                more = wsize;
+
+            } else if (more == (unsigned)(-1)) {
+                /* Very unlikely, but possible on 16 bit machine if
+                 * strstart == 0 && lookahead == 1 (input done a byte at time)
+                 */
+                more--;
+            }
+        }
+
+        /* If the window is almost full and there is insufficient lookahead,
+         * move the upper half to the lower one to make room in the upper half.
+         */
+        if (s->strstart >= wsize+MAX_DIST(s)) {
+
+            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
+            s->match_start -= wsize;
+            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
+            s->block_start -= (long) wsize;
+
+            /* Slide the hash table (could be avoided with 32 bit values
+               at the expense of memory usage). We slide even when level == 0
+               to keep the hash table consistent if we switch back to level > 0
+               later. (Using level 0 permanently is not an optimal usage of
+               zlib, so we don't care about this pathological case.)
+             */
+            /* %%% avoid this when Z_RLE */
+            n = s->hash_size;
+            p = &s->head[n];
+            do {
+                m = *--p;
+                *p = (Pos)(m >= wsize ? m-wsize : NIL);
+            } while (--n);
+
+            n = wsize;
+#ifndef FASTEST
+            p = &s->prev[n];
+            do {
+                m = *--p;
+                *p = (Pos)(m >= wsize ? m-wsize : NIL);
+                /* If n is not on any hash chain, prev[n] is garbage but
+                 * its value will never be used.
+                 */
+            } while (--n);
+#endif
+            more += wsize;
+        }
+        if (s->strm->avail_in == 0) return;
+
+        /* If there was no sliding:
+         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
+         *    more == window_size - lookahead - strstart
+         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
+         * => more >= window_size - 2*WSIZE + 2
+         * In the BIG_MEM or MMAP case (not yet supported),
+         *   window_size == input_size + MIN_LOOKAHEAD  &&
+         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
+         * Otherwise, window_size == 2*WSIZE so more >= 2.
+         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
+         */
+        Assert(more >= 2, "more < 2");
+
+        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
+        s->lookahead += n;
+
+        /* Initialize the hash value now that we have some input: */
+        if (s->lookahead >= MIN_MATCH) {
+            s->ins_h = s->window[s->strstart];
+            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+#if MIN_MATCH != 3
+            Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+        }
+        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
+         * but this is not important since only literal bytes will be emitted.
+         */
+
+    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
+}
+
+/* ===========================================================================
+ * Flush the current block, with given end-of-file flag.
+ * IN assertion: strstart is set to the end of the current match.
+ */
+#define FLUSH_BLOCK_ONLY(s, eof) { \
+   _tr_flush_block(s, (s->block_start >= 0L ? \
+                   (charf *)&s->window[(unsigned)s->block_start] : \
+                   (charf *)Z_NULL), \
+                (ulg)((long)s->strstart - s->block_start), \
+                (eof)); \
+   s->block_start = s->strstart; \
+   flush_pending(s->strm); \
+   Tracev((stderr,"[FLUSH]")); \
+}
+
+/* Same but force premature exit if necessary. */
+#define FLUSH_BLOCK(s, eof) { \
+   FLUSH_BLOCK_ONLY(s, eof); \
+   if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \
+}
+
+/* ===========================================================================
+ * Copy without compression as much as possible from the input stream, return
+ * the current block state.
+ * This function does not insert new strings in the dictionary since
+ * uncompressible data is probably not useful. This function is used
+ * only for the level=0 compression option.
+ * NOTE: this function should be optimized to avoid extra copying from
+ * window to pending_buf.
+ */
+local block_state deflate_stored(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
+     * to pending_buf_size, and each stored block has a 5 byte header:
+     */
+    ulg max_block_size = 0xffff;
+    ulg max_start;
+
+    if (max_block_size > s->pending_buf_size - 5) {
+        max_block_size = s->pending_buf_size - 5;
+    }
+
+    /* Copy as much as possible from input to output: */
+    for (;;) {
+        /* Fill the window as much as possible: */
+        if (s->lookahead <= 1) {
+
+            Assert(s->strstart < s->w_size+MAX_DIST(s) ||
+                   s->block_start >= (long)s->w_size, "slide too late");
+
+            fill_window(s);
+            if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
+
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+        Assert(s->block_start >= 0L, "block gone");
+
+        s->strstart += s->lookahead;
+        s->lookahead = 0;
+
+        /* Emit a stored block if pending_buf will be full: */
+        max_start = s->block_start + max_block_size;
+        if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
+            /* strstart == 0 is possible when wraparound on 16-bit machine */
+            s->lookahead = (uInt)(s->strstart - max_start);
+            s->strstart = (uInt)max_start;
+            FLUSH_BLOCK(s, 0);
+        }
+        /* Flush if we may have to slide, otherwise block_start may become
+         * negative and the data will be gone:
+         */
+        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
+            FLUSH_BLOCK(s, 0);
+        }
+    }
+    FLUSH_BLOCK(s, flush == Z_FINISH);
+    return flush == Z_FINISH ? finish_done : block_done;
+}
+
+/* ===========================================================================
+ * Compress as much as possible from the input stream, return the current
+ * block state.
+ * This function does not perform lazy evaluation of matches and inserts
+ * new strings in the dictionary only for unmatched strings or for short
+ * matches. It is used only for the fast compression options.
+ */
+local block_state deflate_fast(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    IPos hash_head = NIL; /* head of the hash chain */
+    int bflush;           /* set if current block must be flushed */
+
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+        if (s->lookahead < MIN_LOOKAHEAD) {
+            fill_window(s);
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* Insert the string window[strstart .. strstart+2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
+
+        /* Find the longest match, discarding those <= prev_length.
+         * At this point we have always match_length < MIN_MATCH
+         */
+        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+#ifdef FASTEST
+            if ((s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) ||
+                (s->strategy == Z_RLE && s->strstart - hash_head == 1)) {
+                s->match_length = longest_match_fast (s, hash_head);
+            }
+#else
+            if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) {
+                s->match_length = longest_match (s, hash_head);
+            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {
+                s->match_length = longest_match_fast (s, hash_head);
+            }
+#endif
+            /* longest_match() or longest_match_fast() sets match_start */
+        }
+        if (s->match_length >= MIN_MATCH) {
+            check_match(s, s->strstart, s->match_start, s->match_length);
+
+            _tr_tally_dist(s, s->strstart - s->match_start,
+                           s->match_length - MIN_MATCH, bflush);
+
+            s->lookahead -= s->match_length;
+
+            /* Insert new strings in the hash table only if the match length
+             * is not too large. This saves time but degrades compression.
+             */
+#ifndef FASTEST
+            if (s->match_length <= s->max_insert_length &&
+                s->lookahead >= MIN_MATCH) {
+                s->match_length--; /* string at strstart already in table */
+                do {
+                    s->strstart++;
+                    INSERT_STRING(s, s->strstart, hash_head);
+                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
+                     * always MIN_MATCH bytes ahead.
+                     */
+                } while (--s->match_length != 0);
+                s->strstart++;
+            } else
+#endif
+            {
+                s->strstart += s->match_length;
+                s->match_length = 0;
+                s->ins_h = s->window[s->strstart];
+                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+#if MIN_MATCH != 3
+                Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
+                 * matter since it will be recomputed at next deflate call.
+                 */
+            }
+        } else {
+            /* No match, output a literal byte */
+            Tracevv((stderr,"%c", s->window[s->strstart]));
+            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            s->lookahead--;
+            s->strstart++;
+        }
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    FLUSH_BLOCK(s, flush == Z_FINISH);
+    return flush == Z_FINISH ? finish_done : block_done;
+}
+
+#ifndef FASTEST
+/* ===========================================================================
+ * Same as above, but achieves better compression. We use a lazy
+ * evaluation for matches: a match is finally adopted only if there is
+ * no better match at the next window position.
+ */
+local block_state deflate_slow(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    IPos hash_head = NIL;    /* head of hash chain */
+    int bflush;              /* set if current block must be flushed */
+
+    /* Process the input block. */
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+        if (s->lookahead < MIN_LOOKAHEAD) {
+            fill_window(s);
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* Insert the string window[strstart .. strstart+2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
+
+        /* Find the longest match, discarding those <= prev_length.
+         */
+        s->prev_length = s->match_length, s->prev_match = s->match_start;
+        s->match_length = MIN_MATCH-1;
+
+        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
+            s->strstart - hash_head <= MAX_DIST(s)) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+            if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) {
+                s->match_length = longest_match (s, hash_head);
+            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {
+                s->match_length = longest_match_fast (s, hash_head);
+            }
+            /* longest_match() or longest_match_fast() sets match_start */
+
+            if (s->match_length <= 5 && (s->strategy == Z_FILTERED
+#if TOO_FAR <= 32767
+                || (s->match_length == MIN_MATCH &&
+                    s->strstart - s->match_start > TOO_FAR)
+#endif
+                )) {
+
+                /* If prev_match is also MIN_MATCH, match_start is garbage
+                 * but we will ignore the current match anyway.
+                 */
+                s->match_length = MIN_MATCH-1;
+            }
+        }
+        /* If there was a match at the previous step and the current
+         * match is not better, output the previous match:
+         */
+        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
+            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
+            /* Do not insert strings in hash table beyond this. */
+
+            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
+
+            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
+                           s->prev_length - MIN_MATCH, bflush);
+
+            /* Insert in hash table all strings up to the end of the match.
+             * strstart-1 and strstart are already inserted. If there is not
+             * enough lookahead, the last two strings are not inserted in
+             * the hash table.
+             */
+            s->lookahead -= s->prev_length-1;
+            s->prev_length -= 2;
+            do {
+                if (++s->strstart <= max_insert) {
+                    INSERT_STRING(s, s->strstart, hash_head);
+                }
+            } while (--s->prev_length != 0);
+            s->match_available = 0;
+            s->match_length = MIN_MATCH-1;
+            s->strstart++;
+
+            if (bflush) FLUSH_BLOCK(s, 0);
+
+        } else if (s->match_available) {
+            /* If there was no match at the previous position, output a
+             * single literal. If there was a match but the current match
+             * is longer, truncate the previous match to a single literal.
+             */
+            Tracevv((stderr,"%c", s->window[s->strstart-1]));
+            _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+            if (bflush) {
+                FLUSH_BLOCK_ONLY(s, 0);
+            }
+            s->strstart++;
+            s->lookahead--;
+            if (s->strm->avail_out == 0) return need_more;
+        } else {
+            /* There is no previous match to compare with, wait for
+             * the next step to decide.
+             */
+            s->match_available = 1;
+            s->strstart++;
+            s->lookahead--;
+        }
+    }
+    Assert (flush != Z_NO_FLUSH, "no flush?");
+    if (s->match_available) {
+        Tracevv((stderr,"%c", s->window[s->strstart-1]));
+        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+        s->match_available = 0;
+    }
+    FLUSH_BLOCK(s, flush == Z_FINISH);
+    return flush == Z_FINISH ? finish_done : block_done;
+}
+#endif /* FASTEST */
+
+#if 0
+/* ===========================================================================
+ * For Z_RLE, simply look for runs of bytes, generate matches only of distance
+ * one.  Do not maintain a hash table.  (It will be regenerated if this run of
+ * deflate switches away from Z_RLE.)
+ */
+local block_state deflate_rle(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    int bflush;         /* set if current block must be flushed */
+    uInt run;           /* length of run */
+    uInt max;           /* maximum length of run */
+    uInt prev;          /* byte at distance one to match */
+    Bytef *scan;        /* scan for end of run */
+
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the longest encodable run.
+         */
+        if (s->lookahead < MAX_MATCH) {
+            fill_window(s);
+            if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* See how many times the previous byte repeats */
+        run = 0;
+        if (s->strstart > 0) {      /* if there is a previous byte, that is */
+            max = s->lookahead < MAX_MATCH ? s->lookahead : MAX_MATCH;
+            scan = s->window + s->strstart - 1;
+            prev = *scan++;
+            do {
+                if (*scan++ != prev)
+                    break;
+            } while (++run < max);
+        }
+
+        /* Emit match if have run of MIN_MATCH or longer, else emit literal */
+        if (run >= MIN_MATCH) {
+            check_match(s, s->strstart, s->strstart - 1, run);
+            _tr_tally_dist(s, 1, run - MIN_MATCH, bflush);
+            s->lookahead -= run;
+            s->strstart += run;
+        } else {
+            /* No match, output a literal byte */
+            Tracevv((stderr,"%c", s->window[s->strstart]));
+            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            s->lookahead--;
+            s->strstart++;
+        }
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    FLUSH_BLOCK(s, flush == Z_FINISH);
+    return flush == Z_FINISH ? finish_done : block_done;
+}
+#endif
diff --git a/utils/zenutils/libraries/zlib123/zlib/deflate.h b/utils/zenutils/libraries/zlib123/zlib/deflate.h
index 222c53e043..05a5ab3a2c 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/deflate.h
+++ b/utils/zenutils/libraries/zlib123/zlib/deflate.h
@@ -1,331 +1,331 @@
-/* deflate.h -- internal compression state

- * Copyright (C) 1995-2004 Jean-loup Gailly

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* WARNING: this file should *not* be used by applications. It is

-   part of the implementation of the compression library and is

-   subject to change. Applications should only use zlib.h.

- */

-

-/* @(#) $Id$ */

-

-#ifndef DEFLATE_H

-#define DEFLATE_H

-

-#include "zutil.h"

-

-/* define NO_GZIP when compiling if you want to disable gzip header and

-   trailer creation by deflate().  NO_GZIP would be used to avoid linking in

-   the crc code when it is not needed.  For shared libraries, gzip encoding

-   should be left enabled. */

-#ifndef NO_GZIP

-#  define GZIP

-#endif

-

-/* ===========================================================================

- * Internal compression state.

- */

-

-#define LENGTH_CODES 29

-/* number of length codes, not counting the special END_BLOCK code */

-

-#define LITERALS  256

-/* number of literal bytes 0..255 */

-

-#define L_CODES (LITERALS+1+LENGTH_CODES)

-/* number of Literal or Length codes, including the END_BLOCK code */

-

-#define D_CODES   30

-/* number of distance codes */

-

-#define BL_CODES  19

-/* number of codes used to transfer the bit lengths */

-

-#define HEAP_SIZE (2*L_CODES+1)

-/* maximum heap size */

-

-#define MAX_BITS 15

-/* All codes must not exceed MAX_BITS bits */

-

-#define INIT_STATE    42

-#define EXTRA_STATE   69

-#define NAME_STATE    73

-#define COMMENT_STATE 91

-#define HCRC_STATE   103

-#define BUSY_STATE   113

-#define FINISH_STATE 666

-/* Stream status */

-

-

-/* Data structure describing a single value and its code string. */

-typedef struct ct_data_s {

-    union {

-        ush  freq;       /* frequency count */

-        ush  code;       /* bit string */

-    } fc;

-    union {

-        ush  dad;        /* father node in Huffman tree */

-        ush  len;        /* length of bit string */

-    } dl;

-} FAR ct_data;

-

-#define Freq fc.freq

-#define Code fc.code

-#define Dad  dl.dad

-#define Len  dl.len

-

-typedef struct static_tree_desc_s  static_tree_desc;

-

-typedef struct tree_desc_s {

-    ct_data *dyn_tree;           /* the dynamic tree */

-    int     max_code;            /* largest code with non zero frequency */

-    static_tree_desc *stat_desc; /* the corresponding static tree */

-} FAR tree_desc;

-

-typedef ush Pos;

-typedef Pos FAR Posf;

-typedef unsigned IPos;

-

-/* A Pos is an index in the character window. We use short instead of int to

- * save space in the various tables. IPos is used only for parameter passing.

- */

-

-typedef struct internal_state {

-    z_streamp strm;      /* pointer back to this zlib stream */

-    int   status;        /* as the name implies */

-    Bytef *pending_buf;  /* output still pending */

-    ulg   pending_buf_size; /* size of pending_buf */

-    Bytef *pending_out;  /* next pending byte to output to the stream */

-    uInt   pending;      /* nb of bytes in the pending buffer */

-    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */

-    gz_headerp  gzhead;  /* gzip header information to write */

-    uInt   gzindex;      /* where in extra, name, or comment */

-    Byte  method;        /* STORED (for zip only) or DEFLATED */

-    int   last_flush;    /* value of flush param for previous deflate call */

-

-                /* used by deflate.c: */

-

-    uInt  w_size;        /* LZ77 window size (32K by default) */

-    uInt  w_bits;        /* log2(w_size)  (8..16) */

-    uInt  w_mask;        /* w_size - 1 */

-

-    Bytef *window;

-    /* Sliding window. Input bytes are read into the second half of the window,

-     * and move to the first half later to keep a dictionary of at least wSize

-     * bytes. With this organization, matches are limited to a distance of

-     * wSize-MAX_MATCH bytes, but this ensures that IO is always

-     * performed with a length multiple of the block size. Also, it limits

-     * the window size to 64K, which is quite useful on MSDOS.

-     * To do: use the user input buffer as sliding window.

-     */

-

-    ulg window_size;

-    /* Actual size of window: 2*wSize, except when the user input buffer

-     * is directly used as sliding window.

-     */

-

-    Posf *prev;

-    /* Link to older string with same hash index. To limit the size of this

-     * array to 64K, this link is maintained only for the last 32K strings.

-     * An index in this array is thus a window index modulo 32K.

-     */

-

-    Posf *head; /* Heads of the hash chains or NIL. */

-

-    uInt  ins_h;          /* hash index of string to be inserted */

-    uInt  hash_size;      /* number of elements in hash table */

-    uInt  hash_bits;      /* log2(hash_size) */

-    uInt  hash_mask;      /* hash_size-1 */

-

-    uInt  hash_shift;

-    /* Number of bits by which ins_h must be shifted at each input

-     * step. It must be such that after MIN_MATCH steps, the oldest

-     * byte no longer takes part in the hash key, that is:

-     *   hash_shift * MIN_MATCH >= hash_bits

-     */

-

-    long block_start;

-    /* Window position at the beginning of the current output block. Gets

-     * negative when the window is moved backwards.

-     */

-

-    uInt match_length;           /* length of best match */

-    IPos prev_match;             /* previous match */

-    int match_available;         /* set if previous match exists */

-    uInt strstart;               /* start of string to insert */

-    uInt match_start;            /* start of matching string */

-    uInt lookahead;              /* number of valid bytes ahead in window */

-

-    uInt prev_length;

-    /* Length of the best match at previous step. Matches not greater than this

-     * are discarded. This is used in the lazy match evaluation.

-     */

-

-    uInt max_chain_length;

-    /* To speed up deflation, hash chains are never searched beyond this

-     * length.  A higher limit improves compression ratio but degrades the

-     * speed.

-     */

-

-    uInt max_lazy_match;

-    /* Attempt to find a better match only when the current match is strictly

-     * smaller than this value. This mechanism is used only for compression

-     * levels >= 4.

-     */

-#   define max_insert_length  max_lazy_match

-    /* Insert new strings in the hash table only if the match length is not

-     * greater than this length. This saves time but degrades compression.

-     * max_insert_length is used only for compression levels <= 3.

-     */

-

-    int level;    /* compression level (1..9) */

-    int strategy; /* favor or force Huffman coding*/

-

-    uInt good_match;

-    /* Use a faster search when the previous match is longer than this */

-

-    int nice_match; /* Stop searching when current match exceeds this */

-

-                /* used by trees.c: */

-    /* Didn't use ct_data typedef below to supress compiler warning */

-    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */

-    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */

-    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */

-

-    struct tree_desc_s l_desc;               /* desc. for literal tree */

-    struct tree_desc_s d_desc;               /* desc. for distance tree */

-    struct tree_desc_s bl_desc;              /* desc. for bit length tree */

-

-    ush bl_count[MAX_BITS+1];

-    /* number of codes at each bit length for an optimal tree */

-

-    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */

-    int heap_len;               /* number of elements in the heap */

-    int heap_max;               /* element of largest frequency */

-    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.

-     * The same heap array is used to build all trees.

-     */

-

-    uch depth[2*L_CODES+1];

-    /* Depth of each subtree used as tie breaker for trees of equal frequency

-     */

-

-    uchf *l_buf;          /* buffer for literals or lengths */

-

-    uInt  lit_bufsize;

-    /* Size of match buffer for literals/lengths.  There are 4 reasons for

-     * limiting lit_bufsize to 64K:

-     *   - frequencies can be kept in 16 bit counters

-     *   - if compression is not successful for the first block, all input

-     *     data is still in the window so we can still emit a stored block even

-     *     when input comes from standard input.  (This can also be done for

-     *     all blocks if lit_bufsize is not greater than 32K.)

-     *   - if compression is not successful for a file smaller than 64K, we can

-     *     even emit a stored file instead of a stored block (saving 5 bytes).

-     *     This is applicable only for zip (not gzip or zlib).

-     *   - creating new Huffman trees less frequently may not provide fast

-     *     adaptation to changes in the input data statistics. (Take for

-     *     example a binary file with poorly compressible code followed by

-     *     a highly compressible string table.) Smaller buffer sizes give

-     *     fast adaptation but have of course the overhead of transmitting

-     *     trees more frequently.

-     *   - I can't count above 4

-     */

-

-    uInt last_lit;      /* running index in l_buf */

-

-    ushf *d_buf;

-    /* Buffer for distances. To simplify the code, d_buf and l_buf have

-     * the same number of elements. To use different lengths, an extra flag

-     * array would be necessary.

-     */

-

-    ulg opt_len;        /* bit length of current block with optimal trees */

-    ulg static_len;     /* bit length of current block with static trees */

-    uInt matches;       /* number of string matches in current block */

-    int last_eob_len;   /* bit length of EOB code for last block */

-

-#ifdef DEBUG

-    ulg compressed_len; /* total bit length of compressed file mod 2^32 */

-    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */

-#endif

-

-    ush bi_buf;

-    /* Output buffer. bits are inserted starting at the bottom (least

-     * significant bits).

-     */

-    int bi_valid;

-    /* Number of valid bits in bi_buf.  All bits above the last valid bit

-     * are always zero.

-     */

-

-} FAR deflate_state;

-

-/* Output a byte on the stream.

- * IN assertion: there is enough room in pending_buf.

- */

-#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}

-

-

-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)

-/* Minimum amount of lookahead, except at the end of the input file.

- * See deflate.c for comments about the MIN_MATCH+1.

- */

-

-#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)

-/* In order to simplify the code, particularly on 16 bit machines, match

- * distances are limited to MAX_DIST instead of WSIZE.

- */

-

-        /* in trees.c */

-void _tr_init         OF((deflate_state *s));

-int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));

-void _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,

-                          int eof));

-void _tr_align        OF((deflate_state *s));

-void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,

-                          int eof));

-

-#define d_code(dist) \

-   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])

-/* Mapping from a distance to a distance code. dist is the distance - 1 and

- * must not have side effects. _dist_code[256] and _dist_code[257] are never

- * used.

- */

-

-#ifndef DEBUG

-/* Inline versions of _tr_tally for speed: */

-

-#if defined(GEN_TREES_H) || !defined(STDC)

-  extern uch _length_code[];

-  extern uch _dist_code[];

-#else

-  extern const uch _length_code[];

-  extern const uch _dist_code[];

-#endif

-

-# define _tr_tally_lit(s, c, flush) \

-  { uch cc = (c); \

-    s->d_buf[s->last_lit] = 0; \

-    s->l_buf[s->last_lit++] = cc; \

-    s->dyn_ltree[cc].Freq++; \

-    flush = (s->last_lit == s->lit_bufsize-1); \

-   }

-# define _tr_tally_dist(s, distance, length, flush) \

-  { uch len = (length); \

-    ush dist = (distance); \

-    s->d_buf[s->last_lit] = dist; \

-    s->l_buf[s->last_lit++] = len; \

-    dist--; \

-    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \

-    s->dyn_dtree[d_code(dist)].Freq++; \

-    flush = (s->last_lit == s->lit_bufsize-1); \

-  }

-#else

-# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)

-# define _tr_tally_dist(s, distance, length, flush) \

-              flush = _tr_tally(s, distance, length)

-#endif

-

-#endif /* DEFLATE_H */

+/* deflate.h -- internal compression state
+ * Copyright (C) 1995-2004 Jean-loup Gailly
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* @(#) $Id$ */
+
+#ifndef DEFLATE_H
+#define DEFLATE_H
+
+#include "zutil.h"
+
+/* define NO_GZIP when compiling if you want to disable gzip header and
+   trailer creation by deflate().  NO_GZIP would be used to avoid linking in
+   the crc code when it is not needed.  For shared libraries, gzip encoding
+   should be left enabled. */
+#ifndef NO_GZIP
+#  define GZIP
+#endif
+
+/* ===========================================================================
+ * Internal compression state.
+ */
+
+#define LENGTH_CODES 29
+/* number of length codes, not counting the special END_BLOCK code */
+
+#define LITERALS  256
+/* number of literal bytes 0..255 */
+
+#define L_CODES (LITERALS+1+LENGTH_CODES)
+/* number of Literal or Length codes, including the END_BLOCK code */
+
+#define D_CODES   30
+/* number of distance codes */
+
+#define BL_CODES  19
+/* number of codes used to transfer the bit lengths */
+
+#define HEAP_SIZE (2*L_CODES+1)
+/* maximum heap size */
+
+#define MAX_BITS 15
+/* All codes must not exceed MAX_BITS bits */
+
+#define INIT_STATE    42
+#define EXTRA_STATE   69
+#define NAME_STATE    73
+#define COMMENT_STATE 91
+#define HCRC_STATE   103
+#define BUSY_STATE   113
+#define FINISH_STATE 666
+/* Stream status */
+
+
+/* Data structure describing a single value and its code string. */
+typedef struct ct_data_s {
+    union {
+        ush  freq;       /* frequency count */
+        ush  code;       /* bit string */
+    } fc;
+    union {
+        ush  dad;        /* father node in Huffman tree */
+        ush  len;        /* length of bit string */
+    } dl;
+} FAR ct_data;
+
+#define Freq fc.freq
+#define Code fc.code
+#define Dad  dl.dad
+#define Len  dl.len
+
+typedef struct static_tree_desc_s  static_tree_desc;
+
+typedef struct tree_desc_s {
+    ct_data *dyn_tree;           /* the dynamic tree */
+    int     max_code;            /* largest code with non zero frequency */
+    static_tree_desc *stat_desc; /* the corresponding static tree */
+} FAR tree_desc;
+
+typedef ush Pos;
+typedef Pos FAR Posf;
+typedef unsigned IPos;
+
+/* A Pos is an index in the character window. We use short instead of int to
+ * save space in the various tables. IPos is used only for parameter passing.
+ */
+
+typedef struct internal_state {
+    z_streamp strm;      /* pointer back to this zlib stream */
+    int   status;        /* as the name implies */
+    Bytef *pending_buf;  /* output still pending */
+    ulg   pending_buf_size; /* size of pending_buf */
+    Bytef *pending_out;  /* next pending byte to output to the stream */
+    uInt   pending;      /* nb of bytes in the pending buffer */
+    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
+    gz_headerp  gzhead;  /* gzip header information to write */
+    uInt   gzindex;      /* where in extra, name, or comment */
+    Byte  method;        /* STORED (for zip only) or DEFLATED */
+    int   last_flush;    /* value of flush param for previous deflate call */
+
+                /* used by deflate.c: */
+
+    uInt  w_size;        /* LZ77 window size (32K by default) */
+    uInt  w_bits;        /* log2(w_size)  (8..16) */
+    uInt  w_mask;        /* w_size - 1 */
+
+    Bytef *window;
+    /* Sliding window. Input bytes are read into the second half of the window,
+     * and move to the first half later to keep a dictionary of at least wSize
+     * bytes. With this organization, matches are limited to a distance of
+     * wSize-MAX_MATCH bytes, but this ensures that IO is always
+     * performed with a length multiple of the block size. Also, it limits
+     * the window size to 64K, which is quite useful on MSDOS.
+     * To do: use the user input buffer as sliding window.
+     */
+
+    ulg window_size;
+    /* Actual size of window: 2*wSize, except when the user input buffer
+     * is directly used as sliding window.
+     */
+
+    Posf *prev;
+    /* Link to older string with same hash index. To limit the size of this
+     * array to 64K, this link is maintained only for the last 32K strings.
+     * An index in this array is thus a window index modulo 32K.
+     */
+
+    Posf *head; /* Heads of the hash chains or NIL. */
+
+    uInt  ins_h;          /* hash index of string to be inserted */
+    uInt  hash_size;      /* number of elements in hash table */
+    uInt  hash_bits;      /* log2(hash_size) */
+    uInt  hash_mask;      /* hash_size-1 */
+
+    uInt  hash_shift;
+    /* Number of bits by which ins_h must be shifted at each input
+     * step. It must be such that after MIN_MATCH steps, the oldest
+     * byte no longer takes part in the hash key, that is:
+     *   hash_shift * MIN_MATCH >= hash_bits
+     */
+
+    long block_start;
+    /* Window position at the beginning of the current output block. Gets
+     * negative when the window is moved backwards.
+     */
+
+    uInt match_length;           /* length of best match */
+    IPos prev_match;             /* previous match */
+    int match_available;         /* set if previous match exists */
+    uInt strstart;               /* start of string to insert */
+    uInt match_start;            /* start of matching string */
+    uInt lookahead;              /* number of valid bytes ahead in window */
+
+    uInt prev_length;
+    /* Length of the best match at previous step. Matches not greater than this
+     * are discarded. This is used in the lazy match evaluation.
+     */
+
+    uInt max_chain_length;
+    /* To speed up deflation, hash chains are never searched beyond this
+     * length.  A higher limit improves compression ratio but degrades the
+     * speed.
+     */
+
+    uInt max_lazy_match;
+    /* Attempt to find a better match only when the current match is strictly
+     * smaller than this value. This mechanism is used only for compression
+     * levels >= 4.
+     */
+#   define max_insert_length  max_lazy_match
+    /* Insert new strings in the hash table only if the match length is not
+     * greater than this length. This saves time but degrades compression.
+     * max_insert_length is used only for compression levels <= 3.
+     */
+
+    int level;    /* compression level (1..9) */
+    int strategy; /* favor or force Huffman coding*/
+
+    uInt good_match;
+    /* Use a faster search when the previous match is longer than this */
+
+    int nice_match; /* Stop searching when current match exceeds this */
+
+                /* used by trees.c: */
+    /* Didn't use ct_data typedef below to supress compiler warning */
+    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
+    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
+    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
+
+    struct tree_desc_s l_desc;               /* desc. for literal tree */
+    struct tree_desc_s d_desc;               /* desc. for distance tree */
+    struct tree_desc_s bl_desc;              /* desc. for bit length tree */
+
+    ush bl_count[MAX_BITS+1];
+    /* number of codes at each bit length for an optimal tree */
+
+    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
+    int heap_len;               /* number of elements in the heap */
+    int heap_max;               /* element of largest frequency */
+    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
+     * The same heap array is used to build all trees.
+     */
+
+    uch depth[2*L_CODES+1];
+    /* Depth of each subtree used as tie breaker for trees of equal frequency
+     */
+
+    uchf *l_buf;          /* buffer for literals or lengths */
+
+    uInt  lit_bufsize;
+    /* Size of match buffer for literals/lengths.  There are 4 reasons for
+     * limiting lit_bufsize to 64K:
+     *   - frequencies can be kept in 16 bit counters
+     *   - if compression is not successful for the first block, all input
+     *     data is still in the window so we can still emit a stored block even
+     *     when input comes from standard input.  (This can also be done for
+     *     all blocks if lit_bufsize is not greater than 32K.)
+     *   - if compression is not successful for a file smaller than 64K, we can
+     *     even emit a stored file instead of a stored block (saving 5 bytes).
+     *     This is applicable only for zip (not gzip or zlib).
+     *   - creating new Huffman trees less frequently may not provide fast
+     *     adaptation to changes in the input data statistics. (Take for
+     *     example a binary file with poorly compressible code followed by
+     *     a highly compressible string table.) Smaller buffer sizes give
+     *     fast adaptation but have of course the overhead of transmitting
+     *     trees more frequently.
+     *   - I can't count above 4
+     */
+
+    uInt last_lit;      /* running index in l_buf */
+
+    ushf *d_buf;
+    /* Buffer for distances. To simplify the code, d_buf and l_buf have
+     * the same number of elements. To use different lengths, an extra flag
+     * array would be necessary.
+     */
+
+    ulg opt_len;        /* bit length of current block with optimal trees */
+    ulg static_len;     /* bit length of current block with static trees */
+    uInt matches;       /* number of string matches in current block */
+    int last_eob_len;   /* bit length of EOB code for last block */
+
+#ifdef DEBUG
+    ulg compressed_len; /* total bit length of compressed file mod 2^32 */
+    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
+#endif
+
+    ush bi_buf;
+    /* Output buffer. bits are inserted starting at the bottom (least
+     * significant bits).
+     */
+    int bi_valid;
+    /* Number of valid bits in bi_buf.  All bits above the last valid bit
+     * are always zero.
+     */
+
+} FAR deflate_state;
+
+/* Output a byte on the stream.
+ * IN assertion: there is enough room in pending_buf.
+ */
+#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
+
+
+#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
+/* Minimum amount of lookahead, except at the end of the input file.
+ * See deflate.c for comments about the MIN_MATCH+1.
+ */
+
+#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)
+/* In order to simplify the code, particularly on 16 bit machines, match
+ * distances are limited to MAX_DIST instead of WSIZE.
+ */
+
+        /* in trees.c */
+void _tr_init         OF((deflate_state *s));
+int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));
+void _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,
+                          int eof));
+void _tr_align        OF((deflate_state *s));
+void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
+                          int eof));
+
+#define d_code(dist) \
+   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
+/* Mapping from a distance to a distance code. dist is the distance - 1 and
+ * must not have side effects. _dist_code[256] and _dist_code[257] are never
+ * used.
+ */
+
+#ifndef DEBUG
+/* Inline versions of _tr_tally for speed: */
+
+#if defined(GEN_TREES_H) || !defined(STDC)
+  extern uch _length_code[];
+  extern uch _dist_code[];
+#else
+  extern const uch _length_code[];
+  extern const uch _dist_code[];
+#endif
+
+# define _tr_tally_lit(s, c, flush) \
+  { uch cc = (c); \
+    s->d_buf[s->last_lit] = 0; \
+    s->l_buf[s->last_lit++] = cc; \
+    s->dyn_ltree[cc].Freq++; \
+    flush = (s->last_lit == s->lit_bufsize-1); \
+   }
+# define _tr_tally_dist(s, distance, length, flush) \
+  { uch len = (length); \
+    ush dist = (distance); \
+    s->d_buf[s->last_lit] = dist; \
+    s->l_buf[s->last_lit++] = len; \
+    dist--; \
+    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
+    s->dyn_dtree[d_code(dist)].Freq++; \
+    flush = (s->last_lit == s->lit_bufsize-1); \
+  }
+#else
+# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
+# define _tr_tally_dist(s, distance, length, flush) \
+              flush = _tr_tally(s, distance, length)
+#endif
+
+#endif /* DEFLATE_H */
diff --git a/utils/zenutils/libraries/zlib123/zlib/example.c b/utils/zenutils/libraries/zlib123/zlib/example.c
index 455a1d062a..6c8a0ee763 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/example.c
+++ b/utils/zenutils/libraries/zlib123/zlib/example.c
@@ -1,565 +1,565 @@
-/* example.c -- usage example of the zlib compression library

- * Copyright (C) 1995-2004 Jean-loup Gailly.

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* @(#) $Id$ */

-

-#include <stdio.h>

-#include "zlib.h"

-

-#ifdef STDC

-#  include <string.h>

-#  include <stdlib.h>

-#endif

-

-#if defined(VMS) || defined(RISCOS)

-#  define TESTFILE "foo-gz"

-#else

-#  define TESTFILE "foo.gz"

-#endif

-

-#define CHECK_ERR(err, msg) { \

-    if (err != Z_OK) { \

-        fprintf(stderr, "%s error: %d\n", msg, err); \

-        exit(1); \

-    } \

-}

-

-const char hello[] = "hello, hello!";

-/* "hello world" would be more standard, but the repeated "hello"

- * stresses the compression code better, sorry...

- */

-

-const char dictionary[] = "hello";

-uLong dictId; /* Adler32 value of the dictionary */

-

-void test_compress      OF((Byte *compr, uLong comprLen,

-                            Byte *uncompr, uLong uncomprLen));

-void test_gzio          OF((const char *fname,

-                            Byte *uncompr, uLong uncomprLen));

-void test_deflate       OF((Byte *compr, uLong comprLen));

-void test_inflate       OF((Byte *compr, uLong comprLen,

-                            Byte *uncompr, uLong uncomprLen));

-void test_large_deflate OF((Byte *compr, uLong comprLen,

-                            Byte *uncompr, uLong uncomprLen));

-void test_large_inflate OF((Byte *compr, uLong comprLen,

-                            Byte *uncompr, uLong uncomprLen));

-void test_flush         OF((Byte *compr, uLong *comprLen));

-void test_sync          OF((Byte *compr, uLong comprLen,

-                            Byte *uncompr, uLong uncomprLen));

-void test_dict_deflate  OF((Byte *compr, uLong comprLen));

-void test_dict_inflate  OF((Byte *compr, uLong comprLen,

-                            Byte *uncompr, uLong uncomprLen));

-int  main               OF((int argc, char *argv[]));

-

-/* ===========================================================================

- * Test compress() and uncompress()

- */

-void test_compress(compr, comprLen, uncompr, uncomprLen)

-    Byte *compr, *uncompr;

-    uLong comprLen, uncomprLen;

-{

-    int err;

-    uLong len = (uLong)strlen(hello)+1;

-

-    err = compress(compr, &comprLen, (const Bytef*)hello, len);

-    CHECK_ERR(err, "compress");

-

-    strcpy((char*)uncompr, "garbage");

-

-    err = uncompress(uncompr, &uncomprLen, compr, comprLen);

-    CHECK_ERR(err, "uncompress");

-

-    if (strcmp((char*)uncompr, hello)) {

-        fprintf(stderr, "bad uncompress\n");

-        exit(1);

-    } else {

-        printf("uncompress(): %s\n", (char *)uncompr);

-    }

-}

-

-/* ===========================================================================

- * Test read/write of .gz files

- */

-void test_gzio(fname, uncompr, uncomprLen)

-    const char *fname; /* compressed file name */

-    Byte *uncompr;

-    uLong uncomprLen;

-{

-#ifdef NO_GZCOMPRESS

-    fprintf(stderr, "NO_GZCOMPRESS -- gz* functions cannot compress\n");

-#else

-    int err;

-    int len = (int)strlen(hello)+1;

-    gzFile file;

-    z_off_t pos;

-

-    file = gzopen(fname, "wb");

-    if (file == NULL) {

-        fprintf(stderr, "gzopen error\n");

-        exit(1);

-    }

-    gzputc(file, 'h');

-    if (gzputs(file, "ello") != 4) {

-        fprintf(stderr, "gzputs err: %s\n", gzerror(file, &err));

-        exit(1);

-    }

-    if (gzprintf(file, ", %s!", "hello") != 8) {

-        fprintf(stderr, "gzprintf err: %s\n", gzerror(file, &err));

-        exit(1);

-    }

-    gzseek(file, 1L, SEEK_CUR); /* add one zero byte */

-    gzclose(file);

-

-    file = gzopen(fname, "rb");

-    if (file == NULL) {

-        fprintf(stderr, "gzopen error\n");

-        exit(1);

-    }

-    strcpy((char*)uncompr, "garbage");

-

-    if (gzread(file, uncompr, (unsigned)uncomprLen) != len) {

-        fprintf(stderr, "gzread err: %s\n", gzerror(file, &err));

-        exit(1);

-    }

-    if (strcmp((char*)uncompr, hello)) {

-        fprintf(stderr, "bad gzread: %s\n", (char*)uncompr);

-        exit(1);

-    } else {

-        printf("gzread(): %s\n", (char*)uncompr);

-    }

-

-    pos = gzseek(file, -8L, SEEK_CUR);

-    if (pos != 6 || gztell(file) != pos) {

-        fprintf(stderr, "gzseek error, pos=%ld, gztell=%ld\n",

-                (long)pos, (long)gztell(file));

-        exit(1);

-    }

-

-    if (gzgetc(file) != ' ') {

-        fprintf(stderr, "gzgetc error\n");

-        exit(1);

-    }

-

-    if (gzungetc(' ', file) != ' ') {

-        fprintf(stderr, "gzungetc error\n");

-        exit(1);

-    }

-

-    gzgets(file, (char*)uncompr, (int)uncomprLen);

-    if (strlen((char*)uncompr) != 7) { /* " hello!" */

-        fprintf(stderr, "gzgets err after gzseek: %s\n", gzerror(file, &err));

-        exit(1);

-    }

-    if (strcmp((char*)uncompr, hello + 6)) {

-        fprintf(stderr, "bad gzgets after gzseek\n");

-        exit(1);

-    } else {

-        printf("gzgets() after gzseek: %s\n", (char*)uncompr);

-    }

-

-    gzclose(file);

-#endif

-}

-

-/* ===========================================================================

- * Test deflate() with small buffers

- */

-void test_deflate(compr, comprLen)

-    Byte *compr;

-    uLong comprLen;

-{

-    z_stream c_stream; /* compression stream */

-    int err;

-    uLong len = (uLong)strlen(hello)+1;

-

-    c_stream.zalloc = (alloc_func)0;

-    c_stream.zfree = (free_func)0;

-    c_stream.opaque = (voidpf)0;

-

-    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);

-    CHECK_ERR(err, "deflateInit");

-

-    c_stream.next_in  = (Bytef*)hello;

-    c_stream.next_out = compr;

-

-    while (c_stream.total_in != len && c_stream.total_out < comprLen) {

-        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */

-        err = deflate(&c_stream, Z_NO_FLUSH);

-        CHECK_ERR(err, "deflate");

-    }

-    /* Finish the stream, still forcing small buffers: */

-    for (;;) {

-        c_stream.avail_out = 1;

-        err = deflate(&c_stream, Z_FINISH);

-        if (err == Z_STREAM_END) break;

-        CHECK_ERR(err, "deflate");

-    }

-

-    err = deflateEnd(&c_stream);

-    CHECK_ERR(err, "deflateEnd");

-}

-

-/* ===========================================================================

- * Test inflate() with small buffers

- */

-void test_inflate(compr, comprLen, uncompr, uncomprLen)

-    Byte *compr, *uncompr;

-    uLong comprLen, uncomprLen;

-{

-    int err;

-    z_stream d_stream; /* decompression stream */

-

-    strcpy((char*)uncompr, "garbage");

-

-    d_stream.zalloc = (alloc_func)0;

-    d_stream.zfree = (free_func)0;

-    d_stream.opaque = (voidpf)0;

-

-    d_stream.next_in  = compr;

-    d_stream.avail_in = 0;

-    d_stream.next_out = uncompr;

-

-    err = inflateInit(&d_stream);

-    CHECK_ERR(err, "inflateInit");

-

-    while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen) {

-        d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */

-        err = inflate(&d_stream, Z_NO_FLUSH);

-        if (err == Z_STREAM_END) break;

-        CHECK_ERR(err, "inflate");

-    }

-

-    err = inflateEnd(&d_stream);

-    CHECK_ERR(err, "inflateEnd");

-

-    if (strcmp((char*)uncompr, hello)) {

-        fprintf(stderr, "bad inflate\n");

-        exit(1);

-    } else {

-        printf("inflate(): %s\n", (char *)uncompr);

-    }

-}

-

-/* ===========================================================================

- * Test deflate() with large buffers and dynamic change of compression level

- */

-void test_large_deflate(compr, comprLen, uncompr, uncomprLen)

-    Byte *compr, *uncompr;

-    uLong comprLen, uncomprLen;

-{

-    z_stream c_stream; /* compression stream */

-    int err;

-

-    c_stream.zalloc = (alloc_func)0;

-    c_stream.zfree = (free_func)0;

-    c_stream.opaque = (voidpf)0;

-

-    err = deflateInit(&c_stream, Z_BEST_SPEED);

-    CHECK_ERR(err, "deflateInit");

-

-    c_stream.next_out = compr;

-    c_stream.avail_out = (uInt)comprLen;

-

-    /* At this point, uncompr is still mostly zeroes, so it should compress

-     * very well:

-     */

-    c_stream.next_in = uncompr;

-    c_stream.avail_in = (uInt)uncomprLen;

-    err = deflate(&c_stream, Z_NO_FLUSH);

-    CHECK_ERR(err, "deflate");

-    if (c_stream.avail_in != 0) {

-        fprintf(stderr, "deflate not greedy\n");

-        exit(1);

-    }

-

-    /* Feed in already compressed data and switch to no compression: */

-    deflateParams(&c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);

-    c_stream.next_in = compr;

-    c_stream.avail_in = (uInt)comprLen/2;

-    err = deflate(&c_stream, Z_NO_FLUSH);

-    CHECK_ERR(err, "deflate");

-

-    /* Switch back to compressing mode: */

-    deflateParams(&c_stream, Z_BEST_COMPRESSION, Z_FILTERED);

-    c_stream.next_in = uncompr;

-    c_stream.avail_in = (uInt)uncomprLen;

-    err = deflate(&c_stream, Z_NO_FLUSH);

-    CHECK_ERR(err, "deflate");

-

-    err = deflate(&c_stream, Z_FINISH);

-    if (err != Z_STREAM_END) {

-        fprintf(stderr, "deflate should report Z_STREAM_END\n");

-        exit(1);

-    }

-    err = deflateEnd(&c_stream);

-    CHECK_ERR(err, "deflateEnd");

-}

-

-/* ===========================================================================

- * Test inflate() with large buffers

- */

-void test_large_inflate(compr, comprLen, uncompr, uncomprLen)

-    Byte *compr, *uncompr;

-    uLong comprLen, uncomprLen;

-{

-    int err;

-    z_stream d_stream; /* decompression stream */

-

-    strcpy((char*)uncompr, "garbage");

-

-    d_stream.zalloc = (alloc_func)0;

-    d_stream.zfree = (free_func)0;

-    d_stream.opaque = (voidpf)0;

-

-    d_stream.next_in  = compr;

-    d_stream.avail_in = (uInt)comprLen;

-

-    err = inflateInit(&d_stream);

-    CHECK_ERR(err, "inflateInit");

-

-    for (;;) {

-        d_stream.next_out = uncompr;            /* discard the output */

-        d_stream.avail_out = (uInt)uncomprLen;

-        err = inflate(&d_stream, Z_NO_FLUSH);

-        if (err == Z_STREAM_END) break;

-        CHECK_ERR(err, "large inflate");

-    }

-

-    err = inflateEnd(&d_stream);

-    CHECK_ERR(err, "inflateEnd");

-

-    if (d_stream.total_out != 2*uncomprLen + comprLen/2) {

-        fprintf(stderr, "bad large inflate: %ld\n", d_stream.total_out);

-        exit(1);

-    } else {

-        printf("large_inflate(): OK\n");

-    }

-}

-

-/* ===========================================================================

- * Test deflate() with full flush

- */

-void test_flush(compr, comprLen)

-    Byte *compr;

-    uLong *comprLen;

-{

-    z_stream c_stream; /* compression stream */

-    int err;

-    uInt len = (uInt)strlen(hello)+1;

-

-    c_stream.zalloc = (alloc_func)0;

-    c_stream.zfree = (free_func)0;

-    c_stream.opaque = (voidpf)0;

-

-    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);

-    CHECK_ERR(err, "deflateInit");

-

-    c_stream.next_in  = (Bytef*)hello;

-    c_stream.next_out = compr;

-    c_stream.avail_in = 3;

-    c_stream.avail_out = (uInt)*comprLen;

-    err = deflate(&c_stream, Z_FULL_FLUSH);

-    CHECK_ERR(err, "deflate");

-

-    compr[3]++; /* force an error in first compressed block */

-    c_stream.avail_in = len - 3;

-

-    err = deflate(&c_stream, Z_FINISH);

-    if (err != Z_STREAM_END) {

-        CHECK_ERR(err, "deflate");

-    }

-    err = deflateEnd(&c_stream);

-    CHECK_ERR(err, "deflateEnd");

-

-    *comprLen = c_stream.total_out;

-}

-

-/* ===========================================================================

- * Test inflateSync()

- */

-void test_sync(compr, comprLen, uncompr, uncomprLen)

-    Byte *compr, *uncompr;

-    uLong comprLen, uncomprLen;

-{

-    int err;

-    z_stream d_stream; /* decompression stream */

-

-    strcpy((char*)uncompr, "garbage");

-

-    d_stream.zalloc = (alloc_func)0;

-    d_stream.zfree = (free_func)0;

-    d_stream.opaque = (voidpf)0;

-

-    d_stream.next_in  = compr;

-    d_stream.avail_in = 2; /* just read the zlib header */

-

-    err = inflateInit(&d_stream);

-    CHECK_ERR(err, "inflateInit");

-

-    d_stream.next_out = uncompr;

-    d_stream.avail_out = (uInt)uncomprLen;

-

-    inflate(&d_stream, Z_NO_FLUSH);

-    CHECK_ERR(err, "inflate");

-

-    d_stream.avail_in = (uInt)comprLen-2;   /* read all compressed data */

-    err = inflateSync(&d_stream);           /* but skip the damaged part */

-    CHECK_ERR(err, "inflateSync");

-

-    err = inflate(&d_stream, Z_FINISH);

-    if (err != Z_DATA_ERROR) {

-        fprintf(stderr, "inflate should report DATA_ERROR\n");

-        /* Because of incorrect adler32 */

-        exit(1);

-    }

-    err = inflateEnd(&d_stream);

-    CHECK_ERR(err, "inflateEnd");

-

-    printf("after inflateSync(): hel%s\n", (char *)uncompr);

-}

-

-/* ===========================================================================

- * Test deflate() with preset dictionary

- */

-void test_dict_deflate(compr, comprLen)

-    Byte *compr;

-    uLong comprLen;

-{

-    z_stream c_stream; /* compression stream */

-    int err;

-

-    c_stream.zalloc = (alloc_func)0;

-    c_stream.zfree = (free_func)0;

-    c_stream.opaque = (voidpf)0;

-

-    err = deflateInit(&c_stream, Z_BEST_COMPRESSION);

-    CHECK_ERR(err, "deflateInit");

-

-    err = deflateSetDictionary(&c_stream,

-                               (const Bytef*)dictionary, sizeof(dictionary));

-    CHECK_ERR(err, "deflateSetDictionary");

-

-    dictId = c_stream.adler;

-    c_stream.next_out = compr;

-    c_stream.avail_out = (uInt)comprLen;

-

-    c_stream.next_in = (Bytef*)hello;

-    c_stream.avail_in = (uInt)strlen(hello)+1;

-

-    err = deflate(&c_stream, Z_FINISH);

-    if (err != Z_STREAM_END) {

-        fprintf(stderr, "deflate should report Z_STREAM_END\n");

-        exit(1);

-    }

-    err = deflateEnd(&c_stream);

-    CHECK_ERR(err, "deflateEnd");

-}

-

-/* ===========================================================================

- * Test inflate() with a preset dictionary

- */

-void test_dict_inflate(compr, comprLen, uncompr, uncomprLen)

-    Byte *compr, *uncompr;

-    uLong comprLen, uncomprLen;

-{

-    int err;

-    z_stream d_stream; /* decompression stream */

-

-    strcpy((char*)uncompr, "garbage");

-

-    d_stream.zalloc = (alloc_func)0;

-    d_stream.zfree = (free_func)0;

-    d_stream.opaque = (voidpf)0;

-

-    d_stream.next_in  = compr;

-    d_stream.avail_in = (uInt)comprLen;

-

-    err = inflateInit(&d_stream);

-    CHECK_ERR(err, "inflateInit");

-

-    d_stream.next_out = uncompr;

-    d_stream.avail_out = (uInt)uncomprLen;

-

-    for (;;) {

-        err = inflate(&d_stream, Z_NO_FLUSH);

-        if (err == Z_STREAM_END) break;

-        if (err == Z_NEED_DICT) {

-            if (d_stream.adler != dictId) {

-                fprintf(stderr, "unexpected dictionary");

-                exit(1);

-            }

-            err = inflateSetDictionary(&d_stream, (const Bytef*)dictionary,

-                                       sizeof(dictionary));

-        }

-        CHECK_ERR(err, "inflate with dict");

-    }

-

-    err = inflateEnd(&d_stream);

-    CHECK_ERR(err, "inflateEnd");

-

-    if (strcmp((char*)uncompr, hello)) {

-        fprintf(stderr, "bad inflate with dict\n");

-        exit(1);

-    } else {

-        printf("inflate with dictionary: %s\n", (char *)uncompr);

-    }

-}

-

-/* ===========================================================================

- * Usage:  example [output.gz  [input.gz]]

- */

-

-int main(argc, argv)

-    int argc;

-    char *argv[];

-{

-    Byte *compr, *uncompr;

-    uLong comprLen = 10000*sizeof(int); /* don't overflow on MSDOS */

-    uLong uncomprLen = comprLen;

-    static const char* myVersion = ZLIB_VERSION;

-

-    if (zlibVersion()[0] != myVersion[0]) {

-        fprintf(stderr, "incompatible zlib version\n");

-        exit(1);

-

-    } else if (strcmp(zlibVersion(), ZLIB_VERSION) != 0) {

-        fprintf(stderr, "warning: different zlib version\n");

-    }

-

-    printf("zlib version %s = 0x%04x, compile flags = 0x%lx\n",

-            ZLIB_VERSION, ZLIB_VERNUM, zlibCompileFlags());

-

-    compr    = (Byte*)calloc((uInt)comprLen, 1);

-    uncompr  = (Byte*)calloc((uInt)uncomprLen, 1);

-    /* compr and uncompr are cleared to avoid reading uninitialized

-     * data and to ensure that uncompr compresses well.

-     */

-    if (compr == Z_NULL || uncompr == Z_NULL) {

-        printf("out of memory\n");

-        exit(1);

-    }

-    test_compress(compr, comprLen, uncompr, uncomprLen);

-

-    test_gzio((argc > 1 ? argv[1] : TESTFILE),

-              uncompr, uncomprLen);

-

-    test_deflate(compr, comprLen);

-    test_inflate(compr, comprLen, uncompr, uncomprLen);

-

-    test_large_deflate(compr, comprLen, uncompr, uncomprLen);

-    test_large_inflate(compr, comprLen, uncompr, uncomprLen);

-

-    test_flush(compr, &comprLen);

-    test_sync(compr, comprLen, uncompr, uncomprLen);

-    comprLen = uncomprLen;

-

-    test_dict_deflate(compr, comprLen);

-    test_dict_inflate(compr, comprLen, uncompr, uncomprLen);

-

-    free(compr);

-    free(uncompr);

-

-    return 0;

-}

+/* example.c -- usage example of the zlib compression library
+ * Copyright (C) 1995-2004 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include <stdio.h>
+#include "zlib.h"
+
+#ifdef STDC
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+
+#if defined(VMS) || defined(RISCOS)
+#  define TESTFILE "foo-gz"
+#else
+#  define TESTFILE "foo.gz"
+#endif
+
+#define CHECK_ERR(err, msg) { \
+    if (err != Z_OK) { \
+        fprintf(stderr, "%s error: %d\n", msg, err); \
+        exit(1); \
+    } \
+}
+
+const char hello[] = "hello, hello!";
+/* "hello world" would be more standard, but the repeated "hello"
+ * stresses the compression code better, sorry...
+ */
+
+const char dictionary[] = "hello";
+uLong dictId; /* Adler32 value of the dictionary */
+
+void test_compress      OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_gzio          OF((const char *fname,
+                            Byte *uncompr, uLong uncomprLen));
+void test_deflate       OF((Byte *compr, uLong comprLen));
+void test_inflate       OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_large_deflate OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_large_inflate OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_flush         OF((Byte *compr, uLong *comprLen));
+void test_sync          OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_dict_deflate  OF((Byte *compr, uLong comprLen));
+void test_dict_inflate  OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+int  main               OF((int argc, char *argv[]));
+
+/* ===========================================================================
+ * Test compress() and uncompress()
+ */
+void test_compress(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    uLong len = (uLong)strlen(hello)+1;
+
+    err = compress(compr, &comprLen, (const Bytef*)hello, len);
+    CHECK_ERR(err, "compress");
+
+    strcpy((char*)uncompr, "garbage");
+
+    err = uncompress(uncompr, &uncomprLen, compr, comprLen);
+    CHECK_ERR(err, "uncompress");
+
+    if (strcmp((char*)uncompr, hello)) {
+        fprintf(stderr, "bad uncompress\n");
+        exit(1);
+    } else {
+        printf("uncompress(): %s\n", (char *)uncompr);
+    }
+}
+
+/* ===========================================================================
+ * Test read/write of .gz files
+ */
+void test_gzio(fname, uncompr, uncomprLen)
+    const char *fname; /* compressed file name */
+    Byte *uncompr;
+    uLong uncomprLen;
+{
+#ifdef NO_GZCOMPRESS
+    fprintf(stderr, "NO_GZCOMPRESS -- gz* functions cannot compress\n");
+#else
+    int err;
+    int len = (int)strlen(hello)+1;
+    gzFile file;
+    z_off_t pos;
+
+    file = gzopen(fname, "wb");
+    if (file == NULL) {
+        fprintf(stderr, "gzopen error\n");
+        exit(1);
+    }
+    gzputc(file, 'h');
+    if (gzputs(file, "ello") != 4) {
+        fprintf(stderr, "gzputs err: %s\n", gzerror(file, &err));
+        exit(1);
+    }
+    if (gzprintf(file, ", %s!", "hello") != 8) {
+        fprintf(stderr, "gzprintf err: %s\n", gzerror(file, &err));
+        exit(1);
+    }
+    gzseek(file, 1L, SEEK_CUR); /* add one zero byte */
+    gzclose(file);
+
+    file = gzopen(fname, "rb");
+    if (file == NULL) {
+        fprintf(stderr, "gzopen error\n");
+        exit(1);
+    }
+    strcpy((char*)uncompr, "garbage");
+
+    if (gzread(file, uncompr, (unsigned)uncomprLen) != len) {
+        fprintf(stderr, "gzread err: %s\n", gzerror(file, &err));
+        exit(1);
+    }
+    if (strcmp((char*)uncompr, hello)) {
+        fprintf(stderr, "bad gzread: %s\n", (char*)uncompr);
+        exit(1);
+    } else {
+        printf("gzread(): %s\n", (char*)uncompr);
+    }
+
+    pos = gzseek(file, -8L, SEEK_CUR);
+    if (pos != 6 || gztell(file) != pos) {
+        fprintf(stderr, "gzseek error, pos=%ld, gztell=%ld\n",
+                (long)pos, (long)gztell(file));
+        exit(1);
+    }
+
+    if (gzgetc(file) != ' ') {
+        fprintf(stderr, "gzgetc error\n");
+        exit(1);
+    }
+
+    if (gzungetc(' ', file) != ' ') {
+        fprintf(stderr, "gzungetc error\n");
+        exit(1);
+    }
+
+    gzgets(file, (char*)uncompr, (int)uncomprLen);
+    if (strlen((char*)uncompr) != 7) { /* " hello!" */
+        fprintf(stderr, "gzgets err after gzseek: %s\n", gzerror(file, &err));
+        exit(1);
+    }
+    if (strcmp((char*)uncompr, hello + 6)) {
+        fprintf(stderr, "bad gzgets after gzseek\n");
+        exit(1);
+    } else {
+        printf("gzgets() after gzseek: %s\n", (char*)uncompr);
+    }
+
+    gzclose(file);
+#endif
+}
+
+/* ===========================================================================
+ * Test deflate() with small buffers
+ */
+void test_deflate(compr, comprLen)
+    Byte *compr;
+    uLong comprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+    uLong len = (uLong)strlen(hello)+1;
+
+    c_stream.zalloc = (alloc_func)0;
+    c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
+    CHECK_ERR(err, "deflateInit");
+
+    c_stream.next_in  = (Bytef*)hello;
+    c_stream.next_out = compr;
+
+    while (c_stream.total_in != len && c_stream.total_out < comprLen) {
+        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
+        err = deflate(&c_stream, Z_NO_FLUSH);
+        CHECK_ERR(err, "deflate");
+    }
+    /* Finish the stream, still forcing small buffers: */
+    for (;;) {
+        c_stream.avail_out = 1;
+        err = deflate(&c_stream, Z_FINISH);
+        if (err == Z_STREAM_END) break;
+        CHECK_ERR(err, "deflate");
+    }
+
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+}
+
+/* ===========================================================================
+ * Test inflate() with small buffers
+ */
+void test_inflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = (alloc_func)0;
+    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = 0;
+    d_stream.next_out = uncompr;
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen) {
+        d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
+        err = inflate(&d_stream, Z_NO_FLUSH);
+        if (err == Z_STREAM_END) break;
+        CHECK_ERR(err, "inflate");
+    }
+
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    if (strcmp((char*)uncompr, hello)) {
+        fprintf(stderr, "bad inflate\n");
+        exit(1);
+    } else {
+        printf("inflate(): %s\n", (char *)uncompr);
+    }
+}
+
+/* ===========================================================================
+ * Test deflate() with large buffers and dynamic change of compression level
+ */
+void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+
+    c_stream.zalloc = (alloc_func)0;
+    c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_BEST_SPEED);
+    CHECK_ERR(err, "deflateInit");
+
+    c_stream.next_out = compr;
+    c_stream.avail_out = (uInt)comprLen;
+
+    /* At this point, uncompr is still mostly zeroes, so it should compress
+     * very well:
+     */
+    c_stream.next_in = uncompr;
+    c_stream.avail_in = (uInt)uncomprLen;
+    err = deflate(&c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "deflate");
+    if (c_stream.avail_in != 0) {
+        fprintf(stderr, "deflate not greedy\n");
+        exit(1);
+    }
+
+    /* Feed in already compressed data and switch to no compression: */
+    deflateParams(&c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
+    c_stream.next_in = compr;
+    c_stream.avail_in = (uInt)comprLen/2;
+    err = deflate(&c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "deflate");
+
+    /* Switch back to compressing mode: */
+    deflateParams(&c_stream, Z_BEST_COMPRESSION, Z_FILTERED);
+    c_stream.next_in = uncompr;
+    c_stream.avail_in = (uInt)uncomprLen;
+    err = deflate(&c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "deflate");
+
+    err = deflate(&c_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        fprintf(stderr, "deflate should report Z_STREAM_END\n");
+        exit(1);
+    }
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+}
+
+/* ===========================================================================
+ * Test inflate() with large buffers
+ */
+void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = (alloc_func)0;
+    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = (uInt)comprLen;
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    for (;;) {
+        d_stream.next_out = uncompr;            /* discard the output */
+        d_stream.avail_out = (uInt)uncomprLen;
+        err = inflate(&d_stream, Z_NO_FLUSH);
+        if (err == Z_STREAM_END) break;
+        CHECK_ERR(err, "large inflate");
+    }
+
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    if (d_stream.total_out != 2*uncomprLen + comprLen/2) {
+        fprintf(stderr, "bad large inflate: %ld\n", d_stream.total_out);
+        exit(1);
+    } else {
+        printf("large_inflate(): OK\n");
+    }
+}
+
+/* ===========================================================================
+ * Test deflate() with full flush
+ */
+void test_flush(compr, comprLen)
+    Byte *compr;
+    uLong *comprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+    uInt len = (uInt)strlen(hello)+1;
+
+    c_stream.zalloc = (alloc_func)0;
+    c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
+    CHECK_ERR(err, "deflateInit");
+
+    c_stream.next_in  = (Bytef*)hello;
+    c_stream.next_out = compr;
+    c_stream.avail_in = 3;
+    c_stream.avail_out = (uInt)*comprLen;
+    err = deflate(&c_stream, Z_FULL_FLUSH);
+    CHECK_ERR(err, "deflate");
+
+    compr[3]++; /* force an error in first compressed block */
+    c_stream.avail_in = len - 3;
+
+    err = deflate(&c_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        CHECK_ERR(err, "deflate");
+    }
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+
+    *comprLen = c_stream.total_out;
+}
+
+/* ===========================================================================
+ * Test inflateSync()
+ */
+void test_sync(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = (alloc_func)0;
+    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = 2; /* just read the zlib header */
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    d_stream.next_out = uncompr;
+    d_stream.avail_out = (uInt)uncomprLen;
+
+    inflate(&d_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "inflate");
+
+    d_stream.avail_in = (uInt)comprLen-2;   /* read all compressed data */
+    err = inflateSync(&d_stream);           /* but skip the damaged part */
+    CHECK_ERR(err, "inflateSync");
+
+    err = inflate(&d_stream, Z_FINISH);
+    if (err != Z_DATA_ERROR) {
+        fprintf(stderr, "inflate should report DATA_ERROR\n");
+        /* Because of incorrect adler32 */
+        exit(1);
+    }
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    printf("after inflateSync(): hel%s\n", (char *)uncompr);
+}
+
+/* ===========================================================================
+ * Test deflate() with preset dictionary
+ */
+void test_dict_deflate(compr, comprLen)
+    Byte *compr;
+    uLong comprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+
+    c_stream.zalloc = (alloc_func)0;
+    c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_BEST_COMPRESSION);
+    CHECK_ERR(err, "deflateInit");
+
+    err = deflateSetDictionary(&c_stream,
+                               (const Bytef*)dictionary, sizeof(dictionary));
+    CHECK_ERR(err, "deflateSetDictionary");
+
+    dictId = c_stream.adler;
+    c_stream.next_out = compr;
+    c_stream.avail_out = (uInt)comprLen;
+
+    c_stream.next_in = (Bytef*)hello;
+    c_stream.avail_in = (uInt)strlen(hello)+1;
+
+    err = deflate(&c_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        fprintf(stderr, "deflate should report Z_STREAM_END\n");
+        exit(1);
+    }
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+}
+
+/* ===========================================================================
+ * Test inflate() with a preset dictionary
+ */
+void test_dict_inflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = (alloc_func)0;
+    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = (uInt)comprLen;
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    d_stream.next_out = uncompr;
+    d_stream.avail_out = (uInt)uncomprLen;
+
+    for (;;) {
+        err = inflate(&d_stream, Z_NO_FLUSH);
+        if (err == Z_STREAM_END) break;
+        if (err == Z_NEED_DICT) {
+            if (d_stream.adler != dictId) {
+                fprintf(stderr, "unexpected dictionary");
+                exit(1);
+            }
+            err = inflateSetDictionary(&d_stream, (const Bytef*)dictionary,
+                                       sizeof(dictionary));
+        }
+        CHECK_ERR(err, "inflate with dict");
+    }
+
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    if (strcmp((char*)uncompr, hello)) {
+        fprintf(stderr, "bad inflate with dict\n");
+        exit(1);
+    } else {
+        printf("inflate with dictionary: %s\n", (char *)uncompr);
+    }
+}
+
+/* ===========================================================================
+ * Usage:  example [output.gz  [input.gz]]
+ */
+
+int main(argc, argv)
+    int argc;
+    char *argv[];
+{
+    Byte *compr, *uncompr;
+    uLong comprLen = 10000*sizeof(int); /* don't overflow on MSDOS */
+    uLong uncomprLen = comprLen;
+    static const char* myVersion = ZLIB_VERSION;
+
+    if (zlibVersion()[0] != myVersion[0]) {
+        fprintf(stderr, "incompatible zlib version\n");
+        exit(1);
+
+    } else if (strcmp(zlibVersion(), ZLIB_VERSION) != 0) {
+        fprintf(stderr, "warning: different zlib version\n");
+    }
+
+    printf("zlib version %s = 0x%04x, compile flags = 0x%lx\n",
+            ZLIB_VERSION, ZLIB_VERNUM, zlibCompileFlags());
+
+    compr    = (Byte*)calloc((uInt)comprLen, 1);
+    uncompr  = (Byte*)calloc((uInt)uncomprLen, 1);
+    /* compr and uncompr are cleared to avoid reading uninitialized
+     * data and to ensure that uncompr compresses well.
+     */
+    if (compr == Z_NULL || uncompr == Z_NULL) {
+        printf("out of memory\n");
+        exit(1);
+    }
+    test_compress(compr, comprLen, uncompr, uncomprLen);
+
+    test_gzio((argc > 1 ? argv[1] : TESTFILE),
+              uncompr, uncomprLen);
+
+    test_deflate(compr, comprLen);
+    test_inflate(compr, comprLen, uncompr, uncomprLen);
+
+    test_large_deflate(compr, comprLen, uncompr, uncomprLen);
+    test_large_inflate(compr, comprLen, uncompr, uncomprLen);
+
+    test_flush(compr, &comprLen);
+    test_sync(compr, comprLen, uncompr, uncomprLen);
+    comprLen = uncomprLen;
+
+    test_dict_deflate(compr, comprLen);
+    test_dict_inflate(compr, comprLen, uncompr, uncomprLen);
+
+    free(compr);
+    free(uncompr);
+
+    return 0;
+}
diff --git a/utils/zenutils/libraries/zlib123/zlib/gzio.c b/utils/zenutils/libraries/zlib123/zlib/gzio.c
index 5e20a4aa0d..7e90f4928f 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/gzio.c
+++ b/utils/zenutils/libraries/zlib123/zlib/gzio.c
@@ -1,1026 +1,1026 @@
-/* gzio.c -- IO on .gz files

- * Copyright (C) 1995-2005 Jean-loup Gailly.

- * For conditions of distribution and use, see copyright notice in zlib.h

- *

- * Compile this file with -DNO_GZCOMPRESS to avoid the compression code.

- */

-

-/* @(#) $Id$ */

-

-#include <stdio.h>

-

-#include "zutil.h"

-

-#ifdef NO_DEFLATE       /* for compatibility with old definition */

-#  define NO_GZCOMPRESS

-#endif

-

-#ifndef NO_DUMMY_DECL

-struct internal_state {int dummy;}; /* for buggy compilers */

-#endif

-

-#ifndef Z_BUFSIZE

-#  ifdef MAXSEG_64K

-#    define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */

-#  else

-#    define Z_BUFSIZE 16384

-#  endif

-#endif

-#ifndef Z_PRINTF_BUFSIZE

-#  define Z_PRINTF_BUFSIZE 4096

-#endif

-

-#ifdef __MVS__

-#  pragma map (fdopen , "\174\174FDOPEN")

-   FILE *fdopen(int, const char *);

-#endif

-

-#ifndef STDC

-extern voidp  malloc OF((uInt size));

-extern void   free   OF((voidpf ptr));

-#endif

-

-#define ALLOC(size) malloc(size)

-#define TRYFREE(p) {if (p) free(p);}

-

-static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */

-

-/* gzip flag byte */

-#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */

-#define HEAD_CRC     0x02 /* bit 1 set: header CRC present */

-#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */

-#define ORIG_NAME    0x08 /* bit 3 set: original file name present */

-#define COMMENT      0x10 /* bit 4 set: file comment present */

-#define RESERVED     0xE0 /* bits 5..7: reserved */

-

-typedef struct gz_stream {

-    z_stream stream;

-    int      z_err;   /* error code for last stream operation */

-    int      z_eof;   /* set if end of input file */

-    FILE     *file;   /* .gz file */

-    Byte     *inbuf;  /* input buffer */

-    Byte     *outbuf; /* output buffer */

-    uLong    crc;     /* crc32 of uncompressed data */

-    char     *msg;    /* error message */

-    char     *path;   /* path name for debugging only */

-    int      transparent; /* 1 if input file is not a .gz file */

-    char     mode;    /* 'w' or 'r' */

-    z_off_t  start;   /* start of compressed data in file (header skipped) */

-    z_off_t  in;      /* bytes into deflate or inflate */

-    z_off_t  out;     /* bytes out of deflate or inflate */

-    int      back;    /* one character push-back */

-    int      last;    /* true if push-back is last character */

-} gz_stream;

-

-

-local gzFile gz_open      OF((const char *path, const char *mode, int  fd));

-local int do_flush        OF((gzFile file, int flush));

-local int    get_byte     OF((gz_stream *s));

-local void   check_header OF((gz_stream *s));

-local int    destroy      OF((gz_stream *s));

-local void   putLong      OF((FILE *file, uLong x));

-local uLong  getLong      OF((gz_stream *s));

-

-/* ===========================================================================

-     Opens a gzip (.gz) file for reading or writing. The mode parameter

-   is as in fopen ("rb" or "wb"). The file is given either by file descriptor

-   or path name (if fd == -1).

-     gz_open returns NULL if the file could not be opened or if there was

-   insufficient memory to allocate the (de)compression state; errno

-   can be checked to distinguish the two cases (if errno is zero, the

-   zlib error is Z_MEM_ERROR).

-*/

-local gzFile gz_open (path, mode, fd)

-    const char *path;

-    const char *mode;

-    int  fd;

-{

-    int err;

-    int level = Z_DEFAULT_COMPRESSION; /* compression level */

-    int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */

-    char *p = (char*)mode;

-    gz_stream *s;

-    char fmode[80]; /* copy of mode, without the compression level */

-    char *m = fmode;

-

-    if (!path || !mode) return Z_NULL;

-

-    s = (gz_stream *)ALLOC(sizeof(gz_stream));

-    if (!s) return Z_NULL;

-

-    s->stream.zalloc = (alloc_func)0;

-    s->stream.zfree = (free_func)0;

-    s->stream.opaque = (voidpf)0;

-    s->stream.next_in = s->inbuf = Z_NULL;

-    s->stream.next_out = s->outbuf = Z_NULL;

-    s->stream.avail_in = s->stream.avail_out = 0;

-    s->file = NULL;

-    s->z_err = Z_OK;

-    s->z_eof = 0;

-    s->in = 0;

-    s->out = 0;

-    s->back = EOF;

-    s->crc = crc32(0L, Z_NULL, 0);

-    s->msg = NULL;

-    s->transparent = 0;

-

-    s->path = (char*)ALLOC(strlen(path)+1);

-    if (s->path == NULL) {

-        return destroy(s), (gzFile)Z_NULL;

-    }

-    strcpy(s->path, path); /* do this early for debugging */

-

-    s->mode = '\0';

-    do {

-        if (*p == 'r') s->mode = 'r';

-        if (*p == 'w' || *p == 'a') s->mode = 'w';

-        if (*p >= '0' && *p <= '9') {

-            level = *p - '0';

-        } else if (*p == 'f') {

-          strategy = Z_FILTERED;

-        } else if (*p == 'h') {

-          strategy = Z_HUFFMAN_ONLY;

-        } else if (*p == 'R') {

-          strategy = Z_RLE;

-        } else {

-            *m++ = *p; /* copy the mode */

-        }

-    } while (*p++ && m != fmode + sizeof(fmode));

-    if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;

-

-    if (s->mode == 'w') {

-#ifdef NO_GZCOMPRESS

-        err = Z_STREAM_ERROR;

-#else

-        err = deflateInit2(&(s->stream), level,

-                           Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);

-        /* windowBits is passed < 0 to suppress zlib header */

-

-        s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);

-#endif

-        if (err != Z_OK || s->outbuf == Z_NULL) {

-            return destroy(s), (gzFile)Z_NULL;

-        }

-    } else {

-        s->stream.next_in  = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);

-

-        err = inflateInit2(&(s->stream), -MAX_WBITS);

-        /* windowBits is passed < 0 to tell that there is no zlib header.

-         * Note that in this case inflate *requires* an extra "dummy" byte

-         * after the compressed stream in order to complete decompression and

-         * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are

-         * present after the compressed stream.

-         */

-        if (err != Z_OK || s->inbuf == Z_NULL) {

-            return destroy(s), (gzFile)Z_NULL;

-        }

-    }

-    s->stream.avail_out = Z_BUFSIZE;

-

-    errno = 0;

-    s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode);

-

-    if (s->file == NULL) {

-        return destroy(s), (gzFile)Z_NULL;

-    }

-    if (s->mode == 'w') {

-        /* Write a very simple .gz header:

-         */

-        fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],

-             Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);

-        s->start = 10L;

-        /* We use 10L instead of ftell(s->file) to because ftell causes an

-         * fflush on some systems. This version of the library doesn't use

-         * start anyway in write mode, so this initialization is not

-         * necessary.

-         */

-    } else {

-        check_header(s); /* skip the .gz header */

-        s->start = ftell(s->file) - s->stream.avail_in;

-    }

-

-    return (gzFile)s;

-}

-

-/* ===========================================================================

-     Opens a gzip (.gz) file for reading or writing.

-*/

-gzFile ZEXPORT gzopen (path, mode)

-    const char *path;

-    const char *mode;

-{

-    return gz_open (path, mode, -1);

-}

-

-/* ===========================================================================

-     Associate a gzFile with the file descriptor fd. fd is not dup'ed here

-   to mimic the behavio(u)r of fdopen.

-*/

-gzFile ZEXPORT gzdopen (fd, mode)

-    int fd;

-    const char *mode;

-{

-    char name[46];      /* allow for up to 128-bit integers */

-

-    if (fd < 0) return (gzFile)Z_NULL;

-    sprintf(name, "<fd:%d>", fd); /* for debugging */

-

-    return gz_open (name, mode, fd);

-}

-

-/* ===========================================================================

- * Update the compression level and strategy

- */

-int ZEXPORT gzsetparams (file, level, strategy)

-    gzFile file;

-    int level;

-    int strategy;

-{

-    gz_stream *s = (gz_stream*)file;

-

-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;

-

-    /* Make room to allow flushing */

-    if (s->stream.avail_out == 0) {

-

-        s->stream.next_out = s->outbuf;

-        if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {

-            s->z_err = Z_ERRNO;

-        }

-        s->stream.avail_out = Z_BUFSIZE;

-    }

-

-    return deflateParams (&(s->stream), level, strategy);

-}

-

-/* ===========================================================================

-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF

-   for end of file.

-   IN assertion: the stream s has been sucessfully opened for reading.

-*/

-local int get_byte(s)

-    gz_stream *s;

-{

-    if (s->z_eof) return EOF;

-    if (s->stream.avail_in == 0) {

-        errno = 0;

-        s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file);

-        if (s->stream.avail_in == 0) {

-            s->z_eof = 1;

-            if (ferror(s->file)) s->z_err = Z_ERRNO;

-            return EOF;

-        }

-        s->stream.next_in = s->inbuf;

-    }

-    s->stream.avail_in--;

-    return *(s->stream.next_in)++;

-}

-

-/* ===========================================================================

-      Check the gzip header of a gz_stream opened for reading. Set the stream

-    mode to transparent if the gzip magic header is not present; set s->err

-    to Z_DATA_ERROR if the magic header is present but the rest of the header

-    is incorrect.

-    IN assertion: the stream s has already been created sucessfully;

-       s->stream.avail_in is zero for the first time, but may be non-zero

-       for concatenated .gz files.

-*/

-local void check_header(s)

-    gz_stream *s;

-{

-    int method; /* method byte */

-    int flags;  /* flags byte */

-    uInt len;

-    int c;

-

-    /* Assure two bytes in the buffer so we can peek ahead -- handle case

-       where first byte of header is at the end of the buffer after the last

-       gzip segment */

-    len = s->stream.avail_in;

-    if (len < 2) {

-        if (len) s->inbuf[0] = s->stream.next_in[0];

-        errno = 0;

-        len = (uInt)fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file);

-        if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO;

-        s->stream.avail_in += len;

-        s->stream.next_in = s->inbuf;

-        if (s->stream.avail_in < 2) {

-            s->transparent = s->stream.avail_in;

-            return;

-        }

-    }

-

-    /* Peek ahead to check the gzip magic header */

-    if (s->stream.next_in[0] != gz_magic[0] ||

-        s->stream.next_in[1] != gz_magic[1]) {

-        s->transparent = 1;

-        return;

-    }

-    s->stream.avail_in -= 2;

-    s->stream.next_in += 2;

-

-    /* Check the rest of the gzip header */

-    method = get_byte(s);

-    flags = get_byte(s);

-    if (method != Z_DEFLATED || (flags & RESERVED) != 0) {

-        s->z_err = Z_DATA_ERROR;

-        return;

-    }

-

-    /* Discard time, xflags and OS code: */

-    for (len = 0; len < 6; len++) (void)get_byte(s);

-

-    if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */

-        len  =  (uInt)get_byte(s);

-        len += ((uInt)get_byte(s))<<8;

-        /* len is garbage if EOF but the loop below will quit anyway */

-        while (len-- != 0 && get_byte(s) != EOF) ;

-    }

-    if ((flags & ORIG_NAME) != 0) { /* skip the original file name */

-        while ((c = get_byte(s)) != 0 && c != EOF) ;

-    }

-    if ((flags & COMMENT) != 0) {   /* skip the .gz file comment */

-        while ((c = get_byte(s)) != 0 && c != EOF) ;

-    }

-    if ((flags & HEAD_CRC) != 0) {  /* skip the header crc */

-        for (len = 0; len < 2; len++) (void)get_byte(s);

-    }

-    s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK;

-}

-

- /* ===========================================================================

- * Cleanup then free the given gz_stream. Return a zlib error code.

-   Try freeing in the reverse order of allocations.

- */

-local int destroy (s)

-    gz_stream *s;

-{

-    int err = Z_OK;

-

-    if (!s) return Z_STREAM_ERROR;

-

-    TRYFREE(s->msg);

-

-    if (s->stream.state != NULL) {

-        if (s->mode == 'w') {

-#ifdef NO_GZCOMPRESS

-            err = Z_STREAM_ERROR;

-#else

-            err = deflateEnd(&(s->stream));

-#endif

-        } else if (s->mode == 'r') {

-            err = inflateEnd(&(s->stream));

-        }

-    }

-    if (s->file != NULL && fclose(s->file)) {

-#ifdef ESPIPE

-        if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */

-#endif

-            err = Z_ERRNO;

-    }

-    if (s->z_err < 0) err = s->z_err;

-

-    TRYFREE(s->inbuf);

-    TRYFREE(s->outbuf);

-    TRYFREE(s->path);

-    TRYFREE(s);

-    return err;

-}

-

-/* ===========================================================================

-     Reads the given number of uncompressed bytes from the compressed file.

-   gzread returns the number of bytes actually read (0 for end of file).

-*/

-int ZEXPORT gzread (file, buf, len)

-    gzFile file;

-    voidp buf;

-    unsigned len;

-{

-    gz_stream *s = (gz_stream*)file;

-    Bytef *start = (Bytef*)buf; /* starting point for crc computation */

-    Byte  *next_out; /* == stream.next_out but not forced far (for MSDOS) */

-

-    if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;

-

-    if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;

-    if (s->z_err == Z_STREAM_END) return 0;  /* EOF */

-

-    next_out = (Byte*)buf;

-    s->stream.next_out = (Bytef*)buf;

-    s->stream.avail_out = len;

-

-    if (s->stream.avail_out && s->back != EOF) {

-        *next_out++ = s->back;

-        s->stream.next_out++;

-        s->stream.avail_out--;

-        s->back = EOF;

-        s->out++;

-        start++;

-        if (s->last) {

-            s->z_err = Z_STREAM_END;

-            return 1;

-        }

-    }

-

-    while (s->stream.avail_out != 0) {

-

-        if (s->transparent) {

-            /* Copy first the lookahead bytes: */

-            uInt n = s->stream.avail_in;

-            if (n > s->stream.avail_out) n = s->stream.avail_out;

-            if (n > 0) {

-                zmemcpy(s->stream.next_out, s->stream.next_in, n);

-                next_out += n;

-                s->stream.next_out = next_out;

-                s->stream.next_in   += n;

-                s->stream.avail_out -= n;

-                s->stream.avail_in  -= n;

-            }

-            if (s->stream.avail_out > 0) {

-                s->stream.avail_out -=

-                    (uInt)fread(next_out, 1, s->stream.avail_out, s->file);

-            }

-            len -= s->stream.avail_out;

-            s->in  += len;

-            s->out += len;

-            if (len == 0) s->z_eof = 1;

-            return (int)len;

-        }

-        if (s->stream.avail_in == 0 && !s->z_eof) {

-

-            errno = 0;

-            s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file);

-            if (s->stream.avail_in == 0) {

-                s->z_eof = 1;

-                if (ferror(s->file)) {

-                    s->z_err = Z_ERRNO;

-                    break;

-                }

-            }

-            s->stream.next_in = s->inbuf;

-        }

-        s->in += s->stream.avail_in;

-        s->out += s->stream.avail_out;

-        s->z_err = inflate(&(s->stream), Z_NO_FLUSH);

-        s->in -= s->stream.avail_in;

-        s->out -= s->stream.avail_out;

-

-        if (s->z_err == Z_STREAM_END) {

-            /* Check CRC and original size */

-            s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));

-            start = s->stream.next_out;

-

-            if (getLong(s) != s->crc) {

-                s->z_err = Z_DATA_ERROR;

-            } else {

-                (void)getLong(s);

-                /* The uncompressed length returned by above getlong() may be

-                 * different from s->out in case of concatenated .gz files.

-                 * Check for such files:

-                 */

-                check_header(s);

-                if (s->z_err == Z_OK) {

-                    inflateReset(&(s->stream));

-                    s->crc = crc32(0L, Z_NULL, 0);

-                }

-            }

-        }

-        if (s->z_err != Z_OK || s->z_eof) break;

-    }

-    s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));

-

-    if (len == s->stream.avail_out &&

-        (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO))

-        return -1;

-    return (int)(len - s->stream.avail_out);

-}

-

-

-/* ===========================================================================

-      Reads one byte from the compressed file. gzgetc returns this byte

-   or -1 in case of end of file or error.

-*/

-int ZEXPORT gzgetc(file)

-    gzFile file;

-{

-    unsigned char c;

-

-    return gzread(file, &c, 1) == 1 ? c : -1;

-}

-

-

-/* ===========================================================================

-      Push one byte back onto the stream.

-*/

-int ZEXPORT gzungetc(c, file)

-    int c;

-    gzFile file;

-{

-    gz_stream *s = (gz_stream*)file;

-

-    if (s == NULL || s->mode != 'r' || c == EOF || s->back != EOF) return EOF;

-    s->back = c;

-    s->out--;

-    s->last = (s->z_err == Z_STREAM_END);

-    if (s->last) s->z_err = Z_OK;

-    s->z_eof = 0;

-    return c;

-}

-

-

-/* ===========================================================================

-      Reads bytes from the compressed file until len-1 characters are

-   read, or a newline character is read and transferred to buf, or an

-   end-of-file condition is encountered.  The string is then terminated

-   with a null character.

-      gzgets returns buf, or Z_NULL in case of error.

-

-      The current implementation is not optimized at all.

-*/

-char * ZEXPORT gzgets(file, buf, len)

-    gzFile file;

-    char *buf;

-    int len;

-{

-    char *b = buf;

-    if (buf == Z_NULL || len <= 0) return Z_NULL;

-

-    while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ;

-    *buf = '\0';

-    return b == buf && len > 0 ? Z_NULL : b;

-}

-

-

-#ifndef NO_GZCOMPRESS

-/* ===========================================================================

-     Writes the given number of uncompressed bytes into the compressed file.

-   gzwrite returns the number of bytes actually written (0 in case of error).

-*/

-int ZEXPORT gzwrite (file, buf, len)

-    gzFile file;

-    voidpc buf;

-    unsigned len;

-{

-    gz_stream *s = (gz_stream*)file;

-

-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;

-

-    s->stream.next_in = (Bytef*)buf;

-    s->stream.avail_in = len;

-

-    while (s->stream.avail_in != 0) {

-

-        if (s->stream.avail_out == 0) {

-

-            s->stream.next_out = s->outbuf;

-            if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {

-                s->z_err = Z_ERRNO;

-                break;

-            }

-            s->stream.avail_out = Z_BUFSIZE;

-        }

-        s->in += s->stream.avail_in;

-        s->out += s->stream.avail_out;

-        s->z_err = deflate(&(s->stream), Z_NO_FLUSH);

-        s->in -= s->stream.avail_in;

-        s->out -= s->stream.avail_out;

-        if (s->z_err != Z_OK) break;

-    }

-    s->crc = crc32(s->crc, (const Bytef *)buf, len);

-

-    return (int)(len - s->stream.avail_in);

-}

-

-

-/* ===========================================================================

-     Converts, formats, and writes the args to the compressed file under

-   control of the format string, as in fprintf. gzprintf returns the number of

-   uncompressed bytes actually written (0 in case of error).

-*/

-#ifdef STDC

-#include <stdarg.h>

-

-int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)

-{

-    char buf[Z_PRINTF_BUFSIZE];

-    va_list va;

-    int len;

-

-    buf[sizeof(buf) - 1] = 0;

-    va_start(va, format);

-#ifdef NO_vsnprintf

-#  ifdef HAS_vsprintf_void

-    (void)vsprintf(buf, format, va);

-    va_end(va);

-    for (len = 0; len < sizeof(buf); len++)

-        if (buf[len] == 0) break;

-#  else

-    len = vsprintf(buf, format, va);

-    va_end(va);

-#  endif

-#else

-#  ifdef HAS_vsnprintf_void

-    (void)vsnprintf(buf, sizeof(buf), format, va);

-    va_end(va);

-    len = strlen(buf);

-#  else

-    len = vsnprintf(buf, sizeof(buf), format, va);

-    va_end(va);

-#  endif

-#endif

-    if (len <= 0 || len >= (int)sizeof(buf) || buf[sizeof(buf) - 1] != 0)

-        return 0;

-    return gzwrite(file, buf, (unsigned)len);

-}

-#else /* not ANSI C */

-

-int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,

-                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)

-    gzFile file;

-    const char *format;

-    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,

-        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;

-{

-    char buf[Z_PRINTF_BUFSIZE];

-    int len;

-

-    buf[sizeof(buf) - 1] = 0;

-#ifdef NO_snprintf

-#  ifdef HAS_sprintf_void

-    sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,

-            a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);

-    for (len = 0; len < sizeof(buf); len++)

-        if (buf[len] == 0) break;

-#  else

-    len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,

-                a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);

-#  endif

-#else

-#  ifdef HAS_snprintf_void

-    snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,

-             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);

-    len = strlen(buf);

-#  else

-    len = snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,

-                 a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);

-#  endif

-#endif

-    if (len <= 0 || len >= sizeof(buf) || buf[sizeof(buf) - 1] != 0)

-        return 0;

-    return gzwrite(file, buf, len);

-}

-#endif

-

-/* ===========================================================================

-      Writes c, converted to an unsigned char, into the compressed file.

-   gzputc returns the value that was written, or -1 in case of error.

-*/

-int ZEXPORT gzputc(file, c)

-    gzFile file;

-    int c;

-{

-    unsigned char cc = (unsigned char) c; /* required for big endian systems */

-

-    return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1;

-}

-

-

-/* ===========================================================================

-      Writes the given null-terminated string to the compressed file, excluding

-   the terminating null character.

-      gzputs returns the number of characters written, or -1 in case of error.

-*/

-int ZEXPORT gzputs(file, s)

-    gzFile file;

-    const char *s;

-{

-    return gzwrite(file, (char*)s, (unsigned)strlen(s));

-}

-

-

-/* ===========================================================================

-     Flushes all pending output into the compressed file. The parameter

-   flush is as in the deflate() function.

-*/

-local int do_flush (file, flush)

-    gzFile file;

-    int flush;

-{

-    uInt len;

-    int done = 0;

-    gz_stream *s = (gz_stream*)file;

-

-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;

-

-    s->stream.avail_in = 0; /* should be zero already anyway */

-

-    for (;;) {

-        len = Z_BUFSIZE - s->stream.avail_out;

-

-        if (len != 0) {

-            if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) {

-                s->z_err = Z_ERRNO;

-                return Z_ERRNO;

-            }

-            s->stream.next_out = s->outbuf;

-            s->stream.avail_out = Z_BUFSIZE;

-        }

-        if (done) break;

-        s->out += s->stream.avail_out;

-        s->z_err = deflate(&(s->stream), flush);

-        s->out -= s->stream.avail_out;

-

-        /* Ignore the second of two consecutive flushes: */

-        if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;

-

-        /* deflate has finished flushing only when it hasn't used up

-         * all the available space in the output buffer:

-         */

-        done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END);

-

-        if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;

-    }

-    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;

-}

-

-int ZEXPORT gzflush (file, flush)

-     gzFile file;

-     int flush;

-{

-    gz_stream *s = (gz_stream*)file;

-    int err = do_flush (file, flush);

-

-    if (err) return err;

-    fflush(s->file);

-    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;

-}

-#endif /* NO_GZCOMPRESS */

-

-/* ===========================================================================

-      Sets the starting position for the next gzread or gzwrite on the given

-   compressed file. The offset represents a number of bytes in the

-      gzseek returns the resulting offset location as measured in bytes from

-   the beginning of the uncompressed stream, or -1 in case of error.

-      SEEK_END is not implemented, returns error.

-      In this version of the library, gzseek can be extremely slow.

-*/

-z_off_t ZEXPORT gzseek (file, offset, whence)

-    gzFile file;

-    z_off_t offset;

-    int whence;

-{

-    gz_stream *s = (gz_stream*)file;

-

-    if (s == NULL || whence == SEEK_END ||

-        s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) {

-        return -1L;

-    }

-

-    if (s->mode == 'w') {

-#ifdef NO_GZCOMPRESS

-        return -1L;

-#else

-        if (whence == SEEK_SET) {

-            offset -= s->in;

-        }

-        if (offset < 0) return -1L;

-

-        /* At this point, offset is the number of zero bytes to write. */

-        if (s->inbuf == Z_NULL) {

-            s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */

-            if (s->inbuf == Z_NULL) return -1L;

-            zmemzero(s->inbuf, Z_BUFSIZE);

-        }

-        while (offset > 0)  {

-            uInt size = Z_BUFSIZE;

-            if (offset < Z_BUFSIZE) size = (uInt)offset;

-

-            size = gzwrite(file, s->inbuf, size);

-            if (size == 0) return -1L;

-

-            offset -= size;

-        }

-        return s->in;

-#endif

-    }

-    /* Rest of function is for reading only */

-

-    /* compute absolute position */

-    if (whence == SEEK_CUR) {

-        offset += s->out;

-    }

-    if (offset < 0) return -1L;

-

-    if (s->transparent) {

-        /* map to fseek */

-        s->back = EOF;

-        s->stream.avail_in = 0;

-        s->stream.next_in = s->inbuf;

-        if (fseek(s->file, offset, SEEK_SET) < 0) return -1L;

-

-        s->in = s->out = offset;

-        return offset;

-    }

-

-    /* For a negative seek, rewind and use positive seek */

-    if (offset >= s->out) {

-        offset -= s->out;

-    } else if (gzrewind(file) < 0) {

-        return -1L;

-    }

-    /* offset is now the number of bytes to skip. */

-

-    if (offset != 0 && s->outbuf == Z_NULL) {

-        s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);

-        if (s->outbuf == Z_NULL) return -1L;

-    }

-    if (offset && s->back != EOF) {

-        s->back = EOF;

-        s->out++;

-        offset--;

-        if (s->last) s->z_err = Z_STREAM_END;

-    }

-    while (offset > 0)  {

-        int size = Z_BUFSIZE;

-        if (offset < Z_BUFSIZE) size = (int)offset;

-

-        size = gzread(file, s->outbuf, (uInt)size);

-        if (size <= 0) return -1L;

-        offset -= size;

-    }

-    return s->out;

-}

-

-/* ===========================================================================

-     Rewinds input file.

-*/

-int ZEXPORT gzrewind (file)

-    gzFile file;

-{

-    gz_stream *s = (gz_stream*)file;

-

-    if (s == NULL || s->mode != 'r') return -1;

-

-    s->z_err = Z_OK;

-    s->z_eof = 0;

-    s->back = EOF;

-    s->stream.avail_in = 0;

-    s->stream.next_in = s->inbuf;

-    s->crc = crc32(0L, Z_NULL, 0);

-    if (!s->transparent) (void)inflateReset(&s->stream);

-    s->in = 0;

-    s->out = 0;

-    return fseek(s->file, s->start, SEEK_SET);

-}

-

-/* ===========================================================================

-     Returns the starting position for the next gzread or gzwrite on the

-   given compressed file. This position represents a number of bytes in the

-   uncompressed data stream.

-*/

-z_off_t ZEXPORT gztell (file)

-    gzFile file;

-{

-    return gzseek(file, 0L, SEEK_CUR);

-}

-

-/* ===========================================================================

-     Returns 1 when EOF has previously been detected reading the given

-   input stream, otherwise zero.

-*/

-int ZEXPORT gzeof (file)

-    gzFile file;

-{

-    gz_stream *s = (gz_stream*)file;

-

-    /* With concatenated compressed files that can have embedded

-     * crc trailers, z_eof is no longer the only/best indicator of EOF

-     * on a gz_stream. Handle end-of-stream error explicitly here.

-     */

-    if (s == NULL || s->mode != 'r') return 0;

-    if (s->z_eof) return 1;

-    return s->z_err == Z_STREAM_END;

-}

-

-/* ===========================================================================

-     Returns 1 if reading and doing so transparently, otherwise zero.

-*/

-int ZEXPORT gzdirect (file)

-    gzFile file;

-{

-    gz_stream *s = (gz_stream*)file;

-

-    if (s == NULL || s->mode != 'r') return 0;

-    return s->transparent;

-}

-

-/* ===========================================================================

-   Outputs a long in LSB order to the given file

-*/

-local void putLong (file, x)

-    FILE *file;

-    uLong x;

-{

-    int n;

-    for (n = 0; n < 4; n++) {

-        fputc((int)(x & 0xff), file);

-        x >>= 8;

-    }

-}

-

-/* ===========================================================================

-   Reads a long in LSB order from the given gz_stream. Sets z_err in case

-   of error.

-*/

-local uLong getLong (s)

-    gz_stream *s;

-{

-    uLong x = (uLong)get_byte(s);

-    int c;

-

-    x += ((uLong)get_byte(s))<<8;

-    x += ((uLong)get_byte(s))<<16;

-    c = get_byte(s);

-    if (c == EOF) s->z_err = Z_DATA_ERROR;

-    x += ((uLong)c)<<24;

-    return x;

-}

-

-/* ===========================================================================

-     Flushes all pending output if necessary, closes the compressed file

-   and deallocates all the (de)compression state.

-*/

-int ZEXPORT gzclose (file)

-    gzFile file;

-{

-    gz_stream *s = (gz_stream*)file;

-

-    if (s == NULL) return Z_STREAM_ERROR;

-

-    if (s->mode == 'w') {

-#ifdef NO_GZCOMPRESS

-        return Z_STREAM_ERROR;

-#else

-        if (do_flush (file, Z_FINISH) != Z_OK)

-            return destroy((gz_stream*)file);

-

-        putLong (s->file, s->crc);

-        putLong (s->file, (uLong)(s->in & 0xffffffff));

-#endif

-    }

-    return destroy((gz_stream*)file);

-}

-

-#ifdef STDC

-#  define zstrerror(errnum) strerror(errnum)

-#else

-#  define zstrerror(errnum) ""

-#endif

-

-/* ===========================================================================

-     Returns the error message for the last error which occurred on the

-   given compressed file. errnum is set to zlib error number. If an

-   error occurred in the file system and not in the compression library,

-   errnum is set to Z_ERRNO and the application may consult errno

-   to get the exact error code.

-*/

-const char * ZEXPORT gzerror (file, errnum)

-    gzFile file;

-    int *errnum;

-{

-    char *m;

-    gz_stream *s = (gz_stream*)file;

-

-    if (s == NULL) {

-        *errnum = Z_STREAM_ERROR;

-        return (const char*)ERR_MSG(Z_STREAM_ERROR);

-    }

-    *errnum = s->z_err;

-    if (*errnum == Z_OK) return (const char*)"";

-

-    m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg);

-

-    if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err);

-

-    TRYFREE(s->msg);

-    s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3);

-    if (s->msg == Z_NULL) return (const char*)ERR_MSG(Z_MEM_ERROR);

-    strcpy(s->msg, s->path);

-    strcat(s->msg, ": ");

-    strcat(s->msg, m);

-    return (const char*)s->msg;

-}

-

-/* ===========================================================================

-     Clear the error and end-of-file flags, and do the same for the real file.

-*/

-void ZEXPORT gzclearerr (file)

-    gzFile file;

-{

-    gz_stream *s = (gz_stream*)file;

-

-    if (s == NULL) return;

-    if (s->z_err != Z_STREAM_END) s->z_err = Z_OK;

-    s->z_eof = 0;

-    clearerr(s->file);

-}

+/* gzio.c -- IO on .gz files
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * Compile this file with -DNO_GZCOMPRESS to avoid the compression code.
+ */
+
+/* @(#) $Id$ */
+
+#include <stdio.h>
+
+#include "zutil.h"
+
+#ifdef NO_DEFLATE       /* for compatibility with old definition */
+#  define NO_GZCOMPRESS
+#endif
+
+#ifndef NO_DUMMY_DECL
+struct internal_state {int dummy;}; /* for buggy compilers */
+#endif
+
+#ifndef Z_BUFSIZE
+#  ifdef MAXSEG_64K
+#    define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */
+#  else
+#    define Z_BUFSIZE 16384
+#  endif
+#endif
+#ifndef Z_PRINTF_BUFSIZE
+#  define Z_PRINTF_BUFSIZE 4096
+#endif
+
+#ifdef __MVS__
+#  pragma map (fdopen , "\174\174FDOPEN")
+   FILE *fdopen(int, const char *);
+#endif
+
+#ifndef STDC
+extern voidp  malloc OF((uInt size));
+extern void   free   OF((voidpf ptr));
+#endif
+
+#define ALLOC(size) malloc(size)
+#define TRYFREE(p) {if (p) free(p);}
+
+static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
+
+/* gzip flag byte */
+#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
+#define HEAD_CRC     0x02 /* bit 1 set: header CRC present */
+#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
+#define ORIG_NAME    0x08 /* bit 3 set: original file name present */
+#define COMMENT      0x10 /* bit 4 set: file comment present */
+#define RESERVED     0xE0 /* bits 5..7: reserved */
+
+typedef struct gz_stream {
+    z_stream stream;
+    int      z_err;   /* error code for last stream operation */
+    int      z_eof;   /* set if end of input file */
+    FILE     *file;   /* .gz file */
+    Byte     *inbuf;  /* input buffer */
+    Byte     *outbuf; /* output buffer */
+    uLong    crc;     /* crc32 of uncompressed data */
+    char     *msg;    /* error message */
+    char     *path;   /* path name for debugging only */
+    int      transparent; /* 1 if input file is not a .gz file */
+    char     mode;    /* 'w' or 'r' */
+    z_off_t  start;   /* start of compressed data in file (header skipped) */
+    z_off_t  in;      /* bytes into deflate or inflate */
+    z_off_t  out;     /* bytes out of deflate or inflate */
+    int      back;    /* one character push-back */
+    int      last;    /* true if push-back is last character */
+} gz_stream;
+
+
+local gzFile gz_open      OF((const char *path, const char *mode, int  fd));
+local int do_flush        OF((gzFile file, int flush));
+local int    get_byte     OF((gz_stream *s));
+local void   check_header OF((gz_stream *s));
+local int    destroy      OF((gz_stream *s));
+local void   putLong      OF((FILE *file, uLong x));
+local uLong  getLong      OF((gz_stream *s));
+
+/* ===========================================================================
+     Opens a gzip (.gz) file for reading or writing. The mode parameter
+   is as in fopen ("rb" or "wb"). The file is given either by file descriptor
+   or path name (if fd == -1).
+     gz_open returns NULL if the file could not be opened or if there was
+   insufficient memory to allocate the (de)compression state; errno
+   can be checked to distinguish the two cases (if errno is zero, the
+   zlib error is Z_MEM_ERROR).
+*/
+local gzFile gz_open (path, mode, fd)
+    const char *path;
+    const char *mode;
+    int  fd;
+{
+    int err;
+    int level = Z_DEFAULT_COMPRESSION; /* compression level */
+    int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */
+    char *p = (char*)mode;
+    gz_stream *s;
+    char fmode[80]; /* copy of mode, without the compression level */
+    char *m = fmode;
+
+    if (!path || !mode) return Z_NULL;
+
+    s = (gz_stream *)ALLOC(sizeof(gz_stream));
+    if (!s) return Z_NULL;
+
+    s->stream.zalloc = (alloc_func)0;
+    s->stream.zfree = (free_func)0;
+    s->stream.opaque = (voidpf)0;
+    s->stream.next_in = s->inbuf = Z_NULL;
+    s->stream.next_out = s->outbuf = Z_NULL;
+    s->stream.avail_in = s->stream.avail_out = 0;
+    s->file = NULL;
+    s->z_err = Z_OK;
+    s->z_eof = 0;
+    s->in = 0;
+    s->out = 0;
+    s->back = EOF;
+    s->crc = crc32(0L, Z_NULL, 0);
+    s->msg = NULL;
+    s->transparent = 0;
+
+    s->path = (char*)ALLOC(strlen(path)+1);
+    if (s->path == NULL) {
+        return destroy(s), (gzFile)Z_NULL;
+    }
+    strcpy(s->path, path); /* do this early for debugging */
+
+    s->mode = '\0';
+    do {
+        if (*p == 'r') s->mode = 'r';
+        if (*p == 'w' || *p == 'a') s->mode = 'w';
+        if (*p >= '0' && *p <= '9') {
+            level = *p - '0';
+        } else if (*p == 'f') {
+          strategy = Z_FILTERED;
+        } else if (*p == 'h') {
+          strategy = Z_HUFFMAN_ONLY;
+        } else if (*p == 'R') {
+          strategy = Z_RLE;
+        } else {
+            *m++ = *p; /* copy the mode */
+        }
+    } while (*p++ && m != fmode + sizeof(fmode));
+    if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;
+
+    if (s->mode == 'w') {
+#ifdef NO_GZCOMPRESS
+        err = Z_STREAM_ERROR;
+#else
+        err = deflateInit2(&(s->stream), level,
+                           Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
+        /* windowBits is passed < 0 to suppress zlib header */
+
+        s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
+#endif
+        if (err != Z_OK || s->outbuf == Z_NULL) {
+            return destroy(s), (gzFile)Z_NULL;
+        }
+    } else {
+        s->stream.next_in  = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);
+
+        err = inflateInit2(&(s->stream), -MAX_WBITS);
+        /* windowBits is passed < 0 to tell that there is no zlib header.
+         * Note that in this case inflate *requires* an extra "dummy" byte
+         * after the compressed stream in order to complete decompression and
+         * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are
+         * present after the compressed stream.
+         */
+        if (err != Z_OK || s->inbuf == Z_NULL) {
+            return destroy(s), (gzFile)Z_NULL;
+        }
+    }
+    s->stream.avail_out = Z_BUFSIZE;
+
+    errno = 0;
+    s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode);
+
+    if (s->file == NULL) {
+        return destroy(s), (gzFile)Z_NULL;
+    }
+    if (s->mode == 'w') {
+        /* Write a very simple .gz header:
+         */
+        fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
+             Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
+        s->start = 10L;
+        /* We use 10L instead of ftell(s->file) to because ftell causes an
+         * fflush on some systems. This version of the library doesn't use
+         * start anyway in write mode, so this initialization is not
+         * necessary.
+         */
+    } else {
+        check_header(s); /* skip the .gz header */
+        s->start = ftell(s->file) - s->stream.avail_in;
+    }
+
+    return (gzFile)s;
+}
+
+/* ===========================================================================
+     Opens a gzip (.gz) file for reading or writing.
+*/
+gzFile ZEXPORT gzopen (path, mode)
+    const char *path;
+    const char *mode;
+{
+    return gz_open (path, mode, -1);
+}
+
+/* ===========================================================================
+     Associate a gzFile with the file descriptor fd. fd is not dup'ed here
+   to mimic the behavio(u)r of fdopen.
+*/
+gzFile ZEXPORT gzdopen (fd, mode)
+    int fd;
+    const char *mode;
+{
+    char name[46];      /* allow for up to 128-bit integers */
+
+    if (fd < 0) return (gzFile)Z_NULL;
+    sprintf(name, "<fd:%d>", fd); /* for debugging */
+
+    return gz_open (name, mode, fd);
+}
+
+/* ===========================================================================
+ * Update the compression level and strategy
+ */
+int ZEXPORT gzsetparams (file, level, strategy)
+    gzFile file;
+    int level;
+    int strategy;
+{
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
+
+    /* Make room to allow flushing */
+    if (s->stream.avail_out == 0) {
+
+        s->stream.next_out = s->outbuf;
+        if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
+            s->z_err = Z_ERRNO;
+        }
+        s->stream.avail_out = Z_BUFSIZE;
+    }
+
+    return deflateParams (&(s->stream), level, strategy);
+}
+
+/* ===========================================================================
+     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
+   for end of file.
+   IN assertion: the stream s has been sucessfully opened for reading.
+*/
+local int get_byte(s)
+    gz_stream *s;
+{
+    if (s->z_eof) return EOF;
+    if (s->stream.avail_in == 0) {
+        errno = 0;
+        s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file);
+        if (s->stream.avail_in == 0) {
+            s->z_eof = 1;
+            if (ferror(s->file)) s->z_err = Z_ERRNO;
+            return EOF;
+        }
+        s->stream.next_in = s->inbuf;
+    }
+    s->stream.avail_in--;
+    return *(s->stream.next_in)++;
+}
+
+/* ===========================================================================
+      Check the gzip header of a gz_stream opened for reading. Set the stream
+    mode to transparent if the gzip magic header is not present; set s->err
+    to Z_DATA_ERROR if the magic header is present but the rest of the header
+    is incorrect.
+    IN assertion: the stream s has already been created sucessfully;
+       s->stream.avail_in is zero for the first time, but may be non-zero
+       for concatenated .gz files.
+*/
+local void check_header(s)
+    gz_stream *s;
+{
+    int method; /* method byte */
+    int flags;  /* flags byte */
+    uInt len;
+    int c;
+
+    /* Assure two bytes in the buffer so we can peek ahead -- handle case
+       where first byte of header is at the end of the buffer after the last
+       gzip segment */
+    len = s->stream.avail_in;
+    if (len < 2) {
+        if (len) s->inbuf[0] = s->stream.next_in[0];
+        errno = 0;
+        len = (uInt)fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file);
+        if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO;
+        s->stream.avail_in += len;
+        s->stream.next_in = s->inbuf;
+        if (s->stream.avail_in < 2) {
+            s->transparent = s->stream.avail_in;
+            return;
+        }
+    }
+
+    /* Peek ahead to check the gzip magic header */
+    if (s->stream.next_in[0] != gz_magic[0] ||
+        s->stream.next_in[1] != gz_magic[1]) {
+        s->transparent = 1;
+        return;
+    }
+    s->stream.avail_in -= 2;
+    s->stream.next_in += 2;
+
+    /* Check the rest of the gzip header */
+    method = get_byte(s);
+    flags = get_byte(s);
+    if (method != Z_DEFLATED || (flags & RESERVED) != 0) {
+        s->z_err = Z_DATA_ERROR;
+        return;
+    }
+
+    /* Discard time, xflags and OS code: */
+    for (len = 0; len < 6; len++) (void)get_byte(s);
+
+    if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
+        len  =  (uInt)get_byte(s);
+        len += ((uInt)get_byte(s))<<8;
+        /* len is garbage if EOF but the loop below will quit anyway */
+        while (len-- != 0 && get_byte(s) != EOF) ;
+    }
+    if ((flags & ORIG_NAME) != 0) { /* skip the original file name */
+        while ((c = get_byte(s)) != 0 && c != EOF) ;
+    }
+    if ((flags & COMMENT) != 0) {   /* skip the .gz file comment */
+        while ((c = get_byte(s)) != 0 && c != EOF) ;
+    }
+    if ((flags & HEAD_CRC) != 0) {  /* skip the header crc */
+        for (len = 0; len < 2; len++) (void)get_byte(s);
+    }
+    s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK;
+}
+
+ /* ===========================================================================
+ * Cleanup then free the given gz_stream. Return a zlib error code.
+   Try freeing in the reverse order of allocations.
+ */
+local int destroy (s)
+    gz_stream *s;
+{
+    int err = Z_OK;
+
+    if (!s) return Z_STREAM_ERROR;
+
+    TRYFREE(s->msg);
+
+    if (s->stream.state != NULL) {
+        if (s->mode == 'w') {
+#ifdef NO_GZCOMPRESS
+            err = Z_STREAM_ERROR;
+#else
+            err = deflateEnd(&(s->stream));
+#endif
+        } else if (s->mode == 'r') {
+            err = inflateEnd(&(s->stream));
+        }
+    }
+    if (s->file != NULL && fclose(s->file)) {
+#ifdef ESPIPE
+        if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */
+#endif
+            err = Z_ERRNO;
+    }
+    if (s->z_err < 0) err = s->z_err;
+
+    TRYFREE(s->inbuf);
+    TRYFREE(s->outbuf);
+    TRYFREE(s->path);
+    TRYFREE(s);
+    return err;
+}
+
+/* ===========================================================================
+     Reads the given number of uncompressed bytes from the compressed file.
+   gzread returns the number of bytes actually read (0 for end of file).
+*/
+int ZEXPORT gzread (file, buf, len)
+    gzFile file;
+    voidp buf;
+    unsigned len;
+{
+    gz_stream *s = (gz_stream*)file;
+    Bytef *start = (Bytef*)buf; /* starting point for crc computation */
+    Byte  *next_out; /* == stream.next_out but not forced far (for MSDOS) */
+
+    if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
+
+    if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;
+    if (s->z_err == Z_STREAM_END) return 0;  /* EOF */
+
+    next_out = (Byte*)buf;
+    s->stream.next_out = (Bytef*)buf;
+    s->stream.avail_out = len;
+
+    if (s->stream.avail_out && s->back != EOF) {
+        *next_out++ = s->back;
+        s->stream.next_out++;
+        s->stream.avail_out--;
+        s->back = EOF;
+        s->out++;
+        start++;
+        if (s->last) {
+            s->z_err = Z_STREAM_END;
+            return 1;
+        }
+    }
+
+    while (s->stream.avail_out != 0) {
+
+        if (s->transparent) {
+            /* Copy first the lookahead bytes: */
+            uInt n = s->stream.avail_in;
+            if (n > s->stream.avail_out) n = s->stream.avail_out;
+            if (n > 0) {
+                zmemcpy(s->stream.next_out, s->stream.next_in, n);
+                next_out += n;
+                s->stream.next_out = next_out;
+                s->stream.next_in   += n;
+                s->stream.avail_out -= n;
+                s->stream.avail_in  -= n;
+            }
+            if (s->stream.avail_out > 0) {
+                s->stream.avail_out -=
+                    (uInt)fread(next_out, 1, s->stream.avail_out, s->file);
+            }
+            len -= s->stream.avail_out;
+            s->in  += len;
+            s->out += len;
+            if (len == 0) s->z_eof = 1;
+            return (int)len;
+        }
+        if (s->stream.avail_in == 0 && !s->z_eof) {
+
+            errno = 0;
+            s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file);
+            if (s->stream.avail_in == 0) {
+                s->z_eof = 1;
+                if (ferror(s->file)) {
+                    s->z_err = Z_ERRNO;
+                    break;
+                }
+            }
+            s->stream.next_in = s->inbuf;
+        }
+        s->in += s->stream.avail_in;
+        s->out += s->stream.avail_out;
+        s->z_err = inflate(&(s->stream), Z_NO_FLUSH);
+        s->in -= s->stream.avail_in;
+        s->out -= s->stream.avail_out;
+
+        if (s->z_err == Z_STREAM_END) {
+            /* Check CRC and original size */
+            s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
+            start = s->stream.next_out;
+
+            if (getLong(s) != s->crc) {
+                s->z_err = Z_DATA_ERROR;
+            } else {
+                (void)getLong(s);
+                /* The uncompressed length returned by above getlong() may be
+                 * different from s->out in case of concatenated .gz files.
+                 * Check for such files:
+                 */
+                check_header(s);
+                if (s->z_err == Z_OK) {
+                    inflateReset(&(s->stream));
+                    s->crc = crc32(0L, Z_NULL, 0);
+                }
+            }
+        }
+        if (s->z_err != Z_OK || s->z_eof) break;
+    }
+    s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
+
+    if (len == s->stream.avail_out &&
+        (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO))
+        return -1;
+    return (int)(len - s->stream.avail_out);
+}
+
+
+/* ===========================================================================
+      Reads one byte from the compressed file. gzgetc returns this byte
+   or -1 in case of end of file or error.
+*/
+int ZEXPORT gzgetc(file)
+    gzFile file;
+{
+    unsigned char c;
+
+    return gzread(file, &c, 1) == 1 ? c : -1;
+}
+
+
+/* ===========================================================================
+      Push one byte back onto the stream.
+*/
+int ZEXPORT gzungetc(c, file)
+    int c;
+    gzFile file;
+{
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL || s->mode != 'r' || c == EOF || s->back != EOF) return EOF;
+    s->back = c;
+    s->out--;
+    s->last = (s->z_err == Z_STREAM_END);
+    if (s->last) s->z_err = Z_OK;
+    s->z_eof = 0;
+    return c;
+}
+
+
+/* ===========================================================================
+      Reads bytes from the compressed file until len-1 characters are
+   read, or a newline character is read and transferred to buf, or an
+   end-of-file condition is encountered.  The string is then terminated
+   with a null character.
+      gzgets returns buf, or Z_NULL in case of error.
+
+      The current implementation is not optimized at all.
+*/
+char * ZEXPORT gzgets(file, buf, len)
+    gzFile file;
+    char *buf;
+    int len;
+{
+    char *b = buf;
+    if (buf == Z_NULL || len <= 0) return Z_NULL;
+
+    while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ;
+    *buf = '\0';
+    return b == buf && len > 0 ? Z_NULL : b;
+}
+
+
+#ifndef NO_GZCOMPRESS
+/* ===========================================================================
+     Writes the given number of uncompressed bytes into the compressed file.
+   gzwrite returns the number of bytes actually written (0 in case of error).
+*/
+int ZEXPORT gzwrite (file, buf, len)
+    gzFile file;
+    voidpc buf;
+    unsigned len;
+{
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
+
+    s->stream.next_in = (Bytef*)buf;
+    s->stream.avail_in = len;
+
+    while (s->stream.avail_in != 0) {
+
+        if (s->stream.avail_out == 0) {
+
+            s->stream.next_out = s->outbuf;
+            if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
+                s->z_err = Z_ERRNO;
+                break;
+            }
+            s->stream.avail_out = Z_BUFSIZE;
+        }
+        s->in += s->stream.avail_in;
+        s->out += s->stream.avail_out;
+        s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
+        s->in -= s->stream.avail_in;
+        s->out -= s->stream.avail_out;
+        if (s->z_err != Z_OK) break;
+    }
+    s->crc = crc32(s->crc, (const Bytef *)buf, len);
+
+    return (int)(len - s->stream.avail_in);
+}
+
+
+/* ===========================================================================
+     Converts, formats, and writes the args to the compressed file under
+   control of the format string, as in fprintf. gzprintf returns the number of
+   uncompressed bytes actually written (0 in case of error).
+*/
+#ifdef STDC
+#include <stdarg.h>
+
+int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)
+{
+    char buf[Z_PRINTF_BUFSIZE];
+    va_list va;
+    int len;
+
+    buf[sizeof(buf) - 1] = 0;
+    va_start(va, format);
+#ifdef NO_vsnprintf
+#  ifdef HAS_vsprintf_void
+    (void)vsprintf(buf, format, va);
+    va_end(va);
+    for (len = 0; len < sizeof(buf); len++)
+        if (buf[len] == 0) break;
+#  else
+    len = vsprintf(buf, format, va);
+    va_end(va);
+#  endif
+#else
+#  ifdef HAS_vsnprintf_void
+    (void)vsnprintf(buf, sizeof(buf), format, va);
+    va_end(va);
+    len = strlen(buf);
+#  else
+    len = vsnprintf(buf, sizeof(buf), format, va);
+    va_end(va);
+#  endif
+#endif
+    if (len <= 0 || len >= (int)sizeof(buf) || buf[sizeof(buf) - 1] != 0)
+        return 0;
+    return gzwrite(file, buf, (unsigned)len);
+}
+#else /* not ANSI C */
+
+int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
+    gzFile file;
+    const char *format;
+    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
+{
+    char buf[Z_PRINTF_BUFSIZE];
+    int len;
+
+    buf[sizeof(buf) - 1] = 0;
+#ifdef NO_snprintf
+#  ifdef HAS_sprintf_void
+    sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
+            a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+    for (len = 0; len < sizeof(buf); len++)
+        if (buf[len] == 0) break;
+#  else
+    len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
+                a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+#  endif
+#else
+#  ifdef HAS_snprintf_void
+    snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
+             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+    len = strlen(buf);
+#  else
+    len = snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
+                 a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+#  endif
+#endif
+    if (len <= 0 || len >= sizeof(buf) || buf[sizeof(buf) - 1] != 0)
+        return 0;
+    return gzwrite(file, buf, len);
+}
+#endif
+
+/* ===========================================================================
+      Writes c, converted to an unsigned char, into the compressed file.
+   gzputc returns the value that was written, or -1 in case of error.
+*/
+int ZEXPORT gzputc(file, c)
+    gzFile file;
+    int c;
+{
+    unsigned char cc = (unsigned char) c; /* required for big endian systems */
+
+    return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1;
+}
+
+
+/* ===========================================================================
+      Writes the given null-terminated string to the compressed file, excluding
+   the terminating null character.
+      gzputs returns the number of characters written, or -1 in case of error.
+*/
+int ZEXPORT gzputs(file, s)
+    gzFile file;
+    const char *s;
+{
+    return gzwrite(file, (char*)s, (unsigned)strlen(s));
+}
+
+
+/* ===========================================================================
+     Flushes all pending output into the compressed file. The parameter
+   flush is as in the deflate() function.
+*/
+local int do_flush (file, flush)
+    gzFile file;
+    int flush;
+{
+    uInt len;
+    int done = 0;
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
+
+    s->stream.avail_in = 0; /* should be zero already anyway */
+
+    for (;;) {
+        len = Z_BUFSIZE - s->stream.avail_out;
+
+        if (len != 0) {
+            if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) {
+                s->z_err = Z_ERRNO;
+                return Z_ERRNO;
+            }
+            s->stream.next_out = s->outbuf;
+            s->stream.avail_out = Z_BUFSIZE;
+        }
+        if (done) break;
+        s->out += s->stream.avail_out;
+        s->z_err = deflate(&(s->stream), flush);
+        s->out -= s->stream.avail_out;
+
+        /* Ignore the second of two consecutive flushes: */
+        if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;
+
+        /* deflate has finished flushing only when it hasn't used up
+         * all the available space in the output buffer:
+         */
+        done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END);
+
+        if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
+    }
+    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
+}
+
+int ZEXPORT gzflush (file, flush)
+     gzFile file;
+     int flush;
+{
+    gz_stream *s = (gz_stream*)file;
+    int err = do_flush (file, flush);
+
+    if (err) return err;
+    fflush(s->file);
+    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
+}
+#endif /* NO_GZCOMPRESS */
+
+/* ===========================================================================
+      Sets the starting position for the next gzread or gzwrite on the given
+   compressed file. The offset represents a number of bytes in the
+      gzseek returns the resulting offset location as measured in bytes from
+   the beginning of the uncompressed stream, or -1 in case of error.
+      SEEK_END is not implemented, returns error.
+      In this version of the library, gzseek can be extremely slow.
+*/
+z_off_t ZEXPORT gzseek (file, offset, whence)
+    gzFile file;
+    z_off_t offset;
+    int whence;
+{
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL || whence == SEEK_END ||
+        s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) {
+        return -1L;
+    }
+
+    if (s->mode == 'w') {
+#ifdef NO_GZCOMPRESS
+        return -1L;
+#else
+        if (whence == SEEK_SET) {
+            offset -= s->in;
+        }
+        if (offset < 0) return -1L;
+
+        /* At this point, offset is the number of zero bytes to write. */
+        if (s->inbuf == Z_NULL) {
+            s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */
+            if (s->inbuf == Z_NULL) return -1L;
+            zmemzero(s->inbuf, Z_BUFSIZE);
+        }
+        while (offset > 0)  {
+            uInt size = Z_BUFSIZE;
+            if (offset < Z_BUFSIZE) size = (uInt)offset;
+
+            size = gzwrite(file, s->inbuf, size);
+            if (size == 0) return -1L;
+
+            offset -= size;
+        }
+        return s->in;
+#endif
+    }
+    /* Rest of function is for reading only */
+
+    /* compute absolute position */
+    if (whence == SEEK_CUR) {
+        offset += s->out;
+    }
+    if (offset < 0) return -1L;
+
+    if (s->transparent) {
+        /* map to fseek */
+        s->back = EOF;
+        s->stream.avail_in = 0;
+        s->stream.next_in = s->inbuf;
+        if (fseek(s->file, offset, SEEK_SET) < 0) return -1L;
+
+        s->in = s->out = offset;
+        return offset;
+    }
+
+    /* For a negative seek, rewind and use positive seek */
+    if (offset >= s->out) {
+        offset -= s->out;
+    } else if (gzrewind(file) < 0) {
+        return -1L;
+    }
+    /* offset is now the number of bytes to skip. */
+
+    if (offset != 0 && s->outbuf == Z_NULL) {
+        s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
+        if (s->outbuf == Z_NULL) return -1L;
+    }
+    if (offset && s->back != EOF) {
+        s->back = EOF;
+        s->out++;
+        offset--;
+        if (s->last) s->z_err = Z_STREAM_END;
+    }
+    while (offset > 0)  {
+        int size = Z_BUFSIZE;
+        if (offset < Z_BUFSIZE) size = (int)offset;
+
+        size = gzread(file, s->outbuf, (uInt)size);
+        if (size <= 0) return -1L;
+        offset -= size;
+    }
+    return s->out;
+}
+
+/* ===========================================================================
+     Rewinds input file.
+*/
+int ZEXPORT gzrewind (file)
+    gzFile file;
+{
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL || s->mode != 'r') return -1;
+
+    s->z_err = Z_OK;
+    s->z_eof = 0;
+    s->back = EOF;
+    s->stream.avail_in = 0;
+    s->stream.next_in = s->inbuf;
+    s->crc = crc32(0L, Z_NULL, 0);
+    if (!s->transparent) (void)inflateReset(&s->stream);
+    s->in = 0;
+    s->out = 0;
+    return fseek(s->file, s->start, SEEK_SET);
+}
+
+/* ===========================================================================
+     Returns the starting position for the next gzread or gzwrite on the
+   given compressed file. This position represents a number of bytes in the
+   uncompressed data stream.
+*/
+z_off_t ZEXPORT gztell (file)
+    gzFile file;
+{
+    return gzseek(file, 0L, SEEK_CUR);
+}
+
+/* ===========================================================================
+     Returns 1 when EOF has previously been detected reading the given
+   input stream, otherwise zero.
+*/
+int ZEXPORT gzeof (file)
+    gzFile file;
+{
+    gz_stream *s = (gz_stream*)file;
+
+    /* With concatenated compressed files that can have embedded
+     * crc trailers, z_eof is no longer the only/best indicator of EOF
+     * on a gz_stream. Handle end-of-stream error explicitly here.
+     */
+    if (s == NULL || s->mode != 'r') return 0;
+    if (s->z_eof) return 1;
+    return s->z_err == Z_STREAM_END;
+}
+
+/* ===========================================================================
+     Returns 1 if reading and doing so transparently, otherwise zero.
+*/
+int ZEXPORT gzdirect (file)
+    gzFile file;
+{
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL || s->mode != 'r') return 0;
+    return s->transparent;
+}
+
+/* ===========================================================================
+   Outputs a long in LSB order to the given file
+*/
+local void putLong (file, x)
+    FILE *file;
+    uLong x;
+{
+    int n;
+    for (n = 0; n < 4; n++) {
+        fputc((int)(x & 0xff), file);
+        x >>= 8;
+    }
+}
+
+/* ===========================================================================
+   Reads a long in LSB order from the given gz_stream. Sets z_err in case
+   of error.
+*/
+local uLong getLong (s)
+    gz_stream *s;
+{
+    uLong x = (uLong)get_byte(s);
+    int c;
+
+    x += ((uLong)get_byte(s))<<8;
+    x += ((uLong)get_byte(s))<<16;
+    c = get_byte(s);
+    if (c == EOF) s->z_err = Z_DATA_ERROR;
+    x += ((uLong)c)<<24;
+    return x;
+}
+
+/* ===========================================================================
+     Flushes all pending output if necessary, closes the compressed file
+   and deallocates all the (de)compression state.
+*/
+int ZEXPORT gzclose (file)
+    gzFile file;
+{
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL) return Z_STREAM_ERROR;
+
+    if (s->mode == 'w') {
+#ifdef NO_GZCOMPRESS
+        return Z_STREAM_ERROR;
+#else
+        if (do_flush (file, Z_FINISH) != Z_OK)
+            return destroy((gz_stream*)file);
+
+        putLong (s->file, s->crc);
+        putLong (s->file, (uLong)(s->in & 0xffffffff));
+#endif
+    }
+    return destroy((gz_stream*)file);
+}
+
+#ifdef STDC
+#  define zstrerror(errnum) strerror(errnum)
+#else
+#  define zstrerror(errnum) ""
+#endif
+
+/* ===========================================================================
+     Returns the error message for the last error which occurred on the
+   given compressed file. errnum is set to zlib error number. If an
+   error occurred in the file system and not in the compression library,
+   errnum is set to Z_ERRNO and the application may consult errno
+   to get the exact error code.
+*/
+const char * ZEXPORT gzerror (file, errnum)
+    gzFile file;
+    int *errnum;
+{
+    char *m;
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL) {
+        *errnum = Z_STREAM_ERROR;
+        return (const char*)ERR_MSG(Z_STREAM_ERROR);
+    }
+    *errnum = s->z_err;
+    if (*errnum == Z_OK) return (const char*)"";
+
+    m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg);
+
+    if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err);
+
+    TRYFREE(s->msg);
+    s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3);
+    if (s->msg == Z_NULL) return (const char*)ERR_MSG(Z_MEM_ERROR);
+    strcpy(s->msg, s->path);
+    strcat(s->msg, ": ");
+    strcat(s->msg, m);
+    return (const char*)s->msg;
+}
+
+/* ===========================================================================
+     Clear the error and end-of-file flags, and do the same for the real file.
+*/
+void ZEXPORT gzclearerr (file)
+    gzFile file;
+{
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL) return;
+    if (s->z_err != Z_STREAM_END) s->z_err = Z_OK;
+    s->z_eof = 0;
+    clearerr(s->file);
+}
diff --git a/utils/zenutils/libraries/zlib123/zlib/infback.c b/utils/zenutils/libraries/zlib123/zlib/infback.c
index 1e03e1bab0..455dbc9ee8 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/infback.c
+++ b/utils/zenutils/libraries/zlib123/zlib/infback.c
@@ -1,623 +1,623 @@
-/* infback.c -- inflate using a call-back interface

- * Copyright (C) 1995-2005 Mark Adler

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/*

-   This code is largely copied from inflate.c.  Normally either infback.o or

-   inflate.o would be linked into an application--not both.  The interface

-   with inffast.c is retained so that optimized assembler-coded versions of

-   inflate_fast() can be used with either inflate.c or infback.c.

- */

-

-#include "zutil.h"

-#include "inftrees.h"

-#include "inflate.h"

-#include "inffast.h"

-

-/* function prototypes */

-local void fixedtables OF((struct inflate_state FAR *state));

-

-/*

-   strm provides memory allocation functions in zalloc and zfree, or

-   Z_NULL to use the library memory allocation functions.

-

-   windowBits is in the range 8..15, and window is a user-supplied

-   window and output buffer that is 2**windowBits bytes.

- */

-int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)

-z_streamp strm;

-int windowBits;

-unsigned char FAR *window;

-const char *version;

-int stream_size;

-{

-    struct inflate_state FAR *state;

-

-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||

-        stream_size != (int)(sizeof(z_stream)))

-        return Z_VERSION_ERROR;

-    if (strm == Z_NULL || window == Z_NULL ||

-        windowBits < 8 || windowBits > 15)

-        return Z_STREAM_ERROR;

-    strm->msg = Z_NULL;                 /* in case we return an error */

-    if (strm->zalloc == (alloc_func)0) {

-        strm->zalloc = zcalloc;

-        strm->opaque = (voidpf)0;

-    }

-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;

-    state = (struct inflate_state FAR *)ZALLOC(strm, 1,

-                                               sizeof(struct inflate_state));

-    if (state == Z_NULL) return Z_MEM_ERROR;

-    Tracev((stderr, "inflate: allocated\n"));

-    strm->state = (struct internal_state FAR *)state;

-    state->dmax = 32768U;

-    state->wbits = windowBits;

-    state->wsize = 1U << windowBits;

-    state->window = window;

-    state->write = 0;

-    state->whave = 0;

-    return Z_OK;

-}

-

-/*

-   Return state with length and distance decoding tables and index sizes set to

-   fixed code decoding.  Normally this returns fixed tables from inffixed.h.

-   If BUILDFIXED is defined, then instead this routine builds the tables the

-   first time it's called, and returns those tables the first time and

-   thereafter.  This reduces the size of the code by about 2K bytes, in

-   exchange for a little execution time.  However, BUILDFIXED should not be

-   used for threaded applications, since the rewriting of the tables and virgin

-   may not be thread-safe.

- */

-local void fixedtables(state)

-struct inflate_state FAR *state;

-{

-#ifdef BUILDFIXED

-    static int virgin = 1;

-    static code *lenfix, *distfix;

-    static code fixed[544];

-

-    /* build fixed huffman tables if first call (may not be thread safe) */

-    if (virgin) {

-        unsigned sym, bits;

-        static code *next;

-

-        /* literal/length table */

-        sym = 0;

-        while (sym < 144) state->lens[sym++] = 8;

-        while (sym < 256) state->lens[sym++] = 9;

-        while (sym < 280) state->lens[sym++] = 7;

-        while (sym < 288) state->lens[sym++] = 8;

-        next = fixed;

-        lenfix = next;

-        bits = 9;

-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);

-

-        /* distance table */

-        sym = 0;

-        while (sym < 32) state->lens[sym++] = 5;

-        distfix = next;

-        bits = 5;

-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);

-

-        /* do this just once */

-        virgin = 0;

-    }

-#else /* !BUILDFIXED */

-#   include "inffixed.h"

-#endif /* BUILDFIXED */

-    state->lencode = lenfix;

-    state->lenbits = 9;

-    state->distcode = distfix;

-    state->distbits = 5;

-}

-

-/* Macros for inflateBack(): */

-

-/* Load returned state from inflate_fast() */

-#define LOAD() \

-    do { \

-        put = strm->next_out; \

-        left = strm->avail_out; \

-        next = strm->next_in; \

-        have = strm->avail_in; \

-        hold = state->hold; \

-        bits = state->bits; \

-    } while (0)

-

-/* Set state from registers for inflate_fast() */

-#define RESTORE() \

-    do { \

-        strm->next_out = put; \

-        strm->avail_out = left; \

-        strm->next_in = next; \

-        strm->avail_in = have; \

-        state->hold = hold; \

-        state->bits = bits; \

-    } while (0)

-

-/* Clear the input bit accumulator */

-#define INITBITS() \

-    do { \

-        hold = 0; \

-        bits = 0; \

-    } while (0)

-

-/* Assure that some input is available.  If input is requested, but denied,

-   then return a Z_BUF_ERROR from inflateBack(). */

-#define PULL() \

-    do { \

-        if (have == 0) { \

-            have = in(in_desc, &next); \

-            if (have == 0) { \

-                next = Z_NULL; \

-                ret = Z_BUF_ERROR; \

-                goto inf_leave; \

-            } \

-        } \

-    } while (0)

-

-/* Get a byte of input into the bit accumulator, or return from inflateBack()

-   with an error if there is no input available. */

-#define PULLBYTE() \

-    do { \

-        PULL(); \

-        have--; \

-        hold += (unsigned long)(*next++) << bits; \

-        bits += 8; \

-    } while (0)

-

-/* Assure that there are at least n bits in the bit accumulator.  If there is

-   not enough available input to do that, then return from inflateBack() with

-   an error. */

-#define NEEDBITS(n) \

-    do { \

-        while (bits < (unsigned)(n)) \

-            PULLBYTE(); \

-    } while (0)

-

-/* Return the low n bits of the bit accumulator (n < 16) */

-#define BITS(n) \

-    ((unsigned)hold & ((1U << (n)) - 1))

-

-/* Remove n bits from the bit accumulator */

-#define DROPBITS(n) \

-    do { \

-        hold >>= (n); \

-        bits -= (unsigned)(n); \

-    } while (0)

-

-/* Remove zero to seven bits as needed to go to a byte boundary */

-#define BYTEBITS() \

-    do { \

-        hold >>= bits & 7; \

-        bits -= bits & 7; \

-    } while (0)

-

-/* Assure that some output space is available, by writing out the window

-   if it's full.  If the write fails, return from inflateBack() with a

-   Z_BUF_ERROR. */

-#define ROOM() \

-    do { \

-        if (left == 0) { \

-            put = state->window; \

-            left = state->wsize; \

-            state->whave = left; \

-            if (out(out_desc, put, left)) { \

-                ret = Z_BUF_ERROR; \

-                goto inf_leave; \

-            } \

-        } \

-    } while (0)

-

-/*

-   strm provides the memory allocation functions and window buffer on input,

-   and provides information on the unused input on return.  For Z_DATA_ERROR

-   returns, strm will also provide an error message.

-

-   in() and out() are the call-back input and output functions.  When

-   inflateBack() needs more input, it calls in().  When inflateBack() has

-   filled the window with output, or when it completes with data in the

-   window, it calls out() to write out the data.  The application must not

-   change the provided input until in() is called again or inflateBack()

-   returns.  The application must not change the window/output buffer until

-   inflateBack() returns.

-

-   in() and out() are called with a descriptor parameter provided in the

-   inflateBack() call.  This parameter can be a structure that provides the

-   information required to do the read or write, as well as accumulated

-   information on the input and output such as totals and check values.

-

-   in() should return zero on failure.  out() should return non-zero on

-   failure.  If either in() or out() fails, than inflateBack() returns a

-   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it

-   was in() or out() that caused in the error.  Otherwise,  inflateBack()

-   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format

-   error, or Z_MEM_ERROR if it could not allocate memory for the state.

-   inflateBack() can also return Z_STREAM_ERROR if the input parameters

-   are not correct, i.e. strm is Z_NULL or the state was not initialized.

- */

-int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)

-z_streamp strm;

-in_func in;

-void FAR *in_desc;

-out_func out;

-void FAR *out_desc;

-{

-    struct inflate_state FAR *state;

-    unsigned char FAR *next;    /* next input */

-    unsigned char FAR *put;     /* next output */

-    unsigned have, left;        /* available input and output */

-    unsigned long hold;         /* bit buffer */

-    unsigned bits;              /* bits in bit buffer */

-    unsigned copy;              /* number of stored or match bytes to copy */

-    unsigned char FAR *from;    /* where to copy match bytes from */

-    code this;                  /* current decoding table entry */

-    code last;                  /* parent table entry */

-    unsigned len;               /* length to copy for repeats, bits to drop */

-    int ret;                    /* return code */

-    static const unsigned short order[19] = /* permutation of code lengths */

-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};

-

-    /* Check that the strm exists and that the state was initialized */

-    if (strm == Z_NULL || strm->state == Z_NULL)

-        return Z_STREAM_ERROR;

-    state = (struct inflate_state FAR *)strm->state;

-

-    /* Reset the state */

-    strm->msg = Z_NULL;

-    state->mode = TYPE;

-    state->last = 0;

-    state->whave = 0;

-    next = strm->next_in;

-    have = next != Z_NULL ? strm->avail_in : 0;

-    hold = 0;

-    bits = 0;

-    put = state->window;

-    left = state->wsize;

-

-    /* Inflate until end of block marked as last */

-    for (;;)

-        switch (state->mode) {

-        case TYPE:

-            /* determine and dispatch block type */

-            if (state->last) {

-                BYTEBITS();

-                state->mode = DONE;

-                break;

-            }

-            NEEDBITS(3);

-            state->last = BITS(1);

-            DROPBITS(1);

-            switch (BITS(2)) {

-            case 0:                             /* stored block */

-                Tracev((stderr, "inflate:     stored block%s\n",

-                        state->last ? " (last)" : ""));

-                state->mode = STORED;

-                break;

-            case 1:                             /* fixed block */

-                fixedtables(state);

-                Tracev((stderr, "inflate:     fixed codes block%s\n",

-                        state->last ? " (last)" : ""));

-                state->mode = LEN;              /* decode codes */

-                break;

-            case 2:                             /* dynamic block */

-                Tracev((stderr, "inflate:     dynamic codes block%s\n",

-                        state->last ? " (last)" : ""));

-                state->mode = TABLE;

-                break;

-            case 3:

-                strm->msg = (char *)"invalid block type";

-                state->mode = BAD;

-            }

-            DROPBITS(2);

-            break;

-

-        case STORED:

-            /* get and verify stored block length */

-            BYTEBITS();                         /* go to byte boundary */

-            NEEDBITS(32);

-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {

-                strm->msg = (char *)"invalid stored block lengths";

-                state->mode = BAD;

-                break;

-            }

-            state->length = (unsigned)hold & 0xffff;

-            Tracev((stderr, "inflate:       stored length %u\n",

-                    state->length));

-            INITBITS();

-

-            /* copy stored block from input to output */

-            while (state->length != 0) {

-                copy = state->length;

-                PULL();

-                ROOM();

-                if (copy > have) copy = have;

-                if (copy > left) copy = left;

-                zmemcpy(put, next, copy);

-                have -= copy;

-                next += copy;

-                left -= copy;

-                put += copy;

-                state->length -= copy;

-            }

-            Tracev((stderr, "inflate:       stored end\n"));

-            state->mode = TYPE;

-            break;

-

-        case TABLE:

-            /* get dynamic table entries descriptor */

-            NEEDBITS(14);

-            state->nlen = BITS(5) + 257;

-            DROPBITS(5);

-            state->ndist = BITS(5) + 1;

-            DROPBITS(5);

-            state->ncode = BITS(4) + 4;

-            DROPBITS(4);

-#ifndef PKZIP_BUG_WORKAROUND

-            if (state->nlen > 286 || state->ndist > 30) {

-                strm->msg = (char *)"too many length or distance symbols";

-                state->mode = BAD;

-                break;

-            }

-#endif

-            Tracev((stderr, "inflate:       table sizes ok\n"));

-

-            /* get code length code lengths (not a typo) */

-            state->have = 0;

-            while (state->have < state->ncode) {

-                NEEDBITS(3);

-                state->lens[order[state->have++]] = (unsigned short)BITS(3);

-                DROPBITS(3);

-            }

-            while (state->have < 19)

-                state->lens[order[state->have++]] = 0;

-            state->next = state->codes;

-            state->lencode = (code const FAR *)(state->next);

-            state->lenbits = 7;

-            ret = inflate_table(CODES, state->lens, 19, &(state->next),

-                                &(state->lenbits), state->work);

-            if (ret) {

-                strm->msg = (char *)"invalid code lengths set";

-                state->mode = BAD;

-                break;

-            }

-            Tracev((stderr, "inflate:       code lengths ok\n"));

-

-            /* get length and distance code code lengths */

-            state->have = 0;

-            while (state->have < state->nlen + state->ndist) {

-                for (;;) {

-                    this = state->lencode[BITS(state->lenbits)];

-                    if ((unsigned)(this.bits) <= bits) break;

-                    PULLBYTE();

-                }

-                if (this.val < 16) {

-                    NEEDBITS(this.bits);

-                    DROPBITS(this.bits);

-                    state->lens[state->have++] = this.val;

-                }

-                else {

-                    if (this.val == 16) {

-                        NEEDBITS(this.bits + 2);

-                        DROPBITS(this.bits);

-                        if (state->have == 0) {

-                            strm->msg = (char *)"invalid bit length repeat";

-                            state->mode = BAD;

-                            break;

-                        }

-                        len = (unsigned)(state->lens[state->have - 1]);

-                        copy = 3 + BITS(2);

-                        DROPBITS(2);

-                    }

-                    else if (this.val == 17) {

-                        NEEDBITS(this.bits + 3);

-                        DROPBITS(this.bits);

-                        len = 0;

-                        copy = 3 + BITS(3);

-                        DROPBITS(3);

-                    }

-                    else {

-                        NEEDBITS(this.bits + 7);

-                        DROPBITS(this.bits);

-                        len = 0;

-                        copy = 11 + BITS(7);

-                        DROPBITS(7);

-                    }

-                    if (state->have + copy > state->nlen + state->ndist) {

-                        strm->msg = (char *)"invalid bit length repeat";

-                        state->mode = BAD;

-                        break;

-                    }

-                    while (copy--)

-                        state->lens[state->have++] = (unsigned short)len;

-                }

-            }

-

-            /* handle error breaks in while */

-            if (state->mode == BAD) break;

-

-            /* build code tables */

-            state->next = state->codes;

-            state->lencode = (code const FAR *)(state->next);

-            state->lenbits = 9;

-            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),

-                                &(state->lenbits), state->work);

-            if (ret) {

-                strm->msg = (char *)"invalid literal/lengths set";

-                state->mode = BAD;

-                break;

-            }

-            state->distcode = (code const FAR *)(state->next);

-            state->distbits = 6;

-            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,

-                            &(state->next), &(state->distbits), state->work);

-            if (ret) {

-                strm->msg = (char *)"invalid distances set";

-                state->mode = BAD;

-                break;

-            }

-            Tracev((stderr, "inflate:       codes ok\n"));

-            state->mode = LEN;

-

-        case LEN:

-            /* use inflate_fast() if we have enough input and output */

-            if (have >= 6 && left >= 258) {

-                RESTORE();

-                if (state->whave < state->wsize)

-                    state->whave = state->wsize - left;

-                inflate_fast(strm, state->wsize);

-                LOAD();

-                break;

-            }

-

-            /* get a literal, length, or end-of-block code */

-            for (;;) {

-                this = state->lencode[BITS(state->lenbits)];

-                if ((unsigned)(this.bits) <= bits) break;

-                PULLBYTE();

-            }

-            if (this.op && (this.op & 0xf0) == 0) {

-                last = this;

-                for (;;) {

-                    this = state->lencode[last.val +

-                            (BITS(last.bits + last.op) >> last.bits)];

-                    if ((unsigned)(last.bits + this.bits) <= bits) break;

-                    PULLBYTE();

-                }

-                DROPBITS(last.bits);

-            }

-            DROPBITS(this.bits);

-            state->length = (unsigned)this.val;

-

-            /* process literal */

-            if (this.op == 0) {

-                Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?

-                        "inflate:         literal '%c'\n" :

-                        "inflate:         literal 0x%02x\n", this.val));

-                ROOM();

-                *put++ = (unsigned char)(state->length);

-                left--;

-                state->mode = LEN;

-                break;

-            }

-

-            /* process end of block */

-            if (this.op & 32) {

-                Tracevv((stderr, "inflate:         end of block\n"));

-                state->mode = TYPE;

-                break;

-            }

-

-            /* invalid code */

-            if (this.op & 64) {

-                strm->msg = (char *)"invalid literal/length code";

-                state->mode = BAD;

-                break;

-            }

-

-            /* length code -- get extra bits, if any */

-            state->extra = (unsigned)(this.op) & 15;

-            if (state->extra != 0) {

-                NEEDBITS(state->extra);

-                state->length += BITS(state->extra);

-                DROPBITS(state->extra);

-            }

-            Tracevv((stderr, "inflate:         length %u\n", state->length));

-

-            /* get distance code */

-            for (;;) {

-                this = state->distcode[BITS(state->distbits)];

-                if ((unsigned)(this.bits) <= bits) break;

-                PULLBYTE();

-            }

-            if ((this.op & 0xf0) == 0) {

-                last = this;

-                for (;;) {

-                    this = state->distcode[last.val +

-                            (BITS(last.bits + last.op) >> last.bits)];

-                    if ((unsigned)(last.bits + this.bits) <= bits) break;

-                    PULLBYTE();

-                }

-                DROPBITS(last.bits);

-            }

-            DROPBITS(this.bits);

-            if (this.op & 64) {

-                strm->msg = (char *)"invalid distance code";

-                state->mode = BAD;

-                break;

-            }

-            state->offset = (unsigned)this.val;

-

-            /* get distance extra bits, if any */

-            state->extra = (unsigned)(this.op) & 15;

-            if (state->extra != 0) {

-                NEEDBITS(state->extra);

-                state->offset += BITS(state->extra);

-                DROPBITS(state->extra);

-            }

-            if (state->offset > state->wsize - (state->whave < state->wsize ?

-                                                left : 0)) {

-                strm->msg = (char *)"invalid distance too far back";

-                state->mode = BAD;

-                break;

-            }

-            Tracevv((stderr, "inflate:         distance %u\n", state->offset));

-

-            /* copy match from window to output */

-            do {

-                ROOM();

-                copy = state->wsize - state->offset;

-                if (copy < left) {

-                    from = put + copy;

-                    copy = left - copy;

-                }

-                else {

-                    from = put - state->offset;

-                    copy = left;

-                }

-                if (copy > state->length) copy = state->length;

-                state->length -= copy;

-                left -= copy;

-                do {

-                    *put++ = *from++;

-                } while (--copy);

-            } while (state->length != 0);

-            break;

-

-        case DONE:

-            /* inflate stream terminated properly -- write leftover output */

-            ret = Z_STREAM_END;

-            if (left < state->wsize) {

-                if (out(out_desc, state->window, state->wsize - left))

-                    ret = Z_BUF_ERROR;

-            }

-            goto inf_leave;

-

-        case BAD:

-            ret = Z_DATA_ERROR;

-            goto inf_leave;

-

-        default:                /* can't happen, but makes compilers happy */

-            ret = Z_STREAM_ERROR;

-            goto inf_leave;

-        }

-

-    /* Return unused input */

-  inf_leave:

-    strm->next_in = next;

-    strm->avail_in = have;

-    return ret;

-}

-

-int ZEXPORT inflateBackEnd(strm)

-z_streamp strm;

-{

-    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)

-        return Z_STREAM_ERROR;

-    ZFREE(strm, strm->state);

-    strm->state = Z_NULL;

-    Tracev((stderr, "inflate: end\n"));

-    return Z_OK;

-}

+/* infback.c -- inflate using a call-back interface
+ * Copyright (C) 1995-2005 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+   This code is largely copied from inflate.c.  Normally either infback.o or
+   inflate.o would be linked into an application--not both.  The interface
+   with inffast.c is retained so that optimized assembler-coded versions of
+   inflate_fast() can be used with either inflate.c or infback.c.
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+/* function prototypes */
+local void fixedtables OF((struct inflate_state FAR *state));
+
+/*
+   strm provides memory allocation functions in zalloc and zfree, or
+   Z_NULL to use the library memory allocation functions.
+
+   windowBits is in the range 8..15, and window is a user-supplied
+   window and output buffer that is 2**windowBits bytes.
+ */
+int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
+z_streamp strm;
+int windowBits;
+unsigned char FAR *window;
+const char *version;
+int stream_size;
+{
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL || window == Z_NULL ||
+        windowBits < 8 || windowBits > 15)
+        return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+    }
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    state = (struct inflate_state FAR *)ZALLOC(strm, 1,
+                                               sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (struct internal_state FAR *)state;
+    state->dmax = 32768U;
+    state->wbits = windowBits;
+    state->wsize = 1U << windowBits;
+    state->window = window;
+    state->write = 0;
+    state->whave = 0;
+    return Z_OK;
+}
+
+/*
+   Return state with length and distance decoding tables and index sizes set to
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+   If BUILDFIXED is defined, then instead this routine builds the tables the
+   first time it's called, and returns those tables the first time and
+   thereafter.  This reduces the size of the code by about 2K bytes, in
+   exchange for a little execution time.  However, BUILDFIXED should not be
+   used for threaded applications, since the rewriting of the tables and virgin
+   may not be thread-safe.
+ */
+local void fixedtables(state)
+struct inflate_state FAR *state;
+{
+#ifdef BUILDFIXED
+    static int virgin = 1;
+    static code *lenfix, *distfix;
+    static code fixed[544];
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        unsigned sym, bits;
+        static code *next;
+
+        /* literal/length table */
+        sym = 0;
+        while (sym < 144) state->lens[sym++] = 8;
+        while (sym < 256) state->lens[sym++] = 9;
+        while (sym < 280) state->lens[sym++] = 7;
+        while (sym < 288) state->lens[sym++] = 8;
+        next = fixed;
+        lenfix = next;
+        bits = 9;
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
+
+        /* distance table */
+        sym = 0;
+        while (sym < 32) state->lens[sym++] = 5;
+        distfix = next;
+        bits = 5;
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
+
+        /* do this just once */
+        virgin = 0;
+    }
+#else /* !BUILDFIXED */
+#   include "inffixed.h"
+#endif /* BUILDFIXED */
+    state->lencode = lenfix;
+    state->lenbits = 9;
+    state->distcode = distfix;
+    state->distbits = 5;
+}
+
+/* Macros for inflateBack(): */
+
+/* Load returned state from inflate_fast() */
+#define LOAD() \
+    do { \
+        put = strm->next_out; \
+        left = strm->avail_out; \
+        next = strm->next_in; \
+        have = strm->avail_in; \
+        hold = state->hold; \
+        bits = state->bits; \
+    } while (0)
+
+/* Set state from registers for inflate_fast() */
+#define RESTORE() \
+    do { \
+        strm->next_out = put; \
+        strm->avail_out = left; \
+        strm->next_in = next; \
+        strm->avail_in = have; \
+        state->hold = hold; \
+        state->bits = bits; \
+    } while (0)
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Assure that some input is available.  If input is requested, but denied,
+   then return a Z_BUF_ERROR from inflateBack(). */
+#define PULL() \
+    do { \
+        if (have == 0) { \
+            have = in(in_desc, &next); \
+            if (have == 0) { \
+                next = Z_NULL; \
+                ret = Z_BUF_ERROR; \
+                goto inf_leave; \
+            } \
+        } \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflateBack()
+   with an error if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        PULL(); \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflateBack() with
+   an error. */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n < 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/* Assure that some output space is available, by writing out the window
+   if it's full.  If the write fails, return from inflateBack() with a
+   Z_BUF_ERROR. */
+#define ROOM() \
+    do { \
+        if (left == 0) { \
+            put = state->window; \
+            left = state->wsize; \
+            state->whave = left; \
+            if (out(out_desc, put, left)) { \
+                ret = Z_BUF_ERROR; \
+                goto inf_leave; \
+            } \
+        } \
+    } while (0)
+
+/*
+   strm provides the memory allocation functions and window buffer on input,
+   and provides information on the unused input on return.  For Z_DATA_ERROR
+   returns, strm will also provide an error message.
+
+   in() and out() are the call-back input and output functions.  When
+   inflateBack() needs more input, it calls in().  When inflateBack() has
+   filled the window with output, or when it completes with data in the
+   window, it calls out() to write out the data.  The application must not
+   change the provided input until in() is called again or inflateBack()
+   returns.  The application must not change the window/output buffer until
+   inflateBack() returns.
+
+   in() and out() are called with a descriptor parameter provided in the
+   inflateBack() call.  This parameter can be a structure that provides the
+   information required to do the read or write, as well as accumulated
+   information on the input and output such as totals and check values.
+
+   in() should return zero on failure.  out() should return non-zero on
+   failure.  If either in() or out() fails, than inflateBack() returns a
+   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it
+   was in() or out() that caused in the error.  Otherwise,  inflateBack()
+   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
+   error, or Z_MEM_ERROR if it could not allocate memory for the state.
+   inflateBack() can also return Z_STREAM_ERROR if the input parameters
+   are not correct, i.e. strm is Z_NULL or the state was not initialized.
+ */
+int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
+z_streamp strm;
+in_func in;
+void FAR *in_desc;
+out_func out;
+void FAR *out_desc;
+{
+    struct inflate_state FAR *state;
+    unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have, left;        /* available input and output */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned copy;              /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code this;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+    /* Check that the strm exists and that the state was initialized */
+    if (strm == Z_NULL || strm->state == Z_NULL)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* Reset the state */
+    strm->msg = Z_NULL;
+    state->mode = TYPE;
+    state->last = 0;
+    state->whave = 0;
+    next = strm->next_in;
+    have = next != Z_NULL ? strm->avail_in : 0;
+    hold = 0;
+    bits = 0;
+    put = state->window;
+    left = state->wsize;
+
+    /* Inflate until end of block marked as last */
+    for (;;)
+        switch (state->mode) {
+        case TYPE:
+            /* determine and dispatch block type */
+            if (state->last) {
+                BYTEBITS();
+                state->mode = DONE;
+                break;
+            }
+            NEEDBITS(3);
+            state->last = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                fixedtables(state);
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = LEN;              /* decode codes */
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                state->mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+
+        case STORED:
+            /* get and verify stored block length */
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                state->mode = BAD;
+                break;
+            }
+            state->length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %u\n",
+                    state->length));
+            INITBITS();
+
+            /* copy stored block from input to output */
+            while (state->length != 0) {
+                copy = state->length;
+                PULL();
+                ROOM();
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                state->length -= copy;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            state->mode = TYPE;
+            break;
+
+        case TABLE:
+            /* get dynamic table entries descriptor */
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+            if (state->nlen > 286 || state->ndist > 30) {
+                strm->msg = (char *)"too many length or distance symbols";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+
+            /* get code length code lengths (not a typo) */
+            state->have = 0;
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 7;
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+
+            /* get length and distance code code lengths */
+            state->have = 0;
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    this = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(this.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (this.val < 16) {
+                    NEEDBITS(this.bits);
+                    DROPBITS(this.bits);
+                    state->lens[state->have++] = this.val;
+                }
+                else {
+                    if (this.val == 16) {
+                        NEEDBITS(this.bits + 2);
+                        DROPBITS(this.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            state->mode = BAD;
+                            break;
+                        }
+                        len = (unsigned)(state->lens[state->have - 1]);
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (this.val == 17) {
+                        NEEDBITS(this.bits + 3);
+                        DROPBITS(this.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(this.bits + 7);
+                        DROPBITS(this.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        state->mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (state->mode == BAD) break;
+
+            /* build code tables */
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 9;
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                state->mode = BAD;
+                break;
+            }
+            state->distcode = (code const FAR *)(state->next);
+            state->distbits = 6;
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                            &(state->next), &(state->distbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            state->mode = LEN;
+
+        case LEN:
+            /* use inflate_fast() if we have enough input and output */
+            if (have >= 6 && left >= 258) {
+                RESTORE();
+                if (state->whave < state->wsize)
+                    state->whave = state->wsize - left;
+                inflate_fast(strm, state->wsize);
+                LOAD();
+                break;
+            }
+
+            /* get a literal, length, or end-of-block code */
+            for (;;) {
+                this = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(this.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (this.op && (this.op & 0xf0) == 0) {
+                last = this;
+                for (;;) {
+                    this = state->lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + this.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(this.bits);
+            state->length = (unsigned)this.val;
+
+            /* process literal */
+            if (this.op == 0) {
+                Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", this.val));
+                ROOM();
+                *put++ = (unsigned char)(state->length);
+                left--;
+                state->mode = LEN;
+                break;
+            }
+
+            /* process end of block */
+            if (this.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                state->mode = TYPE;
+                break;
+            }
+
+            /* invalid code */
+            if (this.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                state->mode = BAD;
+                break;
+            }
+
+            /* length code -- get extra bits, if any */
+            state->extra = (unsigned)(this.op) & 15;
+            if (state->extra != 0) {
+                NEEDBITS(state->extra);
+                state->length += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+            Tracevv((stderr, "inflate:         length %u\n", state->length));
+
+            /* get distance code */
+            for (;;) {
+                this = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(this.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((this.op & 0xf0) == 0) {
+                last = this;
+                for (;;) {
+                    this = state->distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + this.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(this.bits);
+            if (this.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+            state->offset = (unsigned)this.val;
+
+            /* get distance extra bits, if any */
+            state->extra = (unsigned)(this.op) & 15;
+            if (state->extra != 0) {
+                NEEDBITS(state->extra);
+                state->offset += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+            if (state->offset > state->wsize - (state->whave < state->wsize ?
+                                                left : 0)) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
+
+            /* copy match from window to output */
+            do {
+                ROOM();
+                copy = state->wsize - state->offset;
+                if (copy < left) {
+                    from = put + copy;
+                    copy = left - copy;
+                }
+                else {
+                    from = put - state->offset;
+                    copy = left;
+                }
+                if (copy > state->length) copy = state->length;
+                state->length -= copy;
+                left -= copy;
+                do {
+                    *put++ = *from++;
+                } while (--copy);
+            } while (state->length != 0);
+            break;
+
+        case DONE:
+            /* inflate stream terminated properly -- write leftover output */
+            ret = Z_STREAM_END;
+            if (left < state->wsize) {
+                if (out(out_desc, state->window, state->wsize - left))
+                    ret = Z_BUF_ERROR;
+            }
+            goto inf_leave;
+
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+
+        default:                /* can't happen, but makes compilers happy */
+            ret = Z_STREAM_ERROR;
+            goto inf_leave;
+        }
+
+    /* Return unused input */
+  inf_leave:
+    strm->next_in = next;
+    strm->avail_in = have;
+    return ret;
+}
+
+int ZEXPORT inflateBackEnd(strm)
+z_streamp strm;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}
diff --git a/utils/zenutils/libraries/zlib123/zlib/inffast.c b/utils/zenutils/libraries/zlib123/zlib/inffast.c
index fa31cad905..bbee92ed1e 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/inffast.c
+++ b/utils/zenutils/libraries/zlib123/zlib/inffast.c
@@ -1,318 +1,318 @@
-/* inffast.c -- fast decoding

- * Copyright (C) 1995-2004 Mark Adler

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-#include "zutil.h"

-#include "inftrees.h"

-#include "inflate.h"

-#include "inffast.h"

-

-#ifndef ASMINF

-

-/* Allow machine dependent optimization for post-increment or pre-increment.

-   Based on testing to date,

-   Pre-increment preferred for:

-   - PowerPC G3 (Adler)

-   - MIPS R5000 (Randers-Pehrson)

-   Post-increment preferred for:

-   - none

-   No measurable difference:

-   - Pentium III (Anderson)

-   - M68060 (Nikl)

- */

-#ifdef POSTINC

-#  define OFF 0

-#  define PUP(a) *(a)++

-#else

-#  define OFF 1

-#  define PUP(a) *++(a)

-#endif

-

-/*

-   Decode literal, length, and distance codes and write out the resulting

-   literal and match bytes until either not enough input or output is

-   available, an end-of-block is encountered, or a data error is encountered.

-   When large enough input and output buffers are supplied to inflate(), for

-   example, a 16K input buffer and a 64K output buffer, more than 95% of the

-   inflate execution time is spent in this routine.

-

-   Entry assumptions:

-

-        state->mode == LEN

-        strm->avail_in >= 6

-        strm->avail_out >= 258

-        start >= strm->avail_out

-        state->bits < 8

-

-   On return, state->mode is one of:

-

-        LEN -- ran out of enough output space or enough available input

-        TYPE -- reached end of block code, inflate() to interpret next block

-        BAD -- error in block data

-

-   Notes:

-

-    - The maximum input bits used by a length/distance pair is 15 bits for the

-      length code, 5 bits for the length extra, 15 bits for the distance code,

-      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.

-      Therefore if strm->avail_in >= 6, then there is enough input to avoid

-      checking for available input while decoding.

-

-    - The maximum bytes that a single length/distance pair can output is 258

-      bytes, which is the maximum length that can be coded.  inflate_fast()

-      requires strm->avail_out >= 258 for each loop to avoid checking for

-      output space.

- */

-void inflate_fast(strm, start)

-z_streamp strm;

-unsigned start;         /* inflate()'s starting value for strm->avail_out */

-{

-    struct inflate_state FAR *state;

-    unsigned char FAR *in;      /* local strm->next_in */

-    unsigned char FAR *last;    /* while in < last, enough input available */

-    unsigned char FAR *out;     /* local strm->next_out */

-    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */

-    unsigned char FAR *end;     /* while out < end, enough space available */

-#ifdef INFLATE_STRICT

-    unsigned dmax;              /* maximum distance from zlib header */

-#endif

-    unsigned wsize;             /* window size or zero if not using window */

-    unsigned whave;             /* valid bytes in the window */

-    unsigned write;             /* window write index */

-    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */

-    unsigned long hold;         /* local strm->hold */

-    unsigned bits;              /* local strm->bits */

-    code const FAR *lcode;      /* local strm->lencode */

-    code const FAR *dcode;      /* local strm->distcode */

-    unsigned lmask;             /* mask for first level of length codes */

-    unsigned dmask;             /* mask for first level of distance codes */

-    code this;                  /* retrieved table entry */

-    unsigned op;                /* code bits, operation, extra bits, or */

-                                /*  window position, window bytes to copy */

-    unsigned len;               /* match length, unused bytes */

-    unsigned dist;              /* match distance */

-    unsigned char FAR *from;    /* where to copy match from */

-

-    /* copy state to local variables */

-    state = (struct inflate_state FAR *)strm->state;

-    in = strm->next_in - OFF;

-    last = in + (strm->avail_in - 5);

-    out = strm->next_out - OFF;

-    beg = out - (start - strm->avail_out);

-    end = out + (strm->avail_out - 257);

-#ifdef INFLATE_STRICT

-    dmax = state->dmax;

-#endif

-    wsize = state->wsize;

-    whave = state->whave;

-    write = state->write;

-    window = state->window;

-    hold = state->hold;

-    bits = state->bits;

-    lcode = state->lencode;

-    dcode = state->distcode;

-    lmask = (1U << state->lenbits) - 1;

-    dmask = (1U << state->distbits) - 1;

-

-    /* decode literals and length/distances until end-of-block or not enough

-       input data or output space */

-    do {

-        if (bits < 15) {

-            hold += (unsigned long)(PUP(in)) << bits;

-            bits += 8;

-            hold += (unsigned long)(PUP(in)) << bits;

-            bits += 8;

-        }

-        this = lcode[hold & lmask];

-      dolen:

-        op = (unsigned)(this.bits);

-        hold >>= op;

-        bits -= op;

-        op = (unsigned)(this.op);

-        if (op == 0) {                          /* literal */

-            Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?

-                    "inflate:         literal '%c'\n" :

-                    "inflate:         literal 0x%02x\n", this.val));

-            PUP(out) = (unsigned char)(this.val);

-        }

-        else if (op & 16) {                     /* length base */

-            len = (unsigned)(this.val);

-            op &= 15;                           /* number of extra bits */

-            if (op) {

-                if (bits < op) {

-                    hold += (unsigned long)(PUP(in)) << bits;

-                    bits += 8;

-                }

-                len += (unsigned)hold & ((1U << op) - 1);

-                hold >>= op;

-                bits -= op;

-            }

-            Tracevv((stderr, "inflate:         length %u\n", len));

-            if (bits < 15) {

-                hold += (unsigned long)(PUP(in)) << bits;

-                bits += 8;

-                hold += (unsigned long)(PUP(in)) << bits;

-                bits += 8;

-            }

-            this = dcode[hold & dmask];

-          dodist:

-            op = (unsigned)(this.bits);

-            hold >>= op;

-            bits -= op;

-            op = (unsigned)(this.op);

-            if (op & 16) {                      /* distance base */

-                dist = (unsigned)(this.val);

-                op &= 15;                       /* number of extra bits */

-                if (bits < op) {

-                    hold += (unsigned long)(PUP(in)) << bits;

-                    bits += 8;

-                    if (bits < op) {

-                        hold += (unsigned long)(PUP(in)) << bits;

-                        bits += 8;

-                    }

-                }

-                dist += (unsigned)hold & ((1U << op) - 1);

-#ifdef INFLATE_STRICT

-                if (dist > dmax) {

-                    strm->msg = (char *)"invalid distance too far back";

-                    state->mode = BAD;

-                    break;

-                }

-#endif

-                hold >>= op;

-                bits -= op;

-                Tracevv((stderr, "inflate:         distance %u\n", dist));

-                op = (unsigned)(out - beg);     /* max distance in output */

-                if (dist > op) {                /* see if copy from window */

-                    op = dist - op;             /* distance back in window */

-                    if (op > whave) {

-                        strm->msg = (char *)"invalid distance too far back";

-                        state->mode = BAD;

-                        break;

-                    }

-                    from = window - OFF;

-                    if (write == 0) {           /* very common case */

-                        from += wsize - op;

-                        if (op < len) {         /* some from window */

-                            len -= op;

-                            do {

-                                PUP(out) = PUP(from);

-                            } while (--op);

-                            from = out - dist;  /* rest from output */

-                        }

-                    }

-                    else if (write < op) {      /* wrap around window */

-                        from += wsize + write - op;

-                        op -= write;

-                        if (op < len) {         /* some from end of window */

-                            len -= op;

-                            do {

-                                PUP(out) = PUP(from);

-                            } while (--op);

-                            from = window - OFF;

-                            if (write < len) {  /* some from start of window */

-                                op = write;

-                                len -= op;

-                                do {

-                                    PUP(out) = PUP(from);

-                                } while (--op);

-                                from = out - dist;      /* rest from output */

-                            }

-                        }

-                    }

-                    else {                      /* contiguous in window */

-                        from += write - op;

-                        if (op < len) {         /* some from window */

-                            len -= op;

-                            do {

-                                PUP(out) = PUP(from);

-                            } while (--op);

-                            from = out - dist;  /* rest from output */

-                        }

-                    }

-                    while (len > 2) {

-                        PUP(out) = PUP(from);

-                        PUP(out) = PUP(from);

-                        PUP(out) = PUP(from);

-                        len -= 3;

-                    }

-                    if (len) {

-                        PUP(out) = PUP(from);

-                        if (len > 1)

-                            PUP(out) = PUP(from);

-                    }

-                }

-                else {

-                    from = out - dist;          /* copy direct from output */

-                    do {                        /* minimum length is three */

-                        PUP(out) = PUP(from);

-                        PUP(out) = PUP(from);

-                        PUP(out) = PUP(from);

-                        len -= 3;

-                    } while (len > 2);

-                    if (len) {

-                        PUP(out) = PUP(from);

-                        if (len > 1)

-                            PUP(out) = PUP(from);

-                    }

-                }

-            }

-            else if ((op & 64) == 0) {          /* 2nd level distance code */

-                this = dcode[this.val + (hold & ((1U << op) - 1))];

-                goto dodist;

-            }

-            else {

-                strm->msg = (char *)"invalid distance code";

-                state->mode = BAD;

-                break;

-            }

-        }

-        else if ((op & 64) == 0) {              /* 2nd level length code */

-            this = lcode[this.val + (hold & ((1U << op) - 1))];

-            goto dolen;

-        }

-        else if (op & 32) {                     /* end-of-block */

-            Tracevv((stderr, "inflate:         end of block\n"));

-            state->mode = TYPE;

-            break;

-        }

-        else {

-            strm->msg = (char *)"invalid literal/length code";

-            state->mode = BAD;

-            break;

-        }

-    } while (in < last && out < end);

-

-    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */

-    len = bits >> 3;

-    in -= len;

-    bits -= len << 3;

-    hold &= (1U << bits) - 1;

-

-    /* update state and return */

-    strm->next_in = in + OFF;

-    strm->next_out = out + OFF;

-    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));

-    strm->avail_out = (unsigned)(out < end ?

-                                 257 + (end - out) : 257 - (out - end));

-    state->hold = hold;

-    state->bits = bits;

-    return;

-}

-

-/*

-   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):

-   - Using bit fields for code structure

-   - Different op definition to avoid & for extra bits (do & for table bits)

-   - Three separate decoding do-loops for direct, window, and write == 0

-   - Special case for distance > 1 copies to do overlapped load and store copy

-   - Explicit branch predictions (based on measured branch probabilities)

-   - Deferring match copy and interspersed it with decoding subsequent codes

-   - Swapping literal/length else

-   - Swapping window/direct else

-   - Larger unrolled copy loops (three is about right)

-   - Moving len -= 3 statement into middle of loop

- */

-

-#endif /* !ASMINF */

+/* inffast.c -- fast decoding
+ * Copyright (C) 1995-2004 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+#ifndef ASMINF
+
+/* Allow machine dependent optimization for post-increment or pre-increment.
+   Based on testing to date,
+   Pre-increment preferred for:
+   - PowerPC G3 (Adler)
+   - MIPS R5000 (Randers-Pehrson)
+   Post-increment preferred for:
+   - none
+   No measurable difference:
+   - Pentium III (Anderson)
+   - M68060 (Nikl)
+ */
+#ifdef POSTINC
+#  define OFF 0
+#  define PUP(a) *(a)++
+#else
+#  define OFF 1
+#  define PUP(a) *++(a)
+#endif
+
+/*
+   Decode literal, length, and distance codes and write out the resulting
+   literal and match bytes until either not enough input or output is
+   available, an end-of-block is encountered, or a data error is encountered.
+   When large enough input and output buffers are supplied to inflate(), for
+   example, a 16K input buffer and a 64K output buffer, more than 95% of the
+   inflate execution time is spent in this routine.
+
+   Entry assumptions:
+
+        state->mode == LEN
+        strm->avail_in >= 6
+        strm->avail_out >= 258
+        start >= strm->avail_out
+        state->bits < 8
+
+   On return, state->mode is one of:
+
+        LEN -- ran out of enough output space or enough available input
+        TYPE -- reached end of block code, inflate() to interpret next block
+        BAD -- error in block data
+
+   Notes:
+
+    - The maximum input bits used by a length/distance pair is 15 bits for the
+      length code, 5 bits for the length extra, 15 bits for the distance code,
+      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
+      Therefore if strm->avail_in >= 6, then there is enough input to avoid
+      checking for available input while decoding.
+
+    - The maximum bytes that a single length/distance pair can output is 258
+      bytes, which is the maximum length that can be coded.  inflate_fast()
+      requires strm->avail_out >= 258 for each loop to avoid checking for
+      output space.
+ */
+void inflate_fast(strm, start)
+z_streamp strm;
+unsigned start;         /* inflate()'s starting value for strm->avail_out */
+{
+    struct inflate_state FAR *state;
+    unsigned char FAR *in;      /* local strm->next_in */
+    unsigned char FAR *last;    /* while in < last, enough input available */
+    unsigned char FAR *out;     /* local strm->next_out */
+    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
+    unsigned char FAR *end;     /* while out < end, enough space available */
+#ifdef INFLATE_STRICT
+    unsigned dmax;              /* maximum distance from zlib header */
+#endif
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned write;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
+    unsigned long hold;         /* local strm->hold */
+    unsigned bits;              /* local strm->bits */
+    code const FAR *lcode;      /* local strm->lencode */
+    code const FAR *dcode;      /* local strm->distcode */
+    unsigned lmask;             /* mask for first level of length codes */
+    unsigned dmask;             /* mask for first level of distance codes */
+    code this;                  /* retrieved table entry */
+    unsigned op;                /* code bits, operation, extra bits, or */
+                                /*  window position, window bytes to copy */
+    unsigned len;               /* match length, unused bytes */
+    unsigned dist;              /* match distance */
+    unsigned char FAR *from;    /* where to copy match from */
+
+    /* copy state to local variables */
+    state = (struct inflate_state FAR *)strm->state;
+    in = strm->next_in - OFF;
+    last = in + (strm->avail_in - 5);
+    out = strm->next_out - OFF;
+    beg = out - (start - strm->avail_out);
+    end = out + (strm->avail_out - 257);
+#ifdef INFLATE_STRICT
+    dmax = state->dmax;
+#endif
+    wsize = state->wsize;
+    whave = state->whave;
+    write = state->write;
+    window = state->window;
+    hold = state->hold;
+    bits = state->bits;
+    lcode = state->lencode;
+    dcode = state->distcode;
+    lmask = (1U << state->lenbits) - 1;
+    dmask = (1U << state->distbits) - 1;
+
+    /* decode literals and length/distances until end-of-block or not enough
+       input data or output space */
+    do {
+        if (bits < 15) {
+            hold += (unsigned long)(PUP(in)) << bits;
+            bits += 8;
+            hold += (unsigned long)(PUP(in)) << bits;
+            bits += 8;
+        }
+        this = lcode[hold & lmask];
+      dolen:
+        op = (unsigned)(this.bits);
+        hold >>= op;
+        bits -= op;
+        op = (unsigned)(this.op);
+        if (op == 0) {                          /* literal */
+            Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
+                    "inflate:         literal '%c'\n" :
+                    "inflate:         literal 0x%02x\n", this.val));
+            PUP(out) = (unsigned char)(this.val);
+        }
+        else if (op & 16) {                     /* length base */
+            len = (unsigned)(this.val);
+            op &= 15;                           /* number of extra bits */
+            if (op) {
+                if (bits < op) {
+                    hold += (unsigned long)(PUP(in)) << bits;
+                    bits += 8;
+                }
+                len += (unsigned)hold & ((1U << op) - 1);
+                hold >>= op;
+                bits -= op;
+            }
+            Tracevv((stderr, "inflate:         length %u\n", len));
+            if (bits < 15) {
+                hold += (unsigned long)(PUP(in)) << bits;
+                bits += 8;
+                hold += (unsigned long)(PUP(in)) << bits;
+                bits += 8;
+            }
+            this = dcode[hold & dmask];
+          dodist:
+            op = (unsigned)(this.bits);
+            hold >>= op;
+            bits -= op;
+            op = (unsigned)(this.op);
+            if (op & 16) {                      /* distance base */
+                dist = (unsigned)(this.val);
+                op &= 15;                       /* number of extra bits */
+                if (bits < op) {
+                    hold += (unsigned long)(PUP(in)) << bits;
+                    bits += 8;
+                    if (bits < op) {
+                        hold += (unsigned long)(PUP(in)) << bits;
+                        bits += 8;
+                    }
+                }
+                dist += (unsigned)hold & ((1U << op) - 1);
+#ifdef INFLATE_STRICT
+                if (dist > dmax) {
+                    strm->msg = (char *)"invalid distance too far back";
+                    state->mode = BAD;
+                    break;
+                }
+#endif
+                hold >>= op;
+                bits -= op;
+                Tracevv((stderr, "inflate:         distance %u\n", dist));
+                op = (unsigned)(out - beg);     /* max distance in output */
+                if (dist > op) {                /* see if copy from window */
+                    op = dist - op;             /* distance back in window */
+                    if (op > whave) {
+                        strm->msg = (char *)"invalid distance too far back";
+                        state->mode = BAD;
+                        break;
+                    }
+                    from = window - OFF;
+                    if (write == 0) {           /* very common case */
+                        from += wsize - op;
+                        if (op < len) {         /* some from window */
+                            len -= op;
+                            do {
+                                PUP(out) = PUP(from);
+                            } while (--op);
+                            from = out - dist;  /* rest from output */
+                        }
+                    }
+                    else if (write < op) {      /* wrap around window */
+                        from += wsize + write - op;
+                        op -= write;
+                        if (op < len) {         /* some from end of window */
+                            len -= op;
+                            do {
+                                PUP(out) = PUP(from);
+                            } while (--op);
+                            from = window - OFF;
+                            if (write < len) {  /* some from start of window */
+                                op = write;
+                                len -= op;
+                                do {
+                                    PUP(out) = PUP(from);
+                                } while (--op);
+                                from = out - dist;      /* rest from output */
+                            }
+                        }
+                    }
+                    else {                      /* contiguous in window */
+                        from += write - op;
+                        if (op < len) {         /* some from window */
+                            len -= op;
+                            do {
+                                PUP(out) = PUP(from);
+                            } while (--op);
+                            from = out - dist;  /* rest from output */
+                        }
+                    }
+                    while (len > 2) {
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        len -= 3;
+                    }
+                    if (len) {
+                        PUP(out) = PUP(from);
+                        if (len > 1)
+                            PUP(out) = PUP(from);
+                    }
+                }
+                else {
+                    from = out - dist;          /* copy direct from output */
+                    do {                        /* minimum length is three */
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        len -= 3;
+                    } while (len > 2);
+                    if (len) {
+                        PUP(out) = PUP(from);
+                        if (len > 1)
+                            PUP(out) = PUP(from);
+                    }
+                }
+            }
+            else if ((op & 64) == 0) {          /* 2nd level distance code */
+                this = dcode[this.val + (hold & ((1U << op) - 1))];
+                goto dodist;
+            }
+            else {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+        }
+        else if ((op & 64) == 0) {              /* 2nd level length code */
+            this = lcode[this.val + (hold & ((1U << op) - 1))];
+            goto dolen;
+        }
+        else if (op & 32) {                     /* end-of-block */
+            Tracevv((stderr, "inflate:         end of block\n"));
+            state->mode = TYPE;
+            break;
+        }
+        else {
+            strm->msg = (char *)"invalid literal/length code";
+            state->mode = BAD;
+            break;
+        }
+    } while (in < last && out < end);
+
+    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
+    len = bits >> 3;
+    in -= len;
+    bits -= len << 3;
+    hold &= (1U << bits) - 1;
+
+    /* update state and return */
+    strm->next_in = in + OFF;
+    strm->next_out = out + OFF;
+    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
+    strm->avail_out = (unsigned)(out < end ?
+                                 257 + (end - out) : 257 - (out - end));
+    state->hold = hold;
+    state->bits = bits;
+    return;
+}
+
+/*
+   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
+   - Using bit fields for code structure
+   - Different op definition to avoid & for extra bits (do & for table bits)
+   - Three separate decoding do-loops for direct, window, and write == 0
+   - Special case for distance > 1 copies to do overlapped load and store copy
+   - Explicit branch predictions (based on measured branch probabilities)
+   - Deferring match copy and interspersed it with decoding subsequent codes
+   - Swapping literal/length else
+   - Swapping window/direct else
+   - Larger unrolled copy loops (three is about right)
+   - Moving len -= 3 statement into middle of loop
+ */
+
+#endif /* !ASMINF */
diff --git a/utils/zenutils/libraries/zlib123/zlib/inffast.h b/utils/zenutils/libraries/zlib123/zlib/inffast.h
index 614fa7877d..1e88d2d97b 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/inffast.h
+++ b/utils/zenutils/libraries/zlib123/zlib/inffast.h
@@ -1,11 +1,11 @@
-/* inffast.h -- header to use inffast.c

- * Copyright (C) 1995-2003 Mark Adler

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* WARNING: this file should *not* be used by applications. It is

-   part of the implementation of the compression library and is

-   subject to change. Applications should only use zlib.h.

- */

-

-void inflate_fast OF((z_streamp strm, unsigned start));

+/* inffast.h -- header to use inffast.c
+ * Copyright (C) 1995-2003 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+void inflate_fast OF((z_streamp strm, unsigned start));
diff --git a/utils/zenutils/libraries/zlib123/zlib/inffixed.h b/utils/zenutils/libraries/zlib123/zlib/inffixed.h
index 423d5c5b50..75ed4b5978 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/inffixed.h
+++ b/utils/zenutils/libraries/zlib123/zlib/inffixed.h
@@ -1,94 +1,94 @@
-    /* inffixed.h -- table for decoding fixed codes

-     * Generated automatically by makefixed().

-     */

-

-    /* WARNING: this file should *not* be used by applications. It

-       is part of the implementation of the compression library and

-       is subject to change. Applications should only use zlib.h.

-     */

-

-    static const code lenfix[512] = {

-        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},

-        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},

-        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},

-        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},

-        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},

-        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},

-        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},

-        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},

-        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},

-        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},

-        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},

-        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},

-        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},

-        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},

-        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},

-        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},

-        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},

-        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},

-        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},

-        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},

-        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},

-        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},

-        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},

-        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},

-        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},

-        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},

-        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},

-        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},

-        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},

-        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},

-        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},

-        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},

-        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},

-        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},

-        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},

-        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},

-        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},

-        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},

-        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},

-        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},

-        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},

-        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},

-        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},

-        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},

-        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},

-        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},

-        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},

-        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},

-        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},

-        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},

-        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},

-        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},

-        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},

-        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},

-        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},

-        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},

-        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},

-        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},

-        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},

-        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},

-        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},

-        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},

-        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},

-        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},

-        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},

-        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},

-        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},

-        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},

-        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},

-        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},

-        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},

-        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},

-        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},

-        {0,9,255}

-    };

-

-    static const code distfix[32] = {

-        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},

-        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},

-        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},

-        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},

-        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},

-        {22,5,193},{64,5,0}

-    };

+    /* inffixed.h -- table for decoding fixed codes
+     * Generated automatically by makefixed().
+     */
+
+    /* WARNING: this file should *not* be used by applications. It
+       is part of the implementation of the compression library and
+       is subject to change. Applications should only use zlib.h.
+     */
+
+    static const code lenfix[512] = {
+        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
+        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
+        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
+        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
+        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
+        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
+        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
+        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
+        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
+        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
+        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
+        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
+        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
+        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
+        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
+        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
+        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
+        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
+        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
+        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
+        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
+        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
+        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
+        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
+        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
+        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
+        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
+        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
+        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
+        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
+        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
+        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
+        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
+        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
+        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
+        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
+        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
+        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
+        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
+        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
+        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
+        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
+        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
+        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
+        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
+        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
+        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
+        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
+        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
+        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
+        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
+        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
+        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
+        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
+        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
+        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
+        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
+        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
+        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
+        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
+        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
+        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
+        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
+        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
+        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
+        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
+        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
+        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
+        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
+        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
+        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
+        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
+        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
+        {0,9,255}
+    };
+
+    static const code distfix[32] = {
+        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
+        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
+        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
+        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
+        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
+        {22,5,193},{64,5,0}
+    };
diff --git a/utils/zenutils/libraries/zlib123/zlib/inflate.c b/utils/zenutils/libraries/zlib123/zlib/inflate.c
index 33ea902928..792fdee8e9 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/inflate.c
+++ b/utils/zenutils/libraries/zlib123/zlib/inflate.c
@@ -1,1368 +1,1368 @@
-/* inflate.c -- zlib decompression

- * Copyright (C) 1995-2005 Mark Adler

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/*

- * Change history:

- *

- * 1.2.beta0    24 Nov 2002

- * - First version -- complete rewrite of inflate to simplify code, avoid

- *   creation of window when not needed, minimize use of window when it is

- *   needed, make inffast.c even faster, implement gzip decoding, and to

- *   improve code readability and style over the previous zlib inflate code

- *

- * 1.2.beta1    25 Nov 2002

- * - Use pointers for available input and output checking in inffast.c

- * - Remove input and output counters in inffast.c

- * - Change inffast.c entry and loop from avail_in >= 7 to >= 6

- * - Remove unnecessary second byte pull from length extra in inffast.c

- * - Unroll direct copy to three copies per loop in inffast.c

- *

- * 1.2.beta2    4 Dec 2002

- * - Change external routine names to reduce potential conflicts

- * - Correct filename to inffixed.h for fixed tables in inflate.c

- * - Make hbuf[] unsigned char to match parameter type in inflate.c

- * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)

- *   to avoid negation problem on Alphas (64 bit) in inflate.c

- *

- * 1.2.beta3    22 Dec 2002

- * - Add comments on state->bits assertion in inffast.c

- * - Add comments on op field in inftrees.h

- * - Fix bug in reuse of allocated window after inflateReset()

- * - Remove bit fields--back to byte structure for speed

- * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths

- * - Change post-increments to pre-increments in inflate_fast(), PPC biased?

- * - Add compile time option, POSTINC, to use post-increments instead (Intel?)

- * - Make MATCH copy in inflate() much faster for when inflate_fast() not used

- * - Use local copies of stream next and avail values, as well as local bit

- *   buffer and bit count in inflate()--for speed when inflate_fast() not used

- *

- * 1.2.beta4    1 Jan 2003

- * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings

- * - Move a comment on output buffer sizes from inffast.c to inflate.c

- * - Add comments in inffast.c to introduce the inflate_fast() routine

- * - Rearrange window copies in inflate_fast() for speed and simplification

- * - Unroll last copy for window match in inflate_fast()

- * - Use local copies of window variables in inflate_fast() for speed

- * - Pull out common write == 0 case for speed in inflate_fast()

- * - Make op and len in inflate_fast() unsigned for consistency

- * - Add FAR to lcode and dcode declarations in inflate_fast()

- * - Simplified bad distance check in inflate_fast()

- * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new

- *   source file infback.c to provide a call-back interface to inflate for

- *   programs like gzip and unzip -- uses window as output buffer to avoid

- *   window copying

- *

- * 1.2.beta5    1 Jan 2003

- * - Improved inflateBack() interface to allow the caller to provide initial

- *   input in strm.

- * - Fixed stored blocks bug in inflateBack()

- *

- * 1.2.beta6    4 Jan 2003

- * - Added comments in inffast.c on effectiveness of POSTINC

- * - Typecasting all around to reduce compiler warnings

- * - Changed loops from while (1) or do {} while (1) to for (;;), again to

- *   make compilers happy

- * - Changed type of window in inflateBackInit() to unsigned char *

- *

- * 1.2.beta7    27 Jan 2003

- * - Changed many types to unsigned or unsigned short to avoid warnings

- * - Added inflateCopy() function

- *

- * 1.2.0        9 Mar 2003

- * - Changed inflateBack() interface to provide separate opaque descriptors

- *   for the in() and out() functions

- * - Changed inflateBack() argument and in_func typedef to swap the length

- *   and buffer address return values for the input function

- * - Check next_in and next_out for Z_NULL on entry to inflate()

- *

- * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.

- */

-

-#include "zutil.h"

-#include "inftrees.h"

-#include "inflate.h"

-#include "inffast.h"

-

-#ifdef MAKEFIXED

-#  ifndef BUILDFIXED

-#    define BUILDFIXED

-#  endif

-#endif

-

-/* function prototypes */

-local void fixedtables OF((struct inflate_state FAR *state));

-local int updatewindow OF((z_streamp strm, unsigned out));

-#ifdef BUILDFIXED

-   void makefixed OF((void));

-#endif

-local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,

-                              unsigned len));

-

-int ZEXPORT inflateReset(strm)

-z_streamp strm;

-{

-    struct inflate_state FAR *state;

-

-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-    state = (struct inflate_state FAR *)strm->state;

-    strm->total_in = strm->total_out = state->total = 0;

-    strm->msg = Z_NULL;

-    strm->adler = 1;        /* to support ill-conceived Java test suite */

-    state->mode = HEAD;

-    state->last = 0;

-    state->havedict = 0;

-    state->dmax = 32768U;

-    state->head = Z_NULL;

-    state->wsize = 0;

-    state->whave = 0;

-    state->write = 0;

-    state->hold = 0;

-    state->bits = 0;

-    state->lencode = state->distcode = state->next = state->codes;

-    Tracev((stderr, "inflate: reset\n"));

-    return Z_OK;

-}

-

-int ZEXPORT inflatePrime(strm, bits, value)

-z_streamp strm;

-int bits;

-int value;

-{

-    struct inflate_state FAR *state;

-

-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-    state = (struct inflate_state FAR *)strm->state;

-    if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;

-    value &= (1L << bits) - 1;

-    state->hold += value << state->bits;

-    state->bits += bits;

-    return Z_OK;

-}

-

-int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)

-z_streamp strm;

-int windowBits;

-const char *version;

-int stream_size;

-{

-    struct inflate_state FAR *state;

-

-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||

-        stream_size != (int)(sizeof(z_stream)))

-        return Z_VERSION_ERROR;

-    if (strm == Z_NULL) return Z_STREAM_ERROR;

-    strm->msg = Z_NULL;                 /* in case we return an error */

-    if (strm->zalloc == (alloc_func)0) {

-        strm->zalloc = zcalloc;

-        strm->opaque = (voidpf)0;

-    }

-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;

-    state = (struct inflate_state FAR *)

-            ZALLOC(strm, 1, sizeof(struct inflate_state));

-    if (state == Z_NULL) return Z_MEM_ERROR;

-    Tracev((stderr, "inflate: allocated\n"));

-    strm->state = (struct internal_state FAR *)state;

-    if (windowBits < 0) {

-        state->wrap = 0;

-        windowBits = -windowBits;

-    }

-    else {

-        state->wrap = (windowBits >> 4) + 1;

-#ifdef GUNZIP

-        if (windowBits < 48) windowBits &= 15;

-#endif

-    }

-    if (windowBits < 8 || windowBits > 15) {

-        ZFREE(strm, state);

-        strm->state = Z_NULL;

-        return Z_STREAM_ERROR;

-    }

-    state->wbits = (unsigned)windowBits;

-    state->window = Z_NULL;

-    return inflateReset(strm);

-}

-

-int ZEXPORT inflateInit_(strm, version, stream_size)

-z_streamp strm;

-const char *version;

-int stream_size;

-{

-    return inflateInit2_(strm, DEF_WBITS, version, stream_size);

-}

-

-/*

-   Return state with length and distance decoding tables and index sizes set to

-   fixed code decoding.  Normally this returns fixed tables from inffixed.h.

-   If BUILDFIXED is defined, then instead this routine builds the tables the

-   first time it's called, and returns those tables the first time and

-   thereafter.  This reduces the size of the code by about 2K bytes, in

-   exchange for a little execution time.  However, BUILDFIXED should not be

-   used for threaded applications, since the rewriting of the tables and virgin

-   may not be thread-safe.

- */

-local void fixedtables(state)

-struct inflate_state FAR *state;

-{

-#ifdef BUILDFIXED

-    static int virgin = 1;

-    static code *lenfix, *distfix;

-    static code fixed[544];

-

-    /* build fixed huffman tables if first call (may not be thread safe) */

-    if (virgin) {

-        unsigned sym, bits;

-        static code *next;

-

-        /* literal/length table */

-        sym = 0;

-        while (sym < 144) state->lens[sym++] = 8;

-        while (sym < 256) state->lens[sym++] = 9;

-        while (sym < 280) state->lens[sym++] = 7;

-        while (sym < 288) state->lens[sym++] = 8;

-        next = fixed;

-        lenfix = next;

-        bits = 9;

-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);

-

-        /* distance table */

-        sym = 0;

-        while (sym < 32) state->lens[sym++] = 5;

-        distfix = next;

-        bits = 5;

-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);

-

-        /* do this just once */

-        virgin = 0;

-    }

-#else /* !BUILDFIXED */

-#   include "inffixed.h"

-#endif /* BUILDFIXED */

-    state->lencode = lenfix;

-    state->lenbits = 9;

-    state->distcode = distfix;

-    state->distbits = 5;

-}

-

-#ifdef MAKEFIXED

-#include <stdio.h>

-

-/*

-   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also

-   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes

-   those tables to stdout, which would be piped to inffixed.h.  A small program

-   can simply call makefixed to do this:

-

-    void makefixed(void);

-

-    int main(void)

-    {

-        makefixed();

-        return 0;

-    }

-

-   Then that can be linked with zlib built with MAKEFIXED defined and run:

-

-    a.out > inffixed.h

- */

-void makefixed()

-{

-    unsigned low, size;

-    struct inflate_state state;

-

-    fixedtables(&state);

-    puts("    /* inffixed.h -- table for decoding fixed codes");

-    puts("     * Generated automatically by makefixed().");

-    puts("     */");

-    puts("");

-    puts("    /* WARNING: this file should *not* be used by applications.");

-    puts("       It is part of the implementation of this library and is");

-    puts("       subject to change. Applications should only use zlib.h.");

-    puts("     */");

-    puts("");

-    size = 1U << 9;

-    printf("    static const code lenfix[%u] = {", size);

-    low = 0;

-    for (;;) {

-        if ((low % 7) == 0) printf("\n        ");

-        printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits,

-               state.lencode[low].val);

-        if (++low == size) break;

-        putchar(',');

-    }

-    puts("\n    };");

-    size = 1U << 5;

-    printf("\n    static const code distfix[%u] = {", size);

-    low = 0;

-    for (;;) {

-        if ((low % 6) == 0) printf("\n        ");

-        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,

-               state.distcode[low].val);

-        if (++low == size) break;

-        putchar(',');

-    }

-    puts("\n    };");

-}

-#endif /* MAKEFIXED */

-

-/*

-   Update the window with the last wsize (normally 32K) bytes written before

-   returning.  If window does not exist yet, create it.  This is only called

-   when a window is already in use, or when output has been written during this

-   inflate call, but the end of the deflate stream has not been reached yet.

-   It is also called to create a window for dictionary data when a dictionary

-   is loaded.

-

-   Providing output buffers larger than 32K to inflate() should provide a speed

-   advantage, since only the last 32K of output is copied to the sliding window

-   upon return from inflate(), and since all distances after the first 32K of

-   output will fall in the output data, making match copies simpler and faster.

-   The advantage may be dependent on the size of the processor's data caches.

- */

-local int updatewindow(strm, out)

-z_streamp strm;

-unsigned out;

-{

-    struct inflate_state FAR *state;

-    unsigned copy, dist;

-

-    state = (struct inflate_state FAR *)strm->state;

-

-    /* if it hasn't been done already, allocate space for the window */

-    if (state->window == Z_NULL) {

-        state->window = (unsigned char FAR *)

-                        ZALLOC(strm, 1U << state->wbits,

-                               sizeof(unsigned char));

-        if (state->window == Z_NULL) return 1;

-    }

-

-    /* if window not in use yet, initialize */

-    if (state->wsize == 0) {

-        state->wsize = 1U << state->wbits;

-        state->write = 0;

-        state->whave = 0;

-    }

-

-    /* copy state->wsize or less output bytes into the circular window */

-    copy = out - strm->avail_out;

-    if (copy >= state->wsize) {

-        zmemcpy(state->window, strm->next_out - state->wsize, state->wsize);

-        state->write = 0;

-        state->whave = state->wsize;

-    }

-    else {

-        dist = state->wsize - state->write;

-        if (dist > copy) dist = copy;

-        zmemcpy(state->window + state->write, strm->next_out - copy, dist);

-        copy -= dist;

-        if (copy) {

-            zmemcpy(state->window, strm->next_out - copy, copy);

-            state->write = copy;

-            state->whave = state->wsize;

-        }

-        else {

-            state->write += dist;

-            if (state->write == state->wsize) state->write = 0;

-            if (state->whave < state->wsize) state->whave += dist;

-        }

-    }

-    return 0;

-}

-

-/* Macros for inflate(): */

-

-/* check function to use adler32() for zlib or crc32() for gzip */

-#ifdef GUNZIP

-#  define UPDATE(check, buf, len) \

-    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))

-#else

-#  define UPDATE(check, buf, len) adler32(check, buf, len)

-#endif

-

-/* check macros for header crc */

-#ifdef GUNZIP

-#  define CRC2(check, word) \

-    do { \

-        hbuf[0] = (unsigned char)(word); \

-        hbuf[1] = (unsigned char)((word) >> 8); \

-        check = crc32(check, hbuf, 2); \

-    } while (0)

-

-#  define CRC4(check, word) \

-    do { \

-        hbuf[0] = (unsigned char)(word); \

-        hbuf[1] = (unsigned char)((word) >> 8); \

-        hbuf[2] = (unsigned char)((word) >> 16); \

-        hbuf[3] = (unsigned char)((word) >> 24); \

-        check = crc32(check, hbuf, 4); \

-    } while (0)

-#endif

-

-/* Load registers with state in inflate() for speed */

-#define LOAD() \

-    do { \

-        put = strm->next_out; \

-        left = strm->avail_out; \

-        next = strm->next_in; \

-        have = strm->avail_in; \

-        hold = state->hold; \

-        bits = state->bits; \

-    } while (0)

-

-/* Restore state from registers in inflate() */

-#define RESTORE() \

-    do { \

-        strm->next_out = put; \

-        strm->avail_out = left; \

-        strm->next_in = next; \

-        strm->avail_in = have; \

-        state->hold = hold; \

-        state->bits = bits; \

-    } while (0)

-

-/* Clear the input bit accumulator */

-#define INITBITS() \

-    do { \

-        hold = 0; \

-        bits = 0; \

-    } while (0)

-

-/* Get a byte of input into the bit accumulator, or return from inflate()

-   if there is no input available. */

-#define PULLBYTE() \

-    do { \

-        if (have == 0) goto inf_leave; \

-        have--; \

-        hold += (unsigned long)(*next++) << bits; \

-        bits += 8; \

-    } while (0)

-

-/* Assure that there are at least n bits in the bit accumulator.  If there is

-   not enough available input to do that, then return from inflate(). */

-#define NEEDBITS(n) \

-    do { \

-        while (bits < (unsigned)(n)) \

-            PULLBYTE(); \

-    } while (0)

-

-/* Return the low n bits of the bit accumulator (n < 16) */

-#define BITS(n) \

-    ((unsigned)hold & ((1U << (n)) - 1))

-

-/* Remove n bits from the bit accumulator */

-#define DROPBITS(n) \

-    do { \

-        hold >>= (n); \

-        bits -= (unsigned)(n); \

-    } while (0)

-

-/* Remove zero to seven bits as needed to go to a byte boundary */

-#define BYTEBITS() \

-    do { \

-        hold >>= bits & 7; \

-        bits -= bits & 7; \

-    } while (0)

-

-/* Reverse the bytes in a 32-bit value */

-#define REVERSE(q) \

-    ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \

-     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))

-

-/*

-   inflate() uses a state machine to process as much input data and generate as

-   much output data as possible before returning.  The state machine is

-   structured roughly as follows:

-

-    for (;;) switch (state) {

-    ...

-    case STATEn:

-        if (not enough input data or output space to make progress)

-            return;

-        ... make progress ...

-        state = STATEm;

-        break;

-    ...

-    }

-

-   so when inflate() is called again, the same case is attempted again, and

-   if the appropriate resources are provided, the machine proceeds to the

-   next state.  The NEEDBITS() macro is usually the way the state evaluates

-   whether it can proceed or should return.  NEEDBITS() does the return if

-   the requested bits are not available.  The typical use of the BITS macros

-   is:

-

-        NEEDBITS(n);

-        ... do something with BITS(n) ...

-        DROPBITS(n);

-

-   where NEEDBITS(n) either returns from inflate() if there isn't enough

-   input left to load n bits into the accumulator, or it continues.  BITS(n)

-   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops

-   the low n bits off the accumulator.  INITBITS() clears the accumulator

-   and sets the number of available bits to zero.  BYTEBITS() discards just

-   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()

-   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.

-

-   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return

-   if there is no input available.  The decoding of variable length codes uses

-   PULLBYTE() directly in order to pull just enough bytes to decode the next

-   code, and no more.

-

-   Some states loop until they get enough input, making sure that enough

-   state information is maintained to continue the loop where it left off

-   if NEEDBITS() returns in the loop.  For example, want, need, and keep

-   would all have to actually be part of the saved state in case NEEDBITS()

-   returns:

-

-    case STATEw:

-        while (want < need) {

-            NEEDBITS(n);

-            keep[want++] = BITS(n);

-            DROPBITS(n);

-        }

-        state = STATEx;

-    case STATEx:

-

-   As shown above, if the next state is also the next case, then the break

-   is omitted.

-

-   A state may also return if there is not enough output space available to

-   complete that state.  Those states are copying stored data, writing a

-   literal byte, and copying a matching string.

-

-   When returning, a "goto inf_leave" is used to update the total counters,

-   update the check value, and determine whether any progress has been made

-   during that inflate() call in order to return the proper return code.

-   Progress is defined as a change in either strm->avail_in or strm->avail_out.

-   When there is a window, goto inf_leave will update the window with the last

-   output written.  If a goto inf_leave occurs in the middle of decompression

-   and there is no window currently, goto inf_leave will create one and copy

-   output to the window for the next call of inflate().

-

-   In this implementation, the flush parameter of inflate() only affects the

-   return code (per zlib.h).  inflate() always writes as much as possible to

-   strm->next_out, given the space available and the provided input--the effect

-   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers

-   the allocation of and copying into a sliding window until necessary, which

-   provides the effect documented in zlib.h for Z_FINISH when the entire input

-   stream available.  So the only thing the flush parameter actually does is:

-   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it

-   will return Z_BUF_ERROR if it has not reached the end of the stream.

- */

-

-int ZEXPORT inflate(strm, flush)

-z_streamp strm;

-int flush;

-{

-    struct inflate_state FAR *state;

-    unsigned char FAR *next;    /* next input */

-    unsigned char FAR *put;     /* next output */

-    unsigned have, left;        /* available input and output */

-    unsigned long hold;         /* bit buffer */

-    unsigned bits;              /* bits in bit buffer */

-    unsigned in, out;           /* save starting available input and output */

-    unsigned copy;              /* number of stored or match bytes to copy */

-    unsigned char FAR *from;    /* where to copy match bytes from */

-    code this;                  /* current decoding table entry */

-    code last;                  /* parent table entry */

-    unsigned len;               /* length to copy for repeats, bits to drop */

-    int ret;                    /* return code */

-#ifdef GUNZIP

-    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */

-#endif

-    static const unsigned short order[19] = /* permutation of code lengths */

-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};

-

-    if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||

-        (strm->next_in == Z_NULL && strm->avail_in != 0))

-        return Z_STREAM_ERROR;

-

-    state = (struct inflate_state FAR *)strm->state;

-    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */

-    LOAD();

-    in = have;

-    out = left;

-    ret = Z_OK;

-    for (;;)

-        switch (state->mode) {

-        case HEAD:

-            if (state->wrap == 0) {

-                state->mode = TYPEDO;

-                break;

-            }

-            NEEDBITS(16);

-#ifdef GUNZIP

-            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */

-                state->check = crc32(0L, Z_NULL, 0);

-                CRC2(state->check, hold);

-                INITBITS();

-                state->mode = FLAGS;

-                break;

-            }

-            state->flags = 0;           /* expect zlib header */

-            if (state->head != Z_NULL)

-                state->head->done = -1;

-            if (!(state->wrap & 1) ||   /* check if zlib header allowed */

-#else

-            if (

-#endif

-                ((BITS(8) << 8) + (hold >> 8)) % 31) {

-                strm->msg = (char *)"incorrect header check";

-                state->mode = BAD;

-                break;

-            }

-            if (BITS(4) != Z_DEFLATED) {

-                strm->msg = (char *)"unknown compression method";

-                state->mode = BAD;

-                break;

-            }

-            DROPBITS(4);

-            len = BITS(4) + 8;

-            if (len > state->wbits) {

-                strm->msg = (char *)"invalid window size";

-                state->mode = BAD;

-                break;

-            }

-            state->dmax = 1U << len;

-            Tracev((stderr, "inflate:   zlib header ok\n"));

-            strm->adler = state->check = adler32(0L, Z_NULL, 0);

-            state->mode = hold & 0x200 ? DICTID : TYPE;

-            INITBITS();

-            break;

-#ifdef GUNZIP

-        case FLAGS:

-            NEEDBITS(16);

-            state->flags = (int)(hold);

-            if ((state->flags & 0xff) != Z_DEFLATED) {

-                strm->msg = (char *)"unknown compression method";

-                state->mode = BAD;

-                break;

-            }

-            if (state->flags & 0xe000) {

-                strm->msg = (char *)"unknown header flags set";

-                state->mode = BAD;

-                break;

-            }

-            if (state->head != Z_NULL)

-                state->head->text = (int)((hold >> 8) & 1);

-            if (state->flags & 0x0200) CRC2(state->check, hold);

-            INITBITS();

-            state->mode = TIME;

-        case TIME:

-            NEEDBITS(32);

-            if (state->head != Z_NULL)

-                state->head->time = hold;

-            if (state->flags & 0x0200) CRC4(state->check, hold);

-            INITBITS();

-            state->mode = OS;

-        case OS:

-            NEEDBITS(16);

-            if (state->head != Z_NULL) {

-                state->head->xflags = (int)(hold & 0xff);

-                state->head->os = (int)(hold >> 8);

-            }

-            if (state->flags & 0x0200) CRC2(state->check, hold);

-            INITBITS();

-            state->mode = EXLEN;

-        case EXLEN:

-            if (state->flags & 0x0400) {

-                NEEDBITS(16);

-                state->length = (unsigned)(hold);

-                if (state->head != Z_NULL)

-                    state->head->extra_len = (unsigned)hold;

-                if (state->flags & 0x0200) CRC2(state->check, hold);

-                INITBITS();

-            }

-            else if (state->head != Z_NULL)

-                state->head->extra = Z_NULL;

-            state->mode = EXTRA;

-        case EXTRA:

-            if (state->flags & 0x0400) {

-                copy = state->length;

-                if (copy > have) copy = have;

-                if (copy) {

-                    if (state->head != Z_NULL &&

-                        state->head->extra != Z_NULL) {

-                        len = state->head->extra_len - state->length;

-                        zmemcpy(state->head->extra + len, next,

-                                len + copy > state->head->extra_max ?

-                                state->head->extra_max - len : copy);

-                    }

-                    if (state->flags & 0x0200)

-                        state->check = crc32(state->check, next, copy);

-                    have -= copy;

-                    next += copy;

-                    state->length -= copy;

-                }

-                if (state->length) goto inf_leave;

-            }

-            state->length = 0;

-            state->mode = NAME;

-        case NAME:

-            if (state->flags & 0x0800) {

-                if (have == 0) goto inf_leave;

-                copy = 0;

-                do {

-                    len = (unsigned)(next[copy++]);

-                    if (state->head != Z_NULL &&

-                            state->head->name != Z_NULL &&

-                            state->length < state->head->name_max)

-                        state->head->name[state->length++] = len;

-                } while (len && copy < have);

-                if (state->flags & 0x0200)

-                    state->check = crc32(state->check, next, copy);

-                have -= copy;

-                next += copy;

-                if (len) goto inf_leave;

-            }

-            else if (state->head != Z_NULL)

-                state->head->name = Z_NULL;

-            state->length = 0;

-            state->mode = COMMENT;

-        case COMMENT:

-            if (state->flags & 0x1000) {

-                if (have == 0) goto inf_leave;

-                copy = 0;

-                do {

-                    len = (unsigned)(next[copy++]);

-                    if (state->head != Z_NULL &&

-                            state->head->comment != Z_NULL &&

-                            state->length < state->head->comm_max)

-                        state->head->comment[state->length++] = len;

-                } while (len && copy < have);

-                if (state->flags & 0x0200)

-                    state->check = crc32(state->check, next, copy);

-                have -= copy;

-                next += copy;

-                if (len) goto inf_leave;

-            }

-            else if (state->head != Z_NULL)

-                state->head->comment = Z_NULL;

-            state->mode = HCRC;

-        case HCRC:

-            if (state->flags & 0x0200) {

-                NEEDBITS(16);

-                if (hold != (state->check & 0xffff)) {

-                    strm->msg = (char *)"header crc mismatch";

-                    state->mode = BAD;

-                    break;

-                }

-                INITBITS();

-            }

-            if (state->head != Z_NULL) {

-                state->head->hcrc = (int)((state->flags >> 9) & 1);

-                state->head->done = 1;

-            }

-            strm->adler = state->check = crc32(0L, Z_NULL, 0);

-            state->mode = TYPE;

-            break;

-#endif

-        case DICTID:

-            NEEDBITS(32);

-            strm->adler = state->check = REVERSE(hold);

-            INITBITS();

-            state->mode = DICT;

-        case DICT:

-            if (state->havedict == 0) {

-                RESTORE();

-                return Z_NEED_DICT;

-            }

-            strm->adler = state->check = adler32(0L, Z_NULL, 0);

-            state->mode = TYPE;

-        case TYPE:

-            if (flush == Z_BLOCK) goto inf_leave;

-        case TYPEDO:

-            if (state->last) {

-                BYTEBITS();

-                state->mode = CHECK;

-                break;

-            }

-            NEEDBITS(3);

-            state->last = BITS(1);

-            DROPBITS(1);

-            switch (BITS(2)) {

-            case 0:                             /* stored block */

-                Tracev((stderr, "inflate:     stored block%s\n",

-                        state->last ? " (last)" : ""));

-                state->mode = STORED;

-                break;

-            case 1:                             /* fixed block */

-                fixedtables(state);

-                Tracev((stderr, "inflate:     fixed codes block%s\n",

-                        state->last ? " (last)" : ""));

-                state->mode = LEN;              /* decode codes */

-                break;

-            case 2:                             /* dynamic block */

-                Tracev((stderr, "inflate:     dynamic codes block%s\n",

-                        state->last ? " (last)" : ""));

-                state->mode = TABLE;

-                break;

-            case 3:

-                strm->msg = (char *)"invalid block type";

-                state->mode = BAD;

-            }

-            DROPBITS(2);

-            break;

-        case STORED:

-            BYTEBITS();                         /* go to byte boundary */

-            NEEDBITS(32);

-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {

-                strm->msg = (char *)"invalid stored block lengths";

-                state->mode = BAD;

-                break;

-            }

-            state->length = (unsigned)hold & 0xffff;

-            Tracev((stderr, "inflate:       stored length %u\n",

-                    state->length));

-            INITBITS();

-            state->mode = COPY;

-        case COPY:

-            copy = state->length;

-            if (copy) {

-                if (copy > have) copy = have;

-                if (copy > left) copy = left;

-                if (copy == 0) goto inf_leave;

-                zmemcpy(put, next, copy);

-                have -= copy;

-                next += copy;

-                left -= copy;

-                put += copy;

-                state->length -= copy;

-                break;

-            }

-            Tracev((stderr, "inflate:       stored end\n"));

-            state->mode = TYPE;

-            break;

-        case TABLE:

-            NEEDBITS(14);

-            state->nlen = BITS(5) + 257;

-            DROPBITS(5);

-            state->ndist = BITS(5) + 1;

-            DROPBITS(5);

-            state->ncode = BITS(4) + 4;

-            DROPBITS(4);

-#ifndef PKZIP_BUG_WORKAROUND

-            if (state->nlen > 286 || state->ndist > 30) {

-                strm->msg = (char *)"too many length or distance symbols";

-                state->mode = BAD;

-                break;

-            }

-#endif

-            Tracev((stderr, "inflate:       table sizes ok\n"));

-            state->have = 0;

-            state->mode = LENLENS;

-        case LENLENS:

-            while (state->have < state->ncode) {

-                NEEDBITS(3);

-                state->lens[order[state->have++]] = (unsigned short)BITS(3);

-                DROPBITS(3);

-            }

-            while (state->have < 19)

-                state->lens[order[state->have++]] = 0;

-            state->next = state->codes;

-            state->lencode = (code const FAR *)(state->next);

-            state->lenbits = 7;

-            ret = inflate_table(CODES, state->lens, 19, &(state->next),

-                                &(state->lenbits), state->work);

-            if (ret) {

-                strm->msg = (char *)"invalid code lengths set";

-                state->mode = BAD;

-                break;

-            }

-            Tracev((stderr, "inflate:       code lengths ok\n"));

-            state->have = 0;

-            state->mode = CODELENS;

-        case CODELENS:

-            while (state->have < state->nlen + state->ndist) {

-                for (;;) {

-                    this = state->lencode[BITS(state->lenbits)];

-                    if ((unsigned)(this.bits) <= bits) break;

-                    PULLBYTE();

-                }

-                if (this.val < 16) {

-                    NEEDBITS(this.bits);

-                    DROPBITS(this.bits);

-                    state->lens[state->have++] = this.val;

-                }

-                else {

-                    if (this.val == 16) {

-                        NEEDBITS(this.bits + 2);

-                        DROPBITS(this.bits);

-                        if (state->have == 0) {

-                            strm->msg = (char *)"invalid bit length repeat";

-                            state->mode = BAD;

-                            break;

-                        }

-                        len = state->lens[state->have - 1];

-                        copy = 3 + BITS(2);

-                        DROPBITS(2);

-                    }

-                    else if (this.val == 17) {

-                        NEEDBITS(this.bits + 3);

-                        DROPBITS(this.bits);

-                        len = 0;

-                        copy = 3 + BITS(3);

-                        DROPBITS(3);

-                    }

-                    else {

-                        NEEDBITS(this.bits + 7);

-                        DROPBITS(this.bits);

-                        len = 0;

-                        copy = 11 + BITS(7);

-                        DROPBITS(7);

-                    }

-                    if (state->have + copy > state->nlen + state->ndist) {

-                        strm->msg = (char *)"invalid bit length repeat";

-                        state->mode = BAD;

-                        break;

-                    }

-                    while (copy--)

-                        state->lens[state->have++] = (unsigned short)len;

-                }

-            }

-

-            /* handle error breaks in while */

-            if (state->mode == BAD) break;

-

-            /* build code tables */

-            state->next = state->codes;

-            state->lencode = (code const FAR *)(state->next);

-            state->lenbits = 9;

-            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),

-                                &(state->lenbits), state->work);

-            if (ret) {

-                strm->msg = (char *)"invalid literal/lengths set";

-                state->mode = BAD;

-                break;

-            }

-            state->distcode = (code const FAR *)(state->next);

-            state->distbits = 6;

-            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,

-                            &(state->next), &(state->distbits), state->work);

-            if (ret) {

-                strm->msg = (char *)"invalid distances set";

-                state->mode = BAD;

-                break;

-            }

-            Tracev((stderr, "inflate:       codes ok\n"));

-            state->mode = LEN;

-        case LEN:

-            if (have >= 6 && left >= 258) {

-                RESTORE();

-                inflate_fast(strm, out);

-                LOAD();

-                break;

-            }

-            for (;;) {

-                this = state->lencode[BITS(state->lenbits)];

-                if ((unsigned)(this.bits) <= bits) break;

-                PULLBYTE();

-            }

-            if (this.op && (this.op & 0xf0) == 0) {

-                last = this;

-                for (;;) {

-                    this = state->lencode[last.val +

-                            (BITS(last.bits + last.op) >> last.bits)];

-                    if ((unsigned)(last.bits + this.bits) <= bits) break;

-                    PULLBYTE();

-                }

-                DROPBITS(last.bits);

-            }

-            DROPBITS(this.bits);

-            state->length = (unsigned)this.val;

-            if ((int)(this.op) == 0) {

-                Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?

-                        "inflate:         literal '%c'\n" :

-                        "inflate:         literal 0x%02x\n", this.val));

-                state->mode = LIT;

-                break;

-            }

-            if (this.op & 32) {

-                Tracevv((stderr, "inflate:         end of block\n"));

-                state->mode = TYPE;

-                break;

-            }

-            if (this.op & 64) {

-                strm->msg = (char *)"invalid literal/length code";

-                state->mode = BAD;

-                break;

-            }

-            state->extra = (unsigned)(this.op) & 15;

-            state->mode = LENEXT;

-        case LENEXT:

-            if (state->extra) {

-                NEEDBITS(state->extra);

-                state->length += BITS(state->extra);

-                DROPBITS(state->extra);

-            }

-            Tracevv((stderr, "inflate:         length %u\n", state->length));

-            state->mode = DIST;

-        case DIST:

-            for (;;) {

-                this = state->distcode[BITS(state->distbits)];

-                if ((unsigned)(this.bits) <= bits) break;

-                PULLBYTE();

-            }

-            if ((this.op & 0xf0) == 0) {

-                last = this;

-                for (;;) {

-                    this = state->distcode[last.val +

-                            (BITS(last.bits + last.op) >> last.bits)];

-                    if ((unsigned)(last.bits + this.bits) <= bits) break;

-                    PULLBYTE();

-                }

-                DROPBITS(last.bits);

-            }

-            DROPBITS(this.bits);

-            if (this.op & 64) {

-                strm->msg = (char *)"invalid distance code";

-                state->mode = BAD;

-                break;

-            }

-            state->offset = (unsigned)this.val;

-            state->extra = (unsigned)(this.op) & 15;

-            state->mode = DISTEXT;

-        case DISTEXT:

-            if (state->extra) {

-                NEEDBITS(state->extra);

-                state->offset += BITS(state->extra);

-                DROPBITS(state->extra);

-            }

-#ifdef INFLATE_STRICT

-            if (state->offset > state->dmax) {

-                strm->msg = (char *)"invalid distance too far back";

-                state->mode = BAD;

-                break;

-            }

-#endif

-            if (state->offset > state->whave + out - left) {

-                strm->msg = (char *)"invalid distance too far back";

-                state->mode = BAD;

-                break;

-            }

-            Tracevv((stderr, "inflate:         distance %u\n", state->offset));

-            state->mode = MATCH;

-        case MATCH:

-            if (left == 0) goto inf_leave;

-            copy = out - left;

-            if (state->offset > copy) {         /* copy from window */

-                copy = state->offset - copy;

-                if (copy > state->write) {

-                    copy -= state->write;

-                    from = state->window + (state->wsize - copy);

-                }

-                else

-                    from = state->window + (state->write - copy);

-                if (copy > state->length) copy = state->length;

-            }

-            else {                              /* copy from output */

-                from = put - state->offset;

-                copy = state->length;

-            }

-            if (copy > left) copy = left;

-            left -= copy;

-            state->length -= copy;

-            do {

-                *put++ = *from++;

-            } while (--copy);

-            if (state->length == 0) state->mode = LEN;

-            break;

-        case LIT:

-            if (left == 0) goto inf_leave;

-            *put++ = (unsigned char)(state->length);

-            left--;

-            state->mode = LEN;

-            break;

-        case CHECK:

-            if (state->wrap) {

-                NEEDBITS(32);

-                out -= left;

-                strm->total_out += out;

-                state->total += out;

-                if (out)

-                    strm->adler = state->check =

-                        UPDATE(state->check, put - out, out);

-                out = left;

-                if ((

-#ifdef GUNZIP

-                     state->flags ? hold :

-#endif

-                     REVERSE(hold)) != state->check) {

-                    strm->msg = (char *)"incorrect data check";

-                    state->mode = BAD;

-                    break;

-                }

-                INITBITS();

-                Tracev((stderr, "inflate:   check matches trailer\n"));

-            }

-#ifdef GUNZIP

-            state->mode = LENGTH;

-        case LENGTH:

-            if (state->wrap && state->flags) {

-                NEEDBITS(32);

-                if (hold != (state->total & 0xffffffffUL)) {

-                    strm->msg = (char *)"incorrect length check";

-                    state->mode = BAD;

-                    break;

-                }

-                INITBITS();

-                Tracev((stderr, "inflate:   length matches trailer\n"));

-            }

-#endif

-            state->mode = DONE;

-        case DONE:

-            ret = Z_STREAM_END;

-            goto inf_leave;

-        case BAD:

-            ret = Z_DATA_ERROR;

-            goto inf_leave;

-        case MEM:

-            return Z_MEM_ERROR;

-        case SYNC:

-        default:

-            return Z_STREAM_ERROR;

-        }

-

-    /*

-       Return from inflate(), updating the total counts and the check value.

-       If there was no progress during the inflate() call, return a buffer

-       error.  Call updatewindow() to create and/or update the window state.

-       Note: a memory error from inflate() is non-recoverable.

-     */

-  inf_leave:

-    RESTORE();

-    if (state->wsize || (state->mode < CHECK && out != strm->avail_out))

-        if (updatewindow(strm, out)) {

-            state->mode = MEM;

-            return Z_MEM_ERROR;

-        }

-    in -= strm->avail_in;

-    out -= strm->avail_out;

-    strm->total_in += in;

-    strm->total_out += out;

-    state->total += out;

-    if (state->wrap && out)

-        strm->adler = state->check =

-            UPDATE(state->check, strm->next_out - out, out);

-    strm->data_type = state->bits + (state->last ? 64 : 0) +

-                      (state->mode == TYPE ? 128 : 0);

-    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)

-        ret = Z_BUF_ERROR;

-    return ret;

-}

-

-int ZEXPORT inflateEnd(strm)

-z_streamp strm;

-{

-    struct inflate_state FAR *state;

-    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)

-        return Z_STREAM_ERROR;

-    state = (struct inflate_state FAR *)strm->state;

-    if (state->window != Z_NULL) ZFREE(strm, state->window);

-    ZFREE(strm, strm->state);

-    strm->state = Z_NULL;

-    Tracev((stderr, "inflate: end\n"));

-    return Z_OK;

-}

-

-int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)

-z_streamp strm;

-const Bytef *dictionary;

-uInt dictLength;

-{

-    struct inflate_state FAR *state;

-    unsigned long id;

-

-    /* check state */

-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-    state = (struct inflate_state FAR *)strm->state;

-    if (state->wrap != 0 && state->mode != DICT)

-        return Z_STREAM_ERROR;

-

-    /* check for correct dictionary id */

-    if (state->mode == DICT) {

-        id = adler32(0L, Z_NULL, 0);

-        id = adler32(id, dictionary, dictLength);

-        if (id != state->check)

-            return Z_DATA_ERROR;

-    }

-

-    /* copy dictionary to window */

-    if (updatewindow(strm, strm->avail_out)) {

-        state->mode = MEM;

-        return Z_MEM_ERROR;

-    }

-    if (dictLength > state->wsize) {

-        zmemcpy(state->window, dictionary + dictLength - state->wsize,

-                state->wsize);

-        state->whave = state->wsize;

-    }

-    else {

-        zmemcpy(state->window + state->wsize - dictLength, dictionary,

-                dictLength);

-        state->whave = dictLength;

-    }

-    state->havedict = 1;

-    Tracev((stderr, "inflate:   dictionary set\n"));

-    return Z_OK;

-}

-

-int ZEXPORT inflateGetHeader(strm, head)

-z_streamp strm;

-gz_headerp head;

-{

-    struct inflate_state FAR *state;

-

-    /* check state */

-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-    state = (struct inflate_state FAR *)strm->state;

-    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;

-

-    /* save header structure */

-    state->head = head;

-    head->done = 0;

-    return Z_OK;

-}

-

-/*

-   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found

-   or when out of input.  When called, *have is the number of pattern bytes

-   found in order so far, in 0..3.  On return *have is updated to the new

-   state.  If on return *have equals four, then the pattern was found and the

-   return value is how many bytes were read including the last byte of the

-   pattern.  If *have is less than four, then the pattern has not been found

-   yet and the return value is len.  In the latter case, syncsearch() can be

-   called again with more data and the *have state.  *have is initialized to

-   zero for the first call.

- */

-local unsigned syncsearch(have, buf, len)

-unsigned FAR *have;

-unsigned char FAR *buf;

-unsigned len;

-{

-    unsigned got;

-    unsigned next;

-

-    got = *have;

-    next = 0;

-    while (next < len && got < 4) {

-        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))

-            got++;

-        else if (buf[next])

-            got = 0;

-        else

-            got = 4 - got;

-        next++;

-    }

-    *have = got;

-    return next;

-}

-

-int ZEXPORT inflateSync(strm)

-z_streamp strm;

-{

-    unsigned len;               /* number of bytes to look at or looked at */

-    unsigned long in, out;      /* temporary to save total_in and total_out */

-    unsigned char buf[4];       /* to restore bit buffer to byte string */

-    struct inflate_state FAR *state;

-

-    /* check parameters */

-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-    state = (struct inflate_state FAR *)strm->state;

-    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;

-

-    /* if first time, start search in bit buffer */

-    if (state->mode != SYNC) {

-        state->mode = SYNC;

-        state->hold <<= state->bits & 7;

-        state->bits -= state->bits & 7;

-        len = 0;

-        while (state->bits >= 8) {

-            buf[len++] = (unsigned char)(state->hold);

-            state->hold >>= 8;

-            state->bits -= 8;

-        }

-        state->have = 0;

-        syncsearch(&(state->have), buf, len);

-    }

-

-    /* search available input */

-    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);

-    strm->avail_in -= len;

-    strm->next_in += len;

-    strm->total_in += len;

-

-    /* return no joy or set up to restart inflate() on a new block */

-    if (state->have != 4) return Z_DATA_ERROR;

-    in = strm->total_in;  out = strm->total_out;

-    inflateReset(strm);

-    strm->total_in = in;  strm->total_out = out;

-    state->mode = TYPE;

-    return Z_OK;

-}

-

-/*

-   Returns true if inflate is currently at the end of a block generated by

-   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP

-   implementation to provide an additional safety check. PPP uses

-   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored

-   block. When decompressing, PPP checks that at the end of input packet,

-   inflate is waiting for these length bytes.

- */

-int ZEXPORT inflateSyncPoint(strm)

-z_streamp strm;

-{

-    struct inflate_state FAR *state;

-

-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-    state = (struct inflate_state FAR *)strm->state;

-    return state->mode == STORED && state->bits == 0;

-}

-

-int ZEXPORT inflateCopy(dest, source)

-z_streamp dest;

-z_streamp source;

-{

-    struct inflate_state FAR *state;

-    struct inflate_state FAR *copy;

-    unsigned char FAR *window;

-    unsigned wsize;

-

-    /* check input */

-    if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||

-        source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)

-        return Z_STREAM_ERROR;

-    state = (struct inflate_state FAR *)source->state;

-

-    /* allocate space */

-    copy = (struct inflate_state FAR *)

-           ZALLOC(source, 1, sizeof(struct inflate_state));

-    if (copy == Z_NULL) return Z_MEM_ERROR;

-    window = Z_NULL;

-    if (state->window != Z_NULL) {

-        window = (unsigned char FAR *)

-                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));

-        if (window == Z_NULL) {

-            ZFREE(source, copy);

-            return Z_MEM_ERROR;

-        }

-    }

-

-    /* copy state */

-    zmemcpy(dest, source, sizeof(z_stream));

-    zmemcpy(copy, state, sizeof(struct inflate_state));

-    if (state->lencode >= state->codes &&

-        state->lencode <= state->codes + ENOUGH - 1) {

-        copy->lencode = copy->codes + (state->lencode - state->codes);

-        copy->distcode = copy->codes + (state->distcode - state->codes);

-    }

-    copy->next = copy->codes + (state->next - state->codes);

-    if (window != Z_NULL) {

-        wsize = 1U << state->wbits;

-        zmemcpy(window, state->window, wsize);

-    }

-    copy->window = window;

-    dest->state = (struct internal_state FAR *)copy;

-    return Z_OK;

-}

+/* inflate.c -- zlib decompression
+ * Copyright (C) 1995-2005 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * Change history:
+ *
+ * 1.2.beta0    24 Nov 2002
+ * - First version -- complete rewrite of inflate to simplify code, avoid
+ *   creation of window when not needed, minimize use of window when it is
+ *   needed, make inffast.c even faster, implement gzip decoding, and to
+ *   improve code readability and style over the previous zlib inflate code
+ *
+ * 1.2.beta1    25 Nov 2002
+ * - Use pointers for available input and output checking in inffast.c
+ * - Remove input and output counters in inffast.c
+ * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
+ * - Remove unnecessary second byte pull from length extra in inffast.c
+ * - Unroll direct copy to three copies per loop in inffast.c
+ *
+ * 1.2.beta2    4 Dec 2002
+ * - Change external routine names to reduce potential conflicts
+ * - Correct filename to inffixed.h for fixed tables in inflate.c
+ * - Make hbuf[] unsigned char to match parameter type in inflate.c
+ * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
+ *   to avoid negation problem on Alphas (64 bit) in inflate.c
+ *
+ * 1.2.beta3    22 Dec 2002
+ * - Add comments on state->bits assertion in inffast.c
+ * - Add comments on op field in inftrees.h
+ * - Fix bug in reuse of allocated window after inflateReset()
+ * - Remove bit fields--back to byte structure for speed
+ * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
+ * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
+ * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
+ * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
+ * - Use local copies of stream next and avail values, as well as local bit
+ *   buffer and bit count in inflate()--for speed when inflate_fast() not used
+ *
+ * 1.2.beta4    1 Jan 2003
+ * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
+ * - Move a comment on output buffer sizes from inffast.c to inflate.c
+ * - Add comments in inffast.c to introduce the inflate_fast() routine
+ * - Rearrange window copies in inflate_fast() for speed and simplification
+ * - Unroll last copy for window match in inflate_fast()
+ * - Use local copies of window variables in inflate_fast() for speed
+ * - Pull out common write == 0 case for speed in inflate_fast()
+ * - Make op and len in inflate_fast() unsigned for consistency
+ * - Add FAR to lcode and dcode declarations in inflate_fast()
+ * - Simplified bad distance check in inflate_fast()
+ * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
+ *   source file infback.c to provide a call-back interface to inflate for
+ *   programs like gzip and unzip -- uses window as output buffer to avoid
+ *   window copying
+ *
+ * 1.2.beta5    1 Jan 2003
+ * - Improved inflateBack() interface to allow the caller to provide initial
+ *   input in strm.
+ * - Fixed stored blocks bug in inflateBack()
+ *
+ * 1.2.beta6    4 Jan 2003
+ * - Added comments in inffast.c on effectiveness of POSTINC
+ * - Typecasting all around to reduce compiler warnings
+ * - Changed loops from while (1) or do {} while (1) to for (;;), again to
+ *   make compilers happy
+ * - Changed type of window in inflateBackInit() to unsigned char *
+ *
+ * 1.2.beta7    27 Jan 2003
+ * - Changed many types to unsigned or unsigned short to avoid warnings
+ * - Added inflateCopy() function
+ *
+ * 1.2.0        9 Mar 2003
+ * - Changed inflateBack() interface to provide separate opaque descriptors
+ *   for the in() and out() functions
+ * - Changed inflateBack() argument and in_func typedef to swap the length
+ *   and buffer address return values for the input function
+ * - Check next_in and next_out for Z_NULL on entry to inflate()
+ *
+ * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+#ifdef MAKEFIXED
+#  ifndef BUILDFIXED
+#    define BUILDFIXED
+#  endif
+#endif
+
+/* function prototypes */
+local void fixedtables OF((struct inflate_state FAR *state));
+local int updatewindow OF((z_streamp strm, unsigned out));
+#ifdef BUILDFIXED
+   void makefixed OF((void));
+#endif
+local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
+                              unsigned len));
+
+int ZEXPORT inflateReset(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    strm->total_in = strm->total_out = state->total = 0;
+    strm->msg = Z_NULL;
+    strm->adler = 1;        /* to support ill-conceived Java test suite */
+    state->mode = HEAD;
+    state->last = 0;
+    state->havedict = 0;
+    state->dmax = 32768U;
+    state->head = Z_NULL;
+    state->wsize = 0;
+    state->whave = 0;
+    state->write = 0;
+    state->hold = 0;
+    state->bits = 0;
+    state->lencode = state->distcode = state->next = state->codes;
+    Tracev((stderr, "inflate: reset\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflatePrime(strm, bits, value)
+z_streamp strm;
+int bits;
+int value;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
+    value &= (1L << bits) - 1;
+    state->hold += value << state->bits;
+    state->bits += bits;
+    return Z_OK;
+}
+
+int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
+z_streamp strm;
+int windowBits;
+const char *version;
+int stream_size;
+{
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+    }
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    state = (struct inflate_state FAR *)
+            ZALLOC(strm, 1, sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (struct internal_state FAR *)state;
+    if (windowBits < 0) {
+        state->wrap = 0;
+        windowBits = -windowBits;
+    }
+    else {
+        state->wrap = (windowBits >> 4) + 1;
+#ifdef GUNZIP
+        if (windowBits < 48) windowBits &= 15;
+#endif
+    }
+    if (windowBits < 8 || windowBits > 15) {
+        ZFREE(strm, state);
+        strm->state = Z_NULL;
+        return Z_STREAM_ERROR;
+    }
+    state->wbits = (unsigned)windowBits;
+    state->window = Z_NULL;
+    return inflateReset(strm);
+}
+
+int ZEXPORT inflateInit_(strm, version, stream_size)
+z_streamp strm;
+const char *version;
+int stream_size;
+{
+    return inflateInit2_(strm, DEF_WBITS, version, stream_size);
+}
+
+/*
+   Return state with length and distance decoding tables and index sizes set to
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+   If BUILDFIXED is defined, then instead this routine builds the tables the
+   first time it's called, and returns those tables the first time and
+   thereafter.  This reduces the size of the code by about 2K bytes, in
+   exchange for a little execution time.  However, BUILDFIXED should not be
+   used for threaded applications, since the rewriting of the tables and virgin
+   may not be thread-safe.
+ */
+local void fixedtables(state)
+struct inflate_state FAR *state;
+{
+#ifdef BUILDFIXED
+    static int virgin = 1;
+    static code *lenfix, *distfix;
+    static code fixed[544];
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        unsigned sym, bits;
+        static code *next;
+
+        /* literal/length table */
+        sym = 0;
+        while (sym < 144) state->lens[sym++] = 8;
+        while (sym < 256) state->lens[sym++] = 9;
+        while (sym < 280) state->lens[sym++] = 7;
+        while (sym < 288) state->lens[sym++] = 8;
+        next = fixed;
+        lenfix = next;
+        bits = 9;
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
+
+        /* distance table */
+        sym = 0;
+        while (sym < 32) state->lens[sym++] = 5;
+        distfix = next;
+        bits = 5;
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
+
+        /* do this just once */
+        virgin = 0;
+    }
+#else /* !BUILDFIXED */
+#   include "inffixed.h"
+#endif /* BUILDFIXED */
+    state->lencode = lenfix;
+    state->lenbits = 9;
+    state->distcode = distfix;
+    state->distbits = 5;
+}
+
+#ifdef MAKEFIXED
+#include <stdio.h>
+
+/*
+   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also
+   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes
+   those tables to stdout, which would be piped to inffixed.h.  A small program
+   can simply call makefixed to do this:
+
+    void makefixed(void);
+
+    int main(void)
+    {
+        makefixed();
+        return 0;
+    }
+
+   Then that can be linked with zlib built with MAKEFIXED defined and run:
+
+    a.out > inffixed.h
+ */
+void makefixed()
+{
+    unsigned low, size;
+    struct inflate_state state;
+
+    fixedtables(&state);
+    puts("    /* inffixed.h -- table for decoding fixed codes");
+    puts("     * Generated automatically by makefixed().");
+    puts("     */");
+    puts("");
+    puts("    /* WARNING: this file should *not* be used by applications.");
+    puts("       It is part of the implementation of this library and is");
+    puts("       subject to change. Applications should only use zlib.h.");
+    puts("     */");
+    puts("");
+    size = 1U << 9;
+    printf("    static const code lenfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 7) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits,
+               state.lencode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+    size = 1U << 5;
+    printf("\n    static const code distfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 6) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
+               state.distcode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+}
+#endif /* MAKEFIXED */
+
+/*
+   Update the window with the last wsize (normally 32K) bytes written before
+   returning.  If window does not exist yet, create it.  This is only called
+   when a window is already in use, or when output has been written during this
+   inflate call, but the end of the deflate stream has not been reached yet.
+   It is also called to create a window for dictionary data when a dictionary
+   is loaded.
+
+   Providing output buffers larger than 32K to inflate() should provide a speed
+   advantage, since only the last 32K of output is copied to the sliding window
+   upon return from inflate(), and since all distances after the first 32K of
+   output will fall in the output data, making match copies simpler and faster.
+   The advantage may be dependent on the size of the processor's data caches.
+ */
+local int updatewindow(strm, out)
+z_streamp strm;
+unsigned out;
+{
+    struct inflate_state FAR *state;
+    unsigned copy, dist;
+
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* if it hasn't been done already, allocate space for the window */
+    if (state->window == Z_NULL) {
+        state->window = (unsigned char FAR *)
+                        ZALLOC(strm, 1U << state->wbits,
+                               sizeof(unsigned char));
+        if (state->window == Z_NULL) return 1;
+    }
+
+    /* if window not in use yet, initialize */
+    if (state->wsize == 0) {
+        state->wsize = 1U << state->wbits;
+        state->write = 0;
+        state->whave = 0;
+    }
+
+    /* copy state->wsize or less output bytes into the circular window */
+    copy = out - strm->avail_out;
+    if (copy >= state->wsize) {
+        zmemcpy(state->window, strm->next_out - state->wsize, state->wsize);
+        state->write = 0;
+        state->whave = state->wsize;
+    }
+    else {
+        dist = state->wsize - state->write;
+        if (dist > copy) dist = copy;
+        zmemcpy(state->window + state->write, strm->next_out - copy, dist);
+        copy -= dist;
+        if (copy) {
+            zmemcpy(state->window, strm->next_out - copy, copy);
+            state->write = copy;
+            state->whave = state->wsize;
+        }
+        else {
+            state->write += dist;
+            if (state->write == state->wsize) state->write = 0;
+            if (state->whave < state->wsize) state->whave += dist;
+        }
+    }
+    return 0;
+}
+
+/* Macros for inflate(): */
+
+/* check function to use adler32() for zlib or crc32() for gzip */
+#ifdef GUNZIP
+#  define UPDATE(check, buf, len) \
+    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
+#else
+#  define UPDATE(check, buf, len) adler32(check, buf, len)
+#endif
+
+/* check macros for header crc */
+#ifdef GUNZIP
+#  define CRC2(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        check = crc32(check, hbuf, 2); \
+    } while (0)
+
+#  define CRC4(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        hbuf[2] = (unsigned char)((word) >> 16); \
+        hbuf[3] = (unsigned char)((word) >> 24); \
+        check = crc32(check, hbuf, 4); \
+    } while (0)
+#endif
+
+/* Load registers with state in inflate() for speed */
+#define LOAD() \
+    do { \
+        put = strm->next_out; \
+        left = strm->avail_out; \
+        next = strm->next_in; \
+        have = strm->avail_in; \
+        hold = state->hold; \
+        bits = state->bits; \
+    } while (0)
+
+/* Restore state from registers in inflate() */
+#define RESTORE() \
+    do { \
+        strm->next_out = put; \
+        strm->avail_out = left; \
+        strm->next_in = next; \
+        strm->avail_in = have; \
+        state->hold = hold; \
+        state->bits = bits; \
+    } while (0)
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflate()
+   if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        if (have == 0) goto inf_leave; \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflate(). */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n < 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/* Reverse the bytes in a 32-bit value */
+#define REVERSE(q) \
+    ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
+     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
+
+/*
+   inflate() uses a state machine to process as much input data and generate as
+   much output data as possible before returning.  The state machine is
+   structured roughly as follows:
+
+    for (;;) switch (state) {
+    ...
+    case STATEn:
+        if (not enough input data or output space to make progress)
+            return;
+        ... make progress ...
+        state = STATEm;
+        break;
+    ...
+    }
+
+   so when inflate() is called again, the same case is attempted again, and
+   if the appropriate resources are provided, the machine proceeds to the
+   next state.  The NEEDBITS() macro is usually the way the state evaluates
+   whether it can proceed or should return.  NEEDBITS() does the return if
+   the requested bits are not available.  The typical use of the BITS macros
+   is:
+
+        NEEDBITS(n);
+        ... do something with BITS(n) ...
+        DROPBITS(n);
+
+   where NEEDBITS(n) either returns from inflate() if there isn't enough
+   input left to load n bits into the accumulator, or it continues.  BITS(n)
+   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops
+   the low n bits off the accumulator.  INITBITS() clears the accumulator
+   and sets the number of available bits to zero.  BYTEBITS() discards just
+   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()
+   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
+
+   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
+   if there is no input available.  The decoding of variable length codes uses
+   PULLBYTE() directly in order to pull just enough bytes to decode the next
+   code, and no more.
+
+   Some states loop until they get enough input, making sure that enough
+   state information is maintained to continue the loop where it left off
+   if NEEDBITS() returns in the loop.  For example, want, need, and keep
+   would all have to actually be part of the saved state in case NEEDBITS()
+   returns:
+
+    case STATEw:
+        while (want < need) {
+            NEEDBITS(n);
+            keep[want++] = BITS(n);
+            DROPBITS(n);
+        }
+        state = STATEx;
+    case STATEx:
+
+   As shown above, if the next state is also the next case, then the break
+   is omitted.
+
+   A state may also return if there is not enough output space available to
+   complete that state.  Those states are copying stored data, writing a
+   literal byte, and copying a matching string.
+
+   When returning, a "goto inf_leave" is used to update the total counters,
+   update the check value, and determine whether any progress has been made
+   during that inflate() call in order to return the proper return code.
+   Progress is defined as a change in either strm->avail_in or strm->avail_out.
+   When there is a window, goto inf_leave will update the window with the last
+   output written.  If a goto inf_leave occurs in the middle of decompression
+   and there is no window currently, goto inf_leave will create one and copy
+   output to the window for the next call of inflate().
+
+   In this implementation, the flush parameter of inflate() only affects the
+   return code (per zlib.h).  inflate() always writes as much as possible to
+   strm->next_out, given the space available and the provided input--the effect
+   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers
+   the allocation of and copying into a sliding window until necessary, which
+   provides the effect documented in zlib.h for Z_FINISH when the entire input
+   stream available.  So the only thing the flush parameter actually does is:
+   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it
+   will return Z_BUF_ERROR if it has not reached the end of the stream.
+ */
+
+int ZEXPORT inflate(strm, flush)
+z_streamp strm;
+int flush;
+{
+    struct inflate_state FAR *state;
+    unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have, left;        /* available input and output */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned in, out;           /* save starting available input and output */
+    unsigned copy;              /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code this;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+#ifdef GUNZIP
+    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
+#endif
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
+        (strm->next_in == Z_NULL && strm->avail_in != 0))
+        return Z_STREAM_ERROR;
+
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */
+    LOAD();
+    in = have;
+    out = left;
+    ret = Z_OK;
+    for (;;)
+        switch (state->mode) {
+        case HEAD:
+            if (state->wrap == 0) {
+                state->mode = TYPEDO;
+                break;
+            }
+            NEEDBITS(16);
+#ifdef GUNZIP
+            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
+                state->check = crc32(0L, Z_NULL, 0);
+                CRC2(state->check, hold);
+                INITBITS();
+                state->mode = FLAGS;
+                break;
+            }
+            state->flags = 0;           /* expect zlib header */
+            if (state->head != Z_NULL)
+                state->head->done = -1;
+            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
+#else
+            if (
+#endif
+                ((BITS(8) << 8) + (hold >> 8)) % 31) {
+                strm->msg = (char *)"incorrect header check";
+                state->mode = BAD;
+                break;
+            }
+            if (BITS(4) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            DROPBITS(4);
+            len = BITS(4) + 8;
+            if (len > state->wbits) {
+                strm->msg = (char *)"invalid window size";
+                state->mode = BAD;
+                break;
+            }
+            state->dmax = 1U << len;
+            Tracev((stderr, "inflate:   zlib header ok\n"));
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = hold & 0x200 ? DICTID : TYPE;
+            INITBITS();
+            break;
+#ifdef GUNZIP
+        case FLAGS:
+            NEEDBITS(16);
+            state->flags = (int)(hold);
+            if ((state->flags & 0xff) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            if (state->flags & 0xe000) {
+                strm->msg = (char *)"unknown header flags set";
+                state->mode = BAD;
+                break;
+            }
+            if (state->head != Z_NULL)
+                state->head->text = (int)((hold >> 8) & 1);
+            if (state->flags & 0x0200) CRC2(state->check, hold);
+            INITBITS();
+            state->mode = TIME;
+        case TIME:
+            NEEDBITS(32);
+            if (state->head != Z_NULL)
+                state->head->time = hold;
+            if (state->flags & 0x0200) CRC4(state->check, hold);
+            INITBITS();
+            state->mode = OS;
+        case OS:
+            NEEDBITS(16);
+            if (state->head != Z_NULL) {
+                state->head->xflags = (int)(hold & 0xff);
+                state->head->os = (int)(hold >> 8);
+            }
+            if (state->flags & 0x0200) CRC2(state->check, hold);
+            INITBITS();
+            state->mode = EXLEN;
+        case EXLEN:
+            if (state->flags & 0x0400) {
+                NEEDBITS(16);
+                state->length = (unsigned)(hold);
+                if (state->head != Z_NULL)
+                    state->head->extra_len = (unsigned)hold;
+                if (state->flags & 0x0200) CRC2(state->check, hold);
+                INITBITS();
+            }
+            else if (state->head != Z_NULL)
+                state->head->extra = Z_NULL;
+            state->mode = EXTRA;
+        case EXTRA:
+            if (state->flags & 0x0400) {
+                copy = state->length;
+                if (copy > have) copy = have;
+                if (copy) {
+                    if (state->head != Z_NULL &&
+                        state->head->extra != Z_NULL) {
+                        len = state->head->extra_len - state->length;
+                        zmemcpy(state->head->extra + len, next,
+                                len + copy > state->head->extra_max ?
+                                state->head->extra_max - len : copy);
+                    }
+                    if (state->flags & 0x0200)
+                        state->check = crc32(state->check, next, copy);
+                    have -= copy;
+                    next += copy;
+                    state->length -= copy;
+                }
+                if (state->length) goto inf_leave;
+            }
+            state->length = 0;
+            state->mode = NAME;
+        case NAME:
+            if (state->flags & 0x0800) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                    if (state->head != Z_NULL &&
+                            state->head->name != Z_NULL &&
+                            state->length < state->head->name_max)
+                        state->head->name[state->length++] = len;
+                } while (len && copy < have);
+                if (state->flags & 0x0200)
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            else if (state->head != Z_NULL)
+                state->head->name = Z_NULL;
+            state->length = 0;
+            state->mode = COMMENT;
+        case COMMENT:
+            if (state->flags & 0x1000) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                    if (state->head != Z_NULL &&
+                            state->head->comment != Z_NULL &&
+                            state->length < state->head->comm_max)
+                        state->head->comment[state->length++] = len;
+                } while (len && copy < have);
+                if (state->flags & 0x0200)
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            else if (state->head != Z_NULL)
+                state->head->comment = Z_NULL;
+            state->mode = HCRC;
+        case HCRC:
+            if (state->flags & 0x0200) {
+                NEEDBITS(16);
+                if (hold != (state->check & 0xffff)) {
+                    strm->msg = (char *)"header crc mismatch";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+            }
+            if (state->head != Z_NULL) {
+                state->head->hcrc = (int)((state->flags >> 9) & 1);
+                state->head->done = 1;
+            }
+            strm->adler = state->check = crc32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+            break;
+#endif
+        case DICTID:
+            NEEDBITS(32);
+            strm->adler = state->check = REVERSE(hold);
+            INITBITS();
+            state->mode = DICT;
+        case DICT:
+            if (state->havedict == 0) {
+                RESTORE();
+                return Z_NEED_DICT;
+            }
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+        case TYPE:
+            if (flush == Z_BLOCK) goto inf_leave;
+        case TYPEDO:
+            if (state->last) {
+                BYTEBITS();
+                state->mode = CHECK;
+                break;
+            }
+            NEEDBITS(3);
+            state->last = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                fixedtables(state);
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = LEN;              /* decode codes */
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                state->mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+        case STORED:
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                state->mode = BAD;
+                break;
+            }
+            state->length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %u\n",
+                    state->length));
+            INITBITS();
+            state->mode = COPY;
+        case COPY:
+            copy = state->length;
+            if (copy) {
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                if (copy == 0) goto inf_leave;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                state->length -= copy;
+                break;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            state->mode = TYPE;
+            break;
+        case TABLE:
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+            if (state->nlen > 286 || state->ndist > 30) {
+                strm->msg = (char *)"too many length or distance symbols";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+            state->have = 0;
+            state->mode = LENLENS;
+        case LENLENS:
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 7;
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+            state->have = 0;
+            state->mode = CODELENS;
+        case CODELENS:
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    this = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(this.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (this.val < 16) {
+                    NEEDBITS(this.bits);
+                    DROPBITS(this.bits);
+                    state->lens[state->have++] = this.val;
+                }
+                else {
+                    if (this.val == 16) {
+                        NEEDBITS(this.bits + 2);
+                        DROPBITS(this.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            state->mode = BAD;
+                            break;
+                        }
+                        len = state->lens[state->have - 1];
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (this.val == 17) {
+                        NEEDBITS(this.bits + 3);
+                        DROPBITS(this.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(this.bits + 7);
+                        DROPBITS(this.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        state->mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (state->mode == BAD) break;
+
+            /* build code tables */
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 9;
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                state->mode = BAD;
+                break;
+            }
+            state->distcode = (code const FAR *)(state->next);
+            state->distbits = 6;
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                            &(state->next), &(state->distbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            state->mode = LEN;
+        case LEN:
+            if (have >= 6 && left >= 258) {
+                RESTORE();
+                inflate_fast(strm, out);
+                LOAD();
+                break;
+            }
+            for (;;) {
+                this = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(this.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (this.op && (this.op & 0xf0) == 0) {
+                last = this;
+                for (;;) {
+                    this = state->lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + this.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(this.bits);
+            state->length = (unsigned)this.val;
+            if ((int)(this.op) == 0) {
+                Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", this.val));
+                state->mode = LIT;
+                break;
+            }
+            if (this.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                state->mode = TYPE;
+                break;
+            }
+            if (this.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                state->mode = BAD;
+                break;
+            }
+            state->extra = (unsigned)(this.op) & 15;
+            state->mode = LENEXT;
+        case LENEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->length += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+            Tracevv((stderr, "inflate:         length %u\n", state->length));
+            state->mode = DIST;
+        case DIST:
+            for (;;) {
+                this = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(this.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((this.op & 0xf0) == 0) {
+                last = this;
+                for (;;) {
+                    this = state->distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + this.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(this.bits);
+            if (this.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+            state->offset = (unsigned)this.val;
+            state->extra = (unsigned)(this.op) & 15;
+            state->mode = DISTEXT;
+        case DISTEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->offset += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+#ifdef INFLATE_STRICT
+            if (state->offset > state->dmax) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            if (state->offset > state->whave + out - left) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
+            state->mode = MATCH;
+        case MATCH:
+            if (left == 0) goto inf_leave;
+            copy = out - left;
+            if (state->offset > copy) {         /* copy from window */
+                copy = state->offset - copy;
+                if (copy > state->write) {
+                    copy -= state->write;
+                    from = state->window + (state->wsize - copy);
+                }
+                else
+                    from = state->window + (state->write - copy);
+                if (copy > state->length) copy = state->length;
+            }
+            else {                              /* copy from output */
+                from = put - state->offset;
+                copy = state->length;
+            }
+            if (copy > left) copy = left;
+            left -= copy;
+            state->length -= copy;
+            do {
+                *put++ = *from++;
+            } while (--copy);
+            if (state->length == 0) state->mode = LEN;
+            break;
+        case LIT:
+            if (left == 0) goto inf_leave;
+            *put++ = (unsigned char)(state->length);
+            left--;
+            state->mode = LEN;
+            break;
+        case CHECK:
+            if (state->wrap) {
+                NEEDBITS(32);
+                out -= left;
+                strm->total_out += out;
+                state->total += out;
+                if (out)
+                    strm->adler = state->check =
+                        UPDATE(state->check, put - out, out);
+                out = left;
+                if ((
+#ifdef GUNZIP
+                     state->flags ? hold :
+#endif
+                     REVERSE(hold)) != state->check) {
+                    strm->msg = (char *)"incorrect data check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   check matches trailer\n"));
+            }
+#ifdef GUNZIP
+            state->mode = LENGTH;
+        case LENGTH:
+            if (state->wrap && state->flags) {
+                NEEDBITS(32);
+                if (hold != (state->total & 0xffffffffUL)) {
+                    strm->msg = (char *)"incorrect length check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   length matches trailer\n"));
+            }
+#endif
+            state->mode = DONE;
+        case DONE:
+            ret = Z_STREAM_END;
+            goto inf_leave;
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+        case MEM:
+            return Z_MEM_ERROR;
+        case SYNC:
+        default:
+            return Z_STREAM_ERROR;
+        }
+
+    /*
+       Return from inflate(), updating the total counts and the check value.
+       If there was no progress during the inflate() call, return a buffer
+       error.  Call updatewindow() to create and/or update the window state.
+       Note: a memory error from inflate() is non-recoverable.
+     */
+  inf_leave:
+    RESTORE();
+    if (state->wsize || (state->mode < CHECK && out != strm->avail_out))
+        if (updatewindow(strm, out)) {
+            state->mode = MEM;
+            return Z_MEM_ERROR;
+        }
+    in -= strm->avail_in;
+    out -= strm->avail_out;
+    strm->total_in += in;
+    strm->total_out += out;
+    state->total += out;
+    if (state->wrap && out)
+        strm->adler = state->check =
+            UPDATE(state->check, strm->next_out - out, out);
+    strm->data_type = state->bits + (state->last ? 64 : 0) +
+                      (state->mode == TYPE ? 128 : 0);
+    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
+        ret = Z_BUF_ERROR;
+    return ret;
+}
+
+int ZEXPORT inflateEnd(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->window != Z_NULL) ZFREE(strm, state->window);
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
+z_streamp strm;
+const Bytef *dictionary;
+uInt dictLength;
+{
+    struct inflate_state FAR *state;
+    unsigned long id;
+
+    /* check state */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->wrap != 0 && state->mode != DICT)
+        return Z_STREAM_ERROR;
+
+    /* check for correct dictionary id */
+    if (state->mode == DICT) {
+        id = adler32(0L, Z_NULL, 0);
+        id = adler32(id, dictionary, dictLength);
+        if (id != state->check)
+            return Z_DATA_ERROR;
+    }
+
+    /* copy dictionary to window */
+    if (updatewindow(strm, strm->avail_out)) {
+        state->mode = MEM;
+        return Z_MEM_ERROR;
+    }
+    if (dictLength > state->wsize) {
+        zmemcpy(state->window, dictionary + dictLength - state->wsize,
+                state->wsize);
+        state->whave = state->wsize;
+    }
+    else {
+        zmemcpy(state->window + state->wsize - dictLength, dictionary,
+                dictLength);
+        state->whave = dictLength;
+    }
+    state->havedict = 1;
+    Tracev((stderr, "inflate:   dictionary set\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateGetHeader(strm, head)
+z_streamp strm;
+gz_headerp head;
+{
+    struct inflate_state FAR *state;
+
+    /* check state */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
+
+    /* save header structure */
+    state->head = head;
+    head->done = 0;
+    return Z_OK;
+}
+
+/*
+   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found
+   or when out of input.  When called, *have is the number of pattern bytes
+   found in order so far, in 0..3.  On return *have is updated to the new
+   state.  If on return *have equals four, then the pattern was found and the
+   return value is how many bytes were read including the last byte of the
+   pattern.  If *have is less than four, then the pattern has not been found
+   yet and the return value is len.  In the latter case, syncsearch() can be
+   called again with more data and the *have state.  *have is initialized to
+   zero for the first call.
+ */
+local unsigned syncsearch(have, buf, len)
+unsigned FAR *have;
+unsigned char FAR *buf;
+unsigned len;
+{
+    unsigned got;
+    unsigned next;
+
+    got = *have;
+    next = 0;
+    while (next < len && got < 4) {
+        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
+            got++;
+        else if (buf[next])
+            got = 0;
+        else
+            got = 4 - got;
+        next++;
+    }
+    *have = got;
+    return next;
+}
+
+int ZEXPORT inflateSync(strm)
+z_streamp strm;
+{
+    unsigned len;               /* number of bytes to look at or looked at */
+    unsigned long in, out;      /* temporary to save total_in and total_out */
+    unsigned char buf[4];       /* to restore bit buffer to byte string */
+    struct inflate_state FAR *state;
+
+    /* check parameters */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
+
+    /* if first time, start search in bit buffer */
+    if (state->mode != SYNC) {
+        state->mode = SYNC;
+        state->hold <<= state->bits & 7;
+        state->bits -= state->bits & 7;
+        len = 0;
+        while (state->bits >= 8) {
+            buf[len++] = (unsigned char)(state->hold);
+            state->hold >>= 8;
+            state->bits -= 8;
+        }
+        state->have = 0;
+        syncsearch(&(state->have), buf, len);
+    }
+
+    /* search available input */
+    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
+    strm->avail_in -= len;
+    strm->next_in += len;
+    strm->total_in += len;
+
+    /* return no joy or set up to restart inflate() on a new block */
+    if (state->have != 4) return Z_DATA_ERROR;
+    in = strm->total_in;  out = strm->total_out;
+    inflateReset(strm);
+    strm->total_in = in;  strm->total_out = out;
+    state->mode = TYPE;
+    return Z_OK;
+}
+
+/*
+   Returns true if inflate is currently at the end of a block generated by
+   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
+   implementation to provide an additional safety check. PPP uses
+   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
+   block. When decompressing, PPP checks that at the end of input packet,
+   inflate is waiting for these length bytes.
+ */
+int ZEXPORT inflateSyncPoint(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    return state->mode == STORED && state->bits == 0;
+}
+
+int ZEXPORT inflateCopy(dest, source)
+z_streamp dest;
+z_streamp source;
+{
+    struct inflate_state FAR *state;
+    struct inflate_state FAR *copy;
+    unsigned char FAR *window;
+    unsigned wsize;
+
+    /* check input */
+    if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
+        source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)source->state;
+
+    /* allocate space */
+    copy = (struct inflate_state FAR *)
+           ZALLOC(source, 1, sizeof(struct inflate_state));
+    if (copy == Z_NULL) return Z_MEM_ERROR;
+    window = Z_NULL;
+    if (state->window != Z_NULL) {
+        window = (unsigned char FAR *)
+                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
+        if (window == Z_NULL) {
+            ZFREE(source, copy);
+            return Z_MEM_ERROR;
+        }
+    }
+
+    /* copy state */
+    zmemcpy(dest, source, sizeof(z_stream));
+    zmemcpy(copy, state, sizeof(struct inflate_state));
+    if (state->lencode >= state->codes &&
+        state->lencode <= state->codes + ENOUGH - 1) {
+        copy->lencode = copy->codes + (state->lencode - state->codes);
+        copy->distcode = copy->codes + (state->distcode - state->codes);
+    }
+    copy->next = copy->codes + (state->next - state->codes);
+    if (window != Z_NULL) {
+        wsize = 1U << state->wbits;
+        zmemcpy(window, state->window, wsize);
+    }
+    copy->window = window;
+    dest->state = (struct internal_state FAR *)copy;
+    return Z_OK;
+}
diff --git a/utils/zenutils/libraries/zlib123/zlib/inflate.h b/utils/zenutils/libraries/zlib123/zlib/inflate.h
index fbbc871432..07bd3e78a7 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/inflate.h
+++ b/utils/zenutils/libraries/zlib123/zlib/inflate.h
@@ -1,115 +1,115 @@
-/* inflate.h -- internal inflate state definition

- * Copyright (C) 1995-2004 Mark Adler

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* WARNING: this file should *not* be used by applications. It is

-   part of the implementation of the compression library and is

-   subject to change. Applications should only use zlib.h.

- */

-

-/* define NO_GZIP when compiling if you want to disable gzip header and

-   trailer decoding by inflate().  NO_GZIP would be used to avoid linking in

-   the crc code when it is not needed.  For shared libraries, gzip decoding

-   should be left enabled. */

-#ifndef NO_GZIP

-#  define GUNZIP

-#endif

-

-/* Possible inflate modes between inflate() calls */

-typedef enum {

-    HEAD,       /* i: waiting for magic header */

-    FLAGS,      /* i: waiting for method and flags (gzip) */

-    TIME,       /* i: waiting for modification time (gzip) */

-    OS,         /* i: waiting for extra flags and operating system (gzip) */

-    EXLEN,      /* i: waiting for extra length (gzip) */

-    EXTRA,      /* i: waiting for extra bytes (gzip) */

-    NAME,       /* i: waiting for end of file name (gzip) */

-    COMMENT,    /* i: waiting for end of comment (gzip) */

-    HCRC,       /* i: waiting for header crc (gzip) */

-    DICTID,     /* i: waiting for dictionary check value */

-    DICT,       /* waiting for inflateSetDictionary() call */

-        TYPE,       /* i: waiting for type bits, including last-flag bit */

-        TYPEDO,     /* i: same, but skip check to exit inflate on new block */

-        STORED,     /* i: waiting for stored size (length and complement) */

-        COPY,       /* i/o: waiting for input or output to copy stored block */

-        TABLE,      /* i: waiting for dynamic block table lengths */

-        LENLENS,    /* i: waiting for code length code lengths */

-        CODELENS,   /* i: waiting for length/lit and distance code lengths */

-            LEN,        /* i: waiting for length/lit code */

-            LENEXT,     /* i: waiting for length extra bits */

-            DIST,       /* i: waiting for distance code */

-            DISTEXT,    /* i: waiting for distance extra bits */

-            MATCH,      /* o: waiting for output space to copy string */

-            LIT,        /* o: waiting for output space to write literal */

-    CHECK,      /* i: waiting for 32-bit check value */

-    LENGTH,     /* i: waiting for 32-bit length (gzip) */

-    DONE,       /* finished check, done -- remain here until reset */

-    BAD,        /* got a data error -- remain here until reset */

-    MEM,        /* got an inflate() memory error -- remain here until reset */

-    SYNC        /* looking for synchronization bytes to restart inflate() */

-} inflate_mode;

-

-/*

-    State transitions between above modes -

-

-    (most modes can go to the BAD or MEM mode -- not shown for clarity)

-

-    Process header:

-        HEAD -> (gzip) or (zlib)

-        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME

-        NAME -> COMMENT -> HCRC -> TYPE

-        (zlib) -> DICTID or TYPE

-        DICTID -> DICT -> TYPE

-    Read deflate blocks:

-            TYPE -> STORED or TABLE or LEN or CHECK

-            STORED -> COPY -> TYPE

-            TABLE -> LENLENS -> CODELENS -> LEN

-    Read deflate codes:

-                LEN -> LENEXT or LIT or TYPE

-                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN

-                LIT -> LEN

-    Process trailer:

-        CHECK -> LENGTH -> DONE

- */

-

-/* state maintained between inflate() calls.  Approximately 7K bytes. */

-struct inflate_state {

-    inflate_mode mode;          /* current inflate mode */

-    int last;                   /* true if processing last block */

-    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip */

-    int havedict;               /* true if dictionary provided */

-    int flags;                  /* gzip header method and flags (0 if zlib) */

-    unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */

-    unsigned long check;        /* protected copy of check value */

-    unsigned long total;        /* protected copy of output count */

-    gz_headerp head;            /* where to save gzip header information */

-        /* sliding window */

-    unsigned wbits;             /* log base 2 of requested window size */

-    unsigned wsize;             /* window size or zero if not using window */

-    unsigned whave;             /* valid bytes in the window */

-    unsigned write;             /* window write index */

-    unsigned char FAR *window;  /* allocated sliding window, if needed */

-        /* bit accumulator */

-    unsigned long hold;         /* input bit accumulator */

-    unsigned bits;              /* number of bits in "in" */

-        /* for string and stored block copying */

-    unsigned length;            /* literal or length of data to copy */

-    unsigned offset;            /* distance back to copy string from */

-        /* for table and code decoding */

-    unsigned extra;             /* extra bits needed */

-        /* fixed and dynamic code tables */

-    code const FAR *lencode;    /* starting table for length/literal codes */

-    code const FAR *distcode;   /* starting table for distance codes */

-    unsigned lenbits;           /* index bits for lencode */

-    unsigned distbits;          /* index bits for distcode */

-        /* dynamic table building */

-    unsigned ncode;             /* number of code length code lengths */

-    unsigned nlen;              /* number of length code lengths */

-    unsigned ndist;             /* number of distance code lengths */

-    unsigned have;              /* number of code lengths in lens[] */

-    code FAR *next;             /* next available space in codes[] */

-    unsigned short lens[320];   /* temporary storage for code lengths */

-    unsigned short work[288];   /* work area for code table building */

-    code codes[ENOUGH];         /* space for code tables */

-};

+/* inflate.h -- internal inflate state definition
+ * Copyright (C) 1995-2004 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* define NO_GZIP when compiling if you want to disable gzip header and
+   trailer decoding by inflate().  NO_GZIP would be used to avoid linking in
+   the crc code when it is not needed.  For shared libraries, gzip decoding
+   should be left enabled. */
+#ifndef NO_GZIP
+#  define GUNZIP
+#endif
+
+/* Possible inflate modes between inflate() calls */
+typedef enum {
+    HEAD,       /* i: waiting for magic header */
+    FLAGS,      /* i: waiting for method and flags (gzip) */
+    TIME,       /* i: waiting for modification time (gzip) */
+    OS,         /* i: waiting for extra flags and operating system (gzip) */
+    EXLEN,      /* i: waiting for extra length (gzip) */
+    EXTRA,      /* i: waiting for extra bytes (gzip) */
+    NAME,       /* i: waiting for end of file name (gzip) */
+    COMMENT,    /* i: waiting for end of comment (gzip) */
+    HCRC,       /* i: waiting for header crc (gzip) */
+    DICTID,     /* i: waiting for dictionary check value */
+    DICT,       /* waiting for inflateSetDictionary() call */
+        TYPE,       /* i: waiting for type bits, including last-flag bit */
+        TYPEDO,     /* i: same, but skip check to exit inflate on new block */
+        STORED,     /* i: waiting for stored size (length and complement) */
+        COPY,       /* i/o: waiting for input or output to copy stored block */
+        TABLE,      /* i: waiting for dynamic block table lengths */
+        LENLENS,    /* i: waiting for code length code lengths */
+        CODELENS,   /* i: waiting for length/lit and distance code lengths */
+            LEN,        /* i: waiting for length/lit code */
+            LENEXT,     /* i: waiting for length extra bits */
+            DIST,       /* i: waiting for distance code */
+            DISTEXT,    /* i: waiting for distance extra bits */
+            MATCH,      /* o: waiting for output space to copy string */
+            LIT,        /* o: waiting for output space to write literal */
+    CHECK,      /* i: waiting for 32-bit check value */
+    LENGTH,     /* i: waiting for 32-bit length (gzip) */
+    DONE,       /* finished check, done -- remain here until reset */
+    BAD,        /* got a data error -- remain here until reset */
+    MEM,        /* got an inflate() memory error -- remain here until reset */
+    SYNC        /* looking for synchronization bytes to restart inflate() */
+} inflate_mode;
+
+/*
+    State transitions between above modes -
+
+    (most modes can go to the BAD or MEM mode -- not shown for clarity)
+
+    Process header:
+        HEAD -> (gzip) or (zlib)
+        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME
+        NAME -> COMMENT -> HCRC -> TYPE
+        (zlib) -> DICTID or TYPE
+        DICTID -> DICT -> TYPE
+    Read deflate blocks:
+            TYPE -> STORED or TABLE or LEN or CHECK
+            STORED -> COPY -> TYPE
+            TABLE -> LENLENS -> CODELENS -> LEN
+    Read deflate codes:
+                LEN -> LENEXT or LIT or TYPE
+                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
+                LIT -> LEN
+    Process trailer:
+        CHECK -> LENGTH -> DONE
+ */
+
+/* state maintained between inflate() calls.  Approximately 7K bytes. */
+struct inflate_state {
+    inflate_mode mode;          /* current inflate mode */
+    int last;                   /* true if processing last block */
+    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip */
+    int havedict;               /* true if dictionary provided */
+    int flags;                  /* gzip header method and flags (0 if zlib) */
+    unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
+    unsigned long check;        /* protected copy of check value */
+    unsigned long total;        /* protected copy of output count */
+    gz_headerp head;            /* where to save gzip header information */
+        /* sliding window */
+    unsigned wbits;             /* log base 2 of requested window size */
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned write;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if needed */
+        /* bit accumulator */
+    unsigned long hold;         /* input bit accumulator */
+    unsigned bits;              /* number of bits in "in" */
+        /* for string and stored block copying */
+    unsigned length;            /* literal or length of data to copy */
+    unsigned offset;            /* distance back to copy string from */
+        /* for table and code decoding */
+    unsigned extra;             /* extra bits needed */
+        /* fixed and dynamic code tables */
+    code const FAR *lencode;    /* starting table for length/literal codes */
+    code const FAR *distcode;   /* starting table for distance codes */
+    unsigned lenbits;           /* index bits for lencode */
+    unsigned distbits;          /* index bits for distcode */
+        /* dynamic table building */
+    unsigned ncode;             /* number of code length code lengths */
+    unsigned nlen;              /* number of length code lengths */
+    unsigned ndist;             /* number of distance code lengths */
+    unsigned have;              /* number of code lengths in lens[] */
+    code FAR *next;             /* next available space in codes[] */
+    unsigned short lens[320];   /* temporary storage for code lengths */
+    unsigned short work[288];   /* work area for code table building */
+    code codes[ENOUGH];         /* space for code tables */
+};
diff --git a/utils/zenutils/libraries/zlib123/zlib/inftrees.c b/utils/zenutils/libraries/zlib123/zlib/inftrees.c
index 38ded81c36..8a9c13ff03 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/inftrees.c
+++ b/utils/zenutils/libraries/zlib123/zlib/inftrees.c
@@ -1,329 +1,329 @@
-/* inftrees.c -- generate Huffman trees for efficient decoding

- * Copyright (C) 1995-2005 Mark Adler

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-#include "zutil.h"

-#include "inftrees.h"

-

-#define MAXBITS 15

-

-const char inflate_copyright[] =

-   " inflate 1.2.3 Copyright 1995-2005 Mark Adler ";

-/*

-  If you use the zlib library in a product, an acknowledgment is welcome

-  in the documentation of your product. If for some reason you cannot

-  include such an acknowledgment, I would appreciate that you keep this

-  copyright string in the executable of your product.

- */

-

-/*

-   Build a set of tables to decode the provided canonical Huffman code.

-   The code lengths are lens[0..codes-1].  The result starts at *table,

-   whose indices are 0..2^bits-1.  work is a writable array of at least

-   lens shorts, which is used as a work area.  type is the type of code

-   to be generated, CODES, LENS, or DISTS.  On return, zero is success,

-   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table

-   on return points to the next available entry's address.  bits is the

-   requested root table index bits, and on return it is the actual root

-   table index bits.  It will differ if the request is greater than the

-   longest code or if it is less than the shortest code.

- */

-int inflate_table(type, lens, codes, table, bits, work)

-codetype type;

-unsigned short FAR *lens;

-unsigned codes;

-code FAR * FAR *table;

-unsigned FAR *bits;

-unsigned short FAR *work;

-{

-    unsigned len;               /* a code's length in bits */

-    unsigned sym;               /* index of code symbols */

-    unsigned min, max;          /* minimum and maximum code lengths */

-    unsigned root;              /* number of index bits for root table */

-    unsigned curr;              /* number of index bits for current table */

-    unsigned drop;              /* code bits to drop for sub-table */

-    int left;                   /* number of prefix codes available */

-    unsigned used;              /* code entries in table used */

-    unsigned huff;              /* Huffman code */

-    unsigned incr;              /* for incrementing code, index */

-    unsigned fill;              /* index for replicating entries */

-    unsigned low;               /* low bits for current root entry */

-    unsigned mask;              /* mask for low root bits */

-    code this;                  /* table entry for duplication */

-    code FAR *next;             /* next available space in table */

-    const unsigned short FAR *base;     /* base value table to use */

-    const unsigned short FAR *extra;    /* extra bits table to use */

-    int end;                    /* use base and extra for symbol > end */

-    unsigned short count[MAXBITS+1];    /* number of codes of each length */

-    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */

-    static const unsigned short lbase[31] = { /* Length codes 257..285 base */

-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,

-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};

-    static const unsigned short lext[31] = { /* Length codes 257..285 extra */

-        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,

-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196};

-    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */

-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,

-        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,

-        8193, 12289, 16385, 24577, 0, 0};

-    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */

-        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,

-        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,

-        28, 28, 29, 29, 64, 64};

-

-    /*

-       Process a set of code lengths to create a canonical Huffman code.  The

-       code lengths are lens[0..codes-1].  Each length corresponds to the

-       symbols 0..codes-1.  The Huffman code is generated by first sorting the

-       symbols by length from short to long, and retaining the symbol order

-       for codes with equal lengths.  Then the code starts with all zero bits

-       for the first code of the shortest length, and the codes are integer

-       increments for the same length, and zeros are appended as the length

-       increases.  For the deflate format, these bits are stored backwards

-       from their more natural integer increment ordering, and so when the

-       decoding tables are built in the large loop below, the integer codes

-       are incremented backwards.

-

-       This routine assumes, but does not check, that all of the entries in

-       lens[] are in the range 0..MAXBITS.  The caller must assure this.

-       1..MAXBITS is interpreted as that code length.  zero means that that

-       symbol does not occur in this code.

-

-       The codes are sorted by computing a count of codes for each length,

-       creating from that a table of starting indices for each length in the

-       sorted table, and then entering the symbols in order in the sorted

-       table.  The sorted table is work[], with that space being provided by

-       the caller.

-

-       The length counts are used for other purposes as well, i.e. finding

-       the minimum and maximum length codes, determining if there are any

-       codes at all, checking for a valid set of lengths, and looking ahead

-       at length counts to determine sub-table sizes when building the

-       decoding tables.

-     */

-

-    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */

-    for (len = 0; len <= MAXBITS; len++)

-        count[len] = 0;

-    for (sym = 0; sym < codes; sym++)

-        count[lens[sym]]++;

-

-    /* bound code lengths, force root to be within code lengths */

-    root = *bits;

-    for (max = MAXBITS; max >= 1; max--)

-        if (count[max] != 0) break;

-    if (root > max) root = max;

-    if (max == 0) {                     /* no symbols to code at all */

-        this.op = (unsigned char)64;    /* invalid code marker */

-        this.bits = (unsigned char)1;

-        this.val = (unsigned short)0;

-        *(*table)++ = this;             /* make a table to force an error */

-        *(*table)++ = this;

-        *bits = 1;

-        return 0;     /* no symbols, but wait for decoding to report error */

-    }

-    for (min = 1; min <= MAXBITS; min++)

-        if (count[min] != 0) break;

-    if (root < min) root = min;

-

-    /* check for an over-subscribed or incomplete set of lengths */

-    left = 1;

-    for (len = 1; len <= MAXBITS; len++) {

-        left <<= 1;

-        left -= count[len];

-        if (left < 0) return -1;        /* over-subscribed */

-    }

-    if (left > 0 && (type == CODES || max != 1))

-        return -1;                      /* incomplete set */

-

-    /* generate offsets into symbol table for each length for sorting */

-    offs[1] = 0;

-    for (len = 1; len < MAXBITS; len++)

-        offs[len + 1] = offs[len] + count[len];

-

-    /* sort symbols by length, by symbol order within each length */

-    for (sym = 0; sym < codes; sym++)

-        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;

-

-    /*

-       Create and fill in decoding tables.  In this loop, the table being

-       filled is at next and has curr index bits.  The code being used is huff

-       with length len.  That code is converted to an index by dropping drop

-       bits off of the bottom.  For codes where len is less than drop + curr,

-       those top drop + curr - len bits are incremented through all values to

-       fill the table with replicated entries.

-

-       root is the number of index bits for the root table.  When len exceeds

-       root, sub-tables are created pointed to by the root entry with an index

-       of the low root bits of huff.  This is saved in low to check for when a

-       new sub-table should be started.  drop is zero when the root table is

-       being filled, and drop is root when sub-tables are being filled.

-

-       When a new sub-table is needed, it is necessary to look ahead in the

-       code lengths to determine what size sub-table is needed.  The length

-       counts are used for this, and so count[] is decremented as codes are

-       entered in the tables.

-

-       used keeps track of how many table entries have been allocated from the

-       provided *table space.  It is checked when a LENS table is being made

-       against the space in *table, ENOUGH, minus the maximum space needed by

-       the worst case distance code, MAXD.  This should never happen, but the

-       sufficiency of ENOUGH has not been proven exhaustively, hence the check.

-       This assumes that when type == LENS, bits == 9.

-

-       sym increments through all symbols, and the loop terminates when

-       all codes of length max, i.e. all codes, have been processed.  This

-       routine permits incomplete codes, so another loop after this one fills

-       in the rest of the decoding tables with invalid code markers.

-     */

-

-    /* set up for code type */

-    switch (type) {

-    case CODES:

-        base = extra = work;    /* dummy value--not used */

-        end = 19;

-        break;

-    case LENS:

-        base = lbase;

-        base -= 257;

-        extra = lext;

-        extra -= 257;

-        end = 256;

-        break;

-    default:            /* DISTS */

-        base = dbase;

-        extra = dext;

-        end = -1;

-    }

-

-    /* initialize state for loop */

-    huff = 0;                   /* starting code */

-    sym = 0;                    /* starting code symbol */

-    len = min;                  /* starting code length */

-    next = *table;              /* current table to fill in */

-    curr = root;                /* current table index bits */

-    drop = 0;                   /* current bits to drop from code for index */

-    low = (unsigned)(-1);       /* trigger new sub-table when len > root */

-    used = 1U << root;          /* use root table entries */

-    mask = used - 1;            /* mask for comparing low */

-

-    /* check available table space */

-    if (type == LENS && used >= ENOUGH - MAXD)

-        return 1;

-

-    /* process all codes and make table entries */

-    for (;;) {

-        /* create table entry */

-        this.bits = (unsigned char)(len - drop);

-        if ((int)(work[sym]) < end) {

-            this.op = (unsigned char)0;

-            this.val = work[sym];

-        }

-        else if ((int)(work[sym]) > end) {

-            this.op = (unsigned char)(extra[work[sym]]);

-            this.val = base[work[sym]];

-        }

-        else {

-            this.op = (unsigned char)(32 + 64);         /* end of block */

-            this.val = 0;

-        }

-

-        /* replicate for those indices with low len bits equal to huff */

-        incr = 1U << (len - drop);

-        fill = 1U << curr;

-        min = fill;                 /* save offset to next table */

-        do {

-            fill -= incr;

-            next[(huff >> drop) + fill] = this;

-        } while (fill != 0);

-

-        /* backwards increment the len-bit code huff */

-        incr = 1U << (len - 1);

-        while (huff & incr)

-            incr >>= 1;

-        if (incr != 0) {

-            huff &= incr - 1;

-            huff += incr;

-        }

-        else

-            huff = 0;

-

-        /* go to next symbol, update count, len */

-        sym++;

-        if (--(count[len]) == 0) {

-            if (len == max) break;

-            len = lens[work[sym]];

-        }

-

-        /* create new sub-table if needed */

-        if (len > root && (huff & mask) != low) {

-            /* if first time, transition to sub-tables */

-            if (drop == 0)

-                drop = root;

-

-            /* increment past last table */

-            next += min;            /* here min is 1 << curr */

-

-            /* determine length of next table */

-            curr = len - drop;

-            left = (int)(1 << curr);

-            while (curr + drop < max) {

-                left -= count[curr + drop];

-                if (left <= 0) break;

-                curr++;

-                left <<= 1;

-            }

-

-            /* check for enough space */

-            used += 1U << curr;

-            if (type == LENS && used >= ENOUGH - MAXD)

-                return 1;

-

-            /* point entry in root table to sub-table */

-            low = huff & mask;

-            (*table)[low].op = (unsigned char)curr;

-            (*table)[low].bits = (unsigned char)root;

-            (*table)[low].val = (unsigned short)(next - *table);

-        }

-    }

-

-    /*

-       Fill in rest of table for incomplete codes.  This loop is similar to the

-       loop above in incrementing huff for table indices.  It is assumed that

-       len is equal to curr + drop, so there is no loop needed to increment

-       through high index bits.  When the current sub-table is filled, the loop

-       drops back to the root table to fill in any remaining entries there.

-     */

-    this.op = (unsigned char)64;                /* invalid code marker */

-    this.bits = (unsigned char)(len - drop);

-    this.val = (unsigned short)0;

-    while (huff != 0) {

-        /* when done with sub-table, drop back to root table */

-        if (drop != 0 && (huff & mask) != low) {

-            drop = 0;

-            len = root;

-            next = *table;

-            this.bits = (unsigned char)len;

-        }

-

-        /* put invalid code marker in table */

-        next[huff >> drop] = this;

-

-        /* backwards increment the len-bit code huff */

-        incr = 1U << (len - 1);

-        while (huff & incr)

-            incr >>= 1;

-        if (incr != 0) {

-            huff &= incr - 1;

-            huff += incr;

-        }

-        else

-            huff = 0;

-    }

-

-    /* set return parameters */

-    *table += used;

-    *bits = root;

-    return 0;

-}

+/* inftrees.c -- generate Huffman trees for efficient decoding
+ * Copyright (C) 1995-2005 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+
+#define MAXBITS 15
+
+const char inflate_copyright[] =
+   " inflate 1.2.3 Copyright 1995-2005 Mark Adler ";
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+
+/*
+   Build a set of tables to decode the provided canonical Huffman code.
+   The code lengths are lens[0..codes-1].  The result starts at *table,
+   whose indices are 0..2^bits-1.  work is a writable array of at least
+   lens shorts, which is used as a work area.  type is the type of code
+   to be generated, CODES, LENS, or DISTS.  On return, zero is success,
+   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table
+   on return points to the next available entry's address.  bits is the
+   requested root table index bits, and on return it is the actual root
+   table index bits.  It will differ if the request is greater than the
+   longest code or if it is less than the shortest code.
+ */
+int inflate_table(type, lens, codes, table, bits, work)
+codetype type;
+unsigned short FAR *lens;
+unsigned codes;
+code FAR * FAR *table;
+unsigned FAR *bits;
+unsigned short FAR *work;
+{
+    unsigned len;               /* a code's length in bits */
+    unsigned sym;               /* index of code symbols */
+    unsigned min, max;          /* minimum and maximum code lengths */
+    unsigned root;              /* number of index bits for root table */
+    unsigned curr;              /* number of index bits for current table */
+    unsigned drop;              /* code bits to drop for sub-table */
+    int left;                   /* number of prefix codes available */
+    unsigned used;              /* code entries in table used */
+    unsigned huff;              /* Huffman code */
+    unsigned incr;              /* for incrementing code, index */
+    unsigned fill;              /* index for replicating entries */
+    unsigned low;               /* low bits for current root entry */
+    unsigned mask;              /* mask for low root bits */
+    code this;                  /* table entry for duplication */
+    code FAR *next;             /* next available space in table */
+    const unsigned short FAR *base;     /* base value table to use */
+    const unsigned short FAR *extra;    /* extra bits table to use */
+    int end;                    /* use base and extra for symbol > end */
+    unsigned short count[MAXBITS+1];    /* number of codes of each length */
+    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
+    static const unsigned short lbase[31] = { /* Length codes 257..285 base */
+        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
+    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
+        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196};
+    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
+        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+        8193, 12289, 16385, 24577, 0, 0};
+    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
+        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
+        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
+        28, 28, 29, 29, 64, 64};
+
+    /*
+       Process a set of code lengths to create a canonical Huffman code.  The
+       code lengths are lens[0..codes-1].  Each length corresponds to the
+       symbols 0..codes-1.  The Huffman code is generated by first sorting the
+       symbols by length from short to long, and retaining the symbol order
+       for codes with equal lengths.  Then the code starts with all zero bits
+       for the first code of the shortest length, and the codes are integer
+       increments for the same length, and zeros are appended as the length
+       increases.  For the deflate format, these bits are stored backwards
+       from their more natural integer increment ordering, and so when the
+       decoding tables are built in the large loop below, the integer codes
+       are incremented backwards.
+
+       This routine assumes, but does not check, that all of the entries in
+       lens[] are in the range 0..MAXBITS.  The caller must assure this.
+       1..MAXBITS is interpreted as that code length.  zero means that that
+       symbol does not occur in this code.
+
+       The codes are sorted by computing a count of codes for each length,
+       creating from that a table of starting indices for each length in the
+       sorted table, and then entering the symbols in order in the sorted
+       table.  The sorted table is work[], with that space being provided by
+       the caller.
+
+       The length counts are used for other purposes as well, i.e. finding
+       the minimum and maximum length codes, determining if there are any
+       codes at all, checking for a valid set of lengths, and looking ahead
+       at length counts to determine sub-table sizes when building the
+       decoding tables.
+     */
+
+    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
+    for (len = 0; len <= MAXBITS; len++)
+        count[len] = 0;
+    for (sym = 0; sym < codes; sym++)
+        count[lens[sym]]++;
+
+    /* bound code lengths, force root to be within code lengths */
+    root = *bits;
+    for (max = MAXBITS; max >= 1; max--)
+        if (count[max] != 0) break;
+    if (root > max) root = max;
+    if (max == 0) {                     /* no symbols to code at all */
+        this.op = (unsigned char)64;    /* invalid code marker */
+        this.bits = (unsigned char)1;
+        this.val = (unsigned short)0;
+        *(*table)++ = this;             /* make a table to force an error */
+        *(*table)++ = this;
+        *bits = 1;
+        return 0;     /* no symbols, but wait for decoding to report error */
+    }
+    for (min = 1; min <= MAXBITS; min++)
+        if (count[min] != 0) break;
+    if (root < min) root = min;
+
+    /* check for an over-subscribed or incomplete set of lengths */
+    left = 1;
+    for (len = 1; len <= MAXBITS; len++) {
+        left <<= 1;
+        left -= count[len];
+        if (left < 0) return -1;        /* over-subscribed */
+    }
+    if (left > 0 && (type == CODES || max != 1))
+        return -1;                      /* incomplete set */
+
+    /* generate offsets into symbol table for each length for sorting */
+    offs[1] = 0;
+    for (len = 1; len < MAXBITS; len++)
+        offs[len + 1] = offs[len] + count[len];
+
+    /* sort symbols by length, by symbol order within each length */
+    for (sym = 0; sym < codes; sym++)
+        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
+
+    /*
+       Create and fill in decoding tables.  In this loop, the table being
+       filled is at next and has curr index bits.  The code being used is huff
+       with length len.  That code is converted to an index by dropping drop
+       bits off of the bottom.  For codes where len is less than drop + curr,
+       those top drop + curr - len bits are incremented through all values to
+       fill the table with replicated entries.
+
+       root is the number of index bits for the root table.  When len exceeds
+       root, sub-tables are created pointed to by the root entry with an index
+       of the low root bits of huff.  This is saved in low to check for when a
+       new sub-table should be started.  drop is zero when the root table is
+       being filled, and drop is root when sub-tables are being filled.
+
+       When a new sub-table is needed, it is necessary to look ahead in the
+       code lengths to determine what size sub-table is needed.  The length
+       counts are used for this, and so count[] is decremented as codes are
+       entered in the tables.
+
+       used keeps track of how many table entries have been allocated from the
+       provided *table space.  It is checked when a LENS table is being made
+       against the space in *table, ENOUGH, minus the maximum space needed by
+       the worst case distance code, MAXD.  This should never happen, but the
+       sufficiency of ENOUGH has not been proven exhaustively, hence the check.
+       This assumes that when type == LENS, bits == 9.
+
+       sym increments through all symbols, and the loop terminates when
+       all codes of length max, i.e. all codes, have been processed.  This
+       routine permits incomplete codes, so another loop after this one fills
+       in the rest of the decoding tables with invalid code markers.
+     */
+
+    /* set up for code type */
+    switch (type) {
+    case CODES:
+        base = extra = work;    /* dummy value--not used */
+        end = 19;
+        break;
+    case LENS:
+        base = lbase;
+        base -= 257;
+        extra = lext;
+        extra -= 257;
+        end = 256;
+        break;
+    default:            /* DISTS */
+        base = dbase;
+        extra = dext;
+        end = -1;
+    }
+
+    /* initialize state for loop */
+    huff = 0;                   /* starting code */
+    sym = 0;                    /* starting code symbol */
+    len = min;                  /* starting code length */
+    next = *table;              /* current table to fill in */
+    curr = root;                /* current table index bits */
+    drop = 0;                   /* current bits to drop from code for index */
+    low = (unsigned)(-1);       /* trigger new sub-table when len > root */
+    used = 1U << root;          /* use root table entries */
+    mask = used - 1;            /* mask for comparing low */
+
+    /* check available table space */
+    if (type == LENS && used >= ENOUGH - MAXD)
+        return 1;
+
+    /* process all codes and make table entries */
+    for (;;) {
+        /* create table entry */
+        this.bits = (unsigned char)(len - drop);
+        if ((int)(work[sym]) < end) {
+            this.op = (unsigned char)0;
+            this.val = work[sym];
+        }
+        else if ((int)(work[sym]) > end) {
+            this.op = (unsigned char)(extra[work[sym]]);
+            this.val = base[work[sym]];
+        }
+        else {
+            this.op = (unsigned char)(32 + 64);         /* end of block */
+            this.val = 0;
+        }
+
+        /* replicate for those indices with low len bits equal to huff */
+        incr = 1U << (len - drop);
+        fill = 1U << curr;
+        min = fill;                 /* save offset to next table */
+        do {
+            fill -= incr;
+            next[(huff >> drop) + fill] = this;
+        } while (fill != 0);
+
+        /* backwards increment the len-bit code huff */
+        incr = 1U << (len - 1);
+        while (huff & incr)
+            incr >>= 1;
+        if (incr != 0) {
+            huff &= incr - 1;
+            huff += incr;
+        }
+        else
+            huff = 0;
+
+        /* go to next symbol, update count, len */
+        sym++;
+        if (--(count[len]) == 0) {
+            if (len == max) break;
+            len = lens[work[sym]];
+        }
+
+        /* create new sub-table if needed */
+        if (len > root && (huff & mask) != low) {
+            /* if first time, transition to sub-tables */
+            if (drop == 0)
+                drop = root;
+
+            /* increment past last table */
+            next += min;            /* here min is 1 << curr */
+
+            /* determine length of next table */
+            curr = len - drop;
+            left = (int)(1 << curr);
+            while (curr + drop < max) {
+                left -= count[curr + drop];
+                if (left <= 0) break;
+                curr++;
+                left <<= 1;
+            }
+
+            /* check for enough space */
+            used += 1U << curr;
+            if (type == LENS && used >= ENOUGH - MAXD)
+                return 1;
+
+            /* point entry in root table to sub-table */
+            low = huff & mask;
+            (*table)[low].op = (unsigned char)curr;
+            (*table)[low].bits = (unsigned char)root;
+            (*table)[low].val = (unsigned short)(next - *table);
+        }
+    }
+
+    /*
+       Fill in rest of table for incomplete codes.  This loop is similar to the
+       loop above in incrementing huff for table indices.  It is assumed that
+       len is equal to curr + drop, so there is no loop needed to increment
+       through high index bits.  When the current sub-table is filled, the loop
+       drops back to the root table to fill in any remaining entries there.
+     */
+    this.op = (unsigned char)64;                /* invalid code marker */
+    this.bits = (unsigned char)(len - drop);
+    this.val = (unsigned short)0;
+    while (huff != 0) {
+        /* when done with sub-table, drop back to root table */
+        if (drop != 0 && (huff & mask) != low) {
+            drop = 0;
+            len = root;
+            next = *table;
+            this.bits = (unsigned char)len;
+        }
+
+        /* put invalid code marker in table */
+        next[huff >> drop] = this;
+
+        /* backwards increment the len-bit code huff */
+        incr = 1U << (len - 1);
+        while (huff & incr)
+            incr >>= 1;
+        if (incr != 0) {
+            huff &= incr - 1;
+            huff += incr;
+        }
+        else
+            huff = 0;
+    }
+
+    /* set return parameters */
+    *table += used;
+    *bits = root;
+    return 0;
+}
diff --git a/utils/zenutils/libraries/zlib123/zlib/inftrees.h b/utils/zenutils/libraries/zlib123/zlib/inftrees.h
index dc0fd567ea..b1104c87e7 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/inftrees.h
+++ b/utils/zenutils/libraries/zlib123/zlib/inftrees.h
@@ -1,55 +1,55 @@
-/* inftrees.h -- header to use inftrees.c

- * Copyright (C) 1995-2005 Mark Adler

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* WARNING: this file should *not* be used by applications. It is

-   part of the implementation of the compression library and is

-   subject to change. Applications should only use zlib.h.

- */

-

-/* Structure for decoding tables.  Each entry provides either the

-   information needed to do the operation requested by the code that

-   indexed that table entry, or it provides a pointer to another

-   table that indexes more bits of the code.  op indicates whether

-   the entry is a pointer to another table, a literal, a length or

-   distance, an end-of-block, or an invalid code.  For a table

-   pointer, the low four bits of op is the number of index bits of

-   that table.  For a length or distance, the low four bits of op

-   is the number of extra bits to get after the code.  bits is

-   the number of bits in this code or part of the code to drop off

-   of the bit buffer.  val is the actual byte to output in the case

-   of a literal, the base length or distance, or the offset from

-   the current table to the next table.  Each entry is four bytes. */

-typedef struct {

-    unsigned char op;           /* operation, extra bits, table bits */

-    unsigned char bits;         /* bits in this part of the code */

-    unsigned short val;         /* offset in table or code value */

-} code;

-

-/* op values as set by inflate_table():

-    00000000 - literal

-    0000tttt - table link, tttt != 0 is the number of table index bits

-    0001eeee - length or distance, eeee is the number of extra bits

-    01100000 - end of block

-    01000000 - invalid code

- */

-

-/* Maximum size of dynamic tree.  The maximum found in a long but non-

-   exhaustive search was 1444 code structures (852 for length/literals

-   and 592 for distances, the latter actually the result of an

-   exhaustive search).  The true maximum is not known, but the value

-   below is more than safe. */

-#define ENOUGH 2048

-#define MAXD 592

-

-/* Type of code to build for inftable() */

-typedef enum {

-    CODES,

-    LENS,

-    DISTS

-} codetype;

-

-extern int inflate_table OF((codetype type, unsigned short FAR *lens,

-                             unsigned codes, code FAR * FAR *table,

-                             unsigned FAR *bits, unsigned short FAR *work));

+/* inftrees.h -- header to use inftrees.c
+ * Copyright (C) 1995-2005 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* Structure for decoding tables.  Each entry provides either the
+   information needed to do the operation requested by the code that
+   indexed that table entry, or it provides a pointer to another
+   table that indexes more bits of the code.  op indicates whether
+   the entry is a pointer to another table, a literal, a length or
+   distance, an end-of-block, or an invalid code.  For a table
+   pointer, the low four bits of op is the number of index bits of
+   that table.  For a length or distance, the low four bits of op
+   is the number of extra bits to get after the code.  bits is
+   the number of bits in this code or part of the code to drop off
+   of the bit buffer.  val is the actual byte to output in the case
+   of a literal, the base length or distance, or the offset from
+   the current table to the next table.  Each entry is four bytes. */
+typedef struct {
+    unsigned char op;           /* operation, extra bits, table bits */
+    unsigned char bits;         /* bits in this part of the code */
+    unsigned short val;         /* offset in table or code value */
+} code;
+
+/* op values as set by inflate_table():
+    00000000 - literal
+    0000tttt - table link, tttt != 0 is the number of table index bits
+    0001eeee - length or distance, eeee is the number of extra bits
+    01100000 - end of block
+    01000000 - invalid code
+ */
+
+/* Maximum size of dynamic tree.  The maximum found in a long but non-
+   exhaustive search was 1444 code structures (852 for length/literals
+   and 592 for distances, the latter actually the result of an
+   exhaustive search).  The true maximum is not known, but the value
+   below is more than safe. */
+#define ENOUGH 2048
+#define MAXD 592
+
+/* Type of code to build for inftable() */
+typedef enum {
+    CODES,
+    LENS,
+    DISTS
+} codetype;
+
+extern int inflate_table OF((codetype type, unsigned short FAR *lens,
+                             unsigned codes, code FAR * FAR *table,
+                             unsigned FAR *bits, unsigned short FAR *work));
diff --git a/utils/zenutils/libraries/zlib123/zlib/make_vms.com b/utils/zenutils/libraries/zlib123/zlib/make_vms.com
index 93174bbc8a..c2a1fb54b2 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/make_vms.com
+++ b/utils/zenutils/libraries/zlib123/zlib/make_vms.com
@@ -1,461 +1,461 @@
-$! make libz under VMS written by

-$! Martin P.J. Zinser

-$! <zinser@zinser.no-ip.info or zinser@sysdev.deutsche-boerse.com>

-$!

-$ on error then goto err_exit

-$!

-$!

-$! Just some general constants...

-$!

-$ true  = 1

-$ false = 0

-$ tmpnam = "temp_" + f$getjpi("","pid")

-$ SAY = "WRITE SYS$OUTPUT"

-$!

-$! Setup variables holding "config" information

-$!

-$ Make     = ""

-$ name     = "Zlib"

-$ version  = "?.?.?"

-$ v_string = "ZLIB_VERSION"

-$ v_file   = "zlib.h"

-$ ccopt    = ""

-$ lopts    = ""

-$ linkonly = false

-$ optfile  = name + ".opt"

-$ its_decc = false

-$ its_vaxc = false

-$ its_gnuc = false

-$ axp      = f$getsyi("HW_MODEL").ge.1024

-$ s_case   = false

-$! Check for MMK/MMS

-$!

-$ If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS"

-$ If F$Type (MMK) .eqs. "STRING" Then Make = "MMK"

-$!

-$!

-$ gosub find_version

-$!

-$ gosub check_opts

-$!

-$! Look for the compiler used

-$!

-$ gosub check_compiler

-$ if its_decc

-$ then

-$   ccopt = "/prefix=all" + ccopt

-$   if f$trnlnm("SYS") .eqs. ""

-$   then

-$     if axp

-$     then

-$       define sys sys$library:

-$     else

-$       ccopt = "/decc" + ccopt

-$       define sys decc$library_include:

-$     endif

-$   endif

-$ endif

-$ if its_vaxc .or. its_gnuc

-$ then

-$    if f$trnlnm("SYS").eqs."" then define sys sys$library:

-$ endif

-$!

-$! Build the thing plain or with mms

-$!

-$ write sys$output "Compiling Zlib sources ..."

-$ if make.eqs.""

-$  then

-$   dele example.obj;*,minigzip.obj;*

-$   CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" -

-                adler32.c zlib.h zconf.h

-$   CALL MAKE compress.OBJ "CC ''CCOPT' compress" -

-                compress.c zlib.h zconf.h

-$   CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" -

-                crc32.c zlib.h zconf.h

-$   CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" -

-                deflate.c deflate.h zutil.h zlib.h zconf.h

-$   CALL MAKE gzio.OBJ "CC ''CCOPT' gzio" -

-                gzio.c zutil.h zlib.h zconf.h

-$   CALL MAKE infback.OBJ "CC ''CCOPT' infback" -

-                infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h

-$   CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" -

-                inffast.c zutil.h zlib.h zconf.h inffast.h

-$   CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" -

-                inflate.c zutil.h zlib.h zconf.h infblock.h

-$   CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" -

-                inftrees.c zutil.h zlib.h zconf.h inftrees.h

-$   CALL MAKE trees.OBJ "CC ''CCOPT' trees" -

-                trees.c deflate.h zutil.h zlib.h zconf.h

-$   CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" -

-                uncompr.c zlib.h zconf.h

-$   CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" -

-                zutil.c zutil.h zlib.h zconf.h

-$   write sys$output "Building Zlib ..."

-$   CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ

-$   write sys$output "Building example..."

-$   CALL MAKE example.OBJ "CC ''CCOPT' example" -

-                example.c zlib.h zconf.h

-$   call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb

-$   if f$search("x11vms:xvmsutils.olb") .nes. ""

-$   then

-$     write sys$output "Building minigzip..."

-$     CALL MAKE minigzip.OBJ "CC ''CCOPT' minigzip" -

-                minigzip.c zlib.h zconf.h

-$     call make minigzip.exe -

-                "LINK minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib" -

-                minigzip.obj libz.olb

-$   endif

-$  else

-$   gosub crea_mms

-$   SAY "Make ''name' ''version' with ''Make' "

-$   'make'

-$  endif

-$!

-$! Alpha gets a shareable image

-$!

-$ If axp

-$ Then

-$   gosub crea_olist

-$   write sys$output "Creating libzshr.exe"

-$   call anal_obj_axp modules.opt _link.opt

-$   if s_case

-$   then

-$      open/append optf modules.opt

-$      write optf "case_sensitive=YES"

-$      close optf

-$   endif

-$   LINK_'lopts'/SHARE=libzshr.exe modules.opt/opt,_link.opt/opt

-$ endif

-$ write sys$output "Zlib build completed"

-$ exit

-$CC_ERR:

-$ write sys$output "C compiler required to build ''name'"

-$ goto err_exit

-$ERR_EXIT:

-$ set message/facil/ident/sever/text

-$ write sys$output "Exiting..."

-$ exit 2

-$!

-$!

-$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES

-$ V = 'F$Verify(0)

-$! P1 = What we are trying to make

-$! P2 = Command to make it

-$! P3 - P8  What it depends on

-$

-$ If F$Search(P1) .Eqs. "" Then Goto Makeit

-$ Time = F$CvTime(F$File(P1,"RDT"))

-$arg=3

-$Loop:

-$       Argument = P'arg

-$       If Argument .Eqs. "" Then Goto Exit

-$       El=0

-$Loop2:

-$       File = F$Element(El," ",Argument)

-$       If File .Eqs. " " Then Goto Endl

-$       AFile = ""

-$Loop3:

-$       OFile = AFile

-$       AFile = F$Search(File)

-$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl

-$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit

-$       Goto Loop3

-$NextEL:

-$       El = El + 1

-$       Goto Loop2

-$EndL:

-$ arg=arg+1

-$ If arg .Le. 8 Then Goto Loop

-$ Goto Exit

-$

-$Makeit:

-$ VV=F$VERIFY(0)

-$ write sys$output P2

-$ 'P2

-$ VV='F$Verify(VV)

-$Exit:

-$ If V Then Set Verify

-$ENDSUBROUTINE

-$!------------------------------------------------------------------------------

-$!

-$! Check command line options and set symbols accordingly

-$!

-$ CHECK_OPTS:

-$ i = 1

-$ OPT_LOOP:

-$ if i .lt. 9

-$ then

-$   cparm = f$edit(p'i',"upcase")

-$   if cparm .eqs. "DEBUG"

-$   then

-$     ccopt = ccopt + "/noopt/deb"

-$     lopts = lopts + "/deb"

-$   endif

-$   if f$locate("CCOPT=",cparm) .lt. f$length(cparm)

-$   then

-$     start = f$locate("=",cparm) + 1

-$     len   = f$length(cparm) - start

-$     ccopt = ccopt + f$extract(start,len,cparm)

-$     if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) -

-         then s_case = true

-$   endif

-$   if cparm .eqs. "LINK" then linkonly = true

-$   if f$locate("LOPTS=",cparm) .lt. f$length(cparm)

-$   then

-$     start = f$locate("=",cparm) + 1

-$     len   = f$length(cparm) - start

-$     lopts = lopts + f$extract(start,len,cparm)

-$   endif

-$   if f$locate("CC=",cparm) .lt. f$length(cparm)

-$   then

-$     start  = f$locate("=",cparm) + 1

-$     len    = f$length(cparm) - start

-$     cc_com = f$extract(start,len,cparm)

-      if (cc_com .nes. "DECC") .and. -

-         (cc_com .nes. "VAXC") .and. -

-         (cc_com .nes. "GNUC")

-$     then

-$       write sys$output "Unsupported compiler choice ''cc_com' ignored"

-$       write sys$output "Use DECC, VAXC, or GNUC instead"

-$     else

-$       if cc_com .eqs. "DECC" then its_decc = true

-$       if cc_com .eqs. "VAXC" then its_vaxc = true

-$       if cc_com .eqs. "GNUC" then its_gnuc = true

-$     endif

-$   endif

-$   if f$locate("MAKE=",cparm) .lt. f$length(cparm)

-$   then

-$     start  = f$locate("=",cparm) + 1

-$     len    = f$length(cparm) - start

-$     mmks = f$extract(start,len,cparm)

-$     if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS")

-$     then

-$       make = mmks

-$     else

-$       write sys$output "Unsupported make choice ''mmks' ignored"

-$       write sys$output "Use MMK or MMS instead"

-$     endif

-$   endif

-$   i = i + 1

-$   goto opt_loop

-$ endif

-$ return

-$!------------------------------------------------------------------------------

-$!

-$! Look for the compiler used

-$!

-$CHECK_COMPILER:

-$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))

-$ then

-$   its_decc = (f$search("SYS$SYSTEM:DECC$COMPILER.EXE") .nes. "")

-$   its_vaxc = .not. its_decc .and. (F$Search("SYS$System:VAXC.Exe") .nes. "")

-$   its_gnuc = .not. (its_decc .or. its_vaxc) .and. (f$trnlnm("gnu_cc") .nes. "")

-$ endif

-$!

-$! Exit if no compiler available

-$!

-$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))

-$ then goto CC_ERR

-$ else

-$   if its_decc then write sys$output "CC compiler check ... Compaq C"

-$   if its_vaxc then write sys$output "CC compiler check ... VAX C"

-$   if its_gnuc then write sys$output "CC compiler check ... GNU C"

-$ endif

-$ return

-$!------------------------------------------------------------------------------

-$!

-$! If MMS/MMK are available dump out the descrip.mms if required

-$!

-$CREA_MMS:

-$ write sys$output "Creating descrip.mms..."

-$ create descrip.mms

-$ open/append out descrip.mms

-$ copy sys$input: out

-$ deck

-# descrip.mms: MMS description file for building zlib on VMS

-# written by Martin P.J. Zinser

-# <zinser@zinser.no-ip.info or zinser@sysdev.deutsche-boerse.com>

-

-OBJS = adler32.obj, compress.obj, crc32.obj, gzio.obj, uncompr.obj, infback.obj\

-       deflate.obj, trees.obj, zutil.obj, inflate.obj, \

-       inftrees.obj, inffast.obj

-

-$ eod

-$ write out "CFLAGS=", ccopt

-$ write out "LOPTS=", lopts

-$ copy sys$input: out

-$ deck

-

-all : example.exe minigzip.exe libz.olb

-        @ write sys$output " Example applications available"

-

-libz.olb : libz.olb($(OBJS))

-        @ write sys$output " libz available"

-

-example.exe : example.obj libz.olb

-              link $(LOPTS) example,libz.olb/lib

-

-minigzip.exe : minigzip.obj libz.olb

-              link $(LOPTS) minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib

-

-clean :

-        delete *.obj;*,libz.olb;*,*.opt;*,*.exe;*

-

-

-# Other dependencies.

-adler32.obj  : adler32.c zutil.h zlib.h zconf.h

-compress.obj : compress.c zlib.h zconf.h

-crc32.obj    : crc32.c zutil.h zlib.h zconf.h

-deflate.obj  : deflate.c deflate.h zutil.h zlib.h zconf.h

-example.obj  : example.c zlib.h zconf.h

-gzio.obj     : gzio.c zutil.h zlib.h zconf.h

-inffast.obj  : inffast.c zutil.h zlib.h zconf.h inftrees.h inffast.h

-inflate.obj  : inflate.c zutil.h zlib.h zconf.h

-inftrees.obj : inftrees.c zutil.h zlib.h zconf.h inftrees.h

-minigzip.obj : minigzip.c zlib.h zconf.h

-trees.obj    : trees.c deflate.h zutil.h zlib.h zconf.h

-uncompr.obj  : uncompr.c zlib.h zconf.h

-zutil.obj    : zutil.c zutil.h zlib.h zconf.h

-infback.obj  : infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h

-$ eod

-$ close out

-$ return

-$!------------------------------------------------------------------------------

-$!

-$! Read list of core library sources from makefile.in and create options

-$! needed to build shareable image

-$!

-$CREA_OLIST:

-$ open/read min makefile.in

-$ open/write mod modules.opt

-$ src_check = "OBJS ="

-$MRLOOP:

-$ read/end=mrdone min rec

-$ if (f$extract(0,6,rec) .nes. src_check) then goto mrloop

-$ rec = rec - src_check

-$ gosub extra_filnam

-$ if (f$element(1,"\",rec) .eqs. "\") then goto mrdone

-$MRSLOOP:

-$ read/end=mrdone min rec

-$ gosub extra_filnam

-$ if (f$element(1,"\",rec) .nes. "\") then goto mrsloop

-$MRDONE:

-$ close min

-$ close mod

-$ return

-$!------------------------------------------------------------------------------

-$!

-$! Take record extracted in crea_olist and split it into single filenames

-$!

-$EXTRA_FILNAM:

-$ myrec = f$edit(rec - "\", "trim,compress")

-$ i = 0

-$FELOOP:

-$ srcfil = f$element(i," ", myrec)

-$ if (srcfil .nes. " ")

-$ then

-$   write mod f$parse(srcfil,,,"NAME"), ".obj"

-$   i = i + 1

-$   goto feloop

-$ endif

-$ return

-$!------------------------------------------------------------------------------

-$!

-$! Find current Zlib version number

-$!

-$FIND_VERSION:

-$ open/read h_in 'v_file'

-$hloop:

-$ read/end=hdone h_in rec

-$ rec = f$edit(rec,"TRIM")

-$ if (f$extract(0,1,rec) .nes. "#") then goto hloop

-$ rec = f$edit(rec - "#", "TRIM")

-$ if f$element(0," ",rec) .nes. "define" then goto hloop

-$ if f$element(1," ",rec) .eqs. v_string

-$ then

-$   version = 'f$element(2," ",rec)'

-$   goto hdone

-$ endif

-$ goto hloop

-$hdone:

-$ close h_in

-$ return

-$!------------------------------------------------------------------------------

-$!

-$! Analyze Object files for OpenVMS AXP to extract Procedure and Data

-$! information to build a symbol vector for a shareable image

-$! All the "brains" of this logic was suggested by Hartmut Becker

-$! (Hartmut.Becker@compaq.com). All the bugs were introduced by me

-$! (zinser@decus.de), so if you do have problem reports please do not

-$! bother Hartmut/HP, but get in touch with me

-$!

-$ ANAL_OBJ_AXP: Subroutine

-$ V = 'F$Verify(0)

-$ SAY := "WRITE_ SYS$OUTPUT"

-$

-$ IF F$SEARCH("''P1'") .EQS. ""

-$ THEN

-$    SAY "ANAL_OBJ_AXP-E-NOSUCHFILE:  Error, inputfile ''p1' not available"

-$    goto exit_aa

-$ ENDIF

-$ IF "''P2'" .EQS. ""

-$ THEN

-$    SAY "ANAL_OBJ_AXP:  Error, no output file provided"

-$    goto exit_aa

-$ ENDIF

-$

-$ open/read in 'p1

-$ create a.tmp

-$ open/append atmp a.tmp

-$ loop:

-$ read/end=end_loop in line

-$ f= f$search(line)

-$ if f .eqs. ""

-$ then

-$       write sys$output "ANAL_OBJ_AXP-w-nosuchfile, ''line'"

-$       goto loop

-$ endif

-$ define/user sys$output nl:

-$ define/user sys$error nl:

-$ anal/obj/gsd 'f /out=x.tmp

-$ open/read xtmp x.tmp

-$ XLOOP:

-$ read/end=end_xloop xtmp xline

-$ xline = f$edit(xline,"compress")

-$ write atmp xline

-$ goto xloop

-$ END_XLOOP:

-$ close xtmp

-$ goto loop

-$ end_loop:

-$ close in

-$ close atmp

-$ if f$search("a.tmp") .eqs. "" -

-        then $ exit

-$ ! all global definitions

-$ search a.tmp "symbol:","EGSY$V_DEF 1","EGSY$V_NORM 1"/out=b.tmp

-$ ! all procedures

-$ search b.tmp "EGSY$V_NORM 1"/wind=(0,1) /out=c.tmp

-$ search c.tmp "symbol:"/out=d.tmp

-$ define/user sys$output nl:

-$ edito/edt/command=sys$input d.tmp

-sub/symbol: "/symbol_vector=(/whole

-sub/"/=PROCEDURE)/whole

-exit

-$ ! all data

-$ search b.tmp "EGSY$V_DEF 1"/wind=(0,1) /out=e.tmp

-$ search e.tmp "symbol:"/out=f.tmp

-$ define/user sys$output nl:

-$ edito/edt/command=sys$input f.tmp

-sub/symbol: "/symbol_vector=(/whole

-sub/"/=DATA)/whole

-exit

-$ sort/nodupl d.tmp,f.tmp 'p2'

-$ delete a.tmp;*,b.tmp;*,c.tmp;*,d.tmp;*,e.tmp;*,f.tmp;*

-$ if f$search("x.tmp") .nes. "" -

-        then $ delete x.tmp;*

-$!

-$ EXIT_AA:

-$ if V then set verify

-$ endsubroutine

-$!------------------------------------------------------------------------------

+$! make libz under VMS written by
+$! Martin P.J. Zinser
+$! <zinser@zinser.no-ip.info or zinser@sysdev.deutsche-boerse.com>
+$!
+$ on error then goto err_exit
+$!
+$!
+$! Just some general constants...
+$!
+$ true  = 1
+$ false = 0
+$ tmpnam = "temp_" + f$getjpi("","pid")
+$ SAY = "WRITE SYS$OUTPUT"
+$!
+$! Setup variables holding "config" information
+$!
+$ Make     = ""
+$ name     = "Zlib"
+$ version  = "?.?.?"
+$ v_string = "ZLIB_VERSION"
+$ v_file   = "zlib.h"
+$ ccopt    = ""
+$ lopts    = ""
+$ linkonly = false
+$ optfile  = name + ".opt"
+$ its_decc = false
+$ its_vaxc = false
+$ its_gnuc = false
+$ axp      = f$getsyi("HW_MODEL").ge.1024
+$ s_case   = false
+$! Check for MMK/MMS
+$!
+$ If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS"
+$ If F$Type (MMK) .eqs. "STRING" Then Make = "MMK"
+$!
+$!
+$ gosub find_version
+$!
+$ gosub check_opts
+$!
+$! Look for the compiler used
+$!
+$ gosub check_compiler
+$ if its_decc
+$ then
+$   ccopt = "/prefix=all" + ccopt
+$   if f$trnlnm("SYS") .eqs. ""
+$   then
+$     if axp
+$     then
+$       define sys sys$library:
+$     else
+$       ccopt = "/decc" + ccopt
+$       define sys decc$library_include:
+$     endif
+$   endif
+$ endif
+$ if its_vaxc .or. its_gnuc
+$ then
+$    if f$trnlnm("SYS").eqs."" then define sys sys$library:
+$ endif
+$!
+$! Build the thing plain or with mms
+$!
+$ write sys$output "Compiling Zlib sources ..."
+$ if make.eqs.""
+$  then
+$   dele example.obj;*,minigzip.obj;*
+$   CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" -
+                adler32.c zlib.h zconf.h
+$   CALL MAKE compress.OBJ "CC ''CCOPT' compress" -
+                compress.c zlib.h zconf.h
+$   CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" -
+                crc32.c zlib.h zconf.h
+$   CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" -
+                deflate.c deflate.h zutil.h zlib.h zconf.h
+$   CALL MAKE gzio.OBJ "CC ''CCOPT' gzio" -
+                gzio.c zutil.h zlib.h zconf.h
+$   CALL MAKE infback.OBJ "CC ''CCOPT' infback" -
+                infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h
+$   CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" -
+                inffast.c zutil.h zlib.h zconf.h inffast.h
+$   CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" -
+                inflate.c zutil.h zlib.h zconf.h infblock.h
+$   CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" -
+                inftrees.c zutil.h zlib.h zconf.h inftrees.h
+$   CALL MAKE trees.OBJ "CC ''CCOPT' trees" -
+                trees.c deflate.h zutil.h zlib.h zconf.h
+$   CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" -
+                uncompr.c zlib.h zconf.h
+$   CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" -
+                zutil.c zutil.h zlib.h zconf.h
+$   write sys$output "Building Zlib ..."
+$   CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ
+$   write sys$output "Building example..."
+$   CALL MAKE example.OBJ "CC ''CCOPT' example" -
+                example.c zlib.h zconf.h
+$   call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb
+$   if f$search("x11vms:xvmsutils.olb") .nes. ""
+$   then
+$     write sys$output "Building minigzip..."
+$     CALL MAKE minigzip.OBJ "CC ''CCOPT' minigzip" -
+                minigzip.c zlib.h zconf.h
+$     call make minigzip.exe -
+                "LINK minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib" -
+                minigzip.obj libz.olb
+$   endif
+$  else
+$   gosub crea_mms
+$   SAY "Make ''name' ''version' with ''Make' "
+$   'make'
+$  endif
+$!
+$! Alpha gets a shareable image
+$!
+$ If axp
+$ Then
+$   gosub crea_olist
+$   write sys$output "Creating libzshr.exe"
+$   call anal_obj_axp modules.opt _link.opt
+$   if s_case
+$   then
+$      open/append optf modules.opt
+$      write optf "case_sensitive=YES"
+$      close optf
+$   endif
+$   LINK_'lopts'/SHARE=libzshr.exe modules.opt/opt,_link.opt/opt
+$ endif
+$ write sys$output "Zlib build completed"
+$ exit
+$CC_ERR:
+$ write sys$output "C compiler required to build ''name'"
+$ goto err_exit
+$ERR_EXIT:
+$ set message/facil/ident/sever/text
+$ write sys$output "Exiting..."
+$ exit 2
+$!
+$!
+$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES
+$ V = 'F$Verify(0)
+$! P1 = What we are trying to make
+$! P2 = Command to make it
+$! P3 - P8  What it depends on
+$
+$ If F$Search(P1) .Eqs. "" Then Goto Makeit
+$ Time = F$CvTime(F$File(P1,"RDT"))
+$arg=3
+$Loop:
+$       Argument = P'arg
+$       If Argument .Eqs. "" Then Goto Exit
+$       El=0
+$Loop2:
+$       File = F$Element(El," ",Argument)
+$       If File .Eqs. " " Then Goto Endl
+$       AFile = ""
+$Loop3:
+$       OFile = AFile
+$       AFile = F$Search(File)
+$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
+$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
+$       Goto Loop3
+$NextEL:
+$       El = El + 1
+$       Goto Loop2
+$EndL:
+$ arg=arg+1
+$ If arg .Le. 8 Then Goto Loop
+$ Goto Exit
+$
+$Makeit:
+$ VV=F$VERIFY(0)
+$ write sys$output P2
+$ 'P2
+$ VV='F$Verify(VV)
+$Exit:
+$ If V Then Set Verify
+$ENDSUBROUTINE
+$!------------------------------------------------------------------------------
+$!
+$! Check command line options and set symbols accordingly
+$!
+$ CHECK_OPTS:
+$ i = 1
+$ OPT_LOOP:
+$ if i .lt. 9
+$ then
+$   cparm = f$edit(p'i',"upcase")
+$   if cparm .eqs. "DEBUG"
+$   then
+$     ccopt = ccopt + "/noopt/deb"
+$     lopts = lopts + "/deb"
+$   endif
+$   if f$locate("CCOPT=",cparm) .lt. f$length(cparm)
+$   then
+$     start = f$locate("=",cparm) + 1
+$     len   = f$length(cparm) - start
+$     ccopt = ccopt + f$extract(start,len,cparm)
+$     if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) -
+         then s_case = true
+$   endif
+$   if cparm .eqs. "LINK" then linkonly = true
+$   if f$locate("LOPTS=",cparm) .lt. f$length(cparm)
+$   then
+$     start = f$locate("=",cparm) + 1
+$     len   = f$length(cparm) - start
+$     lopts = lopts + f$extract(start,len,cparm)
+$   endif
+$   if f$locate("CC=",cparm) .lt. f$length(cparm)
+$   then
+$     start  = f$locate("=",cparm) + 1
+$     len    = f$length(cparm) - start
+$     cc_com = f$extract(start,len,cparm)
+      if (cc_com .nes. "DECC") .and. -
+         (cc_com .nes. "VAXC") .and. -
+         (cc_com .nes. "GNUC")
+$     then
+$       write sys$output "Unsupported compiler choice ''cc_com' ignored"
+$       write sys$output "Use DECC, VAXC, or GNUC instead"
+$     else
+$       if cc_com .eqs. "DECC" then its_decc = true
+$       if cc_com .eqs. "VAXC" then its_vaxc = true
+$       if cc_com .eqs. "GNUC" then its_gnuc = true
+$     endif
+$   endif
+$   if f$locate("MAKE=",cparm) .lt. f$length(cparm)
+$   then
+$     start  = f$locate("=",cparm) + 1
+$     len    = f$length(cparm) - start
+$     mmks = f$extract(start,len,cparm)
+$     if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS")
+$     then
+$       make = mmks
+$     else
+$       write sys$output "Unsupported make choice ''mmks' ignored"
+$       write sys$output "Use MMK or MMS instead"
+$     endif
+$   endif
+$   i = i + 1
+$   goto opt_loop
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Look for the compiler used
+$!
+$CHECK_COMPILER:
+$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))
+$ then
+$   its_decc = (f$search("SYS$SYSTEM:DECC$COMPILER.EXE") .nes. "")
+$   its_vaxc = .not. its_decc .and. (F$Search("SYS$System:VAXC.Exe") .nes. "")
+$   its_gnuc = .not. (its_decc .or. its_vaxc) .and. (f$trnlnm("gnu_cc") .nes. "")
+$ endif
+$!
+$! Exit if no compiler available
+$!
+$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))
+$ then goto CC_ERR
+$ else
+$   if its_decc then write sys$output "CC compiler check ... Compaq C"
+$   if its_vaxc then write sys$output "CC compiler check ... VAX C"
+$   if its_gnuc then write sys$output "CC compiler check ... GNU C"
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! If MMS/MMK are available dump out the descrip.mms if required
+$!
+$CREA_MMS:
+$ write sys$output "Creating descrip.mms..."
+$ create descrip.mms
+$ open/append out descrip.mms
+$ copy sys$input: out
+$ deck
+# descrip.mms: MMS description file for building zlib on VMS
+# written by Martin P.J. Zinser
+# <zinser@zinser.no-ip.info or zinser@sysdev.deutsche-boerse.com>
+
+OBJS = adler32.obj, compress.obj, crc32.obj, gzio.obj, uncompr.obj, infback.obj\
+       deflate.obj, trees.obj, zutil.obj, inflate.obj, \
+       inftrees.obj, inffast.obj
+
+$ eod
+$ write out "CFLAGS=", ccopt
+$ write out "LOPTS=", lopts
+$ copy sys$input: out
+$ deck
+
+all : example.exe minigzip.exe libz.olb
+        @ write sys$output " Example applications available"
+
+libz.olb : libz.olb($(OBJS))
+        @ write sys$output " libz available"
+
+example.exe : example.obj libz.olb
+              link $(LOPTS) example,libz.olb/lib
+
+minigzip.exe : minigzip.obj libz.olb
+              link $(LOPTS) minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib
+
+clean :
+        delete *.obj;*,libz.olb;*,*.opt;*,*.exe;*
+
+
+# Other dependencies.
+adler32.obj  : adler32.c zutil.h zlib.h zconf.h
+compress.obj : compress.c zlib.h zconf.h
+crc32.obj    : crc32.c zutil.h zlib.h zconf.h
+deflate.obj  : deflate.c deflate.h zutil.h zlib.h zconf.h
+example.obj  : example.c zlib.h zconf.h
+gzio.obj     : gzio.c zutil.h zlib.h zconf.h
+inffast.obj  : inffast.c zutil.h zlib.h zconf.h inftrees.h inffast.h
+inflate.obj  : inflate.c zutil.h zlib.h zconf.h
+inftrees.obj : inftrees.c zutil.h zlib.h zconf.h inftrees.h
+minigzip.obj : minigzip.c zlib.h zconf.h
+trees.obj    : trees.c deflate.h zutil.h zlib.h zconf.h
+uncompr.obj  : uncompr.c zlib.h zconf.h
+zutil.obj    : zutil.c zutil.h zlib.h zconf.h
+infback.obj  : infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h
+$ eod
+$ close out
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Read list of core library sources from makefile.in and create options
+$! needed to build shareable image
+$!
+$CREA_OLIST:
+$ open/read min makefile.in
+$ open/write mod modules.opt
+$ src_check = "OBJS ="
+$MRLOOP:
+$ read/end=mrdone min rec
+$ if (f$extract(0,6,rec) .nes. src_check) then goto mrloop
+$ rec = rec - src_check
+$ gosub extra_filnam
+$ if (f$element(1,"\",rec) .eqs. "\") then goto mrdone
+$MRSLOOP:
+$ read/end=mrdone min rec
+$ gosub extra_filnam
+$ if (f$element(1,"\",rec) .nes. "\") then goto mrsloop
+$MRDONE:
+$ close min
+$ close mod
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Take record extracted in crea_olist and split it into single filenames
+$!
+$EXTRA_FILNAM:
+$ myrec = f$edit(rec - "\", "trim,compress")
+$ i = 0
+$FELOOP:
+$ srcfil = f$element(i," ", myrec)
+$ if (srcfil .nes. " ")
+$ then
+$   write mod f$parse(srcfil,,,"NAME"), ".obj"
+$   i = i + 1
+$   goto feloop
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Find current Zlib version number
+$!
+$FIND_VERSION:
+$ open/read h_in 'v_file'
+$hloop:
+$ read/end=hdone h_in rec
+$ rec = f$edit(rec,"TRIM")
+$ if (f$extract(0,1,rec) .nes. "#") then goto hloop
+$ rec = f$edit(rec - "#", "TRIM")
+$ if f$element(0," ",rec) .nes. "define" then goto hloop
+$ if f$element(1," ",rec) .eqs. v_string
+$ then
+$   version = 'f$element(2," ",rec)'
+$   goto hdone
+$ endif
+$ goto hloop
+$hdone:
+$ close h_in
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Analyze Object files for OpenVMS AXP to extract Procedure and Data
+$! information to build a symbol vector for a shareable image
+$! All the "brains" of this logic was suggested by Hartmut Becker
+$! (Hartmut.Becker@compaq.com). All the bugs were introduced by me
+$! (zinser@decus.de), so if you do have problem reports please do not
+$! bother Hartmut/HP, but get in touch with me
+$!
+$ ANAL_OBJ_AXP: Subroutine
+$ V = 'F$Verify(0)
+$ SAY := "WRITE_ SYS$OUTPUT"
+$
+$ IF F$SEARCH("''P1'") .EQS. ""
+$ THEN
+$    SAY "ANAL_OBJ_AXP-E-NOSUCHFILE:  Error, inputfile ''p1' not available"
+$    goto exit_aa
+$ ENDIF
+$ IF "''P2'" .EQS. ""
+$ THEN
+$    SAY "ANAL_OBJ_AXP:  Error, no output file provided"
+$    goto exit_aa
+$ ENDIF
+$
+$ open/read in 'p1
+$ create a.tmp
+$ open/append atmp a.tmp
+$ loop:
+$ read/end=end_loop in line
+$ f= f$search(line)
+$ if f .eqs. ""
+$ then
+$       write sys$output "ANAL_OBJ_AXP-w-nosuchfile, ''line'"
+$       goto loop
+$ endif
+$ define/user sys$output nl:
+$ define/user sys$error nl:
+$ anal/obj/gsd 'f /out=x.tmp
+$ open/read xtmp x.tmp
+$ XLOOP:
+$ read/end=end_xloop xtmp xline
+$ xline = f$edit(xline,"compress")
+$ write atmp xline
+$ goto xloop
+$ END_XLOOP:
+$ close xtmp
+$ goto loop
+$ end_loop:
+$ close in
+$ close atmp
+$ if f$search("a.tmp") .eqs. "" -
+        then $ exit
+$ ! all global definitions
+$ search a.tmp "symbol:","EGSY$V_DEF 1","EGSY$V_NORM 1"/out=b.tmp
+$ ! all procedures
+$ search b.tmp "EGSY$V_NORM 1"/wind=(0,1) /out=c.tmp
+$ search c.tmp "symbol:"/out=d.tmp
+$ define/user sys$output nl:
+$ edito/edt/command=sys$input d.tmp
+sub/symbol: "/symbol_vector=(/whole
+sub/"/=PROCEDURE)/whole
+exit
+$ ! all data
+$ search b.tmp "EGSY$V_DEF 1"/wind=(0,1) /out=e.tmp
+$ search e.tmp "symbol:"/out=f.tmp
+$ define/user sys$output nl:
+$ edito/edt/command=sys$input f.tmp
+sub/symbol: "/symbol_vector=(/whole
+sub/"/=DATA)/whole
+exit
+$ sort/nodupl d.tmp,f.tmp 'p2'
+$ delete a.tmp;*,b.tmp;*,c.tmp;*,d.tmp;*,e.tmp;*,f.tmp;*
+$ if f$search("x.tmp") .nes. "" -
+        then $ delete x.tmp;*
+$!
+$ EXIT_AA:
+$ if V then set verify
+$ endsubroutine
+$!------------------------------------------------------------------------------
diff --git a/utils/zenutils/libraries/zlib123/zlib/minigzip.c b/utils/zenutils/libraries/zlib123/zlib/minigzip.c
index 41996dbc9a..4524b96a1d 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/minigzip.c
+++ b/utils/zenutils/libraries/zlib123/zlib/minigzip.c
@@ -1,322 +1,322 @@
-/* minigzip.c -- simulate gzip using the zlib compression library

- * Copyright (C) 1995-2005 Jean-loup Gailly.

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/*

- * minigzip is a minimal implementation of the gzip utility. This is

- * only an example of using zlib and isn't meant to replace the

- * full-featured gzip. No attempt is made to deal with file systems

- * limiting names to 14 or 8+3 characters, etc... Error checking is

- * very limited. So use minigzip only for testing; use gzip for the

- * real thing. On MSDOS, use only on file names without extension

- * or in pipe mode.

- */

-

-/* @(#) $Id$ */

-

-#include <stdio.h>

-#include "zlib.h"

-

-#ifdef STDC

-#  include <string.h>

-#  include <stdlib.h>

-#endif

-

-#ifdef USE_MMAP

-#  include <sys/types.h>

-#  include <sys/mman.h>

-#  include <sys/stat.h>

-#endif

-

-#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)

-#  include <fcntl.h>

-#  include <io.h>

-#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)

-#else

-#  define SET_BINARY_MODE(file)

-#endif

-

-#ifdef VMS

-#  define unlink delete

-#  define GZ_SUFFIX "-gz"

-#endif

-#ifdef RISCOS

-#  define unlink remove

-#  define GZ_SUFFIX "-gz"

-#  define fileno(file) file->__file

-#endif

-#if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os

-#  include <unix.h> /* for fileno */

-#endif

-

-#ifndef WIN32 /* unlink already in stdio.h for WIN32 */

-  extern int unlink OF((const char *));

-#endif

-

-#ifndef GZ_SUFFIX

-#  define GZ_SUFFIX ".gz"

-#endif

-#define SUFFIX_LEN (sizeof(GZ_SUFFIX)-1)

-

-#define BUFLEN      16384

-#define MAX_NAME_LEN 1024

-

-#ifdef MAXSEG_64K

-#  define local static

-   /* Needed for systems with limitation on stack size. */

-#else

-#  define local

-#endif

-

-char *prog;

-

-void error            OF((const char *msg));

-void gz_compress      OF((FILE   *in, gzFile out));

-#ifdef USE_MMAP

-int  gz_compress_mmap OF((FILE   *in, gzFile out));

-#endif

-void gz_uncompress    OF((gzFile in, FILE   *out));

-void file_compress    OF((char  *file, char *mode));

-void file_uncompress  OF((char  *file));

-int  main             OF((int argc, char *argv[]));

-

-/* ===========================================================================

- * Display error message and exit

- */

-void error(msg)

-    const char *msg;

-{

-    fprintf(stderr, "%s: %s\n", prog, msg);

-    exit(1);

-}

-

-/* ===========================================================================

- * Compress input to output then close both files.

- */

-

-void gz_compress(in, out)

-    FILE   *in;

-    gzFile out;

-{

-    local char buf[BUFLEN];

-    int len;

-    int err;

-

-#ifdef USE_MMAP

-    /* Try first compressing with mmap. If mmap fails (minigzip used in a

-     * pipe), use the normal fread loop.

-     */

-    if (gz_compress_mmap(in, out) == Z_OK) return;

-#endif

-    for (;;) {

-        len = (int)fread(buf, 1, sizeof(buf), in);

-        if (ferror(in)) {

-            perror("fread");

-            exit(1);

-        }

-        if (len == 0) break;

-

-        if (gzwrite(out, buf, (unsigned)len) != len) error(gzerror(out, &err));

-    }

-    fclose(in);

-    if (gzclose(out) != Z_OK) error("failed gzclose");

-}

-

-#ifdef USE_MMAP /* MMAP version, Miguel Albrecht <malbrech@eso.org> */

-

-/* Try compressing the input file at once using mmap. Return Z_OK if

- * if success, Z_ERRNO otherwise.

- */

-int gz_compress_mmap(in, out)

-    FILE   *in;

-    gzFile out;

-{

-    int len;

-    int err;

-    int ifd = fileno(in);

-    caddr_t buf;    /* mmap'ed buffer for the entire input file */

-    off_t buf_len;  /* length of the input file */

-    struct stat sb;

-

-    /* Determine the size of the file, needed for mmap: */

-    if (fstat(ifd, &sb) < 0) return Z_ERRNO;

-    buf_len = sb.st_size;

-    if (buf_len <= 0) return Z_ERRNO;

-

-    /* Now do the actual mmap: */

-    buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0);

-    if (buf == (caddr_t)(-1)) return Z_ERRNO;

-

-    /* Compress the whole file at once: */

-    len = gzwrite(out, (char *)buf, (unsigned)buf_len);

-

-    if (len != (int)buf_len) error(gzerror(out, &err));

-

-    munmap(buf, buf_len);

-    fclose(in);

-    if (gzclose(out) != Z_OK) error("failed gzclose");

-    return Z_OK;

-}

-#endif /* USE_MMAP */

-

-/* ===========================================================================

- * Uncompress input to output then close both files.

- */

-void gz_uncompress(in, out)

-    gzFile in;

-    FILE   *out;

-{

-    local char buf[BUFLEN];

-    int len;

-    int err;

-

-    for (;;) {

-        len = gzread(in, buf, sizeof(buf));

-        if (len < 0) error (gzerror(in, &err));

-        if (len == 0) break;

-

-        if ((int)fwrite(buf, 1, (unsigned)len, out) != len) {

-            error("failed fwrite");

-        }

-    }

-    if (fclose(out)) error("failed fclose");

-

-    if (gzclose(in) != Z_OK) error("failed gzclose");

-}

-

-

-/* ===========================================================================

- * Compress the given file: create a corresponding .gz file and remove the

- * original.

- */

-void file_compress(file, mode)

-    char  *file;

-    char  *mode;

-{

-    local char outfile[MAX_NAME_LEN];

-    FILE  *in;

-    gzFile out;

-

-    strcpy(outfile, file);

-    strcat(outfile, GZ_SUFFIX);

-

-    in = fopen(file, "rb");

-    if (in == NULL) {

-        perror(file);

-        exit(1);

-    }

-    out = gzopen(outfile, mode);

-    if (out == NULL) {

-        fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);

-        exit(1);

-    }

-    gz_compress(in, out);

-

-    unlink(file);

-}

-

-

-/* ===========================================================================

- * Uncompress the given file and remove the original.

- */

-void file_uncompress(file)

-    char  *file;

-{

-    local char buf[MAX_NAME_LEN];

-    char *infile, *outfile;

-    FILE  *out;

-    gzFile in;

-    uInt len = (uInt)strlen(file);

-

-    strcpy(buf, file);

-

-    if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {

-        infile = file;

-        outfile = buf;

-        outfile[len-3] = '\0';

-    } else {

-        outfile = file;

-        infile = buf;

-        strcat(infile, GZ_SUFFIX);

-    }

-    in = gzopen(infile, "rb");

-    if (in == NULL) {

-        fprintf(stderr, "%s: can't gzopen %s\n", prog, infile);

-        exit(1);

-    }

-    out = fopen(outfile, "wb");

-    if (out == NULL) {

-        perror(file);

-        exit(1);

-    }

-

-    gz_uncompress(in, out);

-

-    unlink(infile);

-}

-

-

-/* ===========================================================================

- * Usage:  minigzip [-d] [-f] [-h] [-r] [-1 to -9] [files...]

- *   -d : decompress

- *   -f : compress with Z_FILTERED

- *   -h : compress with Z_HUFFMAN_ONLY

- *   -r : compress with Z_RLE

- *   -1 to -9 : compression level

- */

-

-int main(argc, argv)

-    int argc;

-    char *argv[];

-{

-    int uncompr = 0;

-    gzFile file;

-    char outmode[20];

-

-    strcpy(outmode, "wb6 ");

-

-    prog = argv[0];

-    argc--, argv++;

-

-    while (argc > 0) {

-      if (strcmp(*argv, "-d") == 0)

-        uncompr = 1;

-      else if (strcmp(*argv, "-f") == 0)

-        outmode[3] = 'f';

-      else if (strcmp(*argv, "-h") == 0)

-        outmode[3] = 'h';

-      else if (strcmp(*argv, "-r") == 0)

-        outmode[3] = 'R';

-      else if ((*argv)[0] == '-' && (*argv)[1] >= '1' && (*argv)[1] <= '9' &&

-               (*argv)[2] == 0)

-        outmode[2] = (*argv)[1];

-      else

-        break;

-      argc--, argv++;

-    }

-    if (outmode[3] == ' ')

-        outmode[3] = 0;

-    if (argc == 0) {

-        SET_BINARY_MODE(stdin);

-        SET_BINARY_MODE(stdout);

-        if (uncompr) {

-            file = gzdopen(fileno(stdin), "rb");

-            if (file == NULL) error("can't gzdopen stdin");

-            gz_uncompress(file, stdout);

-        } else {

-            file = gzdopen(fileno(stdout), outmode);

-            if (file == NULL) error("can't gzdopen stdout");

-            gz_compress(stdin, file);

-        }

-    } else {

-        do {

-            if (uncompr) {

-                file_uncompress(*argv);

-            } else {

-                file_compress(*argv, outmode);

-            }

-        } while (argv++, --argc);

-    }

-    return 0;

-}

+/* minigzip.c -- simulate gzip using the zlib compression library
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * minigzip is a minimal implementation of the gzip utility. This is
+ * only an example of using zlib and isn't meant to replace the
+ * full-featured gzip. No attempt is made to deal with file systems
+ * limiting names to 14 or 8+3 characters, etc... Error checking is
+ * very limited. So use minigzip only for testing; use gzip for the
+ * real thing. On MSDOS, use only on file names without extension
+ * or in pipe mode.
+ */
+
+/* @(#) $Id$ */
+
+#include <stdio.h>
+#include "zlib.h"
+
+#ifdef STDC
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+
+#ifdef USE_MMAP
+#  include <sys/types.h>
+#  include <sys/mman.h>
+#  include <sys/stat.h>
+#endif
+
+#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)
+#  include <fcntl.h>
+#  include <io.h>
+#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
+#else
+#  define SET_BINARY_MODE(file)
+#endif
+
+#ifdef VMS
+#  define unlink delete
+#  define GZ_SUFFIX "-gz"
+#endif
+#ifdef RISCOS
+#  define unlink remove
+#  define GZ_SUFFIX "-gz"
+#  define fileno(file) file->__file
+#endif
+#if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+#  include <unix.h> /* for fileno */
+#endif
+
+#ifndef WIN32 /* unlink already in stdio.h for WIN32 */
+  extern int unlink OF((const char *));
+#endif
+
+#ifndef GZ_SUFFIX
+#  define GZ_SUFFIX ".gz"
+#endif
+#define SUFFIX_LEN (sizeof(GZ_SUFFIX)-1)
+
+#define BUFLEN      16384
+#define MAX_NAME_LEN 1024
+
+#ifdef MAXSEG_64K
+#  define local static
+   /* Needed for systems with limitation on stack size. */
+#else
+#  define local
+#endif
+
+char *prog;
+
+void error            OF((const char *msg));
+void gz_compress      OF((FILE   *in, gzFile out));
+#ifdef USE_MMAP
+int  gz_compress_mmap OF((FILE   *in, gzFile out));
+#endif
+void gz_uncompress    OF((gzFile in, FILE   *out));
+void file_compress    OF((char  *file, char *mode));
+void file_uncompress  OF((char  *file));
+int  main             OF((int argc, char *argv[]));
+
+/* ===========================================================================
+ * Display error message and exit
+ */
+void error(msg)
+    const char *msg;
+{
+    fprintf(stderr, "%s: %s\n", prog, msg);
+    exit(1);
+}
+
+/* ===========================================================================
+ * Compress input to output then close both files.
+ */
+
+void gz_compress(in, out)
+    FILE   *in;
+    gzFile out;
+{
+    local char buf[BUFLEN];
+    int len;
+    int err;
+
+#ifdef USE_MMAP
+    /* Try first compressing with mmap. If mmap fails (minigzip used in a
+     * pipe), use the normal fread loop.
+     */
+    if (gz_compress_mmap(in, out) == Z_OK) return;
+#endif
+    for (;;) {
+        len = (int)fread(buf, 1, sizeof(buf), in);
+        if (ferror(in)) {
+            perror("fread");
+            exit(1);
+        }
+        if (len == 0) break;
+
+        if (gzwrite(out, buf, (unsigned)len) != len) error(gzerror(out, &err));
+    }
+    fclose(in);
+    if (gzclose(out) != Z_OK) error("failed gzclose");
+}
+
+#ifdef USE_MMAP /* MMAP version, Miguel Albrecht <malbrech@eso.org> */
+
+/* Try compressing the input file at once using mmap. Return Z_OK if
+ * if success, Z_ERRNO otherwise.
+ */
+int gz_compress_mmap(in, out)
+    FILE   *in;
+    gzFile out;
+{
+    int len;
+    int err;
+    int ifd = fileno(in);
+    caddr_t buf;    /* mmap'ed buffer for the entire input file */
+    off_t buf_len;  /* length of the input file */
+    struct stat sb;
+
+    /* Determine the size of the file, needed for mmap: */
+    if (fstat(ifd, &sb) < 0) return Z_ERRNO;
+    buf_len = sb.st_size;
+    if (buf_len <= 0) return Z_ERRNO;
+
+    /* Now do the actual mmap: */
+    buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0);
+    if (buf == (caddr_t)(-1)) return Z_ERRNO;
+
+    /* Compress the whole file at once: */
+    len = gzwrite(out, (char *)buf, (unsigned)buf_len);
+
+    if (len != (int)buf_len) error(gzerror(out, &err));
+
+    munmap(buf, buf_len);
+    fclose(in);
+    if (gzclose(out) != Z_OK) error("failed gzclose");
+    return Z_OK;
+}
+#endif /* USE_MMAP */
+
+/* ===========================================================================
+ * Uncompress input to output then close both files.
+ */
+void gz_uncompress(in, out)
+    gzFile in;
+    FILE   *out;
+{
+    local char buf[BUFLEN];
+    int len;
+    int err;
+
+    for (;;) {
+        len = gzread(in, buf, sizeof(buf));
+        if (len < 0) error (gzerror(in, &err));
+        if (len == 0) break;
+
+        if ((int)fwrite(buf, 1, (unsigned)len, out) != len) {
+            error("failed fwrite");
+        }
+    }
+    if (fclose(out)) error("failed fclose");
+
+    if (gzclose(in) != Z_OK) error("failed gzclose");
+}
+
+
+/* ===========================================================================
+ * Compress the given file: create a corresponding .gz file and remove the
+ * original.
+ */
+void file_compress(file, mode)
+    char  *file;
+    char  *mode;
+{
+    local char outfile[MAX_NAME_LEN];
+    FILE  *in;
+    gzFile out;
+
+    strcpy(outfile, file);
+    strcat(outfile, GZ_SUFFIX);
+
+    in = fopen(file, "rb");
+    if (in == NULL) {
+        perror(file);
+        exit(1);
+    }
+    out = gzopen(outfile, mode);
+    if (out == NULL) {
+        fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
+        exit(1);
+    }
+    gz_compress(in, out);
+
+    unlink(file);
+}
+
+
+/* ===========================================================================
+ * Uncompress the given file and remove the original.
+ */
+void file_uncompress(file)
+    char  *file;
+{
+    local char buf[MAX_NAME_LEN];
+    char *infile, *outfile;
+    FILE  *out;
+    gzFile in;
+    uInt len = (uInt)strlen(file);
+
+    strcpy(buf, file);
+
+    if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {
+        infile = file;
+        outfile = buf;
+        outfile[len-3] = '\0';
+    } else {
+        outfile = file;
+        infile = buf;
+        strcat(infile, GZ_SUFFIX);
+    }
+    in = gzopen(infile, "rb");
+    if (in == NULL) {
+        fprintf(stderr, "%s: can't gzopen %s\n", prog, infile);
+        exit(1);
+    }
+    out = fopen(outfile, "wb");
+    if (out == NULL) {
+        perror(file);
+        exit(1);
+    }
+
+    gz_uncompress(in, out);
+
+    unlink(infile);
+}
+
+
+/* ===========================================================================
+ * Usage:  minigzip [-d] [-f] [-h] [-r] [-1 to -9] [files...]
+ *   -d : decompress
+ *   -f : compress with Z_FILTERED
+ *   -h : compress with Z_HUFFMAN_ONLY
+ *   -r : compress with Z_RLE
+ *   -1 to -9 : compression level
+ */
+
+int main(argc, argv)
+    int argc;
+    char *argv[];
+{
+    int uncompr = 0;
+    gzFile file;
+    char outmode[20];
+
+    strcpy(outmode, "wb6 ");
+
+    prog = argv[0];
+    argc--, argv++;
+
+    while (argc > 0) {
+      if (strcmp(*argv, "-d") == 0)
+        uncompr = 1;
+      else if (strcmp(*argv, "-f") == 0)
+        outmode[3] = 'f';
+      else if (strcmp(*argv, "-h") == 0)
+        outmode[3] = 'h';
+      else if (strcmp(*argv, "-r") == 0)
+        outmode[3] = 'R';
+      else if ((*argv)[0] == '-' && (*argv)[1] >= '1' && (*argv)[1] <= '9' &&
+               (*argv)[2] == 0)
+        outmode[2] = (*argv)[1];
+      else
+        break;
+      argc--, argv++;
+    }
+    if (outmode[3] == ' ')
+        outmode[3] = 0;
+    if (argc == 0) {
+        SET_BINARY_MODE(stdin);
+        SET_BINARY_MODE(stdout);
+        if (uncompr) {
+            file = gzdopen(fileno(stdin), "rb");
+            if (file == NULL) error("can't gzdopen stdin");
+            gz_uncompress(file, stdout);
+        } else {
+            file = gzdopen(fileno(stdout), outmode);
+            if (file == NULL) error("can't gzdopen stdout");
+            gz_compress(stdin, file);
+        }
+    } else {
+        do {
+            if (uncompr) {
+                file_uncompress(*argv);
+            } else {
+                file_compress(*argv, outmode);
+            }
+        } while (argv++, --argc);
+    }
+    return 0;
+}
diff --git a/utils/zenutils/libraries/zlib123/zlib/trees.c b/utils/zenutils/libraries/zlib123/zlib/trees.c
index 7a04802862..395e4e1681 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/trees.c
+++ b/utils/zenutils/libraries/zlib123/zlib/trees.c
@@ -1,1219 +1,1219 @@
-/* trees.c -- output deflated data using Huffman coding

- * Copyright (C) 1995-2005 Jean-loup Gailly

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/*

- *  ALGORITHM

- *

- *      The "deflation" process uses several Huffman trees. The more

- *      common source values are represented by shorter bit sequences.

- *

- *      Each code tree is stored in a compressed form which is itself

- * a Huffman encoding of the lengths of all the code strings (in

- * ascending order by source values).  The actual code strings are

- * reconstructed from the lengths in the inflate process, as described

- * in the deflate specification.

- *

- *  REFERENCES

- *

- *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".

- *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc

- *

- *      Storer, James A.

- *          Data Compression:  Methods and Theory, pp. 49-50.

- *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.

- *

- *      Sedgewick, R.

- *          Algorithms, p290.

- *          Addison-Wesley, 1983. ISBN 0-201-06672-6.

- */

-

-/* @(#) $Id$ */

-

-/* #define GEN_TREES_H */

-

-#include "deflate.h"

-

-#ifdef DEBUG

-#  include <ctype.h>

-#endif

-

-/* ===========================================================================

- * Constants

- */

-

-#define MAX_BL_BITS 7

-/* Bit length codes must not exceed MAX_BL_BITS bits */

-

-#define END_BLOCK 256

-/* end of block literal code */

-

-#define REP_3_6      16

-/* repeat previous bit length 3-6 times (2 bits of repeat count) */

-

-#define REPZ_3_10    17

-/* repeat a zero length 3-10 times  (3 bits of repeat count) */

-

-#define REPZ_11_138  18

-/* repeat a zero length 11-138 times  (7 bits of repeat count) */

-

-local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */

-   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};

-

-local const int extra_dbits[D_CODES] /* extra bits for each distance code */

-   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};

-

-local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */

-   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};

-

-local const uch bl_order[BL_CODES]

-   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};

-/* The lengths of the bit length codes are sent in order of decreasing

- * probability, to avoid transmitting the lengths for unused bit length codes.

- */

-

-#define Buf_size (8 * 2*sizeof(char))

-/* Number of bits used within bi_buf. (bi_buf might be implemented on

- * more than 16 bits on some systems.)

- */

-

-/* ===========================================================================

- * Local data. These are initialized only once.

- */

-

-#define DIST_CODE_LEN  512 /* see definition of array dist_code below */

-

-#if defined(GEN_TREES_H) || !defined(STDC)

-/* non ANSI compilers may not accept trees.h */

-

-local ct_data static_ltree[L_CODES+2];

-/* The static literal tree. Since the bit lengths are imposed, there is no

- * need for the L_CODES extra codes used during heap construction. However

- * The codes 286 and 287 are needed to build a canonical tree (see _tr_init

- * below).

- */

-

-local ct_data static_dtree[D_CODES];

-/* The static distance tree. (Actually a trivial tree since all codes use

- * 5 bits.)

- */

-

-uch _dist_code[DIST_CODE_LEN];

-/* Distance codes. The first 256 values correspond to the distances

- * 3 .. 258, the last 256 values correspond to the top 8 bits of

- * the 15 bit distances.

- */

-

-uch _length_code[MAX_MATCH-MIN_MATCH+1];

-/* length code for each normalized match length (0 == MIN_MATCH) */

-

-local int base_length[LENGTH_CODES];

-/* First normalized length for each code (0 = MIN_MATCH) */

-

-local int base_dist[D_CODES];

-/* First normalized distance for each code (0 = distance of 1) */

-

-#else

-#  include "trees.h"

-#endif /* GEN_TREES_H */

-

-struct static_tree_desc_s {

-    const ct_data *static_tree;  /* static tree or NULL */

-    const intf *extra_bits;      /* extra bits for each code or NULL */

-    int     extra_base;          /* base index for extra_bits */

-    int     elems;               /* max number of elements in the tree */

-    int     max_length;          /* max bit length for the codes */

-};

-

-local static_tree_desc  static_l_desc =

-{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};

-

-local static_tree_desc  static_d_desc =

-{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};

-

-local static_tree_desc  static_bl_desc =

-{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};

-

-/* ===========================================================================

- * Local (static) routines in this file.

- */

-

-local void tr_static_init OF((void));

-local void init_block     OF((deflate_state *s));

-local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));

-local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));

-local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));

-local void build_tree     OF((deflate_state *s, tree_desc *desc));

-local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));

-local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));

-local int  build_bl_tree  OF((deflate_state *s));

-local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,

-                              int blcodes));

-local void compress_block OF((deflate_state *s, ct_data *ltree,

-                              ct_data *dtree));

-local void set_data_type  OF((deflate_state *s));

-local unsigned bi_reverse OF((unsigned value, int length));

-local void bi_windup      OF((deflate_state *s));

-local void bi_flush       OF((deflate_state *s));

-local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,

-                              int header));

-

-#ifdef GEN_TREES_H

-local void gen_trees_header OF((void));

-#endif

-

-#ifndef DEBUG

-#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)

-   /* Send a code of the given tree. c and tree must not have side effects */

-

-#else /* DEBUG */

-#  define send_code(s, c, tree) \

-     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \

-       send_bits(s, tree[c].Code, tree[c].Len); }

-#endif

-

-/* ===========================================================================

- * Output a short LSB first on the stream.

- * IN assertion: there is enough room in pendingBuf.

- */

-#define put_short(s, w) { \

-    put_byte(s, (uch)((w) & 0xff)); \

-    put_byte(s, (uch)((ush)(w) >> 8)); \

-}

-

-/* ===========================================================================

- * Send a value on a given number of bits.

- * IN assertion: length <= 16 and value fits in length bits.

- */

-#ifdef DEBUG

-local void send_bits      OF((deflate_state *s, int value, int length));

-

-local void send_bits(s, value, length)

-    deflate_state *s;

-    int value;  /* value to send */

-    int length; /* number of bits */

-{

-    Tracevv((stderr," l %2d v %4x ", length, value));

-    Assert(length > 0 && length <= 15, "invalid length");

-    s->bits_sent += (ulg)length;

-

-    /* If not enough room in bi_buf, use (valid) bits from bi_buf and

-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))

-     * unused bits in value.

-     */

-    if (s->bi_valid > (int)Buf_size - length) {

-        s->bi_buf |= (value << s->bi_valid);

-        put_short(s, s->bi_buf);

-        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);

-        s->bi_valid += length - Buf_size;

-    } else {

-        s->bi_buf |= value << s->bi_valid;

-        s->bi_valid += length;

-    }

-}

-#else /* !DEBUG */

-

-#define send_bits(s, value, length) \

-{ int len = length;\

-  if (s->bi_valid > (int)Buf_size - len) {\

-    int val = value;\

-    s->bi_buf |= (val << s->bi_valid);\

-    put_short(s, s->bi_buf);\

-    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\

-    s->bi_valid += len - Buf_size;\

-  } else {\

-    s->bi_buf |= (value) << s->bi_valid;\

-    s->bi_valid += len;\

-  }\

-}

-#endif /* DEBUG */

-

-

-/* the arguments must not have side effects */

-

-/* ===========================================================================

- * Initialize the various 'constant' tables.

- */

-local void tr_static_init()

-{

-#if defined(GEN_TREES_H) || !defined(STDC)

-    static int static_init_done = 0;

-    int n;        /* iterates over tree elements */

-    int bits;     /* bit counter */

-    int length;   /* length value */

-    int code;     /* code value */

-    int dist;     /* distance index */

-    ush bl_count[MAX_BITS+1];

-    /* number of codes at each bit length for an optimal tree */

-

-    if (static_init_done) return;

-

-    /* For some embedded targets, global variables are not initialized: */

-    static_l_desc.static_tree = static_ltree;

-    static_l_desc.extra_bits = extra_lbits;

-    static_d_desc.static_tree = static_dtree;

-    static_d_desc.extra_bits = extra_dbits;

-    static_bl_desc.extra_bits = extra_blbits;

-

-    /* Initialize the mapping length (0..255) -> length code (0..28) */

-    length = 0;

-    for (code = 0; code < LENGTH_CODES-1; code++) {

-        base_length[code] = length;

-        for (n = 0; n < (1<<extra_lbits[code]); n++) {

-            _length_code[length++] = (uch)code;

-        }

-    }

-    Assert (length == 256, "tr_static_init: length != 256");

-    /* Note that the length 255 (match length 258) can be represented

-     * in two different ways: code 284 + 5 bits or code 285, so we

-     * overwrite length_code[255] to use the best encoding:

-     */

-    _length_code[length-1] = (uch)code;

-

-    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */

-    dist = 0;

-    for (code = 0 ; code < 16; code++) {

-        base_dist[code] = dist;

-        for (n = 0; n < (1<<extra_dbits[code]); n++) {

-            _dist_code[dist++] = (uch)code;

-        }

-    }

-    Assert (dist == 256, "tr_static_init: dist != 256");

-    dist >>= 7; /* from now on, all distances are divided by 128 */

-    for ( ; code < D_CODES; code++) {

-        base_dist[code] = dist << 7;

-        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {

-            _dist_code[256 + dist++] = (uch)code;

-        }

-    }

-    Assert (dist == 256, "tr_static_init: 256+dist != 512");

-

-    /* Construct the codes of the static literal tree */

-    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;

-    n = 0;

-    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;

-    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;

-    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;

-    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;

-    /* Codes 286 and 287 do not exist, but we must include them in the

-     * tree construction to get a canonical Huffman tree (longest code

-     * all ones)

-     */

-    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);

-

-    /* The static distance tree is trivial: */

-    for (n = 0; n < D_CODES; n++) {

-        static_dtree[n].Len = 5;

-        static_dtree[n].Code = bi_reverse((unsigned)n, 5);

-    }

-    static_init_done = 1;

-

-#  ifdef GEN_TREES_H

-    gen_trees_header();

-#  endif

-#endif /* defined(GEN_TREES_H) || !defined(STDC) */

-}

-

-/* ===========================================================================

- * Genererate the file trees.h describing the static trees.

- */

-#ifdef GEN_TREES_H

-#  ifndef DEBUG

-#    include <stdio.h>

-#  endif

-

-#  define SEPARATOR(i, last, width) \

-      ((i) == (last)? "\n};\n\n" :    \

-       ((i) % (width) == (width)-1 ? ",\n" : ", "))

-

-void gen_trees_header()

-{

-    FILE *header = fopen("trees.h", "w");

-    int i;

-

-    Assert (header != NULL, "Can't open trees.h");

-    fprintf(header,

-            "/* header created automatically with -DGEN_TREES_H */\n\n");

-

-    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");

-    for (i = 0; i < L_CODES+2; i++) {

-        fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,

-                static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));

-    }

-

-    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");

-    for (i = 0; i < D_CODES; i++) {

-        fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,

-                static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));

-    }

-

-    fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");

-    for (i = 0; i < DIST_CODE_LEN; i++) {

-        fprintf(header, "%2u%s", _dist_code[i],

-                SEPARATOR(i, DIST_CODE_LEN-1, 20));

-    }

-

-    fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");

-    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {

-        fprintf(header, "%2u%s", _length_code[i],

-                SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));

-    }

-

-    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");

-    for (i = 0; i < LENGTH_CODES; i++) {

-        fprintf(header, "%1u%s", base_length[i],

-                SEPARATOR(i, LENGTH_CODES-1, 20));

-    }

-

-    fprintf(header, "local const int base_dist[D_CODES] = {\n");

-    for (i = 0; i < D_CODES; i++) {

-        fprintf(header, "%5u%s", base_dist[i],

-                SEPARATOR(i, D_CODES-1, 10));

-    }

-

-    fclose(header);

-}

-#endif /* GEN_TREES_H */

-

-/* ===========================================================================

- * Initialize the tree data structures for a new zlib stream.

- */

-void _tr_init(s)

-    deflate_state *s;

-{

-    tr_static_init();

-

-    s->l_desc.dyn_tree = s->dyn_ltree;

-    s->l_desc.stat_desc = &static_l_desc;

-

-    s->d_desc.dyn_tree = s->dyn_dtree;

-    s->d_desc.stat_desc = &static_d_desc;

-

-    s->bl_desc.dyn_tree = s->bl_tree;

-    s->bl_desc.stat_desc = &static_bl_desc;

-

-    s->bi_buf = 0;

-    s->bi_valid = 0;

-    s->last_eob_len = 8; /* enough lookahead for inflate */

-#ifdef DEBUG

-    s->compressed_len = 0L;

-    s->bits_sent = 0L;

-#endif

-

-    /* Initialize the first block of the first file: */

-    init_block(s);

-}

-

-/* ===========================================================================

- * Initialize a new block.

- */

-local void init_block(s)

-    deflate_state *s;

-{

-    int n; /* iterates over tree elements */

-

-    /* Initialize the trees. */

-    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;

-    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;

-    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;

-

-    s->dyn_ltree[END_BLOCK].Freq = 1;

-    s->opt_len = s->static_len = 0L;

-    s->last_lit = s->matches = 0;

-}

-

-#define SMALLEST 1

-/* Index within the heap array of least frequent node in the Huffman tree */

-

-

-/* ===========================================================================

- * Remove the smallest element from the heap and recreate the heap with

- * one less element. Updates heap and heap_len.

- */

-#define pqremove(s, tree, top) \

-{\

-    top = s->heap[SMALLEST]; \

-    s->heap[SMALLEST] = s->heap[s->heap_len--]; \

-    pqdownheap(s, tree, SMALLEST); \

-}

-

-/* ===========================================================================

- * Compares to subtrees, using the tree depth as tie breaker when

- * the subtrees have equal frequency. This minimizes the worst case length.

- */

-#define smaller(tree, n, m, depth) \

-   (tree[n].Freq < tree[m].Freq || \

-   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))

-

-/* ===========================================================================

- * Restore the heap property by moving down the tree starting at node k,

- * exchanging a node with the smallest of its two sons if necessary, stopping

- * when the heap property is re-established (each father smaller than its

- * two sons).

- */

-local void pqdownheap(s, tree, k)

-    deflate_state *s;

-    ct_data *tree;  /* the tree to restore */

-    int k;               /* node to move down */

-{

-    int v = s->heap[k];

-    int j = k << 1;  /* left son of k */

-    while (j <= s->heap_len) {

-        /* Set j to the smallest of the two sons: */

-        if (j < s->heap_len &&

-            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {

-            j++;

-        }

-        /* Exit if v is smaller than both sons */

-        if (smaller(tree, v, s->heap[j], s->depth)) break;

-

-        /* Exchange v with the smallest son */

-        s->heap[k] = s->heap[j];  k = j;

-

-        /* And continue down the tree, setting j to the left son of k */

-        j <<= 1;

-    }

-    s->heap[k] = v;

-}

-

-/* ===========================================================================

- * Compute the optimal bit lengths for a tree and update the total bit length

- * for the current block.

- * IN assertion: the fields freq and dad are set, heap[heap_max] and

- *    above are the tree nodes sorted by increasing frequency.

- * OUT assertions: the field len is set to the optimal bit length, the

- *     array bl_count contains the frequencies for each bit length.

- *     The length opt_len is updated; static_len is also updated if stree is

- *     not null.

- */

-local void gen_bitlen(s, desc)

-    deflate_state *s;

-    tree_desc *desc;    /* the tree descriptor */

-{

-    ct_data *tree        = desc->dyn_tree;

-    int max_code         = desc->max_code;

-    const ct_data *stree = desc->stat_desc->static_tree;

-    const intf *extra    = desc->stat_desc->extra_bits;

-    int base             = desc->stat_desc->extra_base;

-    int max_length       = desc->stat_desc->max_length;

-    int h;              /* heap index */

-    int n, m;           /* iterate over the tree elements */

-    int bits;           /* bit length */

-    int xbits;          /* extra bits */

-    ush f;              /* frequency */

-    int overflow = 0;   /* number of elements with bit length too large */

-

-    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;

-

-    /* In a first pass, compute the optimal bit lengths (which may

-     * overflow in the case of the bit length tree).

-     */

-    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */

-

-    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {

-        n = s->heap[h];

-        bits = tree[tree[n].Dad].Len + 1;

-        if (bits > max_length) bits = max_length, overflow++;

-        tree[n].Len = (ush)bits;

-        /* We overwrite tree[n].Dad which is no longer needed */

-

-        if (n > max_code) continue; /* not a leaf node */

-

-        s->bl_count[bits]++;

-        xbits = 0;

-        if (n >= base) xbits = extra[n-base];

-        f = tree[n].Freq;

-        s->opt_len += (ulg)f * (bits + xbits);

-        if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);

-    }

-    if (overflow == 0) return;

-

-    Trace((stderr,"\nbit length overflow\n"));

-    /* This happens for example on obj2 and pic of the Calgary corpus */

-

-    /* Find the first bit length which could increase: */

-    do {

-        bits = max_length-1;

-        while (s->bl_count[bits] == 0) bits--;

-        s->bl_count[bits]--;      /* move one leaf down the tree */

-        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */

-        s->bl_count[max_length]--;

-        /* The brother of the overflow item also moves one step up,

-         * but this does not affect bl_count[max_length]

-         */

-        overflow -= 2;

-    } while (overflow > 0);

-

-    /* Now recompute all bit lengths, scanning in increasing frequency.

-     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all

-     * lengths instead of fixing only the wrong ones. This idea is taken

-     * from 'ar' written by Haruhiko Okumura.)

-     */

-    for (bits = max_length; bits != 0; bits--) {

-        n = s->bl_count[bits];

-        while (n != 0) {

-            m = s->heap[--h];

-            if (m > max_code) continue;

-            if ((unsigned) tree[m].Len != (unsigned) bits) {

-                Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));

-                s->opt_len += ((long)bits - (long)tree[m].Len)

-                              *(long)tree[m].Freq;

-                tree[m].Len = (ush)bits;

-            }

-            n--;

-        }

-    }

-}

-

-/* ===========================================================================

- * Generate the codes for a given tree and bit counts (which need not be

- * optimal).

- * IN assertion: the array bl_count contains the bit length statistics for

- * the given tree and the field len is set for all tree elements.

- * OUT assertion: the field code is set for all tree elements of non

- *     zero code length.

- */

-local void gen_codes (tree, max_code, bl_count)

-    ct_data *tree;             /* the tree to decorate */

-    int max_code;              /* largest code with non zero frequency */

-    ushf *bl_count;            /* number of codes at each bit length */

-{

-    ush next_code[MAX_BITS+1]; /* next code value for each bit length */

-    ush code = 0;              /* running code value */

-    int bits;                  /* bit index */

-    int n;                     /* code index */

-

-    /* The distribution counts are first used to generate the code values

-     * without bit reversal.

-     */

-    for (bits = 1; bits <= MAX_BITS; bits++) {

-        next_code[bits] = code = (code + bl_count[bits-1]) << 1;

-    }

-    /* Check that the bit counts in bl_count are consistent. The last code

-     * must be all ones.

-     */

-    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,

-            "inconsistent bit counts");

-    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));

-

-    for (n = 0;  n <= max_code; n++) {

-        int len = tree[n].Len;

-        if (len == 0) continue;

-        /* Now reverse the bits */

-        tree[n].Code = bi_reverse(next_code[len]++, len);

-

-        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",

-             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));

-    }

-}

-

-/* ===========================================================================

- * Construct one Huffman tree and assigns the code bit strings and lengths.

- * Update the total bit length for the current block.

- * IN assertion: the field freq is set for all tree elements.

- * OUT assertions: the fields len and code are set to the optimal bit length

- *     and corresponding code. The length opt_len is updated; static_len is

- *     also updated if stree is not null. The field max_code is set.

- */

-local void build_tree(s, desc)

-    deflate_state *s;

-    tree_desc *desc; /* the tree descriptor */

-{

-    ct_data *tree         = desc->dyn_tree;

-    const ct_data *stree  = desc->stat_desc->static_tree;

-    int elems             = desc->stat_desc->elems;

-    int n, m;          /* iterate over heap elements */

-    int max_code = -1; /* largest code with non zero frequency */

-    int node;          /* new node being created */

-

-    /* Construct the initial heap, with least frequent element in

-     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].

-     * heap[0] is not used.

-     */

-    s->heap_len = 0, s->heap_max = HEAP_SIZE;

-

-    for (n = 0; n < elems; n++) {

-        if (tree[n].Freq != 0) {

-            s->heap[++(s->heap_len)] = max_code = n;

-            s->depth[n] = 0;

-        } else {

-            tree[n].Len = 0;

-        }

-    }

-

-    /* The pkzip format requires that at least one distance code exists,

-     * and that at least one bit should be sent even if there is only one

-     * possible code. So to avoid special checks later on we force at least

-     * two codes of non zero frequency.

-     */

-    while (s->heap_len < 2) {

-        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);

-        tree[node].Freq = 1;

-        s->depth[node] = 0;

-        s->opt_len--; if (stree) s->static_len -= stree[node].Len;

-        /* node is 0 or 1 so it does not have extra bits */

-    }

-    desc->max_code = max_code;

-

-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,

-     * establish sub-heaps of increasing lengths:

-     */

-    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);

-

-    /* Construct the Huffman tree by repeatedly combining the least two

-     * frequent nodes.

-     */

-    node = elems;              /* next internal node of the tree */

-    do {

-        pqremove(s, tree, n);  /* n = node of least frequency */

-        m = s->heap[SMALLEST]; /* m = node of next least frequency */

-

-        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */

-        s->heap[--(s->heap_max)] = m;

-

-        /* Create a new node father of n and m */

-        tree[node].Freq = tree[n].Freq + tree[m].Freq;

-        s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ?

-                                s->depth[n] : s->depth[m]) + 1);

-        tree[n].Dad = tree[m].Dad = (ush)node;

-#ifdef DUMP_BL_TREE

-        if (tree == s->bl_tree) {

-            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",

-                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);

-        }

-#endif

-        /* and insert the new node in the heap */

-        s->heap[SMALLEST] = node++;

-        pqdownheap(s, tree, SMALLEST);

-

-    } while (s->heap_len >= 2);

-

-    s->heap[--(s->heap_max)] = s->heap[SMALLEST];

-

-    /* At this point, the fields freq and dad are set. We can now

-     * generate the bit lengths.

-     */

-    gen_bitlen(s, (tree_desc *)desc);

-

-    /* The field len is now set, we can generate the bit codes */

-    gen_codes ((ct_data *)tree, max_code, s->bl_count);

-}

-

-/* ===========================================================================

- * Scan a literal or distance tree to determine the frequencies of the codes

- * in the bit length tree.

- */

-local void scan_tree (s, tree, max_code)

-    deflate_state *s;

-    ct_data *tree;   /* the tree to be scanned */

-    int max_code;    /* and its largest code of non zero frequency */

-{

-    int n;                     /* iterates over all tree elements */

-    int prevlen = -1;          /* last emitted length */

-    int curlen;                /* length of current code */

-    int nextlen = tree[0].Len; /* length of next code */

-    int count = 0;             /* repeat count of the current code */

-    int max_count = 7;         /* max repeat count */

-    int min_count = 4;         /* min repeat count */

-

-    if (nextlen == 0) max_count = 138, min_count = 3;

-    tree[max_code+1].Len = (ush)0xffff; /* guard */

-

-    for (n = 0; n <= max_code; n++) {

-        curlen = nextlen; nextlen = tree[n+1].Len;

-        if (++count < max_count && curlen == nextlen) {

-            continue;

-        } else if (count < min_count) {

-            s->bl_tree[curlen].Freq += count;

-        } else if (curlen != 0) {

-            if (curlen != prevlen) s->bl_tree[curlen].Freq++;

-            s->bl_tree[REP_3_6].Freq++;

-        } else if (count <= 10) {

-            s->bl_tree[REPZ_3_10].Freq++;

-        } else {

-            s->bl_tree[REPZ_11_138].Freq++;

-        }

-        count = 0; prevlen = curlen;

-        if (nextlen == 0) {

-            max_count = 138, min_count = 3;

-        } else if (curlen == nextlen) {

-            max_count = 6, min_count = 3;

-        } else {

-            max_count = 7, min_count = 4;

-        }

-    }

-}

-

-/* ===========================================================================

- * Send a literal or distance tree in compressed form, using the codes in

- * bl_tree.

- */

-local void send_tree (s, tree, max_code)

-    deflate_state *s;

-    ct_data *tree; /* the tree to be scanned */

-    int max_code;       /* and its largest code of non zero frequency */

-{

-    int n;                     /* iterates over all tree elements */

-    int prevlen = -1;          /* last emitted length */

-    int curlen;                /* length of current code */

-    int nextlen = tree[0].Len; /* length of next code */

-    int count = 0;             /* repeat count of the current code */

-    int max_count = 7;         /* max repeat count */

-    int min_count = 4;         /* min repeat count */

-

-    /* tree[max_code+1].Len = -1; */  /* guard already set */

-    if (nextlen == 0) max_count = 138, min_count = 3;

-

-    for (n = 0; n <= max_code; n++) {

-        curlen = nextlen; nextlen = tree[n+1].Len;

-        if (++count < max_count && curlen == nextlen) {

-            continue;

-        } else if (count < min_count) {

-            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);

-

-        } else if (curlen != 0) {

-            if (curlen != prevlen) {

-                send_code(s, curlen, s->bl_tree); count--;

-            }

-            Assert(count >= 3 && count <= 6, " 3_6?");

-            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);

-

-        } else if (count <= 10) {

-            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);

-

-        } else {

-            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);

-        }

-        count = 0; prevlen = curlen;

-        if (nextlen == 0) {

-            max_count = 138, min_count = 3;

-        } else if (curlen == nextlen) {

-            max_count = 6, min_count = 3;

-        } else {

-            max_count = 7, min_count = 4;

-        }

-    }

-}

-

-/* ===========================================================================

- * Construct the Huffman tree for the bit lengths and return the index in

- * bl_order of the last bit length code to send.

- */

-local int build_bl_tree(s)

-    deflate_state *s;

-{

-    int max_blindex;  /* index of last bit length code of non zero freq */

-

-    /* Determine the bit length frequencies for literal and distance trees */

-    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);

-    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);

-

-    /* Build the bit length tree: */

-    build_tree(s, (tree_desc *)(&(s->bl_desc)));

-    /* opt_len now includes the length of the tree representations, except

-     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.

-     */

-

-    /* Determine the number of bit length codes to send. The pkzip format

-     * requires that at least 4 bit length codes be sent. (appnote.txt says

-     * 3 but the actual value used is 4.)

-     */

-    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {

-        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;

-    }

-    /* Update opt_len to include the bit length tree and counts */

-    s->opt_len += 3*(max_blindex+1) + 5+5+4;

-    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",

-            s->opt_len, s->static_len));

-

-    return max_blindex;

-}

-

-/* ===========================================================================

- * Send the header for a block using dynamic Huffman trees: the counts, the

- * lengths of the bit length codes, the literal tree and the distance tree.

- * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.

- */

-local void send_all_trees(s, lcodes, dcodes, blcodes)

-    deflate_state *s;

-    int lcodes, dcodes, blcodes; /* number of codes for each tree */

-{

-    int rank;                    /* index in bl_order */

-

-    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");

-    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,

-            "too many codes");

-    Tracev((stderr, "\nbl counts: "));

-    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */

-    send_bits(s, dcodes-1,   5);

-    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */

-    for (rank = 0; rank < blcodes; rank++) {

-        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));

-        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);

-    }

-    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));

-

-    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */

-    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));

-

-    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */

-    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));

-}

-

-/* ===========================================================================

- * Send a stored block

- */

-void _tr_stored_block(s, buf, stored_len, eof)

-    deflate_state *s;

-    charf *buf;       /* input block */

-    ulg stored_len;   /* length of input block */

-    int eof;          /* true if this is the last block for a file */

-{

-    send_bits(s, (STORED_BLOCK<<1)+eof, 3);  /* send block type */

-#ifdef DEBUG

-    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;

-    s->compressed_len += (stored_len + 4) << 3;

-#endif

-    copy_block(s, buf, (unsigned)stored_len, 1); /* with header */

-}

-

-/* ===========================================================================

- * Send one empty static block to give enough lookahead for inflate.

- * This takes 10 bits, of which 7 may remain in the bit buffer.

- * The current inflate code requires 9 bits of lookahead. If the

- * last two codes for the previous block (real code plus EOB) were coded

- * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode

- * the last real code. In this case we send two empty static blocks instead

- * of one. (There are no problems if the previous block is stored or fixed.)

- * To simplify the code, we assume the worst case of last real code encoded

- * on one bit only.

- */

-void _tr_align(s)

-    deflate_state *s;

-{

-    send_bits(s, STATIC_TREES<<1, 3);

-    send_code(s, END_BLOCK, static_ltree);

-#ifdef DEBUG

-    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */

-#endif

-    bi_flush(s);

-    /* Of the 10 bits for the empty block, we have already sent

-     * (10 - bi_valid) bits. The lookahead for the last real code (before

-     * the EOB of the previous block) was thus at least one plus the length

-     * of the EOB plus what we have just sent of the empty static block.

-     */

-    if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {

-        send_bits(s, STATIC_TREES<<1, 3);

-        send_code(s, END_BLOCK, static_ltree);

-#ifdef DEBUG

-        s->compressed_len += 10L;

-#endif

-        bi_flush(s);

-    }

-    s->last_eob_len = 7;

-}

-

-/* ===========================================================================

- * Determine the best encoding for the current block: dynamic trees, static

- * trees or store, and output the encoded block to the zip file.

- */

-void _tr_flush_block(s, buf, stored_len, eof)

-    deflate_state *s;

-    charf *buf;       /* input block, or NULL if too old */

-    ulg stored_len;   /* length of input block */

-    int eof;          /* true if this is the last block for a file */

-{

-    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */

-    int max_blindex = 0;  /* index of last bit length code of non zero freq */

-

-    /* Build the Huffman trees unless a stored block is forced */

-    if (s->level > 0) {

-

-        /* Check if the file is binary or text */

-        if (stored_len > 0 && s->strm->data_type == Z_UNKNOWN)

-            set_data_type(s);

-

-        /* Construct the literal and distance trees */

-        build_tree(s, (tree_desc *)(&(s->l_desc)));

-        Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,

-                s->static_len));

-

-        build_tree(s, (tree_desc *)(&(s->d_desc)));

-        Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,

-                s->static_len));

-        /* At this point, opt_len and static_len are the total bit lengths of

-         * the compressed block data, excluding the tree representations.

-         */

-

-        /* Build the bit length tree for the above two trees, and get the index

-         * in bl_order of the last bit length code to send.

-         */

-        max_blindex = build_bl_tree(s);

-

-        /* Determine the best encoding. Compute the block lengths in bytes. */

-        opt_lenb = (s->opt_len+3+7)>>3;

-        static_lenb = (s->static_len+3+7)>>3;

-

-        Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",

-                opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,

-                s->last_lit));

-

-        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;

-

-    } else {

-        Assert(buf != (char*)0, "lost buf");

-        opt_lenb = static_lenb = stored_len + 5; /* force a stored block */

-    }

-

-#ifdef FORCE_STORED

-    if (buf != (char*)0) { /* force stored block */

-#else

-    if (stored_len+4 <= opt_lenb && buf != (char*)0) {

-                       /* 4: two words for the lengths */

-#endif

-        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.

-         * Otherwise we can't have processed more than WSIZE input bytes since

-         * the last block flush, because compression would have been

-         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to

-         * transform a block into a stored block.

-         */

-        _tr_stored_block(s, buf, stored_len, eof);

-

-#ifdef FORCE_STATIC

-    } else if (static_lenb >= 0) { /* force static trees */

-#else

-    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {

-#endif

-        send_bits(s, (STATIC_TREES<<1)+eof, 3);

-        compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);

-#ifdef DEBUG

-        s->compressed_len += 3 + s->static_len;

-#endif

-    } else {

-        send_bits(s, (DYN_TREES<<1)+eof, 3);

-        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,

-                       max_blindex+1);

-        compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);

-#ifdef DEBUG

-        s->compressed_len += 3 + s->opt_len;

-#endif

-    }

-    Assert (s->compressed_len == s->bits_sent, "bad compressed size");

-    /* The above check is made mod 2^32, for files larger than 512 MB

-     * and uLong implemented on 32 bits.

-     */

-    init_block(s);

-

-    if (eof) {

-        bi_windup(s);

-#ifdef DEBUG

-        s->compressed_len += 7;  /* align on byte boundary */

-#endif

-    }

-    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,

-           s->compressed_len-7*eof));

-}

-

-/* ===========================================================================

- * Save the match info and tally the frequency counts. Return true if

- * the current block must be flushed.

- */

-int _tr_tally (s, dist, lc)

-    deflate_state *s;

-    unsigned dist;  /* distance of matched string */

-    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */

-{

-    s->d_buf[s->last_lit] = (ush)dist;

-    s->l_buf[s->last_lit++] = (uch)lc;

-    if (dist == 0) {

-        /* lc is the unmatched char */

-        s->dyn_ltree[lc].Freq++;

-    } else {

-        s->matches++;

-        /* Here, lc is the match length - MIN_MATCH */

-        dist--;             /* dist = match distance - 1 */

-        Assert((ush)dist < (ush)MAX_DIST(s) &&

-               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&

-               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");

-

-        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;

-        s->dyn_dtree[d_code(dist)].Freq++;

-    }

-

-#ifdef TRUNCATE_BLOCK

-    /* Try to guess if it is profitable to stop the current block here */

-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {

-        /* Compute an upper bound for the compressed length */

-        ulg out_length = (ulg)s->last_lit*8L;

-        ulg in_length = (ulg)((long)s->strstart - s->block_start);

-        int dcode;

-        for (dcode = 0; dcode < D_CODES; dcode++) {

-            out_length += (ulg)s->dyn_dtree[dcode].Freq *

-                (5L+extra_dbits[dcode]);

-        }

-        out_length >>= 3;

-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",

-               s->last_lit, in_length, out_length,

-               100L - out_length*100L/in_length));

-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;

-    }

-#endif

-    return (s->last_lit == s->lit_bufsize-1);

-    /* We avoid equality with lit_bufsize because of wraparound at 64K

-     * on 16 bit machines and because stored blocks are restricted to

-     * 64K-1 bytes.

-     */

-}

-

-/* ===========================================================================

- * Send the block data compressed using the given Huffman trees

- */

-local void compress_block(s, ltree, dtree)

-    deflate_state *s;

-    ct_data *ltree; /* literal tree */

-    ct_data *dtree; /* distance tree */

-{

-    unsigned dist;      /* distance of matched string */

-    int lc;             /* match length or unmatched char (if dist == 0) */

-    unsigned lx = 0;    /* running index in l_buf */

-    unsigned code;      /* the code to send */

-    int extra;          /* number of extra bits to send */

-

-    if (s->last_lit != 0) do {

-        dist = s->d_buf[lx];

-        lc = s->l_buf[lx++];

-        if (dist == 0) {

-            send_code(s, lc, ltree); /* send a literal byte */

-            Tracecv(isgraph(lc), (stderr," '%c' ", lc));

-        } else {

-            /* Here, lc is the match length - MIN_MATCH */

-            code = _length_code[lc];

-            send_code(s, code+LITERALS+1, ltree); /* send the length code */

-            extra = extra_lbits[code];

-            if (extra != 0) {

-                lc -= base_length[code];

-                send_bits(s, lc, extra);       /* send the extra length bits */

-            }

-            dist--; /* dist is now the match distance - 1 */

-            code = d_code(dist);

-            Assert (code < D_CODES, "bad d_code");

-

-            send_code(s, code, dtree);       /* send the distance code */

-            extra = extra_dbits[code];

-            if (extra != 0) {

-                dist -= base_dist[code];

-                send_bits(s, dist, extra);   /* send the extra distance bits */

-            }

-        } /* literal or match pair ? */

-

-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */

-        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,

-               "pendingBuf overflow");

-

-    } while (lx < s->last_lit);

-

-    send_code(s, END_BLOCK, ltree);

-    s->last_eob_len = ltree[END_BLOCK].Len;

-}

-

-/* ===========================================================================

- * Set the data type to BINARY or TEXT, using a crude approximation:

- * set it to Z_TEXT if all symbols are either printable characters (33 to 255)

- * or white spaces (9 to 13, or 32); or set it to Z_BINARY otherwise.

- * IN assertion: the fields Freq of dyn_ltree are set.

- */

-local void set_data_type(s)

-    deflate_state *s;

-{

-    int n;

-

-    for (n = 0; n < 9; n++)

-        if (s->dyn_ltree[n].Freq != 0)

-            break;

-    if (n == 9)

-        for (n = 14; n < 32; n++)

-            if (s->dyn_ltree[n].Freq != 0)

-                break;

-    s->strm->data_type = (n == 32) ? Z_TEXT : Z_BINARY;

-}

-

-/* ===========================================================================

- * Reverse the first len bits of a code, using straightforward code (a faster

- * method would use a table)

- * IN assertion: 1 <= len <= 15

- */

-local unsigned bi_reverse(code, len)

-    unsigned code; /* the value to invert */

-    int len;       /* its bit length */

-{

-    register unsigned res = 0;

-    do {

-        res |= code & 1;

-        code >>= 1, res <<= 1;

-    } while (--len > 0);

-    return res >> 1;

-}

-

-/* ===========================================================================

- * Flush the bit buffer, keeping at most 7 bits in it.

- */

-local void bi_flush(s)

-    deflate_state *s;

-{

-    if (s->bi_valid == 16) {

-        put_short(s, s->bi_buf);

-        s->bi_buf = 0;

-        s->bi_valid = 0;

-    } else if (s->bi_valid >= 8) {

-        put_byte(s, (Byte)s->bi_buf);

-        s->bi_buf >>= 8;

-        s->bi_valid -= 8;

-    }

-}

-

-/* ===========================================================================

- * Flush the bit buffer and align the output on a byte boundary

- */

-local void bi_windup(s)

-    deflate_state *s;

-{

-    if (s->bi_valid > 8) {

-        put_short(s, s->bi_buf);

-    } else if (s->bi_valid > 0) {

-        put_byte(s, (Byte)s->bi_buf);

-    }

-    s->bi_buf = 0;

-    s->bi_valid = 0;

-#ifdef DEBUG

-    s->bits_sent = (s->bits_sent+7) & ~7;

-#endif

-}

-

-/* ===========================================================================

- * Copy a stored block, storing first the length and its

- * one's complement if requested.

- */

-local void copy_block(s, buf, len, header)

-    deflate_state *s;

-    charf    *buf;    /* the input data */

-    unsigned len;     /* its length */

-    int      header;  /* true if block header must be written */

-{

-    bi_windup(s);        /* align on byte boundary */

-    s->last_eob_len = 8; /* enough lookahead for inflate */

-

-    if (header) {

-        put_short(s, (ush)len);

-        put_short(s, (ush)~len);

-#ifdef DEBUG

-        s->bits_sent += 2*16;

-#endif

-    }

-#ifdef DEBUG

-    s->bits_sent += (ulg)len<<3;

-#endif

-    while (len--) {

-        put_byte(s, *buf++);

-    }

-}

+/* trees.c -- output deflated data using Huffman coding
+ * Copyright (C) 1995-2005 Jean-loup Gailly
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ *  ALGORITHM
+ *
+ *      The "deflation" process uses several Huffman trees. The more
+ *      common source values are represented by shorter bit sequences.
+ *
+ *      Each code tree is stored in a compressed form which is itself
+ * a Huffman encoding of the lengths of all the code strings (in
+ * ascending order by source values).  The actual code strings are
+ * reconstructed from the lengths in the inflate process, as described
+ * in the deflate specification.
+ *
+ *  REFERENCES
+ *
+ *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
+ *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
+ *
+ *      Storer, James A.
+ *          Data Compression:  Methods and Theory, pp. 49-50.
+ *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.
+ *
+ *      Sedgewick, R.
+ *          Algorithms, p290.
+ *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
+ */
+
+/* @(#) $Id$ */
+
+/* #define GEN_TREES_H */
+
+#include "deflate.h"
+
+#ifdef DEBUG
+#  include <ctype.h>
+#endif
+
+/* ===========================================================================
+ * Constants
+ */
+
+#define MAX_BL_BITS 7
+/* Bit length codes must not exceed MAX_BL_BITS bits */
+
+#define END_BLOCK 256
+/* end of block literal code */
+
+#define REP_3_6      16
+/* repeat previous bit length 3-6 times (2 bits of repeat count) */
+
+#define REPZ_3_10    17
+/* repeat a zero length 3-10 times  (3 bits of repeat count) */
+
+#define REPZ_11_138  18
+/* repeat a zero length 11-138 times  (7 bits of repeat count) */
+
+local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
+   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
+
+local const int extra_dbits[D_CODES] /* extra bits for each distance code */
+   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
+
+local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
+   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
+
+local const uch bl_order[BL_CODES]
+   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
+/* The lengths of the bit length codes are sent in order of decreasing
+ * probability, to avoid transmitting the lengths for unused bit length codes.
+ */
+
+#define Buf_size (8 * 2*sizeof(char))
+/* Number of bits used within bi_buf. (bi_buf might be implemented on
+ * more than 16 bits on some systems.)
+ */
+
+/* ===========================================================================
+ * Local data. These are initialized only once.
+ */
+
+#define DIST_CODE_LEN  512 /* see definition of array dist_code below */
+
+#if defined(GEN_TREES_H) || !defined(STDC)
+/* non ANSI compilers may not accept trees.h */
+
+local ct_data static_ltree[L_CODES+2];
+/* The static literal tree. Since the bit lengths are imposed, there is no
+ * need for the L_CODES extra codes used during heap construction. However
+ * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
+ * below).
+ */
+
+local ct_data static_dtree[D_CODES];
+/* The static distance tree. (Actually a trivial tree since all codes use
+ * 5 bits.)
+ */
+
+uch _dist_code[DIST_CODE_LEN];
+/* Distance codes. The first 256 values correspond to the distances
+ * 3 .. 258, the last 256 values correspond to the top 8 bits of
+ * the 15 bit distances.
+ */
+
+uch _length_code[MAX_MATCH-MIN_MATCH+1];
+/* length code for each normalized match length (0 == MIN_MATCH) */
+
+local int base_length[LENGTH_CODES];
+/* First normalized length for each code (0 = MIN_MATCH) */
+
+local int base_dist[D_CODES];
+/* First normalized distance for each code (0 = distance of 1) */
+
+#else
+#  include "trees.h"
+#endif /* GEN_TREES_H */
+
+struct static_tree_desc_s {
+    const ct_data *static_tree;  /* static tree or NULL */
+    const intf *extra_bits;      /* extra bits for each code or NULL */
+    int     extra_base;          /* base index for extra_bits */
+    int     elems;               /* max number of elements in the tree */
+    int     max_length;          /* max bit length for the codes */
+};
+
+local static_tree_desc  static_l_desc =
+{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
+
+local static_tree_desc  static_d_desc =
+{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
+
+local static_tree_desc  static_bl_desc =
+{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
+
+/* ===========================================================================
+ * Local (static) routines in this file.
+ */
+
+local void tr_static_init OF((void));
+local void init_block     OF((deflate_state *s));
+local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
+local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
+local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
+local void build_tree     OF((deflate_state *s, tree_desc *desc));
+local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
+local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
+local int  build_bl_tree  OF((deflate_state *s));
+local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
+                              int blcodes));
+local void compress_block OF((deflate_state *s, ct_data *ltree,
+                              ct_data *dtree));
+local void set_data_type  OF((deflate_state *s));
+local unsigned bi_reverse OF((unsigned value, int length));
+local void bi_windup      OF((deflate_state *s));
+local void bi_flush       OF((deflate_state *s));
+local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
+                              int header));
+
+#ifdef GEN_TREES_H
+local void gen_trees_header OF((void));
+#endif
+
+#ifndef DEBUG
+#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
+   /* Send a code of the given tree. c and tree must not have side effects */
+
+#else /* DEBUG */
+#  define send_code(s, c, tree) \
+     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
+       send_bits(s, tree[c].Code, tree[c].Len); }
+#endif
+
+/* ===========================================================================
+ * Output a short LSB first on the stream.
+ * IN assertion: there is enough room in pendingBuf.
+ */
+#define put_short(s, w) { \
+    put_byte(s, (uch)((w) & 0xff)); \
+    put_byte(s, (uch)((ush)(w) >> 8)); \
+}
+
+/* ===========================================================================
+ * Send a value on a given number of bits.
+ * IN assertion: length <= 16 and value fits in length bits.
+ */
+#ifdef DEBUG
+local void send_bits      OF((deflate_state *s, int value, int length));
+
+local void send_bits(s, value, length)
+    deflate_state *s;
+    int value;  /* value to send */
+    int length; /* number of bits */
+{
+    Tracevv((stderr," l %2d v %4x ", length, value));
+    Assert(length > 0 && length <= 15, "invalid length");
+    s->bits_sent += (ulg)length;
+
+    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
+     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
+     * unused bits in value.
+     */
+    if (s->bi_valid > (int)Buf_size - length) {
+        s->bi_buf |= (value << s->bi_valid);
+        put_short(s, s->bi_buf);
+        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
+        s->bi_valid += length - Buf_size;
+    } else {
+        s->bi_buf |= value << s->bi_valid;
+        s->bi_valid += length;
+    }
+}
+#else /* !DEBUG */
+
+#define send_bits(s, value, length) \
+{ int len = length;\
+  if (s->bi_valid > (int)Buf_size - len) {\
+    int val = value;\
+    s->bi_buf |= (val << s->bi_valid);\
+    put_short(s, s->bi_buf);\
+    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
+    s->bi_valid += len - Buf_size;\
+  } else {\
+    s->bi_buf |= (value) << s->bi_valid;\
+    s->bi_valid += len;\
+  }\
+}
+#endif /* DEBUG */
+
+
+/* the arguments must not have side effects */
+
+/* ===========================================================================
+ * Initialize the various 'constant' tables.
+ */
+local void tr_static_init()
+{
+#if defined(GEN_TREES_H) || !defined(STDC)
+    static int static_init_done = 0;
+    int n;        /* iterates over tree elements */
+    int bits;     /* bit counter */
+    int length;   /* length value */
+    int code;     /* code value */
+    int dist;     /* distance index */
+    ush bl_count[MAX_BITS+1];
+    /* number of codes at each bit length for an optimal tree */
+
+    if (static_init_done) return;
+
+    /* For some embedded targets, global variables are not initialized: */
+    static_l_desc.static_tree = static_ltree;
+    static_l_desc.extra_bits = extra_lbits;
+    static_d_desc.static_tree = static_dtree;
+    static_d_desc.extra_bits = extra_dbits;
+    static_bl_desc.extra_bits = extra_blbits;
+
+    /* Initialize the mapping length (0..255) -> length code (0..28) */
+    length = 0;
+    for (code = 0; code < LENGTH_CODES-1; code++) {
+        base_length[code] = length;
+        for (n = 0; n < (1<<extra_lbits[code]); n++) {
+            _length_code[length++] = (uch)code;
+        }
+    }
+    Assert (length == 256, "tr_static_init: length != 256");
+    /* Note that the length 255 (match length 258) can be represented
+     * in two different ways: code 284 + 5 bits or code 285, so we
+     * overwrite length_code[255] to use the best encoding:
+     */
+    _length_code[length-1] = (uch)code;
+
+    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
+    dist = 0;
+    for (code = 0 ; code < 16; code++) {
+        base_dist[code] = dist;
+        for (n = 0; n < (1<<extra_dbits[code]); n++) {
+            _dist_code[dist++] = (uch)code;
+        }
+    }
+    Assert (dist == 256, "tr_static_init: dist != 256");
+    dist >>= 7; /* from now on, all distances are divided by 128 */
+    for ( ; code < D_CODES; code++) {
+        base_dist[code] = dist << 7;
+        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
+            _dist_code[256 + dist++] = (uch)code;
+        }
+    }
+    Assert (dist == 256, "tr_static_init: 256+dist != 512");
+
+    /* Construct the codes of the static literal tree */
+    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
+    n = 0;
+    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
+    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
+    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
+    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
+    /* Codes 286 and 287 do not exist, but we must include them in the
+     * tree construction to get a canonical Huffman tree (longest code
+     * all ones)
+     */
+    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
+
+    /* The static distance tree is trivial: */
+    for (n = 0; n < D_CODES; n++) {
+        static_dtree[n].Len = 5;
+        static_dtree[n].Code = bi_reverse((unsigned)n, 5);
+    }
+    static_init_done = 1;
+
+#  ifdef GEN_TREES_H
+    gen_trees_header();
+#  endif
+#endif /* defined(GEN_TREES_H) || !defined(STDC) */
+}
+
+/* ===========================================================================
+ * Genererate the file trees.h describing the static trees.
+ */
+#ifdef GEN_TREES_H
+#  ifndef DEBUG
+#    include <stdio.h>
+#  endif
+
+#  define SEPARATOR(i, last, width) \
+      ((i) == (last)? "\n};\n\n" :    \
+       ((i) % (width) == (width)-1 ? ",\n" : ", "))
+
+void gen_trees_header()
+{
+    FILE *header = fopen("trees.h", "w");
+    int i;
+
+    Assert (header != NULL, "Can't open trees.h");
+    fprintf(header,
+            "/* header created automatically with -DGEN_TREES_H */\n\n");
+
+    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
+    for (i = 0; i < L_CODES+2; i++) {
+        fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
+                static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
+    }
+
+    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
+    for (i = 0; i < D_CODES; i++) {
+        fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
+                static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
+    }
+
+    fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");
+    for (i = 0; i < DIST_CODE_LEN; i++) {
+        fprintf(header, "%2u%s", _dist_code[i],
+                SEPARATOR(i, DIST_CODE_LEN-1, 20));
+    }
+
+    fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
+    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
+        fprintf(header, "%2u%s", _length_code[i],
+                SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
+    }
+
+    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
+    for (i = 0; i < LENGTH_CODES; i++) {
+        fprintf(header, "%1u%s", base_length[i],
+                SEPARATOR(i, LENGTH_CODES-1, 20));
+    }
+
+    fprintf(header, "local const int base_dist[D_CODES] = {\n");
+    for (i = 0; i < D_CODES; i++) {
+        fprintf(header, "%5u%s", base_dist[i],
+                SEPARATOR(i, D_CODES-1, 10));
+    }
+
+    fclose(header);
+}
+#endif /* GEN_TREES_H */
+
+/* ===========================================================================
+ * Initialize the tree data structures for a new zlib stream.
+ */
+void _tr_init(s)
+    deflate_state *s;
+{
+    tr_static_init();
+
+    s->l_desc.dyn_tree = s->dyn_ltree;
+    s->l_desc.stat_desc = &static_l_desc;
+
+    s->d_desc.dyn_tree = s->dyn_dtree;
+    s->d_desc.stat_desc = &static_d_desc;
+
+    s->bl_desc.dyn_tree = s->bl_tree;
+    s->bl_desc.stat_desc = &static_bl_desc;
+
+    s->bi_buf = 0;
+    s->bi_valid = 0;
+    s->last_eob_len = 8; /* enough lookahead for inflate */
+#ifdef DEBUG
+    s->compressed_len = 0L;
+    s->bits_sent = 0L;
+#endif
+
+    /* Initialize the first block of the first file: */
+    init_block(s);
+}
+
+/* ===========================================================================
+ * Initialize a new block.
+ */
+local void init_block(s)
+    deflate_state *s;
+{
+    int n; /* iterates over tree elements */
+
+    /* Initialize the trees. */
+    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
+    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
+    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
+
+    s->dyn_ltree[END_BLOCK].Freq = 1;
+    s->opt_len = s->static_len = 0L;
+    s->last_lit = s->matches = 0;
+}
+
+#define SMALLEST 1
+/* Index within the heap array of least frequent node in the Huffman tree */
+
+
+/* ===========================================================================
+ * Remove the smallest element from the heap and recreate the heap with
+ * one less element. Updates heap and heap_len.
+ */
+#define pqremove(s, tree, top) \
+{\
+    top = s->heap[SMALLEST]; \
+    s->heap[SMALLEST] = s->heap[s->heap_len--]; \
+    pqdownheap(s, tree, SMALLEST); \
+}
+
+/* ===========================================================================
+ * Compares to subtrees, using the tree depth as tie breaker when
+ * the subtrees have equal frequency. This minimizes the worst case length.
+ */
+#define smaller(tree, n, m, depth) \
+   (tree[n].Freq < tree[m].Freq || \
+   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
+
+/* ===========================================================================
+ * Restore the heap property by moving down the tree starting at node k,
+ * exchanging a node with the smallest of its two sons if necessary, stopping
+ * when the heap property is re-established (each father smaller than its
+ * two sons).
+ */
+local void pqdownheap(s, tree, k)
+    deflate_state *s;
+    ct_data *tree;  /* the tree to restore */
+    int k;               /* node to move down */
+{
+    int v = s->heap[k];
+    int j = k << 1;  /* left son of k */
+    while (j <= s->heap_len) {
+        /* Set j to the smallest of the two sons: */
+        if (j < s->heap_len &&
+            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
+            j++;
+        }
+        /* Exit if v is smaller than both sons */
+        if (smaller(tree, v, s->heap[j], s->depth)) break;
+
+        /* Exchange v with the smallest son */
+        s->heap[k] = s->heap[j];  k = j;
+
+        /* And continue down the tree, setting j to the left son of k */
+        j <<= 1;
+    }
+    s->heap[k] = v;
+}
+
+/* ===========================================================================
+ * Compute the optimal bit lengths for a tree and update the total bit length
+ * for the current block.
+ * IN assertion: the fields freq and dad are set, heap[heap_max] and
+ *    above are the tree nodes sorted by increasing frequency.
+ * OUT assertions: the field len is set to the optimal bit length, the
+ *     array bl_count contains the frequencies for each bit length.
+ *     The length opt_len is updated; static_len is also updated if stree is
+ *     not null.
+ */
+local void gen_bitlen(s, desc)
+    deflate_state *s;
+    tree_desc *desc;    /* the tree descriptor */
+{
+    ct_data *tree        = desc->dyn_tree;
+    int max_code         = desc->max_code;
+    const ct_data *stree = desc->stat_desc->static_tree;
+    const intf *extra    = desc->stat_desc->extra_bits;
+    int base             = desc->stat_desc->extra_base;
+    int max_length       = desc->stat_desc->max_length;
+    int h;              /* heap index */
+    int n, m;           /* iterate over the tree elements */
+    int bits;           /* bit length */
+    int xbits;          /* extra bits */
+    ush f;              /* frequency */
+    int overflow = 0;   /* number of elements with bit length too large */
+
+    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;
+
+    /* In a first pass, compute the optimal bit lengths (which may
+     * overflow in the case of the bit length tree).
+     */
+    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
+
+    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
+        n = s->heap[h];
+        bits = tree[tree[n].Dad].Len + 1;
+        if (bits > max_length) bits = max_length, overflow++;
+        tree[n].Len = (ush)bits;
+        /* We overwrite tree[n].Dad which is no longer needed */
+
+        if (n > max_code) continue; /* not a leaf node */
+
+        s->bl_count[bits]++;
+        xbits = 0;
+        if (n >= base) xbits = extra[n-base];
+        f = tree[n].Freq;
+        s->opt_len += (ulg)f * (bits + xbits);
+        if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
+    }
+    if (overflow == 0) return;
+
+    Trace((stderr,"\nbit length overflow\n"));
+    /* This happens for example on obj2 and pic of the Calgary corpus */
+
+    /* Find the first bit length which could increase: */
+    do {
+        bits = max_length-1;
+        while (s->bl_count[bits] == 0) bits--;
+        s->bl_count[bits]--;      /* move one leaf down the tree */
+        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
+        s->bl_count[max_length]--;
+        /* The brother of the overflow item also moves one step up,
+         * but this does not affect bl_count[max_length]
+         */
+        overflow -= 2;
+    } while (overflow > 0);
+
+    /* Now recompute all bit lengths, scanning in increasing frequency.
+     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
+     * lengths instead of fixing only the wrong ones. This idea is taken
+     * from 'ar' written by Haruhiko Okumura.)
+     */
+    for (bits = max_length; bits != 0; bits--) {
+        n = s->bl_count[bits];
+        while (n != 0) {
+            m = s->heap[--h];
+            if (m > max_code) continue;
+            if ((unsigned) tree[m].Len != (unsigned) bits) {
+                Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
+                s->opt_len += ((long)bits - (long)tree[m].Len)
+                              *(long)tree[m].Freq;
+                tree[m].Len = (ush)bits;
+            }
+            n--;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Generate the codes for a given tree and bit counts (which need not be
+ * optimal).
+ * IN assertion: the array bl_count contains the bit length statistics for
+ * the given tree and the field len is set for all tree elements.
+ * OUT assertion: the field code is set for all tree elements of non
+ *     zero code length.
+ */
+local void gen_codes (tree, max_code, bl_count)
+    ct_data *tree;             /* the tree to decorate */
+    int max_code;              /* largest code with non zero frequency */
+    ushf *bl_count;            /* number of codes at each bit length */
+{
+    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
+    ush code = 0;              /* running code value */
+    int bits;                  /* bit index */
+    int n;                     /* code index */
+
+    /* The distribution counts are first used to generate the code values
+     * without bit reversal.
+     */
+    for (bits = 1; bits <= MAX_BITS; bits++) {
+        next_code[bits] = code = (code + bl_count[bits-1]) << 1;
+    }
+    /* Check that the bit counts in bl_count are consistent. The last code
+     * must be all ones.
+     */
+    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
+            "inconsistent bit counts");
+    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
+
+    for (n = 0;  n <= max_code; n++) {
+        int len = tree[n].Len;
+        if (len == 0) continue;
+        /* Now reverse the bits */
+        tree[n].Code = bi_reverse(next_code[len]++, len);
+
+        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
+             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
+    }
+}
+
+/* ===========================================================================
+ * Construct one Huffman tree and assigns the code bit strings and lengths.
+ * Update the total bit length for the current block.
+ * IN assertion: the field freq is set for all tree elements.
+ * OUT assertions: the fields len and code are set to the optimal bit length
+ *     and corresponding code. The length opt_len is updated; static_len is
+ *     also updated if stree is not null. The field max_code is set.
+ */
+local void build_tree(s, desc)
+    deflate_state *s;
+    tree_desc *desc; /* the tree descriptor */
+{
+    ct_data *tree         = desc->dyn_tree;
+    const ct_data *stree  = desc->stat_desc->static_tree;
+    int elems             = desc->stat_desc->elems;
+    int n, m;          /* iterate over heap elements */
+    int max_code = -1; /* largest code with non zero frequency */
+    int node;          /* new node being created */
+
+    /* Construct the initial heap, with least frequent element in
+     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
+     * heap[0] is not used.
+     */
+    s->heap_len = 0, s->heap_max = HEAP_SIZE;
+
+    for (n = 0; n < elems; n++) {
+        if (tree[n].Freq != 0) {
+            s->heap[++(s->heap_len)] = max_code = n;
+            s->depth[n] = 0;
+        } else {
+            tree[n].Len = 0;
+        }
+    }
+
+    /* The pkzip format requires that at least one distance code exists,
+     * and that at least one bit should be sent even if there is only one
+     * possible code. So to avoid special checks later on we force at least
+     * two codes of non zero frequency.
+     */
+    while (s->heap_len < 2) {
+        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
+        tree[node].Freq = 1;
+        s->depth[node] = 0;
+        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
+        /* node is 0 or 1 so it does not have extra bits */
+    }
+    desc->max_code = max_code;
+
+    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
+     * establish sub-heaps of increasing lengths:
+     */
+    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
+
+    /* Construct the Huffman tree by repeatedly combining the least two
+     * frequent nodes.
+     */
+    node = elems;              /* next internal node of the tree */
+    do {
+        pqremove(s, tree, n);  /* n = node of least frequency */
+        m = s->heap[SMALLEST]; /* m = node of next least frequency */
+
+        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
+        s->heap[--(s->heap_max)] = m;
+
+        /* Create a new node father of n and m */
+        tree[node].Freq = tree[n].Freq + tree[m].Freq;
+        s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ?
+                                s->depth[n] : s->depth[m]) + 1);
+        tree[n].Dad = tree[m].Dad = (ush)node;
+#ifdef DUMP_BL_TREE
+        if (tree == s->bl_tree) {
+            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
+                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
+        }
+#endif
+        /* and insert the new node in the heap */
+        s->heap[SMALLEST] = node++;
+        pqdownheap(s, tree, SMALLEST);
+
+    } while (s->heap_len >= 2);
+
+    s->heap[--(s->heap_max)] = s->heap[SMALLEST];
+
+    /* At this point, the fields freq and dad are set. We can now
+     * generate the bit lengths.
+     */
+    gen_bitlen(s, (tree_desc *)desc);
+
+    /* The field len is now set, we can generate the bit codes */
+    gen_codes ((ct_data *)tree, max_code, s->bl_count);
+}
+
+/* ===========================================================================
+ * Scan a literal or distance tree to determine the frequencies of the codes
+ * in the bit length tree.
+ */
+local void scan_tree (s, tree, max_code)
+    deflate_state *s;
+    ct_data *tree;   /* the tree to be scanned */
+    int max_code;    /* and its largest code of non zero frequency */
+{
+    int n;                     /* iterates over all tree elements */
+    int prevlen = -1;          /* last emitted length */
+    int curlen;                /* length of current code */
+    int nextlen = tree[0].Len; /* length of next code */
+    int count = 0;             /* repeat count of the current code */
+    int max_count = 7;         /* max repeat count */
+    int min_count = 4;         /* min repeat count */
+
+    if (nextlen == 0) max_count = 138, min_count = 3;
+    tree[max_code+1].Len = (ush)0xffff; /* guard */
+
+    for (n = 0; n <= max_code; n++) {
+        curlen = nextlen; nextlen = tree[n+1].Len;
+        if (++count < max_count && curlen == nextlen) {
+            continue;
+        } else if (count < min_count) {
+            s->bl_tree[curlen].Freq += count;
+        } else if (curlen != 0) {
+            if (curlen != prevlen) s->bl_tree[curlen].Freq++;
+            s->bl_tree[REP_3_6].Freq++;
+        } else if (count <= 10) {
+            s->bl_tree[REPZ_3_10].Freq++;
+        } else {
+            s->bl_tree[REPZ_11_138].Freq++;
+        }
+        count = 0; prevlen = curlen;
+        if (nextlen == 0) {
+            max_count = 138, min_count = 3;
+        } else if (curlen == nextlen) {
+            max_count = 6, min_count = 3;
+        } else {
+            max_count = 7, min_count = 4;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Send a literal or distance tree in compressed form, using the codes in
+ * bl_tree.
+ */
+local void send_tree (s, tree, max_code)
+    deflate_state *s;
+    ct_data *tree; /* the tree to be scanned */
+    int max_code;       /* and its largest code of non zero frequency */
+{
+    int n;                     /* iterates over all tree elements */
+    int prevlen = -1;          /* last emitted length */
+    int curlen;                /* length of current code */
+    int nextlen = tree[0].Len; /* length of next code */
+    int count = 0;             /* repeat count of the current code */
+    int max_count = 7;         /* max repeat count */
+    int min_count = 4;         /* min repeat count */
+
+    /* tree[max_code+1].Len = -1; */  /* guard already set */
+    if (nextlen == 0) max_count = 138, min_count = 3;
+
+    for (n = 0; n <= max_code; n++) {
+        curlen = nextlen; nextlen = tree[n+1].Len;
+        if (++count < max_count && curlen == nextlen) {
+            continue;
+        } else if (count < min_count) {
+            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
+
+        } else if (curlen != 0) {
+            if (curlen != prevlen) {
+                send_code(s, curlen, s->bl_tree); count--;
+            }
+            Assert(count >= 3 && count <= 6, " 3_6?");
+            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
+
+        } else if (count <= 10) {
+            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
+
+        } else {
+            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
+        }
+        count = 0; prevlen = curlen;
+        if (nextlen == 0) {
+            max_count = 138, min_count = 3;
+        } else if (curlen == nextlen) {
+            max_count = 6, min_count = 3;
+        } else {
+            max_count = 7, min_count = 4;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Construct the Huffman tree for the bit lengths and return the index in
+ * bl_order of the last bit length code to send.
+ */
+local int build_bl_tree(s)
+    deflate_state *s;
+{
+    int max_blindex;  /* index of last bit length code of non zero freq */
+
+    /* Determine the bit length frequencies for literal and distance trees */
+    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
+    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
+
+    /* Build the bit length tree: */
+    build_tree(s, (tree_desc *)(&(s->bl_desc)));
+    /* opt_len now includes the length of the tree representations, except
+     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
+     */
+
+    /* Determine the number of bit length codes to send. The pkzip format
+     * requires that at least 4 bit length codes be sent. (appnote.txt says
+     * 3 but the actual value used is 4.)
+     */
+    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
+        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
+    }
+    /* Update opt_len to include the bit length tree and counts */
+    s->opt_len += 3*(max_blindex+1) + 5+5+4;
+    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
+            s->opt_len, s->static_len));
+
+    return max_blindex;
+}
+
+/* ===========================================================================
+ * Send the header for a block using dynamic Huffman trees: the counts, the
+ * lengths of the bit length codes, the literal tree and the distance tree.
+ * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
+ */
+local void send_all_trees(s, lcodes, dcodes, blcodes)
+    deflate_state *s;
+    int lcodes, dcodes, blcodes; /* number of codes for each tree */
+{
+    int rank;                    /* index in bl_order */
+
+    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
+    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
+            "too many codes");
+    Tracev((stderr, "\nbl counts: "));
+    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
+    send_bits(s, dcodes-1,   5);
+    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
+    for (rank = 0; rank < blcodes; rank++) {
+        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
+        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
+    }
+    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
+
+    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
+    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
+
+    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
+    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
+}
+
+/* ===========================================================================
+ * Send a stored block
+ */
+void _tr_stored_block(s, buf, stored_len, eof)
+    deflate_state *s;
+    charf *buf;       /* input block */
+    ulg stored_len;   /* length of input block */
+    int eof;          /* true if this is the last block for a file */
+{
+    send_bits(s, (STORED_BLOCK<<1)+eof, 3);  /* send block type */
+#ifdef DEBUG
+    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
+    s->compressed_len += (stored_len + 4) << 3;
+#endif
+    copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
+}
+
+/* ===========================================================================
+ * Send one empty static block to give enough lookahead for inflate.
+ * This takes 10 bits, of which 7 may remain in the bit buffer.
+ * The current inflate code requires 9 bits of lookahead. If the
+ * last two codes for the previous block (real code plus EOB) were coded
+ * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode
+ * the last real code. In this case we send two empty static blocks instead
+ * of one. (There are no problems if the previous block is stored or fixed.)
+ * To simplify the code, we assume the worst case of last real code encoded
+ * on one bit only.
+ */
+void _tr_align(s)
+    deflate_state *s;
+{
+    send_bits(s, STATIC_TREES<<1, 3);
+    send_code(s, END_BLOCK, static_ltree);
+#ifdef DEBUG
+    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
+#endif
+    bi_flush(s);
+    /* Of the 10 bits for the empty block, we have already sent
+     * (10 - bi_valid) bits. The lookahead for the last real code (before
+     * the EOB of the previous block) was thus at least one plus the length
+     * of the EOB plus what we have just sent of the empty static block.
+     */
+    if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {
+        send_bits(s, STATIC_TREES<<1, 3);
+        send_code(s, END_BLOCK, static_ltree);
+#ifdef DEBUG
+        s->compressed_len += 10L;
+#endif
+        bi_flush(s);
+    }
+    s->last_eob_len = 7;
+}
+
+/* ===========================================================================
+ * Determine the best encoding for the current block: dynamic trees, static
+ * trees or store, and output the encoded block to the zip file.
+ */
+void _tr_flush_block(s, buf, stored_len, eof)
+    deflate_state *s;
+    charf *buf;       /* input block, or NULL if too old */
+    ulg stored_len;   /* length of input block */
+    int eof;          /* true if this is the last block for a file */
+{
+    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
+    int max_blindex = 0;  /* index of last bit length code of non zero freq */
+
+    /* Build the Huffman trees unless a stored block is forced */
+    if (s->level > 0) {
+
+        /* Check if the file is binary or text */
+        if (stored_len > 0 && s->strm->data_type == Z_UNKNOWN)
+            set_data_type(s);
+
+        /* Construct the literal and distance trees */
+        build_tree(s, (tree_desc *)(&(s->l_desc)));
+        Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
+                s->static_len));
+
+        build_tree(s, (tree_desc *)(&(s->d_desc)));
+        Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
+                s->static_len));
+        /* At this point, opt_len and static_len are the total bit lengths of
+         * the compressed block data, excluding the tree representations.
+         */
+
+        /* Build the bit length tree for the above two trees, and get the index
+         * in bl_order of the last bit length code to send.
+         */
+        max_blindex = build_bl_tree(s);
+
+        /* Determine the best encoding. Compute the block lengths in bytes. */
+        opt_lenb = (s->opt_len+3+7)>>3;
+        static_lenb = (s->static_len+3+7)>>3;
+
+        Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
+                opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
+                s->last_lit));
+
+        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+
+    } else {
+        Assert(buf != (char*)0, "lost buf");
+        opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
+    }
+
+#ifdef FORCE_STORED
+    if (buf != (char*)0) { /* force stored block */
+#else
+    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
+                       /* 4: two words for the lengths */
+#endif
+        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
+         * Otherwise we can't have processed more than WSIZE input bytes since
+         * the last block flush, because compression would have been
+         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
+         * transform a block into a stored block.
+         */
+        _tr_stored_block(s, buf, stored_len, eof);
+
+#ifdef FORCE_STATIC
+    } else if (static_lenb >= 0) { /* force static trees */
+#else
+    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
+#endif
+        send_bits(s, (STATIC_TREES<<1)+eof, 3);
+        compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
+#ifdef DEBUG
+        s->compressed_len += 3 + s->static_len;
+#endif
+    } else {
+        send_bits(s, (DYN_TREES<<1)+eof, 3);
+        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
+                       max_blindex+1);
+        compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);
+#ifdef DEBUG
+        s->compressed_len += 3 + s->opt_len;
+#endif
+    }
+    Assert (s->compressed_len == s->bits_sent, "bad compressed size");
+    /* The above check is made mod 2^32, for files larger than 512 MB
+     * and uLong implemented on 32 bits.
+     */
+    init_block(s);
+
+    if (eof) {
+        bi_windup(s);
+#ifdef DEBUG
+        s->compressed_len += 7;  /* align on byte boundary */
+#endif
+    }
+    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
+           s->compressed_len-7*eof));
+}
+
+/* ===========================================================================
+ * Save the match info and tally the frequency counts. Return true if
+ * the current block must be flushed.
+ */
+int _tr_tally (s, dist, lc)
+    deflate_state *s;
+    unsigned dist;  /* distance of matched string */
+    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
+{
+    s->d_buf[s->last_lit] = (ush)dist;
+    s->l_buf[s->last_lit++] = (uch)lc;
+    if (dist == 0) {
+        /* lc is the unmatched char */
+        s->dyn_ltree[lc].Freq++;
+    } else {
+        s->matches++;
+        /* Here, lc is the match length - MIN_MATCH */
+        dist--;             /* dist = match distance - 1 */
+        Assert((ush)dist < (ush)MAX_DIST(s) &&
+               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
+               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
+
+        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
+        s->dyn_dtree[d_code(dist)].Freq++;
+    }
+
+#ifdef TRUNCATE_BLOCK
+    /* Try to guess if it is profitable to stop the current block here */
+    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
+        /* Compute an upper bound for the compressed length */
+        ulg out_length = (ulg)s->last_lit*8L;
+        ulg in_length = (ulg)((long)s->strstart - s->block_start);
+        int dcode;
+        for (dcode = 0; dcode < D_CODES; dcode++) {
+            out_length += (ulg)s->dyn_dtree[dcode].Freq *
+                (5L+extra_dbits[dcode]);
+        }
+        out_length >>= 3;
+        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
+               s->last_lit, in_length, out_length,
+               100L - out_length*100L/in_length));
+        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
+    }
+#endif
+    return (s->last_lit == s->lit_bufsize-1);
+    /* We avoid equality with lit_bufsize because of wraparound at 64K
+     * on 16 bit machines and because stored blocks are restricted to
+     * 64K-1 bytes.
+     */
+}
+
+/* ===========================================================================
+ * Send the block data compressed using the given Huffman trees
+ */
+local void compress_block(s, ltree, dtree)
+    deflate_state *s;
+    ct_data *ltree; /* literal tree */
+    ct_data *dtree; /* distance tree */
+{
+    unsigned dist;      /* distance of matched string */
+    int lc;             /* match length or unmatched char (if dist == 0) */
+    unsigned lx = 0;    /* running index in l_buf */
+    unsigned code;      /* the code to send */
+    int extra;          /* number of extra bits to send */
+
+    if (s->last_lit != 0) do {
+        dist = s->d_buf[lx];
+        lc = s->l_buf[lx++];
+        if (dist == 0) {
+            send_code(s, lc, ltree); /* send a literal byte */
+            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
+        } else {
+            /* Here, lc is the match length - MIN_MATCH */
+            code = _length_code[lc];
+            send_code(s, code+LITERALS+1, ltree); /* send the length code */
+            extra = extra_lbits[code];
+            if (extra != 0) {
+                lc -= base_length[code];
+                send_bits(s, lc, extra);       /* send the extra length bits */
+            }
+            dist--; /* dist is now the match distance - 1 */
+            code = d_code(dist);
+            Assert (code < D_CODES, "bad d_code");
+
+            send_code(s, code, dtree);       /* send the distance code */
+            extra = extra_dbits[code];
+            if (extra != 0) {
+                dist -= base_dist[code];
+                send_bits(s, dist, extra);   /* send the extra distance bits */
+            }
+        } /* literal or match pair ? */
+
+        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
+        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
+               "pendingBuf overflow");
+
+    } while (lx < s->last_lit);
+
+    send_code(s, END_BLOCK, ltree);
+    s->last_eob_len = ltree[END_BLOCK].Len;
+}
+
+/* ===========================================================================
+ * Set the data type to BINARY or TEXT, using a crude approximation:
+ * set it to Z_TEXT if all symbols are either printable characters (33 to 255)
+ * or white spaces (9 to 13, or 32); or set it to Z_BINARY otherwise.
+ * IN assertion: the fields Freq of dyn_ltree are set.
+ */
+local void set_data_type(s)
+    deflate_state *s;
+{
+    int n;
+
+    for (n = 0; n < 9; n++)
+        if (s->dyn_ltree[n].Freq != 0)
+            break;
+    if (n == 9)
+        for (n = 14; n < 32; n++)
+            if (s->dyn_ltree[n].Freq != 0)
+                break;
+    s->strm->data_type = (n == 32) ? Z_TEXT : Z_BINARY;
+}
+
+/* ===========================================================================
+ * Reverse the first len bits of a code, using straightforward code (a faster
+ * method would use a table)
+ * IN assertion: 1 <= len <= 15
+ */
+local unsigned bi_reverse(code, len)
+    unsigned code; /* the value to invert */
+    int len;       /* its bit length */
+{
+    register unsigned res = 0;
+    do {
+        res |= code & 1;
+        code >>= 1, res <<= 1;
+    } while (--len > 0);
+    return res >> 1;
+}
+
+/* ===========================================================================
+ * Flush the bit buffer, keeping at most 7 bits in it.
+ */
+local void bi_flush(s)
+    deflate_state *s;
+{
+    if (s->bi_valid == 16) {
+        put_short(s, s->bi_buf);
+        s->bi_buf = 0;
+        s->bi_valid = 0;
+    } else if (s->bi_valid >= 8) {
+        put_byte(s, (Byte)s->bi_buf);
+        s->bi_buf >>= 8;
+        s->bi_valid -= 8;
+    }
+}
+
+/* ===========================================================================
+ * Flush the bit buffer and align the output on a byte boundary
+ */
+local void bi_windup(s)
+    deflate_state *s;
+{
+    if (s->bi_valid > 8) {
+        put_short(s, s->bi_buf);
+    } else if (s->bi_valid > 0) {
+        put_byte(s, (Byte)s->bi_buf);
+    }
+    s->bi_buf = 0;
+    s->bi_valid = 0;
+#ifdef DEBUG
+    s->bits_sent = (s->bits_sent+7) & ~7;
+#endif
+}
+
+/* ===========================================================================
+ * Copy a stored block, storing first the length and its
+ * one's complement if requested.
+ */
+local void copy_block(s, buf, len, header)
+    deflate_state *s;
+    charf    *buf;    /* the input data */
+    unsigned len;     /* its length */
+    int      header;  /* true if block header must be written */
+{
+    bi_windup(s);        /* align on byte boundary */
+    s->last_eob_len = 8; /* enough lookahead for inflate */
+
+    if (header) {
+        put_short(s, (ush)len);
+        put_short(s, (ush)~len);
+#ifdef DEBUG
+        s->bits_sent += 2*16;
+#endif
+    }
+#ifdef DEBUG
+    s->bits_sent += (ulg)len<<3;
+#endif
+    while (len--) {
+        put_byte(s, *buf++);
+    }
+}
diff --git a/utils/zenutils/libraries/zlib123/zlib/trees.h b/utils/zenutils/libraries/zlib123/zlib/trees.h
index 1ca868b848..72facf900f 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/trees.h
+++ b/utils/zenutils/libraries/zlib123/zlib/trees.h
@@ -1,128 +1,128 @@
-/* header created automatically with -DGEN_TREES_H */

-

-local const ct_data static_ltree[L_CODES+2] = {

-{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},

-{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},

-{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},

-{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},

-{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},

-{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},

-{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},

-{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},

-{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},

-{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},

-{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},

-{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},

-{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},

-{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},

-{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},

-{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},

-{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},

-{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},

-{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},

-{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},

-{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},

-{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},

-{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},

-{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},

-{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},

-{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},

-{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},

-{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},

-{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},

-{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},

-{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},

-{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},

-{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},

-{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},

-{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},

-{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},

-{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},

-{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},

-{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},

-{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},

-{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},

-{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},

-{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},

-{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},

-{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},

-{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},

-{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},

-{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},

-{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},

-{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},

-{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},

-{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},

-{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},

-{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},

-{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},

-{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},

-{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},

-{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}

-};

-

-local const ct_data static_dtree[D_CODES] = {

-{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},

-{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},

-{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},

-{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},

-{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},

-{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}

-};

-

-const uch _dist_code[DIST_CODE_LEN] = {

- 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,

- 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,

-10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,

-11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,

-12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,

-13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,

-13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,

-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,

-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,

-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,

-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,

-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,

-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,

-18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,

-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,

-24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,

-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,

-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,

-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,

-27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,

-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,

-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,

-28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,

-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,

-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,

-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29

-};

-

-const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {

- 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,

-13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,

-17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,

-19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,

-21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,

-22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,

-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,

-24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,

-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,

-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,

-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,

-26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,

-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28

-};

-

-local const int base_length[LENGTH_CODES] = {

-0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,

-64, 80, 96, 112, 128, 160, 192, 224, 0

-};

-

-local const int base_dist[D_CODES] = {

-    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,

-   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,

- 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576

-};

-

+/* header created automatically with -DGEN_TREES_H */
+
+local const ct_data static_ltree[L_CODES+2] = {
+{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},
+{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},
+{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},
+{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},
+{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},
+{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},
+{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},
+{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},
+{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},
+{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},
+{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},
+{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},
+{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},
+{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},
+{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},
+{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},
+{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},
+{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},
+{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},
+{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},
+{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},
+{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},
+{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},
+{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},
+{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},
+{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},
+{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},
+{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},
+{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},
+{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},
+{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},
+{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},
+{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},
+{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},
+{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},
+{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},
+{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},
+{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},
+{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},
+{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},
+{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},
+{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},
+{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},
+{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},
+{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},
+{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},
+{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},
+{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},
+{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},
+{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},
+{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},
+{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},
+{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},
+{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},
+{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},
+{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},
+{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},
+{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}
+};
+
+local const ct_data static_dtree[D_CODES] = {
+{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
+{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
+{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
+{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
+{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
+{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
+};
+
+const uch _dist_code[DIST_CODE_LEN] = {
+ 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
+ 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
+10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
+13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,
+18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
+};
+
+const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {
+ 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
+13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
+17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
+19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
+22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
+};
+
+local const int base_length[LENGTH_CODES] = {
+0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
+64, 80, 96, 112, 128, 160, 192, 224, 0
+};
+
+local const int base_dist[D_CODES] = {
+    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,
+   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
+ 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
+};
+
diff --git a/utils/zenutils/libraries/zlib123/zlib/uncompr.c b/utils/zenutils/libraries/zlib123/zlib/uncompr.c
index ad6db0a67c..b59e3d0def 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/uncompr.c
+++ b/utils/zenutils/libraries/zlib123/zlib/uncompr.c
@@ -1,61 +1,61 @@
-/* uncompr.c -- decompress a memory buffer

- * Copyright (C) 1995-2003 Jean-loup Gailly.

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* @(#) $Id$ */

-

-#define ZLIB_INTERNAL

-#include "zlib.h"

-

-/* ===========================================================================

-     Decompresses the source buffer into the destination buffer.  sourceLen is

-   the byte length of the source buffer. Upon entry, destLen is the total

-   size of the destination buffer, which must be large enough to hold the

-   entire uncompressed data. (The size of the uncompressed data must have

-   been saved previously by the compressor and transmitted to the decompressor

-   by some mechanism outside the scope of this compression library.)

-   Upon exit, destLen is the actual size of the compressed buffer.

-     This function can be used to decompress a whole file at once if the

-   input file is mmap'ed.

-

-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not

-   enough memory, Z_BUF_ERROR if there was not enough room in the output

-   buffer, or Z_DATA_ERROR if the input data was corrupted.

-*/

-int ZEXPORT uncompress (dest, destLen, source, sourceLen)

-    Bytef *dest;

-    uLongf *destLen;

-    const Bytef *source;

-    uLong sourceLen;

-{

-    z_stream stream;

-    int err;

-

-    stream.next_in = (Bytef*)source;

-    stream.avail_in = (uInt)sourceLen;

-    /* Check for source > 64K on 16-bit machine: */

-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;

-

-    stream.next_out = dest;

-    stream.avail_out = (uInt)*destLen;

-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;

-

-    stream.zalloc = (alloc_func)0;

-    stream.zfree = (free_func)0;

-

-    err = inflateInit(&stream);

-    if (err != Z_OK) return err;

-

-    err = inflate(&stream, Z_FINISH);

-    if (err != Z_STREAM_END) {

-        inflateEnd(&stream);

-        if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))

-            return Z_DATA_ERROR;

-        return err;

-    }

-    *destLen = stream.total_out;

-

-    err = inflateEnd(&stream);

-    return err;

-}

+/* uncompr.c -- decompress a memory buffer
+ * Copyright (C) 1995-2003 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#define ZLIB_INTERNAL
+#include "zlib.h"
+
+/* ===========================================================================
+     Decompresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be large enough to hold the
+   entire uncompressed data. (The size of the uncompressed data must have
+   been saved previously by the compressor and transmitted to the decompressor
+   by some mechanism outside the scope of this compression library.)
+   Upon exit, destLen is the actual size of the compressed buffer.
+     This function can be used to decompress a whole file at once if the
+   input file is mmap'ed.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer, or Z_DATA_ERROR if the input data was corrupted.
+*/
+int ZEXPORT uncompress (dest, destLen, source, sourceLen)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+{
+    z_stream stream;
+    int err;
+
+    stream.next_in = (Bytef*)source;
+    stream.avail_in = (uInt)sourceLen;
+    /* Check for source > 64K on 16-bit machine: */
+    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
+
+    stream.next_out = dest;
+    stream.avail_out = (uInt)*destLen;
+    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
+
+    stream.zalloc = (alloc_func)0;
+    stream.zfree = (free_func)0;
+
+    err = inflateInit(&stream);
+    if (err != Z_OK) return err;
+
+    err = inflate(&stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        inflateEnd(&stream);
+        if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
+            return Z_DATA_ERROR;
+        return err;
+    }
+    *destLen = stream.total_out;
+
+    err = inflateEnd(&stream);
+    return err;
+}
diff --git a/utils/zenutils/libraries/zlib123/zlib/zconf.h b/utils/zenutils/libraries/zlib123/zlib/zconf.h
index e3b0c962e3..03a9431c8b 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/zconf.h
+++ b/utils/zenutils/libraries/zlib123/zlib/zconf.h
@@ -1,332 +1,332 @@
-/* zconf.h -- configuration of the zlib compression library

- * Copyright (C) 1995-2005 Jean-loup Gailly.

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* @(#) $Id$ */

-

-#ifndef ZCONF_H

-#define ZCONF_H

-

-/*

- * If you *really* need a unique prefix for all types and library functions,

- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.

- */

-#ifdef Z_PREFIX

-#  define deflateInit_          z_deflateInit_

-#  define deflate               z_deflate

-#  define deflateEnd            z_deflateEnd

-#  define inflateInit_          z_inflateInit_

-#  define inflate               z_inflate

-#  define inflateEnd            z_inflateEnd

-#  define deflateInit2_         z_deflateInit2_

-#  define deflateSetDictionary  z_deflateSetDictionary

-#  define deflateCopy           z_deflateCopy

-#  define deflateReset          z_deflateReset

-#  define deflateParams         z_deflateParams

-#  define deflateBound          z_deflateBound

-#  define deflatePrime          z_deflatePrime

-#  define inflateInit2_         z_inflateInit2_

-#  define inflateSetDictionary  z_inflateSetDictionary

-#  define inflateSync           z_inflateSync

-#  define inflateSyncPoint      z_inflateSyncPoint

-#  define inflateCopy           z_inflateCopy

-#  define inflateReset          z_inflateReset

-#  define inflateBack           z_inflateBack

-#  define inflateBackEnd        z_inflateBackEnd

-#  define compress              z_compress

-#  define compress2             z_compress2

-#  define compressBound         z_compressBound

-#  define uncompress            z_uncompress

-#  define adler32               z_adler32

-#  define crc32                 z_crc32

-#  define get_crc_table         z_get_crc_table

-#  define zError                z_zError

-

-#  define alloc_func            z_alloc_func

-#  define free_func             z_free_func

-#  define in_func               z_in_func

-#  define out_func              z_out_func

-#  define Byte                  z_Byte

-#  define uInt                  z_uInt

-#  define uLong                 z_uLong

-#  define Bytef                 z_Bytef

-#  define charf                 z_charf

-#  define intf                  z_intf

-#  define uIntf                 z_uIntf

-#  define uLongf                z_uLongf

-#  define voidpf                z_voidpf

-#  define voidp                 z_voidp

-#endif

-

-#if defined(__MSDOS__) && !defined(MSDOS)

-#  define MSDOS

-#endif

-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)

-#  define OS2

-#endif

-#if defined(_WINDOWS) && !defined(WINDOWS)

-#  define WINDOWS

-#endif

-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)

-#  ifndef WIN32

-#    define WIN32

-#  endif

-#endif

-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)

-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)

-#    ifndef SYS16BIT

-#      define SYS16BIT

-#    endif

-#  endif

-#endif

-

-/*

- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more

- * than 64k bytes at a time (needed on systems with 16-bit int).

- */

-#ifdef SYS16BIT

-#  define MAXSEG_64K

-#endif

-#ifdef MSDOS

-#  define UNALIGNED_OK

-#endif

-

-#ifdef __STDC_VERSION__

-#  ifndef STDC

-#    define STDC

-#  endif

-#  if __STDC_VERSION__ >= 199901L

-#    ifndef STDC99

-#      define STDC99

-#    endif

-#  endif

-#endif

-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))

-#  define STDC

-#endif

-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))

-#  define STDC

-#endif

-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))

-#  define STDC

-#endif

-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))

-#  define STDC

-#endif

-

-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */

-#  define STDC

-#endif

-

-#ifndef STDC

-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */

-#    define const       /* note: need a more gentle solution here */

-#  endif

-#endif

-

-/* Some Mac compilers merge all .h files incorrectly: */

-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)

-#  define NO_DUMMY_DECL

-#endif

-

-/* Maximum value for memLevel in deflateInit2 */

-#ifndef MAX_MEM_LEVEL

-#  ifdef MAXSEG_64K

-#    define MAX_MEM_LEVEL 8

-#  else

-#    define MAX_MEM_LEVEL 9

-#  endif

-#endif

-

-/* Maximum value for windowBits in deflateInit2 and inflateInit2.

- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files

- * created by gzip. (Files created by minigzip can still be extracted by

- * gzip.)

- */

-#ifndef MAX_WBITS

-#  define MAX_WBITS   15 /* 32K LZ77 window */

-#endif

-

-/* The memory requirements for deflate are (in bytes):

-            (1 << (windowBits+2)) +  (1 << (memLevel+9))

- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)

- plus a few kilobytes for small objects. For example, if you want to reduce

- the default memory requirements from 256K to 128K, compile with

-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"

- Of course this will generally degrade compression (there's no free lunch).

-

-   The memory requirements for inflate are (in bytes) 1 << windowBits

- that is, 32K for windowBits=15 (default value) plus a few kilobytes

- for small objects.

-*/

-

-                        /* Type declarations */

-

-#ifndef OF /* function prototypes */

-#  ifdef STDC

-#    define OF(args)  args

-#  else

-#    define OF(args)  ()

-#  endif

-#endif

-

-/* The following definitions for FAR are needed only for MSDOS mixed

- * model programming (small or medium model with some far allocations).

- * This was tested only with MSC; for other MSDOS compilers you may have

- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,

- * just define FAR to be empty.

- */

-#ifdef SYS16BIT

-#  if defined(M_I86SM) || defined(M_I86MM)

-     /* MSC small or medium model */

-#    define SMALL_MEDIUM

-#    ifdef _MSC_VER

-#      define FAR _far

-#    else

-#      define FAR far

-#    endif

-#  endif

-#  if (defined(__SMALL__) || defined(__MEDIUM__))

-     /* Turbo C small or medium model */

-#    define SMALL_MEDIUM

-#    ifdef __BORLANDC__

-#      define FAR _far

-#    else

-#      define FAR far

-#    endif

-#  endif

-#endif

-

-#if defined(WINDOWS) || defined(WIN32)

-   /* If building or using zlib as a DLL, define ZLIB_DLL.

-    * This is not mandatory, but it offers a little performance increase.

-    */

-#  ifdef ZLIB_DLL

-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))

-#      ifdef ZLIB_INTERNAL

-#        define ZEXTERN extern __declspec(dllexport)

-#      else

-#        define ZEXTERN extern __declspec(dllimport)

-#      endif

-#    endif

-#  endif  /* ZLIB_DLL */

-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,

-    * define ZLIB_WINAPI.

-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.

-    */

-#  ifdef ZLIB_WINAPI

-#    ifdef FAR

-#      undef FAR

-#    endif

-#    include <windows.h>

-     /* No need for _export, use ZLIB.DEF instead. */

-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */

-#    define ZEXPORT WINAPI

-#    ifdef WIN32

-#      define ZEXPORTVA WINAPIV

-#    else

-#      define ZEXPORTVA FAR CDECL

-#    endif

-#  endif

-#endif

-

-#if defined (__BEOS__)

-#  ifdef ZLIB_DLL

-#    ifdef ZLIB_INTERNAL

-#      define ZEXPORT   __declspec(dllexport)

-#      define ZEXPORTVA __declspec(dllexport)

-#    else

-#      define ZEXPORT   __declspec(dllimport)

-#      define ZEXPORTVA __declspec(dllimport)

-#    endif

-#  endif

-#endif

-

-#ifndef ZEXTERN

-#  define ZEXTERN extern

-#endif

-#ifndef ZEXPORT

-#  define ZEXPORT

-#endif

-#ifndef ZEXPORTVA

-#  define ZEXPORTVA

-#endif

-

-#ifndef FAR

-#  define FAR

-#endif

-

-#if !defined(__MACTYPES__)

-typedef unsigned char  Byte;  /* 8 bits */

-#endif

-typedef unsigned int   uInt;  /* 16 bits or more */

-typedef unsigned long  uLong; /* 32 bits or more */

-

-#ifdef SMALL_MEDIUM

-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */

-#  define Bytef Byte FAR

-#else

-   typedef Byte  FAR Bytef;

-#endif

-typedef char  FAR charf;

-typedef int   FAR intf;

-typedef uInt  FAR uIntf;

-typedef uLong FAR uLongf;

-

-#ifdef STDC

-   typedef void const *voidpc;

-   typedef void FAR   *voidpf;

-   typedef void       *voidp;

-#else

-   typedef Byte const *voidpc;

-   typedef Byte FAR   *voidpf;

-   typedef Byte       *voidp;

-#endif

-

-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */

-#  include <sys/types.h> /* for off_t */

-#  include <unistd.h>    /* for SEEK_* and off_t */

-#  ifdef VMS

-#    include <unixio.h>   /* for off_t */

-#  endif

-#  define z_off_t off_t

-#endif

-#ifndef SEEK_SET

-#  define SEEK_SET        0       /* Seek from beginning of file.  */

-#  define SEEK_CUR        1       /* Seek from current position.  */

-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */

-#endif

-#ifndef z_off_t

-#  define z_off_t long

-#endif

-

-#if defined(__OS400__)

-#  define NO_vsnprintf

-#endif

-

-#if defined(__MVS__)

-#  define NO_vsnprintf

-#  ifdef FAR

-#    undef FAR

-#  endif

-#endif

-

-/* MVS linker does not support external names larger than 8 bytes */

-#if defined(__MVS__)

-#   pragma map(deflateInit_,"DEIN")

-#   pragma map(deflateInit2_,"DEIN2")

-#   pragma map(deflateEnd,"DEEND")

-#   pragma map(deflateBound,"DEBND")

-#   pragma map(inflateInit_,"ININ")

-#   pragma map(inflateInit2_,"ININ2")

-#   pragma map(inflateEnd,"INEND")

-#   pragma map(inflateSync,"INSY")

-#   pragma map(inflateSetDictionary,"INSEDI")

-#   pragma map(compressBound,"CMBND")

-#   pragma map(inflate_table,"INTABL")

-#   pragma map(inflate_fast,"INFA")

-#   pragma map(inflate_copyright,"INCOPY")

-#endif

-

-#endif /* ZCONF_H */

+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZCONF_H
+#define ZCONF_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ */
+#ifdef Z_PREFIX
+#  define deflateInit_          z_deflateInit_
+#  define deflate               z_deflate
+#  define deflateEnd            z_deflateEnd
+#  define inflateInit_          z_inflateInit_
+#  define inflate               z_inflate
+#  define inflateEnd            z_inflateEnd
+#  define deflateInit2_         z_deflateInit2_
+#  define deflateSetDictionary  z_deflateSetDictionary
+#  define deflateCopy           z_deflateCopy
+#  define deflateReset          z_deflateReset
+#  define deflateParams         z_deflateParams
+#  define deflateBound          z_deflateBound
+#  define deflatePrime          z_deflatePrime
+#  define inflateInit2_         z_inflateInit2_
+#  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateSync           z_inflateSync
+#  define inflateSyncPoint      z_inflateSyncPoint
+#  define inflateCopy           z_inflateCopy
+#  define inflateReset          z_inflateReset
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
+#  define compress              z_compress
+#  define compress2             z_compress2
+#  define compressBound         z_compressBound
+#  define uncompress            z_uncompress
+#  define adler32               z_adler32
+#  define crc32                 z_crc32
+#  define get_crc_table         z_get_crc_table
+#  define zError                z_zError
+
+#  define alloc_func            z_alloc_func
+#  define free_func             z_free_func
+#  define in_func               z_in_func
+#  define out_func              z_out_func
+#  define Byte                  z_Byte
+#  define uInt                  z_uInt
+#  define uLong                 z_uLong
+#  define Bytef                 z_Bytef
+#  define charf                 z_charf
+#  define intf                  z_intf
+#  define uIntf                 z_uIntf
+#  define uLongf                z_uLongf
+#  define voidpf                z_voidpf
+#  define voidp                 z_voidp
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+#  define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+#  define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+#  define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#  ifndef WIN32
+#    define WIN32
+#  endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+#    ifndef SYS16BIT
+#      define SYS16BIT
+#    endif
+#  endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+#  define MAXSEG_64K
+#endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+#  ifndef STDC
+#    define STDC
+#  endif
+#  if __STDC_VERSION__ >= 199901L
+#    ifndef STDC99
+#      define STDC99
+#    endif
+#  endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+#  define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
+#  define STDC
+#endif
+
+#ifndef STDC
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#    define const       /* note: need a more gentle solution here */
+#  endif
+#endif
+
+/* Some Mac compilers merge all .h files incorrectly: */
+#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
+#  define NO_DUMMY_DECL
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+#  ifdef MAXSEG_64K
+#    define MAX_MEM_LEVEL 8
+#  else
+#    define MAX_MEM_LEVEL 9
+#  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ for small objects.
+*/
+
+                        /* Type declarations */
+
+#ifndef OF /* function prototypes */
+#  ifdef STDC
+#    define OF(args)  args
+#  else
+#    define OF(args)  ()
+#  endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+#  if defined(M_I86SM) || defined(M_I86MM)
+     /* MSC small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef _MSC_VER
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#  if (defined(__SMALL__) || defined(__MEDIUM__))
+     /* Turbo C small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef __BORLANDC__
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+   /* If building or using zlib as a DLL, define ZLIB_DLL.
+    * This is not mandatory, but it offers a little performance increase.
+    */
+#  ifdef ZLIB_DLL
+#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#      ifdef ZLIB_INTERNAL
+#        define ZEXTERN extern __declspec(dllexport)
+#      else
+#        define ZEXTERN extern __declspec(dllimport)
+#      endif
+#    endif
+#  endif  /* ZLIB_DLL */
+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+    * define ZLIB_WINAPI.
+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+    */
+#  ifdef ZLIB_WINAPI
+#    ifdef FAR
+#      undef FAR
+#    endif
+#    include <windows.h>
+     /* No need for _export, use ZLIB.DEF instead. */
+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+#    define ZEXPORT WINAPI
+#    ifdef WIN32
+#      define ZEXPORTVA WINAPIV
+#    else
+#      define ZEXPORTVA FAR CDECL
+#    endif
+#  endif
+#endif
+
+#if defined (__BEOS__)
+#  ifdef ZLIB_DLL
+#    ifdef ZLIB_INTERNAL
+#      define ZEXPORT   __declspec(dllexport)
+#      define ZEXPORTVA __declspec(dllexport)
+#    else
+#      define ZEXPORT   __declspec(dllimport)
+#      define ZEXPORTVA __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
+#ifndef ZEXTERN
+#  define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+#  define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+#  define ZEXPORTVA
+#endif
+
+#ifndef FAR
+#  define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char  Byte;  /* 8 bits */
+#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#  define Bytef Byte FAR
+#else
+   typedef Byte  FAR Bytef;
+#endif
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void const *voidpc;
+   typedef void FAR   *voidpf;
+   typedef void       *voidp;
+#else
+   typedef Byte const *voidpc;
+   typedef Byte FAR   *voidpf;
+   typedef Byte       *voidp;
+#endif
+
+#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
+#  include <sys/types.h> /* for off_t */
+#  include <unistd.h>    /* for SEEK_* and off_t */
+#  ifdef VMS
+#    include <unixio.h>   /* for off_t */
+#  endif
+#  define z_off_t off_t
+#endif
+#ifndef SEEK_SET
+#  define SEEK_SET        0       /* Seek from beginning of file.  */
+#  define SEEK_CUR        1       /* Seek from current position.  */
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#endif
+#ifndef z_off_t
+#  define z_off_t long
+#endif
+
+#if defined(__OS400__)
+#  define NO_vsnprintf
+#endif
+
+#if defined(__MVS__)
+#  define NO_vsnprintf
+#  ifdef FAR
+#    undef FAR
+#  endif
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+#   pragma map(deflateInit_,"DEIN")
+#   pragma map(deflateInit2_,"DEIN2")
+#   pragma map(deflateEnd,"DEEND")
+#   pragma map(deflateBound,"DEBND")
+#   pragma map(inflateInit_,"ININ")
+#   pragma map(inflateInit2_,"ININ2")
+#   pragma map(inflateEnd,"INEND")
+#   pragma map(inflateSync,"INSY")
+#   pragma map(inflateSetDictionary,"INSEDI")
+#   pragma map(compressBound,"CMBND")
+#   pragma map(inflate_table,"INTABL")
+#   pragma map(inflate_fast,"INFA")
+#   pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */
diff --git a/utils/zenutils/libraries/zlib123/zlib/zconf.in.h b/utils/zenutils/libraries/zlib123/zlib/zconf.in.h
index e3b0c962e3..03a9431c8b 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/zconf.in.h
+++ b/utils/zenutils/libraries/zlib123/zlib/zconf.in.h
@@ -1,332 +1,332 @@
-/* zconf.h -- configuration of the zlib compression library

- * Copyright (C) 1995-2005 Jean-loup Gailly.

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* @(#) $Id$ */

-

-#ifndef ZCONF_H

-#define ZCONF_H

-

-/*

- * If you *really* need a unique prefix for all types and library functions,

- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.

- */

-#ifdef Z_PREFIX

-#  define deflateInit_          z_deflateInit_

-#  define deflate               z_deflate

-#  define deflateEnd            z_deflateEnd

-#  define inflateInit_          z_inflateInit_

-#  define inflate               z_inflate

-#  define inflateEnd            z_inflateEnd

-#  define deflateInit2_         z_deflateInit2_

-#  define deflateSetDictionary  z_deflateSetDictionary

-#  define deflateCopy           z_deflateCopy

-#  define deflateReset          z_deflateReset

-#  define deflateParams         z_deflateParams

-#  define deflateBound          z_deflateBound

-#  define deflatePrime          z_deflatePrime

-#  define inflateInit2_         z_inflateInit2_

-#  define inflateSetDictionary  z_inflateSetDictionary

-#  define inflateSync           z_inflateSync

-#  define inflateSyncPoint      z_inflateSyncPoint

-#  define inflateCopy           z_inflateCopy

-#  define inflateReset          z_inflateReset

-#  define inflateBack           z_inflateBack

-#  define inflateBackEnd        z_inflateBackEnd

-#  define compress              z_compress

-#  define compress2             z_compress2

-#  define compressBound         z_compressBound

-#  define uncompress            z_uncompress

-#  define adler32               z_adler32

-#  define crc32                 z_crc32

-#  define get_crc_table         z_get_crc_table

-#  define zError                z_zError

-

-#  define alloc_func            z_alloc_func

-#  define free_func             z_free_func

-#  define in_func               z_in_func

-#  define out_func              z_out_func

-#  define Byte                  z_Byte

-#  define uInt                  z_uInt

-#  define uLong                 z_uLong

-#  define Bytef                 z_Bytef

-#  define charf                 z_charf

-#  define intf                  z_intf

-#  define uIntf                 z_uIntf

-#  define uLongf                z_uLongf

-#  define voidpf                z_voidpf

-#  define voidp                 z_voidp

-#endif

-

-#if defined(__MSDOS__) && !defined(MSDOS)

-#  define MSDOS

-#endif

-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)

-#  define OS2

-#endif

-#if defined(_WINDOWS) && !defined(WINDOWS)

-#  define WINDOWS

-#endif

-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)

-#  ifndef WIN32

-#    define WIN32

-#  endif

-#endif

-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)

-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)

-#    ifndef SYS16BIT

-#      define SYS16BIT

-#    endif

-#  endif

-#endif

-

-/*

- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more

- * than 64k bytes at a time (needed on systems with 16-bit int).

- */

-#ifdef SYS16BIT

-#  define MAXSEG_64K

-#endif

-#ifdef MSDOS

-#  define UNALIGNED_OK

-#endif

-

-#ifdef __STDC_VERSION__

-#  ifndef STDC

-#    define STDC

-#  endif

-#  if __STDC_VERSION__ >= 199901L

-#    ifndef STDC99

-#      define STDC99

-#    endif

-#  endif

-#endif

-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))

-#  define STDC

-#endif

-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))

-#  define STDC

-#endif

-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))

-#  define STDC

-#endif

-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))

-#  define STDC

-#endif

-

-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */

-#  define STDC

-#endif

-

-#ifndef STDC

-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */

-#    define const       /* note: need a more gentle solution here */

-#  endif

-#endif

-

-/* Some Mac compilers merge all .h files incorrectly: */

-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)

-#  define NO_DUMMY_DECL

-#endif

-

-/* Maximum value for memLevel in deflateInit2 */

-#ifndef MAX_MEM_LEVEL

-#  ifdef MAXSEG_64K

-#    define MAX_MEM_LEVEL 8

-#  else

-#    define MAX_MEM_LEVEL 9

-#  endif

-#endif

-

-/* Maximum value for windowBits in deflateInit2 and inflateInit2.

- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files

- * created by gzip. (Files created by minigzip can still be extracted by

- * gzip.)

- */

-#ifndef MAX_WBITS

-#  define MAX_WBITS   15 /* 32K LZ77 window */

-#endif

-

-/* The memory requirements for deflate are (in bytes):

-            (1 << (windowBits+2)) +  (1 << (memLevel+9))

- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)

- plus a few kilobytes for small objects. For example, if you want to reduce

- the default memory requirements from 256K to 128K, compile with

-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"

- Of course this will generally degrade compression (there's no free lunch).

-

-   The memory requirements for inflate are (in bytes) 1 << windowBits

- that is, 32K for windowBits=15 (default value) plus a few kilobytes

- for small objects.

-*/

-

-                        /* Type declarations */

-

-#ifndef OF /* function prototypes */

-#  ifdef STDC

-#    define OF(args)  args

-#  else

-#    define OF(args)  ()

-#  endif

-#endif

-

-/* The following definitions for FAR are needed only for MSDOS mixed

- * model programming (small or medium model with some far allocations).

- * This was tested only with MSC; for other MSDOS compilers you may have

- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,

- * just define FAR to be empty.

- */

-#ifdef SYS16BIT

-#  if defined(M_I86SM) || defined(M_I86MM)

-     /* MSC small or medium model */

-#    define SMALL_MEDIUM

-#    ifdef _MSC_VER

-#      define FAR _far

-#    else

-#      define FAR far

-#    endif

-#  endif

-#  if (defined(__SMALL__) || defined(__MEDIUM__))

-     /* Turbo C small or medium model */

-#    define SMALL_MEDIUM

-#    ifdef __BORLANDC__

-#      define FAR _far

-#    else

-#      define FAR far

-#    endif

-#  endif

-#endif

-

-#if defined(WINDOWS) || defined(WIN32)

-   /* If building or using zlib as a DLL, define ZLIB_DLL.

-    * This is not mandatory, but it offers a little performance increase.

-    */

-#  ifdef ZLIB_DLL

-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))

-#      ifdef ZLIB_INTERNAL

-#        define ZEXTERN extern __declspec(dllexport)

-#      else

-#        define ZEXTERN extern __declspec(dllimport)

-#      endif

-#    endif

-#  endif  /* ZLIB_DLL */

-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,

-    * define ZLIB_WINAPI.

-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.

-    */

-#  ifdef ZLIB_WINAPI

-#    ifdef FAR

-#      undef FAR

-#    endif

-#    include <windows.h>

-     /* No need for _export, use ZLIB.DEF instead. */

-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */

-#    define ZEXPORT WINAPI

-#    ifdef WIN32

-#      define ZEXPORTVA WINAPIV

-#    else

-#      define ZEXPORTVA FAR CDECL

-#    endif

-#  endif

-#endif

-

-#if defined (__BEOS__)

-#  ifdef ZLIB_DLL

-#    ifdef ZLIB_INTERNAL

-#      define ZEXPORT   __declspec(dllexport)

-#      define ZEXPORTVA __declspec(dllexport)

-#    else

-#      define ZEXPORT   __declspec(dllimport)

-#      define ZEXPORTVA __declspec(dllimport)

-#    endif

-#  endif

-#endif

-

-#ifndef ZEXTERN

-#  define ZEXTERN extern

-#endif

-#ifndef ZEXPORT

-#  define ZEXPORT

-#endif

-#ifndef ZEXPORTVA

-#  define ZEXPORTVA

-#endif

-

-#ifndef FAR

-#  define FAR

-#endif

-

-#if !defined(__MACTYPES__)

-typedef unsigned char  Byte;  /* 8 bits */

-#endif

-typedef unsigned int   uInt;  /* 16 bits or more */

-typedef unsigned long  uLong; /* 32 bits or more */

-

-#ifdef SMALL_MEDIUM

-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */

-#  define Bytef Byte FAR

-#else

-   typedef Byte  FAR Bytef;

-#endif

-typedef char  FAR charf;

-typedef int   FAR intf;

-typedef uInt  FAR uIntf;

-typedef uLong FAR uLongf;

-

-#ifdef STDC

-   typedef void const *voidpc;

-   typedef void FAR   *voidpf;

-   typedef void       *voidp;

-#else

-   typedef Byte const *voidpc;

-   typedef Byte FAR   *voidpf;

-   typedef Byte       *voidp;

-#endif

-

-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */

-#  include <sys/types.h> /* for off_t */

-#  include <unistd.h>    /* for SEEK_* and off_t */

-#  ifdef VMS

-#    include <unixio.h>   /* for off_t */

-#  endif

-#  define z_off_t off_t

-#endif

-#ifndef SEEK_SET

-#  define SEEK_SET        0       /* Seek from beginning of file.  */

-#  define SEEK_CUR        1       /* Seek from current position.  */

-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */

-#endif

-#ifndef z_off_t

-#  define z_off_t long

-#endif

-

-#if defined(__OS400__)

-#  define NO_vsnprintf

-#endif

-

-#if defined(__MVS__)

-#  define NO_vsnprintf

-#  ifdef FAR

-#    undef FAR

-#  endif

-#endif

-

-/* MVS linker does not support external names larger than 8 bytes */

-#if defined(__MVS__)

-#   pragma map(deflateInit_,"DEIN")

-#   pragma map(deflateInit2_,"DEIN2")

-#   pragma map(deflateEnd,"DEEND")

-#   pragma map(deflateBound,"DEBND")

-#   pragma map(inflateInit_,"ININ")

-#   pragma map(inflateInit2_,"ININ2")

-#   pragma map(inflateEnd,"INEND")

-#   pragma map(inflateSync,"INSY")

-#   pragma map(inflateSetDictionary,"INSEDI")

-#   pragma map(compressBound,"CMBND")

-#   pragma map(inflate_table,"INTABL")

-#   pragma map(inflate_fast,"INFA")

-#   pragma map(inflate_copyright,"INCOPY")

-#endif

-

-#endif /* ZCONF_H */

+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZCONF_H
+#define ZCONF_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ */
+#ifdef Z_PREFIX
+#  define deflateInit_          z_deflateInit_
+#  define deflate               z_deflate
+#  define deflateEnd            z_deflateEnd
+#  define inflateInit_          z_inflateInit_
+#  define inflate               z_inflate
+#  define inflateEnd            z_inflateEnd
+#  define deflateInit2_         z_deflateInit2_
+#  define deflateSetDictionary  z_deflateSetDictionary
+#  define deflateCopy           z_deflateCopy
+#  define deflateReset          z_deflateReset
+#  define deflateParams         z_deflateParams
+#  define deflateBound          z_deflateBound
+#  define deflatePrime          z_deflatePrime
+#  define inflateInit2_         z_inflateInit2_
+#  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateSync           z_inflateSync
+#  define inflateSyncPoint      z_inflateSyncPoint
+#  define inflateCopy           z_inflateCopy
+#  define inflateReset          z_inflateReset
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
+#  define compress              z_compress
+#  define compress2             z_compress2
+#  define compressBound         z_compressBound
+#  define uncompress            z_uncompress
+#  define adler32               z_adler32
+#  define crc32                 z_crc32
+#  define get_crc_table         z_get_crc_table
+#  define zError                z_zError
+
+#  define alloc_func            z_alloc_func
+#  define free_func             z_free_func
+#  define in_func               z_in_func
+#  define out_func              z_out_func
+#  define Byte                  z_Byte
+#  define uInt                  z_uInt
+#  define uLong                 z_uLong
+#  define Bytef                 z_Bytef
+#  define charf                 z_charf
+#  define intf                  z_intf
+#  define uIntf                 z_uIntf
+#  define uLongf                z_uLongf
+#  define voidpf                z_voidpf
+#  define voidp                 z_voidp
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+#  define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+#  define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+#  define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#  ifndef WIN32
+#    define WIN32
+#  endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+#    ifndef SYS16BIT
+#      define SYS16BIT
+#    endif
+#  endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+#  define MAXSEG_64K
+#endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+#  ifndef STDC
+#    define STDC
+#  endif
+#  if __STDC_VERSION__ >= 199901L
+#    ifndef STDC99
+#      define STDC99
+#    endif
+#  endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+#  define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
+#  define STDC
+#endif
+
+#ifndef STDC
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#    define const       /* note: need a more gentle solution here */
+#  endif
+#endif
+
+/* Some Mac compilers merge all .h files incorrectly: */
+#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
+#  define NO_DUMMY_DECL
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+#  ifdef MAXSEG_64K
+#    define MAX_MEM_LEVEL 8
+#  else
+#    define MAX_MEM_LEVEL 9
+#  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ for small objects.
+*/
+
+                        /* Type declarations */
+
+#ifndef OF /* function prototypes */
+#  ifdef STDC
+#    define OF(args)  args
+#  else
+#    define OF(args)  ()
+#  endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+#  if defined(M_I86SM) || defined(M_I86MM)
+     /* MSC small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef _MSC_VER
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#  if (defined(__SMALL__) || defined(__MEDIUM__))
+     /* Turbo C small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef __BORLANDC__
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+   /* If building or using zlib as a DLL, define ZLIB_DLL.
+    * This is not mandatory, but it offers a little performance increase.
+    */
+#  ifdef ZLIB_DLL
+#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#      ifdef ZLIB_INTERNAL
+#        define ZEXTERN extern __declspec(dllexport)
+#      else
+#        define ZEXTERN extern __declspec(dllimport)
+#      endif
+#    endif
+#  endif  /* ZLIB_DLL */
+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+    * define ZLIB_WINAPI.
+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+    */
+#  ifdef ZLIB_WINAPI
+#    ifdef FAR
+#      undef FAR
+#    endif
+#    include <windows.h>
+     /* No need for _export, use ZLIB.DEF instead. */
+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+#    define ZEXPORT WINAPI
+#    ifdef WIN32
+#      define ZEXPORTVA WINAPIV
+#    else
+#      define ZEXPORTVA FAR CDECL
+#    endif
+#  endif
+#endif
+
+#if defined (__BEOS__)
+#  ifdef ZLIB_DLL
+#    ifdef ZLIB_INTERNAL
+#      define ZEXPORT   __declspec(dllexport)
+#      define ZEXPORTVA __declspec(dllexport)
+#    else
+#      define ZEXPORT   __declspec(dllimport)
+#      define ZEXPORTVA __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
+#ifndef ZEXTERN
+#  define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+#  define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+#  define ZEXPORTVA
+#endif
+
+#ifndef FAR
+#  define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char  Byte;  /* 8 bits */
+#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#  define Bytef Byte FAR
+#else
+   typedef Byte  FAR Bytef;
+#endif
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void const *voidpc;
+   typedef void FAR   *voidpf;
+   typedef void       *voidp;
+#else
+   typedef Byte const *voidpc;
+   typedef Byte FAR   *voidpf;
+   typedef Byte       *voidp;
+#endif
+
+#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
+#  include <sys/types.h> /* for off_t */
+#  include <unistd.h>    /* for SEEK_* and off_t */
+#  ifdef VMS
+#    include <unixio.h>   /* for off_t */
+#  endif
+#  define z_off_t off_t
+#endif
+#ifndef SEEK_SET
+#  define SEEK_SET        0       /* Seek from beginning of file.  */
+#  define SEEK_CUR        1       /* Seek from current position.  */
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#endif
+#ifndef z_off_t
+#  define z_off_t long
+#endif
+
+#if defined(__OS400__)
+#  define NO_vsnprintf
+#endif
+
+#if defined(__MVS__)
+#  define NO_vsnprintf
+#  ifdef FAR
+#    undef FAR
+#  endif
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+#   pragma map(deflateInit_,"DEIN")
+#   pragma map(deflateInit2_,"DEIN2")
+#   pragma map(deflateEnd,"DEEND")
+#   pragma map(deflateBound,"DEBND")
+#   pragma map(inflateInit_,"ININ")
+#   pragma map(inflateInit2_,"ININ2")
+#   pragma map(inflateEnd,"INEND")
+#   pragma map(inflateSync,"INSY")
+#   pragma map(inflateSetDictionary,"INSEDI")
+#   pragma map(compressBound,"CMBND")
+#   pragma map(inflate_table,"INTABL")
+#   pragma map(inflate_fast,"INFA")
+#   pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */
diff --git a/utils/zenutils/libraries/zlib123/zlib/zlib.3 b/utils/zenutils/libraries/zlib123/zlib/zlib.3
index f6b0da1176..90b8162870 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/zlib.3
+++ b/utils/zenutils/libraries/zlib123/zlib/zlib.3
@@ -1,159 +1,159 @@
-.TH ZLIB 3 "18 July 2005"

-.SH NAME

-zlib \- compression/decompression library

-.SH SYNOPSIS

-[see

-.I zlib.h

-for full description]

-.SH DESCRIPTION

-The

-.I zlib

-library is a general purpose data compression library.

-The code is thread safe.

-It provides in-memory compression and decompression functions,

-including integrity checks of the uncompressed data.

-This version of the library supports only one compression method (deflation)

-but other algorithms will be added later

-and will have the same stream interface.

-.LP

-Compression can be done in a single step if the buffers are large enough

-(for example if an input file is mmap'ed),

-or can be done by repeated calls of the compression function.

-In the latter case,

-the application must provide more input and/or consume the output

-(providing more output space) before each call.

-.LP

-The library also supports reading and writing files in

-.IR gzip (1)

-(.gz) format

-with an interface similar to that of stdio.

-.LP

-The library does not install any signal handler.

-The decoder checks the consistency of the compressed data,

-so the library should never crash even in case of corrupted input.

-.LP

-All functions of the compression library are documented in the file

-.IR zlib.h .

-The distribution source includes examples of use of the library

-in the files

-.I example.c

-and

-.IR minigzip.c .

-.LP

-Changes to this version are documented in the file

-.I ChangeLog

-that accompanies the source,

-and are concerned primarily with bug fixes and portability enhancements.

-.LP

-A Java implementation of

-.I zlib

-is available in the Java Development Kit 1.1:

-.IP

-http://www.javasoft.com/products/JDK/1.1/docs/api/Package-java.util.zip.html

-.LP

-A Perl interface to

-.IR zlib ,

-written by Paul Marquess (pmqs@cpan.org),

-is available at CPAN (Comprehensive Perl Archive Network) sites,

-including:

-.IP

-http://www.cpan.org/modules/by-module/Compress/

-.LP

-A Python interface to

-.IR zlib ,

-written by A.M. Kuchling (amk@magnet.com),

-is available in Python 1.5 and later versions:

-.IP

-http://www.python.org/doc/lib/module-zlib.html

-.LP

-A

-.I zlib

-binding for

-.IR tcl (1),

-written by Andreas Kupries (a.kupries@westend.com),

-is availlable at:

-.IP

-http://www.westend.com/~kupries/doc/trf/man/man.html

-.LP

-An experimental package to read and write files in .zip format,

-written on top of

-.I zlib

-by Gilles Vollant (info@winimage.com),

-is available at:

-.IP

-http://www.winimage.com/zLibDll/unzip.html

-and also in the

-.I contrib/minizip

-directory of the main

-.I zlib

-web site.

-.SH "SEE ALSO"

-The

-.I zlib

-web site can be found at either of these locations:

-.IP

-http://www.zlib.org

-.br

-http://www.gzip.org/zlib/

-.LP

-The data format used by the zlib library is described by RFC

-(Request for Comments) 1950 to 1952 in the files:

-.IP

-http://www.ietf.org/rfc/rfc1950.txt (concerning zlib format)

-.br

-http://www.ietf.org/rfc/rfc1951.txt (concerning deflate format)

-.br

-http://www.ietf.org/rfc/rfc1952.txt (concerning gzip format)

-.LP

-These documents are also available in other formats from:

-.IP

-ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html

-.LP

-Mark Nelson (markn@ieee.org) wrote an article about

-.I zlib

-for the Jan. 1997 issue of  Dr. Dobb's Journal;

-a copy of the article is available at:

-.IP

-http://dogma.net/markn/articles/zlibtool/zlibtool.htm

-.SH "REPORTING PROBLEMS"

-Before reporting a problem,

-please check the

-.I zlib

-web site to verify that you have the latest version of

-.IR zlib ;

-otherwise,

-obtain the latest version and see if the problem still exists.

-Please read the

-.I zlib

-FAQ at:

-.IP

-http://www.gzip.org/zlib/zlib_faq.html

-.LP

-before asking for help.

-Send questions and/or comments to zlib@gzip.org,

-or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).

-.SH AUTHORS

-Version 1.2.3

-Copyright (C) 1995-2005 Jean-loup Gailly (jloup@gzip.org)

-and Mark Adler (madler@alumni.caltech.edu).

-.LP

-This software is provided "as-is,"

-without any express or implied warranty.

-In no event will the authors be held liable for any damages

-arising from the use of this software.

-See the distribution directory with respect to requirements

-governing redistribution.

-The deflate format used by

-.I zlib

-was defined by Phil Katz.

-The deflate and

-.I zlib

-specifications were written by L. Peter Deutsch.

-Thanks to all the people who reported problems and suggested various

-improvements in

-.IR zlib ;

-who are too numerous to cite here.

-.LP

-UNIX manual page by R. P. C. Rodgers,

-U.S. National Library of Medicine (rodgers@nlm.nih.gov).

-.\" end of man page

+.TH ZLIB 3 "18 July 2005"
+.SH NAME
+zlib \- compression/decompression library
+.SH SYNOPSIS
+[see
+.I zlib.h
+for full description]
+.SH DESCRIPTION
+The
+.I zlib
+library is a general purpose data compression library.
+The code is thread safe.
+It provides in-memory compression and decompression functions,
+including integrity checks of the uncompressed data.
+This version of the library supports only one compression method (deflation)
+but other algorithms will be added later
+and will have the same stream interface.
+.LP
+Compression can be done in a single step if the buffers are large enough
+(for example if an input file is mmap'ed),
+or can be done by repeated calls of the compression function.
+In the latter case,
+the application must provide more input and/or consume the output
+(providing more output space) before each call.
+.LP
+The library also supports reading and writing files in
+.IR gzip (1)
+(.gz) format
+with an interface similar to that of stdio.
+.LP
+The library does not install any signal handler.
+The decoder checks the consistency of the compressed data,
+so the library should never crash even in case of corrupted input.
+.LP
+All functions of the compression library are documented in the file
+.IR zlib.h .
+The distribution source includes examples of use of the library
+in the files
+.I example.c
+and
+.IR minigzip.c .
+.LP
+Changes to this version are documented in the file
+.I ChangeLog
+that accompanies the source,
+and are concerned primarily with bug fixes and portability enhancements.
+.LP
+A Java implementation of
+.I zlib
+is available in the Java Development Kit 1.1:
+.IP
+http://www.javasoft.com/products/JDK/1.1/docs/api/Package-java.util.zip.html
+.LP
+A Perl interface to
+.IR zlib ,
+written by Paul Marquess (pmqs@cpan.org),
+is available at CPAN (Comprehensive Perl Archive Network) sites,
+including:
+.IP
+http://www.cpan.org/modules/by-module/Compress/
+.LP
+A Python interface to
+.IR zlib ,
+written by A.M. Kuchling (amk@magnet.com),
+is available in Python 1.5 and later versions:
+.IP
+http://www.python.org/doc/lib/module-zlib.html
+.LP
+A
+.I zlib
+binding for
+.IR tcl (1),
+written by Andreas Kupries (a.kupries@westend.com),
+is availlable at:
+.IP
+http://www.westend.com/~kupries/doc/trf/man/man.html
+.LP
+An experimental package to read and write files in .zip format,
+written on top of
+.I zlib
+by Gilles Vollant (info@winimage.com),
+is available at:
+.IP
+http://www.winimage.com/zLibDll/unzip.html
+and also in the
+.I contrib/minizip
+directory of the main
+.I zlib
+web site.
+.SH "SEE ALSO"
+The
+.I zlib
+web site can be found at either of these locations:
+.IP
+http://www.zlib.org
+.br
+http://www.gzip.org/zlib/
+.LP
+The data format used by the zlib library is described by RFC
+(Request for Comments) 1950 to 1952 in the files:
+.IP
+http://www.ietf.org/rfc/rfc1950.txt (concerning zlib format)
+.br
+http://www.ietf.org/rfc/rfc1951.txt (concerning deflate format)
+.br
+http://www.ietf.org/rfc/rfc1952.txt (concerning gzip format)
+.LP
+These documents are also available in other formats from:
+.IP
+ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html
+.LP
+Mark Nelson (markn@ieee.org) wrote an article about
+.I zlib
+for the Jan. 1997 issue of  Dr. Dobb's Journal;
+a copy of the article is available at:
+.IP
+http://dogma.net/markn/articles/zlibtool/zlibtool.htm
+.SH "REPORTING PROBLEMS"
+Before reporting a problem,
+please check the
+.I zlib
+web site to verify that you have the latest version of
+.IR zlib ;
+otherwise,
+obtain the latest version and see if the problem still exists.
+Please read the
+.I zlib
+FAQ at:
+.IP
+http://www.gzip.org/zlib/zlib_faq.html
+.LP
+before asking for help.
+Send questions and/or comments to zlib@gzip.org,
+or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
+.SH AUTHORS
+Version 1.2.3
+Copyright (C) 1995-2005 Jean-loup Gailly (jloup@gzip.org)
+and Mark Adler (madler@alumni.caltech.edu).
+.LP
+This software is provided "as-is,"
+without any express or implied warranty.
+In no event will the authors be held liable for any damages
+arising from the use of this software.
+See the distribution directory with respect to requirements
+governing redistribution.
+The deflate format used by
+.I zlib
+was defined by Phil Katz.
+The deflate and
+.I zlib
+specifications were written by L. Peter Deutsch.
+Thanks to all the people who reported problems and suggested various
+improvements in
+.IR zlib ;
+who are too numerous to cite here.
+.LP
+UNIX manual page by R. P. C. Rodgers,
+U.S. National Library of Medicine (rodgers@nlm.nih.gov).
+.\" end of man page
diff --git a/utils/zenutils/libraries/zlib123/zlib/zlib.h b/utils/zenutils/libraries/zlib123/zlib/zlib.h
index 62d0e4675b..022817927c 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/zlib.h
+++ b/utils/zenutils/libraries/zlib123/zlib/zlib.h
@@ -1,1357 +1,1357 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library

-  version 1.2.3, July 18th, 2005

-

-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler

-

-  This software is provided 'as-is', without any express or implied

-  warranty.  In no event will the authors be held liable for any damages

-  arising from the use of this software.

-

-  Permission is granted to anyone to use this software for any purpose,

-  including commercial applications, and to alter it and redistribute it

-  freely, subject to the following restrictions:

-

-  1. The origin of this software must not be misrepresented; you must not

-     claim that you wrote the original software. If you use this software

-     in a product, an acknowledgment in the product documentation would be

-     appreciated but is not required.

-  2. Altered source versions must be plainly marked as such, and must not be

-     misrepresented as being the original software.

-  3. This notice may not be removed or altered from any source distribution.

-

-  Jean-loup Gailly        Mark Adler

-  jloup@gzip.org          madler@alumni.caltech.edu

-

-

-  The data format used by the zlib library is described by RFCs (Request for

-  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt

-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).

-*/

-

-#ifndef ZLIB_H

-#define ZLIB_H

-

-#include "zconf.h"

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#define ZLIB_VERSION "1.2.3"

-#define ZLIB_VERNUM 0x1230

-

-/*

-     The 'zlib' compression library provides in-memory compression and

-  decompression functions, including integrity checks of the uncompressed

-  data.  This version of the library supports only one compression method

-  (deflation) but other algorithms will be added later and will have the same

-  stream interface.

-

-     Compression can be done in a single step if the buffers are large

-  enough (for example if an input file is mmap'ed), or can be done by

-  repeated calls of the compression function.  In the latter case, the

-  application must provide more input and/or consume the output

-  (providing more output space) before each call.

-

-     The compressed data format used by default by the in-memory functions is

-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped

-  around a deflate stream, which is itself documented in RFC 1951.

-

-     The library also supports reading and writing files in gzip (.gz) format

-  with an interface similar to that of stdio using the functions that start

-  with "gz".  The gzip format is different from the zlib format.  gzip is a

-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.

-

-     This library can optionally read and write gzip streams in memory as well.

-

-     The zlib format was designed to be compact and fast for use in memory

-  and on communications channels.  The gzip format was designed for single-

-  file compression on file systems, has a larger header than zlib to maintain

-  directory information, and uses a different, slower check method than zlib.

-

-     The library does not install any signal handler. The decoder checks

-  the consistency of the compressed data, so the library should never

-  crash even in case of corrupted input.

-*/

-

-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));

-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));

-

-struct internal_state;

-

-typedef struct z_stream_s {

-    Bytef    *next_in;  /* next input byte */

-    uInt     avail_in;  /* number of bytes available at next_in */

-    uLong    total_in;  /* total nb of input bytes read so far */

-

-    Bytef    *next_out; /* next output byte should be put there */

-    uInt     avail_out; /* remaining free space at next_out */

-    uLong    total_out; /* total nb of bytes output so far */

-

-    char     *msg;      /* last error message, NULL if no error */

-    struct internal_state FAR *state; /* not visible by applications */

-

-    alloc_func zalloc;  /* used to allocate the internal state */

-    free_func  zfree;   /* used to free the internal state */

-    voidpf     opaque;  /* private data object passed to zalloc and zfree */

-

-    int     data_type;  /* best guess about the data type: binary or text */

-    uLong   adler;      /* adler32 value of the uncompressed data */

-    uLong   reserved;   /* reserved for future use */

-} z_stream;

-

-typedef z_stream FAR *z_streamp;

-

-/*

-     gzip header information passed to and from zlib routines.  See RFC 1952

-  for more details on the meanings of these fields.

-*/

-typedef struct gz_header_s {

-    int     text;       /* true if compressed data believed to be text */

-    uLong   time;       /* modification time */

-    int     xflags;     /* extra flags (not used when writing a gzip file) */

-    int     os;         /* operating system */

-    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */

-    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */

-    uInt    extra_max;  /* space at extra (only when reading header) */

-    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */

-    uInt    name_max;   /* space at name (only when reading header) */

-    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */

-    uInt    comm_max;   /* space at comment (only when reading header) */

-    int     hcrc;       /* true if there was or will be a header crc */

-    int     done;       /* true when done reading gzip header (not used

-                           when writing a gzip file) */

-} gz_header;

-

-typedef gz_header FAR *gz_headerp;

-

-/*

-   The application must update next_in and avail_in when avail_in has

-   dropped to zero. It must update next_out and avail_out when avail_out

-   has dropped to zero. The application must initialize zalloc, zfree and

-   opaque before calling the init function. All other fields are set by the

-   compression library and must not be updated by the application.

-

-   The opaque value provided by the application will be passed as the first

-   parameter for calls of zalloc and zfree. This can be useful for custom

-   memory management. The compression library attaches no meaning to the

-   opaque value.

-

-   zalloc must return Z_NULL if there is not enough memory for the object.

-   If zlib is used in a multi-threaded application, zalloc and zfree must be

-   thread safe.

-

-   On 16-bit systems, the functions zalloc and zfree must be able to allocate

-   exactly 65536 bytes, but will not be required to allocate more than this

-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,

-   pointers returned by zalloc for objects of exactly 65536 bytes *must*

-   have their offset normalized to zero. The default allocation function

-   provided by this library ensures this (see zutil.c). To reduce memory

-   requirements and avoid any allocation of 64K objects, at the expense of

-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).

-

-   The fields total_in and total_out can be used for statistics or

-   progress reports. After compression, total_in holds the total size of

-   the uncompressed data and may be saved for use in the decompressor

-   (particularly if the decompressor wants to decompress everything in

-   a single step).

-*/

-

-                        /* constants */

-

-#define Z_NO_FLUSH      0

-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */

-#define Z_SYNC_FLUSH    2

-#define Z_FULL_FLUSH    3

-#define Z_FINISH        4

-#define Z_BLOCK         5

-/* Allowed flush values; see deflate() and inflate() below for details */

-

-#define Z_OK            0

-#define Z_STREAM_END    1

-#define Z_NEED_DICT     2

-#define Z_ERRNO        (-1)

-#define Z_STREAM_ERROR (-2)

-#define Z_DATA_ERROR   (-3)

-#define Z_MEM_ERROR    (-4)

-#define Z_BUF_ERROR    (-5)

-#define Z_VERSION_ERROR (-6)

-/* Return codes for the compression/decompression functions. Negative

- * values are errors, positive values are used for special but normal events.

- */

-

-#define Z_NO_COMPRESSION         0

-#define Z_BEST_SPEED             1

-#define Z_BEST_COMPRESSION       9

-#define Z_DEFAULT_COMPRESSION  (-1)

-/* compression levels */

-

-#define Z_FILTERED            1

-#define Z_HUFFMAN_ONLY        2

-#define Z_RLE                 3

-#define Z_FIXED               4

-#define Z_DEFAULT_STRATEGY    0

-/* compression strategy; see deflateInit2() below for details */

-

-#define Z_BINARY   0

-#define Z_TEXT     1

-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */

-#define Z_UNKNOWN  2

-/* Possible values of the data_type field (though see inflate()) */

-

-#define Z_DEFLATED   8

-/* The deflate compression method (the only one supported in this version) */

-

-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */

-

-#define zlib_version zlibVersion()

-/* for compatibility with versions < 1.0.2 */

-

-                        /* basic functions */

-

-ZEXTERN const char * ZEXPORT zlibVersion OF((void));

-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.

-   If the first character differs, the library code actually used is

-   not compatible with the zlib.h header file used by the application.

-   This check is automatically made by deflateInit and inflateInit.

- */

-

-/*

-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));

-

-     Initializes the internal stream state for compression. The fields

-   zalloc, zfree and opaque must be initialized before by the caller.

-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to

-   use default allocation functions.

-

-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:

-   1 gives best speed, 9 gives best compression, 0 gives no compression at

-   all (the input data is simply copied a block at a time).

-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and

-   compression (currently equivalent to level 6).

-

-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not

-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,

-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible

-   with the version assumed by the caller (ZLIB_VERSION).

-   msg is set to null if there is no error message.  deflateInit does not

-   perform any compression: this will be done by deflate().

-*/

-

-

-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));

-/*

-    deflate compresses as much data as possible, and stops when the input

-  buffer becomes empty or the output buffer becomes full. It may introduce some

-  output latency (reading input without producing any output) except when

-  forced to flush.

-

-    The detailed semantics are as follows. deflate performs one or both of the

-  following actions:

-

-  - Compress more input starting at next_in and update next_in and avail_in

-    accordingly. If not all input can be processed (because there is not

-    enough room in the output buffer), next_in and avail_in are updated and

-    processing will resume at this point for the next call of deflate().

-

-  - Provide more output starting at next_out and update next_out and avail_out

-    accordingly. This action is forced if the parameter flush is non zero.

-    Forcing flush frequently degrades the compression ratio, so this parameter

-    should be set only when necessary (in interactive applications).

-    Some output may be provided even if flush is not set.

-

-  Before the call of deflate(), the application should ensure that at least

-  one of the actions is possible, by providing more input and/or consuming

-  more output, and updating avail_in or avail_out accordingly; avail_out

-  should never be zero before the call. The application can consume the

-  compressed output when it wants, for example when the output buffer is full

-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK

-  and with zero avail_out, it must be called again after making room in the

-  output buffer because there might be more output pending.

-

-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to

-  decide how much data to accumualte before producing output, in order to

-  maximize compression.

-

-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is

-  flushed to the output buffer and the output is aligned on a byte boundary, so

-  that the decompressor can get all input data available so far. (In particular

-  avail_in is zero after the call if enough output space has been provided

-  before the call.)  Flushing may degrade compression for some compression

-  algorithms and so it should be used only when necessary.

-

-    If flush is set to Z_FULL_FLUSH, all output is flushed as with

-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can

-  restart from this point if previous compressed data has been damaged or if

-  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade

-  compression.

-

-    If deflate returns with avail_out == 0, this function must be called again

-  with the same value of the flush parameter and more output space (updated

-  avail_out), until the flush is complete (deflate returns with non-zero

-  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that

-  avail_out is greater than six to avoid repeated flush markers due to

-  avail_out == 0 on return.

-

-    If the parameter flush is set to Z_FINISH, pending input is processed,

-  pending output is flushed and deflate returns with Z_STREAM_END if there

-  was enough output space; if deflate returns with Z_OK, this function must be

-  called again with Z_FINISH and more output space (updated avail_out) but no

-  more input data, until it returns with Z_STREAM_END or an error. After

-  deflate has returned Z_STREAM_END, the only possible operations on the

-  stream are deflateReset or deflateEnd.

-

-    Z_FINISH can be used immediately after deflateInit if all the compression

-  is to be done in a single step. In this case, avail_out must be at least

-  the value returned by deflateBound (see below). If deflate does not return

-  Z_STREAM_END, then it must be called again as described above.

-

-    deflate() sets strm->adler to the adler32 checksum of all input read

-  so far (that is, total_in bytes).

-

-    deflate() may update strm->data_type if it can make a good guess about

-  the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered

-  binary. This field is only for information purposes and does not affect

-  the compression algorithm in any manner.

-

-    deflate() returns Z_OK if some progress has been made (more input

-  processed or more output produced), Z_STREAM_END if all input has been

-  consumed and all output has been produced (only when flush is set to

-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example

-  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible

-  (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not

-  fatal, and deflate() can be called again with more input and more output

-  space to continue compressing.

-*/

-

-

-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));

-/*

-     All dynamically allocated data structures for this stream are freed.

-   This function discards any unprocessed input and does not flush any

-   pending output.

-

-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the

-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed

-   prematurely (some input or output was discarded). In the error case,

-   msg may be set but then points to a static string (which must not be

-   deallocated).

-*/

-

-

-/*

-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));

-

-     Initializes the internal stream state for decompression. The fields

-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by

-   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact

-   value depends on the compression method), inflateInit determines the

-   compression method from the zlib header and allocates all data structures

-   accordingly; otherwise the allocation will be deferred to the first call of

-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to

-   use default allocation functions.

-

-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough

-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the

-   version assumed by the caller.  msg is set to null if there is no error

-   message. inflateInit does not perform any decompression apart from reading

-   the zlib header if present: this will be done by inflate().  (So next_in and

-   avail_in may be modified, but next_out and avail_out are unchanged.)

-*/

-

-

-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));

-/*

-    inflate decompresses as much data as possible, and stops when the input

-  buffer becomes empty or the output buffer becomes full. It may introduce

-  some output latency (reading input without producing any output) except when

-  forced to flush.

-

-  The detailed semantics are as follows. inflate performs one or both of the

-  following actions:

-

-  - Decompress more input starting at next_in and update next_in and avail_in

-    accordingly. If not all input can be processed (because there is not

-    enough room in the output buffer), next_in is updated and processing

-    will resume at this point for the next call of inflate().

-

-  - Provide more output starting at next_out and update next_out and avail_out

-    accordingly.  inflate() provides as much output as possible, until there

-    is no more input data or no more space in the output buffer (see below

-    about the flush parameter).

-

-  Before the call of inflate(), the application should ensure that at least

-  one of the actions is possible, by providing more input and/or consuming

-  more output, and updating the next_* and avail_* values accordingly.

-  The application can consume the uncompressed output when it wants, for

-  example when the output buffer is full (avail_out == 0), or after each

-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it

-  must be called again after making room in the output buffer because there

-  might be more output pending.

-

-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,

-  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much

-  output as possible to the output buffer. Z_BLOCK requests that inflate() stop

-  if and when it gets to the next deflate block boundary. When decoding the

-  zlib or gzip format, this will cause inflate() to return immediately after

-  the header and before the first block. When doing a raw inflate, inflate()

-  will go ahead and process the first block, and will return when it gets to

-  the end of that block, or when it runs out of data.

-

-    The Z_BLOCK option assists in appending to or combining deflate streams.

-  Also to assist in this, on return inflate() will set strm->data_type to the

-  number of unused bits in the last byte taken from strm->next_in, plus 64

-  if inflate() is currently decoding the last block in the deflate stream,

-  plus 128 if inflate() returned immediately after decoding an end-of-block

-  code or decoding the complete header up to just before the first byte of the

-  deflate stream. The end-of-block will not be indicated until all of the

-  uncompressed data from that block has been written to strm->next_out.  The

-  number of unused bits may in general be greater than seven, except when

-  bit 7 of data_type is set, in which case the number of unused bits will be

-  less than eight.

-

-    inflate() should normally be called until it returns Z_STREAM_END or an

-  error. However if all decompression is to be performed in a single step

-  (a single call of inflate), the parameter flush should be set to

-  Z_FINISH. In this case all pending input is processed and all pending

-  output is flushed; avail_out must be large enough to hold all the

-  uncompressed data. (The size of the uncompressed data may have been saved

-  by the compressor for this purpose.) The next operation on this stream must

-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH

-  is never required, but can be used to inform inflate that a faster approach

-  may be used for the single inflate() call.

-

-     In this implementation, inflate() always flushes as much output as

-  possible to the output buffer, and always uses the faster approach on the

-  first call. So the only effect of the flush parameter in this implementation

-  is on the return value of inflate(), as noted below, or when it returns early

-  because Z_BLOCK is used.

-

-     If a preset dictionary is needed after this call (see inflateSetDictionary

-  below), inflate sets strm->adler to the adler32 checksum of the dictionary

-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets

-  strm->adler to the adler32 checksum of all output produced so far (that is,

-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described

-  below. At the end of the stream, inflate() checks that its computed adler32

-  checksum is equal to that saved by the compressor and returns Z_STREAM_END

-  only if the checksum is correct.

-

-    inflate() will decompress and check either zlib-wrapped or gzip-wrapped

-  deflate data.  The header type is detected automatically.  Any information

-  contained in the gzip header is not retained, so applications that need that

-  information should instead use raw inflate, see inflateInit2() below, or

-  inflateBack() and perform their own processing of the gzip header and

-  trailer.

-

-    inflate() returns Z_OK if some progress has been made (more input processed

-  or more output produced), Z_STREAM_END if the end of the compressed data has

-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a

-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was

-  corrupted (input stream not conforming to the zlib format or incorrect check

-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example

-  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,

-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the

-  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and

-  inflate() can be called again with more input and more output space to

-  continue decompressing. If Z_DATA_ERROR is returned, the application may then

-  call inflateSync() to look for a good compression block if a partial recovery

-  of the data is desired.

-*/

-

-

-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));

-/*

-     All dynamically allocated data structures for this stream are freed.

-   This function discards any unprocessed input and does not flush any

-   pending output.

-

-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state

-   was inconsistent. In the error case, msg may be set but then points to a

-   static string (which must not be deallocated).

-*/

-

-                        /* Advanced functions */

-

-/*

-    The following functions are needed only in some special applications.

-*/

-

-/*

-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,

-                                     int  level,

-                                     int  method,

-                                     int  windowBits,

-                                     int  memLevel,

-                                     int  strategy));

-

-     This is another version of deflateInit with more compression options. The

-   fields next_in, zalloc, zfree and opaque must be initialized before by

-   the caller.

-

-     The method parameter is the compression method. It must be Z_DEFLATED in

-   this version of the library.

-

-     The windowBits parameter is the base two logarithm of the window size

-   (the size of the history buffer). It should be in the range 8..15 for this

-   version of the library. Larger values of this parameter result in better

-   compression at the expense of memory usage. The default value is 15 if

-   deflateInit is used instead.

-

-     windowBits can also be -8..-15 for raw deflate. In this case, -windowBits

-   determines the window size. deflate() will then generate raw deflate data

-   with no zlib header or trailer, and will not compute an adler32 check value.

-

-     windowBits can also be greater than 15 for optional gzip encoding. Add

-   16 to windowBits to write a simple gzip header and trailer around the

-   compressed data instead of a zlib wrapper. The gzip header will have no

-   file name, no extra data, no comment, no modification time (set to zero),

-   no header crc, and the operating system will be set to 255 (unknown).  If a

-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.

-

-     The memLevel parameter specifies how much memory should be allocated

-   for the internal compression state. memLevel=1 uses minimum memory but

-   is slow and reduces compression ratio; memLevel=9 uses maximum memory

-   for optimal speed. The default value is 8. See zconf.h for total memory

-   usage as a function of windowBits and memLevel.

-

-     The strategy parameter is used to tune the compression algorithm. Use the

-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a

-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no

-   string match), or Z_RLE to limit match distances to one (run-length

-   encoding). Filtered data consists mostly of small values with a somewhat

-   random distribution. In this case, the compression algorithm is tuned to

-   compress them better. The effect of Z_FILTERED is to force more Huffman

-   coding and less string matching; it is somewhat intermediate between

-   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as

-   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy

-   parameter only affects the compression ratio but not the correctness of the

-   compressed output even if it is not set appropriately.  Z_FIXED prevents the

-   use of dynamic Huffman codes, allowing for a simpler decoder for special

-   applications.

-

-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough

-   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid

-   method). msg is set to null if there is no error message.  deflateInit2 does

-   not perform any compression: this will be done by deflate().

-*/

-

-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,

-                                             const Bytef *dictionary,

-                                             uInt  dictLength));

-/*

-     Initializes the compression dictionary from the given byte sequence

-   without producing any compressed output. This function must be called

-   immediately after deflateInit, deflateInit2 or deflateReset, before any

-   call of deflate. The compressor and decompressor must use exactly the same

-   dictionary (see inflateSetDictionary).

-

-     The dictionary should consist of strings (byte sequences) that are likely

-   to be encountered later in the data to be compressed, with the most commonly

-   used strings preferably put towards the end of the dictionary. Using a

-   dictionary is most useful when the data to be compressed is short and can be

-   predicted with good accuracy; the data can then be compressed better than

-   with the default empty dictionary.

-

-     Depending on the size of the compression data structures selected by

-   deflateInit or deflateInit2, a part of the dictionary may in effect be

-   discarded, for example if the dictionary is larger than the window size in

-   deflate or deflate2. Thus the strings most likely to be useful should be

-   put at the end of the dictionary, not at the front. In addition, the

-   current implementation of deflate will use at most the window size minus

-   262 bytes of the provided dictionary.

-

-     Upon return of this function, strm->adler is set to the adler32 value

-   of the dictionary; the decompressor may later use this value to determine

-   which dictionary has been used by the compressor. (The adler32 value

-   applies to the whole dictionary even if only a subset of the dictionary is

-   actually used by the compressor.) If a raw deflate was requested, then the

-   adler32 value is not computed and strm->adler is not set.

-

-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a

-   parameter is invalid (such as NULL dictionary) or the stream state is

-   inconsistent (for example if deflate has already been called for this stream

-   or if the compression method is bsort). deflateSetDictionary does not

-   perform any compression: this will be done by deflate().

-*/

-

-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,

-                                    z_streamp source));

-/*

-     Sets the destination stream as a complete copy of the source stream.

-

-     This function can be useful when several compression strategies will be

-   tried, for example when there are several ways of pre-processing the input

-   data with a filter. The streams that will be discarded should then be freed

-   by calling deflateEnd.  Note that deflateCopy duplicates the internal

-   compression state which can be quite large, so this strategy is slow and

-   can consume lots of memory.

-

-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not

-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent

-   (such as zalloc being NULL). msg is left unchanged in both source and

-   destination.

-*/

-

-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));

-/*

-     This function is equivalent to deflateEnd followed by deflateInit,

-   but does not free and reallocate all the internal compression state.

-   The stream will keep the same compression level and any other attributes

-   that may have been set by deflateInit2.

-

-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source

-   stream state was inconsistent (such as zalloc or state being NULL).

-*/

-

-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,

-                                      int level,

-                                      int strategy));

-/*

-     Dynamically update the compression level and compression strategy.  The

-   interpretation of level and strategy is as in deflateInit2.  This can be

-   used to switch between compression and straight copy of the input data, or

-   to switch to a different kind of input data requiring a different

-   strategy. If the compression level is changed, the input available so far

-   is compressed with the old level (and may be flushed); the new level will

-   take effect only at the next call of deflate().

-

-     Before the call of deflateParams, the stream state must be set as for

-   a call of deflate(), since the currently available input may have to

-   be compressed and flushed. In particular, strm->avail_out must be non-zero.

-

-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source

-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR

-   if strm->avail_out was zero.

-*/

-

-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,

-                                    int good_length,

-                                    int max_lazy,

-                                    int nice_length,

-                                    int max_chain));

-/*

-     Fine tune deflate's internal compression parameters.  This should only be

-   used by someone who understands the algorithm used by zlib's deflate for

-   searching for the best matching string, and even then only by the most

-   fanatic optimizer trying to squeeze out the last compressed bit for their

-   specific input data.  Read the deflate.c source code for the meaning of the

-   max_lazy, good_length, nice_length, and max_chain parameters.

-

-     deflateTune() can be called after deflateInit() or deflateInit2(), and

-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.

- */

-

-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,

-                                       uLong sourceLen));

-/*

-     deflateBound() returns an upper bound on the compressed size after

-   deflation of sourceLen bytes.  It must be called after deflateInit()

-   or deflateInit2().  This would be used to allocate an output buffer

-   for deflation in a single pass, and so would be called before deflate().

-*/

-

-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,

-                                     int bits,

-                                     int value));

-/*

-     deflatePrime() inserts bits in the deflate output stream.  The intent

-  is that this function is used to start off the deflate output with the

-  bits leftover from a previous deflate stream when appending to it.  As such,

-  this function can only be used for raw deflate, and must be used before the

-  first deflate() call after a deflateInit2() or deflateReset().  bits must be

-  less than or equal to 16, and that many of the least significant bits of

-  value will be inserted in the output.

-

-      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source

-   stream state was inconsistent.

-*/

-

-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,

-                                         gz_headerp head));

-/*

-      deflateSetHeader() provides gzip header information for when a gzip

-   stream is requested by deflateInit2().  deflateSetHeader() may be called

-   after deflateInit2() or deflateReset() and before the first call of

-   deflate().  The text, time, os, extra field, name, and comment information

-   in the provided gz_header structure are written to the gzip header (xflag is

-   ignored -- the extra flags are set according to the compression level).  The

-   caller must assure that, if not Z_NULL, name and comment are terminated with

-   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are

-   available there.  If hcrc is true, a gzip header crc is included.  Note that

-   the current versions of the command-line version of gzip (up through version

-   1.3.x) do not support header crc's, and will report that it is a "multi-part

-   gzip file" and give up.

-

-      If deflateSetHeader is not used, the default gzip header has text false,

-   the time set to zero, and os set to 255, with no extra, name, or comment

-   fields.  The gzip header is returned to the default state by deflateReset().

-

-      deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source

-   stream state was inconsistent.

-*/

-

-/*

-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,

-                                     int  windowBits));

-

-     This is another version of inflateInit with an extra parameter. The

-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized

-   before by the caller.

-

-     The windowBits parameter is the base two logarithm of the maximum window

-   size (the size of the history buffer).  It should be in the range 8..15 for

-   this version of the library. The default value is 15 if inflateInit is used

-   instead. windowBits must be greater than or equal to the windowBits value

-   provided to deflateInit2() while compressing, or it must be equal to 15 if

-   deflateInit2() was not used. If a compressed stream with a larger window

-   size is given as input, inflate() will return with the error code

-   Z_DATA_ERROR instead of trying to allocate a larger window.

-

-     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits

-   determines the window size. inflate() will then process raw deflate data,

-   not looking for a zlib or gzip header, not generating a check value, and not

-   looking for any check values for comparison at the end of the stream. This

-   is for use with other formats that use the deflate compressed data format

-   such as zip.  Those formats provide their own check values. If a custom

-   format is developed using the raw deflate format for compressed data, it is

-   recommended that a check value such as an adler32 or a crc32 be applied to

-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For

-   most applications, the zlib format should be used as is. Note that comments

-   above on the use in deflateInit2() applies to the magnitude of windowBits.

-

-     windowBits can also be greater than 15 for optional gzip decoding. Add

-   32 to windowBits to enable zlib and gzip decoding with automatic header

-   detection, or add 16 to decode only the gzip format (the zlib format will

-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is

-   a crc32 instead of an adler32.

-

-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough

-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg

-   is set to null if there is no error message.  inflateInit2 does not perform

-   any decompression apart from reading the zlib header if present: this will

-   be done by inflate(). (So next_in and avail_in may be modified, but next_out

-   and avail_out are unchanged.)

-*/

-

-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,

-                                             const Bytef *dictionary,

-                                             uInt  dictLength));

-/*

-     Initializes the decompression dictionary from the given uncompressed byte

-   sequence. This function must be called immediately after a call of inflate,

-   if that call returned Z_NEED_DICT. The dictionary chosen by the compressor

-   can be determined from the adler32 value returned by that call of inflate.

-   The compressor and decompressor must use exactly the same dictionary (see

-   deflateSetDictionary).  For raw inflate, this function can be called

-   immediately after inflateInit2() or inflateReset() and before any call of

-   inflate() to set the dictionary.  The application must insure that the

-   dictionary that was used for compression is provided.

-

-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a

-   parameter is invalid (such as NULL dictionary) or the stream state is

-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the

-   expected one (incorrect adler32 value). inflateSetDictionary does not

-   perform any decompression: this will be done by subsequent calls of

-   inflate().

-*/

-

-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));

-/*

-    Skips invalid compressed data until a full flush point (see above the

-  description of deflate with Z_FULL_FLUSH) can be found, or until all

-  available input is skipped. No output is provided.

-

-    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR

-  if no more input was provided, Z_DATA_ERROR if no flush point has been found,

-  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success

-  case, the application may save the current current value of total_in which

-  indicates where valid compressed data was found. In the error case, the

-  application may repeatedly call inflateSync, providing more input each time,

-  until success or end of the input data.

-*/

-

-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,

-                                    z_streamp source));

-/*

-     Sets the destination stream as a complete copy of the source stream.

-

-     This function can be useful when randomly accessing a large stream.  The

-   first pass through the stream can periodically record the inflate state,

-   allowing restarting inflate at those points when randomly accessing the

-   stream.

-

-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not

-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent

-   (such as zalloc being NULL). msg is left unchanged in both source and

-   destination.

-*/

-

-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));

-/*

-     This function is equivalent to inflateEnd followed by inflateInit,

-   but does not free and reallocate all the internal decompression state.

-   The stream will keep attributes that may have been set by inflateInit2.

-

-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source

-   stream state was inconsistent (such as zalloc or state being NULL).

-*/

-

-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,

-                                     int bits,

-                                     int value));

-/*

-     This function inserts bits in the inflate input stream.  The intent is

-  that this function is used to start inflating at a bit position in the

-  middle of a byte.  The provided bits will be used before any bytes are used

-  from next_in.  This function should only be used with raw inflate, and

-  should be used before the first inflate() call after inflateInit2() or

-  inflateReset().  bits must be less than or equal to 16, and that many of the

-  least significant bits of value will be inserted in the input.

-

-      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source

-   stream state was inconsistent.

-*/

-

-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,

-                                         gz_headerp head));

-/*

-      inflateGetHeader() requests that gzip header information be stored in the

-   provided gz_header structure.  inflateGetHeader() may be called after

-   inflateInit2() or inflateReset(), and before the first call of inflate().

-   As inflate() processes the gzip stream, head->done is zero until the header

-   is completed, at which time head->done is set to one.  If a zlib stream is

-   being decoded, then head->done is set to -1 to indicate that there will be

-   no gzip header information forthcoming.  Note that Z_BLOCK can be used to

-   force inflate() to return immediately after header processing is complete

-   and before any actual data is decompressed.

-

-      The text, time, xflags, and os fields are filled in with the gzip header

-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC

-   was valid if done is set to one.)  If extra is not Z_NULL, then extra_max

-   contains the maximum number of bytes to write to extra.  Once done is true,

-   extra_len contains the actual extra field length, and extra contains the

-   extra field, or that field truncated if extra_max is less than extra_len.

-   If name is not Z_NULL, then up to name_max characters are written there,

-   terminated with a zero unless the length is greater than name_max.  If

-   comment is not Z_NULL, then up to comm_max characters are written there,

-   terminated with a zero unless the length is greater than comm_max.  When

-   any of extra, name, or comment are not Z_NULL and the respective field is

-   not present in the header, then that field is set to Z_NULL to signal its

-   absence.  This allows the use of deflateSetHeader() with the returned

-   structure to duplicate the header.  However if those fields are set to

-   allocated memory, then the application will need to save those pointers

-   elsewhere so that they can be eventually freed.

-

-      If inflateGetHeader is not used, then the header information is simply

-   discarded.  The header is always checked for validity, including the header

-   CRC if present.  inflateReset() will reset the process to discard the header

-   information.  The application would need to call inflateGetHeader() again to

-   retrieve the header from the next gzip stream.

-

-      inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source

-   stream state was inconsistent.

-*/

-

-/*

-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,

-                                        unsigned char FAR *window));

-

-     Initialize the internal stream state for decompression using inflateBack()

-   calls.  The fields zalloc, zfree and opaque in strm must be initialized

-   before the call.  If zalloc and zfree are Z_NULL, then the default library-

-   derived memory allocation routines are used.  windowBits is the base two

-   logarithm of the window size, in the range 8..15.  window is a caller

-   supplied buffer of that size.  Except for special applications where it is

-   assured that deflate was used with small window sizes, windowBits must be 15

-   and a 32K byte window must be supplied to be able to decompress general

-   deflate streams.

-

-     See inflateBack() for the usage of these routines.

-

-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of

-   the paramaters are invalid, Z_MEM_ERROR if the internal state could not

-   be allocated, or Z_VERSION_ERROR if the version of the library does not

-   match the version of the header file.

-*/

-

-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));

-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));

-

-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,

-                                    in_func in, void FAR *in_desc,

-                                    out_func out, void FAR *out_desc));

-/*

-     inflateBack() does a raw inflate with a single call using a call-back

-   interface for input and output.  This is more efficient than inflate() for

-   file i/o applications in that it avoids copying between the output and the

-   sliding window by simply making the window itself the output buffer.  This

-   function trusts the application to not change the output buffer passed by

-   the output function, at least until inflateBack() returns.

-

-     inflateBackInit() must be called first to allocate the internal state

-   and to initialize the state with the user-provided window buffer.

-   inflateBack() may then be used multiple times to inflate a complete, raw

-   deflate stream with each call.  inflateBackEnd() is then called to free

-   the allocated state.

-

-     A raw deflate stream is one with no zlib or gzip header or trailer.

-   This routine would normally be used in a utility that reads zip or gzip

-   files and writes out uncompressed files.  The utility would decode the

-   header and process the trailer on its own, hence this routine expects

-   only the raw deflate stream to decompress.  This is different from the

-   normal behavior of inflate(), which expects either a zlib or gzip header and

-   trailer around the deflate stream.

-

-     inflateBack() uses two subroutines supplied by the caller that are then

-   called by inflateBack() for input and output.  inflateBack() calls those

-   routines until it reads a complete deflate stream and writes out all of the

-   uncompressed data, or until it encounters an error.  The function's

-   parameters and return types are defined above in the in_func and out_func

-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the

-   number of bytes of provided input, and a pointer to that input in buf.  If

-   there is no input available, in() must return zero--buf is ignored in that

-   case--and inflateBack() will return a buffer error.  inflateBack() will call

-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()

-   should return zero on success, or non-zero on failure.  If out() returns

-   non-zero, inflateBack() will return with an error.  Neither in() nor out()

-   are permitted to change the contents of the window provided to

-   inflateBackInit(), which is also the buffer that out() uses to write from.

-   The length written by out() will be at most the window size.  Any non-zero

-   amount of input may be provided by in().

-

-     For convenience, inflateBack() can be provided input on the first call by

-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then

-   in() will be called.  Therefore strm->next_in must be initialized before

-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called

-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in

-   must also be initialized, and then if strm->avail_in is not zero, input will

-   initially be taken from strm->next_in[0 .. strm->avail_in - 1].

-

-     The in_desc and out_desc parameters of inflateBack() is passed as the

-   first parameter of in() and out() respectively when they are called.  These

-   descriptors can be optionally used to pass any information that the caller-

-   supplied in() and out() functions need to do their job.

-

-     On return, inflateBack() will set strm->next_in and strm->avail_in to

-   pass back any unused input that was provided by the last in() call.  The

-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR

-   if in() or out() returned an error, Z_DATA_ERROR if there was a format

-   error in the deflate stream (in which case strm->msg is set to indicate the

-   nature of the error), or Z_STREAM_ERROR if the stream was not properly

-   initialized.  In the case of Z_BUF_ERROR, an input or output error can be

-   distinguished using strm->next_in which will be Z_NULL only if in() returned

-   an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to

-   out() returning non-zero.  (in() will always be called before out(), so

-   strm->next_in is assured to be defined if out() returns non-zero.)  Note

-   that inflateBack() cannot return Z_OK.

-*/

-

-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));

-/*

-     All memory allocated by inflateBackInit() is freed.

-

-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream

-   state was inconsistent.

-*/

-

-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));

-/* Return flags indicating compile-time options.

-

-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:

-     1.0: size of uInt

-     3.2: size of uLong

-     5.4: size of voidpf (pointer)

-     7.6: size of z_off_t

-

-    Compiler, assembler, and debug options:

-     8: DEBUG

-     9: ASMV or ASMINF -- use ASM code

-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention

-     11: 0 (reserved)

-

-    One-time table building (smaller code, but not thread-safe if true):

-     12: BUILDFIXED -- build static block decoding tables when needed

-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed

-     14,15: 0 (reserved)

-

-    Library content (indicates missing functionality):

-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking

-                          deflate code when not needed)

-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect

-                    and decode gzip streams (to avoid linking crc code)

-     18-19: 0 (reserved)

-

-    Operation variations (changes in library functionality):

-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate

-     21: FASTEST -- deflate algorithm with only one, lowest compression level

-     22,23: 0 (reserved)

-

-    The sprintf variant used by gzprintf (zero is best):

-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format

-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!

-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned

-

-    Remainder:

-     27-31: 0 (reserved)

- */

-

-

-                        /* utility functions */

-

-/*

-     The following utility functions are implemented on top of the

-   basic stream-oriented functions. To simplify the interface, some

-   default options are assumed (compression level and memory usage,

-   standard memory allocation functions). The source code of these

-   utility functions can easily be modified if you need special options.

-*/

-

-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,

-                                 const Bytef *source, uLong sourceLen));

-/*

-     Compresses the source buffer into the destination buffer.  sourceLen is

-   the byte length of the source buffer. Upon entry, destLen is the total

-   size of the destination buffer, which must be at least the value returned

-   by compressBound(sourceLen). Upon exit, destLen is the actual size of the

-   compressed buffer.

-     This function can be used to compress a whole file at once if the

-   input file is mmap'ed.

-     compress returns Z_OK if success, Z_MEM_ERROR if there was not

-   enough memory, Z_BUF_ERROR if there was not enough room in the output

-   buffer.

-*/

-

-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,

-                                  const Bytef *source, uLong sourceLen,

-                                  int level));

-/*

-     Compresses the source buffer into the destination buffer. The level

-   parameter has the same meaning as in deflateInit.  sourceLen is the byte

-   length of the source buffer. Upon entry, destLen is the total size of the

-   destination buffer, which must be at least the value returned by

-   compressBound(sourceLen). Upon exit, destLen is the actual size of the

-   compressed buffer.

-

-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough

-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,

-   Z_STREAM_ERROR if the level parameter is invalid.

-*/

-

-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));

-/*

-     compressBound() returns an upper bound on the compressed size after

-   compress() or compress2() on sourceLen bytes.  It would be used before

-   a compress() or compress2() call to allocate the destination buffer.

-*/

-

-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,

-                                   const Bytef *source, uLong sourceLen));

-/*

-     Decompresses the source buffer into the destination buffer.  sourceLen is

-   the byte length of the source buffer. Upon entry, destLen is the total

-   size of the destination buffer, which must be large enough to hold the

-   entire uncompressed data. (The size of the uncompressed data must have

-   been saved previously by the compressor and transmitted to the decompressor

-   by some mechanism outside the scope of this compression library.)

-   Upon exit, destLen is the actual size of the compressed buffer.

-     This function can be used to decompress a whole file at once if the

-   input file is mmap'ed.

-

-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not

-   enough memory, Z_BUF_ERROR if there was not enough room in the output

-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.

-*/

-

-

-typedef voidp gzFile;

-

-ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));

-/*

-     Opens a gzip (.gz) file for reading or writing. The mode parameter

-   is as in fopen ("rb" or "wb") but can also include a compression level

-   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for

-   Huffman only compression as in "wb1h", or 'R' for run-length encoding

-   as in "wb1R". (See the description of deflateInit2 for more information

-   about the strategy parameter.)

-

-     gzopen can be used to read a file which is not in gzip format; in this

-   case gzread will directly read from the file without decompression.

-

-     gzopen returns NULL if the file could not be opened or if there was

-   insufficient memory to allocate the (de)compression state; errno

-   can be checked to distinguish the two cases (if errno is zero, the

-   zlib error is Z_MEM_ERROR).  */

-

-ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));

-/*

-     gzdopen() associates a gzFile with the file descriptor fd.  File

-   descriptors are obtained from calls like open, dup, creat, pipe or

-   fileno (in the file has been previously opened with fopen).

-   The mode parameter is as in gzopen.

-     The next call of gzclose on the returned gzFile will also close the

-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file

-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).

-     gzdopen returns NULL if there was insufficient memory to allocate

-   the (de)compression state.

-*/

-

-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));

-/*

-     Dynamically update the compression level or strategy. See the description

-   of deflateInit2 for the meaning of these parameters.

-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not

-   opened for writing.

-*/

-

-ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));

-/*

-     Reads the given number of uncompressed bytes from the compressed file.

-   If the input file was not in gzip format, gzread copies the given number

-   of bytes into the buffer.

-     gzread returns the number of uncompressed bytes actually read (0 for

-   end of file, -1 for error). */

-

-ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,

-                                   voidpc buf, unsigned len));

-/*

-     Writes the given number of uncompressed bytes into the compressed file.

-   gzwrite returns the number of uncompressed bytes actually written

-   (0 in case of error).

-*/

-

-ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));

-/*

-     Converts, formats, and writes the args to the compressed file under

-   control of the format string, as in fprintf. gzprintf returns the number of

-   uncompressed bytes actually written (0 in case of error).  The number of

-   uncompressed bytes written is limited to 4095. The caller should assure that

-   this limit is not exceeded. If it is exceeded, then gzprintf() will return

-   return an error (0) with nothing written. In this case, there may also be a

-   buffer overflow with unpredictable consequences, which is possible only if

-   zlib was compiled with the insecure functions sprintf() or vsprintf()

-   because the secure snprintf() or vsnprintf() functions were not available.

-*/

-

-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));

-/*

-      Writes the given null-terminated string to the compressed file, excluding

-   the terminating null character.

-      gzputs returns the number of characters written, or -1 in case of error.

-*/

-

-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));

-/*

-      Reads bytes from the compressed file until len-1 characters are read, or

-   a newline character is read and transferred to buf, or an end-of-file

-   condition is encountered.  The string is then terminated with a null

-   character.

-      gzgets returns buf, or Z_NULL in case of error.

-*/

-

-ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));

-/*

-      Writes c, converted to an unsigned char, into the compressed file.

-   gzputc returns the value that was written, or -1 in case of error.

-*/

-

-ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));

-/*

-      Reads one byte from the compressed file. gzgetc returns this byte

-   or -1 in case of end of file or error.

-*/

-

-ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));

-/*

-      Push one character back onto the stream to be read again later.

-   Only one character of push-back is allowed.  gzungetc() returns the

-   character pushed, or -1 on failure.  gzungetc() will fail if a

-   character has been pushed but not read yet, or if c is -1. The pushed

-   character will be discarded if the stream is repositioned with gzseek()

-   or gzrewind().

-*/

-

-ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));

-/*

-     Flushes all pending output into the compressed file. The parameter

-   flush is as in the deflate() function. The return value is the zlib

-   error number (see function gzerror below). gzflush returns Z_OK if

-   the flush parameter is Z_FINISH and all output could be flushed.

-     gzflush should be called only when strictly necessary because it can

-   degrade compression.

-*/

-

-ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,

-                                      z_off_t offset, int whence));

-/*

-      Sets the starting position for the next gzread or gzwrite on the

-   given compressed file. The offset represents a number of bytes in the

-   uncompressed data stream. The whence parameter is defined as in lseek(2);

-   the value SEEK_END is not supported.

-     If the file is opened for reading, this function is emulated but can be

-   extremely slow. If the file is opened for writing, only forward seeks are

-   supported; gzseek then compresses a sequence of zeroes up to the new

-   starting position.

-

-      gzseek returns the resulting offset location as measured in bytes from

-   the beginning of the uncompressed stream, or -1 in case of error, in

-   particular if the file is opened for writing and the new starting position

-   would be before the current position.

-*/

-

-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));

-/*

-     Rewinds the given file. This function is supported only for reading.

-

-   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)

-*/

-

-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));

-/*

-     Returns the starting position for the next gzread or gzwrite on the

-   given compressed file. This position represents a number of bytes in the

-   uncompressed data stream.

-

-   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)

-*/

-

-ZEXTERN int ZEXPORT gzeof OF((gzFile file));

-/*

-     Returns 1 when EOF has previously been detected reading the given

-   input stream, otherwise zero.

-*/

-

-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));

-/*

-     Returns 1 if file is being read directly without decompression, otherwise

-   zero.

-*/

-

-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));

-/*

-     Flushes all pending output if necessary, closes the compressed file

-   and deallocates all the (de)compression state. The return value is the zlib

-   error number (see function gzerror below).

-*/

-

-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));

-/*

-     Returns the error message for the last error which occurred on the

-   given compressed file. errnum is set to zlib error number. If an

-   error occurred in the file system and not in the compression library,

-   errnum is set to Z_ERRNO and the application may consult errno

-   to get the exact error code.

-*/

-

-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));

-/*

-     Clears the error and end-of-file flags for file. This is analogous to the

-   clearerr() function in stdio. This is useful for continuing to read a gzip

-   file that is being written concurrently.

-*/

-

-                        /* checksum functions */

-

-/*

-     These functions are not related to compression but are exported

-   anyway because they might be useful in applications using the

-   compression library.

-*/

-

-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));

-/*

-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and

-   return the updated checksum. If buf is NULL, this function returns

-   the required initial value for the checksum.

-   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed

-   much faster. Usage example:

-

-     uLong adler = adler32(0L, Z_NULL, 0);

-

-     while (read_buffer(buffer, length) != EOF) {

-       adler = adler32(adler, buffer, length);

-     }

-     if (adler != original_adler) error();

-*/

-

-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,

-                                          z_off_t len2));

-/*

-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1

-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for

-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of

-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.

-*/

-

-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));

-/*

-     Update a running CRC-32 with the bytes buf[0..len-1] and return the

-   updated CRC-32. If buf is NULL, this function returns the required initial

-   value for the for the crc. Pre- and post-conditioning (one's complement) is

-   performed within this function so it shouldn't be done by the application.

-   Usage example:

-

-     uLong crc = crc32(0L, Z_NULL, 0);

-

-     while (read_buffer(buffer, length) != EOF) {

-       crc = crc32(crc, buffer, length);

-     }

-     if (crc != original_crc) error();

-*/

-

-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));

-

-/*

-     Combine two CRC-32 check values into one.  For two sequences of bytes,

-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were

-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32

-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and

-   len2.

-*/

-

-

-                        /* various hacks, don't look :) */

-

-/* deflateInit and inflateInit are macros to allow checking the zlib version

- * and the compiler's view of z_stream:

- */

-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,

-                                     const char *version, int stream_size));

-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,

-                                     const char *version, int stream_size));

-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,

-                                      int windowBits, int memLevel,

-                                      int strategy, const char *version,

-                                      int stream_size));

-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,

-                                      const char *version, int stream_size));

-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,

-                                         unsigned char FAR *window,

-                                         const char *version,

-                                         int stream_size));

-#define deflateInit(strm, level) \

-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))

-#define inflateInit(strm) \

-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))

-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \

-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\

-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))

-#define inflateInit2(strm, windowBits) \

-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))

-#define inflateBackInit(strm, windowBits, window) \

-        inflateBackInit_((strm), (windowBits), (window), \

-        ZLIB_VERSION, sizeof(z_stream))

-

-

-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)

-    struct internal_state {int dummy;}; /* hack for buggy compilers */

-#endif

-

-ZEXTERN const char   * ZEXPORT zError           OF((int));

-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));

-ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* ZLIB_H */

+/* zlib.h -- interface of the 'zlib' general purpose compression library
+  version 1.2.3, July 18th, 2005
+
+  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+
+  The data format used by the zlib library is described by RFCs (Request for
+  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
+  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
+*/
+
+#ifndef ZLIB_H
+#define ZLIB_H
+
+#include "zconf.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ZLIB_VERSION "1.2.3"
+#define ZLIB_VERNUM 0x1230
+
+/*
+     The 'zlib' compression library provides in-memory compression and
+  decompression functions, including integrity checks of the uncompressed
+  data.  This version of the library supports only one compression method
+  (deflation) but other algorithms will be added later and will have the same
+  stream interface.
+
+     Compression can be done in a single step if the buffers are large
+  enough (for example if an input file is mmap'ed), or can be done by
+  repeated calls of the compression function.  In the latter case, the
+  application must provide more input and/or consume the output
+  (providing more output space) before each call.
+
+     The compressed data format used by default by the in-memory functions is
+  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
+  around a deflate stream, which is itself documented in RFC 1951.
+
+     The library also supports reading and writing files in gzip (.gz) format
+  with an interface similar to that of stdio using the functions that start
+  with "gz".  The gzip format is different from the zlib format.  gzip is a
+  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
+
+     This library can optionally read and write gzip streams in memory as well.
+
+     The zlib format was designed to be compact and fast for use in memory
+  and on communications channels.  The gzip format was designed for single-
+  file compression on file systems, has a larger header than zlib to maintain
+  directory information, and uses a different, slower check method than zlib.
+
+     The library does not install any signal handler. The decoder checks
+  the consistency of the compressed data, so the library should never
+  crash even in case of corrupted input.
+*/
+
+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
+
+struct internal_state;
+
+typedef struct z_stream_s {
+    Bytef    *next_in;  /* next input byte */
+    uInt     avail_in;  /* number of bytes available at next_in */
+    uLong    total_in;  /* total nb of input bytes read so far */
+
+    Bytef    *next_out; /* next output byte should be put there */
+    uInt     avail_out; /* remaining free space at next_out */
+    uLong    total_out; /* total nb of bytes output so far */
+
+    char     *msg;      /* last error message, NULL if no error */
+    struct internal_state FAR *state; /* not visible by applications */
+
+    alloc_func zalloc;  /* used to allocate the internal state */
+    free_func  zfree;   /* used to free the internal state */
+    voidpf     opaque;  /* private data object passed to zalloc and zfree */
+
+    int     data_type;  /* best guess about the data type: binary or text */
+    uLong   adler;      /* adler32 value of the uncompressed data */
+    uLong   reserved;   /* reserved for future use */
+} z_stream;
+
+typedef z_stream FAR *z_streamp;
+
+/*
+     gzip header information passed to and from zlib routines.  See RFC 1952
+  for more details on the meanings of these fields.
+*/
+typedef struct gz_header_s {
+    int     text;       /* true if compressed data believed to be text */
+    uLong   time;       /* modification time */
+    int     xflags;     /* extra flags (not used when writing a gzip file) */
+    int     os;         /* operating system */
+    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
+    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
+    uInt    extra_max;  /* space at extra (only when reading header) */
+    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
+    uInt    name_max;   /* space at name (only when reading header) */
+    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
+    uInt    comm_max;   /* space at comment (only when reading header) */
+    int     hcrc;       /* true if there was or will be a header crc */
+    int     done;       /* true when done reading gzip header (not used
+                           when writing a gzip file) */
+} gz_header;
+
+typedef gz_header FAR *gz_headerp;
+
+/*
+   The application must update next_in and avail_in when avail_in has
+   dropped to zero. It must update next_out and avail_out when avail_out
+   has dropped to zero. The application must initialize zalloc, zfree and
+   opaque before calling the init function. All other fields are set by the
+   compression library and must not be updated by the application.
+
+   The opaque value provided by the application will be passed as the first
+   parameter for calls of zalloc and zfree. This can be useful for custom
+   memory management. The compression library attaches no meaning to the
+   opaque value.
+
+   zalloc must return Z_NULL if there is not enough memory for the object.
+   If zlib is used in a multi-threaded application, zalloc and zfree must be
+   thread safe.
+
+   On 16-bit systems, the functions zalloc and zfree must be able to allocate
+   exactly 65536 bytes, but will not be required to allocate more than this
+   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
+   pointers returned by zalloc for objects of exactly 65536 bytes *must*
+   have their offset normalized to zero. The default allocation function
+   provided by this library ensures this (see zutil.c). To reduce memory
+   requirements and avoid any allocation of 64K objects, at the expense of
+   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
+
+   The fields total_in and total_out can be used for statistics or
+   progress reports. After compression, total_in holds the total size of
+   the uncompressed data and may be saved for use in the decompressor
+   (particularly if the decompressor wants to decompress everything in
+   a single step).
+*/
+
+                        /* constants */
+
+#define Z_NO_FLUSH      0
+#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
+#define Z_SYNC_FLUSH    2
+#define Z_FULL_FLUSH    3
+#define Z_FINISH        4
+#define Z_BLOCK         5
+/* Allowed flush values; see deflate() and inflate() below for details */
+
+#define Z_OK            0
+#define Z_STREAM_END    1
+#define Z_NEED_DICT     2
+#define Z_ERRNO        (-1)
+#define Z_STREAM_ERROR (-2)
+#define Z_DATA_ERROR   (-3)
+#define Z_MEM_ERROR    (-4)
+#define Z_BUF_ERROR    (-5)
+#define Z_VERSION_ERROR (-6)
+/* Return codes for the compression/decompression functions. Negative
+ * values are errors, positive values are used for special but normal events.
+ */
+
+#define Z_NO_COMPRESSION         0
+#define Z_BEST_SPEED             1
+#define Z_BEST_COMPRESSION       9
+#define Z_DEFAULT_COMPRESSION  (-1)
+/* compression levels */
+
+#define Z_FILTERED            1
+#define Z_HUFFMAN_ONLY        2
+#define Z_RLE                 3
+#define Z_FIXED               4
+#define Z_DEFAULT_STRATEGY    0
+/* compression strategy; see deflateInit2() below for details */
+
+#define Z_BINARY   0
+#define Z_TEXT     1
+#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
+#define Z_UNKNOWN  2
+/* Possible values of the data_type field (though see inflate()) */
+
+#define Z_DEFLATED   8
+/* The deflate compression method (the only one supported in this version) */
+
+#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
+
+#define zlib_version zlibVersion()
+/* for compatibility with versions < 1.0.2 */
+
+                        /* basic functions */
+
+ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+   If the first character differs, the library code actually used is
+   not compatible with the zlib.h header file used by the application.
+   This check is automatically made by deflateInit and inflateInit.
+ */
+
+/*
+ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+
+     Initializes the internal stream state for compression. The fields
+   zalloc, zfree and opaque must be initialized before by the caller.
+   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
+   use default allocation functions.
+
+     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+   1 gives best speed, 9 gives best compression, 0 gives no compression at
+   all (the input data is simply copied a block at a time).
+   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
+   compression (currently equivalent to level 6).
+
+     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
+   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+   with the version assumed by the caller (ZLIB_VERSION).
+   msg is set to null if there is no error message.  deflateInit does not
+   perform any compression: this will be done by deflate().
+*/
+
+
+ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+/*
+    deflate compresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full. It may introduce some
+  output latency (reading input without producing any output) except when
+  forced to flush.
+
+    The detailed semantics are as follows. deflate performs one or both of the
+  following actions:
+
+  - Compress more input starting at next_in and update next_in and avail_in
+    accordingly. If not all input can be processed (because there is not
+    enough room in the output buffer), next_in and avail_in are updated and
+    processing will resume at this point for the next call of deflate().
+
+  - Provide more output starting at next_out and update next_out and avail_out
+    accordingly. This action is forced if the parameter flush is non zero.
+    Forcing flush frequently degrades the compression ratio, so this parameter
+    should be set only when necessary (in interactive applications).
+    Some output may be provided even if flush is not set.
+
+  Before the call of deflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming
+  more output, and updating avail_in or avail_out accordingly; avail_out
+  should never be zero before the call. The application can consume the
+  compressed output when it wants, for example when the output buffer is full
+  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
+  and with zero avail_out, it must be called again after making room in the
+  output buffer because there might be more output pending.
+
+    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
+  decide how much data to accumualte before producing output, in order to
+  maximize compression.
+
+    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+  flushed to the output buffer and the output is aligned on a byte boundary, so
+  that the decompressor can get all input data available so far. (In particular
+  avail_in is zero after the call if enough output space has been provided
+  before the call.)  Flushing may degrade compression for some compression
+  algorithms and so it should be used only when necessary.
+
+    If flush is set to Z_FULL_FLUSH, all output is flushed as with
+  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+  restart from this point if previous compressed data has been damaged or if
+  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
+  compression.
+
+    If deflate returns with avail_out == 0, this function must be called again
+  with the same value of the flush parameter and more output space (updated
+  avail_out), until the flush is complete (deflate returns with non-zero
+  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+  avail_out is greater than six to avoid repeated flush markers due to
+  avail_out == 0 on return.
+
+    If the parameter flush is set to Z_FINISH, pending input is processed,
+  pending output is flushed and deflate returns with Z_STREAM_END if there
+  was enough output space; if deflate returns with Z_OK, this function must be
+  called again with Z_FINISH and more output space (updated avail_out) but no
+  more input data, until it returns with Z_STREAM_END or an error. After
+  deflate has returned Z_STREAM_END, the only possible operations on the
+  stream are deflateReset or deflateEnd.
+
+    Z_FINISH can be used immediately after deflateInit if all the compression
+  is to be done in a single step. In this case, avail_out must be at least
+  the value returned by deflateBound (see below). If deflate does not return
+  Z_STREAM_END, then it must be called again as described above.
+
+    deflate() sets strm->adler to the adler32 checksum of all input read
+  so far (that is, total_in bytes).
+
+    deflate() may update strm->data_type if it can make a good guess about
+  the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
+  binary. This field is only for information purposes and does not affect
+  the compression algorithm in any manner.
+
+    deflate() returns Z_OK if some progress has been made (more input
+  processed or more output produced), Z_STREAM_END if all input has been
+  consumed and all output has been produced (only when flush is set to
+  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
+  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
+  (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
+  fatal, and deflate() can be called again with more input and more output
+  space to continue compressing.
+*/
+
+
+ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any
+   pending output.
+
+     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+   prematurely (some input or output was discarded). In the error case,
+   msg may be set but then points to a static string (which must not be
+   deallocated).
+*/
+
+
+/*
+ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+
+     Initializes the internal stream state for decompression. The fields
+   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
+   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
+   value depends on the compression method), inflateInit determines the
+   compression method from the zlib header and allocates all data structures
+   accordingly; otherwise the allocation will be deferred to the first call of
+   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
+   use default allocation functions.
+
+     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+   version assumed by the caller.  msg is set to null if there is no error
+   message. inflateInit does not perform any decompression apart from reading
+   the zlib header if present: this will be done by inflate().  (So next_in and
+   avail_in may be modified, but next_out and avail_out are unchanged.)
+*/
+
+
+ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+/*
+    inflate decompresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full. It may introduce
+  some output latency (reading input without producing any output) except when
+  forced to flush.
+
+  The detailed semantics are as follows. inflate performs one or both of the
+  following actions:
+
+  - Decompress more input starting at next_in and update next_in and avail_in
+    accordingly. If not all input can be processed (because there is not
+    enough room in the output buffer), next_in is updated and processing
+    will resume at this point for the next call of inflate().
+
+  - Provide more output starting at next_out and update next_out and avail_out
+    accordingly.  inflate() provides as much output as possible, until there
+    is no more input data or no more space in the output buffer (see below
+    about the flush parameter).
+
+  Before the call of inflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming
+  more output, and updating the next_* and avail_* values accordingly.
+  The application can consume the uncompressed output when it wants, for
+  example when the output buffer is full (avail_out == 0), or after each
+  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
+  must be called again after making room in the output buffer because there
+  might be more output pending.
+
+    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
+  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
+  output as possible to the output buffer. Z_BLOCK requests that inflate() stop
+  if and when it gets to the next deflate block boundary. When decoding the
+  zlib or gzip format, this will cause inflate() to return immediately after
+  the header and before the first block. When doing a raw inflate, inflate()
+  will go ahead and process the first block, and will return when it gets to
+  the end of that block, or when it runs out of data.
+
+    The Z_BLOCK option assists in appending to or combining deflate streams.
+  Also to assist in this, on return inflate() will set strm->data_type to the
+  number of unused bits in the last byte taken from strm->next_in, plus 64
+  if inflate() is currently decoding the last block in the deflate stream,
+  plus 128 if inflate() returned immediately after decoding an end-of-block
+  code or decoding the complete header up to just before the first byte of the
+  deflate stream. The end-of-block will not be indicated until all of the
+  uncompressed data from that block has been written to strm->next_out.  The
+  number of unused bits may in general be greater than seven, except when
+  bit 7 of data_type is set, in which case the number of unused bits will be
+  less than eight.
+
+    inflate() should normally be called until it returns Z_STREAM_END or an
+  error. However if all decompression is to be performed in a single step
+  (a single call of inflate), the parameter flush should be set to
+  Z_FINISH. In this case all pending input is processed and all pending
+  output is flushed; avail_out must be large enough to hold all the
+  uncompressed data. (The size of the uncompressed data may have been saved
+  by the compressor for this purpose.) The next operation on this stream must
+  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
+  is never required, but can be used to inform inflate that a faster approach
+  may be used for the single inflate() call.
+
+     In this implementation, inflate() always flushes as much output as
+  possible to the output buffer, and always uses the faster approach on the
+  first call. So the only effect of the flush parameter in this implementation
+  is on the return value of inflate(), as noted below, or when it returns early
+  because Z_BLOCK is used.
+
+     If a preset dictionary is needed after this call (see inflateSetDictionary
+  below), inflate sets strm->adler to the adler32 checksum of the dictionary
+  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
+  strm->adler to the adler32 checksum of all output produced so far (that is,
+  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
+  below. At the end of the stream, inflate() checks that its computed adler32
+  checksum is equal to that saved by the compressor and returns Z_STREAM_END
+  only if the checksum is correct.
+
+    inflate() will decompress and check either zlib-wrapped or gzip-wrapped
+  deflate data.  The header type is detected automatically.  Any information
+  contained in the gzip header is not retained, so applications that need that
+  information should instead use raw inflate, see inflateInit2() below, or
+  inflateBack() and perform their own processing of the gzip header and
+  trailer.
+
+    inflate() returns Z_OK if some progress has been made (more input processed
+  or more output produced), Z_STREAM_END if the end of the compressed data has
+  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
+  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
+  corrupted (input stream not conforming to the zlib format or incorrect check
+  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
+  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
+  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
+  inflate() can be called again with more input and more output space to
+  continue decompressing. If Z_DATA_ERROR is returned, the application may then
+  call inflateSync() to look for a good compression block if a partial recovery
+  of the data is desired.
+*/
+
+
+ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any
+   pending output.
+
+     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
+   was inconsistent. In the error case, msg may be set but then points to a
+   static string (which must not be deallocated).
+*/
+
+                        /* Advanced functions */
+
+/*
+    The following functions are needed only in some special applications.
+*/
+
+/*
+ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
+                                     int  level,
+                                     int  method,
+                                     int  windowBits,
+                                     int  memLevel,
+                                     int  strategy));
+
+     This is another version of deflateInit with more compression options. The
+   fields next_in, zalloc, zfree and opaque must be initialized before by
+   the caller.
+
+     The method parameter is the compression method. It must be Z_DEFLATED in
+   this version of the library.
+
+     The windowBits parameter is the base two logarithm of the window size
+   (the size of the history buffer). It should be in the range 8..15 for this
+   version of the library. Larger values of this parameter result in better
+   compression at the expense of memory usage. The default value is 15 if
+   deflateInit is used instead.
+
+     windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
+   determines the window size. deflate() will then generate raw deflate data
+   with no zlib header or trailer, and will not compute an adler32 check value.
+
+     windowBits can also be greater than 15 for optional gzip encoding. Add
+   16 to windowBits to write a simple gzip header and trailer around the
+   compressed data instead of a zlib wrapper. The gzip header will have no
+   file name, no extra data, no comment, no modification time (set to zero),
+   no header crc, and the operating system will be set to 255 (unknown).  If a
+   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
+
+     The memLevel parameter specifies how much memory should be allocated
+   for the internal compression state. memLevel=1 uses minimum memory but
+   is slow and reduces compression ratio; memLevel=9 uses maximum memory
+   for optimal speed. The default value is 8. See zconf.h for total memory
+   usage as a function of windowBits and memLevel.
+
+     The strategy parameter is used to tune the compression algorithm. Use the
+   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
+   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
+   string match), or Z_RLE to limit match distances to one (run-length
+   encoding). Filtered data consists mostly of small values with a somewhat
+   random distribution. In this case, the compression algorithm is tuned to
+   compress them better. The effect of Z_FILTERED is to force more Huffman
+   coding and less string matching; it is somewhat intermediate between
+   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
+   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
+   parameter only affects the compression ratio but not the correctness of the
+   compressed output even if it is not set appropriately.  Z_FIXED prevents the
+   use of dynamic Huffman codes, allowing for a simpler decoder for special
+   applications.
+
+      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
+   method). msg is set to null if there is no error message.  deflateInit2 does
+   not perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the compression dictionary from the given byte sequence
+   without producing any compressed output. This function must be called
+   immediately after deflateInit, deflateInit2 or deflateReset, before any
+   call of deflate. The compressor and decompressor must use exactly the same
+   dictionary (see inflateSetDictionary).
+
+     The dictionary should consist of strings (byte sequences) that are likely
+   to be encountered later in the data to be compressed, with the most commonly
+   used strings preferably put towards the end of the dictionary. Using a
+   dictionary is most useful when the data to be compressed is short and can be
+   predicted with good accuracy; the data can then be compressed better than
+   with the default empty dictionary.
+
+     Depending on the size of the compression data structures selected by
+   deflateInit or deflateInit2, a part of the dictionary may in effect be
+   discarded, for example if the dictionary is larger than the window size in
+   deflate or deflate2. Thus the strings most likely to be useful should be
+   put at the end of the dictionary, not at the front. In addition, the
+   current implementation of deflate will use at most the window size minus
+   262 bytes of the provided dictionary.
+
+     Upon return of this function, strm->adler is set to the adler32 value
+   of the dictionary; the decompressor may later use this value to determine
+   which dictionary has been used by the compressor. (The adler32 value
+   applies to the whole dictionary even if only a subset of the dictionary is
+   actually used by the compressor.) If a raw deflate was requested, then the
+   adler32 value is not computed and strm->adler is not set.
+
+     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
+   parameter is invalid (such as NULL dictionary) or the stream state is
+   inconsistent (for example if deflate has already been called for this stream
+   or if the compression method is bsort). deflateSetDictionary does not
+   perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when several compression strategies will be
+   tried, for example when there are several ways of pre-processing the input
+   data with a filter. The streams that will be discarded should then be freed
+   by calling deflateEnd.  Note that deflateCopy duplicates the internal
+   compression state which can be quite large, so this strategy is slow and
+   can consume lots of memory.
+
+     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being NULL). msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to deflateEnd followed by deflateInit,
+   but does not free and reallocate all the internal compression state.
+   The stream will keep the same compression level and any other attributes
+   that may have been set by deflateInit2.
+
+      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being NULL).
+*/
+
+ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
+                                      int level,
+                                      int strategy));
+/*
+     Dynamically update the compression level and compression strategy.  The
+   interpretation of level and strategy is as in deflateInit2.  This can be
+   used to switch between compression and straight copy of the input data, or
+   to switch to a different kind of input data requiring a different
+   strategy. If the compression level is changed, the input available so far
+   is compressed with the old level (and may be flushed); the new level will
+   take effect only at the next call of deflate().
+
+     Before the call of deflateParams, the stream state must be set as for
+   a call of deflate(), since the currently available input may have to
+   be compressed and flushed. In particular, strm->avail_out must be non-zero.
+
+     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
+   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
+   if strm->avail_out was zero.
+*/
+
+ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
+                                    int good_length,
+                                    int max_lazy,
+                                    int nice_length,
+                                    int max_chain));
+/*
+     Fine tune deflate's internal compression parameters.  This should only be
+   used by someone who understands the algorithm used by zlib's deflate for
+   searching for the best matching string, and even then only by the most
+   fanatic optimizer trying to squeeze out the last compressed bit for their
+   specific input data.  Read the deflate.c source code for the meaning of the
+   max_lazy, good_length, nice_length, and max_chain parameters.
+
+     deflateTune() can be called after deflateInit() or deflateInit2(), and
+   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
+ */
+
+ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
+                                       uLong sourceLen));
+/*
+     deflateBound() returns an upper bound on the compressed size after
+   deflation of sourceLen bytes.  It must be called after deflateInit()
+   or deflateInit2().  This would be used to allocate an output buffer
+   for deflation in a single pass, and so would be called before deflate().
+*/
+
+ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     deflatePrime() inserts bits in the deflate output stream.  The intent
+  is that this function is used to start off the deflate output with the
+  bits leftover from a previous deflate stream when appending to it.  As such,
+  this function can only be used for raw deflate, and must be used before the
+  first deflate() call after a deflateInit2() or deflateReset().  bits must be
+  less than or equal to 16, and that many of the least significant bits of
+  value will be inserted in the output.
+
+      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+      deflateSetHeader() provides gzip header information for when a gzip
+   stream is requested by deflateInit2().  deflateSetHeader() may be called
+   after deflateInit2() or deflateReset() and before the first call of
+   deflate().  The text, time, os, extra field, name, and comment information
+   in the provided gz_header structure are written to the gzip header (xflag is
+   ignored -- the extra flags are set according to the compression level).  The
+   caller must assure that, if not Z_NULL, name and comment are terminated with
+   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
+   available there.  If hcrc is true, a gzip header crc is included.  Note that
+   the current versions of the command-line version of gzip (up through version
+   1.3.x) do not support header crc's, and will report that it is a "multi-part
+   gzip file" and give up.
+
+      If deflateSetHeader is not used, the default gzip header has text false,
+   the time set to zero, and os set to 255, with no extra, name, or comment
+   fields.  The gzip header is returned to the default state by deflateReset().
+
+      deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
+                                     int  windowBits));
+
+     This is another version of inflateInit with an extra parameter. The
+   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
+   before by the caller.
+
+     The windowBits parameter is the base two logarithm of the maximum window
+   size (the size of the history buffer).  It should be in the range 8..15 for
+   this version of the library. The default value is 15 if inflateInit is used
+   instead. windowBits must be greater than or equal to the windowBits value
+   provided to deflateInit2() while compressing, or it must be equal to 15 if
+   deflateInit2() was not used. If a compressed stream with a larger window
+   size is given as input, inflate() will return with the error code
+   Z_DATA_ERROR instead of trying to allocate a larger window.
+
+     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
+   determines the window size. inflate() will then process raw deflate data,
+   not looking for a zlib or gzip header, not generating a check value, and not
+   looking for any check values for comparison at the end of the stream. This
+   is for use with other formats that use the deflate compressed data format
+   such as zip.  Those formats provide their own check values. If a custom
+   format is developed using the raw deflate format for compressed data, it is
+   recommended that a check value such as an adler32 or a crc32 be applied to
+   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
+   most applications, the zlib format should be used as is. Note that comments
+   above on the use in deflateInit2() applies to the magnitude of windowBits.
+
+     windowBits can also be greater than 15 for optional gzip decoding. Add
+   32 to windowBits to enable zlib and gzip decoding with automatic header
+   detection, or add 16 to decode only the gzip format (the zlib format will
+   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is
+   a crc32 instead of an adler32.
+
+     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
+   is set to null if there is no error message.  inflateInit2 does not perform
+   any decompression apart from reading the zlib header if present: this will
+   be done by inflate(). (So next_in and avail_in may be modified, but next_out
+   and avail_out are unchanged.)
+*/
+
+ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the decompression dictionary from the given uncompressed byte
+   sequence. This function must be called immediately after a call of inflate,
+   if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
+   can be determined from the adler32 value returned by that call of inflate.
+   The compressor and decompressor must use exactly the same dictionary (see
+   deflateSetDictionary).  For raw inflate, this function can be called
+   immediately after inflateInit2() or inflateReset() and before any call of
+   inflate() to set the dictionary.  The application must insure that the
+   dictionary that was used for compression is provided.
+
+     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
+   parameter is invalid (such as NULL dictionary) or the stream state is
+   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
+   expected one (incorrect adler32 value). inflateSetDictionary does not
+   perform any decompression: this will be done by subsequent calls of
+   inflate().
+*/
+
+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+/*
+    Skips invalid compressed data until a full flush point (see above the
+  description of deflate with Z_FULL_FLUSH) can be found, or until all
+  available input is skipped. No output is provided.
+
+    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
+  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
+  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
+  case, the application may save the current current value of total_in which
+  indicates where valid compressed data was found. In the error case, the
+  application may repeatedly call inflateSync, providing more input each time,
+  until success or end of the input data.
+*/
+
+ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when randomly accessing a large stream.  The
+   first pass through the stream can periodically record the inflate state,
+   allowing restarting inflate at those points when randomly accessing the
+   stream.
+
+     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being NULL). msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to inflateEnd followed by inflateInit,
+   but does not free and reallocate all the internal decompression state.
+   The stream will keep attributes that may have been set by inflateInit2.
+
+      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being NULL).
+*/
+
+ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     This function inserts bits in the inflate input stream.  The intent is
+  that this function is used to start inflating at a bit position in the
+  middle of a byte.  The provided bits will be used before any bytes are used
+  from next_in.  This function should only be used with raw inflate, and
+  should be used before the first inflate() call after inflateInit2() or
+  inflateReset().  bits must be less than or equal to 16, and that many of the
+  least significant bits of value will be inserted in the input.
+
+      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+      inflateGetHeader() requests that gzip header information be stored in the
+   provided gz_header structure.  inflateGetHeader() may be called after
+   inflateInit2() or inflateReset(), and before the first call of inflate().
+   As inflate() processes the gzip stream, head->done is zero until the header
+   is completed, at which time head->done is set to one.  If a zlib stream is
+   being decoded, then head->done is set to -1 to indicate that there will be
+   no gzip header information forthcoming.  Note that Z_BLOCK can be used to
+   force inflate() to return immediately after header processing is complete
+   and before any actual data is decompressed.
+
+      The text, time, xflags, and os fields are filled in with the gzip header
+   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
+   was valid if done is set to one.)  If extra is not Z_NULL, then extra_max
+   contains the maximum number of bytes to write to extra.  Once done is true,
+   extra_len contains the actual extra field length, and extra contains the
+   extra field, or that field truncated if extra_max is less than extra_len.
+   If name is not Z_NULL, then up to name_max characters are written there,
+   terminated with a zero unless the length is greater than name_max.  If
+   comment is not Z_NULL, then up to comm_max characters are written there,
+   terminated with a zero unless the length is greater than comm_max.  When
+   any of extra, name, or comment are not Z_NULL and the respective field is
+   not present in the header, then that field is set to Z_NULL to signal its
+   absence.  This allows the use of deflateSetHeader() with the returned
+   structure to duplicate the header.  However if those fields are set to
+   allocated memory, then the application will need to save those pointers
+   elsewhere so that they can be eventually freed.
+
+      If inflateGetHeader is not used, then the header information is simply
+   discarded.  The header is always checked for validity, including the header
+   CRC if present.  inflateReset() will reset the process to discard the header
+   information.  The application would need to call inflateGetHeader() again to
+   retrieve the header from the next gzip stream.
+
+      inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
+                                        unsigned char FAR *window));
+
+     Initialize the internal stream state for decompression using inflateBack()
+   calls.  The fields zalloc, zfree and opaque in strm must be initialized
+   before the call.  If zalloc and zfree are Z_NULL, then the default library-
+   derived memory allocation routines are used.  windowBits is the base two
+   logarithm of the window size, in the range 8..15.  window is a caller
+   supplied buffer of that size.  Except for special applications where it is
+   assured that deflate was used with small window sizes, windowBits must be 15
+   and a 32K byte window must be supplied to be able to decompress general
+   deflate streams.
+
+     See inflateBack() for the usage of these routines.
+
+     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
+   the paramaters are invalid, Z_MEM_ERROR if the internal state could not
+   be allocated, or Z_VERSION_ERROR if the version of the library does not
+   match the version of the header file.
+*/
+
+typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
+typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
+
+ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
+                                    in_func in, void FAR *in_desc,
+                                    out_func out, void FAR *out_desc));
+/*
+     inflateBack() does a raw inflate with a single call using a call-back
+   interface for input and output.  This is more efficient than inflate() for
+   file i/o applications in that it avoids copying between the output and the
+   sliding window by simply making the window itself the output buffer.  This
+   function trusts the application to not change the output buffer passed by
+   the output function, at least until inflateBack() returns.
+
+     inflateBackInit() must be called first to allocate the internal state
+   and to initialize the state with the user-provided window buffer.
+   inflateBack() may then be used multiple times to inflate a complete, raw
+   deflate stream with each call.  inflateBackEnd() is then called to free
+   the allocated state.
+
+     A raw deflate stream is one with no zlib or gzip header or trailer.
+   This routine would normally be used in a utility that reads zip or gzip
+   files and writes out uncompressed files.  The utility would decode the
+   header and process the trailer on its own, hence this routine expects
+   only the raw deflate stream to decompress.  This is different from the
+   normal behavior of inflate(), which expects either a zlib or gzip header and
+   trailer around the deflate stream.
+
+     inflateBack() uses two subroutines supplied by the caller that are then
+   called by inflateBack() for input and output.  inflateBack() calls those
+   routines until it reads a complete deflate stream and writes out all of the
+   uncompressed data, or until it encounters an error.  The function's
+   parameters and return types are defined above in the in_func and out_func
+   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
+   number of bytes of provided input, and a pointer to that input in buf.  If
+   there is no input available, in() must return zero--buf is ignored in that
+   case--and inflateBack() will return a buffer error.  inflateBack() will call
+   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
+   should return zero on success, or non-zero on failure.  If out() returns
+   non-zero, inflateBack() will return with an error.  Neither in() nor out()
+   are permitted to change the contents of the window provided to
+   inflateBackInit(), which is also the buffer that out() uses to write from.
+   The length written by out() will be at most the window size.  Any non-zero
+   amount of input may be provided by in().
+
+     For convenience, inflateBack() can be provided input on the first call by
+   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
+   in() will be called.  Therefore strm->next_in must be initialized before
+   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
+   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
+   must also be initialized, and then if strm->avail_in is not zero, input will
+   initially be taken from strm->next_in[0 .. strm->avail_in - 1].
+
+     The in_desc and out_desc parameters of inflateBack() is passed as the
+   first parameter of in() and out() respectively when they are called.  These
+   descriptors can be optionally used to pass any information that the caller-
+   supplied in() and out() functions need to do their job.
+
+     On return, inflateBack() will set strm->next_in and strm->avail_in to
+   pass back any unused input that was provided by the last in() call.  The
+   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
+   if in() or out() returned an error, Z_DATA_ERROR if there was a format
+   error in the deflate stream (in which case strm->msg is set to indicate the
+   nature of the error), or Z_STREAM_ERROR if the stream was not properly
+   initialized.  In the case of Z_BUF_ERROR, an input or output error can be
+   distinguished using strm->next_in which will be Z_NULL only if in() returned
+   an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
+   out() returning non-zero.  (in() will always be called before out(), so
+   strm->next_in is assured to be defined if out() returns non-zero.)  Note
+   that inflateBack() cannot return Z_OK.
+*/
+
+ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
+/*
+     All memory allocated by inflateBackInit() is freed.
+
+     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
+   state was inconsistent.
+*/
+
+ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+/* Return flags indicating compile-time options.
+
+    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
+     1.0: size of uInt
+     3.2: size of uLong
+     5.4: size of voidpf (pointer)
+     7.6: size of z_off_t
+
+    Compiler, assembler, and debug options:
+     8: DEBUG
+     9: ASMV or ASMINF -- use ASM code
+     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
+     11: 0 (reserved)
+
+    One-time table building (smaller code, but not thread-safe if true):
+     12: BUILDFIXED -- build static block decoding tables when needed
+     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
+     14,15: 0 (reserved)
+
+    Library content (indicates missing functionality):
+     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
+                          deflate code when not needed)
+     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
+                    and decode gzip streams (to avoid linking crc code)
+     18-19: 0 (reserved)
+
+    Operation variations (changes in library functionality):
+     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
+     21: FASTEST -- deflate algorithm with only one, lowest compression level
+     22,23: 0 (reserved)
+
+    The sprintf variant used by gzprintf (zero is best):
+     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
+     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
+     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
+
+    Remainder:
+     27-31: 0 (reserved)
+ */
+
+
+                        /* utility functions */
+
+/*
+     The following utility functions are implemented on top of the
+   basic stream-oriented functions. To simplify the interface, some
+   default options are assumed (compression level and memory usage,
+   standard memory allocation functions). The source code of these
+   utility functions can easily be modified if you need special options.
+*/
+
+ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
+                                 const Bytef *source, uLong sourceLen));
+/*
+     Compresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be at least the value returned
+   by compressBound(sourceLen). Upon exit, destLen is the actual size of the
+   compressed buffer.
+     This function can be used to compress a whole file at once if the
+   input file is mmap'ed.
+     compress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer.
+*/
+
+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
+                                  const Bytef *source, uLong sourceLen,
+                                  int level));
+/*
+     Compresses the source buffer into the destination buffer. The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer. Upon entry, destLen is the total size of the
+   destination buffer, which must be at least the value returned by
+   compressBound(sourceLen). Upon exit, destLen is the actual size of the
+   compressed buffer.
+
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+   Z_STREAM_ERROR if the level parameter is invalid.
+*/
+
+ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
+/*
+     compressBound() returns an upper bound on the compressed size after
+   compress() or compress2() on sourceLen bytes.  It would be used before
+   a compress() or compress2() call to allocate the destination buffer.
+*/
+
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
+                                   const Bytef *source, uLong sourceLen));
+/*
+     Decompresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be large enough to hold the
+   entire uncompressed data. (The size of the uncompressed data must have
+   been saved previously by the compressor and transmitted to the decompressor
+   by some mechanism outside the scope of this compression library.)
+   Upon exit, destLen is the actual size of the compressed buffer.
+     This function can be used to decompress a whole file at once if the
+   input file is mmap'ed.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
+*/
+
+
+typedef voidp gzFile;
+
+ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
+/*
+     Opens a gzip (.gz) file for reading or writing. The mode parameter
+   is as in fopen ("rb" or "wb") but can also include a compression level
+   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
+   Huffman only compression as in "wb1h", or 'R' for run-length encoding
+   as in "wb1R". (See the description of deflateInit2 for more information
+   about the strategy parameter.)
+
+     gzopen can be used to read a file which is not in gzip format; in this
+   case gzread will directly read from the file without decompression.
+
+     gzopen returns NULL if the file could not be opened or if there was
+   insufficient memory to allocate the (de)compression state; errno
+   can be checked to distinguish the two cases (if errno is zero, the
+   zlib error is Z_MEM_ERROR).  */
+
+ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
+/*
+     gzdopen() associates a gzFile with the file descriptor fd.  File
+   descriptors are obtained from calls like open, dup, creat, pipe or
+   fileno (in the file has been previously opened with fopen).
+   The mode parameter is as in gzopen.
+     The next call of gzclose on the returned gzFile will also close the
+   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
+   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
+     gzdopen returns NULL if there was insufficient memory to allocate
+   the (de)compression state.
+*/
+
+ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+/*
+     Dynamically update the compression level or strategy. See the description
+   of deflateInit2 for the meaning of these parameters.
+     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
+   opened for writing.
+*/
+
+ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
+/*
+     Reads the given number of uncompressed bytes from the compressed file.
+   If the input file was not in gzip format, gzread copies the given number
+   of bytes into the buffer.
+     gzread returns the number of uncompressed bytes actually read (0 for
+   end of file, -1 for error). */
+
+ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
+                                   voidpc buf, unsigned len));
+/*
+     Writes the given number of uncompressed bytes into the compressed file.
+   gzwrite returns the number of uncompressed bytes actually written
+   (0 in case of error).
+*/
+
+ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
+/*
+     Converts, formats, and writes the args to the compressed file under
+   control of the format string, as in fprintf. gzprintf returns the number of
+   uncompressed bytes actually written (0 in case of error).  The number of
+   uncompressed bytes written is limited to 4095. The caller should assure that
+   this limit is not exceeded. If it is exceeded, then gzprintf() will return
+   return an error (0) with nothing written. In this case, there may also be a
+   buffer overflow with unpredictable consequences, which is possible only if
+   zlib was compiled with the insecure functions sprintf() or vsprintf()
+   because the secure snprintf() or vsnprintf() functions were not available.
+*/
+
+ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+/*
+      Writes the given null-terminated string to the compressed file, excluding
+   the terminating null character.
+      gzputs returns the number of characters written, or -1 in case of error.
+*/
+
+ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+/*
+      Reads bytes from the compressed file until len-1 characters are read, or
+   a newline character is read and transferred to buf, or an end-of-file
+   condition is encountered.  The string is then terminated with a null
+   character.
+      gzgets returns buf, or Z_NULL in case of error.
+*/
+
+ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
+/*
+      Writes c, converted to an unsigned char, into the compressed file.
+   gzputc returns the value that was written, or -1 in case of error.
+*/
+
+ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
+/*
+      Reads one byte from the compressed file. gzgetc returns this byte
+   or -1 in case of end of file or error.
+*/
+
+ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
+/*
+      Push one character back onto the stream to be read again later.
+   Only one character of push-back is allowed.  gzungetc() returns the
+   character pushed, or -1 on failure.  gzungetc() will fail if a
+   character has been pushed but not read yet, or if c is -1. The pushed
+   character will be discarded if the stream is repositioned with gzseek()
+   or gzrewind().
+*/
+
+ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
+/*
+     Flushes all pending output into the compressed file. The parameter
+   flush is as in the deflate() function. The return value is the zlib
+   error number (see function gzerror below). gzflush returns Z_OK if
+   the flush parameter is Z_FINISH and all output could be flushed.
+     gzflush should be called only when strictly necessary because it can
+   degrade compression.
+*/
+
+ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
+                                      z_off_t offset, int whence));
+/*
+      Sets the starting position for the next gzread or gzwrite on the
+   given compressed file. The offset represents a number of bytes in the
+   uncompressed data stream. The whence parameter is defined as in lseek(2);
+   the value SEEK_END is not supported.
+     If the file is opened for reading, this function is emulated but can be
+   extremely slow. If the file is opened for writing, only forward seeks are
+   supported; gzseek then compresses a sequence of zeroes up to the new
+   starting position.
+
+      gzseek returns the resulting offset location as measured in bytes from
+   the beginning of the uncompressed stream, or -1 in case of error, in
+   particular if the file is opened for writing and the new starting position
+   would be before the current position.
+*/
+
+ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
+/*
+     Rewinds the given file. This function is supported only for reading.
+
+   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+*/
+
+ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+/*
+     Returns the starting position for the next gzread or gzwrite on the
+   given compressed file. This position represents a number of bytes in the
+   uncompressed data stream.
+
+   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+*/
+
+ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+/*
+     Returns 1 when EOF has previously been detected reading the given
+   input stream, otherwise zero.
+*/
+
+ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
+/*
+     Returns 1 if file is being read directly without decompression, otherwise
+   zero.
+*/
+
+ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
+/*
+     Flushes all pending output if necessary, closes the compressed file
+   and deallocates all the (de)compression state. The return value is the zlib
+   error number (see function gzerror below).
+*/
+
+ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+/*
+     Returns the error message for the last error which occurred on the
+   given compressed file. errnum is set to zlib error number. If an
+   error occurred in the file system and not in the compression library,
+   errnum is set to Z_ERRNO and the application may consult errno
+   to get the exact error code.
+*/
+
+ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+/*
+     Clears the error and end-of-file flags for file. This is analogous to the
+   clearerr() function in stdio. This is useful for continuing to read a gzip
+   file that is being written concurrently.
+*/
+
+                        /* checksum functions */
+
+/*
+     These functions are not related to compression but are exported
+   anyway because they might be useful in applications using the
+   compression library.
+*/
+
+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+/*
+     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
+   return the updated checksum. If buf is NULL, this function returns
+   the required initial value for the checksum.
+   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+   much faster. Usage example:
+
+     uLong adler = adler32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       adler = adler32(adler, buffer, length);
+     }
+     if (adler != original_adler) error();
+*/
+
+ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
+                                          z_off_t len2));
+/*
+     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
+   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
+   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
+   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
+*/
+
+ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
+/*
+     Update a running CRC-32 with the bytes buf[0..len-1] and return the
+   updated CRC-32. If buf is NULL, this function returns the required initial
+   value for the for the crc. Pre- and post-conditioning (one's complement) is
+   performed within this function so it shouldn't be done by the application.
+   Usage example:
+
+     uLong crc = crc32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       crc = crc32(crc, buffer, length);
+     }
+     if (crc != original_crc) error();
+*/
+
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+
+/*
+     Combine two CRC-32 check values into one.  For two sequences of bytes,
+   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
+   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
+   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
+   len2.
+*/
+
+
+                        /* various hacks, don't look :) */
+
+/* deflateInit and inflateInit are macros to allow checking the zlib version
+ * and the compiler's view of z_stream:
+ */
+ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
+                                      int windowBits, int memLevel,
+                                      int strategy, const char *version,
+                                      int stream_size));
+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
+                                      const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
+                                         unsigned char FAR *window,
+                                         const char *version,
+                                         int stream_size));
+#define deflateInit(strm, level) \
+        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit(strm) \
+        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
+#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit2(strm, windowBits) \
+        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+#define inflateBackInit(strm, windowBits, window) \
+        inflateBackInit_((strm), (windowBits), (window), \
+        ZLIB_VERSION, sizeof(z_stream))
+
+
+#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
+    struct internal_state {int dummy;}; /* hack for buggy compilers */
+#endif
+
+ZEXTERN const char   * ZEXPORT zError           OF((int));
+ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
+ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZLIB_H */
diff --git a/utils/zenutils/libraries/zlib123/zlib/zutil.c b/utils/zenutils/libraries/zlib123/zlib/zutil.c
index 0f4bd7871d..d55f5948a3 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/zutil.c
+++ b/utils/zenutils/libraries/zlib123/zlib/zutil.c
@@ -1,318 +1,318 @@
-/* zutil.c -- target dependent utility functions for the compression library

- * Copyright (C) 1995-2005 Jean-loup Gailly.

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* @(#) $Id$ */

-

-#include "zutil.h"

-

-#ifndef NO_DUMMY_DECL

-struct internal_state      {int dummy;}; /* for buggy compilers */

-#endif

-

-const char * const z_errmsg[10] = {

-"need dictionary",     /* Z_NEED_DICT       2  */

-"stream end",          /* Z_STREAM_END      1  */

-"",                    /* Z_OK              0  */

-"file error",          /* Z_ERRNO         (-1) */

-"stream error",        /* Z_STREAM_ERROR  (-2) */

-"data error",          /* Z_DATA_ERROR    (-3) */

-"insufficient memory", /* Z_MEM_ERROR     (-4) */

-"buffer error",        /* Z_BUF_ERROR     (-5) */

-"incompatible version",/* Z_VERSION_ERROR (-6) */

-""};

-

-

-const char * ZEXPORT zlibVersion()

-{

-    return ZLIB_VERSION;

-}

-

-uLong ZEXPORT zlibCompileFlags()

-{

-    uLong flags;

-

-    flags = 0;

-    switch (sizeof(uInt)) {

-    case 2:     break;

-    case 4:     flags += 1;     break;

-    case 8:     flags += 2;     break;

-    default:    flags += 3;

-    }

-    switch (sizeof(uLong)) {

-    case 2:     break;

-    case 4:     flags += 1 << 2;        break;

-    case 8:     flags += 2 << 2;        break;

-    default:    flags += 3 << 2;

-    }

-    switch (sizeof(voidpf)) {

-    case 2:     break;

-    case 4:     flags += 1 << 4;        break;

-    case 8:     flags += 2 << 4;        break;

-    default:    flags += 3 << 4;

-    }

-    switch (sizeof(z_off_t)) {

-    case 2:     break;

-    case 4:     flags += 1 << 6;        break;

-    case 8:     flags += 2 << 6;        break;

-    default:    flags += 3 << 6;

-    }

-#ifdef DEBUG

-    flags += 1 << 8;

-#endif

-#if defined(ASMV) || defined(ASMINF)

-    flags += 1 << 9;

-#endif

-#ifdef ZLIB_WINAPI

-    flags += 1 << 10;

-#endif

-#ifdef BUILDFIXED

-    flags += 1 << 12;

-#endif

-#ifdef DYNAMIC_CRC_TABLE

-    flags += 1 << 13;

-#endif

-#ifdef NO_GZCOMPRESS

-    flags += 1L << 16;

-#endif

-#ifdef NO_GZIP

-    flags += 1L << 17;

-#endif

-#ifdef PKZIP_BUG_WORKAROUND

-    flags += 1L << 20;

-#endif

-#ifdef FASTEST

-    flags += 1L << 21;

-#endif

-#ifdef STDC

-#  ifdef NO_vsnprintf

-        flags += 1L << 25;

-#    ifdef HAS_vsprintf_void

-        flags += 1L << 26;

-#    endif

-#  else

-#    ifdef HAS_vsnprintf_void

-        flags += 1L << 26;

-#    endif

-#  endif

-#else

-        flags += 1L << 24;

-#  ifdef NO_snprintf

-        flags += 1L << 25;

-#    ifdef HAS_sprintf_void

-        flags += 1L << 26;

-#    endif

-#  else

-#    ifdef HAS_snprintf_void

-        flags += 1L << 26;

-#    endif

-#  endif

-#endif

-    return flags;

-}

-

-#ifdef DEBUG

-

-#  ifndef verbose

-#    define verbose 0

-#  endif

-int z_verbose = verbose;

-

-void z_error (m)

-    char *m;

-{

-    fprintf(stderr, "%s\n", m);

-    exit(1);

-}

-#endif

-

-/* exported to allow conversion of error code to string for compress() and

- * uncompress()

- */

-const char * ZEXPORT zError(err)

-    int err;

-{

-    return ERR_MSG(err);

-}

-

-#if defined(_WIN32_WCE)

-    /* The Microsoft C Run-Time Library for Windows CE doesn't have

-     * errno.  We define it as a global variable to simplify porting.

-     * Its value is always 0 and should not be used.

-     */

-    int errno = 0;

-#endif

-

-#ifndef HAVE_MEMCPY

-

-void zmemcpy(dest, source, len)

-    Bytef* dest;

-    const Bytef* source;

-    uInt  len;

-{

-    if (len == 0) return;

-    do {

-        *dest++ = *source++; /* ??? to be unrolled */

-    } while (--len != 0);

-}

-

-int zmemcmp(s1, s2, len)

-    const Bytef* s1;

-    const Bytef* s2;

-    uInt  len;

-{

-    uInt j;

-

-    for (j = 0; j < len; j++) {

-        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;

-    }

-    return 0;

-}

-

-void zmemzero(dest, len)

-    Bytef* dest;

-    uInt  len;

-{

-    if (len == 0) return;

-    do {

-        *dest++ = 0;  /* ??? to be unrolled */

-    } while (--len != 0);

-}

-#endif

-

-

-#ifdef SYS16BIT

-

-#ifdef __TURBOC__

-/* Turbo C in 16-bit mode */

-

-#  define MY_ZCALLOC

-

-/* Turbo C malloc() does not allow dynamic allocation of 64K bytes

- * and farmalloc(64K) returns a pointer with an offset of 8, so we

- * must fix the pointer. Warning: the pointer must be put back to its

- * original form in order to free it, use zcfree().

- */

-

-#define MAX_PTR 10

-/* 10*64K = 640K */

-

-local int next_ptr = 0;

-

-typedef struct ptr_table_s {

-    voidpf org_ptr;

-    voidpf new_ptr;

-} ptr_table;

-

-local ptr_table table[MAX_PTR];

-/* This table is used to remember the original form of pointers

- * to large buffers (64K). Such pointers are normalized with a zero offset.

- * Since MSDOS is not a preemptive multitasking OS, this table is not

- * protected from concurrent access. This hack doesn't work anyway on

- * a protected system like OS/2. Use Microsoft C instead.

- */

-

-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)

-{

-    voidpf buf = opaque; /* just to make some compilers happy */

-    ulg bsize = (ulg)items*size;

-

-    /* If we allocate less than 65520 bytes, we assume that farmalloc

-     * will return a usable pointer which doesn't have to be normalized.

-     */

-    if (bsize < 65520L) {

-        buf = farmalloc(bsize);

-        if (*(ush*)&buf != 0) return buf;

-    } else {

-        buf = farmalloc(bsize + 16L);

-    }

-    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;

-    table[next_ptr].org_ptr = buf;

-

-    /* Normalize the pointer to seg:0 */

-    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;

-    *(ush*)&buf = 0;

-    table[next_ptr++].new_ptr = buf;

-    return buf;

-}

-

-void  zcfree (voidpf opaque, voidpf ptr)

-{

-    int n;

-    if (*(ush*)&ptr != 0) { /* object < 64K */

-        farfree(ptr);

-        return;

-    }

-    /* Find the original pointer */

-    for (n = 0; n < next_ptr; n++) {

-        if (ptr != table[n].new_ptr) continue;

-

-        farfree(table[n].org_ptr);

-        while (++n < next_ptr) {

-            table[n-1] = table[n];

-        }

-        next_ptr--;

-        return;

-    }

-    ptr = opaque; /* just to make some compilers happy */

-    Assert(0, "zcfree: ptr not found");

-}

-

-#endif /* __TURBOC__ */

-

-

-#ifdef M_I86

-/* Microsoft C in 16-bit mode */

-

-#  define MY_ZCALLOC

-

-#if (!defined(_MSC_VER) || (_MSC_VER <= 600))

-#  define _halloc  halloc

-#  define _hfree   hfree

-#endif

-

-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)

-{

-    if (opaque) opaque = 0; /* to make compiler happy */

-    return _halloc((long)items, size);

-}

-

-void  zcfree (voidpf opaque, voidpf ptr)

-{

-    if (opaque) opaque = 0; /* to make compiler happy */

-    _hfree(ptr);

-}

-

-#endif /* M_I86 */

-

-#endif /* SYS16BIT */

-

-

-#ifndef MY_ZCALLOC /* Any system without a special alloc function */

-

-#ifndef STDC

-extern voidp  malloc OF((uInt size));

-extern voidp  calloc OF((uInt items, uInt size));

-extern void   free   OF((voidpf ptr));

-#endif

-

-voidpf zcalloc (opaque, items, size)

-    voidpf opaque;

-    unsigned items;

-    unsigned size;

-{

-    if (opaque) items += size - size; /* make compiler happy */

-    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :

-                              (voidpf)calloc(items, size);

-}

-

-void  zcfree (opaque, ptr)

-    voidpf opaque;

-    voidpf ptr;

-{

-    free(ptr);

-    if (opaque) return; /* make compiler happy */

-}

-

-#endif /* MY_ZCALLOC */

+/* zutil.c -- target dependent utility functions for the compression library
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include "zutil.h"
+
+#ifndef NO_DUMMY_DECL
+struct internal_state      {int dummy;}; /* for buggy compilers */
+#endif
+
+const char * const z_errmsg[10] = {
+"need dictionary",     /* Z_NEED_DICT       2  */
+"stream end",          /* Z_STREAM_END      1  */
+"",                    /* Z_OK              0  */
+"file error",          /* Z_ERRNO         (-1) */
+"stream error",        /* Z_STREAM_ERROR  (-2) */
+"data error",          /* Z_DATA_ERROR    (-3) */
+"insufficient memory", /* Z_MEM_ERROR     (-4) */
+"buffer error",        /* Z_BUF_ERROR     (-5) */
+"incompatible version",/* Z_VERSION_ERROR (-6) */
+""};
+
+
+const char * ZEXPORT zlibVersion()
+{
+    return ZLIB_VERSION;
+}
+
+uLong ZEXPORT zlibCompileFlags()
+{
+    uLong flags;
+
+    flags = 0;
+    switch (sizeof(uInt)) {
+    case 2:     break;
+    case 4:     flags += 1;     break;
+    case 8:     flags += 2;     break;
+    default:    flags += 3;
+    }
+    switch (sizeof(uLong)) {
+    case 2:     break;
+    case 4:     flags += 1 << 2;        break;
+    case 8:     flags += 2 << 2;        break;
+    default:    flags += 3 << 2;
+    }
+    switch (sizeof(voidpf)) {
+    case 2:     break;
+    case 4:     flags += 1 << 4;        break;
+    case 8:     flags += 2 << 4;        break;
+    default:    flags += 3 << 4;
+    }
+    switch (sizeof(z_off_t)) {
+    case 2:     break;
+    case 4:     flags += 1 << 6;        break;
+    case 8:     flags += 2 << 6;        break;
+    default:    flags += 3 << 6;
+    }
+#ifdef DEBUG
+    flags += 1 << 8;
+#endif
+#if defined(ASMV) || defined(ASMINF)
+    flags += 1 << 9;
+#endif
+#ifdef ZLIB_WINAPI
+    flags += 1 << 10;
+#endif
+#ifdef BUILDFIXED
+    flags += 1 << 12;
+#endif
+#ifdef DYNAMIC_CRC_TABLE
+    flags += 1 << 13;
+#endif
+#ifdef NO_GZCOMPRESS
+    flags += 1L << 16;
+#endif
+#ifdef NO_GZIP
+    flags += 1L << 17;
+#endif
+#ifdef PKZIP_BUG_WORKAROUND
+    flags += 1L << 20;
+#endif
+#ifdef FASTEST
+    flags += 1L << 21;
+#endif
+#ifdef STDC
+#  ifdef NO_vsnprintf
+        flags += 1L << 25;
+#    ifdef HAS_vsprintf_void
+        flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_vsnprintf_void
+        flags += 1L << 26;
+#    endif
+#  endif
+#else
+        flags += 1L << 24;
+#  ifdef NO_snprintf
+        flags += 1L << 25;
+#    ifdef HAS_sprintf_void
+        flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_snprintf_void
+        flags += 1L << 26;
+#    endif
+#  endif
+#endif
+    return flags;
+}
+
+#ifdef DEBUG
+
+#  ifndef verbose
+#    define verbose 0
+#  endif
+int z_verbose = verbose;
+
+void z_error (m)
+    char *m;
+{
+    fprintf(stderr, "%s\n", m);
+    exit(1);
+}
+#endif
+
+/* exported to allow conversion of error code to string for compress() and
+ * uncompress()
+ */
+const char * ZEXPORT zError(err)
+    int err;
+{
+    return ERR_MSG(err);
+}
+
+#if defined(_WIN32_WCE)
+    /* The Microsoft C Run-Time Library for Windows CE doesn't have
+     * errno.  We define it as a global variable to simplify porting.
+     * Its value is always 0 and should not be used.
+     */
+    int errno = 0;
+#endif
+
+#ifndef HAVE_MEMCPY
+
+void zmemcpy(dest, source, len)
+    Bytef* dest;
+    const Bytef* source;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = *source++; /* ??? to be unrolled */
+    } while (--len != 0);
+}
+
+int zmemcmp(s1, s2, len)
+    const Bytef* s1;
+    const Bytef* s2;
+    uInt  len;
+{
+    uInt j;
+
+    for (j = 0; j < len; j++) {
+        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
+    }
+    return 0;
+}
+
+void zmemzero(dest, len)
+    Bytef* dest;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = 0;  /* ??? to be unrolled */
+    } while (--len != 0);
+}
+#endif
+
+
+#ifdef SYS16BIT
+
+#ifdef __TURBOC__
+/* Turbo C in 16-bit mode */
+
+#  define MY_ZCALLOC
+
+/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
+ * and farmalloc(64K) returns a pointer with an offset of 8, so we
+ * must fix the pointer. Warning: the pointer must be put back to its
+ * original form in order to free it, use zcfree().
+ */
+
+#define MAX_PTR 10
+/* 10*64K = 640K */
+
+local int next_ptr = 0;
+
+typedef struct ptr_table_s {
+    voidpf org_ptr;
+    voidpf new_ptr;
+} ptr_table;
+
+local ptr_table table[MAX_PTR];
+/* This table is used to remember the original form of pointers
+ * to large buffers (64K). Such pointers are normalized with a zero offset.
+ * Since MSDOS is not a preemptive multitasking OS, this table is not
+ * protected from concurrent access. This hack doesn't work anyway on
+ * a protected system like OS/2. Use Microsoft C instead.
+ */
+
+voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+{
+    voidpf buf = opaque; /* just to make some compilers happy */
+    ulg bsize = (ulg)items*size;
+
+    /* If we allocate less than 65520 bytes, we assume that farmalloc
+     * will return a usable pointer which doesn't have to be normalized.
+     */
+    if (bsize < 65520L) {
+        buf = farmalloc(bsize);
+        if (*(ush*)&buf != 0) return buf;
+    } else {
+        buf = farmalloc(bsize + 16L);
+    }
+    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
+    table[next_ptr].org_ptr = buf;
+
+    /* Normalize the pointer to seg:0 */
+    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
+    *(ush*)&buf = 0;
+    table[next_ptr++].new_ptr = buf;
+    return buf;
+}
+
+void  zcfree (voidpf opaque, voidpf ptr)
+{
+    int n;
+    if (*(ush*)&ptr != 0) { /* object < 64K */
+        farfree(ptr);
+        return;
+    }
+    /* Find the original pointer */
+    for (n = 0; n < next_ptr; n++) {
+        if (ptr != table[n].new_ptr) continue;
+
+        farfree(table[n].org_ptr);
+        while (++n < next_ptr) {
+            table[n-1] = table[n];
+        }
+        next_ptr--;
+        return;
+    }
+    ptr = opaque; /* just to make some compilers happy */
+    Assert(0, "zcfree: ptr not found");
+}
+
+#endif /* __TURBOC__ */
+
+
+#ifdef M_I86
+/* Microsoft C in 16-bit mode */
+
+#  define MY_ZCALLOC
+
+#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
+#  define _halloc  halloc
+#  define _hfree   hfree
+#endif
+
+voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+{
+    if (opaque) opaque = 0; /* to make compiler happy */
+    return _halloc((long)items, size);
+}
+
+void  zcfree (voidpf opaque, voidpf ptr)
+{
+    if (opaque) opaque = 0; /* to make compiler happy */
+    _hfree(ptr);
+}
+
+#endif /* M_I86 */
+
+#endif /* SYS16BIT */
+
+
+#ifndef MY_ZCALLOC /* Any system without a special alloc function */
+
+#ifndef STDC
+extern voidp  malloc OF((uInt size));
+extern voidp  calloc OF((uInt items, uInt size));
+extern void   free   OF((voidpf ptr));
+#endif
+
+voidpf zcalloc (opaque, items, size)
+    voidpf opaque;
+    unsigned items;
+    unsigned size;
+{
+    if (opaque) items += size - size; /* make compiler happy */
+    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
+                              (voidpf)calloc(items, size);
+}
+
+void  zcfree (opaque, ptr)
+    voidpf opaque;
+    voidpf ptr;
+{
+    free(ptr);
+    if (opaque) return; /* make compiler happy */
+}
+
+#endif /* MY_ZCALLOC */
diff --git a/utils/zenutils/libraries/zlib123/zlib/zutil.h b/utils/zenutils/libraries/zlib123/zlib/zutil.h
index 0ba6e02087..b7d5eff81b 100755..100644
--- a/utils/zenutils/libraries/zlib123/zlib/zutil.h
+++ b/utils/zenutils/libraries/zlib123/zlib/zutil.h
@@ -1,269 +1,269 @@
-/* zutil.h -- internal interface and configuration of the compression library

- * Copyright (C) 1995-2005 Jean-loup Gailly.

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* WARNING: this file should *not* be used by applications. It is

-   part of the implementation of the compression library and is

-   subject to change. Applications should only use zlib.h.

- */

-

-/* @(#) $Id$ */

-

-#ifndef ZUTIL_H

-#define ZUTIL_H

-

-#define ZLIB_INTERNAL

-#include "zlib.h"

-

-#ifdef STDC

-#  ifndef _WIN32_WCE

-#    include <stddef.h>

-#  endif

-#  include <string.h>

-#  include <stdlib.h>

-#endif

-#ifdef NO_ERRNO_H

-#   ifdef _WIN32_WCE

-      /* The Microsoft C Run-Time Library for Windows CE doesn't have

-       * errno.  We define it as a global variable to simplify porting.

-       * Its value is always 0 and should not be used.  We rename it to

-       * avoid conflict with other libraries that use the same workaround.

-       */

-#     define errno z_errno

-#   endif

-    extern int errno;

-#else

-#  ifndef _WIN32_WCE

-#    include <errno.h>

-#  endif

-#endif

-

-#ifndef local

-#  define local static

-#endif

-/* compile with -Dlocal if your debugger can't find static symbols */

-

-typedef unsigned char  uch;

-typedef uch FAR uchf;

-typedef unsigned short ush;

-typedef ush FAR ushf;

-typedef unsigned long  ulg;

-

-extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */

-/* (size given to avoid silly warnings with Visual C++) */

-

-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]

-

-#define ERR_RETURN(strm,err) \

-  return (strm->msg = (char*)ERR_MSG(err), (err))

-/* To be used only when the state is known to be valid */

-

-        /* common constants */

-

-#ifndef DEF_WBITS

-#  define DEF_WBITS MAX_WBITS

-#endif

-/* default windowBits for decompression. MAX_WBITS is for compression only */

-

-#if MAX_MEM_LEVEL >= 8

-#  define DEF_MEM_LEVEL 8

-#else

-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL

-#endif

-/* default memLevel */

-

-#define STORED_BLOCK 0

-#define STATIC_TREES 1

-#define DYN_TREES    2

-/* The three kinds of block type */

-

-#define MIN_MATCH  3

-#define MAX_MATCH  258

-/* The minimum and maximum match lengths */

-

-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */

-

-        /* target dependencies */

-

-#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))

-#  define OS_CODE  0x00

-#  if defined(__TURBOC__) || defined(__BORLANDC__)

-#    if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))

-       /* Allow compilation with ANSI keywords only enabled */

-       void _Cdecl farfree( void *block );

-       void *_Cdecl farmalloc( unsigned long nbytes );

-#    else

-#      include <alloc.h>

-#    endif

-#  else /* MSC or DJGPP */

-#    include <malloc.h>

-#  endif

-#endif

-

-#ifdef AMIGA

-#  define OS_CODE  0x01

-#endif

-

-#if defined(VAXC) || defined(VMS)

-#  define OS_CODE  0x02

-#  define F_OPEN(name, mode) \

-     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")

-#endif

-

-#if defined(ATARI) || defined(atarist)

-#  define OS_CODE  0x05

-#endif

-

-#ifdef OS2

-#  define OS_CODE  0x06

-#  ifdef M_I86

-     #include <malloc.h>

-#  endif

-#endif

-

-#if defined(MACOS) || defined(TARGET_OS_MAC)

-#  define OS_CODE  0x07

-#  if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os

-#    include <unix.h> /* for fdopen */

-#  else

-#    ifndef fdopen

-#      define fdopen(fd,mode) NULL /* No fdopen() */

-#    endif

-#  endif

-#endif

-

-#ifdef TOPS20

-#  define OS_CODE  0x0a

-#endif

-

-#ifdef WIN32

-#  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */

-#    define OS_CODE  0x0b

-#  endif

-#endif

-

-#ifdef __50SERIES /* Prime/PRIMOS */

-#  define OS_CODE  0x0f

-#endif

-

-#if defined(_BEOS_) || defined(RISCOS)

-#  define fdopen(fd,mode) NULL /* No fdopen() */

-#endif

-

-#if (defined(_MSC_VER) && (_MSC_VER > 600))

-#  if defined(_WIN32_WCE)

-#    define fdopen(fd,mode) NULL /* No fdopen() */

-#    ifndef _PTRDIFF_T_DEFINED

-       typedef int ptrdiff_t;

-#      define _PTRDIFF_T_DEFINED

-#    endif

-#  else

-#    define fdopen(fd,type)  _fdopen(fd,type)

-#  endif

-#endif

-

-        /* common defaults */

-

-#ifndef OS_CODE

-#  define OS_CODE  0x03  /* assume Unix */

-#endif

-

-#ifndef F_OPEN

-#  define F_OPEN(name, mode) fopen((name), (mode))

-#endif

-

-         /* functions */

-

-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)

-#  ifndef HAVE_VSNPRINTF

-#    define HAVE_VSNPRINTF

-#  endif

-#endif

-#if defined(__CYGWIN__)

-#  ifndef HAVE_VSNPRINTF

-#    define HAVE_VSNPRINTF

-#  endif

-#endif

-#ifndef HAVE_VSNPRINTF

-#  ifdef MSDOS

-     /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),

-        but for now we just assume it doesn't. */

-#    define NO_vsnprintf

-#  endif

-#  ifdef __TURBOC__

-#    define NO_vsnprintf

-#  endif

-#  ifdef WIN32

-     /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */

-#    if !defined(vsnprintf) && !defined(NO_vsnprintf)

-#      define vsnprintf _vsnprintf

-#    endif

-#  endif

-#  ifdef __SASC

-#    define NO_vsnprintf

-#  endif

-#endif

-#ifdef VMS

-#  define NO_vsnprintf

-#endif

-

-#if defined(pyr)

-#  define NO_MEMCPY

-#endif

-#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)

- /* Use our own functions for small and medium model with MSC <= 5.0.

-  * You may have to use the same strategy for Borland C (untested).

-  * The __SC__ check is for Symantec.

-  */

-#  define NO_MEMCPY

-#endif

-#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)

-#  define HAVE_MEMCPY

-#endif

-#ifdef HAVE_MEMCPY

-#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */

-#    define zmemcpy _fmemcpy

-#    define zmemcmp _fmemcmp

-#    define zmemzero(dest, len) _fmemset(dest, 0, len)

-#  else

-#    define zmemcpy memcpy

-#    define zmemcmp memcmp

-#    define zmemzero(dest, len) memset(dest, 0, len)

-#  endif

-#else

-   extern void zmemcpy  OF((Bytef* dest, const Bytef* source, uInt len));

-   extern int  zmemcmp  OF((const Bytef* s1, const Bytef* s2, uInt len));

-   extern void zmemzero OF((Bytef* dest, uInt len));

-#endif

-

-/* Diagnostic functions */

-#ifdef DEBUG

-#  include <stdio.h>

-   extern int z_verbose;

-   extern void z_error    OF((char *m));

-#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}

-#  define Trace(x) {if (z_verbose>=0) fprintf x ;}

-#  define Tracev(x) {if (z_verbose>0) fprintf x ;}

-#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}

-#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}

-#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}

-#else

-#  define Assert(cond,msg)

-#  define Trace(x)

-#  define Tracev(x)

-#  define Tracevv(x)

-#  define Tracec(c,x)

-#  define Tracecv(c,x)

-#endif

-

-

-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));

-void   zcfree  OF((voidpf opaque, voidpf ptr));

-

-#define ZALLOC(strm, items, size) \

-           (*((strm)->zalloc))((strm)->opaque, (items), (size))

-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))

-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}

-

-#endif /* ZUTIL_H */

+/* zutil.h -- internal interface and configuration of the compression library
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZUTIL_H
+#define ZUTIL_H
+
+#define ZLIB_INTERNAL
+#include "zlib.h"
+
+#ifdef STDC
+#  ifndef _WIN32_WCE
+#    include <stddef.h>
+#  endif
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+#ifdef NO_ERRNO_H
+#   ifdef _WIN32_WCE
+      /* The Microsoft C Run-Time Library for Windows CE doesn't have
+       * errno.  We define it as a global variable to simplify porting.
+       * Its value is always 0 and should not be used.  We rename it to
+       * avoid conflict with other libraries that use the same workaround.
+       */
+#     define errno z_errno
+#   endif
+    extern int errno;
+#else
+#  ifndef _WIN32_WCE
+#    include <errno.h>
+#  endif
+#endif
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+typedef unsigned char  uch;
+typedef uch FAR uchf;
+typedef unsigned short ush;
+typedef ush FAR ushf;
+typedef unsigned long  ulg;
+
+extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+/* (size given to avoid silly warnings with Visual C++) */
+
+#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
+
+#define ERR_RETURN(strm,err) \
+  return (strm->msg = (char*)ERR_MSG(err), (err))
+/* To be used only when the state is known to be valid */
+
+        /* common constants */
+
+#ifndef DEF_WBITS
+#  define DEF_WBITS MAX_WBITS
+#endif
+/* default windowBits for decompression. MAX_WBITS is for compression only */
+
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+/* default memLevel */
+
+#define STORED_BLOCK 0
+#define STATIC_TREES 1
+#define DYN_TREES    2
+/* The three kinds of block type */
+
+#define MIN_MATCH  3
+#define MAX_MATCH  258
+/* The minimum and maximum match lengths */
+
+#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
+
+        /* target dependencies */
+
+#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
+#  define OS_CODE  0x00
+#  if defined(__TURBOC__) || defined(__BORLANDC__)
+#    if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
+       /* Allow compilation with ANSI keywords only enabled */
+       void _Cdecl farfree( void *block );
+       void *_Cdecl farmalloc( unsigned long nbytes );
+#    else
+#      include <alloc.h>
+#    endif
+#  else /* MSC or DJGPP */
+#    include <malloc.h>
+#  endif
+#endif
+
+#ifdef AMIGA
+#  define OS_CODE  0x01
+#endif
+
+#if defined(VAXC) || defined(VMS)
+#  define OS_CODE  0x02
+#  define F_OPEN(name, mode) \
+     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
+#endif
+
+#if defined(ATARI) || defined(atarist)
+#  define OS_CODE  0x05
+#endif
+
+#ifdef OS2
+#  define OS_CODE  0x06
+#  ifdef M_I86
+     #include <malloc.h>
+#  endif
+#endif
+
+#if defined(MACOS) || defined(TARGET_OS_MAC)
+#  define OS_CODE  0x07
+#  if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+#    include <unix.h> /* for fdopen */
+#  else
+#    ifndef fdopen
+#      define fdopen(fd,mode) NULL /* No fdopen() */
+#    endif
+#  endif
+#endif
+
+#ifdef TOPS20
+#  define OS_CODE  0x0a
+#endif
+
+#ifdef WIN32
+#  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */
+#    define OS_CODE  0x0b
+#  endif
+#endif
+
+#ifdef __50SERIES /* Prime/PRIMOS */
+#  define OS_CODE  0x0f
+#endif
+
+#if defined(_BEOS_) || defined(RISCOS)
+#  define fdopen(fd,mode) NULL /* No fdopen() */
+#endif
+
+#if (defined(_MSC_VER) && (_MSC_VER > 600))
+#  if defined(_WIN32_WCE)
+#    define fdopen(fd,mode) NULL /* No fdopen() */
+#    ifndef _PTRDIFF_T_DEFINED
+       typedef int ptrdiff_t;
+#      define _PTRDIFF_T_DEFINED
+#    endif
+#  else
+#    define fdopen(fd,type)  _fdopen(fd,type)
+#  endif
+#endif
+
+        /* common defaults */
+
+#ifndef OS_CODE
+#  define OS_CODE  0x03  /* assume Unix */
+#endif
+
+#ifndef F_OPEN
+#  define F_OPEN(name, mode) fopen((name), (mode))
+#endif
+
+         /* functions */
+
+#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+#if defined(__CYGWIN__)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+#ifndef HAVE_VSNPRINTF
+#  ifdef MSDOS
+     /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
+        but for now we just assume it doesn't. */
+#    define NO_vsnprintf
+#  endif
+#  ifdef __TURBOC__
+#    define NO_vsnprintf
+#  endif
+#  ifdef WIN32
+     /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
+#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
+#      define vsnprintf _vsnprintf
+#    endif
+#  endif
+#  ifdef __SASC
+#    define NO_vsnprintf
+#  endif
+#endif
+#ifdef VMS
+#  define NO_vsnprintf
+#endif
+
+#if defined(pyr)
+#  define NO_MEMCPY
+#endif
+#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
+ /* Use our own functions for small and medium model with MSC <= 5.0.
+  * You may have to use the same strategy for Borland C (untested).
+  * The __SC__ check is for Symantec.
+  */
+#  define NO_MEMCPY
+#endif
+#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
+#  define HAVE_MEMCPY
+#endif
+#ifdef HAVE_MEMCPY
+#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
+#    define zmemcpy _fmemcpy
+#    define zmemcmp _fmemcmp
+#    define zmemzero(dest, len) _fmemset(dest, 0, len)
+#  else
+#    define zmemcpy memcpy
+#    define zmemcmp memcmp
+#    define zmemzero(dest, len) memset(dest, 0, len)
+#  endif
+#else
+   extern void zmemcpy  OF((Bytef* dest, const Bytef* source, uInt len));
+   extern int  zmemcmp  OF((const Bytef* s1, const Bytef* s2, uInt len));
+   extern void zmemzero OF((Bytef* dest, uInt len));
+#endif
+
+/* Diagnostic functions */
+#ifdef DEBUG
+#  include <stdio.h>
+   extern int z_verbose;
+   extern void z_error    OF((char *m));
+#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
+#  define Trace(x) {if (z_verbose>=0) fprintf x ;}
+#  define Tracev(x) {if (z_verbose>0) fprintf x ;}
+#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}
+#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
+#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
+#else
+#  define Assert(cond,msg)
+#  define Trace(x)
+#  define Tracev(x)
+#  define Tracevv(x)
+#  define Tracec(c,x)
+#  define Tracecv(c,x)
+#endif
+
+
+voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
+void   zcfree  OF((voidpf opaque, voidpf ptr));
+
+#define ZALLOC(strm, items, size) \
+           (*((strm)->zalloc))((strm)->opaque, (items), (size))
+#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
+#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
+
+#endif /* ZUTIL_H */
diff --git a/utils/zenutils/notes.txt b/utils/zenutils/notes.txt
index 0848718ac2..0006bd2e71 100755..100644
--- a/utils/zenutils/notes.txt
+++ b/utils/zenutils/notes.txt
@@ -1,77 +1,77 @@
-zenutils is a collection of utilities for working with firmwares of the Creative Zen range.

-

-The utilities are split into 3 categories:

-1) update_*

-   Operates on the Creative firmware updater executable.

-2) firmware_*

-   Operates on the Creative firmware archive.

-3) zen_crypt

-   Operates on the parts of the firmware archive which requires cryptography.

-

-

-General usage:

---------------

-A typical use scenario would be: download the firmware updater and run

- update_extract on it to obtain the firmware archive which it contains.

-Run firmware_extract on the firmware archive to obtain the files

- which the firmware archive contains and a make file that can later be used

- to create a new firmware archive. Edit* the extracted files of

- interest and optionally the associated make file. Create a new firmware

- archive by running firmware_make. If a NULL entry is present in the firmware

- then it's signature has to be updated running zen_crypt. If on windows, you

- can use update_patch to write your newly created firmware archive to the

- updater executable which you originally extracted it from. The new updater

- will update your player with the modifications you've made.

-

-* If you're creating or editing executable code, such as the CENC or ©TL entries,

-you'll need to use zen_crypt to decrypt and/or encrypt them.

-In addition, executable code on some players that use the ©TL entries also needs

- to be signed using zen_crypt, prior to encrypting them.

-Encrypting FBOOT and FRESC is not supported, as these contain the executable 

- code that makes up the critical Rescue Mode software, contained in flash.

-As opposed to CENC and ©TL which ultimately ends up being stored in the players

- filesystem as a file named Jukebox2.jrm.

-

-

-Important:

-----------

-The only entries required in a firmware archive is CINF and if present, NULL.

-Including either FBOOT, FRESC or EXT0 in your firmware archive is not advised,

- the first two are required for the Rescue Mode software operation and EXT0 is

- unknown, but given that it's contents is sent to an internal device named mcu0,

- the consequences of failure could be fatal to your player.

-

-

-Supported players:

-------------------

-zen_crypt supports signing, verification, decryption and encryption on the

- following Creative Zen players:

-  Vision:M (default if no player is specified)

-  Vision W

-  Micro

-  MicroPhoto

-  Sleek

-  SleekPhoto

-  Touch

-  Xtra

-

-The other utilities are not player specific and may work on players not listed.

-Although the Vision:M is the only player I've fully tested.

-

-

-Building the sources:

----------------------

-The source code uses the CMake (www.cmake.org) build system.

-Once you've installed CMake, you'll need to run it to produce make files for

- your system. I would recommend producing the make files within in the 'build'

- directory of this package. Which can be done by typing:

-  zenutils\build\>cmake -g "Visual Studio 8 2005" ..

-  (for msvc8 on windows)

- or:

-  ~zenutils/build/$ cmake -g "Unix Makefiles" ..

-  (for various 'nixes)

-The windows example will produce a solution file for msvc8.

-The 'nix example will produce a makefile which can be built using make.

-

-The executables will be placed within the 'bin' directory, once built.

-

+zenutils is a collection of utilities for working with firmwares of the Creative Zen range.
+
+The utilities are split into 3 categories:
+1) update_*
+   Operates on the Creative firmware updater executable.
+2) firmware_*
+   Operates on the Creative firmware archive.
+3) zen_crypt
+   Operates on the parts of the firmware archive which requires cryptography.
+
+
+General usage:
+--------------
+A typical use scenario would be: download the firmware updater and run
+ update_extract on it to obtain the firmware archive which it contains.
+Run firmware_extract on the firmware archive to obtain the files
+ which the firmware archive contains and a make file that can later be used
+ to create a new firmware archive. Edit* the extracted files of
+ interest and optionally the associated make file. Create a new firmware
+ archive by running firmware_make. If a NULL entry is present in the firmware
+ then it's signature has to be updated running zen_crypt. If on windows, you
+ can use update_patch to write your newly created firmware archive to the
+ updater executable which you originally extracted it from. The new updater
+ will update your player with the modifications you've made.
+
+* If you're creating or editing executable code, such as the CENC or ©TL entries,
+you'll need to use zen_crypt to decrypt and/or encrypt them.
+In addition, executable code on some players that use the ©TL entries also needs
+ to be signed using zen_crypt, prior to encrypting them.
+Encrypting FBOOT and FRESC is not supported, as these contain the executable 
+ code that makes up the critical Rescue Mode software, contained in flash.
+As opposed to CENC and ©TL which ultimately ends up being stored in the players
+ filesystem as a file named Jukebox2.jrm.
+
+
+Important:
+----------
+The only entries required in a firmware archive is CINF and if present, NULL.
+Including either FBOOT, FRESC or EXT0 in your firmware archive is not advised,
+ the first two are required for the Rescue Mode software operation and EXT0 is
+ unknown, but given that it's contents is sent to an internal device named mcu0,
+ the consequences of failure could be fatal to your player.
+
+
+Supported players:
+------------------
+zen_crypt supports signing, verification, decryption and encryption on the
+ following Creative Zen players:
+  Vision:M (default if no player is specified)
+  Vision W
+  Micro
+  MicroPhoto
+  Sleek
+  SleekPhoto
+  Touch
+  Xtra
+
+The other utilities are not player specific and may work on players not listed.
+Although the Vision:M is the only player I've fully tested.
+
+
+Building the sources:
+---------------------
+The source code uses the CMake (www.cmake.org) build system.
+Once you've installed CMake, you'll need to run it to produce make files for
+ your system. I would recommend producing the make files within in the 'build'
+ directory of this package. Which can be done by typing:
+  zenutils\build\>cmake -g "Visual Studio 8 2005" ..
+  (for msvc8 on windows)
+ or:
+  ~zenutils/build/$ cmake -g "Unix Makefiles" ..
+  (for various 'nixes)
+The windows example will produce a solution file for msvc8.
+The 'nix example will produce a makefile which can be built using make.
+
+The executables will be placed within the 'bin' directory, once built.
+
diff --git a/utils/zenutils/source/CMakeLists.txt b/utils/zenutils/source/CMakeLists.txt
index e3d44fd036..e7a4bcf63b 100755..100644
--- a/utils/zenutils/source/CMakeLists.txt
+++ b/utils/zenutils/source/CMakeLists.txt
@@ -1,6 +1,6 @@
-ADD_SUBDIRECTORY(firmware_extract)

-ADD_SUBDIRECTORY(firmware_make)

-ADD_SUBDIRECTORY(shared)

-ADD_SUBDIRECTORY(update_extract)

-ADD_SUBDIRECTORY(update_patch)

-ADD_SUBDIRECTORY(zen_crypt)

+ADD_SUBDIRECTORY(firmware_extract)
+ADD_SUBDIRECTORY(firmware_make)
+ADD_SUBDIRECTORY(shared)
+ADD_SUBDIRECTORY(update_extract)
+ADD_SUBDIRECTORY(update_patch)
+ADD_SUBDIRECTORY(zen_crypt)
diff --git a/utils/zenutils/source/firmware_extract/CMakeLists.txt b/utils/zenutils/source/firmware_extract/CMakeLists.txt
index 3814f03612..43af3e3235 100755..100644
--- a/utils/zenutils/source/firmware_extract/CMakeLists.txt
+++ b/utils/zenutils/source/firmware_extract/CMakeLists.txt
@@ -1,3 +1,3 @@
-ADD_EXECUTABLE(firmware_extract main.cpp)

-

-TARGET_LINK_LIBRARIES(firmware_extract shared)

+ADD_EXECUTABLE(firmware_extract main.cpp)
+
+TARGET_LINK_LIBRARIES(firmware_extract shared)
diff --git a/utils/zenutils/source/firmware_extract/main.cpp b/utils/zenutils/source/firmware_extract/main.cpp
index c677a91a75..bcd77afdfc 100755..100644
--- a/utils/zenutils/source/firmware_extract/main.cpp
+++ b/utils/zenutils/source/firmware_extract/main.cpp
@@ -1,243 +1,243 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#include <iostream>

-#include <ctime>

-#include <getpot/getpot.hpp>

-#include <utils.h>

-#include <firmware.h>

-

-

-static const char VERSION[] = "0.1";

-

-

-void print_version()

-{

-    std::cout

-        << "firmware_extract - Extracts files from a Creative firmware."

-        << std::endl

-        << "Version " << VERSION << std::endl

-        << "Copyright (c) 2007 Rasmus Ry" << std::endl;

-}

-

-void print_help()

-{

-    print_version();

-    std::cout

-        << "Usage: firmware_extract [command] [options]" << std::endl

-        << std::endl

-        << " Commands:" << std::endl

-        << "  -h,--help" << std::endl

-        << "      prints this message." << std::endl

-        << "  -f,--firmware [file]" << std::endl

-        << "      specifies the firmware arhive file name." << std::endl

-        << std::endl

-        << " Options:" << std::endl

-        << "  -V,--verbose" << std::endl

-        << "      prints verbose messages." << std::endl

-        << "  -p,--prefix [prefix]" << std::endl

-        << "      specifies a file name prefix for the extracted files." << std::endl

-        << std::endl

-        ;

-}

-

-

-struct save_entry_functor

-{

-    save_entry_functor(const std::string& fileprefix)

-        : _fileprefix(fileprefix) {}

-

-    bool operator()(const zen::firmware_entry& entry)

-    {

-        std::string filename = _fileprefix + entry.get_content_name();

-        std::ofstream ofs;

-        ofs.open(filename.c_str(), std::ios::binary);

-        if (!ofs)

-            false;

-

-        size_t off = entry.get_content_offset();

-        std::streamsize size = entry.get_bytes().size() - off;

-        ofs.write((const char*)&entry.get_bytes()[off], size);

-

-        return ofs.good();

-    }

-

-    const std::string& _fileprefix;

-}; //struct save_entry_functor

-

-struct print_entry_functor

-{

-    print_entry_functor(std::ostream& os, const std::string& fileprefix)

-        : _os(os), _fileprefix(fileprefix), num(0) {}

-

-    bool operator()(const zen::firmware_entry& entry)

-    {

-        std::string filename = _fileprefix + entry.get_content_name();

-        if (!num)

-            _os << "[./" << num++ << "]" << std::endl;

-        else

-            _os << "[../" << num++ << "]" << std::endl;

-        _os << "tag = " << entry.get_name() << std::endl;

-

-        if (entry.get_content_offset())

-            _os << "name = " << entry.get_content_name() << std::endl;

-

-        _os << "file = \'" << shared::double_quote(filename) << "\'"

-            << std::endl;

-

-        return _os.good();

-    }

-

-    std::ostream& _os;

-    const std::string& _fileprefix;

-    int num;

-}; //struct print_entry_functor

-

-

-int process_arguments(int argc, char* argv[])

-{

-    //--------------------------------------------------------------------

-    // Parse input variables.

-    //--------------------------------------------------------------------

-

-    GetPot cl(argc, argv);

-    if (cl.size() == 1 || cl.search(2, "-h", "--help"))

-    {

-        print_help();

-        return 1;

-    }

-

-    std::string firmwarename;

-    if (cl.search("-f") || cl.search("--firmware"))

-        firmwarename = cl.next("");

-    if (firmwarename.empty())

-    {

-        std::cerr << "Firmware archive must be specified." << std::endl;

-        return 2;

-    }

-

-    bool verbose = false;

-    if (cl.search("-V") || cl.search("--verbose"))

-        verbose = true;

-

-    std::string prefixname = shared::remove_extension(firmwarename) + "_";

-    if (cl.search("-p") || cl.search("--prefix"))

-        prefixname = cl.next(prefixname.c_str());

-

-

-    //--------------------------------------------------------------------

-    // Read the firmware archive.

-    //--------------------------------------------------------------------

-

-    if (verbose)

-        std::cout << "[*] Reading firmware archive..." << std::endl;

-

-    zen::firmware_archive archive(false);

-    std::ifstream ifs;

-    ifs.open(firmwarename.c_str(), std::ios::binary);

-    if (!ifs)

-    {

-        std::cerr << "Failed to open the firmware archive." << std::endl;

-        return 3;

-    }

-

-    if (!archive.read(ifs))

-    {

-        std::cerr << "Failed to read the firmware archive." << std::endl;

-        return 4;

-    }

-

-

-    //--------------------------------------------------------------------

-    // Generate a make file for the extracted firmware archive.

-    //--------------------------------------------------------------------

-

-    // Get make filename for the given input file.

-    std::string makefile = shared::replace_extension(firmwarename, ".mk");

-

-    if (verbose)

-        std::cout << "[*] Producing make file..." << std::endl;

-

-

-    // Produce make file for the given input file.

-    std::ofstream ofs;

-    ofs.open(makefile.c_str(), std::ios::binary);

-    if (!ofs)

-    {

-        std::cerr << "Failed to create firmware archive make file."

-                  << std::endl;

-        return 5;

-    }

-

-    time_t timeval = time(NULL);

-    ofs << "# Make file generated at: " << ctime(&timeval);

-    ofs << "endian = " << (archive.is_big_endian() ? "big" : "little")

-        << std::endl;

-    ofs << "signed = " << (archive.is_signed() ? "true" : "false")

-        << std::endl;

-

-    ofs << "[children]" << std::endl;

-    ofs << "count = " << archive.get_children().size() << std::endl;

-

-    std::for_each(archive.get_children().begin(),

-                  archive.get_children().end(),

-                  print_entry_functor(ofs, prefixname));

-

-    ofs << "[neighbours]" << std::endl;

-    ofs << "count = " << archive.get_neighbours().size() << std::endl;

-    std::for_each(archive.get_neighbours().begin(),

-                  archive.get_neighbours().end(),

-                  print_entry_functor(ofs, prefixname));

-

-

-    //--------------------------------------------------------------------

-    // Save firmware entries.

-    //--------------------------------------------------------------------

-

-    if (verbose)

-        std::cout << "[*] Saving firmware entries..." << std::endl;

-

-    std::for_each(archive.get_children().begin(),

-                  archive.get_children().end(),

-                  save_entry_functor(prefixname));

-

-    std::for_each(archive.get_neighbours().begin(),

-                  archive.get_neighbours().end(),

-                  save_entry_functor(prefixname));

-

-    return 0;

-}

-

-int main(int argc, char* argv[])

-{

-    try

-    {

-        return process_arguments(argc, argv);

-    }

-    catch (const std::exception& xcpt)

-    {

-        std::cerr << "Exception caught: " << xcpt.what() << std::endl;

-        return -1;

-    }

-    catch (...)

-    {

-        std::cerr << "Unknown exception caught." << std::endl;

-        return -2;

-    }

-    return -3;

-}

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <iostream>
+#include <ctime>
+#include <getpot/getpot.hpp>
+#include <utils.h>
+#include <firmware.h>
+
+
+static const char VERSION[] = "0.1";
+
+
+void print_version()
+{
+    std::cout
+        << "firmware_extract - Extracts files from a Creative firmware."
+        << std::endl
+        << "Version " << VERSION << std::endl
+        << "Copyright (c) 2007 Rasmus Ry" << std::endl;
+}
+
+void print_help()
+{
+    print_version();
+    std::cout
+        << "Usage: firmware_extract [command] [options]" << std::endl
+        << std::endl
+        << " Commands:" << std::endl
+        << "  -h,--help" << std::endl
+        << "      prints this message." << std::endl
+        << "  -f,--firmware [file]" << std::endl
+        << "      specifies the firmware arhive file name." << std::endl
+        << std::endl
+        << " Options:" << std::endl
+        << "  -V,--verbose" << std::endl
+        << "      prints verbose messages." << std::endl
+        << "  -p,--prefix [prefix]" << std::endl
+        << "      specifies a file name prefix for the extracted files." << std::endl
+        << std::endl
+        ;
+}
+
+
+struct save_entry_functor
+{
+    save_entry_functor(const std::string& fileprefix)
+        : _fileprefix(fileprefix) {}
+
+    bool operator()(const zen::firmware_entry& entry)
+    {
+        std::string filename = _fileprefix + entry.get_content_name();
+        std::ofstream ofs;
+        ofs.open(filename.c_str(), std::ios::binary);
+        if (!ofs)
+            false;
+
+        size_t off = entry.get_content_offset();
+        std::streamsize size = entry.get_bytes().size() - off;
+        ofs.write((const char*)&entry.get_bytes()[off], size);
+
+        return ofs.good();
+    }
+
+    const std::string& _fileprefix;
+}; //struct save_entry_functor
+
+struct print_entry_functor
+{
+    print_entry_functor(std::ostream& os, const std::string& fileprefix)
+        : _os(os), _fileprefix(fileprefix), num(0) {}
+
+    bool operator()(const zen::firmware_entry& entry)
+    {
+        std::string filename = _fileprefix + entry.get_content_name();
+        if (!num)
+            _os << "[./" << num++ << "]" << std::endl;
+        else
+            _os << "[../" << num++ << "]" << std::endl;
+        _os << "tag = " << entry.get_name() << std::endl;
+
+        if (entry.get_content_offset())
+            _os << "name = " << entry.get_content_name() << std::endl;
+
+        _os << "file = \'" << shared::double_quote(filename) << "\'"
+            << std::endl;
+
+        return _os.good();
+    }
+
+    std::ostream& _os;
+    const std::string& _fileprefix;
+    int num;
+}; //struct print_entry_functor
+
+
+int process_arguments(int argc, char* argv[])
+{
+    //--------------------------------------------------------------------
+    // Parse input variables.
+    //--------------------------------------------------------------------
+
+    GetPot cl(argc, argv);
+    if (cl.size() == 1 || cl.search(2, "-h", "--help"))
+    {
+        print_help();
+        return 1;
+    }
+
+    std::string firmwarename;
+    if (cl.search("-f") || cl.search("--firmware"))
+        firmwarename = cl.next("");
+    if (firmwarename.empty())
+    {
+        std::cerr << "Firmware archive must be specified." << std::endl;
+        return 2;
+    }
+
+    bool verbose = false;
+    if (cl.search("-V") || cl.search("--verbose"))
+        verbose = true;
+
+    std::string prefixname = shared::remove_extension(firmwarename) + "_";
+    if (cl.search("-p") || cl.search("--prefix"))
+        prefixname = cl.next(prefixname.c_str());
+
+
+    //--------------------------------------------------------------------
+    // Read the firmware archive.
+    //--------------------------------------------------------------------
+
+    if (verbose)
+        std::cout << "[*] Reading firmware archive..." << std::endl;
+
+    zen::firmware_archive archive(false);
+    std::ifstream ifs;
+    ifs.open(firmwarename.c_str(), std::ios::binary);
+    if (!ifs)
+    {
+        std::cerr << "Failed to open the firmware archive." << std::endl;
+        return 3;
+    }
+
+    if (!archive.read(ifs))
+    {
+        std::cerr << "Failed to read the firmware archive." << std::endl;
+        return 4;
+    }
+
+
+    //--------------------------------------------------------------------
+    // Generate a make file for the extracted firmware archive.
+    //--------------------------------------------------------------------
+
+    // Get make filename for the given input file.
+    std::string makefile = shared::replace_extension(firmwarename, ".mk");
+
+    if (verbose)
+        std::cout << "[*] Producing make file..." << std::endl;
+
+
+    // Produce make file for the given input file.
+    std::ofstream ofs;
+    ofs.open(makefile.c_str(), std::ios::binary);
+    if (!ofs)
+    {
+        std::cerr << "Failed to create firmware archive make file."
+                  << std::endl;
+        return 5;
+    }
+
+    time_t timeval = time(NULL);
+    ofs << "# Make file generated at: " << ctime(&timeval);
+    ofs << "endian = " << (archive.is_big_endian() ? "big" : "little")
+        << std::endl;
+    ofs << "signed = " << (archive.is_signed() ? "true" : "false")
+        << std::endl;
+
+    ofs << "[children]" << std::endl;
+    ofs << "count = " << archive.get_children().size() << std::endl;
+
+    std::for_each(archive.get_children().begin(),
+                  archive.get_children().end(),
+                  print_entry_functor(ofs, prefixname));
+
+    ofs << "[neighbours]" << std::endl;
+    ofs << "count = " << archive.get_neighbours().size() << std::endl;
+    std::for_each(archive.get_neighbours().begin(),
+                  archive.get_neighbours().end(),
+                  print_entry_functor(ofs, prefixname));
+
+
+    //--------------------------------------------------------------------
+    // Save firmware entries.
+    //--------------------------------------------------------------------
+
+    if (verbose)
+        std::cout << "[*] Saving firmware entries..." << std::endl;
+
+    std::for_each(archive.get_children().begin(),
+                  archive.get_children().end(),
+                  save_entry_functor(prefixname));
+
+    std::for_each(archive.get_neighbours().begin(),
+                  archive.get_neighbours().end(),
+                  save_entry_functor(prefixname));
+
+    return 0;
+}
+
+int main(int argc, char* argv[])
+{
+    try
+    {
+        return process_arguments(argc, argv);
+    }
+    catch (const std::exception& xcpt)
+    {
+        std::cerr << "Exception caught: " << xcpt.what() << std::endl;
+        return -1;
+    }
+    catch (...)
+    {
+        std::cerr << "Unknown exception caught." << std::endl;
+        return -2;
+    }
+    return -3;
+}
diff --git a/utils/zenutils/source/firmware_make/CMakeLists.txt b/utils/zenutils/source/firmware_make/CMakeLists.txt
index 518a008730..39197e2f07 100755..100644
--- a/utils/zenutils/source/firmware_make/CMakeLists.txt
+++ b/utils/zenutils/source/firmware_make/CMakeLists.txt
@@ -1,3 +1,3 @@
-ADD_EXECUTABLE(firmware_make main.cpp)

-

-TARGET_LINK_LIBRARIES (firmware_make shared)

+ADD_EXECUTABLE(firmware_make main.cpp)
+
+TARGET_LINK_LIBRARIES (firmware_make shared)
diff --git a/utils/zenutils/source/firmware_make/main.cpp b/utils/zenutils/source/firmware_make/main.cpp
index b0602b6ffe..35d036e601 100755..100644
--- a/utils/zenutils/source/firmware_make/main.cpp
+++ b/utils/zenutils/source/firmware_make/main.cpp
@@ -1,261 +1,261 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#include <iostream>

-#include <sstream>

-#include <getpot/getpot.hpp>

-#include <file.h>

-#include <firmware.h>

-#include <utils.h>

-

-

-static const char VERSION[] = "0.1";

-

-void print_version()

-{

-    std::cout

-        << "firmware_make - Creates a Creative firmware archive." << std::endl

-        << "Version " << VERSION << std::endl

-        << "Copyright (c) 2007 Rasmus Ry" << std::endl;

-}

-

-void print_help()

-{

-    print_version();

-    std::cout << std::endl

-        << "Usage: firmware_make [command] [options]" << std::endl

-        << std::endl

-        << " Commands:" << std::endl

-        << "  -h,--help" << std::endl

-        << "      prints this message." << std::endl

-        << "  -m,--makefile [file]" << std::endl

-        << "      specifies the .mk file to build the firmware archive from."

-        << std::endl << std::endl

-        << " Options:" << std::endl

-        << "  -V,--verbose" << std::endl

-        << "      prints verbose messages." << std::endl

-        << "  -f,--firmware [file]" << std::endl

-        << "      specifies the output firmware file name" << std::endl

-        << std::endl

-        ;

-}

-

-dword get_tag_value(std::string tag)

-{

-    if (tag[0] == '0' && tag[1] == 'x')

-    {

-        dword val = 0;

-        if (sscanf(tag.c_str(), "0x%08X", &val) == 1)

-            return val;

-        if (sscanf(tag.c_str(), "0x%08x", &val) == 1)

-            return val;

-    }

-    else

-    {

-        return shared::swap(*(dword*)&tag[0]);

-    }

-    return 0;

-}

-

-bool process_child(const GetPot& mkfile, const std::string& root, int index,

-                   zen::firmware_entry& entry)

-{

-    std::stringstream sstm;

-    sstm << root << "/" << index;

-    std::string var = sstm.str() + "/tag";

-    std::string tag = mkfile(var.c_str(), "");

-    var = sstm.str() + "/name";

-    std::string name = mkfile(var.c_str(), "");

-    var = sstm.str() + "/file";

-    std::string file = mkfile(var.c_str(), "");

-

-    if (file.empty() || tag.empty())

-    {

-        std::cerr << "Invalid file or tag for var: " << sstm.str()

-                  << std::endl;

-        return false;

-    }

-

-    shared::bytes buffer;

-    if (!shared::read_file(file, buffer))

-    {

-        std::cerr << "Failed to read the file: " << file << std::endl;

-        return false;

-    }

-

-    entry.get_bytes().clear();

-    entry.get_header().tag = get_tag_value(tag);

-    size_t contoff = entry.get_content_offset();

-    if (contoff)

-    {

-        entry.get_bytes().resize(contoff, 0);

-        if (!name.empty())

-        {

-            size_t endoff = entry.is_big_endian() ? 1 : 0;

-            for (int i = 0; i < name.size(); ++i)

-                entry.get_bytes()[i * 2 + endoff] = name[i];

-        }

-    }

-    entry.get_bytes().insert(entry.get_bytes().end(), buffer.begin(),

-                             buffer.end());

-

-    entry.get_header().size = entry.get_bytes().size();

-

-    return true;

-}

-

-int process_arguments(int argc, char* argv[])

-{

-    //--------------------------------------------------------------------

-    // Parse input variables.

-    //--------------------------------------------------------------------

-

-    GetPot cl(argc, argv);

-    if (cl.size() == 1 || cl.search(2, "-h", "--help"))

-    {

-        print_help();

-        return 1;

-    }

-

-    std::string makefile;

-    if (cl.search("-m") || cl.search("--makefile"))

-        makefile = cl.next("");

-    if (makefile.empty())

-    {

-        std::cerr << "Makefile must be specified." << std::endl;

-        return 2;

-    }

-

-    std::string firmware;

-    if (cl.search("-f") || cl.search("--firmware"))

-        firmware = cl.next("");

-    if (firmware.empty())

-    {

-        std::cerr << "Firmware must be specified." << std::endl;

-        return 3;

-    }

-

-    bool verbose = false;

-    if (cl.search("-V") || cl.search("--verbose"))

-        verbose = true;

-

-    GetPot mkfile(makefile.c_str());

-    if (verbose)

-        mkfile.print();

-

-    bool big_endian;

-    std::string endian = mkfile("endian", "little");

-    if (endian == "little")

-    {

-        big_endian = false;

-    }

-    else if (endian == "big")

-    {

-        big_endian = true;

-    }

-    else

-    {

-        std::cerr << "Invalid value of 'endian'" << std::endl;

-        return 4;

-    }

-

-    zen::firmware_archive archive(big_endian);

-    int childcount = mkfile("children/count", 0);

-    if (!childcount)

-    {

-        std::cerr << "A firmware archive must have at least one child entry."

-                  << std::endl;

-        return 5;

-    }

-

-    for (int i = 0; i < childcount; i++)

-    {

-        zen::firmware_entry entry(big_endian);

-        if (!process_child(mkfile, "children", i, entry))

-        {

-            return 6;

-        }

-        archive.get_children().push_back(entry);

-    }

-

-    int neighbourcount = mkfile("neighbours/count", 0);

-    for (int i = 0; i < neighbourcount; i++)

-    {

-        zen::firmware_entry entry(big_endian);

-        if (!process_child(mkfile, "neighbours", i, entry))

-        {

-            return 7;

-        }

-        archive.get_neighbours().push_back(entry);

-    }

-

-    std::ofstream ofs;

-    ofs.open(firmware.c_str(), std::ios::out|std::ios::binary|std::ios::trunc);

-    if (!ofs)

-    {

-        std::cerr << "Failed to create the firmware file." << std::endl;

-        return 8;

-    }

-

-    if (!archive.write(ofs))

-    {

-        std::cerr << "Failed to save the firmware archive." << std::endl;

-        return 9;

-    }

-    ofs.close();

-

-    size_t length = archive.calc_size();

-    if (!length)

-    {

-        std::cerr << "Failed to determine the size of the firmware archive."

-                  << std::endl;

-        return 10;

-    }

-

-    int align = length % 4;

-    if (align)

-    {

-        shared::bytes padding(4 - align, 0);

-        if (!shared::write_file(firmware, padding, false, length))

-        {

-            std::cerr << "Failed to write padding data." << std::endl;

-            return 11;

-        }

-    }

-

-    return 0;

-}

-

-int main(int argc, char* argv[])

-{

-    try

-    {

-        return process_arguments(argc, argv);

-    }

-    catch (const std::exception& xcpt)

-    {

-        std::cerr << "Exception caught: " << xcpt.what() << std::endl;

-        return -1;

-    }

-    catch (...)

-    {

-        std::cerr << "Unknown exception caught." << std::endl;

-        return -2;

-    }

-    return -3;

-}

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <iostream>
+#include <sstream>
+#include <getpot/getpot.hpp>
+#include <file.h>
+#include <firmware.h>
+#include <utils.h>
+
+
+static const char VERSION[] = "0.1";
+
+void print_version()
+{
+    std::cout
+        << "firmware_make - Creates a Creative firmware archive." << std::endl
+        << "Version " << VERSION << std::endl
+        << "Copyright (c) 2007 Rasmus Ry" << std::endl;
+}
+
+void print_help()
+{
+    print_version();
+    std::cout << std::endl
+        << "Usage: firmware_make [command] [options]" << std::endl
+        << std::endl
+        << " Commands:" << std::endl
+        << "  -h,--help" << std::endl
+        << "      prints this message." << std::endl
+        << "  -m,--makefile [file]" << std::endl
+        << "      specifies the .mk file to build the firmware archive from."
+        << std::endl << std::endl
+        << " Options:" << std::endl
+        << "  -V,--verbose" << std::endl
+        << "      prints verbose messages." << std::endl
+        << "  -f,--firmware [file]" << std::endl
+        << "      specifies the output firmware file name" << std::endl
+        << std::endl
+        ;
+}
+
+dword get_tag_value(std::string tag)
+{
+    if (tag[0] == '0' && tag[1] == 'x')
+    {
+        dword val = 0;
+        if (sscanf(tag.c_str(), "0x%08X", &val) == 1)
+            return val;
+        if (sscanf(tag.c_str(), "0x%08x", &val) == 1)
+            return val;
+    }
+    else
+    {
+        return shared::swap(*(dword*)&tag[0]);
+    }
+    return 0;
+}
+
+bool process_child(const GetPot& mkfile, const std::string& root, int index,
+                   zen::firmware_entry& entry)
+{
+    std::stringstream sstm;
+    sstm << root << "/" << index;
+    std::string var = sstm.str() + "/tag";
+    std::string tag = mkfile(var.c_str(), "");
+    var = sstm.str() + "/name";
+    std::string name = mkfile(var.c_str(), "");
+    var = sstm.str() + "/file";
+    std::string file = mkfile(var.c_str(), "");
+
+    if (file.empty() || tag.empty())
+    {
+        std::cerr << "Invalid file or tag for var: " << sstm.str()
+                  << std::endl;
+        return false;
+    }
+
+    shared::bytes buffer;
+    if (!shared::read_file(file, buffer))
+    {
+        std::cerr << "Failed to read the file: " << file << std::endl;
+        return false;
+    }
+
+    entry.get_bytes().clear();
+    entry.get_header().tag = get_tag_value(tag);
+    size_t contoff = entry.get_content_offset();
+    if (contoff)
+    {
+        entry.get_bytes().resize(contoff, 0);
+        if (!name.empty())
+        {
+            size_t endoff = entry.is_big_endian() ? 1 : 0;
+            for (int i = 0; i < name.size(); ++i)
+                entry.get_bytes()[i * 2 + endoff] = name[i];
+        }
+    }
+    entry.get_bytes().insert(entry.get_bytes().end(), buffer.begin(),
+                             buffer.end());
+
+    entry.get_header().size = entry.get_bytes().size();
+
+    return true;
+}
+
+int process_arguments(int argc, char* argv[])
+{
+    //--------------------------------------------------------------------
+    // Parse input variables.
+    //--------------------------------------------------------------------
+
+    GetPot cl(argc, argv);
+    if (cl.size() == 1 || cl.search(2, "-h", "--help"))
+    {
+        print_help();
+        return 1;
+    }
+
+    std::string makefile;
+    if (cl.search("-m") || cl.search("--makefile"))
+        makefile = cl.next("");
+    if (makefile.empty())
+    {
+        std::cerr << "Makefile must be specified." << std::endl;
+        return 2;
+    }
+
+    std::string firmware;
+    if (cl.search("-f") || cl.search("--firmware"))
+        firmware = cl.next("");
+    if (firmware.empty())
+    {
+        std::cerr << "Firmware must be specified." << std::endl;
+        return 3;
+    }
+
+    bool verbose = false;
+    if (cl.search("-V") || cl.search("--verbose"))
+        verbose = true;
+
+    GetPot mkfile(makefile.c_str());
+    if (verbose)
+        mkfile.print();
+
+    bool big_endian;
+    std::string endian = mkfile("endian", "little");
+    if (endian == "little")
+    {
+        big_endian = false;
+    }
+    else if (endian == "big")
+    {
+        big_endian = true;
+    }
+    else
+    {
+        std::cerr << "Invalid value of 'endian'" << std::endl;
+        return 4;
+    }
+
+    zen::firmware_archive archive(big_endian);
+    int childcount = mkfile("children/count", 0);
+    if (!childcount)
+    {
+        std::cerr << "A firmware archive must have at least one child entry."
+                  << std::endl;
+        return 5;
+    }
+
+    for (int i = 0; i < childcount; i++)
+    {
+        zen::firmware_entry entry(big_endian);
+        if (!process_child(mkfile, "children", i, entry))
+        {
+            return 6;
+        }
+        archive.get_children().push_back(entry);
+    }
+
+    int neighbourcount = mkfile("neighbours/count", 0);
+    for (int i = 0; i < neighbourcount; i++)
+    {
+        zen::firmware_entry entry(big_endian);
+        if (!process_child(mkfile, "neighbours", i, entry))
+        {
+            return 7;
+        }
+        archive.get_neighbours().push_back(entry);
+    }
+
+    std::ofstream ofs;
+    ofs.open(firmware.c_str(), std::ios::out|std::ios::binary|std::ios::trunc);
+    if (!ofs)
+    {
+        std::cerr << "Failed to create the firmware file." << std::endl;
+        return 8;
+    }
+
+    if (!archive.write(ofs))
+    {
+        std::cerr << "Failed to save the firmware archive." << std::endl;
+        return 9;
+    }
+    ofs.close();
+
+    size_t length = archive.calc_size();
+    if (!length)
+    {
+        std::cerr << "Failed to determine the size of the firmware archive."
+                  << std::endl;
+        return 10;
+    }
+
+    int align = length % 4;
+    if (align)
+    {
+        shared::bytes padding(4 - align, 0);
+        if (!shared::write_file(firmware, padding, false, length))
+        {
+            std::cerr << "Failed to write padding data." << std::endl;
+            return 11;
+        }
+    }
+
+    return 0;
+}
+
+int main(int argc, char* argv[])
+{
+    try
+    {
+        return process_arguments(argc, argv);
+    }
+    catch (const std::exception& xcpt)
+    {
+        std::cerr << "Exception caught: " << xcpt.what() << std::endl;
+        return -1;
+    }
+    catch (...)
+    {
+        std::cerr << "Unknown exception caught." << std::endl;
+        return -2;
+    }
+    return -3;
+}
diff --git a/utils/zenutils/source/shared/CMakeLists.txt b/utils/zenutils/source/shared/CMakeLists.txt
index 2e42dbbe74..751257f64f 100755..100644
--- a/utils/zenutils/source/shared/CMakeLists.txt
+++ b/utils/zenutils/source/shared/CMakeLists.txt
@@ -1,16 +1,16 @@
-PROJECT(shared)

-

-# source files for shared

-SET(shared_srcs

-  cenc.cpp

-  crypt.cpp

-  file.cpp

-  firmware.cpp

-  pe.cpp

-  updater.cpp

-  utils.cpp

-)

-

-ADD_LIBRARY(shared ${shared_srcs})

-TARGET_LINK_LIBRARIES(shared pelib)

-TARGET_LINK_LIBRARIES(shared zlib)

+PROJECT(shared)
+
+# source files for shared
+SET(shared_srcs
+  cenc.cpp
+  crypt.cpp
+  file.cpp
+  firmware.cpp
+  pe.cpp
+  updater.cpp
+  utils.cpp
+)
+
+ADD_LIBRARY(shared ${shared_srcs})
+TARGET_LINK_LIBRARIES(shared pelib)
+TARGET_LINK_LIBRARIES(shared zlib)
diff --git a/utils/zenutils/source/shared/cenc.cpp b/utils/zenutils/source/shared/cenc.cpp
index 932bee4625..929a59b64d 100755..100644
--- a/utils/zenutils/source/shared/cenc.cpp
+++ b/utils/zenutils/source/shared/cenc.cpp
@@ -1,333 +1,333 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#include "cenc.h"

-#include <firmware.h>

-#include <stdexcept>

-

-

-namespace {

-const byte CODE_MASK      = 0xC0;

-const byte ARGS_MASK      = 0x3F;

-

-const byte REPEAT_CODE    = 0x00;

-const byte BLOCK_CODE     = 0x40;

-const byte LONG_RUN_CODE  = 0x80;

-const byte SHORT_RUN_CODE = 0xC0;

-

-const byte BLOCK_ARGS     = 0x1F;

-const byte BLOCK_MODE     = 0x20;

-

-

-void decode_run(byte* dst, word len, byte val,

-                int& dstidx)

-{

-    memset(dst + dstidx, val, len);

-    dstidx += len;

-}

-

-void decode_pattern(byte* src, byte* dst,

-                    word len, int& srcidx, int& dstidx,

-                    bool bdecode, int npasses)

-{

-    for (int i = 0; i < npasses; i++)

-    {

-        if (bdecode)

-        {

-            for (int j = 0; j < len; j++)

-            {

-                word c, d;

-                c = src[srcidx + j];

-                d = (c >> 5) & 7;

-                c = (c << 3) & 0xF8;

-                src[srcidx + j] = static_cast<byte>(c | d);

-            }

-            bdecode = false;

-        }

-        memcpy(dst + dstidx, src + srcidx, len);

-        dstidx += len;

-    }

-    srcidx += len;

-}

-}; //namespace

-

-int zen::cenc_decode(byte* src, int srclen, byte* dst, int dstlen)

-{

-    if (!src || !srclen || !dst || !dstlen)

-    {

-        throw std::invalid_argument("Invalid argument(s).");

-    }

-

-    int i = 0, j = 0;

-    do

-    {

-        word c, d, e;

-        c = src[i++];

-        switch (c & CODE_MASK)

-        {

-        case REPEAT_CODE: // 2 bytes

-            d = src[i++];

-            d = d + 2;

-

-            e = (c & ARGS_MASK) + 2;

-

-            decode_pattern(src, dst, e, i, j, false, d);

-            break;

-

-        case BLOCK_CODE: // 1/2/3 bytes

-            d = c & BLOCK_ARGS;

-            if (!(c & BLOCK_MODE))

-            {

-                e = src[i++];

-                e = (d << 8) + (e + 0x21);

-

-                d = static_cast<word>(i ^ j);

-            }

-            else

-            {

-                e = d + 1;

-

-                d = static_cast<word>(i ^ j);

-            }

-            if (d & 1)

-            {

-                i++;

-            }

-

-            decode_pattern(src, dst, e, i, j, true, 1);

-            break;

-

-        case LONG_RUN_CODE: // 3 bytes

-            d = src[i++];

-            e = ((c & ARGS_MASK) << 8) + (d + 0x42);

-

-            d = src[i++];

-            d = ((d & 7) << 5) | ((d >> 3) & 0x1F);

-

-            decode_run(dst, e, static_cast<byte>(d), j);

-            break;

-

-        case SHORT_RUN_CODE: // 2 bytes

-            d = src[i++];

-            d = ((d & 3) << 6) | ((d >> 2) & 0x3F);

-

-            e = (c & ARGS_MASK) + 2;

-

-            decode_run(dst, e, static_cast<byte>(d), j);

-            break;

-        };

-    } while (i < srclen && j < dstlen);

-

-    return j;

-}

-

-namespace {

-int encode_run(byte* dst, int& dstidx, byte val, int len, int dstlen)

-{

-    if (len < 2)

-        throw std::invalid_argument("Length is too small.");

-

-    int ret = 0;

-    if (len <= 0x41)

-    {

-        if ((dstidx + 2) > dstlen)

-            throw std::runtime_error("Not enough space to store run.");

-

-        dst[dstidx++] = SHORT_RUN_CODE | (((len - 2) & ARGS_MASK));

-        dst[dstidx++] = ((val >> 6) & 3) | ((val & 0x3F) << 2);

-

-        ret = 2;

-    }

-    else if (len <= 0x4041)

-    {

-        if ((dstidx + 3) > dstlen)

-            throw std::runtime_error("Not enough space to store run.");

-

-        byte b1 = (len - 0x42) >> 8;

-        byte b2 = (len - 0x42) & 0xFF;

-

-        dst[dstidx++] = LONG_RUN_CODE | ((b1 & ARGS_MASK));

-        dst[dstidx++] = b2;

-        dst[dstidx++] = ((val >> 5) & 7) | ((val & 0x1F) << 3);

-

-        ret = 3;

-    }

-    else

-    {

-        int long_count  = len / 0x4041;

-        int short_len   = len % 0x4041;

-        bool toosmall   = short_len == 1;

-

-        int run_len = 0x4041;

-        for (int i = 0; i < long_count; i++)

-        {

-            if (toosmall && (i == (long_count-1)))

-            {

-                run_len--;

-                toosmall = false;

-            }

-            int tmp = encode_run(dst, dstidx, val, run_len, dstlen);

-            if (!tmp) return 0;

-            ret += tmp;

-            len -= run_len;

-        }

-

-        if (len)

-        {

-            int short_count = len / 0x41;

-            int short_rest  = short_count ? (len % 0x41) : 0;

-            toosmall = short_rest == 1;

-

-            run_len = 0x41;

-            for (int i = 0; i < short_count; i++)

-            {

-                if (toosmall && (i == (short_count-1)))

-                {

-                    run_len--;

-                    toosmall = false;

-                }

-                int tmp = encode_run(dst, dstidx, val, run_len, dstlen);

-                if (!tmp) return 0;

-                ret += tmp;

-                len -= run_len;

-            }

-            int tmp = encode_run(dst, dstidx, val, len, dstlen);

-            if (!tmp) return 0;

-            ret += tmp;

-            len -= len;

-        }

-    }

-

-    return ret;

-}

-

-int encode_block(byte* dst, int& dstidx, byte* src, int& srcidx, int len,

-                 int dstlen)

-{

-    if (len < 1)

-        throw std::invalid_argument("Length is too small.");

-

-    int startidx = dstidx;

-    if (len < 0x21)

-    {

-        if ((dstidx + 2 + len) > dstlen)

-            throw std::runtime_error("Not enough space to store block.");

-

-        dst[dstidx++] = BLOCK_CODE  | BLOCK_MODE | ((len - 1) & BLOCK_ARGS);

-        if ((dstidx ^ srcidx) & 1)

-            dst[dstidx++] = 0;

-

-        for (int i = 0; i < len; i++)

-        {

-            byte c = src[srcidx++];

-            byte d = (c & 7) << 5;

-            c = (c & 0xF8) >> 3;

-            dst[dstidx++] = c | d;

-        }

-    }

-    else if (len < 0x2021)

-    {

-        if ((dstidx + 3 + len) > dstlen)

-            throw std::runtime_error("Not enough space to store block.");

-

-        dst[dstidx++] = BLOCK_CODE | (((len - 0x21) >> 8) & BLOCK_ARGS);

-        dst[dstidx++] = (len - 0x21) & 0xFF;

-        if ((dstidx ^ srcidx) & 1)

-            dst[dstidx++] = 0;

-

-        for (int i = 0; i < len; i++)

-        {

-            byte c = src[srcidx++];

-            byte d = (c & 7) << 5;

-            c = (c & 0xF8) >> 3;

-            dst[dstidx++] = c | d;

-        }

-    }

-    else

-    {

-        int longblocks = len / 0x2020;

-        int rest = len % 0x2020;

-        for (int i = 0; i < longblocks; i++)

-        {

-            int tmp = encode_block(dst, dstidx, src, srcidx, 0x2020, dstlen);

-            if (!tmp) return 0;

-        }

-        if (rest)

-        {

-            int shortblocks = rest / 0x20;

-            for (int i = 0; i < shortblocks; i++)

-            {

-                int tmp = encode_block(dst, dstidx, src, srcidx, 0x20, dstlen);

-                if (!tmp) return 0;

-            }

-            rest = rest % 0x20;

-            int tmp = encode_block(dst, dstidx, src, srcidx, rest, dstlen);

-            if (!tmp) return 0;

-        }

-    }

-

-    return (dstidx - startidx);

-}

-}; //namespace

-

-int zen::cenc_encode(byte* src, int srclen, byte* dst, int dstlen)

-{

-    if (!src || !srclen || !dst || !dstlen)

-    {

-        throw std::invalid_argument("Invalid argument(s).");

-    }

-

-    int i = 0, j = 0, k = 0;

-    word c, d, e;

-    int runlen = 0;

-    while (i < srclen && j < dstlen)

-    {

-        k = i;

-        c = src[i++];

-        runlen = 1;

-        while (i < srclen && src[i] == c)

-        {

-            runlen++;

-            i++;

-        }

-        if (runlen >= 2)

-        {

-            if (!encode_run(dst, j, c, runlen, dstlen))

-                return 0;

-        }

-        else

-        {

-            runlen = 0;

-            i = k;

-            while (i < (srclen - 1) && (src[i] != src[i + 1]))

-            {

-                runlen++;

-                i++;

-            }

-            if (i == (srclen - 1))

-            {

-                runlen++;

-                i++;

-            }

-            if (!encode_block(dst, j, src, k, runlen, dstlen))

-                return 0;

-        }

-    }

-

-    return j;

-}

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "cenc.h"
+#include <firmware.h>
+#include <stdexcept>
+
+
+namespace {
+const byte CODE_MASK      = 0xC0;
+const byte ARGS_MASK      = 0x3F;
+
+const byte REPEAT_CODE    = 0x00;
+const byte BLOCK_CODE     = 0x40;
+const byte LONG_RUN_CODE  = 0x80;
+const byte SHORT_RUN_CODE = 0xC0;
+
+const byte BLOCK_ARGS     = 0x1F;
+const byte BLOCK_MODE     = 0x20;
+
+
+void decode_run(byte* dst, word len, byte val,
+                int& dstidx)
+{
+    memset(dst + dstidx, val, len);
+    dstidx += len;
+}
+
+void decode_pattern(byte* src, byte* dst,
+                    word len, int& srcidx, int& dstidx,
+                    bool bdecode, int npasses)
+{
+    for (int i = 0; i < npasses; i++)
+    {
+        if (bdecode)
+        {
+            for (int j = 0; j < len; j++)
+            {
+                word c, d;
+                c = src[srcidx + j];
+                d = (c >> 5) & 7;
+                c = (c << 3) & 0xF8;
+                src[srcidx + j] = static_cast<byte>(c | d);
+            }
+            bdecode = false;
+        }
+        memcpy(dst + dstidx, src + srcidx, len);
+        dstidx += len;
+    }
+    srcidx += len;
+}
+}; //namespace
+
+int zen::cenc_decode(byte* src, int srclen, byte* dst, int dstlen)
+{
+    if (!src || !srclen || !dst || !dstlen)
+    {
+        throw std::invalid_argument("Invalid argument(s).");
+    }
+
+    int i = 0, j = 0;
+    do
+    {
+        word c, d, e;
+        c = src[i++];
+        switch (c & CODE_MASK)
+        {
+        case REPEAT_CODE: // 2 bytes
+            d = src[i++];
+            d = d + 2;
+
+            e = (c & ARGS_MASK) + 2;
+
+            decode_pattern(src, dst, e, i, j, false, d);
+            break;
+
+        case BLOCK_CODE: // 1/2/3 bytes
+            d = c & BLOCK_ARGS;
+            if (!(c & BLOCK_MODE))
+            {
+                e = src[i++];
+                e = (d << 8) + (e + 0x21);
+
+                d = static_cast<word>(i ^ j);
+            }
+            else
+            {
+                e = d + 1;
+
+                d = static_cast<word>(i ^ j);
+            }
+            if (d & 1)
+            {
+                i++;
+            }
+
+            decode_pattern(src, dst, e, i, j, true, 1);
+            break;
+
+        case LONG_RUN_CODE: // 3 bytes
+            d = src[i++];
+            e = ((c & ARGS_MASK) << 8) + (d + 0x42);
+
+            d = src[i++];
+            d = ((d & 7) << 5) | ((d >> 3) & 0x1F);
+
+            decode_run(dst, e, static_cast<byte>(d), j);
+            break;
+
+        case SHORT_RUN_CODE: // 2 bytes
+            d = src[i++];
+            d = ((d & 3) << 6) | ((d >> 2) & 0x3F);
+
+            e = (c & ARGS_MASK) + 2;
+
+            decode_run(dst, e, static_cast<byte>(d), j);
+            break;
+        };
+    } while (i < srclen && j < dstlen);
+
+    return j;
+}
+
+namespace {
+int encode_run(byte* dst, int& dstidx, byte val, int len, int dstlen)
+{
+    if (len < 2)
+        throw std::invalid_argument("Length is too small.");
+
+    int ret = 0;
+    if (len <= 0x41)
+    {
+        if ((dstidx + 2) > dstlen)
+            throw std::runtime_error("Not enough space to store run.");
+
+        dst[dstidx++] = SHORT_RUN_CODE | (((len - 2) & ARGS_MASK));
+        dst[dstidx++] = ((val >> 6) & 3) | ((val & 0x3F) << 2);
+
+        ret = 2;
+    }
+    else if (len <= 0x4041)
+    {
+        if ((dstidx + 3) > dstlen)
+            throw std::runtime_error("Not enough space to store run.");
+
+        byte b1 = (len - 0x42) >> 8;
+        byte b2 = (len - 0x42) & 0xFF;
+
+        dst[dstidx++] = LONG_RUN_CODE | ((b1 & ARGS_MASK));
+        dst[dstidx++] = b2;
+        dst[dstidx++] = ((val >> 5) & 7) | ((val & 0x1F) << 3);
+
+        ret = 3;
+    }
+    else
+    {
+        int long_count  = len / 0x4041;
+        int short_len   = len % 0x4041;
+        bool toosmall   = short_len == 1;
+
+        int run_len = 0x4041;
+        for (int i = 0; i < long_count; i++)
+        {
+            if (toosmall && (i == (long_count-1)))
+            {
+                run_len--;
+                toosmall = false;
+            }
+            int tmp = encode_run(dst, dstidx, val, run_len, dstlen);
+            if (!tmp) return 0;
+            ret += tmp;
+            len -= run_len;
+        }
+
+        if (len)
+        {
+            int short_count = len / 0x41;
+            int short_rest  = short_count ? (len % 0x41) : 0;
+            toosmall = short_rest == 1;
+
+            run_len = 0x41;
+            for (int i = 0; i < short_count; i++)
+            {
+                if (toosmall && (i == (short_count-1)))
+                {
+                    run_len--;
+                    toosmall = false;
+                }
+                int tmp = encode_run(dst, dstidx, val, run_len, dstlen);
+                if (!tmp) return 0;
+                ret += tmp;
+                len -= run_len;
+            }
+            int tmp = encode_run(dst, dstidx, val, len, dstlen);
+            if (!tmp) return 0;
+            ret += tmp;
+            len -= len;
+        }
+    }
+
+    return ret;
+}
+
+int encode_block(byte* dst, int& dstidx, byte* src, int& srcidx, int len,
+                 int dstlen)
+{
+    if (len < 1)
+        throw std::invalid_argument("Length is too small.");
+
+    int startidx = dstidx;
+    if (len < 0x21)
+    {
+        if ((dstidx + 2 + len) > dstlen)
+            throw std::runtime_error("Not enough space to store block.");
+
+        dst[dstidx++] = BLOCK_CODE  | BLOCK_MODE | ((len - 1) & BLOCK_ARGS);
+        if ((dstidx ^ srcidx) & 1)
+            dst[dstidx++] = 0;
+
+        for (int i = 0; i < len; i++)
+        {
+            byte c = src[srcidx++];
+            byte d = (c & 7) << 5;
+            c = (c & 0xF8) >> 3;
+            dst[dstidx++] = c | d;
+        }
+    }
+    else if (len < 0x2021)
+    {
+        if ((dstidx + 3 + len) > dstlen)
+            throw std::runtime_error("Not enough space to store block.");
+
+        dst[dstidx++] = BLOCK_CODE | (((len - 0x21) >> 8) & BLOCK_ARGS);
+        dst[dstidx++] = (len - 0x21) & 0xFF;
+        if ((dstidx ^ srcidx) & 1)
+            dst[dstidx++] = 0;
+
+        for (int i = 0; i < len; i++)
+        {
+            byte c = src[srcidx++];
+            byte d = (c & 7) << 5;
+            c = (c & 0xF8) >> 3;
+            dst[dstidx++] = c | d;
+        }
+    }
+    else
+    {
+        int longblocks = len / 0x2020;
+        int rest = len % 0x2020;
+        for (int i = 0; i < longblocks; i++)
+        {
+            int tmp = encode_block(dst, dstidx, src, srcidx, 0x2020, dstlen);
+            if (!tmp) return 0;
+        }
+        if (rest)
+        {
+            int shortblocks = rest / 0x20;
+            for (int i = 0; i < shortblocks; i++)
+            {
+                int tmp = encode_block(dst, dstidx, src, srcidx, 0x20, dstlen);
+                if (!tmp) return 0;
+            }
+            rest = rest % 0x20;
+            int tmp = encode_block(dst, dstidx, src, srcidx, rest, dstlen);
+            if (!tmp) return 0;
+        }
+    }
+
+    return (dstidx - startidx);
+}
+}; //namespace
+
+int zen::cenc_encode(byte* src, int srclen, byte* dst, int dstlen)
+{
+    if (!src || !srclen || !dst || !dstlen)
+    {
+        throw std::invalid_argument("Invalid argument(s).");
+    }
+
+    int i = 0, j = 0, k = 0;
+    word c, d, e;
+    int runlen = 0;
+    while (i < srclen && j < dstlen)
+    {
+        k = i;
+        c = src[i++];
+        runlen = 1;
+        while (i < srclen && src[i] == c)
+        {
+            runlen++;
+            i++;
+        }
+        if (runlen >= 2)
+        {
+            if (!encode_run(dst, j, c, runlen, dstlen))
+                return 0;
+        }
+        else
+        {
+            runlen = 0;
+            i = k;
+            while (i < (srclen - 1) && (src[i] != src[i + 1]))
+            {
+                runlen++;
+                i++;
+            }
+            if (i == (srclen - 1))
+            {
+                runlen++;
+                i++;
+            }
+            if (!encode_block(dst, j, src, k, runlen, dstlen))
+                return 0;
+        }
+    }
+
+    return j;
+}
diff --git a/utils/zenutils/source/shared/cenc.h b/utils/zenutils/source/shared/cenc.h
index 12a7c92516..e96794dcc4 100755..100644
--- a/utils/zenutils/source/shared/cenc.h
+++ b/utils/zenutils/source/shared/cenc.h
@@ -1,29 +1,29 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#ifndef ZEN_CENC_H_INCLUDED

-#define ZEN_CENC_H_INCLUDED

-

-#include <utils.h>

-

-namespace zen {

-    int cenc_decode(byte* src, int srclen, byte* dst, int dstlen);

-    int cenc_encode(byte* src, int srclen, byte* dst, int dstlen);

-}; //namespace zen

-

-#endif //CENC_H_INCLUDED

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef ZEN_CENC_H_INCLUDED
+#define ZEN_CENC_H_INCLUDED
+
+#include <utils.h>
+
+namespace zen {
+    int cenc_decode(byte* src, int srclen, byte* dst, int dstlen);
+    int cenc_encode(byte* src, int srclen, byte* dst, int dstlen);
+}; //namespace zen
+
+#endif //CENC_H_INCLUDED
diff --git a/utils/zenutils/source/shared/crypt.cpp b/utils/zenutils/source/shared/crypt.cpp
index 9c2d33870c..3f15ac64f1 100755..100644
--- a/utils/zenutils/source/shared/crypt.cpp
+++ b/utils/zenutils/source/shared/crypt.cpp
@@ -1,91 +1,91 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#include "crypt.h"

-#include <stdexcept>

-#include <beecrypt/hmacsha1.h>

-#include <beecrypt/blockmode.h>

-#include <beecrypt/blowfish.h>

-

-

-bool zen::hmac_sha1_calc(const byte* key, size_t keylen, const byte* data,

-                         size_t datalen, byte* sig, size_t* siglen)

-{

-    hmacsha1Param param;

-    if (hmacsha1Setup(&param, key, keylen * 8))

-        return false;

-    if (hmacsha1Update(&param, data, datalen))

-        return false;

-    if (hmacsha1Digest(&param, sig))

-        return false;

-    return true;

-}

-

-bool zen::bf_cbc_encrypt(const byte* key, size_t keylen, byte* data,

-                         size_t datalen, const byte* iv)

-{

-    if (datalen % blowfish.blocksize)

-        throw std::invalid_argument(

-            "The length must be aligned on a 8 byte boundary.");

-

-        blowfishParam param;

-    if (blowfishSetup(&param, key, keylen * 8, ENCRYPT))

-        return false;

-    if (blowfishSetIV(&param, iv))

-        return false;

-

-    byte* plain = new byte[datalen];

-    memcpy(plain, data, datalen);

-

-    unsigned int nblocks = datalen / blowfish.blocksize;

-    if (blockEncryptCBC(&blowfish, &param, (uint32_t*)data, (uint32_t*)plain,

-                        nblocks))

-    {

-        delete [] plain;

-        return false;

-    }

-

-    return true;

-}

-

-bool zen::bf_cbc_decrypt(const byte* key, size_t keylen, byte* data,

-                         size_t datalen, const byte* iv)

-{

-    if (datalen % blowfish.blocksize)

-        throw std::invalid_argument(

-            "The length must be aligned on a 8 byte boundary.");

-

-        blowfishParam param;

-    if (blowfishSetup(&param, key, keylen * 8, ENCRYPT))

-        return false;

-    if (blowfishSetIV(&param, iv))

-        return false;

-

-    byte* cipher = new byte[datalen];

-    memcpy(cipher, data, datalen);

-

-    unsigned int nblocks = datalen / blowfish.blocksize;

-    if (blockDecryptCBC(&blowfish, &param, (uint32_t*)data, (uint32_t*)cipher,

-                        nblocks))

-    {

-        delete [] cipher;

-        return false;

-    }

-

-    return true;

-}

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "crypt.h"
+#include <stdexcept>
+#include <beecrypt/hmacsha1.h>
+#include <beecrypt/blockmode.h>
+#include <beecrypt/blowfish.h>
+
+
+bool zen::hmac_sha1_calc(const byte* key, size_t keylen, const byte* data,
+                         size_t datalen, byte* sig, size_t* siglen)
+{
+    hmacsha1Param param;
+    if (hmacsha1Setup(&param, key, keylen * 8))
+        return false;
+    if (hmacsha1Update(&param, data, datalen))
+        return false;
+    if (hmacsha1Digest(&param, sig))
+        return false;
+    return true;
+}
+
+bool zen::bf_cbc_encrypt(const byte* key, size_t keylen, byte* data,
+                         size_t datalen, const byte* iv)
+{
+    if (datalen % blowfish.blocksize)
+        throw std::invalid_argument(
+            "The length must be aligned on a 8 byte boundary.");
+
+        blowfishParam param;
+    if (blowfishSetup(&param, key, keylen * 8, ENCRYPT))
+        return false;
+    if (blowfishSetIV(&param, iv))
+        return false;
+
+    byte* plain = new byte[datalen];
+    memcpy(plain, data, datalen);
+
+    unsigned int nblocks = datalen / blowfish.blocksize;
+    if (blockEncryptCBC(&blowfish, &param, (uint32_t*)data, (uint32_t*)plain,
+                        nblocks))
+    {
+        delete [] plain;
+        return false;
+    }
+
+    return true;
+}
+
+bool zen::bf_cbc_decrypt(const byte* key, size_t keylen, byte* data,
+                         size_t datalen, const byte* iv)
+{
+    if (datalen % blowfish.blocksize)
+        throw std::invalid_argument(
+            "The length must be aligned on a 8 byte boundary.");
+
+        blowfishParam param;
+    if (blowfishSetup(&param, key, keylen * 8, ENCRYPT))
+        return false;
+    if (blowfishSetIV(&param, iv))
+        return false;
+
+    byte* cipher = new byte[datalen];
+    memcpy(cipher, data, datalen);
+
+    unsigned int nblocks = datalen / blowfish.blocksize;
+    if (blockDecryptCBC(&blowfish, &param, (uint32_t*)data, (uint32_t*)cipher,
+                        nblocks))
+    {
+        delete [] cipher;
+        return false;
+    }
+
+    return true;
+}
diff --git a/utils/zenutils/source/shared/crypt.h b/utils/zenutils/source/shared/crypt.h
index a057055b70..a357fef042 100755..100644
--- a/utils/zenutils/source/shared/crypt.h
+++ b/utils/zenutils/source/shared/crypt.h
@@ -1,30 +1,30 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#ifndef ZEN_CRYPT_H_INCLUDED

-#define ZEN_CRYPT_H_INCLUDED

-

-#include <utils.h>

-

-namespace zen {

-    bool hmac_sha1_calc(const byte* key, size_t keylen, const byte* data, size_t datalen, byte* sig, size_t* siglen);

-    bool bf_cbc_encrypt(const byte* key, size_t keylen, byte* data, size_t datalen, const byte* iv);

-    bool bf_cbc_decrypt(const byte* key, size_t keylen, byte* data, size_t datalen, const byte* iv);

-}; //namespace zen

-

-#endif //ZEN_CRYPT_H_INCLUDED

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef ZEN_CRYPT_H_INCLUDED
+#define ZEN_CRYPT_H_INCLUDED
+
+#include <utils.h>
+
+namespace zen {
+    bool hmac_sha1_calc(const byte* key, size_t keylen, const byte* data, size_t datalen, byte* sig, size_t* siglen);
+    bool bf_cbc_encrypt(const byte* key, size_t keylen, byte* data, size_t datalen, const byte* iv);
+    bool bf_cbc_decrypt(const byte* key, size_t keylen, byte* data, size_t datalen, const byte* iv);
+}; //namespace zen
+
+#endif //ZEN_CRYPT_H_INCLUDED
diff --git a/utils/zenutils/source/shared/file.cpp b/utils/zenutils/source/shared/file.cpp
index 2c31498972..b1b1093170 100755..100644
--- a/utils/zenutils/source/shared/file.cpp
+++ b/utils/zenutils/source/shared/file.cpp
@@ -1,106 +1,106 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#include "file.h"

-#include <fstream>

-

-

-bool shared::read_file(const std::string& filename, bytes& buffer,

-                       std::streampos offset, std::streamsize count)

-{

-    std::ifstream ifs;

-    ifs.open(filename.c_str(), std::ios::binary);

-    if (!ifs)

-    {

-        return false;

-    }

-

-    std::ifstream::pos_type startpos = offset;

-    ifs.seekg(offset, std::ios::beg);

-    if (count == -1)

-        ifs.seekg(0, std::ios::end);

-    else

-        ifs.seekg(count, std::ios::cur);

-    std::ifstream::pos_type endpos = ifs.tellg();

-

-    buffer.resize(endpos-startpos);

-    ifs.seekg(offset, std::ios::beg);

-

-    ifs.read((char*)&buffer[0], endpos-startpos);

-

-    ifs.close();

-    return ifs.good();

-}

-

-

-bool shared::write_file(const std::string& filename, bytes& buffer,

-                        bool truncate, std::streampos offset,

-                        std::streamsize count)

-{

-    std::ios::openmode mode = std::ios::in|std::ios::out|std::ios::binary;

-    if (truncate)

-        mode |= std::ios::trunc;

-

-    std::fstream ofs;

-    ofs.open(filename.c_str(), mode);

-    if (!ofs)

-    {

-        return false;

-    }

-

-    if (count == -1)

-        count = buffer.size();

-    else if (count > buffer.size())

-        return false;

-

-    ofs.seekg(offset, std::ios::beg);

-

-    ofs.write((char*)&buffer[0], count);

-

-    ofs.close();

-    return ofs.good();

-}

-

-bool shared::file_exists(const std::string& filename)

-{

-    std::ifstream ifs;

-    ifs.open(filename.c_str(), std::ios::in);

-    if (ifs.is_open())

-    {

-        ifs.close();

-        return true;

-    }

-    return false;

-}

-

-bool shared::copy_file(const std::string& srcname, const std::string& dstname)

-{

-    bytes buffer;

-    if (!read_file(srcname, buffer))

-        return false;

-    return write_file(dstname, buffer, true);

-}

-

-bool shared::backup_file(const std::string& filename, bool force)

-{

-    std::string backupname = filename + ".bak";

-    if (!force)

-        if (file_exists(backupname))

-            return true;

-    return copy_file(filename, backupname);

-}

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "file.h"
+#include <fstream>
+
+
+bool shared::read_file(const std::string& filename, bytes& buffer,
+                       std::streampos offset, std::streamsize count)
+{
+    std::ifstream ifs;
+    ifs.open(filename.c_str(), std::ios::binary);
+    if (!ifs)
+    {
+        return false;
+    }
+
+    std::ifstream::pos_type startpos = offset;
+    ifs.seekg(offset, std::ios::beg);
+    if (count == -1)
+        ifs.seekg(0, std::ios::end);
+    else
+        ifs.seekg(count, std::ios::cur);
+    std::ifstream::pos_type endpos = ifs.tellg();
+
+    buffer.resize(endpos-startpos);
+    ifs.seekg(offset, std::ios::beg);
+
+    ifs.read((char*)&buffer[0], endpos-startpos);
+
+    ifs.close();
+    return ifs.good();
+}
+
+
+bool shared::write_file(const std::string& filename, bytes& buffer,
+                        bool truncate, std::streampos offset,
+                        std::streamsize count)
+{
+    std::ios::openmode mode = std::ios::in|std::ios::out|std::ios::binary;
+    if (truncate)
+        mode |= std::ios::trunc;
+
+    std::fstream ofs;
+    ofs.open(filename.c_str(), mode);
+    if (!ofs)
+    {
+        return false;
+    }
+
+    if (count == -1)
+        count = buffer.size();
+    else if (count > buffer.size())
+        return false;
+
+    ofs.seekg(offset, std::ios::beg);
+
+    ofs.write((char*)&buffer[0], count);
+
+    ofs.close();
+    return ofs.good();
+}
+
+bool shared::file_exists(const std::string& filename)
+{
+    std::ifstream ifs;
+    ifs.open(filename.c_str(), std::ios::in);
+    if (ifs.is_open())
+    {
+        ifs.close();
+        return true;
+    }
+    return false;
+}
+
+bool shared::copy_file(const std::string& srcname, const std::string& dstname)
+{
+    bytes buffer;
+    if (!read_file(srcname, buffer))
+        return false;
+    return write_file(dstname, buffer, true);
+}
+
+bool shared::backup_file(const std::string& filename, bool force)
+{
+    std::string backupname = filename + ".bak";
+    if (!force)
+        if (file_exists(backupname))
+            return true;
+    return copy_file(filename, backupname);
+}
diff --git a/utils/zenutils/source/shared/file.h b/utils/zenutils/source/shared/file.h
index 8fa533c981..770f39a900 100755..100644
--- a/utils/zenutils/source/shared/file.h
+++ b/utils/zenutils/source/shared/file.h
@@ -1,36 +1,36 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#ifndef SHARED_FILE_H_INCLUDED

-#define SHARED_FILE_H_INCLUDED

-

-#include <string>

-#include <iostream>

-#include "utils.h"

-

-namespace shared {

-    bool read_file(const std::string& filename, bytes& buffer,

-                   std::streampos offset = 0, std::streamsize count = -1);

-    bool write_file(const std::string& filename, bytes& buffer, bool truncate,

-                    std::streampos offset = 0, std::streamsize count = -1);

-    bool file_exists(const std::string& filename);

-    bool copy_file(const std::string& srcname, const std::string& dstname);

-    bool backup_file(const std::string& filename, bool force = false);

-}; //namespace shared

-

-#endif //SHARED_FILE_H_INCLUDED

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SHARED_FILE_H_INCLUDED
+#define SHARED_FILE_H_INCLUDED
+
+#include <string>
+#include <iostream>
+#include "utils.h"
+
+namespace shared {
+    bool read_file(const std::string& filename, bytes& buffer,
+                   std::streampos offset = 0, std::streamsize count = -1);
+    bool write_file(const std::string& filename, bytes& buffer, bool truncate,
+                    std::streampos offset = 0, std::streamsize count = -1);
+    bool file_exists(const std::string& filename);
+    bool copy_file(const std::string& srcname, const std::string& dstname);
+    bool backup_file(const std::string& filename, bool force = false);
+}; //namespace shared
+
+#endif //SHARED_FILE_H_INCLUDED
diff --git a/utils/zenutils/source/shared/firmware.cpp b/utils/zenutils/source/shared/firmware.cpp
index 7767b55d8f..811b8146b4 100755..100644
--- a/utils/zenutils/source/shared/firmware.cpp
+++ b/utils/zenutils/source/shared/firmware.cpp
@@ -1,387 +1,387 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#include "firmware.h"

-#include <iostream>

-#include <stdexcept>

-

-

-zen::firmware_entry::firmware_entry(bool big_endian)

-    : _big_endian(big_endian)

-{

-}

-

-zen::firmware_entry::firmware_entry(const firmware_entry& copy)

-{

-    assign(copy);

-}

-

-zen::firmware_entry& zen::firmware_entry::operator=(const firmware_entry& right)

-{

-    assign(right);

-    return *this;

-}

-

-

-bool zen::firmware_entry::read(std::istream& is)

-{

-    // Read the header.

-    is.read((char*)&_header, sizeof(firmware_header_t));

-    if (!is.good())

-        return false;

-

-    // If the firmware is big-endian, swap the header values to little-endian.

-    if (_big_endian)

-    {

-        _header.tag = shared::swap(_header.tag);

-        if (_header.tag != 'NULL')

-        {

-            _header.size = shared::swap(_header.size);

-        }

-    }

-

-    // Resize the bytes buffer to the size specified in the header.

-    _bytes.resize(_header.size);

-

-    // Read the entry contents.

-    is.read(reinterpret_cast<char*>(&_bytes[0]),

-            _header.size);

-

-    return is.good();

-}

-

-bool zen::firmware_entry::write(std::ostream& os) const

-{

-    // Form a header using the current size of the bytes buffer.

-    firmware_header_t header = {

-        _header.tag,

-        static_cast<dword>(_bytes.size())

-    };

-

-    // If the firmware is big-endian, swap the header values back into big-endian.

-    if (_big_endian)

-    {

-        if (header.tag != 'NULL')

-        {

-            header.size = shared::swap(header.size);

-        }

-        header.tag = shared::swap(header.tag);

-    }

-

-    // Write the header.

-    os.write((const char*)&header, sizeof(firmware_header_t));

-    if (!os.good())

-        return false;

-

-    // Write the entry contents.

-    os.write(reinterpret_cast<const char*>(&_bytes[0]),

-             static_cast<std::streamsize>(_bytes.size()));

-

-    return os.good();

-}

-

-

-bool zen::firmware_entry::is_big_endian() const

-{

-    return _big_endian;

-}

-

-const zen::firmware_header_t& zen::firmware_entry::get_header() const

-{

-    return _header;

-}

-zen::firmware_header_t& zen::firmware_entry::get_header()

-{

-    return _header;

-}

-

-const shared::bytes& zen::firmware_entry::get_bytes() const

-{

-    return _bytes;

-}

-shared::bytes& zen::firmware_entry::get_bytes()

-{

-    return _bytes;

-}

-

-

-std::string zen::firmware_entry::get_name() const

-{

-    char name[5];

-    *(dword*)name = shared::swap(_header.tag);

-    name[4] = '\0';

-

-    // Determine if all characters in the tag are printable.

-    bool isprintable = true;

-    for (int i = 0; i < 4; i++)

-    {

-        if (!isprint((byte)name[i]))

-        {

-            isprintable = false;

-            break;

-        }

-    }

-

-    // If they are, simply return the tag as a string.

-    if (isprintable)

-    {

-        return std::string(name);

-    }

-

-    // Otherwise, encode the tag into a hexadecimal string.

-    char buffer[11];

-    sprintf(buffer, "0x%08x", _header.tag);

-    return std::string(buffer);

-}

-

-std::string zen::firmware_entry::get_content_name() const

-{

-    std::string name = get_name();

-    if (name == "DATA")

-    {

-        name = "";

-        int nameoff = is_big_endian() ? 1 : 0;

-        for (int i = 0; i < 16; i++)

-        {

-            char c = get_bytes()[i * 2 + nameoff];

-            if (!c)

-                break;

-            name += c;

-        }

-    }

-    else if (name == "EXT0")

-    {

-        name = "";

-        int nameoff = is_big_endian() ? 1 : 0;

-        for (int i = 0; i < 12; i++)

-        {

-            char c = get_bytes()[i * 2 + nameoff];

-            if (!c)

-                break;

-            name += c;

-        }

-    }

-    return name;

-}

-

-size_t zen::firmware_entry::get_content_offset() const

-{

-    std::string name = get_name();

-    if (name == "DATA")

-    {

-        return 32;

-    }

-    else if (name == "EXT0")

-    {

-        return 24;

-    }

-    return 0;

-}

-

-size_t zen::firmware_entry::calc_size() const

-{

-    return _bytes.size() + sizeof(firmware_header_t);

-}

-

-

-void zen::firmware_entry::assign(const firmware_entry& copy)

-{

-    _big_endian = copy._big_endian;

-    _header.tag = copy._header.tag;

-    _header.size = copy._header.size;

-    _bytes.assign(copy._bytes.begin(), copy._bytes.end());

-}

-

-

-

-zen::firmware_archive::firmware_archive(bool big_endian)

-    : _big_endian(big_endian)

-{

-}

-

-zen::firmware_archive::firmware_archive(const firmware_archive& copy)

-{

-    assign(copy);

-}

-

-zen::firmware_archive& zen::firmware_archive::operator=(const firmware_archive& right)

-{

-    assign(right);

-    return *this;

-}

-

-

-bool zen::firmware_archive::read(std::istream& is)

-{

-    // Read the root entry's header.

-    firmware_header_t root;

-    is.read((char*)&root, sizeof(firmware_header_t));

-    if (!is.good())

-        return false;

-

-    if ((root.tag != 'CIFF') && (root.tag != 'FFIC'))

-    {

-        throw std::runtime_error("Invalid firmware archive format!");

-    }

-

-    _big_endian = root.tag == 'FFIC' ? true : false;

-    if (_big_endian)

-    {

-        root.tag  = shared::swap(root.tag);

-        root.size = shared::swap(root.size);

-    }

-

-    // Save the current stream position.

-    std::istream::pos_type endpos = is.tellg();

-    std::istream::pos_type curpos = endpos;

-    endpos += std::istream::pos_type(root.size);

-

-    // Read untill the end of the root entry contents.

-    while (curpos < endpos)

-    {

-        firmware_entry entry(_big_endian);

-        if (!entry.read(is))

-            return false;

-

-        _children.push_back(entry);

-        curpos = is.tellg();

-    }

-

-    curpos = is.tellg();

-    is.seekg(0, std::ios::end);

-    endpos = is.tellg();

-    is.seekg(curpos);

-

-    // Read untill the end of the file.

-    while (((size_t)curpos + sizeof(firmware_header_t)) < endpos)

-    {

-        firmware_entry entry(_big_endian);

-        if (!entry.read(is))

-            return false;

-

-        _neighbours.push_back(entry);

-        curpos = is.tellg();

-    }

-

-    return true;

-}

-

-bool zen::firmware_archive::write(std::ostream& os) const

-{

-    // Read the root entry's header.

-    firmware_header_t root = {'CIFF', 0};

-

-    // Calculate the total size of all the children entries.

-    for (firmware_entries::const_iterator i = _children.begin();

-         i != _children.end(); ++i)

-    {

-        root.size += i->calc_size();

-    }

-

-    // If the firmware is big-endian, swap the header values back into big-endian.

-    if (_big_endian)

-    {

-        root.tag  = shared::swap(root.tag);

-        root.size = shared::swap(root.size);

-    }

-

-    // Write the header.

-    os.write((const char*)&root, sizeof(firmware_header_t));

-    if (!os.good())

-        return false;

-

-    // Write all the child entries.

-    for (firmware_entries::const_iterator i = _children.begin();

-         i != _children.end(); ++i)

-    {

-        if (!i->write(os))

-            return false;

-    }

-

-    // Write all the neighbour entries.

-    for (firmware_entries::const_iterator i = _neighbours.begin();

-         i != _neighbours.end(); ++i)

-    {

-        if (!i->write(os))

-            return false;

-    }

-

-    return true;

-}

-

-

-bool zen::firmware_archive::is_big_endian() const

-{

-    return _big_endian;

-}

-

-const zen::firmware_entries& zen::firmware_archive::get_children() const

-{

-    return _children;

-}

-zen::firmware_entries& zen::firmware_archive::get_children()

-{

-    return _children;

-}

-

-const zen::firmware_entries& zen::firmware_archive::get_neighbours() const

-{

-    return _neighbours;

-}

-zen::firmware_entries& zen::firmware_archive::get_neighbours()

-{

-    return _neighbours;

-}

-

-bool zen::firmware_archive::is_signed() const

-{

-    for (firmware_entries::const_iterator i = _neighbours.begin();

-         i != _neighbours.end(); i++)

-    {

-        if (i->get_name() == "NULL")

-            return true;

-    }

-    return false;

-}

-

-size_t zen::firmware_archive::calc_size() const

-{

-    size_t size = sizeof(firmware_header_t);

-

-    for (firmware_entries::const_iterator i = _children.begin();

-         i != _children.end(); i++)

-    {

-        size += i->calc_size();

-    }

-

-    for (firmware_entries::const_iterator i = _neighbours.begin();

-         i != _neighbours.end(); i++)

-    {

-        size += i->calc_size();

-    }

-

-    return size;

-}

-

-

-void zen::firmware_archive::assign(const firmware_archive& copy)

-{

-    _big_endian = copy._big_endian;

-    _children.assign(copy._children.begin(), copy._children.end());

-    _neighbours.assign(copy._neighbours.begin(), copy._neighbours.end());

-}

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "firmware.h"
+#include <iostream>
+#include <stdexcept>
+
+
+zen::firmware_entry::firmware_entry(bool big_endian)
+    : _big_endian(big_endian)
+{
+}
+
+zen::firmware_entry::firmware_entry(const firmware_entry& copy)
+{
+    assign(copy);
+}
+
+zen::firmware_entry& zen::firmware_entry::operator=(const firmware_entry& right)
+{
+    assign(right);
+    return *this;
+}
+
+
+bool zen::firmware_entry::read(std::istream& is)
+{
+    // Read the header.
+    is.read((char*)&_header, sizeof(firmware_header_t));
+    if (!is.good())
+        return false;
+
+    // If the firmware is big-endian, swap the header values to little-endian.
+    if (_big_endian)
+    {
+        _header.tag = shared::swap(_header.tag);
+        if (_header.tag != 'NULL')
+        {
+            _header.size = shared::swap(_header.size);
+        }
+    }
+
+    // Resize the bytes buffer to the size specified in the header.
+    _bytes.resize(_header.size);
+
+    // Read the entry contents.
+    is.read(reinterpret_cast<char*>(&_bytes[0]),
+            _header.size);
+
+    return is.good();
+}
+
+bool zen::firmware_entry::write(std::ostream& os) const
+{
+    // Form a header using the current size of the bytes buffer.
+    firmware_header_t header = {
+        _header.tag,
+        static_cast<dword>(_bytes.size())
+    };
+
+    // If the firmware is big-endian, swap the header values back into big-endian.
+    if (_big_endian)
+    {
+        if (header.tag != 'NULL')
+        {
+            header.size = shared::swap(header.size);
+        }
+        header.tag = shared::swap(header.tag);
+    }
+
+    // Write the header.
+    os.write((const char*)&header, sizeof(firmware_header_t));
+    if (!os.good())
+        return false;
+
+    // Write the entry contents.
+    os.write(reinterpret_cast<const char*>(&_bytes[0]),
+             static_cast<std::streamsize>(_bytes.size()));
+
+    return os.good();
+}
+
+
+bool zen::firmware_entry::is_big_endian() const
+{
+    return _big_endian;
+}
+
+const zen::firmware_header_t& zen::firmware_entry::get_header() const
+{
+    return _header;
+}
+zen::firmware_header_t& zen::firmware_entry::get_header()
+{
+    return _header;
+}
+
+const shared::bytes& zen::firmware_entry::get_bytes() const
+{
+    return _bytes;
+}
+shared::bytes& zen::firmware_entry::get_bytes()
+{
+    return _bytes;
+}
+
+
+std::string zen::firmware_entry::get_name() const
+{
+    char name[5];
+    *(dword*)name = shared::swap(_header.tag);
+    name[4] = '\0';
+
+    // Determine if all characters in the tag are printable.
+    bool isprintable = true;
+    for (int i = 0; i < 4; i++)
+    {
+        if (!isprint((byte)name[i]))
+        {
+            isprintable = false;
+            break;
+        }
+    }
+
+    // If they are, simply return the tag as a string.
+    if (isprintable)
+    {
+        return std::string(name);
+    }
+
+    // Otherwise, encode the tag into a hexadecimal string.
+    char buffer[11];
+    sprintf(buffer, "0x%08x", _header.tag);
+    return std::string(buffer);
+}
+
+std::string zen::firmware_entry::get_content_name() const
+{
+    std::string name = get_name();
+    if (name == "DATA")
+    {
+        name = "";
+        int nameoff = is_big_endian() ? 1 : 0;
+        for (int i = 0; i < 16; i++)
+        {
+            char c = get_bytes()[i * 2 + nameoff];
+            if (!c)
+                break;
+            name += c;
+        }
+    }
+    else if (name == "EXT0")
+    {
+        name = "";
+        int nameoff = is_big_endian() ? 1 : 0;
+        for (int i = 0; i < 12; i++)
+        {
+            char c = get_bytes()[i * 2 + nameoff];
+            if (!c)
+                break;
+            name += c;
+        }
+    }
+    return name;
+}
+
+size_t zen::firmware_entry::get_content_offset() const
+{
+    std::string name = get_name();
+    if (name == "DATA")
+    {
+        return 32;
+    }
+    else if (name == "EXT0")
+    {
+        return 24;
+    }
+    return 0;
+}
+
+size_t zen::firmware_entry::calc_size() const
+{
+    return _bytes.size() + sizeof(firmware_header_t);
+}
+
+
+void zen::firmware_entry::assign(const firmware_entry& copy)
+{
+    _big_endian = copy._big_endian;
+    _header.tag = copy._header.tag;
+    _header.size = copy._header.size;
+    _bytes.assign(copy._bytes.begin(), copy._bytes.end());
+}
+
+
+
+zen::firmware_archive::firmware_archive(bool big_endian)
+    : _big_endian(big_endian)
+{
+}
+
+zen::firmware_archive::firmware_archive(const firmware_archive& copy)
+{
+    assign(copy);
+}
+
+zen::firmware_archive& zen::firmware_archive::operator=(const firmware_archive& right)
+{
+    assign(right);
+    return *this;
+}
+
+
+bool zen::firmware_archive::read(std::istream& is)
+{
+    // Read the root entry's header.
+    firmware_header_t root;
+    is.read((char*)&root, sizeof(firmware_header_t));
+    if (!is.good())
+        return false;
+
+    if ((root.tag != 'CIFF') && (root.tag != 'FFIC'))
+    {
+        throw std::runtime_error("Invalid firmware archive format!");
+    }
+
+    _big_endian = root.tag == 'FFIC' ? true : false;
+    if (_big_endian)
+    {
+        root.tag  = shared::swap(root.tag);
+        root.size = shared::swap(root.size);
+    }
+
+    // Save the current stream position.
+    std::istream::pos_type endpos = is.tellg();
+    std::istream::pos_type curpos = endpos;
+    endpos += std::istream::pos_type(root.size);
+
+    // Read untill the end of the root entry contents.
+    while (curpos < endpos)
+    {
+        firmware_entry entry(_big_endian);
+        if (!entry.read(is))
+            return false;
+
+        _children.push_back(entry);
+        curpos = is.tellg();
+    }
+
+    curpos = is.tellg();
+    is.seekg(0, std::ios::end);
+    endpos = is.tellg();
+    is.seekg(curpos);
+
+    // Read untill the end of the file.
+    while (((size_t)curpos + sizeof(firmware_header_t)) < endpos)
+    {
+        firmware_entry entry(_big_endian);
+        if (!entry.read(is))
+            return false;
+
+        _neighbours.push_back(entry);
+        curpos = is.tellg();
+    }
+
+    return true;
+}
+
+bool zen::firmware_archive::write(std::ostream& os) const
+{
+    // Read the root entry's header.
+    firmware_header_t root = {'CIFF', 0};
+
+    // Calculate the total size of all the children entries.
+    for (firmware_entries::const_iterator i = _children.begin();
+         i != _children.end(); ++i)
+    {
+        root.size += i->calc_size();
+    }
+
+    // If the firmware is big-endian, swap the header values back into big-endian.
+    if (_big_endian)
+    {
+        root.tag  = shared::swap(root.tag);
+        root.size = shared::swap(root.size);
+    }
+
+    // Write the header.
+    os.write((const char*)&root, sizeof(firmware_header_t));
+    if (!os.good())
+        return false;
+
+    // Write all the child entries.
+    for (firmware_entries::const_iterator i = _children.begin();
+         i != _children.end(); ++i)
+    {
+        if (!i->write(os))
+            return false;
+    }
+
+    // Write all the neighbour entries.
+    for (firmware_entries::const_iterator i = _neighbours.begin();
+         i != _neighbours.end(); ++i)
+    {
+        if (!i->write(os))
+            return false;
+    }
+
+    return true;
+}
+
+
+bool zen::firmware_archive::is_big_endian() const
+{
+    return _big_endian;
+}
+
+const zen::firmware_entries& zen::firmware_archive::get_children() const
+{
+    return _children;
+}
+zen::firmware_entries& zen::firmware_archive::get_children()
+{
+    return _children;
+}
+
+const zen::firmware_entries& zen::firmware_archive::get_neighbours() const
+{
+    return _neighbours;
+}
+zen::firmware_entries& zen::firmware_archive::get_neighbours()
+{
+    return _neighbours;
+}
+
+bool zen::firmware_archive::is_signed() const
+{
+    for (firmware_entries::const_iterator i = _neighbours.begin();
+         i != _neighbours.end(); i++)
+    {
+        if (i->get_name() == "NULL")
+            return true;
+    }
+    return false;
+}
+
+size_t zen::firmware_archive::calc_size() const
+{
+    size_t size = sizeof(firmware_header_t);
+
+    for (firmware_entries::const_iterator i = _children.begin();
+         i != _children.end(); i++)
+    {
+        size += i->calc_size();
+    }
+
+    for (firmware_entries::const_iterator i = _neighbours.begin();
+         i != _neighbours.end(); i++)
+    {
+        size += i->calc_size();
+    }
+
+    return size;
+}
+
+
+void zen::firmware_archive::assign(const firmware_archive& copy)
+{
+    _big_endian = copy._big_endian;
+    _children.assign(copy._children.begin(), copy._children.end());
+    _neighbours.assign(copy._neighbours.begin(), copy._neighbours.end());
+}
diff --git a/utils/zenutils/source/shared/firmware.h b/utils/zenutils/source/shared/firmware.h
index 3542186590..3cd233c3b6 100755..100644
--- a/utils/zenutils/source/shared/firmware.h
+++ b/utils/zenutils/source/shared/firmware.h
@@ -1,92 +1,92 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#ifndef ZEN_FIRMWARE_H_INCLUDED

-#define ZEN_FIRMWARE_H_INCLUDED

-

-#include <list>

-#include <utils.h>

-

-namespace zen {

-    struct firmware_header_t

-    {

-        dword tag;

-        dword size;

-    }; //struct firmware_header_t

-

-    class firmware_entry

-    {

-    public:

-        firmware_entry(bool big_endian);

-        firmware_entry(const firmware_entry& copy);

-        firmware_entry& operator=(const firmware_entry& right);

-

-        bool read(std::istream& is);

-        bool write(std::ostream& os) const;

-

-        bool is_big_endian() const;

-        const firmware_header_t& get_header() const;

-        firmware_header_t& get_header();

-        const shared::bytes& get_bytes() const;

-        shared::bytes& get_bytes();

-

-        std::string get_name() const;

-        std::string get_content_name() const;

-        size_t get_content_offset() const;

-        size_t calc_size() const;

-

-    protected:

-        void assign(const firmware_entry& copy);

-

-    private:

-        bool _big_endian;

-        firmware_header_t _header;

-        shared::bytes _bytes;

-    }; //class firmware_entry

-

-    typedef std::list<firmware_entry> firmware_entries;

-

-    class firmware_archive

-    {

-    public:

-        firmware_archive(bool big_endian);

-        firmware_archive(const firmware_archive& copy);

-        firmware_archive& operator=(const firmware_archive& right);

-

-        bool read(std::istream& is);

-        bool write(std::ostream& os) const;

-

-        bool is_big_endian() const;

-        const firmware_entries& get_children() const;

-        firmware_entries& get_children();

-        const firmware_entries& get_neighbours() const;

-        firmware_entries& get_neighbours();

-        bool is_signed() const;

-        size_t calc_size() const;

-

-    protected:

-        void assign(const firmware_archive& copy);

-

-    private:

-        firmware_entries _children;

-        firmware_entries _neighbours;

-        bool _big_endian;

-    }; //class firmware_archive

-}; //namespace zen

-

-#endif //ZEN_FIRMWARE_ARCHIVE_H_INCLUDED

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef ZEN_FIRMWARE_H_INCLUDED
+#define ZEN_FIRMWARE_H_INCLUDED
+
+#include <list>
+#include <utils.h>
+
+namespace zen {
+    struct firmware_header_t
+    {
+        dword tag;
+        dword size;
+    }; //struct firmware_header_t
+
+    class firmware_entry
+    {
+    public:
+        firmware_entry(bool big_endian);
+        firmware_entry(const firmware_entry& copy);
+        firmware_entry& operator=(const firmware_entry& right);
+
+        bool read(std::istream& is);
+        bool write(std::ostream& os) const;
+
+        bool is_big_endian() const;
+        const firmware_header_t& get_header() const;
+        firmware_header_t& get_header();
+        const shared::bytes& get_bytes() const;
+        shared::bytes& get_bytes();
+
+        std::string get_name() const;
+        std::string get_content_name() const;
+        size_t get_content_offset() const;
+        size_t calc_size() const;
+
+    protected:
+        void assign(const firmware_entry& copy);
+
+    private:
+        bool _big_endian;
+        firmware_header_t _header;
+        shared::bytes _bytes;
+    }; //class firmware_entry
+
+    typedef std::list<firmware_entry> firmware_entries;
+
+    class firmware_archive
+    {
+    public:
+        firmware_archive(bool big_endian);
+        firmware_archive(const firmware_archive& copy);
+        firmware_archive& operator=(const firmware_archive& right);
+
+        bool read(std::istream& is);
+        bool write(std::ostream& os) const;
+
+        bool is_big_endian() const;
+        const firmware_entries& get_children() const;
+        firmware_entries& get_children();
+        const firmware_entries& get_neighbours() const;
+        firmware_entries& get_neighbours();
+        bool is_signed() const;
+        size_t calc_size() const;
+
+    protected:
+        void assign(const firmware_archive& copy);
+
+    private:
+        firmware_entries _children;
+        firmware_entries _neighbours;
+        bool _big_endian;
+    }; //class firmware_archive
+}; //namespace zen
+
+#endif //ZEN_FIRMWARE_ARCHIVE_H_INCLUDED
diff --git a/utils/zenutils/source/shared/pe.cpp b/utils/zenutils/source/shared/pe.cpp
index c86ec6c8cc..10070074dd 100755..100644
--- a/utils/zenutils/source/shared/pe.cpp
+++ b/utils/zenutils/source/shared/pe.cpp
@@ -1,128 +1,128 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#include "pe.h"

-

-

-shared::pe_file::pe_file(PeLib::PeFile* pef) : _pef(pef)

-{

-}

-shared::pe_file::~pe_file()

-{

-    if (_pef != NULL)

-        delete _pef;

-}

-

-bool shared::pe_file::is_valid() const

-{

-    if (_pef->getBits() == 32)

-    {

-        PeLib::PeHeader32& pef32 = static_cast<PeLib::PeFile32*>(_pef)->peHeader();

-        if (!pef32.isValid())

-            return false;

-        return true;

-    }

-    else if (_pef->getBits() == 64)

-    {

-        PeLib::PeHeader64& pef64 = static_cast<PeLib::PeFile64*>(_pef)->peHeader();

-        if (!pef64.isValid())

-            return false;

-        return true;

-    }

-    return false;

-}

-

-bool shared::pe_file::read(const std::string& filename)

-{

-    if (_pef != NULL)

-    {

-        delete _pef;

-        _pef = NULL;

-    }

-

-    _pef = PeLib::openPeFile(filename);

-    if (!_pef)

-    {

-        return false;

-    }

-    if (_pef->readMzHeader())

-    {

-        delete _pef;

-        return false;

-    }

-    if (!_pef->mzHeader().isValid())

-    {

-        delete _pef;

-        return false;

-    }

-    if (_pef->readPeHeader())

-    {

-        delete _pef;

-        return false;

-    }

-    if (!is_valid())

-    {

-        delete _pef;

-        return false;

-    }

-    return true;

-}

-

-bool shared::pe_file::find_section(const std::string& name, section_info& info) const

-{

-    if (_pef->getBits() == 32)

-        return find_section(static_cast<PeLib::PeFile32*>(_pef),

-                            name, info);

-    else if (_pef->getBits() == 64)

-        return find_section(static_cast<PeLib::PeFile64*>(_pef),

-                            name, info);

-    return false;

-}

-

-bool shared::pe_file::add_section(const std::string& name,

-                                  const bytes& buffer, section_info& info)

-{

-    if (_pef->getBits() == 32)

-    {

-         return add_section(static_cast<PeLib::PeFile32*>(_pef),

-                            name, buffer, info);

-    }

-    else if (_pef->getBits() == 64)

-    {

-         return add_section(static_cast<PeLib::PeFile64*>(_pef),

-                            name, buffer, info);

-    }

-    return false;

-}

-

-dword shared::pe_file::get_image_base() const

-{

-    if (_pef->getBits() == 32)

-        return static_cast<PeLib::PeFile32*>(_pef)->peHeader().getImageBase();

-    else

-        return static_cast<PeLib::PeFile64*>(_pef)->peHeader().getImageBase();

-    return 0;

-}

-dword shared::pe_file::pa_to_va(dword pa) const

-{

-    if (_pef->getBits() == 32)

-        return static_cast<PeLib::PeFile32*>(_pef)->peHeader().offsetToVa(pa);

-    else

-        return static_cast<PeLib::PeFile64*>(_pef)->peHeader().offsetToVa(pa);

-    return 0;

-}

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "pe.h"
+
+
+shared::pe_file::pe_file(PeLib::PeFile* pef) : _pef(pef)
+{
+}
+shared::pe_file::~pe_file()
+{
+    if (_pef != NULL)
+        delete _pef;
+}
+
+bool shared::pe_file::is_valid() const
+{
+    if (_pef->getBits() == 32)
+    {
+        PeLib::PeHeader32& pef32 = static_cast<PeLib::PeFile32*>(_pef)->peHeader();
+        if (!pef32.isValid())
+            return false;
+        return true;
+    }
+    else if (_pef->getBits() == 64)
+    {
+        PeLib::PeHeader64& pef64 = static_cast<PeLib::PeFile64*>(_pef)->peHeader();
+        if (!pef64.isValid())
+            return false;
+        return true;
+    }
+    return false;
+}
+
+bool shared::pe_file::read(const std::string& filename)
+{
+    if (_pef != NULL)
+    {
+        delete _pef;
+        _pef = NULL;
+    }
+
+    _pef = PeLib::openPeFile(filename);
+    if (!_pef)
+    {
+        return false;
+    }
+    if (_pef->readMzHeader())
+    {
+        delete _pef;
+        return false;
+    }
+    if (!_pef->mzHeader().isValid())
+    {
+        delete _pef;
+        return false;
+    }
+    if (_pef->readPeHeader())
+    {
+        delete _pef;
+        return false;
+    }
+    if (!is_valid())
+    {
+        delete _pef;
+        return false;
+    }
+    return true;
+}
+
+bool shared::pe_file::find_section(const std::string& name, section_info& info) const
+{
+    if (_pef->getBits() == 32)
+        return find_section(static_cast<PeLib::PeFile32*>(_pef),
+                            name, info);
+    else if (_pef->getBits() == 64)
+        return find_section(static_cast<PeLib::PeFile64*>(_pef),
+                            name, info);
+    return false;
+}
+
+bool shared::pe_file::add_section(const std::string& name,
+                                  const bytes& buffer, section_info& info)
+{
+    if (_pef->getBits() == 32)
+    {
+         return add_section(static_cast<PeLib::PeFile32*>(_pef),
+                            name, buffer, info);
+    }
+    else if (_pef->getBits() == 64)
+    {
+         return add_section(static_cast<PeLib::PeFile64*>(_pef),
+                            name, buffer, info);
+    }
+    return false;
+}
+
+dword shared::pe_file::get_image_base() const
+{
+    if (_pef->getBits() == 32)
+        return static_cast<PeLib::PeFile32*>(_pef)->peHeader().getImageBase();
+    else
+        return static_cast<PeLib::PeFile64*>(_pef)->peHeader().getImageBase();
+    return 0;
+}
+dword shared::pe_file::pa_to_va(dword pa) const
+{
+    if (_pef->getBits() == 32)
+        return static_cast<PeLib::PeFile32*>(_pef)->peHeader().offsetToVa(pa);
+    else
+        return static_cast<PeLib::PeFile64*>(_pef)->peHeader().offsetToVa(pa);
+    return 0;
+}
diff --git a/utils/zenutils/source/shared/pe.h b/utils/zenutils/source/shared/pe.h
index 92a272d3c7..f2f3aa48e8 100755..100644
--- a/utils/zenutils/source/shared/pe.h
+++ b/utils/zenutils/source/shared/pe.h
@@ -1,142 +1,142 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#ifndef SHARED_PE_H_INCLUDED

-#define SHARED_PE_H_INCLUDED

-

-#include <string>

-#include <pelib/PeLib.h>

-#include <utils.h>

-

-namespace shared {

-    struct section_info

-    {

-        word index;

-        dword virtual_address;

-        dword virtual_size;

-        dword raw_address;

-        dword raw_size;

-        dword characteristics;

-    }; //struct section_info

-

-    class pe_file

-    {

-    public:

-        pe_file(PeLib::PeFile* pef = NULL);

-        ~pe_file();

-

-        bool is_valid() const;

-        bool read(const std::string& filename);

-        bool find_section(const std::string& name, section_info& info) const;

-        bool add_section(const std::string& name, const bytes& buffer, section_info& info);

-        dword get_image_base() const;

-        dword pa_to_va(PeLib::dword pa) const;

-

-    protected:

-        template <int _Bits>

-        static bool find_section(const PeLib::PeFileT<_Bits>* pef,

-                          const std::string& name, section_info& info);

-        template <int _Bits>

-        static bool add_section(PeLib::PeFileT<_Bits>* pef,

-                          const std::string& name, const bytes& buffer,

-                          section_info& info);

-

-    private:

-        PeLib::PeFile* _pef;

-    }; //class pe_file

-

-

-    template <int _Bits>

-    bool pe_file::find_section(const PeLib::PeFileT<_Bits>* pef,

-                      const std::string& name, section_info& info)

-    {

-        for (PeLib::word i = 0; i < pef->peHeader().getNumberOfSections(); i++)

-        {

-            if (pef->peHeader().getSectionName(i) == name)

-            {

-                info.index = i;

-                info.virtual_address = pef->peHeader().getVirtualAddress(i);

-                info.virtual_size = pef->peHeader().getVirtualSize(i);

-                info.raw_address = pef->peHeader().getPointerToRawData(i);

-                info.raw_size = pef->peHeader().getSizeOfRawData(i);

-                info.characteristics = pef->peHeader().getCharacteristics(i);

-                return true;

-            }

-        }

-        return false;

-    }

-

-    template <int _Bits>

-    bool pe_file::add_section(PeLib::PeFileT<_Bits>* pef,

-                      const std::string& name, const bytes& buffer,

-                      section_info& info)

-    {

-        using namespace PeLib;

-

-        // Check if the last section has the same name as the one being added.

-        PeLib::word secnum = pef->peHeader().getNumberOfSections();

-        if (pef->peHeader().getSectionName(secnum-1) == name)

-        {

-            // If it is, we change the attributes of the existing section.

-            secnum = secnum - 1;

-            pef->peHeader().setSizeOfRawData(secnum,

-                alignOffset(buffer.size(),

-                            pef->peHeader().getFileAlignment()));

-            pef->peHeader().setVirtualSize(secnum,

-                alignOffset(buffer.size(),

-                            pef->peHeader().getSectionAlignment()));

-            PeLib::dword chars = pef->peHeader().getCharacteristics(secnum-1);

-            pef->peHeader().setCharacteristics(secnum,

-                chars | PELIB_IMAGE_SCN_MEM_WRITE | PELIB_IMAGE_SCN_MEM_READ);

-        }

-        else

-        {

-            // Otherwise we add a new section.

-            if (pef->peHeader().addSection(name, buffer.size()) != NO_ERROR)

-            {

-                return false;

-            }

-            pef->peHeader().makeValid(pef->mzHeader().getAddressOfPeHeader());

-            pef->peHeader().write(pef->getFileName(), pef->mzHeader().getAddressOfPeHeader());

-        }

-

-        // Save the section headers to the file.

-        if (pef->peHeader().writeSections(pef->getFileName()) != NO_ERROR)

-        {

-            return false;

-        }

-

-        // Save the section data to the file.

-        if (pef->peHeader().writeSectionData(pef->getFileName(), secnum, buffer) != NO_ERROR)

-        {

-            return false;

-        }

-

-        // Fill out the section information.

-        info.index = secnum;

-        info.virtual_address = pef->peHeader().getVirtualAddress(secnum);

-        info.virtual_size = pef->peHeader().getVirtualSize(secnum);

-        info.raw_address = pef->peHeader().getPointerToRawData(secnum);

-        info.raw_size = pef->peHeader().getSizeOfRawData(secnum);

-        info.characteristics = pef->peHeader().getCharacteristics(secnum);

-

-        return true;

-    }

-}; //namespace shared

-

-#endif //SHARED_PE_H_INCLUDED

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SHARED_PE_H_INCLUDED
+#define SHARED_PE_H_INCLUDED
+
+#include <string>
+#include <pelib/PeLib.h>
+#include <utils.h>
+
+namespace shared {
+    struct section_info
+    {
+        word index;
+        dword virtual_address;
+        dword virtual_size;
+        dword raw_address;
+        dword raw_size;
+        dword characteristics;
+    }; //struct section_info
+
+    class pe_file
+    {
+    public:
+        pe_file(PeLib::PeFile* pef = NULL);
+        ~pe_file();
+
+        bool is_valid() const;
+        bool read(const std::string& filename);
+        bool find_section(const std::string& name, section_info& info) const;
+        bool add_section(const std::string& name, const bytes& buffer, section_info& info);
+        dword get_image_base() const;
+        dword pa_to_va(PeLib::dword pa) const;
+
+    protected:
+        template <int _Bits>
+        static bool find_section(const PeLib::PeFileT<_Bits>* pef,
+                          const std::string& name, section_info& info);
+        template <int _Bits>
+        static bool add_section(PeLib::PeFileT<_Bits>* pef,
+                          const std::string& name, const bytes& buffer,
+                          section_info& info);
+
+    private:
+        PeLib::PeFile* _pef;
+    }; //class pe_file
+
+
+    template <int _Bits>
+    bool pe_file::find_section(const PeLib::PeFileT<_Bits>* pef,
+                      const std::string& name, section_info& info)
+    {
+        for (PeLib::word i = 0; i < pef->peHeader().getNumberOfSections(); i++)
+        {
+            if (pef->peHeader().getSectionName(i) == name)
+            {
+                info.index = i;
+                info.virtual_address = pef->peHeader().getVirtualAddress(i);
+                info.virtual_size = pef->peHeader().getVirtualSize(i);
+                info.raw_address = pef->peHeader().getPointerToRawData(i);
+                info.raw_size = pef->peHeader().getSizeOfRawData(i);
+                info.characteristics = pef->peHeader().getCharacteristics(i);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    template <int _Bits>
+    bool pe_file::add_section(PeLib::PeFileT<_Bits>* pef,
+                      const std::string& name, const bytes& buffer,
+                      section_info& info)
+    {
+        using namespace PeLib;
+
+        // Check if the last section has the same name as the one being added.
+        PeLib::word secnum = pef->peHeader().getNumberOfSections();
+        if (pef->peHeader().getSectionName(secnum-1) == name)
+        {
+            // If it is, we change the attributes of the existing section.
+            secnum = secnum - 1;
+            pef->peHeader().setSizeOfRawData(secnum,
+                alignOffset(buffer.size(),
+                            pef->peHeader().getFileAlignment()));
+            pef->peHeader().setVirtualSize(secnum,
+                alignOffset(buffer.size(),
+                            pef->peHeader().getSectionAlignment()));
+            PeLib::dword chars = pef->peHeader().getCharacteristics(secnum-1);
+            pef->peHeader().setCharacteristics(secnum,
+                chars | PELIB_IMAGE_SCN_MEM_WRITE | PELIB_IMAGE_SCN_MEM_READ);
+        }
+        else
+        {
+            // Otherwise we add a new section.
+            if (pef->peHeader().addSection(name, buffer.size()) != NO_ERROR)
+            {
+                return false;
+            }
+            pef->peHeader().makeValid(pef->mzHeader().getAddressOfPeHeader());
+            pef->peHeader().write(pef->getFileName(), pef->mzHeader().getAddressOfPeHeader());
+        }
+
+        // Save the section headers to the file.
+        if (pef->peHeader().writeSections(pef->getFileName()) != NO_ERROR)
+        {
+            return false;
+        }
+
+        // Save the section data to the file.
+        if (pef->peHeader().writeSectionData(pef->getFileName(), secnum, buffer) != NO_ERROR)
+        {
+            return false;
+        }
+
+        // Fill out the section information.
+        info.index = secnum;
+        info.virtual_address = pef->peHeader().getVirtualAddress(secnum);
+        info.virtual_size = pef->peHeader().getVirtualSize(secnum);
+        info.raw_address = pef->peHeader().getPointerToRawData(secnum);
+        info.raw_size = pef->peHeader().getSizeOfRawData(secnum);
+        info.characteristics = pef->peHeader().getCharacteristics(secnum);
+
+        return true;
+    }
+}; //namespace shared
+
+#endif //SHARED_PE_H_INCLUDED
diff --git a/utils/zenutils/source/shared/shared.cpp b/utils/zenutils/source/shared/shared.cpp
index e69de29bb2..e69de29bb2 100755..100644
--- a/utils/zenutils/source/shared/shared.cpp
+++ b/utils/zenutils/source/shared/shared.cpp
diff --git a/utils/zenutils/source/shared/updater.cpp b/utils/zenutils/source/shared/updater.cpp
index 77d3f2876c..25d8452992 100755..100644
--- a/utils/zenutils/source/shared/updater.cpp
+++ b/utils/zenutils/source/shared/updater.cpp
@@ -1,151 +1,151 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#include "updater.h"

-#include <file.h>

-#include <pe.h>

-#include <utils.h>

-

-

-const char* zen::find_firmware_key(const byte* buffer, size_t len)

-{

-    char szkey1[] = "34d1";

-    size_t cchkey1 = strlen(szkey1);

-    char szkey2[] = "TbnCboEbn";

-    size_t cchkey2 = strlen(szkey2);

-    for (int i = 0; i < static_cast<int>(len); i++)

-    {

-        if (len >= cchkey1)

-        {

-            if (!strncmp((char*)&buffer[i], szkey1, cchkey1))

-            {

-                return (const char*)&buffer[i];

-            }

-        }

-        if (len >= cchkey2)

-        {

-            if (!strncmp((char*)&buffer[i], szkey2, cchkey2))

-            {

-                return (const char*)&buffer[i];

-            }

-        }

-    }

-    return NULL;

-}

-

-dword zen::find_firmware_offset(byte* buffer, size_t len)

-{

-    for (dword i = 0; i < static_cast<dword>(len); i += 0x10)

-    {

-        dword size = *(dword*)&buffer[i];

-        if (size < (i + len) && size > (len >> 1))

-        {

-            if (buffer[i + sizeof(dword)] != 0

-                && buffer[i + sizeof(dword) + 1] != 0

-                && buffer[i + sizeof(dword) + 2] != 0

-                && buffer[i + sizeof(dword) + 3] != 0)

-            {

-                return i;

-            }

-        }

-    }

-    return 0;

-}

-

-bool zen::find_firmware_archive(const std::string& filename, dword& va, dword& pa)

-{

-    shared::pe_file pef;

-    if (!pef.read(filename))

-    {

-        return false;

-    }

-    shared::section_info data_section;

-    if (!pef.find_section(".data", data_section))

-    {

-        return false;

-    }

-    shared::bytes buffer;

-    if (!shared::read_file(filename, buffer, data_section.raw_address,

-                           data_section.raw_size))

-    {

-        return false;

-    }

-    dword offset = find_firmware_offset(&buffer[0], buffer.size());

-    if (!offset)

-    {

-        return false;

-    }

-    va = data_section.virtual_address + offset;

-    pa = data_section.raw_address + offset;

-

-    return true;

-}

-

-

-bool zen::crypt_firmware(const char* key, byte* buffer, size_t len)

-{

-    // Determine if the key length is dword aligned.

-    int keylen = strlen(key);

-    int keylen_rem = keylen % sizeof(dword);

-

-    // Determine how many times the key must be repeated to be dword aligned.

-    int keycycle = keylen_rem ? (sizeof(dword) / keylen_rem) : 1;

-    int keyscount = (keylen * keycycle) / sizeof(dword);

-

-    // Allocate a buffer to hold the key as an array of dwords.

-    dword* keys = new dword[keyscount];

-

-    // Copy the key into the key array, whilst mutating it.

-    for (int i = 0; i < keyscount; i++)

-    {

-        dword val;

-        int keyoffset = (i * sizeof(dword)) % keylen;

-        if ((keyoffset+sizeof(dword)) < keylen)

-        {

-            val = *(dword*)&key[keyoffset];

-        }

-        else

-        {

-            val = key[keyoffset]

-                | (key[(keyoffset + 1) % keylen] << 8)

-                | (key[(keyoffset + 2) % keylen] << 16)

-                | (key[(keyoffset + 3) % keylen] << 24);

-        }

-        keys[i] = (val - 0x01010101) | 0x80808080;

-    }

-

-    // Determine the number of dwords in the buffer.

-    int len_div = len / sizeof(dword);

-

-    // Decrypt all dwords of the buffer.

-    for (int i = 0; i < len_div; i++)

-    {

-        ((dword*)buffer)[i] ^= keys[i % keyscount];

-    }

-

-    // Determine the remaining number of bytes in the buffer.

-    int len_rem = len % sizeof(dword);

-

-    // Decrypt the remaining number of bytes in the buffer.

-    for (int i = len_div * sizeof(dword); i < len; i++)

-    {

-        buffer[i] ^= ((key[i % keylen] - 0x01) | 0x80);

-    }

-

-    return true;

-}

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "updater.h"
+#include <file.h>
+#include <pe.h>
+#include <utils.h>
+
+
+const char* zen::find_firmware_key(const byte* buffer, size_t len)
+{
+    char szkey1[] = "34d1";
+    size_t cchkey1 = strlen(szkey1);
+    char szkey2[] = "TbnCboEbn";
+    size_t cchkey2 = strlen(szkey2);
+    for (int i = 0; i < static_cast<int>(len); i++)
+    {
+        if (len >= cchkey1)
+        {
+            if (!strncmp((char*)&buffer[i], szkey1, cchkey1))
+            {
+                return (const char*)&buffer[i];
+            }
+        }
+        if (len >= cchkey2)
+        {
+            if (!strncmp((char*)&buffer[i], szkey2, cchkey2))
+            {
+                return (const char*)&buffer[i];
+            }
+        }
+    }
+    return NULL;
+}
+
+dword zen::find_firmware_offset(byte* buffer, size_t len)
+{
+    for (dword i = 0; i < static_cast<dword>(len); i += 0x10)
+    {
+        dword size = *(dword*)&buffer[i];
+        if (size < (i + len) && size > (len >> 1))
+        {
+            if (buffer[i + sizeof(dword)] != 0
+                && buffer[i + sizeof(dword) + 1] != 0
+                && buffer[i + sizeof(dword) + 2] != 0
+                && buffer[i + sizeof(dword) + 3] != 0)
+            {
+                return i;
+            }
+        }
+    }
+    return 0;
+}
+
+bool zen::find_firmware_archive(const std::string& filename, dword& va, dword& pa)
+{
+    shared::pe_file pef;
+    if (!pef.read(filename))
+    {
+        return false;
+    }
+    shared::section_info data_section;
+    if (!pef.find_section(".data", data_section))
+    {
+        return false;
+    }
+    shared::bytes buffer;
+    if (!shared::read_file(filename, buffer, data_section.raw_address,
+                           data_section.raw_size))
+    {
+        return false;
+    }
+    dword offset = find_firmware_offset(&buffer[0], buffer.size());
+    if (!offset)
+    {
+        return false;
+    }
+    va = data_section.virtual_address + offset;
+    pa = data_section.raw_address + offset;
+
+    return true;
+}
+
+
+bool zen::crypt_firmware(const char* key, byte* buffer, size_t len)
+{
+    // Determine if the key length is dword aligned.
+    int keylen = strlen(key);
+    int keylen_rem = keylen % sizeof(dword);
+
+    // Determine how many times the key must be repeated to be dword aligned.
+    int keycycle = keylen_rem ? (sizeof(dword) / keylen_rem) : 1;
+    int keyscount = (keylen * keycycle) / sizeof(dword);
+
+    // Allocate a buffer to hold the key as an array of dwords.
+    dword* keys = new dword[keyscount];
+
+    // Copy the key into the key array, whilst mutating it.
+    for (int i = 0; i < keyscount; i++)
+    {
+        dword val;
+        int keyoffset = (i * sizeof(dword)) % keylen;
+        if ((keyoffset+sizeof(dword)) < keylen)
+        {
+            val = *(dword*)&key[keyoffset];
+        }
+        else
+        {
+            val = key[keyoffset]
+                | (key[(keyoffset + 1) % keylen] << 8)
+                | (key[(keyoffset + 2) % keylen] << 16)
+                | (key[(keyoffset + 3) % keylen] << 24);
+        }
+        keys[i] = (val - 0x01010101) | 0x80808080;
+    }
+
+    // Determine the number of dwords in the buffer.
+    int len_div = len / sizeof(dword);
+
+    // Decrypt all dwords of the buffer.
+    for (int i = 0; i < len_div; i++)
+    {
+        ((dword*)buffer)[i] ^= keys[i % keyscount];
+    }
+
+    // Determine the remaining number of bytes in the buffer.
+    int len_rem = len % sizeof(dword);
+
+    // Decrypt the remaining number of bytes in the buffer.
+    for (int i = len_div * sizeof(dword); i < len; i++)
+    {
+        buffer[i] ^= ((key[i % keylen] - 0x01) | 0x80);
+    }
+
+    return true;
+}
diff --git a/utils/zenutils/source/shared/updater.h b/utils/zenutils/source/shared/updater.h
index 57f9979c30..884fe9568c 100755..100644
--- a/utils/zenutils/source/shared/updater.h
+++ b/utils/zenutils/source/shared/updater.h
@@ -1,32 +1,32 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#ifndef ZEN_UPDATER_H_INCLUDED

-#define ZEN_UPDATER_H_INCLUDED

-

-#include <pelib/PeLib.h>

-#include <utils.h>

-

-namespace zen {

-    const char* find_firmware_key(const byte* buffer, size_t len);

-    dword find_firmware_offset(byte* buffer, size_t len);

-    bool find_firmware_archive(const std::string& filename, dword& va, dword& pa);

-    bool crypt_firmware(const char* key, byte* buffer, size_t len);

-}; //namespace zen

-

-#endif //ZEN_UPDATER_H_INCLUDED

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef ZEN_UPDATER_H_INCLUDED
+#define ZEN_UPDATER_H_INCLUDED
+
+#include <pelib/PeLib.h>
+#include <utils.h>
+
+namespace zen {
+    const char* find_firmware_key(const byte* buffer, size_t len);
+    dword find_firmware_offset(byte* buffer, size_t len);
+    bool find_firmware_archive(const std::string& filename, dword& va, dword& pa);
+    bool crypt_firmware(const char* key, byte* buffer, size_t len);
+}; //namespace zen
+
+#endif //ZEN_UPDATER_H_INCLUDED
diff --git a/utils/zenutils/source/shared/utils.cpp b/utils/zenutils/source/shared/utils.cpp
index 8f45de5d3f..fbb223b42b 100755..100644
--- a/utils/zenutils/source/shared/utils.cpp
+++ b/utils/zenutils/source/shared/utils.cpp
@@ -1,211 +1,211 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#include "utils.h"

-#include <fstream>

-#include <zlib/zlib.h>

-

-

-std::string shared::replace_extension(const std::string& filename, const std::string& extension)

-{

-    std::string newname;

-    const char* name = filename.c_str();

-    const char* ext = strrchr(name, '.');

-    if (ext)

-    {

-        // If an extension was found, replace it.

-        newname.assign(name, ext-name);

-        newname += extension;

-    }

-    else

-    {

-        // If an extension was not found, append it.

-        newname = name;

-        newname += extension;

-    }

-    return newname;

-}

-

-std::string shared::remove_extension(const std::string& filename)

-{

-    std::string newname;

-    const char* name = filename.c_str();

-    const char* ext = strrchr(name, '.');

-    if (ext)

-    {

-        newname.assign(name, ext-name);

-    }

-    else

-    {

-        newname = name;

-    }

-    return newname;

-}

-

-std::string shared::double_quote(const std::string& str)

-{

-    std::string out;

-    for (int i = 0, j = str.length(); i < j; i++)

-    {

-        if (str[i] == '\\')

-            out += "\\\\";

-        else

-            out += str[i];

-    }

-    return out;

-}

-

-bool shared::inflate_to_file(const bytes& buffer, const char* filename)

-{

-    // Open output file.

-    std::ofstream ofs;

-    ofs.open(filename, std::ios::binary);

-    if (!ofs)

-    {

-        return false;

-    }

-

-    // Initialize zlib.

-    z_stream d_stream; // decompression stream

-

-    d_stream.zalloc = Z_NULL;

-    d_stream.zfree = Z_NULL;

-    d_stream.opaque = Z_NULL;

-

-    d_stream.next_in  = const_cast<bytes::value_type*>(&buffer[0]);

-    d_stream.avail_in = static_cast<uInt>(buffer.size());

-

-    int ret = inflateInit(&d_stream);

-    if (ret != Z_OK)

-        return false;

-

-    // Allocate buffer to hold the inflated data.

-    const size_t BUFSIZE = 1048576;

-    Bytef* infbuf = new Bytef[BUFSIZE];

-    if (!infbuf)

-        return false;

-

-    // Decompress untill the end of the input buffer.

-    uLong totalout = 0;

-    bool bLoop = true;

-    while (bLoop)

-    {

-        d_stream.next_out = infbuf;

-        d_stream.avail_out = BUFSIZE;

-

-        ret = inflate(&d_stream, Z_NO_FLUSH);

-        if (ret == Z_STREAM_END)

-        {

-            bLoop = false;

-        }

-        else if (ret != Z_OK)

-        {

-            inflateEnd(&d_stream);

-            delete [] infbuf;

-            return false;

-        }

-

-        // Write the inflated data to the output file.

-        if (!ofs.write((const char*)infbuf, d_stream.total_out-totalout))

-        {

-            inflateEnd(&d_stream);

-            delete [] infbuf;

-            return false;

-        }

-        totalout = d_stream.total_out;

-    }

-

-    // Cleanup and return.

-    inflateEnd(&d_stream);

-    delete [] infbuf;

-

-    return true;

-}

-

-bool shared::deflate_to_file(const bytes& buffer, const char* filename)

-{

-    // Open output file.

-    std::ofstream ofs;

-    ofs.open(filename, std::ios::binary);

-    if (!ofs)

-    {

-        return false;

-    }

-

-    // Initialize zlib.

-    z_stream c_stream; // compression stream.

-

-    c_stream.zalloc = Z_NULL;

-    c_stream.zfree = Z_NULL;

-    c_stream.opaque = Z_NULL;

-

-    int ret = deflateInit(&c_stream, Z_BEST_COMPRESSION);

-    if (ret != Z_OK)

-        return false;

-

-    // Allocate buffer to hold the deflated data.

-    const size_t BUFSIZE = 1048576;

-    Bytef* defbuf = new Bytef[BUFSIZE];

-    if (!defbuf)

-        return false;

-

-    c_stream.avail_in = static_cast<uInt>(buffer.size());

-    c_stream.next_in = const_cast<bytes::value_type*>(&buffer[0]);

-

-    // Compress until end of the buffer.

-    uLong totalout = 0;

-    bool bLoop = true;

-    while (bLoop)

-    {

-        c_stream.avail_out = BUFSIZE;

-        c_stream.next_out = defbuf;

-

-        ret = deflate(&c_stream, Z_NO_FLUSH);    // no bad return value

-        if (ret == Z_STREAM_END)

-        {

-            bLoop = false;

-        }

-        else if (ret == Z_BUF_ERROR && !c_stream.avail_in)

-        {

-            ret = deflate(&c_stream, Z_FINISH);    // no bad return value

-            bLoop = false;

-        }

-        else if (ret != Z_OK)

-        {

-            deflateEnd(&c_stream);

-            delete [] defbuf;

-            return false;

-        }

-

-        // Write the inflated data to the output file.

-        if (!ofs.write((const char*)defbuf, c_stream.total_out-totalout))

-        {

-            deflateEnd(&c_stream);

-            delete [] defbuf;

-            return false;

-        }

-

-        totalout = c_stream.total_out;

-    }

-

-    // Clean up and return.

-    deflateEnd(&c_stream);

-    delete [] defbuf;

-

-    return true;

-}

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "utils.h"
+#include <fstream>
+#include <zlib/zlib.h>
+
+
+std::string shared::replace_extension(const std::string& filename, const std::string& extension)
+{
+    std::string newname;
+    const char* name = filename.c_str();
+    const char* ext = strrchr(name, '.');
+    if (ext)
+    {
+        // If an extension was found, replace it.
+        newname.assign(name, ext-name);
+        newname += extension;
+    }
+    else
+    {
+        // If an extension was not found, append it.
+        newname = name;
+        newname += extension;
+    }
+    return newname;
+}
+
+std::string shared::remove_extension(const std::string& filename)
+{
+    std::string newname;
+    const char* name = filename.c_str();
+    const char* ext = strrchr(name, '.');
+    if (ext)
+    {
+        newname.assign(name, ext-name);
+    }
+    else
+    {
+        newname = name;
+    }
+    return newname;
+}
+
+std::string shared::double_quote(const std::string& str)
+{
+    std::string out;
+    for (int i = 0, j = str.length(); i < j; i++)
+    {
+        if (str[i] == '\\')
+            out += "\\\\";
+        else
+            out += str[i];
+    }
+    return out;
+}
+
+bool shared::inflate_to_file(const bytes& buffer, const char* filename)
+{
+    // Open output file.
+    std::ofstream ofs;
+    ofs.open(filename, std::ios::binary);
+    if (!ofs)
+    {
+        return false;
+    }
+
+    // Initialize zlib.
+    z_stream d_stream; // decompression stream
+
+    d_stream.zalloc = Z_NULL;
+    d_stream.zfree = Z_NULL;
+    d_stream.opaque = Z_NULL;
+
+    d_stream.next_in  = const_cast<bytes::value_type*>(&buffer[0]);
+    d_stream.avail_in = static_cast<uInt>(buffer.size());
+
+    int ret = inflateInit(&d_stream);
+    if (ret != Z_OK)
+        return false;
+
+    // Allocate buffer to hold the inflated data.
+    const size_t BUFSIZE = 1048576;
+    Bytef* infbuf = new Bytef[BUFSIZE];
+    if (!infbuf)
+        return false;
+
+    // Decompress untill the end of the input buffer.
+    uLong totalout = 0;
+    bool bLoop = true;
+    while (bLoop)
+    {
+        d_stream.next_out = infbuf;
+        d_stream.avail_out = BUFSIZE;
+
+        ret = inflate(&d_stream, Z_NO_FLUSH);
+        if (ret == Z_STREAM_END)
+        {
+            bLoop = false;
+        }
+        else if (ret != Z_OK)
+        {
+            inflateEnd(&d_stream);
+            delete [] infbuf;
+            return false;
+        }
+
+        // Write the inflated data to the output file.
+        if (!ofs.write((const char*)infbuf, d_stream.total_out-totalout))
+        {
+            inflateEnd(&d_stream);
+            delete [] infbuf;
+            return false;
+        }
+        totalout = d_stream.total_out;
+    }
+
+    // Cleanup and return.
+    inflateEnd(&d_stream);
+    delete [] infbuf;
+
+    return true;
+}
+
+bool shared::deflate_to_file(const bytes& buffer, const char* filename)
+{
+    // Open output file.
+    std::ofstream ofs;
+    ofs.open(filename, std::ios::binary);
+    if (!ofs)
+    {
+        return false;
+    }
+
+    // Initialize zlib.
+    z_stream c_stream; // compression stream.
+
+    c_stream.zalloc = Z_NULL;
+    c_stream.zfree = Z_NULL;
+    c_stream.opaque = Z_NULL;
+
+    int ret = deflateInit(&c_stream, Z_BEST_COMPRESSION);
+    if (ret != Z_OK)
+        return false;
+
+    // Allocate buffer to hold the deflated data.
+    const size_t BUFSIZE = 1048576;
+    Bytef* defbuf = new Bytef[BUFSIZE];
+    if (!defbuf)
+        return false;
+
+    c_stream.avail_in = static_cast<uInt>(buffer.size());
+    c_stream.next_in = const_cast<bytes::value_type*>(&buffer[0]);
+
+    // Compress until end of the buffer.
+    uLong totalout = 0;
+    bool bLoop = true;
+    while (bLoop)
+    {
+        c_stream.avail_out = BUFSIZE;
+        c_stream.next_out = defbuf;
+
+        ret = deflate(&c_stream, Z_NO_FLUSH);    // no bad return value
+        if (ret == Z_STREAM_END)
+        {
+            bLoop = false;
+        }
+        else if (ret == Z_BUF_ERROR && !c_stream.avail_in)
+        {
+            ret = deflate(&c_stream, Z_FINISH);    // no bad return value
+            bLoop = false;
+        }
+        else if (ret != Z_OK)
+        {
+            deflateEnd(&c_stream);
+            delete [] defbuf;
+            return false;
+        }
+
+        // Write the inflated data to the output file.
+        if (!ofs.write((const char*)defbuf, c_stream.total_out-totalout))
+        {
+            deflateEnd(&c_stream);
+            delete [] defbuf;
+            return false;
+        }
+
+        totalout = c_stream.total_out;
+    }
+
+    // Clean up and return.
+    deflateEnd(&c_stream);
+    delete [] defbuf;
+
+    return true;
+}
diff --git a/utils/zenutils/source/shared/utils.h b/utils/zenutils/source/shared/utils.h
index ca9e291514..694cb9c8b1 100755..100644
--- a/utils/zenutils/source/shared/utils.h
+++ b/utils/zenutils/source/shared/utils.h
@@ -1,68 +1,68 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#ifndef SHARED_UTILS_H_INCLUDED

-#define SHARED_UTILS_H_INCLUDED

-

-#include <vector>

-#include <pelib/PeLib.h>

-

-#ifndef byte

-typedef PeLib::byte byte;

-#endif

-#ifndef word

-typedef PeLib::word word;

-#endif

-#ifndef dword

-typedef PeLib::dword dword;

-#endif

-

-namespace shared {

-    typedef std::vector<byte> bytes;

-

-    inline dword swap(dword val)

-    {

-        return ((val & 0xFF) << 24)

-               | ((val & 0xFF00) << 8)

-               | ((val & 0xFF0000) >> 8)

-               | ((val & 0xFF000000) >> 24);

-    }

-

-    template <typename _Type>

-    inline void reverse(_Type* start, _Type* end)

-    {

-        while (start < end)

-        {

-            *start ^= *end;

-            *end ^= *start;

-            *start ^= *end;

-            start++;

-            end--;

-        }

-    }

-

-    std::string replace_extension(const std::string& filename, const std::string& extension);

-    std::string remove_extension(const std::string& filename);

-    std::string get_path(const std::string& filename);

-    std::string double_quote(const std::string& str);

-

-    bool inflate_to_file(const bytes& buffer, const char* filename);

-    bool deflate_to_file(const bytes& buffer, const char* filename);

-}; //namespace shared

-

-#endif //SHARED_UTILS_H_INCLUDED

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SHARED_UTILS_H_INCLUDED
+#define SHARED_UTILS_H_INCLUDED
+
+#include <vector>
+#include <pelib/PeLib.h>
+
+#ifndef byte
+typedef PeLib::byte byte;
+#endif
+#ifndef word
+typedef PeLib::word word;
+#endif
+#ifndef dword
+typedef PeLib::dword dword;
+#endif
+
+namespace shared {
+    typedef std::vector<byte> bytes;
+
+    inline dword swap(dword val)
+    {
+        return ((val & 0xFF) << 24)
+               | ((val & 0xFF00) << 8)
+               | ((val & 0xFF0000) >> 8)
+               | ((val & 0xFF000000) >> 24);
+    }
+
+    template <typename _Type>
+    inline void reverse(_Type* start, _Type* end)
+    {
+        while (start < end)
+        {
+            *start ^= *end;
+            *end ^= *start;
+            *start ^= *end;
+            start++;
+            end--;
+        }
+    }
+
+    std::string replace_extension(const std::string& filename, const std::string& extension);
+    std::string remove_extension(const std::string& filename);
+    std::string get_path(const std::string& filename);
+    std::string double_quote(const std::string& str);
+
+    bool inflate_to_file(const bytes& buffer, const char* filename);
+    bool deflate_to_file(const bytes& buffer, const char* filename);
+}; //namespace shared
+
+#endif //SHARED_UTILS_H_INCLUDED
diff --git a/utils/zenutils/source/update_extract/CMakeLists.txt b/utils/zenutils/source/update_extract/CMakeLists.txt
index 813e389bed..60d298be11 100755..100644
--- a/utils/zenutils/source/update_extract/CMakeLists.txt
+++ b/utils/zenutils/source/update_extract/CMakeLists.txt
@@ -1,3 +1,3 @@
-ADD_EXECUTABLE(update_extract main.cpp)

-

-TARGET_LINK_LIBRARIES (update_extract shared)

+ADD_EXECUTABLE(update_extract main.cpp)
+
+TARGET_LINK_LIBRARIES (update_extract shared)
diff --git a/utils/zenutils/source/update_extract/main.cpp b/utils/zenutils/source/update_extract/main.cpp
index 0fae29e00c..4891329397 100755..100644
--- a/utils/zenutils/source/update_extract/main.cpp
+++ b/utils/zenutils/source/update_extract/main.cpp
@@ -1,279 +1,279 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#include <iostream>

-#include <iomanip>

-#include <ctime>

-#include <getpot/getpot.hpp>

-#include <file.h>

-#include <updater.h>

-#include <utils.h>

-

-

-static const char VERSION[] = "0.1";

-

-void print_version()

-{

-    std::cout

-        << "update_extract - Extracts a Creative firmware from an updater"

-           " executable." << std::endl

-        << "Version " << VERSION << std::endl

-        << "Copyright (c) 2007 Rasmus Ry" << std::endl;

-}

-

-void print_help()

-{

-    print_version();

-    std::cout << std::endl

-        << "Usage: update_extract [command] [options]" << std::endl

-        << std::endl

-        << " Commands:" << std::endl

-        << "  -h,--help" << std::endl

-        << "      prints this message." << std::endl

-        << "  -u,--updater [file]" << std::endl

-        << "      specifies the updater executable." << std::endl

-        << std::endl

-        << " Options:" << std::endl

-        << "  -V,--verbose" << std::endl

-        << "      prints verbose messages." << std::endl

-        << "  -f,--firmware [file]" << std::endl

-        << "      specifies the firmware arhive file name." << std::endl

-        << "  -k,--key [key]" << std::endl

-        << "      specifies the firmware archive key." << std::endl

-        << "  -o,--offset [offset]" << std::endl

-        << "      specifies the firmware archive offset in c-style"

-           " hexadecimal." << std::endl

-        << std::endl

-        ;

-}

-

-std::string options_name(const std::string& name)

-{

-    return shared::replace_extension(name, ".opt");

-}

-

-std::string default_firmware_name(const std::string& name)

-{

-    return shared::replace_extension(name, "_rk.bin");

-}

-

-int process_arguments(int argc, char* argv[])

-{

-    //--------------------------------------------------------------------

-    // Parse input variables.

-    //--------------------------------------------------------------------

-

-    GetPot cl(argc, argv);

-    if (cl.size() == 1 || cl.search(2, "-h", "--help"))

-    {

-        print_help();

-        return 1;

-    }

-

-    std::string updatername;

-    if (cl.search("-u") || cl.search("--updater"))

-        updatername = cl.next("");

-    if (updatername.empty())

-    {

-        std::cerr << "Updater executable must be specified." << std::endl;

-        return 2;

-    }

-

-    std::string firmarename = default_firmware_name(updatername);

-    if (cl.search("-f") || cl.search("--firmware"))

-        firmarename = cl.next(firmarename.c_str());

-

-    bool verbose = false;

-    if (cl.search("-V") || cl.search("--verbose"))

-        verbose = true;

-

-    // Get or find the firmware archive key.

-    std::string key;

-    if (cl.search("-k") || cl.search("--key"))

-        key = cl.next("");

-

-    if (key.empty())

-    {

-        if (verbose)

-            std::cout << "[*] Looking for firmware archive key..."

-                      << std::endl;

-        shared::bytes buffer;

-        if (!shared::read_file(updatername, buffer))

-        {

-            std::cerr << "Failed to read the firmware updater executable."

-                      << std::endl;

-            return 3;

-        }

-        key = zen::find_firmware_key(&buffer[0], buffer.size());

-        if (key.empty())

-        {

-            std::cerr << "Failed to find the firmware archive key."

-                      << std::endl;

-            return 4;

-        }

-    }

-

-    // Get or find the firmware archive offset.

-    std::string offset;

-    dword offset_pa = 0;

-    if (cl.search("-o") || cl.search("--ofset"))

-        offset = cl.next("");

-

-    if (offset.empty())

-    {

-        if (verbose)

-            std::cout << "[*] Looking for firmware archive offset..."

-                      << std::endl;

-

-        dword offset_va = 0;

-        if (!zen::find_firmware_archive(updatername, offset_va, offset_pa))

-        {

-            std::cerr << "Failed to find the firmware archive offset."

-                      << std::endl;

-            return 5;

-        }

-    }

-    else

-    {

-        int offset_val;

-        if (!sscanf(offset.c_str(), "0x%x", &offset_val))

-        {

-            if (!sscanf(offset.c_str(), "0x%X", &offset_val))

-            {

-                std::cerr << "\'" << offset

-                    << "\' is not a valid c-style hexadecimal value."

-                    << std::endl;

-                return 6;

-            }

-        }

-        offset_pa = static_cast<dword>(offset_val);

-    }

-

-    // Read firmware archive size.

-    shared::bytes buffer;

-    if (!shared::read_file(updatername, buffer, offset_pa, sizeof(dword)))

-    {

-        std::cerr << "Failed to read the firmware archive size." << std::endl;

-        return 7;

-    }

-    dword archive_size = *(dword*)&buffer[0];

-

-    if (verbose)

-    {

-        std::cout << "[*] Printing input variables..." << std::endl;

-        std::cout << "    Updater executable:  " << updatername << std::endl;

-        std::cout << "    Firmware archive:    " << firmarename << std::endl;

-        std::cout << "      Key:               " << key << std::endl;

-        std::cout << "      Offset:            "

-                  << std::hex << std::showbase << std::setw(10)

-                  << std::setfill('0') << std::internal

-                  << offset_pa << std::endl;

-        std::cout << "      Size:              "

-                  << std::hex << std::showbase << std::setw(10)

-                  << std::setfill('0') << std::internal

-                  << archive_size << std::endl;

-    }

-

-

-    //--------------------------------------------------------------------

-    // Extract the firmware archive from the updater.

-    //--------------------------------------------------------------------

-

-    if (verbose)

-        std::cout << "[*] Reading firmware archive..." << std::endl;

-

-    // Read the firmware archive.

-    offset_pa += sizeof(dword);

-    if (!shared::read_file(updatername, buffer, offset_pa, archive_size))

-    {

-        std::cerr << "Failed to read the firmware archive." << std::endl;

-        return 8;

-    }

-

-    if (verbose)

-        std::cout << "[*] Decrypting firmware archive..." << std::endl;

-

-    // Decrypt the firmware archive.

-    if (!zen::crypt_firmware(key.c_str(), &buffer[0], buffer.size()))

-    {

-        std::cerr << "Failed to decrypt the firmware archive." << std::endl;

-        return 9;

-    }

-

-    if (verbose)

-        std::cout << "[*] Decompressing firmware archive..." << std::endl;

-

-    // Inflate the firmware archive to the output file.

-    if (!shared::inflate_to_file(buffer, firmarename.c_str()))

-    {

-        std::cerr << "Failed to decompress the firmware archive." << std::endl;

-        return 10;

-    }

-

-

-    //--------------------------------------------------------------------

-    // Generate an options file for the extracted firmware archive.

-    //--------------------------------------------------------------------

-

-    // Get options filename for the given input file.

-    std::string optionsname = options_name(updatername);

-

-    if (verbose)

-        std::cout << "[*] Producing options file..." << std::endl;

-

-    // Produce options file for the given input file.

-    std::ofstream ofs;

-    ofs.open(optionsname.c_str(), std::ios::binary);

-    if (!ofs)

-    {

-        std::cerr << "Failed to create firmware archive options file."

-                  << std::endl;

-        return 11;

-    }

-

-    time_t timeval = time(NULL);

-    ofs << "# Options file generated at: " << ctime(&timeval)

-        << "updater  = \'" << shared::double_quote(updatername) << "\'"

-        << std::endl

-        << "firmware = \'" << shared::double_quote(firmarename) << "\'"

-        << std::endl

-        << "offset   = " << (offset_pa - sizeof(dword)) << std::endl

-        << "size     = " << archive_size << std::endl

-        << "key      = \'" << key << "\'" << std::endl;

-

-    return 0;

-}

-

-int main(int argc, char* argv[])

-{

-    try

-    {

-        return process_arguments(argc, argv);

-    }

-    catch (const std::exception& xcpt)

-    {

-        std::cerr << "Exception caught: " << xcpt.what() << std::endl;

-        return -1;

-    }

-    catch (...)

-    {

-        std::cerr << "Unknown exception caught." << std::endl;

-        return -2;

-    }

-    return -3;

-}

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <iostream>
+#include <iomanip>
+#include <ctime>
+#include <getpot/getpot.hpp>
+#include <file.h>
+#include <updater.h>
+#include <utils.h>
+
+
+static const char VERSION[] = "0.1";
+
+void print_version()
+{
+    std::cout
+        << "update_extract - Extracts a Creative firmware from an updater"
+           " executable." << std::endl
+        << "Version " << VERSION << std::endl
+        << "Copyright (c) 2007 Rasmus Ry" << std::endl;
+}
+
+void print_help()
+{
+    print_version();
+    std::cout << std::endl
+        << "Usage: update_extract [command] [options]" << std::endl
+        << std::endl
+        << " Commands:" << std::endl
+        << "  -h,--help" << std::endl
+        << "      prints this message." << std::endl
+        << "  -u,--updater [file]" << std::endl
+        << "      specifies the updater executable." << std::endl
+        << std::endl
+        << " Options:" << std::endl
+        << "  -V,--verbose" << std::endl
+        << "      prints verbose messages." << std::endl
+        << "  -f,--firmware [file]" << std::endl
+        << "      specifies the firmware arhive file name." << std::endl
+        << "  -k,--key [key]" << std::endl
+        << "      specifies the firmware archive key." << std::endl
+        << "  -o,--offset [offset]" << std::endl
+        << "      specifies the firmware archive offset in c-style"
+           " hexadecimal." << std::endl
+        << std::endl
+        ;
+}
+
+std::string options_name(const std::string& name)
+{
+    return shared::replace_extension(name, ".opt");
+}
+
+std::string default_firmware_name(const std::string& name)
+{
+    return shared::replace_extension(name, "_rk.bin");
+}
+
+int process_arguments(int argc, char* argv[])
+{
+    //--------------------------------------------------------------------
+    // Parse input variables.
+    //--------------------------------------------------------------------
+
+    GetPot cl(argc, argv);
+    if (cl.size() == 1 || cl.search(2, "-h", "--help"))
+    {
+        print_help();
+        return 1;
+    }
+
+    std::string updatername;
+    if (cl.search("-u") || cl.search("--updater"))
+        updatername = cl.next("");
+    if (updatername.empty())
+    {
+        std::cerr << "Updater executable must be specified." << std::endl;
+        return 2;
+    }
+
+    std::string firmarename = default_firmware_name(updatername);
+    if (cl.search("-f") || cl.search("--firmware"))
+        firmarename = cl.next(firmarename.c_str());
+
+    bool verbose = false;
+    if (cl.search("-V") || cl.search("--verbose"))
+        verbose = true;
+
+    // Get or find the firmware archive key.
+    std::string key;
+    if (cl.search("-k") || cl.search("--key"))
+        key = cl.next("");
+
+    if (key.empty())
+    {
+        if (verbose)
+            std::cout << "[*] Looking for firmware archive key..."
+                      << std::endl;
+        shared::bytes buffer;
+        if (!shared::read_file(updatername, buffer))
+        {
+            std::cerr << "Failed to read the firmware updater executable."
+                      << std::endl;
+            return 3;
+        }
+        key = zen::find_firmware_key(&buffer[0], buffer.size());
+        if (key.empty())
+        {
+            std::cerr << "Failed to find the firmware archive key."
+                      << std::endl;
+            return 4;
+        }
+    }
+
+    // Get or find the firmware archive offset.
+    std::string offset;
+    dword offset_pa = 0;
+    if (cl.search("-o") || cl.search("--ofset"))
+        offset = cl.next("");
+
+    if (offset.empty())
+    {
+        if (verbose)
+            std::cout << "[*] Looking for firmware archive offset..."
+                      << std::endl;
+
+        dword offset_va = 0;
+        if (!zen::find_firmware_archive(updatername, offset_va, offset_pa))
+        {
+            std::cerr << "Failed to find the firmware archive offset."
+                      << std::endl;
+            return 5;
+        }
+    }
+    else
+    {
+        int offset_val;
+        if (!sscanf(offset.c_str(), "0x%x", &offset_val))
+        {
+            if (!sscanf(offset.c_str(), "0x%X", &offset_val))
+            {
+                std::cerr << "\'" << offset
+                    << "\' is not a valid c-style hexadecimal value."
+                    << std::endl;
+                return 6;
+            }
+        }
+        offset_pa = static_cast<dword>(offset_val);
+    }
+
+    // Read firmware archive size.
+    shared::bytes buffer;
+    if (!shared::read_file(updatername, buffer, offset_pa, sizeof(dword)))
+    {
+        std::cerr << "Failed to read the firmware archive size." << std::endl;
+        return 7;
+    }
+    dword archive_size = *(dword*)&buffer[0];
+
+    if (verbose)
+    {
+        std::cout << "[*] Printing input variables..." << std::endl;
+        std::cout << "    Updater executable:  " << updatername << std::endl;
+        std::cout << "    Firmware archive:    " << firmarename << std::endl;
+        std::cout << "      Key:               " << key << std::endl;
+        std::cout << "      Offset:            "
+                  << std::hex << std::showbase << std::setw(10)
+                  << std::setfill('0') << std::internal
+                  << offset_pa << std::endl;
+        std::cout << "      Size:              "
+                  << std::hex << std::showbase << std::setw(10)
+                  << std::setfill('0') << std::internal
+                  << archive_size << std::endl;
+    }
+
+
+    //--------------------------------------------------------------------
+    // Extract the firmware archive from the updater.
+    //--------------------------------------------------------------------
+
+    if (verbose)
+        std::cout << "[*] Reading firmware archive..." << std::endl;
+
+    // Read the firmware archive.
+    offset_pa += sizeof(dword);
+    if (!shared::read_file(updatername, buffer, offset_pa, archive_size))
+    {
+        std::cerr << "Failed to read the firmware archive." << std::endl;
+        return 8;
+    }
+
+    if (verbose)
+        std::cout << "[*] Decrypting firmware archive..." << std::endl;
+
+    // Decrypt the firmware archive.
+    if (!zen::crypt_firmware(key.c_str(), &buffer[0], buffer.size()))
+    {
+        std::cerr << "Failed to decrypt the firmware archive." << std::endl;
+        return 9;
+    }
+
+    if (verbose)
+        std::cout << "[*] Decompressing firmware archive..." << std::endl;
+
+    // Inflate the firmware archive to the output file.
+    if (!shared::inflate_to_file(buffer, firmarename.c_str()))
+    {
+        std::cerr << "Failed to decompress the firmware archive." << std::endl;
+        return 10;
+    }
+
+
+    //--------------------------------------------------------------------
+    // Generate an options file for the extracted firmware archive.
+    //--------------------------------------------------------------------
+
+    // Get options filename for the given input file.
+    std::string optionsname = options_name(updatername);
+
+    if (verbose)
+        std::cout << "[*] Producing options file..." << std::endl;
+
+    // Produce options file for the given input file.
+    std::ofstream ofs;
+    ofs.open(optionsname.c_str(), std::ios::binary);
+    if (!ofs)
+    {
+        std::cerr << "Failed to create firmware archive options file."
+                  << std::endl;
+        return 11;
+    }
+
+    time_t timeval = time(NULL);
+    ofs << "# Options file generated at: " << ctime(&timeval)
+        << "updater  = \'" << shared::double_quote(updatername) << "\'"
+        << std::endl
+        << "firmware = \'" << shared::double_quote(firmarename) << "\'"
+        << std::endl
+        << "offset   = " << (offset_pa - sizeof(dword)) << std::endl
+        << "size     = " << archive_size << std::endl
+        << "key      = \'" << key << "\'" << std::endl;
+
+    return 0;
+}
+
+int main(int argc, char* argv[])
+{
+    try
+    {
+        return process_arguments(argc, argv);
+    }
+    catch (const std::exception& xcpt)
+    {
+        std::cerr << "Exception caught: " << xcpt.what() << std::endl;
+        return -1;
+    }
+    catch (...)
+    {
+        std::cerr << "Unknown exception caught." << std::endl;
+        return -2;
+    }
+    return -3;
+}
diff --git a/utils/zenutils/source/update_patch/CMakeLists.txt b/utils/zenutils/source/update_patch/CMakeLists.txt
index 11474b7ff8..7b509dc40d 100755..100644
--- a/utils/zenutils/source/update_patch/CMakeLists.txt
+++ b/utils/zenutils/source/update_patch/CMakeLists.txt
@@ -1,3 +1,3 @@
-ADD_EXECUTABLE(update_patch main.cpp)

-

-TARGET_LINK_LIBRARIES (update_patch shared)

+ADD_EXECUTABLE(update_patch main.cpp)
+
+TARGET_LINK_LIBRARIES (update_patch shared)
diff --git a/utils/zenutils/source/update_patch/main.cpp b/utils/zenutils/source/update_patch/main.cpp
index d48797b46d..5467694728 100755..100644
--- a/utils/zenutils/source/update_patch/main.cpp
+++ b/utils/zenutils/source/update_patch/main.cpp
@@ -1,409 +1,409 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#include <iostream>

-#include <iomanip>

-#include <cstdio>

-#include <getpot/getpot.hpp>

-#include <file.h>

-#include <updater.h>

-#include <utils.h>

-#include <pe.h>

-

-

-static const char VERSION[] = "0.1";

-

-void print_version()

-{

-    std::cout

-        << "update_patch - Patches a Creative firmware into an updater"

-           " executable." << std::endl

-        << "Version " << VERSION << std::endl

-        << "Copyright (c) 2007 Rasmus Ry" << std::endl;

-}

-

-void print_help()

-{

-    print_version();

-    std::cout << std::endl

-        << "Usage: update_patch [command] [options]" << std::endl

-        << std::endl

-        << " Commands:" << std::endl

-        << "  -h,--help" << std::endl

-        << "      prints this message." << std::endl

-        << "  -u,--updater [file]" << std::endl

-        << "      specifies the updater executable." << std::endl

-        << std::endl

-        << " Options:" << std::endl

-        << "  -V,--verbose" << std::endl

-        << "      prints verbose messages." << std::endl

-        << "  -f,--firmware [file]" << std::endl

-        << "      specifies the firmware arhive file name." << std::endl

-        << "  -k,--key [key]" << std::endl

-        << "      specifies the firmware archive key." << std::endl

-        << "  -o,--offset [offset]" << std::endl

-        << "      specifies the firmware archive offset in c-style"

-           " hexadecimal." << std::endl

-        << std::endl

-        ;

-}

-

-std::string options_name(const std::string& name)

-{

-    return shared::replace_extension(name, ".opt");

-}

-

-std::string default_firmware_name(const std::string& name)

-{

-    return shared::replace_extension(name, "_rk.bin");

-}

-

-int process_arguments(int argc, char* argv[])

-{

-    //--------------------------------------------------------------------

-    // Parse input variables.

-    //--------------------------------------------------------------------

-

-    GetPot cl(argc, argv);

-    if (cl.size() == 1 || cl.search(2, "-h", "--help"))

-    {

-        print_help();

-        return 1;

-    }

-

-    std::string updatername;

-    if (cl.search("-u") || cl.search("--updater"))

-        updatername = cl.next("");

-    if (updatername.empty())

-    {

-        std::cerr << "Updater executable must be specified." << std::endl;

-        return 2;

-    }

-

-    bool verbose = false;

-    if (cl.search("-V") || cl.search("--verbose"))

-        verbose = true;

-

-    if (verbose)

-        std::cout << "[*] Parsing options file..." << std::endl;

-

-    GetPot optfile(options_name(updatername.c_str()).c_str());

-    if (verbose)

-        optfile.print();

-

-    std::string firmwarename = optfile("firmware",

-        default_firmware_name(updatername).c_str());

-    dword offset_pa = optfile("offset", 0);

-    dword size = optfile("size", 0);

-    std::string key = optfile("key", "");

-

-    if (cl.search("-f") || cl.search("--firmware"))

-        firmwarename = cl.next(firmwarename.c_str());

-

-    std::string offset;

-    if (cl.search("-o") || cl.search("--offset"))

-        offset = cl.next("");

-

-    if (offset.empty() && !offset_pa)

-    {

-        if (verbose)

-            std::cout << "[*] Looking for firmware archive offset..."

-                      << std::endl;

-

-        dword offset_va = 0;

-        if (!zen::find_firmware_archive(updatername, offset_va, offset_pa))

-        {

-            std::cerr << "Failed to find the firmware archive offset."

-                      << std::endl;

-            return 3;

-        }

-    }

-    else if (!offset_pa)

-    {

-        int offset_val;

-        if (!sscanf(offset.c_str(), "0x%x", &offset_val))

-        {

-            if (!sscanf(offset.c_str(), "0x%X", &offset_val))

-            {

-                std::cerr << "\'" << offset

-                    << "\' is not a valid c-style hexadecimal value."

-                    << std::endl;

-                return 4;

-            }

-        }

-        offset_pa = static_cast<dword>(offset_val);

-    }

-

-    if (key.empty())

-    {

-        if (verbose)

-            std::cout << "[*] Looking for firmware archive key..."

-                      << std::endl;

-        shared::bytes buffer;

-        if (!shared::read_file(updatername, buffer))

-        {

-            std::cerr << "Failed to read the firmware updater executable."

-                      << std::endl;

-            return 5;

-        }

-        key = zen::find_firmware_key(&buffer[0], buffer.size());

-        if (key.empty())

-        {

-            std::cerr << "Failed to find the firmware archive key."

-                      << std::endl;

-            return 6;

-        }

-    }

-

-    if (verbose)

-    {

-        std::cout << "[*] Printing input variables..." << std::endl;

-        std::cout << "    Updater executable:  " << updatername << std::endl;

-        std::cout << "    Firmware archive:    " << firmwarename << std::endl;

-        std::cout << "      Key:               " << key << std::endl;

-        std::cout << "      Offset:            "

-                  << std::hex << std::showbase << std::setw(10)

-                  << std::setfill('0') << std::internal

-                  << offset_pa << std::endl;

-        std::cout << "      Size:              "

-                  << std::hex << std::showbase << std::setw(10)

-                  << std::setfill('0') << std::internal

-                  << size << std::endl;

-    }

-

-

-    //--------------------------------------------------------------------

-    // Prepare the firmware archive for being patched into the updater.

-    //--------------------------------------------------------------------

-

-    if (verbose)

-        std::cout << "[*] Reading firmware archive..." << std::endl;

-

-    shared::bytes buffer;

-    if (!shared::read_file(firmwarename, buffer))

-    {

-        std::cerr << "Failed to read the firmware archive." << std::endl;

-        return 7;

-    }

-

-    if (verbose)

-        std::cout << "    Bytes read:          "

-                  << std::hex << std::showbase << std::setw(10)

-                  << std::setfill('0') << std::internal

-                  << buffer.size() << std::endl;

-

-    if (verbose)

-        std::cout << "[*] Compressing firmware archive..." << std::endl;

-

-    std::string compfirmware = shared::replace_extension(firmwarename, ".def");

-    if (!shared::deflate_to_file(buffer, compfirmware.c_str()))

-    {

-        std::cerr << "Failed to compress the firmware archive." << std::endl;

-        return 8;

-    }

-

-    if (verbose)

-        std::cout << "[*] Reading compressed firmware archive..." << std::endl;

-

-    if (!shared::read_file(compfirmware, buffer))

-    {

-        std::cerr << "Failed to read the compressed firmware archive."

-                  << std::endl;

-        return 9;

-    }

-

-    if (verbose)

-        std::cout << "    Bytes read:          "

-                  << std::hex << std::showbase << std::setw(10)

-                  << std::setfill('0') << std::internal

-                  << buffer.size() << std::endl;

-

-    // Delete the temporary firmware file.

-    std::remove(compfirmware.c_str());

-

-    if (verbose)

-        std::cout << "[*] Encrypting compressed firmware archive..."

-                  << std::endl;

-

-    if (!zen::crypt_firmware(key.c_str(), &buffer[0], buffer.size()))

-    {

-        std::cerr << "Failed to encrypt the compressed firmware archive."

-                  << std::endl;

-        return 10;

-    }

-

-

-    //--------------------------------------------------------------------

-    // Backup the updater and patch the firmware archive into it.

-    //--------------------------------------------------------------------

-

-    if (verbose)

-        std::cout << "[*] Backing up the updater executable..." << std::endl;

-

-    if (!shared::backup_file(updatername))

-    {

-        std::cerr << "Failed to backup the updater executable." << std::endl;

-        return 11;

-    }

-

-    // Is there enough space within the existing firmware archive

-    //  to hold the new one?

-    if (size < buffer.size())

-    {

-        // No, we need to add a new section to hold the new firmware archive.

-        if (verbose)

-            std::cout << "[*] Adding new section to the updater executable..."

-                      << std::endl;

-

-        // Construct a new buffer with the archive size prepended.

-        shared::bytes newbuffer(buffer.size() + sizeof(dword));

-        *(dword*)&newbuffer[0] = static_cast<dword>(buffer.size());

-        std::copy(buffer.begin(), buffer.end(), &newbuffer[4]);

-

-        // Read the updater portable executable.

-        shared::pe_file pef;

-        if (!pef.read(updatername))

-        {

-            std::cerr << "Failed to read the updater portable executable"

-                         " structure." << std::endl;

-            return 12;

-        }

-

-        // Add a new section to the updater, containing the encrypted

-        //  firmware archive.

-        shared::section_info newsection;

-        if (!pef.add_section(".firm", newbuffer, newsection))

-        {

-            std::cerr << "Failed to add an extra section to the updater"

-                         " executable." << std::endl;

-            return 13;

-        }

-

-        if (verbose)

-            std::cout << "[*] Relocating code references to the firmware"

-                         " archive..." << std::endl;

-

-        // Locate the code section.

-        shared::section_info textsection;

-        if (!pef.find_section(".text", textsection))

-        {

-            std::cerr << "Failed to find the code section in the updater"

-                         " executable." << std::endl;

-            return 14;

-        }

-

-        // Read the code section data.

-        if (!shared::read_file(updatername, buffer, textsection.raw_address,

-                               textsection.raw_size))

-        {

-            std::cerr << "Failed to read the code section from the updater"

-                         " executable." << std::endl;

-            return 15;

-        }

-

-        // Determine the addresses of the new and old firmware archives.

-        dword oldva = pef.pa_to_va(offset_pa);

-        dword newva = pef.pa_to_va(newsection.raw_address);

-        if (!oldva || !newva)

-        {

-            std::cerr << "Failed to compute address of the new or old"

-                         " archive." << std::endl;

-            return 16;

-        }

-

-        // Relocate references to the old firmware archive.

-        dword imgbase = pef.get_image_base();

-        for (int i = 0, j = buffer.size() - sizeof(dword) + 1; i < j; i++)

-        {

-            dword val = *(dword*)&buffer[i];

-            if (val >= oldva && val <= (oldva + 3))

-            {

-                *(dword*)&buffer[i] = newva + (val - oldva);

-                if (verbose)

-                    std::cout << "    "

-                              << std::hex << std::showbase << std::setw(10)

-                              << std::setfill('0') << std::internal

-                              << (imgbase + textsection.virtual_address + i)

-                              << ": "

-                              << std::hex << std::showbase << std::setw(10)

-                              << std::setfill('0') << std::internal

-                              << val

-                              << " -> "

-                              << std::hex << std::showbase << std::setw(10)

-                              << std::setfill('0') << std::internal

-                              << (newva + (val - oldva)) << std::endl;

-            }

-        }

-

-        // Write the relocated code section data.

-        if (!shared::write_file(updatername, buffer, false, textsection.raw_address,

-                                buffer.size()))

-        {

-            std::cerr << "Failed to write the relocated code section to the"

-                         " updater executable." << std::endl;

-            return 17;

-        }

-    } //if (size < buffer.size())

-    else

-    {

-        // Yes, overwrite the existing firmware archive.

-        if (verbose)

-            std::cout << "[*] Overwriting existing firmware archive..."

-                      << std::endl;

-

-        shared::bytes archive_size(sizeof(dword));

-        *(dword*)&archive_size[0] = buffer.size();

-

-        if (!shared::write_file(updatername, archive_size, false, offset_pa,

-                                archive_size.size()))

-        {

-            std::cerr << "Failed to write archive size to the updater"

-                         " executable." << std::endl;

-            return 18;

-        }

-

-        if (!shared::write_file(updatername, buffer, false,

-                                offset_pa+archive_size.size(), buffer.size()))

-        {

-            std::cerr << "Failed to write the new archive to the updater"

-                         " exectuable." << std::endl;

-            return 19;

-        }

-    }

-

-    return 0;

-}

-

-int main(int argc, char* argv[])

-{

-    try

-    {

-        return process_arguments(argc, argv);

-    }

-    catch (const std::exception& xcpt)

-    {

-        std::cerr << "Exception caught: " << xcpt.what() << std::endl;

-        return -1;

-    }

-    catch (...)

-    {

-        std::cerr << "Unknown exception caught." << std::endl;

-        return -2;

-    }

-    return -3;

-}

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <iostream>
+#include <iomanip>
+#include <cstdio>
+#include <getpot/getpot.hpp>
+#include <file.h>
+#include <updater.h>
+#include <utils.h>
+#include <pe.h>
+
+
+static const char VERSION[] = "0.1";
+
+void print_version()
+{
+    std::cout
+        << "update_patch - Patches a Creative firmware into an updater"
+           " executable." << std::endl
+        << "Version " << VERSION << std::endl
+        << "Copyright (c) 2007 Rasmus Ry" << std::endl;
+}
+
+void print_help()
+{
+    print_version();
+    std::cout << std::endl
+        << "Usage: update_patch [command] [options]" << std::endl
+        << std::endl
+        << " Commands:" << std::endl
+        << "  -h,--help" << std::endl
+        << "      prints this message." << std::endl
+        << "  -u,--updater [file]" << std::endl
+        << "      specifies the updater executable." << std::endl
+        << std::endl
+        << " Options:" << std::endl
+        << "  -V,--verbose" << std::endl
+        << "      prints verbose messages." << std::endl
+        << "  -f,--firmware [file]" << std::endl
+        << "      specifies the firmware arhive file name." << std::endl
+        << "  -k,--key [key]" << std::endl
+        << "      specifies the firmware archive key." << std::endl
+        << "  -o,--offset [offset]" << std::endl
+        << "      specifies the firmware archive offset in c-style"
+           " hexadecimal." << std::endl
+        << std::endl
+        ;
+}
+
+std::string options_name(const std::string& name)
+{
+    return shared::replace_extension(name, ".opt");
+}
+
+std::string default_firmware_name(const std::string& name)
+{
+    return shared::replace_extension(name, "_rk.bin");
+}
+
+int process_arguments(int argc, char* argv[])
+{
+    //--------------------------------------------------------------------
+    // Parse input variables.
+    //--------------------------------------------------------------------
+
+    GetPot cl(argc, argv);
+    if (cl.size() == 1 || cl.search(2, "-h", "--help"))
+    {
+        print_help();
+        return 1;
+    }
+
+    std::string updatername;
+    if (cl.search("-u") || cl.search("--updater"))
+        updatername = cl.next("");
+    if (updatername.empty())
+    {
+        std::cerr << "Updater executable must be specified." << std::endl;
+        return 2;
+    }
+
+    bool verbose = false;
+    if (cl.search("-V") || cl.search("--verbose"))
+        verbose = true;
+
+    if (verbose)
+        std::cout << "[*] Parsing options file..." << std::endl;
+
+    GetPot optfile(options_name(updatername.c_str()).c_str());
+    if (verbose)
+        optfile.print();
+
+    std::string firmwarename = optfile("firmware",
+        default_firmware_name(updatername).c_str());
+    dword offset_pa = optfile("offset", 0);
+    dword size = optfile("size", 0);
+    std::string key = optfile("key", "");
+
+    if (cl.search("-f") || cl.search("--firmware"))
+        firmwarename = cl.next(firmwarename.c_str());
+
+    std::string offset;
+    if (cl.search("-o") || cl.search("--offset"))
+        offset = cl.next("");
+
+    if (offset.empty() && !offset_pa)
+    {
+        if (verbose)
+            std::cout << "[*] Looking for firmware archive offset..."
+                      << std::endl;
+
+        dword offset_va = 0;
+        if (!zen::find_firmware_archive(updatername, offset_va, offset_pa))
+        {
+            std::cerr << "Failed to find the firmware archive offset."
+                      << std::endl;
+            return 3;
+        }
+    }
+    else if (!offset_pa)
+    {
+        int offset_val;
+        if (!sscanf(offset.c_str(), "0x%x", &offset_val))
+        {
+            if (!sscanf(offset.c_str(), "0x%X", &offset_val))
+            {
+                std::cerr << "\'" << offset
+                    << "\' is not a valid c-style hexadecimal value."
+                    << std::endl;
+                return 4;
+            }
+        }
+        offset_pa = static_cast<dword>(offset_val);
+    }
+
+    if (key.empty())
+    {
+        if (verbose)
+            std::cout << "[*] Looking for firmware archive key..."
+                      << std::endl;
+        shared::bytes buffer;
+        if (!shared::read_file(updatername, buffer))
+        {
+            std::cerr << "Failed to read the firmware updater executable."
+                      << std::endl;
+            return 5;
+        }
+        key = zen::find_firmware_key(&buffer[0], buffer.size());
+        if (key.empty())
+        {
+            std::cerr << "Failed to find the firmware archive key."
+                      << std::endl;
+            return 6;
+        }
+    }
+
+    if (verbose)
+    {
+        std::cout << "[*] Printing input variables..." << std::endl;
+        std::cout << "    Updater executable:  " << updatername << std::endl;
+        std::cout << "    Firmware archive:    " << firmwarename << std::endl;
+        std::cout << "      Key:               " << key << std::endl;
+        std::cout << "      Offset:            "
+                  << std::hex << std::showbase << std::setw(10)
+                  << std::setfill('0') << std::internal
+                  << offset_pa << std::endl;
+        std::cout << "      Size:              "
+                  << std::hex << std::showbase << std::setw(10)
+                  << std::setfill('0') << std::internal
+                  << size << std::endl;
+    }
+
+
+    //--------------------------------------------------------------------
+    // Prepare the firmware archive for being patched into the updater.
+    //--------------------------------------------------------------------
+
+    if (verbose)
+        std::cout << "[*] Reading firmware archive..." << std::endl;
+
+    shared::bytes buffer;
+    if (!shared::read_file(firmwarename, buffer))
+    {
+        std::cerr << "Failed to read the firmware archive." << std::endl;
+        return 7;
+    }
+
+    if (verbose)
+        std::cout << "    Bytes read:          "
+                  << std::hex << std::showbase << std::setw(10)
+                  << std::setfill('0') << std::internal
+                  << buffer.size() << std::endl;
+
+    if (verbose)
+        std::cout << "[*] Compressing firmware archive..." << std::endl;
+
+    std::string compfirmware = shared::replace_extension(firmwarename, ".def");
+    if (!shared::deflate_to_file(buffer, compfirmware.c_str()))
+    {
+        std::cerr << "Failed to compress the firmware archive." << std::endl;
+        return 8;
+    }
+
+    if (verbose)
+        std::cout << "[*] Reading compressed firmware archive..." << std::endl;
+
+    if (!shared::read_file(compfirmware, buffer))
+    {
+        std::cerr << "Failed to read the compressed firmware archive."
+                  << std::endl;
+        return 9;
+    }
+
+    if (verbose)
+        std::cout << "    Bytes read:          "
+                  << std::hex << std::showbase << std::setw(10)
+                  << std::setfill('0') << std::internal
+                  << buffer.size() << std::endl;
+
+    // Delete the temporary firmware file.
+    std::remove(compfirmware.c_str());
+
+    if (verbose)
+        std::cout << "[*] Encrypting compressed firmware archive..."
+                  << std::endl;
+
+    if (!zen::crypt_firmware(key.c_str(), &buffer[0], buffer.size()))
+    {
+        std::cerr << "Failed to encrypt the compressed firmware archive."
+                  << std::endl;
+        return 10;
+    }
+
+
+    //--------------------------------------------------------------------
+    // Backup the updater and patch the firmware archive into it.
+    //--------------------------------------------------------------------
+
+    if (verbose)
+        std::cout << "[*] Backing up the updater executable..." << std::endl;
+
+    if (!shared::backup_file(updatername))
+    {
+        std::cerr << "Failed to backup the updater executable." << std::endl;
+        return 11;
+    }
+
+    // Is there enough space within the existing firmware archive
+    //  to hold the new one?
+    if (size < buffer.size())
+    {
+        // No, we need to add a new section to hold the new firmware archive.
+        if (verbose)
+            std::cout << "[*] Adding new section to the updater executable..."
+                      << std::endl;
+
+        // Construct a new buffer with the archive size prepended.
+        shared::bytes newbuffer(buffer.size() + sizeof(dword));
+        *(dword*)&newbuffer[0] = static_cast<dword>(buffer.size());
+        std::copy(buffer.begin(), buffer.end(), &newbuffer[4]);
+
+        // Read the updater portable executable.
+        shared::pe_file pef;
+        if (!pef.read(updatername))
+        {
+            std::cerr << "Failed to read the updater portable executable"
+                         " structure." << std::endl;
+            return 12;
+        }
+
+        // Add a new section to the updater, containing the encrypted
+        //  firmware archive.
+        shared::section_info newsection;
+        if (!pef.add_section(".firm", newbuffer, newsection))
+        {
+            std::cerr << "Failed to add an extra section to the updater"
+                         " executable." << std::endl;
+            return 13;
+        }
+
+        if (verbose)
+            std::cout << "[*] Relocating code references to the firmware"
+                         " archive..." << std::endl;
+
+        // Locate the code section.
+        shared::section_info textsection;
+        if (!pef.find_section(".text", textsection))
+        {
+            std::cerr << "Failed to find the code section in the updater"
+                         " executable." << std::endl;
+            return 14;
+        }
+
+        // Read the code section data.
+        if (!shared::read_file(updatername, buffer, textsection.raw_address,
+                               textsection.raw_size))
+        {
+            std::cerr << "Failed to read the code section from the updater"
+                         " executable." << std::endl;
+            return 15;
+        }
+
+        // Determine the addresses of the new and old firmware archives.
+        dword oldva = pef.pa_to_va(offset_pa);
+        dword newva = pef.pa_to_va(newsection.raw_address);
+        if (!oldva || !newva)
+        {
+            std::cerr << "Failed to compute address of the new or old"
+                         " archive." << std::endl;
+            return 16;
+        }
+
+        // Relocate references to the old firmware archive.
+        dword imgbase = pef.get_image_base();
+        for (int i = 0, j = buffer.size() - sizeof(dword) + 1; i < j; i++)
+        {
+            dword val = *(dword*)&buffer[i];
+            if (val >= oldva && val <= (oldva + 3))
+            {
+                *(dword*)&buffer[i] = newva + (val - oldva);
+                if (verbose)
+                    std::cout << "    "
+                              << std::hex << std::showbase << std::setw(10)
+                              << std::setfill('0') << std::internal
+                              << (imgbase + textsection.virtual_address + i)
+                              << ": "
+                              << std::hex << std::showbase << std::setw(10)
+                              << std::setfill('0') << std::internal
+                              << val
+                              << " -> "
+                              << std::hex << std::showbase << std::setw(10)
+                              << std::setfill('0') << std::internal
+                              << (newva + (val - oldva)) << std::endl;
+            }
+        }
+
+        // Write the relocated code section data.
+        if (!shared::write_file(updatername, buffer, false, textsection.raw_address,
+                                buffer.size()))
+        {
+            std::cerr << "Failed to write the relocated code section to the"
+                         " updater executable." << std::endl;
+            return 17;
+        }
+    } //if (size < buffer.size())
+    else
+    {
+        // Yes, overwrite the existing firmware archive.
+        if (verbose)
+            std::cout << "[*] Overwriting existing firmware archive..."
+                      << std::endl;
+
+        shared::bytes archive_size(sizeof(dword));
+        *(dword*)&archive_size[0] = buffer.size();
+
+        if (!shared::write_file(updatername, archive_size, false, offset_pa,
+                                archive_size.size()))
+        {
+            std::cerr << "Failed to write archive size to the updater"
+                         " executable." << std::endl;
+            return 18;
+        }
+
+        if (!shared::write_file(updatername, buffer, false,
+                                offset_pa+archive_size.size(), buffer.size()))
+        {
+            std::cerr << "Failed to write the new archive to the updater"
+                         " exectuable." << std::endl;
+            return 19;
+        }
+    }
+
+    return 0;
+}
+
+int main(int argc, char* argv[])
+{
+    try
+    {
+        return process_arguments(argc, argv);
+    }
+    catch (const std::exception& xcpt)
+    {
+        std::cerr << "Exception caught: " << xcpt.what() << std::endl;
+        return -1;
+    }
+    catch (...)
+    {
+        std::cerr << "Unknown exception caught." << std::endl;
+        return -2;
+    }
+    return -3;
+}
diff --git a/utils/zenutils/source/zen_crypt/CMakeLists.txt b/utils/zenutils/source/zen_crypt/CMakeLists.txt
index e88e8951a5..5721bbfa06 100755..100644
--- a/utils/zenutils/source/zen_crypt/CMakeLists.txt
+++ b/utils/zenutils/source/zen_crypt/CMakeLists.txt
@@ -1,4 +1,4 @@
-ADD_EXECUTABLE(zen_crypt main.cpp)

-

-TARGET_LINK_LIBRARIES(zen_crypt shared)

-TARGET_LINK_LIBRARIES(zen_crypt beecrypt)

+ADD_EXECUTABLE(zen_crypt main.cpp)
+
+TARGET_LINK_LIBRARIES(zen_crypt shared)
+TARGET_LINK_LIBRARIES(zen_crypt beecrypt)
diff --git a/utils/zenutils/source/zen_crypt/main.cpp b/utils/zenutils/source/zen_crypt/main.cpp
index 8301cbbea5..9944ba97f8 100755..100644
--- a/utils/zenutils/source/zen_crypt/main.cpp
+++ b/utils/zenutils/source/zen_crypt/main.cpp
@@ -1,687 +1,687 @@
-/* zenutils - Utilities for working with creative firmwares.

- * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#include <iostream>

-#include <getpot/getpot.hpp>

-#include <cenc.h>

-#include <crypt.h>

-#include <file.h>

-#include <firmware.h>

-#include <utils.h>

-

-

-namespace {

-enum command_t

-{

-    cmd_none = 0,

-    cmd_sign,

-    cmd_verify,

-    cmd_encrypt,

-    cmd_decrypt

-};

-

-enum mode_t

-{

-    mode_none = 0,

-    mode_cenc,

-    mode_fresc,

-    mode_tl

-};

-

-struct player_info_t

-{

-    const char* name;

-    const char* null_key;  // HMAC-SHA1 key

-    const char* fresc_key; // BlowFish key

-    const char* tl_key;    // BlowFish key

-    bool big_endian;

-};

-}; //namespace

-

-

-static const char VERSION[] = "0.1";

-

-static const char null_key_v1[]  = "CTL:N0MAD|PDE0.SIGN.";

-static const char null_key_v2[]  = "CTL:N0MAD|PDE0.DPMP.";

-

-static const char fresc_key[]    = "Copyright (C) CTL. -"

-                                   " zN0MAD iz v~p0wderful!";

-

-static const char tl_zvm_key[]   = "1sN0TM3D az u~may th1nk*"

-                                   "Creative Zen Vision:M";

-static const char tl_zvw_key[]   = "1sN0TM3D az u~may th1nk*"

-                                   "Creative ZEN Vision W";

-static const char tl_zm_key[]    = "1sN0TM3D az u~may th1nk*"

-                                   "Creative Zen Micro";

-static const char tl_zmp_key[]   = "1sN0TM3D az u~may th1nk*"

-                                   "Creative Zen MicroPhoto";

-static const char tl_zs_key[]    = "1sN0TM3D az u~may th1nk*"

-                                   "Creative Zen Sleek";

-static const char tl_zsp_key[]   = "1sN0TM3D az u~may th1nk*"

-                                   "Creative Zen Sleek Photo";

-static const char tl_zt_key[]    = "1sN0TM3D az u~may th1nk*"

-                                   "Creative Zen Touch";

-static const char tl_zx_key[]    = "1sN0TM3D az u~may th1nk*"

-                                   "NOMAD Jukebox Zen Xtra";

-

-player_info_t players[] = {

-    {"Vision:M", null_key_v2, fresc_key, tl_zvm_key, false},

-    {"Vision W", null_key_v2, fresc_key, tl_zvw_key, false},

-    {"Micro", null_key_v1, fresc_key, tl_zm_key, true},

-    {"MicroPhoto", null_key_v1, fresc_key, tl_zmp_key, true},

-    {"Sleek", null_key_v1, fresc_key, tl_zs_key, true},

-    {"SleekPhoto", null_key_v1, fresc_key, tl_zsp_key, true},

-    {"Touch", null_key_v1, fresc_key, tl_zt_key, true},

-    {"Xtra", null_key_v1, fresc_key, tl_zx_key, true},

-    {NULL, NULL, NULL, NULL, false}

-};

-

-

-player_info_t* find_player_info(std::string player)

-{

-    for (int i = 0; players[i].name != NULL; i++)

-    {

-        if (!stricmp(players[i].name, player.c_str()))

-        {

-            return &players[i];

-        }

-    }

-    return NULL;

-}

-

-void print_version()

-{

-    std::cout

-        << "zen_crypt - A utility for encrypting, decrypting or signing"

-           " Creative firmwares." << std::endl

-        << "Version " << VERSION << std::endl

-        << "Copyright (c) 2007 Rasmus Ry" << std::endl;

-}

-

-void print_help()

-{

-    print_version();

-    std::cout << std::endl

-        << "Usage: zen_crypt [command] [options]" << std::endl

-        << std::endl

-        << " Commands:" << std::endl

-        << "  -h,--help" << std::endl

-        << "      prints this message." << std::endl

-        << "  -s,--sign" << std::endl

-        << "      signs a given input file." << std::endl

-        << "  -v,--verify" << std::endl

-        << "      verifies a signed input file." << std::endl

-        << "  -e,--encrypt" << std::endl

-        << "      encrypts a given input file." << std::endl

-        << "  -d,--decrypt" << std::endl

-        << "      decrypts a given input file." << std::endl

-        << std::endl

-        << " Options:" << std::endl

-        << "  -V,--verbose" << std::endl

-        << "      prints verbose messages." << std::endl

-        << "  -b,--big-endian" << std::endl

-        << "      specifies that the input is big-endian, default is"

-           " little-endian." << std::endl

-        << "  -i,--input [file]" << std::endl

-        << "      specifies the input file." << std::endl

-        << "  -o,--output [file]" << std::endl

-        << "      specifies the output file." << std::endl

-        << "  -m,--mode [CENC|FRESC|TL]" << std::endl

-        << "      specifies which algorithm to use." << std::endl

-        << "  -k,--key [player|key]" << std::endl

-        << "      specifies which key to use." << std::endl

-        << std::endl

-        ;

-    std::cout << " Players:" << std::endl;

-    for (int i = 0; players[i].name != NULL; i++)

-    {

-        std::cout << "      " << players[i].name;

-        if (!i)

-            std::cout << " (default)";

-        std::cout << std::endl;

-    }

-}

-

-size_t find_null_signature(shared::bytes& data)

-{

-    size_t index = data.size();

-    if (index < (20 + 8 + 7))

-        return 0;

-    index -= 20 + 8;

-    for (int i = 0; i < 7; i++)

-    {

-        if (*(dword*)&data[index-i] == 'NULL' ||

-            *(dword*)&data[index-i] == 'LLUN')

-        {

-            return index-i;

-        }

-    }

-    return 0;

-}

-

-

-bool sign(shared::bytes& data, player_info_t* pi, const std::string& file,

-          bool verbose)

-{

-    if (verbose)

-        std::cout << "[*] Checking for the presence of an existing"

-                     " NULL signature..." << std::endl;

-    size_t index = find_null_signature(data);

-    if (index)

-    {

-        if (verbose)

-            std::cout << "[*] Found NULL signature at: "

-                      << std::hex << index << std::endl;

-

-        if (verbose)

-            std::cout << "[*] Computing digest..." << std::endl;

-

-        shared::bytes digest(20);

-        if (!zen::hmac_sha1_calc((const byte*)pi->null_key,

-                                 strlen(pi->null_key)+1, &data[0], index,

-                                 &digest[0], NULL))

-        {

-            std::cerr << "Failed to compute digest." << std::endl;

-            return false;

-        }

-

-        if (verbose)

-            std::cout << "[*] Writing file data..." << std::endl;

-

-        if (!shared::write_file(file, data, true))

-        {

-            std::cerr << "Failed to write file data." << std::endl;

-            return false;

-        }

-

-        if (verbose)

-            std::cout << "[*] Writing digest data..." << std::endl;

-

-        if (!shared::write_file(file, digest, false, index+8))

-        {

-            std::cerr << "Failed to write digest data." << std::endl;

-            return false;

-        }

-    }

-    else

-    {

-        if (verbose)

-            std::cout << "[*] Computing digest..." << std::endl;

-

-        shared::bytes signature(20+8);

-        if (!zen::hmac_sha1_calc((const byte*)pi->null_key,

-                                 strlen(pi->null_key)+1, &data[0], data.size(),

-                                 &signature[8], NULL))

-        {

-            std::cerr << "Failed to compute digest." << std::endl;

-            return false;

-        }

-

-

-        zen::firmware_header_t header = {'NULL', 20};

-        if (pi->big_endian)

-        {

-            header.tag = shared::swap(header.tag);

-            header.size = shared::swap(header.size);

-        }

-        memcpy(&signature[0], &header, sizeof(zen::firmware_header_t));

-

-        if (verbose)

-            std::cout << "[*] Writing file data..." << std::endl;

-

-        if (!shared::write_file(file, data, true))

-        {

-            std::cerr << "Failed to write file data." << std::endl;

-            return false;

-        }

-

-        if (verbose)

-            std::cout << "[*] Writing signature data..." << std::endl;

-

-        if (!shared::write_file(file, signature, false, data.size()))

-        {

-            std::cerr << "Failed to write signature data." << std::endl;

-            return false;

-        }

-

-        if (verbose)

-            std::cout << "[*] Ensuring that the file length is"

-                         " 32-bit aligned..." << std::endl;

-

-        int length = data.size() + signature.size();

-        int align = length % 4;

-        if (align)

-        {

-            shared::bytes padding(4 - align, 0);

-            if (!shared::write_file(file, padding, false, length))

-            {

-                std::cerr << "Failed to write padding data." << std::endl;

-                return false;

-            }

-        }

-    }

-

-    return true;

-}

-

-bool verify(shared::bytes& data, player_info_t* pi, bool verbose)

-{

-    if (verbose)

-        std::cout << "[*] Checking for the presence of an existing"

-                     " NULL signature..." << std::endl;

-    size_t index = find_null_signature(data);

-    if (!index)

-    {

-        std::cerr << "No NULL signature present in the input file."

-                  << std::endl;

-        return false;

-    }

-    if (verbose)

-        std::cout << "[*] Found NULL signature at: "

-                  << std::hex << index << std::endl;

-

-    if (verbose)

-        std::cout << "[*] Computing digest..." << std::endl;

-

-    byte digest[20];

-    if (!zen::hmac_sha1_calc((const byte*)pi->null_key, strlen(pi->null_key)+1,

-                             &data[0], index, digest, NULL))

-    {

-        std::cerr << "Failed to compute digest." << std::endl;

-        return false;

-    }

-

-    if (verbose)

-        std::cout << "[*] Verifying NULL signature digest..." << std::endl;

-

-    if (memcmp(&digest[0], &data[index+8], 20))

-    {

-        std::cerr << "The NULL signature contains an incorrect digest."

-                  << std::endl;

-        return false;

-    }

-

-    return true;

-}

-

-bool encrypt(shared::bytes& data, int mode, player_info_t* pi,

-             const std::string& file, bool verbose)

-{

-    if (mode == mode_cenc)

-    {

-        if (verbose)

-            std::cout << "[*] Encoding input file..." << std::endl;

-

-        shared::bytes outbuf(data.size() * 2);

-        int len = zen::cenc_encode(&data[0], data.size(), &outbuf[0], outbuf.size());

-        if (!len)

-        {

-            std::cerr << "Failed to encode the input file." << std::endl;

-            return false;

-        }

-

-        if (verbose)

-            std::cout << "[*] Writing decoded length to file..." << std::endl;

-

-        shared::bytes length(sizeof(dword));

-        *(dword*)&length[0] = pi->big_endian ? shared::swap(data.size()) : data.size();

-        if (!shared::write_file(file, length, true))

-        {

-            std::cerr << "Failed to write the file data." << std::endl;

-            return false;

-        }

-

-        if (verbose)

-            std::cout << "[*] Writing file data..." << std::endl;

-

-        if (!shared::write_file(file, outbuf, sizeof(dword), len))

-        {

-            std::cerr << "Failed to write the file data." << std::endl;

-            return false;

-        }

-    }

-    else if (mode == mode_fresc)

-    {

-        std::cerr << "FRESC mode is not supported." << std::endl;

-        return false;

-    }

-    else if (mode == mode_tl)

-    {

-        if (verbose)

-            std::cout << "[*] Encoding input file..." << std::endl;

-

-        shared::bytes outbuf(data.size() * 2);

-        *(dword*)&outbuf[0] = pi->big_endian ? shared::swap(data.size()) : data.size();

-        int len = zen::cenc_encode(&data[0], data.size(),

-                                  &outbuf[sizeof(dword)],

-                                  outbuf.size()-sizeof(dword));

-        if (!len)

-        {

-            std::cerr << "Failed to encode the input file." << std::endl;

-            return false;

-        }

-        len += sizeof(dword);

-

-        int align = len % 8;

-        align = align ? (8 - align) : 0;

-        len += align;

-

-        if (verbose)

-            std::cout << "[*] Encrypting encoded data..." << std::endl;

-

-        dword iv[2] = {0, shared::swap(len)};

-        if (!zen::bf_cbc_encrypt((const byte*)pi->tl_key, strlen(pi->tl_key)+1,

-                            &outbuf[0], len, (const byte*)iv))

-        {

-            std::cerr << "Failed to decrypt the input file." << std::endl;

-            return false;

-        }

-

-        if (verbose)

-            std::cout << "[*] Writing file data..." << std::endl;

-

-        if (!shared::write_file(file, outbuf, true, 0, len))

-        {

-            std::cerr << "Failed to save the output file." << std::endl;

-            return false;

-        }

-    }

-    else

-    {

-        std::cerr << "Invalid mode specified." << std::endl;

-        return false;

-    }

-

-    return true;

-}

-

-bool decrypt(shared::bytes& data, int mode, player_info_t* pi,

-             const std::string& file, bool verbose)

-{

-    if (mode == mode_cenc)

-    {

-        dword length = *(dword*)&data[0];

-        length = pi->big_endian ? shared::swap(length) : length;

-

-        if (verbose)

-            std::cout << "[*] Decoding input file..." << std::endl;

-

-        shared::bytes outbuf(length);

-        if (!zen::cenc_decode(&data[sizeof(dword)], data.size()-sizeof(dword),

-                              &outbuf[0], length))

-        {

-            std::cerr << "Failed to decode the input file." << std::endl;

-            return false;

-        }

-

-        if (verbose)

-            std::cout << "[*] Writing file data..." << std::endl;

-

-        if (!shared::write_file(file, outbuf, true))

-        {

-            std::cerr << "Failed to write the file data." << std::endl;

-            return false;

-        }

-    }

-    else if (mode == mode_fresc)

-    {

-        if (verbose)

-            std::cout << "[*] Decrypting input file..." << std::endl;

-

-        dword iv[2] = {shared::swap(data.size()), 0};

-        if (!zen::bf_cbc_decrypt((const byte*)pi->fresc_key,

-                                 strlen(pi->fresc_key)+1, &data[0],

-                                 data.size(), (const byte*)iv))

-        {

-            std::cerr << "Failed to decrypt the input file." << std::endl;

-            return false;

-        }

-

-        if (verbose)

-            std::cout << "[*] Writing file data..." << std::endl;

-

-        if (!shared::write_file(file, data, true))

-        {

-            std::cerr << "Failed to save the output file." << std::endl;

-            return false;

-        }

-    }

-    else if (mode == mode_tl)

-    {

-        if (verbose)

-            std::cout << "[*] Decrypting input file..." << std::endl;

-

-        dword iv[2] = {0, shared::swap(data.size())};

-        if (!zen::bf_cbc_decrypt((const byte*)pi->tl_key, strlen(pi->tl_key)+1,

-                            &data[0], data.size(), (const byte*)iv))

-        {

-            std::cerr << "Failed to decrypt the input file." << std::endl;

-            return false;

-        }

-

-        dword length = *(dword*)&data[0];

-        length = pi->big_endian ? shared::swap(length) : length;

-        if (length > (data.size() * 3))

-        {

-            std::cerr << "Decrypted length is unexpectedly large: "

-                      << std::hex << length

-                      << " Check the endian and key settings." << std::endl;

-            return false;

-        }

-

-        if (verbose)

-            std::cout << "[*] Decoding decrypted data..." << std::endl;

-

-        shared::bytes outbuf(length);

-        if (!zen::cenc_decode(&data[sizeof(dword)], data.size()-sizeof(dword),

-                              &outbuf[0], length))

-        {

-            std::cerr << "Failed to decode the input file." << std::endl;

-            return false;

-        }

-

-        if (verbose)

-            std::cout << "[*] Writing file data..." << std::endl;

-

-        if (!shared::write_file(file, outbuf, true))

-        {

-            std::cerr << "Failed to save the output file." << std::endl;

-            return false;

-        }

-    }

-    else

-    {

-        std::cerr << "Invalid mode specified." << std::endl;

-        return false;

-    }

-

-    return true;

-}

-

-int process_arguments(int argc, char*argv[])

-{

-    //--------------------------------------------------------------------

-    // Parse input variables.

-    //--------------------------------------------------------------------

-

-    GetPot cl(argc, argv);

-    if (cl.size() == 1 || cl.search(2, "-h", "--help"))

-    {

-        print_help();

-        return 1;

-    }

-

-    int command = cmd_none;

-    if (cl.search(2, "-s", "--sign"))

-        command = cmd_sign;

-    else if (cl.search(2, "-v", "--verify"))

-        command = cmd_verify;

-    else if (cl.search(2, "-e", "--encrypt"))

-        command = cmd_encrypt;

-    else if (cl.search(2, "-d", "--decrypt"))

-        command = cmd_decrypt;

-

-    if (command == cmd_none)

-    {

-        std::cerr << "No command specified." << std::endl;

-        return 2;

-    }

-

-    int mode = mode_none;

-    if (command == cmd_encrypt || command == cmd_decrypt)

-    {

-        if (!cl.search(2, "-m", "--mode"))

-        {

-            std::cerr << "The specified command requires that"

-                         " a mode is specified."

-                      << std::endl;

-            return 3;

-        }

-        std::string name = cl.next("");

-        if (!name.empty())

-        {

-            if (!stricmp(name.c_str(), "CENC"))

-                mode = mode_cenc;

-            else if (!stricmp(name.c_str(), "FRESC"))

-                mode = mode_fresc;

-            else if (!stricmp(name.c_str(), "TL"))

-                mode = mode_tl;

-        }

-        if (mode == mode_none)

-        {

-            std::cerr << "Invalid mode specified." << std::endl;

-            return 4;

-        }

-    }

-

-    bool verbose = false;

-    if (cl.search(2, "-V", "--verbose"))

-        verbose = true;

-

-    bool big_endian = false;

-    if (cl.search(2, "-b", "--big-endian"))

-        big_endian = true;

-

-    std::string infile;

-    if (cl.search(2, "-i", "--input"))

-        infile = cl.next("");

-    if (infile.empty())

-    {

-        std::cerr << "An input file must be specified." << std::endl;

-        return 5;

-    }

-

-    std::string outfile = infile;

-    if (cl.search(2, "-o", "--output"))

-        outfile = cl.next(outfile.c_str());

-

-    player_info_t* pi = &players[0];

-    std::string key;

-    if (cl.search(2, "-k", "--key"))

-        key = cl.next("");

-    if (!key.empty())

-    {

-        player_info_t* pitmp = find_player_info(key);

-        if (pitmp != NULL)

-            pi = pitmp;

-        else

-        {

-            static player_info_t player = {

-                NULL, key.c_str(), key.c_str(), key.c_str(), false

-            };

-            pi = &player;

-        }

-    }

-    if (big_endian)

-        pi->big_endian = big_endian;

-

-

-    //--------------------------------------------------------------------

-    // Read the input file.

-    //--------------------------------------------------------------------

-

-    if (verbose)

-        std::cout << "[*] Reading input file..." << std::endl;

-

-    shared::bytes buffer;

-    if (!shared::read_file(infile, buffer))

-    {

-        std::cerr << "Failed to read the input file." << std::endl;

-        return 6;

-    }

-

-

-    //--------------------------------------------------------------------

-    // Process the input file.

-    //--------------------------------------------------------------------

-

-    switch (command)

-    {

-    case cmd_sign:

-        if (verbose)

-            std::cout << "[*] Signing input file..." << std::endl;

-        if (!sign(buffer, pi, outfile, verbose))

-            return 7;

-        std::cout << "Successfully signed the input file." << std::endl;

-        break;

-    case cmd_verify:

-        if (verbose)

-            std::cout << "[*] Verifying signature on input file..."

-                      << std::endl;

-        if (!verify(buffer, pi, verbose))

-            return 8;

-        std::cout << "Successfully verified the input file signature."

-                  << std::endl;

-        break;

-    case cmd_encrypt:

-        if (verbose)

-            std::cout << "[*] Encrypting input file..." << std::endl;

-        if (!encrypt(buffer, mode, pi, outfile, verbose))

-            return 9;

-        std::cout << "Successfully encrypted the input file." << std::endl;

-        break;

-    case cmd_decrypt:

-        if (verbose)

-            std::cout << "[*] Decrypting input file..." << std::endl;

-        if (!decrypt(buffer, mode, pi, outfile, verbose))

-            return 10;

-        std::cout << "Successfully decrypted the input file." << std::endl;

-        break;

-    };

-

-    return 0;

-}

-

-int main(int argc, char* argv[])

-{

-    try

-    {

-        return process_arguments(argc, argv);

-    }

-    catch (const std::exception& xcpt)

-    {

-        std::cerr << "Exception caught: " << xcpt.what() << std::endl;

-        return -1;

-    }

-    catch (...)

-    {

-        std::cerr << "Unknown exception caught." << std::endl;

-        return -2;

-    }

-    return -3;

-}

+/* zenutils - Utilities for working with creative firmwares.
+ * Copyright 2007 (c) Rasmus Ry <rasmus.ry{at}gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <iostream>
+#include <getpot/getpot.hpp>
+#include <cenc.h>
+#include <crypt.h>
+#include <file.h>
+#include <firmware.h>
+#include <utils.h>
+
+
+namespace {
+enum command_t
+{
+    cmd_none = 0,
+    cmd_sign,
+    cmd_verify,
+    cmd_encrypt,
+    cmd_decrypt
+};
+
+enum mode_t
+{
+    mode_none = 0,
+    mode_cenc,
+    mode_fresc,
+    mode_tl
+};
+
+struct player_info_t
+{
+    const char* name;
+    const char* null_key;  // HMAC-SHA1 key
+    const char* fresc_key; // BlowFish key
+    const char* tl_key;    // BlowFish key
+    bool big_endian;
+};
+}; //namespace
+
+
+static const char VERSION[] = "0.1";
+
+static const char null_key_v1[]  = "CTL:N0MAD|PDE0.SIGN.";
+static const char null_key_v2[]  = "CTL:N0MAD|PDE0.DPMP.";
+
+static const char fresc_key[]    = "Copyright (C) CTL. -"
+                                   " zN0MAD iz v~p0wderful!";
+
+static const char tl_zvm_key[]   = "1sN0TM3D az u~may th1nk*"
+                                   "Creative Zen Vision:M";
+static const char tl_zvw_key[]   = "1sN0TM3D az u~may th1nk*"
+                                   "Creative ZEN Vision W";
+static const char tl_zm_key[]    = "1sN0TM3D az u~may th1nk*"
+                                   "Creative Zen Micro";
+static const char tl_zmp_key[]   = "1sN0TM3D az u~may th1nk*"
+                                   "Creative Zen MicroPhoto";
+static const char tl_zs_key[]    = "1sN0TM3D az u~may th1nk*"
+                                   "Creative Zen Sleek";
+static const char tl_zsp_key[]   = "1sN0TM3D az u~may th1nk*"
+                                   "Creative Zen Sleek Photo";
+static const char tl_zt_key[]    = "1sN0TM3D az u~may th1nk*"
+                                   "Creative Zen Touch";
+static const char tl_zx_key[]    = "1sN0TM3D az u~may th1nk*"
+                                   "NOMAD Jukebox Zen Xtra";
+
+player_info_t players[] = {
+    {"Vision:M", null_key_v2, fresc_key, tl_zvm_key, false},
+    {"Vision W", null_key_v2, fresc_key, tl_zvw_key, false},
+    {"Micro", null_key_v1, fresc_key, tl_zm_key, true},
+    {"MicroPhoto", null_key_v1, fresc_key, tl_zmp_key, true},
+    {"Sleek", null_key_v1, fresc_key, tl_zs_key, true},
+    {"SleekPhoto", null_key_v1, fresc_key, tl_zsp_key, true},
+    {"Touch", null_key_v1, fresc_key, tl_zt_key, true},
+    {"Xtra", null_key_v1, fresc_key, tl_zx_key, true},
+    {NULL, NULL, NULL, NULL, false}
+};
+
+
+player_info_t* find_player_info(std::string player)
+{
+    for (int i = 0; players[i].name != NULL; i++)
+    {
+        if (!stricmp(players[i].name, player.c_str()))
+        {
+            return &players[i];
+        }
+    }
+    return NULL;
+}
+
+void print_version()
+{
+    std::cout
+        << "zen_crypt - A utility for encrypting, decrypting or signing"
+           " Creative firmwares." << std::endl
+        << "Version " << VERSION << std::endl
+        << "Copyright (c) 2007 Rasmus Ry" << std::endl;
+}
+
+void print_help()
+{
+    print_version();
+    std::cout << std::endl
+        << "Usage: zen_crypt [command] [options]" << std::endl
+        << std::endl
+        << " Commands:" << std::endl
+        << "  -h,--help" << std::endl
+        << "      prints this message." << std::endl
+        << "  -s,--sign" << std::endl
+        << "      signs a given input file." << std::endl
+        << "  -v,--verify" << std::endl
+        << "      verifies a signed input file." << std::endl
+        << "  -e,--encrypt" << std::endl
+        << "      encrypts a given input file." << std::endl
+        << "  -d,--decrypt" << std::endl
+        << "      decrypts a given input file." << std::endl
+        << std::endl
+        << " Options:" << std::endl
+        << "  -V,--verbose" << std::endl
+        << "      prints verbose messages." << std::endl
+        << "  -b,--big-endian" << std::endl
+        << "      specifies that the input is big-endian, default is"
+           " little-endian." << std::endl
+        << "  -i,--input [file]" << std::endl
+        << "      specifies the input file." << std::endl
+        << "  -o,--output [file]" << std::endl
+        << "      specifies the output file." << std::endl
+        << "  -m,--mode [CENC|FRESC|TL]" << std::endl
+        << "      specifies which algorithm to use." << std::endl
+        << "  -k,--key [player|key]" << std::endl
+        << "      specifies which key to use." << std::endl
+        << std::endl
+        ;
+    std::cout << " Players:" << std::endl;
+    for (int i = 0; players[i].name != NULL; i++)
+    {
+        std::cout << "      " << players[i].name;
+        if (!i)
+            std::cout << " (default)";
+        std::cout << std::endl;
+    }
+}
+
+size_t find_null_signature(shared::bytes& data)
+{
+    size_t index = data.size();
+    if (index < (20 + 8 + 7))
+        return 0;
+    index -= 20 + 8;
+    for (int i = 0; i < 7; i++)
+    {
+        if (*(dword*)&data[index-i] == 'NULL' ||
+            *(dword*)&data[index-i] == 'LLUN')
+        {
+            return index-i;
+        }
+    }
+    return 0;
+}
+
+
+bool sign(shared::bytes& data, player_info_t* pi, const std::string& file,
+          bool verbose)
+{
+    if (verbose)
+        std::cout << "[*] Checking for the presence of an existing"
+                     " NULL signature..." << std::endl;
+    size_t index = find_null_signature(data);
+    if (index)
+    {
+        if (verbose)
+            std::cout << "[*] Found NULL signature at: "
+                      << std::hex << index << std::endl;
+
+        if (verbose)
+            std::cout << "[*] Computing digest..." << std::endl;
+
+        shared::bytes digest(20);
+        if (!zen::hmac_sha1_calc((const byte*)pi->null_key,
+                                 strlen(pi->null_key)+1, &data[0], index,
+                                 &digest[0], NULL))
+        {
+            std::cerr << "Failed to compute digest." << std::endl;
+            return false;
+        }
+
+        if (verbose)
+            std::cout << "[*] Writing file data..." << std::endl;
+
+        if (!shared::write_file(file, data, true))
+        {
+            std::cerr << "Failed to write file data." << std::endl;
+            return false;
+        }
+
+        if (verbose)
+            std::cout << "[*] Writing digest data..." << std::endl;
+
+        if (!shared::write_file(file, digest, false, index+8))
+        {
+            std::cerr << "Failed to write digest data." << std::endl;
+            return false;
+        }
+    }
+    else
+    {
+        if (verbose)
+            std::cout << "[*] Computing digest..." << std::endl;
+
+        shared::bytes signature(20+8);
+        if (!zen::hmac_sha1_calc((const byte*)pi->null_key,
+                                 strlen(pi->null_key)+1, &data[0], data.size(),
+                                 &signature[8], NULL))
+        {
+            std::cerr << "Failed to compute digest." << std::endl;
+            return false;
+        }
+
+
+        zen::firmware_header_t header = {'NULL', 20};
+        if (pi->big_endian)
+        {
+            header.tag = shared::swap(header.tag);
+            header.size = shared::swap(header.size);
+        }
+        memcpy(&signature[0], &header, sizeof(zen::firmware_header_t));
+
+        if (verbose)
+            std::cout << "[*] Writing file data..." << std::endl;
+
+        if (!shared::write_file(file, data, true))
+        {
+            std::cerr << "Failed to write file data." << std::endl;
+            return false;
+        }
+
+        if (verbose)
+            std::cout << "[*] Writing signature data..." << std::endl;
+
+        if (!shared::write_file(file, signature, false, data.size()))
+        {
+            std::cerr << "Failed to write signature data." << std::endl;
+            return false;
+        }
+
+        if (verbose)
+            std::cout << "[*] Ensuring that the file length is"
+                         " 32-bit aligned..." << std::endl;
+
+        int length = data.size() + signature.size();
+        int align = length % 4;
+        if (align)
+        {
+            shared::bytes padding(4 - align, 0);
+            if (!shared::write_file(file, padding, false, length))
+            {
+                std::cerr << "Failed to write padding data." << std::endl;
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+bool verify(shared::bytes& data, player_info_t* pi, bool verbose)
+{
+    if (verbose)
+        std::cout << "[*] Checking for the presence of an existing"
+                     " NULL signature..." << std::endl;
+    size_t index = find_null_signature(data);
+    if (!index)
+    {
+        std::cerr << "No NULL signature present in the input file."
+                  << std::endl;
+        return false;
+    }
+    if (verbose)
+        std::cout << "[*] Found NULL signature at: "
+                  << std::hex << index << std::endl;
+
+    if (verbose)
+        std::cout << "[*] Computing digest..." << std::endl;
+
+    byte digest[20];
+    if (!zen::hmac_sha1_calc((const byte*)pi->null_key, strlen(pi->null_key)+1,
+                             &data[0], index, digest, NULL))
+    {
+        std::cerr << "Failed to compute digest." << std::endl;
+        return false;
+    }
+
+    if (verbose)
+        std::cout << "[*] Verifying NULL signature digest..." << std::endl;
+
+    if (memcmp(&digest[0], &data[index+8], 20))
+    {
+        std::cerr << "The NULL signature contains an incorrect digest."
+                  << std::endl;
+        return false;
+    }
+
+    return true;
+}
+
+bool encrypt(shared::bytes& data, int mode, player_info_t* pi,
+             const std::string& file, bool verbose)
+{
+    if (mode == mode_cenc)
+    {
+        if (verbose)
+            std::cout << "[*] Encoding input file..." << std::endl;
+
+        shared::bytes outbuf(data.size() * 2);
+        int len = zen::cenc_encode(&data[0], data.size(), &outbuf[0], outbuf.size());
+        if (!len)
+        {
+            std::cerr << "Failed to encode the input file." << std::endl;
+            return false;
+        }
+
+        if (verbose)
+            std::cout << "[*] Writing decoded length to file..." << std::endl;
+
+        shared::bytes length(sizeof(dword));
+        *(dword*)&length[0] = pi->big_endian ? shared::swap(data.size()) : data.size();
+        if (!shared::write_file(file, length, true))
+        {
+            std::cerr << "Failed to write the file data." << std::endl;
+            return false;
+        }
+
+        if (verbose)
+            std::cout << "[*] Writing file data..." << std::endl;
+
+        if (!shared::write_file(file, outbuf, sizeof(dword), len))
+        {
+            std::cerr << "Failed to write the file data." << std::endl;
+            return false;
+        }
+    }
+    else if (mode == mode_fresc)
+    {
+        std::cerr << "FRESC mode is not supported." << std::endl;
+        return false;
+    }
+    else if (mode == mode_tl)
+    {
+        if (verbose)
+            std::cout << "[*] Encoding input file..." << std::endl;
+
+        shared::bytes outbuf(data.size() * 2);
+        *(dword*)&outbuf[0] = pi->big_endian ? shared::swap(data.size()) : data.size();
+        int len = zen::cenc_encode(&data[0], data.size(),
+                                  &outbuf[sizeof(dword)],
+                                  outbuf.size()-sizeof(dword));
+        if (!len)
+        {
+            std::cerr << "Failed to encode the input file." << std::endl;
+            return false;
+        }
+        len += sizeof(dword);
+
+        int align = len % 8;
+        align = align ? (8 - align) : 0;
+        len += align;
+
+        if (verbose)
+            std::cout << "[*] Encrypting encoded data..." << std::endl;
+
+        dword iv[2] = {0, shared::swap(len)};
+        if (!zen::bf_cbc_encrypt((const byte*)pi->tl_key, strlen(pi->tl_key)+1,
+                            &outbuf[0], len, (const byte*)iv))
+        {
+            std::cerr << "Failed to decrypt the input file." << std::endl;
+            return false;
+        }
+
+        if (verbose)
+            std::cout << "[*] Writing file data..." << std::endl;
+
+        if (!shared::write_file(file, outbuf, true, 0, len))
+        {
+            std::cerr << "Failed to save the output file." << std::endl;
+            return false;
+        }
+    }
+    else
+    {
+        std::cerr << "Invalid mode specified." << std::endl;
+        return false;
+    }
+
+    return true;
+}
+
+bool decrypt(shared::bytes& data, int mode, player_info_t* pi,
+             const std::string& file, bool verbose)
+{
+    if (mode == mode_cenc)
+    {
+        dword length = *(dword*)&data[0];
+        length = pi->big_endian ? shared::swap(length) : length;
+
+        if (verbose)
+            std::cout << "[*] Decoding input file..." << std::endl;
+
+        shared::bytes outbuf(length);
+        if (!zen::cenc_decode(&data[sizeof(dword)], data.size()-sizeof(dword),
+                              &outbuf[0], length))
+        {
+            std::cerr << "Failed to decode the input file." << std::endl;
+            return false;
+        }
+
+        if (verbose)
+            std::cout << "[*] Writing file data..." << std::endl;
+
+        if (!shared::write_file(file, outbuf, true))
+        {
+            std::cerr << "Failed to write the file data." << std::endl;
+            return false;
+        }
+    }
+    else if (mode == mode_fresc)
+    {
+        if (verbose)
+            std::cout << "[*] Decrypting input file..." << std::endl;
+
+        dword iv[2] = {shared::swap(data.size()), 0};
+        if (!zen::bf_cbc_decrypt((const byte*)pi->fresc_key,
+                                 strlen(pi->fresc_key)+1, &data[0],
+                                 data.size(), (const byte*)iv))
+        {
+            std::cerr << "Failed to decrypt the input file." << std::endl;
+            return false;
+        }
+
+        if (verbose)
+            std::cout << "[*] Writing file data..." << std::endl;
+
+        if (!shared::write_file(file, data, true))
+        {
+            std::cerr << "Failed to save the output file." << std::endl;
+            return false;
+        }
+    }
+    else if (mode == mode_tl)
+    {
+        if (verbose)
+            std::cout << "[*] Decrypting input file..." << std::endl;
+
+        dword iv[2] = {0, shared::swap(data.size())};
+        if (!zen::bf_cbc_decrypt((const byte*)pi->tl_key, strlen(pi->tl_key)+1,
+                            &data[0], data.size(), (const byte*)iv))
+        {
+            std::cerr << "Failed to decrypt the input file." << std::endl;
+            return false;
+        }
+
+        dword length = *(dword*)&data[0];
+        length = pi->big_endian ? shared::swap(length) : length;
+        if (length > (data.size() * 3))
+        {
+            std::cerr << "Decrypted length is unexpectedly large: "
+                      << std::hex << length
+                      << " Check the endian and key settings." << std::endl;
+            return false;
+        }
+
+        if (verbose)
+            std::cout << "[*] Decoding decrypted data..." << std::endl;
+
+        shared::bytes outbuf(length);
+        if (!zen::cenc_decode(&data[sizeof(dword)], data.size()-sizeof(dword),
+                              &outbuf[0], length))
+        {
+            std::cerr << "Failed to decode the input file." << std::endl;
+            return false;
+        }
+
+        if (verbose)
+            std::cout << "[*] Writing file data..." << std::endl;
+
+        if (!shared::write_file(file, outbuf, true))
+        {
+            std::cerr << "Failed to save the output file." << std::endl;
+            return false;
+        }
+    }
+    else
+    {
+        std::cerr << "Invalid mode specified." << std::endl;
+        return false;
+    }
+
+    return true;
+}
+
+int process_arguments(int argc, char*argv[])
+{
+    //--------------------------------------------------------------------
+    // Parse input variables.
+    //--------------------------------------------------------------------
+
+    GetPot cl(argc, argv);
+    if (cl.size() == 1 || cl.search(2, "-h", "--help"))
+    {
+        print_help();
+        return 1;
+    }
+
+    int command = cmd_none;
+    if (cl.search(2, "-s", "--sign"))
+        command = cmd_sign;
+    else if (cl.search(2, "-v", "--verify"))
+        command = cmd_verify;
+    else if (cl.search(2, "-e", "--encrypt"))
+        command = cmd_encrypt;
+    else if (cl.search(2, "-d", "--decrypt"))
+        command = cmd_decrypt;
+
+    if (command == cmd_none)
+    {
+        std::cerr << "No command specified." << std::endl;
+        return 2;
+    }
+
+    int mode = mode_none;
+    if (command == cmd_encrypt || command == cmd_decrypt)
+    {
+        if (!cl.search(2, "-m", "--mode"))
+        {
+            std::cerr << "The specified command requires that"
+                         " a mode is specified."
+                      << std::endl;
+            return 3;
+        }
+        std::string name = cl.next("");
+        if (!name.empty())
+        {
+            if (!stricmp(name.c_str(), "CENC"))
+                mode = mode_cenc;
+            else if (!stricmp(name.c_str(), "FRESC"))
+                mode = mode_fresc;
+            else if (!stricmp(name.c_str(), "TL"))
+                mode = mode_tl;
+        }
+        if (mode == mode_none)
+        {
+            std::cerr << "Invalid mode specified." << std::endl;
+            return 4;
+        }
+    }
+
+    bool verbose = false;
+    if (cl.search(2, "-V", "--verbose"))
+        verbose = true;
+
+    bool big_endian = false;
+    if (cl.search(2, "-b", "--big-endian"))
+        big_endian = true;
+
+    std::string infile;
+    if (cl.search(2, "-i", "--input"))
+        infile = cl.next("");
+    if (infile.empty())
+    {
+        std::cerr << "An input file must be specified." << std::endl;
+        return 5;
+    }
+
+    std::string outfile = infile;
+    if (cl.search(2, "-o", "--output"))
+        outfile = cl.next(outfile.c_str());
+
+    player_info_t* pi = &players[0];
+    std::string key;
+    if (cl.search(2, "-k", "--key"))
+        key = cl.next("");
+    if (!key.empty())
+    {
+        player_info_t* pitmp = find_player_info(key);
+        if (pitmp != NULL)
+            pi = pitmp;
+        else
+        {
+            static player_info_t player = {
+                NULL, key.c_str(), key.c_str(), key.c_str(), false
+            };
+            pi = &player;
+        }
+    }
+    if (big_endian)
+        pi->big_endian = big_endian;
+
+
+    //--------------------------------------------------------------------
+    // Read the input file.
+    //--------------------------------------------------------------------
+
+    if (verbose)
+        std::cout << "[*] Reading input file..." << std::endl;
+
+    shared::bytes buffer;
+    if (!shared::read_file(infile, buffer))
+    {
+        std::cerr << "Failed to read the input file." << std::endl;
+        return 6;
+    }
+
+
+    //--------------------------------------------------------------------
+    // Process the input file.
+    //--------------------------------------------------------------------
+
+    switch (command)
+    {
+    case cmd_sign:
+        if (verbose)
+            std::cout << "[*] Signing input file..." << std::endl;
+        if (!sign(buffer, pi, outfile, verbose))
+            return 7;
+        std::cout << "Successfully signed the input file." << std::endl;
+        break;
+    case cmd_verify:
+        if (verbose)
+            std::cout << "[*] Verifying signature on input file..."
+                      << std::endl;
+        if (!verify(buffer, pi, verbose))
+            return 8;
+        std::cout << "Successfully verified the input file signature."
+                  << std::endl;
+        break;
+    case cmd_encrypt:
+        if (verbose)
+            std::cout << "[*] Encrypting input file..." << std::endl;
+        if (!encrypt(buffer, mode, pi, outfile, verbose))
+            return 9;
+        std::cout << "Successfully encrypted the input file." << std::endl;
+        break;
+    case cmd_decrypt:
+        if (verbose)
+            std::cout << "[*] Decrypting input file..." << std::endl;
+        if (!decrypt(buffer, mode, pi, outfile, verbose))
+            return 10;
+        std::cout << "Successfully decrypted the input file." << std::endl;
+        break;
+    };
+
+    return 0;
+}
+
+int main(int argc, char* argv[])
+{
+    try
+    {
+        return process_arguments(argc, argv);
+    }
+    catch (const std::exception& xcpt)
+    {
+        std::cerr << "Exception caught: " << xcpt.what() << std::endl;
+        return -1;
+    }
+    catch (...)
+    {
+        std::cerr << "Unknown exception caught." << std::endl;
+        return -2;
+    }
+    return -3;
+}