From af1e990b8466c732f3fb286da7db6983e3dba410 Mon Sep 17 00:00:00 2001
From: rukaimi <rukaimi@985867f9-ca9c-e1f6-822d-e8a4186388af>
Date: Fri, 12 Oct 2012 15:50:15 +0000
Subject: [PATCH] Minor improvements

---
 pe_lib/pe_base.cpp                        | 58 +++++++++++++----------
 pe_lib/pe_base.h                          |  4 +-
 pe_lib/pe_exception.h                     |  4 +-
 pe_lib/pe_resource_manager.cpp            | 14 +++---
 pe_lib/pe_structures.h                    |  4 +-
 samples/address_convertions/main.cpp      |  2 +-
 samples/basic_dotnet_viewer/main.cpp      |  2 +-
 samples/basic_info_viewer/main.cpp        |  2 +-
 samples/bound_import_reader/main.cpp      |  2 +-
 samples/debug_info_reader/main.cpp        |  2 +-
 samples/entropy_calculator/main.cpp       |  2 +-
 samples/exception_dir_reader/main.cpp     |  2 +-
 samples/export_adder/main.cpp             |  2 +-
 samples/exports_reader/main.cpp           |  2 +-
 samples/full_pe_rebuilder/main.cpp        | 28 +++++------
 samples/image_config_editor/main.cpp      |  2 +-
 samples/import_adder/main.cpp             |  2 +-
 samples/imports_reader/main.cpp           |  2 +-
 samples/pe_config_reader/main.cpp         |  2 +-
 samples/pe_realigner/main.cpp             |  2 +-
 samples/pe_rebaser/main.cpp               |  2 +-
 samples/pe_sections_reader/main.cpp       |  2 +-
 samples/pe_stripper/main.cpp              |  2 +-
 samples/relocation_adder/main.cpp         |  2 +-
 samples/relocations_reader/main.cpp       |  2 +-
 samples/resource_editor/main.cpp          |  4 +-
 samples/resource_viewer/main.cpp          |  2 +-
 samples/rich_overlay_stub_reader/main.cpp |  2 +-
 samples/section_adder/main.cpp            |  2 +-
 samples/sections_and_addresses/main.cpp   |  2 +-
 samples/tls_editor/main.cpp               |  2 +-
 samples/tls_reader/main.cpp               |  2 +-
 32 files changed, 89 insertions(+), 77 deletions(-)

diff --git a/pe_lib/pe_base.cpp b/pe_lib/pe_base.cpp
index 3f46a9c..436b98a 100644
--- a/pe_lib/pe_base.cpp
+++ b/pe_lib/pe_base.cpp
@@ -9,7 +9,7 @@
 #include "pe_exception.h"
 #include "pe_base.h"
 
-#ifndef PELIB_ON_WINDOWS
+#ifndef PE_BLISS_WINDOWS
 #include <iconv.h>
 #endif
 
@@ -3688,7 +3688,7 @@ const pe_base::resource_directory pe_base::process_resource_directory(uint32_t r
 			if(section_data_length_from_rva(res_rva + dir_entry.NameOffset + sizeof(uint16_t), res_rva + dir_entry.NameOffset + sizeof(uint16_t), section_data_virtual, true) < directory_name_length)
 				throw pe_exception("Incorrect resource directory", pe_exception::incorrect_resource_directory);
 
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 			//Set entry UNICODE name
 			entry.set_name(std::wstring(
 				reinterpret_cast<const wchar_t*>(section_data_from_rva(res_rva + dir_entry.NameOffset + sizeof(uint16_t), section_data_virtual, true)),
@@ -3798,7 +3798,7 @@ void pe_base::rebuild_resource_directory(section& resource_section, resource_dir
 			memcpy(&raw_data[current_strings_pos], &unicode_length, sizeof(unicode_length));
 			current_strings_pos += sizeof(unicode_length);
 
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 			memcpy(&raw_data[current_strings_pos], (*it).get_name().c_str(), (*it).get_name().length() * sizeof(uint16_t) + sizeof(uint16_t) /* unicode */);
 #else
 			{
@@ -4512,7 +4512,7 @@ pe_base::misc_debug_info::misc_debug_info(const image_debug_misc* info)
 	//IMAGE_DEBUG_MISC::Data must be checked before!
 	if(info->Unicode)
 	{
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 		debug_data_unicode_ = std::wstring(reinterpret_cast<const wchar_t*>(info->Data), (info->Length - sizeof(image_debug_misc) + 1 /* BYTE[1] in the end of structure */) / 2);
 #else
 		debug_data_unicode_ = from_ucs2(u16string(reinterpret_cast<const unicode16_t*>(info->Data), (info->Length - sizeof(image_debug_misc) + 1 /* BYTE[1] in the end of structure */) / 2));
@@ -5312,7 +5312,7 @@ const std::string& pe_base::get_full_headers_data() const
 	return full_headers_data_;
 }
 
-#ifndef PELIB_ON_WINDOWS
+#ifndef PE_BLISS_WINDOWS
 const u16string pe_base::to_ucs2(const std::wstring& str)
 {
 	u16string ret;
@@ -5321,15 +5321,20 @@ const u16string pe_base::to_ucs2(const std::wstring& str)
 
 	ret.resize(str.length());
 
-	//Check for -1
-    iconv_t conv = iconv_open("UCS-2", "WCHAR_T");
-    size_t inbytesleft = str.length() * sizeof(wchar_t);
-    size_t outbytesleft = ret.length() * sizeof(unicode16_t);
-    const wchar_t* in_pos = str.c_str();
-    unicode16_t* out_pos = &ret[0];
-	//Check for -1
-    iconv(conv, const_cast<char**>(reinterpret_cast<const char**>(&in_pos)), &inbytesleft, reinterpret_cast<char**>(&out_pos), &outbytesleft);
-    iconv_close(conv);
+	iconv_t conv = iconv_open("UCS-2", "WCHAR_T");
+	if(conv == reinterpret_cast<iconv_t>(-1))
+		throw pe_exception("Error opening iconv", pe_exception::encoding_convertion_error);
+
+	size_t inbytesleft = str.length() * sizeof(wchar_t);
+	size_t outbytesleft = ret.length() * sizeof(unicode16_t);
+	const wchar_t* in_pos = str.c_str();
+	unicode16_t* out_pos = &ret[0];
+
+	size_t result = iconv(conv, const_cast<char**>(reinterpret_cast<const char**>(&in_pos)), &inbytesleft, reinterpret_cast<char**>(&out_pos), &outbytesleft);
+	iconv_close(conv);
+	
+	if(result == static_cast<size_t>(-1))
+		throw pe_exception("Iconv error", pe_exception::encoding_convertion_error);
 
 	return ret;
 }
@@ -5339,18 +5344,23 @@ const std::wstring pe_base::from_ucs2(const u16string& str)
 	std::wstring ret;
 	if(str.empty())
 		return ret;
-	
+
 	ret.resize(str.length());
 
-	//Check for -1
-    iconv_t conv = iconv_open("WCHAR_T", "UCS-2");
-    size_t inbytesleft = str.length() * sizeof(unicode16_t);
-    size_t outbytesleft = ret.length() * sizeof(wchar_t);
-    const unicode16_t* in_pos = str.c_str();
-    wchar_t* out_pos = &ret[0];
-	//Check for -1
-    iconv(conv, const_cast<char**>(reinterpret_cast<const char**>(&in_pos)), &inbytesleft, reinterpret_cast<char**>(&out_pos), &outbytesleft);
-    iconv_close(conv);
+	iconv_t conv = iconv_open("WCHAR_T", "UCS-2");
+	if(conv == reinterpret_cast<iconv_t>(-1))
+		throw pe_exception("Error opening iconv", pe_exception::encoding_convertion_error);
+
+	size_t inbytesleft = str.length() * sizeof(unicode16_t);
+	size_t outbytesleft = ret.length() * sizeof(wchar_t);
+	const unicode16_t* in_pos = str.c_str();
+	wchar_t* out_pos = &ret[0];
+
+	size_t result = iconv(conv, const_cast<char**>(reinterpret_cast<const char**>(&in_pos)), &inbytesleft, reinterpret_cast<char**>(&out_pos), &outbytesleft);
+	iconv_close(conv);
+
+	if(result == static_cast<size_t>(-1))
+		throw pe_exception("Iconv error", pe_exception::encoding_convertion_error);
 
 	return ret;
 }
diff --git a/pe_lib/pe_base.h b/pe_lib/pe_base.h
index d86bb73..9f3caa8 100644
--- a/pe_lib/pe_base.h
+++ b/pe_lib/pe_base.h
@@ -11,7 +11,7 @@
 #include "pe_structures.h"
 
 //Please don't remove this information from header
-//PEBliss 0.2
+//PEBliss 0.2.1
 //(c) DX 2011 - 2012, http://kaimi.ru
 //Free to use, modify and distribute
 
@@ -2167,7 +2167,7 @@ private:
 	//Calculates entropy from bytes count
 	static double calculate_entropy(const uint32_t byte_count[256], std::streamoff total_length);
 
-#ifndef PELIB_ON_WINDOWS
+#ifndef PE_BLISS_WINDOWS
 public:
 	static const u16string to_ucs2(const std::wstring& str);
 	static const std::wstring from_ucs2(const u16string& str);
diff --git a/pe_lib/pe_exception.h b/pe_lib/pe_exception.h
index fa89536..27172f2 100644
--- a/pe_lib/pe_exception.h
+++ b/pe_lib/pe_exception.h
@@ -80,7 +80,9 @@ public:
 
 		version_info_string_does_not_exist,
 
-		no_more_sections_can_be_added
+		no_more_sections_can_be_added,
+
+		encoding_convertion_error
 	};
 
 public:
diff --git a/pe_lib/pe_resource_manager.cpp b/pe_lib/pe_resource_manager.cpp
index 4c5a118..1b5c913 100644
--- a/pe_lib/pe_resource_manager.cpp
+++ b/pe_lib/pe_resource_manager.cpp
@@ -719,7 +719,7 @@ const pe_resource_viewer::string_list pe_resource_viewer::parse_string_list(uint
 		if(string_length)
 		{
 			//Create and save string (UNICODE)
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 			ret.insert(
 				std::make_pair(static_cast<uint16_t>(((id - 1) << 4) + i), //ID of string is calculated in such way
 				std::wstring(reinterpret_cast<const wchar_t*>(resource_data.data() + passed_bytes), string_length)));
@@ -873,7 +873,7 @@ const pe_resource_viewer::message_list pe_resource_viewer::parse_message_list(co
 					throw pe_exception("Incorrect resource message table", pe_exception::resource_incorrect_message_table);
 
 				//Add ID and string to message table
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 				ret.insert(std::make_pair(curr_id, message_table_item(
 					std::wstring(reinterpret_cast<const wchar_t*>(resource_data.data() + block->OffsetToEntries + current_pos + size_of_entry_headers),
 					(entry->Length - size_of_entry_headers) / 2)
@@ -1074,7 +1074,7 @@ const pe_resource_viewer::file_version_info pe_resource_viewer::get_version_info
 					}
 
 					//Save name-value pair
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 					new_values.insert(std::make_pair(reinterpret_cast<const unicode16_t*>(string_block->Key), data));
 #else
 					new_values.insert(std::make_pair(pe_base::from_ucs2(reinterpret_cast<const unicode16_t*>(string_block->Key)),
@@ -1085,7 +1085,7 @@ const pe_resource_viewer::file_version_info pe_resource_viewer::get_version_info
 					string_pos += pe_base::align_up(string_block->Length, sizeof(uint32_t));
 				}
 
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 				string_values.insert(std::make_pair(reinterpret_cast<const unicode16_t*>(string_table->Key), new_values));
 #else
 				string_values.insert(std::make_pair(pe_base::from_ucs2(reinterpret_cast<const unicode16_t*>(string_table->Key)), new_values));
@@ -2435,7 +2435,7 @@ void pe_resource_manager::set_version_info(const file_version_info& file_info, c
 			uint32_t old_ptr2 = data_ptr; //Used to calculate string table block length later
 			uint32_t lang_key_length = static_cast<uint32_t>(((*table_it).first.length() + 1) * sizeof(uint16_t));
 
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 			memcpy(&version_data[data_ptr], (*table_it).first.c_str(), lang_key_length); //Write block key
 #else
 			{
@@ -2467,7 +2467,7 @@ void pe_resource_manager::set_version_info(const file_version_info& file_info, c
 				memcpy(&version_data[data_ptr], &string_block, sizeof(version_info_block) - sizeof(uint16_t));
 				data_ptr += sizeof(version_info_block) - sizeof(uint16_t);
 
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 				memcpy(&version_data[data_ptr], (*it).first.c_str(), key_length); //Write block key
 #else
 				{
@@ -2485,7 +2485,7 @@ void pe_resource_manager::set_version_info(const file_version_info& file_info, c
 				}
 
 				//Write block data (value)
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 				memcpy(&version_data[data_ptr], (*it).second.c_str(), string_block.ValueLength * sizeof(uint16_t));
 #else
 				{
diff --git a/pe_lib/pe_structures.h b/pe_lib/pe_structures.h
index 982d372..80ba042 100644
--- a/pe_lib/pe_structures.h
+++ b/pe_lib/pe_structures.h
@@ -3,7 +3,7 @@
 #include <sstream>
 #include "stdint_defs.h"
 #if defined(_MSC_VER)
-#define PELIB_ON_WINDOWS
+#define PE_BLISS_WINDOWS
 #endif
 
 namespace pe_bliss
@@ -975,7 +975,7 @@ struct image_load_config_directory64
 #pragma pack(pop)
 
 
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 typedef wchar_t unicode16_t;
 typedef std::basic_string<unicode16_t> u16string;
 #else
diff --git a/samples/address_convertions/main.cpp b/samples/address_convertions/main.cpp
index 0c90926..02045f9 100644
--- a/samples/address_convertions/main.cpp
+++ b/samples/address_convertions/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/basic_dotnet_viewer/main.cpp b/samples/basic_dotnet_viewer/main.cpp
index 1325415..6dd9630 100644
--- a/samples/basic_dotnet_viewer/main.cpp
+++ b/samples/basic_dotnet_viewer/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/basic_info_viewer/main.cpp b/samples/basic_info_viewer/main.cpp
index 5331a55..b820c38 100644
--- a/samples/basic_info_viewer/main.cpp
+++ b/samples/basic_info_viewer/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/bound_import_reader/main.cpp b/samples/bound_import_reader/main.cpp
index be3b101..b0808ad 100644
--- a/samples/bound_import_reader/main.cpp
+++ b/samples/bound_import_reader/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/debug_info_reader/main.cpp b/samples/debug_info_reader/main.cpp
index 1c15119..03ce50a 100644
--- a/samples/debug_info_reader/main.cpp
+++ b/samples/debug_info_reader/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/entropy_calculator/main.cpp b/samples/entropy_calculator/main.cpp
index 25a9b86..34d9610 100644
--- a/samples/entropy_calculator/main.cpp
+++ b/samples/entropy_calculator/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/exception_dir_reader/main.cpp b/samples/exception_dir_reader/main.cpp
index b943bc4..c9fffbc 100644
--- a/samples/exception_dir_reader/main.cpp
+++ b/samples/exception_dir_reader/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/export_adder/main.cpp b/samples/export_adder/main.cpp
index 3483a45..fd60a6c 100644
--- a/samples/export_adder/main.cpp
+++ b/samples/export_adder/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/exports_reader/main.cpp b/samples/exports_reader/main.cpp
index 0b74e52..d41a90a 100644
--- a/samples/exports_reader/main.cpp
+++ b/samples/exports_reader/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/full_pe_rebuilder/main.cpp b/samples/full_pe_rebuilder/main.cpp
index 47c86aa..c9a1a3d 100644
--- a/samples/full_pe_rebuilder/main.cpp
+++ b/samples/full_pe_rebuilder/main.cpp
@@ -3,13 +3,13 @@
 #include <sstream>
 #include <pe_factory.h>
 #include <pe_32_64.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
 using namespace pe_bliss;
 
-//Ïðèìåð, ïîêàçûâàþùèé, êàê ñ íóëÿ ñîçäàòü PE-ôàéë
+//Пример, показывающий, как с нуля создать PE-файл
 int main(int argc, char* argv[])
 {
 	if(argc != 2)
@@ -18,7 +18,7 @@ int main(int argc, char* argv[])
 		return 0;
 	}
 
-	//Îòêðûâàåì ôàéë
+	//Открываем файл
 	std::ifstream pe_file(argv[1], std::ios::in | std::ios::binary);
 	if(!pe_file)
 	{
@@ -28,19 +28,19 @@ int main(int argc, char* argv[])
 
 	try
 	{
-		//Íîâûé îáðàç, êîòîðûé ìû ñîçäàäèì èç îòêðûòîãî ñ íóëÿ
+		//Новый образ, который мы создадим из открытого с нуля
 		std::auto_ptr<pe_base> new_image;
 
 		{
-			//Ñîçäàåì ýêçåìïëÿð PE èëè PE+ êëàññà ñ ïîìîùüþ ôàáðèêè
+			//Создаем экземпляр PE или PE+ класса с помощью фабрики
 			std::auto_ptr<pe_base> image = pe_factory::create_pe(pe_file);
 
-			//Ñîçäàåì íîâûé ïóñòîé îáðàç
+			//Создаем новый пустой образ
 			new_image.reset(image->get_pe_type() == pe_base::pe_type_32
 				? static_cast<pe_base*>(new pe32(image->get_section_alignment()))
 				: static_cast<pe_base*>(new pe64(image->get_section_alignment())));
 
-			//Êîïèðóåì âàæíûå ïàðàìåòðû ñòàðîãî îáðàçà â íîâûé
+			//Копируем важные параметры старого образа в новый
 			new_image->set_characteristics(image->get_characteristics());
 			new_image->set_dll_characteristics(image->get_dll_characteristics());
 			new_image->set_file_alignment(image->get_file_alignment());
@@ -53,14 +53,14 @@ int main(int argc, char* argv[])
 			new_image->set_number_of_rvas_and_sizes(new_image->get_number_of_rvas_and_sizes());
 			new_image->set_subsystem(image->get_subsystem());
 
-			//Êîïèðóåì âñå ñóùåñòâóþùèå äèðåêòîðèè
+			//Копируем все существующие директории
 			for(unsigned long i = 0; i < image->get_number_of_rvas_and_sizes(); ++i)
 			{
 				new_image->set_directory_rva(i, image->get_directory_rva(i));
 				new_image->set_directory_size(i, image->get_directory_size(i));
 			}
 
-			//Êîïèðóåì äàííûå ñåêöèé
+			//Копируем данные секций
 			{
 				const pe_base::section_list& pe_sections = image->get_image_sections();
 				for(pe_base::section_list::const_iterator it = pe_sections.begin(); it != pe_sections.end(); ++it)
@@ -69,8 +69,8 @@ int main(int argc, char* argv[])
 		}
 
 
-		//Ïðîñ÷èòàåì êîíòðîëüíóþ ñóììó íîâîãî PE-ôàéëà
-		//è ñîõðàíèì åå (äëÿ ïðèìåðà)
+		//Просчитаем контрольную сумму нового PE-файла
+		//и сохраним ее (для примера)
 		{
 			std::stringstream temp_pe(std::ios::out | std::ios::in | std::ios::binary);
 			new_image->rebuild_pe(temp_pe);
@@ -78,7 +78,7 @@ int main(int argc, char* argv[])
 		}
 
 
-		//Ñîçäàåì íîâûé PE-ôàéë
+		//Создаем новый PE-файл
 		std::string base_file_name(argv[1]);
 		std::string::size_type slash_pos;
 		if((slash_pos = base_file_name.find_last_of("/\\")) != std::string::npos)
@@ -92,14 +92,14 @@ int main(int argc, char* argv[])
 			return -1;
 		}
 
-		//Ïåðåñîáèðàåì PE-ôàéë èç íîâîãî îáðàùà
+		//Пересобираем PE-файл из нового обраща
 		new_image->rebuild_pe(new_pe_file);
 
 		std::cout << "PE was rebuilt and saved to " << base_file_name << std::endl;
 	}
 	catch(const pe_exception& e)
 	{
-		//Åñëè âîçíèêëà îøèáêà
+		//Если возникла ошибка
 		std::cout << "Error: " << e.what() << std::endl;
 		return -1;
 	}
diff --git a/samples/image_config_editor/main.cpp b/samples/image_config_editor/main.cpp
index 7db4cab..b349817 100644
--- a/samples/image_config_editor/main.cpp
+++ b/samples/image_config_editor/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/import_adder/main.cpp b/samples/import_adder/main.cpp
index 3058089..b5e9625 100644
--- a/samples/import_adder/main.cpp
+++ b/samples/import_adder/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/imports_reader/main.cpp b/samples/imports_reader/main.cpp
index c7afdac..819ffd9 100644
--- a/samples/imports_reader/main.cpp
+++ b/samples/imports_reader/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/pe_config_reader/main.cpp b/samples/pe_config_reader/main.cpp
index 62f885d..2bddbb5 100644
--- a/samples/pe_config_reader/main.cpp
+++ b/samples/pe_config_reader/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/pe_realigner/main.cpp b/samples/pe_realigner/main.cpp
index 0db402c..a899888 100644
--- a/samples/pe_realigner/main.cpp
+++ b/samples/pe_realigner/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/pe_rebaser/main.cpp b/samples/pe_rebaser/main.cpp
index 838478c..1b6b9f3 100644
--- a/samples/pe_rebaser/main.cpp
+++ b/samples/pe_rebaser/main.cpp
@@ -2,7 +2,7 @@
 #include <fstream>
 #include <pe_factory.h>
 #include <stdint_defs.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/pe_sections_reader/main.cpp b/samples/pe_sections_reader/main.cpp
index 7cfb2f7..9d89f36 100644
--- a/samples/pe_sections_reader/main.cpp
+++ b/samples/pe_sections_reader/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/pe_stripper/main.cpp b/samples/pe_stripper/main.cpp
index cd1d1d5..a893fdc 100644
--- a/samples/pe_stripper/main.cpp
+++ b/samples/pe_stripper/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/relocation_adder/main.cpp b/samples/relocation_adder/main.cpp
index eb8cd30..70d2ba0 100644
--- a/samples/relocation_adder/main.cpp
+++ b/samples/relocation_adder/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/relocations_reader/main.cpp b/samples/relocations_reader/main.cpp
index 6be765a..d094959 100644
--- a/samples/relocations_reader/main.cpp
+++ b/samples/relocations_reader/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/resource_editor/main.cpp b/samples/resource_editor/main.cpp
index 672369b..bfacdb2 100644
--- a/samples/resource_editor/main.cpp
+++ b/samples/resource_editor/main.cpp
@@ -2,7 +2,7 @@
 #include <fstream>
 #include <pe_factory.h>
 #include <pe_resource_manager.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "resource.h"
 #include "lib.h"
 #else
@@ -18,7 +18,7 @@ int main(int argc, char* argv[])
 {
 	std::string pe_filename;
 
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 	//Открываем файл (сами себя)
 	pe_filename = argv[0];
 #else
diff --git a/samples/resource_viewer/main.cpp b/samples/resource_viewer/main.cpp
index 314ed6a..79a67fd 100644
--- a/samples/resource_viewer/main.cpp
+++ b/samples/resource_viewer/main.cpp
@@ -2,7 +2,7 @@
 #include <fstream>
 #include <pe_factory.h>
 #include <pe_resource_manager.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/rich_overlay_stub_reader/main.cpp b/samples/rich_overlay_stub_reader/main.cpp
index 5f176c0..05eb0f3 100644
--- a/samples/rich_overlay_stub_reader/main.cpp
+++ b/samples/rich_overlay_stub_reader/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/section_adder/main.cpp b/samples/section_adder/main.cpp
index b5598e5..c6a45a4 100644
--- a/samples/section_adder/main.cpp
+++ b/samples/section_adder/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/sections_and_addresses/main.cpp b/samples/sections_and_addresses/main.cpp
index 7134670..e62fec8 100644
--- a/samples/sections_and_addresses/main.cpp
+++ b/samples/sections_and_addresses/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/tls_editor/main.cpp b/samples/tls_editor/main.cpp
index c935136..a525793 100644
--- a/samples/tls_editor/main.cpp
+++ b/samples/tls_editor/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
diff --git a/samples/tls_reader/main.cpp b/samples/tls_reader/main.cpp
index c0aabd6..6304cc6 100644
--- a/samples/tls_reader/main.cpp
+++ b/samples/tls_reader/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <pe_factory.h>
-#ifdef PELIB_ON_WINDOWS
+#ifdef PE_BLISS_WINDOWS
 #include "lib.h"
 #endif
 
-- 
GitLab