Moved libpebliss into the third party directory where it belongs. Further,...

Moved libpebliss into the third party directory where it belongs.  Further, made it a submodule.  The repo points at git.z-s.com, but it's a clone of something from github.  the clone is so we can have a few of our own files, such as .gitignore

.gitattributes

 irdb-libs/third_party/capstone norecurse
 irdb-libs/third_party/elfio-code norecurse
+irdb-libs/third_party/pebliss
 

.gitmodules

@@ -60,3 +60,9 @@
 [submodule "irdb-libs/third_party/elfio-code"]
 	path = irdb-libs/third_party/elfio-code
 	url = http://git.code.sf.net/p/elfio/code
+[submodule "irdb-libs/third_party/pebliss"]
+	path = irdb-libs/third_party/pebliss
+	url = git@git.zephyr-software.com:third-party-mirrors/pebliss.git
+
+
+

SMPStaticAnalyzer @ 0fefccb5

-Subproject commit 661cc55f103c79efef0be4707a0c6a509fe9493c
+Subproject commit 0fefccb52b493eafbeeaf45283b0210d9e09ff5c

irdb-libs/SConscript

@@ -48,7 +48,7 @@ if "PEDI_HOME" in os.environ:
 env['BASE_IRDB_LIBS']="irdb-core"
 
 if sysname != "SunOS":
-	libPEBLISS=SConscript("pebliss/trunk/pe_lib/SConscript", variant_dir='scons_build/libPEBLISS')
+	libPEBLISS=SConscript("third_party/SConscript.pebliss", variant_dir='scons_build/libPEBLISS')
 	# setup libraries needed for linking
 	if "PEDI_HOME" in os.environ:
 		Depends(pedi,libPEBLISS)

irdb-libs/libEXEIO/src/SConscript

@@ -14,7 +14,7 @@ cpppath='''
 	.
 	$SECURITY_TRANSFORMS_HOME/include/
 	$SECURITY_TRANSFORMS_HOME/libEXEIO/include
-	$SECURITY_TRANSFORMS_HOME/pebliss/trunk/pe_lib/
+	$SECURITY_TRANSFORMS_HOME/third_party/pebliss/pe_lib/
 	$SECURITY_TRANSFORMS_HOME/third_party/elfio-code
 	'''
 

irdb-libs/meds2pdb/SConscript

@@ -25,10 +25,8 @@ LIBS=Split(" irdb-cfg irdb-util irdb-transform EXEIO MEDSannotation pqxx "+env.s
 myenv=myenv.Clone(CPPPATH=Split(cpppath))
 pgm=myenv.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)
 install1=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
-install2=myenv.Install("$SECURITY_TRANSFORMS_HOME/tools/meds2pdb/", pgm)
 
 Default(install1)
-Default(install2)
 
-install=[]+install1+install2
+install=[]+install1
 Return('install')

irdb-libs/pebliss/trunk/Makefile

-TARGETS = pe_bliss samples_pack tests_pack
-TARGETS_CLEAN = pe_clean samples_clean tests_clean
-
-all: $(TARGETS)
-
-clean: $(TARGETS_CLEAN)
-
-pe_bliss:
-	$(MAKE) PE_DEBUG=$(PE_DEBUG) -C ./pe_lib
-
-samples_pack: pe_bliss
-	$(MAKE) PE_DEBUG=$(PE_DEBUG) -C ./samples
-
-pe_clean:
-	$(MAKE) -C ./pe_lib clean
-
-samples_clean:
-	$(MAKE) -C ./samples clean
-
-tests_pack: pe_bliss
-	$(MAKE) PE_DEBUG=$(PE_DEBUG) -C ./tests
-
-tests_clean:
-	$(MAKE) -C ./tests clean

irdb-libs/pebliss/trunk/pe_lib/Makefile

-OBJS = entropy.o file_version_info.o message_table.o pe_base.o pe_bound_import.o pe_checksum.o pe_debug.o pe_directory.o pe_dotnet.o pe_exception_directory.o pe_exports.o pe_imports.o pe_load_config.o pe_properties.o pe_properties_generic.o pe_relocations.o pe_factory.o pe_resources.o pe_resource_manager.o pe_resource_viewer.o pe_rich_data.o pe_section.o pe_tls.o utils.o version_info_editor.o version_info_viewer.o pe_exception.o resource_message_list_reader.o resource_string_table_reader.o resource_version_info_reader.o resource_version_info_writer.o resource_cursor_icon_reader.o resource_cursor_icon_writer.o resource_bitmap_writer.o resource_bitmap_reader.o resource_data_info.o pe_rebuilder.o
-LIBNAME = pebliss
-LIBPATH = ../lib
-CXXFLAGS = -O2 -Wall -fPIC -DPIC -I.
-
-ifdef PE_DEBUG
-CXXFLAGS  += -g -O0
-endif
-
-all: $(LIBPATH)/lib$(LIBNAME).a
-
-clean:
-	rm -f $(OBJS) lib$(LIBNAME).a
-	rm -rf ../lib
-
-lib$(LIBNAME).a: $(OBJS)
-	ar -cvr lib$(LIBNAME).a $(OBJS)
-	ranlib lib$(LIBNAME).a
-
-$(LIBPATH):
-	mkdir -p ../lib
-
-$(LIBPATH)/lib$(LIBNAME).a: lib$(LIBNAME).a $(LIBPATH)
-	cp -d lib$(LIBNAME).a ../lib

irdb-libs/pebliss/trunk/pe_lib/SConscript

-import os
-
-Import('env')
-myenv=env
-myenv.Replace(SECURITY_TRANSFORMS_HOME=os.environ['SECURITY_TRANSFORMS_HOME'])
-
-
-libname="pebliss"
-files=  '''
-	entropy.cpp
-	file_version_info.cpp
-	message_table.cpp
-	pe_base.cpp
-	pe_bound_import.cpp
-	pe_checksum.cpp
-	pe_debug.cpp
-	pe_directory.cpp
-	pe_dotnet.cpp
-	pe_exception.cpp
-	pe_exception_directory.cpp
-	pe_exports.cpp
-	pe_factory.cpp
-	pe_imports.cpp
-	pe_load_config.cpp
-	pe_properties.cpp
-	pe_properties_generic.cpp
-	pe_rebuilder.cpp
-	pe_relocations.cpp
-	pe_resource_manager.cpp
-	pe_resource_viewer.cpp
-	pe_resources.cpp
-	pe_rich_data.cpp
-	pe_section.cpp
-	pe_tls.cpp
-	resource_bitmap_reader.cpp
-	resource_bitmap_writer.cpp
-	resource_cursor_icon_reader.cpp
-	resource_cursor_icon_writer.cpp
-	resource_data_info.cpp
-	resource_message_list_reader.cpp
-	resource_string_table_reader.cpp
-	resource_version_info_reader.cpp
-	resource_version_info_writer.cpp
-	utils.cpp
-	version_info_editor.cpp
-	version_info_viewer.cpp
-	'''
-
-cpppath=''' 
-	$SECURITY_TRANSFORMS_HOME/pebliss/trunk/pe_lib
-	'''
-
-myenv=myenv.Clone(CPPPATH=Split(cpppath))
-myenv.Append(CCFLAGS=" -w ")
-lib=myenv.SharedLibrary(libname, Split(files))
-
-install=myenv.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
-Default(install)
-

irdb-libs/pebliss/trunk/pe_lib/SConstruct

-
-
-
-env=Environment()
-Export('env')
-SConscript("SConscript")

irdb-libs/pebliss/trunk/pe_lib/entropy.cpp

-#include <cmath>
-#include "entropy.h"
-#include "utils.h"
-
-namespace pe_bliss
-{
-//Calculates entropy for PE image section
-double entropy_calculator::calculate_entropy(const section& s)
-{
-	if(s.get_raw_data().empty()) //Don't count entropy for empty sections
-		throw pe_exception("Section is empty", pe_exception::section_is_empty);
-
-	return calculate_entropy(s.get_raw_data().data(), s.get_raw_data().length());
-}
-
-//Calculates entropy for istream (from current position of stream)
-double entropy_calculator::calculate_entropy(std::istream& file)
-{
-	uint32_t byte_count[256] = {0}; //Byte count for each of 255 bytes
-
-	if(file.bad())
-		throw pe_exception("Stream is bad", pe_exception::stream_is_bad);
-
-	std::streamoff pos = file.tellg();
-
-	std::streamoff length = pe_utils::get_file_size(file);
-	length -= file.tellg();
-
-	if(!length) //Don't calculate entropy for empty buffers
-		throw pe_exception("Data length is zero", pe_exception::data_is_empty);
-
-	//Count bytes
-	for(std::streamoff i = 0; i != length; ++i)
-		++byte_count[static_cast<unsigned char>(file.get())];
-
-	file.seekg(pos);
-
-	return calculate_entropy(byte_count, length);
-}
-
-//Calculates entropy for data block
-double entropy_calculator::calculate_entropy(const char* data, size_t length)
-{
-	uint32_t byte_count[256] = {0}; //Byte count for each of 255 bytes
-
-	if(!length) //Don't calculate entropy for empty buffers
-		throw pe_exception("Data length is zero", pe_exception::data_is_empty);
-
-	//Count bytes
-	for(size_t i = 0; i != length; ++i)
-		++byte_count[static_cast<unsigned char>(data[i])];
-
-	return calculate_entropy(byte_count, length);
-}
-
-//Calculates entropy for this PE file (only section data)
-double entropy_calculator::calculate_entropy(const pe_base& pe)
-{
-	uint32_t byte_count[256] = {0}; //Byte count for each of 255 bytes
-
-	size_t total_data_length = 0;
-
-	//Count bytes for each section
-	for(section_list::const_iterator it = pe.get_image_sections().begin(); it != pe.get_image_sections().end(); ++it)
-	{
-		const std::string& data = (*it).get_raw_data();
-		size_t length = data.length();
-		total_data_length += length;
-		for(size_t i = 0; i != length; ++i)
-			++byte_count[static_cast<unsigned char>(data[i])];
-	}
-
-	return calculate_entropy(byte_count, total_data_length);
-}
-
-//Calculates entropy from bytes count
-double entropy_calculator::calculate_entropy(const uint32_t byte_count[256], std::streamoff total_length)
-{
-	double entropy = 0.; //Entropy result value
-	//Calculate entropy
-	for(uint32_t i = 0; i < 256; ++i)
-	{
-		double temp = static_cast<double>(byte_count[i]) / total_length;
-		if(temp > 0.)
-			entropy += std::abs(temp * (std::log(temp) * pe_utils::log_2));
-	}
-
-	return entropy;
-}
-}

irdb-libs/pebliss/trunk/pe_lib/entropy.h

-#ifndef pebliss_entropy_h
-#define pebliss_entropy_h
-#pragma once
-
-#include <istream>
-#include "pe_base.h"
-
-namespace pe_bliss
-{
-class entropy_calculator
-{
-public:
-	//Calculates entropy for PE image section
-	static double calculate_entropy(const section& s);
-
-	//Calculates entropy for istream (from current position of stream)
-	static double calculate_entropy(std::istream& file);
-
-	//Calculates entropy for data block
-	static double calculate_entropy(const char* data, size_t length);
-
-	//Calculates entropy for this PE file (only section data)
-	static double calculate_entropy(const pe_base& pe);
-
-private:
-	entropy_calculator();
-	entropy_calculator(const entropy_calculator&);
-	entropy_calculator& operator=(const entropy_calculator&);
-
-	//Calculates entropy from bytes count
-	static double calculate_entropy(const uint32_t byte_count[256], std::streamoff total_length);
-};
-}
-#endif

irdb-libs/pebliss/trunk/pe_lib/file_version_info.cpp

-#include "file_version_info.h"
-#include "pe_structures.h"
-
-namespace pe_bliss
-{
-using namespace pe_win;
-
-//Default constructor
-file_version_info::file_version_info()
-	:file_version_ms_(0), file_version_ls_(0),
-	product_version_ms_(0), product_version_ls_(0),
-	file_flags_(0),
-	file_os_(0),
-	file_type_(0), file_subtype_(0),
-	file_date_ms_(0), file_date_ls_(0)
-{}
-
-//Constructor from Windows fixed version info structure
-file_version_info::file_version_info(const vs_fixedfileinfo& info)
-	:file_version_ms_(info.dwFileVersionMS), file_version_ls_(info.dwFileVersionLS),
-	product_version_ms_(info.dwProductVersionMS), product_version_ls_(info.dwProductVersionLS),
-	file_flags_(info.dwFileFlags),
-	file_os_(info.dwFileOS),
-	file_type_(info.dwFileType), file_subtype_(info.dwFileSubtype),
-	file_date_ms_(info.dwFileDateMS), file_date_ls_(info.dwFileDateLS)
-{}
-
-//Returns true if file is debug-built
-bool file_version_info::is_debug() const
-{
-	return file_flags_ & vs_ff_debug ? true : false;
-}
-
-//Returns true if file is release-built
-bool file_version_info::is_prerelease() const
-{
-	return file_flags_ & vs_ff_prerelease ? true : false;
-}
-
-//Returns true if file is patched
-bool file_version_info::is_patched() const
-{
-	return file_flags_ & vs_ff_patched ? true : false;
-}
-
-//Returns true if private build
-bool file_version_info::is_private_build() const
-{
-	return file_flags_ & vs_ff_privatebuild ? true : false;
-}
-
-//Returns true if special build
-bool file_version_info::is_special_build() const
-{
-	return file_flags_ & vs_ff_specialbuild ? true : false;
-}
-
-//Returns true if info inferred
-bool file_version_info::is_info_inferred() const
-{
-	return file_flags_ & vs_ff_infoinferred ? true : false;
-}
-
-//Retuens file flags (raw DWORD)
-uint32_t file_version_info::get_file_flags() const
-{
-	return file_flags_;
-}
-
-//Returns file version most significant DWORD
-uint32_t file_version_info::get_file_version_ms() const
-{
-	return file_version_ms_;
-}
-
-//Returns file version least significant DWORD
-uint32_t file_version_info::get_file_version_ls() const
-{
-	return file_version_ls_;
-}
-
-//Returns product version most significant DWORD
-uint32_t file_version_info::get_product_version_ms() const
-{
-	return product_version_ms_;
-}
-
-//Returns product version least significant DWORD
-uint32_t file_version_info::get_product_version_ls() const
-{
-	return product_version_ls_;
-}
-
-//Returns file OS type (raw DWORD)
-uint32_t file_version_info::get_file_os_raw() const
-{
-	return file_os_;
-}
-
-//Returns file OS type
-file_version_info::file_os_type file_version_info::get_file_os() const
-{
-	//Determine file operation system type
-	switch(file_os_)
-	{
-	case vos_dos:
-		return file_os_dos;
-
-	case vos_os216:
-		return file_os_os216;
-
-	case vos_os232:
-		return file_os_os232;
-
-	case vos_nt:
-		return file_os_nt;
-
-	case vos_wince:
-		return file_os_wince;
-
-	case vos__windows16:
-		return file_os_win16;
-
-	case vos__pm16:
-		return file_os_pm16;
-
-	case vos__pm32:
-		return file_os_pm32;
-
-	case vos__windows32:
-		return file_os_win32;
-
-	case vos_dos_windows16:
-		return file_os_dos_win16;
-
-	case vos_dos_windows32:
-		return file_os_dos_win32;
-
-	case vos_os216_pm16:
-		return file_os_os216_pm16;
-
-	case vos_os232_pm32:
-		return file_os_os232_pm32;
-
-	case vos_nt_windows32:
-		return file_os_nt_win32;
-	}
-
-	return file_os_unknown;
-}
-
-//Returns file type (raw DWORD)
-uint32_t file_version_info::get_file_type_raw() const
-{
-	return file_type_;
-}
-
-//Returns file type
-file_version_info::file_type file_version_info::get_file_type() const
-{
-	//Determine file type
-	switch(file_type_)
-	{
-	case vft_app:
-		return file_type_application;
-
-	case vft_dll:
-		return file_type_dll;
-
-	case vft_drv:
-		return file_type_driver;
-
-	case vft_font:
-		return file_type_font;
-
-	case vft_vxd:
-		return file_type_vxd;
-
-	case vft_static_lib:
-		return file_type_static_lib;
-	}
-
-	return file_type_unknown;
-}
-
-//Returns file subtype (usually non-zero for drivers and fonts)
-uint32_t file_version_info::get_file_subtype() const
-{
-	return file_subtype_;
-}
-
-//Returns file date most significant DWORD
-uint32_t file_version_info::get_file_date_ms() const
-{
-	return file_date_ms_;
-}
-
-//Returns file date least significant DWORD
-uint32_t file_version_info::get_file_date_ls() const
-{
-	return file_date_ls_;
-}
-
-//Helper to set file flag
-void file_version_info::set_file_flag(uint32_t flag)
-{
-	file_flags_ |= flag;
-}
-
-//Helper to clear file flag
-void file_version_info::clear_file_flag(uint32_t flag)
-{
-	file_flags_ &= ~flag;
-}
-
-//Helper to set or clear file flag
-void file_version_info::set_file_flag(uint32_t flag, bool set_flag)
-{
-	set_flag ? set_file_flag(flag) : clear_file_flag(flag);
-}
-
-//Sets if file is debug-built
-void file_version_info::set_debug(bool debug)
-{
-	set_file_flag(vs_ff_debug, debug);
-}
-
-//Sets if file is prerelease
-void file_version_info::set_prerelease(bool prerelease)
-{
-	set_file_flag(vs_ff_prerelease, prerelease);
-}
-
-//Sets if file is patched
-void file_version_info::set_patched(bool patched)
-{
-	set_file_flag(vs_ff_patched, patched);
-}
-
-//Sets if private build
-void file_version_info::set_private_build(bool private_build)
-{
-	set_file_flag(vs_ff_privatebuild, private_build);
-}
-
-//Sets if special build
-void file_version_info::set_special_build(bool special_build)
-{
-	set_file_flag(vs_ff_specialbuild, special_build);
-}
-
-//Sets if info inferred
-void file_version_info::set_info_inferred(bool info_inferred)
-{
-	set_file_flag(vs_ff_infoinferred, info_inferred);
-}
-
-//Sets flags (raw DWORD)
-void file_version_info::set_file_flags(uint32_t file_flags)
-{
-	file_flags_ = file_flags;
-}
-
-//Sets file version most significant DWORD
-void file_version_info::set_file_version_ms(uint32_t file_version_ms)
-{
-	file_version_ms_ = file_version_ms;
-}
-
-//Sets file version least significant DWORD
-void file_version_info::set_file_version_ls(uint32_t file_version_ls)
-{
-	file_version_ls_ = file_version_ls;
-}
-
-//Sets product version most significant DWORD
-void file_version_info::set_product_version_ms(uint32_t product_version_ms)
-{
-	product_version_ms_ = product_version_ms;
-}
-
-//Sets product version least significant DWORD
-void file_version_info::set_product_version_ls(uint32_t product_version_ls)
-{
-	product_version_ls_ = product_version_ls;
-}
-
-//Sets file OS type (raw DWORD)
-void file_version_info::set_file_os_raw(uint32_t file_os)
-{
-	file_os_ = file_os;
-}
-
-//Sets file OS type
-void file_version_info::set_file_os(file_os_type file_os)
-{
-	//Determine file operation system type
-	switch(file_os)
-	{
-	case file_os_dos:
-		file_os_ = vos_dos;
-		return;
-
-	case file_os_os216:
-		file_os_ = vos_os216;
-		return;
-
-	case file_os_os232:
-		file_os_ = vos_os232;
-		return;
-
-	case file_os_nt:
-		file_os_ = vos_nt;
-		return;
-
-	case file_os_wince:
-		file_os_ = vos_wince;
-		return;
-
-	case file_os_win16:
-		file_os_ = vos__windows16;
-		return;
-		
-	case file_os_pm16:
-		file_os_ = vos__pm16;
-		return;
-
-	case file_os_pm32:
-		file_os_ = vos__pm32;
-		return;
-
-	case file_os_win32:
-		file_os_ = vos__windows32;
-		return;
-
-	case file_os_dos_win16:
-		file_os_ = vos_dos_windows16;
-		return;
-
-	case file_os_dos_win32:
-		file_os_ = vos_dos_windows32;
-		return;
-
-	case file_os_os216_pm16:
-		file_os_ = vos_os216_pm16;
-		return;
-
-	case file_os_os232_pm32:
-		file_os_ = vos_os232_pm32;
-		return;
-
-	case file_os_nt_win32:
-		file_os_ = vos_nt_windows32;
-		return;
-
-	default:
-		return;
-	}
-}
-
-//Sets file type (raw DWORD)
-void file_version_info::set_file_type_raw(uint32_t file_type)
-{
-	file_type_ = file_type;
-}
-
-//Sets file type
-void file_version_info::set_file_type(file_type file_type)
-{
-	//Determine file type
-	switch(file_type)
-	{
-	case file_type_application:
-		file_type_ = vft_app;
-		return;
-		
-	case file_type_dll:
-		file_type_ = vft_dll;
-		return;
-
-	case file_type_driver:
-		file_type_ = vft_drv;
-		return;
-
-	case file_type_font:
-		file_type_ = vft_font;
-		return;
-
-	case file_type_vxd:
-		file_type_ = vft_vxd;
-		return;
-
-	case file_type_static_lib:
-		file_type_ = vft_static_lib;
-		return;
-
-	default:
-		return;
-	}
-}
-
-//Sets file subtype (usually non-zero for drivers and fonts)
-void file_version_info::set_file_subtype(uint32_t file_subtype)
-{
-	file_subtype_ = file_subtype;
-}
-
-//Sets file date most significant DWORD
-void file_version_info::set_file_date_ms(uint32_t file_date_ms)
-{
-	file_date_ms_ = file_date_ms;
-}
-
-//Sets file date least significant DWORD
-void file_version_info::set_file_date_ls(uint32_t file_date_ls)
-{
-	file_date_ls_ = file_date_ls;
-}
-}

irdb-libs/pebliss/trunk/pe_lib/file_version_info.h

-#ifndef pebliss_file_version_info_h
-#define pebliss_file_version_info_h
-#pragma once
-#include <string>
-#include <map>
-#include "stdint_defs.h"
-#include "pe_structures.h"
-
-namespace pe_bliss
-{
-//Structure representing fixed file version info
-class file_version_info
-{
-public:
-	//Enumeration of file operating system types
-	enum file_os_type
-	{
-		file_os_unknown,
-		file_os_dos,
-		file_os_os216,
-		file_os_os232,
-		file_os_nt,
-		file_os_wince,
-		file_os_win16,
-		file_os_pm16,
-		file_os_pm32,
-		file_os_win32,
-		file_os_dos_win16,
-		file_os_dos_win32,
-		file_os_os216_pm16,
-		file_os_os232_pm32,
-		file_os_nt_win32
-	};
-
-	//Enumeration of file types
-	enum file_type
-	{
-		file_type_unknown,
-		file_type_application,
-		file_type_dll,
-		file_type_driver,
-		file_type_font,
-		file_type_vxd,
-		file_type_static_lib
-	};
-
-public:
-	//Default constructor
-	file_version_info();
-	//Constructor from Windows fixed version info structure
-	explicit file_version_info(const pe_win::vs_fixedfileinfo& info);
-
-public: //Getters
-	//Returns true if file is debug-built
-	bool is_debug() const;
-	//Returns true if file is prerelease
-	bool is_prerelease() const;
-	//Returns true if file is patched
-	bool is_patched() const;
-	//Returns true if private build
-	bool is_private_build() const;
-	//Returns true if special build
-	bool is_special_build() const;
-	//Returns true if info inferred
-	bool is_info_inferred() const;
-	//Retuens file flags (raw DWORD)
-	uint32_t get_file_flags() const;
-
-	//Returns file version most significant DWORD
-	uint32_t get_file_version_ms() const;
-	//Returns file version least significant DWORD
-	uint32_t get_file_version_ls() const;
-	//Returns product version most significant DWORD
-	uint32_t get_product_version_ms() const;
-	//Returns product version least significant DWORD
-	uint32_t get_product_version_ls() const;
-
-	//Returns file OS type (raw DWORD)
-	uint32_t get_file_os_raw() const;
-	//Returns file OS type
-	file_os_type get_file_os() const;
-
-	//Returns file type (raw DWORD)
-	uint32_t get_file_type_raw() const;
-	//Returns file type
-	file_type get_file_type() const;
-
-	//Returns file subtype (usually non-zero for drivers and fonts)
-	uint32_t get_file_subtype() const;
-
-	//Returns file date most significant DWORD
-	uint32_t get_file_date_ms() const;
-	//Returns file date least significant DWORD
-	uint32_t get_file_date_ls() const;
-
-	//Returns file version string
-	template<typename T>
-	const std::basic_string<T> get_file_version_string() const
-	{
-		return get_version_string<T>(file_version_ms_, file_version_ls_);
-	}
-
-	//Returns product version string
-	template<typename T>
-	const std::basic_string<T> get_product_version_string() const
-	{
-		return get_version_string<T>(product_version_ms_, product_version_ls_);
-	}
-		
-public: //Setters
-	//Sets if file is debug-built
-	void set_debug(bool debug);
-	//Sets if file is prerelease
-	void set_prerelease(bool prerelease);
-	//Sets if file is patched
-	void set_patched(bool patched);
-	//Sets if private build
-	void set_private_build(bool private_build);
-	//Sets if special build
-	void set_special_build(bool special_build);
-	//Sets if info inferred
-	void set_info_inferred(bool info_inferred);
-	//Sets flags (raw DWORD)
-	void set_file_flags(uint32_t file_flags);
-
-	//Sets file version most significant DWORD
-	void set_file_version_ms(uint32_t file_version_ms);
-	//Sets file version least significant DWORD
-	void set_file_version_ls(uint32_t file_version_ls);
-	//Sets product version most significant DWORD
-	void set_product_version_ms(uint32_t product_version_ms);
-	//Sets product version least significant DWORD
-	void set_product_version_ls(uint32_t product_version_ls);
-
-	//Sets file OS type (raw DWORD)
-	void set_file_os_raw(uint32_t file_os);
-	//Sets file OS type
-	void set_file_os(file_os_type file_os);
-
-	//Sets file type (raw DWORD)
-	void set_file_type_raw(uint32_t file_type);
-	//Sets file type
-	void set_file_type(file_type file_type);
-
-	//Sets file subtype (usually non-zero for drivers and fonts)
-	void set_file_subtype(uint32_t file_subtype);
-
-	//Sets file date most significant DWORD
-	void set_file_date_ms(uint32_t file_date_ms);
-	//Sets file date least significant DWORD
-	void set_file_date_ls(uint32_t file_date_ls);
-
-private:
-	//Helper to convert version DWORDs to string
-	template<typename T>
-	static const std::basic_string<T> get_version_string(uint32_t ms, uint32_t ls)
-	{
-		std::basic_stringstream<T> ss;
-		ss << (ms >> 16) << static_cast<T>(L'.')
-			<< (ms & 0xFFFF) << static_cast<T>(L'.')
-			<< (ls >> 16) << static_cast<T>(L'.')
-			<< (ls & 0xFFFF);
-		return ss.str();
-	}
-
-	//Helper to set file flag
-	void set_file_flag(uint32_t flag);
-	//Helper to clear file flag
-	void clear_file_flag(uint32_t flag);
-	//Helper to set or clear file flag
-	void set_file_flag(uint32_t flag, bool set_flag);
-
-	uint32_t file_version_ms_, file_version_ls_,
-		product_version_ms_, product_version_ls_;
-	uint32_t file_flags_;
-	uint32_t file_os_;
-	uint32_t file_type_, file_subtype_;
-	uint32_t file_date_ms_, file_date_ls_;
-};
-}
-#endif

irdb-libs/pebliss/trunk/pe_lib/message_table.cpp

-#include "message_table.h"
-#include "utils.h"
-
-namespace pe_bliss
-{
-//Default constructor
-message_table_item::message_table_item()
-	:unicode_(false)
-{}
-
-//Constructor from ANSI string
-message_table_item::message_table_item(const std::string& str)
-	:unicode_(false), ansi_str_(str)
-{
-	pe_utils::strip_nullbytes(ansi_str_);
-}
-
-//Constructor from UNICODE string
-message_table_item::message_table_item(const std::wstring& str)
-	:unicode_(true), unicode_str_(str)
-{
-	pe_utils::strip_nullbytes(unicode_str_);
-}
-
-//Returns true if contained string is unicode
-bool message_table_item::is_unicode() const
-{
-	return unicode_;
-}
-
-//Returns ANSI string
-const std::string& message_table_item::get_ansi_string() const
-{
-	return ansi_str_;
-}
-
-//Returns UNICODE string
-const std::wstring& message_table_item::get_unicode_string() const
-{
-	return unicode_str_;
-}
-
-//Sets ANSI string (clears UNICODE one)
-void message_table_item::set_string(const std::string& str)
-{
-	ansi_str_ = str;
-	pe_utils::strip_nullbytes(ansi_str_);
-	unicode_str_.clear();
-	unicode_ = false;
-}
-
-//Sets UNICODE string (clears ANSI one)
-void message_table_item::set_string(const std::wstring& str)
-{
-	unicode_str_ = str;
-	pe_utils::strip_nullbytes(unicode_str_);
-	ansi_str_.clear();
-	unicode_ = true;
-}
-}

irdb-libs/pebliss/trunk/pe_lib/message_table.h

-#ifndef pebliss_message_table_h
-#define pebliss_message_table_h
-#pragma once
-#ifndef pe_bliss_message_table_h
-#define pe_bliss_message_table_h
-
-#include <string>
-#include <map>
-#include "stdint_defs.h"
-
-namespace pe_bliss
-{
-//Structure representing message table string
-class message_table_item
-{
-public:
-	//Default constructor
-	message_table_item();
-	//Constructors from ANSI and UNICODE strings
-	explicit message_table_item(const std::string& str);
-	explicit message_table_item(const std::wstring& str);
-
-	//Returns true if string is UNICODE
-	bool is_unicode() const;
-	//Returns ANSI string
-	const std::string& get_ansi_string() const;
-	//Returns UNICODE string
-	const std::wstring& get_unicode_string() const;
-
-public:
-	//Sets ANSI or UNICODE string
-	void set_string(const std::string& str);
-	void set_string(const std::wstring& str);
-
-private:
-	bool unicode_;
-	std::string ansi_str_;
-	std::wstring unicode_str_;
-};
-}
-#endif
-#endif