34 files changed, 12634 insertions, 12634 deletions
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)
+PROJECT(pelib)
-# source files for pelib
+# source files for pelib
-SET(pelib_srcs
+SET(pelib_srcs
-  pelib/BoundImportDirectory.cpp
+  pelib/BoundImportDirectory.cpp
-  pelib/ComHeaderDirectory.cpp
+  pelib/ComHeaderDirectory.cpp
-  pelib/DebugDirectory.cpp
+  pelib/DebugDirectory.cpp
-  pelib/ExportDirectory.cpp
+  pelib/ExportDirectory.cpp
-  pelib/IatDirectory.cpp
+  pelib/IatDirectory.cpp
-  pelib/MzHeader.cpp
+  pelib/MzHeader.cpp
-  pelib/PeFile.cpp
+  pelib/PeFile.cpp
-  pelib/PeHeader.cpp
+  pelib/PeHeader.cpp
-  pelib/PeLibAux.cpp
+  pelib/PeLibAux.cpp
-  pelib/RelocationsDirectory.cpp
+  pelib/RelocationsDirectory.cpp
-  pelib/ResourceDirectory.cpp
+  pelib/ResourceDirectory.cpp
-  pelib/buffer/InputBuffer.cpp
+  pelib/buffer/InputBuffer.cpp
-  pelib/buffer/OutputBuffer.cpp
+  pelib/buffer/OutputBuffer.cpp
-)
+)
-ADD_LIBRARY(pelib ${pelib_srcs})
+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.
+* BoundImportDirectory.cpp - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#include "PeLibInc.h"
+#include "PeLibInc.h"
-#include "BoundImportDirectory.h"
+#include "BoundImportDirectory.h"
-#include <numeric>
+#include <numeric>
-#include <set>
+#include <set>
-#include <map>
+#include <map>
-namespace PeLib
+namespace PeLib
-{
+{
-        /**
+        /**
-        * Adds another bound import to the BoundImport directory.
+        * Adds another bound import to the BoundImport directory.
-        * @param strModuleName Name of the PE file which will be imported.
+        * @param strModuleName Name of the PE file which will be imported.
-        * @param dwTds Value of the TimeDateStamp of the bound import field.
+        * @param dwTds Value of the TimeDateStamp of the bound import field.
-        * @param wOmn Value of the OffsetModuleName 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.
+        * @param wWfr Value of the NumberOfModuleForwarderRefs of the bound import field.
-        **/
+        **/
-        int BoundImportDirectory::addBoundImport(const std::string& strModuleName, dword dwTds, word wOmn, word wWfr)
+        int BoundImportDirectory::addBoundImport(const std::string& strModuleName, dword dwTds, word wOmn, word wWfr)
-        {
+        {
-                for (unsigned int i=0;i<m_vIbd.size();i++)
+                for (unsigned int i=0;i<m_vIbd.size();i++)
-                {
+                {
-                        if (isEqualNc(strModuleName, m_vIbd[i].strModuleName))
+                        if (isEqualNc(strModuleName, m_vIbd[i].strModuleName))
-                        {
+                        {
-                                return ERROR_DUPLICATE_ENTRY;
+                                return ERROR_DUPLICATE_ENTRY;
-                        }
+                        }
-                }
+                }
-                
+                
-                PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR ibidCurrent;
+                PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR ibidCurrent;
-                ibidCurrent.TimeDateStamp = dwTds;
+                ibidCurrent.TimeDateStamp = dwTds;
-                ibidCurrent.OffsetModuleName = wOmn;
+                ibidCurrent.OffsetModuleName = wOmn;
-                ibidCurrent.NumberOfModuleForwarderRefs = wWfr;
+                ibidCurrent.NumberOfModuleForwarderRefs = wWfr;
-                PELIB_IMAGE_BOUND_DIRECTORY ibdCurrent;
+                PELIB_IMAGE_BOUND_DIRECTORY ibdCurrent;
-                ibdCurrent.ibdDescriptor = ibidCurrent;
+                ibdCurrent.ibdDescriptor = ibidCurrent;
-                ibdCurrent.strModuleName = strModuleName;
+                ibdCurrent.strModuleName = strModuleName;
-                m_vIbd.push_back(ibdCurrent);
+                m_vIbd.push_back(ibdCurrent);
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * Searches for the first instance of a module with the given modulename.
+        * Searches for the first instance of a module with the given modulename.
-        * @param strModuleName The name of a module.
+        * @param strModuleName The name of a module.
-        * @return The id of the module.
+        * @return The id of the module.
-        **/
+        **/
-        int BoundImportDirectory::getModuleIndex(const std::string& strModuleName) const
+        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));
+                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())
+                if (Iter == m_vIbd.end())
-                {
+                {
-                        return ERROR_ENTRY_NOT_FOUND;
+                        return ERROR_ENTRY_NOT_FOUND;
-                }
+                }
-                
+                
-                return static_cast<int>(std::distance(m_vIbd.begin(), Iter));
+                return static_cast<int>(std::distance(m_vIbd.begin(), Iter));
-        }
+        }
-        /**
+        /**
-        * @return Number of files in the current BoundImport directory.
+        * @return Number of files in the current BoundImport directory.
-        **/
+        **/
-        unsigned int BoundImportDirectory::calcNumberOfModules() const
+        unsigned int BoundImportDirectory::calcNumberOfModules() const
-        {
+        {
-                return static_cast<unsigned int>(m_vIbd.size());
+                return static_cast<unsigned int>(m_vIbd.size());
-        }
+        }
-        int BoundImportDirectory::read(InputBuffer& inpBuffer, unsigned char* data, unsigned int dwSize)
+        int BoundImportDirectory::read(InputBuffer& inpBuffer, unsigned char* data, unsigned int dwSize)
-        {
+        {
-                std::vector<PELIB_IMAGE_BOUND_DIRECTORY> currentDirectory;
+                std::vector<PELIB_IMAGE_BOUND_DIRECTORY> currentDirectory;
-                
+                
-                do
+                do
-                {
+                {
-                        PELIB_IMAGE_BOUND_DIRECTORY ibdCurrent;
+                        PELIB_IMAGE_BOUND_DIRECTORY ibdCurrent;
-                        
+                        
-                        inpBuffer >> ibdCurrent.ibdDescriptor.TimeDateStamp;
+                        inpBuffer >> ibdCurrent.ibdDescriptor.TimeDateStamp;
-                        inpBuffer >> ibdCurrent.ibdDescriptor.OffsetModuleName;
+                        inpBuffer >> ibdCurrent.ibdDescriptor.OffsetModuleName;
-                        inpBuffer >> ibdCurrent.ibdDescriptor.NumberOfModuleForwarderRefs;
+                        inpBuffer >> ibdCurrent.ibdDescriptor.NumberOfModuleForwarderRefs;
-                        if (ibdCurrent.ibdDescriptor.TimeDateStamp == 0 && ibdCurrent.ibdDescriptor.OffsetModuleName == 0 && ibdCurrent.ibdDescriptor.NumberOfModuleForwarderRefs == 0) break;
+                        if (ibdCurrent.ibdDescriptor.TimeDateStamp == 0 && ibdCurrent.ibdDescriptor.OffsetModuleName == 0 && ibdCurrent.ibdDescriptor.NumberOfModuleForwarderRefs == 0) break;
-                        
+                        
-                        for (int i=0;i<ibdCurrent.ibdDescriptor.NumberOfModuleForwarderRefs;i++)
+                        for (int i=0;i<ibdCurrent.ibdDescriptor.NumberOfModuleForwarderRefs;i++)
-                        {
+                        {
-                                PELIB_IMAGE_BOUND_DIRECTORY currentForwarder;
+                                PELIB_IMAGE_BOUND_DIRECTORY currentForwarder;
-                                
+                                
-                                inpBuffer >> currentForwarder.ibdDescriptor.TimeDateStamp;
+                                inpBuffer >> currentForwarder.ibdDescriptor.TimeDateStamp;
-                                inpBuffer >> currentForwarder.ibdDescriptor.OffsetModuleName;
+                                inpBuffer >> currentForwarder.ibdDescriptor.OffsetModuleName;
-                                inpBuffer >> currentForwarder.ibdDescriptor.NumberOfModuleForwarderRefs;
+                                inpBuffer >> currentForwarder.ibdDescriptor.NumberOfModuleForwarderRefs;
-                                
+                                
-                                ibdCurrent.moduleForwarders.push_back(currentForwarder);
+                                ibdCurrent.moduleForwarders.push_back(currentForwarder);
-                        }
+                        }
-                        
+                        
-                        currentDirectory.push_back(ibdCurrent);
+                        currentDirectory.push_back(ibdCurrent);
-                        ibdCurrent.moduleForwarders.clear();
+                        ibdCurrent.moduleForwarders.clear();
-                } while (true);
+                } while (true);
-                
+                
-                for (unsigned int i=0;i<currentDirectory.size();i++)
+                for (unsigned int i=0;i<currentDirectory.size();i++)
-                {
+                {
-                        dword wOmn = currentDirectory[i].ibdDescriptor.OffsetModuleName;
+                        dword wOmn = currentDirectory[i].ibdDescriptor.OffsetModuleName;
-                        if (wOmn > dwSize)
+                        if (wOmn > dwSize)
-                        {
+                        {
-                                return ERROR_INVALID_FILE;
+                                return ERROR_INVALID_FILE;
-                        }
+                        }
-                        
+                        
-                        currentDirectory[i].strModuleName = "";
+                        currentDirectory[i].strModuleName = "";
-                        for (int k=0;data[wOmn + k] != 0 && k + wOmn < dwSize;k++)
+                        for (int k=0;data[wOmn + k] != 0 && k + wOmn < dwSize;k++)
-                        {
+                        {
-                                currentDirectory[i].strModuleName += data[wOmn + k];
+                                currentDirectory[i].strModuleName += data[wOmn + k];
-                        }
+                        }
-                        
+                        
-                        for (unsigned int j=0;j<currentDirectory[i].moduleForwarders.size();j++)
+                        for (unsigned int j=0;j<currentDirectory[i].moduleForwarders.size();j++)
-                        {
+                        {
-                                dword wOmn = currentDirectory[i].moduleForwarders[j].ibdDescriptor.OffsetModuleName;
+                                dword wOmn = currentDirectory[i].moduleForwarders[j].ibdDescriptor.OffsetModuleName;
-                                
+                                
-                                if (wOmn > dwSize)
+                                if (wOmn > dwSize)
-                                {
+                                {
-                                        return ERROR_INVALID_FILE;
+                                        return ERROR_INVALID_FILE;
-                                }
+                                }
-                                
+                                
-//                              m_vIbd[i].moduleForwarders[j].strModuleName.assign((char*)(&vBimpDir[wOmn]));
+//                              m_vIbd[i].moduleForwarders[j].strModuleName.assign((char*)(&vBimpDir[wOmn]));
-                                currentDirectory[i].moduleForwarders[j].strModuleName = "";
+                                currentDirectory[i].moduleForwarders[j].strModuleName = "";
-                                for (int k=0;data[wOmn + k] != 0 && k + wOmn < dwSize;k++)
+                                for (int k=0;data[wOmn + k] != 0 && k + wOmn < dwSize;k++)
-                                {
+                                {
-                                        currentDirectory[i].moduleForwarders[j].strModuleName += data[wOmn + k];
+                                        currentDirectory[i].moduleForwarders[j].strModuleName += data[wOmn + k];
-                                }
+                                }
-                        }
+                        }
-                }
+                }
-                
+                
-                std::swap(m_vIbd, currentDirectory);
+                std::swap(m_vIbd, currentDirectory);
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * Reads the BoundImport directory from a PE file.
+        * Reads the BoundImport directory from a PE file.
-        * @param strModuleName The name of the PE file from which the BoundImport directory is read.
+        * @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 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).
+        * @param dwSize The size of the BoundImport directory (see #PeFile::PeHeader::getIDBoundImportSize).
-        **/
+        **/
-        int BoundImportDirectory::read(const std::string& strModuleName, dword dwOffset, unsigned int uiSize)
+        int BoundImportDirectory::read(const std::string& strModuleName, dword dwOffset, unsigned int uiSize)
-        {
+        {
-                std::ifstream ifFile(strModuleName.c_str(), std::ios::binary);
+                std::ifstream ifFile(strModuleName.c_str(), std::ios::binary);
-                if (!ifFile)
+                if (!ifFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                
+                
-                if (fileSize(ifFile) < dwOffset + uiSize)
+                if (fileSize(ifFile) < dwOffset + uiSize)
-                {
+                {
-                        return ERROR_INVALID_FILE;
+                        return ERROR_INVALID_FILE;
-                }
+                }
-                
+                
-                ifFile.seekg(dwOffset, std::ios::beg);
+                ifFile.seekg(dwOffset, std::ios::beg);
-                
+                
-                std::vector<unsigned char> vBimpDir(uiSize);
+                std::vector<unsigned char> vBimpDir(uiSize);
-                ifFile.read(reinterpret_cast<char*>(&vBimpDir[0]), uiSize);
+                ifFile.read(reinterpret_cast<char*>(&vBimpDir[0]), uiSize);
-                InputBuffer inpBuffer(vBimpDir);
+                InputBuffer inpBuffer(vBimpDir);
-                
+                
-                return read(inpBuffer, &vBimpDir[0], uiSize);
+                return read(inpBuffer, &vBimpDir[0], uiSize);
-        }
+        }
-        
+        
-        int BoundImportDirectory::read(unsigned char* pcBuffer, unsigned int uiSize)
+        int BoundImportDirectory::read(unsigned char* pcBuffer, unsigned int uiSize)
-        {
+        {
-                std::vector<unsigned char> vBimpDir(pcBuffer, pcBuffer + uiSize);
+                std::vector<unsigned char> vBimpDir(pcBuffer, pcBuffer + uiSize);
-                InputBuffer inpBuffer(vBimpDir);
+                InputBuffer inpBuffer(vBimpDir);
-                
+                
-                return read(inpBuffer, &vBimpDir[0], uiSize);
+                return read(inpBuffer, &vBimpDir[0], uiSize);
-        }
+        }
-        
+        
-        unsigned int BoundImportDirectory::totalModules() const
+        unsigned int BoundImportDirectory::totalModules() const
-        {
+        {
-                unsigned int modules = static_cast<unsigned int>(m_vIbd.size());
+                unsigned int modules = static_cast<unsigned int>(m_vIbd.size());
-                
+                
-                for (unsigned int i=0;i<m_vIbd.size();i++)
+                for (unsigned int i=0;i<m_vIbd.size();i++)
-                {
+                {
-                        modules += static_cast<unsigned int>(m_vIbd[i].moduleForwarders.size());
+                        modules += static_cast<unsigned int>(m_vIbd[i].moduleForwarders.size());
-                }
+                }
-                
+                
-                return modules;
+                return modules;
-        }
+        }
-        /**
+        /**
-        * Rebuilds the BoundImport directory. The rebuilded BoundImport directory can then be
+        * Rebuilds the BoundImport directory. The rebuilded BoundImport directory can then be
-        * written back to a PE file.
+        * written back to a PE file.
-        * @param vBuffer Buffer where the rebuilt BoundImport directory will be stored.
+        * @param vBuffer Buffer where the rebuilt BoundImport directory will be stored.
-        * @param fMakeValid If this flag is true a valid directory will be produced.
+        * @param fMakeValid If this flag is true a valid directory will be produced.
-        **/
+        **/
-        void BoundImportDirectory::rebuild(std::vector<byte>& vBuffer, bool fMakeValid) const
+        void BoundImportDirectory::rebuild(std::vector<byte>& vBuffer, bool fMakeValid) const
-        {
+        {
-                std::map<std::string, word> filename_offsets;
+                std::map<std::string, word> filename_offsets;
-                
+                
-                OutputBuffer obBuffer(vBuffer);
+                OutputBuffer obBuffer(vBuffer);
-                
+                
-                word ulNameOffset = static_cast<word>((totalModules() + 1) * PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size());
+                word ulNameOffset = static_cast<word>((totalModules() + 1) * PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size());
-                
+                
-                for (unsigned int i=0;i<m_vIbd.size();i++)
+                for (unsigned int i=0;i<m_vIbd.size();i++)
-                {
+                {
-                        obBuffer << m_vIbd[i].ibdDescriptor.TimeDateStamp;
+                        obBuffer << m_vIbd[i].ibdDescriptor.TimeDateStamp;
-                        // Recalculate the offsets if a valid directory is wanted.
+                        // Recalculate the offsets if a valid directory is wanted.
-                        if (fMakeValid)
+                        if (fMakeValid)
-                        {
+                        {
-                                if (filename_offsets.find(m_vIbd[i].strModuleName) == filename_offsets.end())
+                                if (filename_offsets.find(m_vIbd[i].strModuleName) == filename_offsets.end())
-                                {
+                                {
-                                        filename_offsets[m_vIbd[i].strModuleName] = ulNameOffset;
+                                        filename_offsets[m_vIbd[i].strModuleName] = ulNameOffset;
-                                        obBuffer << ulNameOffset;
+                                        obBuffer << ulNameOffset;
-                                        ulNameOffset += static_cast<word>(m_vIbd[i].strModuleName.size() + 1);
+                                        ulNameOffset += static_cast<word>(m_vIbd[i].strModuleName.size() + 1);
-                                }
+                                }
-                                else
+                                else
-                                {
+                                {
-                                        obBuffer << filename_offsets[m_vIbd[i].strModuleName];
+                                        obBuffer << filename_offsets[m_vIbd[i].strModuleName];
-                                }
+                                }
-                        }
+                        }
-                        else // Otherwise just copy the old values into the buffer.
+                        else // Otherwise just copy the old values into the buffer.
-                        {
+                        {
-                                obBuffer << m_vIbd[i].ibdDescriptor.OffsetModuleName;
+                                obBuffer << m_vIbd[i].ibdDescriptor.OffsetModuleName;
-                        }
+                        }
-                        obBuffer << m_vIbd[i].ibdDescriptor.NumberOfModuleForwarderRefs;
+                        obBuffer << m_vIbd[i].ibdDescriptor.NumberOfModuleForwarderRefs;
-                        
+                        
-                        for (int j=0;j<calcNumberOfModuleForwarderRefs(i);j++)
+                        for (int j=0;j<calcNumberOfModuleForwarderRefs(i);j++)
-                        {
+                        {
-                                obBuffer << m_vIbd[i].moduleForwarders[j].ibdDescriptor.TimeDateStamp;
+                                obBuffer << m_vIbd[i].moduleForwarders[j].ibdDescriptor.TimeDateStamp;
-                                
+                                
-                                if (fMakeValid)
+                                if (fMakeValid)
-                                {
+                                {
-                                        if (filename_offsets.find(m_vIbd[i].strModuleName) == filename_offsets.end())
+                                        if (filename_offsets.find(m_vIbd[i].strModuleName) == filename_offsets.end())
-                                        {
+                                        {
-                                                filename_offsets[m_vIbd[i].moduleForwarders[j].strModuleName] = ulNameOffset;
+                                                filename_offsets[m_vIbd[i].moduleForwarders[j].strModuleName] = ulNameOffset;
-                                                obBuffer << ulNameOffset;
+                                                obBuffer << ulNameOffset;
-                                                ulNameOffset += static_cast<word>(m_vIbd[i].moduleForwarders[j].strModuleName.size() + 1);
+                                                ulNameOffset += static_cast<word>(m_vIbd[i].moduleForwarders[j].strModuleName.size() + 1);
-                                        }
+                                        }
-                                        else
+                                        else
-                                        {
+                                        {
-                                                obBuffer << filename_offsets[m_vIbd[i].moduleForwarders[j].strModuleName];
+                                                obBuffer << filename_offsets[m_vIbd[i].moduleForwarders[j].strModuleName];
-                                        }
+                                        }
-                                }
+                                }
-                                else // Otherwise just copy the old values into the buffer.
+                                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.OffsetModuleName;
-                                }
+                                }
-                                obBuffer << m_vIbd[i].moduleForwarders[j].ibdDescriptor.NumberOfModuleForwarderRefs;
+                                obBuffer << m_vIbd[i].moduleForwarders[j].ibdDescriptor.NumberOfModuleForwarderRefs;
-                        }
+                        }
-                }
+                }
-                
+                
-                obBuffer << static_cast<dword>(0);
+                obBuffer << static_cast<dword>(0);
-                obBuffer << static_cast<word>(0);
+                obBuffer << static_cast<word>(0);
-                obBuffer << static_cast<word>(0);
+                obBuffer << static_cast<word>(0);
-                for (unsigned int i=0;i<m_vIbd.size();i++)
+                for (unsigned int i=0;i<m_vIbd.size();i++)
-                {
+                {
-                        if (filename_offsets.find(m_vIbd[i].strModuleName) != filename_offsets.end())
+                        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));
+                                obBuffer.add(getModuleName(i).c_str(), static_cast<unsigned long>(getModuleName(i).size() + 1));
-                                filename_offsets.erase(m_vIbd[i].strModuleName);
+                                filename_offsets.erase(m_vIbd[i].strModuleName);
-                        }
+                        }
-                        
+                        
-                        for (int j=0;j<calcNumberOfModuleForwarderRefs(i);j++)
+                        for (int j=0;j<calcNumberOfModuleForwarderRefs(i);j++)
-                        {
+                        {
-                                if (filename_offsets.find(getModuleName(i, j)) != filename_offsets.end())
+                                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));
+                                        obBuffer.add(getModuleName(i, j).c_str(), static_cast<unsigned long>(getModuleName(i, j).size() + 1));
-                                        filename_offsets.erase(getModuleName(i, j));
+                                        filename_offsets.erase(getModuleName(i, j));
-                                }
+                                }
-                        }
+                        }
-                }
+                }
-        }
+        }
-        /**
+        /**
-        * Removes all bound import files.
+        * Removes all bound import files.
-        **/
+        **/
-        void BoundImportDirectory::clear()
+        void BoundImportDirectory::clear()
-        {
+        {
-                m_vIbd.clear();
+                m_vIbd.clear();
-        }
+        }
-        /**
+        /**
-        * Removes a field specified by the parameter filename from the BoundImport directory.
+        * 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.
+        * @param strModuleName Name of the file whose field will be removed from the BoundImport directory.
-        **/
+        **/
-        void BoundImportDirectory::removeBoundImport(const std::string& strModuleName)
+        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());
+                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.
+        * Returns the size of the rebuilt BoundImportDirectory.
-        * @return Size of the rebuilt BoundImportDirectory.
+        * @return Size of the rebuilt BoundImportDirectory.
-        **/
+        **/
-        unsigned int BoundImportDirectory::size() const
+        unsigned int BoundImportDirectory::size() const
-        {
+        {
-                unsigned int size = PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size();
+                unsigned int size = PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size();
-                
+                
-                std::set<std::string> filenames;
+                std::set<std::string> filenames;
-                
+                
-                for (unsigned int i = 0; i < m_vIbd.size(); i++)
+                for (unsigned int i = 0; i < m_vIbd.size(); i++)
-                {
+                {
-                        filenames.insert(m_vIbd[i].strModuleName);
+                        filenames.insert(m_vIbd[i].strModuleName);
-                        
+                        
-                        size += PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size();
+                        size += PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size();
-                        
+                        
-                        for (unsigned int j = 0; j < m_vIbd[i].moduleForwarders.size(); j++)
+                        for (unsigned int j = 0; j < m_vIbd[i].moduleForwarders.size(); j++)
-                        {
+                        {
-                                filenames.insert(m_vIbd[i].moduleForwarders[j].strModuleName);
+                                filenames.insert(m_vIbd[i].moduleForwarders[j].strModuleName);
-                                
+                                
-                                size += PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size();
+                                size += PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size();
-                        }
+                        }
-                }
+                }
-                
+                
-                for (std::set<std::string>::iterator iter = filenames.begin(); iter != filenames.end(); ++iter)
+                for (std::set<std::string>::iterator iter = filenames.begin(); iter != filenames.end(); ++iter)
-                {
+                {
-                        size += static_cast<unsigned int>(iter->size()) + 1;
+                        size += static_cast<unsigned int>(iter->size()) + 1;
-                }
+                }
-                
+                
-                return size;
+                return size;
-        }
+        }
-        /**
+        /**
-        * @param strFilename Name of the file.
+        * @param strFilename Name of the file.
-        * @param dwOffset File offset the bound importdirectory will be written to.
+        * @param dwOffset File offset the bound importdirectory will be written to.
-        * @param fMakeValid If this flag is true a valid directory will be produced.
+        * @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
+        int BoundImportDirectory::write(const std::string& strFilename, dword dwOffset,  bool fMakeValid) const
-        {
+        {
-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        ofFile.clear();
+                        ofFile.clear();
-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                else
+                else
-                {
+                {
-                        ofFile.close();
+                        ofFile.close();
-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                ofFile.seekp(dwOffset, std::ios::beg);
+                ofFile.seekp(dwOffset, std::ios::beg);
-                std::vector<unsigned char> vBuffer;
+                std::vector<unsigned char> vBuffer;
-                rebuild(vBuffer, fMakeValid);
+                rebuild(vBuffer, fMakeValid);
-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<std::streamsize>(vBuffer.size()));
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<std::streamsize>(vBuffer.size()));
-                ofFile.close();
+                ofFile.close();
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * Retrieves the value of the TimeDateStamp value of a bound import field.
+        * Retrieves the value of the TimeDateStamp value of a bound import field.
-        * @param dwBidnr Number of the bound import field.
+        * @param dwBidnr Number of the bound import field.
-        * @return Value of the TimeDateStamp of the bound import field.
+        * @return Value of the TimeDateStamp of the bound import field.
-        **/
+        **/
-        dword BoundImportDirectory::getTimeDateStamp(dword dwBidnr) const
+        dword BoundImportDirectory::getTimeDateStamp(dword dwBidnr) const
-        {
+        {
-                return m_vIbd[dwBidnr].ibdDescriptor.TimeDateStamp;
+                return m_vIbd[dwBidnr].ibdDescriptor.TimeDateStamp;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Retrieves the value of the OffsetModuleName value of a bound import field. 
+        * Retrieves the value of the OffsetModuleName value of a bound import field. 
-        * @param dwBidnr Number of the bound import field.
+        * @param dwBidnr Number of the bound import field.
-        * @return Value of the OffsetModuleName of the bound import field.
+        * @return Value of the OffsetModuleName of the bound import field.
-        **/
+        **/
-        word BoundImportDirectory::getOffsetModuleName(dword dwBidnr) const
+        word BoundImportDirectory::getOffsetModuleName(dword dwBidnr) const
-        {
+        {
-                return m_vIbd[dwBidnr].ibdDescriptor.OffsetModuleName;
+                return m_vIbd[dwBidnr].ibdDescriptor.OffsetModuleName;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Retrieves the value of the NumberOfModuleForwarderRefs value of a bound import field.
+        * Retrieves the value of the NumberOfModuleForwarderRefs value of a bound import field.
-        * @param dwBidnr Number of the bound import field.
+        * @param dwBidnr Number of the bound import field.
-        * @return Value of the NumberOfModuleForwarderRefs of the bound import field.
+        * @return Value of the NumberOfModuleForwarderRefs of the bound import field.
-        **/
+        **/
-        word BoundImportDirectory::getNumberOfModuleForwarderRefs(dword dwBidnr) const
+        word BoundImportDirectory::getNumberOfModuleForwarderRefs(dword dwBidnr) const
-        {
+        {
-                return m_vIbd[dwBidnr].ibdDescriptor.NumberOfModuleForwarderRefs;
+                return m_vIbd[dwBidnr].ibdDescriptor.NumberOfModuleForwarderRefs;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Retrieves the value of the ModuleName value of a bound import field.
+        * Retrieves the value of the ModuleName value of a bound import field.
-        * @param dwBidnr Number of the bound import field.
+        * @param dwBidnr Number of the bound import field.
-        * @return Value of the ModuleName of the bound import field.
+        * @return Value of the ModuleName of the bound import field.
-        **/
+        **/
-        std::string BoundImportDirectory::getModuleName(dword dwBidnr) const
+        std::string BoundImportDirectory::getModuleName(dword dwBidnr) const
-        {
+        {
-                return m_vIbd[dwBidnr].strModuleName;
+                return m_vIbd[dwBidnr].strModuleName;
-        }
+        }
-        /**
+        /**
-        * Changes the TimeDateStamp value of an existing bound import field.
+        * Changes the TimeDateStamp value of an existing bound import field.
-        * @param dwBidnr Number of the bound import field which will be changed.
+        * @param dwBidnr Number of the bound import field which will be changed.
-        * @param dwTds New value of the TimeDateStamp of the bound import field.
+        * @param dwTds New value of the TimeDateStamp of the bound import field.
-        **/
+        **/
-        void BoundImportDirectory::setTimeDateStamp(dword dwBidnr, dword dwTds)
+        void BoundImportDirectory::setTimeDateStamp(dword dwBidnr, dword dwTds)
-        {
+        {
-                m_vIbd[dwBidnr].ibdDescriptor.TimeDateStamp = dwTds;
+                m_vIbd[dwBidnr].ibdDescriptor.TimeDateStamp = dwTds;
-        }
+        }
-        /**
+        /**
-        * Changes the OffsetModuleName value of an existing bound import field.
+        * Changes the OffsetModuleName value of an existing bound import field.
-        * @param dwBidnr Number of the bound import field which will be changed.
+        * @param dwBidnr Number of the bound import field which will be changed.
-        * @param wOmn New value of the OffsetModuleName of the bound import field.
+        * @param wOmn New value of the OffsetModuleName of the bound import field.
-        **/
+        **/
-        void BoundImportDirectory::setOffsetModuleName(dword dwBidnr, word wOmn)
+        void BoundImportDirectory::setOffsetModuleName(dword dwBidnr, word wOmn)
-        {
+        {
-                m_vIbd[dwBidnr].ibdDescriptor.OffsetModuleName = wOmn;
+                m_vIbd[dwBidnr].ibdDescriptor.OffsetModuleName = wOmn;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Changes the NumberOfModuleForwarderRefs value of an existing bound import field.
+        * Changes the NumberOfModuleForwarderRefs value of an existing bound import field.
-        * @param dwBidnr Number of the bound import field which will be changed.
+        * @param dwBidnr Number of the bound import field which will be changed.
-        * @param wMfr New value of the NumberOfModuleForwarderRefs of the bound import field.
+        * @param wMfr New value of the NumberOfModuleForwarderRefs of the bound import field.
-        **/
+        **/
-        void BoundImportDirectory::setNumberOfModuleForwarderRefs(dword dwBidnr, word wMfr)
+        void BoundImportDirectory::setNumberOfModuleForwarderRefs(dword dwBidnr, word wMfr)
-        {
+        {
-                m_vIbd[dwBidnr].ibdDescriptor.NumberOfModuleForwarderRefs = wMfr;
+                m_vIbd[dwBidnr].ibdDescriptor.NumberOfModuleForwarderRefs = wMfr;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Changes the ModuleName value of an existing bound import field.
+        * Changes the ModuleName value of an existing bound import field.
-        * @param dwBidnr Number of the bound import field which will be changed.
+        * @param dwBidnr Number of the bound import field which will be changed.
-        * @param strModuleName New value of the ModuleName of the bound import field.
+        * @param strModuleName New value of the ModuleName of the bound import field.
-        **/
+        **/
-        void BoundImportDirectory::setModuleName(dword dwBidnr, const std::string& strModuleName)
+        void BoundImportDirectory::setModuleName(dword dwBidnr, const std::string& strModuleName)
-        {
+        {
-                m_vIbd[dwBidnr].strModuleName = strModuleName;
+                m_vIbd[dwBidnr].strModuleName = strModuleName;
-        }
+        }
-        
+        
-        dword BoundImportDirectory::getTimeDateStamp(dword dwBidnr, dword forwardedModule) const
+        dword BoundImportDirectory::getTimeDateStamp(dword dwBidnr, dword forwardedModule) const
-        {
+        {
-                return m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.TimeDateStamp;
+                return m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.TimeDateStamp;
-        }
+        }
-        
+        
-        word BoundImportDirectory::getOffsetModuleName(dword dwBidnr, dword forwardedModule) const
+        word BoundImportDirectory::getOffsetModuleName(dword dwBidnr, dword forwardedModule) const
-        {
+        {
-                return m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.OffsetModuleName;
+                return m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.OffsetModuleName;
-        }
+        }
-        
+        
-        word BoundImportDirectory::getNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule) const
+        word BoundImportDirectory::getNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule) const
-        {
+        {
-                return m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.NumberOfModuleForwarderRefs;
+                return m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.NumberOfModuleForwarderRefs;
-        }
+        }
-        
+        
-        std::string BoundImportDirectory::getModuleName(dword dwBidnr, dword forwardedModule) const
+        std::string BoundImportDirectory::getModuleName(dword dwBidnr, dword forwardedModule) const
-        {
+        {
-                return m_vIbd[dwBidnr].moduleForwarders[forwardedModule].strModuleName;
+                return m_vIbd[dwBidnr].moduleForwarders[forwardedModule].strModuleName;
-        }
+        }
-        
+        
-        void BoundImportDirectory::setTimeDateStamp(dword dwBidnr, dword forwardedModule, dword dwTds)
+        void BoundImportDirectory::setTimeDateStamp(dword dwBidnr, dword forwardedModule, dword dwTds)
-        {
+        {
-                m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.TimeDateStamp = dwTds;
+                m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.TimeDateStamp = dwTds;
-        }
+        }
-        
+        
-        void BoundImportDirectory::setOffsetModuleName(dword dwBidnr, dword forwardedModule, word wOmn)
+        void BoundImportDirectory::setOffsetModuleName(dword dwBidnr, dword forwardedModule, word wOmn)
-        {
+        {
-                m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.OffsetModuleName = wOmn;
+                m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.OffsetModuleName = wOmn;
-        }
+        }
-        
+        
-        void BoundImportDirectory::setNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule, word wMfr)
+        void BoundImportDirectory::setNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule, word wMfr)
-        {
+        {
-                m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.NumberOfModuleForwarderRefs = wMfr;
+                m_vIbd[dwBidnr].moduleForwarders[forwardedModule].ibdDescriptor.NumberOfModuleForwarderRefs = wMfr;
-        }
+        }
-        void BoundImportDirectory::setModuleName(dword dwBidnr, dword forwardedModule, const std::string& strModuleName)
+        void BoundImportDirectory::setModuleName(dword dwBidnr, dword forwardedModule, const std::string& strModuleName)
-        {
+        {
-                m_vIbd[dwBidnr].moduleForwarders[forwardedModule].strModuleName = strModuleName;
+                m_vIbd[dwBidnr].moduleForwarders[forwardedModule].strModuleName = strModuleName;
-        }
+        }
-        
+        
-        word BoundImportDirectory::calcNumberOfModuleForwarderRefs(dword dwBidnr) const
+        word BoundImportDirectory::calcNumberOfModuleForwarderRefs(dword dwBidnr) const
-        {
+        {
-                return static_cast<word>(m_vIbd[dwBidnr].moduleForwarders.size());
+                return static_cast<word>(m_vIbd[dwBidnr].moduleForwarders.size());
-        }
+        }
-        
+        
-        void BoundImportDirectory::addForwardedModule(dword dwBidnr, const std::string& name, dword timeStamp, word offsetModuleName, word forwardedModules)
+        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: Maybe test if there are already 0xFFFF forwarded modules.
-                // XXX: Check for duplicate entries. Is it also necessary to check
+                // XXX: Check for duplicate entries. Is it also necessary to check
-                //      non-forwarded entries and forwarded entries in other non-forwarded
+                //      non-forwarded entries and forwarded entries in other non-forwarded
-                //      entries?
+                //      entries?
-                // XXX: Can forwarders forward recursively?
+                // XXX: Can forwarders forward recursively?
-                
+                
-                PELIB_IMAGE_BOUND_DIRECTORY ibdCurrent;
+                PELIB_IMAGE_BOUND_DIRECTORY ibdCurrent;
-                ibdCurrent.strModuleName = name;
+                ibdCurrent.strModuleName = name;
-                ibdCurrent.ibdDescriptor.TimeDateStamp = timeStamp;
+                ibdCurrent.ibdDescriptor.TimeDateStamp = timeStamp;
-                ibdCurrent.ibdDescriptor.OffsetModuleName = offsetModuleName;
+                ibdCurrent.ibdDescriptor.OffsetModuleName = offsetModuleName;
-                ibdCurrent.ibdDescriptor.NumberOfModuleForwarderRefs = forwardedModules;
+                ibdCurrent.ibdDescriptor.NumberOfModuleForwarderRefs = forwardedModules;
-                
+                
-                m_vIbd[dwBidnr].moduleForwarders.push_back(ibdCurrent);
+                m_vIbd[dwBidnr].moduleForwarders.push_back(ibdCurrent);
-        }
+        }
-        
+        
-        void BoundImportDirectory::removeForwardedModule(dword dwBidnr, word forwardedModule)
+        void BoundImportDirectory::removeForwardedModule(dword dwBidnr, word forwardedModule)
-        {
+        {
-                m_vIbd[dwBidnr].moduleForwarders.erase(m_vIbd[dwBidnr].moduleForwarders.begin() + 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.
+* BoundImportDirectory.h - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#ifndef BOUNDIMPORTDIRECTORY_H
+#ifndef BOUNDIMPORTDIRECTORY_H
-#define BOUNDIMPORTDIRECTORY_H
+#define BOUNDIMPORTDIRECTORY_H
-#include "PeLibAux.h"
+#include "PeLibAux.h"
-namespace PeLib
+namespace PeLib
-{
+{
-        /// Class that handles the BoundImport directory.
+        /// Class that handles the BoundImport directory.
-        /**
+        /**
-        * This class can read and modify the BoundImport directory table of a PE file.
+        * This class can read and modify the BoundImport directory table of a PE file.
-        **/
+        **/
-        class BoundImportDirectory
+        class BoundImportDirectory
-        {
+        {
-                private:
+                private:
-                  std::vector<PELIB_IMAGE_BOUND_DIRECTORY> m_vIbd; ///< Stores the individual BoundImport fields.
+                  std::vector<PELIB_IMAGE_BOUND_DIRECTORY> m_vIbd; ///< Stores the individual BoundImport fields.
-                  
+                  
-                  int read(InputBuffer& inpBuffer, unsigned char* data, unsigned int dwSize);
+                  int read(InputBuffer& inpBuffer, unsigned char* data, unsigned int dwSize);
-                  unsigned int totalModules() const;
+                  unsigned int totalModules() const;
-                public:
+                public:
-                  /// Adds another bound import.
+                  /// Adds another bound import.
-                  int addBoundImport(const std::string& strModuleName, dword dwTds, word dwOmn, word wWfr); // EXPORT
+                  int addBoundImport(const std::string& strModuleName, dword dwTds, word dwOmn, word wWfr); // EXPORT
-                  /// Identifies a module through it's name.
+                  /// Identifies a module through it's name.
-                  int getModuleIndex(const std::string& strModuleName) const; // EXPORT
+                  int getModuleIndex(const std::string& strModuleName) const; // EXPORT
-                  /// Returns the number of files in the BoundImport directory.
+                  /// Returns the number of files in the BoundImport directory.
-                  unsigned int calcNumberOfModules() const; // EXPORT
+                  unsigned int calcNumberOfModules() const; // EXPORT
-                  /// Reads the BoundImport directory table from a PE file.
+                  /// Reads the BoundImport directory table from a PE file.
-                  int read(const std::string& strFileName, dword dwOffset, unsigned int uiSize); // EXPORT
+                  int read(const std::string& strFileName, dword dwOffset, unsigned int uiSize); // EXPORT
-                  int read(unsigned char* pcBuffer, unsigned int uiSize); // EXPORT
+                  int read(unsigned char* pcBuffer, unsigned int uiSize); // EXPORT
-                  /// Rebuilds the BoundImport directory.
+                  /// Rebuilds the BoundImport directory.
-                  void rebuild(std::vector<byte>& vBuffer, bool fMakeValid = true) const; // EXPORT
+                  void rebuild(std::vector<byte>& vBuffer, bool fMakeValid = true) const; // EXPORT
-                  /// Empties the BoundImport directory.
+                  /// Empties the BoundImport directory.
-                  void clear(); // EXPORT
+                  void clear(); // EXPORT
-                  /// Removes a bound import.
+                  /// Removes a bound import.
-                  void removeBoundImport(const std::string& strModuleName); // EXPORT
+                  void removeBoundImport(const std::string& strModuleName); // EXPORT
-                  /// Returns the size of the BoundImport directory.
+                  /// Returns the size of the BoundImport directory.
-                  unsigned int size() const; // EXPORT
+                  unsigned int size() const; // EXPORT
-                  /// Writes the current bound import directory to a file.
+                  /// Writes the current bound import directory to a file.
-                  int write(const std::string& strFilename, dword dwOffset, bool fMakeValid = true) const; // EXPORT
+                  int write(const std::string& strFilename, dword dwOffset, bool fMakeValid = true) const; // EXPORT
-                  /// Retrieves the TimeDateStamp value of a bound import.
+                  /// Retrieves the TimeDateStamp value of a bound import.
-                  dword getTimeDateStamp(dword dwBidnr) const; // EXPORT
+                  dword getTimeDateStamp(dword dwBidnr) const; // EXPORT
-                  /// Retrieves the OffsetModuleName value of a bound import.
+                  /// Retrieves the OffsetModuleName value of a bound import.
-                  word getOffsetModuleName(dword dwBidnr) const; // EXPORT
+                  word getOffsetModuleName(dword dwBidnr) const; // EXPORT
-                  /// Retrieves the NumberOfModuleForwarderRefs value of a bound import.
+                  /// Retrieves the NumberOfModuleForwarderRefs value of a bound import.
-                  word getNumberOfModuleForwarderRefs(dword dwBidnr) const; // EXPORT
+                  word getNumberOfModuleForwarderRefs(dword dwBidnr) const; // EXPORT
-                  /// Retrieves the ModuleName value of a bound import.
+                  /// Retrieves the ModuleName value of a bound import.
-                  std::string getModuleName(dword dwBidnr) const; // EXPORT
+                  std::string getModuleName(dword dwBidnr) const; // EXPORT
-                  /// Updates the TimeDateStamp value of a bound import.
+                  /// Updates the TimeDateStamp value of a bound import.
-                  void setTimeDateStamp(dword dwBidnr, dword dwTds); // EXPORT
+                  void setTimeDateStamp(dword dwBidnr, dword dwTds); // EXPORT
-                  /// Updates the OffsetModuleName value of a bound import.
+                  /// Updates the OffsetModuleName value of a bound import.
-                  void setOffsetModuleName(dword dwBidnr, word wOmn); // EXPORT
+                  void setOffsetModuleName(dword dwBidnr, word wOmn); // EXPORT
-                  /// Updates the NumberOfModuleForwarderRefs value of a bound import.
+                  /// Updates the NumberOfModuleForwarderRefs value of a bound import.
-                  void setNumberOfModuleForwarderRefs(dword dwBidnr, word wMfr); // EXPORT
+                  void setNumberOfModuleForwarderRefs(dword dwBidnr, word wMfr); // EXPORT
-                  /// Updates the ModuleName value of a bound import.
+                  /// Updates the ModuleName value of a bound import.
-                  void setModuleName(dword dwBidnr, const std::string& strModuleName); // EXPORT
+                  void setModuleName(dword dwBidnr, const std::string& strModuleName); // EXPORT
-                  
+                  
-                  dword getTimeDateStamp(dword dwBidnr, dword forwardedModule) const; // EXPORT _module
+                  dword getTimeDateStamp(dword dwBidnr, dword forwardedModule) const; // EXPORT _module
-                  word getOffsetModuleName(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
+                  word getNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule) const; // EXPORT _module
-                  std::string getModuleName(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 setTimeDateStamp(dword dwBidnr, dword forwardedModule, dword dwTds); // EXPORT _module
-                  void setOffsetModuleName(dword dwBidnr, dword forwardedModule, word wOmn); // EXPORT _module
+                  void setOffsetModuleName(dword dwBidnr, dword forwardedModule, word wOmn); // EXPORT _module
-                  void setNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule, word wMfr); // EXPORT _module
+                  void setNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule, word wMfr); // EXPORT _module
-                  void setModuleName(dword dwBidnr, dword forwardedModule, const std::string& strModuleName); // EXPORT _module
+                  void setModuleName(dword dwBidnr, dword forwardedModule, const std::string& strModuleName); // EXPORT _module
-                  
+                  
-                  word calcNumberOfModuleForwarderRefs(dword dwBidnr) const; // EXPORT
+                  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 addForwardedModule(dword dwBidnr, const std::string& name, dword timeStamp = 0, word offsetModuleName = 0, word forwardedModules = 0); // EXPORT
-                  void removeForwardedModule(dword dwBidnr, word forwardedModule); // EXPORT
+                  void removeForwardedModule(dword dwBidnr, word forwardedModule); // EXPORT
-        };
+        };
-}
+}
-#endif
+#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.
+* ComHeaderDirectory.cpp - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#include "PeLibInc.h"
+#include "PeLibInc.h"
-#include "ComHeaderDirectory.h"
+#include "ComHeaderDirectory.h"
-namespace PeLib
+namespace PeLib
-{
+{
-        void ComHeaderDirectory::read(InputBuffer& inputbuffer)
+        void ComHeaderDirectory::read(InputBuffer& inputbuffer)
-        {
+        {
-                PELIB_IMAGE_COR20_HEADER ichCurr;
+                PELIB_IMAGE_COR20_HEADER ichCurr;
-                
+                
-                inputbuffer >> ichCurr.cb;
+                inputbuffer >> ichCurr.cb;
-                inputbuffer >> ichCurr.MajorRuntimeVersion;
+                inputbuffer >> ichCurr.MajorRuntimeVersion;
-                inputbuffer >> ichCurr.MinorRuntimeVersion;
+                inputbuffer >> ichCurr.MinorRuntimeVersion;
-                inputbuffer >> ichCurr.MetaData.VirtualAddress;
+                inputbuffer >> ichCurr.MetaData.VirtualAddress;
-                inputbuffer >> ichCurr.MetaData.Size;
+                inputbuffer >> ichCurr.MetaData.Size;
-                inputbuffer >> ichCurr.Flags;
+                inputbuffer >> ichCurr.Flags;
-                inputbuffer >> ichCurr.EntryPointToken;
+                inputbuffer >> ichCurr.EntryPointToken;
-                inputbuffer >> ichCurr.Resources.VirtualAddress;
+                inputbuffer >> ichCurr.Resources.VirtualAddress;
-                inputbuffer >> ichCurr.Resources.Size;
+                inputbuffer >> ichCurr.Resources.Size;
-                inputbuffer >> ichCurr.StrongNameSignature.VirtualAddress;
+                inputbuffer >> ichCurr.StrongNameSignature.VirtualAddress;
-                inputbuffer >> ichCurr.StrongNameSignature.Size;
+                inputbuffer >> ichCurr.StrongNameSignature.Size;
-                inputbuffer >> ichCurr.CodeManagerTable.VirtualAddress;
+                inputbuffer >> ichCurr.CodeManagerTable.VirtualAddress;
-                inputbuffer >> ichCurr.CodeManagerTable.Size;
+                inputbuffer >> ichCurr.CodeManagerTable.Size;
-                inputbuffer >> ichCurr.VTableFixups.VirtualAddress;
+                inputbuffer >> ichCurr.VTableFixups.VirtualAddress;
-                inputbuffer >> ichCurr.VTableFixups.Size;
+                inputbuffer >> ichCurr.VTableFixups.Size;
-                inputbuffer >> ichCurr.ExportAddressTableJumps.VirtualAddress;
+                inputbuffer >> ichCurr.ExportAddressTableJumps.VirtualAddress;
-                inputbuffer >> ichCurr.ExportAddressTableJumps.Size;
+                inputbuffer >> ichCurr.ExportAddressTableJumps.Size;
-                inputbuffer >> ichCurr.ManagedNativeHeader.VirtualAddress;
+                inputbuffer >> ichCurr.ManagedNativeHeader.VirtualAddress;
-                inputbuffer >> ichCurr.ManagedNativeHeader.Size;
+                inputbuffer >> ichCurr.ManagedNativeHeader.Size;
-                
+                
-                std::swap(ichCurr, m_ichComHeader);
+                std::swap(ichCurr, m_ichComHeader);
-        }
+        }
-        
+        
-        int ComHeaderDirectory::read(unsigned char* buffer, unsigned int buffersize)
+        int ComHeaderDirectory::read(unsigned char* buffer, unsigned int buffersize)
-        {
+        {
-                if (buffersize < PELIB_IMAGE_COR20_HEADER::size())
+                if (buffersize < PELIB_IMAGE_COR20_HEADER::size())
-                {
+                {
-                        return ERROR_INVALID_FILE;
+                        return ERROR_INVALID_FILE;
-                }
+                }
-                
+                
-                std::vector<byte> vComDescDirectory(buffer, buffer + buffersize);
+                std::vector<byte> vComDescDirectory(buffer, buffer + buffersize);
-                
+                
-                InputBuffer ibBuffer(vComDescDirectory);
+                InputBuffer ibBuffer(vComDescDirectory);
-                read(ibBuffer);
+                read(ibBuffer);
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Reads a file's COM+ descriptor.
+        * Reads a file's COM+ descriptor.
-        * @param strFilename Name of the file.
+        * @param strFilename Name of the file.
-        * @param uiOffset File offset of the COM+ descriptor.
+        * @param uiOffset File offset of the COM+ descriptor.
-        * @param uiSize Size of the COM+ descriptor.
+        * @param uiSize Size of the COM+ descriptor.
-        **/
+        **/
-        int ComHeaderDirectory::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize)
+        int ComHeaderDirectory::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize)
-        {
+        {
-                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
+                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
-                unsigned int ulFileSize = fileSize(ifFile);
+                unsigned int ulFileSize = fileSize(ifFile);
-                if (!ifFile)
+                if (!ifFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                
+                
-                if (ulFileSize < uiOffset + uiSize)
+                if (ulFileSize < uiOffset + uiSize)
-                {
+                {
-                        return ERROR_INVALID_FILE;
+                        return ERROR_INVALID_FILE;
-                }
+                }
-                ifFile.seekg(uiOffset, std::ios::beg);
+                ifFile.seekg(uiOffset, std::ios::beg);
-                std::vector<byte> vComDescDirectory(uiSize);
+                std::vector<byte> vComDescDirectory(uiSize);
-                ifFile.read(reinterpret_cast<char*>(&vComDescDirectory[0]), uiSize);
+                ifFile.read(reinterpret_cast<char*>(&vComDescDirectory[0]), uiSize);
-                
+                
-                InputBuffer ibBuffer(vComDescDirectory);
+                InputBuffer ibBuffer(vComDescDirectory);
-                read(ibBuffer);
+                read(ibBuffer);
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Rebuilds the current COM+ descriptor.
+        * Rebuilds the current COM+ descriptor.
-        * @param vBuffer Buffer where the COM+ descriptor will be written to.
+        * @param vBuffer Buffer where the COM+ descriptor will be written to.
-        **/
+        **/
-        void ComHeaderDirectory::rebuild(std::vector<byte>& vBuffer) const
+        void ComHeaderDirectory::rebuild(std::vector<byte>& vBuffer) const
-        {
+        {
-                OutputBuffer obBuffer(vBuffer);
+                OutputBuffer obBuffer(vBuffer);
-                
+                
-                obBuffer << m_ichComHeader.cb;
+                obBuffer << m_ichComHeader.cb;
-                obBuffer << m_ichComHeader.MajorRuntimeVersion;
+                obBuffer << m_ichComHeader.MajorRuntimeVersion;
-                obBuffer << m_ichComHeader.MinorRuntimeVersion;
+                obBuffer << m_ichComHeader.MinorRuntimeVersion;
-                obBuffer << m_ichComHeader.MetaData.VirtualAddress;
+                obBuffer << m_ichComHeader.MetaData.VirtualAddress;
-                obBuffer << m_ichComHeader.MetaData.Size;
+                obBuffer << m_ichComHeader.MetaData.Size;
-                obBuffer << m_ichComHeader.Flags;
+                obBuffer << m_ichComHeader.Flags;
-                obBuffer << m_ichComHeader.EntryPointToken;
+                obBuffer << m_ichComHeader.EntryPointToken;
-                obBuffer << m_ichComHeader.Resources.VirtualAddress;
+                obBuffer << m_ichComHeader.Resources.VirtualAddress;
-                obBuffer << m_ichComHeader.Resources.Size;
+                obBuffer << m_ichComHeader.Resources.Size;
-                obBuffer << m_ichComHeader.StrongNameSignature.VirtualAddress;
+                obBuffer << m_ichComHeader.StrongNameSignature.VirtualAddress;
-                obBuffer << m_ichComHeader.StrongNameSignature.Size;
+                obBuffer << m_ichComHeader.StrongNameSignature.Size;
-                obBuffer << m_ichComHeader.CodeManagerTable.VirtualAddress;
+                obBuffer << m_ichComHeader.CodeManagerTable.VirtualAddress;
-                obBuffer << m_ichComHeader.CodeManagerTable.Size;
+                obBuffer << m_ichComHeader.CodeManagerTable.Size;
-                obBuffer << m_ichComHeader.VTableFixups.VirtualAddress;
+                obBuffer << m_ichComHeader.VTableFixups.VirtualAddress;
-                obBuffer << m_ichComHeader.VTableFixups.Size;
+                obBuffer << m_ichComHeader.VTableFixups.Size;
-                obBuffer << m_ichComHeader.ExportAddressTableJumps.VirtualAddress;
+                obBuffer << m_ichComHeader.ExportAddressTableJumps.VirtualAddress;
-                obBuffer << m_ichComHeader.ExportAddressTableJumps.Size;
+                obBuffer << m_ichComHeader.ExportAddressTableJumps.Size;
-                obBuffer << m_ichComHeader.ManagedNativeHeader.VirtualAddress;
+                obBuffer << m_ichComHeader.ManagedNativeHeader.VirtualAddress;
-                obBuffer << m_ichComHeader.ManagedNativeHeader.Size;
+                obBuffer << m_ichComHeader.ManagedNativeHeader.Size;
-        }
+        }
-        /**
+        /**
-        * @return Size in bytes.
+        * @return Size in bytes.
-        **/
+        **/
-        unsigned int ComHeaderDirectory::size() const
+        unsigned int ComHeaderDirectory::size() const
-        {
+        {
-                return PELIB_IMAGE_COR20_HEADER::size();
+                return PELIB_IMAGE_COR20_HEADER::size();
-        }
+        }
-        /**
+        /**
-        * @param strFilename Name of the file.
+        * @param strFilename Name of the file.
-        * @param dwOffset File offset the COM+ descriptor will be written to.
+        * @param dwOffset File offset the COM+ descriptor will be written to.
-        **/
+        **/
-        int ComHeaderDirectory::write(const std::string& strFilename, unsigned int dwOffset) const
+        int ComHeaderDirectory::write(const std::string& strFilename, unsigned int dwOffset) const
-        {
+        {
-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        ofFile.clear();
+                        ofFile.clear();
-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                else
+                else
-                {
+                {
-                        ofFile.close();
+                        ofFile.close();
-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                ofFile.seekp(dwOffset, std::ios::beg);
+                ofFile.seekp(dwOffset, std::ios::beg);
-                std::vector<unsigned char> vBuffer;
+                std::vector<unsigned char> vBuffer;
-                rebuild(vBuffer);
+                rebuild(vBuffer);
-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
-                ofFile.close();
+                ofFile.close();
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * @return SizeOfHeader value of the current COM+ descriptor.
+        * @return SizeOfHeader value of the current COM+ descriptor.
-        **/
+        **/
-        dword ComHeaderDirectory::getSizeOfHeader() const
+        dword ComHeaderDirectory::getSizeOfHeader() const
-        {
+        {
-                return m_ichComHeader.cb;
+                return m_ichComHeader.cb;
-        }
+        }
-        /**
+        /**
-        * @return MajorRuntimeVersion value of the current COM+ descriptor.
+        * @return MajorRuntimeVersion value of the current COM+ descriptor.
-        **/
+        **/
-        word ComHeaderDirectory::getMajorRuntimeVersion() const
+        word ComHeaderDirectory::getMajorRuntimeVersion() const
-        {
+        {
-                return m_ichComHeader.MajorRuntimeVersion;
+                return m_ichComHeader.MajorRuntimeVersion;
-        }
+        }
-        /**
+        /**
-        * @return MinorRuntimeVersion value of the current COM+ descriptor.
+        * @return MinorRuntimeVersion value of the current COM+ descriptor.
-        **/
+        **/
-        word ComHeaderDirectory::getMinorRuntimeVersion() const
+        word ComHeaderDirectory::getMinorRuntimeVersion() const
-        {
+        {
-                return m_ichComHeader.MinorRuntimeVersion;
+                return m_ichComHeader.MinorRuntimeVersion;
-        }
+        }
-        /**
+        /**
-        * @return MetaData (Virtual Address) value of the current COM+ descriptor.
+        * @return MetaData (Virtual Address) value of the current COM+ descriptor.
-        **/
+        **/
-        dword ComHeaderDirectory::getMetaDataVa() const
+        dword ComHeaderDirectory::getMetaDataVa() const
-        {
+        {
-                return m_ichComHeader.MetaData.VirtualAddress;
+                return m_ichComHeader.MetaData.VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * @return MetaData (Size) value of the current COM+ descriptor.
+        * @return MetaData (Size) value of the current COM+ descriptor.
-        **/
+        **/
-        dword ComHeaderDirectory::getMetaDataSize() const
+        dword ComHeaderDirectory::getMetaDataSize() const
-        {
+        {
-                return m_ichComHeader.MetaData.Size;
+                return m_ichComHeader.MetaData.Size;
-        }
+        }
-        /**
+        /**
-        * @return Flags value of the current COM+ descriptor.
+        * @return Flags value of the current COM+ descriptor.
-        **/
+        **/
-        dword ComHeaderDirectory::getFlags() const
+        dword ComHeaderDirectory::getFlags() const
-        {
+        {
-                return m_ichComHeader.Flags;
+                return m_ichComHeader.Flags;
-        }
+        }
-        /**
+        /**
-        * @return EntryPointToken value of the current COM+ descriptor.
+        * @return EntryPointToken value of the current COM+ descriptor.
-        **/
+        **/
-        dword ComHeaderDirectory::getEntryPointToken() const
+        dword ComHeaderDirectory::getEntryPointToken() const
-        {
+        {
-                return m_ichComHeader.EntryPointToken;
+                return m_ichComHeader.EntryPointToken;
-        }
+        }
-        /**
+        /**
-        * @return Resources (Virtual Address) value of the current COM+ descriptor.
+        * @return Resources (Virtual Address) value of the current COM+ descriptor.
-        **/
+        **/
-        dword ComHeaderDirectory::getResourcesVa() const
+        dword ComHeaderDirectory::getResourcesVa() const
-        {
+        {
-                return m_ichComHeader.Resources.VirtualAddress;
+                return m_ichComHeader.Resources.VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * @return Resources (Size) value of the current COM+ descriptor.
+        * @return Resources (Size) value of the current COM+ descriptor.
-        **/
+        **/
-        dword ComHeaderDirectory::getResourcesSize()
+        dword ComHeaderDirectory::getResourcesSize()
-        {
+        {
-                return m_ichComHeader.Resources.Size;
+                return m_ichComHeader.Resources.Size;
-        }
+        }
-        /**
+        /**
-        * @return StrongNameSignature (Virtual Address) value of the current COM+ descriptor.
+        * @return StrongNameSignature (Virtual Address) value of the current COM+ descriptor.
-        **/
+        **/
-        dword ComHeaderDirectory::getStrongNameSignatureVa() const
+        dword ComHeaderDirectory::getStrongNameSignatureVa() const
-        {
+        {
-                return m_ichComHeader.StrongNameSignature.VirtualAddress;
+                return m_ichComHeader.StrongNameSignature.VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * @return StrongNameSignature (Size) value of the current COM+ descriptor.
+        * @return StrongNameSignature (Size) value of the current COM+ descriptor.
-        **/
+        **/
-        dword ComHeaderDirectory::getStrongNameSignagureSize() const
+        dword ComHeaderDirectory::getStrongNameSignagureSize() const
-        {
+        {
-                return m_ichComHeader.StrongNameSignature.Size;
+                return m_ichComHeader.StrongNameSignature.Size;
-        }
+        }
-        /**
+        /**
-        * @return CodeManagerTable (Virtual Address) value of the current COM+ descriptor.
+        * @return CodeManagerTable (Virtual Address) value of the current COM+ descriptor.
-        **/
+        **/
-        dword ComHeaderDirectory::getCodeManagerTableVa() const
+        dword ComHeaderDirectory::getCodeManagerTableVa() const
-        {
+        {
-                return m_ichComHeader.CodeManagerTable.VirtualAddress;
+                return m_ichComHeader.CodeManagerTable.VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * @return CodeManagerTable (Size) value of the current COM+ descriptor.
+        * @return CodeManagerTable (Size) value of the current COM+ descriptor.
-        **/
+        **/
-        dword ComHeaderDirectory::getCodeManagerTableSize() const
+        dword ComHeaderDirectory::getCodeManagerTableSize() const
-        {
+        {
-                return m_ichComHeader.CodeManagerTable.Size;
+                return m_ichComHeader.CodeManagerTable.Size;
-        }
+        }
-        /**
+        /**
-        * @return VTableFixups (Virtual Address) value of the current COM+ descriptor.
+        * @return VTableFixups (Virtual Address) value of the current COM+ descriptor.
-        **/
+        **/
-        dword ComHeaderDirectory::getVTableFixupsVa() const
+        dword ComHeaderDirectory::getVTableFixupsVa() const
-        {
+        {
-                return m_ichComHeader.VTableFixups.VirtualAddress;
+                return m_ichComHeader.VTableFixups.VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * @return VTableFixups (Size) value of the current COM+ descriptor.
+        * @return VTableFixups (Size) value of the current COM+ descriptor.
-        **/
+        **/
-        dword ComHeaderDirectory::getVTableFixupsSize() const
+        dword ComHeaderDirectory::getVTableFixupsSize() const
-        {
+        {
-                return m_ichComHeader.VTableFixups.Size;
+                return m_ichComHeader.VTableFixups.Size;
-        }
+        }
-        /**
+        /**
-        * @return ExportAddressTableJumps (Virtual Address) value of the current COM+ descriptor.
+        * @return ExportAddressTableJumps (Virtual Address) value of the current COM+ descriptor.
-        **/
+        **/
-        dword ComHeaderDirectory::getExportAddressTableJumpsVa() const
+        dword ComHeaderDirectory::getExportAddressTableJumpsVa() const
-        {
+        {
-                return m_ichComHeader.ExportAddressTableJumps.VirtualAddress;
+                return m_ichComHeader.ExportAddressTableJumps.VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * @return ExportAddressTableJumps (Size) value of the current COM+ descriptor.
+        * @return ExportAddressTableJumps (Size) value of the current COM+ descriptor.
-        **/
+        **/
-        dword ComHeaderDirectory::getExportAddressTableJumpsSize() const
+        dword ComHeaderDirectory::getExportAddressTableJumpsSize() const
-        {
+        {
-                return m_ichComHeader.ExportAddressTableJumps.Size;
+                return m_ichComHeader.ExportAddressTableJumps.Size;
-        }
+        }
-        /**
+        /**
-        * @return ManagedNativeHeader (Virtual Address) value of the current COM+ descriptor.
+        * @return ManagedNativeHeader (Virtual Address) value of the current COM+ descriptor.
-        **/
+        **/
-        dword ComHeaderDirectory::getManagedNativeHeaderVa() const
+        dword ComHeaderDirectory::getManagedNativeHeaderVa() const
-        {
+        {
-                return m_ichComHeader.ManagedNativeHeader.VirtualAddress;
+                return m_ichComHeader.ManagedNativeHeader.VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * @return ManagedNativeHeader (Size) value of the current COM+ descriptor.
+        * @return ManagedNativeHeader (Size) value of the current COM+ descriptor.
-        **/
+        **/
-        dword ComHeaderDirectory::getManagedNativeHeaderSize() const
+        dword ComHeaderDirectory::getManagedNativeHeaderSize() const
-        {
+        {
-                return m_ichComHeader.ManagedNativeHeader.Size;
+                return m_ichComHeader.ManagedNativeHeader.Size;
-        }
+        }
-        /**
+        /**
-        * @param dwValue New value for the current SizeOfHeader (cb) value.
+        * @param dwValue New value for the current SizeOfHeader (cb) value.
-        **/
+        **/
-        void ComHeaderDirectory::setSizeOfHeader(dword dwValue)
+        void ComHeaderDirectory::setSizeOfHeader(dword dwValue)
-        {
+        {
-                m_ichComHeader.cb = dwValue;
+                m_ichComHeader.cb = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param wValue New value for the current MajorRuntimeVersion value.
+        * @param wValue New value for the current MajorRuntimeVersion value.
-        **/
+        **/
-        void ComHeaderDirectory::setMajorRuntimeVersion(word wValue)
+        void ComHeaderDirectory::setMajorRuntimeVersion(word wValue)
-        {
+        {
-                m_ichComHeader.MajorRuntimeVersion = wValue;
+                m_ichComHeader.MajorRuntimeVersion = wValue;
-        }
+        }
-        /**
+        /**
-        * @param wValue New value for the current MinorRuntimeVersion value.
+        * @param wValue New value for the current MinorRuntimeVersion value.
-        **/
+        **/
-        void ComHeaderDirectory::setMinorRuntimeVersion(word wValue)
+        void ComHeaderDirectory::setMinorRuntimeVersion(word wValue)
-        {
+        {
-                m_ichComHeader.MinorRuntimeVersion = wValue;
+                m_ichComHeader.MinorRuntimeVersion = wValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue New value for the current MetaData (VirtualAddress) value.
+        * @param dwValue New value for the current MetaData (VirtualAddress) value.
-        **/
+        **/
-        void ComHeaderDirectory::setMetaDataVa(dword dwValue)
+        void ComHeaderDirectory::setMetaDataVa(dword dwValue)
-        {
+        {
-                m_ichComHeader.MetaData.VirtualAddress = dwValue;
+                m_ichComHeader.MetaData.VirtualAddress = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue New value for the current MetaData (Size) value.
+        * @param dwValue New value for the current MetaData (Size) value.
-        **/
+        **/
-        void ComHeaderDirectory::setMetaDataSize(dword dwValue)
+        void ComHeaderDirectory::setMetaDataSize(dword dwValue)
-        {
+        {
-                m_ichComHeader.MetaData.Size = dwValue;
+                m_ichComHeader.MetaData.Size = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue New value for the current Flags value.
+        * @param dwValue New value for the current Flags value.
-        **/
+        **/
-        void ComHeaderDirectory::setFlags(dword dwValue)
+        void ComHeaderDirectory::setFlags(dword dwValue)
-        {
+        {
-                m_ichComHeader.Flags = dwValue;
+                m_ichComHeader.Flags = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue New value for the current EntryPointToken value.
+        * @param dwValue New value for the current EntryPointToken value.
-        **/
+        **/
-        void ComHeaderDirectory::setEntryPointToken(dword dwValue)
+        void ComHeaderDirectory::setEntryPointToken(dword dwValue)
-        {
+        {
-                m_ichComHeader.EntryPointToken = dwValue;
+                m_ichComHeader.EntryPointToken = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue New value for the current Resources (VirtualAddress) value.
+        * @param dwValue New value for the current Resources (VirtualAddress) value.
-        **/
+        **/
-        void ComHeaderDirectory::setResourcesVa(dword dwValue)
+        void ComHeaderDirectory::setResourcesVa(dword dwValue)
-        {
+        {
-                m_ichComHeader.Resources.VirtualAddress = dwValue;
+                m_ichComHeader.Resources.VirtualAddress = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue New value for the current Resources (Size) value.
+        * @param dwValue New value for the current Resources (Size) value.
-        **/
+        **/
-        void ComHeaderDirectory::setResourcesSize(dword dwValue)
+        void ComHeaderDirectory::setResourcesSize(dword dwValue)
-        {
+        {
-                m_ichComHeader.Resources.Size = dwValue;
+                m_ichComHeader.Resources.Size = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue New value for the current StrongNameSignature (VirtualAddress) value.
+        * @param dwValue New value for the current StrongNameSignature (VirtualAddress) value.
-        **/
+        **/
-        void ComHeaderDirectory::setStrongNameSignatureVa(dword dwValue)
+        void ComHeaderDirectory::setStrongNameSignatureVa(dword dwValue)
-        {
+        {
-                m_ichComHeader.StrongNameSignature.VirtualAddress = dwValue;
+                m_ichComHeader.StrongNameSignature.VirtualAddress = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue New value for the current StrongNameSignature (Size) value.
+        * @param dwValue New value for the current StrongNameSignature (Size) value.
-        **/
+        **/
-        void ComHeaderDirectory::setStrongNameSignagureSize(dword dwValue)
+        void ComHeaderDirectory::setStrongNameSignagureSize(dword dwValue)
-        {
+        {
-                m_ichComHeader.StrongNameSignature.Size = dwValue;
+                m_ichComHeader.StrongNameSignature.Size = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue New value for the current CodeManagerTable (VirtualAddress) value.
+        * @param dwValue New value for the current CodeManagerTable (VirtualAddress) value.
-        **/
+        **/
-        void ComHeaderDirectory::setCodeManagerTableVa(dword dwValue)
+        void ComHeaderDirectory::setCodeManagerTableVa(dword dwValue)
-        {
+        {
-                m_ichComHeader.CodeManagerTable.VirtualAddress = dwValue;
+                m_ichComHeader.CodeManagerTable.VirtualAddress = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue New value for the current CodeManagerTable (Size) value.
+        * @param dwValue New value for the current CodeManagerTable (Size) value.
-        **/
+        **/
-        void ComHeaderDirectory::setCodeManagerTableSize(dword dwValue)
+        void ComHeaderDirectory::setCodeManagerTableSize(dword dwValue)
-        {
+        {
-                m_ichComHeader.CodeManagerTable.Size = dwValue;
+                m_ichComHeader.CodeManagerTable.Size = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue New value for the current VTableFixups (VirtualAddress) value.
+        * @param dwValue New value for the current VTableFixups (VirtualAddress) value.
-        **/
+        **/
-        void ComHeaderDirectory::setVTableFixupsVa(dword dwValue)
+        void ComHeaderDirectory::setVTableFixupsVa(dword dwValue)
-        {
+        {
-                m_ichComHeader.VTableFixups.VirtualAddress = dwValue;
+                m_ichComHeader.VTableFixups.VirtualAddress = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue New value for the current VTableFixups (Size) value.
+        * @param dwValue New value for the current VTableFixups (Size) value.
-        **/
+        **/
-        void ComHeaderDirectory::setVTableFixupsSize(dword dwValue)
+        void ComHeaderDirectory::setVTableFixupsSize(dword dwValue)
-        {
+        {
-                m_ichComHeader.VTableFixups.Size = dwValue;
+                m_ichComHeader.VTableFixups.Size = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue New value for the current ExportAddressTableJumps (VirtualAddress) value.
+        * @param dwValue New value for the current ExportAddressTableJumps (VirtualAddress) value.
-        **/
+        **/
-        void ComHeaderDirectory::setExportAddressTableJumpsVa(dword dwValue)
+        void ComHeaderDirectory::setExportAddressTableJumpsVa(dword dwValue)
-        {
+        {
-                m_ichComHeader.ExportAddressTableJumps.VirtualAddress = dwValue;
+                m_ichComHeader.ExportAddressTableJumps.VirtualAddress = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue New value for the current ExportAddressTableJumps (Size) value.
+        * @param dwValue New value for the current ExportAddressTableJumps (Size) value.
-        **/
+        **/
-        void ComHeaderDirectory::setExportAddressTableJumpsSize(dword dwValue)
+        void ComHeaderDirectory::setExportAddressTableJumpsSize(dword dwValue)
-        {
+        {
-                m_ichComHeader.ExportAddressTableJumps.Size = dwValue;
+                m_ichComHeader.ExportAddressTableJumps.Size = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue New value for the current ManagedNativeHeader (VirtualAddress) value.
+        * @param dwValue New value for the current ManagedNativeHeader (VirtualAddress) value.
-        **/
+        **/
-        void ComHeaderDirectory::setManagedNativeHeaderVa(dword dwValue)
+        void ComHeaderDirectory::setManagedNativeHeaderVa(dword dwValue)
-        {
+        {
-                m_ichComHeader.ManagedNativeHeader.VirtualAddress = dwValue;
+                m_ichComHeader.ManagedNativeHeader.VirtualAddress = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue New value for the current ManagedNativeHeader (Size) value.
+        * @param dwValue New value for the current ManagedNativeHeader (Size) value.
-        **/
+        **/
-        void ComHeaderDirectory::setManagedNativeHeaderSize(dword dwValue)
+        void ComHeaderDirectory::setManagedNativeHeaderSize(dword dwValue)
-        {
+        {
-                m_ichComHeader.ManagedNativeHeader.Size = 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.
+* ComHeaderDirectory.h - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#ifndef COMHEADERDIRECTORY_H
+#ifndef COMHEADERDIRECTORY_H
-#define COMHEADERDIRECTORY_H
+#define COMHEADERDIRECTORY_H
-namespace PeLib
+namespace PeLib
-{
+{
-        /// Class that handles the COM+ descriptor directory.
+        /// Class that handles the COM+ descriptor directory.
-        /**
+        /**
-        * This class handles the COM+ Descriptor directory which was added to PE files
+        * This class handles the COM+ Descriptor directory which was added to PE files
-        * which work with the .NET runtime modules.
+        * which work with the .NET runtime modules.
-        **/
+        **/
-        class ComHeaderDirectory
+        class ComHeaderDirectory
-        {
+        {
-                private:
+                private:
-                  PELIB_IMAGE_COR20_HEADER m_ichComHeader; ///< The COM+ descriptor.
+                  PELIB_IMAGE_COR20_HEADER m_ichComHeader; ///< The COM+ descriptor.
-                  
+                  
-                  void read(InputBuffer& inputbuffer);
+                  void read(InputBuffer& inputbuffer);
-                public:
+                public:
-                  /// Read a file's COM+ runtime descriptor directory.
+                  /// Read a file's COM+ runtime descriptor directory.
-                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize); // EXPORT
+                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize); // EXPORT
-                  int read(unsigned char* buffer, unsigned int buffersize); // EXPORT
+                  int read(unsigned char* buffer, unsigned int buffersize); // EXPORT
-                  /// Rebuild the COM+ descriptor.
+                  /// Rebuild the COM+ descriptor.
-                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT
+                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT
-                  /// Returns the size of the current COM+ descriptor.
+                  /// Returns the size of the current COM+ descriptor.
-                  unsigned int size() const; // EXPORT
+                  unsigned int size() const; // EXPORT
-                  /// Writes the current COM+ descriptor directory to a file.
+                  /// Writes the current COM+ descriptor directory to a file.
-                  int write(const std::string& strFilename, unsigned int dwOffset) const; // EXPORT
+                  int write(const std::string& strFilename, unsigned int dwOffset) const; // EXPORT
-                  /// Get the COM+ descriptor's SizeOfHeader (cb) value.
+                  /// Get the COM+ descriptor's SizeOfHeader (cb) value.
-                  dword getSizeOfHeader() const; // EXPORT
+                  dword getSizeOfHeader() const; // EXPORT
-                  /// Get the COM+ descriptor's MajorRuntimeVersion value.
+                  /// Get the COM+ descriptor's MajorRuntimeVersion value.
-                  word getMajorRuntimeVersion() const; // EXPORT
+                  word getMajorRuntimeVersion() const; // EXPORT
-                  /// Get the COM+ descriptor's MinorRuntimeVersion value.
+                  /// Get the COM+ descriptor's MinorRuntimeVersion value.
-                  word getMinorRuntimeVersion() const; // EXPORT
+                  word getMinorRuntimeVersion() const; // EXPORT
-                  /// Get the COM+ descriptor's MetaData (Virtual Address) value.
+                  /// Get the COM+ descriptor's MetaData (Virtual Address) value.
-                  dword getMetaDataVa() const; // EXPORT
+                  dword getMetaDataVa() const; // EXPORT
-                  /// Get the COM+ descriptor's MetaData (Size) value.
+                  /// Get the COM+ descriptor's MetaData (Size) value.
-                  dword getMetaDataSize() const; // EXPORT
+                  dword getMetaDataSize() const; // EXPORT
-                  /// Get the COM+ descriptor's Flags value.
+                  /// Get the COM+ descriptor's Flags value.
-                  dword getFlags() const; // EXPORT
+                  dword getFlags() const; // EXPORT
-                  /// Get the COM+ descriptor's EntryPointToken value.
+                  /// Get the COM+ descriptor's EntryPointToken value.
-                  dword getEntryPointToken() const; // EXPORT
+                  dword getEntryPointToken() const; // EXPORT
-                  /// Get the COM+ descriptor's Resources (Virtual Address) value.
+                  /// Get the COM+ descriptor's Resources (Virtual Address) value.
-                  dword getResourcesVa() const; // EXPORT
+                  dword getResourcesVa() const; // EXPORT
-                  /// Get the COM+ descriptor's Resources (Size) value.
+                  /// Get the COM+ descriptor's Resources (Size) value.
-                  dword getResourcesSize(); // EXPORT
+                  dword getResourcesSize(); // EXPORT
-                  /// Get the COM+ descriptor's StrongNameSignature (Virtual Address) value.
+                  /// Get the COM+ descriptor's StrongNameSignature (Virtual Address) value.
-                  dword getStrongNameSignatureVa() const; // EXPORT
+                  dword getStrongNameSignatureVa() const; // EXPORT
-                  /// Get the COM+ descriptor's StrongNameSignature (Size) value.
+                  /// Get the COM+ descriptor's StrongNameSignature (Size) value.
-                  dword getStrongNameSignagureSize() const; // EXPORT
+                  dword getStrongNameSignagureSize() const; // EXPORT
-                  /// Get the COM+ descriptor's CodeManagerTable (Virtual Address) value.
+                  /// Get the COM+ descriptor's CodeManagerTable (Virtual Address) value.
-                  dword getCodeManagerTableVa() const; // EXPORT
+                  dword getCodeManagerTableVa() const; // EXPORT
-                  /// Get the COM+ descriptor's CodeManagerTable (Size) value.
+                  /// Get the COM+ descriptor's CodeManagerTable (Size) value.
-                  dword getCodeManagerTableSize() const; // EXPORT
+                  dword getCodeManagerTableSize() const; // EXPORT
-                  /// Get the COM+ descriptor's VTableFixup (Virtual Address) value.
+                  /// Get the COM+ descriptor's VTableFixup (Virtual Address) value.
-                  dword getVTableFixupsVa() const; // EXPORT
+                  dword getVTableFixupsVa() const; // EXPORT
-                  /// Get the COM+ descriptor's VTableFixup (Size) value.
+                  /// Get the COM+ descriptor's VTableFixup (Size) value.
-                  dword getVTableFixupsSize() const; // EXPORT
+                  dword getVTableFixupsSize() const; // EXPORT
-                  /// Get the COM+ descriptor's ExportAddressTable (Virtual Address) value.
+                  /// Get the COM+ descriptor's ExportAddressTable (Virtual Address) value.
-                  dword getExportAddressTableJumpsVa() const; // EXPORT
+                  dword getExportAddressTableJumpsVa() const; // EXPORT
-                  /// Get the COM+ descriptor's ExportAddressTable (Size) value.
+                  /// Get the COM+ descriptor's ExportAddressTable (Size) value.
-                  dword getExportAddressTableJumpsSize() const; // EXPORT
+                  dword getExportAddressTableJumpsSize() const; // EXPORT
-                  /// Get the COM+ descriptor's ManagedNativeHeader (Virtual Address) value.
+                  /// Get the COM+ descriptor's ManagedNativeHeader (Virtual Address) value.
-                  dword getManagedNativeHeaderVa() const; // EXPORT
+                  dword getManagedNativeHeaderVa() const; // EXPORT
-                  /// Get the COM+ descriptor's ManagedNativeHeader (Size) value.
+                  /// Get the COM+ descriptor's ManagedNativeHeader (Size) value.
-                  dword getManagedNativeHeaderSize() const; // EXPORT
+                  dword getManagedNativeHeaderSize() const; // EXPORT
-                  /// Change the COM+ descriptor's SizeOfHeader (cb) value.
+                  /// Change the COM+ descriptor's SizeOfHeader (cb) value.
-                  void setSizeOfHeader(dword dwValue); // EXPORT
+                  void setSizeOfHeader(dword dwValue); // EXPORT
-                  /// Change the COM+ descriptor's MajorRuntimeVersion value.
+                  /// Change the COM+ descriptor's MajorRuntimeVersion value.
-                  void setMajorRuntimeVersion(word wValue); // EXPORT
+                  void setMajorRuntimeVersion(word wValue); // EXPORT
-                  /// Change the COM+ descriptor's MinorRuntimeVersion value.
+                  /// Change the COM+ descriptor's MinorRuntimeVersion value.
-                  void setMinorRuntimeVersion(word wValue); // EXPORT
+                  void setMinorRuntimeVersion(word wValue); // EXPORT
-                  /// Change the COM+ descriptor's MetaData (VirtualAddress) value.
+                  /// Change the COM+ descriptor's MetaData (VirtualAddress) value.
-                  void setMetaDataVa(dword dwValue); // EXPORT
+                  void setMetaDataVa(dword dwValue); // EXPORT
-                  /// Change the COM+ descriptor's MetaData (Size) value.
+                  /// Change the COM+ descriptor's MetaData (Size) value.
-                  void setMetaDataSize(dword dwValue); // EXPORT
+                  void setMetaDataSize(dword dwValue); // EXPORT
-                  /// Change the COM+ descriptor's Flags value.
+                  /// Change the COM+ descriptor's Flags value.
-                  void setFlags(dword dwValue); // EXPORT
+                  void setFlags(dword dwValue); // EXPORT
-                  /// Change the COM+ descriptor's EntryPointToken value.
+                  /// Change the COM+ descriptor's EntryPointToken value.
-                  void setEntryPointToken(dword dwValue); // EXPORT
+                  void setEntryPointToken(dword dwValue); // EXPORT
-                  /// Change the COM+ descriptor's Resources (VirtualAddress) value.
+                  /// Change the COM+ descriptor's Resources (VirtualAddress) value.
-                  void setResourcesVa(dword dwValue); // EXPORT
+                  void setResourcesVa(dword dwValue); // EXPORT
-                  /// Change the COM+ descriptor's Resources (Size) value.
+                  /// Change the COM+ descriptor's Resources (Size) value.
-                  void setResourcesSize(dword dwValue); // EXPORT
+                  void setResourcesSize(dword dwValue); // EXPORT
-                  /// Change the COM+ descriptor's StrongNameSignatureVa (VirtualAddress) value.
+                  /// Change the COM+ descriptor's StrongNameSignatureVa (VirtualAddress) value.
-                  void setStrongNameSignatureVa(dword dwValue); // EXPORT
+                  void setStrongNameSignatureVa(dword dwValue); // EXPORT
-                  /// Change the COM+ descriptor's StrongNameSignatureVa (Size) value.
+                  /// Change the COM+ descriptor's StrongNameSignatureVa (Size) value.
-                  void setStrongNameSignagureSize(dword dwValue); // EXPORT
+                  void setStrongNameSignagureSize(dword dwValue); // EXPORT
-                  /// Change the COM+ descriptor's CodeManagerTable (VirtualAddress) value.
+                  /// Change the COM+ descriptor's CodeManagerTable (VirtualAddress) value.
-                  void setCodeManagerTableVa(dword dwValue); // EXPORT
+                  void setCodeManagerTableVa(dword dwValue); // EXPORT
-                  /// Change the COM+ descriptor's CodeManagerTable (Size) value.
+                  /// Change the COM+ descriptor's CodeManagerTable (Size) value.
-                  void setCodeManagerTableSize(dword dwValue); // EXPORT
+                  void setCodeManagerTableSize(dword dwValue); // EXPORT
-                  /// Change the COM+ descriptor's VTableFixups (VirtualAddress) value.
+                  /// Change the COM+ descriptor's VTableFixups (VirtualAddress) value.
-                  void setVTableFixupsVa(dword dwValue); // EXPORT
+                  void setVTableFixupsVa(dword dwValue); // EXPORT
-                  /// Change the COM+ descriptor's VTableFixups (Size) value.
+                  /// Change the COM+ descriptor's VTableFixups (Size) value.
-                  void setVTableFixupsSize(dword dwValue); // EXPORT
+                  void setVTableFixupsSize(dword dwValue); // EXPORT
-                  /// Change the COM+ descriptor's ExportAddressTableJumps (VirtualAddress) value.
+                  /// Change the COM+ descriptor's ExportAddressTableJumps (VirtualAddress) value.
-                  void setExportAddressTableJumpsVa(dword dwValue); // EXPORT
+                  void setExportAddressTableJumpsVa(dword dwValue); // EXPORT
-                  /// Change the COM+ descriptor's ExportAddressTableJumps (Size) value.
+                  /// Change the COM+ descriptor's ExportAddressTableJumps (Size) value.
-                  void setExportAddressTableJumpsSize(dword dwValue); // EXPORT
+                  void setExportAddressTableJumpsSize(dword dwValue); // EXPORT
-                  /// Change the COM+ descriptor's ManagedNativeHeader (VirtualAddress) value.
+                  /// Change the COM+ descriptor's ManagedNativeHeader (VirtualAddress) value.
-                  void setManagedNativeHeaderVa(dword dwValue); // EXPORT
+                  void setManagedNativeHeaderVa(dword dwValue); // EXPORT
-                  /// Change the COM+ descriptor's ManagedNativeHeader (Size) value.
+                  /// Change the COM+ descriptor's ManagedNativeHeader (Size) value.
-                  void setManagedNativeHeaderSize(dword dwValue); // EXPORT
+                  void setManagedNativeHeaderSize(dword dwValue); // EXPORT
-        };
+        };
-}
+}
-#endif
+#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.
+* DebugDirectory.cpp - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#include "PeLibInc.h"
+#include "PeLibInc.h"
-#include "DebugDirectory.h"
+#include "DebugDirectory.h"
-namespace PeLib
+namespace PeLib
-{
+{
-        void DebugDirectory::clear()
+        void DebugDirectory::clear()
-        {
+        {
-                m_vDebugInfo.clear();
+                m_vDebugInfo.clear();
-        }
+        }
-        
+        
-        std::vector<PELIB_IMG_DEBUG_DIRECTORY> DebugDirectory::read(InputBuffer& ibBuffer, unsigned int uiSize)
+        std::vector<PELIB_IMG_DEBUG_DIRECTORY> DebugDirectory::read(InputBuffer& ibBuffer, unsigned int uiSize)
-        {
+        {
-                std::vector<PELIB_IMG_DEBUG_DIRECTORY> currDebugInfo;
+                std::vector<PELIB_IMG_DEBUG_DIRECTORY> currDebugInfo;
-                
+                
-                PELIB_IMG_DEBUG_DIRECTORY iddCurr;
+                PELIB_IMG_DEBUG_DIRECTORY iddCurr;
-                
+                
-                for (unsigned int i=0;i<uiSize/PELIB_IMAGE_DEBUG_DIRECTORY::size();i++)
+                for (unsigned int i=0;i<uiSize/PELIB_IMAGE_DEBUG_DIRECTORY::size();i++)
-                {
+                {
-                        
+                        
-                        ibBuffer >> iddCurr.idd.Characteristics;
+                        ibBuffer >> iddCurr.idd.Characteristics;
-                        ibBuffer >> iddCurr.idd.TimeDateStamp;
+                        ibBuffer >> iddCurr.idd.TimeDateStamp;
-                        ibBuffer >> iddCurr.idd.MajorVersion;
+                        ibBuffer >> iddCurr.idd.MajorVersion;
-                        ibBuffer >> iddCurr.idd.MinorVersion;
+                        ibBuffer >> iddCurr.idd.MinorVersion;
-                        ibBuffer >> iddCurr.idd.Type;
+                        ibBuffer >> iddCurr.idd.Type;
-                        ibBuffer >> iddCurr.idd.SizeOfData;
+                        ibBuffer >> iddCurr.idd.SizeOfData;
-                        ibBuffer >> iddCurr.idd.AddressOfRawData;
+                        ibBuffer >> iddCurr.idd.AddressOfRawData;
-                        ibBuffer >> iddCurr.idd.PointerToRawData;
+                        ibBuffer >> iddCurr.idd.PointerToRawData;
-                
+                
-                        currDebugInfo.push_back(iddCurr);
+                        currDebugInfo.push_back(iddCurr);
-                }
+                }
-                
+                
-                return currDebugInfo;
+                return currDebugInfo;
-        }
+        }
-        
+        
-        int DebugDirectory::read(unsigned char* buffer, unsigned int buffersize)
+        int DebugDirectory::read(unsigned char* buffer, unsigned int buffersize)
-        {
+        {
-                // XXX: Note, debug data is not read at all. This might or might not change
+                // XXX: Note, debug data is not read at all. This might or might not change
-                //      in the future.
+                //      in the future.
-                
+                
-                std::vector<byte> vDebugDirectory(buffer, buffer + buffersize);
+                std::vector<byte> vDebugDirectory(buffer, buffer + buffersize);
-                
+                
-                InputBuffer ibBuffer(vDebugDirectory);
+                InputBuffer ibBuffer(vDebugDirectory);
-                
+                
-                std::vector<PELIB_IMG_DEBUG_DIRECTORY> currDebugInfo = read(ibBuffer, buffersize);
+                std::vector<PELIB_IMG_DEBUG_DIRECTORY> currDebugInfo = read(ibBuffer, buffersize);
-                
+                
-                std::swap(currDebugInfo, m_vDebugInfo);
+                std::swap(currDebugInfo, m_vDebugInfo);
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        
+        
-        /**
+        /**
-        * @param strFilename Name of the file which will be read.
+        * @param strFilename Name of the file which will be read.
-        * @param uiOffset File offset of the Debug directory.
+        * @param uiOffset File offset of the Debug directory.
-        * @param uiSize Size of the Debug directory.
+        * @param uiSize Size of the Debug directory.
-        **/
+        **/
-        int DebugDirectory::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize)
+        int DebugDirectory::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize)
-        {
+        {
-                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
+                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
-                unsigned int ulFileSize = fileSize(ifFile);
+                unsigned int ulFileSize = fileSize(ifFile);
-                if (!ifFile)
+                if (!ifFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                
+                
-                if (ulFileSize < uiOffset + uiSize)
+                if (ulFileSize < uiOffset + uiSize)
-                {
+                {
-                        return ERROR_INVALID_FILE;
+                        return ERROR_INVALID_FILE;
-                }
+                }
-                ifFile.seekg(uiOffset, std::ios::beg);
+                ifFile.seekg(uiOffset, std::ios::beg);
-                std::vector<byte> vDebugDirectory(uiSize);
+                std::vector<byte> vDebugDirectory(uiSize);
-                ifFile.read(reinterpret_cast<char*>(&vDebugDirectory[0]), uiSize);
+                ifFile.read(reinterpret_cast<char*>(&vDebugDirectory[0]), uiSize);
-                
+                
-                InputBuffer ibBuffer(vDebugDirectory);
+                InputBuffer ibBuffer(vDebugDirectory);
-                
+                
-                std::vector<PELIB_IMG_DEBUG_DIRECTORY> currDebugInfo = read(ibBuffer, uiSize);
+                std::vector<PELIB_IMG_DEBUG_DIRECTORY> currDebugInfo = read(ibBuffer, uiSize);
-                
+                
-                for (unsigned int i=0;i<currDebugInfo.size();i++)
+                for (unsigned int i=0;i<currDebugInfo.size();i++)
-                {
+                {
-                        ifFile.seekg(currDebugInfo[i].idd.PointerToRawData, std::ios::beg);
+                        ifFile.seekg(currDebugInfo[i].idd.PointerToRawData, std::ios::beg);
-                        currDebugInfo[i].data.resize(currDebugInfo[i].idd.SizeOfData);
+                        currDebugInfo[i].data.resize(currDebugInfo[i].idd.SizeOfData);
-                        ifFile.read(reinterpret_cast<char*>(&currDebugInfo[i].data[0]), currDebugInfo[i].idd.SizeOfData);
+                        ifFile.read(reinterpret_cast<char*>(&currDebugInfo[i].data[0]), currDebugInfo[i].idd.SizeOfData);
-                        if (!ifFile) return ERROR_INVALID_FILE;
+                        if (!ifFile) return ERROR_INVALID_FILE;
-                }
+                }
-                
+                
-                std::swap(currDebugInfo, m_vDebugInfo);
+                std::swap(currDebugInfo, m_vDebugInfo);
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Rebuilds the current debug directory.
+        * Rebuilds the current debug directory.
-        * @param vBuffer Buffer where the rebuilt directory is stored.
+        * @param vBuffer Buffer where the rebuilt directory is stored.
-        **/
+        **/
-        void DebugDirectory::rebuild(std::vector<byte>& vBuffer) const
+        void DebugDirectory::rebuild(std::vector<byte>& vBuffer) const
-        {
+        {
-                OutputBuffer obBuffer(vBuffer);
+                OutputBuffer obBuffer(vBuffer);
-                
+                
-                for (unsigned int i=0;i<m_vDebugInfo.size();i++)
+                for (unsigned int i=0;i<m_vDebugInfo.size();i++)
-                {
+                {
-                        obBuffer << m_vDebugInfo[i].idd.Characteristics;
+                        obBuffer << m_vDebugInfo[i].idd.Characteristics;
-                        obBuffer << m_vDebugInfo[i].idd.TimeDateStamp;
+                        obBuffer << m_vDebugInfo[i].idd.TimeDateStamp;
-                        obBuffer << m_vDebugInfo[i].idd.MajorVersion;
+                        obBuffer << m_vDebugInfo[i].idd.MajorVersion;
-                        obBuffer << m_vDebugInfo[i].idd.MinorVersion;
+                        obBuffer << m_vDebugInfo[i].idd.MinorVersion;
-                        obBuffer << m_vDebugInfo[i].idd.Type;
+                        obBuffer << m_vDebugInfo[i].idd.Type;
-                        obBuffer << m_vDebugInfo[i].idd.SizeOfData;
+                        obBuffer << m_vDebugInfo[i].idd.SizeOfData;
-                        obBuffer << m_vDebugInfo[i].idd.AddressOfRawData;
+                        obBuffer << m_vDebugInfo[i].idd.AddressOfRawData;
-                        obBuffer << m_vDebugInfo[i].idd.PointerToRawData;
+                        obBuffer << m_vDebugInfo[i].idd.PointerToRawData;
-                }
+                }
-        }
+        }
-        /**
+        /**
-        * @return Size of the debug directory.
+        * @return Size of the debug directory.
-        **/
+        **/
-        unsigned int DebugDirectory::size() const
+        unsigned int DebugDirectory::size() const
-        {
+        {
-                return static_cast<unsigned int>(m_vDebugInfo.size()) * PELIB_IMAGE_DEBUG_DIRECTORY::size();
+                return static_cast<unsigned int>(m_vDebugInfo.size()) * PELIB_IMAGE_DEBUG_DIRECTORY::size();
-        }
+        }
-        /**
+        /**
-        * @param strFilename Name of the file which will be written.
+        * @param strFilename Name of the file which will be written.
-        * @param uiOffset File offset where the debug directory will be stored.
+        * @param uiOffset File offset where the debug directory will be stored.
-        **/
+        **/
-        int DebugDirectory::write(const std::string& strFilename, unsigned int uiOffset) const
+        int DebugDirectory::write(const std::string& strFilename, unsigned int uiOffset) const
-        {
+        {
-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        ofFile.clear();
+                        ofFile.clear();
-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                else
+                else
-                {
+                {
-                        ofFile.close();
+                        ofFile.close();
-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                ofFile.seekp(uiOffset, std::ios::beg);
+                ofFile.seekp(uiOffset, std::ios::beg);
-                std::vector<unsigned char> vBuffer;
+                std::vector<unsigned char> vBuffer;
-                rebuild(vBuffer);
+                rebuild(vBuffer);
-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
-                ofFile.close();
+                ofFile.close();
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * @return Number of debug structures in the current Debug directory.
+        * @return Number of debug structures in the current Debug directory.
-        **/
+        **/
-        unsigned int DebugDirectory::calcNumberOfEntries() const
+        unsigned int DebugDirectory::calcNumberOfEntries() const
-        {
+        {
-                return static_cast<unsigned int>(m_vDebugInfo.size());
+                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
+        * Adds a new debug structure to the debug directory. The initial values of all members of the structure
-        * are undefined.
+        * are undefined.
-        **/
+        **/
-        void DebugDirectory::addEntry()
+        void DebugDirectory::addEntry()
-        {
+        {
-                PELIB_IMG_DEBUG_DIRECTORY p;
+                PELIB_IMG_DEBUG_DIRECTORY p;
-                m_vDebugInfo.push_back(p);
+                m_vDebugInfo.push_back(p);
-        }
+        }
-        /**
+        /**
-        * Removes a debug structure from the current debug directory. If an invalid structure is specified
+        * 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.
+        * by the parameter uiIndex the result will be undefined behaviour.
-        * @param uiIndex Identifies the debug structure.
+        * @param uiIndex Identifies the debug structure.
-        **/
+        **/
-        void DebugDirectory::removeEntry(unsigned int uiIndex)
+        void DebugDirectory::removeEntry(unsigned int uiIndex)
-        {
+        {
-                m_vDebugInfo.erase(m_vDebugInfo.begin() + uiIndex);
+                m_vDebugInfo.erase(m_vDebugInfo.begin() + uiIndex);
-        }
+        }
-                  
+                  
-        /**
+        /**
-        * Returns the Characteristics value of a debug structure. If an invalid structure is specified
+        * Returns the Characteristics value of a debug structure. If an invalid structure is specified
-        * by the parameter uiIndex the result will be undefined behaviour.
+        * by the parameter uiIndex the result will be undefined behaviour.
-        * @param uiIndex Identifies the debug structure.
+        * @param uiIndex Identifies the debug structure.
-        * @return Characteristics value of the debug structure.
+        * @return Characteristics value of the debug structure.
-        **/
+        **/
-        dword DebugDirectory::getCharacteristics(unsigned int uiIndex) const
+        dword DebugDirectory::getCharacteristics(unsigned int uiIndex) const
-        {
+        {
-                return m_vDebugInfo[uiIndex].idd.Characteristics;
+                return m_vDebugInfo[uiIndex].idd.Characteristics;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the TimeDateStamp value of a debug structure. If an invalid structure is specified
+        * Returns the TimeDateStamp value of a debug structure. If an invalid structure is specified
-        * by the parameter uiIndex the result will be undefined behaviour.
+        * by the parameter uiIndex the result will be undefined behaviour.
-        * @param uiIndex Identifies the debug structure.
+        * @param uiIndex Identifies the debug structure.
-        * @return TimeDateStamp value of the debug structure.
+        * @return TimeDateStamp value of the debug structure.
-        **/
+        **/
-        dword DebugDirectory::getTimeDateStamp(unsigned int uiIndex) const
+        dword DebugDirectory::getTimeDateStamp(unsigned int uiIndex) const
-        {
+        {
-                return m_vDebugInfo[uiIndex].idd.TimeDateStamp;
+                return m_vDebugInfo[uiIndex].idd.TimeDateStamp;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the MajorVersion value of a debug structure. If an invalid structure is specified
+        * Returns the MajorVersion value of a debug structure. If an invalid structure is specified
-        * by the parameter uiIndex the result will be undefined behaviour.
+        * by the parameter uiIndex the result will be undefined behaviour.
-        * @param uiIndex Identifies the debug structure.
+        * @param uiIndex Identifies the debug structure.
-        * @return MajorVersion value of the debug structure.
+        * @return MajorVersion value of the debug structure.
-        **/
+        **/
-        word DebugDirectory::getMajorVersion(unsigned int uiIndex) const
+        word DebugDirectory::getMajorVersion(unsigned int uiIndex) const
-        {
+        {
-                return m_vDebugInfo[uiIndex].idd.MajorVersion;
+                return m_vDebugInfo[uiIndex].idd.MajorVersion;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the MinorVersion value of a debug structure. If an invalid structure is specified
+        * Returns the MinorVersion value of a debug structure. If an invalid structure is specified
-        * by the parameter uiIndex the result will be undefined behaviour.
+        * by the parameter uiIndex the result will be undefined behaviour.
-        * @param uiIndex Identifies the debug structure.
+        * @param uiIndex Identifies the debug structure.
-        * @return MinorVersion value of the debug structure.
+        * @return MinorVersion value of the debug structure.
-        **/
+        **/
-        word DebugDirectory::getMinorVersion(unsigned int uiIndex) const
+        word DebugDirectory::getMinorVersion(unsigned int uiIndex) const
-        {
+        {
-                return m_vDebugInfo[uiIndex].idd.MinorVersion;
+                return m_vDebugInfo[uiIndex].idd.MinorVersion;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the Type value of a debug structure. If an invalid structure is specified
+        * Returns the Type value of a debug structure. If an invalid structure is specified
-        * by the parameter uiIndex the result will be undefined behaviour.
+        * by the parameter uiIndex the result will be undefined behaviour.
-        * @param uiIndex Identifies the debug structure.
+        * @param uiIndex Identifies the debug structure.
-        * @return Type value of the debug structure.
+        * @return Type value of the debug structure.
-        **/
+        **/
-        dword DebugDirectory::getType(unsigned int uiIndex) const
+        dword DebugDirectory::getType(unsigned int uiIndex) const
-        {
+        {
-                return m_vDebugInfo[uiIndex].idd.Type;
+                return m_vDebugInfo[uiIndex].idd.Type;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the SizeOfData value of a debug structure. If an invalid structure is specified
+        * Returns the SizeOfData value of a debug structure. If an invalid structure is specified
-        * by the parameter uiIndex the result will be undefined behaviour.
+        * by the parameter uiIndex the result will be undefined behaviour.
-        * @param uiIndex Identifies the debug structure.
+        * @param uiIndex Identifies the debug structure.
-        * @return SizeOfData value of the debug structure.
+        * @return SizeOfData value of the debug structure.
-        **/
+        **/
-        dword DebugDirectory::getSizeOfData(unsigned int uiIndex) const
+        dword DebugDirectory::getSizeOfData(unsigned int uiIndex) const
-        {
+        {
-                return m_vDebugInfo[uiIndex].idd.SizeOfData;
+                return m_vDebugInfo[uiIndex].idd.SizeOfData;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the AddressOfRawData value of a debug structure. If an invalid structure is specified
+        * Returns the AddressOfRawData value of a debug structure. If an invalid structure is specified
-        * by the parameter uiIndex the result will be undefined behaviour.
+        * by the parameter uiIndex the result will be undefined behaviour.
-        * @param uiIndex Identifies the debug structure.
+        * @param uiIndex Identifies the debug structure.
-        * @return AddressOfRawData value of the debug structure.
+        * @return AddressOfRawData value of the debug structure.
-        **/
+        **/
-        dword DebugDirectory::getAddressOfRawData(unsigned int uiIndex) const
+        dword DebugDirectory::getAddressOfRawData(unsigned int uiIndex) const
-        {
+        {
-                return m_vDebugInfo[uiIndex].idd.AddressOfRawData;
+                return m_vDebugInfo[uiIndex].idd.AddressOfRawData;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the PointerToRawData value of a debug structure. If an invalid structure is specified
+        * Returns the PointerToRawData value of a debug structure. If an invalid structure is specified
-        * by the parameter uiIndex the result will be undefined behaviour.
+        * by the parameter uiIndex the result will be undefined behaviour.
-        * @param uiIndex Identifies the debug structure.
+        * @param uiIndex Identifies the debug structure.
-        * @return PointerToRawData value of the debug structure.
+        * @return PointerToRawData value of the debug structure.
-        **/
+        **/
-        dword DebugDirectory::getPointerToRawData(unsigned int uiIndex) const
+        dword DebugDirectory::getPointerToRawData(unsigned int uiIndex) const
-        {
+        {
-                return m_vDebugInfo[uiIndex].idd.PointerToRawData;
+                return m_vDebugInfo[uiIndex].idd.PointerToRawData;
-        }
+        }
-        
+        
-        std::vector<byte> DebugDirectory::getData(unsigned int index) const
+        std::vector<byte> DebugDirectory::getData(unsigned int index) const
-        {
+        {
-                return m_vDebugInfo[index].data;
+                return m_vDebugInfo[index].data;
-        }
+        }
-        /**
+        /**
-        * Changes the Characteristics value of a debug structure. If an invalid structure is specified
+        * Changes the Characteristics value of a debug structure. If an invalid structure is specified
-        * by the parameter uiIndex the result will be undefined behaviour.
+        * by the parameter uiIndex the result will be undefined behaviour.
-        * @param uiIndex Identifies the debug structure.
+        * @param uiIndex Identifies the debug structure.
-        * @param dwValue New value of the Characteristics value of the debug structure.
+        * @param dwValue New value of the Characteristics value of the debug structure.
-        **/
+        **/
-        void DebugDirectory::setCharacteristics(unsigned int uiIndex, dword dwValue)
+        void DebugDirectory::setCharacteristics(unsigned int uiIndex, dword dwValue)
-        {
+        {
-                m_vDebugInfo[uiIndex].idd.Characteristics = dwValue;
+                m_vDebugInfo[uiIndex].idd.Characteristics = dwValue;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Changes the TimeDateStamp value of a debug structure. If an invalid structure is specified
+        * Changes the TimeDateStamp value of a debug structure. If an invalid structure is specified
-        * by the parameter uiIndex the result will be undefined behaviour.
+        * by the parameter uiIndex the result will be undefined behaviour.
-        * @param uiIndex Identifies the debug structure.
+        * @param uiIndex Identifies the debug structure.
-        * @param dwValue New value of the TimeDateStamp value of the debug structure.
+        * @param dwValue New value of the TimeDateStamp value of the debug structure.
-        **/
+        **/
-        void DebugDirectory::setTimeDateStamp(unsigned int uiIndex, dword dwValue)
+        void DebugDirectory::setTimeDateStamp(unsigned int uiIndex, dword dwValue)
-        {
+        {
-                m_vDebugInfo[uiIndex].idd.TimeDateStamp = dwValue;
+                m_vDebugInfo[uiIndex].idd.TimeDateStamp = dwValue;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Changes the MajorVersion value of a debug structure. If an invalid structure is specified
+        * Changes the MajorVersion value of a debug structure. If an invalid structure is specified
-        * by the parameter uiIndex the result will be undefined behaviour.
+        * by the parameter uiIndex the result will be undefined behaviour.
-        * @param uiIndex Identifies the debug structure.
+        * @param uiIndex Identifies the debug structure.
-        * @param wValue New value of the MajorVersion value of the debug structure.
+        * @param wValue New value of the MajorVersion value of the debug structure.
-        **/
+        **/
-        void DebugDirectory::setMajorVersion(unsigned int uiIndex, word wValue)
+        void DebugDirectory::setMajorVersion(unsigned int uiIndex, word wValue)
-        {
+        {
-                m_vDebugInfo[uiIndex].idd.MajorVersion = wValue;
+                m_vDebugInfo[uiIndex].idd.MajorVersion = wValue;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Changes the MinorVersion value of a debug structure. If an invalid structure is specified
+        * Changes the MinorVersion value of a debug structure. If an invalid structure is specified
-        * by the parameter uiIndex the result will be undefined behaviour.
+        * by the parameter uiIndex the result will be undefined behaviour.
-        * @param uiIndex Identifies the debug structure.
+        * @param uiIndex Identifies the debug structure.
-        * @param wValue New value of the MinorVersion value of the debug structure.
+        * @param wValue New value of the MinorVersion value of the debug structure.
-        **/
+        **/
-        void DebugDirectory::setMinorVersion(unsigned int uiIndex, word wValue)
+        void DebugDirectory::setMinorVersion(unsigned int uiIndex, word wValue)
-        {
+        {
-                m_vDebugInfo[uiIndex].idd.MinorVersion = wValue;
+                m_vDebugInfo[uiIndex].idd.MinorVersion = wValue;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Changes the Type value of a debug structure. If an invalid structure is specified
+        * Changes the Type value of a debug structure. If an invalid structure is specified
-        * by the parameter uiIndex the result will be undefined behaviour.
+        * by the parameter uiIndex the result will be undefined behaviour.
-        * @param uiIndex Identifies the debug structure.
+        * @param uiIndex Identifies the debug structure.
-        * @param dwValue New value of the Type value of the debug structure.
+        * @param dwValue New value of the Type value of the debug structure.
-        **/
+        **/
-        void DebugDirectory::setType(unsigned int uiIndex, dword dwValue)
+        void DebugDirectory::setType(unsigned int uiIndex, dword dwValue)
-        {
+        {
-                m_vDebugInfo[uiIndex].idd.Type = dwValue;
+                m_vDebugInfo[uiIndex].idd.Type = dwValue;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Changes the SizeOfData value of a debug structure. If an invalid structure is specified
+        * Changes the SizeOfData value of a debug structure. If an invalid structure is specified
-        * by the parameter uiIndex the result will be undefined behaviour.
+        * by the parameter uiIndex the result will be undefined behaviour.
-        * @param uiIndex Identifies the debug structure.
+        * @param uiIndex Identifies the debug structure.
-        * @param dwValue New value of the SizeOfData value of the debug structure.
+        * @param dwValue New value of the SizeOfData value of the debug structure.
-        **/
+        **/
-        void DebugDirectory::setSizeOfData(unsigned int uiIndex, dword dwValue)
+        void DebugDirectory::setSizeOfData(unsigned int uiIndex, dword dwValue)
-        {
+        {
-                m_vDebugInfo[uiIndex].idd.SizeOfData = dwValue;
+                m_vDebugInfo[uiIndex].idd.SizeOfData = dwValue;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Changes the AddressOfRawData value of a debug structure. If an invalid structure is specified
+        * Changes the AddressOfRawData value of a debug structure. If an invalid structure is specified
-        * by the parameter uiIndex the result will be undefined behaviour.
+        * by the parameter uiIndex the result will be undefined behaviour.
-        * @param uiIndex Identifies the debug structure.
+        * @param uiIndex Identifies the debug structure.
-        * @param dwValue New value of the AddressOfRawData value of the debug structure.
+        * @param dwValue New value of the AddressOfRawData value of the debug structure.
-        **/
+        **/
-        void DebugDirectory::setAddressOfRawData(unsigned int uiIndex, dword dwValue)
+        void DebugDirectory::setAddressOfRawData(unsigned int uiIndex, dword dwValue)
-        {
+        {
-                m_vDebugInfo[uiIndex].idd.AddressOfRawData = dwValue;
+                m_vDebugInfo[uiIndex].idd.AddressOfRawData = dwValue;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Changes the PointerToRawData value of a debug structure. If an invalid structure is specified
+        * Changes the PointerToRawData value of a debug structure. If an invalid structure is specified
-        * by the parameter uiIndex the result will be undefined behaviour.
+        * by the parameter uiIndex the result will be undefined behaviour.
-        * @param uiIndex Identifies the debug structure.
+        * @param uiIndex Identifies the debug structure.
-        * @param dwValue New value of the PointerToRawData value of the debug structure.
+        * @param dwValue New value of the PointerToRawData value of the debug structure.
-        **/
+        **/
-        void DebugDirectory::setPointerToRawData(unsigned int uiIndex, dword dwValue)
+        void DebugDirectory::setPointerToRawData(unsigned int uiIndex, dword dwValue)
-        {
+        {
-                m_vDebugInfo[uiIndex].idd.PointerToRawData = dwValue;
+                m_vDebugInfo[uiIndex].idd.PointerToRawData = dwValue;
-        }
+        }
-        
+        
-        void DebugDirectory::setData(unsigned int index, const std::vector<byte>& data)
+        void DebugDirectory::setData(unsigned int index, const std::vector<byte>& data)
-        {
+        {
-                m_vDebugInfo[index].data = 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.
+* DebugDirectory.h - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#ifndef DEBUGDIRECTORY_H
+#ifndef DEBUGDIRECTORY_H
-#define DEBUGDIRECTORY_H
+#define DEBUGDIRECTORY_H
-namespace PeLib
+namespace PeLib
-{
+{
-        /// Class that handles the Debug directory.
+        /// Class that handles the Debug directory.
-        class DebugDirectory
+        class DebugDirectory
-        {
+        {
-                private:
+                private:
-                  /// Stores the various DebugDirectory structures.
+                  /// Stores the various DebugDirectory structures.
-                  std::vector<PELIB_IMG_DEBUG_DIRECTORY> m_vDebugInfo;
+                  std::vector<PELIB_IMG_DEBUG_DIRECTORY> m_vDebugInfo;
-                  
+                  
-                  std::vector<PELIB_IMG_DEBUG_DIRECTORY> read(InputBuffer& ibBuffer, unsigned int uiSize);
+                  std::vector<PELIB_IMG_DEBUG_DIRECTORY> read(InputBuffer& ibBuffer, unsigned int uiSize);
-                public:
+                public:
-                  void clear(); // EXPORT
+                  void clear(); // EXPORT
-                  /// Reads the Debug directory from a file.
+                  /// Reads the Debug directory from a file.
-                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize); // EXPORT
+                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize); // EXPORT
-                  int read(unsigned char* buffer, unsigned int buffersize);
+                  int read(unsigned char* buffer, unsigned int buffersize);
-                  /// Rebuilds the current Debug directory.
+                  /// Rebuilds the current Debug directory.
-                  void rebuild(std::vector<byte>& obBuffer) const; // EXPORT
+                  void rebuild(std::vector<byte>& obBuffer) const; // EXPORT
-                  /// Returns the size the current Debug directory needs after rebuilding.
+                  /// Returns the size the current Debug directory needs after rebuilding.
-                  unsigned int size() const;
+                  unsigned int size() const;
-                  /// Writes the current Debug directory back to a file.
+                  /// Writes the current Debug directory back to a file.
-                  int write(const std::string& strFilename, unsigned int uiOffset) const; // EXPORT
+                  int write(const std::string& strFilename, unsigned int uiOffset) const; // EXPORT
-                  /// Returns the number of DebugDirectory image structures in the current DebugDirectory.
+                  /// Returns the number of DebugDirectory image structures in the current DebugDirectory.
-                  unsigned int calcNumberOfEntries() const; // EXPORT
+                  unsigned int calcNumberOfEntries() const; // EXPORT
-                  
+                  
-                  /// Adds a new debug structure.
+                  /// Adds a new debug structure.
-                  void addEntry(); // EXPORT
+                  void addEntry(); // EXPORT
-                  /// Removes a debug structure.
+                  /// Removes a debug structure.
-                  void removeEntry(unsigned int uiIndex); // EXPORT
+                  void removeEntry(unsigned int uiIndex); // EXPORT
-                  
+                  
-                  /// Returns the Characteristics value of a debug structure.
+                  /// Returns the Characteristics value of a debug structure.
-                  dword getCharacteristics(unsigned int uiIndex) const; // EXPORT
+                  dword getCharacteristics(unsigned int uiIndex) const; // EXPORT
-                  /// Returns the TimeDateStamp value of a debug structure.
+                  /// Returns the TimeDateStamp value of a debug structure.
-                  dword getTimeDateStamp(unsigned int uiIndex) const; // EXPORT
+                  dword getTimeDateStamp(unsigned int uiIndex) const; // EXPORT
-                  /// Returns the MajorVersion value of a debug structure.
+                  /// Returns the MajorVersion value of a debug structure.
-                  word getMajorVersion(unsigned int uiIndex) const; // EXPORT
+                  word getMajorVersion(unsigned int uiIndex) const; // EXPORT
-                  /// Returns the MinorVersion value of a debug structure.
+                  /// Returns the MinorVersion value of a debug structure.
-                  word getMinorVersion(unsigned int uiIndex) const; // EXPORT
+                  word getMinorVersion(unsigned int uiIndex) const; // EXPORT
-                  /// Returns the Type value of a debug structure.
+                  /// Returns the Type value of a debug structure.
-                  dword getType(unsigned int uiIndex) const; // EXPORT
+                  dword getType(unsigned int uiIndex) const; // EXPORT
-                  /// Returns the SizeOfData value of a debug structure.
+                  /// Returns the SizeOfData value of a debug structure.
-                  dword getSizeOfData(unsigned int uiIndex) const; // EXPORT
+                  dword getSizeOfData(unsigned int uiIndex) const; // EXPORT
-                  /// Returns the AddressOfRawData value of a debug structure.
+                  /// Returns the AddressOfRawData value of a debug structure.
-                  dword getAddressOfRawData(unsigned int uiIndex) const; // EXPORT
+                  dword getAddressOfRawData(unsigned int uiIndex) const; // EXPORT
-                  /// Returns the PointerToRawData value of a debug structure.
+                  /// Returns the PointerToRawData value of a debug structure.
-                  dword getPointerToRawData(unsigned int uiIndex) const; // EXPORT
+                  dword getPointerToRawData(unsigned int uiIndex) const; // EXPORT
-                  std::vector<byte> getData(unsigned int index) const; // EXPORT
+                  std::vector<byte> getData(unsigned int index) const; // EXPORT
-                  
+                  
-                  /// Sets the Characteristics value of a debug structure.
+                  /// Sets the Characteristics value of a debug structure.
-                  void setCharacteristics(unsigned int uiIndex, dword dwValue); // EXPORT
+                  void setCharacteristics(unsigned int uiIndex, dword dwValue); // EXPORT
-                  /// Sets the TimeDateStamp value of a debug structure.
+                  /// Sets the TimeDateStamp value of a debug structure.
-                  void setTimeDateStamp(unsigned int uiIndex, dword dwValue); // EXPORT
+                  void setTimeDateStamp(unsigned int uiIndex, dword dwValue); // EXPORT
-                  /// Sets the MajorVersion value of a debug structure.
+                  /// Sets the MajorVersion value of a debug structure.
-                  void setMajorVersion(unsigned int uiIndex, word wValue); // EXPORT
+                  void setMajorVersion(unsigned int uiIndex, word wValue); // EXPORT
-                  /// Sets the MinorVersion value of a debug structure.
+                  /// Sets the MinorVersion value of a debug structure.
-                  void setMinorVersion(unsigned int uiIndex, word wValue); // EXPORT
+                  void setMinorVersion(unsigned int uiIndex, word wValue); // EXPORT
-                  /// Sets the Type value of a debug structure.
+                  /// Sets the Type value of a debug structure.
-                  void setType(unsigned int uiIndex, dword dwValue); // EXPORT
+                  void setType(unsigned int uiIndex, dword dwValue); // EXPORT
-                  /// Sets the SizeOfData value of a debug structure.
+                  /// Sets the SizeOfData value of a debug structure.
-                  void setSizeOfData(unsigned int uiIndex, dword dwValue); // EXPORT
+                  void setSizeOfData(unsigned int uiIndex, dword dwValue); // EXPORT
-                  /// Sets the AddressOfRawData value of a debug structure.
+                  /// Sets the AddressOfRawData value of a debug structure.
-                  void setAddressOfRawData(unsigned int uiIndex, dword dwValue); // EXPORT
+                  void setAddressOfRawData(unsigned int uiIndex, dword dwValue); // EXPORT
-                  /// Sets the PointerToRawData value of a debug structure.
+                  /// Sets the PointerToRawData value of a debug structure.
-                  void setPointerToRawData(unsigned int uiIndex, dword dwValue); // EXPORT
+                  void setPointerToRawData(unsigned int uiIndex, dword dwValue); // EXPORT
-                  void setData(unsigned int index, const std::vector<byte>& data); // EXPORT
+                  void setData(unsigned int index, const std::vector<byte>& data); // EXPORT
-        };
+        };
-}
+}
-#endif
+#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.
+* ExportDirectory.cpp - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-//#ifdef false
+//#ifdef false
-#include "PeLibInc.h"
+#include "PeLibInc.h"
-#include "ExportDirectory.h"
+#include "ExportDirectory.h"
-namespace PeLib
+namespace PeLib
-{
+{
-        /**
+        /**
-        * @param strFuncname Name of the function.
+        * @param strFuncname Name of the function.
-        * @param dwFuncAddr RVA of the function.
+        * @param dwFuncAddr RVA of the function.
-        **/
+        **/
-        void ExportDirectory::addFunction(const std::string& strFuncname, dword dwFuncAddr)
+        void ExportDirectory::addFunction(const std::string& strFuncname, dword dwFuncAddr)
-        {
+        {
-                PELIB_EXP_FUNC_INFORMATION efiCurr;
+                PELIB_EXP_FUNC_INFORMATION efiCurr;
-                efiCurr.funcname = strFuncname;
+                efiCurr.funcname = strFuncname;
-                efiCurr.addroffunc = dwFuncAddr;
+                efiCurr.addroffunc = dwFuncAddr;
-                m_ied.functions.push_back(efiCurr);
+                m_ied.functions.push_back(efiCurr);
-        }
+        }
-        
+        
-        void ExportDirectory::removeFunction(unsigned int index)
+        void ExportDirectory::removeFunction(unsigned int index)
-        {
+        {
-                m_ied.functions.erase(m_ied.functions.begin() + index);
+                m_ied.functions.erase(m_ied.functions.begin() + index);
-        }
+        }
-        
+        
-        void ExportDirectory::clear()
+        void ExportDirectory::clear()
-        {
+        {
-                m_ied.functions.clear();
+                m_ied.functions.clear();
-        }
+        }
-                
+                
-        unsigned int ExportDirectory::calcNumberOfFunctions() const
+        unsigned int ExportDirectory::calcNumberOfFunctions() const
-        {
+        {
-                return static_cast<unsigned int>(m_ied.functions.size());
+                return static_cast<unsigned int>(m_ied.functions.size());
-        }
+        }
-        /**
+        /**
-        * Identifies an exported function through it's name.
+        * Identifies an exported function through it's name.
-        * @param strFunctionName Name of the function
+        * @param strFunctionName Name of the function
-        * @return Number which identifies the functions.
+        * @return Number which identifies the functions.
-        **/
+        **/
-        int ExportDirectory::getFunctionIndex(const std::string& strFunctionName) const
+        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));
+                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())
+                if (Iter == m_ied.functions.end())
-                {
+                {
-//                      throw Exceptions::InvalidName(ExportDirectoryId, __LINE__);
+//                      throw Exceptions::InvalidName(ExportDirectoryId, __LINE__);
-                        return -1;
+                        return -1;
-                }
+                }
-                
+                
-                return static_cast<int>(std::distance(m_ied.functions.begin(), Iter));
+                return static_cast<int>(std::distance(m_ied.functions.begin(), Iter));
-        }
+        }
-        /**
+        /**
-        * @param strFilename Name of the file.
+        * @param strFilename Name of the file.
-        * @param uiOffset File offset of the export directory.
+        * @param uiOffset File offset of the export directory.
-        * @param uiSize Size 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.
+        * @param pehHeader A valid PE header which is necessary because some RVA calculations need to be done.
-    * \todo: Proper use of InputBuffer
+    * \todo: Proper use of InputBuffer
-        **/
+        **/
-        int ExportDirectory::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, const PeHeader& pehHeader)
+        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);
+                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
-                
+                
-                if (!ifFile)
+                if (!ifFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                
+                
-                unsigned int filesize = fileSize(ifFile);
+                unsigned int filesize = fileSize(ifFile);
-                
+                
-                if (filesize < uiOffset + uiSize)
+                if (filesize < uiOffset + uiSize)
-                {
+                {
-                        return ERROR_INVALID_FILE;
+                        return ERROR_INVALID_FILE;
-                }
+                }
-                ifFile.seekg(uiOffset, std::ios::beg);
+                ifFile.seekg(uiOffset, std::ios::beg);
-                PELIB_IMAGE_EXP_DIRECTORY iedCurr;
+                PELIB_IMAGE_EXP_DIRECTORY iedCurr;
-                std::vector<unsigned char> vExportdirectory(uiSize);
+                std::vector<unsigned char> vExportdirectory(uiSize);
-                ifFile.read(reinterpret_cast<char*>(&vExportdirectory[0]), uiSize);
+                ifFile.read(reinterpret_cast<char*>(&vExportdirectory[0]), uiSize);
-                InputBuffer inpBuffer(vExportdirectory);
+                InputBuffer inpBuffer(vExportdirectory);
-                inpBuffer >> iedCurr.ied.Characteristics;
+                inpBuffer >> iedCurr.ied.Characteristics;
-                inpBuffer >> iedCurr.ied.TimeDateStamp;
+                inpBuffer >> iedCurr.ied.TimeDateStamp;
-                inpBuffer >> iedCurr.ied.MajorVersion;
+                inpBuffer >> iedCurr.ied.MajorVersion;
-                inpBuffer >> iedCurr.ied.MinorVersion;
+                inpBuffer >> iedCurr.ied.MinorVersion;
-                inpBuffer >> iedCurr.ied.Name;
+                inpBuffer >> iedCurr.ied.Name;
-                inpBuffer >> iedCurr.ied.Base;
+                inpBuffer >> iedCurr.ied.Base;
-                inpBuffer >> iedCurr.ied.NumberOfFunctions;
+                inpBuffer >> iedCurr.ied.NumberOfFunctions;
-                inpBuffer >> iedCurr.ied.NumberOfNames;
+                inpBuffer >> iedCurr.ied.NumberOfNames;
-                inpBuffer >> iedCurr.ied.AddressOfFunctions;
+                inpBuffer >> iedCurr.ied.AddressOfFunctions;
-                inpBuffer >> iedCurr.ied.AddressOfNames;
+                inpBuffer >> iedCurr.ied.AddressOfNames;
-                inpBuffer >> iedCurr.ied.AddressOfNameOrdinals;
+                inpBuffer >> iedCurr.ied.AddressOfNameOrdinals;
-                if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))
+                if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))
-                {
+                {
-                        unsigned int offset = p32->rvaToOffset(iedCurr.ied.Name);
+                        unsigned int offset = p32->rvaToOffset(iedCurr.ied.Name);
-                        
+                        
-                        if (offset >= filesize)
+                        if (offset >= filesize)
-                                return ERROR_INVALID_FILE;
+                                return ERROR_INVALID_FILE;
-                        
+                        
-                        ifFile.seekg(offset, std::ios::beg);
+                        ifFile.seekg(offset, std::ios::beg);
-                }
+                }
-                else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))
+                else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))
-                {
+                {
-                        // XXX: Files might be > 4 GB
+                        // XXX: Files might be > 4 GB
-                        unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.Name));
+                        unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.Name));
-                        
+                        
-                        if (offset >= filesize)
+                        if (offset >= filesize)
-                                return ERROR_INVALID_FILE;
+                                return ERROR_INVALID_FILE;
-                        
+                        
-                        ifFile.seekg(offset, std::ios::beg);
+                        ifFile.seekg(offset, std::ios::beg);
-                }
+                }
-                
+                
-                char c = 0;
+                char c = 0;
-                std::string strFname = "";
+                std::string strFname = "";
-                do
+                do
-                {
+                {
-                        ifFile.read(reinterpret_cast<char*>(&c), sizeof(c));
+                        ifFile.read(reinterpret_cast<char*>(&c), sizeof(c));
-                        if (!ifFile) return ERROR_INVALID_FILE;
+                        if (!ifFile) return ERROR_INVALID_FILE;
-                        if (c) strFname += c;
+                        if (c) strFname += c;
-                }
+                }
-                while (c != 0);
+                while (c != 0);
-                iedCurr.name = strFname;
+                iedCurr.name = strFname;
-                if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))
+                if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))
-                {
+                {
-                        unsigned int offset = p32->rvaToOffset(iedCurr.ied.AddressOfFunctions);
+                        unsigned int offset = p32->rvaToOffset(iedCurr.ied.AddressOfFunctions);
-                        
+                        
-                        if (offset >= filesize)
+                        if (offset >= filesize)
-                                return ERROR_INVALID_FILE;
+                                return ERROR_INVALID_FILE;
-                        
+                        
-                        ifFile.seekg(offset, std::ios::beg);
+                        ifFile.seekg(offset, std::ios::beg);
-                }
+                }
-                else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))
+                else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))
-                {
+                {
-                        // XXX: File might be > 4 GB
+                        // XXX: File might be > 4 GB
-                        unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.AddressOfFunctions));
+                        unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.AddressOfFunctions));
-                        
+                        
-                        if (offset >= filesize)
+                        if (offset >= filesize)
-                                return ERROR_INVALID_FILE;
+                                return ERROR_INVALID_FILE;
-                                
+                                
-                        ifFile.seekg(offset, std::ios::beg);
+                        ifFile.seekg(offset, std::ios::beg);
-                }
+                }
-                PELIB_EXP_FUNC_INFORMATION efiCurr;
+                PELIB_EXP_FUNC_INFORMATION efiCurr;
-                efiCurr.ordinal = 0; efiCurr.addroffunc = 0; efiCurr.addrofname = 0;
+                efiCurr.ordinal = 0; efiCurr.addroffunc = 0; efiCurr.addrofname = 0;
-                for (unsigned int i=0;i<iedCurr.ied.NumberOfFunctions;i++)
+                for (unsigned int i=0;i<iedCurr.ied.NumberOfFunctions;i++)
-                {
+                {
-                        if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))
+                        if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))
-                        {
+                        {
-                                unsigned int offset = p32->rvaToOffset(iedCurr.ied.AddressOfFunctions) + i*sizeof(efiCurr.addroffunc);
+                                unsigned int offset = p32->rvaToOffset(iedCurr.ied.AddressOfFunctions) + i*sizeof(efiCurr.addroffunc);
-                                
+                                
-                                if (offset >= filesize)
+                                if (offset >= filesize)
-                                        return ERROR_INVALID_FILE;
+                                        return ERROR_INVALID_FILE;
-                                        
+                                        
-                                ifFile.seekg(offset, std::ios::beg);
+                                ifFile.seekg(offset, std::ios::beg);
-                        }
+                        }
-                        else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))
+                        else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))
-                        {
+                        {
-                                // XXX: File might be > 4GB
+                                // XXX: File might be > 4GB
-                                unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.AddressOfFunctions)) + i*sizeof(efiCurr.addroffunc);
+                                unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.AddressOfFunctions)) + i*sizeof(efiCurr.addroffunc);
-                                
+                                
-                                if (offset >= filesize)
+                                if (offset >= filesize)
-                                        return ERROR_INVALID_FILE;
+                                        return ERROR_INVALID_FILE;
-                                        
+                                        
-                                ifFile.seekg(offset, std::ios::beg);
+                                ifFile.seekg(offset, std::ios::beg);
-                        }
+                        }
-                        
+                        
-                        ifFile.read(reinterpret_cast<char*>(&efiCurr.addroffunc), sizeof(efiCurr.addroffunc));
+                        ifFile.read(reinterpret_cast<char*>(&efiCurr.addroffunc), sizeof(efiCurr.addroffunc));
-                        
+                        
-                        if (!ifFile)
+                        if (!ifFile)
-                                return ERROR_INVALID_FILE;
+                                return ERROR_INVALID_FILE;
-                                
+                                
-                        efiCurr.ordinal = i;
+                        efiCurr.ordinal = i;
-                        iedCurr.functions.push_back(efiCurr);
+                        iedCurr.functions.push_back(efiCurr);
-                }
+                }
-                for (unsigned int i=0;i<iedCurr.ied.NumberOfNames;i++)
+                for (unsigned int i=0;i<iedCurr.ied.NumberOfNames;i++)
-                {
+                {
-                        if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))
+                        if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))
-                        {
+                        {
-                                unsigned int offset = p32->rvaToOffset(iedCurr.ied.AddressOfNameOrdinals) + i*sizeof(efiCurr.ordinal);
+                                unsigned int offset = p32->rvaToOffset(iedCurr.ied.AddressOfNameOrdinals) + i*sizeof(efiCurr.ordinal);
-                                
+                                
-                                if (offset >= filesize)
+                                if (offset >= filesize)
-                                        return ERROR_INVALID_FILE;
+                                        return ERROR_INVALID_FILE;
-                                
+                                
-                                ifFile.seekg(offset, std::ios::beg);
+                                ifFile.seekg(offset, std::ios::beg);
-                        }
+                        }
-                        else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))
+                        else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))
-                        {
+                        {
-                                // XXX: File might be > 4 GB
+                                // XXX: File might be > 4 GB
-                                unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.AddressOfNameOrdinals)) + i*sizeof(efiCurr.ordinal);
+                                unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.AddressOfNameOrdinals)) + i*sizeof(efiCurr.ordinal);
-                                
+                                
-                                if (offset >= filesize)
+                                if (offset >= filesize)
-                                        return ERROR_INVALID_FILE;
+                                        return ERROR_INVALID_FILE;
-                                
+                                
-                                ifFile.seekg(offset, std::ios::beg);
+                                ifFile.seekg(offset, std::ios::beg);
-                        }
+                        }
-                        word ordinal;
+                        word ordinal;
-                        ifFile.read(reinterpret_cast<char*>(&ordinal), sizeof(ordinal));
+                        ifFile.read(reinterpret_cast<char*>(&ordinal), sizeof(ordinal));
-                        
+                        
-                        if (!ifFile)
+                        if (!ifFile)
-                                return ERROR_INVALID_FILE;
+                                return ERROR_INVALID_FILE;
-                        
+                        
-                        iedCurr.functions[ordinal].ordinal = ordinal;
+                        iedCurr.functions[ordinal].ordinal = ordinal;
-                        if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))
+                        if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))
-                        {
+                        {
-                                unsigned int offset = p32->rvaToOffset(iedCurr.ied.AddressOfNames) + i*sizeof(efiCurr.addrofname);
+                                unsigned int offset = p32->rvaToOffset(iedCurr.ied.AddressOfNames) + i*sizeof(efiCurr.addrofname);
-                                
+                                
-                                if (offset >= filesize)
+                                if (offset >= filesize)
-                                        return ERROR_INVALID_FILE;
+                                        return ERROR_INVALID_FILE;
-                                
+                                
-                                ifFile.seekg(offset, std::ios::beg);
+                                ifFile.seekg(offset, std::ios::beg);
-                        }
+                        }
-                        else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))
+                        else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))
-                        {
+                        {
-                                // XXX: File might be > 4 GB.
+                                // XXX: File might be > 4 GB.
-                                unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.AddressOfNames)) + i*sizeof(efiCurr.addrofname);
+                                unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.ied.AddressOfNames)) + i*sizeof(efiCurr.addrofname);
-                                
+                                
-                                if (offset >= filesize)
+                                if (offset >= filesize)
-                                        return ERROR_INVALID_FILE;
+                                        return ERROR_INVALID_FILE;
-                                
+                                
-                                ifFile.seekg(offset, std::ios::beg);
+                                ifFile.seekg(offset, std::ios::beg);
-                        }
+                        }
-                        
+                        
-                        ifFile.read(reinterpret_cast<char*>(&iedCurr.functions[ordinal].addrofname), sizeof(iedCurr.functions[ordinal].addrofname));
+                        ifFile.read(reinterpret_cast<char*>(&iedCurr.functions[ordinal].addrofname), sizeof(iedCurr.functions[ordinal].addrofname));
-                        
+                        
-                        if (!ifFile)
+                        if (!ifFile)
-                                return ERROR_INVALID_FILE;
+                                return ERROR_INVALID_FILE;
-                        if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))
+                        if (const PeHeader32* p32 = dynamic_cast<const PeHeader32*>(&pehHeader))
-                        {
+                        {
-                                unsigned int offset = p32->rvaToOffset(iedCurr.functions[ordinal].addrofname);
+                                unsigned int offset = p32->rvaToOffset(iedCurr.functions[ordinal].addrofname);
-                                if (offset >= filesize)
+                                if (offset >= filesize)
-                                        return ERROR_INVALID_FILE;
+                                        return ERROR_INVALID_FILE;
-                                ifFile.seekg(offset, std::ios::beg);
+                                ifFile.seekg(offset, std::ios::beg);
-                        }
+                        }
-                        else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))
+                        else if (const PeHeader64* p64 = dynamic_cast<const PeHeader64*>(&pehHeader))
-                        {
+                        {
-                                // XXX: File might be > 4 GB.
+                                // XXX: File might be > 4 GB.
-                                unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.functions[ordinal].addrofname));
+                                unsigned int offset = static_cast<unsigned int>(p64->rvaToOffset(iedCurr.functions[ordinal].addrofname));
-                                if (offset >= filesize)
+                                if (offset >= filesize)
-                                        return ERROR_INVALID_FILE;
+                                        return ERROR_INVALID_FILE;
-                                ifFile.seekg(static_cast<unsigned int>(p64->rvaToOffset(iedCurr.functions[ordinal].addrofname)), std::ios::beg);
+                                ifFile.seekg(static_cast<unsigned int>(p64->rvaToOffset(iedCurr.functions[ordinal].addrofname)), std::ios::beg);
-                        }
+                        }
-                        char c = 0;
+                        char c = 0;
-                        std::string strFname = "";
+                        std::string strFname = "";
-                        do
+                        do
-                        {
+                        {
-                                ifFile.read(reinterpret_cast<char*>(&c), sizeof(c));
+                                ifFile.read(reinterpret_cast<char*>(&c), sizeof(c));
-                                
+                                
-                                if (!ifFile)
+                                if (!ifFile)
-                                        return ERROR_INVALID_FILE;
+                                        return ERROR_INVALID_FILE;
-                                        
+                                        
-                                if (c) strFname += c;
+                                if (c) strFname += c;
-                        }
+                        }
-                        while (c != 0);
+                        while (c != 0);
-                        iedCurr.functions[ordinal].funcname = strFname;
+                        iedCurr.functions[ordinal].funcname = strFname;
-                }
+                }
-                std::swap(m_ied, iedCurr);
+                std::swap(m_ied, iedCurr);
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * @param vBuffer Buffer where the rebuilt export directory is written to.
+        * @param vBuffer Buffer where the rebuilt export directory is written to.
-        * @param dwRva RVA of the export directory.
+        * @param dwRva RVA of the export directory.
-        * \todo fValid flag
+        * \todo fValid flag
-        **/
+        **/
-        void ExportDirectory::rebuild(std::vector<byte>& vBuffer, dword dwRva) const
+        void ExportDirectory::rebuild(std::vector<byte>& vBuffer, dword dwRva) const
-        {
+        {
-                unsigned int uiSizeDirectory = sizeof(PELIB_IMAGE_EXPORT_DIRECTORY);
+                unsigned int uiSizeDirectory = sizeof(PELIB_IMAGE_EXPORT_DIRECTORY);
-                unsigned int uiSizeNames = 0;
+                unsigned int uiSizeNames = 0;
-                unsigned int uiSizeAddrFuncs = 0;
+                unsigned int uiSizeAddrFuncs = 0;
-                unsigned int uiSizeAddrNames = 0;
+                unsigned int uiSizeAddrNames = 0;
-                unsigned int uiSizeOrdinals = 0;
+                unsigned int uiSizeOrdinals = 0;
-                for (unsigned int i=0;i<m_ied.functions.size();i++)
+                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;
+                        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);
+                        uiSizeAddrFuncs += sizeof(m_ied.functions[i].addroffunc);
-                        uiSizeAddrNames += (m_ied.functions[i].funcname.empty()) ? 0 : sizeof(m_ied.functions[i].addrofname);
+                        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);
+                        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;
+                unsigned int uiFilenameSize = static_cast<unsigned int>(m_ied.name.size()) + 1;
-                
+                
-                OutputBuffer obBuffer(vBuffer);
+                OutputBuffer obBuffer(vBuffer);
-                obBuffer << m_ied.ied.Characteristics;
+                obBuffer << m_ied.ied.Characteristics;
-                obBuffer << m_ied.ied.TimeDateStamp;
+                obBuffer << m_ied.ied.TimeDateStamp;
-                obBuffer << m_ied.ied.MajorVersion;
+                obBuffer << m_ied.ied.MajorVersion;
-                obBuffer << m_ied.ied.MinorVersion;
+                obBuffer << m_ied.ied.MinorVersion;
-                obBuffer << dwRva + uiSizeDirectory;
+                obBuffer << dwRva + uiSizeDirectory;
-                obBuffer << m_ied.ied.Base;
+                obBuffer << m_ied.ied.Base;
-                obBuffer << static_cast<unsigned int>(m_ied.functions.size());
+                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)
+                // 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 << static_cast<unsigned int>(m_ied.functions.size());
-                obBuffer << dwRva + uiSizeDirectory + uiFilenameSize;
+                obBuffer << dwRva + uiSizeDirectory + uiFilenameSize;
-                obBuffer << dwRva + uiSizeDirectory + uiFilenameSize + uiSizeAddrFuncs; 
+                obBuffer << dwRva + uiSizeDirectory + uiFilenameSize + uiSizeAddrFuncs; 
-                obBuffer << dwRva + uiSizeDirectory + uiFilenameSize + uiSizeAddrFuncs + uiSizeAddrNames;
+                obBuffer << dwRva + uiSizeDirectory + uiFilenameSize + uiSizeAddrFuncs + uiSizeAddrNames;
-                obBuffer.add(m_ied.name.c_str(), static_cast<unsigned int>(m_ied.name.size())+1);
+                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++)
+                for (unsigned int i=0;i<m_ied.functions.size();i++)
-                {
+                {
-                        obBuffer << m_ied.functions[i].addroffunc;
+                        obBuffer << m_ied.functions[i].addroffunc;
-                }
+                }
-                unsigned int ulFuncCounter = dwRva + uiSizeDirectory + uiFilenameSize + uiSizeAddrFuncs + uiSizeAddrNames + uiSizeOrdinals;
+                unsigned int ulFuncCounter = dwRva + uiSizeDirectory + uiFilenameSize + uiSizeAddrFuncs + uiSizeAddrNames + uiSizeOrdinals;
-                
+                
-                for (unsigned int i=0;i<m_ied.functions.size();i++)
+                for (unsigned int i=0;i<m_ied.functions.size();i++)
-                {
+                {
-                        if (!m_ied.functions[i].funcname.empty())
+                        if (!m_ied.functions[i].funcname.empty())
-                        {
+                        {
-                                obBuffer << ulFuncCounter;
+                                obBuffer << ulFuncCounter;
-                                ulFuncCounter += static_cast<unsigned int>(m_ied.functions[i].funcname.size()) + 1;
+                                ulFuncCounter += static_cast<unsigned int>(m_ied.functions[i].funcname.size()) + 1;
-                        }
+                        }
-                }
+                }
-                for (unsigned int i=0;i<m_ied.functions.size();i++)
+                for (unsigned int i=0;i<m_ied.functions.size();i++)
-                {
+                {
-                        if (!m_ied.functions[i].funcname.empty())
+                        if (!m_ied.functions[i].funcname.empty())
-                        {
+                        {
-                                obBuffer <<  m_ied.functions[i].ordinal;
+                                obBuffer <<  m_ied.functions[i].ordinal;
-                        }
+                        }
-                }
+                }
-                for (unsigned int i=0;i<m_ied.functions.size();i++)
+                for (unsigned int i=0;i<m_ied.functions.size();i++)
-                {
+                {
-                        if (m_ied.functions[i].funcname.empty() && m_ied.functions[i].addroffunc)
+                        if (m_ied.functions[i].funcname.empty() && m_ied.functions[i].addroffunc)
-                        {
+                        {
-                                obBuffer <<  m_ied.functions[i].ordinal;
+                                obBuffer <<  m_ied.functions[i].ordinal;
-                        }
+                        }
-                }
+                }
-                for (unsigned int i=0;i<m_ied.functions.size();i++)
+                for (unsigned int i=0;i<m_ied.functions.size();i++)
-                {
+                {
-                        if (!m_ied.functions[i].funcname.empty())
+                        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);
+                                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.
+        * @return Size of the current export directory.
-        **/
+        **/
-        unsigned int ExportDirectory::size() const
+        unsigned int ExportDirectory::size() const
-        {
+        {
-                return m_ied.size();
+                return m_ied.size();
-        }
+        }
-        /**
+        /**
-        * @param strFilename Name of the file.
+        * @param strFilename Name of the file.
-        * @param uiOffset File offset the export directory will be written to.
+        * @param uiOffset File offset the export directory will be written to.
-        * @param uiRva RVA of the export directory.
+        * @param uiRva RVA of the export directory.
-        * \todo Check if ofFile.write succeeded.
+        * \todo Check if ofFile.write succeeded.
-        **/
+        **/
-        int ExportDirectory::write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva) const
+        int ExportDirectory::write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva) const
-        {
+        {
-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        ofFile.clear();
+                        ofFile.clear();
-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                else
+                else
-                {
+                {
-                        ofFile.close();
+                        ofFile.close();
-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                ofFile.seekp(uiOffset, std::ios::beg);
+                ofFile.seekp(uiOffset, std::ios::beg);
-                std::vector<unsigned char> vBuffer;
+                std::vector<unsigned char> vBuffer;
-                rebuild(vBuffer, uiRva);
+                rebuild(vBuffer, uiRva);
-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
-                ofFile.close();
+                ofFile.close();
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * Changes the filename according to the export directory.
+        * Changes the filename according to the export directory.
-        * @param strFilename New filename.
+        * @param strFilename New filename.
-        **/
+        **/
-        void ExportDirectory::setNameString(const std::string& strFilename)
+        void ExportDirectory::setNameString(const std::string& strFilename)
-        {
+        {
-                m_ied.name = strFilename;
+                m_ied.name = strFilename;
-        }
+        }
-        std::string ExportDirectory::getNameString() const
+        std::string ExportDirectory::getNameString() const
-        {
+        {
-                return m_ied.name;
+                return m_ied.name;
-        }
+        }
-        /**
+        /**
-        * @param dwIndex Number which identifies an exported function.
+        * @param dwIndex Number which identifies an exported function.
-        * @return The name of that function.
+        * @return The name of that function.
-        **/
+        **/
-        std::string ExportDirectory::getFunctionName(dword dwIndex) const
+        std::string ExportDirectory::getFunctionName(dword dwIndex) const
-        {
+        {
-                return m_ied.functions[dwIndex].funcname;
+                return m_ied.functions[dwIndex].funcname;
-        }
+        }
-        /**
+        /**
-        * @param dwIndex Number which identifies an exported function.
+        * @param dwIndex Number which identifies an exported function.
-        * @return The ordinal of that function.
+        * @return The ordinal of that function.
-        **/
+        **/
-        word ExportDirectory::getFunctionOrdinal(dword dwIndex) const
+        word ExportDirectory::getFunctionOrdinal(dword dwIndex) const
-        {
+        {
-                return m_ied.functions[dwIndex].ordinal;
+                return m_ied.functions[dwIndex].ordinal;
-        }
+        }
-        /**
+        /**
-        * @param dwIndex Number which identifies an exported function.
+        * @param dwIndex Number which identifies an exported function.
-        * @return The RVA of the name string of that function.
+        * @return The RVA of the name string of that function.
-        **/
+        **/
-        dword ExportDirectory::getAddressOfName(dword dwIndex) const
+        dword ExportDirectory::getAddressOfName(dword dwIndex) const
-        {
+        {
-                return m_ied.functions[dwIndex].addrofname;
+                return m_ied.functions[dwIndex].addrofname;
-        }
+        }
-        /**
+        /**
-        * @param dwIndex Number which identifies an exported function.
+        * @param dwIndex Number which identifies an exported function.
-        * @return The RVA of that function.
+        * @return The RVA of that function.
-        **/
+        **/
-        dword ExportDirectory::getAddressOfFunction(dword dwIndex) const
+        dword ExportDirectory::getAddressOfFunction(dword dwIndex) const
-        {
+        {
-                return m_ied.functions[dwIndex].addroffunc;
+                return m_ied.functions[dwIndex].addroffunc;
-        }
+        }
-        
+        
-        /**
+        /**
-        * @param dwIndex Number which identifies an exported function.
+        * @param dwIndex Number which identifies an exported function.
-        * @param strName The name of that function.
+        * @param strName The name of that function.
-        **/
+        **/
-        void ExportDirectory::setFunctionName(dword dwIndex, const std::string& strName)
+        void ExportDirectory::setFunctionName(dword dwIndex, const std::string& strName)
-        {
+        {
-                m_ied.functions[dwIndex].funcname = strName;
+                m_ied.functions[dwIndex].funcname = strName;
-        }
+        }
-        /**
+        /**
-        * @param dwIndex Number which identifies an exported function.
+        * @param dwIndex Number which identifies an exported function.
-        * @param wValue The ordinal of that function.
+        * @param wValue The ordinal of that function.
-        **/
+        **/
-        void ExportDirectory::setFunctionOrdinal(dword dwIndex, word wValue)
+        void ExportDirectory::setFunctionOrdinal(dword dwIndex, word wValue)
-        {
+        {
-                m_ied.functions[dwIndex].ordinal = wValue;
+                m_ied.functions[dwIndex].ordinal = wValue;
-        }
+        }
-        /**
+        /**
-        * @param dwIndex Number which identifies an exported function.
+        * @param dwIndex Number which identifies an exported function.
-        * @param dwValue The RVA of the name string of that function.
+        * @param dwValue The RVA of the name string of that function.
-        **/
+        **/
-        void ExportDirectory::setAddressOfName(dword dwIndex, dword dwValue)
+        void ExportDirectory::setAddressOfName(dword dwIndex, dword dwValue)
-        {
+        {
-                m_ied.functions[dwIndex].addrofname = dwValue;
+                m_ied.functions[dwIndex].addrofname = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwIndex Number which identifies an exported function.
+        * @param dwIndex Number which identifies an exported function.
-        * @param dwValue The RVA of that function.
+        * @param dwValue The RVA of that function.
-        **/
+        **/
-        void ExportDirectory::setAddressOfFunction(dword dwIndex, dword dwValue)
+        void ExportDirectory::setAddressOfFunction(dword dwIndex, dword dwValue)
-        {
+        {
-                m_ied.functions[dwIndex].addroffunc = dwValue;
+                m_ied.functions[dwIndex].addroffunc = dwValue;
-        }
+        }
-        /**
+        /**
-        * @return The ordinal base of the export directory.
+        * @return The ordinal base of the export directory.
-        **/
+        **/
-        dword ExportDirectory::getBase() const
+        dword ExportDirectory::getBase() const
-        {
+        {
-                return m_ied.ied.Base;
+                return m_ied.ied.Base;
-        }
+        }
-        /**
+        /**
-        * @return The characteristics of the export directory.
+        * @return The characteristics of the export directory.
-        **/
+        **/
-        dword ExportDirectory::getCharacteristics() const
+        dword ExportDirectory::getCharacteristics() const
-        {
+        {
-                return m_ied.ied.Characteristics;
+                return m_ied.ied.Characteristics;
-        }
+        }
-        /**
+        /**
-        * @return The time/date stamp of the export directory.
+        * @return The time/date stamp of the export directory.
-        **/
+        **/
-        dword ExportDirectory::getTimeDateStamp() const
+        dword ExportDirectory::getTimeDateStamp() const
-        {
+        {
-                return m_ied.ied.TimeDateStamp;
+                return m_ied.ied.TimeDateStamp;
-        }
+        }
-        /**
+        /**
-        * @return The MajorVersion of the export directory.
+        * @return The MajorVersion of the export directory.
-        **/
+        **/
-        word ExportDirectory::getMajorVersion() const
+        word ExportDirectory::getMajorVersion() const
-        {
+        {
-                return m_ied.ied.MajorVersion;
+                return m_ied.ied.MajorVersion;
-        }
+        }
-        /**
+        /**
-        * @return The MinorVersion of the export directory.
+        * @return The MinorVersion of the export directory.
-        **/
+        **/
-        word ExportDirectory::getMinorVersion() const
+        word ExportDirectory::getMinorVersion() const
-        {
+        {
-                return m_ied.ied.MinorVersion;
+                return m_ied.ied.MinorVersion;
-        }
+        }
-        /**
+        /**
-        * @return The RVA of the name of the file.
+        * @return The RVA of the name of the file.
-        **/
+        **/
-        dword ExportDirectory::getName() const
+        dword ExportDirectory::getName() const
-        {
+        {
-                return m_ied.ied.Name;
+                return m_ied.ied.Name;
-        }
+        }
-        /**
+        /**
-        * @return The NumberOfFunctions of the export directory.
+        * @return The NumberOfFunctions of the export directory.
-        **/
+        **/
-        dword ExportDirectory::getNumberOfFunctions() const
+        dword ExportDirectory::getNumberOfFunctions() const
-        {
+        {
-                return m_ied.ied.NumberOfFunctions;
+                return m_ied.ied.NumberOfFunctions;
-        }
+        }
-        /**
+        /**
-        * @return The NumberOfNames of the export directory.
+        * @return The NumberOfNames of the export directory.
-        **/
+        **/
-        dword ExportDirectory::getNumberOfNames() const
+        dword ExportDirectory::getNumberOfNames() const
-        {
+        {
-                return m_ied.ied.NumberOfNames;
+                return m_ied.ied.NumberOfNames;
-        }
+        }
-        /**
+        /**
-        * @return The AddressOfFunctions of the export directory.
+        * @return The AddressOfFunctions of the export directory.
-        **/
+        **/
-        dword ExportDirectory::getAddressOfFunctions() const
+        dword ExportDirectory::getAddressOfFunctions() const
-        {
+        {
-                return m_ied.ied.AddressOfFunctions;
+                return m_ied.ied.AddressOfFunctions;
-        }
+        }
-        /**
+        /**
-        * @return The AddressOfNames of the export directory.
+        * @return The AddressOfNames of the export directory.
-        **/
+        **/
-        dword ExportDirectory::getAddressOfNames() const
+        dword ExportDirectory::getAddressOfNames() const
-        {
+        {
-                return m_ied.ied.AddressOfNames;
+                return m_ied.ied.AddressOfNames;
-        }
+        }
-/*      dword ExportDirectory::getNumberOfNameOrdinals() const
+/*      dword ExportDirectory::getNumberOfNameOrdinals() const
-        {
+        {
-                return static_cast<dword>(m_ied.functions.size());
+                return static_cast<dword>(m_ied.functions.size());
-        }
+        }
-        dword ExportDirectory::getNumberOfAddressOfFunctionNames() const
+        dword ExportDirectory::getNumberOfAddressOfFunctionNames() const
-        {
+        {
-                return static_cast<dword>(m_ied.functions.size());
+                return static_cast<dword>(m_ied.functions.size());
-        }
+        }
-        dword ExportDirectory::getNumberOfAddressOfFunctions() const
+        dword ExportDirectory::getNumberOfAddressOfFunctions() const
-        {
+        {
-                return static_cast<dword>(m_ied.functions.size());
+                return static_cast<dword>(m_ied.functions.size());
-        }
+        }
-*/
+*/
-        /**
+        /**
-        * @return The AddressOfNameOrdinals of the export directory.
+        * @return The AddressOfNameOrdinals of the export directory.
-        **/
+        **/
-        dword ExportDirectory::getAddressOfNameOrdinals() const
+        dword ExportDirectory::getAddressOfNameOrdinals() const
-        {
+        {
-                return m_ied.ied.AddressOfNameOrdinals;
+                return m_ied.ied.AddressOfNameOrdinals;
-        }
+        }
-        /**
+        /**
-        * @param dwValue The ordinal base of the export directory.
+        * @param dwValue The ordinal base of the export directory.
-        **/
+        **/
-        void ExportDirectory::setBase(dword dwValue)
+        void ExportDirectory::setBase(dword dwValue)
-        {
+        {
-                m_ied.ied.Base = dwValue;
+                m_ied.ied.Base = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue The Characteristics of the export directory.
+        * @param dwValue The Characteristics of the export directory.
-        **/
+        **/
-        void ExportDirectory::setCharacteristics(dword dwValue)
+        void ExportDirectory::setCharacteristics(dword dwValue)
-        {
+        {
-                m_ied.ied.Characteristics = dwValue;
+                m_ied.ied.Characteristics = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue The TimeDateStamp of the export directory.
+        * @param dwValue The TimeDateStamp of the export directory.
-        **/
+        **/
-        void ExportDirectory::setTimeDateStamp(dword dwValue)
+        void ExportDirectory::setTimeDateStamp(dword dwValue)
-        {
+        {
-                m_ied.ied.TimeDateStamp = dwValue;
+                m_ied.ied.TimeDateStamp = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param wValue The MajorVersion of the export directory.
+        * @param wValue The MajorVersion of the export directory.
-        **/
+        **/
-        void ExportDirectory::setMajorVersion(word wValue)
+        void ExportDirectory::setMajorVersion(word wValue)
-        {
+        {
-                m_ied.ied.MajorVersion = wValue;
+                m_ied.ied.MajorVersion = wValue;
-        }
+        }
-        /**
+        /**
-        * @param wValue The MinorVersion of the export directory.
+        * @param wValue The MinorVersion of the export directory.
-        **/
+        **/
-        void ExportDirectory::setMinorVersion(word wValue)
+        void ExportDirectory::setMinorVersion(word wValue)
-        {
+        {
-                m_ied.ied.MinorVersion = wValue;
+                m_ied.ied.MinorVersion = wValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue The Name of the export directory.
+        * @param dwValue The Name of the export directory.
-        **/
+        **/
-        void ExportDirectory::setName(dword dwValue)
+        void ExportDirectory::setName(dword dwValue)
-        {
+        {
-                m_ied.ied.Name = dwValue;
+                m_ied.ied.Name = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue The NumberOfFunctions of the export directory.
+        * @param dwValue The NumberOfFunctions of the export directory.
-        **/
+        **/
-        void ExportDirectory::setNumberOfFunctions(dword dwValue)
+        void ExportDirectory::setNumberOfFunctions(dword dwValue)
-        {
+        {
-                m_ied.ied.NumberOfFunctions = dwValue;
+                m_ied.ied.NumberOfFunctions = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue The NumberOfNames of the export directory.
+        * @param dwValue The NumberOfNames of the export directory.
-        **/
+        **/
-        void ExportDirectory::setNumberOfNames(dword dwValue)
+        void ExportDirectory::setNumberOfNames(dword dwValue)
-        {
+        {
-                m_ied.ied.NumberOfNames = dwValue;
+                m_ied.ied.NumberOfNames = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue The AddressOfFunctions of the export directory.
+        * @param dwValue The AddressOfFunctions of the export directory.
-        **/
+        **/
-        void ExportDirectory::setAddressOfFunctions(dword dwValue)
+        void ExportDirectory::setAddressOfFunctions(dword dwValue)
-        {
+        {
-                m_ied.ied.AddressOfFunctions = dwValue;
+                m_ied.ied.AddressOfFunctions = dwValue;
-        }
+        }
-        /**
+        /**
-        * @param dwValue The AddressOfNames of the export directory.
+        * @param dwValue The AddressOfNames of the export directory.
-        **/
+        **/
-        void ExportDirectory::setAddressOfNames(dword dwValue)
+        void ExportDirectory::setAddressOfNames(dword dwValue)
-        {
+        {
-                m_ied.ied.AddressOfNames = dwValue;
+                m_ied.ied.AddressOfNames = dwValue;
-        }
+        }
-        
+        
-        void ExportDirectory::setAddressOfNameOrdinals(dword value)
+        void ExportDirectory::setAddressOfNameOrdinals(dword value)
-        {
+        {
-                m_ied.ied.AddressOfNameOrdinals = 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.
+* ExportDirectory.h - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#ifndef EXPORTDIRECTORY_H
+#ifndef EXPORTDIRECTORY_H
-#define EXPORTDIRECTORY_H
+#define EXPORTDIRECTORY_H
-#include "PeHeader.h"
+#include "PeHeader.h"
-namespace PeLib
+namespace PeLib
-{
+{
-        /// Class that handles the export directory.
+        /// Class that handles the export directory.
-        /**
+        /**
-        * This class handles the export directory.
+        * This class handles the export directory.
-        * \todo getNameString
+        * \todo getNameString
-        **/
+        **/
-//      template<int bits>
+//      template<int bits>
-        class ExportDirectory
+        class ExportDirectory
-        {
+        {
-                private:
+                private:
-                  /// Used to store all necessary information about a file's exported functions.
+                  /// Used to store all necessary information about a file's exported functions.
-                  PELIB_IMAGE_EXP_DIRECTORY m_ied;
+                  PELIB_IMAGE_EXP_DIRECTORY m_ied;
-                public:
+                public:
-                  /// Add another function to be exported.
+                  /// Add another function to be exported.
-                  void addFunction(const std::string& strFuncname, dword dwFuncAddr); // EXPORT
+                  void addFunction(const std::string& strFuncname, dword dwFuncAddr); // EXPORT
-                  unsigned int calcNumberOfFunctions() const; // EXPORT
+                  unsigned int calcNumberOfFunctions() const; // EXPORT
-                  void clear(); // EXPORT
+                  void clear(); // EXPORT
-                  /// Identifies a function through it's name.
+                  /// Identifies a function through it's name.
-                  int getFunctionIndex(const std::string& strFunctionName) const; // EXPORT
+                  int getFunctionIndex(const std::string& strFunctionName) const; // EXPORT
-                  /// Read a file's export directory.
+                  /// Read a file's export directory.
-                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, const PeHeader& pehHeader); // EXPORT
+                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, const PeHeader& pehHeader); // EXPORT
-                  /// Rebuild the current export directory.
+                  /// Rebuild the current export directory.
-                  void rebuild(std::vector<byte>& vBuffer, dword dwRva) const; // EXPORT
+                  void rebuild(std::vector<byte>& vBuffer, dword dwRva) const; // EXPORT
-                  void removeFunction(unsigned int index); // EXPORT
+                  void removeFunction(unsigned int index); // EXPORT
-                  /// Returns the size of the current export directory.
+                  /// Returns the size of the current export directory.
-                  unsigned int size() const; // EXPORT
+                  unsigned int size() const; // EXPORT
-                  /// Writes the current export directory to a file.
+                  /// Writes the current export directory to a file.
-                  int write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva) const; // EXPORT
+                  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).
+                  /// Changes the name of the file (according to the export directory).
-                  void setNameString(const std::string& strFilename); // EXPORT
+                  void setNameString(const std::string& strFilename); // EXPORT
-                  std::string getNameString() const; // EXPORT
+                  std::string getNameString() const; // EXPORT
-                  /// Get the name of an exported function.
+                  /// Get the name of an exported function.
-                  std::string getFunctionName(unsigned int index) const; // EXPORT
+                  std::string getFunctionName(unsigned int index) const; // EXPORT
-                  /// Get the ordinal of an exported function.
+                  /// Get the ordinal of an exported function.
-                  word getFunctionOrdinal(unsigned int index) const; // EXPORT
+                  word getFunctionOrdinal(unsigned int index) const; // EXPORT
-                  /// Get the address of the name of an exported function.
+                  /// Get the address of the name of an exported function.
-                  dword getAddressOfName(unsigned int index) const; // EXPORT
+                  dword getAddressOfName(unsigned int index) const; // EXPORT
-                  /// Get the address of an exported function.
+                  /// Get the address of an exported function.
-                  dword getAddressOfFunction(unsigned int index) const; // EXPORT
+                  dword getAddressOfFunction(unsigned int index) const; // EXPORT
-                  
+                  
-                  /// Change the name of an exported function.
+                  /// Change the name of an exported function.
-                  void setFunctionName(unsigned int index, const std::string& strName); // EXPORT
+                  void setFunctionName(unsigned int index, const std::string& strName); // EXPORT
-                  /// Change the ordinal of an exported function.
+                  /// Change the ordinal of an exported function.
-                  void setFunctionOrdinal(unsigned int index, word wValue); // EXPORT
+                  void setFunctionOrdinal(unsigned int index, word wValue); // EXPORT
-                  /// Change the address of the name of an exported function.
+                  /// Change the address of the name of an exported function.
-                  void setAddressOfName(unsigned int index, dword dwValue); // EXPORT
+                  void setAddressOfName(unsigned int index, dword dwValue); // EXPORT
-                  /// Change the address of an exported function.
+                  /// Change the address of an exported function.
-                  void setAddressOfFunction(unsigned int index, dword dwValue); // EXPORT
+                  void setAddressOfFunction(unsigned int index, dword dwValue); // EXPORT
-                  
+                  
-                  /*
+                  /*
-                  word getFunctionOrdinal(std::string strFuncname) const;
+                  word getFunctionOrdinal(std::string strFuncname) const;
-                  dword getAddressOfName(std::string strFuncname) const;
+                  dword getAddressOfName(std::string strFuncname) const;
-                  dword getAddressOfFunction(std::string strFuncname) const;
+                  dword getAddressOfFunction(std::string strFuncname) const;
-                  void setFunctionOrdinal(std::string strFuncname, word wValue);
+                  void setFunctionOrdinal(std::string strFuncname, word wValue);
-                  void setAddressOfName(std::string strFuncname, dword dwValue);
+                  void setAddressOfName(std::string strFuncname, dword dwValue);
-                  void setAddressOfFunction(std::string strFuncname, dword dwValue);
+                  void setAddressOfFunction(std::string strFuncname, dword dwValue);
-                  */
+                  */
-                  /// Return the Base value of the export directory.
+                  /// Return the Base value of the export directory.
-                  dword getBase() const; // EXPORT
+                  dword getBase() const; // EXPORT
-                  /// Return the Characteristics value of the export directory.
+                  /// Return the Characteristics value of the export directory.
-                  dword getCharacteristics() const; // EXPORT
+                  dword getCharacteristics() const; // EXPORT
-                  /// Return the TimeDateStamp value of the export directory.
+                  /// Return the TimeDateStamp value of the export directory.
-                  dword getTimeDateStamp() const; // EXPORT
+                  dword getTimeDateStamp() const; // EXPORT
-                  /// Return the MajorVersion value of the export directory.
+                  /// Return the MajorVersion value of the export directory.
-                  word getMajorVersion() const; // EXPORT
+                  word getMajorVersion() const; // EXPORT
-                  /// Return the MinorVersion value of the export directory.
+                  /// Return the MinorVersion value of the export directory.
-                  word getMinorVersion() const; // EXPORT
+                  word getMinorVersion() const; // EXPORT
-                  /// Return the Name value of the export directory.
+                  /// Return the Name value of the export directory.
-                  dword getName() const; // EXPORT
+                  dword getName() const; // EXPORT
-                  /// Return the NumberOfFunctions value of the export directory.
+                  /// Return the NumberOfFunctions value of the export directory.
-                  dword getNumberOfFunctions() const; // EXPORT
+                  dword getNumberOfFunctions() const; // EXPORT
-                  /// Return the NumberOfNames value of the export directory.
+                  /// Return the NumberOfNames value of the export directory.
-                  dword getNumberOfNames() const; // EXPORT
+                  dword getNumberOfNames() const; // EXPORT
-                  /// Return the AddressOfFunctions value of the export directory.
+                  /// Return the AddressOfFunctions value of the export directory.
-                  dword getAddressOfFunctions() const; // EXPORT
+                  dword getAddressOfFunctions() const; // EXPORT
-                  /// Return the AddressOfNames value of the export directory.
+                  /// Return the AddressOfNames value of the export directory.
-                  dword getAddressOfNames() const; // EXPORT
+                  dword getAddressOfNames() const; // EXPORT
-                  /// Returns the AddressOfNameOrdinals value.
+                  /// Returns the AddressOfNameOrdinals value.
-                  dword getAddressOfNameOrdinals() const; // EXPORT
+                  dword getAddressOfNameOrdinals() const; // EXPORT
-/*                /// Returns the number of NameOrdinals.
+/*                /// Returns the number of NameOrdinals.
-                  dword getNumberOfNameOrdinals() const; // EXPORT
+                  dword getNumberOfNameOrdinals() const; // EXPORT
-                  /// Returns the number of AddressOfFunctionNames values.
+                  /// Returns the number of AddressOfFunctionNames values.
-                  dword getNumberOfAddressOfFunctionNames() const; // EXPORT
+                  dword getNumberOfAddressOfFunctionNames() const; // EXPORT
-                  /// Returns the number of AddressOfFunction values.
+                  /// Returns the number of AddressOfFunction values.
-                  dword getNumberOfAddressOfFunctions() const; // EXPORT
+                  dword getNumberOfAddressOfFunctions() const; // EXPORT
-*/
+*/
-                  /// Set the Base value of the export directory.
+                  /// Set the Base value of the export directory.
-                  void setBase(dword dwValue); // EXPORT
+                  void setBase(dword dwValue); // EXPORT
-                  /// Set the Characteristics value of the export directory.
+                  /// Set the Characteristics value of the export directory.
-                  void setCharacteristics(dword dwValue); // EXPORT
+                  void setCharacteristics(dword dwValue); // EXPORT
-                  /// Set the TimeDateStamp value of the export directory.
+                  /// Set the TimeDateStamp value of the export directory.
-                  void setTimeDateStamp(dword dwValue); // EXPORT
+                  void setTimeDateStamp(dword dwValue); // EXPORT
-                  /// Set the MajorVersion value of the export directory.
+                  /// Set the MajorVersion value of the export directory.
-                  void setMajorVersion(word wValue); // EXPORT
+                  void setMajorVersion(word wValue); // EXPORT
-                  /// Set the MinorVersion value of the export directory.
+                  /// Set the MinorVersion value of the export directory.
-                  void setMinorVersion(word wValue); // EXPORT
+                  void setMinorVersion(word wValue); // EXPORT
-                  /// Set the Name value of the export directory.
+                  /// Set the Name value of the export directory.
-                  void setName(dword dwValue); // EXPORT
+                  void setName(dword dwValue); // EXPORT
-                  /// Set the NumberOfFunctions value of the export directory.
+                  /// Set the NumberOfFunctions value of the export directory.
-                  void setNumberOfFunctions(dword dwValue); // EXPORT
+                  void setNumberOfFunctions(dword dwValue); // EXPORT
-                  /// Set the NumberOfNames value of the export directory.
+                  /// Set the NumberOfNames value of the export directory.
-                  void setNumberOfNames(dword dwValue); // EXPORT
+                  void setNumberOfNames(dword dwValue); // EXPORT
-                  /// Set the AddressOfFunctions value of the export directory.
+                  /// Set the AddressOfFunctions value of the export directory.
-                  void setAddressOfFunctions(dword dwValue); // EXPORT
+                  void setAddressOfFunctions(dword dwValue); // EXPORT
-                  /// Set the AddressOfNames value of the export directory.
+                  /// Set the AddressOfNames value of the export directory.
-                  void setAddressOfNames(dword dwValue); // EXPORT
+                  void setAddressOfNames(dword dwValue); // EXPORT
-                  void setAddressOfNameOrdinals(dword value); // EXPORT
+                  void setAddressOfNameOrdinals(dword value); // EXPORT
-        };
+        };
-}
+}
-#endif
+#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.
+* IatDirectory.h - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#include "IatDirectory.h"
+#include "IatDirectory.h"
-namespace PeLib
+namespace PeLib
-{
+{
-        int IatDirectory::read(InputBuffer& inputBuffer, unsigned int size)
+        int IatDirectory::read(InputBuffer& inputBuffer, unsigned int size)
-        {
+        {
-                dword dwAddr;
+                dword dwAddr;
-                std::vector<dword> vIat;
+                std::vector<dword> vIat;
-                for (unsigned int i=0;i<size/sizeof(dword);i++)
+                for (unsigned int i=0;i<size/sizeof(dword);i++)
-                {
+                {
-                        inputBuffer >> dwAddr;
+                        inputBuffer >> dwAddr;
-                        vIat.push_back(dwAddr);
+                        vIat.push_back(dwAddr);
-                }
+                }
-                
+                
-                std::swap(vIat, m_vIat);
+                std::swap(vIat, m_vIat);
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Reads the Import Address table from a file.
+        * Reads the Import Address table from a file.
-        * @param strFilename Name of the file.
+        * @param strFilename Name of the file.
-        * @param dwOffset File offset of the IAT (see #PeFile::PeHeader::getIDIatRVA).
+        * @param dwOffset File offset of the IAT (see #PeFile::PeHeader::getIDIatRVA).
-        * @param dwSize Size of the IAT (see #PeFile::PeHeader::getIDIatSize).
+        * @param dwSize Size of the IAT (see #PeFile::PeHeader::getIDIatSize).
-        **/
+        **/
-        int IatDirectory::read(const std::string& strFilename, unsigned int dwOffset, unsigned int dwSize)
+        int IatDirectory::read(const std::string& strFilename, unsigned int dwOffset, unsigned int dwSize)
-        {
+        {
-                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
+                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
-                
+                
-                if (!ifFile)
+                if (!ifFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                
+                
-                if (fileSize(ifFile) < dwOffset + dwSize)
+                if (fileSize(ifFile) < dwOffset + dwSize)
-                {
+                {
-                        return ERROR_INVALID_FILE;
+                        return ERROR_INVALID_FILE;
-                }
+                }
-                
+                
-                ifFile.seekg(dwOffset, std::ios::beg);
+                ifFile.seekg(dwOffset, std::ios::beg);
-                
+                
-                std::vector<byte> vBuffer(dwSize);
+                std::vector<byte> vBuffer(dwSize);
-                ifFile.read(reinterpret_cast<char*>(&vBuffer[0]), dwSize);
+                ifFile.read(reinterpret_cast<char*>(&vBuffer[0]), dwSize);
-                InputBuffer inpBuffer(vBuffer);
+                InputBuffer inpBuffer(vBuffer);
-                return read(inpBuffer, dwSize);
+                return read(inpBuffer, dwSize);
-        }
+        }
-        
+        
-        int IatDirectory::read(unsigned char* buffer, unsigned int buffersize)
+        int IatDirectory::read(unsigned char* buffer, unsigned int buffersize)
-        {
+        {
-                std::vector<byte> vBuffer(buffer, buffer + buffersize);
+                std::vector<byte> vBuffer(buffer, buffer + buffersize);
-                InputBuffer inpBuffer(vBuffer);
+                InputBuffer inpBuffer(vBuffer);
-                return read(inpBuffer, buffersize);
+                return read(inpBuffer, buffersize);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the number of fields in the IAT. This is equivalent to the number of
+        * Returns the number of fields in the IAT. This is equivalent to the number of
-        * imported functions.
+        * imported functions.
-        * @return Number of fields in the IAT.
+        * @return Number of fields in the IAT.
-        **/
+        **/
-        unsigned int IatDirectory::calcNumberOfAddresses() const
+        unsigned int IatDirectory::calcNumberOfAddresses() const
-        {
+        {
-                return static_cast<unsigned int>(m_vIat.size());
+                return static_cast<unsigned int>(m_vIat.size());
-        }
+        }
-        /**
+        /**
-        * Returns the dwValue of a field in the IAT.
+        * Returns the dwValue of a field in the IAT.
-        * @param dwAddrnr Number identifying the field.
+        * @param dwAddrnr Number identifying the field.
-        * @return dwValue of the field.
+        * @return dwValue of the field.
-        **/
+        **/
-        dword IatDirectory::getAddress(unsigned int index) const
+        dword IatDirectory::getAddress(unsigned int index) const
-        {
+        {
-                return m_vIat[index];
+                return m_vIat[index];
-        }
+        }
-        
+        
-        /**
+        /**
-        * Updates the dwValue of a field in the IAT.
+        * Updates the dwValue of a field in the IAT.
-        * @param dwAddrnr Number identifying the field.
+        * @param dwAddrnr Number identifying the field.
-        * @param dwValue New dwValue of the field.
+        * @param dwValue New dwValue of the field.
-        **/
+        **/
-        void IatDirectory::setAddress(dword dwAddrnr, dword dwValue)
+        void IatDirectory::setAddress(dword dwAddrnr, dword dwValue)
-        {
+        {
-                m_vIat[dwAddrnr] = dwValue;
+                m_vIat[dwAddrnr] = dwValue;
-        }
+        }
-        /**
+        /**
-        * Adds another field to the IAT.
+        * Adds another field to the IAT.
-        * @param dwValue dwValue of the new field.
+        * @param dwValue dwValue of the new field.
-        **/
+        **/
-        void IatDirectory::addAddress(dword dwValue)
+        void IatDirectory::addAddress(dword dwValue)
-        {
+        {
-                m_vIat.push_back(dwValue);
+                m_vIat.push_back(dwValue);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Removes an address from the IAT.
+        * Removes an address from the IAT.
-        * @param dwAddrnr Number identifying the field.
+        * @param dwAddrnr Number identifying the field.
-        **/
+        **/
-        void IatDirectory::removeAddress(unsigned int index)
+        void IatDirectory::removeAddress(unsigned int index)
-        {
+        {
-                std::vector<dword>::iterator pos = m_vIat.begin() + index;
+                std::vector<dword>::iterator pos = m_vIat.begin() + index;
-                m_vIat.erase(pos);
+                m_vIat.erase(pos);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Delete all entries from the IAT.
+        * Delete all entries from the IAT.
-        **/
+        **/
-        void IatDirectory::clear()
+        void IatDirectory::clear()
-        {
+        {
-                m_vIat.clear();
+                m_vIat.clear();
-        }
+        }
-        
+        
-        /**
+        /**
-        * Rebuilds the complete Import Address Table.
+        * Rebuilds the complete Import Address Table.
-        * @param vBuffer Buffer where the rebuilt IAT will be stored.
+        * @param vBuffer Buffer where the rebuilt IAT will be stored.
-        **/
+        **/
-        void IatDirectory::rebuild(std::vector<byte>& vBuffer) const
+        void IatDirectory::rebuild(std::vector<byte>& vBuffer) const
-        {
+        {
-                vBuffer.reserve(size());
+                vBuffer.reserve(size());
-                OutputBuffer obBuffer(vBuffer);
+                OutputBuffer obBuffer(vBuffer);
-        
+        
-                for (unsigned int i=0;i<m_vIat.size();i++)
+                for (unsigned int i=0;i<m_vIat.size();i++)
-                {
+                {
-                        obBuffer << m_vIat[i];
+                        obBuffer << m_vIat[i];
-                }
+                }
-        }
+        }
-        unsigned int IatDirectory::size() const
+        unsigned int IatDirectory::size() const
-        {
+        {
-                return static_cast<unsigned int>(m_vIat.size())* sizeof(dword);
+                return static_cast<unsigned int>(m_vIat.size())* sizeof(dword);
-        }
+        }
-        /// Writes the current IAT to a file.
+        /// Writes the current IAT to a file.
-        int IatDirectory::write(const std::string& strFilename, unsigned int uiOffset) const
+        int IatDirectory::write(const std::string& strFilename, unsigned int uiOffset) const
-        {
+        {
-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        ofFile.clear();
+                        ofFile.clear();
-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                else
+                else
-                {
+                {
-                        ofFile.close();
+                        ofFile.close();
-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                ofFile.seekp(uiOffset, std::ios::beg);
+                ofFile.seekp(uiOffset, std::ios::beg);
-                std::vector<unsigned char> vBuffer;
+                std::vector<unsigned char> vBuffer;
-                rebuild(vBuffer);
+                rebuild(vBuffer);
-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
-                ofFile.close();
+                ofFile.close();
-                
+                
-                return NO_ERROR;
+                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.
+* IatDirectory.h - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#ifndef IATDIRECTORY_H
+#ifndef IATDIRECTORY_H
-#define IATDIRECTORY_H
+#define IATDIRECTORY_H
-#include "PeLibInc.h"
+#include "PeLibInc.h"
-namespace PeLib
+namespace PeLib
-{
+{
-        /// Class that handles the Import Address Table (IAT)
+        /// Class that handles the Import Address Table (IAT)
-        /**
+        /**
-        * This class can read and modify the Import Address Table of a PE file.
+        * This class can read and modify the Import Address Table of a PE file.
-        **/
+        **/
-        class IatDirectory
+        class IatDirectory
-        {
+        {
-                private:
+                private:
-                  std::vector<dword> m_vIat; ///< Stores the individual IAT fields.
+                  std::vector<dword> m_vIat; ///< Stores the individual IAT fields.
-                  
+                  
-                  int read(InputBuffer& inputBuffer, unsigned int size);
+                  int read(InputBuffer& inputBuffer, unsigned int size);
-                  
+                  
-                public:
+                public:
-                  /// Reads the Import Address Table from a PE file.
+                  /// Reads the Import Address Table from a PE file.
-                  int read(const std::string& strFilename, unsigned int dwOffset, unsigned int dwSize); // EXPORT
+                  int read(const std::string& strFilename, unsigned int dwOffset, unsigned int dwSize); // EXPORT
-                  int read(unsigned char* buffer, unsigned int buffersize); // EXPORT
+                  int read(unsigned char* buffer, unsigned int buffersize); // EXPORT
-                  /// Returns the number of fields in the IAT.
+                  /// Returns the number of fields in the IAT.
-                  unsigned int calcNumberOfAddresses() const; // EXPORT
+                  unsigned int calcNumberOfAddresses() const; // EXPORT
-                  /// Adds another address to the IAT.
+                  /// Adds another address to the IAT.
-                  void addAddress(dword dwValue); // EXPORT
+                  void addAddress(dword dwValue); // EXPORT
-                  /// Removes an address from the IAT.
+                  /// Removes an address from the IAT.
-                  void removeAddress(unsigned int index); // EXPORT
+                  void removeAddress(unsigned int index); // EXPORT
-                  /// Empties the IAT.
+                  /// Empties the IAT.
-                  void clear(); // EXPORT
+                  void clear(); // EXPORT
-                  // Rebuilds the IAT.
+                  // Rebuilds the IAT.
-                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT
+                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT
-                  /// Returns the size of the current IAT.
+                  /// Returns the size of the current IAT.
-                  unsigned int size() const; // EXPORT
+                  unsigned int size() const; // EXPORT
-                  /// Writes the current IAT to a file.
+                  /// Writes the current IAT to a file.
-                  int write(const std::string& strFilename, unsigned int uiOffset) const; // EXPORT
+                  int write(const std::string& strFilename, unsigned int uiOffset) const; // EXPORT
-                  /// Retrieve the value of a field in the IAT.
+                  /// Retrieve the value of a field in the IAT.
-                  dword getAddress(unsigned int index) const; // EXPORT
+                  dword getAddress(unsigned int index) const; // EXPORT
-                  /// Change the value of a field in the IAT.
+                  /// Change the value of a field in the IAT.
-                  void setAddress(dword dwAddrnr, dword dwValue); // EXPORT
+                  void setAddress(dword dwAddrnr, dword dwValue); // EXPORT
-        };
+        };
-}
+}
-#endif
+#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.
+* ImportDirectory.h - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#ifndef IMPORTDIRECTORY_H
+#ifndef IMPORTDIRECTORY_H
-#define IMPORTDIRECTORY_H
+#define IMPORTDIRECTORY_H
-#include "PeLibAux.h"
+#include "PeLibAux.h"
-#include "PeHeader.h"
+#include "PeHeader.h"
-namespace PeLib
+namespace PeLib
-{
+{
-        /// Parameter for functions that can operate on the OLDDIR or new import directory.
+        /// Parameter for functions that can operate on the OLDDIR or new import directory.
-        enum currdir {OLDDIR = 1, NEWDIR};
+        enum currdir {OLDDIR = 1, NEWDIR};
-                
+                
-        class PeLibException;
+        class PeLibException;
-        /// Class that handles import directories.
+        /// Class that handles import directories.
-        /**
+        /**
-        * This class can read import directories from existing PE files or start completely from scratch.
+        * 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.
+        * 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
+        * 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
+        * 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
+        * 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.
+        * 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 Adding functions by ordinal doesn't work yet (rebuild needs to be changed).
-        * \todo Somehow store the rvas of the chunks in the file.
+        * \todo Somehow store the rvas of the chunks in the file.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        class ImportDirectory
+        class ImportDirectory
-        {
+        {
-                typedef typename std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> >::iterator ImpDirFileIterator;
+                typedef typename std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> >::iterator ImpDirFileIterator;
-                typedef typename std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> >::const_iterator ConstImpDirFileIterator;
+                typedef typename std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> >::const_iterator ConstImpDirFileIterator;
-        
+        
-                private:
+                private:
-                  /// Stores information about already imported DLLs.
+                  /// Stores information about already imported DLLs.
-                  std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> > m_vOldiid;
+                  std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> > m_vOldiid;
-                  /// Stores information about imported DLLs which will be added.
+                  /// Stores information about imported DLLs which will be added.
-                  std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> > m_vNewiid;
+                  std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> > m_vNewiid;
-                // I can't convince Borland C++ to compile the function outside of the class declaration.
+                // I can't convince Borland C++ to compile the function outside of the class declaration.
-                // That's why the function definition is here.
+                // That's why the function definition is here.
-                /// Tests if a certain function is imported.
+                /// 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
+                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 FileIter = m_vOldiid.begin();
-                        ConstImpDirFileIterator EndIter = m_vOldiid.end();
+                        ConstImpDirFileIterator EndIter = m_vOldiid.end();
-                        
+                        
-                        for (int i=0;i<=1;i++) // Loop once for m_vOldiid and once for m_vNewiid
+                        for (int i=0;i<=1;i++) // Loop once for m_vOldiid and once for m_vNewiid
-                        {
+                        {
-                                do
+                                do
-                                {
+                                {
-                                        FileIter = std::find_if(FileIter, EndIter, std::bind2nd(std::mem_fun_ref(&PELIB_IMAGE_IMPORT_DIRECTORY<bits>::operator==), strFilename));
+                                        FileIter = std::find_if(FileIter, EndIter, std::bind2nd(std::mem_fun_ref(&PELIB_IMAGE_IMPORT_DIRECTORY<bits>::operator==), strFilename));
-                                        
+                                        
-                                        if (FileIter != EndIter)
+                                        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));
+                                                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())
+                                                if (Iter != FileIter->originalfirstthunk.end())
-                                                {
+                                                {
-                                                        return true;
+                                                        return true;
-                                                }
+                                                }
-                                                ++FileIter;
+                                                ++FileIter;
-                                        }
+                                        }
-                                }
+                                }
-                                while (FileIter != EndIter);
+                                while (FileIter != EndIter);
-                                
+                                
-                                FileIter = m_vNewiid.begin();
+                                FileIter = m_vNewiid.begin();
-                                EndIter = m_vNewiid.end();
+                                EndIter = m_vNewiid.end();
-                        }
+                        }
-                        
+                        
-                        return false;
+                        return false;
-                }
+                }
-        
+        
-                public:
+                public:
-                  /// Add a function to the import directory.
+                  /// Add a function to the import directory.
-                  int addFunction(const std::string& strFilename, word wHint); // EXPORT _byHint
+                  int addFunction(const std::string& strFilename, word wHint); // EXPORT _byHint
-                  /// Add a function to the import directory.
+                  /// Add a function to the import directory.
-                  int addFunction(const std::string& strFilename, const std::string& strFuncname); // EXPORT _byName
+                  int addFunction(const std::string& strFilename, const std::string& strFuncname); // EXPORT _byName
-                  /// Get the ID of a file through it's name.
+                  /// Get the ID of a file through it's name.
-                  unsigned int getFileIndex(const std::string& strFilename, currdir cdDir) const; // EXPORT
+                  unsigned int getFileIndex(const std::string& strFilename, currdir cdDir) const; // EXPORT
-                  /// Get the ID of a function through it's name.
+                  /// 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
+                  unsigned int getFunctionIndex(const std::string& strFilename, const std::string& strFuncname, currdir cdDir) const; // EXPORT
-                  /// Get the name of an imported file.
+                  /// Get the name of an imported file.
-                  std::string getFileName(dword dwFilenr, currdir cdDir) const; // EXPORT
+                  std::string getFileName(dword dwFilenr, currdir cdDir) const; // EXPORT
-                  
+                  
-                  void setFileName(dword filenr, currdir dir, const std::string& name); // EXPORT
+                  void setFileName(dword filenr, currdir dir, const std::string& name); // EXPORT
-                  
+                  
-                  /// Get the hint of an imported function.
+                  /// Get the hint of an imported function.
-                  word getFunctionHint(dword dwFilenr, dword dwFuncnr, currdir cdDir) const; // EXPORT
+                  word getFunctionHint(dword dwFilenr, dword dwFuncnr, currdir cdDir) const; // EXPORT
-                  void setFunctionHint(dword dwFilenr, dword dwFuncnr, currdir cdDir, word value); // EXPORT
+                  void setFunctionHint(dword dwFilenr, dword dwFuncnr, currdir cdDir, word value); // EXPORT
-                  /// Get the name of an imported function.
+                  /// Get the name of an imported function.
-                  std::string getFunctionName(dword dwFilenr, dword dwFuncnr, currdir cdDir) const; // EXPORT
+                  std::string getFunctionName(dword dwFilenr, dword dwFuncnr, currdir cdDir) const; // EXPORT
-                  void setFunctionName(dword dwFilenr, dword dwFuncnr, currdir cdDir, const std::string& functionName); // EXPORT
+                  void setFunctionName(dword dwFilenr, dword dwFuncnr, currdir cdDir, const std::string& functionName); // EXPORT
-                  /// Get the number of files which are imported.
+                  /// Get the number of files which are imported.
-                  dword getNumberOfFiles(currdir cdDir) const; // EXPORT
+                  dword getNumberOfFiles(currdir cdDir) const; // EXPORT
-                  /// Get the number of fucntions which are imported by a specific file.
+                  /// Get the number of fucntions which are imported by a specific file.
-                  dword getNumberOfFunctions(dword dwFilenr, currdir cdDir) const; // EXPORT
+                  dword getNumberOfFunctions(dword dwFilenr, currdir cdDir) const; // EXPORT
-                  /// Read a file's import directory.
+                  /// Read a file's import directory.
-                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, const PeHeaderT<bits>& pehHeader); // EXPORT
+                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, const PeHeaderT<bits>& pehHeader); // EXPORT
-                  /// Rebuild the import directory.
+                  /// Rebuild the import directory.
-                  void rebuild(std::vector<byte>& vBuffer, dword dwRva, bool fixEntries = true) const; // EXPORT
+                  void rebuild(std::vector<byte>& vBuffer, dword dwRva, bool fixEntries = true) const; // EXPORT
-                  /// Remove a file from the import directory.
+                  /// Remove a file from the import directory.
-                  int removeFile(const std::string& strFilename); // EXPORT
+                  int removeFile(const std::string& strFilename); // EXPORT
-                  /// Remove a function from the import directory.
+                  /// Remove a function from the import directory.
-                  int removeFunction(const std::string& strFilename, const std::string& strFuncname); // EXPORT _byName
+                  int removeFunction(const std::string& strFilename, const std::string& strFuncname); // EXPORT _byName
-                  /// Remove a function from the import directory.
+                  /// Remove a function from the import directory.
-                  int removeFunction(const std::string& strFilename, word wHint); // EXPORT _byHint
+                  int removeFunction(const std::string& strFilename, word wHint); // EXPORT _byHint
-                  /// Returns the size of the current import directory.
+                  /// Returns the size of the current import directory.
-                  unsigned int size() const; // EXPORT
+                  unsigned int size() const; // EXPORT
-                  /// Writes the import directory to a file.
+                  /// Writes the import directory to a file.
-                  int write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva); // EXPORT
+                  int write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva); // EXPORT
-                  /// Returns the FirstThunk value of a function.
+                  /// Returns the FirstThunk value of a function.
-                  dword getFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir) const; // EXPORT _byNumber
+                  dword getFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir) const; // EXPORT _byNumber
-                  void setFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir, dword value); // EXPORT _byNumber
+                  void setFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir, dword value); // EXPORT _byNumber
-                  /// Returns the OriginalFirstThunk value of a function.
+                  /// Returns the OriginalFirstThunk value of a function.
-                  dword getOriginalFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir) const; // EXPORT _byNumber
+                  dword getOriginalFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir) const; // EXPORT _byNumber
-                  void setOriginalFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir, dword value); // EXPORT
+                  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 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);
+//                dword getOriginalFirstThunk(const std::string& strFilename, const std::string& strFuncname, currdir cdDir) const throw (PeLibException);
-                  /// Returns the FirstThunk value of a file.
+                  /// Returns the FirstThunk value of a file.
-                  dword getFirstThunk(const std::string& strFilename, currdir cdDir) const; // EXPORT _byName
+                  dword getFirstThunk(const std::string& strFilename, currdir cdDir) const; // EXPORT _byName
-                  /// Returns the OriginalFirstThunk value of a file.
+                  /// Returns the OriginalFirstThunk value of a file.
-                  dword getOriginalFirstThunk(const std::string& strFilename, currdir cdDir) const; // EXPORT _byName
+                  dword getOriginalFirstThunk(const std::string& strFilename, currdir cdDir) const; // EXPORT _byName
-                  /// Returns the ForwarderChain value of a file.
+                  /// Returns the ForwarderChain value of a file.
-                  dword getForwarderChain(const std::string& strFilename, currdir cdDir) const; // EXPORT _byName
+                  dword getForwarderChain(const std::string& strFilename, currdir cdDir) const; // EXPORT _byName
-                  dword getRvaOfName(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.
+                  /// Returns the TimeDateStamp value of a file.
-                  dword getTimeDateStamp(const std::string& strFilename, currdir cdDir) const; // EXPORT _byName
+                  dword getTimeDateStamp(const std::string& strFilename, currdir cdDir) const; // EXPORT _byName
-                  /// Returns the FirstThunk value of a file.
+                  /// Returns the FirstThunk value of a file.
-                  dword getFirstThunk(dword dwFilenr, currdir cdDir) const; // EXPORT
+                  dword getFirstThunk(dword dwFilenr, currdir cdDir) const; // EXPORT
-                  void setFirstThunk(dword dwFilenr, currdir cdDir, dword value); // EXPORT _byNumber_function
+                  void setFirstThunk(dword dwFilenr, currdir cdDir, dword value); // EXPORT _byNumber_function
-                  /// Returns the OriginalFirstThunk value of a file.
+                  /// Returns the OriginalFirstThunk value of a file.
-                  dword getOriginalFirstThunk(dword dwFilenr, currdir cdDir) const; // EXPORT
+                  dword getOriginalFirstThunk(dword dwFilenr, currdir cdDir) const; // EXPORT
-                  void setOriginalFirstThunk(dword dwFilenr, currdir cdDir, dword value); // EXPORT _byNumber_function
+                  void setOriginalFirstThunk(dword dwFilenr, currdir cdDir, dword value); // EXPORT _byNumber_function
-                  /// Returns the ForwarderChain value of a file.
+                  /// Returns the ForwarderChain value of a file.
-                  dword getForwarderChain(dword dwFilenr, currdir cdDir) const; // EXPORT _byNumber
+                  dword getForwarderChain(dword dwFilenr, currdir cdDir) const; // EXPORT _byNumber
-                  void setForwarderChain(dword dwFilenr, currdir cdDir, dword value); // EXPORT _byNumber_function
+                  void setForwarderChain(dword dwFilenr, currdir cdDir, dword value); // EXPORT _byNumber_function
-                  dword getRvaOfName(dword dwFilenr, currdir cdDir) const; // EXPORT _byNumber
+                  dword getRvaOfName(dword dwFilenr, currdir cdDir) const; // EXPORT _byNumber
-                  void setRvaOfName(dword dwFilenr, currdir cdDir, dword value); // EXPORT
+                  void setRvaOfName(dword dwFilenr, currdir cdDir, dword value); // EXPORT
-                  /// Returns the TimeDateStamp value of a file.
+                  /// Returns the TimeDateStamp value of a file.
-                  dword getTimeDateStamp(dword dwFilenr, currdir cdDir) const; // EXPORT
+                  dword getTimeDateStamp(dword dwFilenr, currdir cdDir) const; // EXPORT
-                  void setTimeDateStamp(dword dwFilenr, currdir cdDir, dword value); // EXPORT _byNumber
+                  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);
+//                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.
+        * 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
+        * 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.
+        * to specify the address the import table will have in the file.
-        * @param strFilename The name of a DLL.
+        * @param strFilename The name of a DLL.
-        * @param wHint The ordinal of the function in the DLL.
+        * @param wHint The ordinal of the function in the DLL.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        int ImportDirectory<bits>::addFunction(const std::string& strFilename, word wHint)
+        int ImportDirectory<bits>::addFunction(const std::string& strFilename, word wHint)
-        {
+        {
-                if (hasFunction(strFilename, wHint, &PELIB_THUNK_DATA<bits>::equalHint))
+                if (hasFunction(strFilename, wHint, &PELIB_THUNK_DATA<bits>::equalHint))
-                {
+                {
-                        return ERROR_DUPLICATE_ENTRY;
+                        return ERROR_DUPLICATE_ENTRY;
-                }
+                }
-                
+                
-                // Find the imported file.
+                // 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));
+                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_IMAGE_IMPORT_DIRECTORY<bits> iid;
-                PELIB_THUNK_DATA<bits> td;
+                PELIB_THUNK_DATA<bits> td;
-                td.hint = wHint;
+                td.hint = wHint;
-                td.itd.Ordinal = wHint | PELIB_IMAGE_ORDINAL_FLAGS<bits>::IMAGE_ORDINAL_FLAG;
+                td.itd.Ordinal = wHint | PELIB_IMAGE_ORDINAL_FLAGS<bits>::IMAGE_ORDINAL_FLAG;
-                iid.name = strFilename;
+                iid.name = strFilename;
-                if (FileIter == m_vNewiid.end())
+                if (FileIter == m_vNewiid.end())
-                {
+                {
-                        iid.originalfirstthunk.push_back(td);
+                        iid.originalfirstthunk.push_back(td);
-                        iid.firstthunk.push_back(td);
+                        iid.firstthunk.push_back(td);
-                        m_vNewiid.push_back(iid);
+                        m_vNewiid.push_back(iid);
-                }
+                }
-                else
+                else
-                {
+                {
-                        FileIter->originalfirstthunk.push_back(td);
+                        FileIter->originalfirstthunk.push_back(td);
-                        FileIter->firstthunk.push_back(td);
+                        FileIter->firstthunk.push_back(td);
-                }
+                }
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * Add a function to the Import Directory.
+        * Add a function to the Import Directory.
-        * @param strFilename Name of the file which will be imported
+        * @param strFilename Name of the file which will be imported
-        * @param strFuncname Name of the function which will be imported.
+        * @param strFuncname Name of the function which will be imported.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        int ImportDirectory<bits>::addFunction(const std::string& strFilename, const std::string& strFuncname)
+        int ImportDirectory<bits>::addFunction(const std::string& strFilename, const std::string& strFuncname)
-        {
+        {
-                if (hasFunction(strFilename, strFuncname, &PELIB_THUNK_DATA<bits>::equalFunctionName))
+                if (hasFunction(strFilename, strFuncname, &PELIB_THUNK_DATA<bits>::equalFunctionName))
-                {
+                {
-                        return ERROR_DUPLICATE_ENTRY;
+                        return ERROR_DUPLICATE_ENTRY;
-                }
+                }
-                
+                
-                // Find the imported file.
+                // 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));
+                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_IMAGE_IMPORT_DIRECTORY<bits> iid;
-                PELIB_THUNK_DATA<bits> td;
+                PELIB_THUNK_DATA<bits> td;
-                td.fname = strFuncname;
+                td.fname = strFuncname;
-                iid.name = strFilename;
+                iid.name = strFilename;
-                if (FileIter == m_vNewiid.end())
+                if (FileIter == m_vNewiid.end())
-                {
+                {
-                        iid.originalfirstthunk.push_back(td);
+                        iid.originalfirstthunk.push_back(td);
-                        iid.firstthunk.push_back(td);
+                        iid.firstthunk.push_back(td);
-                        m_vNewiid.push_back(iid);
+                        m_vNewiid.push_back(iid);
-                }
+                }
-                else
+                else
-                {
+                {
-                        FileIter->originalfirstthunk.push_back(td);
+                        FileIter->originalfirstthunk.push_back(td);
-                        FileIter->firstthunk.push_back(td);
+                        FileIter->firstthunk.push_back(td);
-                }
+                }
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * Searches through the import directory and returns the number of the import
+        * Searches through the import directory and returns the number of the import
-        * directory entry which belongs to the given filename.
+        * directory entry which belongs to the given filename.
-        * @param strFilename Name of the imported file.
+        * @param strFilename Name of the imported file.
-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
-        * @return The ID of an imported file.
+        * @return The ID of an imported file.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        unsigned int ImportDirectory<bits>::getFileIndex(const std::string& strFilename, currdir cdDir) const
+        unsigned int ImportDirectory<bits>::getFileIndex(const std::string& strFilename, currdir cdDir) const
-        {
+        {
-                const std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> >* currDir;
+                const std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> >* currDir;
-                
+                
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                         currDir = &m_vOldiid;
+                         currDir = &m_vOldiid;
-                }
+                }
-                else
+                else
-                {
+                {
-                         currDir = &m_vNewiid;
+                         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));
+                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())
+                if (FileIter != currDir->end())
-                {
+                {
-                        return static_cast<unsigned int>(std::distance(currDir->begin(), FileIter));
+                        return static_cast<unsigned int>(std::distance(currDir->begin(), FileIter));
-                }
+                }
-                else
+                else
-                {
+                {
-                        return -1;
+                        return -1;
-                        // throw Exceptions::InvalidName(ImportDirectoryId, __LINE__);
+                        // throw Exceptions::InvalidName(ImportDirectoryId, __LINE__);
-                }
+                }
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * Searches through an imported file for a specific function.
+        * Searches through an imported file for a specific function.
-        * @param strFilename Name of the imported file.
+        * @param strFilename Name of the imported file.
-        * @param strFuncname Name of the imported function.
+        * @param strFuncname Name of the imported function.
-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
-        * @return ID of the imported function.
+        * @return ID of the imported function.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        unsigned int ImportDirectory<bits>::getFunctionIndex(const std::string& strFilename, const std::string& strFuncname, currdir cdDir) const
+        unsigned int ImportDirectory<bits>::getFunctionIndex(const std::string& strFilename, const std::string& strFuncname, currdir cdDir) const
-        {
+        {
-                unsigned int uiFile = getFileIndex(strFilename, cdDir);
+                unsigned int uiFile = getFileIndex(strFilename, cdDir);
-                for (unsigned int i=0;i<getNumberOfFunctions(uiFile, cdDir);i++)
+                for (unsigned int i=0;i<getNumberOfFunctions(uiFile, cdDir);i++)
-                {
+                {
-                        if (getFunctionName(uiFile, i, cdDir) == strFuncname) return i;
+                        if (getFunctionName(uiFile, i, cdDir) == strFuncname) return i;
-                }
+                }
-                return -1;
+                return -1;
-        }
+        }
-        /**
+        /**
-        * Get the name of an imported file.
+        * Get the name of an imported file.
-        * @param dwFilenr Identifies which file should be checked.
+        * @param dwFilenr Identifies which file should be checked.
-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
-        * @return Name of an imported file.
+        * @return Name of an imported file.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        std::string ImportDirectory<bits>::getFileName(dword dwFilenr, currdir cdDir) const
+        std::string ImportDirectory<bits>::getFileName(dword dwFilenr, currdir cdDir) const
-        {
+        {
-                if (cdDir == OLDDIR) return m_vOldiid[dwFilenr].name;
+                if (cdDir == OLDDIR) return m_vOldiid[dwFilenr].name;
-                else return m_vNewiid[dwFilenr].name;
+                else return m_vNewiid[dwFilenr].name;
-        }
+        }
-        template<int bits>
+        template<int bits>
-        void ImportDirectory<bits>::setFileName(dword filenr, currdir dir, const std::string& name)
+        void ImportDirectory<bits>::setFileName(dword filenr, currdir dir, const std::string& name)
-        {
+        {
-                if (dir == OLDDIR) m_vOldiid[filenr].name = name;
+                if (dir == OLDDIR) m_vOldiid[filenr].name = name;
-                else m_vNewiid[filenr].name = name;
+                else m_vNewiid[filenr].name = name;
-        }
+        }
-        /**
+        /**
-        * Get the name of an imported function.
+        * Get the name of an imported function.
-        * @param dwFilenr Identifies which file should be checked.
+        * @param dwFilenr Identifies which file should be checked.
-        * @param dwFuncnr Identifies which function 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.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
-        * @return Name of an imported function.
+        * @return Name of an imported function.
-        * \todo Marked line is unsafe (function should be rewritten).
+        * \todo Marked line is unsafe (function should be rewritten).
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        std::string ImportDirectory<bits>::getFunctionName(dword dwFilenr, dword dwFuncnr, currdir cdDir) const
+        std::string ImportDirectory<bits>::getFunctionName(dword dwFilenr, dword dwFuncnr, currdir cdDir) const
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        // Unsafe
+                        // Unsafe
-                        if (m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk)
+                        if (m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk)
-                        {
+                        {
-                                return m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].fname;
+                                return m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].fname;
-                        }
+                        }
-                        else
+                        else
-                        {
+                        {
-                                return m_vOldiid[dwFilenr].firstthunk[dwFuncnr].fname;
+                                return m_vOldiid[dwFilenr].firstthunk[dwFuncnr].fname;
-                        }
+                        }
-                }
+                }
-                else
+                else
-                {
+                {
-                        if (m_vNewiid[dwFilenr].impdesc.OriginalFirstThunk)
+                        if (m_vNewiid[dwFilenr].impdesc.OriginalFirstThunk)
-                        {
+                        {
-                                return m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].fname;
+                                return m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].fname;
-                        }
+                        }
-                        else
+                        else
-                        {
+                        {
-                                return m_vNewiid[dwFilenr].firstthunk[dwFuncnr].fname;
+                                return m_vNewiid[dwFilenr].firstthunk[dwFuncnr].fname;
-                        }
+                        }
-                }
+                }
-        }
+        }
-        template<int bits>
+        template<int bits>
-        void ImportDirectory<bits>::setFunctionName(dword dwFilenr, dword dwFuncnr, currdir cdDir, const std::string& functionName)
+        void ImportDirectory<bits>::setFunctionName(dword dwFilenr, dword dwFuncnr, currdir cdDir, const std::string& functionName)
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        // Unsafe
+                        // Unsafe
-                        if (m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk)
+                        if (m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk)
-                        {
+                        {
-                                m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].fname = functionName;
+                                m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].fname = functionName;
-                        }
+                        }
-                        else
+                        else
-                        {
+                        {
-                                m_vOldiid[dwFilenr].firstthunk[dwFuncnr].fname = functionName;
+                                m_vOldiid[dwFilenr].firstthunk[dwFuncnr].fname = functionName;
-                        }
+                        }
-                }
+                }
-                else
+                else
-                {
+                {
-                        if (m_vNewiid[dwFilenr].impdesc.OriginalFirstThunk)
+                        if (m_vNewiid[dwFilenr].impdesc.OriginalFirstThunk)
-                        {
+                        {
-                                m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].fname = functionName;
+                                m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].fname = functionName;
-                        }
+                        }
-                        else
+                        else
-                        {
+                        {
-                                m_vNewiid[dwFilenr].firstthunk[dwFuncnr].fname = functionName;
+                                m_vNewiid[dwFilenr].firstthunk[dwFuncnr].fname = functionName;
-                        }
+                        }
-                }
+                }
-        }
+        }
-        /**
+        /**
-        * Get the hint of an imported function.
+        * Get the hint of an imported function.
-        * @param dwFilenr Identifies which file should be checked.
+        * @param dwFilenr Identifies which file should be checked.
-        * @param dwFuncnr Identifies which function 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.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
-        * @return Hint of an imported function.
+        * @return Hint of an imported function.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        word ImportDirectory<bits>::getFunctionHint(dword dwFilenr, dword dwFuncnr, currdir cdDir) const
+        word ImportDirectory<bits>::getFunctionHint(dword dwFilenr, dword dwFuncnr, currdir cdDir) const
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        if (m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk)
+                        if (m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk)
-                        {
+                        {
-                                return m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].hint;
+                                return m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].hint;
-                        }
+                        }
-                        else
+                        else
-                        {
+                        {
-                                return m_vOldiid[dwFilenr].firstthunk[dwFuncnr].hint;
+                                return m_vOldiid[dwFilenr].firstthunk[dwFuncnr].hint;
-                        }
+                        }
-                }
+                }
-                else return m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].hint;
+                else return m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].hint;
-        }
+        }
-        template<int bits>
+        template<int bits>
-        void ImportDirectory<bits>::setFunctionHint(dword dwFilenr, dword dwFuncnr, currdir cdDir, word value)
+        void ImportDirectory<bits>::setFunctionHint(dword dwFilenr, dword dwFuncnr, currdir cdDir, word value)
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        if (m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk)
+                        if (m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk)
-                        {
+                        {
-                                m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].hint = value;
+                                m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].hint = value;
-                        }
+                        }
-                        else
+                        else
-                        {
+                        {
-                                m_vOldiid[dwFilenr].firstthunk[dwFuncnr].hint = value;
+                                m_vOldiid[dwFilenr].firstthunk[dwFuncnr].hint = value;
-                        }
+                        }
-                }
+                }
-                else m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].hint = value;
+                else m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].hint = value;
-        }
+        }
-        /**
+        /**
-        * Get the number of files which are currently being imported.
+        * Get the number of files which are currently being imported.
-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
-        * @return Number of files which are currently being imported.
+        * @return Number of files which are currently being imported.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        dword ImportDirectory<bits>::getNumberOfFiles(currdir cdDir) const
+        dword ImportDirectory<bits>::getNumberOfFiles(currdir cdDir) const
-        {
+        {
-                if (cdDir == OLDDIR) return static_cast<dword>(m_vOldiid.size());
+                if (cdDir == OLDDIR) return static_cast<dword>(m_vOldiid.size());
-                else return static_cast<dword>(m_vNewiid.size());
+                else return static_cast<dword>(m_vNewiid.size());
-        }
+        }
-        /**
+        /**
-        * Get the number of functions which are currently being imported from a specific file.
+        * Get the number of functions which are currently being imported from a specific file.
-        * @param dwFilenr Identifies which file should be checked.
+        * @param dwFilenr Identifies which file should be checked.
-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @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.
+        * @return Number of functions which are currently being imported from a specific file.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        dword ImportDirectory<bits>::getNumberOfFunctions(dword dwFilenr, currdir cdDir) const
+        dword ImportDirectory<bits>::getNumberOfFunctions(dword dwFilenr, currdir cdDir) const
-        {
+        {
-                if (cdDir == OLDDIR) return static_cast<unsigned int>(m_vOldiid[dwFilenr].firstthunk.size());
+                if (cdDir == OLDDIR) return static_cast<unsigned int>(m_vOldiid[dwFilenr].firstthunk.size());
-                else return static_cast<unsigned int>(m_vNewiid[dwFilenr].firstthunk.size());
+                else return static_cast<unsigned int>(m_vNewiid[dwFilenr].firstthunk.size());
-        }
+        }
-        /**
+        /**
-        * Read an import directory from a file.
+        * Read an import directory from a file.
-        * \todo Check if streams failed.
+        * \todo Check if streams failed.
-        * @param strFilename Name of the file which will be read.
+        * @param strFilename Name of the file which will be read.
-        * @param uiOffset Offset of the import directory (see #PeLib::PeHeader::getIDImportRVA).
+        * @param uiOffset Offset of the import directory (see #PeLib::PeHeader::getIDImportRVA).
-        * @param uiSize Size of the import directory (see #PeLib::PeHeader::getIDImportSize).
+        * @param uiSize Size of the import directory (see #PeLib::PeHeader::getIDImportSize).
-        * @param pehHeader A valid PE header.
+        * @param pehHeader A valid PE header.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        int ImportDirectory<bits>::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, const PeHeaderT<bits>& pehHeader)
+        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);
+                std::ifstream ifFile(strFilename.c_str(), std::ios_base::binary);
-                if (!ifFile)
+                if (!ifFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                
+                
-                unsigned int uiFileSize = fileSize(ifFile);
+                unsigned int uiFileSize = fileSize(ifFile);
-                
+                
-                if (uiFileSize < uiOffset + uiSize)
+                if (uiFileSize < uiOffset + uiSize)
-                {
+                {
-                        return ERROR_INVALID_FILE;
+                        return ERROR_INVALID_FILE;
-                }
+                }
-                ifFile.seekg(uiOffset, std::ios_base::beg);
+                ifFile.seekg(uiOffset, std::ios_base::beg);
-                std::vector<unsigned char> vImportdirectory(uiSize);
+                std::vector<unsigned char> vImportdirectory(uiSize);
-                ifFile.read(reinterpret_cast<char*>(&vImportdirectory[0]), uiSize);
+                ifFile.read(reinterpret_cast<char*>(&vImportdirectory[0]), uiSize);
-                PELIB_IMAGE_IMPORT_DIRECTORY<bits> iidCurr;
+                PELIB_IMAGE_IMPORT_DIRECTORY<bits> iidCurr;
-                unsigned int uiDesccounter = 0;
+                unsigned int uiDesccounter = 0;
-                InputBuffer inpBuffer(vImportdirectory);
+                InputBuffer inpBuffer(vImportdirectory);
-                std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> > vOldIidCurr;
+                std::vector<PELIB_IMAGE_IMPORT_DIRECTORY<bits> > vOldIidCurr;
-                do // Read and store all descriptors
+                do // Read and store all descriptors
-                {
+                {
-                        inpBuffer >> iidCurr.impdesc.OriginalFirstThunk;
+                        inpBuffer >> iidCurr.impdesc.OriginalFirstThunk;
-                        inpBuffer >> iidCurr.impdesc.TimeDateStamp;
+                        inpBuffer >> iidCurr.impdesc.TimeDateStamp;
-                        inpBuffer >> iidCurr.impdesc.ForwarderChain;
+                        inpBuffer >> iidCurr.impdesc.ForwarderChain;
-                        inpBuffer >> iidCurr.impdesc.Name;
+                        inpBuffer >> iidCurr.impdesc.Name;
-                        inpBuffer >> iidCurr.impdesc.FirstThunk;
+                        inpBuffer >> iidCurr.impdesc.FirstThunk;
-                        if (iidCurr.impdesc.OriginalFirstThunk != 0 || iidCurr.impdesc.TimeDateStamp != 0 || iidCurr.impdesc.ForwarderChain != 0 ||
+                        if (iidCurr.impdesc.OriginalFirstThunk != 0 || iidCurr.impdesc.TimeDateStamp != 0 || iidCurr.impdesc.ForwarderChain != 0 ||
-                        iidCurr.impdesc.Name != 0 || iidCurr.impdesc.FirstThunk != 0)
+                        iidCurr.impdesc.Name != 0 || iidCurr.impdesc.FirstThunk != 0)
-                        {
+                        {
-                                vOldIidCurr.push_back(iidCurr);
+                                vOldIidCurr.push_back(iidCurr);
-                        }
+                        }
-                        uiDesccounter++;
+                        uiDesccounter++;
-                        if (uiSize < (uiDesccounter + 1) * PELIB_IMAGE_IMPORT_DESCRIPTOR::size()) break;
+                        if (uiSize < (uiDesccounter + 1) * PELIB_IMAGE_IMPORT_DESCRIPTOR::size()) break;
-                } while (iidCurr.impdesc.OriginalFirstThunk != 0 || iidCurr.impdesc.TimeDateStamp != 0 || iidCurr.impdesc.ForwarderChain != 0 ||
+                } while (iidCurr.impdesc.OriginalFirstThunk != 0 || iidCurr.impdesc.TimeDateStamp != 0 || iidCurr.impdesc.ForwarderChain != 0 ||
-                                iidCurr.impdesc.Name != 0 || iidCurr.impdesc.FirstThunk != 0);
+                                iidCurr.impdesc.Name != 0 || iidCurr.impdesc.FirstThunk != 0);
-                char namebuffer[2] = {0};
+                char namebuffer[2] = {0};
-                        
+                        
-                // Name
+                // Name
-                for (unsigned int i=0;i<vOldIidCurr.size();i++)
+                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);
+                        ifFile.seekg(static_cast<unsigned int>(pehHeader.rvaToOffset(vOldIidCurr[i].impdesc.Name)), std::ios_base::beg);
-                        std::string dllname = "";
+                        std::string dllname = "";
-                        
+                        
-                        do
+                        do
-                        {
+                        {
-                                ifFile.read(namebuffer, 1);
+                                ifFile.read(namebuffer, 1);
-                                if (!ifFile || !namebuffer[0]) break; // reached end of file or 0-byte
+                                if (!ifFile || !namebuffer[0]) break; // reached end of file or 0-byte
-                                dllname += namebuffer;
+                                dllname += namebuffer;
-                        } while (true);
+                        } while (true);
-                        
+                        
-                        vOldIidCurr[i].name = dllname;
+                        vOldIidCurr[i].name = dllname;
-                        
+                        
-                }
+                }
-                
+                
-                // OriginalFirstThunk
+                // OriginalFirstThunk
-                for (unsigned int i=0;i<vOldIidCurr.size();i++)
+                for (unsigned int i=0;i<vOldIidCurr.size();i++)
-                {
+                {
-                        PELIB_THUNK_DATA<bits> tdCurr;
+                        PELIB_THUNK_DATA<bits> tdCurr;
-                        dword uiVaoft = vOldIidCurr[i].impdesc.OriginalFirstThunk;
+                        dword uiVaoft = vOldIidCurr[i].impdesc.OriginalFirstThunk;
-                        if (!uiVaoft)
+                        if (!uiVaoft)
-                        {
+                        {
-                                continue;
+                                continue;
-                        }
+                        }
-                        ifFile.seekg(static_cast<unsigned int>(pehHeader.rvaToOffset(uiVaoft)), std::ios_base::beg);
+                        ifFile.seekg(static_cast<unsigned int>(pehHeader.rvaToOffset(uiVaoft)), std::ios_base::beg);
-                        do
+                        do
-                        {
+                        {
-                                if (uiFileSize < pehHeader.rvaToOffset(uiVaoft) + sizeof(tdCurr.itd.Ordinal))
+                                if (uiFileSize < pehHeader.rvaToOffset(uiVaoft) + sizeof(tdCurr.itd.Ordinal))
-                                {
+                                {
-                                        return ERROR_INVALID_FILE;
+                                        return ERROR_INVALID_FILE;
-                                }
+                                }
-                                uiVaoft += sizeof(tdCurr.itd.Ordinal);
+                                uiVaoft += sizeof(tdCurr.itd.Ordinal);
-                                
+                                
-                                ifFile.read(reinterpret_cast<char*>(&tdCurr.itd.Ordinal), 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);
+                                if (tdCurr.itd.Ordinal) vOldIidCurr[i].originalfirstthunk.push_back(tdCurr);
-                        } while (tdCurr.itd.Ordinal);
+                        } while (tdCurr.itd.Ordinal);
-                }
+                }
-                // FirstThunk
+                // FirstThunk
-                for (unsigned int i=0;i<vOldIidCurr.size();i++)
+                for (unsigned int i=0;i<vOldIidCurr.size();i++)
-                {
+                {
-                        dword uiVaoft = vOldIidCurr[i].impdesc.FirstThunk;
+                        dword uiVaoft = vOldIidCurr[i].impdesc.FirstThunk;
-                        PELIB_THUNK_DATA<bits> tdCurr;
+                        PELIB_THUNK_DATA<bits> tdCurr;
-                        ifFile.seekg(static_cast<unsigned int>(pehHeader.rvaToOffset(uiVaoft)), std::ios_base::beg);
+                        ifFile.seekg(static_cast<unsigned int>(pehHeader.rvaToOffset(uiVaoft)), std::ios_base::beg);
-                        do
+                        do
-                        {
+                        {
-                                if (uiFileSize < pehHeader.rvaToOffset(uiVaoft) + sizeof(tdCurr.itd.Ordinal))
+                                if (uiFileSize < pehHeader.rvaToOffset(uiVaoft) + sizeof(tdCurr.itd.Ordinal))
-                                {
+                                {
-                                        return ERROR_INVALID_FILE;
+                                        return ERROR_INVALID_FILE;
-                                }
+                                }
-                                
+                                
-                                uiVaoft += sizeof(tdCurr.itd.Ordinal);
+                                uiVaoft += sizeof(tdCurr.itd.Ordinal);
-                                
+                                
-                                ifFile.read(reinterpret_cast<char*>(&tdCurr.itd.Ordinal), 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);
+                                if (tdCurr.itd.Ordinal) vOldIidCurr[i].firstthunk.push_back(tdCurr);
-                        } while (tdCurr.itd.Ordinal);
+                        } while (tdCurr.itd.Ordinal);
-                }
+                }
-                // Names
+                // Names
-                for (unsigned int i=0;i<vOldIidCurr.size();i++)
+                for (unsigned int i=0;i<vOldIidCurr.size();i++)
-                {
+                {
-                        if (vOldIidCurr[i].impdesc.OriginalFirstThunk)
+                        if (vOldIidCurr[i].impdesc.OriginalFirstThunk)
-                        {
+                        {
-                                for (unsigned int j=0;j<vOldIidCurr[i].originalfirstthunk.size();j++)
+                                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)
+                                        if (vOldIidCurr[i].originalfirstthunk[j].itd.Ordinal & PELIB_IMAGE_ORDINAL_FLAGS<bits>::IMAGE_ORDINAL_FLAG)
-                                        {
+                                        {
-                                                vOldIidCurr[i].originalfirstthunk[j].hint = 0;
+                                                vOldIidCurr[i].originalfirstthunk[j].hint = 0;
-                                                continue;
+                                                continue;
-                                        }
+                                        }
-                                        ifFile.seekg(static_cast<unsigned int>(pehHeader.rvaToOffset(vOldIidCurr[i].originalfirstthunk[j].itd.Ordinal)), std::ios_base::beg);
+                                        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));
+                                        ifFile.read(reinterpret_cast<char*>(&vOldIidCurr[i].originalfirstthunk[j].hint), sizeof(vOldIidCurr[i].originalfirstthunk[j].hint));
-                                        
+                                        
-                                        if (!ifFile)
+                                        if (!ifFile)
-                                                return ERROR_INVALID_FILE;
+                                                return ERROR_INVALID_FILE;
-                                        std::string funcname = "";
+                                        std::string funcname = "";
-                                        do
+                                        do
-                                        {
+                                        {
-                                                ifFile.read(namebuffer, 1);
+                                                ifFile.read(namebuffer, 1);
-                                                if (!ifFile || !namebuffer[0]) break; // reached end of file or 0-byte
+                                                if (!ifFile || !namebuffer[0]) break; // reached end of file or 0-byte
-                                                funcname += namebuffer;
+                                                funcname += namebuffer;
-                                        } while (true);
+                                        } while (true);
-                        
+                        
-                                        vOldIidCurr[i].originalfirstthunk[j].fname = funcname;
+                                        vOldIidCurr[i].originalfirstthunk[j].fname = funcname;
-                                }
+                                }
-                        }
+                        }
-                        else
+                        else
-                        {
+                        {
-                                for (unsigned int j=0;j<vOldIidCurr[i].firstthunk.size();j++)
+                                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)
+                                        if (vOldIidCurr[i].firstthunk[j].itd.Ordinal & PELIB_IMAGE_ORDINAL_FLAGS<bits>::IMAGE_ORDINAL_FLAG)
-                                        {
+                                        {
-                                                continue;
+                                                continue;
-                                        }
+                                        }
-                                        ifFile.seekg(static_cast<unsigned int>(pehHeader.rvaToOffset(vOldIidCurr[i].firstthunk[j].itd.Ordinal)), std::ios_base::beg);
+                                        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));
+                                        ifFile.read(reinterpret_cast<char*>(&vOldIidCurr[i].firstthunk[j].hint), sizeof(vOldIidCurr[i].firstthunk[j].hint));
-                                        
+                                        
-                                        if (!ifFile)
+                                        if (!ifFile)
-                                                return ERROR_INVALID_FILE;
+                                                return ERROR_INVALID_FILE;
-                                        std::string funcname = "";
+                                        std::string funcname = "";
-                                        do
+                                        do
-                                        {
+                                        {
-                                                ifFile.read(namebuffer, 1);
+                                                ifFile.read(namebuffer, 1);
-                                                if (!ifFile || !namebuffer[0]) break; // reached end of file or 0-byte
+                                                if (!ifFile || !namebuffer[0]) break; // reached end of file or 0-byte
-                                                funcname += namebuffer;
+                                                funcname += namebuffer;
-                                        } while (true);
+                                        } while (true);
-                        
+                        
-                                        vOldIidCurr[i].firstthunk[j].fname = funcname;
+                                        vOldIidCurr[i].firstthunk[j].fname = funcname;
-                                }
+                                }
-                        }
+                        }
-                }
+                }
-                std::swap(vOldIidCurr, m_vOldiid);
+                std::swap(vOldIidCurr, m_vOldiid);
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * Rebuilds the import directory.
+        * Rebuilds the import directory.
-        * @param vBuffer Buffer the rebuilt import directory will be written to.
+        * @param vBuffer Buffer the rebuilt import directory will be written to.
-        * @param dwRva The RVA of the ImportDirectory in the file.
+        * @param dwRva The RVA of the ImportDirectory in the file.
-        * \todo uiSizeoffuncnames is not used.
+        * \todo uiSizeoffuncnames is not used.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        void ImportDirectory<bits>::rebuild(std::vector<byte>& vBuffer, dword dwRva, bool fixEntries) const
+        void ImportDirectory<bits>::rebuild(std::vector<byte>& vBuffer, dword dwRva, bool fixEntries) const
-        {
+        {
-                unsigned int uiImprva = dwRva;
+                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 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 uiSizeofdllnames = 0, uiSizeoffuncnames = 0;
-                unsigned int uiSizeofoft = 0;
+                unsigned int uiSizeofoft = 0;
-                for (unsigned int i=0;i<m_vNewiid.size();i++)
+                for (unsigned int i=0;i<m_vNewiid.size();i++)
-                {
+                {
-                        uiSizeofdllnames += static_cast<unsigned int>(m_vNewiid[i].name.size()) + 1;
+                        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();
+                        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++)
+                        for(unsigned int j=0;j<m_vNewiid[i].originalfirstthunk.size();j++)
-                        {
+                        {
-                                // +3 for hint (word) and 00-byte
+                                // +3 for hint (word) and 00-byte
-                                uiSizeoffuncnames += (static_cast<unsigned int>(m_vNewiid[i].originalfirstthunk[j].fname.size()) + 3);
+                                uiSizeoffuncnames += (static_cast<unsigned int>(m_vNewiid[i].originalfirstthunk[j].fname.size()) + 3);
-                        }
+                        }
-                }
+                }
-//              for (unsigned int i=0;i<m_vNewiid.size();i++)
+//              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();
+//                      uiSizeofoft += (static_cast<unsigned int>(m_vNewiid[i].originalfirstthunk.size())+1) * PELIB_IMAGE_THUNK_DATA<bits>::size();
-//              }
+//              }
-                
+                
-                OutputBuffer obBuffer(vBuffer);
+                OutputBuffer obBuffer(vBuffer);
-                // Rebuild IMAGE_IMPORT_DESCRIPTORS
+                // Rebuild IMAGE_IMPORT_DESCRIPTORS
-                for (unsigned int i=0;i<m_vOldiid.size();i++)
+                for (unsigned int i=0;i<m_vOldiid.size();i++)
-                {
+                {
-                        obBuffer << m_vOldiid[i].impdesc.OriginalFirstThunk;
+                        obBuffer << m_vOldiid[i].impdesc.OriginalFirstThunk;
-                        obBuffer << m_vOldiid[i].impdesc.TimeDateStamp;
+                        obBuffer << m_vOldiid[i].impdesc.TimeDateStamp;
-                        obBuffer << m_vOldiid[i].impdesc.ForwarderChain;
+                        obBuffer << m_vOldiid[i].impdesc.ForwarderChain;
-                        obBuffer << m_vOldiid[i].impdesc.Name;
+                        obBuffer << m_vOldiid[i].impdesc.Name;
-                        obBuffer << m_vOldiid[i].impdesc.FirstThunk;
+                        obBuffer << m_vOldiid[i].impdesc.FirstThunk;
-                }
+                }
-                unsigned int dllsize = 0;
+                unsigned int dllsize = 0;
-                for (unsigned int i=0;i<m_vNewiid.size();i++)
+                for (unsigned int i=0;i<m_vNewiid.size();i++)
-                {
+                {
-                        dword dwPoft = uiSizeofdescriptors + uiImprva;
+                        dword dwPoft = uiSizeofdescriptors + uiImprva;
-                        for (unsigned int j=1;j<=i;j++)
+                        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();
+                                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 << (fixEntries ? dwPoft : m_vNewiid[i].impdesc.OriginalFirstThunk);
-                        obBuffer << m_vNewiid[i].impdesc.TimeDateStamp;
+                        obBuffer << m_vNewiid[i].impdesc.TimeDateStamp;
-                        obBuffer << m_vNewiid[i].impdesc.ForwarderChain;
+                        obBuffer << m_vNewiid[i].impdesc.ForwarderChain;
-                        dword dwPdll = uiSizeofdescriptors + uiSizeofoft + uiImprva + dllsize;
+                        dword dwPdll = uiSizeofdescriptors + uiSizeofoft + uiImprva + dllsize;
-                        obBuffer << (fixEntries ? dwPdll : m_vNewiid[i].impdesc.Name);
+                        obBuffer << (fixEntries ? dwPdll : m_vNewiid[i].impdesc.Name);
-                        obBuffer << (fixEntries ? dwPoft : m_vNewiid[i].impdesc.FirstThunk);
+                        obBuffer << (fixEntries ? dwPoft : m_vNewiid[i].impdesc.FirstThunk);
-                        dllsize += static_cast<unsigned int>(m_vNewiid[i].name.size()) + 1;
+                        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;
+                obBuffer << (dword)0;
-                obBuffer << (dword)0;
+                obBuffer << (dword)0;
-                obBuffer << (dword)0;
+                obBuffer << (dword)0;
-                unsigned int uiPfunc = uiSizeofdescriptors + uiSizeofoft + uiSizeofdllnames + uiImprva;
+                unsigned int uiPfunc = uiSizeofdescriptors + uiSizeofoft + uiSizeofdllnames + uiImprva;
-                // Rebuild original first thunk
+                // Rebuild original first thunk
-                for (unsigned int i=0;i<m_vNewiid.size();i++)
+                for (unsigned int i=0;i<m_vNewiid.size();i++)
-                {
+                {
-                        for (unsigned int j=0;j<m_vNewiid[i].originalfirstthunk.size();j++)
+                        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
+                                if (m_vNewiid[i].originalfirstthunk[j].itd.Ordinal & PELIB_IMAGE_ORDINAL_FLAGS<bits>::IMAGE_ORDINAL_FLAG
-                                        || fixEntries == false)
+                                        || fixEntries == false)
-                                {
+                                {
-                                        obBuffer << m_vNewiid[i].originalfirstthunk[j].itd.Ordinal;
+                                        obBuffer << m_vNewiid[i].originalfirstthunk[j].itd.Ordinal;
-                                }
+                                }
-                                else
+                                else
-                                {
+                                {
-                                        obBuffer << uiPfunc;
+                                        obBuffer << uiPfunc;
-                                }
+                                }
-                                uiPfunc += static_cast<unsigned int>(m_vNewiid[i].originalfirstthunk[j].fname.size()) + 3;
+                                uiPfunc += static_cast<unsigned int>(m_vNewiid[i].originalfirstthunk[j].fname.size()) + 3;
-                        }
+                        }
-                        obBuffer << (dword)0;
+                        obBuffer << (dword)0;
-                }
+                }
-                // Write dllnames into import directory
+                // Write dllnames into import directory
-                for (unsigned int i=0;i<m_vNewiid.size();i++)
+                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);
+                        obBuffer.add(m_vNewiid[i].name.c_str(), static_cast<unsigned int>(m_vNewiid[i].name.size())+1);
-                }
+                }
-                // Write function names into directory
+                // Write function names into directory
-                for (unsigned int i=0;i<m_vNewiid.size();i++)
+                for (unsigned int i=0;i<m_vNewiid.size();i++)
-                {
+                {
-                        for (unsigned int j=0;j<m_vNewiid[i].originalfirstthunk.size();j++)
+                        for (unsigned int j=0;j<m_vNewiid[i].originalfirstthunk.size();j++)
-                        {
+                        {
-                                obBuffer << m_vNewiid[i].originalfirstthunk[j].hint;
+                                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);
+                                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.
+        * Removes a specific file and all functions of it from the import directory.
-        * @param strFilename Name of the file which will be removed.
+        * @param strFilename Name of the file which will be removed.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        int ImportDirectory<bits>::removeFile(const std::string& strFilename)
+        int ImportDirectory<bits>::removeFile(const std::string& strFilename)
-        {
+        {
-                unsigned int oldSize = static_cast<unsigned int>(m_vNewiid.size());
+                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());
+                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;
+                return oldSize == m_vNewiid.size() ? 1 : 0;
-        }
+        }
-        /**
+        /**
-        * Removes a specific function from the import directory.
+        * Removes a specific function from the import directory.
-        * @param strFilename Name of the file which exports the function.
+        * @param strFilename Name of the file which exports the function.
-        * @param strFuncname Name of the imported function.
+        * @param strFuncname Name of the imported function.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        int ImportDirectory<bits>::removeFunction(const std::string& strFilename, const std::string& strFuncname)
+        int ImportDirectory<bits>::removeFunction(const std::string& strFilename, const std::string& strFuncname)
-        {
+        {
-                ImpDirFileIterator viPos = m_vNewiid.begin();
+                ImpDirFileIterator viPos = m_vNewiid.begin();
-                int notFound = 1;
+                int notFound = 1;
-                while (viPos != m_vNewiid.end())
+                while (viPos != m_vNewiid.end())
-                {
+                {
-                        if (isEqualNc(viPos->name, strFilename))
+                        if (isEqualNc(viPos->name, strFilename))
-                        {
+                        {
-                                unsigned int oldSize = static_cast<unsigned int>(viPos->originalfirstthunk.size());
+                                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(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)));
+                                //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;
+                                if (viPos->originalfirstthunk.size() != oldSize) notFound = 0;
-                        }
+                        }
-                        ++viPos;
+                        ++viPos;
-                }
+                }
-                
+                
-                return notFound;
+                return notFound;
-        }
+        }
-        /**
+        /**
-        * Removes a specific function from the import directory.
+        * Removes a specific function from the import directory.
-        * @param strFilename Name of the file which exports the function.
+        * @param strFilename Name of the file which exports the function.
-        * @param wHint The hint of the function.
+        * @param wHint The hint of the function.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        int ImportDirectory<bits>::removeFunction(const std::string& strFilename, word wHint)
+        int ImportDirectory<bits>::removeFunction(const std::string& strFilename, word wHint)
-        {
+        {
-                ImpDirFileIterator viPos = m_vNewiid.begin();
+                ImpDirFileIterator viPos = m_vNewiid.begin();
-                int notFound = 1;
+                int notFound = 1;
-                while (viPos != m_vNewiid.end())
+                while (viPos != m_vNewiid.end())
-                {
+                {
-                        if (isEqualNc(viPos->name, strFilename))
+                        if (isEqualNc(viPos->name, strFilename))
-                        {
+                        {
-                                unsigned int oldSize = static_cast<unsigned int>(viPos->originalfirstthunk.size());
+                                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());
+                                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());
+                                unsigned int newPos = static_cast<unsigned int>(viPos->originalfirstthunk.size());
-                                if (viPos->originalfirstthunk.size() != oldSize) notFound = 0;
+                                if (viPos->originalfirstthunk.size() != oldSize) notFound = 0;
-                        }
+                        }
-                        ++viPos;
+                        ++viPos;
-                }
+                }
-                
+                
-                return notFound;
+                return notFound;
-        }
+        }
-        /**
+        /**
-        * Writes the current import directory to a file.
+        * Writes the current import directory to a file.
-        * @param strFilename Name of the file.
+        * @param strFilename Name of the file.
-        * @param uiOffset File Offset of the new import directory.
+        * @param uiOffset File Offset of the new import directory.
-        * @param uiRva RVA which belongs to that file offset.
+        * @param uiRva RVA which belongs to that file offset.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        int ImportDirectory<bits>::write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva)
+        int ImportDirectory<bits>::write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva)
-        {
+        {
-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        ofFile.clear();
+                        ofFile.clear();
-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                else
+                else
-                {
+                {
-                        ofFile.close();
+                        ofFile.close();
-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                ofFile.seekp(uiOffset, std::ios_base::beg);
+                ofFile.seekp(uiOffset, std::ios_base::beg);
-                std::vector<byte> vBuffer;
+                std::vector<byte> vBuffer;
-                rebuild(vBuffer, uiRva);
+                rebuild(vBuffer, uiRva);
-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), vBuffer.size());
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), vBuffer.size());
-                ofFile.close();
+                ofFile.close();
-                std::copy(m_vNewiid.begin(), m_vNewiid.end(), std::back_inserter(m_vOldiid));
+                std::copy(m_vNewiid.begin(), m_vNewiid.end(), std::back_inserter(m_vOldiid));
-                m_vNewiid.clear();
+                m_vNewiid.clear();
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * Returns the size of the import directory.
+        * Returns the size of the import directory.
-        * @return Size of the import directory.
+        * @return Size of the import directory.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        unsigned int ImportDirectory<bits>::size() const
+        unsigned int ImportDirectory<bits>::size() const
-        {
+        {
-                // Only the descriptors of m_vOldiid must be rebuilt, not the data they point to.
+                // 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> >)
+                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();
+                + (m_vOldiid.size() + 1) * PELIB_IMAGE_IMPORT_DESCRIPTOR::size();
-        }
+        }
-        /**
+        /**
-        * @param strFilename Name of the imported file.
+        * @param strFilename Name of the imported file.
-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
-        * @return FirstThunk value of an imported file.
+        * @return FirstThunk value of an imported file.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        dword ImportDirectory<bits>::getFirstThunk(const std::string& strFilename, currdir cdDir) const
+        dword ImportDirectory<bits>::getFirstThunk(const std::string& strFilename, currdir cdDir) const
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.FirstThunk;
+                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.FirstThunk;
-                }
+                }
-                else
+                else
-                {
+                {
-                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.FirstThunk;
+                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.FirstThunk;
-                }
+                }
-        }
+        }
-        /**
+        /**
-        * @param strFilename Name of the imported file.
+        * @param strFilename Name of the imported file.
-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
-        * @return OriginalFirstThunk value of an imported file.
+        * @return OriginalFirstThunk value of an imported file.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        dword ImportDirectory<bits>::getOriginalFirstThunk(const std::string& strFilename, currdir cdDir) const
+        dword ImportDirectory<bits>::getOriginalFirstThunk(const std::string& strFilename, currdir cdDir) const
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.OriginalFirstThunk;
+                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.OriginalFirstThunk;
-                }
+                }
-                else
+                else
-                {
+                {
-                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.OriginalFirstThunk;
+                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.OriginalFirstThunk;
-                }
+                }
-        }
+        }
-        /**
+        /**
-        * @param strFilename Name of the imported file.
+        * @param strFilename Name of the imported file.
-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
-        * @return ForwarderChain value of an imported file.
+        * @return ForwarderChain value of an imported file.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        dword ImportDirectory<bits>::getForwarderChain(const std::string& strFilename, currdir cdDir) const
+        dword ImportDirectory<bits>::getForwarderChain(const std::string& strFilename, currdir cdDir) const
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.ForwarderChain;
+                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.ForwarderChain;
-                }
+                }
-                else
+                else
-                {
+                {
-                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.ForwarderChain;
+                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.ForwarderChain;
-                }
+                }
-        }
+        }
-        /**
+        /**
-        * @param strFilename Name of the imported file.
+        * @param strFilename Name of the imported file.
-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
-        * @return TimeDateStamp value of an imported file.
+        * @return TimeDateStamp value of an imported file.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        dword ImportDirectory<bits>::getTimeDateStamp(const std::string& strFilename, currdir cdDir) const
+        dword ImportDirectory<bits>::getTimeDateStamp(const std::string& strFilename, currdir cdDir) const
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.TimeDateStamp;
+                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.TimeDateStamp;
-                }
+                }
-                else
+                else
-                {
+                {
-                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.TimeDateStamp;
+                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.TimeDateStamp;
-                }
+                }
-        }
+        }
-        template<int bits>
+        template<int bits>
-        dword ImportDirectory<bits>::getRvaOfName(const std::string& strFilename, currdir cdDir) const
+        dword ImportDirectory<bits>::getRvaOfName(const std::string& strFilename, currdir cdDir) const
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.Name;
+                        return m_vOldiid[getFileIndex(strFilename, cdDir)].impdesc.Name;
-                }
+                }
-                else
+                else
-                {
+                {
-                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.Name;
+                        return m_vNewiid[getFileIndex(strFilename, cdDir)].impdesc.Name;
-                }
+                }
-        }
+        }
-        /**
+        /**
-        * @param strFilename Name of the imported file.
+        * @param strFilename Name of the imported file.
-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
-        * @return FirstThunk value of an imported file.
+        * @return FirstThunk value of an imported file.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        dword ImportDirectory<bits>::getFirstThunk(dword dwFilenr, currdir cdDir) const
+        dword ImportDirectory<bits>::getFirstThunk(dword dwFilenr, currdir cdDir) const
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        return m_vOldiid[dwFilenr].impdesc.FirstThunk;
+                        return m_vOldiid[dwFilenr].impdesc.FirstThunk;
-                }
+                }
-                else
+                else
-                {
+                {
-                        return m_vNewiid[dwFilenr].impdesc.FirstThunk;
+                        return m_vNewiid[dwFilenr].impdesc.FirstThunk;
-                }
+                }
-        }
+        }
-        template<int bits>
+        template<int bits>
-        void ImportDirectory<bits>::setFirstThunk(dword dwFilenr, currdir cdDir, dword value)
+        void ImportDirectory<bits>::setFirstThunk(dword dwFilenr, currdir cdDir, dword value)
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        m_vOldiid[dwFilenr].impdesc.FirstThunk = value;
+                        m_vOldiid[dwFilenr].impdesc.FirstThunk = value;
-                }
+                }
-                else
+                else
-                {
+                {
-                        m_vNewiid[dwFilenr].impdesc.FirstThunk = value;
+                        m_vNewiid[dwFilenr].impdesc.FirstThunk = value;
-                }
+                }
-        }
+        }
-        /**
+        /**
-        * @param strFilename Name of the imported file.
+        * @param strFilename Name of the imported file.
-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
-        * @return OriginalFirstThunk value of an imported file.
+        * @return OriginalFirstThunk value of an imported file.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        dword ImportDirectory<bits>::getOriginalFirstThunk(dword dwFilenr, currdir cdDir) const
+        dword ImportDirectory<bits>::getOriginalFirstThunk(dword dwFilenr, currdir cdDir) const
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        return m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk;
+                        return m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk;
-                }
+                }
-                else
+                else
-                {
+                {
-                        return m_vNewiid[dwFilenr].impdesc.OriginalFirstThunk;
+                        return m_vNewiid[dwFilenr].impdesc.OriginalFirstThunk;
-                }
+                }
-        }
+        }
-        template<int bits>
+        template<int bits>
-        void ImportDirectory<bits>::setOriginalFirstThunk(dword dwFilenr, currdir cdDir, dword value)
+        void ImportDirectory<bits>::setOriginalFirstThunk(dword dwFilenr, currdir cdDir, dword value)
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk = value;
+                        m_vOldiid[dwFilenr].impdesc.OriginalFirstThunk = value;
-                }
+                }
-                else
+                else
-                {
+                {
-                        m_vNewiid[dwFilenr].impdesc.OriginalFirstThunk = value;
+                        m_vNewiid[dwFilenr].impdesc.OriginalFirstThunk = value;
-                }
+                }
-        }
+        }
-        /**
+        /**
-        * @param strFilename Name of the imported file.
+        * @param strFilename Name of the imported file.
-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
-        * @return ForwarderChain value of an imported file.
+        * @return ForwarderChain value of an imported file.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        dword ImportDirectory<bits>::getForwarderChain(dword dwFilenr, currdir cdDir) const
+        dword ImportDirectory<bits>::getForwarderChain(dword dwFilenr, currdir cdDir) const
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        return m_vOldiid[dwFilenr].impdesc.ForwarderChain;
+                        return m_vOldiid[dwFilenr].impdesc.ForwarderChain;
-                }
+                }
-                else
+                else
-                {
+                {
-                        return m_vNewiid[dwFilenr].impdesc.ForwarderChain;
+                        return m_vNewiid[dwFilenr].impdesc.ForwarderChain;
-                }
+                }
-        }
+        }
-        template<int bits>
+        template<int bits>
-        void ImportDirectory<bits>::setForwarderChain(dword dwFilenr, currdir cdDir, dword value)
+        void ImportDirectory<bits>::setForwarderChain(dword dwFilenr, currdir cdDir, dword value)
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        m_vOldiid[dwFilenr].impdesc.ForwarderChain = value;
+                        m_vOldiid[dwFilenr].impdesc.ForwarderChain = value;
-                }
+                }
-                else
+                else
-                {
+                {
-                        m_vNewiid[dwFilenr].impdesc.ForwarderChain = value;
+                        m_vNewiid[dwFilenr].impdesc.ForwarderChain = value;
-                }
+                }
-        }
+        }
-        /**
+        /**
-        * @param strFilename Name of the imported file.
+        * @param strFilename Name of the imported file.
-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
-        * @return TimeDateStamp value of an imported file.
+        * @return TimeDateStamp value of an imported file.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        dword ImportDirectory<bits>::getTimeDateStamp(dword dwFilenr, currdir cdDir) const
+        dword ImportDirectory<bits>::getTimeDateStamp(dword dwFilenr, currdir cdDir) const
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        return m_vOldiid[dwFilenr].impdesc.TimeDateStamp;
+                        return m_vOldiid[dwFilenr].impdesc.TimeDateStamp;
-                }
+                }
-                else
+                else
-                {
+                {
-                        return m_vNewiid[dwFilenr].impdesc.TimeDateStamp;
+                        return m_vNewiid[dwFilenr].impdesc.TimeDateStamp;
-                }
+                }
-        }
+        }
-        template<int bits>
+        template<int bits>
-        void ImportDirectory<bits>::setTimeDateStamp(dword dwFilenr, currdir cdDir, dword value)
+        void ImportDirectory<bits>::setTimeDateStamp(dword dwFilenr, currdir cdDir, dword value)
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        m_vOldiid[dwFilenr].impdesc.TimeDateStamp = value;
+                        m_vOldiid[dwFilenr].impdesc.TimeDateStamp = value;
-                }
+                }
-                else
+                else
-                {
+                {
-                        m_vNewiid[dwFilenr].impdesc.TimeDateStamp = value;
+                        m_vNewiid[dwFilenr].impdesc.TimeDateStamp = value;
-                }
+                }
-        }
+        }
-        template<int bits>
+        template<int bits>
-        dword ImportDirectory<bits>::getRvaOfName(dword dwFilenr, currdir cdDir) const
+        dword ImportDirectory<bits>::getRvaOfName(dword dwFilenr, currdir cdDir) const
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        return m_vOldiid[dwFilenr].impdesc.Name;
+                        return m_vOldiid[dwFilenr].impdesc.Name;
-                }
+                }
-                else
+                else
-                {
+                {
-                        return m_vNewiid[dwFilenr].impdesc.Name;
+                        return m_vNewiid[dwFilenr].impdesc.Name;
-                }
+                }
-        }
+        }
-        template<int bits>
+        template<int bits>
-        void ImportDirectory<bits>::setRvaOfName(dword dwFilenr, currdir cdDir, dword value)
+        void ImportDirectory<bits>::setRvaOfName(dword dwFilenr, currdir cdDir, dword value)
-        {
+        {
-                if (cdDir == OLDDIR)
+                if (cdDir == OLDDIR)
-                {
+                {
-                        m_vOldiid[dwFilenr].impdesc.Name = value;
+                        m_vOldiid[dwFilenr].impdesc.Name = value;
-                }
+                }
-                else
+                else
-                {
+                {
-                        m_vNewiid[dwFilenr].impdesc.Name = value;
+                        m_vNewiid[dwFilenr].impdesc.Name = value;
-                }
+                }
-        }
+        }
-        /**
+        /**
-        * @param dwFilenr ID of the imported file.
+        * @param dwFilenr ID of the imported file.
-        * @param dwFuncnr ID of the imported function.
+        * @param dwFuncnr ID of the imported function.
-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
-        * @return FirstThunk value of an imported function.
+        * @return FirstThunk value of an imported function.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        dword ImportDirectory<bits>::getFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir) const
+        dword ImportDirectory<bits>::getFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir) const
-        {
+        {
-                if (cdDir == OLDDIR) return m_vOldiid[dwFilenr].firstthunk[dwFuncnr].itd.Ordinal;
+                if (cdDir == OLDDIR) return m_vOldiid[dwFilenr].firstthunk[dwFuncnr].itd.Ordinal;
-                else return m_vNewiid[dwFilenr].firstthunk[dwFuncnr].itd.Ordinal;
+                else return m_vNewiid[dwFilenr].firstthunk[dwFuncnr].itd.Ordinal;
-        }
+        }
-        
+        
-        template<int bits>
+        template<int bits>
-        void ImportDirectory<bits>::setFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir, dword value)
+        void ImportDirectory<bits>::setFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir, dword value)
-        {
+        {
-                if (cdDir == OLDDIR) m_vOldiid[dwFilenr].firstthunk[dwFuncnr].itd.Ordinal = value;
+                if (cdDir == OLDDIR) m_vOldiid[dwFilenr].firstthunk[dwFuncnr].itd.Ordinal = value;
-                else m_vNewiid[dwFilenr].firstthunk[dwFuncnr].itd.Ordinal = value;
+                else m_vNewiid[dwFilenr].firstthunk[dwFuncnr].itd.Ordinal = value;
-        }
+        }
-        
+        
-        /**
+        /**
-        * @param dwFilenr ID of the imported file.
+        * @param dwFilenr ID of the imported file.
-        * @param dwFuncnr ID of the imported function.
+        * @param dwFuncnr ID of the imported function.
-        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
+        * @param cdDir Flag to decide if the OLDDIR or new import directory is used.
-        * @return OriginalFirstThunk value of an imported function.
+        * @return OriginalFirstThunk value of an imported function.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        dword ImportDirectory<bits>::getOriginalFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir) const
+        dword ImportDirectory<bits>::getOriginalFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir) const
-        {
+        {
-                if (cdDir == OLDDIR) return m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].itd.Ordinal;
+                if (cdDir == OLDDIR) return m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].itd.Ordinal;
-                else return m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].itd.Ordinal;
+                else return m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].itd.Ordinal;
-        }
+        }
-        template<int bits>
+        template<int bits>
-        void ImportDirectory<bits>::setOriginalFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir, dword value)
+        void ImportDirectory<bits>::setOriginalFirstThunk(dword dwFilenr, dword dwFuncnr, currdir cdDir, dword value)
-        {
+        {
-                if (cdDir == OLDDIR) m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].itd.Ordinal = value;
+                if (cdDir == OLDDIR) m_vOldiid[dwFilenr].originalfirstthunk[dwFuncnr].itd.Ordinal = value;
-                else m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].itd.Ordinal = value;
+                else m_vNewiid[dwFilenr].originalfirstthunk[dwFuncnr].itd.Ordinal = value;
-        }
+        }
-        typedef ImportDirectory<32> ImportDirectory32;
+        typedef ImportDirectory<32> ImportDirectory32;
-        typedef ImportDirectory<64> ImportDirectory64;
+        typedef ImportDirectory<64> ImportDirectory64;
-}
+}
-#endif
+#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.
+* MzHeader.cpp - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#include "MzHeader.h"
+#include "MzHeader.h"
-#include <iostream>
+#include <iostream>
-namespace PeLib
+namespace PeLib
-{
+{
-        /**
+        /**
-        * Reads data from an InputBuffer into the struct that represents the MZ header.
+        * 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
+        * 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.
+        * size of a MZ header. Otherwise we get undefined behaviour.
-        * @param ibBuffer InputBuffer that holds the data.
+        * @param ibBuffer InputBuffer that holds the data.
-        * @return A non-zero value is returned if a problem occured.
+        * @return A non-zero value is returned if a problem occured.
-        **/
+        **/
-        void MzHeader::read(InputBuffer& ibBuffer)
+        void MzHeader::read(InputBuffer& ibBuffer)
-        {
+        {
-                ibBuffer >> m_idhHeader.e_magic;
+                ibBuffer >> m_idhHeader.e_magic;
-                ibBuffer >> m_idhHeader.e_cblp;
+                ibBuffer >> m_idhHeader.e_cblp;
-                ibBuffer >> m_idhHeader.e_cp;
+                ibBuffer >> m_idhHeader.e_cp;
-                ibBuffer >> m_idhHeader.e_crlc;
+                ibBuffer >> m_idhHeader.e_crlc;
-                ibBuffer >> m_idhHeader.e_cparhdr;
+                ibBuffer >> m_idhHeader.e_cparhdr;
-                ibBuffer >> m_idhHeader.e_minalloc;
+                ibBuffer >> m_idhHeader.e_minalloc;
-                ibBuffer >> m_idhHeader.e_maxalloc;
+                ibBuffer >> m_idhHeader.e_maxalloc;
-                ibBuffer >> m_idhHeader.e_ss;
+                ibBuffer >> m_idhHeader.e_ss;
-                ibBuffer >> m_idhHeader.e_sp;
+                ibBuffer >> m_idhHeader.e_sp;
-                ibBuffer >> m_idhHeader.e_csum;
+                ibBuffer >> m_idhHeader.e_csum;
-                ibBuffer >> m_idhHeader.e_ip;
+                ibBuffer >> m_idhHeader.e_ip;
-                ibBuffer >> m_idhHeader.e_cs;
+                ibBuffer >> m_idhHeader.e_cs;
-                ibBuffer >> m_idhHeader.e_lfarlc;
+                ibBuffer >> m_idhHeader.e_lfarlc;
-                ibBuffer >> m_idhHeader.e_ovno;
+                ibBuffer >> m_idhHeader.e_ovno;
-                for (unsigned int i=0;i<sizeof(m_idhHeader.e_res)/sizeof(m_idhHeader.e_res[0]);i++)
+                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_res[i];
-                }
+                }
-                ibBuffer >> m_idhHeader.e_oemid;
+                ibBuffer >> m_idhHeader.e_oemid;
-                ibBuffer >> m_idhHeader.e_oeminfo;
+                ibBuffer >> m_idhHeader.e_oeminfo;
-                for (unsigned int i=0;i<sizeof(m_idhHeader.e_res2)/sizeof(m_idhHeader.e_res2[0]);i++)
+                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_res2[i];
-                }
+                }
-                ibBuffer >> m_idhHeader.e_lfanew;
+                ibBuffer >> m_idhHeader.e_lfanew;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Tests if the currently loaded MZ header is a valid MZ header. 
+        * 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.
+        * 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).
+        * 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.
+        * 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.
+        * @return A boolean value that indicates if the MZ header is correct or not.
-        **/
+        **/
-        bool MzHeader::isValid() const
+        bool MzHeader::isValid() const
-        {
+        {
-                // The only thing that matters on Windows 2K is the e_magic value. The entire rest is for DOS compatibility.
+                // The only thing that matters on Windows 2K is the e_magic value. The entire rest is for DOS compatibility.
-                return isValid(e_magic);
+                return isValid(e_magic);
-        }
+        }
-    bool MzHeader::isValid(Field f) const
+    bool MzHeader::isValid(Field f) const
-    {
+    {
-        if (f == e_magic)
+        if (f == e_magic)
-        {
+        {
-            return m_idhHeader.e_magic == PELIB_IMAGE_DOS_SIGNATURE;
+            return m_idhHeader.e_magic == PELIB_IMAGE_DOS_SIGNATURE;
-        }
+        }
-        else
+        else
-        {
+        {
-            return true;
+            return true;
-        }
+        }
-    }
+    }
-        /**
+        /**
-        * Corrects all erroneous values of the current MZ header. Note that this function does not correct the
+        * Corrects all erroneous values of the current MZ header. Note that this function does not correct the
-        * pointer to the PE header.     
+        * pointer to the PE header.     
-        * Actually, the only thing this function corrects is the e_magic value.
+        * 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.
+        * Everything else is not relevant for Windows 2000 and that's the system PeLib is focusing on for now.
-        **/
+        **/
-        void MzHeader::makeValid()
+        void MzHeader::makeValid()
-        {
+        {
-                // The only thing that matters on Windows is the e_magic value. The entire rest is for DOS compatibility.
+                // The only thing that matters on Windows is the e_magic value. The entire rest is for DOS compatibility.
-                setMagicNumber(PELIB_IMAGE_DOS_SIGNATURE);
+                setMagicNumber(PELIB_IMAGE_DOS_SIGNATURE);
-        }
+        }
-    void MzHeader::makeValid(Field f)
+    void MzHeader::makeValid(Field f)
-    {
+    {
-        if (f == e_magic)
+        if (f == e_magic)
-        {
+        {
-            setMagicNumber(PELIB_IMAGE_DOS_SIGNATURE);
+            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.
+        * 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
+        * 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.
+        * be possible to load damaged PE files to repair them.
-        * @param strFilename Name of the file which will be read.
+        * @param strFilename Name of the file which will be read.
-        * @return A non-zero value is returned if a problem occured.
+        * @return A non-zero value is returned if a problem occured.
-        **/
+        **/
-        int MzHeader::read(const std::string& strFilename)
+        int MzHeader::read(const std::string& strFilename)
-        {
+        {
-                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
+                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
-                if (!ifFile)
+                if (!ifFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                if (fileSize(ifFile) < PELIB_IMAGE_DOS_HEADER::size())
+                if (fileSize(ifFile) < PELIB_IMAGE_DOS_HEADER::size())
-                {
+                {
-                        return ERROR_INVALID_FILE;
+                        return ERROR_INVALID_FILE;
-                }
+                }
-                ifFile.seekg(0, std::ios::beg);
+                ifFile.seekg(0, std::ios::beg);
-                originalOffset = 0;
+                originalOffset = 0;
-                
+                
-                std::vector<byte> vBuffer(PELIB_IMAGE_DOS_HEADER::size());
+                std::vector<byte> vBuffer(PELIB_IMAGE_DOS_HEADER::size());
-                ifFile.read(reinterpret_cast<char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
+                ifFile.read(reinterpret_cast<char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
-                ifFile.close();
+                ifFile.close();
-                InputBuffer ibBuffer(vBuffer);
+                InputBuffer ibBuffer(vBuffer);
-                read(ibBuffer);
+                read(ibBuffer);
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * Reads the MZ header from memory. A pointer to a location in memory is passed and the data
+        * 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.
+        * 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 pcBuffer Pointer to a MZ header.
-        * @param uiSize Length of the buffer.
+        * @param uiSize Length of the buffer.
-        * @return A non-zero value is returned if a problem occured.
+        * @return A non-zero value is returned if a problem occured.
-        **/
+        **/
-        int MzHeader::read(unsigned char* pcBuffer, unsigned int uiSize, unsigned int originalOffs)
+        int MzHeader::read(unsigned char* pcBuffer, unsigned int uiSize, unsigned int originalOffs)
-        {
+        {
-                if (uiSize < PELIB_IMAGE_DOS_HEADER::size())
+                if (uiSize < PELIB_IMAGE_DOS_HEADER::size())
-                {
+                {
-                        return ERROR_INVALID_FILE;
+                        return ERROR_INVALID_FILE;
-                }
+                }
-                
+                
-                std::vector<byte> vBuffer(pcBuffer, pcBuffer + uiSize);
+                std::vector<byte> vBuffer(pcBuffer, pcBuffer + uiSize);
-                for (int i=0;i<0x40;i++) std::cout << std::hex << (int)vBuffer[i] << " ";
+                for (int i=0;i<0x40;i++) std::cout << std::hex << (int)vBuffer[i] << " ";
-                originalOffset = originalOffs;
+                originalOffset = originalOffs;
-                
+                
-                InputBuffer ibBuffer(vBuffer);
+                InputBuffer ibBuffer(vBuffer);
-                read(ibBuffer);
+                read(ibBuffer);
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * Rebuilds the MZ header so that it can be written to a file. It's not guaranteed that the
+        * 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
+        * 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.
+        * must call #PeLib::MzHeader::makeValid first.
-        * @param vBuffer Buffer where the rebuilt MZ header will be stored.
+        * @param vBuffer Buffer where the rebuilt MZ header will be stored.
-        **/
+        **/
-        void MzHeader::rebuild(std::vector<byte>& vBuffer) const
+        void MzHeader::rebuild(std::vector<byte>& vBuffer) const
-        {
+        {
-                OutputBuffer obBuffer(vBuffer);
+                OutputBuffer obBuffer(vBuffer);
-                obBuffer << m_idhHeader.e_magic;
+                obBuffer << m_idhHeader.e_magic;
-                obBuffer << m_idhHeader.e_cblp;
+                obBuffer << m_idhHeader.e_cblp;
-                obBuffer << m_idhHeader.e_cp;
+                obBuffer << m_idhHeader.e_cp;
-                obBuffer << m_idhHeader.e_crlc;
+                obBuffer << m_idhHeader.e_crlc;
-                obBuffer << m_idhHeader.e_cparhdr;
+                obBuffer << m_idhHeader.e_cparhdr;
-                obBuffer << m_idhHeader.e_minalloc;
+                obBuffer << m_idhHeader.e_minalloc;
-                obBuffer << m_idhHeader.e_maxalloc;
+                obBuffer << m_idhHeader.e_maxalloc;
-                obBuffer << m_idhHeader.e_ss;
+                obBuffer << m_idhHeader.e_ss;
-                obBuffer << m_idhHeader.e_sp;
+                obBuffer << m_idhHeader.e_sp;
-                obBuffer << m_idhHeader.e_csum;
+                obBuffer << m_idhHeader.e_csum;
-                obBuffer << m_idhHeader.e_ip;
+                obBuffer << m_idhHeader.e_ip;
-                obBuffer << m_idhHeader.e_cs;
+                obBuffer << m_idhHeader.e_cs;
-                obBuffer << m_idhHeader.e_lfarlc;
+                obBuffer << m_idhHeader.e_lfarlc;
-                obBuffer << m_idhHeader.e_ovno;
+                obBuffer << m_idhHeader.e_ovno;
-                for (unsigned int i=0;i<sizeof(m_idhHeader.e_res)/sizeof(m_idhHeader.e_res[0]);i++)
+                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_res[i];
-                }
+                }
-                obBuffer << m_idhHeader.e_oemid;
+                obBuffer << m_idhHeader.e_oemid;
-                obBuffer << m_idhHeader.e_oeminfo;
+                obBuffer << m_idhHeader.e_oeminfo;
-                for (unsigned int i=0;i<sizeof(m_idhHeader.e_res2)/sizeof(m_idhHeader.e_res2[0]);i++)
+                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_res2[i];
-                }
+                }
-                obBuffer << m_idhHeader.e_lfanew;
+                obBuffer << m_idhHeader.e_lfanew;
-        }
+        }
-        /**
+        /**
-        * Returns the size of the MZ header. This size is actually always sizeof(IMAGE_DOS_HEADER) (== 0x40)
+        * 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
+        * 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.
+        * size of the MZ header + the size of the dos stub check #PeLib::MzHeader::getAddressOfPeHeader.
-        * @return Size of the MZ header.
+        * @return Size of the MZ header.
-        **/
+        **/
-        unsigned int MzHeader::size() const
+        unsigned int MzHeader::size() const
-        {
+        {
-                return sizeof(m_idhHeader);
+                return sizeof(m_idhHeader);
-        }
+        }
-        /**
+        /**
-        * Writes the current MZ header to a file. The file does not have to exist. If it doesn't exist
+        * Writes the current MZ header to a file. The file does not have to exist. If it doesn't exist
-        * it will be created.
+        * it will be created.
-        * @param strFilename Name of the file the header will be written to.
+        * @param strFilename Name of the file the header will be written to.
-        * @param dwOffset Offset the header will be written to (defaults to 0).
+        * @param dwOffset Offset the header will be written to (defaults to 0).
-        * @return A non-zero value is returned if a problem occured.
+        * @return A non-zero value is returned if a problem occured.
-        **/
+        **/
-        int MzHeader::write(const std::string& strFilename, dword dwOffset = 0) const
+        int MzHeader::write(const std::string& strFilename, dword dwOffset = 0) const
-        {
+        {
-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        ofFile.clear();
+                        ofFile.clear();
-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                else
+                else
-                {
+                {
-                        ofFile.close();
+                        ofFile.close();
-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                ofFile.seekp(dwOffset, std::ios::beg);
+                ofFile.seekp(dwOffset, std::ios::beg);
-                std::vector<unsigned char> vBuffer;
+                std::vector<unsigned char> vBuffer;
-                rebuild(vBuffer);
+                rebuild(vBuffer);
-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
-                ofFile.close();
+                ofFile.close();
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_magic value.
+        * Returns the MZ header's e_magic value.
-        **/
+        **/
-        word MzHeader::getMagicNumber() const
+        word MzHeader::getMagicNumber() const
-        {
+        {
-                return m_idhHeader.e_magic;
+                return m_idhHeader.e_magic;
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_cblp value.
+        * Returns the MZ header's e_cblp value.
-        **/
+        **/
-        word MzHeader::getBytesOnLastPage() const
+        word MzHeader::getBytesOnLastPage() const
-        {
+        {
-                return m_idhHeader.e_cblp;
+                return m_idhHeader.e_cblp;
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_cp value.
+        * Returns the MZ header's e_cp value.
-        **/
+        **/
-        word MzHeader::getPagesInFile() const
+        word MzHeader::getPagesInFile() const
-        {
+        {
-                return m_idhHeader.e_cp;
+                return m_idhHeader.e_cp;
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_crlc value.
+        * Returns the MZ header's e_crlc value.
-        **/
+        **/
-        word MzHeader::getRelocations() const
+        word MzHeader::getRelocations() const
-        {
+        {
-                return m_idhHeader.e_crlc;
+                return m_idhHeader.e_crlc;
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_cparhdr value.
+        * Returns the MZ header's e_cparhdr value.
-        **/
+        **/
-        word MzHeader::getSizeOfHeader() const
+        word MzHeader::getSizeOfHeader() const
-        {
+        {
-                return m_idhHeader.e_cparhdr;
+                return m_idhHeader.e_cparhdr;
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_minalloc value.
+        * Returns the MZ header's e_minalloc value.
-        **/
+        **/
-        word MzHeader::getMinExtraParagraphs() const
+        word MzHeader::getMinExtraParagraphs() const
-        {
+        {
-                return m_idhHeader.e_minalloc;
+                return m_idhHeader.e_minalloc;
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_maxalloc value.
+        * Returns the MZ header's e_maxalloc value.
-        **/
+        **/
-        word MzHeader::getMaxExtraParagraphs() const
+        word MzHeader::getMaxExtraParagraphs() const
-        {
+        {
-                return m_idhHeader.e_maxalloc;
+                return m_idhHeader.e_maxalloc;
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_ss value.
+        * Returns the MZ header's e_ss value.
-        **/
+        **/
-        word MzHeader::getSsValue() const
+        word MzHeader::getSsValue() const
-        {
+        {
-                return m_idhHeader.e_ss;
+                return m_idhHeader.e_ss;
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_sp value.
+        * Returns the MZ header's e_sp value.
-        **/
+        **/
-        word MzHeader::getSpValue() const
+        word MzHeader::getSpValue() const
-        {
+        {
-                return m_idhHeader.e_sp;
+                return m_idhHeader.e_sp;
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_csum value.
+        * Returns the MZ header's e_csum value.
-        **/
+        **/
-        word MzHeader::getChecksum() const
+        word MzHeader::getChecksum() const
-        {
+        {
-                return m_idhHeader.e_csum;
+                return m_idhHeader.e_csum;
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_ip value.
+        * Returns the MZ header's e_ip value.
-        **/
+        **/
-        word MzHeader::getIpValue() const
+        word MzHeader::getIpValue() const
-        {
+        {
-                return m_idhHeader.e_ip;
+                return m_idhHeader.e_ip;
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_cs value.
+        * Returns the MZ header's e_cs value.
-        **/
+        **/
-        word MzHeader::getCsValue() const
+        word MzHeader::getCsValue() const
-        {
+        {
-                return m_idhHeader.e_cs;
+                return m_idhHeader.e_cs;
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_lfarlc value.
+        * Returns the MZ header's e_lfarlc value.
-        **/
+        **/
-        word MzHeader::getAddrOfRelocationTable() const
+        word MzHeader::getAddrOfRelocationTable() const
-        {
+        {
-                return m_idhHeader.e_lfarlc;
+                return m_idhHeader.e_lfarlc;
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_ovno value.
+        * Returns the MZ header's e_ovno value.
-        **/
+        **/
-        word MzHeader::getOverlayNumber() const
+        word MzHeader::getOverlayNumber() const
-        {
+        {
-                return m_idhHeader.e_ovno;
+                return m_idhHeader.e_ovno;
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_oemid value.
+        * Returns the MZ header's e_oemid value.
-        **/
+        **/
-        word MzHeader::getOemIdentifier() const
+        word MzHeader::getOemIdentifier() const
-        {
+        {
-                return m_idhHeader.e_oemid;
+                return m_idhHeader.e_oemid;
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_oeminfo value.
+        * Returns the MZ header's e_oeminfo value.
-        **/
+        **/
-        word MzHeader::getOemInformation() const
+        word MzHeader::getOemInformation() const
-        {
+        {
-                return m_idhHeader.e_oeminfo;
+                return m_idhHeader.e_oeminfo;
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_lfanew value.
+        * Returns the MZ header's e_lfanew value.
-        **/
+        **/
-        dword MzHeader::getAddressOfPeHeader() const
+        dword MzHeader::getAddressOfPeHeader() const
-        {
+        {
-                return m_idhHeader.e_lfanew;
+                return m_idhHeader.e_lfanew;
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_res[uiNr] value. If the parameter uiNr is out of range 
+        * Returns the MZ header's e_res[uiNr] value. If the parameter uiNr is out of range 
-        * you will get undefined behaviour.
+        * you will get undefined behaviour.
-        * @param uiNr The index of the word in the e_res array (valid range: 0-3)
+        * @param uiNr The index of the word in the e_res array (valid range: 0-3)
-        **/
+        **/
-        word MzHeader::getReservedWords1(unsigned int uiNr) const
+        word MzHeader::getReservedWords1(unsigned int uiNr) const
-        {
+        {
-                return m_idhHeader.e_res[uiNr];
+                return m_idhHeader.e_res[uiNr];
-        }
+        }
-        /**
+        /**
-        * Returns the MZ header's e_res2[uiNr] value. If the parameter uiNr is out of range 
+        * Returns the MZ header's e_res2[uiNr] value. If the parameter uiNr is out of range 
-        * you will get undefined behaviour.
+        * you will get undefined behaviour.
-        * @param uiNr The index of the word in the e_res array (valid range: 0-9)
+        * @param uiNr The index of the word in the e_res array (valid range: 0-9)
-        **/
+        **/
-        word MzHeader::getReservedWords2(unsigned int uiNr) const
+        word MzHeader::getReservedWords2(unsigned int uiNr) const
-        {
+        {
-                return m_idhHeader.e_res2[uiNr];
+                return m_idhHeader.e_res2[uiNr];
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the MZ header's e_magic value.
+        * Sets the MZ header's e_magic value.
-        * @param wValue The new value of e_magic.
+        * @param wValue The new value of e_magic.
-        **/
+        **/
-        void MzHeader::setMagicNumber(word wValue)
+        void MzHeader::setMagicNumber(word wValue)
-        {
+        {
-                m_idhHeader.e_magic = wValue;
+                m_idhHeader.e_magic = wValue;
-        }
+        }
-        /**
+        /**
-        * Sets the MZ header's e_cblp value.
+        * Sets the MZ header's e_cblp value.
-        * @param wValue The new value of e_cblp.
+        * @param wValue The new value of e_cblp.
-        **/
+        **/
-        void MzHeader::setBytesOnLastPage(word wValue)
+        void MzHeader::setBytesOnLastPage(word wValue)
-        {
+        {
-                m_idhHeader.e_cblp = wValue;
+                m_idhHeader.e_cblp = wValue;
-        }
+        }
-        /**
+        /**
-        * Sets the MZ header's e_cp value.
+        * Sets the MZ header's e_cp value.
-        * @param wValue The new value of e_cp.
+        * @param wValue The new value of e_cp.
-        **/
+        **/
-        void MzHeader::setPagesInFile(word wValue)
+        void MzHeader::setPagesInFile(word wValue)
-        {
+        {
-                m_idhHeader.e_cp = wValue;
+                m_idhHeader.e_cp = wValue;
-        }
+        }
-        /**
+        /**
-        * Sets the MZ header's e_crlc value.
+        * Sets the MZ header's e_crlc value.
-        * @param wValue The new value of e_crlc.
+        * @param wValue The new value of e_crlc.
-        **/  
+        **/  
-        void MzHeader::setRelocations(word wValue)
+        void MzHeader::setRelocations(word wValue)
-        {
+        {
-                m_idhHeader.e_crlc = wValue;
+                m_idhHeader.e_crlc = wValue;
-        }
+        }
-        /**
+        /**
-        * Sets the MZ header's e_cparhdr value.
+        * Sets the MZ header's e_cparhdr value.
-        * @param wValue The new value of e_cparhdr.
+        * @param wValue The new value of e_cparhdr.
-        **/  
+        **/  
-        void MzHeader::setSizeOfHeader(word wValue)
+        void MzHeader::setSizeOfHeader(word wValue)
-        {
+        {
-                m_idhHeader.e_cparhdr = wValue;
+                m_idhHeader.e_cparhdr = wValue;
-        }
+        }
-        /**
+        /**
-        * Sets the MZ header's e_minalloc value.
+        * Sets the MZ header's e_minalloc value.
-        * @param wValue The new value of e_minalloc.
+        * @param wValue The new value of e_minalloc.
-        **/  
+        **/  
-        void MzHeader::setMinExtraParagraphs(word wValue)
+        void MzHeader::setMinExtraParagraphs(word wValue)
-        {
+        {
-                m_idhHeader.e_minalloc = wValue;
+                m_idhHeader.e_minalloc = wValue;
-        }
+        }
-        /**
+        /**
-        * Sets the MZ header's e_maxalloc value.
+        * Sets the MZ header's e_maxalloc value.
-        * @param wValue The new value of e_maxalloc.
+        * @param wValue The new value of e_maxalloc.
-        **/  
+        **/  
-        void MzHeader::setMaxExtraParagraphs(word wValue)
+        void MzHeader::setMaxExtraParagraphs(word wValue)
-        {
+        {
-                m_idhHeader.e_maxalloc = wValue;
+                m_idhHeader.e_maxalloc = wValue;
-        }
+        }
-        /**
+        /**
-        * Sets the MZ header's e_ss value.
+        * Sets the MZ header's e_ss value.
-        * @param wValue The new value of e_ss.
+        * @param wValue The new value of e_ss.
-        **/  
+        **/  
-        void MzHeader::setSsValue(word wValue)
+        void MzHeader::setSsValue(word wValue)
-        {
+        {
-                m_idhHeader.e_ss = wValue;
+                m_idhHeader.e_ss = wValue;
-        }
+        }
-        /**
+        /**
-        * Sets the MZ header's e_sp value.
+        * Sets the MZ header's e_sp value.
-        * @param wValue The new value of e_sp.
+        * @param wValue The new value of e_sp.
-        **/  
+        **/  
-        void MzHeader::setSpValue(word wValue)
+        void MzHeader::setSpValue(word wValue)
-        {
+        {
-                m_idhHeader.e_sp = wValue;
+                m_idhHeader.e_sp = wValue;
-        }
+        }
-        /**
+        /**
-        * Sets the MZ header's e_csum value.
+        * Sets the MZ header's e_csum value.
-        * @param wValue The new value of e_csum.
+        * @param wValue The new value of e_csum.
-        **/  
+        **/  
-        void MzHeader::setChecksum(word wValue)
+        void MzHeader::setChecksum(word wValue)
-        {
+        {
-                m_idhHeader.e_csum = wValue;
+                m_idhHeader.e_csum = wValue;
-        }
+        }
-        /**
+        /**
-        * Sets the MZ header's e_ip value.
+        * Sets the MZ header's e_ip value.
-        * @param wValue The new value of e_ip.
+        * @param wValue The new value of e_ip.
-        **/  
+        **/  
-        void MzHeader::setIpValue(word wValue)
+        void MzHeader::setIpValue(word wValue)
-        {
+        {
-                m_idhHeader.e_ip = wValue;
+                m_idhHeader.e_ip = wValue;
-        }
+        }
-        /**
+        /**
-        * Sets the MZ header's e_cs value.
+        * Sets the MZ header's e_cs value.
-        * @param wValue The new value of e_cs.
+        * @param wValue The new value of e_cs.
-        **/  
+        **/  
-        void MzHeader::setCsValue(word wValue)
+        void MzHeader::setCsValue(word wValue)
-        {
+        {
-                m_idhHeader.e_cs = wValue;
+                m_idhHeader.e_cs = wValue;
-        }
+        }
-        /**
+        /**
-        * Sets the MZ header's e_lfarlc value.
+        * Sets the MZ header's e_lfarlc value.
-        * @param wValue The new value of e_lfarlc.
+        * @param wValue The new value of e_lfarlc.
-        **/  
+        **/  
-        void MzHeader::setAddrOfRelocationTable(word wValue)
+        void MzHeader::setAddrOfRelocationTable(word wValue)
-        {
+        {
-                m_idhHeader.e_lfarlc = wValue;
+                m_idhHeader.e_lfarlc = wValue;
-        }
+        }
-        /**
+        /**
-        * Sets the MZ header's e_ovno value.
+        * Sets the MZ header's e_ovno value.
-        * @param wValue The new value of e_ovno.
+        * @param wValue The new value of e_ovno.
-        **/  
+        **/  
-        void MzHeader::setOverlayNumber(word wValue)
+        void MzHeader::setOverlayNumber(word wValue)
-        {
+        {
-                m_idhHeader.e_ovno = wValue;
+                m_idhHeader.e_ovno = wValue;
-        }
+        }
-        /**
+        /**
-        * Sets the MZ header's e_oemid value.
+        * Sets the MZ header's e_oemid value.
-        * @param wValue The new value of e_oemid.
+        * @param wValue The new value of e_oemid.
-        **/  
+        **/  
-        void MzHeader::setOemIdentifier(word wValue)
+        void MzHeader::setOemIdentifier(word wValue)
-        {
+        {
-                m_idhHeader.e_oemid = wValue;
+                m_idhHeader.e_oemid = wValue;
-        }
+        }
-        /**
+        /**
-        * Sets the MZ header's e_oeminfo value.
+        * Sets the MZ header's e_oeminfo value.
-        * @param wValue The new value of e_oeminfo.
+        * @param wValue The new value of e_oeminfo.
-        **/  
+        **/  
-        void MzHeader::setOemInformation(word wValue)
+        void MzHeader::setOemInformation(word wValue)
-        {
+        {
-                m_idhHeader.e_oeminfo = wValue;
+                m_idhHeader.e_oeminfo = wValue;
-        }
+        }
-        /**
+        /**
-        * Sets the MZ header's e_lfanew value.
+        * Sets the MZ header's e_lfanew value.
-        * @param lValue The new value of e_lfanew.
+        * @param lValue The new value of e_lfanew.
-        **/  
+        **/  
-        void MzHeader::setAddressOfPeHeader(dword lValue)
+        void MzHeader::setAddressOfPeHeader(dword lValue)
-        {
+        {
-                m_idhHeader.e_lfanew = lValue;
+                m_idhHeader.e_lfanew = lValue;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the MZ header's e_res[uiNr] value. If the parameter uiNr is out of range 
+        * Sets the MZ header's e_res[uiNr] value. If the parameter uiNr is out of range 
-        * you will get undefined behaviour.
+        * you will get undefined behaviour.
-        * @param uiNr The index of the word in the e_res array (valid range: 0-3)
+        * @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].
+        * @param wValue The new value of e_res[nr].
-        **/
+        **/
-        void MzHeader::setReservedWords1(unsigned int uiNr, word wValue)
+        void MzHeader::setReservedWords1(unsigned int uiNr, word wValue)
-        {
+        {
-                m_idhHeader.e_res[uiNr] = wValue;
+                m_idhHeader.e_res[uiNr] = wValue;
-        }
+        }
-        /**
+        /**
-        * Sets the MZ header's e_res2[uiNr] value. If the parameter uiNr is out of range 
+        * Sets the MZ header's e_res2[uiNr] value. If the parameter uiNr is out of range 
-        * you will get undefined behaviour.
+        * you will get undefined behaviour.
-        * @param uiNr The index of the word in the e_res2 array (valid range: 0-9)
+        * @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].
+        * @param wValue The new value of e_res[nr].
-        **/
+        **/
-        void MzHeader::setReservedWords2(unsigned int uiNr, word wValue)
+        void MzHeader::setReservedWords2(unsigned int uiNr, word wValue)
-        {
+        {
-                m_idhHeader.e_res2[uiNr] = 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.
+* MzHeader.h - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#ifndef MZHEADER_H
+#ifndef MZHEADER_H
-#define MZHEADER_H
+#define MZHEADER_H
-#include "PeLibInc.h"
+#include "PeLibInc.h"
-namespace PeLib
+namespace PeLib
-{
+{
-        /// Class that handles the MZ header of files.
+        /// Class that handles the MZ header of files.
-        /**
+        /**
-        * This class can read and modify MZ headers. It provides set- and get functions to access
+        * 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
+        * all individual members of a MZ header. Furthermore it's possible to validate and rebuild
-        * MZ headers.
+        * MZ headers.
-        **/
+        **/
-        class MzHeader
+        class MzHeader
-        {
+        {
-                private:
+                private:
-                  PELIB_IMAGE_DOS_HEADER m_idhHeader; ///< Stores all MZ header information.
+                  PELIB_IMAGE_DOS_HEADER m_idhHeader; ///< Stores all MZ header information.
-                  
+                  
-                  /// Reads data from an InputBuffer into a MZ header struct.
+                  /// Reads data from an InputBuffer into a MZ header struct.
-                  void read(InputBuffer& ibBuffer);
+                  void read(InputBuffer& ibBuffer);
-                  
+                  
-                  /// Offset of the MZ header in the original file.
+                  /// Offset of the MZ header in the original file.
-                  unsigned int originalOffset;
+                  unsigned int originalOffset;
-                  
+                  
-                public:
+                public:
-          enum Field {e_magic, e_cblp, e_cp, e_crlc, e_cparhdr, e_minalloc, e_maxalloc,
+          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_ss, e_sp, e_csum, e_ip, e_cs, e_lfarlc, e_ovno, e_res, e_oemid,
-                        e_oeminfo, e_res2, e_lfanew};
+                        e_oeminfo, e_res2, e_lfanew};
-                  /// Checks if the current MZ header is valid.
+                  /// Checks if the current MZ header is valid.
-                  bool isValid() const; // EXPORT
+                  bool isValid() const; // EXPORT
-          
+          
-                  bool isValid(Field field) const; // EXPORT _field
+                  bool isValid(Field field) const; // EXPORT _field
-                  /// Corrects the current MZ header.
+                  /// Corrects the current MZ header.
-                  void makeValid(); // EXPORT
+                  void makeValid(); // EXPORT
-                  void makeValid(Field field); // EXPORT _field
+                  void makeValid(Field field); // EXPORT _field
-                  /// Reads the MZ header of a file.
+                  /// Reads the MZ header of a file.
-                  int read(const std::string& strFilename); // EXPORT
+                  int read(const std::string& strFilename); // EXPORT
-                  /// Reads the MZ header from a memory location.
+                  /// Reads the MZ header from a memory location.
-                  int read(unsigned char* pcBuffer, unsigned int uiSize, unsigned int originalOffs = 0); // EXPORT _fromMemory
+                  int read(unsigned char* pcBuffer, unsigned int uiSize, unsigned int originalOffs = 0); // EXPORT _fromMemory
-                  /// Rebuild the MZ header.
+                  /// Rebuild the MZ header.
-                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT
+                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT
-                  /// Returns the size of the current MZ header.
+                  /// Returns the size of the current MZ header.
-                  unsigned int size() const; // EXPORT
+                  unsigned int size() const; // EXPORT
-                  /// Writes the current MZ header to offset 0 of a file.
+                  /// Writes the current MZ header to offset 0 of a file.
-                  int write(const std::string& strFilename, dword dwOffset) const; // EXPORT
+                  int write(const std::string& strFilename, dword dwOffset) const; // EXPORT
-                  /// Gets the e_magic value of the MZ header.
+                  /// Gets the e_magic value of the MZ header.
-                  word getMagicNumber() const; // EXPORT
+                  word getMagicNumber() const; // EXPORT
-                  /// Gets the e_cblp value of the MZ header.
+                  /// Gets the e_cblp value of the MZ header.
-                  word getBytesOnLastPage() const; // EXPORT
+                  word getBytesOnLastPage() const; // EXPORT
-                  /// Gets the e_cp value of the MZ header.
+                  /// Gets the e_cp value of the MZ header.
-                  word getPagesInFile() const; // EXPORT
+                  word getPagesInFile() const; // EXPORT
-                  /// Gets the e_crlc value of the MZ header.
+                  /// Gets the e_crlc value of the MZ header.
-                  word getRelocations() const; // EXPORT
+                  word getRelocations() const; // EXPORT
-                  /// Gets the e_cparhdr value of the MZ header.
+                  /// Gets the e_cparhdr value of the MZ header.
-                  word getSizeOfHeader() const; // EXPORT
+                  word getSizeOfHeader() const; // EXPORT
-                  /// Gets the e_minalloc value of the MZ header.
+                  /// Gets the e_minalloc value of the MZ header.
-                  word getMinExtraParagraphs() const; // EXPORT
+                  word getMinExtraParagraphs() const; // EXPORT
-                  /// Gets the e_maxalloc value of the MZ header.
+                  /// Gets the e_maxalloc value of the MZ header.
-                  word getMaxExtraParagraphs() const; // EXPORT
+                  word getMaxExtraParagraphs() const; // EXPORT
-                  /// Gets the e_ss value of the MZ header.
+                  /// Gets the e_ss value of the MZ header.
-                  word getSsValue() const; // EXPORT
+                  word getSsValue() const; // EXPORT
-                  /// Gets the e_sp value of the MZ header.
+                  /// Gets the e_sp value of the MZ header.
-                  word getSpValue() const; // EXPORT
+                  word getSpValue() const; // EXPORT
-                  /// Gets the e_csum value of the MZ header.
+                  /// Gets the e_csum value of the MZ header.
-                  word getChecksum() const; // EXPORT
+                  word getChecksum() const; // EXPORT
-                  /// Gets the e_ip value of the MZ header.
+                  /// Gets the e_ip value of the MZ header.
-                  word getIpValue() const; // EXPORT
+                  word getIpValue() const; // EXPORT
-                  /// Gets the e_cs value of the MZ header.
+                  /// Gets the e_cs value of the MZ header.
-                  word getCsValue() const; // EXPORT
+                  word getCsValue() const; // EXPORT
-                  /// Gets the e_lfarlc value of the MZ header.
+                  /// Gets the e_lfarlc value of the MZ header.
-                  word getAddrOfRelocationTable() const; // EXPORT
+                  word getAddrOfRelocationTable() const; // EXPORT
-                  /// Gets the e_ovnovalue of the MZ header.
+                  /// Gets the e_ovnovalue of the MZ header.
-                  word getOverlayNumber() const; // EXPORT
+                  word getOverlayNumber() const; // EXPORT
-                  /// Gets the e_oemid value of the MZ header.
+                  /// Gets the e_oemid value of the MZ header.
-                  word getOemIdentifier() const; // EXPORT
+                  word getOemIdentifier() const; // EXPORT
-                  /// Gets the e_oeminfo value of the MZ header.
+                  /// Gets the e_oeminfo value of the MZ header.
-                  word getOemInformation() const; // EXPORT
+                  word getOemInformation() const; // EXPORT
-                  /// Gets the e_lfanew value of the MZ header.
+                  /// Gets the e_lfanew value of the MZ header.
-                  dword getAddressOfPeHeader() const; // EXPORT
+                  dword getAddressOfPeHeader() const; // EXPORT
-                  /// Gets the e_res of the MZ header.
+                  /// Gets the e_res of the MZ header.
-                  word getReservedWords1(unsigned int uiNr) const; // EXPORT
+                  word getReservedWords1(unsigned int uiNr) const; // EXPORT
-                  /// Gets the e_res2 of the MZ header.
+                  /// Gets the e_res2 of the MZ header.
-                  word getReservedWords2(unsigned int uiNr) const; // EXPORT
+                  word getReservedWords2(unsigned int uiNr) const; // EXPORT
-        
+        
-                  /// Sets the e_magic value of the MZ header.
+                  /// Sets the e_magic value of the MZ header.
-                  void setMagicNumber(word wValue); // EXPORT
+                  void setMagicNumber(word wValue); // EXPORT
-                  /// Sets the e_cblp value of the MZ header.
+                  /// Sets the e_cblp value of the MZ header.
-                  void setBytesOnLastPage(word wValue); // EXPORT
+                  void setBytesOnLastPage(word wValue); // EXPORT
-                  /// Sets the e_cp value of the MZ header.
+                  /// Sets the e_cp value of the MZ header.
-                  void setPagesInFile(word wValue); // EXPORT
+                  void setPagesInFile(word wValue); // EXPORT
-                  /// Sets the e_crlc value of the MZ header.
+                  /// Sets the e_crlc value of the MZ header.
-                  void setRelocations(word wValue); // EXPORT
+                  void setRelocations(word wValue); // EXPORT
-                  /// Sets the e_cparhdr value of the MZ header.
+                  /// Sets the e_cparhdr value of the MZ header.
-                  void setSizeOfHeader(word wValue); // EXPORT
+                  void setSizeOfHeader(word wValue); // EXPORT
-                  /// Sets the e_minalloc value of the MZ header.
+                  /// Sets the e_minalloc value of the MZ header.
-                  void setMinExtraParagraphs(word wValue); // EXPORT
+                  void setMinExtraParagraphs(word wValue); // EXPORT
-                  /// Sets the e_maxalloc value of the MZ header.
+                  /// Sets the e_maxalloc value of the MZ header.
-                  void setMaxExtraParagraphs(word wValue); // EXPORT
+                  void setMaxExtraParagraphs(word wValue); // EXPORT
-                  /// Sets the e_ss value of the MZ header.
+                  /// Sets the e_ss value of the MZ header.
-                  void setSsValue(word wValue); // EXPORT
+                  void setSsValue(word wValue); // EXPORT
-                  /// Sets the e_sp value of the MZ header.
+                  /// Sets the e_sp value of the MZ header.
-                  void setSpValue(word wValue); // EXPORT
+                  void setSpValue(word wValue); // EXPORT
-                  /// Sets the e_csum value of the MZ header.
+                  /// Sets the e_csum value of the MZ header.
-                  void setChecksum(word wValue); // EXPORT
+                  void setChecksum(word wValue); // EXPORT
-                  /// Sets the e_ip value of the MZ header.
+                  /// Sets the e_ip value of the MZ header.
-                  void setIpValue(word wValue); // EXPORT
+                  void setIpValue(word wValue); // EXPORT
-                  /// Sets the e_cs value of the MZ header.
+                  /// Sets the e_cs value of the MZ header.
-                  void setCsValue(word wValue); // EXPORT
+                  void setCsValue(word wValue); // EXPORT
-                  /// Sets the e_lfarlc value of the MZ header.
+                  /// Sets the e_lfarlc value of the MZ header.
-                  void setAddrOfRelocationTable(word wValue); // EXPORT
+                  void setAddrOfRelocationTable(word wValue); // EXPORT
-                  /// Sets the e_ovno value of the MZ header.
+                  /// Sets the e_ovno value of the MZ header.
-                  void setOverlayNumber(word wValue); // EXPORT
+                  void setOverlayNumber(word wValue); // EXPORT
-                  /// Sets the e_oemid value of the MZ header.
+                  /// Sets the e_oemid value of the MZ header.
-                  void setOemIdentifier(word wValue); // EXPORT
+                  void setOemIdentifier(word wValue); // EXPORT
-                  /// Sets the e_oeminfo value of the MZ header.
+                  /// Sets the e_oeminfo value of the MZ header.
-                  void setOemInformation(word wValue); // EXPORT
+                  void setOemInformation(word wValue); // EXPORT
-                  /// Sets the e_lfanew value of the MZ header.
+                  /// Sets the e_lfanew value of the MZ header.
-                  void setAddressOfPeHeader(dword dwValue); // EXPORT
+                  void setAddressOfPeHeader(dword dwValue); // EXPORT
-                  /// Sets the e_res value of the MZ header.
+                  /// Sets the e_res value of the MZ header.
-                  void setReservedWords1(unsigned int uiNr, word wValue); // EXPORT
+                  void setReservedWords1(unsigned int uiNr, word wValue); // EXPORT
-                  /// Sets the e_res2 value of the MZ header.
+                  /// Sets the e_res2 value of the MZ header.
-                  void setReservedWords2(unsigned int uiNr, word wValue); // EXPORT
+                  void setReservedWords2(unsigned int uiNr, word wValue); // EXPORT
-        };
+        };
-}
+}
-#endif
+#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.
+* PeLib.cpp - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#include "PeFile.h"
+#include "PeFile.h"
-namespace PeLib
+namespace PeLib
-{
+{
-        PeFile::~PeFile()
+        PeFile::~PeFile()
-        {
+        {
-        }
+        }
-        
+        
-        PeFile32::PeFile32() : PeFileT<32>()
+        PeFile32::PeFile32() : PeFileT<32>()
-        {
+        {
-        }
+        }
-        
+        
-        PeFile32::PeFile32(const std::string& strFlename) : PeFileT<32>(strFlename)
+        PeFile32::PeFile32(const std::string& strFlename) : PeFileT<32>(strFlename)
-        {
+        {
-        }
+        }
-        
+        
-        PeFile64::PeFile64() : PeFileT<64>()
+        PeFile64::PeFile64() : PeFileT<64>()
-        {
+        {
-        }
+        }
-        
+        
-        PeFile64::PeFile64(const std::string& strFlename) : PeFileT<64>(strFlename)
+        PeFile64::PeFile64(const std::string& strFlename) : PeFileT<64>(strFlename)
-        {
+        {
-        }
+        }
-        
+        
-        /**
+        /**
-        * @return A reference to the file's MZ header.
+        * @return A reference to the file's MZ header.
-        **/
+        **/
-        
+        
-        const MzHeader& PeFile::mzHeader() const
+        const MzHeader& PeFile::mzHeader() const
-        {
+        {
-                return m_mzh;
+                return m_mzh;
-        }
+        }
-        /**
+        /**
-        * @return A reference to the file's MZ header.
+        * @return A reference to the file's MZ header.
-        **/
+        **/
-        
+        
-        MzHeader& PeFile::mzHeader()
+        MzHeader& PeFile::mzHeader()
-        {
+        {
-                return m_mzh;
+                return m_mzh;
-        }
+        }
-        /**
+        /**
-        * @return A reference to the file's export directory.
+        * @return A reference to the file's export directory.
-        **/
+        **/
-        
+        
-        const ExportDirectory& PeFile::expDir() const
+        const ExportDirectory& PeFile::expDir() const
-        {
+        {
-                return m_expdir;
+                return m_expdir;
-        }
+        }
-        /**
+        /**
-        * @return A reference to the file's export directory.
+        * @return A reference to the file's export directory.
-        **/
+        **/
-        
+        
-        ExportDirectory& PeFile::expDir()
+        ExportDirectory& PeFile::expDir()
-        {
+        {
-                return m_expdir;
+                return m_expdir;
-        }
+        }
-        
+        
-        /**
+        /**
-        * @return A reference to the file's bound import directory.
+        * @return A reference to the file's bound import directory.
-        **/
+        **/
-        
+        
-        const BoundImportDirectory& PeFile::boundImpDir() const
+        const BoundImportDirectory& PeFile::boundImpDir() const
-        {
+        {
-                return m_boundimpdir;
+                return m_boundimpdir;
-        }
+        }
-        
+        
-        /**
+        /**
-        * @return A reference to the file's bound import directory.
+        * @return A reference to the file's bound import directory.
-        **/
+        **/
-        
+        
-        BoundImportDirectory& PeFile::boundImpDir()
+        BoundImportDirectory& PeFile::boundImpDir()
-        {
+        {
-                return m_boundimpdir;
+                return m_boundimpdir;
-        }
+        }
-        
+        
-        /**
+        /**
-        * @return A reference to the file's resource directory.
+        * @return A reference to the file's resource directory.
-        **/
+        **/
-        
+        
-        const ResourceDirectory& PeFile::resDir() const
+        const ResourceDirectory& PeFile::resDir() const
-        {
+        {
-                return m_resdir;
+                return m_resdir;
-        }
+        }
-        
+        
-        /**
+        /**
-        * @return A reference to the file's resource directory.
+        * @return A reference to the file's resource directory.
-        **/
+        **/
-        
+        
-        ResourceDirectory& PeFile::resDir()
+        ResourceDirectory& PeFile::resDir()
-        {
+        {
-                return m_resdir;
+                return m_resdir;
-        }
+        }
-        
+        
-        /**
+        /**
-        * @return A reference to the file's relocations directory.
+        * @return A reference to the file's relocations directory.
-        **/
+        **/
-        
+        
-        const RelocationsDirectory& PeFile::relocDir() const
+        const RelocationsDirectory& PeFile::relocDir() const
-        {
+        {
-                return m_relocs;
+                return m_relocs;
-        }
+        }
-        /**
+        /**
-        * @return A reference to the file's relocations directory.
+        * @return A reference to the file's relocations directory.
-        **/
+        **/
-        
+        
-        RelocationsDirectory& PeFile::relocDir()
+        RelocationsDirectory& PeFile::relocDir()
-        {
+        {
-                return m_relocs;
+                return m_relocs;
-        }
+        }
-        /**
+        /**
-        * @return A reference to the file's COM+ descriptor directory.
+        * @return A reference to the file's COM+ descriptor directory.
-        **/
+        **/
-        
+        
-        const ComHeaderDirectory& PeFile::comDir() const
+        const ComHeaderDirectory& PeFile::comDir() const
-        {
+        {
-                return m_comdesc;
+                return m_comdesc;
-        }
+        }
-        /**
+        /**
-        * @return A reference to the file's COM+ descriptor directory.
+        * @return A reference to the file's COM+ descriptor directory.
-        **/
+        **/
-        
+        
-        ComHeaderDirectory & PeFile::comDir()
+        ComHeaderDirectory & PeFile::comDir()
-        {
+        {
-                return m_comdesc;
+                return m_comdesc;
-        }
+        }
-        
+        
-        const IatDirectory& PeFile::iatDir() const
+        const IatDirectory& PeFile::iatDir() const
-        {
+        {
-                return m_iat;
+                return m_iat;
-        }
+        }
-        
+        
-        IatDirectory& PeFile::iatDir()
+        IatDirectory& PeFile::iatDir()
-        {
+        {
-                return m_iat;
+                return m_iat;
-        }
+        }
-        
+        
-        const DebugDirectory& PeFile::debugDir() const
+        const DebugDirectory& PeFile::debugDir() const
-        {
+        {
-                return m_debugdir;
+                return m_debugdir;
-        }
+        }
-        
+        
-        DebugDirectory& PeFile::debugDir()
+        DebugDirectory& PeFile::debugDir()
-        {
+        {
-                return m_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.
+* PeFile.h - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#ifndef PEFILE_H
+#ifndef PEFILE_H
-#define PEFILE_H
+#define PEFILE_H
-#include "PeLibInc.h"
+#include "PeLibInc.h"
-#include "MzHeader.h"
+#include "MzHeader.h"
-#include "PeHeader.h"
+#include "PeHeader.h"
-#include "ImportDirectory.h"
+#include "ImportDirectory.h"
-#include "ExportDirectory.h"
+#include "ExportDirectory.h"
-#include "BoundImportDirectory.h"
+#include "BoundImportDirectory.h"
-#include "ResourceDirectory.h"
+#include "ResourceDirectory.h"
-#include "RelocationsDirectory.h"
+#include "RelocationsDirectory.h"
-#include "ComHeaderDirectory.h"
+#include "ComHeaderDirectory.h"
-#include "IatDirectory.h"
+#include "IatDirectory.h"
-#include "DebugDirectory.h"
+#include "DebugDirectory.h"
-#include "TlsDirectory.h"
+#include "TlsDirectory.h"
-namespace PeLib
+namespace PeLib
-{
+{
-        class PeFile32;
+        class PeFile32;
-        class PeFile64;
+        class PeFile64;
-        
+        
-        /**
+        /**
-        * Visitor base class for PeFiles.
+        * Visitor base class for PeFiles.
-        **/
+        **/
-        class PeFileVisitor
+        class PeFileVisitor
-        {
+        {
-                public:
+                public:
-                  virtual void callback(PeFile32 &file){}
+                  virtual void callback(PeFile32 &file){}
-                  virtual void callback(PeFile64 &file){}
+                  virtual void callback(PeFile64 &file){}
-                  virtual ~PeFileVisitor(){}
+                  virtual ~PeFileVisitor(){}
-        };
+        };
-        /**
+        /**
-        * Traits class that's used to decide of what type the PeHeader in a PeFile is.
+        * Traits class that's used to decide of what type the PeHeader in a PeFile is.
-        **/
+        **/
-        template<int>
+        template<int>
-        struct PeFile_Traits;
+        struct PeFile_Traits;
-        template<>
+        template<>
-        struct PeFile_Traits<32>
+        struct PeFile_Traits<32>
-        {
+        {
-                typedef PeHeader32 PeHeader32_64;
+                typedef PeHeader32 PeHeader32_64;
-        };
+        };
-        
+        
-        template<>
+        template<>
-        struct PeFile_Traits<64>
+        struct PeFile_Traits<64>
-        {
+        {
-                typedef PeHeader64 PeHeader32_64;
+                typedef PeHeader64 PeHeader32_64;
-        };
+        };
-        
+        
-        /**
+        /**
-        * This class represents the common structures of PE and PE+ files.
+        * This class represents the common structures of PE and PE+ files.
-        **/
+        **/
-        class PeFile
+        class PeFile
-        {
+        {
-                protected:
+                protected:
-                  std::string m_filename; ///< Name of the current file.
+                  std::string m_filename; ///< Name of the current file.
-                  MzHeader m_mzh; ///< MZ header of the current file.
+                  MzHeader m_mzh; ///< MZ header of the current file.
-                  ExportDirectory m_expdir; ///< Export directory of the current file.
+                  ExportDirectory m_expdir; ///< Export directory of the current file.
-                  BoundImportDirectory m_boundimpdir; ///< BoundImportDirectory of the current file.
+                  BoundImportDirectory m_boundimpdir; ///< BoundImportDirectory of the current file.
-                  ResourceDirectory m_resdir; ///< ResourceDirectory of the current file.
+                  ResourceDirectory m_resdir; ///< ResourceDirectory of the current file.
-                  RelocationsDirectory m_relocs; ///< Relocations directory of the current file.
+                  RelocationsDirectory m_relocs; ///< Relocations directory of the current file.
-                  ComHeaderDirectory m_comdesc; ///< COM+ descriptor 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.
+                  IatDirectory m_iat; ///< Import address table of the current file.
-                  DebugDirectory m_debugdir;
+                  DebugDirectory m_debugdir;
-                public:
+                public:
-                  virtual ~PeFile();
+                  virtual ~PeFile();
-                  
+                  
-                  /// Returns the name of the current file.
+                  /// Returns the name of the current file.
-                  virtual std::string getFileName() const = 0; // EXPORT
+                  virtual std::string getFileName() const = 0; // EXPORT
-                  /// Changes the name of the current file.
+                  /// Changes the name of the current file.
-                  virtual void setFileName(std::string strFilename) = 0; // EXPORT
+                  virtual void setFileName(std::string strFilename) = 0; // EXPORT
-                  
+                  
-                  virtual void visit(PeFileVisitor &v) = 0;
+                  virtual void visit(PeFileVisitor &v) = 0;
-                  
+                  
-                  /// Reads the MZ header of the current file from disc.
+                  /// Reads the MZ header of the current file from disc.
-                  virtual int readMzHeader() = 0; // EXPORT
+                  virtual int readMzHeader() = 0; // EXPORT
-                  /// Reads the export directory of the current file from disc.
+                  /// Reads the export directory of the current file from disc.
-                  virtual int readExportDirectory()  = 0; // EXPORT
+                  virtual int readExportDirectory()  = 0; // EXPORT
-                  /// Reads the PE header of the current file from disc.
+                  /// Reads the PE header of the current file from disc.
-                  virtual int readPeHeader()  = 0; // EXPORT
+                  virtual int readPeHeader()  = 0; // EXPORT
-                  /// Reads the import directory of the current file from disc.
+                  /// Reads the import directory of the current file from disc.
-                  virtual int readImportDirectory()  = 0; // EXPORT
+                  virtual int readImportDirectory()  = 0; // EXPORT
-                  /// Reads the bound import directory of the current file from disc.
+                  /// Reads the bound import directory of the current file from disc.
-                  virtual int readBoundImportDirectory()  = 0; // EXPORT
+                  virtual int readBoundImportDirectory()  = 0; // EXPORT
-                  /// Reads the resource directory of the current file from disc.
+                  /// Reads the resource directory of the current file from disc.
-                  virtual int readResourceDirectory()  = 0; // EXPORT
+                  virtual int readResourceDirectory()  = 0; // EXPORT
-                  /// Reads the relocations directory of the current file from disc.
+                  /// Reads the relocations directory of the current file from disc.
-                  virtual int readRelocationsDirectory()  = 0; // EXPORT
+                  virtual int readRelocationsDirectory()  = 0; // EXPORT
-                  /// Reads the COM+ descriptor directory of the current file from disc.
+                  /// Reads the COM+ descriptor directory of the current file from disc.
-                  virtual int readComHeaderDirectory()  = 0; // EXPORT
+                  virtual int readComHeaderDirectory()  = 0; // EXPORT
-                  /// Reads the IAT directory of the current file from disc.
+                  /// Reads the IAT directory of the current file from disc.
-                  virtual int readIatDirectory()  = 0; // EXPORT
+                  virtual int readIatDirectory()  = 0; // EXPORT
-                  /// Reads the Debug directory of the current file.              
+                  /// Reads the Debug directory of the current file.              
-                  virtual int readDebugDirectory()  = 0; // EXPORT
+                  virtual int readDebugDirectory()  = 0; // EXPORT
-                  virtual int readTlsDirectory()  = 0; // EXPORT
+                  virtual int readTlsDirectory()  = 0; // EXPORT
-                  
+                  
-                  virtual unsigned int getBits() const = 0;
+                  virtual unsigned int getBits() const = 0;
-                  /// Accessor function for the MZ header.
+                  /// Accessor function for the MZ header.
-                  const MzHeader& mzHeader() const;
+                  const MzHeader& mzHeader() const;
-                  /// Accessor function for the MZ header.
+                  /// Accessor function for the MZ header.
-                  MzHeader& mzHeader(); // EXPORT
+                  MzHeader& mzHeader(); // EXPORT
-                  /// Accessor function for the export directory.
+                  /// Accessor function for the export directory.
-                  const ExportDirectory& expDir() const;
+                  const ExportDirectory& expDir() const;
-                  /// Accessor function for the export directory.
+                  /// Accessor function for the export directory.
-                  ExportDirectory& expDir(); // EXPORT
+                  ExportDirectory& expDir(); // EXPORT
-                  
+                  
-                  /// Accessor function for the bound import directory.
+                  /// Accessor function for the bound import directory.
-                  const BoundImportDirectory& boundImpDir() const;
+                  const BoundImportDirectory& boundImpDir() const;
-                  /// Accessor function for the bound import directory.
+                  /// Accessor function for the bound import directory.
-                  BoundImportDirectory& boundImpDir(); // EXPORT
+                  BoundImportDirectory& boundImpDir(); // EXPORT
-                  
+                  
-                  /// Accessor function for the resource directory.
+                  /// Accessor function for the resource directory.
-                  const ResourceDirectory& resDir() const;
+                  const ResourceDirectory& resDir() const;
-                  /// Accessor function for the resource directory.
+                  /// Accessor function for the resource directory.
-                  ResourceDirectory& resDir(); // EXPORT
+                  ResourceDirectory& resDir(); // EXPORT
-                  /// Accessor function for the relocations directory.
+                  /// Accessor function for the relocations directory.
-                  const RelocationsDirectory& relocDir() const;
+                  const RelocationsDirectory& relocDir() const;
-                  /// Accessor function for the relocations directory.
+                  /// Accessor function for the relocations directory.
-                  RelocationsDirectory& relocDir(); // EXPORT
+                  RelocationsDirectory& relocDir(); // EXPORT
-                  /// Accessor function for the COM+ descriptor directory.
+                  /// Accessor function for the COM+ descriptor directory.
-                  const ComHeaderDirectory& comDir() const;
+                  const ComHeaderDirectory& comDir() const;
-                  /// Accessor function for the COM+ descriptor directory.
+                  /// Accessor function for the COM+ descriptor directory.
-                  ComHeaderDirectory& comDir(); // EXPORT
+                  ComHeaderDirectory& comDir(); // EXPORT
-                  /// Accessor function for the IAT directory.
+                  /// Accessor function for the IAT directory.
-                  const IatDirectory& iatDir() const;
+                  const IatDirectory& iatDir() const;
-                  /// Accessor function for the IAT directory.
+                  /// Accessor function for the IAT directory.
-                  IatDirectory& iatDir(); // EXPORT
+                  IatDirectory& iatDir(); // EXPORT
-                  
+                  
-                  /// Accessor function for the debug directory.
+                  /// Accessor function for the debug directory.
-                  const DebugDirectory& debugDir() const;
+                  const DebugDirectory& debugDir() const;
-                  /// Accessor function for the debug directory.
+                  /// Accessor function for the debug directory.
-                  DebugDirectory& debugDir(); // EXPORT
+                  DebugDirectory& debugDir(); // EXPORT
-                  
+                  
-        };
+        };
-        
+        
-        /**
+        /**
-        * This class implements the common structures of PE and PE+ files.
+        * This class implements the common structures of PE and PE+ files.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        class PeFileT : public PeFile
+        class PeFileT : public PeFile
-        {
+        {
-                typedef typename PeFile_Traits<bits>::PeHeader32_64 PeHeader32_64;
+                typedef typename PeFile_Traits<bits>::PeHeader32_64 PeHeader32_64;
-                
+                
-                private:
+                private:
-                  PeHeader32_64 m_peh; ///< PE header of the current file.
+                  PeHeader32_64 m_peh; ///< PE header of the current file.
-                  ImportDirectory<bits> m_impdir; ///< Import directory of the current file.
+                  ImportDirectory<bits> m_impdir; ///< Import directory of the current file.
-                  TlsDirectory<bits> m_tlsdir;
+                  TlsDirectory<bits> m_tlsdir;
-                
+                
-                public:
+                public:
-                  /// Default constructor which exists only for the sake of allowing to construct files without filenames.
+                  /// Default constructor which exists only for the sake of allowing to construct files without filenames.
-                  PeFileT();
+                  PeFileT();
-                  
+                  
-                  virtual ~PeFileT() {}
+                  virtual ~PeFileT() {}
-                  
+                  
-                  /// Initializes a PeFile with a filename
+                  /// Initializes a PeFile with a filename
-                  explicit PeFileT(const std::string& strFilename);
+                  explicit PeFileT(const std::string& strFilename);
-                  
+                  
-                  /// Returns the name of the current file.
+                  /// Returns the name of the current file.
-                  std::string getFileName() const;
+                  std::string getFileName() const;
-                  /// Changes the name of the current file.
+                  /// Changes the name of the current file.
-                  void setFileName(std::string strFilename);
+                  void setFileName(std::string strFilename);
-                  /// Reads the MZ header of the current file from disc.
+                  /// Reads the MZ header of the current file from disc.
-                  int readMzHeader() ;
+                  int readMzHeader() ;
-                  /// Reads the export directory of the current file from disc.
+                  /// Reads the export directory of the current file from disc.
-                  int readExportDirectory() ;
+                  int readExportDirectory() ;
-                  /// Reads the PE header of the current file from disc.
+                  /// Reads the PE header of the current file from disc.
-                  int readPeHeader() ;
+                  int readPeHeader() ;
-                  /// Reads the import directory of the current file from disc.
+                  /// Reads the import directory of the current file from disc.
-                  int readImportDirectory() ;
+                  int readImportDirectory() ;
-                  /// Reads the bound import directory of the current file from disc.
+                  /// Reads the bound import directory of the current file from disc.
-                  int readBoundImportDirectory() ;
+                  int readBoundImportDirectory() ;
-                  /// Reads the resource directory of the current file from disc.
+                  /// Reads the resource directory of the current file from disc.
-                  int readResourceDirectory() ;
+                  int readResourceDirectory() ;
-                  /// Reads the relocations directory of the current file from disc.
+                  /// Reads the relocations directory of the current file from disc.
-                  int readRelocationsDirectory() ;
+                  int readRelocationsDirectory() ;
-                  /// Reads the COM+ descriptor directory of the current file from disc.
+                  /// Reads the COM+ descriptor directory of the current file from disc.
-                  int readComHeaderDirectory() ;
+                  int readComHeaderDirectory() ;
-                  /// Reads the IAT directory of the current file from disc.
+                  /// Reads the IAT directory of the current file from disc.
-                  int readIatDirectory() ;
+                  int readIatDirectory() ;
-                  /// Reads the Debug directory of the current file.              
+                  /// Reads the Debug directory of the current file.              
-                  int readDebugDirectory() ;
+                  int readDebugDirectory() ;
-                  int readTlsDirectory() ;
+                  int readTlsDirectory() ;
-                  
+                  
-                  unsigned int getBits() const
+                  unsigned int getBits() const
-                  {
+                  {
-                          return bits;
+                          return bits;
-                  }
+                  }
-                  
+                  
-                  /// Accessor function for the PE header.
+                  /// Accessor function for the PE header.
-                  const PeHeader32_64& peHeader() const;
+                  const PeHeader32_64& peHeader() const;
-                  /// Accessor function for the PE header.
+                  /// Accessor function for the PE header.
-                  PeHeader32_64& peHeader();
+                  PeHeader32_64& peHeader();
-                  /// Accessor function for the import directory.
+                  /// Accessor function for the import directory.
-                  const ImportDirectory<bits>& impDir() const;
+                  const ImportDirectory<bits>& impDir() const;
-                  /// Accessor function for the import directory.
+                  /// Accessor function for the import directory.
-                  ImportDirectory<bits>& impDir();
+                  ImportDirectory<bits>& impDir();
-                  
+                  
-                  const TlsDirectory<bits>& tlsDir() const;
+                  const TlsDirectory<bits>& tlsDir() const;
-                  TlsDirectory<bits>& tlsDir();
+                  TlsDirectory<bits>& tlsDir();
-        };
+        };
-        /**
+        /**
-        * This class is the main class for handling PE files.
+        * This class is the main class for handling PE files.
-        **/
+        **/
-        class PeFile32 : public PeFileT<32>
+        class PeFile32 : public PeFileT<32>
-        {
+        {
-                public:
+                public:
-                  /// Default constructor which exists only for the sake of allowing to construct files without filenames.
+                  /// Default constructor which exists only for the sake of allowing to construct files without filenames.
-                  PeFile32();
+                  PeFile32();
-                  /// Initializes a PeFile with a filename
+                  /// Initializes a PeFile with a filename
-                  explicit PeFile32(const std::string& strFlename);
+                  explicit PeFile32(const std::string& strFlename);
-                  virtual void visit(PeFileVisitor &v) { v.callback( *this ); }
+                  virtual void visit(PeFileVisitor &v) { v.callback( *this ); }
-        };
+        };
-        
+        
-        /**
+        /**
-        * This class is the main class for handling PE+ files.
+        * This class is the main class for handling PE+ files.
-        **/
+        **/
-        class PeFile64 : public PeFileT<64>
+        class PeFile64 : public PeFileT<64>
-        {
+        {
-                public:
+                public:
-                  /// Default constructor which exists only for the sake of allowing to construct files without filenames.
+                  /// Default constructor which exists only for the sake of allowing to construct files without filenames.
-                  PeFile64();
+                  PeFile64();
-                  /// Initializes a PeFile with a filename
+                  /// Initializes a PeFile with a filename
-                  explicit PeFile64(const std::string& strFlename);
+                  explicit PeFile64(const std::string& strFlename);
-                  virtual void visit(PeFileVisitor &v) { v.callback( *this ); }
+                  virtual void visit(PeFileVisitor &v) { v.callback( *this ); }
-        };
+        };
-        
+        
-        //typedef PeFileT<32> PeFile32;
+        //typedef PeFileT<32> PeFile32;
-        //typedef PeFileT<64> PeFile64;
+        //typedef PeFileT<64> PeFile64;
-        
+        
-        /**
+        /**
-        * @param strFilename Name of the current file.
+        * @param strFilename Name of the current file.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        PeFileT<bits>::PeFileT(const std::string& strFilename)
+        PeFileT<bits>::PeFileT(const std::string& strFilename)
-        {
+        {
-                m_filename = strFilename;
+                m_filename = strFilename;
-        }
+        }
-        template<int bits>
+        template<int bits>
-        PeFileT<bits>::PeFileT()
+        PeFileT<bits>::PeFileT()
-        {
+        {
-        }
+        }
-        template<int bits>
+        template<int bits>
-        int PeFileT<bits>::readPeHeader() 
+        int PeFileT<bits>::readPeHeader() 
-        {
+        {
-                return peHeader().read(getFileName(), mzHeader().getAddressOfPeHeader());
+                return peHeader().read(getFileName(), mzHeader().getAddressOfPeHeader());
-        }
+        }
-        
+        
-        template<int bits>
+        template<int bits>
-        int PeFileT<bits>::readImportDirectory() 
+        int PeFileT<bits>::readImportDirectory() 
-        {
+        {
-                if (peHeader().calcNumberOfRvaAndSizes() >= 2
+                if (peHeader().calcNumberOfRvaAndSizes() >= 2
-                        && peHeader().getIddImportRva()
+                        && peHeader().getIddImportRva()
-                        && peHeader().getIddImportSize())
+                        && peHeader().getIddImportSize())
-                {
+                {
-                        return impDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddImportRva())), peHeader().getIddImportSize(), peHeader());
+                        return impDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddImportRva())), peHeader().getIddImportSize(), peHeader());
-                }
+                }
-                return ERROR_DIRECTORY_DOES_NOT_EXIST;
+                return ERROR_DIRECTORY_DOES_NOT_EXIST;
-        }
+        }
-        /**
+        /**
-        * @return A reference to the file's PE header.
+        * @return A reference to the file's PE header.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        const typename PeFile_Traits<bits>::PeHeader32_64& PeFileT<bits>::peHeader() const
+        const typename PeFile_Traits<bits>::PeHeader32_64& PeFileT<bits>::peHeader() const
-        {
+        {
-                return m_peh;
+                return m_peh;
-        }
+        }
-        /**
+        /**
-        * @return A reference to the file's PE header.
+        * @return A reference to the file's PE header.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        typename PeFile_Traits<bits>::PeHeader32_64& PeFileT<bits>::peHeader()
+        typename PeFile_Traits<bits>::PeHeader32_64& PeFileT<bits>::peHeader()
-        {
+        {
-                return m_peh;
+                return m_peh;
-        }
+        }
-        /**
+        /**
-        * @return A reference to the file's import directory.
+        * @return A reference to the file's import directory.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        const ImportDirectory<bits>& PeFileT<bits>::impDir() const
+        const ImportDirectory<bits>& PeFileT<bits>::impDir() const
-        {
+        {
-                return m_impdir;
+                return m_impdir;
-        }
+        }
-        /**
+        /**
-        * @return A reference to the file's import directory.
+        * @return A reference to the file's import directory.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        ImportDirectory<bits>& PeFileT<bits>::impDir()
+        ImportDirectory<bits>& PeFileT<bits>::impDir()
-        {
+        {
-                return m_impdir;
+                return m_impdir;
-        }
+        }
-        template<int bits>
+        template<int bits>
-        const TlsDirectory<bits>& PeFileT<bits>::tlsDir() const
+        const TlsDirectory<bits>& PeFileT<bits>::tlsDir() const
-        {
+        {
-                return m_tlsdir;
+                return m_tlsdir;
-        }
+        }
-        template<int bits>
+        template<int bits>
-        TlsDirectory<bits>& PeFileT<bits>::tlsDir()
+        TlsDirectory<bits>& PeFileT<bits>::tlsDir()
-        {
+        {
-                return m_tlsdir;
+                return m_tlsdir;
-        }
+        }
-        /**
+        /**
-        * @return Filename of the current file.
+        * @return Filename of the current file.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        std::string PeFileT<bits>::getFileName() const
+        std::string PeFileT<bits>::getFileName() const
-        {
+        {
-                return m_filename;
+                return m_filename;
-        }
+        }
-        /**
+        /**
-        * @param strFilename New filename.
+        * @param strFilename New filename.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        void PeFileT<bits>::setFileName(std::string strFilename)
+        void PeFileT<bits>::setFileName(std::string strFilename)
-        {
+        {
-                m_filename = strFilename;
+                m_filename = strFilename;
-        }
+        }
-        template<int bits>
+        template<int bits>
-        int PeFileT<bits>::readMzHeader() 
+        int PeFileT<bits>::readMzHeader() 
-        {
+        {
-                return mzHeader().read(getFileName());
+                return mzHeader().read(getFileName());
-        }
+        }
-        
+        
-        template<int bits>
+        template<int bits>
-        int PeFileT<bits>::readExportDirectory() 
+        int PeFileT<bits>::readExportDirectory() 
-        {
+        {
-                if (peHeader().calcNumberOfRvaAndSizes() >= 1
+                if (peHeader().calcNumberOfRvaAndSizes() >= 1
-                        && peHeader().getIddExportRva() && peHeader().getIddExportSize())
+                        && peHeader().getIddExportRva() && peHeader().getIddExportSize())
-                {
+                {
-                        return expDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddExportRva())), peHeader().getIddExportSize(), peHeader());
+                        return expDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddExportRva())), peHeader().getIddExportSize(), peHeader());
-                }
+                }
-                return ERROR_DIRECTORY_DOES_NOT_EXIST;
+                return ERROR_DIRECTORY_DOES_NOT_EXIST;
-        }
+        }
-        
+        
-        template<int bits>
+        template<int bits>
-        int PeFileT<bits>::readBoundImportDirectory() 
+        int PeFileT<bits>::readBoundImportDirectory() 
-        {
+        {
-                if (peHeader().calcNumberOfRvaAndSizes() >= 12
+                if (peHeader().calcNumberOfRvaAndSizes() >= 12
-                        && peHeader().getIddBoundImportRva() && peHeader().getIddBoundImportSize())
+                        && peHeader().getIddBoundImportRva() && peHeader().getIddBoundImportSize())
-                {
+                {
-                        return boundImpDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddBoundImportRva())), peHeader().getIddBoundImportSize());
+                        return boundImpDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddBoundImportRva())), peHeader().getIddBoundImportSize());
-                }
+                }
-                return ERROR_DIRECTORY_DOES_NOT_EXIST;
+                return ERROR_DIRECTORY_DOES_NOT_EXIST;
-        }
+        }
-        template<int bits>
+        template<int bits>
-        int PeFileT<bits>::readResourceDirectory() 
+        int PeFileT<bits>::readResourceDirectory() 
-        {
+        {
-                if (peHeader().calcNumberOfRvaAndSizes() >= 3
+                if (peHeader().calcNumberOfRvaAndSizes() >= 3
-                        && peHeader().getIddResourceRva() && peHeader().getIddResourceSize())
+                        && peHeader().getIddResourceRva() && peHeader().getIddResourceSize())
-                {
+                {
-                        return resDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddResourceRva())), peHeader().getIddResourceSize(), peHeader().getIddResourceRva());
+                        return resDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddResourceRva())), peHeader().getIddResourceSize(), peHeader().getIddResourceRva());
-                }
+                }
-                return ERROR_DIRECTORY_DOES_NOT_EXIST;
+                return ERROR_DIRECTORY_DOES_NOT_EXIST;
-        }
+        }
-        template<int bits>
+        template<int bits>
-        int PeFileT<bits>::readRelocationsDirectory() 
+        int PeFileT<bits>::readRelocationsDirectory() 
-        {
+        {
-                if (peHeader().calcNumberOfRvaAndSizes() >= 6
+                if (peHeader().calcNumberOfRvaAndSizes() >= 6
-                        && peHeader().getIddBaseRelocRva() && peHeader().getIddBaseRelocSize())
+                        && peHeader().getIddBaseRelocRva() && peHeader().getIddBaseRelocSize())
-                {
+                {
-                        return relocDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddBaseRelocRva())), peHeader().getIddBaseRelocSize());
+                        return relocDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddBaseRelocRva())), peHeader().getIddBaseRelocSize());
-                }
+                }
-                return ERROR_DIRECTORY_DOES_NOT_EXIST;
+                return ERROR_DIRECTORY_DOES_NOT_EXIST;
-        }
+        }
-        template<int bits>
+        template<int bits>
-        int PeFileT<bits>::readComHeaderDirectory() 
+        int PeFileT<bits>::readComHeaderDirectory() 
-        {
+        {
-                if (peHeader().calcNumberOfRvaAndSizes() >= 15
+                if (peHeader().calcNumberOfRvaAndSizes() >= 15
-                        && peHeader().getIddComHeaderRva() && peHeader().getIddComHeaderSize())
+                        && peHeader().getIddComHeaderRva() && peHeader().getIddComHeaderSize())
-                {
+                {
-                        return comDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(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::cout << peHeader().getIddComHeaderRva() << std::endl;
-                        std::exit(0);
+                        std::exit(0);
-                return ERROR_DIRECTORY_DOES_NOT_EXIST;
+                return ERROR_DIRECTORY_DOES_NOT_EXIST;
-        }
+        }
-        template<int bits>
+        template<int bits>
-        int PeFileT<bits>::readIatDirectory() 
+        int PeFileT<bits>::readIatDirectory() 
-        {
+        {
-                if (peHeader().calcNumberOfRvaAndSizes() >= 13
+                if (peHeader().calcNumberOfRvaAndSizes() >= 13
-                        && peHeader().getIddIatRva() && peHeader().getIddIatSize())
+                        && peHeader().getIddIatRva() && peHeader().getIddIatSize())
-                {
+                {
-                        return iatDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddIatRva())), peHeader().getIddIatSize());
+                        return iatDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddIatRva())), peHeader().getIddIatSize());
-                }
+                }
-                return ERROR_DIRECTORY_DOES_NOT_EXIST;
+                return ERROR_DIRECTORY_DOES_NOT_EXIST;
-        }
+        }
-        template<int bits>
+        template<int bits>
-        int PeFileT<bits>::readDebugDirectory() 
+        int PeFileT<bits>::readDebugDirectory() 
-        {
+        {
-                if (peHeader().calcNumberOfRvaAndSizes() >= 7
+                if (peHeader().calcNumberOfRvaAndSizes() >= 7
-                        && peHeader().getIddDebugRva() && peHeader().getIddDebugSize())
+                        && peHeader().getIddDebugRva() && peHeader().getIddDebugSize())
-                {
+                {
-                        return debugDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddDebugRva())), peHeader().getIddDebugSize());
+                        return debugDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddDebugRva())), peHeader().getIddDebugSize());
-                }
+                }
-                return ERROR_DIRECTORY_DOES_NOT_EXIST;
+                return ERROR_DIRECTORY_DOES_NOT_EXIST;
-        }
+        }
-        template<int bits>
+        template<int bits>
-        int PeFileT<bits>::readTlsDirectory() 
+        int PeFileT<bits>::readTlsDirectory() 
-        {
+        {
-                if (peHeader().calcNumberOfRvaAndSizes() >= 10
+                if (peHeader().calcNumberOfRvaAndSizes() >= 10
-                        && peHeader().getIddTlsRva() && peHeader().getIddTlsSize())
+                        && peHeader().getIddTlsRva() && peHeader().getIddTlsSize())
-                {
+                {
-                        return tlsDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddTlsRva())), peHeader().getIddTlsSize());
+                        return tlsDir().read(getFileName(), static_cast<unsigned int>(peHeader().rvaToOffset(peHeader().getIddTlsRva())), peHeader().getIddTlsSize());
-                }
+                }
-                return ERROR_DIRECTORY_DOES_NOT_EXIST;
+                return ERROR_DIRECTORY_DOES_NOT_EXIST;
-        }
+        }
-}
+}
-#endif
+#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.
+* PeHeader.cpp - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#include "PeLibInc.h"
+#include "PeLibInc.h"
-#include "PeHeader.h"
+#include "PeHeader.h"
-namespace PeLib
+namespace PeLib
-{
+{
-        template<>
+        template<>
-        void PeHeaderT<32>::readBaseOfData(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<32>& header) const
+        void PeHeaderT<32>::readBaseOfData(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<32>& header) const
-        {
+        {
-                ibBuffer >> header.OptionalHeader.BaseOfData;
+                ibBuffer >> header.OptionalHeader.BaseOfData;
-        }
+        }
-        
+        
-        template<>
+        template<>
-        void PeHeaderT<64>::readBaseOfData(InputBuffer&, PELIB_IMAGE_NT_HEADERS<64>&) const
+        void PeHeaderT<64>::readBaseOfData(InputBuffer&, PELIB_IMAGE_NT_HEADERS<64>&) const
-        {
+        {
-        }
+        }
-        
+        
-        template<>
+        template<>
-        void PeHeaderT<32>::rebuildBaseOfData(OutputBuffer& obBuffer) const
+        void PeHeaderT<32>::rebuildBaseOfData(OutputBuffer& obBuffer) const
-        {
+        {
-                obBuffer << m_inthHeader.OptionalHeader.BaseOfData;
+                obBuffer << m_inthHeader.OptionalHeader.BaseOfData;
-        }
+        }
-        
+        
-        template<>
+        template<>
-        void PeHeaderT<64>::rebuildBaseOfData(OutputBuffer&) const
+        void PeHeaderT<64>::rebuildBaseOfData(OutputBuffer&) const
-        {
+        {
-        }
+        }
-        
+        
-    template<>
+    template<>
-    bool PeHeaderT<32>::isValid() const
+    bool PeHeaderT<32>::isValid() const
-    {
+    {
-                return true;
+                return true;
-    }
+    }
-    
+    
-    template<>
+    template<>
-    bool PeHeaderT<64>::isValid() const
+    bool PeHeaderT<64>::isValid() const
-    {
+    {
-                return true;
+                return true;
-    }
+    }
-    
+    
-    template<>
+    template<>
-    bool PeHeaderT<32>::isValid(unsigned int pehf) const
+    bool PeHeaderT<32>::isValid(unsigned int pehf) const
-    {
+    {
-    /*
+    /*
-        if (pehf == NtSignature)
+        if (pehf == NtSignature)
-        {
+        {
-            return m_inthHeader.Signature == IMAGE_NT_SIGNATURE;
+            return m_inthHeader.Signature == IMAGE_NT_SIGNATURE;
-        }
+        }
-        else if (pehf == NumberOfSections)
+        else if (pehf == NumberOfSections)
-        {
+        {
-            return getNumberOfSections() == calcNumberOfSections();
+            return getNumberOfSections() == calcNumberOfSections();
-        }      */
+        }      */
-        return false;
+        return false;
-    }
+    }
-    template<>
+    template<>
-    bool PeHeaderT<64>::isValid(unsigned int pehf) const
+    bool PeHeaderT<64>::isValid(unsigned int pehf) const
-    {
+    {
-        return false;
+        return false;
-    }
+    }
-        /**
+        /**
-        * @return The BaseOfData value from the PE header.
+        * @return The BaseOfData value from the PE header.
-        **/
+        **/
-        dword PeHeader32::getBaseOfData() const
+        dword PeHeader32::getBaseOfData() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.BaseOfData;
+                return m_inthHeader.OptionalHeader.BaseOfData;
-        }
+        }
-        /**
+        /**
-        * Changes the file's BaseOfData.
+        * Changes the file's BaseOfData.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        void PeHeader32::setBaseOfData(dword dwValue)
+        void PeHeader32::setBaseOfData(dword dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.BaseOfData = 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.
+* PeHeader.h - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#ifndef PEHEADER_H
+#ifndef PEHEADER_H
-#define PEHEADER_H
+#define PEHEADER_H
-#include "PeLibAux.h"
+#include "PeLibAux.h"
-namespace PeLib
+namespace PeLib
-{
+{
-        class PeHeader
+        class PeHeader
-        {
+        {
-//              protected:
+//              protected:
-//                      virtual void readBaseOfData(InputBuffer& ibBuffer) = 0;
+//                      virtual void readBaseOfData(InputBuffer& ibBuffer) = 0;
-//                      virtual void rebuildBaseOfData(OutputBuffer& obBuffer) const = 0;
+//                      virtual void rebuildBaseOfData(OutputBuffer& obBuffer) const = 0;
-                        
+                        
-                public:
+                public:
-                        virtual ~PeHeader(){};
+                        virtual ~PeHeader(){};
-        };
+        };
-        
+        
-        /// Class that handles the PE header of files.
+        /// Class that handles the PE header of files.
-        /**
+        /**
-        * This class can read and modify PE headers. It provides set- and get functions to access
+        * 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
+        * 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.
+        * PE headers. A PE header includes the IMAGE_Nt_HEADERS and the section definitions of a PE file.
-        * \todo getIdReservedRva
+        * \todo getIdReservedRva
-        **/
+        **/
-        template<int x>
+        template<int x>
-        class PeHeaderT : public PeHeader
+        class PeHeaderT : public PeHeader
-        {
+        {
-                private:
+                private:
-                        void readBaseOfData(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const;
+                        void readBaseOfData(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const;
-                        void rebuildBaseOfData(OutputBuffer& obBuffer) const;
+                        void rebuildBaseOfData(OutputBuffer& obBuffer) const;
-                
+                
-                protected:
+                protected:
-                  std::vector<PELIB_IMAGE_SECTION_HEADER> m_vIsh; ///< Stores section header information.
+                  std::vector<PELIB_IMAGE_SECTION_HEADER> m_vIsh; ///< Stores section header information.
-                  PELIB_IMAGE_NT_HEADERS<x> m_inthHeader; ///< Stores Nt 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
+                  dword m_uiOffset; ///< Equivalent to the value returned by #PeLib::MzHeader::getAddressOfPeFile
-                public:
+                public:
-                  typedef typename FieldSizes<x>::VAR4_8 VAR4_8;
+                  typedef typename FieldSizes<x>::VAR4_8 VAR4_8;
-                
+                
-                  PeHeaderT() : m_uiOffset(0)
+                  PeHeaderT() : m_uiOffset(0)
-                  {
+                  {
-                  }
+                  }
-                        
+                        
-                  /// Add a section to the header.
+                  /// Add a section to the header.
-                  int addSection(const std::string& strName, dword dwSize); // EXPORT
+                  int addSection(const std::string& strName, dword dwSize); // EXPORT
-                  
+                  
-                  unsigned int calcSizeOfImage() const; // EXPORT
+                  unsigned int calcSizeOfImage() const; // EXPORT
-                  
+                  
-                  /// Returns the unused space after the header.
+                  /// Returns the unused space after the header.
-                  unsigned int calcSpaceAfterHeader() const; // EXPORT
+                  unsigned int calcSpaceAfterHeader() const; // EXPORT
-                  
+                  
-                  /// Returns the address of the physically first section (not the first defined section).
+                  /// Returns the address of the physically first section (not the first defined section).
-                  unsigned int calcStartOfCode() const; // EXPORT
+                  unsigned int calcStartOfCode() const; // EXPORT
-                  /// Calculates the offset for a new section of size uiSize.
+                  /// Calculates the offset for a new section of size uiSize.
-                  unsigned int calcOffset() const; // EXPORT
+                  unsigned int calcOffset() const; // EXPORT
-                  /// Calculates the Rva for a new section of size uiSize.
+                  /// Calculates the Rva for a new section of size uiSize.
-                  unsigned int calcRva() const; // EXPORT
+                  unsigned int calcRva() const; // EXPORT
-                  
+                  
-                  /// Returns the number of sections in the current file.
+                  /// Returns the number of sections in the current file.
-                  word calcNumberOfSections() const; // EXPORT
+                  word calcNumberOfSections() const; // EXPORT
-                  void enlargeLastSection(unsigned int uiSize); // EXPORT
+                  void enlargeLastSection(unsigned int uiSize); // EXPORT
-                  
+                  
-                  /// Returns the section Id of the section that contains the offset.
+                  /// Returns the section Id of the section that contains the offset.
-                  word getSectionWithOffset(VAR4_8 dwOffset) const; // EXPORT
+                  word getSectionWithOffset(VAR4_8 dwOffset) const; // EXPORT
-                  /// Returns the number of the section which the given relative address points to.
+                  /// Returns the number of the section which the given relative address points to.
-                  word getSectionWithRva(VAR4_8 rva) const; // EXPORT
+                  word getSectionWithRva(VAR4_8 rva) const; // EXPORT
-          bool isValid() const; // EXPORT
+          bool isValid() const; // EXPORT
-          bool isValid(unsigned int foo) const; // EXPORT
+          bool isValid(unsigned int foo) const; // EXPORT
-                  /// Corrects the current PE header.
+                  /// Corrects the current PE header.
-                  void makeValid(dword dwOffset); // EXPORT
+                  void makeValid(dword dwOffset); // EXPORT
-                  /// Converts a file offset to a relative virtual offset.
+                  /// Converts a file offset to a relative virtual offset.
-                  unsigned int offsetToRva(VAR4_8 dwOffset) const; // EXPORT
+                  unsigned int offsetToRva(VAR4_8 dwOffset) const; // EXPORT
-                  /// Converts a file offset to a virtual address.
+                  /// Converts a file offset to a virtual address.
-                  unsigned int offsetToVa(VAR4_8 dwOffset) const; // EXPORT
+                  unsigned int offsetToVa(VAR4_8 dwOffset) const; // EXPORT
-                  /// Reads the PE header of a file.
+                  /// Reads the PE header of a file.
-                  int read(std::string strFilename, unsigned int uiOffset); // EXPORT
+                  int read(std::string strFilename, unsigned int uiOffset); // EXPORT
-                  int read(const unsigned char* pcBuffer, unsigned int uiSize, 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 readHeader(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const;
-                  void readDataDirectories(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;
+                  std::vector<PELIB_IMAGE_SECTION_HEADER> readSections(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const;
-        
+        
-                  /// Rebuilds the current PE header.
+                  /// Rebuilds the current PE header.
-                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT
+                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT
-                  /// Converts a relative virtual address to a file offset.
+                  /// Converts a relative virtual address to a file offset.
-                  VAR4_8 rvaToOffset(VAR4_8 dwRva) const; // EXPORT
+                  VAR4_8 rvaToOffset(VAR4_8 dwRva) const; // EXPORT
-                  /// Converts a relative virtual address to a virtual address.
+                  /// Converts a relative virtual address to a virtual address.
-                  VAR4_8 rvaToVa(VAR4_8 dwRva) const; // EXPORT
+                  VAR4_8 rvaToVa(VAR4_8 dwRva) const; // EXPORT
-                  /// Calculates the size for the current PE header including all section definitions.
+                  /// Calculates the size for the current PE header including all section definitions.
-                  unsigned int size() const;
+                  unsigned int size() const;
-                  VAR4_8 vaToRva(VAR4_8 dwRva) const; // EXPORT
+                  VAR4_8 vaToRva(VAR4_8 dwRva) const; // EXPORT
-                  VAR4_8 vaToOffset(VAR4_8 dwRva) const; // EXPORT
+                  VAR4_8 vaToOffset(VAR4_8 dwRva) const; // EXPORT
-                  /// Save the PE header to a file.
+                  /// Save the PE header to a file.
-                  int write(std::string strFilename, unsigned int uiOffset) const; // EXPORT
+                  int write(std::string strFilename, unsigned int uiOffset) const; // EXPORT
-                  /// Writes sections to a file.
+                  /// Writes sections to a file.
-                  int writeSections(const std::string& strFilename) const; // EXPORT
+                  int writeSections(const std::string& strFilename) const; // EXPORT
-                  /// Overwrites a section with new data.
+                  /// Overwrites a section with new data.
-                  int writeSectionData(const std::string& strFilename, word wSecnr, const std::vector<byte>& vBuffer) const; // EXPORT
+                  int writeSectionData(const std::string& strFilename, word wSecnr, const std::vector<byte>& vBuffer) const; // EXPORT
-// header getters
+// header getters
-                  /// Returns the Signature value of the header.
+                  /// Returns the Signature value of the header.
-                  dword getNtSignature() const; // EXPORT
+                  dword getNtSignature() const; // EXPORT
-                  /// Returns the Machine value of the header.
+                  /// Returns the Machine value of the header.
-                  word getMachine() const; // EXPORT
+                  word getMachine() const; // EXPORT
-                  /// Returns the Sections value of the header.
+                  /// Returns the Sections value of the header.
-                  word getNumberOfSections() const; // EXPORT
+                  word getNumberOfSections() const; // EXPORT
-                  /// Returns the TimeDateStamp value of the header.
+                  /// Returns the TimeDateStamp value of the header.
-                  dword getTimeDateStamp() const; // EXPORT
+                  dword getTimeDateStamp() const; // EXPORT
-                  /// Returns the PointerToSymbolTable value of the header.
+                  /// Returns the PointerToSymbolTable value of the header.
-                  dword getPointerToSymbolTable() const; // EXPORT
+                  dword getPointerToSymbolTable() const; // EXPORT
-                  /// Returns the NumberOfSymbols value of the header.
+                  /// Returns the NumberOfSymbols value of the header.
-                  dword getNumberOfSymbols() const; // EXPORT
+                  dword getNumberOfSymbols() const; // EXPORT
-                  /// Returns the SizeOfOptionalHeader value of the header.
+                  /// Returns the SizeOfOptionalHeader value of the header.
-                  word getSizeOfOptionalHeader() const; // EXPORT
+                  word getSizeOfOptionalHeader() const; // EXPORT
-                  /// Returns the Characteristics value of the header.
+                  /// Returns the Characteristics value of the header.
-                  word getCharacteristics() const; // EXPORT
+                  word getCharacteristics() const; // EXPORT
-                  /// Returns the Magic value of the header.
+                  /// Returns the Magic value of the header.
-                  word getMagic() const; // EXPORT
+                  word getMagic() const; // EXPORT
-                  /// Returns the MajorLinkerVersion value of the header.
+                  /// Returns the MajorLinkerVersion value of the header.
-                  byte getMajorLinkerVersion() const; // EXPORT
+                  byte getMajorLinkerVersion() const; // EXPORT
-                  /// Returns the MinorLinkerVersion value of the header.
+                  /// Returns the MinorLinkerVersion value of the header.
-                  byte getMinorLinkerVersion() const; // EXPORT
+                  byte getMinorLinkerVersion() const; // EXPORT
-                  /// Returns the SizeOfCode value of the header.
+                  /// Returns the SizeOfCode value of the header.
-                  dword getSizeOfCode() const; // EXPORT
+                  dword getSizeOfCode() const; // EXPORT
-                  /// Returns the SizeOfInitializedData value of the header.
+                  /// Returns the SizeOfInitializedData value of the header.
-                  dword getSizeOfInitializedData() const; // EXPORT
+                  dword getSizeOfInitializedData() const; // EXPORT
-                  /// Returns the SizeOfUninitializedData value of the header.
+                  /// Returns the SizeOfUninitializedData value of the header.
-                  dword getSizeOfUninitializedData() const; // EXPORT
+                  dword getSizeOfUninitializedData() const; // EXPORT
-                  /// Returns the AddressOfEntryPoint value of the header.
+                  /// Returns the AddressOfEntryPoint value of the header.
-                  dword getAddressOfEntryPoint() const; // EXPORT
+                  dword getAddressOfEntryPoint() const; // EXPORT
-                  /// Returns the BaseOfCode value of the header.
+                  /// Returns the BaseOfCode value of the header.
-                  dword getBaseOfCode() const; // EXPORT
+                  dword getBaseOfCode() const; // EXPORT
-                  /// Returns the ImageBase value of the header.
+                  /// Returns the ImageBase value of the header.
-                  VAR4_8 getImageBase() const; // EXPORT
+                  VAR4_8 getImageBase() const; // EXPORT
-                  /// Returns the SectionAlignment value of the header.
+                  /// Returns the SectionAlignment value of the header.
-                  dword getSectionAlignment() const; // EXPORT
+                  dword getSectionAlignment() const; // EXPORT
-                  /// Returns the FileAlignment value of the header.
+                  /// Returns the FileAlignment value of the header.
-                  dword getFileAlignment() const; // EXPORT
+                  dword getFileAlignment() const; // EXPORT
-                  /// Returns the MajorOperatingSystemVersion value of the header.
+                  /// Returns the MajorOperatingSystemVersion value of the header.
-                  word getMajorOperatingSystemVersion() const; // EXPORT
+                  word getMajorOperatingSystemVersion() const; // EXPORT
-                  /// Returns the MinorOperatingSystemVersion value of the header.
+                  /// Returns the MinorOperatingSystemVersion value of the header.
-                  word getMinorOperatingSystemVersion() const; // EXPORT
+                  word getMinorOperatingSystemVersion() const; // EXPORT
-                  /// Returns the MajorImageVersion value of the header.
+                  /// Returns the MajorImageVersion value of the header.
-                  word getMajorImageVersion() const; // EXPORT
+                  word getMajorImageVersion() const; // EXPORT
-                  /// Returns the MinorImageVersion value of the header.
+                  /// Returns the MinorImageVersion value of the header.
-                  word getMinorImageVersion() const; // EXPORT
+                  word getMinorImageVersion() const; // EXPORT
-                  /// Returns the MajorSubsystemVersion value of the header.
+                  /// Returns the MajorSubsystemVersion value of the header.
-                  word getMajorSubsystemVersion() const; // EXPORT
+                  word getMajorSubsystemVersion() const; // EXPORT
-                  /// Returns the MinorSubsystemVersion value of the header.
+                  /// Returns the MinorSubsystemVersion value of the header.
-                  word getMinorSubsystemVersion() const; // EXPORT
+                  word getMinorSubsystemVersion() const; // EXPORT
-                  /// Returns the Reserved1 value of the header.
+                  /// Returns the Reserved1 value of the header.
-                  dword getWin32VersionValue() const; // EXPORT
+                  dword getWin32VersionValue() const; // EXPORT
-                  /// Returns the SizeOfImage value of the header.
+                  /// Returns the SizeOfImage value of the header.
-                  dword getSizeOfImage() const; // EXPORT
+                  dword getSizeOfImage() const; // EXPORT
-                  /// Returns the SizeOfHeaders value of the header.
+                  /// Returns the SizeOfHeaders value of the header.
-                  dword getSizeOfHeaders() const; // EXPORT
+                  dword getSizeOfHeaders() const; // EXPORT
-                  /// Returns the CheckSum value of the header.
+                  /// Returns the CheckSum value of the header.
-                  dword getCheckSum() const; // EXPORT
+                  dword getCheckSum() const; // EXPORT
-                  /// Returns the Subsystem value of the header.
+                  /// Returns the Subsystem value of the header.
-                  word getSubsystem() const; // EXPORT
+                  word getSubsystem() const; // EXPORT
-                  /// Returns the DllCharacteristics value of the header.
+                  /// Returns the DllCharacteristics value of the header.
-                  word getDllCharacteristics() const; // EXPORT
+                  word getDllCharacteristics() const; // EXPORT
-                  /// Returns the SizeOfStackReserve value of the header.
+                  /// Returns the SizeOfStackReserve value of the header.
-                  VAR4_8 getSizeOfStackReserve() const; // EXPORT
+                  VAR4_8 getSizeOfStackReserve() const; // EXPORT
-                  /// Returns the SizeOfStackCommit value of the header.
+                  /// Returns the SizeOfStackCommit value of the header.
-                  VAR4_8 getSizeOfStackCommit() const; // EXPORT
+                  VAR4_8 getSizeOfStackCommit() const; // EXPORT
-                  /// Returns the SizeOfHeapReserve value of the header.
+                  /// Returns the SizeOfHeapReserve value of the header.
-                  VAR4_8 getSizeOfHeapReserve() const; // EXPORT
+                  VAR4_8 getSizeOfHeapReserve() const; // EXPORT
-                  /// Returns the SizeOfHeapCommit value of the header.
+                  /// Returns the SizeOfHeapCommit value of the header.
-                  VAR4_8 getSizeOfHeapCommit() const; // EXPORT
+                  VAR4_8 getSizeOfHeapCommit() const; // EXPORT
-                  /// Returns the LoaderFlags value of the header.
+                  /// Returns the LoaderFlags value of the header.
-                  dword getLoaderFlags() const; // EXPORT
+                  dword getLoaderFlags() const; // EXPORT
-                  /// Returns the NumberOfRvaAndSizes value of the header.
+                  /// Returns the NumberOfRvaAndSizes value of the header.
-                  dword getNumberOfRvaAndSizes() const; // EXPORT
+                  dword getNumberOfRvaAndSizes() const; // EXPORT
-                  dword calcNumberOfRvaAndSizes() const; // EXPORT
+                  dword calcNumberOfRvaAndSizes() const; // EXPORT
-                  void addDataDirectory(); // EXPORT
+                  void addDataDirectory(); // EXPORT
-                  void removeDataDirectory(dword index); // EXPORT
+                  void removeDataDirectory(dword index); // EXPORT
-                  
+                  
-// image directory getters
+// image directory getters
-                  /// Returns the relative virtual address of the image directory Export.
+                  /// Returns the relative virtual address of the image directory Export.
-                  dword getIddExportRva() const; // EXPORT
+                  dword getIddExportRva() const; // EXPORT
-                  /// Returns the size of the image directory Export.
+                  /// Returns the size of the image directory Export.
-                  dword getIddExportSize() const; // EXPORT
+                  dword getIddExportSize() const; // EXPORT
-                  /// Returns the relative virtual address of the image directory Import.
+                  /// Returns the relative virtual address of the image directory Import.
-                  dword getIddImportRva() const; // EXPORT
+                  dword getIddImportRva() const; // EXPORT
-                  /// Returns the size of the image directory Import.
+                  /// Returns the size of the image directory Import.
-                  dword getIddImportSize() const; // EXPORT
+                  dword getIddImportSize() const; // EXPORT
-                  /// Returns the relative virtual address of the image directory Resource.
+                  /// Returns the relative virtual address of the image directory Resource.
-                  dword getIddResourceRva() const; // EXPORT
+                  dword getIddResourceRva() const; // EXPORT
-                  /// Returns the size of the image directory Resource.
+                  /// Returns the size of the image directory Resource.
-                  dword getIddResourceSize() const; // EXPORT
+                  dword getIddResourceSize() const; // EXPORT
-                  /// Returns the relative virtual address of the image directory Exception.
+                  /// Returns the relative virtual address of the image directory Exception.
-                  dword getIddExceptionRva() const; // EXPORT
+                  dword getIddExceptionRva() const; // EXPORT
-                  /// Returns the size of the image directory Exception.
+                  /// Returns the size of the image directory Exception.
-                  dword getIddExceptionSize() const; // EXPORT
+                  dword getIddExceptionSize() const; // EXPORT
-                  /// Returns the relative virtual address of the image directory Security.
+                  /// Returns the relative virtual address of the image directory Security.
-                  dword getIddSecurityRva() const; // EXPORT
+                  dword getIddSecurityRva() const; // EXPORT
-                  /// Returns the size of the image directory Security.
+                  /// Returns the size of the image directory Security.
-                  dword getIddSecuritySize() const; // EXPORT
+                  dword getIddSecuritySize() const; // EXPORT
-                  /// Returns the relative virtual address of the image directory Base Reloc.
+                  /// Returns the relative virtual address of the image directory Base Reloc.
-                  dword getIddBaseRelocRva() const; // EXPORT
+                  dword getIddBaseRelocRva() const; // EXPORT
-                  /// Returns the size of the image directory Base Reloc.
+                  /// Returns the size of the image directory Base Reloc.
-                  dword getIddBaseRelocSize() const; // EXPORT
+                  dword getIddBaseRelocSize() const; // EXPORT
-                  /// Returns the relative virtual address of the image directory Debug.
+                  /// Returns the relative virtual address of the image directory Debug.
-                  dword getIddDebugRva() const; // EXPORT
+                  dword getIddDebugRva() const; // EXPORT
-                  /// Returns the size of the image directory Debug.
+                  /// Returns the size of the image directory Debug.
-                  dword getIddDebugSize() const; // EXPORT
+                  dword getIddDebugSize() const; // EXPORT
-                  /// Returns the relative virtual address of the image directory Architecture.
+                  /// Returns the relative virtual address of the image directory Architecture.
-                  dword getIddArchitectureRva() const; // EXPORT
+                  dword getIddArchitectureRva() const; // EXPORT
-                  /// Returns the size of the image directory Architecture.
+                  /// Returns the size of the image directory Architecture.
-                  dword getIddArchitectureSize() const; // EXPORT
+                  dword getIddArchitectureSize() const; // EXPORT
-                  /// Returns the relative virtual address of the image directory GlobalPtr.
+                  /// Returns the relative virtual address of the image directory GlobalPtr.
-                  dword getIddGlobalPtrRva() const; // EXPORT
+                  dword getIddGlobalPtrRva() const; // EXPORT
-                  /// Returns the size of the image directory GlobalPtr.
+                  /// Returns the size of the image directory GlobalPtr.
-                  dword getIddGlobalPtrSize() const; // EXPORT
+                  dword getIddGlobalPtrSize() const; // EXPORT
-                  /// Returns the relative virtual address of the image directory Tls.
+                  /// Returns the relative virtual address of the image directory Tls.
-                  dword getIddTlsRva() const; // EXPORT
+                  dword getIddTlsRva() const; // EXPORT
-                  /// Returns the size of the image directory Tls.
+                  /// Returns the size of the image directory Tls.
-                  dword getIddTlsSize() const; // EXPORT
+                  dword getIddTlsSize() const; // EXPORT
-                  /// Returns the relative virtual address of the image directory LoadConfig.
+                  /// Returns the relative virtual address of the image directory LoadConfig.
-                  dword getIddLoadConfigRva() const; // EXPORT
+                  dword getIddLoadConfigRva() const; // EXPORT
-                  /// Returns the size of the image directory LoadConfig.
+                  /// Returns the size of the image directory LoadConfig.
-                  dword getIddLoadConfigSize() const; // EXPORT
+                  dword getIddLoadConfigSize() const; // EXPORT
-                  /// Returns the relative virtual address of the image directory BoundImport.
+                  /// Returns the relative virtual address of the image directory BoundImport.
-                  dword getIddBoundImportRva() const; // EXPORT
+                  dword getIddBoundImportRva() const; // EXPORT
-                  /// Returns the size of the image directory BoundImport.
+                  /// Returns the size of the image directory BoundImport.
-                  dword getIddBoundImportSize() const; // EXPORT
+                  dword getIddBoundImportSize() const; // EXPORT
-                  /// Returns the relative virtual address of the image directory Iat.
+                  /// Returns the relative virtual address of the image directory Iat.
-                  dword getIddIatRva() const; // EXPORT
+                  dword getIddIatRva() const; // EXPORT
-                  /// Returns the size of the image directory Iat.
+                  /// Returns the size of the image directory Iat.
-                  dword getIddIatSize() const; // EXPORT
+                  dword getIddIatSize() const; // EXPORT
-                  /// Returns the relative virtual address of the image directory DelayImport.
+                  /// Returns the relative virtual address of the image directory DelayImport.
-                  dword getIddDelayImportRva() const; // EXPORT
+                  dword getIddDelayImportRva() const; // EXPORT
-                  /// Returns the size of the image directory DelayImport.
+                  /// Returns the size of the image directory DelayImport.
-                  dword getIddDelayImportSize() const; // EXPORT
+                  dword getIddDelayImportSize() const; // EXPORT
-                  /// Returns the relative virtual address of the image directory COM Descriptor.
+                  /// Returns the relative virtual address of the image directory COM Descriptor.
-                  dword getIddComHeaderRva() const; // EXPORT
+                  dword getIddComHeaderRva() const; // EXPORT
-                  /// Returns the size of the image directory COM Descriptor.
+                  /// Returns the size of the image directory COM Descriptor.
-                  dword getIddComHeaderSize() const; // EXPORT
+                  dword getIddComHeaderSize() const; // EXPORT
-                  /// Returns the relative virtual address of an image directory.
+                  /// Returns the relative virtual address of an image directory.
-                  dword getImageDataDirectoryRva(dword dwDirectory) const; // EXPORT
+                  dword getImageDataDirectoryRva(dword dwDirectory) const; // EXPORT
-                  /// Returns the size of an image directory.
+                  /// Returns the size of an image directory.
-                  dword getImageDataDirectorySize(dword dwDirectory) const; // EXPORT
+                  dword getImageDataDirectorySize(dword dwDirectory) const; // EXPORT
-                  
+                  
-                  void setImageDataDirectoryRva(dword dwDirectory, dword value); // EXPORT
+                  void setImageDataDirectoryRva(dword dwDirectory, dword value); // EXPORT
-                  void setImageDataDirectorySize(dword dwDirectory, dword value); // EXPORT
+                  void setImageDataDirectorySize(dword dwDirectory, dword value); // EXPORT
-// section getters
+// section getters
-                  /// Returns the name of a section.
+                  /// Returns the name of a section.
-                  std::string getSectionName(word uiSectionnr) const; // EXPORT
+                  std::string getSectionName(word uiSectionnr) const; // EXPORT
-                  /// Returns the virtual size of a section.
+                  /// Returns the virtual size of a section.
-                  dword getVirtualSize(word uiSectionnr) const; // EXPORT
+                  dword getVirtualSize(word uiSectionnr) const; // EXPORT
-                  /// Returns the virtual address of a section.
+                  /// Returns the virtual address of a section.
-                  dword getVirtualAddress(word uiSectionnr) const; // EXPORT
+                  dword getVirtualAddress(word uiSectionnr) const; // EXPORT
-                  /// Returns the size of a section's raw data.
+                  /// Returns the size of a section's raw data.
-                  dword getSizeOfRawData(word uiSectionnr) const; // EXPORT
+                  dword getSizeOfRawData(word uiSectionnr) const; // EXPORT
-                  /// Returns file offset of the data of a section.
+                  /// Returns file offset of the data of a section.
-                  dword getPointerToRawData(word uiSectionnr) const; // EXPORT
+                  dword getPointerToRawData(word uiSectionnr) const; // EXPORT
-                  /// Returns the rva of the relocations of a section.
+                  /// Returns the rva of the relocations of a section.
-                  dword getPointerToRelocations(word uiSectionnr) const; // EXPORT
+                  dword getPointerToRelocations(word uiSectionnr) const; // EXPORT
-                  /// Returns the rva of the line numbers of a section.
+                  /// Returns the rva of the line numbers of a section.
-                  dword getPointerToLinenumbers(word uiSectionnr) const; // EXPORT
+                  dword getPointerToLinenumbers(word uiSectionnr) const; // EXPORT
-                  /// Returns the number of relocations of a section.
+                  /// Returns the number of relocations of a section.
-                  dword getNumberOfRelocations(word uiSectionnr) const; // EXPORT
+                  dword getNumberOfRelocations(word uiSectionnr) const; // EXPORT
-                  /// Returns the number of line numbers of a section.
+                  /// Returns the number of line numbers of a section.
-                  dword getNumberOfLinenumbers(word uiSectionnr) const; // EXPORT
+                  dword getNumberOfLinenumbers(word uiSectionnr) const; // EXPORT
-                  /// Returns the characteristics of a section.
+                  /// Returns the characteristics of a section.
-                  dword getCharacteristics(word uiSectionnr) const; // EXPORT _section
+                  dword getCharacteristics(word uiSectionnr) const; // EXPORT _section
-// header setters
+// header setters
-                  /// Sets the Signature value of the header.
+                  /// Sets the Signature value of the header.
-                  void setNtSignature(dword value); // EXPORT
+                  void setNtSignature(dword value); // EXPORT
-                  /// Sets the Machine value of the header.
+                  /// Sets the Machine value of the header.
-                  void setMachine(word value); // EXPORT
+                  void setMachine(word value); // EXPORT
-                  /// Sets the Sections value of the header.
+                  /// Sets the Sections value of the header.
-                  void setNumberOfSections(word value); // EXPORT
+                  void setNumberOfSections(word value); // EXPORT
-                  /// Sets the TimeDateStamp value of the header.
+                  /// Sets the TimeDateStamp value of the header.
-                  void setTimeDateStamp(dword value); // EXPORT
+                  void setTimeDateStamp(dword value); // EXPORT
-                  /// Sets the PointerToSymbolTable value of the header.
+                  /// Sets the PointerToSymbolTable value of the header.
-                  void setPointerToSymbolTable(dword value); // EXPORT
+                  void setPointerToSymbolTable(dword value); // EXPORT
-                  /// Sets the NumberOfSymbols value of the header.
+                  /// Sets the NumberOfSymbols value of the header.
-                  void setNumberOfSymbols(dword value); // EXPORT
+                  void setNumberOfSymbols(dword value); // EXPORT
-                  /// Sets the SizeOfOptionalHeader value of the header.
+                  /// Sets the SizeOfOptionalHeader value of the header.
-                  void setSizeOfOptionalHeader(word value); // EXPORT
+                  void setSizeOfOptionalHeader(word value); // EXPORT
-                  /// Sets the Characteristics value of the header.
+                  /// Sets the Characteristics value of the header.
-                  void setCharacteristics(word value); // EXPORT _section
+                  void setCharacteristics(word value); // EXPORT _section
-                  /// Sets the Magic value of the header.
+                  /// Sets the Magic value of the header.
-                  void setMagic(word value); // EXPORT
+                  void setMagic(word value); // EXPORT
-                  /// Sets the MajorLinkerVersion value of the header.
+                  /// Sets the MajorLinkerVersion value of the header.
-                  void setMajorLinkerVersion(byte value); // EXPORT
+                  void setMajorLinkerVersion(byte value); // EXPORT
-                  /// Sets the MinorLinkerVersion value of the header.
+                  /// Sets the MinorLinkerVersion value of the header.
-                  void setMinorLinkerVersion(byte value); // EXPORT
+                  void setMinorLinkerVersion(byte value); // EXPORT
-                  /// Sets the SizeOfCode value of the header.
+                  /// Sets the SizeOfCode value of the header.
-                  void setSizeOfCode(dword value); // EXPORT
+                  void setSizeOfCode(dword value); // EXPORT
-                  /// Sets the SizeOfInitializedData value of the header.
+                  /// Sets the SizeOfInitializedData value of the header.
-                  void setSizeOfInitializedData(dword value); // EXPORT
+                  void setSizeOfInitializedData(dword value); // EXPORT
-                  /// Sets the SizeOfUninitializedData value of the header.
+                  /// Sets the SizeOfUninitializedData value of the header.
-                  void setSizeOfUninitializedData(dword value); // EXPORT
+                  void setSizeOfUninitializedData(dword value); // EXPORT
-                  /// Sets the AddressOfEntryPoint value of the header.
+                  /// Sets the AddressOfEntryPoint value of the header.
-                  void setAddressOfEntryPoint(dword value); // EXPORT
+                  void setAddressOfEntryPoint(dword value); // EXPORT
-                  /// Sets the BaseOfCode value of the header.
+                  /// Sets the BaseOfCode value of the header.
-                  void setBaseOfCode(dword value); // EXPORT
+                  void setBaseOfCode(dword value); // EXPORT
-                  /// Sets the ImageBase value of the header.
+                  /// Sets the ImageBase value of the header.
-                  void setImageBase(VAR4_8 value); // EXPORT
+                  void setImageBase(VAR4_8 value); // EXPORT
-                  /// Sets the SectionAlignment value of the header.
+                  /// Sets the SectionAlignment value of the header.
-                  void setSectionAlignment(dword value); // EXPORT
+                  void setSectionAlignment(dword value); // EXPORT
-                  /// Sets the FileAlignment value of the header.
+                  /// Sets the FileAlignment value of the header.
-                  void setFileAlignment(dword value); // EXPORT
+                  void setFileAlignment(dword value); // EXPORT
-                  /// Sets the MajorOperatingSystemVersion value of the header.
+                  /// Sets the MajorOperatingSystemVersion value of the header.
-                  void setMajorOperatingSystemVersion(word value); // EXPORT
+                  void setMajorOperatingSystemVersion(word value); // EXPORT
-                  /// Sets the MinorOperatingSystemVersion value of the header.
+                  /// Sets the MinorOperatingSystemVersion value of the header.
-                  void setMinorOperatingSystemVersion(word value); // EXPORT
+                  void setMinorOperatingSystemVersion(word value); // EXPORT
-                  /// Sets the MajorImageVersion value of the header.
+                  /// Sets the MajorImageVersion value of the header.
-                  void setMajorImageVersion(word value); // EXPORT
+                  void setMajorImageVersion(word value); // EXPORT
-                  /// Sets the MinorImageVersion value of the header.
+                  /// Sets the MinorImageVersion value of the header.
-                  void setMinorImageVersion(word value); // EXPORT
+                  void setMinorImageVersion(word value); // EXPORT
-                  /// Sets the MajorSubsystemVersion value of the header.
+                  /// Sets the MajorSubsystemVersion value of the header.
-                  void setMajorSubsystemVersion(word value); // EXPORT
+                  void setMajorSubsystemVersion(word value); // EXPORT
-                  /// Sets the MinorSubsystemVersion value of the header.
+                  /// Sets the MinorSubsystemVersion value of the header.
-                  void setMinorSubsystemVersion(word value); // EXPORT
+                  void setMinorSubsystemVersion(word value); // EXPORT
-                  /// Sets the Reserved1 value of the header.
+                  /// Sets the Reserved1 value of the header.
-                  void setWin32VersionValue(dword value); // EXPORT
+                  void setWin32VersionValue(dword value); // EXPORT
-                  /// Sets the SizeOfImage value of the header.
+                  /// Sets the SizeOfImage value of the header.
-                  void setSizeOfImage(dword value); // EXPORT
+                  void setSizeOfImage(dword value); // EXPORT
-                  /// Sets the SizeOfHeaders value of the header.
+                  /// Sets the SizeOfHeaders value of the header.
-                  void setSizeOfHeaders(dword value); // EXPORT
+                  void setSizeOfHeaders(dword value); // EXPORT
-                  /// Sets the CheckSum value of the header.
+                  /// Sets the CheckSum value of the header.
-                  void setCheckSum(dword value); // EXPORT
+                  void setCheckSum(dword value); // EXPORT
-                  /// Sets the Subsystem value of the header.
+                  /// Sets the Subsystem value of the header.
-                  void setSubsystem(word value); // EXPORT
+                  void setSubsystem(word value); // EXPORT
-                  /// Sets the DllCharacteristics value of the header.
+                  /// Sets the DllCharacteristics value of the header.
-                  void setDllCharacteristics(word value); // EXPORT
+                  void setDllCharacteristics(word value); // EXPORT
-                  /// Sets the SizeOfStackReserve value of the header.
+                  /// Sets the SizeOfStackReserve value of the header.
-                  void setSizeOfStackReserve(VAR4_8 value); // EXPORT
+                  void setSizeOfStackReserve(VAR4_8 value); // EXPORT
-                  /// Sets the SizeOfStackCommit value of the header.
+                  /// Sets the SizeOfStackCommit value of the header.
-                  void setSizeOfStackCommit(VAR4_8 value); // EXPORT
+                  void setSizeOfStackCommit(VAR4_8 value); // EXPORT
-                  /// Sets the SizeOfHeapReserve value of the header.
+                  /// Sets the SizeOfHeapReserve value of the header.
-                  void setSizeOfHeapReserve(VAR4_8 value); // EXPORT
+                  void setSizeOfHeapReserve(VAR4_8 value); // EXPORT
-                  /// Sets the SizeOfHeapCommit value of the header.
+                  /// Sets the SizeOfHeapCommit value of the header.
-                  void setSizeOfHeapCommit(VAR4_8 value); // EXPORT
+                  void setSizeOfHeapCommit(VAR4_8 value); // EXPORT
-                  /// Sets the LoaderFlags value of the header.
+                  /// Sets the LoaderFlags value of the header.
-                  void setLoaderFlags(dword value); // EXPORT
+                  void setLoaderFlags(dword value); // EXPORT
-                  /// Sets the NumberOfRvaAndSizes value of the header.
+                  /// Sets the NumberOfRvaAndSizes value of the header.
-                  void setNumberOfRvaAndSizes(dword value); // EXPORT
+                  void setNumberOfRvaAndSizes(dword value); // EXPORT
-// image directory getters
+// image directory getters
-                  void setIddDebugRva(dword dwValue); // EXPORT
+                  void setIddDebugRva(dword dwValue); // EXPORT
-                  void setIddDebugSize(dword dwValue); // EXPORT
+                  void setIddDebugSize(dword dwValue); // EXPORT
-                  void setIddDelayImportRva(dword dwValue); // EXPORT
+                  void setIddDelayImportRva(dword dwValue); // EXPORT
-                  void setIddDelayImportSize(dword dwValue); // EXPORT
+                  void setIddDelayImportSize(dword dwValue); // EXPORT
-                  void setIddExceptionRva(dword dwValue); // EXPORT
+                  void setIddExceptionRva(dword dwValue); // EXPORT
-                  void setIddExceptionSize(dword dwValue); // EXPORT
+                  void setIddExceptionSize(dword dwValue); // EXPORT
-                  void setIddGlobalPtrRva(dword dwValue); // EXPORT
+                  void setIddGlobalPtrRva(dword dwValue); // EXPORT
-                  void setIddGlobalPtrSize(dword dwValue); // EXPORT
+                  void setIddGlobalPtrSize(dword dwValue); // EXPORT
-                  void setIddIatRva(dword dwValue); // EXPORT
+                  void setIddIatRva(dword dwValue); // EXPORT
-                  void setIddIatSize(dword dwValue); // EXPORT
+                  void setIddIatSize(dword dwValue); // EXPORT
-                  void setIddLoadConfigRva(dword dwValue); // EXPORT
+                  void setIddLoadConfigRva(dword dwValue); // EXPORT
-                  void setIddLoadConfigSize(dword dwValue); // EXPORT
+                  void setIddLoadConfigSize(dword dwValue); // EXPORT
-                  void setIddResourceRva(dword dwValue); // EXPORT
+                  void setIddResourceRva(dword dwValue); // EXPORT
-                  void setIddResourceSize(dword dwValue); // EXPORT
+                  void setIddResourceSize(dword dwValue); // EXPORT
-                  void setIddSecurityRva(dword dwValue); // EXPORT
+                  void setIddSecurityRva(dword dwValue); // EXPORT
-                  void setIddSecuritySize(dword dwValue); // EXPORT
+                  void setIddSecuritySize(dword dwValue); // EXPORT
-                  void setIddTlsRva(dword dwValue); // EXPORT
+                  void setIddTlsRva(dword dwValue); // EXPORT
-                  void setIddTlsSize(dword dwValue); // EXPORT
+                  void setIddTlsSize(dword dwValue); // EXPORT
-                  void setIddImportRva(dword dwValue); // EXPORT
+                  void setIddImportRva(dword dwValue); // EXPORT
-                  void setIddImportSize(dword dwValue); // EXPORT
+                  void setIddImportSize(dword dwValue); // EXPORT
-                  void setIddExportRva(dword dwValue); // EXPORT
+                  void setIddExportRva(dword dwValue); // EXPORT
-                  void setIddExportSize(dword dwValue); // EXPORT
+                  void setIddExportSize(dword dwValue); // EXPORT
-                  
+                  
-                  void setIddBaseRelocRva(dword value); // EXPORT
+                  void setIddBaseRelocRva(dword value); // EXPORT
-                  void setIddBaseRelocSize(dword value); // EXPORT
+                  void setIddBaseRelocSize(dword value); // EXPORT
-                  void setIddArchitectureRva(dword value); // EXPORT
+                  void setIddArchitectureRva(dword value); // EXPORT
-                  void setIddArchitectureSize(dword value); // EXPORT
+                  void setIddArchitectureSize(dword value); // EXPORT
-                  void setIddComHeaderRva(dword value); // EXPORT
+                  void setIddComHeaderRva(dword value); // EXPORT
-                  void setIddComHeaderSize(dword value); // EXPORT
+                  void setIddComHeaderSize(dword value); // EXPORT
-                  /// Set the name of a section.
+                  /// Set the name of a section.
-                  void setSectionName(word uiSectionnr, std::string strName); // EXPORT
+                  void setSectionName(word uiSectionnr, std::string strName); // EXPORT
-                  /// Set the virtual size of a section.
+                  /// Set the virtual size of a section.
-                  void setVirtualSize(word uiSectionnr, dword dwValue); // EXPORT
+                  void setVirtualSize(word uiSectionnr, dword dwValue); // EXPORT
-                  /// Set the virtual address of a section.
+                  /// Set the virtual address of a section.
-                  void setVirtualAddress(word uiSectionnr, dword dwValue); // EXPORT
+                  void setVirtualAddress(word uiSectionnr, dword dwValue); // EXPORT
-                  /// Set the size of raw data of a section.
+                  /// Set the size of raw data of a section.
-                  void setSizeOfRawData(word uiSectionnr, dword dwValue); // EXPORT
+                  void setSizeOfRawData(word uiSectionnr, dword dwValue); // EXPORT
-                  /// Set the file offset of a section.
+                  /// Set the file offset of a section.
-                  void setPointerToRawData(word uiSectionnr, dword dwValue); // EXPORT
+                  void setPointerToRawData(word uiSectionnr, dword dwValue); // EXPORT
-                  /// Set the pointer to relocations of a section.
+                  /// Set the pointer to relocations of a section.
-                  void setPointerToRelocations(word uiSectionnr, dword dwValue); // EXPORT
+                  void setPointerToRelocations(word uiSectionnr, dword dwValue); // EXPORT
-                  /// Set the pointer to linenumbers of a section.
+                  /// Set the pointer to linenumbers of a section.
-                  void setPointerToLinenumbers(word uiSectionnr, dword dwValue); // EXPORT
+                  void setPointerToLinenumbers(word uiSectionnr, dword dwValue); // EXPORT
-                  /// Set the number of relocations a section.
+                  /// Set the number of relocations a section.
-                  void setNumberOfRelocations(word uiSectionnr, dword dwValue); // EXPORT
+                  void setNumberOfRelocations(word uiSectionnr, dword dwValue); // EXPORT
-                  /// Set the number of linenumbers section.
+                  /// Set the number of linenumbers section.
-                  void setNumberOfLinenumbers(word uiSectionnr, dword dwValue); // EXPORT
+                  void setNumberOfLinenumbers(word uiSectionnr, dword dwValue); // EXPORT
-                  /// Set the characteristics of a section.
+                  /// Set the characteristics of a section.
-                  void setCharacteristics(word uiSectionnr, dword dwValue); // EXPORT
+                  void setCharacteristics(word uiSectionnr, dword dwValue); // EXPORT
-        };
+        };
-        
+        
-        class PeHeader32 : public PeHeaderT<32>
+        class PeHeader32 : public PeHeaderT<32>
-        {
+        {
-                public:
+                public:
-                  /// Returns the BaseOfData value of the header.
+                  /// Returns the BaseOfData value of the header.
-                  dword getBaseOfData() const; // EXPORT
+                  dword getBaseOfData() const; // EXPORT
-                  /// Sets the BaseOfData value of the header.
+                  /// Sets the BaseOfData value of the header.
-                  void setBaseOfData(dword value); // EXPORT
+                  void setBaseOfData(dword value); // EXPORT
-        };
+        };
-        
+        
-        class PeHeader64 : public PeHeaderT<64>
+        class PeHeader64 : public PeHeaderT<64>
-        {
+        {
-        };
+        };
-        
+        
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::addDataDirectory()
+        void PeHeaderT<x>::addDataDirectory()
-        {
+        {
-                m_inthHeader.dataDirectories.push_back(PELIB_IMAGE_DATA_DIRECTORY());
+                m_inthHeader.dataDirectories.push_back(PELIB_IMAGE_DATA_DIRECTORY());
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::removeDataDirectory(dword index)
+        void PeHeaderT<x>::removeDataDirectory(dword index)
-        {
+        {
-                m_inthHeader.dataDirectories.erase(m_inthHeader.dataDirectories.begin() + 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
+        * 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
+        * 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 |
+        * 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.
+        * 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
+        * Note: It's important that if the current header's FileAlignment and/or SectionAlignment values are
-        * 0 this function will fail.
+        * 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 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.
+        * @param dwSize Physical size of the new section in bytes.
-        * \todo Better code that handles files with 0 sections.
+        * \todo Better code that handles files with 0 sections.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        int PeHeaderT<x>::addSection(const std::string& strName, dword dwSize)
+        int PeHeaderT<x>::addSection(const std::string& strName, dword dwSize)
-        {
+        {
-                unsigned int uiSecnr = calcNumberOfSections();
+                unsigned int uiSecnr = calcNumberOfSections();
-                if (!getFileAlignment())
+                if (!getFileAlignment())
-                {
+                {
-                        return ERROR_NO_FILE_ALIGNMENT;
+                        return ERROR_NO_FILE_ALIGNMENT;
-                }
+                }
-                else if (!getSectionAlignment())
+                else if (!getSectionAlignment())
-                {
+                {
-                        return ERROR_NO_SECTION_ALIGNMENT;
+                        return ERROR_NO_SECTION_ALIGNMENT;
-                }
+                }
-                        
+                        
-                if (uiSecnr) // Always allow 1 section.
+                if (uiSecnr) // Always allow 1 section.
-                {
+                {
-                        if (uiSecnr == 0xFFFF)
+                        if (uiSecnr == 0xFFFF)
-                        {
+                        {
-                                return ERROR_TOO_MANY_SECTIONS;
+                                return ERROR_TOO_MANY_SECTIONS;
-                        }
+                        }
-                        else if (calcSpaceAfterHeader() < PELIB_IMAGE_SECTION_HEADER::size())
+                        else if (calcSpaceAfterHeader() < PELIB_IMAGE_SECTION_HEADER::size())
-                        {
+                        {
-                                return ERROR_NOT_ENOUGH_SPACE;
+                                return ERROR_NOT_ENOUGH_SPACE;
-                        }
+                        }
-                }
+                }
-                dword dwOffset = calcOffset(/*dwSize*/);
+                dword dwOffset = calcOffset(/*dwSize*/);
-                dword dwRva = calcRva(/*dwSize*/);
+                dword dwRva = calcRva(/*dwSize*/);
-                PELIB_IMAGE_SECTION_HEADER ishdCurr;
+                PELIB_IMAGE_SECTION_HEADER ishdCurr;
-                m_vIsh.push_back(ishdCurr);
+                m_vIsh.push_back(ishdCurr);
-                setSectionName(uiSecnr, strName);
+                setSectionName(uiSecnr, strName);
-                setSizeOfRawData(uiSecnr, alignOffset(dwSize, getFileAlignment()));
+                setSizeOfRawData(uiSecnr, alignOffset(dwSize, getFileAlignment()));
-                setPointerToRawData(uiSecnr, dwOffset);
+                setPointerToRawData(uiSecnr, dwOffset);
-                setVirtualSize(uiSecnr, alignOffset(dwSize, getSectionAlignment()));
+                setVirtualSize(uiSecnr, alignOffset(dwSize, getSectionAlignment()));
-                setVirtualAddress(uiSecnr, dwRva);
+                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);
+                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;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * Calculates a valid SizeOfImage value given the information from the current PE header.
+        * 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.
+        * Note that this calculation works in Win2K but probably does not work in Win9X. I didn't test that though.
-        * @return Valid SizeOfImage value.
+        * @return Valid SizeOfImage value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        unsigned int PeHeaderT<x>::calcSizeOfImage() const
+        unsigned int PeHeaderT<x>::calcSizeOfImage() const
-        {
+        {
-                // Major note here: It's possible for sections to exist with a Virtual Size of 0.
+                // 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.
+                //                  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).
+                //                  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.
+                //                  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));
+                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;
+                if (ishLastSection->VirtualSize != 0) return ishLastSection->VirtualAddress + ishLastSection->VirtualSize;
-                return ishLastSection->VirtualAddress + std::max(ishLastSection->VirtualSize, ishLastSection->SizeOfRawData);
+                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
+        * 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).
+        * else (that's either the first section or an image directory).
-        * @return Unused space after the header.
+        * @return Unused space after the header.
-        * \todo There are PE files with sections beginning at offset 0. They
+        * \todo There are PE files with sections beginning at offset 0. They
-        * need to be considered.
+        * need to be considered.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        unsigned int PeHeaderT<x>::calcSpaceAfterHeader() const
+        unsigned int PeHeaderT<x>::calcSpaceAfterHeader() const
-        {
+        {
-                return (calcStartOfCode() > size() + m_uiOffset) ? calcStartOfCode() - (size() + m_uiOffset) : 0;
+                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.
+        * 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.
+        * 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.
+        * This offset can be the beginning of a section or the beginning of a directory.
-        * \todo Some optimizization is surely possible here.
+        * \todo Some optimizization is surely possible here.
-        * \todo There are PE files with sections beginning at offset 0. They
+        * \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.
+        * need to be considered. Returning 0 for these files doesn't really make sense.
-        * So far these sections are disregarded.
+        * So far these sections are disregarded.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        unsigned int PeHeaderT<x>::calcStartOfCode() const
+        unsigned int PeHeaderT<x>::calcStartOfCode() const
-        {
+        {
-                unsigned int directories = calcNumberOfRvaAndSizes();
+                unsigned int directories = calcNumberOfRvaAndSizes();
-                dword dwMinOffset = 0xFFFFFFFF;
+                dword dwMinOffset = 0xFFFFFFFF;
-                if (directories >= 1 && getIddExportRva() && rvaToOffset(getIddExportRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddExportRva());
+                if (directories >= 1 && getIddExportRva() && rvaToOffset(getIddExportRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddExportRva());
-                if (directories >= 2 && getIddImportRva() && rvaToOffset(getIddImportRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddImportRva());
+                if (directories >= 2 && getIddImportRva() && rvaToOffset(getIddImportRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddImportRva());
-                if (directories >= 3 && getIddResourceRva() && rvaToOffset(getIddResourceRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddResourceRva());
+                if (directories >= 3 && getIddResourceRva() && rvaToOffset(getIddResourceRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddResourceRva());
-                if (directories >= 4 && getIddExceptionRva()  && rvaToOffset(getIddExceptionRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddExceptionRva());
+                if (directories >= 4 && getIddExceptionRva()  && rvaToOffset(getIddExceptionRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddExceptionRva());
-                if (directories >= 5 && getIddSecurityRva()  && rvaToOffset(getIddSecurityRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddSecurityRva());
+                if (directories >= 5 && getIddSecurityRva()  && rvaToOffset(getIddSecurityRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddSecurityRva());
-                if (directories >= 6 && getIddBaseRelocRva()  && rvaToOffset(getIddBaseRelocRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddBaseRelocRva());
+                if (directories >= 6 && getIddBaseRelocRva()  && rvaToOffset(getIddBaseRelocRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddBaseRelocRva());
-                if (directories >= 7 && getIddDebugRva()  && rvaToOffset(getIddDebugRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddDebugRva());
+                if (directories >= 7 && getIddDebugRva()  && rvaToOffset(getIddDebugRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddDebugRva());
-                if (directories >= 8 && getIddArchitectureRva()  && rvaToOffset(getIddArchitectureRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddArchitectureRva());
+                if (directories >= 8 && getIddArchitectureRva()  && rvaToOffset(getIddArchitectureRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddArchitectureRva());
-                if (directories >= 9 && getIddGlobalPtrRva()  && rvaToOffset(getIddGlobalPtrRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddGlobalPtrRva());
+                if (directories >= 9 && getIddGlobalPtrRva()  && rvaToOffset(getIddGlobalPtrRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddGlobalPtrRva());
-                if (directories >= 10 && getIddTlsRva()  && rvaToOffset(getIddTlsRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddTlsRva());
+                if (directories >= 10 && getIddTlsRva()  && rvaToOffset(getIddTlsRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddTlsRva());
-                if (directories >= 11 && getIddLoadConfigRva()  && rvaToOffset(getIddLoadConfigRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddLoadConfigRva());
+                if (directories >= 11 && getIddLoadConfigRva()  && rvaToOffset(getIddLoadConfigRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddLoadConfigRva());
-                if (directories >= 12 && getIddBoundImportRva()  && rvaToOffset(getIddBoundImportRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddBoundImportRva());
+                if (directories >= 12 && getIddBoundImportRva()  && rvaToOffset(getIddBoundImportRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddBoundImportRva());
-                if (directories >= 13 && getIddIatRva()  && rvaToOffset(getIddIatRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddIatRva());
+                if (directories >= 13 && getIddIatRva()  && rvaToOffset(getIddIatRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddIatRva());
-                if (directories >= 14 && getIddDelayImportRva()  && rvaToOffset(getIddDelayImportRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddDelayImportRva());
+                if (directories >= 14 && getIddDelayImportRva()  && rvaToOffset(getIddDelayImportRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddDelayImportRva());
-                if (directories >= 15 && getIddComHeaderRva()  && rvaToOffset(getIddComHeaderRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddComHeaderRva());
+                if (directories >= 15 && getIddComHeaderRva()  && rvaToOffset(getIddComHeaderRva()) < dwMinOffset) dwMinOffset = rvaToOffset(getIddComHeaderRva());
-                
+                
-                for (word i=0;i<calcNumberOfSections();i++)
+                for (word i=0;i<calcNumberOfSections();i++)
-                {
+                {
-                        if ((getPointerToRawData(i) < dwMinOffset || dwMinOffset == 0xFFFFFFFF) && getSizeOfRawData(i))
+                        if ((getPointerToRawData(i) < dwMinOffset || dwMinOffset == 0xFFFFFFFF) && getSizeOfRawData(i))
-                        {
+                        {
-                                if (getPointerToRawData(i)) dwMinOffset = getPointerToRawData(i);
+                                if (getPointerToRawData(i)) dwMinOffset = getPointerToRawData(i);
-                        }
+                        }
-                }
+                }
-                return dwMinOffset;
+                return dwMinOffset;
-        }
+        }
-        /**
+        /**
-        * Calculates the file offset for a new section. The file offset will already be aligned to the file's FileAlignment.
+        * Calculates the file offset for a new section. The file offset will already be aligned to the file's FileAlignment.
-        * @return Aligned file offset.
+        * @return Aligned file offset.
-        * \todo uiSize isn't used yet. Will be used later on to search for caves.
+        * \todo uiSize isn't used yet. Will be used later on to search for caves.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        unsigned int PeHeaderT<x>::calcOffset(/*unsigned int uiSize*/) const
+        unsigned int PeHeaderT<x>::calcOffset(/*unsigned int uiSize*/) const
-        {
+        {
-                unsigned int maxoffset = size();
+                unsigned int maxoffset = size();
-                for (word i=0;i<calcNumberOfSections();i++)
+                for (word i=0;i<calcNumberOfSections();i++)
-                {
+                {
-                        if (getPointerToRawData(i) + getSizeOfRawData(i) > maxoffset) maxoffset = getPointerToRawData(i) + getSizeOfRawData(i);
+                        if (getPointerToRawData(i) + getSizeOfRawData(i) > maxoffset) maxoffset = getPointerToRawData(i) + getSizeOfRawData(i);
-                }
+                }
-                return alignOffset(maxoffset, getFileAlignment());
+                return alignOffset(maxoffset, getFileAlignment());
-        }
+        }
-        /**
+        /**
-        * Calculates the Rva for a new section. The Rva will already be aligned to the file's SectionAlignment.
+        * 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.
+        * \todo uiSize isn't used yet. Will be used later on to search for caves.
-        * @return Aligned Rva.
+        * @return Aligned Rva.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        unsigned int PeHeaderT<x>::calcRva(/*unsigned int uiSize*/) const
+        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.
+                // 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.
+                //                  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).
+                //                  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.
+                //                  In this file each and every section has a VSize of 0 but it still runs.
-                
+                
-                unsigned int maxoffset = size();
+                unsigned int maxoffset = size();
-                for (word i=0;i<calcNumberOfSections();i++)
+                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));
+                        if (getVirtualAddress(i) + std::max(getVirtualSize(i), getSizeOfRawData(i)) > maxoffset) maxoffset = getVirtualAddress(i) + std::max(getVirtualSize(i), getSizeOfRawData(i));
-                }
+                }
-                return alignOffset(maxoffset, getSectionAlignment());
+                return alignOffset(maxoffset, getSectionAlignment());
-        }
+        }
-        /**
+        /**
-        * Returns the number of currently defined sections. Note that this value can be different from the number
+        * 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).
+        * of sections according to the header (see #PeLib::PeHeaderT<x>::getNumberOfSections).
-        * @return Number of currently defined sections.
+        * @return Number of currently defined sections.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        word PeHeaderT<x>::calcNumberOfSections() const
+        word PeHeaderT<x>::calcNumberOfSections() const
-        {
+        {
-                return static_cast<PeLib::word>(m_vIsh.size());
+                return static_cast<PeLib::word>(m_vIsh.size());
-        }
+        }
-        /**
+        /**
-        * Enlarges the physically last section in the file.
+        * Enlarges the physically last section in the file.
-        * @param uiSize Additional size that's added to the section's size.
+        * @param uiSize Additional size that's added to the section's size.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::enlargeLastSection(unsigned int uiSize)
+        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));
+                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());
+                unsigned int uiRawDataSize = alignOffset(ishLastSection->SizeOfRawData + uiSize, getFileAlignment());
-                
+                
-                ishLastSection->SizeOfRawData = uiRawDataSize;
+                ishLastSection->SizeOfRawData = uiRawDataSize;
-                ishLastSection->VirtualSize = ishLastSection->SizeOfRawData;
+                ishLastSection->VirtualSize = ishLastSection->SizeOfRawData;
-                
+                
-                setSizeOfImage(calcSizeOfImage());
+                setSizeOfImage(calcSizeOfImage());
-        }
+        }
-        /**
+        /**
-        * Determines the section which contains the file offset.
+        * Determines the section which contains the file offset.
-        * @param dwOffset File offset.
+        * @param dwOffset File offset.
-        * @return Section Id of the section which contains the offset.
+        * @return Section Id of the section which contains the offset.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        word PeHeaderT<x>::getSectionWithOffset(VAR4_8 dwOffset) const
+        word PeHeaderT<x>::getSectionWithOffset(VAR4_8 dwOffset) const
-        {
+        {
-                // Offset = 0 must be handled explicitly as there are files
+                // Offset = 0 must be handled explicitly as there are files
-                // with sections that begin at offset 0, that means the section
+                // with sections that begin at offset 0, that means the section
-                // only exists in memory.
+                // only exists in memory.
-                
+                
-                if (!dwOffset) return std::numeric_limits<word>::max();
+                if (!dwOffset) return std::numeric_limits<word>::max();
-                
+                
-                for (word i=0;i<calcNumberOfSections();i++)
+                for (word i=0;i<calcNumberOfSections();i++)
-                {
+                {
-                        // Explicity exclude sections with raw pointer = 0.
+                        // Explicity exclude sections with raw pointer = 0.
-                        dword rawptr = getPointerToRawData(i);
+                        dword rawptr = getPointerToRawData(i);
-                        if (rawptr && rawptr <= dwOffset && rawptr + getSizeOfRawData(i) > dwOffset) return i;
+                        if (rawptr && rawptr <= dwOffset && rawptr + getSizeOfRawData(i) > dwOffset) return i;
-                }
+                }
-                
+                
-                return std::numeric_limits<word>::max();
+                return std::numeric_limits<word>::max();
-        }
+        }
-        /**
+        /**
-        * Determines the section which contains the Rva.
+        * Determines the section which contains the Rva.
-        * @param dwRva A relative virtual address.
+        * @param dwRva A relative virtual address.
-        * @return Section Id of the section which contains the Rva.
+        * @return Section Id of the section which contains the Rva.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        word PeHeaderT<x>::getSectionWithRva(VAR4_8 dwRva) const
+        word PeHeaderT<x>::getSectionWithRva(VAR4_8 dwRva) const
-        {
+        {
-                // Major note here: It's possible for sections to exist with a Virtual Size of 0.
+                // 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.
+                //                  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).
+                //                  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.
+                //                  In this file each and every section has a VSize of 0 but it still runs.
-                
+                
-                for (word i=0;i<calcNumberOfSections();i++)
+                for (word i=0;i<calcNumberOfSections();i++)
-                {
+                {
-                        // Weird VC++7 error doesn't allow me to use std::max here.
+                        // Weird VC++7 error doesn't allow me to use std::max here.
-                        dword max = getVirtualSize(i) >= getSizeOfRawData(i) ? getVirtualSize(i) : getSizeOfRawData(i);
+                        dword max = getVirtualSize(i) >= getSizeOfRawData(i) ? getVirtualSize(i) : getSizeOfRawData(i);
-                        if (getVirtualAddress(i) <= dwRva && getVirtualAddress(i) + max > dwRva) return i;
+                        if (getVirtualAddress(i) <= dwRva && getVirtualAddress(i) + max > dwRva) return i;
-                }
+                }
-                
+                
-                return -1;
+                return -1;
-        }
+        }
-        /**
+        /**
-        * Corrects all faulty values of the current PE header. The following values will be corrected: NtSignature,
+        * 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),
+        * NumberOfSections, SizeOfOptionalHeader, FileAlignment (will be aligned to n*0x200),
-        * SectionAlignment (will be aligned to n*0x1000), NumberOfRvaAndSizes, SizeOfHeaders, SizeOfImage,
+        * SectionAlignment (will be aligned to n*0x1000), NumberOfRvaAndSizes, SizeOfHeaders, SizeOfImage,
-        * Magic, Characteristics.
+        * Magic, Characteristics.
-        * @param dwOffset Beginning of PeHeader (see #PeLib::MzHeader::getAddressOfPeHeader).
+        * @param dwOffset Beginning of PeHeader (see #PeLib::MzHeader::getAddressOfPeHeader).
-    * \todo 32bit and 64bit versions.
+    * \todo 32bit and 64bit versions.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::makeValid(dword dwOffset)
+        void PeHeaderT<x>::makeValid(dword dwOffset)
-        {
+        {
-                setNtSignature(PELIB_IMAGE_NT_SIGNATURE); // 'PE'
+                setNtSignature(PELIB_IMAGE_NT_SIGNATURE); // 'PE'
-                setMachine(PELIB_IMAGE_FILE_MACHINE_I386);
+                setMachine(PELIB_IMAGE_FILE_MACHINE_I386);
-                setNumberOfSections(calcNumberOfSections());
+                setNumberOfSections(calcNumberOfSections());
-                
+                
-                // Check if 64 bits.
+                // Check if 64 bits.
-                setSizeOfOptionalHeader(PELIB_IMAGE_OPTIONAL_HEADER<x>::size() + calcNumberOfRvaAndSizes() * 8);
+                setSizeOfOptionalHeader(PELIB_IMAGE_OPTIONAL_HEADER<x>::size() + calcNumberOfRvaAndSizes() * 8);
-                // Check if 64 bits.
+                // Check if 64 bits.
-                dword dwCharacteristics = PELIB_IMAGE_FILE_EXECUTABLE_IMAGE | PELIB_IMAGE_FILE_32BIT_MACHINE;
+                dword dwCharacteristics = PELIB_IMAGE_FILE_EXECUTABLE_IMAGE | PELIB_IMAGE_FILE_32BIT_MACHINE;
-                setCharacteristics(dwCharacteristics);
+                setCharacteristics(dwCharacteristics);
-                // Check if 64 bits.
+                // Check if 64 bits.
-                setMagic(PELIB_IMAGE_NT_OPTIONAL_HDR32_MAGIC);
+                setMagic(PELIB_IMAGE_NT_OPTIONAL_HDR32_MAGIC);
-                // setImageBase(0x01000000);
+                // setImageBase(0x01000000);
-                // Align file and section alignment values
+                // Align file and section alignment values
-                unsigned int dwAlignedOffset = alignOffset(getSectionAlignment(), 0x1000);
+                unsigned int dwAlignedOffset = alignOffset(getSectionAlignment(), 0x1000);
-                setSectionAlignment(dwAlignedOffset ? dwAlignedOffset : 0x1000);
+                setSectionAlignment(dwAlignedOffset ? dwAlignedOffset : 0x1000);
-                dwAlignedOffset = alignOffset(getFileAlignment(), 0x200);
+                dwAlignedOffset = alignOffset(getFileAlignment(), 0x200);
-                setFileAlignment(dwAlignedOffset ? dwAlignedOffset : 0x200);
+                setFileAlignment(dwAlignedOffset ? dwAlignedOffset : 0x200);
-//              setMajorSubsystemVersion(4);
+//              setMajorSubsystemVersion(4);
-//              setSubsystem(IMAGE_SUBSYSTEM_WINDOWS_GUI);
+//              setSubsystem(IMAGE_SUBSYSTEM_WINDOWS_GUI);
-                setNumberOfRvaAndSizes(calcNumberOfRvaAndSizes());
+                setNumberOfRvaAndSizes(calcNumberOfRvaAndSizes());
-                
+                
-                // Code below depends on code above. Don't change the order.
+                // Code below depends on code above. Don't change the order.
-                dword dwSizeOfHeaders = alignOffset(dwOffset + size(), getFileAlignment());
+                dword dwSizeOfHeaders = alignOffset(dwOffset + size(), getFileAlignment());
-                setSizeOfHeaders(dwSizeOfHeaders);
+                setSizeOfHeaders(dwSizeOfHeaders);
-                dword dwSizeOfImage = alignOffset(dwSizeOfHeaders, getSectionAlignment());
+                dword dwSizeOfImage = alignOffset(dwSizeOfHeaders, getSectionAlignment());
-                for (int i=0;i<calcNumberOfSections();i++)
+                for (int i=0;i<calcNumberOfSections();i++)
-                {
+                {
-                        dwSizeOfImage += alignOffset(getVirtualSize(i), getSectionAlignment());
+                        dwSizeOfImage += alignOffset(getVirtualSize(i), getSectionAlignment());
-                }
+                }
-                dwSizeOfImage = alignOffset(dwSizeOfImage, getSectionAlignment());
+                dwSizeOfImage = alignOffset(dwSizeOfImage, getSectionAlignment());
-                setSizeOfImage(dwSizeOfImage);
+                setSizeOfImage(dwSizeOfImage);
-        }
+        }
-        template<int x>
+        template<int x>
-        unsigned int PeHeaderT<x>::offsetToRva(VAR4_8 dwOffset) const
+        unsigned int PeHeaderT<x>::offsetToRva(VAR4_8 dwOffset) const
-        {
+        {
-                if (dwOffset < calcStartOfCode()) return dwOffset;
+                if (dwOffset < calcStartOfCode()) return dwOffset;
-        
+        
-                PeLib::word uiSecnr = getSectionWithOffset(dwOffset);
+                PeLib::word uiSecnr = getSectionWithOffset(dwOffset);
-                
+                
-                if (uiSecnr == 0xFFFF) return -1;
+                if (uiSecnr == 0xFFFF) return -1;
-                
+                
-                return getVirtualAddress(uiSecnr) + dwOffset - getPointerToRawData(uiSecnr);
+                return getVirtualAddress(uiSecnr) + dwOffset - getPointerToRawData(uiSecnr);
-        }
+        }
-        /**
+        /**
-        * Converts a file offset to a virtual address.
+        * Converts a file offset to a virtual address.
-        * @param dwOffset File offset.
+        * @param dwOffset File offset.
-        * @return Virtual Address.
+        * @return Virtual Address.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        unsigned int PeHeaderT<x>::offsetToVa(VAR4_8 dwOffset) const
+        unsigned int PeHeaderT<x>::offsetToVa(VAR4_8 dwOffset) const
-        {
+        {
-                if (dwOffset < calcStartOfCode()) return getImageBase() + dwOffset;
+                if (dwOffset < calcStartOfCode()) return getImageBase() + dwOffset;
-                
+                
-                PeLib::word uiSecnr = getSectionWithOffset(dwOffset);
+                PeLib::word uiSecnr = getSectionWithOffset(dwOffset);
-                
+                
-                if (uiSecnr == 0xFFFF) return -1;
+                if (uiSecnr == 0xFFFF) return -1;
-                
+                
-                return getImageBase() + getVirtualAddress(uiSecnr) + dwOffset - getPointerToRawData(uiSecnr);
+                return getImageBase() + getVirtualAddress(uiSecnr) + dwOffset - getPointerToRawData(uiSecnr);
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::readHeader(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const
+        void PeHeaderT<x>::readHeader(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const
-        {
+        {
-                ibBuffer >> header.Signature;
+                ibBuffer >> header.Signature;
-                
+                
-                ibBuffer >> header.FileHeader.Machine;
+                ibBuffer >> header.FileHeader.Machine;
-                ibBuffer >> header.FileHeader.NumberOfSections;
+                ibBuffer >> header.FileHeader.NumberOfSections;
-                ibBuffer >> header.FileHeader.TimeDateStamp;
+                ibBuffer >> header.FileHeader.TimeDateStamp;
-                ibBuffer >> header.FileHeader.PointerToSymbolTable;
+                ibBuffer >> header.FileHeader.PointerToSymbolTable;
-                ibBuffer >> header.FileHeader.NumberOfSymbols;
+                ibBuffer >> header.FileHeader.NumberOfSymbols;
-                ibBuffer >> header.FileHeader.SizeOfOptionalHeader;
+                ibBuffer >> header.FileHeader.SizeOfOptionalHeader;
-                ibBuffer >> header.FileHeader.Characteristics;
+                ibBuffer >> header.FileHeader.Characteristics;
-                ibBuffer >> header.OptionalHeader.Magic;
+                ibBuffer >> header.OptionalHeader.Magic;
-                ibBuffer >> header.OptionalHeader.MajorLinkerVersion;
+                ibBuffer >> header.OptionalHeader.MajorLinkerVersion;
-                ibBuffer >> header.OptionalHeader.MinorLinkerVersion;
+                ibBuffer >> header.OptionalHeader.MinorLinkerVersion;
-                ibBuffer >> header.OptionalHeader.SizeOfCode;
+                ibBuffer >> header.OptionalHeader.SizeOfCode;
-                ibBuffer >> header.OptionalHeader.SizeOfInitializedData;
+                ibBuffer >> header.OptionalHeader.SizeOfInitializedData;
-                ibBuffer >> header.OptionalHeader.SizeOfUninitializedData;
+                ibBuffer >> header.OptionalHeader.SizeOfUninitializedData;
-                ibBuffer >> header.OptionalHeader.AddressOfEntryPoint;
+                ibBuffer >> header.OptionalHeader.AddressOfEntryPoint;
-                ibBuffer >> header.OptionalHeader.BaseOfCode;
+                ibBuffer >> header.OptionalHeader.BaseOfCode;
-                readBaseOfData(ibBuffer, header);
+                readBaseOfData(ibBuffer, header);
-                ibBuffer >> header.OptionalHeader.ImageBase;
+                ibBuffer >> header.OptionalHeader.ImageBase;
-                ibBuffer >> header.OptionalHeader.SectionAlignment;
+                ibBuffer >> header.OptionalHeader.SectionAlignment;
-                ibBuffer >> header.OptionalHeader.FileAlignment;
+                ibBuffer >> header.OptionalHeader.FileAlignment;
-                ibBuffer >> header.OptionalHeader.MajorOperatingSystemVersion;
+                ibBuffer >> header.OptionalHeader.MajorOperatingSystemVersion;
-                ibBuffer >> header.OptionalHeader.MinorOperatingSystemVersion;
+                ibBuffer >> header.OptionalHeader.MinorOperatingSystemVersion;
-                ibBuffer >> header.OptionalHeader.MajorImageVersion;
+                ibBuffer >> header.OptionalHeader.MajorImageVersion;
-                ibBuffer >> header.OptionalHeader.MinorImageVersion;
+                ibBuffer >> header.OptionalHeader.MinorImageVersion;
-                ibBuffer >> header.OptionalHeader.MajorSubsystemVersion;
+                ibBuffer >> header.OptionalHeader.MajorSubsystemVersion;
-                ibBuffer >> header.OptionalHeader.MinorSubsystemVersion;
+                ibBuffer >> header.OptionalHeader.MinorSubsystemVersion;
-                ibBuffer >> header.OptionalHeader.Win32VersionValue;
+                ibBuffer >> header.OptionalHeader.Win32VersionValue;
-                ibBuffer >> header.OptionalHeader.SizeOfImage;
+                ibBuffer >> header.OptionalHeader.SizeOfImage;
-                ibBuffer >> header.OptionalHeader.SizeOfHeaders;
+                ibBuffer >> header.OptionalHeader.SizeOfHeaders;
-                ibBuffer >> header.OptionalHeader.CheckSum;
+                ibBuffer >> header.OptionalHeader.CheckSum;
-                ibBuffer >> header.OptionalHeader.Subsystem;
+                ibBuffer >> header.OptionalHeader.Subsystem;
-                ibBuffer >> header.OptionalHeader.DllCharacteristics;
+                ibBuffer >> header.OptionalHeader.DllCharacteristics;
-                ibBuffer >> header.OptionalHeader.SizeOfStackReserve;
+                ibBuffer >> header.OptionalHeader.SizeOfStackReserve;
-                ibBuffer >> header.OptionalHeader.SizeOfStackCommit;
+                ibBuffer >> header.OptionalHeader.SizeOfStackCommit;
-                ibBuffer >> header.OptionalHeader.SizeOfHeapReserve;
+                ibBuffer >> header.OptionalHeader.SizeOfHeapReserve;
-                ibBuffer >> header.OptionalHeader.SizeOfHeapCommit;
+                ibBuffer >> header.OptionalHeader.SizeOfHeapCommit;
-                ibBuffer >> header.OptionalHeader.LoaderFlags;
+                ibBuffer >> header.OptionalHeader.LoaderFlags;
-                ibBuffer >> header.OptionalHeader.NumberOfRvaAndSizes;
+                ibBuffer >> header.OptionalHeader.NumberOfRvaAndSizes;
-        }
+        }
-        
+        
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::readDataDirectories(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const
+        void PeHeaderT<x>::readDataDirectories(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const
-        {
+        {
-                PELIB_IMAGE_DATA_DIRECTORY idd;
+                PELIB_IMAGE_DATA_DIRECTORY idd;
-                for (unsigned int i=0;i<header.OptionalHeader.NumberOfRvaAndSizes;i++)
+                for (unsigned int i=0;i<header.OptionalHeader.NumberOfRvaAndSizes;i++)
-                {
+                {
-                        ibBuffer >> idd.VirtualAddress;
+                        ibBuffer >> idd.VirtualAddress;
-                        ibBuffer >> idd.Size;
+                        ibBuffer >> idd.Size;
-                        header.dataDirectories.push_back(idd);
+                        header.dataDirectories.push_back(idd);
-                }
+                }
-        }
+        }
-        
+        
-        template<int x>
+        template<int x>
-        std::vector<PELIB_IMAGE_SECTION_HEADER> PeHeaderT<x>::readSections(InputBuffer& ibBuffer, PELIB_IMAGE_NT_HEADERS<x>& header) const
+        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;
+                const unsigned int nrSections = header.FileHeader.NumberOfSections;
-                PELIB_IMAGE_SECTION_HEADER ishCurr;
+                PELIB_IMAGE_SECTION_HEADER ishCurr;
-                std::vector<PELIB_IMAGE_SECTION_HEADER> vIshdCurr;
+                std::vector<PELIB_IMAGE_SECTION_HEADER> vIshdCurr;
-                for (unsigned int i=0;i<nrSections;i++)
+                for (unsigned int i=0;i<nrSections;i++)
-                {
+                {
-                        ibBuffer.read(reinterpret_cast<char*>(ishCurr.Name), 8);
+                        ibBuffer.read(reinterpret_cast<char*>(ishCurr.Name), 8);
-                        ibBuffer >> ishCurr.VirtualSize;
+                        ibBuffer >> ishCurr.VirtualSize;
-                        ibBuffer >> ishCurr.VirtualAddress;
+                        ibBuffer >> ishCurr.VirtualAddress;
-                        ibBuffer >> ishCurr.SizeOfRawData;
+                        ibBuffer >> ishCurr.SizeOfRawData;
-                        ibBuffer >> ishCurr.PointerToRawData;
+                        ibBuffer >> ishCurr.PointerToRawData;
-                        ibBuffer >> ishCurr.PointerToRelocations;
+                        ibBuffer >> ishCurr.PointerToRelocations;
-                        ibBuffer >> ishCurr.PointerToLinenumbers;
+                        ibBuffer >> ishCurr.PointerToLinenumbers;
-                        ibBuffer >> ishCurr.NumberOfRelocations;
+                        ibBuffer >> ishCurr.NumberOfRelocations;
-                        ibBuffer >> ishCurr.NumberOfLinenumbers;
+                        ibBuffer >> ishCurr.NumberOfLinenumbers;
-                        ibBuffer >> ishCurr.Characteristics;
+                        ibBuffer >> ishCurr.Characteristics;
-                        vIshdCurr.push_back(ishCurr);
+                        vIshdCurr.push_back(ishCurr);
-                }
+                }
-                return vIshdCurr;
+                return vIshdCurr;
-        }
+        }
-        
+        
-        template<int x>
+        template<int x>
-        int PeHeaderT<x>::read(const unsigned char* pcBuffer, unsigned int uiSize, unsigned int uiOffset)
+        int PeHeaderT<x>::read(const unsigned char* pcBuffer, unsigned int uiSize, unsigned int uiOffset)
-        {
+        {
-                if (uiSize < m_inthHeader.size())
+                if (uiSize < m_inthHeader.size())
-                {
+                {
-                        return ERROR_INVALID_FILE;
+                        return ERROR_INVALID_FILE;
-                }
+                }
-                
+                
-                std::vector<unsigned char> vBuffer(pcBuffer, pcBuffer + m_inthHeader.size());
+                std::vector<unsigned char> vBuffer(pcBuffer, pcBuffer + m_inthHeader.size());
-                InputBuffer ibBuffer(vBuffer);
+                InputBuffer ibBuffer(vBuffer);
-                PELIB_IMAGE_NT_HEADERS<x> header;
+                PELIB_IMAGE_NT_HEADERS<x> header;
-                
+                
-                readHeader(ibBuffer, header);
+                readHeader(ibBuffer, header);
-                
+                
-                if (uiSize < m_inthHeader.size() + header.OptionalHeader.NumberOfRvaAndSizes * 8 + header.FileHeader.NumberOfSections * 0x28)
+                if (uiSize < m_inthHeader.size() + header.OptionalHeader.NumberOfRvaAndSizes * 8 + header.FileHeader.NumberOfSections * 0x28)
-                {
+                {
-                        return ERROR_INVALID_FILE;
+                        return ERROR_INVALID_FILE;
-                }
+                }
-                
+                
-                vBuffer.resize(header.OptionalHeader.NumberOfRvaAndSizes * 8 + header.FileHeader.NumberOfSections * 0x28);
+                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);
+                vBuffer.assign(pcBuffer + m_inthHeader.size(), pcBuffer + m_inthHeader.size() + header.OptionalHeader.NumberOfRvaAndSizes * 8 + header.FileHeader.NumberOfSections * 0x28);
-                
+                
-                ibBuffer.setBuffer(vBuffer);
+                ibBuffer.setBuffer(vBuffer);
-                
+                
-                readDataDirectories(ibBuffer, header);
+                readDataDirectories(ibBuffer, header);
-                
+                
-                m_vIsh = readSections(ibBuffer, header);
+                m_vIsh = readSections(ibBuffer, header);
-                std::swap(m_inthHeader, header);
+                std::swap(m_inthHeader, header);
-                m_uiOffset = uiOffset;
+                m_uiOffset = uiOffset;
-                return NO_ERROR;
+                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.
+        * 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
+        * 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.
+        * 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 strFilename Name of the file which will be read.
-        * @param uiOffset File offset of PE header (see #PeLib::MzHeader::getAddressOfPeHeader).
+        * @param uiOffset File offset of PE header (see #PeLib::MzHeader::getAddressOfPeHeader).
-        **/
+        **/
-        template<int x>
+        template<int x>
-        int PeHeaderT<x>::read(std::string strFilename, unsigned int uiOffset)
+        int PeHeaderT<x>::read(std::string strFilename, unsigned int uiOffset)
-        {
+        {
-                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
+                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
-                
+                
-                if (!ifFile)
+                if (!ifFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                
+                
-                // File too small
+                // File too small
-                if (fileSize(ifFile) < uiOffset + m_inthHeader.size())
+                if (fileSize(ifFile) < uiOffset + m_inthHeader.size())
-                {
+                {
-                        return ERROR_INVALID_FILE;
+                        return ERROR_INVALID_FILE;
-                }
+                }
-                
+                
-                std::vector<unsigned char> vBuffer(m_inthHeader.size());
+                std::vector<unsigned char> vBuffer(m_inthHeader.size());
-                ifFile.seekg(uiOffset, std::ios::beg);
+                ifFile.seekg(uiOffset, std::ios::beg);
-                ifFile.read(reinterpret_cast<char*>(&vBuffer[0]), static_cast<std::streamsize>(vBuffer.size()));
+                ifFile.read(reinterpret_cast<char*>(&vBuffer[0]), static_cast<std::streamsize>(vBuffer.size()));
-                InputBuffer ibBuffer(vBuffer);
+                InputBuffer ibBuffer(vBuffer);
-                PELIB_IMAGE_NT_HEADERS<x> header;
+                PELIB_IMAGE_NT_HEADERS<x> header;
-                
+                
-                readHeader(ibBuffer, header);
+                readHeader(ibBuffer, header);
-                vBuffer.resize(header.OptionalHeader.NumberOfRvaAndSizes * 8 + header.FileHeader.NumberOfSections * 0x28);
+                vBuffer.resize(header.OptionalHeader.NumberOfRvaAndSizes * 8 + header.FileHeader.NumberOfSections * 0x28);
-                ifFile.read(reinterpret_cast<char*>(&vBuffer[0]), static_cast<std::streamsize>(vBuffer.size()));
+                ifFile.read(reinterpret_cast<char*>(&vBuffer[0]), static_cast<std::streamsize>(vBuffer.size()));
-                if (!ifFile)
+                if (!ifFile)
-                {
+                {
-                        return ERROR_INVALID_FILE;
+                        return ERROR_INVALID_FILE;
-                }
+                }
-                ibBuffer.setBuffer(vBuffer);
+                ibBuffer.setBuffer(vBuffer);
-                
+                
-                readDataDirectories(ibBuffer, header);
+                readDataDirectories(ibBuffer, header);
-                
+                
-                // Sections
+                // Sections
-//              const unsigned int nrSections = header.FileHeader.NumberOfSections;
+//              const unsigned int nrSections = header.FileHeader.NumberOfSections;
-//              if (fileSize(ifFile) < uiOffset + m_inthHeader.size() + nrSections * PELIB_IMAGE_SECTION_HEADER::size())
+//              if (fileSize(ifFile) < uiOffset + m_inthHeader.size() + nrSections * PELIB_IMAGE_SECTION_HEADER::size())
-//              {
+//              {
-//                      return ERROR_INVALID_FILE;
+//                      return ERROR_INVALID_FILE;
-//              }
+//              }
-                
+                
-                m_vIsh = readSections(ibBuffer, header);
+                m_vIsh = readSections(ibBuffer, header);
-                std::swap(m_inthHeader, header);
+                std::swap(m_inthHeader, header);
-                m_uiOffset = uiOffset;
+                m_uiOffset = uiOffset;
-                ifFile.close();
+                ifFile.close();
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * Rebuilds the PE header so that it can be written to a file. It's not guaranteed that the
+        * 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
+        * header will be valid. If you want to make sure that the header will be valid you
-        * must call #PeLib::PeHeaderT<x>::makeValid first.
+        * must call #PeLib::PeHeaderT<x>::makeValid first.
-        * @param vBuffer Buffer where the rebuilt header will be stored.
+        * @param vBuffer Buffer where the rebuilt header will be stored.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::rebuild(std::vector<byte>& vBuffer) const
+        void PeHeaderT<x>::rebuild(std::vector<byte>& vBuffer) const
-        {
+        {
-                OutputBuffer obBuffer(vBuffer);
+                OutputBuffer obBuffer(vBuffer);
-                obBuffer << m_inthHeader.Signature;
+                obBuffer << m_inthHeader.Signature;
-                obBuffer << m_inthHeader.FileHeader.Machine;
+                obBuffer << m_inthHeader.FileHeader.Machine;
-                obBuffer << m_inthHeader.FileHeader.NumberOfSections;
+                obBuffer << m_inthHeader.FileHeader.NumberOfSections;
-                obBuffer << m_inthHeader.FileHeader.TimeDateStamp;
+                obBuffer << m_inthHeader.FileHeader.TimeDateStamp;
-                obBuffer << m_inthHeader.FileHeader.PointerToSymbolTable;
+                obBuffer << m_inthHeader.FileHeader.PointerToSymbolTable;
-                obBuffer << m_inthHeader.FileHeader.NumberOfSymbols;
+                obBuffer << m_inthHeader.FileHeader.NumberOfSymbols;
-                obBuffer << m_inthHeader.FileHeader.SizeOfOptionalHeader;
+                obBuffer << m_inthHeader.FileHeader.SizeOfOptionalHeader;
-                obBuffer << m_inthHeader.FileHeader.Characteristics;
+                obBuffer << m_inthHeader.FileHeader.Characteristics;
-                obBuffer << m_inthHeader.OptionalHeader.Magic;
+                obBuffer << m_inthHeader.OptionalHeader.Magic;
-                obBuffer << m_inthHeader.OptionalHeader.MajorLinkerVersion;
+                obBuffer << m_inthHeader.OptionalHeader.MajorLinkerVersion;
-                obBuffer << m_inthHeader.OptionalHeader.MinorLinkerVersion;
+                obBuffer << m_inthHeader.OptionalHeader.MinorLinkerVersion;
-                obBuffer << m_inthHeader.OptionalHeader.SizeOfCode;
+                obBuffer << m_inthHeader.OptionalHeader.SizeOfCode;
-                obBuffer << m_inthHeader.OptionalHeader.SizeOfInitializedData;
+                obBuffer << m_inthHeader.OptionalHeader.SizeOfInitializedData;
-                obBuffer << m_inthHeader.OptionalHeader.SizeOfUninitializedData;
+                obBuffer << m_inthHeader.OptionalHeader.SizeOfUninitializedData;
-                obBuffer << m_inthHeader.OptionalHeader.AddressOfEntryPoint;
+                obBuffer << m_inthHeader.OptionalHeader.AddressOfEntryPoint;
-                obBuffer << m_inthHeader.OptionalHeader.BaseOfCode;
+                obBuffer << m_inthHeader.OptionalHeader.BaseOfCode;
-                rebuildBaseOfData(obBuffer);
+                rebuildBaseOfData(obBuffer);
-//              obBuffer << m_inthHeader.OptionalHeader.BaseOfData;
+//              obBuffer << m_inthHeader.OptionalHeader.BaseOfData;
-                obBuffer << m_inthHeader.OptionalHeader.ImageBase;
+                obBuffer << m_inthHeader.OptionalHeader.ImageBase;
-                obBuffer << m_inthHeader.OptionalHeader.SectionAlignment;
+                obBuffer << m_inthHeader.OptionalHeader.SectionAlignment;
-                obBuffer << m_inthHeader.OptionalHeader.FileAlignment;
+                obBuffer << m_inthHeader.OptionalHeader.FileAlignment;
-                obBuffer << m_inthHeader.OptionalHeader.MajorOperatingSystemVersion;
+                obBuffer << m_inthHeader.OptionalHeader.MajorOperatingSystemVersion;
-                obBuffer << m_inthHeader.OptionalHeader.MinorOperatingSystemVersion;
+                obBuffer << m_inthHeader.OptionalHeader.MinorOperatingSystemVersion;
-                obBuffer << m_inthHeader.OptionalHeader.MajorImageVersion;
+                obBuffer << m_inthHeader.OptionalHeader.MajorImageVersion;
-                obBuffer << m_inthHeader.OptionalHeader.MinorImageVersion;
+                obBuffer << m_inthHeader.OptionalHeader.MinorImageVersion;
-                obBuffer << m_inthHeader.OptionalHeader.MajorSubsystemVersion;
+                obBuffer << m_inthHeader.OptionalHeader.MajorSubsystemVersion;
-                obBuffer << m_inthHeader.OptionalHeader.MinorSubsystemVersion;
+                obBuffer << m_inthHeader.OptionalHeader.MinorSubsystemVersion;
-                obBuffer << m_inthHeader.OptionalHeader.Win32VersionValue;
+                obBuffer << m_inthHeader.OptionalHeader.Win32VersionValue;
-                obBuffer << m_inthHeader.OptionalHeader.SizeOfImage;
+                obBuffer << m_inthHeader.OptionalHeader.SizeOfImage;
-                obBuffer << m_inthHeader.OptionalHeader.SizeOfHeaders;
+                obBuffer << m_inthHeader.OptionalHeader.SizeOfHeaders;
-                obBuffer << m_inthHeader.OptionalHeader.CheckSum;
+                obBuffer << m_inthHeader.OptionalHeader.CheckSum;
-                obBuffer << m_inthHeader.OptionalHeader.Subsystem;
+                obBuffer << m_inthHeader.OptionalHeader.Subsystem;
-                obBuffer << m_inthHeader.OptionalHeader.DllCharacteristics;
+                obBuffer << m_inthHeader.OptionalHeader.DllCharacteristics;
-                obBuffer << m_inthHeader.OptionalHeader.SizeOfStackReserve;
+                obBuffer << m_inthHeader.OptionalHeader.SizeOfStackReserve;
-                obBuffer << m_inthHeader.OptionalHeader.SizeOfStackCommit;
+                obBuffer << m_inthHeader.OptionalHeader.SizeOfStackCommit;
-                obBuffer << m_inthHeader.OptionalHeader.SizeOfHeapReserve;
+                obBuffer << m_inthHeader.OptionalHeader.SizeOfHeapReserve;
-                obBuffer << m_inthHeader.OptionalHeader.SizeOfHeapCommit;
+                obBuffer << m_inthHeader.OptionalHeader.SizeOfHeapCommit;
-                obBuffer << m_inthHeader.OptionalHeader.LoaderFlags;
+                obBuffer << m_inthHeader.OptionalHeader.LoaderFlags;
-                obBuffer << m_inthHeader.OptionalHeader.NumberOfRvaAndSizes;
+                obBuffer << m_inthHeader.OptionalHeader.NumberOfRvaAndSizes;
-                // The 0x10 data directories
+                // The 0x10 data directories
-                for (unsigned int i=0;i<calcNumberOfRvaAndSizes();i++)
+                for (unsigned int i=0;i<calcNumberOfRvaAndSizes();i++)
-                {
+                {
-                        obBuffer << m_inthHeader.dataDirectories[i].VirtualAddress;
+                        obBuffer << m_inthHeader.dataDirectories[i].VirtualAddress;
-                        obBuffer << m_inthHeader.dataDirectories[i].Size;
+                        obBuffer << m_inthHeader.dataDirectories[i].Size;
-                }
+                }
-                
+                
-                // The section definitions
+                // The section definitions
-                const unsigned int nrSections = calcNumberOfSections();
+                const unsigned int nrSections = calcNumberOfSections();
-                for (unsigned int i=0;i<nrSections;i++)
+                for (unsigned int i=0;i<nrSections;i++)
-                {
+                {
-                        char temp[9] = {0};
+                        char temp[9] = {0};
-                        strcpy(temp, getSectionName(i).c_str());
+                        strcpy(temp, getSectionName(i).c_str());
-                        obBuffer.add(temp, 8);
+                        obBuffer.add(temp, 8);
-                        obBuffer << m_vIsh[i].VirtualSize;
+                        obBuffer << m_vIsh[i].VirtualSize;
-                        obBuffer << m_vIsh[i].VirtualAddress;
+                        obBuffer << m_vIsh[i].VirtualAddress;
-                        obBuffer << m_vIsh[i].SizeOfRawData;
+                        obBuffer << m_vIsh[i].SizeOfRawData;
-                        obBuffer << m_vIsh[i].PointerToRawData;
+                        obBuffer << m_vIsh[i].PointerToRawData;
-                        obBuffer << m_vIsh[i].PointerToRelocations;
+                        obBuffer << m_vIsh[i].PointerToRelocations;
-                        obBuffer << m_vIsh[i].PointerToLinenumbers;
+                        obBuffer << m_vIsh[i].PointerToLinenumbers;
-                        obBuffer << m_vIsh[i].NumberOfRelocations;
+                        obBuffer << m_vIsh[i].NumberOfRelocations;
-                        obBuffer << m_vIsh[i].NumberOfLinenumbers;
+                        obBuffer << m_vIsh[i].NumberOfLinenumbers;
-                        obBuffer << m_vIsh[i].Characteristics;
+                        obBuffer << m_vIsh[i].Characteristics;
-                }
+                }
-        }
+        }
-        /**
+        /**
-        * Converts a relative virtual offset to a file offset.
+        * Converts a relative virtual offset to a file offset.
-        * @param dwRva A relative virtual offset.
+        * @param dwRva A relative virtual offset.
-        * @return A file offset.
+        * @return A file offset.
-        * \todo It's not always 0x1000.
+        * \todo It's not always 0x1000.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::rvaToOffset(VAR4_8 dwRva) const
+        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::rvaToOffset(VAR4_8 dwRva) const
-        {
+        {
-                // XXX: Not correct
+                // XXX: Not correct
-                if (dwRva < 0x1000) return dwRva;
+                if (dwRva < 0x1000) return dwRva;
-                
+                
-                PeLib::word uiSecnr = getSectionWithRva(dwRva);
+                PeLib::word uiSecnr = getSectionWithRva(dwRva);
-                if (uiSecnr == 0xFFFF || dwRva > getVirtualAddress(uiSecnr) + getSizeOfRawData(uiSecnr))
+                if (uiSecnr == 0xFFFF || dwRva > getVirtualAddress(uiSecnr) + getSizeOfRawData(uiSecnr))
-                {
+                {
-                        return std::numeric_limits<VAR4_8>::max();
+                        return std::numeric_limits<VAR4_8>::max();
-                }
+                }
-                
+                
-                return getPointerToRawData(uiSecnr) + dwRva - getVirtualAddress(uiSecnr);
+                return getPointerToRawData(uiSecnr) + dwRva - getVirtualAddress(uiSecnr);
-        }
+        }
-        /**
+        /**
-        * Converts a relative virtual offset to a virtual offset.
+        * Converts a relative virtual offset to a virtual offset.
-        * @param dwRva A relative virtual offset.
+        * @param dwRva A relative virtual offset.
-        * @return A virtual offset.
+        * @return A virtual offset.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::rvaToVa(VAR4_8 dwRva) const
+        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::rvaToVa(VAR4_8 dwRva) const
-        {
+        {
-                return getImageBase() + dwRva;
+                return getImageBase() + dwRva;
-        }
+        }
-        /**
+        /**
-        * Calculates the size of the current PE header. This includes the actual header and the section definitions.
+        * Calculates the size of the current PE header. This includes the actual header and the section definitions.
-        * @return Size of the current PE header.
+        * @return Size of the current PE header.
-        * \todo Better handling of files with less than 0x10 directories.
+        * \todo Better handling of files with less than 0x10 directories.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        unsigned int PeHeaderT<x>::size() const
+        unsigned int PeHeaderT<x>::size() const
-        {
+        {
-                return m_inthHeader.size() + getNumberOfSections() * PELIB_IMAGE_SECTION_HEADER::size();
+                return m_inthHeader.size() + getNumberOfSections() * PELIB_IMAGE_SECTION_HEADER::size();
-        }
+        }
-        // \todo Not sure if this works.
+        // \todo Not sure if this works.
-        template<int x>
+        template<int x>
-        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::vaToRva(VAR4_8 dwRva) const
+        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::vaToRva(VAR4_8 dwRva) const
-        {
+        {
-                if (dwRva - getImageBase() < calcStartOfCode()) return dwRva - getImageBase();
+                if (dwRva - getImageBase() < calcStartOfCode()) return dwRva - getImageBase();
-                
+                
-                if (getSectionWithRva(dwRva - getImageBase()) == 0xFFFF) return -1;
+                if (getSectionWithRva(dwRva - getImageBase()) == 0xFFFF) return -1;
-                
+                
-                return dwRva - getImageBase();
+                return dwRva - getImageBase();
-        }
+        }
-        template<int x>
+        template<int x>
-        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::vaToOffset(VAR4_8 dwRva) const
+        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::vaToOffset(VAR4_8 dwRva) const
-        {
+        {
-                return rvaToOffset(dwRva - getImageBase());
+                return rvaToOffset(dwRva - getImageBase());
-        }
+        }
-        /**
+        /**
-        * Saves the PE header to a file. Note that this only saves the header information, if you have added sections
+        * 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
+        * 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,
+        * 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.
+        * call #PeLib::PeHeaderT<x>::isValid and #PeLib::PeHeaderT<x>::makeValid first.
-        * @param strFilename Filename of the file the header will be written to.
+        * @param strFilename Filename of the file the header will be written to.
-        * @param uiOffset File offset the header will be written to.
+        * @param uiOffset File offset the header will be written to.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        int PeHeaderT<x>::write(std::string strFilename, unsigned int uiOffset) const
+        int PeHeaderT<x>::write(std::string strFilename, unsigned int uiOffset) const
-        {
+        {
-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        ofFile.clear();
+                        ofFile.clear();
-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                else
+                else
-                {
+                {
-                        ofFile.close();
+                        ofFile.close();
-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                
+                
-                ofFile.seekp(uiOffset, std::ios::beg);
+                ofFile.seekp(uiOffset, std::ios::beg);
-                std::vector<unsigned char> vBuffer;
+                std::vector<unsigned char> vBuffer;
-                rebuild(vBuffer);
+                rebuild(vBuffer);
-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
-                ofFile.close();
+                ofFile.close();
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * Overwrites a section's data.
+        * Overwrites a section's data.
-        * @param wSecnr Number of the section which will be overwritten.
+        * @param wSecnr Number of the section which will be overwritten.
-        * @param strFilename Name of the file where the section will be written to.
+        * @param strFilename Name of the file where the section will be written to.
-        * @param wSecnr Number of the section that will be written.
+        * @param wSecnr Number of the section that will be written.
-        * @param vBuffer New data of the section.
+        * @param vBuffer New data of the section.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        int PeHeaderT<x>::writeSectionData(const std::string& strFilename, word wSecnr, const std::vector<byte>& vBuffer) const
+        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);
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        ofFile.clear();
+                        ofFile.clear();
-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                else
+                else
-                {
+                {
-                        ofFile.close();
+                        ofFile.close();
-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        ofFile.clear();
+                        ofFile.clear();
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                ofFile.seekp(getPointerToRawData(wSecnr), std::ios::beg);
+                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.write(reinterpret_cast<const char*>(&vBuffer[0]), std::min(static_cast<unsigned int>(vBuffer.size()), getSizeOfRawData(wSecnr)));
-                ofFile.close();
+                ofFile.close();
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        template<int x>
+        template<int x>
-        int PeHeaderT<x>::writeSections(const std::string& strFilename) const
+        int PeHeaderT<x>::writeSections(const std::string& strFilename) const
-        {
+        {
-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        ofFile.clear();
+                        ofFile.clear();
-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                else
+                else
-                {
+                {
-                        ofFile.close();
+                        ofFile.close();
-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                unsigned int uiFilesize = fileSize(ofFile);
+                unsigned int uiFilesize = fileSize(ofFile);
-                for (int i=0;i<calcNumberOfSections();i++)
+                for (int i=0;i<calcNumberOfSections();i++)
-                {
+                {
-                        if (uiFilesize < getPointerToRawData(i) + getSizeOfRawData(i))
+                        if (uiFilesize < getPointerToRawData(i) + getSizeOfRawData(i))
-                        {
+                        {
-                                unsigned int uiToWrite = getPointerToRawData(i) + getSizeOfRawData(i) - uiFilesize;
+                                unsigned int uiToWrite = getPointerToRawData(i) + getSizeOfRawData(i) - uiFilesize;
-                                std::vector<char> vBuffer(uiToWrite);
+                                std::vector<char> vBuffer(uiToWrite);
-                                ofFile.seekp(0, std::ios::end);
+                                ofFile.seekp(0, std::ios::end);
-                                ofFile.write(&vBuffer[0], static_cast<unsigned int>(vBuffer.size()));
+                                ofFile.write(&vBuffer[0], static_cast<unsigned int>(vBuffer.size()));
-                                uiFilesize = getPointerToRawData(i) + getSizeOfRawData(i);
+                                uiFilesize = getPointerToRawData(i) + getSizeOfRawData(i);
-                        }
+                        }
-                }
+                }
-                ofFile.close();
+                ofFile.close();
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * Returns the file's Nt signature.
+        * Returns the file's Nt signature.
-        * @return The Nt signature value from the PE header.
+        * @return The Nt signature value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getNtSignature() const
+        dword PeHeaderT<x>::getNtSignature() const
-        {
+        {
-                return m_inthHeader.Signature;
+                return m_inthHeader.Signature;
-        }
+        }
-        /**
+        /**
-        * Returns the file's machine.
+        * Returns the file's machine.
-        * @return The Machine value from the PE header.
+        * @return The Machine value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        word PeHeaderT<x>::getMachine() const
+        word PeHeaderT<x>::getMachine() const
-        {
+        {
-                return m_inthHeader.FileHeader.Machine;
+                return m_inthHeader.FileHeader.Machine;
-        }
+        }
-        /**
+        /**
-        * Returns the file's number of sections as defined in the header. Note that this value can be different
+        * 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).
+        * from the number of defined sections (#see PeLib::PeHeaderT<x>::getNumberOfSections).
-        * @return The NumberOfSections value from the PE header.
+        * @return The NumberOfSections value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        word PeHeaderT<x>::getNumberOfSections() const
+        word PeHeaderT<x>::getNumberOfSections() const
-        {
+        {
-                return m_inthHeader.FileHeader.NumberOfSections;
+                return m_inthHeader.FileHeader.NumberOfSections;
-        }
+        }
-        /** 
+        /** 
-        * Returns the file's TimeDateStamp.
+        * Returns the file's TimeDateStamp.
-        * @return The TimeDateStamp value from the PE header.
+        * @return The TimeDateStamp value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getTimeDateStamp() const
+        dword PeHeaderT<x>::getTimeDateStamp() const
-        {
+        {
-                return m_inthHeader.FileHeader.TimeDateStamp;
+                return m_inthHeader.FileHeader.TimeDateStamp;
-        }
+        }
-        /**
+        /**
-        * Returns the relative virtual address of the file's symbol table.
+        * Returns the relative virtual address of the file's symbol table.
-        * @return The PointerToSymbolTable value from the PE header.
+        * @return The PointerToSymbolTable value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getPointerToSymbolTable() const
+        dword PeHeaderT<x>::getPointerToSymbolTable() const
-        {
+        {
-                return m_inthHeader.FileHeader.PointerToSymbolTable;
+                return m_inthHeader.FileHeader.PointerToSymbolTable;
-        }
+        }
-        /**
+        /**
-        * Returns the number of symbols of the file's symbol table.
+        * Returns the number of symbols of the file's symbol table.
-        * @return The NumberOfSymbols value from the PE header.
+        * @return The NumberOfSymbols value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getNumberOfSymbols() const
+        dword PeHeaderT<x>::getNumberOfSymbols() const
-        {
+        {
-                return m_inthHeader.FileHeader.NumberOfSymbols;
+                return m_inthHeader.FileHeader.NumberOfSymbols;
-        }
+        }
-        /**
+        /**
-        * Returns the size of optional header of the file.
+        * Returns the size of optional header of the file.
-        * @return The SizeOfOptionalHeader value from the PE header.
+        * @return The SizeOfOptionalHeader value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        word PeHeaderT<x>::getSizeOfOptionalHeader() const
+        word PeHeaderT<x>::getSizeOfOptionalHeader() const
-        {
+        {
-                return m_inthHeader.FileHeader.SizeOfOptionalHeader;
+                return m_inthHeader.FileHeader.SizeOfOptionalHeader;
-        }
+        }
-        /**
+        /**
-        * @return The Characteristics value from the PE header.
+        * @return The Characteristics value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        word PeHeaderT<x>::getCharacteristics() const
+        word PeHeaderT<x>::getCharacteristics() const
-        {
+        {
-                return m_inthHeader.FileHeader.Characteristics;
+                return m_inthHeader.FileHeader.Characteristics;
-        }
+        }
-        /**
+        /**
-        * @return The Magic value from the PE header.
+        * @return The Magic value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        word PeHeaderT<x>::getMagic() const
+        word PeHeaderT<x>::getMagic() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.Magic;
+                return m_inthHeader.OptionalHeader.Magic;
-        }
+        }
-        /**
+        /**
-        * @return The MajorLinkerVersion value from the PE header.
+        * @return The MajorLinkerVersion value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        byte PeHeaderT<x>::getMajorLinkerVersion() const
+        byte PeHeaderT<x>::getMajorLinkerVersion() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.MajorLinkerVersion;
+                return m_inthHeader.OptionalHeader.MajorLinkerVersion;
-        }
+        }
-        /**
+        /**
-        * @return The MinorLinkerVersion value from the PE header.
+        * @return The MinorLinkerVersion value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        byte PeHeaderT<x>::getMinorLinkerVersion() const
+        byte PeHeaderT<x>::getMinorLinkerVersion() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.MinorLinkerVersion;
+                return m_inthHeader.OptionalHeader.MinorLinkerVersion;
-        }
+        }
-        /**
+        /**
-        * @return The SizeOfCode value from the PE header.
+        * @return The SizeOfCode value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getSizeOfCode() const
+        dword PeHeaderT<x>::getSizeOfCode() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.SizeOfCode;
+                return m_inthHeader.OptionalHeader.SizeOfCode;
-        }
+        }
-        /**
+        /**
-        * @return The SizeOfInitializedData value from the PE header.
+        * @return The SizeOfInitializedData value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getSizeOfInitializedData() const
+        dword PeHeaderT<x>::getSizeOfInitializedData() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.SizeOfInitializedData;
+                return m_inthHeader.OptionalHeader.SizeOfInitializedData;
-        }
+        }
-        /**
+        /**
-        * @return The SizeOfUninitializedData value from the PE header.
+        * @return The SizeOfUninitializedData value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getSizeOfUninitializedData() const
+        dword PeHeaderT<x>::getSizeOfUninitializedData() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.SizeOfUninitializedData;
+                return m_inthHeader.OptionalHeader.SizeOfUninitializedData;
-        }
+        }
-        /**
+        /**
-        * @return The AddressOfEntryPoint value from the PE header.
+        * @return The AddressOfEntryPoint value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getAddressOfEntryPoint() const
+        dword PeHeaderT<x>::getAddressOfEntryPoint() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.AddressOfEntryPoint;
+                return m_inthHeader.OptionalHeader.AddressOfEntryPoint;
-        }
+        }
-        /**
+        /**
-        * @return The BaseOfCode value from the PE header.
+        * @return The BaseOfCode value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getBaseOfCode() const
+        dword PeHeaderT<x>::getBaseOfCode() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.BaseOfCode;
+                return m_inthHeader.OptionalHeader.BaseOfCode;
-        }
+        }
-        /**
+        /**
-        * @return The ImageBase value from the PE header.
+        * @return The ImageBase value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::getImageBase() const
+        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::getImageBase() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.ImageBase;
+                return m_inthHeader.OptionalHeader.ImageBase;
-        }
+        }
-        /**
+        /**
-        * @return The SectionAlignment value from the PE header.
+        * @return The SectionAlignment value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getSectionAlignment() const
+        dword PeHeaderT<x>::getSectionAlignment() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.SectionAlignment;
+                return m_inthHeader.OptionalHeader.SectionAlignment;
-        }
+        }
-        /**
+        /**
-        * @return The FileAlignment value from the PE header.
+        * @return The FileAlignment value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getFileAlignment() const
+        dword PeHeaderT<x>::getFileAlignment() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.FileAlignment;
+                return m_inthHeader.OptionalHeader.FileAlignment;
-        }
+        }
-        /**
+        /**
-        * @return The MajorOperatingSystemVersion value from the PE header.
+        * @return The MajorOperatingSystemVersion value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        word PeHeaderT<x>::getMajorOperatingSystemVersion() const
+        word PeHeaderT<x>::getMajorOperatingSystemVersion() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.MajorOperatingSystemVersion;
+                return m_inthHeader.OptionalHeader.MajorOperatingSystemVersion;
-        }
+        }
-        /**
+        /**
-        * @return The MinorOperatingSystemVersion value from the PE header.
+        * @return The MinorOperatingSystemVersion value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        word PeHeaderT<x>::getMinorOperatingSystemVersion() const
+        word PeHeaderT<x>::getMinorOperatingSystemVersion() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.MinorOperatingSystemVersion;
+                return m_inthHeader.OptionalHeader.MinorOperatingSystemVersion;
-        }
+        }
-        /**
+        /**
-        * @return The MajorImageVersion value from the PE header.
+        * @return The MajorImageVersion value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        word PeHeaderT<x>::getMajorImageVersion() const
+        word PeHeaderT<x>::getMajorImageVersion() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.MajorImageVersion;
+                return m_inthHeader.OptionalHeader.MajorImageVersion;
-        }
+        }
-        /**
+        /**
-        * @return The MinorImageVersion value from the PE header.
+        * @return The MinorImageVersion value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        word PeHeaderT<x>::getMinorImageVersion() const
+        word PeHeaderT<x>::getMinorImageVersion() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.MinorImageVersion;
+                return m_inthHeader.OptionalHeader.MinorImageVersion;
-        }
+        }
-        /**
+        /**
-        * @return The MajorSubsystemVersion value from the PE header.
+        * @return The MajorSubsystemVersion value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        word PeHeaderT<x>::getMajorSubsystemVersion() const
+        word PeHeaderT<x>::getMajorSubsystemVersion() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.MajorSubsystemVersion;
+                return m_inthHeader.OptionalHeader.MajorSubsystemVersion;
-        }
+        }
-        /**
+        /**
-        * @return The MinorSubsystemVersion value from the PE header.
+        * @return The MinorSubsystemVersion value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        word PeHeaderT<x>::getMinorSubsystemVersion() const
+        word PeHeaderT<x>::getMinorSubsystemVersion() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.MinorSubsystemVersion;
+                return m_inthHeader.OptionalHeader.MinorSubsystemVersion;
-        }
+        }
-        /**
+        /**
-        * @return The WinVersionValue value from the PE header.
+        * @return The WinVersionValue value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getWin32VersionValue() const
+        dword PeHeaderT<x>::getWin32VersionValue() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.Win32VersionValue;
+                return m_inthHeader.OptionalHeader.Win32VersionValue;
-        }
+        }
-        /**
+        /**
-        * @return The SizeOfImage value from the PE header.
+        * @return The SizeOfImage value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getSizeOfImage() const
+        dword PeHeaderT<x>::getSizeOfImage() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.SizeOfImage;
+                return m_inthHeader.OptionalHeader.SizeOfImage;
-        }
+        }
-        /**
+        /**
-        * @return The SizeOfHeaders value from the PE header.
+        * @return The SizeOfHeaders value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getSizeOfHeaders() const
+        dword PeHeaderT<x>::getSizeOfHeaders() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.SizeOfHeaders;
+                return m_inthHeader.OptionalHeader.SizeOfHeaders;
-        }
+        }
-        /**
+        /**
-        * @return The CheckSums value from the PE header.
+        * @return The CheckSums value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getCheckSum() const
+        dword PeHeaderT<x>::getCheckSum() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.CheckSum;
+                return m_inthHeader.OptionalHeader.CheckSum;
-        }
+        }
-        /**
+        /**
-        * @return The Subsystem value from the PE header.
+        * @return The Subsystem value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        word PeHeaderT<x>::getSubsystem() const
+        word PeHeaderT<x>::getSubsystem() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.Subsystem;
+                return m_inthHeader.OptionalHeader.Subsystem;
-        }
+        }
-        /**
+        /**
-        * @return The DllCharacteristics value from the PE header.
+        * @return The DllCharacteristics value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        word PeHeaderT<x>::getDllCharacteristics() const
+        word PeHeaderT<x>::getDllCharacteristics() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.DllCharacteristics;
+                return m_inthHeader.OptionalHeader.DllCharacteristics;
-        }
+        }
-        /**
+        /**
-        * @return The SizeOfStackReserve value from the PE header.
+        * @return The SizeOfStackReserve value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::getSizeOfStackReserve() const
+        typename FieldSizes<x>::VAR4_8 PeHeaderT<x>::getSizeOfStackReserve() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.SizeOfStackReserve;
+                return m_inthHeader.OptionalHeader.SizeOfStackReserve;
-        }
+        }
-        /**
+        /**
-        * @return The SizeOfStackCommit value from the PE header.
+        * @return The SizeOfStackCommit value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        typename FieldSizes<x>::VAR4_8  PeHeaderT<x>::getSizeOfStackCommit() const
+        typename FieldSizes<x>::VAR4_8  PeHeaderT<x>::getSizeOfStackCommit() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.SizeOfStackCommit;
+                return m_inthHeader.OptionalHeader.SizeOfStackCommit;
-        }
+        }
-        /**
+        /**
-        * @return The SizeOfHeapReserve value from the PE header.
+        * @return The SizeOfHeapReserve value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        typename FieldSizes<x>::VAR4_8  PeHeaderT<x>::getSizeOfHeapReserve() const
+        typename FieldSizes<x>::VAR4_8  PeHeaderT<x>::getSizeOfHeapReserve() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.SizeOfHeapReserve;
+                return m_inthHeader.OptionalHeader.SizeOfHeapReserve;
-        }
+        }
-        /**
+        /**
-        * @return The SizeOfHeapCommit value from the PE header.
+        * @return The SizeOfHeapCommit value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        typename FieldSizes<x>::VAR4_8  PeHeaderT<x>::getSizeOfHeapCommit() const
+        typename FieldSizes<x>::VAR4_8  PeHeaderT<x>::getSizeOfHeapCommit() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.SizeOfHeapCommit;
+                return m_inthHeader.OptionalHeader.SizeOfHeapCommit;
-        }
+        }
-        /**
+        /**
-        * @return The LoaderFlags value from the PE header.
+        * @return The LoaderFlags value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getLoaderFlags() const
+        dword PeHeaderT<x>::getLoaderFlags() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.LoaderFlags;
+                return m_inthHeader.OptionalHeader.LoaderFlags;
-        }
+        }
-        /**
+        /**
-        * @return The NumberOfRvaAndSizes value from the PE header.
+        * @return The NumberOfRvaAndSizes value from the PE header.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getNumberOfRvaAndSizes() const
+        dword PeHeaderT<x>::getNumberOfRvaAndSizes() const
-        {
+        {
-                return m_inthHeader.OptionalHeader.NumberOfRvaAndSizes;
+                return m_inthHeader.OptionalHeader.NumberOfRvaAndSizes;
-        }
+        }
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::calcNumberOfRvaAndSizes() const
+        dword PeHeaderT<x>::calcNumberOfRvaAndSizes() const
-        {
+        {
-                return static_cast<dword>(m_inthHeader.dataDirectories.size());
+                return static_cast<dword>(m_inthHeader.dataDirectories.size());
-        }
+        }
-        /**
+        /**
-        * Returns the relative virtual address of the current file's export directory.
+        * Returns the relative virtual address of the current file's export directory.
-        * @return The Rva of the Export directory.
+        * @return The Rva of the Export directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddExportRva() const
+        dword PeHeaderT<x>::getIddExportRva() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * Returns the size of the current file's export directory.
+        * Returns the size of the current file's export directory.
-        * @return The sizeof the Export directory.
+        * @return The sizeof the Export directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddExportSize() const
+        dword PeHeaderT<x>::getIddExportSize() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT].Size;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT].Size;
-        }
+        }
-        /**
+        /**
-        * Returns the relative virtual address of the current file's import directory.
+        * Returns the relative virtual address of the current file's import directory.
-        * @return The Rva of the Import directory.
+        * @return The Rva of the Import directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddImportRva() const
+        dword PeHeaderT<x>::getIddImportRva() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * Returns the size of the current file's import directory.
+        * Returns the size of the current file's import directory.
-        * @return The size of the Import directory.
+        * @return The size of the Import directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddImportSize() const
+        dword PeHeaderT<x>::getIddImportSize() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT].Size;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT].Size;
-        }
+        }
-        /**
+        /**
-        * Returns the relative virtual address of the current file's resource directory.
+        * Returns the relative virtual address of the current file's resource directory.
-        * @return The Rva of the Resource directory.
+        * @return The Rva of the Resource directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddResourceRva() const
+        dword PeHeaderT<x>::getIddResourceRva() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * Returns the size of the current file'resource resource directory.
+        * Returns the size of the current file'resource resource directory.
-        * @return The size of the Resource directory.
+        * @return The size of the Resource directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddResourceSize() const
+        dword PeHeaderT<x>::getIddResourceSize() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE].Size;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE].Size;
-        }
+        }
-        /**
+        /**
-        * Returns the relative virtual address of the current file's exception directory.
+        * Returns the relative virtual address of the current file's exception directory.
-        * @return The Rva of the Exception directory.
+        * @return The Rva of the Exception directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddExceptionRva() const
+        dword PeHeaderT<x>::getIddExceptionRva() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION].VirtualAddress;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION].VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * Returns the size of the current file's exception directory.
+        * Returns the size of the current file's exception directory.
-        * @return The size of the Exception directory.
+        * @return The size of the Exception directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddExceptionSize() const
+        dword PeHeaderT<x>::getIddExceptionSize() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION].Size;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION].Size;
-        }
+        }
-        /**
+        /**
-        * Returns the relative virtual address of the current file's security directory.
+        * Returns the relative virtual address of the current file's security directory.
-        * @return The Rva of the Security directory.
+        * @return The Rva of the Security directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddSecurityRva() const
+        dword PeHeaderT<x>::getIddSecurityRva() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY].VirtualAddress;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY].VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * Returns the size of the current file's security directory.
+        * Returns the size of the current file's security directory.
-        * @return The size of the Security directory.
+        * @return The size of the Security directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddSecuritySize() const
+        dword PeHeaderT<x>::getIddSecuritySize() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY].Size;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY].Size;
-        }
+        }
-        /**
+        /**
-        * Returns the relative virtual address of the current file's base reloc directory.
+        * Returns the relative virtual address of the current file's base reloc directory.
-        * @return The Rva of the Base Reloc directory.
+        * @return The Rva of the Base Reloc directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddBaseRelocRva() const
+        dword PeHeaderT<x>::getIddBaseRelocRva() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * Returns the size of the current file's base reloc directory.
+        * Returns the size of the current file's base reloc directory.
-        * @return The size of the Base Reloc directory.
+        * @return The size of the Base Reloc directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddBaseRelocSize() const
+        dword PeHeaderT<x>::getIddBaseRelocSize() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size;
-        }
+        }
-        /**
+        /**
-        * Returns the relative virtual address of the current file's debug directory.
+        * Returns the relative virtual address of the current file's debug directory.
-        * @return The Rva of the Debug directory.
+        * @return The Rva of the Debug directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddDebugRva() const
+        dword PeHeaderT<x>::getIddDebugRva() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * Returns the size of the current file's debug directory.
+        * Returns the size of the current file's debug directory.
-        * @return The size of the Debug directory.
+        * @return The size of the Debug directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddDebugSize() const
+        dword PeHeaderT<x>::getIddDebugSize() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG].Size;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG].Size;
-        }
+        }
-        /**
+        /**
-        * Returns the relative virtual address of the current file's Architecture directory.
+        * Returns the relative virtual address of the current file's Architecture directory.
-        * @return The Rva of the Architecture directory.
+        * @return The Rva of the Architecture directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddArchitectureRva() const
+        dword PeHeaderT<x>::getIddArchitectureRva() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE].VirtualAddress;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE].VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * Returns the size of the current file's Architecture directory.
+        * Returns the size of the current file's Architecture directory.
-        * @return The size of the Architecture directory.
+        * @return The size of the Architecture directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddArchitectureSize() const
+        dword PeHeaderT<x>::getIddArchitectureSize() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE].Size;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE].Size;
-        }
+        }
-        /**
+        /**
-        * Returns the relative virtual address of the current file's global ptr directory.
+        * Returns the relative virtual address of the current file's global ptr directory.
-        * @return The Rva of the GlobalPtr directory.
+        * @return The Rva of the GlobalPtr directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddGlobalPtrRva() const
+        dword PeHeaderT<x>::getIddGlobalPtrRva() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR].VirtualAddress;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR].VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * Returns the size of the current file's global ptr directory.
+        * Returns the size of the current file's global ptr directory.
-        * @return The size of the GlobalPtr directory.
+        * @return The size of the GlobalPtr directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddGlobalPtrSize() const
+        dword PeHeaderT<x>::getIddGlobalPtrSize() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR].Size;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR].Size;
-        }
+        }
-        /**
+        /**
-        * Returns the relative virtual address of the current file's TLS directory.
+        * Returns the relative virtual address of the current file's TLS directory.
-        * @return The Rva of the Tls directory.
+        * @return The Rva of the Tls directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddTlsRva() const
+        dword PeHeaderT<x>::getIddTlsRva() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_TLS].VirtualAddress;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_TLS].VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * Returns the size of the current file's TLS directory.
+        * Returns the size of the current file's TLS directory.
-        * @return The size of the Tls directory.
+        * @return The size of the Tls directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddTlsSize() const
+        dword PeHeaderT<x>::getIddTlsSize() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_TLS].Size;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_TLS].Size;
-        }
+        }
-        /**
+        /**
-        * Returns the relative virtual address of the current file's load config directory.
+        * Returns the relative virtual address of the current file's load config directory.
-        * @return The Rva of the LoadConfig directory.
+        * @return The Rva of the LoadConfig directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddLoadConfigRva() const
+        dword PeHeaderT<x>::getIddLoadConfigRva() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].VirtualAddress;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * Returns the size of the current file's load config directory.
+        * Returns the size of the current file's load config directory.
-        * @return The size of the LoadConfig directory.
+        * @return The size of the LoadConfig directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddLoadConfigSize() const
+        dword PeHeaderT<x>::getIddLoadConfigSize() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].Size;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].Size;
-        }
+        }
-        /**
+        /**
-        * Returns the relative virtual address of the current file's bound import directory.
+        * Returns the relative virtual address of the current file's bound import directory.
-        * @return The Rva of the BoundImport directory.
+        * @return The Rva of the BoundImport directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddBoundImportRva() const
+        dword PeHeaderT<x>::getIddBoundImportRva() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT].VirtualAddress;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT].VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * Returns the size of the current file's bound import directory.
+        * Returns the size of the current file's bound import directory.
-        * @return The size of the BoundImport directory.
+        * @return The size of the BoundImport directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddBoundImportSize() const
+        dword PeHeaderT<x>::getIddBoundImportSize() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT].Size;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT].Size;
-        }
+        }
-        /**
+        /**
-        * Returns the relative virtual address of the current file's IAT directory.
+        * Returns the relative virtual address of the current file's IAT directory.
-        * @return The Rva of the IAT directory.
+        * @return The Rva of the IAT directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddIatRva() const
+        dword PeHeaderT<x>::getIddIatRva() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IAT].VirtualAddress;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IAT].VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * Returns the size of the current file's IAT directory.
+        * Returns the size of the current file's IAT directory.
-        * @return The size of the IAT directory.
+        * @return The size of the IAT directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddIatSize() const
+        dword PeHeaderT<x>::getIddIatSize() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IAT].Size;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IAT].Size;
-        }
+        }
-        /**
+        /**
-        * Returns the relative virtual address of the current file's Delay Import directory.
+        * Returns the relative virtual address of the current file's Delay Import directory.
-        * @return The Rva of the DelayImport directory.
+        * @return The Rva of the DelayImport directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddDelayImportRva() const
+        dword PeHeaderT<x>::getIddDelayImportRva() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress;
-        }
+        }
-        /**
+        /**
-        * Returns the size of the current file's Delay Import directory.
+        * Returns the size of the current file's Delay Import directory.
-        * @return The size of the DelayImport directory.
+        * @return The size of the DelayImport directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddDelayImportSize() const
+        dword PeHeaderT<x>::getIddDelayImportSize() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].Size;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].Size;
-        }
+        }
-        /**
+        /**
-        * Returns the relative virtual address of the current file's COM Descriptor directory.
+        * Returns the relative virtual address of the current file's COM Descriptor directory.
-        * @return The Rva of the COM Descriptor directory.
+        * @return The Rva of the COM Descriptor directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddComHeaderRva() const
+        dword PeHeaderT<x>::getIddComHeaderRva() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the size of the current file's COM Descriptor directory.
+        * Returns the size of the current file's COM Descriptor directory.
-        * @return The Rva of the COM Descriptor directory.
+        * @return The Rva of the COM Descriptor directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getIddComHeaderSize() const
+        dword PeHeaderT<x>::getIddComHeaderSize() const
-        {
+        {
-                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size;
+                return m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size;
-        }
+        }
-        /**
+        /**
-        * Returns the relative virtual address of an image directory.
+        * Returns the relative virtual address of an image directory.
-        * @param dwDirectory The identifier of an image directory.
+        * @param dwDirectory The identifier of an image directory.
-        * @return The Rva of the image directory.
+        * @return The Rva of the image directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getImageDataDirectoryRva(dword dwDirectory) const
+        dword PeHeaderT<x>::getImageDataDirectoryRva(dword dwDirectory) const
-        {
+        {
-                return m_inthHeader.dataDirectories[dwDirectory].VirtualAddress;
+                return m_inthHeader.dataDirectories[dwDirectory].VirtualAddress;
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setImageDataDirectoryRva(dword dwDirectory, dword value)
+        void PeHeaderT<x>::setImageDataDirectoryRva(dword dwDirectory, dword value)
-        {
+        {
-                m_inthHeader.dataDirectories[dwDirectory].VirtualAddress = value;
+                m_inthHeader.dataDirectories[dwDirectory].VirtualAddress = value;
-        }
+        }
-        /**
+        /**
-        * Returns the size of an image directory.
+        * Returns the size of an image directory.
-        * @param dwDirectory The identifier of an image directory.
+        * @param dwDirectory The identifier of an image directory.
-        * @return The size of the image directory.
+        * @return The size of the image directory.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getImageDataDirectorySize(dword dwDirectory) const
+        dword PeHeaderT<x>::getImageDataDirectorySize(dword dwDirectory) const
-        {
+        {
-                return m_inthHeader.dataDirectories[dwDirectory].Size;
+                return m_inthHeader.dataDirectories[dwDirectory].Size;
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setImageDataDirectorySize(dword dwDirectory, dword value)
+        void PeHeaderT<x>::setImageDataDirectorySize(dword dwDirectory, dword value)
-        {
+        {
-                m_inthHeader.dataDirectories[dwDirectory].Size = value;
+                m_inthHeader.dataDirectories[dwDirectory].Size = value;
-        }
+        }
-        /**
+        /**
-        * Returns the name of the section which is specified by the parameter wSectionnr.
+        * Returns the name of the section which is specified by the parameter wSectionnr.
-        * @param wSectionnr Index of the section.
+        * @param wSectionnr Index of the section.
-        * @return The name of the section.
+        * @return The name of the section.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        std::string PeHeaderT<x>::getSectionName(word wSectionnr) const
+        std::string PeHeaderT<x>::getSectionName(word wSectionnr) const
-        {
+        {
-                std::string sectionName = "";
+                std::string sectionName = "";
-                
+                
-                for (unsigned int i=0;i<sizeof(m_vIsh[wSectionnr].Name);i++)
+                for (unsigned int i=0;i<sizeof(m_vIsh[wSectionnr].Name);i++)
-                {
+                {
-                        if (m_vIsh[wSectionnr].Name[i]) sectionName += m_vIsh[wSectionnr].Name[i];
+                        if (m_vIsh[wSectionnr].Name[i]) sectionName += m_vIsh[wSectionnr].Name[i];
-                }
+                }
-                
+                
-                return sectionName;
+                return sectionName;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the virtual size of the section which is specified by the parameter wSectionnr.
+        * Returns the virtual size of the section which is specified by the parameter wSectionnr.
-        * @param wSectionnr Index of the section.
+        * @param wSectionnr Index of the section.
-        * @return The virtual size of the section.
+        * @return The virtual size of the section.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getVirtualSize(word wSectionnr) const
+        dword PeHeaderT<x>::getVirtualSize(word wSectionnr) const
-        {
+        {
-                return m_vIsh[wSectionnr].VirtualSize;
+                return m_vIsh[wSectionnr].VirtualSize;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the relative virtual address of the section which is specified by the parameter wSectionnr.
+        * Returns the relative virtual address of the section which is specified by the parameter wSectionnr.
-        * @param wSectionnr Index of the section.
+        * @param wSectionnr Index of the section.
-        * @return The Rva of the section.
+        * @return The Rva of the section.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getVirtualAddress(word wSectionnr) const
+        dword PeHeaderT<x>::getVirtualAddress(word wSectionnr) const
-        {
+        {
-                return m_vIsh[wSectionnr].VirtualAddress;
+                return m_vIsh[wSectionnr].VirtualAddress;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the size of raw data of the section which is specified by the parameter wSectionnr.
+        * Returns the size of raw data of the section which is specified by the parameter wSectionnr.
-        * @param wSectionnr Index of the section.
+        * @param wSectionnr Index of the section.
-        * @return The size of raw data of the section.
+        * @return The size of raw data of the section.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getSizeOfRawData(word wSectionnr) const
+        dword PeHeaderT<x>::getSizeOfRawData(word wSectionnr) const
-        {
+        {
-                return m_vIsh[wSectionnr].SizeOfRawData;
+                return m_vIsh[wSectionnr].SizeOfRawData;
-        }
+        }
-        /**
+        /**
-        * Returns the file offset of the section which is specified by the parameter wSectionnr.
+        * Returns the file offset of the section which is specified by the parameter wSectionnr.
-        * @param wSectionnr Index of the section.
+        * @param wSectionnr Index of the section.
-        * @return The file offset of the section.
+        * @return The file offset of the section.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getPointerToRawData(word wSectionnr) const
+        dword PeHeaderT<x>::getPointerToRawData(word wSectionnr) const
-        {
+        {
-                return m_vIsh[wSectionnr].PointerToRawData;
+                return m_vIsh[wSectionnr].PointerToRawData;
-        }
+        }
-        /**
+        /**
-        * Returns the pointer to relocations of the section which is specified by the parameter wSectionnr.
+        * Returns the pointer to relocations of the section which is specified by the parameter wSectionnr.
-        * @param wSectionnr Index of the section.
+        * @param wSectionnr Index of the section.
-        * @return The pointer to relocations of the section.
+        * @return The pointer to relocations of the section.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getPointerToRelocations(word wSectionnr) const
+        dword PeHeaderT<x>::getPointerToRelocations(word wSectionnr) const
-        {
+        {
-                return m_vIsh[wSectionnr].PointerToRelocations;
+                return m_vIsh[wSectionnr].PointerToRelocations;
-        }
+        }
-        /**
+        /**
-        * Returns the poiner to line numbers of the section which is specified by the parameter wSectionnr.
+        * Returns the poiner to line numbers of the section which is specified by the parameter wSectionnr.
-        * @param wSectionnr Index of the section.
+        * @param wSectionnr Index of the section.
-        * @return The pointer to line numbers of the section.
+        * @return The pointer to line numbers of the section.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getPointerToLinenumbers(word wSectionnr) const
+        dword PeHeaderT<x>::getPointerToLinenumbers(word wSectionnr) const
-        {
+        {
-                return m_vIsh[wSectionnr].PointerToLinenumbers;
+                return m_vIsh[wSectionnr].PointerToLinenumbers;
-        }
+        }
-        /**
+        /**
-        * Returns the number of relocations of the section which is specified by the parameter wSectionnr.
+        * Returns the number of relocations of the section which is specified by the parameter wSectionnr.
-        * @param wSectionnr Index of the section.
+        * @param wSectionnr Index of the section.
-        * @return The number of relocations of the section.
+        * @return The number of relocations of the section.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getNumberOfRelocations(word wSectionnr) const
+        dword PeHeaderT<x>::getNumberOfRelocations(word wSectionnr) const
-        {
+        {
-                return m_vIsh[wSectionnr].NumberOfRelocations;
+                return m_vIsh[wSectionnr].NumberOfRelocations;
-        }
+        }
-        /**
+        /**
-        * Returns the number of line numbers of the section which is specified by the parameter wSectionnr.
+        * Returns the number of line numbers of the section which is specified by the parameter wSectionnr.
-        * @param wSectionnr Index of the section.
+        * @param wSectionnr Index of the section.
-        * @return The number of line numbers of the section.
+        * @return The number of line numbers of the section.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getNumberOfLinenumbers(word wSectionnr) const
+        dword PeHeaderT<x>::getNumberOfLinenumbers(word wSectionnr) const
-        {
+        {
-                return m_vIsh[wSectionnr].NumberOfLinenumbers;
+                return m_vIsh[wSectionnr].NumberOfLinenumbers;
-        }
+        }
-        /**
+        /**
-        * Returns the characteristics of the section which is specified by the parameter wSectionnr.
+        * Returns the characteristics of the section which is specified by the parameter wSectionnr.
-        * @param wSectionnr Index of the section.
+        * @param wSectionnr Index of the section.
-        * @return The characteristics of the section.
+        * @return The characteristics of the section.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        dword PeHeaderT<x>::getCharacteristics(word wSectionnr) const
+        dword PeHeaderT<x>::getCharacteristics(word wSectionnr) const
-        {
+        {
-                return m_vIsh[wSectionnr].Characteristics;
+                return m_vIsh[wSectionnr].Characteristics;
-        }
+        }
-        /**
+        /**
-        * Changes the file's Nt signature.
+        * Changes the file's Nt signature.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setNtSignature(dword dwValue)
+        void PeHeaderT<x>::setNtSignature(dword dwValue)
-        {
+        {
-                m_inthHeader.Signature = dwValue;
+                m_inthHeader.Signature = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's Machine.
+        * Changes the file's Machine.
-        * @param wValue New value.
+        * @param wValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setMachine(word wValue)
+        void PeHeaderT<x>::setMachine(word wValue)
-        {
+        {
-                m_inthHeader.FileHeader.Machine = wValue;
+                m_inthHeader.FileHeader.Machine = wValue;
-        }
+        }
-        /**
+        /**
-        * Changes the number of sections.
+        * Changes the number of sections.
-        * @param wValue New value.
+        * @param wValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setNumberOfSections(word wValue)
+        void PeHeaderT<x>::setNumberOfSections(word wValue)
-        {
+        {
-                m_inthHeader.FileHeader.NumberOfSections = wValue;
+                m_inthHeader.FileHeader.NumberOfSections = wValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's TimeDateStamp.
+        * Changes the file's TimeDateStamp.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setTimeDateStamp(dword dwValue)
+        void PeHeaderT<x>::setTimeDateStamp(dword dwValue)
-        {
+        {
-                m_inthHeader.FileHeader.TimeDateStamp = dwValue;
+                m_inthHeader.FileHeader.TimeDateStamp = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's PointerToSymbolTable.
+        * Changes the file's PointerToSymbolTable.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setPointerToSymbolTable(dword dwValue)
+        void PeHeaderT<x>::setPointerToSymbolTable(dword dwValue)
-        {
+        {
-                m_inthHeader.FileHeader.PointerToSymbolTable = dwValue;
+                m_inthHeader.FileHeader.PointerToSymbolTable = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's NumberOfSymbols.
+        * Changes the file's NumberOfSymbols.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setNumberOfSymbols(dword dwValue)
+        void PeHeaderT<x>::setNumberOfSymbols(dword dwValue)
-        {
+        {
-                m_inthHeader.FileHeader.NumberOfSymbols = dwValue;
+                m_inthHeader.FileHeader.NumberOfSymbols = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's SizeOfOptionalHeader.
+        * Changes the file's SizeOfOptionalHeader.
-        * @param wValue New value.
+        * @param wValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setSizeOfOptionalHeader(word wValue)
+        void PeHeaderT<x>::setSizeOfOptionalHeader(word wValue)
-        {
+        {
-                m_inthHeader.FileHeader.SizeOfOptionalHeader = wValue;
+                m_inthHeader.FileHeader.SizeOfOptionalHeader = wValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's Characteristics.
+        * Changes the file's Characteristics.
-        * @param wValue New value.
+        * @param wValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setCharacteristics(word wValue)
+        void PeHeaderT<x>::setCharacteristics(word wValue)
-        {
+        {
-                m_inthHeader.FileHeader.Characteristics = wValue;
+                m_inthHeader.FileHeader.Characteristics = wValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's Magic.
+        * Changes the file's Magic.
-        * @param wValue New value.
+        * @param wValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setMagic(word wValue)
+        void PeHeaderT<x>::setMagic(word wValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.Magic = wValue;
+                m_inthHeader.OptionalHeader.Magic = wValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's MajorLinkerVersion.
+        * Changes the file's MajorLinkerVersion.
-        * @param bValue New value.
+        * @param bValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setMajorLinkerVersion(byte bValue)
+        void PeHeaderT<x>::setMajorLinkerVersion(byte bValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.MajorLinkerVersion = bValue;
+                m_inthHeader.OptionalHeader.MajorLinkerVersion = bValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's MinorLinkerVersion.
+        * Changes the file's MinorLinkerVersion.
-        * @param bValue New value.
+        * @param bValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setMinorLinkerVersion(byte bValue)
+        void PeHeaderT<x>::setMinorLinkerVersion(byte bValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.MinorLinkerVersion = bValue;
+                m_inthHeader.OptionalHeader.MinorLinkerVersion = bValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's SizeOfCode.
+        * Changes the file's SizeOfCode.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setSizeOfCode(dword dwValue)
+        void PeHeaderT<x>::setSizeOfCode(dword dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.SizeOfCode = dwValue;
+                m_inthHeader.OptionalHeader.SizeOfCode = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's SizeOfInitializedData.
+        * Changes the file's SizeOfInitializedData.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setSizeOfInitializedData(dword dwValue)
+        void PeHeaderT<x>::setSizeOfInitializedData(dword dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.SizeOfInitializedData = dwValue;
+                m_inthHeader.OptionalHeader.SizeOfInitializedData = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's SizeOfUninitializedData.
+        * Changes the file's SizeOfUninitializedData.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setSizeOfUninitializedData(dword dwValue)
+        void PeHeaderT<x>::setSizeOfUninitializedData(dword dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.SizeOfUninitializedData = dwValue;
+                m_inthHeader.OptionalHeader.SizeOfUninitializedData = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's AddressOfEntryPoint.
+        * Changes the file's AddressOfEntryPoint.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setAddressOfEntryPoint(dword dwValue)
+        void PeHeaderT<x>::setAddressOfEntryPoint(dword dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.AddressOfEntryPoint = dwValue;
+                m_inthHeader.OptionalHeader.AddressOfEntryPoint = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's BaseOfCode.
+        * Changes the file's BaseOfCode.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setBaseOfCode(dword dwValue)
+        void PeHeaderT<x>::setBaseOfCode(dword dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.BaseOfCode = dwValue;
+                m_inthHeader.OptionalHeader.BaseOfCode = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's ImageBase.
+        * Changes the file's ImageBase.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setImageBase(typename FieldSizes<x>::VAR4_8 dwValue)
+        void PeHeaderT<x>::setImageBase(typename FieldSizes<x>::VAR4_8 dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.ImageBase = dwValue;
+                m_inthHeader.OptionalHeader.ImageBase = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's SectionAlignment.
+        * Changes the file's SectionAlignment.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setSectionAlignment(dword dwValue)
+        void PeHeaderT<x>::setSectionAlignment(dword dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.SectionAlignment = dwValue;
+                m_inthHeader.OptionalHeader.SectionAlignment = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's FileAlignment.
+        * Changes the file's FileAlignment.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setFileAlignment(dword dwValue)
+        void PeHeaderT<x>::setFileAlignment(dword dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.FileAlignment = dwValue;
+                m_inthHeader.OptionalHeader.FileAlignment = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's MajorOperatingSystemVersion.
+        * Changes the file's MajorOperatingSystemVersion.
-        * @param wValue New value.
+        * @param wValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setMajorOperatingSystemVersion(word wValue)
+        void PeHeaderT<x>::setMajorOperatingSystemVersion(word wValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.MajorOperatingSystemVersion = wValue;
+                m_inthHeader.OptionalHeader.MajorOperatingSystemVersion = wValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's MinorOperatingSystemVersion.
+        * Changes the file's MinorOperatingSystemVersion.
-        * @param wValue New value.
+        * @param wValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setMinorOperatingSystemVersion(word wValue)
+        void PeHeaderT<x>::setMinorOperatingSystemVersion(word wValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.MinorOperatingSystemVersion = wValue;
+                m_inthHeader.OptionalHeader.MinorOperatingSystemVersion = wValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's MajorImageVersion.
+        * Changes the file's MajorImageVersion.
-        * @param wValue New value.
+        * @param wValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setMajorImageVersion(word wValue)
+        void PeHeaderT<x>::setMajorImageVersion(word wValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.MajorImageVersion = wValue;
+                m_inthHeader.OptionalHeader.MajorImageVersion = wValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's MinorImageVersion.
+        * Changes the file's MinorImageVersion.
-        * @param wValue New value.
+        * @param wValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setMinorImageVersion(word wValue)
+        void PeHeaderT<x>::setMinorImageVersion(word wValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.MinorImageVersion = wValue;
+                m_inthHeader.OptionalHeader.MinorImageVersion = wValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's MajorSubsystemVersion.
+        * Changes the file's MajorSubsystemVersion.
-        * @param wValue New value.
+        * @param wValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setMajorSubsystemVersion(word wValue)
+        void PeHeaderT<x>::setMajorSubsystemVersion(word wValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.MajorSubsystemVersion = wValue;
+                m_inthHeader.OptionalHeader.MajorSubsystemVersion = wValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's MinorSubsystemVersion.
+        * Changes the file's MinorSubsystemVersion.
-        * @param wValue New value.
+        * @param wValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setMinorSubsystemVersion(word wValue)
+        void PeHeaderT<x>::setMinorSubsystemVersion(word wValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.MinorSubsystemVersion = wValue;
+                m_inthHeader.OptionalHeader.MinorSubsystemVersion = wValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's Win32VersionValue.
+        * Changes the file's Win32VersionValue.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setWin32VersionValue(dword dwValue)
+        void PeHeaderT<x>::setWin32VersionValue(dword dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.Win32VersionValue = dwValue;
+                m_inthHeader.OptionalHeader.Win32VersionValue = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's SizeOfImage.
+        * Changes the file's SizeOfImage.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setSizeOfImage(dword dwValue)
+        void PeHeaderT<x>::setSizeOfImage(dword dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.SizeOfImage = dwValue;
+                m_inthHeader.OptionalHeader.SizeOfImage = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's SizeOfHeaders.
+        * Changes the file's SizeOfHeaders.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setSizeOfHeaders(dword dwValue)
+        void PeHeaderT<x>::setSizeOfHeaders(dword dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.SizeOfHeaders = dwValue;
+                m_inthHeader.OptionalHeader.SizeOfHeaders = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's CheckSum.
+        * Changes the file's CheckSum.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setCheckSum(dword dwValue)
+        void PeHeaderT<x>::setCheckSum(dword dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.CheckSum = dwValue;
+                m_inthHeader.OptionalHeader.CheckSum = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's Subsystem.
+        * Changes the file's Subsystem.
-        * @param wValue New value.
+        * @param wValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setSubsystem(word wValue)
+        void PeHeaderT<x>::setSubsystem(word wValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.Subsystem = wValue;
+                m_inthHeader.OptionalHeader.Subsystem = wValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's DllCharacteristics.
+        * Changes the file's DllCharacteristics.
-        * @param wValue New value.
+        * @param wValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setDllCharacteristics(word wValue)
+        void PeHeaderT<x>::setDllCharacteristics(word wValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.DllCharacteristics = wValue;
+                m_inthHeader.OptionalHeader.DllCharacteristics = wValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's SizeOfStackReserve.
+        * Changes the file's SizeOfStackReserve.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setSizeOfStackReserve(typename FieldSizes<x>::VAR4_8 dwValue)
+        void PeHeaderT<x>::setSizeOfStackReserve(typename FieldSizes<x>::VAR4_8 dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.SizeOfStackReserve = dwValue;
+                m_inthHeader.OptionalHeader.SizeOfStackReserve = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's SizeOfStackCommit.
+        * Changes the file's SizeOfStackCommit.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setSizeOfStackCommit(typename FieldSizes<x>::VAR4_8 dwValue)
+        void PeHeaderT<x>::setSizeOfStackCommit(typename FieldSizes<x>::VAR4_8 dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.SizeOfStackCommit = dwValue;
+                m_inthHeader.OptionalHeader.SizeOfStackCommit = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's SizeOfHeapReserve.
+        * Changes the file's SizeOfHeapReserve.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setSizeOfHeapReserve(typename FieldSizes<x>::VAR4_8 dwValue)
+        void PeHeaderT<x>::setSizeOfHeapReserve(typename FieldSizes<x>::VAR4_8 dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.SizeOfHeapReserve = dwValue;
+                m_inthHeader.OptionalHeader.SizeOfHeapReserve = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's SizeOfHeapCommit.
+        * Changes the file's SizeOfHeapCommit.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setSizeOfHeapCommit(typename FieldSizes<x>::VAR4_8 dwValue)
+        void PeHeaderT<x>::setSizeOfHeapCommit(typename FieldSizes<x>::VAR4_8 dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.SizeOfHeapCommit = dwValue;
+                m_inthHeader.OptionalHeader.SizeOfHeapCommit = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's LoaderFlags.
+        * Changes the file's LoaderFlags.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setLoaderFlags(dword dwValue)
+        void PeHeaderT<x>::setLoaderFlags(dword dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.LoaderFlags = dwValue;
+                m_inthHeader.OptionalHeader.LoaderFlags = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the file's NumberOfRvaAndSizes.
+        * Changes the file's NumberOfRvaAndSizes.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setNumberOfRvaAndSizes(dword dwValue)
+        void PeHeaderT<x>::setNumberOfRvaAndSizes(dword dwValue)
-        {
+        {
-                m_inthHeader.OptionalHeader.NumberOfRvaAndSizes = dwValue;
+                m_inthHeader.OptionalHeader.NumberOfRvaAndSizes = dwValue;
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddDebugRva(dword dwValue)
+        void PeHeaderT<x>::setIddDebugRva(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress = dwValue;
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddDebugSize(dword dwValue)
+        void PeHeaderT<x>::setIddDebugSize(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG].Size = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG].Size = dwValue;
-        }
+        }
-        
+        
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddDelayImportRva(dword dwValue)
+        void PeHeaderT<x>::setIddDelayImportRva(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress = dwValue;
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddDelayImportSize(dword dwValue)
+        void PeHeaderT<x>::setIddDelayImportSize(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].Size = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].Size = dwValue;
-        }
+        }
-        
+        
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddExceptionRva(dword dwValue)
+        void PeHeaderT<x>::setIddExceptionRva(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION].VirtualAddress = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION].VirtualAddress = dwValue;
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddExceptionSize(dword dwValue)
+        void PeHeaderT<x>::setIddExceptionSize(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION].Size = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION].Size = dwValue;
-        }
+        }
-        
+        
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddGlobalPtrRva(dword dwValue)
+        void PeHeaderT<x>::setIddGlobalPtrRva(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR].VirtualAddress = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR].VirtualAddress = dwValue;
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddGlobalPtrSize(dword dwValue)
+        void PeHeaderT<x>::setIddGlobalPtrSize(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR].Size = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR].Size = dwValue;
-        }
+        }
-        
+        
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddIatRva(dword dwValue)
+        void PeHeaderT<x>::setIddIatRva(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IAT].VirtualAddress = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IAT].VirtualAddress = dwValue;
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddIatSize(dword dwValue)
+        void PeHeaderT<x>::setIddIatSize(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IAT].Size = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IAT].Size = dwValue;
-        }
+        }
-        
+        
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddLoadConfigRva(dword dwValue)
+        void PeHeaderT<x>::setIddLoadConfigRva(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].VirtualAddress = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].VirtualAddress = dwValue;
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddLoadConfigSize(dword dwValue)
+        void PeHeaderT<x>::setIddLoadConfigSize(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].Size = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].Size = dwValue;
-        }
+        }
-        
+        
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddResourceRva(dword dwValue)
+        void PeHeaderT<x>::setIddResourceRva(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = dwValue;
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddResourceSize(dword dwValue)
+        void PeHeaderT<x>::setIddResourceSize(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = dwValue;
-        }
+        }
-        
+        
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddSecurityRva(dword dwValue)
+        void PeHeaderT<x>::setIddSecurityRva(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY].VirtualAddress = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY].VirtualAddress = dwValue;
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddSecuritySize(dword dwValue)
+        void PeHeaderT<x>::setIddSecuritySize(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY].Size = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY].Size = dwValue;
-        }
+        }
-        
+        
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddTlsRva(dword dwValue)
+        void PeHeaderT<x>::setIddTlsRva(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_TLS].VirtualAddress = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_TLS].VirtualAddress = dwValue;
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddTlsSize(dword dwValue)
+        void PeHeaderT<x>::setIddTlsSize(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_TLS].Size = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_TLS].Size = dwValue;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Changes the rva of the file's export directory.
+        * Changes the rva of the file's export directory.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddExportRva(dword dwValue)
+        void PeHeaderT<x>::setIddExportRva(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the size of the file's export directory.
+        * Changes the size of the file's export directory.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddExportSize(dword dwValue)
+        void PeHeaderT<x>::setIddExportSize(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT].Size = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT].Size = dwValue;
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddBaseRelocRva(dword value)
+        void PeHeaderT<x>::setIddBaseRelocRva(dword value)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = value;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = value;
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddBaseRelocSize(dword value)
+        void PeHeaderT<x>::setIddBaseRelocSize(dword value)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = value;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = value;
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddArchitectureRva(dword value)
+        void PeHeaderT<x>::setIddArchitectureRva(dword value)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE].VirtualAddress = value;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE].VirtualAddress = value;
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddArchitectureSize(dword value)
+        void PeHeaderT<x>::setIddArchitectureSize(dword value)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE].Size = value;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE].Size = value;
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddComHeaderRva(dword value)
+        void PeHeaderT<x>::setIddComHeaderRva(dword value)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress = value;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress = value;
-        }
+        }
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddComHeaderSize(dword value)
+        void PeHeaderT<x>::setIddComHeaderSize(dword value)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size = value;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size = value;
-        }
+        }
-        /**
+        /**
-        * Changes the rva of the file's import directory.
+        * Changes the rva of the file's import directory.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddImportRva(dword dwValue)
+        void PeHeaderT<x>::setIddImportRva(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the size of the file's import directory.
+        * Changes the size of the file's import directory.
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setIddImportSize(dword dwValue)
+        void PeHeaderT<x>::setIddImportSize(dword dwValue)
-        {
+        {
-                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT].Size = dwValue;
+                m_inthHeader.dataDirectories[PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT].Size = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the name of a section.
+        * Changes the name of a section.
-        * @param wSectionnr Identifier of the section
+        * @param wSectionnr Identifier of the section
-        * @param strName New name.
+        * @param strName New name.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setSectionName(word wSectionnr, std::string strName)
+        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));
+                strncpy(reinterpret_cast<char*>(m_vIsh[wSectionnr].Name), strName.c_str(), sizeof(m_vIsh[wSectionnr].Name));
-        }
+        }
-        /**
+        /**
-        * Changes the virtual size of a section.
+        * Changes the virtual size of a section.
-        * @param wSectionnr Identifier of the section
+        * @param wSectionnr Identifier of the section
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setVirtualSize(word wSectionnr, dword dwValue)
+        void PeHeaderT<x>::setVirtualSize(word wSectionnr, dword dwValue)
-        {
+        {
-                m_vIsh[wSectionnr].VirtualSize = dwValue;
+                m_vIsh[wSectionnr].VirtualSize = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the virtual address of a section.
+        * Changes the virtual address of a section.
-        * @param wSectionnr Identifier of the section
+        * @param wSectionnr Identifier of the section
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setVirtualAddress(word wSectionnr, dword dwValue)
+        void PeHeaderT<x>::setVirtualAddress(word wSectionnr, dword dwValue)
-        {
+        {
-                m_vIsh[wSectionnr].VirtualAddress = dwValue;
+                m_vIsh[wSectionnr].VirtualAddress = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the size of raw data of a section.
+        * Changes the size of raw data of a section.
-        * @param wSectionnr Identifier of the section
+        * @param wSectionnr Identifier of the section
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setSizeOfRawData(word wSectionnr, dword dwValue)
+        void PeHeaderT<x>::setSizeOfRawData(word wSectionnr, dword dwValue)
-        {
+        {
-                m_vIsh[wSectionnr].SizeOfRawData = dwValue;
+                m_vIsh[wSectionnr].SizeOfRawData = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the size of raw data of a section.
+        * Changes the size of raw data of a section.
-        * @param wSectionnr Identifier of the section
+        * @param wSectionnr Identifier of the section
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setPointerToRawData(word wSectionnr, dword dwValue)
+        void PeHeaderT<x>::setPointerToRawData(word wSectionnr, dword dwValue)
-        {
+        {
-                m_vIsh[wSectionnr].PointerToRawData = dwValue;
+                m_vIsh[wSectionnr].PointerToRawData = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the pointer to relocations of a section.
+        * Changes the pointer to relocations of a section.
-        * @param wSectionnr Identifier of the section
+        * @param wSectionnr Identifier of the section
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setPointerToRelocations(word wSectionnr, dword dwValue)
+        void PeHeaderT<x>::setPointerToRelocations(word wSectionnr, dword dwValue)
-        {
+        {
-                m_vIsh[wSectionnr].PointerToRelocations = dwValue;
+                m_vIsh[wSectionnr].PointerToRelocations = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the pointer to line numbers of a section.
+        * Changes the pointer to line numbers of a section.
-        * @param wSectionnr Identifier of the section
+        * @param wSectionnr Identifier of the section
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setPointerToLinenumbers(word wSectionnr, dword dwValue)
+        void PeHeaderT<x>::setPointerToLinenumbers(word wSectionnr, dword dwValue)
-        {
+        {
-                m_vIsh[wSectionnr].PointerToLinenumbers = dwValue;
+                m_vIsh[wSectionnr].PointerToLinenumbers = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the number of relocations of a section.
+        * Changes the number of relocations of a section.
-        * @param wSectionnr Identifier of the section
+        * @param wSectionnr Identifier of the section
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setNumberOfRelocations(word wSectionnr, dword dwValue)
+        void PeHeaderT<x>::setNumberOfRelocations(word wSectionnr, dword dwValue)
-        {
+        {
-                m_vIsh[wSectionnr].NumberOfRelocations = dwValue;
+                m_vIsh[wSectionnr].NumberOfRelocations = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the number of line numbers of a section.
+        * Changes the number of line numbers of a section.
-        * @param wSectionnr Identifier of the section
+        * @param wSectionnr Identifier of the section
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setNumberOfLinenumbers(word wSectionnr, dword dwValue)
+        void PeHeaderT<x>::setNumberOfLinenumbers(word wSectionnr, dword dwValue)
-        {
+        {
-                m_vIsh[wSectionnr].NumberOfLinenumbers = dwValue;
+                m_vIsh[wSectionnr].NumberOfLinenumbers = dwValue;
-        }
+        }
-        /**
+        /**
-        * Changes the characteristics of a section.
+        * Changes the characteristics of a section.
-        * @param wSectionnr Identifier of the section
+        * @param wSectionnr Identifier of the section
-        * @param dwValue New value.
+        * @param dwValue New value.
-        **/
+        **/
-        template<int x>
+        template<int x>
-        void PeHeaderT<x>::setCharacteristics(word wSectionnr, dword dwValue)
+        void PeHeaderT<x>::setCharacteristics(word wSectionnr, dword dwValue)
-        {
+        {
-                m_vIsh[wSectionnr].Characteristics = dwValue;
+                m_vIsh[wSectionnr].Characteristics = dwValue;
-        }
+        }
-}
+}
-#endif
+#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.
+* PeLib.h - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-/** \mainpage PeLib - An open-source C++ library to modify PE files.
+/** \mainpage PeLib - An open-source C++ library to modify PE files.
-*
+*
-* \section intro Introduction
+* \section intro Introduction
-*
+*
-* <b>What is PeLib?</b><br>
+* <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
+* 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
+#ifndef PELIB_H
-#define PELIB_H
+#define PELIB_H
-#include "PeFile.h"
+#include "PeFile.h"
-#endif
+#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.
+* PeLibAux.cpp - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#include "PeLibInc.h"
+#include "PeLibInc.h"
-#include "PeLibAux.h"
+#include "PeLibAux.h"
-#include "PeFile.h"
+#include "PeFile.h"
-#ifdef _MSC_VER
+#ifdef _MSC_VER
-        #include <ctype.h>
+        #include <ctype.h>
-#endif
+#endif
-namespace PeLib
+namespace PeLib
-{
+{
-    const qword PELIB_IMAGE_ORDINAL_FLAGS<64>::IMAGE_ORDINAL_FLAG = 0x8000000000000000ULL;
+    const qword PELIB_IMAGE_ORDINAL_FLAGS<64>::IMAGE_ORDINAL_FLAG = 0x8000000000000000ULL;
-        
+        
-        bool PELIB_IMAGE_SECTION_HEADER::biggerFileOffset(const PELIB_IMAGE_SECTION_HEADER& ish) const
+        bool PELIB_IMAGE_SECTION_HEADER::biggerFileOffset(const PELIB_IMAGE_SECTION_HEADER& ish) const
-        {
+        {
-                return PointerToRawData < ish.PointerToRawData;
+                return PointerToRawData < ish.PointerToRawData;
-        }
+        }
-        bool PELIB_IMAGE_SECTION_HEADER::biggerVirtualAddress(const PELIB_IMAGE_SECTION_HEADER& ish) const
+        bool PELIB_IMAGE_SECTION_HEADER::biggerVirtualAddress(const PELIB_IMAGE_SECTION_HEADER& ish) const
-        {
+        {
-                return VirtualAddress < ish.VirtualAddress;
+                return VirtualAddress < ish.VirtualAddress;
-        }
+        }
-        unsigned int alignOffset(unsigned int uiOffset, unsigned int uiAlignment)
+        unsigned int alignOffset(unsigned int uiOffset, unsigned int uiAlignment)
-        {
+        {
-                if (!uiAlignment) return uiAlignment;
+                if (!uiAlignment) return uiAlignment;
-                return (uiOffset % uiAlignment) ? uiOffset + (uiAlignment - uiOffset % uiAlignment) : uiOffset;
+                return (uiOffset % uiAlignment) ? uiOffset + (uiAlignment - uiOffset % uiAlignment) : uiOffset;
-        }
+        }
-        unsigned int fileSize(const std::string& filename)
+        unsigned int fileSize(const std::string& filename)
-        {
+        {
-                std::fstream file(filename.c_str());
+                std::fstream file(filename.c_str());
-                file.seekg(0, std::ios::end);
+                file.seekg(0, std::ios::end);
-                return file.tellg();
+                return file.tellg();
-        }
+        }
-        unsigned int fileSize(std::ifstream& file)
+        unsigned int fileSize(std::ifstream& file)
-        {
+        {
-                unsigned int oldpos = file.tellg();
+                unsigned int oldpos = file.tellg();
-                file.seekg(0, std::ios::end);
+                file.seekg(0, std::ios::end);
-                unsigned int filesize = file.tellg();
+                unsigned int filesize = file.tellg();
-                file.seekg(oldpos, std::ios::beg);
+                file.seekg(oldpos, std::ios::beg);
-                return filesize;
+                return filesize;
-        }
+        }
-        
+        
-        unsigned int fileSize(std::fstream& file)
+        unsigned int fileSize(std::fstream& file)
-        {
+        {
-                unsigned int oldpos = file.tellg();
+                unsigned int oldpos = file.tellg();
-                file.seekg(0, std::ios::end);
+                file.seekg(0, std::ios::end);
-                unsigned int filesize = file.tellg();
+                unsigned int filesize = file.tellg();
-                file.seekg(oldpos, std::ios::beg);
+                file.seekg(oldpos, std::ios::beg);
-                return filesize;
+                return filesize;
-        }
+        }
-        
+        
-        unsigned int fileSize(std::ofstream& file)
+        unsigned int fileSize(std::ofstream& file)
-        {
+        {
-                unsigned int oldpos = file.tellp();
+                unsigned int oldpos = file.tellp();
-                file.seekp(0, std::ios::end);
+                file.seekp(0, std::ios::end);
-                unsigned int filesize = file.tellp();
+                unsigned int filesize = file.tellp();
-                file.seekp(oldpos, std::ios::beg);
+                file.seekp(oldpos, std::ios::beg);
-                return filesize;
+                return filesize;
-        }
+        }
-        
+        
-        bool isEqualNc(const std::string& s1, const std::string& s2)
+        bool isEqualNc(const std::string& s1, const std::string& s2)
-        {
+        {
-                std::string t1 = s1;
+                std::string t1 = s1;
-                std::string t2 = s2;
+                std::string t2 = s2;
-        
+        
-                // No std:: to make VC++ happy
+                // No std:: to make VC++ happy
-                #ifdef _MSC_VER
+                #ifdef _MSC_VER
-                        std::transform(t1.begin(), t1.end(), t1.begin(), toupper);
+                        std::transform(t1.begin(), t1.end(), t1.begin(), toupper);
-                        std::transform(t2.begin(), t2.end(), t2.begin(), toupper);
+                        std::transform(t2.begin(), t2.end(), t2.begin(), toupper);
-                #else
+                #else
-                        // Weird syntax to make Borland C++ happy
+                        // Weird syntax to make Borland C++ happy
-                        std::transform(t1.begin(), t1.end(), t1.begin(), (int(*)(int))std::toupper);
+                        std::transform(t1.begin(), t1.end(), t1.begin(), (int(*)(int))std::toupper);
-                        std::transform(t2.begin(), t2.end(), t2.begin(), (int(*)(int))std::toupper);
+                        std::transform(t2.begin(), t2.end(), t2.begin(), (int(*)(int))std::toupper);
-                #endif
+                #endif
-                return t1 == t2;
+                return t1 == t2;
-        }
+        }
-        PELIB_IMAGE_DOS_HEADER::PELIB_IMAGE_DOS_HEADER()
+        PELIB_IMAGE_DOS_HEADER::PELIB_IMAGE_DOS_HEADER()
-        {
+        {
-                e_magic = 0;
+                e_magic = 0;
-                e_cblp = 0;
+                e_cblp = 0;
-                e_cp = 0;
+                e_cp = 0;
-                e_crlc = 0;
+                e_crlc = 0;
-                e_cparhdr = 0;
+                e_cparhdr = 0;
-                e_minalloc = 0;
+                e_minalloc = 0;
-                e_maxalloc = 0;
+                e_maxalloc = 0;
-                e_ss = 0;
+                e_ss = 0;
-                e_sp = 0;
+                e_sp = 0;
-                e_csum = 0;
+                e_csum = 0;
-                e_ip = 0;
+                e_ip = 0;
-                e_cs = 0;
+                e_cs = 0;
-                e_lfarlc = 0;
+                e_lfarlc = 0;
-                e_ovno = 0;
+                e_ovno = 0;
-                for (unsigned int i=0;i<sizeof(e_res)/sizeof(e_res[0]);i++)
+                for (unsigned int i=0;i<sizeof(e_res)/sizeof(e_res[0]);i++)
-                {
+                {
-                        e_res[i] = 0;
+                        e_res[i] = 0;
-                }
+                }
-                e_oemid = 0;
+                e_oemid = 0;
-                e_oeminfo = 0;
+                e_oeminfo = 0;
-                for (unsigned int i=0;i<sizeof(e_res2)/sizeof(e_res2[0]);i++)
+                for (unsigned int i=0;i<sizeof(e_res2)/sizeof(e_res2[0]);i++)
-                {
+                {
-                        e_res2[i] = 0;
+                        e_res2[i] = 0;
-                }
+                }
-                e_lfanew = 0;
+                e_lfanew = 0;
-        }
+        }
-        PELIB_EXP_FUNC_INFORMATION::PELIB_EXP_FUNC_INFORMATION()
+        PELIB_EXP_FUNC_INFORMATION::PELIB_EXP_FUNC_INFORMATION()
-        {
+        {
-                addroffunc = 0;
+                addroffunc = 0;
-                addrofname = 0;
+                addrofname = 0;
-                ordinal = 0;
+                ordinal = 0;
-        }
+        }
-        PELIB_IMAGE_RESOURCE_DIRECTORY::PELIB_IMAGE_RESOURCE_DIRECTORY()
+        PELIB_IMAGE_RESOURCE_DIRECTORY::PELIB_IMAGE_RESOURCE_DIRECTORY()
-        {
+        {
-                Characteristics = 0;
+                Characteristics = 0;
-                TimeDateStamp = 0;
+                TimeDateStamp = 0;
-                MajorVersion = 0;
+                MajorVersion = 0;
-                MinorVersion = 0;
+                MinorVersion = 0;
-                NumberOfNamedEntries = 0;
+                NumberOfNamedEntries = 0;
-                NumberOfIdEntries = 0;
+                NumberOfIdEntries = 0;
-        }
+        }
-        PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY::PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY()
+        PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY::PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY()
-        {
+        {
-                Name = 0;
+                Name = 0;
-                OffsetToData = 0;
+                OffsetToData = 0;
-        }
+        }
-        bool PELIB_IMG_RES_DIR_ENTRY::operator<(const PELIB_IMG_RES_DIR_ENTRY& first) const
+        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)
+                if (irde.Name & PELIB_IMAGE_RESOURCE_NAME_IS_STRING && first.irde.Name & PELIB_IMAGE_RESOURCE_NAME_IS_STRING)
-                {
+                {
-                        return wstrName < first.wstrName;
+                        return wstrName < first.wstrName;
-                }
+                }
-                else if (irde.Name & PELIB_IMAGE_RESOURCE_NAME_IS_STRING)
+                else if (irde.Name & PELIB_IMAGE_RESOURCE_NAME_IS_STRING)
-                {
+                {
-                        return true;
+                        return true;
-                }
+                }
-                else if (first.irde.Name & PELIB_IMAGE_RESOURCE_NAME_IS_STRING)
+                else if (first.irde.Name & PELIB_IMAGE_RESOURCE_NAME_IS_STRING)
-                {
+                {
-                        return false;
+                        return false;
-                }
+                }
-                else
+                else
-                {
+                {
-                        return irde.Name < first.irde.Name;
+                        return irde.Name < first.irde.Name;
-                }
+                }
-        }
+        }
-        PELIB_IMAGE_BASE_RELOCATION::PELIB_IMAGE_BASE_RELOCATION()
+        PELIB_IMAGE_BASE_RELOCATION::PELIB_IMAGE_BASE_RELOCATION()
-        {
+        {
-                VirtualAddress = 0;
+                VirtualAddress = 0;
-                SizeOfBlock = 0;
+                SizeOfBlock = 0;
-        }
+        }
-        PELIB_IMAGE_COR20_HEADER::PELIB_IMAGE_COR20_HEADER()
+        PELIB_IMAGE_COR20_HEADER::PELIB_IMAGE_COR20_HEADER()
-        {
+        {
-                cb = 0;
+                cb = 0;
-                MajorRuntimeVersion = 0;
+                MajorRuntimeVersion = 0;
-                MinorRuntimeVersion = 0;
+                MinorRuntimeVersion = 0;
-                MetaData.VirtualAddress = 0;
+                MetaData.VirtualAddress = 0;
-                MetaData.Size = 0;
+                MetaData.Size = 0;
-                Flags = 0;
+                Flags = 0;
-                EntryPointToken = 0;
+                EntryPointToken = 0;
-                Resources.VirtualAddress = 0;
+                Resources.VirtualAddress = 0;
-                Resources.Size = 0;
+                Resources.Size = 0;
-                StrongNameSignature.VirtualAddress = 0;
+                StrongNameSignature.VirtualAddress = 0;
-                StrongNameSignature.Size = 0;
+                StrongNameSignature.Size = 0;
-                CodeManagerTable.VirtualAddress = 0;
+                CodeManagerTable.VirtualAddress = 0;
-                CodeManagerTable.Size = 0;
+                CodeManagerTable.Size = 0;
-                VTableFixups.VirtualAddress = 0;
+                VTableFixups.VirtualAddress = 0;
-                VTableFixups.Size = 0;
+                VTableFixups.Size = 0;
-                ExportAddressTableJumps.VirtualAddress = 0;
+                ExportAddressTableJumps.VirtualAddress = 0;
-                ExportAddressTableJumps.Size = 0;
+                ExportAddressTableJumps.Size = 0;
-                ManagedNativeHeader.VirtualAddress = 0;
+                ManagedNativeHeader.VirtualAddress = 0;
-                ManagedNativeHeader.Size = 0;
+                ManagedNativeHeader.Size = 0;
-        }
+        }
-        /** Compares the passed filename to the struct's filename.
+        /** Compares the passed filename to the struct's filename.
-        * @param strModuleName A filename.
+        * @param strModuleName A filename.
-        * @return True, if the passed filename equals the struct's filename. The comparison is case-sensitive.
+        * @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
+        bool PELIB_IMAGE_BOUND_DIRECTORY::equal(const std::string strModuleName) const
-        {
+        {
-                return this->strModuleName == strModuleName;
+                return this->strModuleName == strModuleName;
-        }
+        }
-        bool PELIB_EXP_FUNC_INFORMATION::equal(const std::string strFunctionName) const
+        bool PELIB_EXP_FUNC_INFORMATION::equal(const std::string strFunctionName) const
-        {
+        {
-                return isEqualNc(this->funcname, strFunctionName);
+                return isEqualNc(this->funcname, strFunctionName);
-        }
+        }
-        
+        
-        /**
+        /**
-        * @param strFilename Name of a file.
+        * @param strFilename Name of a file.
-        * @return Either PEFILE32, PEFILE64 or PEFILE_UNKNOWN
+        * @return Either PEFILE32, PEFILE64 or PEFILE_UNKNOWN
-        **/
+        **/
-        unsigned int getFileType(const std::string strFilename)
+        unsigned int getFileType(const std::string strFilename)
-        {
+        {
-                word machine, magic;
+                word machine, magic;
-                
+                
-                PeFile32 pef(strFilename);
+                PeFile32 pef(strFilename);
-                if (pef.readMzHeader() != NO_ERROR) return PEFILE_UNKNOWN;
+                if (pef.readMzHeader() != NO_ERROR) return PEFILE_UNKNOWN;
-                if (pef.readPeHeader() != NO_ERROR) return PEFILE_UNKNOWN;
+                if (pef.readPeHeader() != NO_ERROR) return PEFILE_UNKNOWN;
-                        
+                        
-                machine = pef.peHeader().getMachine();
+                machine = pef.peHeader().getMachine();
-                magic = pef.peHeader().getMagic();
+                magic = pef.peHeader().getMagic();
-        
+        
-                if (machine == PELIB_IMAGE_FILE_MACHINE_I386 && magic == PELIB_IMAGE_NT_OPTIONAL_HDR32_MAGIC)
+                if (machine == PELIB_IMAGE_FILE_MACHINE_I386 && magic == PELIB_IMAGE_NT_OPTIONAL_HDR32_MAGIC)
-                {
+                {
-                        return PEFILE32;
+                        return PEFILE32;
-                }
+                }
-                // 0x8664 == AMD64; no named constant yet
+                // 0x8664 == AMD64; no named constant yet
-                else if ((machine == 0x8664 || machine == PELIB_IMAGE_FILE_MACHINE_IA64) && magic == PELIB_IMAGE_NT_OPTIONAL_HDR64_MAGIC)
+                else if ((machine == 0x8664 || machine == PELIB_IMAGE_FILE_MACHINE_IA64) && magic == PELIB_IMAGE_NT_OPTIONAL_HDR64_MAGIC)
-                {
+                {
-                        return PEFILE64;
+                        return PEFILE64;
-                }
+                }
-                else
+                else
-                {
+                {
-                        return PEFILE_UNKNOWN;
+                        return PEFILE_UNKNOWN;
-                }
+                }
-        }
+        }
-        
+        
-        /**
+        /**
-        * Opens a PE file. The return type is either PeFile32 or PeFile64 object. If an error occurs the return
+        * Opens a PE file. The return type is either PeFile32 or PeFile64 object. If an error occurs the return
-        * value is 0.
+        * value is 0.
-        * @param strFilename Name of a file.
+        * @param strFilename Name of a file.
-        * @return Either a PeFile32 object, a PeFil64 object or 0.
+        * @return Either a PeFile32 object, a PeFil64 object or 0.
-        **/
+        **/
-        PeFile* openPeFile(const std::string& strFilename)
+        PeFile* openPeFile(const std::string& strFilename)
-        {
+        {
-                unsigned int type = getFileType(strFilename);
+                unsigned int type = getFileType(strFilename);
-                
+                
-                if (type == PEFILE32)
+                if (type == PEFILE32)
-                {
+                {
-                        return new PeFile32(strFilename);
+                        return new PeFile32(strFilename);
-                }
+                }
-                else if (type == PEFILE64)
+                else if (type == PEFILE64)
-                {
+                {
-                        return new PeFile64(strFilename);
+                        return new PeFile64(strFilename);
-                }
+                }
-                else
+                else
-                {
+                {
-                        return 0;
+                        return 0;
-                }
+                }
-        }
+        }
-        
+        
-        unsigned int PELIB_IMAGE_BOUND_DIRECTORY::size() const
+        unsigned int PELIB_IMAGE_BOUND_DIRECTORY::size() const
-        {
+        {
-                unsigned int size = 0;
+                unsigned int size = 0;
-                for (unsigned int i=0;i<moduleForwarders.size();i++)
+                for (unsigned int i=0;i<moduleForwarders.size();i++)
-                {
+                {
-                        size += moduleForwarders[i].size();
+                        size += moduleForwarders[i].size();
-                }
+                }
-                return size + PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR::size() + strModuleName.size() + 1;
+                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.
+* PeLibAux.cpp - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#ifndef PELIBAUX_H
+#ifndef PELIBAUX_H
-#define PELIBAUX_H
+#define PELIBAUX_H
-//#include "PeLibInc.h"
+//#include "PeLibInc.h"
-//#include "PeHeader.h"
+//#include "PeHeader.h"
-#include "buffer/OutputBuffer.h"
+#include "buffer/OutputBuffer.h"
-#include "buffer/InputBuffer.h"
+#include "buffer/InputBuffer.h"
-//#include "buffer/ResTree.h"
+//#include "buffer/ResTree.h"
-#include <numeric>
+#include <numeric>
-#include <limits>
+#include <limits>
-namespace PeLib
+namespace PeLib
-{
+{
-        enum errorCodes
+        enum errorCodes
-        {
+        {
-                NO_ERROR = 0,
+                NO_ERROR = 0,
-                ERROR_OPENING_FILE = -1,
+                ERROR_OPENING_FILE = -1,
-                ERROR_INVALID_FILE = -2,
+                ERROR_INVALID_FILE = -2,
-                ERROR_TOO_MANY_SECTIONS = -3,
+                ERROR_TOO_MANY_SECTIONS = -3,
-                ERROR_NOT_ENOUGH_SPACE = -4,
+                ERROR_NOT_ENOUGH_SPACE = -4,
-                ERROR_NO_FILE_ALIGNMENT = -5,
+                ERROR_NO_FILE_ALIGNMENT = -5,
-                ERROR_NO_SECTION_ALIGNMENT = -6,
+                ERROR_NO_SECTION_ALIGNMENT = -6,
-                ERROR_ENTRY_NOT_FOUND = -7,
+                ERROR_ENTRY_NOT_FOUND = -7,
-                ERROR_DUPLICATE_ENTRY = -8,
+                ERROR_DUPLICATE_ENTRY = -8,
-                ERROR_DIRECTORY_DOES_NOT_EXIST = -9
+                ERROR_DIRECTORY_DOES_NOT_EXIST = -9
-        };
+        };
-        class PeFile;
+        class PeFile;
-        bool isEqualNc(const std::string& s1, const std::string& s2);
+        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,
+// 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
+// a 16bit type and a bit type. That's because binary PE files are pretty picky about their
-// structure.
+// structure.
-        #if CHAR_BIT == 8
+        #if CHAR_BIT == 8
-                #if UCHAR_MAX == 255
+                #if UCHAR_MAX == 255
-                        typedef unsigned char byte;
+                        typedef unsigned char byte;
-        //              typedef std::bitset<8> byte;
+        //              typedef std::bitset<8> byte;
-                #else
+                #else
-                        #error You need to change some typedefs (Code: 8). Please read the PeLib documentation.
+                        #error You need to change some typedefs (Code: 8). Please read the PeLib documentation.
-                #endif
+                #endif
-        
+        
-                #if USHRT_MAX == 65535U
+                #if USHRT_MAX == 65535U
-                        typedef unsigned short word;
+                        typedef unsigned short word;
-        //              typedef std::bitset<16> word;
+        //              typedef std::bitset<16> word;
-                #else
+                #else
-                        #error You need to change some typedefs (Code: 16). Please read the PeLib documentation.
+                        #error You need to change some typedefs (Code: 16). Please read the PeLib documentation.
-                #endif
+                #endif
-        
+        
-                #if UINT_MAX == 4294967295UL
+                #if UINT_MAX == 4294967295UL
-                        typedef unsigned int dword;
+                        typedef unsigned int dword;
-        //              typedef std::bitset<32> dword;
+        //              typedef std::bitset<32> dword;
-                #else
+                #else
-                        #error You need to change some typedefs (Code: 32). Please read the PeLib documentation.
+                        #error You need to change some typedefs (Code: 32). Please read the PeLib documentation.
-                #endif
+                #endif
-                typedef unsigned long long qword;
+                typedef unsigned long long qword;
-        
+        
-//              #if ULLONG_MAX == 18446744073709551615
+//              #if ULLONG_MAX == 18446744073709551615
-//                      typedef unsigned long long qword;
+//                      typedef unsigned long long qword;
-//              #else
+//              #else
-//                      #error You need to change some typedefs (Code: 32). Please read the PeLib documentation.
+//                      #error You need to change some typedefs (Code: 32). Please read the PeLib documentation.
-//              #endif
+//              #endif
-        #else
+        #else
-                #error You need to change some typedefs. Please read the PeLib documentation.
+                #error You need to change some typedefs. Please read the PeLib documentation.
-        #endif
+        #endif
-/*      enum bits {BITS_BYTE = 8, BITS_WORD = 16, BITS_DWORD = 32};
+/*      enum bits {BITS_BYTE = 8, BITS_WORD = 16, BITS_DWORD = 32};
-        template<bits value>
+        template<bits value>
-        class DataType
+        class DataType
-        {
+        {
-                private:
+                private:
-                  std::bitset<value> bsValue;
+                  std::bitset<value> bsValue;
-                  unsigned long ulValue;
+                  unsigned long ulValue;
-          
+          
-                public:
+                public:
-                  void operator=(unsigned long ulValue)
+                  void operator=(unsigned long ulValue)
-                  {
+                  {
-                        bsValue = ulValue;
+                        bsValue = ulValue;
-                  }
+                  }
-                  operator unsigned long() const
+                  operator unsigned long() const
-                  {
+                  {
-                        return bsValue.to_ulong();
+                        return bsValue.to_ulong();
-                  }
+                  }
-                  
+                  
-                  const int operator&()
+                  const int operator&()
-                  {
+                  {
-                        ulValue = bsValue;
+                        ulValue = bsValue;
-                        return ulValue; 
+                        return ulValue; 
-                  }
+                  }
-        };
+        };
-        typedef DataType<BITS_BYTE> byte;
+        typedef DataType<BITS_BYTE> byte;
-        typedef DataType<BITS_WORD> word;
+        typedef DataType<BITS_WORD> word;
-        typedef DataType<BITS_DWORD> dword;
+        typedef DataType<BITS_DWORD> dword;
-*/
+*/
-        enum {PEFILE32 = 32,
+        enum {PEFILE32 = 32,
-                  PEFILE64 = 64,
+                  PEFILE64 = 64,
-                  PEFILE_UNKNOWN = 0};
+                  PEFILE_UNKNOWN = 0};
-        enum {BoundImportDirectoryId = 1,
+        enum {BoundImportDirectoryId = 1,
-              ComHeaderDirectoryId,
+              ComHeaderDirectoryId,
-              ExportDirectoryId,
+              ExportDirectoryId,
-              IatDirectoryId,
+              IatDirectoryId,
-              ImportDirectoryId,
+              ImportDirectoryId,
-              MzHeaderId,
+              MzHeaderId,
-              PeHeaderId,
+              PeHeaderId,
-              RelocationsId,
+              RelocationsId,
-              PeFileId,
+              PeFileId,
-              ResourceDirectoryId,
+              ResourceDirectoryId,
-              DebugDirectoryId,
+              DebugDirectoryId,
-              TlsDirectoryId
+              TlsDirectoryId
-        };
+        };
-        const word PELIB_IMAGE_DOS_SIGNATURE = 0x5A4D;
+        const word PELIB_IMAGE_DOS_SIGNATURE = 0x5A4D;
-        
+        
-        const dword PELIB_IMAGE_NT_SIGNATURE = 0x00004550;
+        const dword PELIB_IMAGE_NT_SIGNATURE = 0x00004550;
-        template<int bits>
+        template<int bits>
-        struct PELIB_IMAGE_ORDINAL_FLAGS;
+        struct PELIB_IMAGE_ORDINAL_FLAGS;
-        
+        
-        template<>
+        template<>
-        struct PELIB_IMAGE_ORDINAL_FLAGS<32>
+        struct PELIB_IMAGE_ORDINAL_FLAGS<32>
-        {
+        {
-                static const dword IMAGE_ORDINAL_FLAG = 0x80000000;
+                static const dword IMAGE_ORDINAL_FLAG = 0x80000000;
-        };
+        };
-        
+        
-        template<>
+        template<>
-        struct PELIB_IMAGE_ORDINAL_FLAGS<64>
+        struct PELIB_IMAGE_ORDINAL_FLAGS<64>
-        {
+        {
-                static const qword IMAGE_ORDINAL_FLAG;
+                static const qword IMAGE_ORDINAL_FLAG;
-        };
+        };
-        const unsigned long PELIB_IMAGE_NUMBEROF_DIRECTORY_ENTRIES = 16;
+        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_NAME_IS_STRING = 0x80000000;
-        const unsigned long PELIB_IMAGE_RESOURCE_DATA_IS_DIRECTORY = 0x80000000;
+        const unsigned long PELIB_IMAGE_RESOURCE_DATA_IS_DIRECTORY = 0x80000000;
-        enum
+        enum
-        {
+        {
-                PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT,             // OK
+                PELIB_IMAGE_DIRECTORY_ENTRY_EXPORT,             // OK
-                PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT,             // OK
+                PELIB_IMAGE_DIRECTORY_ENTRY_IMPORT,             // OK
-                PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE,           // OK
+                PELIB_IMAGE_DIRECTORY_ENTRY_RESOURCE,           // OK
-                PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION,
+                PELIB_IMAGE_DIRECTORY_ENTRY_EXCEPTION,
-                PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY,
+                PELIB_IMAGE_DIRECTORY_ENTRY_SECURITY,
-                PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC,  // OK
+                PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC,  // OK
-                PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG,
+                PELIB_IMAGE_DIRECTORY_ENTRY_DEBUG,
-                PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE,
+                PELIB_IMAGE_DIRECTORY_ENTRY_ARCHITECTURE,
-                PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR,
+                PELIB_IMAGE_DIRECTORY_ENTRY_GLOBALPTR,
-                PELIB_IMAGE_DIRECTORY_ENTRY_TLS,
+                PELIB_IMAGE_DIRECTORY_ENTRY_TLS,
-                PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG,
+                PELIB_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG,
-                PELIB_IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT,       // OK
+                PELIB_IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT,       // OK
-                PELIB_IMAGE_DIRECTORY_ENTRY_IAT,                // OK
+                PELIB_IMAGE_DIRECTORY_ENTRY_IAT,                // OK
-                PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT,
+                PELIB_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT,
-                PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR
+                PELIB_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR
-        };
+        };
-        enum
+        enum
-        {
+        {
-                PELIB_IMAGE_SCN_TYPE_NO_PAD             = 0x00000008,
+                PELIB_IMAGE_SCN_TYPE_NO_PAD             = 0x00000008,
-                PELIB_IMAGE_SCN_CNT_CODE                   = 0x00000020,
+                PELIB_IMAGE_SCN_CNT_CODE                   = 0x00000020,
-                PELIB_IMAGE_SCN_CNT_INITIALIZED_DATA       = 0x00000040,
+                PELIB_IMAGE_SCN_CNT_INITIALIZED_DATA       = 0x00000040,
-                PELIB_IMAGE_SCN_CNT_UNINITIALIZED_DATA     = 0x00000080,
+                PELIB_IMAGE_SCN_CNT_UNINITIALIZED_DATA     = 0x00000080,
-                PELIB_IMAGE_SCN_LNK_OTHER                 = 0x00000100,
+                PELIB_IMAGE_SCN_LNK_OTHER                 = 0x00000100,
-                PELIB_IMAGE_SCN_LNK_INFO                   = 0x00000200,
+                PELIB_IMAGE_SCN_LNK_INFO                   = 0x00000200,
-                PELIB_IMAGE_SCN_LNK_REMOVE               = 0x00000800,
+                PELIB_IMAGE_SCN_LNK_REMOVE               = 0x00000800,
-                PELIB_IMAGE_SCN_LNK_COMDAT               = 0x00001000,
+                PELIB_IMAGE_SCN_LNK_COMDAT               = 0x00001000,
-                PELIB_IMAGE_SCN_NO_DEFER_SPEC_EXC         = 0x00004000,
+                PELIB_IMAGE_SCN_NO_DEFER_SPEC_EXC         = 0x00004000,
-                PELIB_IMAGE_SCN_GPREL                 = 0x00008000,
+                PELIB_IMAGE_SCN_GPREL                 = 0x00008000,
-                PELIB_IMAGE_SCN_MEM_FARDATA             = 0x00008000,
+                PELIB_IMAGE_SCN_MEM_FARDATA             = 0x00008000,
-                PELIB_IMAGE_SCN_MEM_PURGEABLE         = 0x00020000,
+                PELIB_IMAGE_SCN_MEM_PURGEABLE         = 0x00020000,
-                PELIB_IMAGE_SCN_MEM_16BIT                 = 0x00020000,
+                PELIB_IMAGE_SCN_MEM_16BIT                 = 0x00020000,
-                PELIB_IMAGE_SCN_MEM_LOCKED               = 0x00040000,
+                PELIB_IMAGE_SCN_MEM_LOCKED               = 0x00040000,
-                PELIB_IMAGE_SCN_MEM_PRELOAD             = 0x00080000,
+                PELIB_IMAGE_SCN_MEM_PRELOAD             = 0x00080000,
-                PELIB_IMAGE_SCN_ALIGN_1BYTES           = 0x00100000,
+                PELIB_IMAGE_SCN_ALIGN_1BYTES           = 0x00100000,
-                PELIB_IMAGE_SCN_ALIGN_2BYTES           = 0x00200000,
+                PELIB_IMAGE_SCN_ALIGN_2BYTES           = 0x00200000,
-                PELIB_IMAGE_SCN_ALIGN_4BYTES           = 0x00300000,
+                PELIB_IMAGE_SCN_ALIGN_4BYTES           = 0x00300000,
-                PELIB_IMAGE_SCN_ALIGN_8BYTES           = 0x00400000,
+                PELIB_IMAGE_SCN_ALIGN_8BYTES           = 0x00400000,
-                PELIB_IMAGE_SCN_ALIGN_16BYTES         = 0x00500000,
+                PELIB_IMAGE_SCN_ALIGN_16BYTES         = 0x00500000,
-                PELIB_IMAGE_SCN_ALIGN_BYTES             = 0x00600000,
+                PELIB_IMAGE_SCN_ALIGN_BYTES             = 0x00600000,
-                PELIB_IMAGE_SCN_ALIGN_64BYTES         = 0x00700000,
+                PELIB_IMAGE_SCN_ALIGN_64BYTES         = 0x00700000,
-                PELIB_IMAGE_SCN_ALIGN_128BYTES       = 0x00800000,
+                PELIB_IMAGE_SCN_ALIGN_128BYTES       = 0x00800000,
-                PELIB_IMAGE_SCN_ALIGN_256BYTES       = 0x00900000,
+                PELIB_IMAGE_SCN_ALIGN_256BYTES       = 0x00900000,
-                PELIB_IMAGE_SCN_ALIGN_512BYTES       = 0x00A00000,
+                PELIB_IMAGE_SCN_ALIGN_512BYTES       = 0x00A00000,
-                PELIB_IMAGE_SCN_ALIGN_1024BYTES     = 0x00B00000,
+                PELIB_IMAGE_SCN_ALIGN_1024BYTES     = 0x00B00000,
-                PELIB_IMAGE_SCN_ALIGN_2048BYTES     = 0x00C00000,
+                PELIB_IMAGE_SCN_ALIGN_2048BYTES     = 0x00C00000,
-                PELIB_IMAGE_SCN_ALIGN_4096BYTES     = 0x00D00000,
+                PELIB_IMAGE_SCN_ALIGN_4096BYTES     = 0x00D00000,
-                PELIB_IMAGE_SCN_ALIGN_8192BYTES     = 0x00E00000,
+                PELIB_IMAGE_SCN_ALIGN_8192BYTES     = 0x00E00000,
-                PELIB_IMAGE_SCN_LNK_NRELOC_OVFL     = 0x01000000,
+                PELIB_IMAGE_SCN_LNK_NRELOC_OVFL     = 0x01000000,
-                PELIB_IMAGE_SCN_MEM_DISCARDABLE     = 0x02000000,
+                PELIB_IMAGE_SCN_MEM_DISCARDABLE     = 0x02000000,
-                PELIB_IMAGE_SCN_MEM_NOT_CACHED       = 0x04000000,
+                PELIB_IMAGE_SCN_MEM_NOT_CACHED       = 0x04000000,
-                PELIB_IMAGE_SCN_MEM_NOT_PAGED         = 0x08000000,
+                PELIB_IMAGE_SCN_MEM_NOT_PAGED         = 0x08000000,
-                PELIB_IMAGE_SCN_MEM_SHARED               = 0x10000000,
+                PELIB_IMAGE_SCN_MEM_SHARED               = 0x10000000,
-                PELIB_IMAGE_SCN_MEM_EXECUTE             = 0x20000000,
+                PELIB_IMAGE_SCN_MEM_EXECUTE             = 0x20000000,
-                PELIB_IMAGE_SCN_MEM_READ                   = 0x40000000,
+                PELIB_IMAGE_SCN_MEM_READ                   = 0x40000000,
-                PELIB_IMAGE_SCN_MEM_WRITE                 = 0x80000000
+                PELIB_IMAGE_SCN_MEM_WRITE                 = 0x80000000
-        };
+        };
-        enum
+        enum
-        {
+        {
-                PELIB_IMAGE_FILE_MACHINE_UNKNOWN           = 0,
+                PELIB_IMAGE_FILE_MACHINE_UNKNOWN           = 0,
-                PELIB_IMAGE_FILE_MACHINE_I386         = 0x014c,
+                PELIB_IMAGE_FILE_MACHINE_I386         = 0x014c,
-                PELIB_IMAGE_FILE_MACHINE_R3000       = 0x0162,
+                PELIB_IMAGE_FILE_MACHINE_R3000       = 0x0162,
-                PELIB_IMAGE_FILE_MACHINE_R4000       = 0x0166,
+                PELIB_IMAGE_FILE_MACHINE_R4000       = 0x0166,
-                PELIB_IMAGE_FILE_MACHINE_R10000     = 0x0168,
+                PELIB_IMAGE_FILE_MACHINE_R10000     = 0x0168,
-                PELIB_IMAGE_FILE_MACHINE_WCEMIPSV2       = 0x0169,
+                PELIB_IMAGE_FILE_MACHINE_WCEMIPSV2       = 0x0169,
-                PELIB_IMAGE_FILE_MACHINE_ALPHA       = 0x0184,
+                PELIB_IMAGE_FILE_MACHINE_ALPHA       = 0x0184,
-                PELIB_IMAGE_FILE_MACHINE_POWERPC           = 0x01F0,
+                PELIB_IMAGE_FILE_MACHINE_POWERPC           = 0x01F0,
-                PELIB_IMAGE_FILE_MACHINE_SH3           = 0x01a2,
+                PELIB_IMAGE_FILE_MACHINE_SH3           = 0x01a2,
-                PELIB_IMAGE_FILE_MACHINE_SH3E         = 0x01a4,
+                PELIB_IMAGE_FILE_MACHINE_SH3E         = 0x01a4,
-                PELIB_IMAGE_FILE_MACHINE_SH4           = 0x01a6,
+                PELIB_IMAGE_FILE_MACHINE_SH4           = 0x01a6,
-                PELIB_IMAGE_FILE_MACHINE_ARM           = 0x01c0,
+                PELIB_IMAGE_FILE_MACHINE_ARM           = 0x01c0,
-                PELIB_IMAGE_FILE_MACHINE_THUMB       = 0x01c2,
+                PELIB_IMAGE_FILE_MACHINE_THUMB       = 0x01c2,
-                PELIB_IMAGE_FILE_MACHINE_IA64         = 0x0200,
+                PELIB_IMAGE_FILE_MACHINE_IA64         = 0x0200,
-                PELIB_IMAGE_FILE_MACHINE_MIPS16     = 0x0266,
+                PELIB_IMAGE_FILE_MACHINE_MIPS16     = 0x0266,
-                PELIB_IMAGE_FILE_MACHINE_MIPSFPU           = 0x0366,
+                PELIB_IMAGE_FILE_MACHINE_MIPSFPU           = 0x0366,
-                PELIB_IMAGE_FILE_MACHINE_MIPSFPU16       = 0x0466,
+                PELIB_IMAGE_FILE_MACHINE_MIPSFPU16       = 0x0466,
-                PELIB_IMAGE_FILE_MACHINE_ALPHA64           = 0x0284,
+                PELIB_IMAGE_FILE_MACHINE_ALPHA64           = 0x0284,
-                PELIB_IMAGE_FILE_MACHINE_AXP64       = PELIB_IMAGE_FILE_MACHINE_ALPHA64
+                PELIB_IMAGE_FILE_MACHINE_AXP64       = PELIB_IMAGE_FILE_MACHINE_ALPHA64
-        };
+        };
-        enum
+        enum
-        {
+        {
-                PELIB_IMAGE_FILE_RELOCS_STRIPPED           = 0x0001,
+                PELIB_IMAGE_FILE_RELOCS_STRIPPED           = 0x0001,
-                PELIB_IMAGE_FILE_EXECUTABLE_IMAGE         = 0x0002,
+                PELIB_IMAGE_FILE_EXECUTABLE_IMAGE         = 0x0002,
-                PELIB_IMAGE_FILE_LINE_NUMS_STRIPPED     = 0x0004,
+                PELIB_IMAGE_FILE_LINE_NUMS_STRIPPED     = 0x0004,
-                PELIB_IMAGE_FILE_LOCAL_SYMS_STRIPPED       = 0x0008,
+                PELIB_IMAGE_FILE_LOCAL_SYMS_STRIPPED       = 0x0008,
-                PELIB_IMAGE_FILE_AGGRESIVE_WS_TRIM       = 0x0010,
+                PELIB_IMAGE_FILE_AGGRESIVE_WS_TRIM       = 0x0010,
-                PELIB_IMAGE_FILE_LARGE_ADDRESS_AWARE       = 0x0020,
+                PELIB_IMAGE_FILE_LARGE_ADDRESS_AWARE       = 0x0020,
-                PELIB_IMAGE_FILE_BYTES_REVERSED_LO       = 0x0080,
+                PELIB_IMAGE_FILE_BYTES_REVERSED_LO       = 0x0080,
-                PELIB_IMAGE_FILE_32BIT_MACHINE       = 0x0100,
+                PELIB_IMAGE_FILE_32BIT_MACHINE       = 0x0100,
-                PELIB_IMAGE_FILE_DEBUG_STRIPPED     = 0x0200,
+                PELIB_IMAGE_FILE_DEBUG_STRIPPED     = 0x0200,
-                PELIB_IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP   = 0x0400,
+                PELIB_IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP   = 0x0400,
-                PELIB_IMAGE_FILE_NET_RUN_FROM_SWAP       = 0x0800,
+                PELIB_IMAGE_FILE_NET_RUN_FROM_SWAP       = 0x0800,
-                PELIB_IMAGE_FILE_SYSTEM             = 0x1000,
+                PELIB_IMAGE_FILE_SYSTEM             = 0x1000,
-                PELIB_IMAGE_FILE_DLL                   = 0x2000,
+                PELIB_IMAGE_FILE_DLL                   = 0x2000,
-                PELIB_IMAGE_FILE_UP_SYSTEM_ONLY     = 0x4000,
+                PELIB_IMAGE_FILE_UP_SYSTEM_ONLY     = 0x4000,
-                PELIB_IMAGE_FILE_BYTES_REVERSED_HI       = 0x8000
+                PELIB_IMAGE_FILE_BYTES_REVERSED_HI       = 0x8000
-        };
+        };
-        enum
+        enum
-        {
+        {
-                PELIB_IMAGE_NT_OPTIONAL_HDR32_MAGIC      = 0x10b,
+                PELIB_IMAGE_NT_OPTIONAL_HDR32_MAGIC      = 0x10b,
-                PELIB_IMAGE_NT_OPTIONAL_HDR64_MAGIC      = 0x20b,
+                PELIB_IMAGE_NT_OPTIONAL_HDR64_MAGIC      = 0x20b,
-                PELIB_IMAGE_ROM_OPTIONAL_HDR_MAGIC       = 0x107
+                PELIB_IMAGE_ROM_OPTIONAL_HDR_MAGIC       = 0x107
-        };
+        };
-        enum
+        enum
-        {
+        {
-                PELIB_IMAGE_SUBSYSTEM_UNKNOWN         = 0,
+                PELIB_IMAGE_SUBSYSTEM_UNKNOWN         = 0,
-                PELIB_IMAGE_SUBSYSTEM_NATIVE           = 1,
+                PELIB_IMAGE_SUBSYSTEM_NATIVE           = 1,
-                PELIB_IMAGE_SUBSYSTEM_WINDOWS_GUI         = 2,
+                PELIB_IMAGE_SUBSYSTEM_WINDOWS_GUI         = 2,
-                PELIB_IMAGE_SUBSYSTEM_WINDOWS_CUI         = 3,
+                PELIB_IMAGE_SUBSYSTEM_WINDOWS_CUI         = 3,
-                PELIB_IMAGE_SUBSYSTEM_OS2_CUI         = 5,
+                PELIB_IMAGE_SUBSYSTEM_OS2_CUI         = 5,
-                PELIB_IMAGE_SUBSYSTEM_POSIX_CUI     = 7,
+                PELIB_IMAGE_SUBSYSTEM_POSIX_CUI     = 7,
-                PELIB_IMAGE_SUBSYSTEM_NATIVE_WINDOWS       = 8,
+                PELIB_IMAGE_SUBSYSTEM_NATIVE_WINDOWS       = 8,
-                PELIB_IMAGE_SUBSYSTEM_WINDOWS_CE_GUI       = 9
+                PELIB_IMAGE_SUBSYSTEM_WINDOWS_CE_GUI       = 9
-        };
+        };
-        enum
+        enum
-        {
+        {
-                PELIB_RT_CURSOR = 1,            // 1
+                PELIB_RT_CURSOR = 1,            // 1
-                PELIB_RT_BITMAP,                        // 2
+                PELIB_RT_BITMAP,                        // 2
-                PELIB_RT_ICON,                  // 3
+                PELIB_RT_ICON,                  // 3
-                PELIB_RT_MENU,                  // 4
+                PELIB_RT_MENU,                  // 4
-                PELIB_RT_DIALOG,                        // 5
+                PELIB_RT_DIALOG,                        // 5
-                PELIB_RT_STRING,                        // 6
+                PELIB_RT_STRING,                        // 6
-                PELIB_RT_FONTDIR,                       // 7
+                PELIB_RT_FONTDIR,                       // 7
-                PELIB_RT_FONT,                  // 8
+                PELIB_RT_FONT,                  // 8
-                PELIB_RT_ACCELERATOR,           // 9
+                PELIB_RT_ACCELERATOR,           // 9
-                PELIB_RT_RCDATA,                        // 10
+                PELIB_RT_RCDATA,                        // 10
-                PELIB_RT_MESSAGETABLE,  // 11
+                PELIB_RT_MESSAGETABLE,  // 11
-                PELIB_RT_GROUP_CURSOR,  // 12
+                PELIB_RT_GROUP_CURSOR,  // 12
-                PELIB_RT_GROUP_ICON = 14,       // 14
+                PELIB_RT_GROUP_ICON = 14,       // 14
-                PELIB_RT_VERSION = 16,
+                PELIB_RT_VERSION = 16,
-                PELIB_RT_DLGINCLUDE,
+                PELIB_RT_DLGINCLUDE,
-                PELIB_RT_PLUGPLAY = 19,
+                PELIB_RT_PLUGPLAY = 19,
-                PELIB_RT_VXD,
+                PELIB_RT_VXD,
-                PELIB_RT_ANICURSOR,
+                PELIB_RT_ANICURSOR,
-                PELIB_RT_ANIICON,
+                PELIB_RT_ANIICON,
-                PELIB_RT_HTML,
+                PELIB_RT_HTML,
-                PELIB_RT_MANIFEST
+                PELIB_RT_MANIFEST
-        };
+        };
-        
+        
-        template<typename T>
+        template<typename T>
-        unsigned int accumulate(unsigned int size, const T& v)
+        unsigned int accumulate(unsigned int size, const T& v)
-        {
+        {
-                return size + v.size();
+                return size + v.size();
-        }
+        }
-        
+        
-        struct PELIB_IMAGE_DOS_HEADER
+        struct PELIB_IMAGE_DOS_HEADER
-        {
+        {
-                word   e_magic;
+                word   e_magic;
-                word   e_cblp;
+                word   e_cblp;
-                word   e_cp;
+                word   e_cp;
-                word   e_crlc;
+                word   e_crlc;
-                word   e_cparhdr;
+                word   e_cparhdr;
-                word   e_minalloc;
+                word   e_minalloc;
-                word   e_maxalloc;
+                word   e_maxalloc;
-                word   e_ss;
+                word   e_ss;
-                word   e_sp;
+                word   e_sp;
-                word   e_csum;
+                word   e_csum;
-                word   e_ip;
+                word   e_ip;
-                word   e_cs;
+                word   e_cs;
-                word   e_lfarlc;
+                word   e_lfarlc;
-                word   e_ovno;
+                word   e_ovno;
-                word   e_res[4];
+                word   e_res[4];
-                word   e_oemid;
+                word   e_oemid;
-                word   e_oeminfo;
+                word   e_oeminfo;
-                word   e_res2[10];
+                word   e_res2[10];
-                dword   e_lfanew;
+                dword   e_lfanew;
-                
+                
-                PELIB_IMAGE_DOS_HEADER();
+                PELIB_IMAGE_DOS_HEADER();
-                
+                
-                static inline unsigned int size() {return 64;}
+                static inline unsigned int size() {return 64;}
-        };
+        };
-        struct PELIB_IMAGE_FILE_HEADER
+        struct PELIB_IMAGE_FILE_HEADER
-        {
+        {
-                word    Machine;
+                word    Machine;
-                word    NumberOfSections;
+                word    NumberOfSections;
-                dword   TimeDateStamp;
+                dword   TimeDateStamp;
-                dword   PointerToSymbolTable;
+                dword   PointerToSymbolTable;
-                dword   NumberOfSymbols;
+                dword   NumberOfSymbols;
-                word    SizeOfOptionalHeader;
+                word    SizeOfOptionalHeader;
-                word    Characteristics;
+                word    Characteristics;
-                
+                
-                PELIB_IMAGE_FILE_HEADER()
+                PELIB_IMAGE_FILE_HEADER()
-                {
+                {
-                        Machine = 0;
+                        Machine = 0;
-                        NumberOfSections = 0;
+                        NumberOfSections = 0;
-                        TimeDateStamp = 0;
+                        TimeDateStamp = 0;
-                        PointerToSymbolTable = 0;
+                        PointerToSymbolTable = 0;
-                        NumberOfSymbols = 0;
+                        NumberOfSymbols = 0;
-                        SizeOfOptionalHeader = 0;
+                        SizeOfOptionalHeader = 0;
-                        Characteristics = 0;
+                        Characteristics = 0;
-                }
+                }
-                
+                
-                static inline unsigned int size() {return 20;}
+                static inline unsigned int size() {return 20;}
-        };
+        };
-        struct PELIB_IMAGE_DATA_DIRECTORY
+        struct PELIB_IMAGE_DATA_DIRECTORY
-        {
+        {
-                dword   VirtualAddress;
+                dword   VirtualAddress;
-                dword   Size;
+                dword   Size;
-                
+                
-                PELIB_IMAGE_DATA_DIRECTORY()
+                PELIB_IMAGE_DATA_DIRECTORY()
-                {
+                {
-                        VirtualAddress = 0;
+                        VirtualAddress = 0;
-                        Size = 0;
+                        Size = 0;
-                }
+                }
-                
+                
-                static inline unsigned int size() {return 8;}
+                static inline unsigned int size() {return 8;}
-        };
+        };
-        template<int>
+        template<int>
-        struct FieldSizes;
+        struct FieldSizes;
-        
+        
-        template<>
+        template<>
-        struct FieldSizes<32>
+        struct FieldSizes<32>
-        {
+        {
-                typedef dword VAR4_8;
+                typedef dword VAR4_8;
-        };
+        };
-        
+        
-        template<>
+        template<>
-        struct FieldSizes<64>
+        struct FieldSizes<64>
-        {
+        {
-                typedef qword VAR4_8;
+                typedef qword VAR4_8;
-        };
+        };
-        
+        
-        template<int x>
+        template<int x>
-        struct PELIB_IMAGE_OPTIONAL_HEADER_BASE
+        struct PELIB_IMAGE_OPTIONAL_HEADER_BASE
-        {
+        {
-                typedef typename FieldSizes<x>::VAR4_8 VAR4_8;
+                typedef typename FieldSizes<x>::VAR4_8 VAR4_8;
-                
+                
-                word    Magic;
+                word    Magic;
-                byte    MajorLinkerVersion;
+                byte    MajorLinkerVersion;
-                byte    MinorLinkerVersion;
+                byte    MinorLinkerVersion;
-                dword   SizeOfCode;
+                dword   SizeOfCode;
-                dword   SizeOfInitializedData;
+                dword   SizeOfInitializedData;
-                dword   SizeOfUninitializedData;
+                dword   SizeOfUninitializedData;
-                dword   AddressOfEntryPoint;
+                dword   AddressOfEntryPoint;
-                dword   BaseOfCode;
+                dword   BaseOfCode;
-                dword   BaseOfData;
+                dword   BaseOfData;
-                VAR4_8  ImageBase;
+                VAR4_8  ImageBase;
-                dword   SectionAlignment;
+                dword   SectionAlignment;
-                dword   FileAlignment;
+                dword   FileAlignment;
-                word    MajorOperatingSystemVersion;
+                word    MajorOperatingSystemVersion;
-                word    MinorOperatingSystemVersion;
+                word    MinorOperatingSystemVersion;
-                word    MajorImageVersion;
+                word    MajorImageVersion;
-                word    MinorImageVersion;
+                word    MinorImageVersion;
-                word    MajorSubsystemVersion;
+                word    MajorSubsystemVersion;
-                word    MinorSubsystemVersion;
+                word    MinorSubsystemVersion;
-                dword   Win32VersionValue;
+                dword   Win32VersionValue;
-                dword   SizeOfImage;
+                dword   SizeOfImage;
-                dword   SizeOfHeaders;
+                dword   SizeOfHeaders;
-                dword   CheckSum;
+                dword   CheckSum;
-                word    Subsystem;
+                word    Subsystem;
-                word    DllCharacteristics;
+                word    DllCharacteristics;
-                VAR4_8  SizeOfStackReserve;
+                VAR4_8  SizeOfStackReserve;
-                VAR4_8  SizeOfStackCommit;
+                VAR4_8  SizeOfStackCommit;
-                VAR4_8  SizeOfHeapReserve;
+                VAR4_8  SizeOfHeapReserve;
-                VAR4_8  SizeOfHeapCommit;
+                VAR4_8  SizeOfHeapCommit;
-                dword   LoaderFlags;
+                dword   LoaderFlags;
-                dword   NumberOfRvaAndSizes;
+                dword   NumberOfRvaAndSizes;
-//              PELIB_IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
+//              PELIB_IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
-                
+                
-                PELIB_IMAGE_OPTIONAL_HEADER_BASE();
+                PELIB_IMAGE_OPTIONAL_HEADER_BASE();
-        };
+        };
-        
+        
-        template<int x>
+        template<int x>
-        PELIB_IMAGE_OPTIONAL_HEADER_BASE<x>::PELIB_IMAGE_OPTIONAL_HEADER_BASE()
+        PELIB_IMAGE_OPTIONAL_HEADER_BASE<x>::PELIB_IMAGE_OPTIONAL_HEADER_BASE()
-        {
+        {
-                Magic = 0;
+                Magic = 0;
-                MajorLinkerVersion = 0;
+                MajorLinkerVersion = 0;
-                MinorLinkerVersion = 0;
+                MinorLinkerVersion = 0;
-                SizeOfCode = 0;
+                SizeOfCode = 0;
-                SizeOfInitializedData = 0;
+                SizeOfInitializedData = 0;
-                SizeOfUninitializedData = 0;
+                SizeOfUninitializedData = 0;
-                AddressOfEntryPoint = 0;
+                AddressOfEntryPoint = 0;
-                BaseOfCode = 0;
+                BaseOfCode = 0;
-//              BaseOfData = 0;
+//              BaseOfData = 0;
-                ImageBase = 0;
+                ImageBase = 0;
-                SectionAlignment = 0;
+                SectionAlignment = 0;
-                FileAlignment = 0;
+                FileAlignment = 0;
-                MajorOperatingSystemVersion = 0;
+                MajorOperatingSystemVersion = 0;
-                MinorOperatingSystemVersion = 0;
+                MinorOperatingSystemVersion = 0;
-                MajorImageVersion = 0;
+                MajorImageVersion = 0;
-                MinorImageVersion = 0;
+                MinorImageVersion = 0;
-                MajorSubsystemVersion = 0;
+                MajorSubsystemVersion = 0;
-                MinorSubsystemVersion = 0;
+                MinorSubsystemVersion = 0;
-                Win32VersionValue = 0;
+                Win32VersionValue = 0;
-                SizeOfImage = 0;
+                SizeOfImage = 0;
-                SizeOfHeaders = 0;
+                SizeOfHeaders = 0;
-                CheckSum = 0;
+                CheckSum = 0;
-                Subsystem = 0;
+                Subsystem = 0;
-                DllCharacteristics = 0;
+                DllCharacteristics = 0;
-                SizeOfStackReserve = 0;
+                SizeOfStackReserve = 0;
-                SizeOfStackCommit = 0;
+                SizeOfStackCommit = 0;
-                SizeOfHeapReserve = 0;
+                SizeOfHeapReserve = 0;
-                SizeOfHeapCommit = 0;
+                SizeOfHeapCommit = 0;
-                LoaderFlags = 0;
+                LoaderFlags = 0;
-                NumberOfRvaAndSizes = 0;
+                NumberOfRvaAndSizes = 0;
-        }
+        }
-        template<int>
+        template<int>
-        struct PELIB_IMAGE_OPTIONAL_HEADER;
+        struct PELIB_IMAGE_OPTIONAL_HEADER;
-        
+        
-        template<>
+        template<>
-        struct PELIB_IMAGE_OPTIONAL_HEADER<32> : public PELIB_IMAGE_OPTIONAL_HEADER_BASE<32>
+        struct PELIB_IMAGE_OPTIONAL_HEADER<32> : public PELIB_IMAGE_OPTIONAL_HEADER_BASE<32>
-        {
+        {
-                dword  BaseOfData;
+                dword  BaseOfData;
-                
+                
-                static inline unsigned int size() {return 224 - 0x10 * 8;}
+                static inline unsigned int size() {return 224 - 0x10 * 8;}
-        };
+        };
-        
+        
-        template<>
+        template<>
-        struct PELIB_IMAGE_OPTIONAL_HEADER<64> : public PELIB_IMAGE_OPTIONAL_HEADER_BASE<64>
+        struct PELIB_IMAGE_OPTIONAL_HEADER<64> : public PELIB_IMAGE_OPTIONAL_HEADER_BASE<64>
-        {
+        {
-                static inline unsigned int size() {return 240 - 0x10 * 8;}
+                static inline unsigned int size() {return 240 - 0x10 * 8;}
-        };
+        };
-        
+        
-        template<int x>
+        template<int x>
-        struct PELIB_IMAGE_NT_HEADERS
+        struct PELIB_IMAGE_NT_HEADERS
-        {
+        {
-                dword Signature;
+                dword Signature;
-                PELIB_IMAGE_FILE_HEADER FileHeader;
+                PELIB_IMAGE_FILE_HEADER FileHeader;
-                PELIB_IMAGE_OPTIONAL_HEADER<x> OptionalHeader;
+                PELIB_IMAGE_OPTIONAL_HEADER<x> OptionalHeader;
-                std::vector<PELIB_IMAGE_DATA_DIRECTORY> dataDirectories;
+                std::vector<PELIB_IMAGE_DATA_DIRECTORY> dataDirectories;
-                
+                
-                unsigned int size() const
+                unsigned int size() const
-                {
+                {
-                        return sizeof(dword)
+                        return sizeof(dword)
-                                + PELIB_IMAGE_FILE_HEADER::size()
+                                + PELIB_IMAGE_FILE_HEADER::size()
-                                + PELIB_IMAGE_OPTIONAL_HEADER<x>::size()
+                                + PELIB_IMAGE_OPTIONAL_HEADER<x>::size()
-                                + static_cast<unsigned int>(dataDirectories.size()) * PELIB_IMAGE_DATA_DIRECTORY::size();
+                                + static_cast<unsigned int>(dataDirectories.size()) * PELIB_IMAGE_DATA_DIRECTORY::size();
-                }
+                }
-                
+                
-                PELIB_IMAGE_NT_HEADERS()
+                PELIB_IMAGE_NT_HEADERS()
-                {
+                {
-                        Signature = 0;
+                        Signature = 0;
-                }
+                }
-        };
+        };
-        const unsigned int PELIB_IMAGE_SIZEOF_SHORT_NAME  = 8;
+        const unsigned int PELIB_IMAGE_SIZEOF_SHORT_NAME  = 8;
-        struct PELIB_IMAGE_SECTION_HEADER
+        struct PELIB_IMAGE_SECTION_HEADER
-        {
+        {
-                byte Name[PELIB_IMAGE_SIZEOF_SHORT_NAME];
+                byte Name[PELIB_IMAGE_SIZEOF_SHORT_NAME];
-                dword   VirtualSize;
+                dword   VirtualSize;
-                dword   VirtualAddress;
+                dword   VirtualAddress;
-                dword   SizeOfRawData;
+                dword   SizeOfRawData;
-                dword   PointerToRawData;
+                dword   PointerToRawData;
-                dword   PointerToRelocations;
+                dword   PointerToRelocations;
-                dword   PointerToLinenumbers;
+                dword   PointerToLinenumbers;
-                word    NumberOfRelocations;
+                word    NumberOfRelocations;
-                word    NumberOfLinenumbers;
+                word    NumberOfLinenumbers;
-                dword   Characteristics;
+                dword   Characteristics;
-                
+                
-                PELIB_IMAGE_SECTION_HEADER()
+                PELIB_IMAGE_SECTION_HEADER()
-                {
+                {
-                        VirtualSize = 0;
+                        VirtualSize = 0;
-                        VirtualAddress = 0;
+                        VirtualAddress = 0;
-                        SizeOfRawData = 0;
+                        SizeOfRawData = 0;
-                        PointerToRawData = 0;
+                        PointerToRawData = 0;
-                        PointerToRelocations = 0;
+                        PointerToRelocations = 0;
-                        PointerToLinenumbers = 0;
+                        PointerToLinenumbers = 0;
-                        NumberOfRelocations = 0;
+                        NumberOfRelocations = 0;
-                        NumberOfLinenumbers = 0;
+                        NumberOfLinenumbers = 0;
-                        Characteristics = 0;
+                        Characteristics = 0;
-                }
+                }
-                
+                
-                static inline unsigned int size() {return 40;}
+                static inline unsigned int size() {return 40;}
-                bool biggerFileOffset(const PELIB_IMAGE_SECTION_HEADER& ish) const;
+                bool biggerFileOffset(const PELIB_IMAGE_SECTION_HEADER& ish) const;
-                bool biggerVirtualAddress(const PELIB_IMAGE_SECTION_HEADER& ish) const;
+                bool biggerVirtualAddress(const PELIB_IMAGE_SECTION_HEADER& ish) const;
-        };
+        };
-        template<int bits>
+        template<int bits>
-        struct PELIB_IMAGE_THUNK_DATA
+        struct PELIB_IMAGE_THUNK_DATA
-        {
+        {
-                typename FieldSizes<bits>::VAR4_8 Ordinal;
+                typename FieldSizes<bits>::VAR4_8 Ordinal;
-                PELIB_IMAGE_THUNK_DATA()
+                PELIB_IMAGE_THUNK_DATA()
-                {
+                {
-                        Ordinal = 0;
+                        Ordinal = 0;
-                }
+                }
-                
+                
-                static inline unsigned int size() {return 4;}
+                static inline unsigned int size() {return 4;}
-        };
+        };
-        struct PELIB_IMAGE_IMPORT_DESCRIPTOR
+        struct PELIB_IMAGE_IMPORT_DESCRIPTOR
-        {
+        {
-                dword   OriginalFirstThunk;
+                dword   OriginalFirstThunk;
-                dword   TimeDateStamp;
+                dword   TimeDateStamp;
-                dword   ForwarderChain;
+                dword   ForwarderChain;
-                dword   Name;
+                dword   Name;
-                dword   FirstThunk;
+                dword   FirstThunk;
-                
+                
-                PELIB_IMAGE_IMPORT_DESCRIPTOR()
+                PELIB_IMAGE_IMPORT_DESCRIPTOR()
-                {
+                {
-                        OriginalFirstThunk = 0;
+                        OriginalFirstThunk = 0;
-                        TimeDateStamp = 0;
+                        TimeDateStamp = 0;
-                        ForwarderChain = 0;
+                        ForwarderChain = 0;
-                        Name = 0;
+                        Name = 0;
-                        FirstThunk = 0;
+                        FirstThunk = 0;
-                }
+                }
-                
+                
-                static inline unsigned int size() {return 20;}
+                static inline unsigned int size() {return 20;}
-        };
+        };
-        
+        
-        struct PELIB_IMAGE_EXPORT_DIRECTORY
+        struct PELIB_IMAGE_EXPORT_DIRECTORY
-        {
+        {
-                dword   Characteristics;
+                dword   Characteristics;
-                dword   TimeDateStamp;
+                dword   TimeDateStamp;
-                word    MajorVersion;
+                word    MajorVersion;
-                word    MinorVersion;
+                word    MinorVersion;
-                dword   Name;
+                dword   Name;
-                dword   Base;
+                dword   Base;
-                dword   NumberOfFunctions;
+                dword   NumberOfFunctions;
-                dword   NumberOfNames;
+                dword   NumberOfNames;
-                dword   AddressOfFunctions;
+                dword   AddressOfFunctions;
-                dword   AddressOfNames;
+                dword   AddressOfNames;
-                dword   AddressOfNameOrdinals;
+                dword   AddressOfNameOrdinals;
-                
+                
-                PELIB_IMAGE_EXPORT_DIRECTORY()
+                PELIB_IMAGE_EXPORT_DIRECTORY()
-                {
+                {
-                        Characteristics = 0;
+                        Characteristics = 0;
-                        TimeDateStamp = 0;
+                        TimeDateStamp = 0;
-                        MajorVersion = 0;
+                        MajorVersion = 0;
-                        MinorVersion = 0;
+                        MinorVersion = 0;
-                        Name = 0;
+                        Name = 0;
-                        Base = 0;
+                        Base = 0;
-                        NumberOfFunctions = 0;
+                        NumberOfFunctions = 0;
-                        NumberOfNames = 0;
+                        NumberOfNames = 0;
-                        AddressOfFunctions = 0;
+                        AddressOfFunctions = 0;
-                        NumberOfNames = 0;
+                        NumberOfNames = 0;
-                        AddressOfNameOrdinals = 0;
+                        AddressOfNameOrdinals = 0;
-                }
+                }
-                
+                
-                static inline unsigned int size() {return 40;}
+                static inline unsigned int size() {return 40;}
-        };
+        };
-        
+        
-        struct PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR
+        struct PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR
-        {
+        {
-                dword   TimeDateStamp;
+                dword   TimeDateStamp;
-                word    OffsetModuleName;
+                word    OffsetModuleName;
-                word    NumberOfModuleForwarderRefs;
+                word    NumberOfModuleForwarderRefs;
-                
+                
-                PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR()
+                PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR()
-                {
+                {
-                        TimeDateStamp = 0;
+                        TimeDateStamp = 0;
-                        OffsetModuleName = 0;
+                        OffsetModuleName = 0;
-                        NumberOfModuleForwarderRefs = 0;
+                        NumberOfModuleForwarderRefs = 0;
-                }
+                }
-                static unsigned int size()
+                static unsigned int size()
-                {
+                {
-                        return 8;
+                        return 8;
-                }
+                }
-        };
+        };
-        
+        
-        // Stores all necessary information about a BoundImport field.
+        // Stores all necessary information about a BoundImport field.
-        struct PELIB_IMAGE_BOUND_DIRECTORY
+        struct PELIB_IMAGE_BOUND_DIRECTORY
-        {
+        {
-                PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR ibdDescriptor; ///< Information about the imported file.
+                PELIB_IMAGE_BOUND_IMPORT_DESCRIPTOR ibdDescriptor; ///< Information about the imported file.
-                std::string strModuleName; ///< Name of the imported file.
+                std::string strModuleName; ///< Name of the imported file.
-                std::vector<PELIB_IMAGE_BOUND_DIRECTORY> moduleForwarders;
+                std::vector<PELIB_IMAGE_BOUND_DIRECTORY> moduleForwarders;
-                // Will be used in std::find_if
+                // Will be used in std::find_if
-                // Passing by-reference not possible (see C++ Standard Core Language Defect Reports, Revision 29, Issue 106)
+                // 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.
+                /// Compares the passed filename to the struct's filename.
-                bool equal(const std::string strModuleName) const;
+                bool equal(const std::string strModuleName) const;
-                
+                
-                unsigned int size() const;
+                unsigned int size() const;
-        };
+        };
-        struct PELIB_EXP_FUNC_INFORMATION
+        struct PELIB_EXP_FUNC_INFORMATION
-        {
+        {
-                dword addroffunc;
+                dword addroffunc;
-                dword addrofname;
+                dword addrofname;
-                word ordinal;
+                word ordinal;
-                std::string funcname;
+                std::string funcname;
-                
+                
-                PELIB_EXP_FUNC_INFORMATION();
+                PELIB_EXP_FUNC_INFORMATION();
-                bool equal(const std::string strFunctionName) const;
+                bool equal(const std::string strFunctionName) const;
-                inline unsigned int size() const
+                inline unsigned int size() const
-                {
+                {
-                        unsigned int uiSize = 4;
+                        unsigned int uiSize = 4;
-                        if (addroffunc) uiSize += 2;// + 4;
+                        if (addroffunc) uiSize += 2;// + 4;
-                        if (!funcname.empty()) uiSize += 4 + (unsigned int)funcname.size() + 1;
+                        if (!funcname.empty()) uiSize += 4 + (unsigned int)funcname.size() + 1;
-                        return uiSize;
+                        return uiSize;
-                }
+                }
-        };
+        };
-        struct PELIB_IMAGE_RESOURCE_DIRECTORY
+        struct PELIB_IMAGE_RESOURCE_DIRECTORY
-        {
+        {
-                dword Characteristics;
+                dword Characteristics;
-                dword TimeDateStamp;
+                dword TimeDateStamp;
-                word MajorVersion;
+                word MajorVersion;
-                word MinorVersion;
+                word MinorVersion;
-                word NumberOfNamedEntries;
+                word NumberOfNamedEntries;
-                word NumberOfIdEntries;
+                word NumberOfIdEntries;
-                
+                
-                PELIB_IMAGE_RESOURCE_DIRECTORY();
+                PELIB_IMAGE_RESOURCE_DIRECTORY();
-                static inline unsigned int size() {return 16;}
+                static inline unsigned int size() {return 16;}
-        };
+        };
-        struct PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY
+        struct PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY
-        {
+        {
-                dword Name;
+                dword Name;
-                dword OffsetToData;
+                dword OffsetToData;
-                PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY();
+                PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY();
-                static inline unsigned int size() {return 8;}
+                static inline unsigned int size() {return 8;}
-        };
+        };
-        const unsigned int PELIB_IMAGE_SIZEOF_BASE_RELOCATION = 8;
+        const unsigned int PELIB_IMAGE_SIZEOF_BASE_RELOCATION = 8;
-        struct PELIB_IMG_RES_DIR_ENTRY
+        struct PELIB_IMG_RES_DIR_ENTRY
-        {
+        {
-                PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY irde;
+                PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY irde;
-                std::string wstrName;
+                std::string wstrName;
-                bool operator<(const PELIB_IMG_RES_DIR_ENTRY& first) const;
+                bool operator<(const PELIB_IMG_RES_DIR_ENTRY& first) const;
-        };
+        };
-        
+        
-        struct PELIB_IMAGE_BASE_RELOCATION
+        struct PELIB_IMAGE_BASE_RELOCATION
-        {
+        {
-                dword VirtualAddress;
+                dword VirtualAddress;
-                dword SizeOfBlock;
+                dword SizeOfBlock;
-                
+                
-                PELIB_IMAGE_BASE_RELOCATION();
+                PELIB_IMAGE_BASE_RELOCATION();
-                static inline unsigned int size() {return 8;}
+                static inline unsigned int size() {return 8;}
-        };
+        };
-        struct PELIB_IMAGE_COR20_HEADER
+        struct PELIB_IMAGE_COR20_HEADER
-        {
+        {
-                dword cb;
+                dword cb;
-                word MajorRuntimeVersion;
+                word MajorRuntimeVersion;
-                word MinorRuntimeVersion;
+                word MinorRuntimeVersion;
-                PELIB_IMAGE_DATA_DIRECTORY MetaData;
+                PELIB_IMAGE_DATA_DIRECTORY MetaData;
-                dword Flags;
+                dword Flags;
-                dword EntryPointToken;
+                dword EntryPointToken;
-                PELIB_IMAGE_DATA_DIRECTORY Resources;
+                PELIB_IMAGE_DATA_DIRECTORY Resources;
-                PELIB_IMAGE_DATA_DIRECTORY StrongNameSignature;
+                PELIB_IMAGE_DATA_DIRECTORY StrongNameSignature;
-                PELIB_IMAGE_DATA_DIRECTORY CodeManagerTable;
+                PELIB_IMAGE_DATA_DIRECTORY CodeManagerTable;
-                PELIB_IMAGE_DATA_DIRECTORY VTableFixups;
+                PELIB_IMAGE_DATA_DIRECTORY VTableFixups;
-                PELIB_IMAGE_DATA_DIRECTORY ExportAddressTableJumps;
+                PELIB_IMAGE_DATA_DIRECTORY ExportAddressTableJumps;
-                PELIB_IMAGE_DATA_DIRECTORY ManagedNativeHeader;
+                PELIB_IMAGE_DATA_DIRECTORY ManagedNativeHeader;
-                
+                
-                PELIB_IMAGE_COR20_HEADER();
+                PELIB_IMAGE_COR20_HEADER();
-                static inline unsigned int size() {return 72;}
+                static inline unsigned int size() {return 72;}
-        };
+        };
-        // Used to store a file's export table.
+        // Used to store a file's export table.
-        struct PELIB_IMAGE_EXP_DIRECTORY
+        struct PELIB_IMAGE_EXP_DIRECTORY
-        {
+        {
-                /// The IMAGE_EXPORTED_DIRECTORY of a file's export table.
+                /// The IMAGE_EXPORTED_DIRECTORY of a file's export table.
-                PELIB_IMAGE_EXPORT_DIRECTORY ied;
+                PELIB_IMAGE_EXPORT_DIRECTORY ied;
-                /// The original filename of current file.
+                /// The original filename of current file.
-                std::string name;
+                std::string name;
-                std::vector<PELIB_EXP_FUNC_INFORMATION> functions;
+                std::vector<PELIB_EXP_FUNC_INFORMATION> functions;
-                inline unsigned int size() const
+                inline unsigned int size() const
-                {
+                {
-                        return PELIB_IMAGE_EXPORT_DIRECTORY::size() + name.size() + 1 + 
+                        return PELIB_IMAGE_EXPORT_DIRECTORY::size() + name.size() + 1 + 
-                        std::accumulate(functions.begin(), functions.end(), 0, accumulate<PELIB_EXP_FUNC_INFORMATION>);
+                        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
+        // Used for parsing a file's import table. It combines the function name, the hint
-        // and the IMAGE_THUNK_DATA of an imported function.
+        // and the IMAGE_THUNK_DATA of an imported function.
-        template<int bits>
+        template<int bits>
-        struct PELIB_THUNK_DATA
+        struct PELIB_THUNK_DATA
-        {
+        {
-                /// The IMAGE_THUNK_DATA struct of an imported function.
+                /// The IMAGE_THUNK_DATA struct of an imported function.
-                PELIB_IMAGE_THUNK_DATA<bits> itd;
+                PELIB_IMAGE_THUNK_DATA<bits> itd;
-                /// The hint of an imported function.
+                /// The hint of an imported function.
-                word hint;
+                word hint;
-                /// The function name of an imported function.
+                /// The function name of an imported function.
-                std::string fname;
+                std::string fname;
-                
+                
-                bool equalHint(word wHint) const
+                bool equalHint(word wHint) const
-                {
+                {
-                        return hint == wHint;
+                        return hint == wHint;
-//                      return itd.Ordinal == (wHint | IMAGE_ORDINAL_FLAGS<bits>::IMAGE_ORDINAL_FLAG);
+//                      return itd.Ordinal == (wHint | IMAGE_ORDINAL_FLAGS<bits>::IMAGE_ORDINAL_FLAG);
-                }
+                }
-                
+                
-                bool equalFunctionName(std::string strFunctionName) const
+                bool equalFunctionName(std::string strFunctionName) const
-                {
+                {
-                        return isEqualNc(fname, strFunctionName);
+                        return isEqualNc(fname, strFunctionName);
-                }
+                }
-                
+                
-                unsigned int size() const {return PELIB_IMAGE_THUNK_DATA<bits>::size() + fname.size() + 1 + sizeof(hint);}
+                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
+        // Used to store a file's import table. Every struct of this sort
-        // can store import information of one DLL.
+        // can store import information of one DLL.
-        template<int bits>
+        template<int bits>
-        struct PELIB_IMAGE_IMPORT_DIRECTORY
+        struct PELIB_IMAGE_IMPORT_DIRECTORY
-        {
+        {
-                /// The IMAGE_IMPORT_DESCRIPTOR of an imported DLL.
+                /// The IMAGE_IMPORT_DESCRIPTOR of an imported DLL.
-                PELIB_IMAGE_IMPORT_DESCRIPTOR impdesc;
+                PELIB_IMAGE_IMPORT_DESCRIPTOR impdesc;
-                /// The name of an imported DLL.
+                /// The name of an imported DLL.
-                std::string name;
+                std::string name;
-                /// All original first thunk values of an imported DLL.
+                /// All original first thunk values of an imported DLL.
-                std::vector<PELIB_THUNK_DATA<bits> > originalfirstthunk;
+                std::vector<PELIB_THUNK_DATA<bits> > originalfirstthunk;
-                /// All first thunk value of an imported DLL.
+                /// All first thunk value of an imported DLL.
-                std::vector<PELIB_THUNK_DATA<bits> > firstthunk;
+                std::vector<PELIB_THUNK_DATA<bits> > firstthunk;
-                
+                
-//              bool operator==(std::string strFilename) const;
+//              bool operator==(std::string strFilename) const;
-                inline unsigned int size() const
+                inline unsigned int size() const
-                {
+                {
-                        return PELIB_IMAGE_IMPORT_DESCRIPTOR::size() + name.size() + 1 + // descriptor + dllname
+                        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)
+                        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
+                        PELIB_IMAGE_THUNK_DATA<bits>::size(); // zero-termination
-                }
+                }
-                
+                
-                bool operator==(std::string strFilename) const
+                bool operator==(std::string strFilename) const
-                {
+                {
-                        return isEqualNc(this->name, strFilename);
+                        return isEqualNc(this->name, strFilename);
-                }
+                }
-        };
+        };
-    struct PELIB_IMAGE_RESOURCE_DATA_ENTRY
+    struct PELIB_IMAGE_RESOURCE_DATA_ENTRY
-    {
+    {
-            dword OffsetToData;
+            dword OffsetToData;
-            dword Size;
+            dword Size;
-            dword CodePage;
+            dword CodePage;
-            dword Reserved;
+            dword Reserved;
-                static inline unsigned int size() {return 16;}
+                static inline unsigned int size() {return 16;}
-    };
+    };
-    struct PELIB_IMAGE_RESOURCE_DATA
+    struct PELIB_IMAGE_RESOURCE_DATA
-    {
+    {
-            PELIB_IMAGE_RESOURCE_DATA_ENTRY irdEntry;
+            PELIB_IMAGE_RESOURCE_DATA_ENTRY irdEntry;
-            std::vector<byte> vData;
+            std::vector<byte> vData;
-    };
+    };
-        struct IMG_BASE_RELOC
+        struct IMG_BASE_RELOC
-    {
+    {
-                PELIB_IMAGE_BASE_RELOCATION ibrRelocation;
+                PELIB_IMAGE_BASE_RELOCATION ibrRelocation;
-                std::vector<word> vRelocData;
+                std::vector<word> vRelocData;
-        };
+        };
-        
+        
-        struct PELIB_IMAGE_DEBUG_DIRECTORY
+        struct PELIB_IMAGE_DEBUG_DIRECTORY
-        {
+        {
-                dword Characteristics;
+                dword Characteristics;
-                dword TimeDateStamp;
+                dword TimeDateStamp;
-                word MajorVersion;
+                word MajorVersion;
-                word MinorVersion;
+                word MinorVersion;
-                dword Type;
+                dword Type;
-                dword SizeOfData;
+                dword SizeOfData;
-                dword AddressOfRawData;
+                dword AddressOfRawData;
-                dword PointerToRawData;
+                dword PointerToRawData;
-                
+                
-                static unsigned int size() {return 28;}
+                static unsigned int size() {return 28;}
-        };
+        };
-        
+        
-        struct PELIB_IMG_DEBUG_DIRECTORY
+        struct PELIB_IMG_DEBUG_DIRECTORY
-        {
+        {
-                PELIB_IMAGE_DEBUG_DIRECTORY idd;
+                PELIB_IMAGE_DEBUG_DIRECTORY idd;
-                std::vector<byte> data;
+                std::vector<byte> data;
-        };
+        };
-        template<int bits>
+        template<int bits>
-        struct PELIB_IMAGE_TLS_DIRECTORY_BASE
+        struct PELIB_IMAGE_TLS_DIRECTORY_BASE
-        {
+        {
-            typename FieldSizes<bits>::VAR4_8 StartAddressOfRawData;
+            typename FieldSizes<bits>::VAR4_8 StartAddressOfRawData;
-            typename FieldSizes<bits>::VAR4_8 EndAddressOfRawData;
+            typename FieldSizes<bits>::VAR4_8 EndAddressOfRawData;
-            typename FieldSizes<bits>::VAR4_8 AddressOfIndex;
+            typename FieldSizes<bits>::VAR4_8 AddressOfIndex;
-            typename FieldSizes<bits>::VAR4_8 AddressOfCallBacks;
+            typename FieldSizes<bits>::VAR4_8 AddressOfCallBacks;
-            dword SizeOfZeroFill;
+            dword SizeOfZeroFill;
-            dword Characteristics;
+            dword Characteristics;
-        };    
+        };    
-        
+        
-        template<int bits>
+        template<int bits>
-        struct PELIB_IMAGE_TLS_DIRECTORY;// : public PELIB_IMAGE_TLS_DIRECTORY_BASE<bits>
+        struct PELIB_IMAGE_TLS_DIRECTORY;// : public PELIB_IMAGE_TLS_DIRECTORY_BASE<bits>
-        
+        
-        template<>
+        template<>
-        struct PELIB_IMAGE_TLS_DIRECTORY<32> : public PELIB_IMAGE_TLS_DIRECTORY_BASE<32>
+        struct PELIB_IMAGE_TLS_DIRECTORY<32> : public PELIB_IMAGE_TLS_DIRECTORY_BASE<32>
-        {
+        {
-//              enum {size = 24};
+//              enum {size = 24};
-            static unsigned int size(){return 24;}
+            static unsigned int size(){return 24;}
-        };
+        };
-        template<>
+        template<>
-        struct PELIB_IMAGE_TLS_DIRECTORY<64> : public PELIB_IMAGE_TLS_DIRECTORY_BASE<64>
+        struct PELIB_IMAGE_TLS_DIRECTORY<64> : public PELIB_IMAGE_TLS_DIRECTORY_BASE<64>
-        {
+        {
-//              enum {size = 40};
+//              enum {size = 40};
-            static unsigned int size(){return 40;}
+            static unsigned int size(){return 40;}
-        };
+        };
-        unsigned int fileSize(const std::string& filename);
+        unsigned int fileSize(const std::string& filename);
-        unsigned int fileSize(std::ifstream& file);
+        unsigned int fileSize(std::ifstream& file);
-        unsigned int fileSize(std::ofstream& file);
+        unsigned int fileSize(std::ofstream& file);
-        unsigned int fileSize(std::fstream& file);
+        unsigned int fileSize(std::fstream& file);
-        unsigned int alignOffset(unsigned int uiOffset, unsigned int uiAlignment);
+        unsigned int alignOffset(unsigned int uiOffset, unsigned int uiAlignment);
-        
+        
-        /// Determines if a file is a 32bit or 64bit PE file.
+        /// Determines if a file is a 32bit or 64bit PE file.
-        unsigned int getFileType(const std::string strFilename);
+        unsigned int getFileType(const std::string strFilename);
-        
+        
-        /// Opens a PE file.
+        /// Opens a PE file.
-        PeFile* openPeFile(const std::string& strFilename);
+        PeFile* openPeFile(const std::string& strFilename);
-  /*  enum MzHeader_Field {e_magic, e_cblp, e_cp, e_crlc, e_cparhdr, e_minalloc, e_maxalloc,
+  /*  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_ss, e_sp, e_csum, e_ip, e_cs, e_lfarlc, e_ovno, e_res, e_oemid,
-                        e_oeminfo, e_res2, e_lfanew};
+                        e_oeminfo, e_res2, e_lfanew};
-    enum PeHeader_Field {NtSignature, Machine, NumberOfSections, TimeDateStamp, PointerToSymbolTable,
+    enum PeHeader_Field {NtSignature, Machine, NumberOfSections, TimeDateStamp, PointerToSymbolTable,
-                        NumberOfSymbols, SizeOfOptionalHeader, Characteristics, Magic,
+                        NumberOfSymbols, SizeOfOptionalHeader, Characteristics, Magic,
-                        MajorLinkerVersion, MinorLinkerVersion, SizeOfCode, SizeOfInitializedData,
+                        MajorLinkerVersion, MinorLinkerVersion, SizeOfCode, SizeOfInitializedData,
-                        SizeOfUninitializedData, AddressOfEntryPoint, BaseOfCode, BaseOfData, ImageBase,
+                        SizeOfUninitializedData, AddressOfEntryPoint, BaseOfCode, BaseOfData, ImageBase,
-                        SectionAlignment, FileAlignment, MajorOperatingSystemVersion, MinorOperatingSystemVersion,
+                        SectionAlignment, FileAlignment, MajorOperatingSystemVersion, MinorOperatingSystemVersion,
-                        MajorImageVersion, MinorImageVersion, MajorSubsystemVersion, MinorSubsystemVersion,
+                        MajorImageVersion, MinorImageVersion, MajorSubsystemVersion, MinorSubsystemVersion,
-                        Win32VersionValue, SizeOfImage, SizeOfHeaders, CheckSum, Subsystem, DllCharacteristics,
+                        Win32VersionValue, SizeOfImage, SizeOfHeaders, CheckSum, Subsystem, DllCharacteristics,
-                        SizeOfStackReserve, SizeOfStackCommit, SizeOfHeapReserve, SizeOfHeapCommit,
+                        SizeOfStackReserve, SizeOfStackCommit, SizeOfHeapReserve, SizeOfHeapCommit,
-                        LoaderFlags, NumberOfRvaAndSizes, DataDirectoryRva, DataDirectorySize};
+                        LoaderFlags, NumberOfRvaAndSizes, DataDirectoryRva, DataDirectorySize};
-    enum Section_Field {SectionName, VirtualSize, VirtualAddress, SizeOfRawData, PointerToRawData, PointerToRelocations,
+    enum Section_Field {SectionName, VirtualSize, VirtualAddress, SizeOfRawData, PointerToRawData, PointerToRelocations,
-                        PointerToLinenumbers, NumberOfRelocations, NumberOfLinenumbers, SectionCharacteristics};
+                        PointerToLinenumbers, NumberOfRelocations, NumberOfLinenumbers, SectionCharacteristics};
-*/
+*/
-}
+}
-#endif
+#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.
+* PeLibInc.h - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#ifndef STD_H
+#ifndef STD_H
-#define STD_H
+#define STD_H
-#ifdef _MSC_VER
+#ifdef _MSC_VER
-        #ifndef for
+        #ifndef for
-                #define for if (0) {} else for
+                #define for if (0) {} else for
-        #endif
+        #endif
-#endif
+#endif
-#include <algorithm>
+#include <algorithm>
-#include <climits>
+#include <climits>
-#include <fstream>
+#include <fstream>
-#include <iostream>
+#include <iostream>
-#include <string>
+#include <string>
-#include <vector>
+#include <vector>
-#include <functional>
+#include <functional>
-// #include "PeLib.h"
+// #include "PeLib.h"
-#include "PeLibAux.h"
+#include "PeLibAux.h"
-#endif
+#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.
+* Relocations.cpp - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#include "PeLibInc.h"
+#include "PeLibInc.h"
-#include "RelocationsDirectory.h"
+#include "RelocationsDirectory.h"
-namespace PeLib
+namespace PeLib
-{
+{
-        void RelocationsDirectory::setRelocationData(unsigned int ulRelocation, unsigned int ulDataNumber, word wData)
+        void RelocationsDirectory::setRelocationData(unsigned int ulRelocation, unsigned int ulDataNumber, word wData)
-        {
+        {
-                m_vRelocations[ulRelocation].vRelocData[ulDataNumber] = wData;
+                m_vRelocations[ulRelocation].vRelocData[ulDataNumber] = wData;
-        }
+        }
-        
+        
-        void RelocationsDirectory::read(InputBuffer& inputbuffer, unsigned int uiSize)
+        void RelocationsDirectory::read(InputBuffer& inputbuffer, unsigned int uiSize)
-        {
+        {
-                IMG_BASE_RELOC ibrCurr;
+                IMG_BASE_RELOC ibrCurr;
-                std::vector<IMG_BASE_RELOC> vCurrReloc;
+                std::vector<IMG_BASE_RELOC> vCurrReloc;
-                do
+                do
-                {
+                {
-                        inputbuffer >> ibrCurr.ibrRelocation.VirtualAddress;
+                        inputbuffer >> ibrCurr.ibrRelocation.VirtualAddress;
-                        inputbuffer >> ibrCurr.ibrRelocation.SizeOfBlock;
+                        inputbuffer >> ibrCurr.ibrRelocation.SizeOfBlock;
-                        ibrCurr.vRelocData.clear();
+                        ibrCurr.vRelocData.clear();
-                        // That's not how to check if there are relocations, some DLLs start at VA 0.
+                        // That's not how to check if there are relocations, some DLLs start at VA 0.
-                        // if (!ibrCurr.ibrRelocation.VirtualAddress) break;
+                        // if (!ibrCurr.ibrRelocation.VirtualAddress) break;
-                        for (unsigned int i=0;i<(ibrCurr.ibrRelocation.SizeOfBlock - PELIB_IMAGE_SIZEOF_BASE_RELOCATION) / sizeof(word);i++)
+                        for (unsigned int i=0;i<(ibrCurr.ibrRelocation.SizeOfBlock - PELIB_IMAGE_SIZEOF_BASE_RELOCATION) / sizeof(word);i++)
-                        {
+                        {
-                                word wData;
+                                word wData;
-                                inputbuffer >> wData;
+                                inputbuffer >> wData;
-                                ibrCurr.vRelocData.push_back(wData);
+                                ibrCurr.vRelocData.push_back(wData);
-                        }
+                        }
-                        vCurrReloc.push_back(ibrCurr);
+                        vCurrReloc.push_back(ibrCurr);
-                } while (ibrCurr.ibrRelocation.VirtualAddress && inputbuffer.get() < uiSize);
+                } while (ibrCurr.ibrRelocation.VirtualAddress && inputbuffer.get() < uiSize);
-                std::swap(vCurrReloc, m_vRelocations);
+                std::swap(vCurrReloc, m_vRelocations);
-        }
+        }
-        
+        
-        // TODO: Return value is wrong if buffer was too small.
+        // TODO: Return value is wrong if buffer was too small.
-        int RelocationsDirectory::read(const unsigned char* buffer, unsigned int buffersize)
+        int RelocationsDirectory::read(const unsigned char* buffer, unsigned int buffersize)
-        {
+        {
-                std::vector<unsigned char> vRelocDirectory(buffer, buffer + buffersize);
+                std::vector<unsigned char> vRelocDirectory(buffer, buffer + buffersize);
-                InputBuffer ibBuffer(vRelocDirectory);
+                InputBuffer ibBuffer(vRelocDirectory);
-                read(ibBuffer, buffersize);
+                read(ibBuffer, buffersize);
-        
+        
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        int RelocationsDirectory::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize)
+        int RelocationsDirectory::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize)
-        {
+        {
-                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
+                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
-                unsigned int ulFileSize = fileSize(ifFile);
+                unsigned int ulFileSize = fileSize(ifFile);
-                if (!ifFile)
+                if (!ifFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                
+                
-                if (ulFileSize < uiOffset + uiSize)
+                if (ulFileSize < uiOffset + uiSize)
-                {
+                {
-                        return ERROR_INVALID_FILE;
+                        return ERROR_INVALID_FILE;
-                }
+                }
-                ifFile.seekg(uiOffset, std::ios::beg);
+                ifFile.seekg(uiOffset, std::ios::beg);
-                std::vector<unsigned char> vRelocDirectory(uiSize);
+                std::vector<unsigned char> vRelocDirectory(uiSize);
-                ifFile.read(reinterpret_cast<char*>(&vRelocDirectory[0]), uiSize);
+                ifFile.read(reinterpret_cast<char*>(&vRelocDirectory[0]), uiSize);
-                InputBuffer ibBuffer(vRelocDirectory);
+                InputBuffer ibBuffer(vRelocDirectory);
-                read(ibBuffer, uiSize);
+                read(ibBuffer, uiSize);
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        
+        
-        unsigned int RelocationsDirectory::size() const
+        unsigned int RelocationsDirectory::size() const
-        {
+        {
-                unsigned int size = static_cast<unsigned int>(m_vRelocations.size()) * PELIB_IMAGE_BASE_RELOCATION::size();
+                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++)
+                for (unsigned int i=0;i<m_vRelocations.size();i++)
-                {
+                {
-                        size += static_cast<unsigned int>(m_vRelocations[i].vRelocData.size()) * sizeof(word);
+                        size += static_cast<unsigned int>(m_vRelocations[i].vRelocData.size()) * sizeof(word);
-                }
+                }
-                
+                
-                return size;
+                return size;
-        }
+        }
-        
+        
-        void RelocationsDirectory::rebuild(std::vector<byte>& vBuffer) const
+        void RelocationsDirectory::rebuild(std::vector<byte>& vBuffer) const
-        {
+        {
-                OutputBuffer obBuffer(vBuffer);
+                OutputBuffer obBuffer(vBuffer);
-                
+                
-                for (unsigned int i=0;i<m_vRelocations.size();i++)
+                for (unsigned int i=0;i<m_vRelocations.size();i++)
-                {
+                {
-                        obBuffer << m_vRelocations[i].ibrRelocation.VirtualAddress;
+                        obBuffer << m_vRelocations[i].ibrRelocation.VirtualAddress;
-                        obBuffer << m_vRelocations[i].ibrRelocation.SizeOfBlock;
+                        obBuffer << m_vRelocations[i].ibrRelocation.SizeOfBlock;
-                        for (unsigned int j=0;j<m_vRelocations[i].vRelocData.size();j++)
+                        for (unsigned int j=0;j<m_vRelocations[i].vRelocData.size();j++)
-                        {
+                        {
-                                obBuffer << m_vRelocations[i].vRelocData[j];
+                                obBuffer << m_vRelocations[i].vRelocData[j];
-                        }
+                        }
-                }
+                }
-        }
+        }
-        unsigned int RelocationsDirectory::calcNumberOfRelocations() const
+        unsigned int RelocationsDirectory::calcNumberOfRelocations() const
-        {
+        {
-                return static_cast<unsigned int>(m_vRelocations.size());
+                return static_cast<unsigned int>(m_vRelocations.size());
-        }
+        }
-        dword RelocationsDirectory::getVirtualAddress(unsigned int ulRelocation) const
+        dword RelocationsDirectory::getVirtualAddress(unsigned int ulRelocation) const
-        {
+        {
-                return m_vRelocations[ulRelocation].ibrRelocation.VirtualAddress;
+                return m_vRelocations[ulRelocation].ibrRelocation.VirtualAddress;
-        }
+        }
-        dword RelocationsDirectory::getSizeOfBlock(unsigned int ulRelocation) const
+        dword RelocationsDirectory::getSizeOfBlock(unsigned int ulRelocation) const
-        {
+        {
-                return m_vRelocations[ulRelocation].ibrRelocation.SizeOfBlock;
+                return m_vRelocations[ulRelocation].ibrRelocation.SizeOfBlock;
-        }
+        }
-        unsigned int RelocationsDirectory::calcNumberOfRelocationData(unsigned int ulRelocation) const
+        unsigned int RelocationsDirectory::calcNumberOfRelocationData(unsigned int ulRelocation) const
-        {
+        {
-                return static_cast<unsigned int>(m_vRelocations[ulRelocation].vRelocData.size());
+                return static_cast<unsigned int>(m_vRelocations[ulRelocation].vRelocData.size());
-        }
+        }
-        word RelocationsDirectory::getRelocationData(unsigned int ulRelocation, unsigned int ulDataNumber) const
+        word RelocationsDirectory::getRelocationData(unsigned int ulRelocation, unsigned int ulDataNumber) const
-        {
+        {
-                return m_vRelocations[ulRelocation].vRelocData[ulDataNumber];
+                return m_vRelocations[ulRelocation].vRelocData[ulDataNumber];
-        }
+        }
-        void RelocationsDirectory::setVirtualAddress(unsigned int ulRelocation, dword dwValue)
+        void RelocationsDirectory::setVirtualAddress(unsigned int ulRelocation, dword dwValue)
-        {
+        {
-                m_vRelocations[ulRelocation].ibrRelocation.VirtualAddress = dwValue;
+                m_vRelocations[ulRelocation].ibrRelocation.VirtualAddress = dwValue;
-        }
+        }
-        void RelocationsDirectory::setSizeOfBlock(unsigned int ulRelocation, dword dwValue)
+        void RelocationsDirectory::setSizeOfBlock(unsigned int ulRelocation, dword dwValue)
-        {
+        {
-                m_vRelocations[ulRelocation].ibrRelocation.SizeOfBlock = dwValue;
+                m_vRelocations[ulRelocation].ibrRelocation.SizeOfBlock = dwValue;
-        }
+        }
-        
+        
-        void RelocationsDirectory::addRelocation()
+        void RelocationsDirectory::addRelocation()
-        {
+        {
-                IMG_BASE_RELOC newrelocation;
+                IMG_BASE_RELOC newrelocation;
-                m_vRelocations.push_back(newrelocation);
+                m_vRelocations.push_back(newrelocation);
-        }
+        }
-        void RelocationsDirectory::addRelocationData(unsigned int ulRelocation, word wValue)
+        void RelocationsDirectory::addRelocationData(unsigned int ulRelocation, word wValue)
-        {
+        {
-                m_vRelocations[ulRelocation].vRelocData.push_back(wValue);
+                m_vRelocations[ulRelocation].vRelocData.push_back(wValue);
-        }
+        }
-/*      void RelocationsDirectory::removeRelocationData(unsigned int ulRelocation, word 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
+                // 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.
+                // 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());
+                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)
+        void RelocationsDirectory::removeRelocation(unsigned int index)
-        {
+        {
-                m_vRelocations.erase(m_vRelocations.begin() + index);
+                m_vRelocations.erase(m_vRelocations.begin() + index);
-        }
+        }
-        
+        
-        void RelocationsDirectory::removeRelocationData(unsigned int relocindex, unsigned int dataindex)
+        void RelocationsDirectory::removeRelocationData(unsigned int relocindex, unsigned int dataindex)
-        {
+        {
-                m_vRelocations[relocindex].vRelocData.erase(m_vRelocations[relocindex].vRelocData.begin() + dataindex);
+                m_vRelocations[relocindex].vRelocData.erase(m_vRelocations[relocindex].vRelocData.begin() + dataindex);
-        }
+        }
-                  
+                  
-        int RelocationsDirectory::write(const std::string& strFilename, unsigned int uiOffset) const
+        int RelocationsDirectory::write(const std::string& strFilename, unsigned int uiOffset) const
-        {
+        {
-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        ofFile.clear();
+                        ofFile.clear();
-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                else
+                else
-                {
+                {
-                        ofFile.close();
+                        ofFile.close();
-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                ofFile.seekp(uiOffset, std::ios::beg);
+                ofFile.seekp(uiOffset, std::ios::beg);
-                std::vector<unsigned char> vBuffer;
+                std::vector<unsigned char> vBuffer;
-                rebuild(vBuffer);
+                rebuild(vBuffer);
-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<std::streamsize>(vBuffer.size()));
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<std::streamsize>(vBuffer.size()));
-                ofFile.close();
+                ofFile.close();
-                
+                
-                return NO_ERROR;
+                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.
+* Relocations.h - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#ifndef RELOCATIONSDIRECTORY_H
+#ifndef RELOCATIONSDIRECTORY_H
-#define RELOCATIONSDIRECTORY_H
+#define RELOCATIONSDIRECTORY_H
-namespace PeLib
+namespace PeLib
-{
+{
-        /// Class that handles the relocations directory.
+        /// Class that handles the relocations directory.
-        /**
+        /**
-        * This class handles the relocations directory.
+        * This class handles the relocations directory.
-        **/
+        **/
-        class RelocationsDirectory
+        class RelocationsDirectory
-        {
+        {
-                private:
+                private:
-                  std::vector<IMG_BASE_RELOC> m_vRelocations; ///< Used to store the relocation data.
+                  std::vector<IMG_BASE_RELOC> m_vRelocations; ///< Used to store the relocation data.
-                  void read(InputBuffer& inputbuffer, unsigned int uiSize);
+                  void read(InputBuffer& inputbuffer, unsigned int uiSize);
-                public:
+                public:
-                  /// Returns the number of relocations in the relocations directory.
+                  /// Returns the number of relocations in the relocations directory.
-                  unsigned int calcNumberOfRelocations() const; // EXPORT
+                  unsigned int calcNumberOfRelocations() const; // EXPORT
-                  /// Returns the number of relocation data entries of a specific relocation.
+                  /// Returns the number of relocation data entries of a specific relocation.
-                  unsigned int calcNumberOfRelocationData(unsigned int ulRelocation) const; // EXPORT
+                  unsigned int calcNumberOfRelocationData(unsigned int ulRelocation) const; // EXPORT
-                  /// Read a file's relocations directory.
+                  /// Read a file's relocations directory.
-                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize); // EXPORT
+                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize); // EXPORT
-                  int read(const unsigned char* buffer, unsigned int buffersize); // EXPORT
+                  int read(const unsigned char* buffer, unsigned int buffersize); // EXPORT
-                  /// Rebuilds the relocations directory.
+                  /// Rebuilds the relocations directory.
-                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT
+                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT
-                  /// Returns the size of the relocations directory.
+                  /// Returns the size of the relocations directory.
-                  unsigned int size() const; // EXPORT
+                  unsigned int size() const; // EXPORT
-                  /// Writes the relocations directory to a file.
+                  /// Writes the relocations directory to a file.
-                  int write(const std::string& strFilename, unsigned int dwOffset) const; // EXPORT
+                  int write(const std::string& strFilename, unsigned int dwOffset) const; // EXPORT
-                  /// Returns the VA of a relocation.
+                  /// Returns the VA of a relocation.
-                  dword getVirtualAddress(unsigned int ulRelocation) const; // EXPORT
+                  dword getVirtualAddress(unsigned int ulRelocation) const; // EXPORT
-                  /// Returns the SizeOfBlock value of a relocation.
+                  /// Returns the SizeOfBlock value of a relocation.
-                  dword getSizeOfBlock(unsigned int ulRelocation) const; // EXPORT
+                  dword getSizeOfBlock(unsigned int ulRelocation) const; // EXPORT
-                  /// Returns the RelocationData of a relocation.
+                  /// Returns the RelocationData of a relocation.
-                  word getRelocationData(unsigned int ulRelocation, unsigned int ulDataNumber) const; // EXPORT
+                  word getRelocationData(unsigned int ulRelocation, unsigned int ulDataNumber) const; // EXPORT
-                  
+                  
-                  /// Changes the relocation data of a relocation.
+                  /// Changes the relocation data of a relocation.
-                  void setRelocationData(unsigned int ulRelocation, unsigned int ulDataNumber, word wData); // EXPORT
+                  void setRelocationData(unsigned int ulRelocation, unsigned int ulDataNumber, word wData); // EXPORT
-                  
+                  
-                  /// Changes the VirtualAddress of a relocation.
+                  /// Changes the VirtualAddress of a relocation.
-                  void setVirtualAddress(unsigned int ulRelocation, dword dwValue); // EXPORT
+                  void setVirtualAddress(unsigned int ulRelocation, dword dwValue); // EXPORT
-                  /// Changes the SizeOfBlock of a relocation.
+                  /// Changes the SizeOfBlock of a relocation.
-                  void setSizeOfBlock(unsigned int ulRelocation, dword dwValue); // EXPORT
+                  void setSizeOfBlock(unsigned int ulRelocation, dword dwValue); // EXPORT
-                  
+                  
-                  void addRelocation(); // EXPORT
+                  void addRelocation(); // EXPORT
-                  /// Adds new data to a relocation.
+                  /// Adds new data to a relocation.
-                  void addRelocationData(unsigned int ulRelocation, word wValue); // EXPORT
+                  void addRelocationData(unsigned int ulRelocation, word wValue); // EXPORT
-                  /// Removes data from a relocation.
+                  /// Removes data from a relocation.
-//                void removeRelocationData(unsigned int ulRelocation, word wValue); // EXPORT
+//                void removeRelocationData(unsigned int ulRelocation, word wValue); // EXPORT
-                  void removeRelocation(unsigned int index); // EXPORT
+                  void removeRelocation(unsigned int index); // EXPORT
-                  void removeRelocationData(unsigned int relocindex, unsigned int dataindex); // EXPORT
+                  void removeRelocationData(unsigned int relocindex, unsigned int dataindex); // EXPORT
-        };
+        };
-}
+}
-#endif
+#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.
+* ResourceDirectory.h - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#include "ResourceDirectory.h"
+#include "ResourceDirectory.h"
-namespace PeLib
+namespace PeLib
-{
+{
-// -------------------------------------------------- ResourceChild -------------------------------------------
+// -------------------------------------------------- ResourceChild -------------------------------------------
-        ResourceChild::ResourceChild()
+        ResourceChild::ResourceChild()
-        {
+        {
-        }
+        }
-        
+        
-        ResourceChild::ResourceChild(const ResourceChild& rhs)
+        ResourceChild::ResourceChild(const ResourceChild& rhs)
-        {
+        {
-                if (dynamic_cast<ResourceNode*>(rhs.child))
+                if (dynamic_cast<ResourceNode*>(rhs.child))
-                {
+                {
-                        ResourceNode* oldnode = static_cast<ResourceNode*>(rhs.child);
+                        ResourceNode* oldnode = static_cast<ResourceNode*>(rhs.child);
-                        
+                        
-                        entry = rhs.entry;
+                        entry = rhs.entry;
-                        child = new ResourceNode;
+                        child = new ResourceNode;
-                        child->uiElementRva = rhs.child->getElementRva();
+                        child->uiElementRva = rhs.child->getElementRva();
-                        static_cast<ResourceNode*>(child)->header = oldnode->header;
+                        static_cast<ResourceNode*>(child)->header = oldnode->header;
-                        static_cast<ResourceNode*>(child)->children = oldnode->children;
+                        static_cast<ResourceNode*>(child)->children = oldnode->children;
-                }
+                }
-                else
+                else
-                {
+                {
-                        ResourceLeaf* oldnode = static_cast<ResourceLeaf*>(rhs.child);
+                        ResourceLeaf* oldnode = static_cast<ResourceLeaf*>(rhs.child);
-                        
+                        
-                        child = new ResourceLeaf;
+                        child = new ResourceLeaf;
-                        child->uiElementRva = rhs.child->getElementRva();
+                        child->uiElementRva = rhs.child->getElementRva();
-                        static_cast<ResourceLeaf*>(child)->m_data = oldnode->m_data;
+                        static_cast<ResourceLeaf*>(child)->m_data = oldnode->m_data;
-                        static_cast<ResourceLeaf*>(child)->entry = oldnode->entry;
+                        static_cast<ResourceLeaf*>(child)->entry = oldnode->entry;
-                }
+                }
-        }
+        }
-        
+        
-        ResourceChild& ResourceChild::operator=(const ResourceChild& rhs)
+        ResourceChild& ResourceChild::operator=(const ResourceChild& rhs)
-        {
+        {
-                if (this != &rhs)
+                if (this != &rhs)
-                {
+                {
-                        if (dynamic_cast<ResourceNode*>(rhs.child))
+                        if (dynamic_cast<ResourceNode*>(rhs.child))
-                        {
+                        {
-                                ResourceNode* oldnode = static_cast<ResourceNode*>(rhs.child);
+                                ResourceNode* oldnode = static_cast<ResourceNode*>(rhs.child);
-                                
+                                
-                                entry = rhs.entry;
+                                entry = rhs.entry;
-        
+        
-                                child = new ResourceNode;
+                                child = new ResourceNode;
-                                child->uiElementRva = rhs.child->getElementRva();
+                                child->uiElementRva = rhs.child->getElementRva();
-                                static_cast<ResourceNode*>(child)->header = oldnode->header;
+                                static_cast<ResourceNode*>(child)->header = oldnode->header;
-                                static_cast<ResourceNode*>(child)->children = oldnode->children;
+                                static_cast<ResourceNode*>(child)->children = oldnode->children;
-                        }
+                        }
-                        else
+                        else
-                        {
+                        {
-                                ResourceLeaf* oldnode = static_cast<ResourceLeaf*>(rhs.child);
+                                ResourceLeaf* oldnode = static_cast<ResourceLeaf*>(rhs.child);
-                                
+                                
-                                child = new ResourceLeaf;
+                                child = new ResourceLeaf;
-                                child->uiElementRva = rhs.child->getElementRva();
+                                child->uiElementRva = rhs.child->getElementRva();
-                                static_cast<ResourceLeaf*>(child)->m_data = oldnode->m_data;
+                                static_cast<ResourceLeaf*>(child)->m_data = oldnode->m_data;
-                                static_cast<ResourceLeaf*>(child)->entry = oldnode->entry;
+                                static_cast<ResourceLeaf*>(child)->entry = oldnode->entry;
-                        }
+                        }
-                }
+                }
-                
+                
-                return *this;
+                return *this;
-        }
+        }
-        
+        
-        ResourceChild::~ResourceChild()
+        ResourceChild::~ResourceChild()
-        {
+        {
-                delete child;
+                delete child;
-        }
+        }
-        /**
+        /**
-        * Compares the resource child's id to the parameter dwId.
+        * Compares the resource child's id to the parameter dwId.
-        * @param dwId ID of a resource.
+        * @param dwId ID of a resource.
-        * @return True, if the resource child's id equals the parameter.
+        * @return True, if the resource child's id equals the parameter.
-        **/
+        **/
-        bool ResourceChild::equalId(dword dwId) const
+        bool ResourceChild::equalId(dword dwId) const
-        {
+        {
-                return entry.irde.Name == dwId;
+                return entry.irde.Name == dwId;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Compares the resource child's name to the parameter strName.
+        * Compares the resource child's name to the parameter strName.
-        * @param strName ID of a resource.
+        * @param strName ID of a resource.
-        * @return True, if the resource child's name equals the parameter.
+        * @return True, if the resource child's name equals the parameter.
-        **/
+        **/
-        bool ResourceChild::equalName(std::string strName) const
+        bool ResourceChild::equalName(std::string strName) const
-        {
+        {
-                return entry.wstrName == strName;
+                return entry.wstrName == strName;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns true if the resource was given a name.
+        * Returns true if the resource was given a name.
-        **/
+        **/
-        bool ResourceChild::isNamedResource() const
+        bool ResourceChild::isNamedResource() const
-        {
+        {
-                return entry.wstrName.size() != 0;
+                return entry.wstrName.size() != 0;
-        }
+        }
-        
+        
-        /**
+        /**
-        * The children of a resource must be ordered in a certain way. First come the named resources
+        * 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.
+        * in sorted order, afterwards followed the unnamed resources in sorted order.
-        **/
+        **/
-        bool ResourceChild::operator<(const ResourceChild& rc) const
+        bool ResourceChild::operator<(const ResourceChild& rc) const
-        {
+        {
-                if (this->isNamedResource() && !rc.isNamedResource())
+                if (this->isNamedResource() && !rc.isNamedResource())
-                {
+                {
-                        return true;
+                        return true;
-                }
+                }
-                else if (!this->isNamedResource() && rc.isNamedResource())
+                else if (!this->isNamedResource() && rc.isNamedResource())
-                {
+                {
-                        return false;
+                        return false;
-                }
+                }
-                else if (this->isNamedResource() && rc.isNamedResource())
+                else if (this->isNamedResource() && rc.isNamedResource())
-                {
+                {
-                        return this->entry.wstrName < rc.entry.wstrName;
+                        return this->entry.wstrName < rc.entry.wstrName;
-                }
+                }
-                else
+                else
-                {
+                {
-                        return this->entry.irde.Name < rc.entry.irde.Name;
+                        return this->entry.irde.Name < rc.entry.irde.Name;
-                }
+                }
-        }
+        }
-        
+        
-/*      unsigned int ResourceChild::size() const
+/*      unsigned int ResourceChild::size() const
-        {
+        {
-                return PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY::size()
+                return PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY::size()
-                       + child->size()
+                       + child->size()
-                       + (entry.wstrName.size() ? entry.wstrName.size() + 2 : 0);
+                       + (entry.wstrName.size() ? entry.wstrName.size() + 2 : 0);
-        }
+        }
-*/
+*/
-// -------------------------------------------------- ResourceElement -------------------------------------------
+// -------------------------------------------------- ResourceElement -------------------------------------------
-        /**
+        /**
-        * Returns the RVA of a ResourceElement. This is the RVA where the ResourceElement can be
+        * Returns the RVA of a ResourceElement. This is the RVA where the ResourceElement can be
-        * found in the file.
+        * found in the file.
-        * @return RVA of the ResourceElement.
+        * @return RVA of the ResourceElement.
-        **/
+        **/
-        unsigned int ResourceElement::getElementRva() const
+        unsigned int ResourceElement::getElementRva() const
-        {
+        {
-                return uiElementRva;
+                return uiElementRva;
-        }
+        }
-// -------------------------------------------------- ResourceLeaf -------------------------------------------
+// -------------------------------------------------- ResourceLeaf -------------------------------------------
-        /**
+        /**
-        * Checks if a ResourceElement is a leaf or not.
+        * Checks if a ResourceElement is a leaf or not.
-        * @return Always returns true.
+        * @return Always returns true.
-        **/
+        **/
-        bool ResourceLeaf::isLeaf() const
+        bool ResourceLeaf::isLeaf() const
-        {
+        {
-                return true;
+                return true;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Reads the next resource leaf from the InputBuffer.
+        * Reads the next resource leaf from the InputBuffer.
-        * @param inpBuffer An InputBuffer that holds the complete resource directory.
+        * @param inpBuffer An InputBuffer that holds the complete resource directory.
-        * @param uiOffset Offset of the resource leaf that's to be read.
+        * @param uiOffset Offset of the resource leaf that's to be read.
-        * @param uiRva RVA of the beginning of the resource directory.
+        * @param uiRva RVA of the beginning of the resource directory.
-        * @param pad Used for debugging purposes.
+        * @param pad Used for debugging purposes.
-        **/
+        **/
-        int ResourceLeaf::read(InputBuffer& inpBuffer, unsigned int uiOffset, unsigned int uiRva/*, const std::string& pad*/)
+        int ResourceLeaf::read(InputBuffer& inpBuffer, unsigned int uiOffset, unsigned int uiRva/*, const std::string& pad*/)
-        {
+        {
-//              std::cout << pad << "Leaf:" << std::endl;
+//              std::cout << pad << "Leaf:" << std::endl;
-                
+                
-                // Invalid leaf.
+                // Invalid leaf.
-                if (uiOffset + PELIB_IMAGE_RESOURCE_DATA_ENTRY::size() > inpBuffer.size())
+                if (uiOffset + PELIB_IMAGE_RESOURCE_DATA_ENTRY::size() > inpBuffer.size())
-                {
+                {
-                        return 1;
+                        return 1;
-                }
+                }
-                uiElementRva = uiOffset + uiRva;
+                uiElementRva = uiOffset + uiRva;
-                inpBuffer.set(uiOffset);
+                inpBuffer.set(uiOffset);
-                
+                
-                inpBuffer >> entry.OffsetToData;
+                inpBuffer >> entry.OffsetToData;
-                inpBuffer >> entry.Size;
+                inpBuffer >> entry.Size;
-                inpBuffer >> entry.CodePage;
+                inpBuffer >> entry.CodePage;
-                inpBuffer >> entry.Reserved;
+                inpBuffer >> entry.Reserved;
-/*              std::cout << pad << std::hex << "Offset: " << entry.OffsetToData << std::endl;
+/*              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 << "Size: " << entry.Size << std::endl;
-                std::cout << pad << std::hex << "CodePage: " << entry.CodePage << std::endl;
+                std::cout << pad << std::hex << "CodePage: " << entry.CodePage << std::endl;
-                std::cout << pad << std::hex << "Reserved: " << entry.Reserved << std::endl;
+                std::cout << pad << std::hex << "Reserved: " << entry.Reserved << std::endl;
-*/              
+*/              
-                // Invalid leaf.
+                // Invalid leaf.
-                if (entry.OffsetToData - uiRva + entry.Size > inpBuffer.size())
+                if (entry.OffsetToData - uiRva + entry.Size > inpBuffer.size())
-                {
+                {
-//                      std::cout << entry.OffsetToData << " XXX " << uiRva << " - " << entry.Size << " - " << inpBuffer.size() << std::endl;
+//                      std::cout << entry.OffsetToData << " XXX " << uiRva << " - " << entry.Size << " - " << inpBuffer.size() << std::endl;
-                        return 1;
+                        return 1;
-                }
+                }
-                
+                
-//              std::cout << entry.OffsetToData << " - " << uiRva << " - " << entry.Size << " - " << inpBuffer.size() << std::endl;
+//              std::cout << entry.OffsetToData << " - " << uiRva << " - " << entry.Size << " - " << inpBuffer.size() << std::endl;
-                inpBuffer.set(entry.OffsetToData - uiRva);
+                inpBuffer.set(entry.OffsetToData - uiRva);
-                m_data.assign(inpBuffer.data() + inpBuffer.get(), inpBuffer.data() + inpBuffer.get() + entry.Size);
+                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::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, " "));
+//              std::copy(m_data.begin(), m_data.end(), std::ostream_iterator<int>(std::cout << std::hex, " "));
-                return 0;
+                return 0;
-        }
+        }
-        /**
+        /**
-        * Rebuilds the current resource leaf.
+        * Rebuilds the current resource leaf.
-        * @param obBuffer OutputBuffer where the rebuilt resource leaf is stored.
+        * @param obBuffer OutputBuffer where the rebuilt resource leaf is stored.
-        * @param uiOffset Offset of the resource leaf inside the resource directory.
+        * @param uiOffset Offset of the resource leaf inside the resource directory.
-        * @param uiRva RVA of 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
+        void ResourceLeaf::rebuild(OutputBuffer& obBuffer, unsigned int& uiOffset, unsigned int uiRva, const std::string&) const
-        {
+        {
-//              std::cout << std::hex << pad << "Leaf: " << uiOffset << std::endl;
+//              std::cout << std::hex << pad << "Leaf: " << uiOffset << std::endl;
-                uiOffset += PELIB_IMAGE_RESOURCE_DATA_ENTRY::size();
+                uiOffset += PELIB_IMAGE_RESOURCE_DATA_ENTRY::size();
-                
+                
-//              obBuffer << entry.OffsetToData;
+//              obBuffer << entry.OffsetToData;
-//              obBuffer << uiOffset;
+//              obBuffer << uiOffset;
-                obBuffer << uiRva + uiOffset + (uiOffset % 4);
+                obBuffer << uiRva + uiOffset + (uiOffset % 4);
-                obBuffer << entry.Size;
+                obBuffer << entry.Size;
-                obBuffer << entry.CodePage;
+                obBuffer << entry.CodePage;
-                obBuffer << entry.Reserved;
+                obBuffer << entry.Reserved;
-                
+                
-                while (uiOffset % 4)
+                while (uiOffset % 4)
-                {
+                {
-                        uiOffset++;
+                        uiOffset++;
-                        obBuffer << (byte)0;
+                        obBuffer << (byte)0;
-                }
+                }
-                
+                
-                uiOffset += static_cast<unsigned int>(m_data.size());
+                uiOffset += static_cast<unsigned int>(m_data.size());
-                for (unsigned int i=0;i<m_data.size();i++)
+                for (unsigned int i=0;i<m_data.size();i++)
-                {
+                {
-                        obBuffer << m_data[i];
+                        obBuffer << m_data[i];
-                }
+                }
-//              std::cout << "LeafChild: " << std::endl;
+//              std::cout << "LeafChild: " << std::endl;
-        }
+        }
-        void ResourceLeaf::makeValid()
+        void ResourceLeaf::makeValid()
-        {
+        {
-                entry.Size = static_cast<unsigned int>(m_data.size());
+                entry.Size = static_cast<unsigned int>(m_data.size());
-        }
+        }
-        
+        
-/*      /// Returns the size of a resource leaf.
+/*      /// Returns the size of a resource leaf.
-        unsigned int ResourceLeaf::size() const
+        unsigned int ResourceLeaf::size() const
-        {
+        {
-                return PELIB_IMAGE_RESOURCE_DATA_ENTRY::size() + m_data.size();
+                return PELIB_IMAGE_RESOURCE_DATA_ENTRY::size() + m_data.size();
-        }
+        }
-*/
+*/
-        /**
+        /**
-        * Returns a vector that contains the raw data of a resource leaf.
+        * Returns a vector that contains the raw data of a resource leaf.
-        * @return Raw data of the resource.
+        * @return Raw data of the resource.
-        **/
+        **/
-        std::vector<byte> ResourceLeaf::getData() const
+        std::vector<byte> ResourceLeaf::getData() const
-        {
+        {
-                return m_data;
+                return m_data;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Overwrites the raw data of a resource.
+        * Overwrites the raw data of a resource.
-        * @param vData New data of the resource.
+        * @param vData New data of the resource.
-        **/
+        **/
-        void ResourceLeaf::setData(const std::vector<byte>& vData)
+        void ResourceLeaf::setData(const std::vector<byte>& vData)
-        {
+        {
-                m_data = vData;
+                m_data = vData;
-        }
+        }
-        /**
+        /**
-        * Returns the leaf's OffsetToData value. That's the RVA where the raw data of the resource
+        * Returns the leaf's OffsetToData value. That's the RVA where the raw data of the resource
-        * can be found.
+        * can be found.
-        * @return The leaf's OffsetToData value.
+        * @return The leaf's OffsetToData value.
-        **/
+        **/
-        dword ResourceLeaf::getOffsetToData() const
+        dword ResourceLeaf::getOffsetToData() const
-        {
+        {
-                return entry.OffsetToData;
+                return entry.OffsetToData;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the leaf's Size value. That's the size of the raw data of the resource.
+        * Returns the leaf's Size value. That's the size of the raw data of the resource.
-        * @return The leaf's Size value.
+        * @return The leaf's Size value.
-        **/
+        **/
-        dword ResourceLeaf::getSize() const
+        dword ResourceLeaf::getSize() const
-        {
+        {
-                return entry.Size;
+                return entry.Size;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the leaf's CodePage value.
+        * Returns the leaf's CodePage value.
-        * @return The leaf's CodePage value.
+        * @return The leaf's CodePage value.
-        **/
+        **/
-        dword ResourceLeaf::getCodePage() const
+        dword ResourceLeaf::getCodePage() const
-        {
+        {
-                return entry.CodePage;
+                return entry.CodePage;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the leaf's Reserved value.
+        * Returns the leaf's Reserved value.
-        * @return The leaf's Reserved value.
+        * @return The leaf's Reserved value.
-        **/
+        **/
-        dword ResourceLeaf::getReserved() const
+        dword ResourceLeaf::getReserved() const
-        {
+        {
-                return entry.Reserved;
+                return entry.Reserved;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the leaf's OffsetToData value.
+        * Sets the leaf's OffsetToData value.
-        * @param dwValue The leaf's new OffsetToData value.
+        * @param dwValue The leaf's new OffsetToData value.
-        **/
+        **/
-        void ResourceLeaf::setOffsetToData(dword dwValue)
+        void ResourceLeaf::setOffsetToData(dword dwValue)
-        {
+        {
-                entry.OffsetToData = dwValue;
+                entry.OffsetToData = dwValue;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the leaf's Size value.
+        * Sets the leaf's Size value.
-        * @param dwValue The leaf's new Size value.
+        * @param dwValue The leaf's new Size value.
-        **/
+        **/
-        void ResourceLeaf::setSize(dword dwValue)
+        void ResourceLeaf::setSize(dword dwValue)
-        {
+        {
-                entry.Size = dwValue;
+                entry.Size = dwValue;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the leaf's CodePage value.
+        * Sets the leaf's CodePage value.
-        * @param dwValue The leaf's new CodePage value.
+        * @param dwValue The leaf's new CodePage value.
-        **/
+        **/
-        void ResourceLeaf::setCodePage(dword dwValue)
+        void ResourceLeaf::setCodePage(dword dwValue)
-        {
+        {
-                entry.CodePage = dwValue;
+                entry.CodePage = dwValue;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the leaf's Reserved value.
+        * Sets the leaf's Reserved value.
-        * @param dwValue The leaf's new Reserved value.
+        * @param dwValue The leaf's new Reserved value.
-        **/
+        **/
-        void ResourceLeaf::setReserved(dword dwValue)
+        void ResourceLeaf::setReserved(dword dwValue)
-        {
+        {
-                entry.Reserved = dwValue;
+                entry.Reserved = dwValue;
-        }
+        }
-        
+        
-// -------------------------------------------------- ResourceNode -------------------------------------------
+// -------------------------------------------------- ResourceNode -------------------------------------------
-        /**
+        /**
-        * Checks if a ResourceElement is a leaf or not.
+        * Checks if a ResourceElement is a leaf or not.
-        * @return Always returns false.
+        * @return Always returns false.
-        **/
+        **/
-        bool ResourceNode::isLeaf() const
+        bool ResourceNode::isLeaf() const
-        {
+        {
-                return false;
+                return false;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sorts the node's children and corrects the node's header.
+        * Sorts the node's children and corrects the node's header.
-        **/
+        **/
-        void ResourceNode::makeValid()
+        void ResourceNode::makeValid()
-        {
+        {
-                std::sort(children.begin(), children.end());
+                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.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;
+                header.NumberOfIdEntries = static_cast<unsigned int>(children.size()) - header.NumberOfNamedEntries;
-        }
+        }
-        /**
+        /**
-        * Rebuilds the current resource node.
+        * Rebuilds the current resource node.
-        * @param obBuffer OutputBuffer where the rebuilt resource node is stored.
+        * @param obBuffer OutputBuffer where the rebuilt resource node is stored.
-        * @param uiOffset Offset of the resource node inside the resource directory.
+        * @param uiOffset Offset of the resource node inside the resource directory.
-        * @param uiRva RVA of the resource directory.
+        * @param uiRva RVA of the resource directory.
-        * @param pad Used for debugging.
+        * @param pad Used for debugging.
-        **/
+        **/
-        void ResourceNode::rebuild(OutputBuffer& obBuffer, unsigned int& uiOffset, unsigned int uiRva, const std::string& pad) const
+        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 << uiOffset << std::endl;
-                
+                
-                std::cout << std::hex << pad << "header.Characteristics: " << header.Characteristics << 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.TimeDateStamp: " << header.TimeDateStamp << std::endl;
-                std::cout << std::hex << pad << "header.MajorVersion: "  << header.MajorVersion << 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.MinorVersion: "  << header.MinorVersion << std::endl;
-                std::cout << std::hex << pad << "header.NumberOfNamedEntries: "  << header.NumberOfNamedEntries << std::endl;
+                std::cout << std::hex << pad << "header.NumberOfNamedEntries: "  << header.NumberOfNamedEntries << std::endl;
-                std::cout << std::hex << pad << "header.NumberOfIdEntries: "  << header.NumberOfIdEntries << std::endl;
+                std::cout << std::hex << pad << "header.NumberOfIdEntries: "  << header.NumberOfIdEntries << std::endl;
-*/              
+*/              
-                obBuffer << header.Characteristics;
+                obBuffer << header.Characteristics;
-                obBuffer << header.TimeDateStamp;
+                obBuffer << header.TimeDateStamp;
-                obBuffer << header.MajorVersion;
+                obBuffer << header.MajorVersion;
-                obBuffer << header.MinorVersion;
+                obBuffer << header.MinorVersion;
-                //std::cout << pad << "Children: " << children.size() << std::endl;
+                //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 << 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;
+                //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 << 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 << children.size() - std::count_if(children.begin(), children.end(), std::mem_fun_ref(&ResourceChild::isNamedResource));
-                obBuffer << header.NumberOfNamedEntries;
+                obBuffer << header.NumberOfNamedEntries;
-                obBuffer << header.NumberOfIdEntries;
+                obBuffer << header.NumberOfIdEntries;
-                uiOffset += PELIB_IMAGE_RESOURCE_DIRECTORY::size();
+                uiOffset += PELIB_IMAGE_RESOURCE_DIRECTORY::size();
-                
+                
-                for (unsigned int i=0;i<children.size();i++)
+                for (unsigned int i=0;i<children.size();i++)
-                {
+                {
-                        obBuffer << (dword)0;
+                        obBuffer << (dword)0;
-                        obBuffer << (dword)0;
+                        obBuffer << (dword)0;
-                }
+                }
-                unsigned int newoffs = (uiOffset + children.size() * 8);
+                unsigned int newoffs = (uiOffset + children.size() * 8);
-                
+                
-                for (unsigned int i=0;i<children.size();i++)
+                for (unsigned int i=0;i<children.size();i++)
-                {
+                {
-                        if (!children[i].entry.wstrName.size())
+                        if (!children[i].entry.wstrName.size())
-                        {
+                        {
-                                obBuffer.update(uiOffset, children[i].entry.irde.Name);
+                                obBuffer.update(uiOffset, children[i].entry.irde.Name);
-                        }
+                        }
-                        else
+                        else
-                        {
+                        {
-                                obBuffer.update(uiOffset, newoffs | PELIB_IMAGE_RESOURCE_NAME_IS_STRING);
+                                obBuffer.update(uiOffset, newoffs | PELIB_IMAGE_RESOURCE_NAME_IS_STRING);
-                                obBuffer << (word)children[i].entry.wstrName.size();
+                                obBuffer << (word)children[i].entry.wstrName.size();
-                                newoffs += 2;
+                                newoffs += 2;
-                                for (unsigned int j=0;j<children[i].entry.wstrName.size();j++)
+                                for (unsigned int j=0;j<children[i].entry.wstrName.size();j++)
-                                {
+                                {
-//                                      std::cout << children[i].entry.wstrName[j];
+//                                      std::cout << children[i].entry.wstrName[j];
-                                        obBuffer << (word)children[i].entry.wstrName[j];
+                                        obBuffer << (word)children[i].entry.wstrName[j];
-                                        newoffs += 2;
+                                        newoffs += 2;
-                                }
+                                }
-                        }
+                        }
-                        uiOffset += 4;
+                        uiOffset += 4;
-//                      obBuffer << children[i].entry.OffsetToData;
+//                      obBuffer << children[i].entry.OffsetToData;
-                        obBuffer.update(uiOffset, newoffs | (children[i].entry.irde.OffsetToData & PELIB_IMAGE_RESOURCE_DATA_IS_DIRECTORY));
+                        obBuffer.update(uiOffset, newoffs | (children[i].entry.irde.OffsetToData & PELIB_IMAGE_RESOURCE_DATA_IS_DIRECTORY));
-                        uiOffset += 4;
+                        uiOffset += 4;
-                        children[i].child->rebuild(obBuffer, newoffs, uiRva, pad + "  ");
+                        children[i].child->rebuild(obBuffer, newoffs, uiRva, pad + "  ");
-                }
+                }
-                uiOffset = newoffs;
+                uiOffset = newoffs;
-        }
+        }
-        /**
+        /**
-        * Reads the next resource node from the InputBuffer.
+        * Reads the next resource node from the InputBuffer.
-        * @param inpBuffer An InputBuffer that holds the complete resource directory.
+        * @param inpBuffer An InputBuffer that holds the complete resource directory.
-        * @param uiOffset Offset of the resource node that's to be read.
+        * @param uiOffset Offset of the resource node that's to be read.
-        * @param uiRva RVA of the beginning of the resource directory.
+        * @param uiRva RVA of the beginning of the resource directory.
-        * @param pad Something I need for debugging. Will be removed soon.
+        * @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*/)
+        int ResourceNode::read(InputBuffer& inpBuffer, unsigned int uiOffset, unsigned int uiRva/*, const std::string& pad*/)
-        {
+        {
-                // Not enough space to be a valid node.
+                // Not enough space to be a valid node.
-                if (uiOffset + PELIB_IMAGE_RESOURCE_DIRECTORY::size() > inpBuffer.size())
+                if (uiOffset + PELIB_IMAGE_RESOURCE_DIRECTORY::size() > inpBuffer.size())
-                {
+                {
-                        return 1;
+                        return 1;
-                }
+                }
-                
+                
-                uiElementRva = uiOffset + uiRva;
+                uiElementRva = uiOffset + uiRva;
-                
+                
-                inpBuffer.set(uiOffset);
+                inpBuffer.set(uiOffset);
-                
+                
-                inpBuffer >> header.Characteristics;
+                inpBuffer >> header.Characteristics;
-                inpBuffer >> header.TimeDateStamp;
+                inpBuffer >> header.TimeDateStamp;
-                inpBuffer >> header.MajorVersion;
+                inpBuffer >> header.MajorVersion;
-                inpBuffer >> header.MinorVersion;
+                inpBuffer >> header.MinorVersion;
-                inpBuffer >> header.NumberOfNamedEntries;
+                inpBuffer >> header.NumberOfNamedEntries;
-                inpBuffer >> header.NumberOfIdEntries;
+                inpBuffer >> header.NumberOfIdEntries;
-                        
+                        
-                // Not enough space to be a valid node.
+                // Not enough space to be a valid node.
-                if (uiOffset + PELIB_IMAGE_RESOURCE_DIRECTORY::size()
+                if (uiOffset + PELIB_IMAGE_RESOURCE_DIRECTORY::size()
-                   + (header.NumberOfNamedEntries + header.NumberOfIdEntries) * PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY::size()
+                   + (header.NumberOfNamedEntries + header.NumberOfIdEntries) * PELIB_IMAGE_RESOURCE_DIRECTORY_ENTRY::size()
-                   > inpBuffer.size())
+                   > inpBuffer.size())
-                {
+                {
-                        return 1;
+                        return 1;
-                }
+                }
-                
+                
-//              std::cout << std::hex << pad << "Characteristics: " << header.Characteristics << std::endl;
+//              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 << "TimeDateStamp: " << header.TimeDateStamp << std::endl;
-//              std::cout << std::hex << pad << "MajorVersion: " << header.MajorVersion << 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 << "MinorVersion: " << header.MinorVersion << std::endl;
-//              std::cout << std::hex << pad << "NumberOfNamedEntries: " << header.NumberOfNamedEntries << std::endl;
+//              std::cout << std::hex << pad << "NumberOfNamedEntries: " << header.NumberOfNamedEntries << std::endl;
-//              std::cout << std::hex << pad << "NumberOfIdEntries: " << header.NumberOfIdEntries << std::endl;
+//              std::cout << std::hex << pad << "NumberOfIdEntries: " << header.NumberOfIdEntries << std::endl;
-                        
+                        
-                for (int i=0;i<header.NumberOfNamedEntries + header.NumberOfIdEntries;i++)
+                for (int i=0;i<header.NumberOfNamedEntries + header.NumberOfIdEntries;i++)
-                {
+                {
-                        ResourceChild rc;
+                        ResourceChild rc;
-                        inpBuffer >> rc.entry.irde.Name;
+                        inpBuffer >> rc.entry.irde.Name;
-                        inpBuffer >> rc.entry.irde.OffsetToData;
+                        inpBuffer >> rc.entry.irde.OffsetToData;
-                        
+                        
-                        unsigned int lastPos = inpBuffer.get();
+                        unsigned int lastPos = inpBuffer.get();
-                        if (rc.entry.irde.Name & PELIB_IMAGE_RESOURCE_NAME_IS_STRING)
+                        if (rc.entry.irde.Name & PELIB_IMAGE_RESOURCE_NAME_IS_STRING)
-                        {
+                        {
-                                // Enough space to read string length?
+                                // Enough space to read string length?
-                                if ((rc.entry.irde.Name & ~PELIB_IMAGE_RESOURCE_NAME_IS_STRING) + 2 < inpBuffer.size())
+                                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);
+                                        inpBuffer.set(rc.entry.irde.Name & ~PELIB_IMAGE_RESOURCE_NAME_IS_STRING);
-                                        word strlen;
+                                        word strlen;
-                                        inpBuffer >> strlen;
+                                        inpBuffer >> strlen;
-                                        
+                                        
-                                        // Enough space to read string?
+                                        // Enough space to read string?
-                                        if ((rc.entry.irde.Name & ~PELIB_IMAGE_RESOURCE_NAME_IS_STRING) + 2 * strlen < inpBuffer.size())
+                                        if ((rc.entry.irde.Name & ~PELIB_IMAGE_RESOURCE_NAME_IS_STRING) + 2 * strlen < inpBuffer.size())
-                                        {
+                                        {
-                                                wchar_t c;
+                                                wchar_t c;
-                                                for (word i=0;i<strlen;i++)
+                                                for (word i=0;i<strlen;i++)
-                                                {
+                                                {
-                                                        inpBuffer >> c;
+                                                        inpBuffer >> c;
-                                                        rc.entry.wstrName += c;
+                                                        rc.entry.wstrName += c;
-                                                }
+                                                }
-                                        }
+                                        }
-                                }
+                                }
-                                
+                                
-//                              std::wcout << rc.entry.wstrName << std::endl;
+//                              std::wcout << rc.entry.wstrName << std::endl;
-                                
+                                
-//                              std::cout << strlen << std::endl;
+//                              std::cout << strlen << std::endl;
-                                inpBuffer.set(lastPos);
+                                inpBuffer.set(lastPos);
-                        }
+                        }
-                        
+                        
-                        if (rc.entry.irde.OffsetToData & PELIB_IMAGE_RESOURCE_DATA_IS_DIRECTORY)
+                        if (rc.entry.irde.OffsetToData & PELIB_IMAGE_RESOURCE_DATA_IS_DIRECTORY)
-                        {
+                        {
-                                rc.child = new ResourceNode;
+                                rc.child = new ResourceNode;
-                                rc.child->read(inpBuffer, rc.entry.irde.OffsetToData & ~PELIB_IMAGE_RESOURCE_DATA_IS_DIRECTORY, uiRva/*, pad + "  "*/);
+                                rc.child->read(inpBuffer, rc.entry.irde.OffsetToData & ~PELIB_IMAGE_RESOURCE_DATA_IS_DIRECTORY, uiRva/*, pad + "  "*/);
-                        }
+                        }
-                        else
+                        else
-                        {
+                        {
-                                rc.child = new ResourceLeaf;
+                                rc.child = new ResourceLeaf;
-                                rc.child->read(inpBuffer, rc.entry.irde.OffsetToData, uiRva/*, pad + "  "*/);
+                                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 << "(Name): " << rc.entry.irde.Name << std::endl;
-//                      std::cout << std::hex << pad << "Entry " << i << "(Offset): " << rc.entry.irde.OffsetToData << std::endl;
+//                      std::cout << std::hex << pad << "Entry " << i << "(Offset): " << rc.entry.irde.OffsetToData << std::endl;
-                        children.push_back(rc);
+                        children.push_back(rc);
-                        inpBuffer.set(lastPos);
+                        inpBuffer.set(lastPos);
-                }
+                }
-                
+                
-                return 0;
+                return 0;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the number of children of the current node. Note that this number is the number
+        * 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.
+        * of defined children, not the value from the header.
-        * @return Number of node's children.
+        * @return Number of node's children.
-        **/
+        **/
-        unsigned int ResourceNode::getNumberOfChildren() const
+        unsigned int ResourceNode::getNumberOfChildren() const
-        {
+        {
-                return static_cast<unsigned int>(children.size());
+                return static_cast<unsigned int>(children.size());
-        }
+        }
-        
+        
-        /**
+        /**
-        * Adds another child to the current node.
+        * Adds another child to the current node.
-        **/
+        **/
-        void ResourceNode::addChild()
+        void ResourceNode::addChild()
-        {
+        {
-                ResourceChild c;
+                ResourceChild c;
-                c.child = 0;
+                c.child = 0;
-                children.push_back(c);
+                children.push_back(c);
-        }
+        }
-                  
+                  
-        /**
+        /**
-        * Returns a node's child.
+        * Returns a node's child.
-        * @param uiIndex Index of the child.
+        * @param uiIndex Index of the child.
-        * @return The child identified by uiIndex. This child can be either a ResourceNode or a ResourceLeaf.
+        * @return The child identified by uiIndex. This child can be either a ResourceNode or a ResourceLeaf.
-        **/
+        **/
-        ResourceElement* ResourceNode::getChild(unsigned int uiIndex)
+        ResourceElement* ResourceNode::getChild(unsigned int uiIndex)
-        {
+        {
-                return children[uiIndex].child;
+                return children[uiIndex].child;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Removes a child from the current node.
+        * Removes a child from the current node.
-        * @param uiIndex Index of the child.
+        * @param uiIndex Index of the child.
-        **/
+        **/
-        void ResourceNode::removeChild(unsigned int uiIndex)
+        void ResourceNode::removeChild(unsigned int uiIndex)
-        {
+        {
-                children.erase(children.begin() + uiIndex);
+                children.erase(children.begin() + uiIndex);
-        }
+        }
-                  
+                  
-        /**
+        /**
-        * Returns the name of a child.
+        * Returns the name of a child.
-        * @param uiIndex Index of the child.
+        * @param uiIndex Index of the child.
-        * @return Either the name of the specified child or an empty string.
+        * @return Either the name of the specified child or an empty string.
-        **/
+        **/
-        std::string ResourceNode::getChildName(unsigned int uiIndex) const
+        std::string ResourceNode::getChildName(unsigned int uiIndex) const
-        {
+        {
-                return children[uiIndex].entry.wstrName;
+                return children[uiIndex].entry.wstrName;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the Name value of a child.
+        * Returns the Name value of a child.
-        * @param uiIndex Index of the child.
+        * @param uiIndex Index of the child.
-        * @return Name value of a child.
+        * @return Name value of a child.
-        **/
+        **/
-        dword ResourceNode::getOffsetToChildName(unsigned int uiIndex) const
+        dword ResourceNode::getOffsetToChildName(unsigned int uiIndex) const
-        {
+        {
-                return children[uiIndex].entry.irde.Name;
+                return children[uiIndex].entry.irde.Name;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the OffsetToData value of a child.
+        * Returns the OffsetToData value of a child.
-        * @param uiIndex Index of the child.
+        * @param uiIndex Index of the child.
-        * @return OffsetToData value of a child.
+        * @return OffsetToData value of a child.
-        **/
+        **/
-        dword ResourceNode::getOffsetToChildData(unsigned int uiIndex) const
+        dword ResourceNode::getOffsetToChildData(unsigned int uiIndex) const
-        {
+        {
-                return children[uiIndex].entry.irde.OffsetToData;
+                return children[uiIndex].entry.irde.OffsetToData;
-        }
+        }
-        
+        
-                  
+                  
-        /**
+        /**
-        * Sets the name of a child.
+        * Sets the name of a child.
-        * @param uiIndex Index of the child.
+        * @param uiIndex Index of the child.
-        * @param strNewName New name of the resource.
+        * @param strNewName New name of the resource.
-        **/
+        **/
-        void ResourceNode::setChildName(unsigned int uiIndex, const std::string& strNewName)
+        void ResourceNode::setChildName(unsigned int uiIndex, const std::string& strNewName)
-        {
+        {
-                children[uiIndex].entry.wstrName = strNewName;
+                children[uiIndex].entry.wstrName = strNewName;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the Name value of a child.
+        * Sets the Name value of a child.
-        * @param uiIndex Index of the child.
+        * @param uiIndex Index of the child.
-        * @param dwNewOffset New Name value of the resource.
+        * @param dwNewOffset New Name value of the resource.
-        **/
+        **/
-        void ResourceNode::setOffsetToChildName(unsigned int uiIndex, dword dwNewOffset)
+        void ResourceNode::setOffsetToChildName(unsigned int uiIndex, dword dwNewOffset)
-        {
+        {
-                children[uiIndex].entry.irde.Name = dwNewOffset;
+                children[uiIndex].entry.irde.Name = dwNewOffset;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the OffsetToData value of a child.
+        * Sets the OffsetToData value of a child.
-        * @param uiIndex Index of the child.
+        * @param uiIndex Index of the child.
-        * @param dwNewOffset New OffsetToData value of the resource.
+        * @param dwNewOffset New OffsetToData value of the resource.
-        **/
+        **/
-        void ResourceNode::setOffsetToChildData(unsigned int uiIndex, dword dwNewOffset)
+        void ResourceNode::setOffsetToChildData(unsigned int uiIndex, dword dwNewOffset)
-        {
+        {
-                children[uiIndex].entry.irde.OffsetToData = dwNewOffset;
+                children[uiIndex].entry.irde.OffsetToData = dwNewOffset;
-        }
+        }
-                  
+                  
-        /**
+        /**
-        * Returns the Characteristics value of the node.
+        * Returns the Characteristics value of the node.
-        * @return Characteristics value of the node.
+        * @return Characteristics value of the node.
-        **/
+        **/
-        dword ResourceNode::getCharacteristics() const
+        dword ResourceNode::getCharacteristics() const
-        {
+        {
-                return header.Characteristics;
+                return header.Characteristics;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the TimeDateStamp value of the node.
+        * Returns the TimeDateStamp value of the node.
-        * @return TimeDateStamp value of the node.
+        * @return TimeDateStamp value of the node.
-        **/
+        **/
-        dword ResourceNode::getTimeDateStamp() const
+        dword ResourceNode::getTimeDateStamp() const
-        {
+        {
-                return header.TimeDateStamp;
+                return header.TimeDateStamp;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the MajorVersion value of the node.
+        * Returns the MajorVersion value of the node.
-        * @return MajorVersion value of the node.
+        * @return MajorVersion value of the node.
-        **/
+        **/
-        word ResourceNode::getMajorVersion() const
+        word ResourceNode::getMajorVersion() const
-        {
+        {
-                return header.MajorVersion;
+                return header.MajorVersion;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the MinorVersion value of the node.
+        * Returns the MinorVersion value of the node.
-        * @return MinorVersion value of the node.
+        * @return MinorVersion value of the node.
-        **/
+        **/
-        word ResourceNode::getMinorVersion() const
+        word ResourceNode::getMinorVersion() const
-        {
+        {
-                return header.MinorVersion;
+                return header.MinorVersion;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the NumberOfNamedEntries value of the node.
+        * Returns the NumberOfNamedEntries value of the node.
-        * @return NumberOfNamedEntries value of the node.
+        * @return NumberOfNamedEntries value of the node.
-        **/
+        **/
-        word ResourceNode::getNumberOfNamedEntries() const
+        word ResourceNode::getNumberOfNamedEntries() const
-        {
+        {
-                return header.NumberOfNamedEntries;
+                return header.NumberOfNamedEntries;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the NumberOfIdEntries value of the node.
+        * Returns the NumberOfIdEntries value of the node.
-        * @return NumberOfIdEntries value of the node.
+        * @return NumberOfIdEntries value of the node.
-        **/
+        **/
-        word ResourceNode::getNumberOfIdEntries() const
+        word ResourceNode::getNumberOfIdEntries() const
-        {
+        {
-                return header.NumberOfIdEntries;
+                return header.NumberOfIdEntries;
-        }
+        }
-                  
+                  
-        /**
+        /**
-        * Sets the Characteristics value of the node.
+        * Sets the Characteristics value of the node.
-        * @param value New Characteristics value of the node.
+        * @param value New Characteristics value of the node.
-        **/
+        **/
-        void ResourceNode::setCharacteristics(dword value)
+        void ResourceNode::setCharacteristics(dword value)
-        {
+        {
-                header.Characteristics = value;
+                header.Characteristics = value;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the TimeDateStamp value of the node.
+        * Sets the TimeDateStamp value of the node.
-        * @param value New TimeDateStamp value of the node.
+        * @param value New TimeDateStamp value of the node.
-        **/
+        **/
-        void ResourceNode::setTimeDateStamp(dword value)
+        void ResourceNode::setTimeDateStamp(dword value)
-        {
+        {
-                header.TimeDateStamp = value;
+                header.TimeDateStamp = value;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the MajorVersion value of the node.
+        * Sets the MajorVersion value of the node.
-        * @param value New MajorVersion value of the node.
+        * @param value New MajorVersion value of the node.
-        **/
+        **/
-        void ResourceNode::setMajorVersion(word value)
+        void ResourceNode::setMajorVersion(word value)
-        {
+        {
-                header.MajorVersion = value;
+                header.MajorVersion = value;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the MinorVersion value of the node.
+        * Sets the MinorVersion value of the node.
-        * @param value New MinorVersion value of the node.
+        * @param value New MinorVersion value of the node.
-        **/
+        **/
-        void ResourceNode::setMinorVersion(word value)
+        void ResourceNode::setMinorVersion(word value)
-        {
+        {
-                header.MinorVersion = value;
+                header.MinorVersion = value;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the NumberOfNamedEntries value of the node.
+        * Sets the NumberOfNamedEntries value of the node.
-        * @param value New NumberOfNamedEntries value of the node.
+        * @param value New NumberOfNamedEntries value of the node.
-        **/
+        **/
-        void ResourceNode::setNumberOfNamedEntries(word value)
+        void ResourceNode::setNumberOfNamedEntries(word value)
-        {
+        {
-                header.NumberOfNamedEntries = value;
+                header.NumberOfNamedEntries = value;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the NumberOfIdEntries value of the node.
+        * Sets the NumberOfIdEntries value of the node.
-        * @param value New NumberOfIdEntries value of the node.
+        * @param value New NumberOfIdEntries value of the node.
-        **/
+        **/
-        void ResourceNode::setNumberOfIdEntries(word value)
+        void ResourceNode::setNumberOfIdEntries(word value)
-        {
+        {
-                header.NumberOfIdEntries = value;
+                header.NumberOfIdEntries = value;
-        }
+        }
-        
+        
-                  
+                  
-/*      /// Returns the size of a resource node.
+/*      /// Returns the size of a resource node.
-        unsigned int ResourceNode::size() const
+        unsigned int ResourceNode::size() const
-        {
+        {
-                if (children.size())
+                if (children.size())
-                {
+                {
-                        std::cout << std::accumulate(children.begin(), children.end(), 0, accumulate<ResourceChild>) << std::endl;
+                        std::cout << std::accumulate(children.begin(), children.end(), 0, accumulate<ResourceChild>) << std::endl;
-                        return PELIB_IMAGE_RESOURCE_DIRECTORY::size()
+                        return PELIB_IMAGE_RESOURCE_DIRECTORY::size()
-                                 + std::accumulate(children.begin(), children.end(), 0, accumulate<ResourceChild>);
+                                 + std::accumulate(children.begin(), children.end(), 0, accumulate<ResourceChild>);
-                }
+                }
-                else
+                else
-                {
+                {
-                        return 0;
+                        return 0;
-                }
+                }
-        }
+        }
-*/      
+*/      
-// -------------------------------------------------- ResourceDirectory -------------------------------------------
+// -------------------------------------------------- ResourceDirectory -------------------------------------------
-        
+        
-        /**
+        /**
-        * Returns the root node of the resource directory.
+        * Returns the root node of the resource directory.
-        * @return Root node of the resource directory.
+        * @return Root node of the resource directory.
-        **/
+        **/
-        ResourceNode* ResourceDirectory::getRoot()
+        ResourceNode* ResourceDirectory::getRoot()
-        {
+        {
-                return &m_rnRoot;
+                return &m_rnRoot;
-        }
+        }
-        /**
+        /**
-        * Correctly sorts the resource nodes of the resource tree. This function should be called
+        * Correctly sorts the resource nodes of the resource tree. This function should be called
-        * before calling rebuild.
+        * before calling rebuild.
-        **/
+        **/
-        void ResourceDirectory::makeValid()
+        void ResourceDirectory::makeValid()
-        {
+        {
-                m_rnRoot.makeValid();
+                m_rnRoot.makeValid();
-        }
+        }
-        /**
+        /**
-        * Reads the resource directory from a file.
+        * Reads the resource directory from a file.
-        * @param strFilename Name of the file.
+        * @param strFilename Name of the file.
-        * @param uiOffset File offset of the resource directory.
+        * @param uiOffset File offset of the resource directory.
-        * @param uiSize Raw size of the resource directory.
+        * @param uiSize Raw size of the resource directory.
-        * @param uiResDirRva RVA of the beginning 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)
+        int ResourceDirectory::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, unsigned int uiResDirRva)
-        {
+        {
-                if (!uiSize || !uiOffset)
+                if (!uiSize || !uiOffset)
-                {
+                {
-                        return 1;
+                        return 1;
-                }
+                }
-                
+                
-                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
+                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
-                
+                
-                if (!ifFile)
+                if (!ifFile)
-                {
+                {
-//                      throw Exceptions::CannotOpenFile(ResourceDirectoryId, __LINE__);
+//                      throw Exceptions::CannotOpenFile(ResourceDirectoryId, __LINE__);
-                        return 1;
+                        return 1;
-                }
+                }
-                
+                
-                if (fileSize(ifFile) < uiOffset + uiSize)
+                if (fileSize(ifFile) < uiOffset + uiSize)
-                {
+                {
-//                      throw Exceptions::InvalidFormat(ResourceDirectoryId, __LINE__);
+//                      throw Exceptions::InvalidFormat(ResourceDirectoryId, __LINE__);
-                        return 1;
+                        return 1;
-                }
+                }
-                ifFile.seekg(uiOffset, std::ios::beg);
+                ifFile.seekg(uiOffset, std::ios::beg);
-                
+                
-                PELIB_IMAGE_RESOURCE_DIRECTORY irdCurrRoot;
+                PELIB_IMAGE_RESOURCE_DIRECTORY irdCurrRoot;
-                
+                
-                std::vector<byte> vResourceDirectory(uiSize);
+                std::vector<byte> vResourceDirectory(uiSize);
-                ifFile.read(reinterpret_cast<char*>(&vResourceDirectory[0]), uiSize);
+                ifFile.read(reinterpret_cast<char*>(&vResourceDirectory[0]), uiSize);
-                InputBuffer inpBuffer(vResourceDirectory);
+                InputBuffer inpBuffer(vResourceDirectory);
-                
+                
-//              ResourceNode currNode;
+//              ResourceNode currNode;
-                return m_rnRoot.read(inpBuffer, 0, uiResDirRva/*, ""*/);
+                return m_rnRoot.read(inpBuffer, 0, uiResDirRva/*, ""*/);
-//              std::swap(currNode, m_rnRoot);
+//              std::swap(currNode, m_rnRoot);
-        }
+        }
-        /**
+        /**
-        * Rebuilds the resource directory.
+        * Rebuilds the resource directory.
-        * @param vBuffer Buffer the source directory will be written to.
+        * @param vBuffer Buffer the source directory will be written to.
-        * @param uiRva RVA of the resource directory.
+        * @param uiRva RVA of the resource directory.
-        **/
+        **/
-        void ResourceDirectory::rebuild(std::vector<byte>& vBuffer, unsigned int uiRva) const
+        void ResourceDirectory::rebuild(std::vector<byte>& vBuffer, unsigned int uiRva) const
-        {
+        {
-                OutputBuffer obBuffer(vBuffer);
+                OutputBuffer obBuffer(vBuffer);
-                unsigned int offs = 0;
+                unsigned int offs = 0;
-//              std::cout << "Root: " << m_rnRoot.children.size() << std::endl;
+//              std::cout << "Root: " << m_rnRoot.children.size() << std::endl;
-                m_rnRoot.rebuild(obBuffer, offs, uiRva, "");
+                m_rnRoot.rebuild(obBuffer, offs, uiRva, "");
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the size of the entire rebuilt resource directory. That's the size of the entire
+        * 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.
+        * structure as it's written back to a file.
-        **/
+        **/
-/*      unsigned int ResourceDirectory::size() const
+/*      unsigned int ResourceDirectory::size() const
-        {
+        {
-                return m_rnRoot.size();
+                return m_rnRoot.size();
-        }
+        }
-*/      
+*/      
-        /**
+        /**
-        * Writes the current resource directory back into a file.
+        * Writes the current resource directory back into a file.
-        * @param strFilename Name of the output file.
+        * @param strFilename Name of the output file.
-        * @param uiOffset File offset where the resource directory will be written to.
+        * @param uiOffset File offset where the resource directory will be written to.
-        * @param uiRva RVA of the file offset.
+        * @param uiRva RVA of the file offset.
-        **/
+        **/
-        int ResourceDirectory::write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva) const
+        int ResourceDirectory::write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva) const
-        {
+        {
-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        ofFile.clear();
+                        ofFile.clear();
-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                else
+                else
-                {
+                {
-                        ofFile.close();
+                        ofFile.close();
-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                ofFile.seekp(uiOffset, std::ios::beg);
+                ofFile.seekp(uiOffset, std::ios::beg);
-                std::vector<unsigned char> vBuffer;
+                std::vector<unsigned char> vBuffer;
-                rebuild(vBuffer, uiRva);
+                rebuild(vBuffer, uiRva);
-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), static_cast<unsigned int>(vBuffer.size()));
-                ofFile.close();
+                ofFile.close();
-                
+                
-                return 0;
+                return 0;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Adds another resource type. The new resource type is identified by the ID dwResTypeId.
+        * Adds another resource type. The new resource type is identified by the ID dwResTypeId.
-        * @param dwResTypeId ID which identifies the resource type.
+        * @param dwResTypeId ID which identifies the resource type.
-        **/
+        **/
-        int ResourceDirectory::addResourceType(dword dwResTypeId)
+        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));
+                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())
+                if (Iter != m_rnRoot.children.end())
-                {
+                {
-                        return 1;
+                        return 1;
-                        // throw Exceptions::EntryAlreadyExists(ResourceDirectoryId, __LINE__);
+                        // throw Exceptions::EntryAlreadyExists(ResourceDirectoryId, __LINE__);
-                }
+                }
-                
+                
-                ResourceChild rcCurr;
+                ResourceChild rcCurr;
-                rcCurr.child = new ResourceNode;
+                rcCurr.child = new ResourceNode;
-                rcCurr.entry.irde.Name = dwResTypeId;
+                rcCurr.entry.irde.Name = dwResTypeId;
-                m_rnRoot.children.push_back(rcCurr);
+                m_rnRoot.children.push_back(rcCurr);
-                
+                
-                return 0;
+                return 0;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Adds another resource type. The new resource type is identified by the name strResTypeName.
+        * Adds another resource type. The new resource type is identified by the name strResTypeName.
-        * @param strResTypeName Name which identifies the resource type.
+        * @param strResTypeName Name which identifies the resource type.
-        **/
+        **/
-        int ResourceDirectory::addResourceType(const std::string& strResTypeName)
+        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));
+                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())
+                if (Iter != m_rnRoot.children.end())
-                {
+                {
-                        return 1;
+                        return 1;
-//                      throw Exceptions::EntryAlreadyExists(ResourceDirectoryId, __LINE__);
+//                      throw Exceptions::EntryAlreadyExists(ResourceDirectoryId, __LINE__);
-                }
+                }
-                
+                
-                ResourceChild rcCurr;
+                ResourceChild rcCurr;
-                rcCurr.entry.wstrName = strResTypeName;
+                rcCurr.entry.wstrName = strResTypeName;
-                rcCurr.child = new ResourceNode;
+                rcCurr.child = new ResourceNode;
-                m_rnRoot.children.push_back(rcCurr);
+                m_rnRoot.children.push_back(rcCurr);
-                
+                
-                return 0;
+                return 0;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Removes the resource type identified by the ID dwResTypeId.
+        * Removes the resource type identified by the ID dwResTypeId.
-        * @param dwResTypeId ID which identifies the resource type.
+        * @param dwResTypeId ID which identifies the resource type.
-        **/
+        **/
-        int ResourceDirectory::removeResourceType(dword dwResTypeId)
+        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));
+                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())
+                if (Iter == m_rnRoot.children.end())
-                {
+                {
-                        return 1;
+                        return 1;
-//                      throw Exceptions::ResourceTypeDoesNotExist(ResourceDirectoryId, __LINE__);
+//                      throw Exceptions::ResourceTypeDoesNotExist(ResourceDirectoryId, __LINE__);
-                }
+                }
-                
+                
-                bool isNamed = false;
+                bool isNamed = false;
-                if (Iter->isNamedResource()) isNamed = true;
+                if (Iter->isNamedResource()) isNamed = true;
-                m_rnRoot.children.erase(Iter);
+                m_rnRoot.children.erase(Iter);
-                
+                
-                if (isNamed) m_rnRoot.header.NumberOfNamedEntries = static_cast<PeLib::word>(m_rnRoot.children.size());
+                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());
+                else m_rnRoot.header.NumberOfIdEntries = static_cast<PeLib::word>(m_rnRoot.children.size());
-                
+                
-                return 0;
+                return 0;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Removes the resource type identified by the name strResTypeName.
+        * Removes the resource type identified by the name strResTypeName.
-        * @param strResTypeName Name which identifies the resource type.
+        * @param strResTypeName Name which identifies the resource type.
-        **/
+        **/
-        int ResourceDirectory::removeResourceType(const std::string& strResTypeName)
+        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));
+                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())
+                if (Iter == m_rnRoot.children.end())
-                {
+                {
-                        return 1;
+                        return 1;
-                //      throw Exceptions::ResourceTypeDoesNotExist(ResourceDirectoryId, __LINE__);
+                //      throw Exceptions::ResourceTypeDoesNotExist(ResourceDirectoryId, __LINE__);
-                }
+                }
-                
+                
-                bool isNamed = false;
+                bool isNamed = false;
-                if (Iter->isNamedResource()) isNamed = true;
+                if (Iter->isNamedResource()) isNamed = true;
-                
+                
-                m_rnRoot.children.erase(Iter);
+                m_rnRoot.children.erase(Iter);
-                
+                
-                if (isNamed) m_rnRoot.header.NumberOfNamedEntries = static_cast<PeLib::word>(m_rnRoot.children.size());
+                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());
+                else m_rnRoot.header.NumberOfIdEntries = static_cast<PeLib::word>(m_rnRoot.children.size());
-                
+                
-                return 0;
+                return 0;
-        }
+        }
-        /**
+        /**
-        * Removes the resource type identified by the index uiIndex.
+        * Removes the resource type identified by the index uiIndex.
-        * @param uiIndex Index which identifies the resource type.
+        * @param uiIndex Index which identifies the resource type.
-        **/
+        **/
-        int ResourceDirectory::removeResourceTypeByIndex(unsigned int uiIndex)
+        int ResourceDirectory::removeResourceTypeByIndex(unsigned int uiIndex)
-        {
+        {
-                bool isNamed = false;
+                bool isNamed = false;
-                if (m_rnRoot.children[uiIndex].isNamedResource()) isNamed = true;
+                if (m_rnRoot.children[uiIndex].isNamedResource()) isNamed = true;
-                
+                
-                m_rnRoot.children.erase(m_rnRoot.children.begin() + uiIndex);
+                m_rnRoot.children.erase(m_rnRoot.children.begin() + uiIndex);
-                
+                
-                if (isNamed) m_rnRoot.header.NumberOfNamedEntries = static_cast<PeLib::word>(m_rnRoot.children.size());
+                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());
+                else m_rnRoot.header.NumberOfIdEntries = static_cast<PeLib::word>(m_rnRoot.children.size());
-                
+                
-                return 0;
+                return 0;
-        }
+        }
-                  
+                  
-        /**
+        /**
-        * Adds another resource to the resource tree. The first parameter identifies the resource type
+        * 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.
+        * of the new resource, the second parameter identifies the resource itself.
-        * @param dwResTypeId ID of the resource type.
+        * @param dwResTypeId ID of the resource type.
-        * @param dwResId ID of the resource.
+        * @param dwResId ID of the resource.
-        **/
+        **/
-        int ResourceDirectory::addResource(dword dwResTypeId, dword dwResId)
+        int ResourceDirectory::addResource(dword dwResTypeId, dword dwResId)
-        {
+        {
-                ResourceChild rcCurr;
+                ResourceChild rcCurr;
-                rcCurr.entry.irde.Name = dwResId;
+                rcCurr.entry.irde.Name = dwResId;
-                return addResourceT(dwResTypeId, dwResId, rcCurr);
+                return addResourceT(dwResTypeId, dwResId, rcCurr);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Adds another resource to the resource tree. The first parameter identifies the resource type
+        * 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.
+        * of the new resource, the second parameter identifies the resource itself.
-        * @param dwResTypeId ID of the resource type.
+        * @param dwResTypeId ID of the resource type.
-        * @param strResName Name of the resource.
+        * @param strResName Name of the resource.
-        **/
+        **/
-        int ResourceDirectory::addResource(dword dwResTypeId, const std::string& strResName)
+        int ResourceDirectory::addResource(dword dwResTypeId, const std::string& strResName)
-        {
+        {
-                ResourceChild rcCurr;
+                ResourceChild rcCurr;
-                rcCurr.entry.wstrName = strResName;
+                rcCurr.entry.wstrName = strResName;
-                return addResourceT(dwResTypeId, strResName, rcCurr);
+                return addResourceT(dwResTypeId, strResName, rcCurr);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Adds another resource to the resource tree. The first parameter identifies the resource type
+        * 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.
+        * of the new resource, the second parameter identifies the resource itself.
-        * @param strResTypeName Name of the resource type.
+        * @param strResTypeName Name of the resource type.
-        * @param dwResId ID of the resource.
+        * @param dwResId ID of the resource.
-        **/
+        **/
-        int ResourceDirectory::addResource(const std::string& strResTypeName, dword dwResId)
+        int ResourceDirectory::addResource(const std::string& strResTypeName, dword dwResId)
-        {
+        {
-                ResourceChild rcCurr;
+                ResourceChild rcCurr;
-                rcCurr.entry.irde.Name = dwResId;
+                rcCurr.entry.irde.Name = dwResId;
-                return addResourceT(strResTypeName, dwResId, rcCurr);
+                return addResourceT(strResTypeName, dwResId, rcCurr);
-        }
+        }
-        /**
+        /**
-        * Adds another resource to the resource tree. The first parameter identifies the resource type
+        * 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.
+        * of the new resource, the second parameter identifies the resource itself.
-        * @param strResTypeName Name of the resource type.
+        * @param strResTypeName Name of the resource type.
-        * @param strResName Name of the resource.
+        * @param strResName Name of the resource.
-        **/
+        **/
-        int ResourceDirectory::addResource(const std::string& strResTypeName, const std::string& strResName)
+        int ResourceDirectory::addResource(const std::string& strResTypeName, const std::string& strResName)
-        {
+        {
-                ResourceChild rcCurr;
+                ResourceChild rcCurr;
-                rcCurr.entry.wstrName = strResName;
+                rcCurr.entry.wstrName = strResName;
-                return addResourceT(strResTypeName, strResName, rcCurr);
+                return addResourceT(strResTypeName, strResName, rcCurr);
-        }
+        }
-        /**
+        /**
-        * Removes a resource from the resource tree. The first parameter identifies the resource type
+        * 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.
+        * of the new resource, the second parameter identifies the resource itself.
-        * @param dwResTypeIndex ID of the resource type.
+        * @param dwResTypeIndex ID of the resource type.
-        * @param dwResId ID of the resource.
+        * @param dwResId ID of the resource.
-        **/
+        **/
-        int ResourceDirectory::removeResource(dword dwResTypeIndex, dword dwResId)
+        int ResourceDirectory::removeResource(dword dwResTypeIndex, dword dwResId)
-        {
+        {
-                return removeResourceT(dwResTypeIndex, dwResId);
+                return removeResourceT(dwResTypeIndex, dwResId);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Removes a resource from the resource tree. The first parameter identifies the resource type
+        * 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.
+        * of the new resource, the second parameter identifies the resource itself.
-        * @param dwResTypeIndex ID of the resource type.
+        * @param dwResTypeIndex ID of the resource type.
-        * @param strResName Name of the resource.
+        * @param strResName Name of the resource.
-        **/
+        **/
-        int ResourceDirectory::removeResource(dword dwResTypeIndex, const std::string& strResName)
+        int ResourceDirectory::removeResource(dword dwResTypeIndex, const std::string& strResName)
-        {
+        {
-                return removeResourceT(dwResTypeIndex, strResName);
+                return removeResourceT(dwResTypeIndex, strResName);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Removes a resource from the resource tree. The first parameter identifies the resource type
+        * 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.
+        * of the new resource, the second parameter identifies the resource itself.
-        * @param strResTypeName Name of the resource type.
+        * @param strResTypeName Name of the resource type.
-        * @param dwResId ID of the resource.
+        * @param dwResId ID of the resource.
-        **/
+        **/
-        int ResourceDirectory::removeResource(const std::string& strResTypeName, dword dwResId)
+        int ResourceDirectory::removeResource(const std::string& strResTypeName, dword dwResId)
-        {
+        {
-                return removeResourceT(strResTypeName, dwResId);
+                return removeResourceT(strResTypeName, dwResId);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Removes a resource from the resource tree. The first parameter identifies the resource type
+        * 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.
+        * of the new resource, the second parameter identifies the resource itself.
-        * @param strResTypeName Name of the resource type.
+        * @param strResTypeName Name of the resource type.
-        * @param strResName Name of the resource.
+        * @param strResName Name of the resource.
-        **/
+        **/
-        int ResourceDirectory::removeResource(const std::string& strResTypeName, const std::string& strResName)
+        int ResourceDirectory::removeResource(const std::string& strResTypeName, const std::string& strResName)
-        {
+        {
-                return removeResourceT(strResTypeName, strResName);
+                return removeResourceT(strResTypeName, strResName);
-        }
+        }
-                  
+                  
-        /**
+        /**
-        * Returns the number of resource types.
+        * Returns the number of resource types.
-        **/
+        **/
-        unsigned int ResourceDirectory::getNumberOfResourceTypes() const
+        unsigned int ResourceDirectory::getNumberOfResourceTypes() const
-        {
+        {
-                return static_cast<unsigned int>(m_rnRoot.children.size());
+                return static_cast<unsigned int>(m_rnRoot.children.size());
-        }
+        }
-        /**
+        /**
-        * Returns the ID of a resource type which was specified through an index.
+        * Returns the ID of a resource type which was specified through an index.
-        * The valid range of the parameter uiIndex is 0...getNumberOfResourceTypes() - 1.
+        * The valid range of the parameter uiIndex is 0...getNumberOfResourceTypes() - 1.
-        * Leaving the invalid range leads to undefined behaviour.
+        * Leaving the invalid range leads to undefined behaviour.
-        * @param uiIndex Index which identifies a resource type.
+        * @param uiIndex Index which identifies a resource type.
-        * @return The ID of the specified resource type.
+        * @return The ID of the specified resource type.
-        **/
+        **/
-        dword ResourceDirectory::getResourceTypeIdByIndex(unsigned int uiIndex) const
+        dword ResourceDirectory::getResourceTypeIdByIndex(unsigned int uiIndex) const
-        {
+        {
-                return m_rnRoot.children[uiIndex].entry.irde.Name;
+                return m_rnRoot.children[uiIndex].entry.irde.Name;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the name of a resource type which was specified through an index.
+        * Returns the name of a resource type which was specified through an index.
-        * The valid range of the parameter uiIndex is 0...getNumberOfResourceTypes() - 1.
+        * The valid range of the parameter uiIndex is 0...getNumberOfResourceTypes() - 1.
-        * Leaving the invalid range leads to undefined behaviour.
+        * Leaving the invalid range leads to undefined behaviour.
-        * @param uiIndex Index which identifies a resource type.
+        * @param uiIndex Index which identifies a resource type.
-        * @return The name of the specified resource type.
+        * @return The name of the specified resource type.
-        **/
+        **/
-        std::string ResourceDirectory::getResourceTypeNameByIndex(unsigned int uiIndex) const
+        std::string ResourceDirectory::getResourceTypeNameByIndex(unsigned int uiIndex) const
-        {
+        {
-                return m_rnRoot.children[uiIndex].entry.wstrName;
+                return m_rnRoot.children[uiIndex].entry.wstrName;
-        }
+        }
-        /**
+        /**
-        * Converts the ID of a resource type to an index.
+        * Converts the ID of a resource type to an index.
-        * @param dwResTypeId ID of the resource type.
+        * @param dwResTypeId ID of the resource type.
-        * @return Index of that resource type.
+        * @return Index of that resource type.
-        **/
+        **/
-        int ResourceDirectory::resourceTypeIdToIndex(dword dwResTypeId) const
+        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));
+                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;
+                if (Iter == m_rnRoot.children.end()) return -1;
-                return static_cast<unsigned int>(std::distance(m_rnRoot.children.begin(), Iter));
+                return static_cast<unsigned int>(std::distance(m_rnRoot.children.begin(), Iter));
-        }
+        }
-        
+        
-        /**
+        /**
-        * Converts the name of a resource type to an index.
+        * Converts the name of a resource type to an index.
-        * @param strResTypeName ID of the resource type.
+        * @param strResTypeName ID of the resource type.
-        * @return Index of that resource type.
+        * @return Index of that resource type.
-        **/
+        **/
-        int ResourceDirectory::resourceTypeNameToIndex(const std::string& strResTypeName) const
+        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));
+                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;
+                if (Iter == m_rnRoot.children.end()) return -1;
-                return static_cast<unsigned int>(std::distance(m_rnRoot.children.begin(), Iter));
+                return static_cast<unsigned int>(std::distance(m_rnRoot.children.begin(), Iter));
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the number of resources of a specific resource type.
+        * Returns the number of resources of a specific resource type.
-        * @param dwId ID of the resource type.
+        * @param dwId ID of the resource type.
-        * @return Number of resources of resource type dwId.
+        * @return Number of resources of resource type dwId.
-        **/
+        **/
-        unsigned int ResourceDirectory::getNumberOfResources(dword dwId) const
+        unsigned int ResourceDirectory::getNumberOfResources(dword dwId) const
-        {
+        {
-//              std::vector<ResourceChild>::const_iterator IterD = m_rnRoot.children.begin();
+//              std::vector<ResourceChild>::const_iterator IterD = m_rnRoot.children.begin();
-//              std::cout << dwId << std::endl;
+//              std::cout << dwId << std::endl;
-//              while (IterD != m_rnRoot.children.end())
+//              while (IterD != m_rnRoot.children.end())
-//              {
+//              {
-//                      std::cout << IterD->entry.irde.Name << std::endl;
+//                      std::cout << IterD->entry.irde.Name << std::endl;
-//                      ++IterD;
+//                      ++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));
+                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())
+                if (Iter == m_rnRoot.children.end())
-                {
+                {
-                        return 0xFFFFFFFF;
+                        return 0xFFFFFFFF;
-                }
+                }
-                else
+                else
-                {
+                {
-                        ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);
+                        ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);
-                        return static_cast<unsigned int>(currNode->children.size());
+                        return static_cast<unsigned int>(currNode->children.size());
-                }
+                }
-        }
+        }
-        /**
+        /**
-        * Returns the number of resources of a specific resource type.
+        * Returns the number of resources of a specific resource type.
-        * @param strResTypeName Name of the resource type.
+        * @param strResTypeName Name of the resource type.
-        * @return Number of resources of resource type strResTypeName.
+        * @return Number of resources of resource type strResTypeName.
-        **/
+        **/
-        unsigned int ResourceDirectory::getNumberOfResources(const std::string& strResTypeName) const
+        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));
+                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())
+                if (Iter == m_rnRoot.children.end())
-                {
+                {
-                        return 0xFFFFFFFF;
+                        return 0xFFFFFFFF;
-                }
+                }
-                else
+                else
-                {
+                {
-                        ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);
+                        ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);
-                        return static_cast<unsigned int>(currNode->children.size());
+                        return static_cast<unsigned int>(currNode->children.size());
-                }
+                }
-        }
+        }
-        /**
+        /**
-        * Returns the number of resources of a resource type which was specified through an index.
+        * 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.
+        * The valid range of the parameter uiIndex is 0...getNumberOfResourceTypes() - 1.
-        * Leaving the invalid range leads to undefined behaviour.
+        * Leaving the invalid range leads to undefined behaviour.
-        * @param uiIndex Index which identifies a resource type.
+        * @param uiIndex Index which identifies a resource type.
-        * @return The number of resources of the specified resource type.
+        * @return The number of resources of the specified resource type.
-        **/
+        **/
-        unsigned int ResourceDirectory::getNumberOfResourcesByIndex(unsigned int uiIndex) const
+        unsigned int ResourceDirectory::getNumberOfResourcesByIndex(unsigned int uiIndex) const
-        {
+        {
-                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiIndex].child);
+                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiIndex].child);
-                return static_cast<unsigned int>(currNode->children.size());
+                return static_cast<unsigned int>(currNode->children.size());
-        }
+        }
-        
+        
-        /**
+        /**
-        * Gets the resource data of a specific resource.
+        * Gets the resource data of a specific resource.
-        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
-        * @param dwResId Identifies the resource.
+        * @param dwResId Identifies the resource.
-        * @param data Vector where the data is stored.
+        * @param data Vector where the data is stored.
-        **/
+        **/
-        void ResourceDirectory::getResourceData(dword dwResTypeId, dword dwResId, std::vector<byte>& data) const
+        void ResourceDirectory::getResourceData(dword dwResTypeId, dword dwResId, std::vector<byte>& data) const
-        {
+        {
-                getResourceDataT(dwResTypeId, dwResId, data);
+                getResourceDataT(dwResTypeId, dwResId, data);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Gets the resource data of a specific resource.
+        * Gets the resource data of a specific resource.
-        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
-        * @param strResName Identifies the resource.
+        * @param strResName Identifies the resource.
-        * @param data Vector where the data is stored.
+        * @param data Vector where the data is stored.
-        **/
+        **/
-        void ResourceDirectory::getResourceData(dword dwResTypeId, const std::string& strResName, std::vector<byte>& data) const
+        void ResourceDirectory::getResourceData(dword dwResTypeId, const std::string& strResName, std::vector<byte>& data) const
-        {
+        {
-                getResourceDataT(dwResTypeId, strResName, data);
+                getResourceDataT(dwResTypeId, strResName, data);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Gets the resource data of a specific resource.
+        * Gets the resource data of a specific resource.
-        * @param strResTypeName Identifies the resource type of the resource.
+        * @param strResTypeName Identifies the resource type of the resource.
-        * @param dwResId Identifies the resource.
+        * @param dwResId Identifies the resource.
-        * @param data Vector where the data is stored.
+        * @param data Vector where the data is stored.
-        **/
+        **/
-        void ResourceDirectory::getResourceData(const std::string& strResTypeName, dword dwResId, std::vector<byte>& data) const
+        void ResourceDirectory::getResourceData(const std::string& strResTypeName, dword dwResId, std::vector<byte>& data) const
-        {
+        {
-                getResourceDataT(strResTypeName, dwResId, data);
+                getResourceDataT(strResTypeName, dwResId, data);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Gets the resource data of a specific resource.
+        * Gets the resource data of a specific resource.
-        * @param strResTypeName Identifies the resource type of the resource.
+        * @param strResTypeName Identifies the resource type of the resource.
-        * @param strResName Identifies the resource.
+        * @param strResName Identifies the resource.
-        * @param data Vector where the data is stored.
+        * @param data Vector where the data is stored.
-        **/
+        **/
-        void ResourceDirectory::getResourceData(const std::string& strResTypeName, const std::string& strResName, std::vector<byte>& data) const
+        void ResourceDirectory::getResourceData(const std::string& strResTypeName, const std::string& strResName, std::vector<byte>& data) const
-        {
+        {
-                getResourceDataT(strResTypeName, strResName, data);
+                getResourceDataT(strResTypeName, strResName, data);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Gets the resource data of a specific resource by index.
+        * 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 uiResTypeIndex is 0...getNumberOfResourceTypes() - 1.
-        * The valid range of the parameter uiResIndex is 0...getNumberOfResources() - 1.
+        * The valid range of the parameter uiResIndex is 0...getNumberOfResources() - 1.
-        * Leaving the invalid range leads to undefined behaviour.
+        * Leaving the invalid range leads to undefined behaviour.
-        * @param uiResTypeIndex Identifies the resource type of the resource.
+        * @param uiResTypeIndex Identifies the resource type of the resource.
-        * @param uiResIndex Identifies the resource.
+        * @param uiResIndex Identifies the resource.
-        * @param data Vector where the data is stored.
+        * @param data Vector where the data is stored.
-        **/
+        **/
-        void ResourceDirectory::getResourceDataByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, std::vector<byte>& data) const
+        void ResourceDirectory::getResourceDataByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, std::vector<byte>& data) const
-        {
+        {
-                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);
+                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);
-                currNode = static_cast<ResourceNode*>(currNode->children[uiResIndex].child);
+                currNode = static_cast<ResourceNode*>(currNode->children[uiResIndex].child);
-                ResourceLeaf* currLeaf = static_cast<ResourceLeaf*>(currNode->children[0].child);
+                ResourceLeaf* currLeaf = static_cast<ResourceLeaf*>(currNode->children[0].child);
-                
+                
-                data.assign(currLeaf->m_data.begin(), currLeaf->m_data.end());
+                data.assign(currLeaf->m_data.begin(), currLeaf->m_data.end());
-        }
+        }
-                  
+                  
-        /**
+        /**
-        * Sets the resource data of a specific resource.
+        * Sets the resource data of a specific resource.
-        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
-        * @param dwResId Identifies the resource.
+        * @param dwResId Identifies the resource.
-        * @param data The new resource data.
+        * @param data The new resource data.
-        **/
+        **/
-        void ResourceDirectory::setResourceData(dword dwResTypeId, dword dwResId, std::vector<byte>& data)
+        void ResourceDirectory::setResourceData(dword dwResTypeId, dword dwResId, std::vector<byte>& data)
-        {
+        {
-                setResourceDataT(dwResTypeId, dwResId, data);
+                setResourceDataT(dwResTypeId, dwResId, data);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the resource data of a specific resource.
+        * Sets the resource data of a specific resource.
-        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
-        * @param strResName Identifies the resource.
+        * @param strResName Identifies the resource.
-        * @param data The new resource data.
+        * @param data The new resource data.
-        **/
+        **/
-        void ResourceDirectory::setResourceData(dword dwResTypeId, const std::string& strResName, std::vector<byte>& data)
+        void ResourceDirectory::setResourceData(dword dwResTypeId, const std::string& strResName, std::vector<byte>& data)
-        {
+        {
-                setResourceDataT(dwResTypeId, strResName, data);
+                setResourceDataT(dwResTypeId, strResName, data);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the resource data of a specific resource.
+        * Sets the resource data of a specific resource.
-        * @param strResTypeName Identifies the resource type of the resource.
+        * @param strResTypeName Identifies the resource type of the resource.
-        * @param dwResId Identifies the resource.
+        * @param dwResId Identifies the resource.
-        * @param data The new resource data.
+        * @param data The new resource data.
-        **/
+        **/
-        void ResourceDirectory::setResourceData(const std::string& strResTypeName, dword dwResId, std::vector<byte>& data)
+        void ResourceDirectory::setResourceData(const std::string& strResTypeName, dword dwResId, std::vector<byte>& data)
-        {
+        {
-                setResourceDataT(strResTypeName, dwResId, data);
+                setResourceDataT(strResTypeName, dwResId, data);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the resource data of a specific resource.
+        * Sets the resource data of a specific resource.
-        * @param strResTypeName Identifies the resource type of the resource.
+        * @param strResTypeName Identifies the resource type of the resource.
-        * @param strResName Identifies the resource.
+        * @param strResName Identifies the resource.
-        * @param data The new resource data.
+        * @param data The new resource data.
-        **/
+        **/
-        void ResourceDirectory::setResourceData(const std::string& strResTypeName, const std::string& strResName, std::vector<byte>& data)
+        void ResourceDirectory::setResourceData(const std::string& strResTypeName, const std::string& strResName, std::vector<byte>& data)
-        {
+        {
-                setResourceDataT(strResTypeName, strResName, data);
+                setResourceDataT(strResTypeName, strResName, data);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the resource data of a specific resource by index.
+        * 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 uiResTypeIndex is 0...getNumberOfResourceTypes() - 1.
-        * The valid range of the parameter uiResIndex is 0...getNumberOfResources() - 1.
+        * The valid range of the parameter uiResIndex is 0...getNumberOfResources() - 1.
-        * Leaving the invalid range leads to undefined behaviour.
+        * Leaving the invalid range leads to undefined behaviour.
-        * @param uiResTypeIndex Identifies the resource type of the resource.
+        * @param uiResTypeIndex Identifies the resource type of the resource.
-        * @param uiResIndex Identifies the resource.
+        * @param uiResIndex Identifies the resource.
-        * @param data The new resource data.
+        * @param data The new resource data.
-        **/
+        **/
-        void ResourceDirectory::setResourceDataByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, std::vector<byte>& data)
+        void ResourceDirectory::setResourceDataByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, std::vector<byte>& data)
-        {
+        {
-                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);
+                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);
-                currNode = static_cast<ResourceNode*>(currNode->children[uiResIndex].child);
+                currNode = static_cast<ResourceNode*>(currNode->children[uiResIndex].child);
-                ResourceLeaf* currLeaf = static_cast<ResourceLeaf*>(currNode->children[0].child);
+                ResourceLeaf* currLeaf = static_cast<ResourceLeaf*>(currNode->children[0].child);
-                currLeaf->m_data.assign(data.begin(), data.end());
+                currLeaf->m_data.assign(data.begin(), data.end());
-        }
+        }
-                  
+                  
-        /**
+        /**
-        * Gets the ID of a specific resource.
+        * Gets the ID of a specific resource.
-        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
-        * @param strResName Identifies the resource.
+        * @param strResName Identifies the resource.
-        * @return ID of the specified resource.
+        * @return ID of the specified resource.
-        **/
+        **/
-        dword ResourceDirectory::getResourceId(dword dwResTypeId, const std::string& strResName) const
+        dword ResourceDirectory::getResourceId(dword dwResTypeId, const std::string& strResName) const
-        {
+        {
-                return getResourceIdT(dwResTypeId, strResName);
+                return getResourceIdT(dwResTypeId, strResName);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Gets the ID of a specific resource.
+        * Gets the ID of a specific resource.
-        * @param strResTypeName Identifies the resource type of the resource.
+        * @param strResTypeName Identifies the resource type of the resource.
-        * @param strResName Identifies the resource.
+        * @param strResName Identifies the resource.
-        * @return ID of the specified resource.
+        * @return ID of the specified resource.
-        **/
+        **/
-        dword ResourceDirectory::getResourceId(const std::string& strResTypeName, const std::string& strResName) const
+        dword ResourceDirectory::getResourceId(const std::string& strResTypeName, const std::string& strResName) const
-        {
+        {
-                return getResourceIdT(strResTypeName, strResName);
+                return getResourceIdT(strResTypeName, strResName);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Gets the ID of a specific resource by index.
+        * Gets the ID of a specific resource by index.
-        * @param uiResTypeIndex Identifies the resource type of the resource.
+        * @param uiResTypeIndex Identifies the resource type of the resource.
-        * @param uiResIndex Identifies the resource.
+        * @param uiResIndex Identifies the resource.
-        * @return ID of the specified resource.
+        * @return ID of the specified resource.
-        **/
+        **/
-        dword ResourceDirectory::getResourceIdByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex) const
+        dword ResourceDirectory::getResourceIdByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex) const
-        {
+        {
-                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);
+                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);
-                return currNode->children[uiResIndex].entry.irde.Name;
+                return currNode->children[uiResIndex].entry.irde.Name;
-        }
+        }
-        /**
+        /**
-        * Sets the ID of a specific resource.
+        * Sets the ID of a specific resource.
-        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
-        * @param dwResId Identifies the resource.
+        * @param dwResId Identifies the resource.
-        * @param dwNewResId New ID of the resource.
+        * @param dwNewResId New ID of the resource.
-        **/
+        **/
-        void ResourceDirectory::setResourceId(dword dwResTypeId, dword dwResId, dword dwNewResId)
+        void ResourceDirectory::setResourceId(dword dwResTypeId, dword dwResId, dword dwNewResId)
-        {
+        {
-                setResourceIdT(dwResTypeId, dwResId, dwNewResId);
+                setResourceIdT(dwResTypeId, dwResId, dwNewResId);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the ID of a specific resource.
+        * Sets the ID of a specific resource.
-        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
-        * @param strResName Identifies the resource.
+        * @param strResName Identifies the resource.
-        * @param dwNewResId New ID of the resource.
+        * @param dwNewResId New ID of the resource.
-        **/
+        **/
-        void ResourceDirectory::setResourceId(dword dwResTypeId, const std::string& strResName, dword dwNewResId)
+        void ResourceDirectory::setResourceId(dword dwResTypeId, const std::string& strResName, dword dwNewResId)
-        {
+        {
-                setResourceIdT(dwResTypeId, strResName, dwNewResId);
+                setResourceIdT(dwResTypeId, strResName, dwNewResId);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the ID of a specific resource.
+        * Sets the ID of a specific resource.
-        * @param strResTypeName Identifies the resource type of the resource.
+        * @param strResTypeName Identifies the resource type of the resource.
-        * @param dwResId Identifies the resource.
+        * @param dwResId Identifies the resource.
-        * @param dwNewResId New ID of the resource.
+        * @param dwNewResId New ID of the resource.
-        **/
+        **/
-        void ResourceDirectory::setResourceId(const std::string& strResTypeName, dword dwResId, dword dwNewResId)
+        void ResourceDirectory::setResourceId(const std::string& strResTypeName, dword dwResId, dword dwNewResId)
-        {
+        {
-                setResourceIdT(strResTypeName, dwResId, dwNewResId);
+                setResourceIdT(strResTypeName, dwResId, dwNewResId);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the ID of a specific resource.
+        * Sets the ID of a specific resource.
-        * @param strResTypeName Identifies the resource type of the resource.
+        * @param strResTypeName Identifies the resource type of the resource.
-        * @param strResName Identifies the resource.
+        * @param strResName Identifies the resource.
-        * @param dwNewResId New ID of the resource.
+        * @param dwNewResId New ID of the resource.
-        **/
+        **/
-        void ResourceDirectory::setResourceId(const std::string& strResTypeName, const std::string& strResName, dword dwNewResId)
+        void ResourceDirectory::setResourceId(const std::string& strResTypeName, const std::string& strResName, dword dwNewResId)
-        {
+        {
-                setResourceIdT(strResTypeName, strResName, dwNewResId);
+                setResourceIdT(strResTypeName, strResName, dwNewResId);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the ID of a specific resource by index.
+        * Sets the ID of a specific resource by index.
-        * @param uiResTypeIndex Identifies the resource type of the resource.
+        * @param uiResTypeIndex Identifies the resource type of the resource.
-        * @param uiResIndex Identifies the resource.
+        * @param uiResIndex Identifies the resource.
-        * @param dwNewResId New ID of the specified resource.
+        * @param dwNewResId New ID of the specified resource.
-        **/
+        **/
-        void ResourceDirectory::setResourceIdByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, dword dwNewResId)
+        void ResourceDirectory::setResourceIdByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, dword dwNewResId)
-        {
+        {
-                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);
+                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);
-                currNode->children[uiResIndex].entry.irde.Name = dwNewResId;
+                currNode->children[uiResIndex].entry.irde.Name = dwNewResId;
-        }
+        }
-        /**
+        /**
-        * Gets the Name of a specific resource.
+        * Gets the Name of a specific resource.
-        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
-        * @param dwResId Identifies the resource.
+        * @param dwResId Identifies the resource.
-        * @return Name of the specified resource.
+        * @return Name of the specified resource.
-        **/
+        **/
-        std::string ResourceDirectory::getResourceName(dword dwResTypeId, dword dwResId) const
+        std::string ResourceDirectory::getResourceName(dword dwResTypeId, dword dwResId) const
-        {
+        {
-                return getResourceNameT(dwResTypeId, dwResId);
+                return getResourceNameT(dwResTypeId, dwResId);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Gets the Name of a specific resource.
+        * Gets the Name of a specific resource.
-        * @param strResTypeName Identifies the resource type of the resource.
+        * @param strResTypeName Identifies the resource type of the resource.
-        * @param dwResId Identifies the resource.
+        * @param dwResId Identifies the resource.
-        * @return Name of the specified resource.
+        * @return Name of the specified resource.
-        **/
+        **/
-        std::string ResourceDirectory::getResourceName(const std::string& strResTypeName, dword dwResId) const
+        std::string ResourceDirectory::getResourceName(const std::string& strResTypeName, dword dwResId) const
-        {
+        {
-                return getResourceNameT(strResTypeName, dwResId);
+                return getResourceNameT(strResTypeName, dwResId);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Gets the name of a specific resource by index.
+        * Gets the name of a specific resource by index.
-        * @param uiResTypeIndex Identifies the resource type of the resource.
+        * @param uiResTypeIndex Identifies the resource type of the resource.
-        * @param uiResIndex Identifies the resource.
+        * @param uiResIndex Identifies the resource.
-        * @return Name of the specified resource.
+        * @return Name of the specified resource.
-        **/
+        **/
-        std::string ResourceDirectory::getResourceNameByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex) const
+        std::string ResourceDirectory::getResourceNameByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex) const
-        {
+        {
-                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);
+                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);
-                return currNode->children[uiResIndex].entry.wstrName;
+                return currNode->children[uiResIndex].entry.wstrName;
-        }
+        }
-        /**
+        /**
-        * Sets the name of a specific resource.
+        * Sets the name of a specific resource.
-        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
-        * @param dwResId Identifies the resource.
+        * @param dwResId Identifies the resource.
-        * @param strNewResName New name of the specified resource.
+        * @param strNewResName New name of the specified resource.
-        **/
+        **/
-        void ResourceDirectory::setResourceName(dword dwResTypeId, dword dwResId, const std::string& strNewResName)
+        void ResourceDirectory::setResourceName(dword dwResTypeId, dword dwResId, const std::string& strNewResName)
-        {
+        {
-                setResourceNameT(dwResTypeId, dwResId, strNewResName);
+                setResourceNameT(dwResTypeId, dwResId, strNewResName);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the name of a specific resource.
+        * Sets the name of a specific resource.
-        * @param dwResTypeId Identifies the resource type of the resource.
+        * @param dwResTypeId Identifies the resource type of the resource.
-        * @param strResName Identifies the resource.
+        * @param strResName Identifies the resource.
-        * @param strNewResName New name of the specified resource.
+        * @param strNewResName New name of the specified resource.
-        **/
+        **/
-        void ResourceDirectory::setResourceName(dword dwResTypeId, const std::string& strResName, const std::string& strNewResName)
+        void ResourceDirectory::setResourceName(dword dwResTypeId, const std::string& strResName, const std::string& strNewResName)
-        {
+        {
-                setResourceNameT(dwResTypeId, strResName, strNewResName);
+                setResourceNameT(dwResTypeId, strResName, strNewResName);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the name of a specific resource.
+        * Sets the name of a specific resource.
-        * @param strResTypeName Identifies the resource type of the resource.
+        * @param strResTypeName Identifies the resource type of the resource.
-        * @param dwResId Identifies the resource.
+        * @param dwResId Identifies the resource.
-        * @param strNewResName New name of the specified resource.
+        * @param strNewResName New name of the specified resource.
-        **/
+        **/
-        void ResourceDirectory::setResourceName(const std::string& strResTypeName, dword dwResId, const std::string& strNewResName)
+        void ResourceDirectory::setResourceName(const std::string& strResTypeName, dword dwResId, const std::string& strNewResName)
-        {
+        {
-                setResourceNameT(strResTypeName, dwResId, strNewResName);
+                setResourceNameT(strResTypeName, dwResId, strNewResName);
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the name of a specific resource.
+        * Sets the name of a specific resource.
-        * @param strResTypeName Identifies the resource type of the resource.
+        * @param strResTypeName Identifies the resource type of the resource.
-        * @param strResName Identifies the resource.
+        * @param strResName Identifies the resource.
-        * @param strNewResName New name of the specified resource.
+        * @param strNewResName New name of the specified resource.
-        **/
+        **/
-        void ResourceDirectory::setResourceName(const std::string& strResTypeName, const std::string& strResName, const std::string& strNewResName)
+        void ResourceDirectory::setResourceName(const std::string& strResTypeName, const std::string& strResName, const std::string& strNewResName)
-        {
+        {
-                setResourceNameT(strResTypeName, strResName, strNewResName);
+                setResourceNameT(strResTypeName, strResName, strNewResName);
-        }
+        }
-                  
+                  
-        /**
+        /**
-        * Sets the name of a specific resource by index.
+        * Sets the name of a specific resource by index.
-        * @param uiResTypeIndex Identifies the resource type of the resource.
+        * @param uiResTypeIndex Identifies the resource type of the resource.
-        * @param uiResIndex Identifies the resource.
+        * @param uiResIndex Identifies the resource.
-        * @param strNewResName New name of the specified resource.
+        * @param strNewResName New name of the specified resource.
-        **/
+        **/
-        void ResourceDirectory::setResourceNameByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, const std::string& strNewResName)
+        void ResourceDirectory::setResourceNameByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, const std::string& strNewResName)
-        {
+        {
-                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);
+                ResourceNode* currNode = static_cast<ResourceNode*>(m_rnRoot.children[uiResTypeIndex].child);
-                currNode->children[uiResIndex].entry.wstrName = strNewResName;
+                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.
+* ResourceDirectory.cpp - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#ifndef RESOURCEDIRECTORY_H
+#ifndef RESOURCEDIRECTORY_H
-#define RESOURCEDIRECTORY_H
+#define RESOURCEDIRECTORY_H
-#include "PeLibInc.h"
+#include "PeLibInc.h"
-namespace PeLib
+namespace PeLib
-{
+{
-        class ResourceElement;
+        class ResourceElement;
-        
+        
-        /// The class ResourceChild is used to store information about a resource node.
+        /// The class ResourceChild is used to store information about a resource node.
-        class ResourceChild
+        class ResourceChild
-        {
+        {
-                friend class ResourceElement;
+                friend class ResourceElement;
-                friend class ResourceDirectory;
+                friend class ResourceDirectory;
-                friend class ResourceNode;
+                friend class ResourceNode;
-                friend class ResourceLeaf;
+                friend class ResourceLeaf;
-                
+                
-                /// Stores name and offset of a resource node.
+                /// Stores name and offset of a resource node.
-                PELIB_IMG_RES_DIR_ENTRY entry;
+                PELIB_IMG_RES_DIR_ENTRY entry;
-                /// A pointer to one of the node's child nodes.
+                /// A pointer to one of the node's child nodes.
-                ResourceElement* child;
+                ResourceElement* child;
-                
+                
-                public:
+                public:
-                  /// Function which compares a resource ID to the node's resource ID.
+                  /// Function which compares a resource ID to the node's resource ID.
-                  bool equalId(dword wId) const; // EXPORT
+                  bool equalId(dword wId) const; // EXPORT
-                  /// Function which compares a string to the node's resource name.
+                  /// Function which compares a string to the node's resource name.
-                  bool equalName(std::string strName) const; // EXPORT
+                  bool equalName(std::string strName) const; // EXPORT
-                  /// Predicate that determines if a child is identified by name or by ID.
+                  /// Predicate that determines if a child is identified by name or by ID.
-                  bool isNamedResource() const; // EXPORT
+                  bool isNamedResource() const; // EXPORT
-                  /// Used for sorting a node's children.
+                  /// Used for sorting a node's children.
-                  bool operator<(const ResourceChild& rc) const; // EXPORT
+                  bool operator<(const ResourceChild& rc) const; // EXPORT
-                  /// Returns the size of a resource child.
+                  /// Returns the size of a resource child.
-//              unsigned int size() const;
+//              unsigned int size() const;
-                  /// Standard constructor. Does absolutely nothing.
+                  /// Standard constructor. Does absolutely nothing.
-                  ResourceChild();
+                  ResourceChild();
-                  /// Makes a deep copy of a ResourceChild object.
+                  /// Makes a deep copy of a ResourceChild object.
-                  ResourceChild(const ResourceChild& rhs);
+                  ResourceChild(const ResourceChild& rhs);
-                  /// Makes a deep copy of a ResourceChild object.
+                  /// Makes a deep copy of a ResourceChild object.
-                  ResourceChild& operator=(const ResourceChild& rhs);
+                  ResourceChild& operator=(const ResourceChild& rhs);
-                  /// Deletes a ResourceChild object.
+                  /// Deletes a ResourceChild object.
-                  ~ResourceChild();
+                  ~ResourceChild();
-        };
+        };
-        
+        
-        /// Base class for ResourceNode and ResourceLeaf, the elements of the resource tree.
+        /// Base class for ResourceNode and ResourceLeaf, the elements of the resource tree.
-        /// \todo write
+        /// \todo write
-        class ResourceElement
+        class ResourceElement
-        {
+        {
-                friend class ResourceChild;
+                friend class ResourceChild;
-                friend class ResourceNode;
+                friend class ResourceNode;
-                friend class ResourceLeaf;
+                friend class ResourceLeaf;
-                
+                
-                protected:
+                protected:
-                  /// Stores RVA of the resource element in the file.
+                  /// Stores RVA of the resource element in the file.
-                  unsigned int uiElementRva;
+                  unsigned int uiElementRva;
-                
+                
-                  /// Reads the next resource element from the InputBuffer.
+                  /// Reads the next resource element from the InputBuffer.
-                  virtual int read(InputBuffer&, unsigned int, unsigned int/*, const std::string&*/) = 0;
+                  virtual int read(InputBuffer&, unsigned int, unsigned int/*, const std::string&*/) = 0;
-                  /// Writes the next resource element into the OutputBuffer.
+                  /// Writes the next resource element into the OutputBuffer.
-                  virtual void rebuild(OutputBuffer&, unsigned int&, unsigned int, const std::string&) const = 0;
+                  virtual void rebuild(OutputBuffer&, unsigned int&, unsigned int, const std::string&) const = 0;
-                  
+                  
-                public:
+                public:
-                  /// Returns the RVA of the element in the file.
+                  /// Returns the RVA of the element in the file.
-                  unsigned int getElementRva() const; // EXPORT
+                  unsigned int getElementRva() const; // EXPORT
-                  /// Indicates if the resource element is a leaf or a node.
+                  /// Indicates if the resource element is a leaf or a node.
-                  virtual bool isLeaf() const = 0; // EXPORT
+                  virtual bool isLeaf() const = 0; // EXPORT
-                  /// Corrects erroneous valeus in the ResourceElement.
+                  /// Corrects erroneous valeus in the ResourceElement.
-                  virtual void makeValid() = 0; // EXPORT
+                  virtual void makeValid() = 0; // EXPORT
-                  /// Returns the size of a resource element.
+                  /// Returns the size of a resource element.
-//                virtual unsigned int size() const = 0;
+//                virtual unsigned int size() const = 0;
-                  /// Necessary virtual destructor.
+                  /// Necessary virtual destructor.
-                  virtual ~ResourceElement() {}
+                  virtual ~ResourceElement() {}
-        };
+        };
-        
+        
-        /// ResourceLeafs represent the leafs of the resource tree: The actual resources.
+        /// ResourceLeafs represent the leafs of the resource tree: The actual resources.
-        class ResourceLeaf : public ResourceElement
+        class ResourceLeaf : public ResourceElement
-        {
+        {
-                friend class ResourceChild;
+                friend class ResourceChild;
-                friend class ResourceDirectory;
+                friend class ResourceDirectory;
-                template<typename T> friend struct fixNumberOfEntries;
+                template<typename T> friend struct fixNumberOfEntries;
-                
+                
-                private:
+                private:
-                  /// The resource data.
+                  /// The resource data.
-                  std::vector<byte> m_data;
+                  std::vector<byte> m_data;
-                  /// PeLib equivalent of the Win32 structure IMAGE_RESOURCE_DATA_ENTRY
+                  /// PeLib equivalent of the Win32 structure IMAGE_RESOURCE_DATA_ENTRY
-                  PELIB_IMAGE_RESOURCE_DATA_ENTRY entry;
+                  PELIB_IMAGE_RESOURCE_DATA_ENTRY entry;
-                  
+                  
-                protected:
+                protected:
-                  int read(InputBuffer& inpBuffer, unsigned int uiOffset, unsigned int rva/*, const std::string&*/);
+                  int read(InputBuffer& inpBuffer, unsigned int uiOffset, unsigned int rva/*, const std::string&*/);
-                  /// Writes the next resource leaf into the OutputBuffer.
+                  /// Writes the next resource leaf into the OutputBuffer.
-                  void rebuild(OutputBuffer&, unsigned int& uiOffset, unsigned int uiRva, const std::string&) const;
+                  void rebuild(OutputBuffer&, unsigned int& uiOffset, unsigned int uiRva, const std::string&) const;
-                
+                
-                public:
+                public:
-                  /// Indicates if the resource element is a leaf or a node.
+                  /// Indicates if the resource element is a leaf or a node.
-                  bool isLeaf() const; // EXPORT
+                  bool isLeaf() const; // EXPORT
-                  /// Corrects erroneous valeus in the ResourceLeaf.
+                  /// Corrects erroneous valeus in the ResourceLeaf.
-                  void makeValid(); // EXPORT
+                  void makeValid(); // EXPORT
-                  /// Reads the next resource leaf from the InputBuffer.
+                  /// Reads the next resource leaf from the InputBuffer.
-                  /// Returns the size of a resource lead.
+                  /// Returns the size of a resource lead.
-//                unsigned int size() const;
+//                unsigned int size() const;
-                  /// Returns the resource data of this resource leaf.
+                  /// Returns the resource data of this resource leaf.
-                  std::vector<byte> getData() const; // EXPORT
+                  std::vector<byte> getData() const; // EXPORT
-                  /// Sets the resource data of this resource leaf.
+                  /// Sets the resource data of this resource leaf.
-                  void setData(const std::vector<byte>& vData); // EXPORT
+                  void setData(const std::vector<byte>& vData); // EXPORT
-                  /// Returns the OffsetToData value of this resource leaf.
+                  /// Returns the OffsetToData value of this resource leaf.
-                  dword getOffsetToData() const; // EXPORT
+                  dword getOffsetToData() const; // EXPORT
-                  /// Returns the Size value of this resource leaf.
+                  /// Returns the Size value of this resource leaf.
-                  dword getSize() const; // EXPORT
+                  dword getSize() const; // EXPORT
-                  /// Returns the CodePage value of this resource leaf.
+                  /// Returns the CodePage value of this resource leaf.
-                  dword getCodePage() const; // EXPORT
+                  dword getCodePage() const; // EXPORT
-                  /// Returns the Reserved value of this resource leaf.
+                  /// Returns the Reserved value of this resource leaf.
-                  dword getReserved() const; // EXPORT
+                  dword getReserved() const; // EXPORT
-                  
+                  
-                  /// Sets the OffsetToData value of this resource leaf.
+                  /// Sets the OffsetToData value of this resource leaf.
-                  void setOffsetToData(dword dwValue); // EXPORT
+                  void setOffsetToData(dword dwValue); // EXPORT
-                  /// Sets the Size value of this resource leaf.
+                  /// Sets the Size value of this resource leaf.
-                  void setSize(dword dwValue); // EXPORT
+                  void setSize(dword dwValue); // EXPORT
-                  /// Sets the CodePage value of this resource leaf.
+                  /// Sets the CodePage value of this resource leaf.
-                  void setCodePage(dword dwValue); // EXPORT
+                  void setCodePage(dword dwValue); // EXPORT
-                  /// Sets the Reserved value of this resource leaf.
+                  /// Sets the Reserved value of this resource leaf.
-                  void setReserved(dword dwValue); // EXPORT
+                  void setReserved(dword dwValue); // EXPORT
-        };
+        };
-        
+        
-        /// ResourceNodes represent the nodes in the resource tree.
+        /// ResourceNodes represent the nodes in the resource tree.
-        class ResourceNode : public ResourceElement
+        class ResourceNode : public ResourceElement
-        {
+        {
-                friend class ResourceChild;
+                friend class ResourceChild;
-                friend class ResourceDirectory;
+                friend class ResourceDirectory;
-                template<typename T> friend struct fixNumberOfEntries;
+                template<typename T> friend struct fixNumberOfEntries;
-                
+                
-                /// The node's children.
+                /// The node's children.
-                std::vector<ResourceChild> children;
+                std::vector<ResourceChild> children;
-                /// The node's header. Equivalent to IMAGE_RESOURCE_DIRECTORY from the Win32 API.
+                /// The node's header. Equivalent to IMAGE_RESOURCE_DIRECTORY from the Win32 API.
-                PELIB_IMAGE_RESOURCE_DIRECTORY header;
+                PELIB_IMAGE_RESOURCE_DIRECTORY header;
-                
+                
-                protected:
+                protected:
-                  /// Reads the next resource node.
+                  /// Reads the next resource node.
-                  int read(InputBuffer& inpBuffer, unsigned int uiOffset, unsigned int rva/*, const std::string&*/);
+                  int read(InputBuffer& inpBuffer, unsigned int uiOffset, unsigned int rva/*, const std::string&*/);
-                  /// Writes the next resource node into the OutputBuffer.
+                  /// Writes the next resource node into the OutputBuffer.
-                  void rebuild(OutputBuffer&, unsigned int& uiOffset, unsigned int uiRva, const std::string&) const;
+                  void rebuild(OutputBuffer&, unsigned int& uiOffset, unsigned int uiRva, const std::string&) const;
-                  
+                  
-                public:
+                public:
-                  /// Indicates if the resource element is a leaf or a node.
+                  /// Indicates if the resource element is a leaf or a node.
-                  bool isLeaf() const; // EXPORT
+                  bool isLeaf() const; // EXPORT
-                  /// Corrects erroneous valeus in the ResourceNode.
+                  /// Corrects erroneous valeus in the ResourceNode.
-                  void makeValid(); // EXPORT
+                  void makeValid(); // EXPORT
-                  
+                  
-                  /// Returns the node's number of children.
+                  /// Returns the node's number of children.
-                  unsigned int getNumberOfChildren() const; // EXPORT
+                  unsigned int getNumberOfChildren() const; // EXPORT
-                  /// Adds another child to node.
+                  /// Adds another child to node.
-                  void addChild(); // EXPORT
+                  void addChild(); // EXPORT
-                  /// Returns a node's child.
+                  /// Returns a node's child.
-                  ResourceElement* getChild(unsigned int uiIndex); // EXPORT
+                  ResourceElement* getChild(unsigned int uiIndex); // EXPORT
-                  /// Removes a node's child.
+                  /// Removes a node's child.
-                  void removeChild(unsigned int uiIndex); // EXPORT
+                  void removeChild(unsigned int uiIndex); // EXPORT
-                  
+                  
-                  /// Returns the name of one of the node's children.
+                  /// Returns the name of one of the node's children.
-                  std::string getChildName(unsigned int uiIndex) const; // EXPORT
+                  std::string getChildName(unsigned int uiIndex) const; // EXPORT
-                  /// Returns the Name value of one of the node's children.
+                  /// Returns the Name value of one of the node's children.
-                  dword getOffsetToChildName(unsigned int uiIndex) const; // EXPORT
+                  dword getOffsetToChildName(unsigned int uiIndex) const; // EXPORT
-                  /// Returns the OffsetToData value of one of the node's children.
+                  /// Returns the OffsetToData value of one of the node's children.
-                  dword getOffsetToChildData(unsigned int uiIndex) const; // EXPORT
+                  dword getOffsetToChildData(unsigned int uiIndex) const; // EXPORT
-                  
+                  
-                  /// Sets the name of one of the node's children.
+                  /// Sets the name of one of the node's children.
-                  void setChildName(unsigned int uiIndex, const std::string& strNewName); // EXPORT
+                  void setChildName(unsigned int uiIndex, const std::string& strNewName); // EXPORT
-                  /// Sets the Name value of one of the node's children.
+                  /// Sets the Name value of one of the node's children.
-                  void setOffsetToChildName(unsigned int uiIndex, dword dwNewOffset); // EXPORT
+                  void setOffsetToChildName(unsigned int uiIndex, dword dwNewOffset); // EXPORT
-                  /// Sets the OffsetToData value of one of the node's children.
+                  /// Sets the OffsetToData value of one of the node's children.
-                  void setOffsetToChildData(unsigned int uiIndex, dword dwNewOffset); // EXPORT
+                  void setOffsetToChildData(unsigned int uiIndex, dword dwNewOffset); // EXPORT
-                  
+                  
-                  /// Returns the node's Characteristics value.
+                  /// Returns the node's Characteristics value.
-                  dword getCharacteristics() const; // EXPORT
+                  dword getCharacteristics() const; // EXPORT
-                  /// Returns the node's TimeDateStamp value.
+                  /// Returns the node's TimeDateStamp value.
-                  dword getTimeDateStamp() const; // EXPORT
+                  dword getTimeDateStamp() const; // EXPORT
-                  /// Returns the node's MajorVersion value.
+                  /// Returns the node's MajorVersion value.
-                  word getMajorVersion() const; // EXPORT
+                  word getMajorVersion() const; // EXPORT
-                  /// Returns the node's MinorVersion value.
+                  /// Returns the node's MinorVersion value.
-                  word getMinorVersion() const; // EXPORT
+                  word getMinorVersion() const; // EXPORT
-                  /// Returns the node's NumberOfNamedEntries value.
+                  /// Returns the node's NumberOfNamedEntries value.
-                  word getNumberOfNamedEntries() const; // EXPORT
+                  word getNumberOfNamedEntries() const; // EXPORT
-                  /// Returns the node's NumberOfIdEntries value.
+                  /// Returns the node's NumberOfIdEntries value.
-                  word getNumberOfIdEntries() const; // EXPORT
+                  word getNumberOfIdEntries() const; // EXPORT
-                  
+                  
-                  /// Sets the node's Characteristics value.
+                  /// Sets the node's Characteristics value.
-                  void setCharacteristics(dword value); // EXPORT
+                  void setCharacteristics(dword value); // EXPORT
-                  /// Sets the node's TimeDateStamp value.
+                  /// Sets the node's TimeDateStamp value.
-                  void setTimeDateStamp(dword value); // EXPORT
+                  void setTimeDateStamp(dword value); // EXPORT
-                  /// Sets the node's MajorVersion value.
+                  /// Sets the node's MajorVersion value.
-                  void setMajorVersion(word value); // EXPORT
+                  void setMajorVersion(word value); // EXPORT
-                  /// Sets the node's MinorVersion value.
+                  /// Sets the node's MinorVersion value.
-                  void setMinorVersion(word value); // EXPORT
+                  void setMinorVersion(word value); // EXPORT
-                  /// Sets the node's NumberOfNamedEntries value.
+                  /// Sets the node's NumberOfNamedEntries value.
-                  void setNumberOfNamedEntries(word value); // EXPORT
+                  void setNumberOfNamedEntries(word value); // EXPORT
-                  /// Sets the node's NumberOfIdEntries value.
+                  /// Sets the node's NumberOfIdEntries value.
-                  void setNumberOfIdEntries(word value); // EXPORT
+                  void setNumberOfIdEntries(word value); // EXPORT
-                  
+                  
-                  /// Returns the size of a resource node.
+                  /// Returns the size of a resource node.
-//              unsigned int size() const;
+//              unsigned int size() const;
-        };
+        };
-        /// Auxiliary functor which is used to search through the resource tree.
+        /// Auxiliary functor which is used to search through the resource tree.
-        /**
+        /**
-        * Traits class for the template functions of ResourceDirectory.
+        * 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
+        * It's used to find out which function to use when searching for resource nodes or resource leafs
-        * in a node's children vector.
+        * in a node's children vector.
-        **/
+        **/
-        template<typename T>
+        template<typename T>
-        struct ResComparer
+        struct ResComparer
-        {
+        {
-                /// Pointer to a member function of ResourceChild
+                /// Pointer to a member function of ResourceChild
-                typedef bool(ResourceChild::*CompFunc)(T) const;
+                typedef bool(ResourceChild::*CompFunc)(T) const;
-                 
+                 
-                /// Return 0 for all unspecialized versions of ResComparer.
+                /// Return 0 for all unspecialized versions of ResComparer.
-                static CompFunc comp();
+                static CompFunc comp();
-        };
+        };
-        /// Auxiliary functor which is used to search through the resource tree.
+        /// Auxiliary functor which is used to search through the resource tree.
-        /**
+        /**
-        * ResComparer<dword> is used when a resource element is searched for by ID.
+        * ResComparer<dword> is used when a resource element is searched for by ID.
-        **/
+        **/
-        template<>
+        template<>
-        struct ResComparer<dword>
+        struct ResComparer<dword>
-        {
+        {
-                /// Pointer to a member function of ResourceChild
+                /// Pointer to a member function of ResourceChild
-                typedef bool(ResourceChild::*CompFunc)(dword) const;
+                typedef bool(ResourceChild::*CompFunc)(dword) const;
-                 
+                 
-                /// Return the address of the ResourceChild member function that compares the ids of resource elements.
+                /// Return the address of the ResourceChild member function that compares the ids of resource elements.
-                static CompFunc comp()
+                static CompFunc comp()
-                {
+                {
-                        return &ResourceChild::equalId;
+                        return &ResourceChild::equalId;
-                }
+                }
-        };
+        };
-        /// Auxiliary functor which is used to search through the resource tree.
+        /// 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.
+        * This specializd version of ResComparer is used when a resource element is searched for by name.
-        **/
+        **/
-        template<>
+        template<>
-        struct ResComparer<std::string>
+        struct ResComparer<std::string>
-        {
+        {
-                /// Pointer to a member function of ResourceChild
+                /// Pointer to a member function of ResourceChild
-                typedef bool(ResourceChild::*CompFunc)(std::string) const;
+                typedef bool(ResourceChild::*CompFunc)(std::string) const;
-                 
+                 
-                /// Return the address of the ResourceChild member function that compares the names of resource elements.
+                /// Return the address of the ResourceChild member function that compares the names of resource elements.
-                static CompFunc comp()
+                static CompFunc comp()
-                {
+                {
-                        return &ResourceChild::equalName;
+                        return &ResourceChild::equalName;
-                }
+                }
-        };
+        };
-        /// Unspecialized function that's used as base template for the specialized versions below.
+        /// Unspecialized function that's used as base template for the specialized versions below.
-        template<typename T>
+        template<typename T>
-        struct fixNumberOfEntries
+        struct fixNumberOfEntries
-        {
+        {
-                /// Fixes a resource node's header.
+                /// Fixes a resource node's header.
-                static void fix(ResourceNode*);
+                static void fix(ResourceNode*);
-        };
+        };
-                  
+                  
-        /// Fixes NumberOfIdEntries value of a node.
+        /// Fixes NumberOfIdEntries value of a node.
-        template<>
+        template<>
-        struct fixNumberOfEntries<dword>
+        struct fixNumberOfEntries<dword>
-        {
+        {
-                /// Fixes a resource node's NumberOfIdEntries value.
+                /// Fixes a resource node's NumberOfIdEntries value.
-                static void fix(ResourceNode* node)
+                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));
+                        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.
+        /// Fixes NumberOfNamedEntries value of a node.
-        template<>
+        template<>
-        struct fixNumberOfEntries<std::string>
+        struct fixNumberOfEntries<std::string>
-        {
+        {
-                /// Fixes a resource node's NumberOfNamedEntries value.
+                /// Fixes a resource node's NumberOfNamedEntries value.
-                static void fix(ResourceNode* node)
+                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)));
+                        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.    
+        /// 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
+        * 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.
+        * 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
+        * 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
+        * 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>
+        * 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
+        * 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
+        * 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>
+        * 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
+        * 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
+        * 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
+        * 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 
+        * 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
+        * fix the resource tree after manipulating it. PeLib makes the job easy for you, just call the
-        * ResourceDirectory::makeValid function.<br><br>
+        * 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
+        * 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
+        * 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
+        * 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>
+        * of the returned vector.<br><br>
-        * There are also different ways to serialize (rebuild) the resource tree as it's not a fixed structure
+        * 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>
+        * 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
+        * 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
+        * 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
+        * 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.
+        * directory before you write the rebuilt resource directory back to the file.
-        **/
+        **/
-        class ResourceDirectory
+        class ResourceDirectory
-        {
+        {
-                private:
+                private:
-                  /// The root node of the resource directory.
+                  /// The root node of the resource directory.
-                  ResourceNode m_rnRoot;
+                  ResourceNode m_rnRoot;
-                  // Prepare for some crazy syntax below to make Digital Mars happy.
+                  // Prepare for some crazy syntax below to make Digital Mars happy.
-                  
+                  
-                  /// Retrieves an iterator to a specified resource child.
+                  /// Retrieves an iterator to a specified resource child.
-                  template<typename S, typename T>
+                  template<typename S, typename T>
-                  std::vector<ResourceChild>::const_iterator locateResourceT(S restypeid, T resid) const;
+                  std::vector<ResourceChild>::const_iterator locateResourceT(S restypeid, T resid) const;
-                  
+                  
-                  /// Retrieves an iterator to a specified resource child.
+                  /// Retrieves an iterator to a specified resource child.
-                  template<typename S, typename T>
+                  template<typename S, typename T>
-                  std::vector<ResourceChild>::iterator locateResourceT(S restypeid, T resid);
+                  std::vector<ResourceChild>::iterator locateResourceT(S restypeid, T resid);
-                  
+                  
-                  /// Adds a new resource.
+                  /// Adds a new resource.
-                  template<typename S, typename T>
+                  template<typename S, typename T>
-                  int addResourceT(S restypeid, T resid, ResourceChild& rc);
+                  int addResourceT(S restypeid, T resid, ResourceChild& rc);
-                  
+                  
-                  /// Removes new resource.
+                  /// Removes new resource.
-                  template<typename S, typename T>
+                  template<typename S, typename T>
-                  int removeResourceT(S restypeid, T resid);
+                  int removeResourceT(S restypeid, T resid);
-                  
+                  
-                  /// Returns the data of a resource.
+                  /// Returns the data of a resource.
-                  template<typename S, typename T>
+                  template<typename S, typename T>
-                  int getResourceDataT(S restypeid, T resid, std::vector<byte>& data) const;
+                  int getResourceDataT(S restypeid, T resid, std::vector<byte>& data) const;
-                  
+                  
-                  /// Sets the data of a resource.
+                  /// Sets the data of a resource.
-                  template<typename S, typename T>
+                  template<typename S, typename T>
-                  int setResourceDataT(S restypeid, T resid, std::vector<byte>& data);
+                  int setResourceDataT(S restypeid, T resid, std::vector<byte>& data);
-                  
+                  
-                  /// Returns the ID of a resource.
+                  /// Returns the ID of a resource.
-                  template<typename S, typename T>
+                  template<typename S, typename T>
-                  dword getResourceIdT(S restypeid, T resid) const;
+                  dword getResourceIdT(S restypeid, T resid) const;
-                  
+                  
-                  /// Sets the ID of a resource.
+                  /// Sets the ID of a resource.
-                  template<typename S, typename T>
+                  template<typename S, typename T>
-                  int setResourceIdT(S restypeid, T resid, dword dwNewResId);
+                  int setResourceIdT(S restypeid, T resid, dword dwNewResId);
-                  
+                  
-                  /// Returns the name of a resource.
+                  /// Returns the name of a resource.
-                  template<typename S, typename T>
+                  template<typename S, typename T>
-                  std::string getResourceNameT(S restypeid, T resid) const;
+                  std::string getResourceNameT(S restypeid, T resid) const;
-                  
+                  
-                  /// Sets the name of a resource.
+                  /// Sets the name of a resource.
-                  template<typename S, typename T>
+                  template<typename S, typename T>
-                  int setResourceNameT(S restypeid, T resid, std::string strNewResName);
+                  int setResourceNameT(S restypeid, T resid, std::string strNewResName);
-                  
+                  
-                public:
+                public:
-                  ResourceNode* getRoot();
+                  ResourceNode* getRoot();
-                  /// Corrects a erroneous resource directory.
+                  /// Corrects a erroneous resource directory.
-                  void makeValid();
+                  void makeValid();
-                  /// Reads the resource directory from a file.
+                  /// Reads the resource directory from a file.
-                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, unsigned int uiResDirRva);
+                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize, unsigned int uiResDirRva);
-                  /// Rebuilds the resource directory.
+                  /// Rebuilds the resource directory.
-                  void rebuild(std::vector<byte>& vBuffer, unsigned int uiRva) const;
+                  void rebuild(std::vector<byte>& vBuffer, unsigned int uiRva) const;
-                  /// Returns the size of the rebuilt resource directory.
+                  /// Returns the size of the rebuilt resource directory.
-//                unsigned int size() const;
+//                unsigned int size() const;
-                  /// Writes the resource directory to a file.
+                  /// Writes the resource directory to a file.
-                  int write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva) const;
+                  int write(const std::string& strFilename, unsigned int uiOffset, unsigned int uiRva) const;
-                  /// Adds a new resource type.
+                  /// Adds a new resource type.
-                  int addResourceType(dword dwResTypeId);
+                  int addResourceType(dword dwResTypeId);
-                  /// Adds a new resource type.
+                  /// Adds a new resource type.
-                  int addResourceType(const std::string& strResTypeName);
+                  int addResourceType(const std::string& strResTypeName);
-                  
+                  
-                  /// Removes a resource type and all of it's resources.
+                  /// Removes a resource type and all of it's resources.
-                  int removeResourceType(dword dwResTypeId);
+                  int removeResourceType(dword dwResTypeId);
-                  /// Removes a resource type and all of it's resources.
+                  /// Removes a resource type and all of it's resources.
-                  int removeResourceType(const std::string& strResTypeName);
+                  int removeResourceType(const std::string& strResTypeName);
-                  
+                  
-                  /// Removes a resource type and all of it's resources.
+                  /// Removes a resource type and all of it's resources.
-                  int removeResourceTypeByIndex(unsigned int uiIndex);
+                  int removeResourceTypeByIndex(unsigned int uiIndex);
-                  
+                  
-                  /// Adds a new resource.
+                  /// Adds a new resource.
-                  int addResource(dword dwResTypeId, dword dwResId);
+                  int addResource(dword dwResTypeId, dword dwResId);
-                  /// Adds a new resource.
+                  /// Adds a new resource.
-                  int addResource(dword dwResTypeId, const std::string& strResName);
+                  int addResource(dword dwResTypeId, const std::string& strResName);
-                  /// Adds a new resource.
+                  /// Adds a new resource.
-                  int addResource(const std::string& strResTypeName, dword dwResId);
+                  int addResource(const std::string& strResTypeName, dword dwResId);
-                  /// Adds a new resource.
+                  /// Adds a new resource.
-                  int addResource(const std::string& strResTypeName, const std::string& strResName);
+                  int addResource(const std::string& strResTypeName, const std::string& strResName);
-                  /// Removes a resource.
+                  /// Removes a resource.
-                  int removeResource(dword dwResTypeId, dword dwResId);
+                  int removeResource(dword dwResTypeId, dword dwResId);
-                  /// Removes a resource.
+                  /// Removes a resource.
-                  int removeResource(dword dwResTypeId, const std::string& strResName);
+                  int removeResource(dword dwResTypeId, const std::string& strResName);
-                  /// Removes a resource.
+                  /// Removes a resource.
-                  int removeResource(const std::string& strResTypeName, dword dwResId);
+                  int removeResource(const std::string& strResTypeName, dword dwResId);
-                  /// Removes a resource.
+                  /// Removes a resource.
-                  int removeResource(const std::string& strResTypeName, const std::string& strResName);
+                  int removeResource(const std::string& strResTypeName, const std::string& strResName);
-                  /// Returns the number of resource types.
+                  /// Returns the number of resource types.
-                  unsigned int getNumberOfResourceTypes() const;
+                  unsigned int getNumberOfResourceTypes() const;
-                  
+                  
-                  /// Returns the ID of a resource type.
+                  /// Returns the ID of a resource type.
-                  dword getResourceTypeIdByIndex(unsigned int uiIndex) const;
+                  dword getResourceTypeIdByIndex(unsigned int uiIndex) const;
-                  /// Returns the name of a resource type.
+                  /// Returns the name of a resource type.
-                  std::string getResourceTypeNameByIndex(unsigned int uiIndex) const;
+                  std::string getResourceTypeNameByIndex(unsigned int uiIndex) const;
-                  
+                  
-                  /// Converts a resource type ID to an index.
+                  /// Converts a resource type ID to an index.
-                  int resourceTypeIdToIndex(dword dwResTypeId) const;
+                  int resourceTypeIdToIndex(dword dwResTypeId) const;
-                  /// Converts a resource type name to an index.
+                  /// Converts a resource type name to an index.
-                  int resourceTypeNameToIndex(const std::string& strResTypeName) const;
+                  int resourceTypeNameToIndex(const std::string& strResTypeName) const;
-                  
+                  
-                  /// Returns the number of resources of a certain resource type.
+                  /// Returns the number of resources of a certain resource type.
-                  unsigned int getNumberOfResources(dword dwId) const;
+                  unsigned int getNumberOfResources(dword dwId) const;
-                  /// Returns the number of resources of a certain resource type.
+                  /// Returns the number of resources of a certain resource type.
-                  unsigned int getNumberOfResources(const std::string& strResTypeName) const;
+                  unsigned int getNumberOfResources(const std::string& strResTypeName) const;
-                  
+                  
-                  /// Returns the number of resources of a certain resource type.
+                  /// Returns the number of resources of a certain resource type.
-                  unsigned int getNumberOfResourcesByIndex(unsigned int uiIndex) const;
+                  unsigned int getNumberOfResourcesByIndex(unsigned int uiIndex) const;
-                  
+                  
-                  /// Returns the data of a certain resource.
+                  /// Returns the data of a certain resource.
-                  void getResourceData(dword dwResTypeId, dword dwResId, std::vector<byte>& data) const;
+                  void getResourceData(dword dwResTypeId, dword dwResId, std::vector<byte>& data) const;
-                  /// Returns the data of a certain resource.
+                  /// Returns the data of a certain resource.
-                  void getResourceData(dword dwResTypeId, const std::string& strResName, std::vector<byte>& data) const;
+                  void getResourceData(dword dwResTypeId, const std::string& strResName, std::vector<byte>& data) const;
-                  /// Returns the data of a certain resource.
+                  /// Returns the data of a certain resource.
-                  void getResourceData(const std::string& strResTypeName, dword dwResId, std::vector<byte>& data) const;
+                  void getResourceData(const std::string& strResTypeName, dword dwResId, std::vector<byte>& data) const;
-                  /// Returns the data of a certain resource.
+                  /// Returns the data of a certain resource.
-                  void getResourceData(const std::string& strResTypeName, const std::string& strResName, std::vector<byte>& data) const;
+                  void getResourceData(const std::string& strResTypeName, const std::string& strResName, std::vector<byte>& data) const;
-                  
+                  
-                  /// Returns the data of a certain resource.
+                  /// Returns the data of a certain resource.
-                  void getResourceDataByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, std::vector<byte>& data) const;
+                  void getResourceDataByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, std::vector<byte>& data) const;
-                  
+                  
-                  /// Sets the data of a certain resource.
+                  /// Sets the data of a certain resource.
-                  void setResourceData(dword dwResTypeId, dword dwResId, std::vector<byte>& data);
+                  void setResourceData(dword dwResTypeId, dword dwResId, std::vector<byte>& data);
-                  /// Sets the data of a certain resource.
+                  /// Sets the data of a certain resource.
-                  void setResourceData(dword dwResTypeId, const std::string& strResName, std::vector<byte>& data);
+                  void setResourceData(dword dwResTypeId, const std::string& strResName, std::vector<byte>& data);
-                  /// Sets the data of a certain resource.
+                  /// Sets the data of a certain resource.
-                  void setResourceData(const std::string& strResTypeName, dword dwResId, std::vector<byte>& data);
+                  void setResourceData(const std::string& strResTypeName, dword dwResId, std::vector<byte>& data);
-                  /// Sets the data of a certain resource.
+                  /// Sets the data of a certain resource.
-                  void setResourceData(const std::string& strResTypeName, const std::string& strResName, std::vector<byte>& data);
+                  void setResourceData(const std::string& strResTypeName, const std::string& strResName, std::vector<byte>& data);
-                  
+                  
-                  /// Sets the data of a certain resource.
+                  /// Sets the data of a certain resource.
-                  void setResourceDataByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, std::vector<byte>& data);
+                  void setResourceDataByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, std::vector<byte>& data);
-                  /// Returns the ID of a certain resource.
+                  /// Returns the ID of a certain resource.
-                  dword getResourceId(dword dwResTypeId, const std::string& strResName) const;
+                  dword getResourceId(dword dwResTypeId, const std::string& strResName) const;
-                  /// Returns the ID of a certain resource.
+                  /// Returns the ID of a certain resource.
-                  dword getResourceId(const std::string& strResTypeName, const std::string& strResName) const;
+                  dword getResourceId(const std::string& strResTypeName, const std::string& strResName) const;
-                  
+                  
-                  /// Returns the ID of a certain resource.
+                  /// Returns the ID of a certain resource.
-                  dword getResourceIdByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex) const;
+                  dword getResourceIdByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex) const;
-                  
+                  
-                  /// Sets the ID of a certain resource.
+                  /// Sets the ID of a certain resource.
-                  void setResourceId(dword dwResTypeId, dword dwResId, dword dwNewResId);
+                  void setResourceId(dword dwResTypeId, dword dwResId, dword dwNewResId);
-                  /// Sets the ID of a certain resource.
+                  /// Sets the ID of a certain resource.
-                  void setResourceId(dword dwResTypeId, const std::string& strResName, dword dwNewResId);
+                  void setResourceId(dword dwResTypeId, const std::string& strResName, dword dwNewResId);
-                  /// Sets the ID of a certain resource.
+                  /// Sets the ID of a certain resource.
-                  void setResourceId(const std::string& strResTypeName, dword dwResId, dword dwNewResId);
+                  void setResourceId(const std::string& strResTypeName, dword dwResId, dword dwNewResId);
-                  /// Sets the ID of a certain resource.
+                  /// Sets the ID of a certain resource.
-                  void setResourceId(const std::string& strResTypeName, const std::string& strResName, dword dwNewResId);
+                  void setResourceId(const std::string& strResTypeName, const std::string& strResName, dword dwNewResId);
-                  
+                  
-                  /// Sets the ID of a certain resource.
+                  /// Sets the ID of a certain resource.
-                  void setResourceIdByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, dword dwNewResId);
+                  void setResourceIdByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, dword dwNewResId);
-                  
+                  
-                  /// Returns the name of a certain resource.
+                  /// Returns the name of a certain resource.
-                  std::string getResourceName(dword dwResTypeId, dword dwResId) const;
+                  std::string getResourceName(dword dwResTypeId, dword dwResId) const;
-                  /// Returns the name of a certain resource.
+                  /// Returns the name of a certain resource.
-                  std::string getResourceName(const std::string& strResTypeName, dword dwResId) const;
+                  std::string getResourceName(const std::string& strResTypeName, dword dwResId) const;
-                  
+                  
-                  /// Returns the name of a certain resource.
+                  /// Returns the name of a certain resource.
-                  std::string getResourceNameByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex) const;
+                  std::string getResourceNameByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex) const;
-                  
+                  
-                  /// Sets the name of a certain resource.
+                  /// Sets the name of a certain resource.
-                  void setResourceName(dword dwResTypeId, dword dwResId, const std::string& strNewResName);
+                  void setResourceName(dword dwResTypeId, dword dwResId, const std::string& strNewResName);
-                  /// Sets the name of a certain resource.
+                  /// Sets the name of a certain resource.
-                  void setResourceName(dword dwResTypeId, const std::string& strResName, const std::string& strNewResName);
+                  void setResourceName(dword dwResTypeId, const std::string& strResName, const std::string& strNewResName);
-                  /// Sets the name of a certain resource.
+                  /// Sets the name of a certain resource.
-                  void setResourceName(const std::string& strResTypeName, dword dwResId, const std::string& strNewResName);
+                  void setResourceName(const std::string& strResTypeName, dword dwResId, const std::string& strNewResName);
-                  /// Sets the name of a certain resource.
+                  /// Sets the name of a certain resource.
-                  void setResourceName(const std::string& strResTypeName, const std::string& strResName, const std::string& strNewResName);
+                  void setResourceName(const std::string& strResTypeName, const std::string& strResName, const std::string& strNewResName);
-                  
+                  
-                  /// Sets the name of a certain resource.
+                  /// Sets the name of a certain resource.
-                  void setResourceNameByIndex(unsigned int uiResTypeIndex, unsigned int uiResIndex, const std::string& strNewResName);
+                  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
+        * Looks through the entire resource tree and returns a const_iterator to the resource specified
-        * by the parameters.
+        * by the parameters.
-        * @param restypeid Identifier of the resource type (either ID or name).
+        * @param restypeid Identifier of the resource type (either ID or name).
-        * @param resid Identifier of the resource (either ID or name).
+        * @param resid Identifier of the resource (either ID or name).
-        * @return A const_iterator to the specified resource.
+        * @return A const_iterator to the specified resource.
-        **/
+        **/
-        template<typename S, typename T>
+        template<typename S, typename T>
-        std::vector<ResourceChild>::const_iterator ResourceDirectory::locateResourceT(S restypeid, T resid) const
+        std::vector<ResourceChild>::const_iterator ResourceDirectory::locateResourceT(S restypeid, T resid) const
-        {
+        {
-                typedef bool(ResourceChild::*CompFunc1)(S) const;
+                typedef bool(ResourceChild::*CompFunc1)(S) const;
-                typedef bool(ResourceChild::*CompFunc2)(T) const;
+                typedef bool(ResourceChild::*CompFunc2)(T) const;
-                
+                
-                CompFunc1 comp1 = ResComparer<S>::comp();
+                CompFunc1 comp1 = ResComparer<S>::comp();
-                CompFunc2 comp2 = ResComparer<T>::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));
+                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())
+                if (Iter == m_rnRoot.children.end())
-                {
+                {
-                        return Iter;
+                        return Iter;
-                }
+                }
-                
+                
-                ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);
+                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));
+                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())
+                if (ResIter == currNode->children.end())
-                {
+                {
-                        return ResIter;
+                        return ResIter;
-                }
+                }
-                        
+                        
-                return ResIter;
+                return ResIter;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Looks through the entire resource tree and returns an iterator to the resource specified
+        * Looks through the entire resource tree and returns an iterator to the resource specified
-        * by the parameters.
+        * by the parameters.
-        * @param restypeid Identifier of the resource type (either ID or name).
+        * @param restypeid Identifier of the resource type (either ID or name).
-        * @param resid Identifier of the resource (either ID or name).
+        * @param resid Identifier of the resource (either ID or name).
-        * @return An iterator to the specified resource.
+        * @return An iterator to the specified resource.
-        **/
+        **/
-        template<typename S, typename T>
+        template<typename S, typename T>
-        std::vector<ResourceChild>::iterator ResourceDirectory::locateResourceT(S restypeid, T resid)
+        std::vector<ResourceChild>::iterator ResourceDirectory::locateResourceT(S restypeid, T resid)
-        {
+        {
-                typedef bool(ResourceChild::*CompFunc1)(S) const;
+                typedef bool(ResourceChild::*CompFunc1)(S) const;
-                typedef bool(ResourceChild::*CompFunc2)(T) const;
+                typedef bool(ResourceChild::*CompFunc2)(T) const;
-                
+                
-                CompFunc1 comp1 = ResComparer<S>::comp();
+                CompFunc1 comp1 = ResComparer<S>::comp();
-                CompFunc2 comp2 = ResComparer<T>::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));
+                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())
+                if (Iter == m_rnRoot.children.end())
-                {
+                {
-                        return Iter;
+                        return Iter;
-                }
+                }
-                
+                
-                ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);
+                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));
+                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())
+                if (ResIter == currNode->children.end())
-                {
+                {
-                        return ResIter;
+                        return ResIter;
-                }
+                }
-                        
+                        
-                return ResIter;
+                return ResIter;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Adds a new resource, resource type and ID are specified by the parameters.
+        * 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 restypeid Identifier of the resource type (either ID or name).
-        * @param resid Identifier of the resource (either ID or name).
+        * @param resid Identifier of the resource (either ID or name).
-        * @param rc ResourceChild that will be added.
+        * @param rc ResourceChild that will be added.
-        **/
+        **/
-        template<typename S, typename T>
+        template<typename S, typename T>
-        int ResourceDirectory::addResourceT(S restypeid, T resid, ResourceChild& rc)
+        int ResourceDirectory::addResourceT(S restypeid, T resid, ResourceChild& rc)
-        {
+        {
-                typedef bool(ResourceChild::*CompFunc1)(S) const;
+                typedef bool(ResourceChild::*CompFunc1)(S) const;
-                typedef bool(ResourceChild::*CompFunc2)(T) const;
+                typedef bool(ResourceChild::*CompFunc2)(T) const;
-                
+                
-                CompFunc1 comp1 = ResComparer<S>::comp();
+                CompFunc1 comp1 = ResComparer<S>::comp();
-                CompFunc2 comp2 = ResComparer<T>::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));
+                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())
+                if (Iter == m_rnRoot.children.end())
-                {
+                {
-                        return 1;
+                        return 1;
-                        // throw Exceptions::ResourceTypeDoesNotExist(ResourceDirectoryId, __LINE__);
+                        // throw Exceptions::ResourceTypeDoesNotExist(ResourceDirectoryId, __LINE__);
-                }
+                }
-                
+                
-                ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);
+                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));
+                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())
+                if (ResIter != currNode->children.end())
-                {
+                {
-                        return 1;
+                        return 1;
-//                      throw Exceptions::EntryAlreadyExists(ResourceDirectoryId, __LINE__);
+//                      throw Exceptions::EntryAlreadyExists(ResourceDirectoryId, __LINE__);
-                }
+                }
-                                
+                                
-                rc.child = new ResourceNode;
+                rc.child = new ResourceNode;
-                ResourceChild rlnew;
+                ResourceChild rlnew;
-                rlnew.child = new ResourceLeaf;
+                rlnew.child = new ResourceLeaf;
-                ResourceNode* currNode2 = static_cast<ResourceNode*>(rc.child);
+                ResourceNode* currNode2 = static_cast<ResourceNode*>(rc.child);
-                currNode2->children.push_back(rlnew);
+                currNode2->children.push_back(rlnew);
-                currNode->children.push_back(rc);
+                currNode->children.push_back(rc);
-                
+                
-                fixNumberOfEntries<T>::fix(currNode);
+                fixNumberOfEntries<T>::fix(currNode);
-                fixNumberOfEntries<T>::fix(currNode2);
+                fixNumberOfEntries<T>::fix(currNode2);
-                
+                
-                return 0;
+                return 0;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Removes a resource, resource type and ID are specified by the parameters.
+        * Removes a resource, resource type and ID are specified by the parameters.
-        * @param restypeid Identifier of the resource type (either ID or name).
+        * @param restypeid Identifier of the resource type (either ID or name).
-        * @param resid Identifier of the resource (either ID or name).
+        * @param resid Identifier of the resource (either ID or name).
-        **/
+        **/
-        template<typename S, typename T>
+        template<typename S, typename T>
-        int ResourceDirectory::removeResourceT(S restypeid, T resid)
+        int ResourceDirectory::removeResourceT(S restypeid, T resid)
-        {
+        {
-                typedef bool(ResourceChild::*CompFunc1)(S) const;
+                typedef bool(ResourceChild::*CompFunc1)(S) const;
-                typedef bool(ResourceChild::*CompFunc2)(T) const;
+                typedef bool(ResourceChild::*CompFunc2)(T) const;
-                
+                
-                CompFunc1 comp1 = ResComparer<S>::comp();
+                CompFunc1 comp1 = ResComparer<S>::comp();
-                CompFunc2 comp2 = ResComparer<T>::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));
+                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())
+                if (Iter == m_rnRoot.children.end())
-                {
+                {
-                        return 1;
+                        return 1;
-                        //throw Exceptions::ResourceTypeDoesNotExist(ResourceDirectoryId, __LINE__);
+                        //throw Exceptions::ResourceTypeDoesNotExist(ResourceDirectoryId, __LINE__);
-                }
+                }
-                
+                
-                ResourceNode* currNode = static_cast<ResourceNode*>(Iter->child);
+                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));
+                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())
+                if (ResIter == currNode->children.end())
-                {
+                {
-                        return 1;
+                        return 1;
-                        // throw Exceptions::InvalidName(ResourceDirectoryId, __LINE__);
+                        // throw Exceptions::InvalidName(ResourceDirectoryId, __LINE__);
-                }
+                }
-                        
+                        
-                currNode->children.erase(ResIter);
+                currNode->children.erase(ResIter);
-                
+                
-                fixNumberOfEntries<T>::fix(currNode);
+                fixNumberOfEntries<T>::fix(currNode);
-                
+                
-                return 0;
+                return 0;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the data of a resource, resource type and ID are specified by the parameters.
+        * 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 restypeid Identifier of the resource type (either ID or name).
-        * @param resid Identifier of the resource (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.
+        * @param data The data of the resource will be written into this vector.
-        **/
+        **/
-        template<typename S, typename T>
+        template<typename S, typename T>
-        int ResourceDirectory::getResourceDataT(S restypeid, T resid, std::vector<byte>& data) const
+        int ResourceDirectory::getResourceDataT(S restypeid, T resid, std::vector<byte>& data) const
-        {
+        {
-                std::vector<ResourceChild>::const_iterator ResIter = locateResourceT(restypeid, resid);
+                std::vector<ResourceChild>::const_iterator ResIter = locateResourceT(restypeid, resid);
-                ResourceNode* currNode = static_cast<ResourceNode*>(ResIter->child);
+                ResourceNode* currNode = static_cast<ResourceNode*>(ResIter->child);
-                ResourceLeaf* currLeaf = static_cast<ResourceLeaf*>(currNode->children[0].child);
+                ResourceLeaf* currLeaf = static_cast<ResourceLeaf*>(currNode->children[0].child);
-                data.assign(currLeaf->m_data.begin(), currLeaf->m_data.end());
+                data.assign(currLeaf->m_data.begin(), currLeaf->m_data.end());
-                
+                
-                return 0;
+                return 0;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the data of a resource, resource type and ID are specified by the parameters.
+        * 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 restypeid Identifier of the resource type (either ID or name).
-        * @param resid Identifier of the resource (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.
+        * @param data The new data of the resource is taken from this vector.
-        **/
+        **/
-        template<typename S, typename T>
+        template<typename S, typename T>
-        int ResourceDirectory::setResourceDataT(S restypeid, T resid, std::vector<byte>& data)
+        int ResourceDirectory::setResourceDataT(S restypeid, T resid, std::vector<byte>& data)
-        {
+        {
-                std::vector<ResourceChild>::iterator ResIter = locateResourceT(restypeid, resid);
+                std::vector<ResourceChild>::iterator ResIter = locateResourceT(restypeid, resid);
-                ResourceNode* currNode = static_cast<ResourceNode*>(ResIter->child);
+                ResourceNode* currNode = static_cast<ResourceNode*>(ResIter->child);
-                ResourceLeaf* currLeaf = static_cast<ResourceLeaf*>(currNode->children[0].child);
+                ResourceLeaf* currLeaf = static_cast<ResourceLeaf*>(currNode->children[0].child);
-                currLeaf->m_data.assign(data.begin(), data.end());
+                currLeaf->m_data.assign(data.begin(), data.end());
-                
+                
-                return 0;
+                return 0;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Returns the id of a resource, resource type and ID are specified by the parameters.
+        * 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.
+        * 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 restypeid Identifier of the resource type (either ID or name).
-        * @param resid Identifier of the resource (either ID or name).
+        * @param resid Identifier of the resource (either ID or name).
-        * @return The ID of the specified resource.
+        * @return The ID of the specified resource.
-        **/
+        **/
-        template<typename S, typename T>
+        template<typename S, typename T>
-        dword ResourceDirectory::getResourceIdT(S restypeid, T resid) const
+        dword ResourceDirectory::getResourceIdT(S restypeid, T resid) const
-        {
+        {
-                std::vector<ResourceChild>::const_iterator ResIter = locateResourceT(restypeid, resid);
+                std::vector<ResourceChild>::const_iterator ResIter = locateResourceT(restypeid, resid);
-                return ResIter->entry.irde.Name;
+                return ResIter->entry.irde.Name;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Sets the id of a resource, resource type and ID are specified by the parameters.
+        * 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 restypeid Identifier of the resource type (either ID or name).
-        * @param resid Identifier of the resource (either ID or name).
+        * @param resid Identifier of the resource (either ID or name).
-        * @param dwNewResId New ID of the resource.
+        * @param dwNewResId New ID of the resource.
-        **/
+        **/
-        template<typename S, typename T>
+        template<typename S, typename T>
-        int ResourceDirectory::setResourceIdT(S restypeid, T resid, dword dwNewResId)
+        int ResourceDirectory::setResourceIdT(S restypeid, T resid, dword dwNewResId)
-        {
+        {
-                std::vector<ResourceChild>::iterator ResIter = locateResourceT(restypeid, resid);
+                std::vector<ResourceChild>::iterator ResIter = locateResourceT(restypeid, resid);
-                ResIter->entry.irde.Name = dwNewResId;
+                ResIter->entry.irde.Name = dwNewResId;
-                return 0;
+                return 0;
-        }
+        }
-                  
+                  
-        /**
+        /**
-        * Returns the name of a resource, resource type and ID are specified by the parameters.
+        * 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.
+        * 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 restypeid Identifier of the resource type (either ID or name).
-        * @param resid Identifier of the resource (either ID or name).
+        * @param resid Identifier of the resource (either ID or name).
-        * @return The name of the specified resource.
+        * @return The name of the specified resource.
-        **/
+        **/
-        template<typename S, typename T>
+        template<typename S, typename T>
-        std::string ResourceDirectory::getResourceNameT(S restypeid, T resid) const
+        std::string ResourceDirectory::getResourceNameT(S restypeid, T resid) const
-        {
+        {
-                std::vector<ResourceChild>::const_iterator ResIter = locateResourceT(restypeid, resid);
+                std::vector<ResourceChild>::const_iterator ResIter = locateResourceT(restypeid, resid);
-                return ResIter->entry.wstrName;
+                return ResIter->entry.wstrName;
-        }
+        }
-                  
+                  
-        /**
+        /**
-        * Sets the name of a resource, resource type and ID are specified by the parameters.
+        * 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 restypeid Identifier of the resource type (either ID or name).
-        * @param resid Identifier of the resource (either ID or name).
+        * @param resid Identifier of the resource (either ID or name).
-        * @param strNewResName The new name of the resource.
+        * @param strNewResName The new name of the resource.
-        **/
+        **/
-        template<typename S, typename T>
+        template<typename S, typename T>
-        int ResourceDirectory::setResourceNameT(S restypeid, T resid, std::string strNewResName)
+        int ResourceDirectory::setResourceNameT(S restypeid, T resid, std::string strNewResName)
-        {
+        {
-                std::vector<ResourceChild>::iterator ResIter = locateResourceT(restypeid, resid);
+                std::vector<ResourceChild>::iterator ResIter = locateResourceT(restypeid, resid);
-                ResIter->entry.wstrName = strNewResName;
+                ResIter->entry.wstrName = strNewResName;
-                
+                
-                return 0;
+                return 0;
-        }
+        }
-}
+}
-#endif
+#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.
+* TlsDirectory.h - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#ifndef TLSDIRECTORY_H
+#ifndef TLSDIRECTORY_H
-#define TLSDIRECTORY_H
+#define TLSDIRECTORY_H
-namespace PeLib
+namespace PeLib
-{
+{
-        /// Class that handles the TLS directory.
+        /// Class that handles the TLS directory.
-        /**
+        /**
-        * This class handles the TLS (Thread Local Storage) directory.
+        * This class handles the TLS (Thread Local Storage) directory.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        class TlsDirectory
+        class TlsDirectory
-        {
+        {
-                private:
+                private:
-                  PELIB_IMAGE_TLS_DIRECTORY<bits> m_tls; ///< Structure that holds all information about the directory.
+                  PELIB_IMAGE_TLS_DIRECTORY<bits> m_tls; ///< Structure that holds all information about the directory.
-                  void read(InputBuffer& inputbuffer);
+                  void read(InputBuffer& inputbuffer);
-                public:
+                public:
-                  /// Reads a file's TLS directory.
+                  /// Reads a file's TLS directory.
-                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize); // EXPORT
+                  int read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize); // EXPORT
-                  int read(unsigned char* buffer, unsigned int buffersize); // EXPORT
+                  int read(unsigned char* buffer, unsigned int buffersize); // EXPORT
-                  /// Rebuilds the TLS directory.
+                  /// Rebuilds the TLS directory.
-                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT
+                  void rebuild(std::vector<byte>& vBuffer) const; // EXPORT
-                  /// Returns the size of the TLS Directory.
+                  /// Returns the size of the TLS Directory.
-                  unsigned int size() const; // EXPORT
+                  unsigned int size() const; // EXPORT
-                  /// Writes the TLS directory to a file.
+                  /// Writes the TLS directory to a file.
-                  int write(const std::string& strFilename, unsigned int dwOffset) const; // EXPORT
+                  int write(const std::string& strFilename, unsigned int dwOffset) const; // EXPORT
-                  /// Returns the StartAddressOfRawData value of the TLS header.
+                  /// Returns the StartAddressOfRawData value of the TLS header.
-                  dword getStartAddressOfRawData() const; // EXPORT
+                  dword getStartAddressOfRawData() const; // EXPORT
-                  /// Returns the EndAddressOfRawData value of the TLS header.
+                  /// Returns the EndAddressOfRawData value of the TLS header.
-                  dword getEndAddressOfRawData() const; // EXPORT
+                  dword getEndAddressOfRawData() const; // EXPORT
-                  /// Returns the AddressOfIndex value of the TLS header.
+                  /// Returns the AddressOfIndex value of the TLS header.
-                  dword getAddressOfIndex() const; // EXPORT
+                  dword getAddressOfIndex() const; // EXPORT
-                  /// Returns the AddressOfCallBacks value of the TLS header.
+                  /// Returns the AddressOfCallBacks value of the TLS header.
-                  dword getAddressOfCallBacks() const; // EXPORT
+                  dword getAddressOfCallBacks() const; // EXPORT
-                  /// Returns the SizeOfZeroFill value of the TLS header.
+                  /// Returns the SizeOfZeroFill value of the TLS header.
-                  dword getSizeOfZeroFill() const; // EXPORT
+                  dword getSizeOfZeroFill() const; // EXPORT
-                  /// Returns the Characteristics value of the TLS header.
+                  /// Returns the Characteristics value of the TLS header.
-                  dword getCharacteristics() const; // EXPORT
+                  dword getCharacteristics() const; // EXPORT
-                  
+                  
-                  /// Sets the StartAddressOfRawData value of the TLS header.
+                  /// Sets the StartAddressOfRawData value of the TLS header.
-                  void setStartAddressOfRawData(dword dwValue); // EXPORT
+                  void setStartAddressOfRawData(dword dwValue); // EXPORT
-                  /// Sets the EndAddressOfRawData value of the TLS header.
+                  /// Sets the EndAddressOfRawData value of the TLS header.
-                  void setEndAddressOfRawData(dword dwValue); // EXPORT
+                  void setEndAddressOfRawData(dword dwValue); // EXPORT
-                  /// Sets the AddressOfIndex value of the TLS header.
+                  /// Sets the AddressOfIndex value of the TLS header.
-                  void setAddressOfIndex(dword dwValue); // EXPORT
+                  void setAddressOfIndex(dword dwValue); // EXPORT
-                  /// Sets the AddressOfCallBacks value of the TLS header.
+                  /// Sets the AddressOfCallBacks value of the TLS header.
-                  void setAddressOfCallBacks(dword dwValue); // EXPORT
+                  void setAddressOfCallBacks(dword dwValue); // EXPORT
-                  /// Sets the SizeOfZeroFill value of the TLS header.
+                  /// Sets the SizeOfZeroFill value of the TLS header.
-                  void setSizeOfZeroFill(dword dwValue); // EXPORT
+                  void setSizeOfZeroFill(dword dwValue); // EXPORT
-                  /// Sets the Characteristics value of the TLS header.
+                  /// Sets the Characteristics value of the TLS header.
-                  void setCharacteristics(dword dwValue); // EXPORT
+                  void setCharacteristics(dword dwValue); // EXPORT
-        };
+        };
-        
+        
-        template<int bits>
+        template<int bits>
-        void TlsDirectory<bits>::read(InputBuffer& inputBuffer)
+        void TlsDirectory<bits>::read(InputBuffer& inputBuffer)
-        {
+        {
-                PELIB_IMAGE_TLS_DIRECTORY<bits> itdCurr;
+                PELIB_IMAGE_TLS_DIRECTORY<bits> itdCurr;
-                
+                
-                inputBuffer >> itdCurr.StartAddressOfRawData;
+                inputBuffer >> itdCurr.StartAddressOfRawData;
-                inputBuffer >> itdCurr.EndAddressOfRawData;
+                inputBuffer >> itdCurr.EndAddressOfRawData;
-                inputBuffer >> itdCurr.AddressOfIndex;
+                inputBuffer >> itdCurr.AddressOfIndex;
-                inputBuffer >> itdCurr.AddressOfCallBacks;
+                inputBuffer >> itdCurr.AddressOfCallBacks;
-                inputBuffer >> itdCurr.SizeOfZeroFill;
+                inputBuffer >> itdCurr.SizeOfZeroFill;
-                inputBuffer >> itdCurr.Characteristics;
+                inputBuffer >> itdCurr.Characteristics;
-                
+                
-                std::swap(itdCurr, m_tls);
+                std::swap(itdCurr, m_tls);
-        }
+        }
-        
+        
-        template<int bits>
+        template<int bits>
-        int TlsDirectory<bits>::read(unsigned char* buffer, unsigned int buffersize)
+        int TlsDirectory<bits>::read(unsigned char* buffer, unsigned int buffersize)
-        {
+        {
-                if (buffersize < PELIB_IMAGE_TLS_DIRECTORY<bits>::size())
+                if (buffersize < PELIB_IMAGE_TLS_DIRECTORY<bits>::size())
-                {
+                {
-                        return ERROR_INVALID_FILE;
+                        return ERROR_INVALID_FILE;
-                }
+                }
-                std::vector<byte> vTlsDirectory(buffer, buffer + buffersize);
+                std::vector<byte> vTlsDirectory(buffer, buffer + buffersize);
-                
+                
-                InputBuffer ibBuffer(vTlsDirectory);
+                InputBuffer ibBuffer(vTlsDirectory);
-                read(ibBuffer);
+                read(ibBuffer);
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Reads a file's TLS directory.
+        * Reads a file's TLS directory.
-        * @param strFilename Name of the file.
+        * @param strFilename Name of the file.
-        * @param uiOffset File offset of the TLS directory.
+        * @param uiOffset File offset of the TLS directory.
-        * @param uiSize Size of the TLS directory.
+        * @param uiSize Size of the TLS directory.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        int TlsDirectory<bits>::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize)
+        int TlsDirectory<bits>::read(const std::string& strFilename, unsigned int uiOffset, unsigned int uiSize)
-        {
+        {
-                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
+                std::ifstream ifFile(strFilename.c_str(), std::ios::binary);
-                unsigned int ulFileSize = fileSize(ifFile);
+                unsigned int ulFileSize = fileSize(ifFile);
-                if (!ifFile)
+                if (!ifFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                
+                
-                if (ulFileSize < uiOffset + uiSize)
+                if (ulFileSize < uiOffset + uiSize)
-                {
+                {
-                        return ERROR_INVALID_FILE;
+                        return ERROR_INVALID_FILE;
-                }
+                }
-                ifFile.seekg(uiOffset, std::ios::beg);
+                ifFile.seekg(uiOffset, std::ios::beg);
-                std::vector<byte> vTlsDirectory(uiSize);
+                std::vector<byte> vTlsDirectory(uiSize);
-                ifFile.read(reinterpret_cast<char*>(&vTlsDirectory[0]), uiSize);
+                ifFile.read(reinterpret_cast<char*>(&vTlsDirectory[0]), uiSize);
-                
+                
-                InputBuffer ibBuffer(vTlsDirectory);
+                InputBuffer ibBuffer(vTlsDirectory);
-                read(ibBuffer);
+                read(ibBuffer);
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        
+        
-        /**
+        /**
-        * Rebuilds the current TLS Directory.
+        * Rebuilds the current TLS Directory.
-        * @param vBuffer Buffer where the TLS directory will be written to.
+        * @param vBuffer Buffer where the TLS directory will be written to.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        void TlsDirectory<bits>::rebuild(std::vector<byte>& vBuffer) const
+        void TlsDirectory<bits>::rebuild(std::vector<byte>& vBuffer) const
-        {
+        {
-                OutputBuffer obBuffer(vBuffer);
+                OutputBuffer obBuffer(vBuffer);
-                
+                
-                obBuffer << m_tls.StartAddressOfRawData;
+                obBuffer << m_tls.StartAddressOfRawData;
-                obBuffer << m_tls.EndAddressOfRawData;
+                obBuffer << m_tls.EndAddressOfRawData;
-                obBuffer << m_tls.AddressOfIndex;
+                obBuffer << m_tls.AddressOfIndex;
-                obBuffer << m_tls.AddressOfCallBacks;
+                obBuffer << m_tls.AddressOfCallBacks;
-                obBuffer << m_tls.SizeOfZeroFill;
+                obBuffer << m_tls.SizeOfZeroFill;
-                obBuffer << m_tls.Characteristics;
+                obBuffer << m_tls.Characteristics;
-        }
+        }
-        /**
+        /**
-        * Returns the size of the TLS directory. Due to the static nature of this structure the return value
+        * Returns the size of the TLS directory. Due to the static nature of this structure the return value
-        * will always be 24.
+        * will always be 24.
-        * @return Size in bytes.
+        * @return Size in bytes.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        unsigned int TlsDirectory<bits>::size() const
+        unsigned int TlsDirectory<bits>::size() const
-        {
+        {
-                return PELIB_IMAGE_TLS_DIRECTORY<bits>::size();
+                return PELIB_IMAGE_TLS_DIRECTORY<bits>::size();
-        }
+        }
-        /**
+        /**
-        * @param strFilename Name of the file.
+        * @param strFilename Name of the file.
-        * @param dwOffset File offset the TLS Directory will be written to.
+        * @param dwOffset File offset the TLS Directory will be written to.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        int TlsDirectory<bits>::write(const std::string& strFilename, unsigned int dwOffset) const
+        int TlsDirectory<bits>::write(const std::string& strFilename, unsigned int dwOffset) const
-        {
+        {
-                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
+                std::fstream ofFile(strFilename.c_str(), std::ios_base::in);
-                
+                
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        ofFile.clear();
+                        ofFile.clear();
-                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                else
+                else
-                {
+                {
-                        ofFile.close();
+                        ofFile.close();
-                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+                        ofFile.open(strFilename.c_str(), std::ios_base::in | std::ios_base::out | std::ios_base::binary);
-                }
+                }
-                if (!ofFile)
+                if (!ofFile)
-                {
+                {
-                        return ERROR_OPENING_FILE;
+                        return ERROR_OPENING_FILE;
-                }
+                }
-                ofFile.seekp(dwOffset, std::ios::beg);
+                ofFile.seekp(dwOffset, std::ios::beg);
-                std::vector<unsigned char> vBuffer;
+                std::vector<unsigned char> vBuffer;
-                rebuild(vBuffer);
+                rebuild(vBuffer);
-                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), vBuffer.size());
+                ofFile.write(reinterpret_cast<const char*>(&vBuffer[0]), vBuffer.size());
-                ofFile.close();
+                ofFile.close();
-                
+                
-                return NO_ERROR;
+                return NO_ERROR;
-        }
+        }
-        /**
+        /**
-        * @return The StartAddressOfRawData value of the TLS directory.
+        * @return The StartAddressOfRawData value of the TLS directory.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        dword TlsDirectory<bits>::getStartAddressOfRawData() const
+        dword TlsDirectory<bits>::getStartAddressOfRawData() const
-        {
+        {
-                return m_tls.StartAddressOfRawData;
+                return m_tls.StartAddressOfRawData;
-        }
+        }
-        
+        
-        /**
+        /**
-        * @return The EndAddressOfRawData value of the TLS directory.
+        * @return The EndAddressOfRawData value of the TLS directory.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        dword TlsDirectory<bits>::getEndAddressOfRawData() const
+        dword TlsDirectory<bits>::getEndAddressOfRawData() const
-        {
+        {
-                return m_tls.EndAddressOfRawData;
+                return m_tls.EndAddressOfRawData;
-        }
+        }
-        
+        
-        /**
+        /**
-        * @return The AddressOfIndex value of the TLS directory.
+        * @return The AddressOfIndex value of the TLS directory.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        dword TlsDirectory<bits>::getAddressOfIndex() const
+        dword TlsDirectory<bits>::getAddressOfIndex() const
-        {
+        {
-                return m_tls.AddressOfIndex;
+                return m_tls.AddressOfIndex;
-        }
+        }
-        
+        
-        /**
+        /**
-        * @return The AddressOfCallBacks value of the TLS directory.
+        * @return The AddressOfCallBacks value of the TLS directory.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        dword TlsDirectory<bits>::getAddressOfCallBacks() const
+        dword TlsDirectory<bits>::getAddressOfCallBacks() const
-        {
+        {
-                return m_tls.AddressOfCallBacks;
+                return m_tls.AddressOfCallBacks;
-        }
+        }
-        
+        
-        /**
+        /**
-        * @return The SizeOfZeroFill value of the TLS directory.
+        * @return The SizeOfZeroFill value of the TLS directory.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        dword TlsDirectory<bits>::getSizeOfZeroFill() const
+        dword TlsDirectory<bits>::getSizeOfZeroFill() const
-        {
+        {
-                return m_tls.SizeOfZeroFill;
+                return m_tls.SizeOfZeroFill;
-        }
+        }
-        
+        
-        /**
+        /**
-        * @return The Characteristics value of the TLS directory.
+        * @return The Characteristics value of the TLS directory.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        dword TlsDirectory<bits>::getCharacteristics() const
+        dword TlsDirectory<bits>::getCharacteristics() const
-        {
+        {
-                return m_tls.Characteristics;
+                return m_tls.Characteristics;
-        }
+        }
-        /**
+        /**
-        * @param dwValue The new StartAddressOfRawData value of the TLS directory.
+        * @param dwValue The new StartAddressOfRawData value of the TLS directory.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        void TlsDirectory<bits>::setStartAddressOfRawData(dword dwValue)
+        void TlsDirectory<bits>::setStartAddressOfRawData(dword dwValue)
-        {
+        {
-                m_tls.StartAddressOfRawData = dwValue;
+                m_tls.StartAddressOfRawData = dwValue;
-        }
+        }
-        
+        
-        /**
+        /**
-        * @param dwValue The new EndAddressOfRawData value of the TLS directory.
+        * @param dwValue The new EndAddressOfRawData value of the TLS directory.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        void TlsDirectory<bits>::setEndAddressOfRawData(dword dwValue)
+        void TlsDirectory<bits>::setEndAddressOfRawData(dword dwValue)
-        {
+        {
-                m_tls.EndAddressOfRawData = dwValue;
+                m_tls.EndAddressOfRawData = dwValue;
-        }
+        }
-        
+        
-        /**
+        /**
-        * @param dwValue The new AddressOfIndex value of the TLS directory.
+        * @param dwValue The new AddressOfIndex value of the TLS directory.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        void TlsDirectory<bits>::setAddressOfIndex(dword dwValue)
+        void TlsDirectory<bits>::setAddressOfIndex(dword dwValue)
-        {
+        {
-                m_tls.AddressOfIndex = dwValue;
+                m_tls.AddressOfIndex = dwValue;
-        }
+        }
-        
+        
-        /**
+        /**
-        * @param dwValue The new AddressOfCallBacks value of the TLS directory.
+        * @param dwValue The new AddressOfCallBacks value of the TLS directory.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        void TlsDirectory<bits>::setAddressOfCallBacks(dword dwValue)
+        void TlsDirectory<bits>::setAddressOfCallBacks(dword dwValue)
-        {
+        {
-                m_tls.AddressOfCallBacks = dwValue;
+                m_tls.AddressOfCallBacks = dwValue;
-        }
+        }
-        
+        
-        /**
+        /**
-        * @param dwValue The new SizeOfZeroFill value of the TLS directory.
+        * @param dwValue The new SizeOfZeroFill value of the TLS directory.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        void TlsDirectory<bits>::setSizeOfZeroFill(dword dwValue)
+        void TlsDirectory<bits>::setSizeOfZeroFill(dword dwValue)
-        {
+        {
-                m_tls.SizeOfZeroFill = dwValue;
+                m_tls.SizeOfZeroFill = dwValue;
-        }
+        }
-        
+        
-        /**
+        /**
-        * @param dwValue The new Characteristics value of the TLS directory.
+        * @param dwValue The new Characteristics value of the TLS directory.
-        **/
+        **/
-        template<int bits>
+        template<int bits>
-        void TlsDirectory<bits>::setCharacteristics(dword dwValue)
+        void TlsDirectory<bits>::setCharacteristics(dword dwValue)
-        {
+        {
-                m_tls.Characteristics = dwValue;
+                m_tls.Characteristics = dwValue;
-        }
+        }
-        
+        
-}
+}
-#endif
+#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.
+* InputBuffer.cpp - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#include "InputBuffer.h"
+#include "InputBuffer.h"
-namespace PeLib
+namespace PeLib
-{
+{
-        unsigned long InputBuffer::get()
+        unsigned long InputBuffer::get()
-        {
+        {
-                return ulIndex;
+                return ulIndex;
-        }
+        }
-        InputBuffer::InputBuffer(std::vector<unsigned char>& vBuffer) : m_vBuffer(vBuffer), ulIndex(0)
+        InputBuffer::InputBuffer(std::vector<unsigned char>& vBuffer) : m_vBuffer(vBuffer), ulIndex(0)
-        {
+        {
-        }
+        }
-        const unsigned char* InputBuffer::data() const
+        const unsigned char* InputBuffer::data() const
-        {
+        {
-                return &m_vBuffer[0];
+                return &m_vBuffer[0];
-        }
+        }
-        unsigned long InputBuffer::size()
+        unsigned long InputBuffer::size()
-        {
+        {
-                return static_cast<unsigned long>(m_vBuffer.size());
+                return static_cast<unsigned long>(m_vBuffer.size());
-        }
+        }
-        void InputBuffer::read(char* lpBuffer, unsigned long ulSize)
+        void InputBuffer::read(char* lpBuffer, unsigned long ulSize)
-        {
+        {
-                std::copy(&m_vBuffer[ulIndex], &m_vBuffer[ulIndex + ulSize], lpBuffer);
+                std::copy(&m_vBuffer[ulIndex], &m_vBuffer[ulIndex + ulSize], lpBuffer);
-                ulIndex += ulSize;
+                ulIndex += ulSize;
-        }
+        }
-        void InputBuffer::reset()
+        void InputBuffer::reset()
-        {
+        {
-                m_vBuffer.clear();
+                m_vBuffer.clear();
-        }
+        }
-        void InputBuffer::set(unsigned long ulIndex)
+        void InputBuffer::set(unsigned long ulIndex)
-        {
+        {
-                this->ulIndex = ulIndex;
+                this->ulIndex = ulIndex;
-        }
+        }
-        void InputBuffer::setBuffer(std::vector<unsigned char>& vBuffer)
+        void InputBuffer::setBuffer(std::vector<unsigned char>& vBuffer)
-        {
+        {
-                m_vBuffer = vBuffer;
+                m_vBuffer = vBuffer;
-                ulIndex = 0;
+                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.
+* InputBuffer.h - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#ifndef INPUTBUFFER_H
+#ifndef INPUTBUFFER_H
-#define INPUTBUFFER_H
+#define INPUTBUFFER_H
-#include <vector>
+#include <vector>
-#include <iterator>
+#include <iterator>
-#include <cassert>
+#include <cassert>
-namespace PeLib
+namespace PeLib
-{
+{
-        class InputBuffer
+        class InputBuffer
-        {
+        {
-                private:
+                private:
-                  std::vector<unsigned char>& m_vBuffer;
+                  std::vector<unsigned char>& m_vBuffer;
-                  unsigned long ulIndex;
+                  unsigned long ulIndex;
-                  
+                  
-                public:
+                public:
-                  InputBuffer(std::vector<unsigned char>& vBuffer);
+                  InputBuffer(std::vector<unsigned char>& vBuffer);
-                  
+                  
-                  const unsigned char* data() const;
+                  const unsigned char* data() const;
-                  unsigned long size();
+                  unsigned long size();
-                  template<typename T>
+                  template<typename T>
-                  InputBuffer& operator>>(T& value)
+                  InputBuffer& operator>>(T& value)
-                  {
+                  {
-                        assert(ulIndex + sizeof(value) <= m_vBuffer.size());
+                        assert(ulIndex + sizeof(value) <= m_vBuffer.size());
-                        value = *(T*)(&m_vBuffer[ulIndex]);//reinterpret_cast<T*>(&m_vBuffer[ulIndex]);
+                        value = *(T*)(&m_vBuffer[ulIndex]);//reinterpret_cast<T*>(&m_vBuffer[ulIndex]);
-                        ulIndex += sizeof(T);
+                        ulIndex += sizeof(T);
-                        return *this;
+                        return *this;
-                  }
+                  }
-                  void read(char* lpBuffer, unsigned long ulSize);
+                  void read(char* lpBuffer, unsigned long ulSize);
-                  void reset();
+                  void reset();
-                  void set(unsigned long ulIndex);
+                  void set(unsigned long ulIndex);
-                  unsigned long get();
+                  unsigned long get();
-                  void setBuffer(std::vector<unsigned char>& vBuffer);
+                  void setBuffer(std::vector<unsigned char>& vBuffer);
-//                void updateData(unsigned long ulIndex,
+//                void updateData(unsigned long ulIndex,
-        };
+        };
-}
+}
-#endif
+#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.
+* OutputBuffer.cpp - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#include "OutputBuffer.h"
+#include "OutputBuffer.h"
-namespace PeLib
+namespace PeLib
-{
+{
-        OutputBuffer::OutputBuffer(std::vector<unsigned char>& vBuffer) : m_vBuffer(vBuffer)
+        OutputBuffer::OutputBuffer(std::vector<unsigned char>& vBuffer) : m_vBuffer(vBuffer)
-        {
+        {
-                m_vBuffer.clear();
+                m_vBuffer.clear();
-        }
+        }
-        const unsigned char* OutputBuffer::data() const
+        const unsigned char* OutputBuffer::data() const
-        {
+        {
-                return &m_vBuffer[0];
+                return &m_vBuffer[0];
-        }
+        }
-        unsigned long OutputBuffer::size()
+        unsigned long OutputBuffer::size()
-        {
+        {
-                return static_cast<unsigned long>(m_vBuffer.size());
+                return static_cast<unsigned long>(m_vBuffer.size());
-        }
+        }
-        void OutputBuffer::add(const char* lpBuffer, unsigned long ulSize)
+        void OutputBuffer::add(const char* lpBuffer, unsigned long ulSize)
-        {
+        {
-                std::copy(lpBuffer, lpBuffer + ulSize, std::back_inserter(m_vBuffer));
+                std::copy(lpBuffer, lpBuffer + ulSize, std::back_inserter(m_vBuffer));
-        }
+        }
-        void OutputBuffer::reset()
+        void OutputBuffer::reset()
-        {
+        {
-                m_vBuffer.clear();
+                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.
+* OutputBuffer.h - Part of the PeLib library.
-*
+*
-* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
+* Copyright (c) 2004 - 2005 Sebastian Porst (webmaster@the-interweb.com)
-* All rights reserved.
+* All rights reserved.
-*
+*
-* This software is licensed under the zlib/libpng License.
+* This software is licensed under the zlib/libpng License.
-* For more details see http://www.opensource.org/licenses/zlib-license.php
+* For more details see http://www.opensource.org/licenses/zlib-license.php
-* or the license information file (license.htm) in the root directory 
+* or the license information file (license.htm) in the root directory 
-* of PeLib.
+* of PeLib.
-*/
+*/
-#ifndef OUTPUTBUFFER_H
+#ifndef OUTPUTBUFFER_H
-#define OUTPUTBUFFER_H
+#define OUTPUTBUFFER_H
-#include <vector>
+#include <vector>
-#include <iterator>
+#include <iterator>
-namespace PeLib
+namespace PeLib
-{
+{
-        class OutputBuffer
+        class OutputBuffer
-        {
+        {
-                private:
+                private:
-                  std::vector<unsigned char>& m_vBuffer;
+                  std::vector<unsigned char>& m_vBuffer;
-                  
+                  
-                public:
+                public:
-                  OutputBuffer(std::vector<unsigned char>& vBuffer);
+                  OutputBuffer(std::vector<unsigned char>& vBuffer);
-                  const unsigned char* data() const;
+                  const unsigned char* data() const;
-                  unsigned long size();
+                  unsigned long size();
-                  template<typename T>
+                  template<typename T>
-                  OutputBuffer& operator<<(const T& value)
+                  OutputBuffer& operator<<(const T& value)
-                  {
+                  {
-                        const unsigned char* p = reinterpret_cast<const unsigned char*>(&value);
+                        const unsigned char* p = reinterpret_cast<const unsigned char*>(&value);
-                        std::copy(p, p + sizeof(value), std::back_inserter(m_vBuffer));
+                        std::copy(p, p + sizeof(value), std::back_inserter(m_vBuffer));
-                        return *this;
+                        return *this;
-                  }
+                  }
-                  void add(const char* lpBuffer, unsigned long ulSize);
+                  void add(const char* lpBuffer, unsigned long ulSize);
-                  void reset();
+                  void reset();
-                  void resize(unsigned int uiSize);
+                  void resize(unsigned int uiSize);
-                  void set(unsigned int uiPosition);
+                  void set(unsigned int uiPosition);
-                  template<typename T>
+                  template<typename T>
-                  void update(unsigned long ulIndex, const T& value)
+                  void update(unsigned long ulIndex, const T& value)
-                  {
+                  {
-                        *(T*)(&m_vBuffer[ulIndex]) = value;
+                        *(T*)(&m_vBuffer[ulIndex]) = value;
-                  }
+                  }
-        };
+        };
-}
+}
-#endif
+#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)
+PeLib 0.09 alpha (February 09, 2005)
-Added:
+Added:
- Added PeHeaderT<x>::setIddBaseRelocRva(dword value)
+- Added PeHeaderT<x>::setIddBaseRelocRva(dword value)
- Added PeHeaderT<x>::setIddBaseRelocSize(dword value)
+- Added PeHeaderT<x>::setIddBaseRelocSize(dword value)
- Added PeHeaderT<x>::setIddArchitectureRva(dword value)
+- Added PeHeaderT<x>::setIddArchitectureRva(dword value)
- Added PeHeaderT<x>::setIddArchitectureSize(dword value)
+- Added PeHeaderT<x>::setIddArchitectureSize(dword value)
- Added PeHeaderT<x>::setIddComHeaderRva(dword value)
+- Added PeHeaderT<x>::setIddComHeaderRva(dword value)
- Added PeHeaderT<x>::setIddComHeaderSize(dword value)
+- Added PeHeaderT<x>::setIddComHeaderSize(dword value)
- Added void PeHeaderT<x>::setImageDataDirectoryRva(dword dwDirectory, dword value)
+- Added void PeHeaderT<x>::setImageDataDirectoryRva(dword dwDirectory, dword value)
- Added void PeHeaderT<x>::setImageDataDirectorySize(dword dwDirectory, dword value)
+- Added void PeHeaderT<x>::setImageDataDirectorySize(dword dwDirectory, dword value)
- Added bool PeHeaderT<x>::isValid() const
+- Added bool PeHeaderT<x>::isValid() const
- Added int PeHeaderT<x>::read(const unsigned char* pcBuffer, unsigned int uiSize, unsigned int uiOffset);
+- 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(unsigned char* pcBuffer, unsigned int uiSize);
- Added int BoundImportDirectory::read(InputBuffer& inpBuffer, unsigned char* data, unsigned int dwSize);
+- Added int BoundImportDirectory::read(InputBuffer& inpBuffer, unsigned char* data, unsigned int dwSize);
- Added unsigned int BoundImportDirectory::totalModules()
+- Added unsigned int BoundImportDirectory::totalModules()
- Added DebugDirectory::setData to set the debug data of individual entries in the DebugDirectory.
+- 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 DebugDirectory::getData to get the debug data of individual entries in the DebugDirectory.
- Added int IatDirectory::read(unsigned char* buffer, unsigned int buffersize)
+- Added int IatDirectory::read(unsigned char* buffer, unsigned int buffersize)
- Optimized the size and rebuild methods to avoid duplicate strings for files that appear
+- Optimized the size and rebuild methods to avoid duplicate strings for files that appear
-  more than once in the BoundImport Directory.
+  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 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 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 two read functions to RelocationsDirectory and updated the return values of the old read function.
- Added void RelocationsDirectory::addRelocation()
+- Added void RelocationsDirectory::addRelocation()
- Added void RelocationsDirectory::removeRelocation(unsigned int index)
+- Added void RelocationsDirectory::removeRelocation(unsigned int index)
- Added void DebugDirectory::clear()
+- Added void DebugDirectory::clear()
- Added void ExportDirectory::removeFunction(unsigned int index)
+- Added void ExportDirectory::removeFunction(unsigned int index)
- Added void ExportDirectory::clear()
+- Added void ExportDirectory::clear()
- Added unsigned int ExportDirectory::calcNumberOfFunctions()
+- Added unsigned int ExportDirectory::calcNumberOfFunctions()
- Added void ExportDirectory::setAddressOfNameOrdinals(dword value)
+- Added void ExportDirectory::setAddressOfNameOrdinals(dword value)
-Bugfixes:
+Bugfixes:
- Fixed a bug in TlsDirectory<bits>::size()
+- Fixed a bug in TlsDirectory<bits>::size()
- Fixed a bug in PeHeaderT<64>::isValid(dword)
+- Fixed a bug in PeHeaderT<64>::isValid(dword)
- Fixed a bug in PeHeaderT<bits>::removeDataDirectory(dword)
+- Fixed a bug in PeHeaderT<bits>::removeDataDirectory(dword)
- Fixed a bug in BoundImportDirectory::rebuild()
+- Fixed a bug in BoundImportDirectory::rebuild()
- Fixed a bug in BoundImportDirectory::read() (Potential buffer overflow)
+- 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 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 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 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 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 a minor bug in PeHeader::calcSizeOfImage
- Fixed some return values and removed all exception handling blocks.
+- Fixed some return values and removed all exception handling blocks.
-Changes:
+Changes:
- Changed return values of PeHeader::addSection
+- Changed return values of PeHeader::addSection
- Changed return values of PeHeader::read
+- Changed return values of PeHeader::read
- Changed behaviour: PeHeader::m_uiOffset is initialized to 0 in default constructors.
+- Changed behaviour: PeHeader::m_uiOffset is initialized to 0 in default constructors.
- Changed return value of BoundImportDirectory::getNumberOfModules() from int to unsigned int
+- Changed return value of BoundImportDirectory::getNumberOfModules() from int to unsigned int
- Changed name of BoundImportDirectory::getNumberOfModules to calcNumberOfModules
+- Changed name of BoundImportDirectory::getNumberOfModules to calcNumberOfModules
- Changed the return values of the PeFile::read* functions.
+- Changed the return values of the PeFile::read* functions.
- Renamed IatDirectory::removeAll to IatDirectory::clear
+- Renamed IatDirectory::removeAll to IatDirectory::clear
- Renamed IatDirectory::numberOfAddresses to IatDirectory::calcNumberOfAddresses
+- Renamed IatDirectory::numberOfAddresses to IatDirectory::calcNumberOfAddresses
- Changed the parameter types of IatDirectory::getAddress from dword to unsigned int
+- Changed the parameter types of IatDirectory::getAddress from dword to unsigned int
- Changed the parameter types of IatDirectory::removeAddress 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
+- 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.
+  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 PELIB_IMAGE_TLS_DIRECTORY<bits>::size from an enum to a function.
- Changed the name of RelocationsDirectory::getNumberOfRelocationData to calcNumberOfRelocationData
+- Changed the name of RelocationsDirectory::getNumberOfRelocationData to calcNumberOfRelocationData
- Changed void RelocationsDirectory::removeRelocationData(unsigned int ulRelocation, word wValue)
+- Changed void RelocationsDirectory::removeRelocationData(unsigned int ulRelocation, word wValue)
-  to      void RelocationsDirectory::removeRelocationData(unsigned int relocindex, unsigned int dataindex)
+  to      void RelocationsDirectory::removeRelocationData(unsigned int relocindex, unsigned int dataindex)
- Removed dword ExportDirectory::getNumberOfNameOrdinals()
+- Removed dword ExportDirectory::getNumberOfNameOrdinals()
- Removed dword ExportDirectory::getNumberOfAddressOfFunctionNames()
+- Removed dword ExportDirectory::getNumberOfAddressOfFunctionNames()
- Removed dword ExportDirectory::getNumberOfAddressOfFunctions()
+- Removed dword ExportDirectory::getNumberOfAddressOfFunctions()
- Changed the parameters of some functions in ExportDirectory from dword to unsigned int.
+- Changed the parameters of some functions in ExportDirectory from dword to unsigned int.
-January 16, 2005 PeLib 0.08 alpha
+January 16, 2005 PeLib 0.08 alpha
-Added:
+Added:
- Added std::string ExportDirectory::getNameString()
+- Added std::string ExportDirectory::getNameString()
- Added resource type RT_MANIFEST to PeLibAux.h
+- Added resource type RT_MANIFEST to PeLibAux.h
- Added the following functions of PeHeaderT<int x>: setIddDebugRva, setIddDebugSize,
+- Added the following functions of PeHeaderT<int x>: setIddDebugRva, setIddDebugSize,
-  setIddDelayImportRva, setIddDelayImportSize, setIddExceptionRva, setIddExceptionSize, setIddGlobalPtrRva,
+  setIddDelayImportRva, setIddDelayImportSize, setIddExceptionRva, setIddExceptionSize, setIddGlobalPtrRva,
-  setIddGlobalPtrSize, setIddIatRva, setIddIatSize, setIddLoadConfigRva, setIddLoadConfigSize,
+  setIddGlobalPtrSize, setIddIatRva, setIddIatSize, setIddLoadConfigRva, setIddLoadConfigSize,
-  setIddResourceRva, setIddResourceSize, setIddResourceRva, setIddResourceSize, setIddSecurityRva,
+  setIddResourceRva, setIddResourceSize, setIddResourceRva, setIddResourceSize, setIddSecurityRva,
-  setIddSecuritySize, setIddTlsRva, setIddTlsSize
+  setIddSecuritySize, setIddTlsRva, setIddTlsSize
- ImportDirectory32 and ImportDirectory64 are now available.
+- ImportDirectory32 and ImportDirectory64 are now available.
- Added ImportDirectory<bits>::setFileName(dword, currdir, const std::string&)
+- Added ImportDirectory<bits>::setFileName(dword, currdir, const std::string&)
- Added ImportDirectory<bits>::setFirstThunk(dword, currdir, dword)
+- Added ImportDirectory<bits>::setFirstThunk(dword, currdir, dword)
- Added ImportDirectory<bits>::setForwarderChain(dword, currdir, dword)
+- Added ImportDirectory<bits>::setForwarderChain(dword, currdir, dword)
- Added ImportDirectory<bits>::setRvaOfName(dword, currdir, dword)
+- Added ImportDirectory<bits>::setRvaOfName(dword, currdir, dword)
- Added ImportDirectory<bits>::setOriginalFirstThunk(dword, currdir, dword)
+- Added ImportDirectory<bits>::setOriginalFirstThunk(dword, currdir, dword)
- Added ImportDirectory<bits>::setTimeDateStamp(dword, currdir, dword)
+- Added ImportDirectory<bits>::setTimeDateStamp(dword, currdir, dword)
- Added ImportDirectory<bits>::setOriginalFirstThunk(dword, dword, currdir, dword)
+- Added ImportDirectory<bits>::setOriginalFirstThunk(dword, dword, currdir, dword)
- Added ImportDirectory<bits>::setFirstThunk(dword, dword, currdir, dword)
+- Added ImportDirectory<bits>::setFirstThunk(dword, dword, currdir, dword)
- Added ImportDirectory<bits>::setFunctionHint(dword, dword, currdir, word)
+- Added ImportDirectory<bits>::setFunctionHint(dword, dword, currdir, word)
- Added ImportDirectory<bits>::setFunctionName(dword, dword, currdir, const std::string&)
+- Added ImportDirectory<bits>::setFunctionName(dword, dword, currdir, const std::string&)
- Added dword BoundImportDirectory::getTimeDateStamp(dword dwBidnr, dword forwardedModule) const
+- Added dword BoundImportDirectory::getTimeDateStamp(dword dwBidnr, dword forwardedModule) const
- Added word BoundImportDirectory::getOffsetModuleName(dword dwBidnr, dword forwardedModule) const
+- Added word BoundImportDirectory::getOffsetModuleName(dword dwBidnr, dword forwardedModule) const
- Added word BoundImportDirectory::getNumberOfModuleForwarderRefs(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 std::string BoundImportDirectory::getModuleName(dword dwBidnr, dword forwardedModule) const
- Added void BoundImportDirectory::setTimeDateStamp(dword dwBidnr, dword forwardedModule, dword dwTds)
+- Added void BoundImportDirectory::setTimeDateStamp(dword dwBidnr, dword forwardedModule, dword dwTds)
- Added void BoundImportDirectory::setOffsetModuleName(dword dwBidnr, dword forwardedModule, word wOmn)
+- Added void BoundImportDirectory::setOffsetModuleName(dword dwBidnr, dword forwardedModule, word wOmn)
- Added void BoundImportDirectory::setNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule, word wMfr)
+- Added void BoundImportDirectory::setNumberOfModuleForwarderRefs(dword dwBidnr, dword forwardedModule, word wMfr)
- Added void BoundImportDirectory::setModuleName(dword dwBidnr, dword forwardedModule, const std::string& strModuleName)
+- Added void BoundImportDirectory::setModuleName(dword dwBidnr, dword forwardedModule, const std::string& strModuleName)
- Added word calcNumberOfModuleForwarderRefs(dword dwBidnr) const
+- 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 addForwardedModule(dword dwBidnr, const std::string& name, dword timeStamp = 0, word offsetModuleName = 0, word forwardedModules = 0)
- Added void removeForwardedModule(dword dwBidnr, word forwardedModule)
+- Added void removeForwardedModule(dword dwBidnr, word forwardedModule)
- Added PeHeaderT<x>::addDataDirectory()
+- Added PeHeaderT<x>::addDataDirectory()
- Added PeHeaderT<x>::removeDataDirectory(dword)
+- Added PeHeaderT<x>::removeDataDirectory(dword)
-Bugfixes:
+Bugfixes:
- Fixed a bug in MzHeader::isValid
+- Fixed a bug in MzHeader::isValid
- Fixed a bug in PeHeaderT<x>::size()
+- Fixed a bug in PeHeaderT<x>::size()
- Fixed a bug in PeHeaderT<x>::calcRva()
+- Fixed a bug in PeHeaderT<x>::calcRva()
- Fixed a bug in PeHeaderT<x>::calcSizeOfImage()
+- Fixed a bug in PeHeaderT<x>::calcSizeOfImage()
- Fixed a bug in PeHeaderT<x>::getSectionName(dword)
+- Fixed a bug in PeHeaderT<x>::getSectionName(dword)
- Fixed a bug in PeHeaderT<x>::calcStartOfCode()
+- 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_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 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>::removeFunction(const std::string& strFilename, word wHint)
- Fixed a bug in int ImportDirectory<bits>::removeFile(const std::string& strFilename)
+- Fixed a bug in int ImportDirectory<bits>::removeFile(const std::string& strFilename)
- Function hints are now properly added when rebuilding import directories.
+- Function hints are now properly added when rebuilding import directories.
- Reading and rebuilding bound import directories now works with forwarded modules.
+- Reading and rebuilding bound import directories now works with forwarded modules.
-Changes:
+Changes:
- Changed behaviour: Removed all exceptions from the MzHeader class. The functions work with return values now.
+- 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: 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.
+- Changed behaviour: PeHeaderT<int x>::addSection(std::string, dword) doesn't use exceptions anymore.
-                     Return values now indicate if the function succeeded or failed.
+                     Return values now indicate if the function succeeded or failed.
- Changed behaviour: PeHeaderT<int x>::getSectionWithOffset(dword) doesn't use exceptions anymore.
+- Changed behaviour: PeHeaderT<int x>::getSectionWithOffset(dword) doesn't use exceptions anymore.
-                     Return values now indicate if the function succeeded or failed.
+                     Return values now indicate if the function succeeded or failed.
- Changed behaviour: PeHeaderT<int x>::getSectionWithRva(dword) doesn't use exceptions anymore.
+- Changed behaviour: PeHeaderT<int x>::getSectionWithRva(dword) doesn't use exceptions anymore.
-                     Return values now indicate if the function succeeded or failed.
+                     Return values now indicate if the function succeeded or failed.
- Changed behaviour: PeHeaderT<int x>::rvaToOffset(dword) doesn't use exceptions anymore.
+- Changed behaviour: PeHeaderT<int x>::rvaToOffset(dword) doesn't use exceptions anymore.
-                     Return values now indicate if the function succeeded or failed.
+                     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.
+- 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.
+                     Return values now indicate if the function succeeded or failed.
- Changed behaviour: PeHeaderT<int x>::writeSectionData(const std::string& strFilename, word wSecnr,
+- Changed behaviour: PeHeaderT<int x>::writeSectionData(const std::string& strFilename, word wSecnr,
-                                         const std::vector<byte>& vBuffer) doesn't use exceptions anymore.
+                                         const std::vector<byte>& vBuffer) doesn't use exceptions anymore.
-                     Return values now indicate if the function succeeded or failed.
+                     Return values now indicate if the function succeeded or failed.
- Changed behaviour: PeHeaderT<int x>::writeSections(std::string) doesn't use exceptions anymore.
+- Changed behaviour: PeHeaderT<int x>::writeSections(std::string) doesn't use exceptions anymore.
-                     Return values now indicate if the function succeeded or failed.
+                     Return values now indicate if the function succeeded or failed.
- Changed behaviour: Return value of PeHeaderT<x>::calcSpaceAfterHeader() changed from unsigned long
+- Changed behaviour: Return value of PeHeaderT<x>::calcSpaceAfterHeader() changed from unsigned long
-                                         to unsigned int.
+                                         to unsigned int.
- Changed behaviour: Return value of PeHeaderT<x>::calcStartOfCode() changed from unsigned long
+- Changed behaviour: Return value of PeHeaderT<x>::calcStartOfCode() changed from unsigned long
-                                         to unsigned int.
+                                         to unsigned int.
- Changed behaviour: Return value of PeHeaderT<x>::calcOffset() changed from unsigned long
+- Changed behaviour: Return value of PeHeaderT<x>::calcOffset() changed from unsigned long
-                                         to unsigned int.
+                                         to unsigned int.
- Changed behaviour: Return value of PeHeaderT<x>::offsetToRva(dword) changed from unsigned long
+- Changed behaviour: Return value of PeHeaderT<x>::offsetToRva(dword) changed from unsigned long
-                                         to unsigned int.
+                                         to unsigned int.
- Changed behaviour: Return value of PeHeaderT<x>::offsetToVa(dword) changed from unsigned long
+- Changed behaviour: Return value of PeHeaderT<x>::offsetToVa(dword) changed from unsigned long
-                                         to unsigned int.
+                                         to unsigned int.
- Renamed ExportDirectory::setName(std::string) to ExportDirectory::setNameString(std::string)
+- Renamed ExportDirectory::setName(std::string) to ExportDirectory::setNameString(std::string)
- Renamed the PeHeaderT::getId* functions to PeHeaderT::getIdd*
+- Renamed the PeHeaderT::getId* functions to PeHeaderT::getIdd*
- Renamed PeHeaderT::getImageDirectoryRva to PeHeaderT::getImageDataDirectoryRva
+- Renamed PeHeaderT::getImageDirectoryRva to PeHeaderT::getImageDataDirectoryRva
- Renamed PeHeaderT::getImageDirectorySize to PeHeaderT::getImageDataDirectorySize
+- Renamed PeHeaderT::getImageDirectorySize to PeHeaderT::getImageDataDirectorySize
- Renamed void PeHeaderT<x>::setWinVersionValue(dword dwValue) to void PeHeaderT<x>::setWin32VersionValue(dword dwValue)
+- 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,
+- Renamed the following functions of PeHeaderT<int x>: setIdImportRva to setIddImportRva,
-  setIdImportSize to setIddImportSize, setIdExportRva to setIddExportRva, setIdExportSize to setIddExportSize
+  setIdImportSize to setIddImportSize, setIdExportRva to setIddExportRva, setIdExportSize to setIddExportSize
- Renamed dword ImportDirectory<bits>::getName to dword ImportDirectory<bits>::getRvaOfName
+- Renamed dword ImportDirectory<bits>::getName to dword ImportDirectory<bits>::getRvaOfName
- Changed behaviour: All removeFunction and removeFile functions from ImportDirectory.h return int instead
+- Changed behaviour: All removeFunction and removeFile functions from ImportDirectory.h return int instead
-  of void now.
+  of void now.
- Changed behavior: ResourceDirectory::resourceTypeNameToIndex returns int instead of unsigned int.
+- Changed behavior: ResourceDirectory::resourceTypeNameToIndex returns int instead of unsigned int.
-  
+  
-------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
-July 18, 2004 PeLib 0.07 alpha
+July 18, 2004 PeLib 0.07 alpha
-Added:
+Added:
- Full support of the PE+ format.
+- Full support of the PE+ format.
- ImportDirectory::getName(string, currdir)
+- ImportDirectory::getName(string, currdir)
- ImportDirectory::getFirstThunk(dword, currdir)
+- ImportDirectory::getFirstThunk(dword, currdir)
- ImportDirectory::getOriginalFirstThunk(dword, currdir)
+- ImportDirectory::getOriginalFirstThunk(dword, currdir)
- ImportDirectory::getForwarderChain(dword, currdir)
+- ImportDirectory::getForwarderChain(dword, currdir)
- ImportDirectory::getName(dword, currdir)
+- ImportDirectory::getName(dword, currdir)
- ImportDirectory::getTimeDateStamp(dword, currdir)
+- ImportDirectory::getTimeDateStamp(dword, currdir)
- PeLib::getFileType(string)
+- PeLib::getFileType(string)
- PeLib::openPeFile(string)
+- PeLib::openPeFile(string)
- Added class PeFileVisitor
+- Added class PeFileVisitor
- Added PeFile::visit(PeFileVisitor&)
+- Added PeFile::visit(PeFileVisitor&)
-Bugfixes:
+Bugfixes:
- Fixed a bug in PeHeader::rvaToOffset
+- Fixed a bug in PeHeader::rvaToOffset
-Changes:
+Changes:
- Renamed ImportDirectory::OLD to PeLib::OLDDIR and ImportDirectory::NEW to PeLib::NEWDIR
+- Renamed ImportDirectory::OLD to PeLib::OLDDIR and ImportDirectory::NEW to PeLib::NEWDIR
- Renamed Relocations to RelocationsDirectory
+- Renamed Relocations to RelocationsDirectory
- Renamed ImportAddressTable to IatDirectory
+- Renamed ImportAddressTable to IatDirectory
- Renamed ComDescriptor to ComHeader
+- Renamed ComDescriptor to ComHeader
- Renamed PeFile::comDescDir to PeFile::comDir
+- Renamed PeFile::comDescDir to PeFile::comDir
- Changed unsigned long ExportDirectory::getFunctionIndex to unsigned int ExportDirectory::getFunctionIndex
+- Changed unsigned long ExportDirectory::getFunctionIndex to unsigned int ExportDirectory::getFunctionIndex
-------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
-July 4, 2004 PeLib 0.06 alpha
+July 4, 2004 PeLib 0.06 alpha
-Added:
+Added:
- TlsDirectory class
+- TlsDirectory class
-Changes:
+Changes:
- ResourceElement::read and ResourceElement::rebuild are now protected.
+- ResourceElement::read and ResourceElement::rebuild are now protected.
-Bugfixes:
+Bugfixes:
- Fixed a bug in PeHeader::rvaToOffset
+- Fixed a bug in PeHeader::rvaToOffset
-------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
-June 26, 2004 PeLib 0.05 alpha
+June 26, 2004 PeLib 0.05 alpha
-Added:
+Added:
- Constructor, Copy constructor, assignment operator and destructor for ResourceChild.
+- Constructor, Copy constructor, assignment operator and destructor for ResourceChild.
- ResourceDirectory::getRoot()
+- ResourceDirectory::getRoot()
- ResourceElement::isLeaf()
+- ResourceElement::isLeaf()
- ResourceElement::getElementRva
+- ResourceElement::getElementRva
- 10 new functions in ResourceLeaf.
+- 10 new functions in ResourceLeaf.
- 22 new functions in ResourceNode.
+- 22 new functions in ResourceNode.
- Added the RT_* constants which identify resource types to PeLibAux.h
+- 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 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 PELIB_IMAGE_DEBUG_DIRECTORY and PELIB_IMG_DEBUG_DIRECTORY
- Added the new class DebugDirectory which handles the debug directory of PE files.
+- Added the new class DebugDirectory which handles the debug directory of PE files.
- Added readDebugDirectory() and debugDir() to PeFile.
+- Added readDebugDirectory() and debugDir() to PeFile.
-Removed:
+Removed:
- ~ResourceNode()
+- ~ResourceNode()
-------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
-June 12, 2004 PeLib 0.04 alpha
+June 12, 2004 PeLib 0.04 alpha
-New:
+New:
- Finally implemented the class ResourceDirectory. That means lots of new functions I won't explicitly list here.
+- Finally implemented the class ResourceDirectory. That means lots of new functions I won't explicitly list here.
-  Check the documentation.
+  Check the documentation.
-Removed:
+Removed:
- The files buffer/ResTree.cpp and buffer/ResTree.h are obsolete and were removed.
+- The files buffer/ResTree.cpp and buffer/ResTree.h are obsolete and were removed.
-Bugfixes:
+Bugfixes:
- Fixed PeHeader::calcStartOfCode
+- Fixed PeHeader::calcStartOfCode
- Fixed PeHeader::getSectionWithRva
+- Fixed PeHeader::getSectionWithRva
-Changes:
+Changes:
- Changed PeHeader::read to throw an exception if the NT signature is not 'PE'\0\0
+- 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 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 the return value of MzHeader::size from long to int.
- Changed parameters of MzHeader::getReservedWords1, MzHeader::getReservedWords2, MzHeader::setReservedWords1 and
+- Changed parameters of MzHeader::getReservedWords1, MzHeader::getReservedWords2, MzHeader::setReservedWords1 and
-  MzHeader::setReservedWords2 from long to int.
+  MzHeader::setReservedWords2 from long to int.
- Changed MzHeader::read(std::string) to MzHeader::read(const std::string&)
+- 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::getModuleIndex from long to int.
- Changed return value of BoundImportDirectory::size 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 ComDescriptor::size from long to int.
- Changed return value of ImportAddressTable::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::getNumberOfRelocations from long to int.
- Changed return value of Relocations::getNumberOfRelocationData 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 return value of Relocations::size from long to int.
- Changed parameter of Relocations::getVirtualAddress 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::getSizeOfBlock from long to int.
- Changed parameter of Relocations::getRelocationData 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::setRelocationData from long to int.
- Changed parameters of Relocations::setVirtualAddress 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::setSizeOfBlock from long to int.
- Changed parameters of Relocations::addRelocationData from long to int.
+- Changed parameters of Relocations::addRelocationData from long to int.
- Changed parameters of Relocations::removeRelocationData 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.
+- Changed return value of ExportDirectory::getFunctionIndex(const std::string&) const from unsigned int to int.
-------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
-May 31, 2004: PeLib 0.03 alpha
+May 31, 2004: PeLib 0.03 alpha
-Bugfixes:
+Bugfixes:
- Fixed some bugs in FileDump.cpp
+- Fixed some bugs in FileDump.cpp
-Changes:
+Changes:
- Modified PeLibAux.cpp to make PeLib VC++ 7.1 compatible.
+- Modified PeLibAux.cpp to make PeLib VC++ 7.1 compatible.
- Changed vector access from .at to operator[] all over the project.
+- Changed vector access from .at to operator[] all over the project.
-  Real undefined behaviour is probably better than spontaniously terminating applications.
+  Real undefined behaviour is probably better than spontaniously terminating applications.
-New:
+New:
- Added makefiles for Borland C++ commandline tools (tested on version 5.6.4)
+- Added makefiles for Borland C++ commandline tools (tested on version 5.6.4)
- Added makefiles for Digital Mars Compiler (tested on version 8.38n)
+- 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
+  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.
+  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)
+- Added makefiles for Visual C++ 7.1 (tested on compiler Version 13.10.3052)
-------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
-Mai 1, 2004: PeLib 0.02 alpha
+Mai 1, 2004: PeLib 0.02 alpha
-Bugfixes:
+Bugfixes:
- Fixed a bug in FileDump's and OON2's makefile.g++
+- Fixed a bug in FileDump's and OON2's makefile.g++
- Fixed ImportDirectory::size
+- Fixed ImportDirectory::size
- Changed parameter of PELIB_THUNK_DATA::equalHint from dword to word
+- 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)
+- Fixed a bug in PeHeader::read (PeLib always assumed 0x10 data directories in version 0.01 alpha)
-Changes:
+Changes:
- Slightly changed ImportDirectory::removeFile (Changed function's signature)
+- Slightly changed ImportDirectory::removeFile (Changed function's signature)
- Moved the definitions of byte, word and dword into the PeLib namespace.
+- Moved the definitions of byte, word and dword into the PeLib namespace.
- Renamed PELIB_THUNK_DATA::equalName to PELIB_THUNK_DATA::equalFunctionName
+- Renamed PELIB_THUNK_DATA::equalName to PELIB_THUNK_DATA::equalFunctionName
- Started to add size() functions to structs defined in PeLibAux.h
+- Started to add size() functions to structs defined in PeLibAux.h
- Moved PeFile::writeSectionData to PeHeader::writeSectionData
+- Moved PeFile::writeSectionData to PeHeader::writeSectionData
- Moved PeFile::writeSections to PeHeader::writeSections
+- Moved PeFile::writeSections to PeHeader::writeSections
-New:
+New:
- Added ImportDirectory::hasFunction
+- Added ImportDirectory::hasFunction
- Wrote BoundImportDirectory::size
+- Wrote BoundImportDirectory::size
- Added accumulate function to PeLibAux.h
+- Added accumulate function to PeLibAux.h
- Added PELIB_IMAGE_SECTION_HEADER::biggerFileOffset
+- Added PELIB_IMAGE_SECTION_HEADER::biggerFileOffset
- Added PELIB_IMAGE_SECTION_HEADER::biggerVirtualAddress
+- Added PELIB_IMAGE_SECTION_HEADER::biggerVirtualAddress
- Added PeHeader::calcSizeOfImage
+- Added PeHeader::calcSizeOfImage
- Added PeHeader::enlargeLastSection
+- Added PeHeader::enlargeLastSection
-Removed:
+Removed:
- Removed PeFile::write
+- Removed PeFile::write
- Removed PeFile::writeImportDirectory
+- Removed PeFile::writeImportDirectory
-Other changes:
+Other changes:
- Rewrote parts of ImportDirectory::read
+- Rewrote parts of ImportDirectory::read
- Rewrote ImportDirectory::removeFunction (both version).
+- Rewrote ImportDirectory::removeFunction (both version).
- Changed std::ios:: to std::ios_base:: in ImportDirectory
+- Changed std::ios:: to std::ios_base:: in ImportDirectory
- Changed ImportDirectory::addFunction (both versions)
+- Changed ImportDirectory::addFunction (both versions)
- Changed ExportDirectory::rebuild
+- Changed ExportDirectory::rebuild
- Changed ExportDirectory::size
+- Changed ExportDirectory::size
- Rewrote ImportDirectory::size
+- Rewrote ImportDirectory::size
- Rewrote PeHeader::size
+- Rewrote PeHeader::size
- Rewrote ComDescriptor::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>
+<html>
-<body>
+<body>
-<h1>The zlib/libpng License</h1>
+<h1>The zlib/libpng License</h1>
-<tt>
+<tt>
-<p>Copyright (c) 2004 - Sebastian Porst</p>
+<p>Copyright (c) 2004 - Sebastian Porst</p>
-  <p>This software is provided 'as-is', without any express or implied
+  <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
+  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.</p>
+  arising from the use of this software.</p>
-  <p>Permission is granted to anyone to use this software for any purpose,
+  <p>Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
+  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:</p>
+  freely, subject to the following restrictions:</p>
-<blockquote>
+<blockquote>
-  <p>1. The origin of this software must not be misrepresented; you must not
+  <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
+     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
+     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.</p>
+     appreciated but is not required.</p>
-  <p>2. Altered source versions must be plainly marked as such, and must not be
+  <p>2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.</p>
+     misrepresented as being the original software.</p>
-  <p>3. This notice may not be removed or altered from any source
+  <p>3. This notice may not be removed or altered from any source
- distribution.</p>
+ distribution.</p>
-</blockquote>
+</blockquote>
-</tt>
+</tt>
-</body>
+</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)
+PeLib - Version 0.09 (alpha release)
-=========================================
+=========================================
-Copyright 2004 by Sebastian Porst
+Copyright 2004 by Sebastian Porst
-WWW: http://www.pelib.com
+WWW: http://www.pelib.com
-E-Mail: webmaster@the-interweb.com
+E-Mail: webmaster@the-interweb.com
-=========================================
+=========================================
-1. What is PeLib?
+1. What is PeLib?
-2. Where can I find a documentation of PeLib DLL?
+2. Where can I find a documentation of PeLib DLL?
-3. Which license is used for PeLib?
+3. Which license is used for PeLib?
-4. Which compilers are being supported?
+4. Which compilers are being supported?
-5. How do I compile PeLib?
+5. How do I compile PeLib?
-1. What is PeLib DLL?
+1. What is PeLib DLL?
-   PeLib is an open-source C++ library to modify
+   PeLib is an open-source C++ library to modify
-   PE files. See http://www.pelib.com for more details.
+   PE files. See http://www.pelib.com for more details.
-2. Where can I find a documentation of PeLib DLL?
+2. Where can I find a documentation of PeLib DLL?
-   http://www.pelib.com
+   http://www.pelib.com
-3. All parts of PeLib are distributed under the zlib/libpng license.
+3. All parts of PeLib are distributed under the zlib/libpng license.
-   See license.htm for details.
+   See license.htm for details.
-   
+   
-4. The following compilers have been tested:
+4. The following compilers have been tested:
-   MingW with g++ 3.2.3
+   MingW with g++ 3.2.3
-   Visual C++ 7.1 / Compiler version 13.10.3052
+   Visual C++ 7.1 / Compiler version 13.10.3052
-   Borland C++ 5.6.4 (currently not supported)
+   Borland C++ 5.6.4 (currently not supported)
-   Digital Mars Compiler 8.38n (currently not supported)
+   Digital Mars Compiler 8.38n (currently not supported)
-5. Go into the PeLib/source directory and enter the following lines
+5. Go into the PeLib/source directory and enter the following lines
-   depending on which compiler you use.
+   depending on which compiler you use.
-   
+   
-   g++: make -f makefile.g++
+   g++: make -f makefile.g++
-   Borland C++: make -f makefile.bcc (currently not supported)
+   Borland C++: make -f makefile.bcc (currently not supported)
-   Visual C++ 7.1: nmake makefile.vc7
+   Visual C++ 7.1: nmake makefile.vc7
-   Digital Mars: make makefile.dmc (currently not supported)
+   Digital Mars: make makefile.dmc (currently not supported)
-   
+   
-   If the compilation is succesful there should be some *.o/*.obj files
+   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.
+   and (if you used g++) a PeLib.a file in the lib directory.
-   Then go to the examples directory and pick one example (I
+   Then go to the examples directory and pick one example (I
-   suggest FileDump) and try to build it with the same make
+   suggest FileDump) and try to build it with the same make
   command as above.
 \ No newline at end of file