From 8b5a6150078b99e1aab7012148aa08f6d9615df8 Mon Sep 17 00:00:00 2001
From: "Mr. eXoDia" <mr.exodia.tpodt@gmail.com>
Date: Sun, 18 May 2014 16:34:56 +0200
Subject: [PATCH] use IMAGE_FIRST_SECTION everywhere

---
 TitanEngine/Global.Engine.cpp          |  8 +++----
 TitanEngine/TitanEngine.Importer.cpp   |  1 +
 TitanEngine/TitanEngine.PE.Convert.cpp | 12 +++++-----
 TitanEngine/TitanEngine.PE.Data.cpp    |  8 +++----
 TitanEngine/TitanEngine.PE.Fixer.cpp   |  8 +++----
 TitanEngine/TitanEngine.PE.Overlay.cpp |  4 ++--
 TitanEngine/TitanEngine.PE.Section.cpp | 32 +++++++++++++-------------
 TitanEngine/TitanEngine.Realigner.cpp  |  8 +++----
 TitanEngine/TitanEngine.Static.cpp     |  4 ++--
 9 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/TitanEngine/Global.Engine.cpp b/TitanEngine/Global.Engine.cpp
index 975a0d3..2e8e889 100644
--- a/TitanEngine/Global.Engine.cpp
+++ b/TitanEngine/Global.Engine.cpp
@@ -327,7 +327,7 @@ ULONG_PTR EngineEstimateNewSectionRVA(ULONG_PTR FileMapVA)
 
         if(!FileIs64)
         {
-            PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+            PESections = IMAGE_FIRST_SECTION(PEHeader32);
             SectionNumber = PEHeader32->FileHeader.NumberOfSections;
             __try
             {
@@ -346,7 +346,7 @@ ULONG_PTR EngineEstimateNewSectionRVA(ULONG_PTR FileMapVA)
         }
         else
         {
-            PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+            PESections = IMAGE_FIRST_SECTION(PEHeader64);
             SectionNumber = PEHeader64->FileHeader.NumberOfSections;
             __try
             {
@@ -895,7 +895,7 @@ ULONG_PTR EngineSimulateNtLoaderW(wchar_t* szFileName)
                 __try
                 {
                     PeHeaderSize = DOSHeader->e_lfanew + PEHeader32->FileHeader.SizeOfOptionalHeader + (sizeof(IMAGE_SECTION_HEADER) * PEHeader32->FileHeader.NumberOfSections) + sizeof(IMAGE_FILE_HEADER) + 4;
-                    PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                    PESections = IMAGE_FIRST_SECTION(PEHeader32);
                     SectionNumber = PEHeader32->FileHeader.NumberOfSections;
                     RtlCopyMemory(AllocatedFile, (LPVOID)FileMapVA, PeHeaderSize);
                     while(SectionNumber > 0)
@@ -919,7 +919,7 @@ ULONG_PTR EngineSimulateNtLoaderW(wchar_t* szFileName)
                 __try
                 {
                     PeHeaderSize = DOSHeader->e_lfanew + PEHeader64->FileHeader.SizeOfOptionalHeader + (sizeof(IMAGE_SECTION_HEADER) * PEHeader64->FileHeader.NumberOfSections) + sizeof(IMAGE_FILE_HEADER) + 4;
-                    PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                    PESections = IMAGE_FIRST_SECTION(PEHeader64);
                     SectionNumber = PEHeader64->FileHeader.NumberOfSections;
                     RtlCopyMemory(AllocatedFile, (LPVOID)FileMapVA, PeHeaderSize);
                     while(SectionNumber > 0)
diff --git a/TitanEngine/TitanEngine.Importer.cpp b/TitanEngine/TitanEngine.Importer.cpp
index 639795b..a666e0c 100644
--- a/TitanEngine/TitanEngine.Importer.cpp
+++ b/TitanEngine/TitanEngine.Importer.cpp
@@ -217,6 +217,7 @@ __declspec(dllexport) void* TITCALL ImporterGetForwardedDLLName(HANDLE hProcess,
 }
 __declspec(dllexport) long TITCALL ImporterGetForwardedDLLIndex(HANDLE hProcess, ULONG_PTR APIAddress, ULONG_PTR DLLBasesList)
 {
+    //TODO: remove?
     return((DWORD)EngineGlobalAPIHandler(hProcess, NULL, APIAddress, NULL, UE_OPTION_IMPORTER_RETURN_FORWARDER_DLLINDEX));
 }
 __declspec(dllexport) ULONG_PTR TITCALL ImporterGetForwardedAPIOrdinalNumber(HANDLE hProcess, ULONG_PTR APIAddress)
diff --git a/TitanEngine/TitanEngine.PE.Convert.cpp b/TitanEngine/TitanEngine.PE.Convert.cpp
index 0b62ab1..11550b2 100644
--- a/TitanEngine/TitanEngine.PE.Convert.cpp
+++ b/TitanEngine/TitanEngine.PE.Convert.cpp
@@ -109,7 +109,7 @@ __declspec(dllexport) ULONG_PTR TITCALL ConvertVAtoFileOffset(ULONG_PTR FileMapV
                 {
                     ConvertedAddress = ConvertAddress;
                 }
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader32);
                 SectionNumber = PEHeader32->FileHeader.NumberOfSections;
                 __try
                 {
@@ -150,7 +150,7 @@ __declspec(dllexport) ULONG_PTR TITCALL ConvertVAtoFileOffset(ULONG_PTR FileMapV
                 {
                     ConvertedAddress = ConvertAddress;
                 }
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader64);
                 SectionNumber = PEHeader64->FileHeader.NumberOfSections;
                 __try
                 {
@@ -244,7 +244,7 @@ __declspec(dllexport) ULONG_PTR TITCALL ConvertVAtoFileOffsetEx(ULONG_PTR FileMa
                 {
                     ConvertedAddress = ConvertAddress;
                 }
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader32);
                 SectionNumber = PEHeader32->FileHeader.NumberOfSections;
                 __try
                 {
@@ -316,7 +316,7 @@ __declspec(dllexport) ULONG_PTR TITCALL ConvertVAtoFileOffsetEx(ULONG_PTR FileMa
                 {
                     ConvertedAddress = ConvertAddress;
                 }
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader64);
                 SectionNumber = PEHeader64->FileHeader.NumberOfSections;
                 __try
                 {
@@ -413,7 +413,7 @@ __declspec(dllexport) ULONG_PTR TITCALL ConvertFileOffsetToVA(ULONG_PTR FileMapV
                 {
                     ConvertedAddress = ConvertAddress;
                 }
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader32);
                 SectionNumber = PEHeader32->FileHeader.NumberOfSections;
                 __try
                 {
@@ -451,7 +451,7 @@ __declspec(dllexport) ULONG_PTR TITCALL ConvertFileOffsetToVA(ULONG_PTR FileMapV
                 {
                     ConvertedAddress = ConvertAddress;
                 }
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader64);
                 SectionNumber = PEHeader64->FileHeader.NumberOfSections;
                 __try
                 {
diff --git a/TitanEngine/TitanEngine.PE.Data.cpp b/TitanEngine/TitanEngine.PE.Data.cpp
index 69747e2..cfb8a26 100644
--- a/TitanEngine/TitanEngine.PE.Data.cpp
+++ b/TitanEngine/TitanEngine.PE.Data.cpp
@@ -35,7 +35,7 @@ __declspec(dllexport) ULONG_PTR TITCALL GetPE32DataFromMappedFile(ULONG_PTR File
             }
             if(!FileIs64)
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader32);
                 SectionNumber = PEHeader32->FileHeader.NumberOfSections;
                 if(WhichData < UE_SECTIONNAME)
                 {
@@ -184,7 +184,7 @@ __declspec(dllexport) ULONG_PTR TITCALL GetPE32DataFromMappedFile(ULONG_PTR File
             }
             else
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader64);
                 SectionNumber = PEHeader64->FileHeader.NumberOfSections;
                 if(WhichData < UE_SECTIONNAME)
                 {
@@ -562,7 +562,7 @@ __declspec(dllexport) bool TITCALL SetPE32DataForMappedFile(ULONG_PTR FileMapVA,
             }
             if(!FileIs64)
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader32);
                 SectionNumber = PEHeader32->FileHeader.NumberOfSections;
                 __try
                 {
@@ -748,7 +748,7 @@ __declspec(dllexport) bool TITCALL SetPE32DataForMappedFile(ULONG_PTR FileMapVA,
             }
             else
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader64);
                 SectionNumber = PEHeader64->FileHeader.NumberOfSections;
                 __try
                 {
diff --git a/TitanEngine/TitanEngine.PE.Fixer.cpp b/TitanEngine/TitanEngine.PE.Fixer.cpp
index 0e82f55..6ef89e4 100644
--- a/TitanEngine/TitanEngine.PE.Fixer.cpp
+++ b/TitanEngine/TitanEngine.PE.Fixer.cpp
@@ -735,7 +735,7 @@ __declspec(dllexport) bool TITCALL IsPE32FileValidExW(wchar_t* szFileName, DWORD
                     /*
                     	Section check
                     */
-                    PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                    PESections = IMAGE_FIRST_SECTION(PEHeader32);
                     NumberOfSections = PEHeader32->FileHeader.NumberOfSections;
                     while(NumberOfSections > NULL)
                     {
@@ -1474,7 +1474,7 @@ __declspec(dllexport) bool TITCALL IsPE32FileValidExW(wchar_t* szFileName, DWORD
                     /*
                     	Section check
                     */
-                    PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                    PESections = IMAGE_FIRST_SECTION(PEHeader64);
                     NumberOfSections = PEHeader64->FileHeader.NumberOfSections;
                     while(NumberOfSections > NULL)
                     {
@@ -2215,7 +2215,7 @@ __declspec(dllexport) bool TITCALL FixBrokenPE32FileExW(wchar_t* szFileName, LPV
                         */
                         if(myFileStatusInfo->SectionTable != UE_FIELD_OK || myFileStatusInfo->SizeOfImage != UE_FIELD_OK)
                         {
-                            PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                            PESections = IMAGE_FIRST_SECTION(PEHeader32);
                             NumberOfSections = PEHeader32->FileHeader.NumberOfSections;
                             while(NumberOfSections > NULL)
                             {
@@ -2808,7 +2808,7 @@ __declspec(dllexport) bool TITCALL FixBrokenPE32FileExW(wchar_t* szFileName, LPV
                         */
                         if(myFileStatusInfo->SectionTable != UE_FIELD_OK || myFileStatusInfo->SizeOfImage != UE_FIELD_OK)
                         {
-                            PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                            PESections = IMAGE_FIRST_SECTION(PEHeader64);
                             NumberOfSections = PEHeader64->FileHeader.NumberOfSections;
                             while(NumberOfSections > NULL)
                             {
diff --git a/TitanEngine/TitanEngine.PE.Overlay.cpp b/TitanEngine/TitanEngine.PE.Overlay.cpp
index dc93521..0592f40 100644
--- a/TitanEngine/TitanEngine.PE.Overlay.cpp
+++ b/TitanEngine/TitanEngine.PE.Overlay.cpp
@@ -61,7 +61,7 @@ __declspec(dllexport) bool TITCALL FindOverlayW(wchar_t* szFileName, LPDWORD Ove
             }
             if(!FileIs64)
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader32);
                 SectionNumber = PEHeader32->FileHeader.NumberOfSections;
                 __try
                 {
@@ -101,7 +101,7 @@ __declspec(dllexport) bool TITCALL FindOverlayW(wchar_t* szFileName, LPDWORD Ove
             }
             else
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader64);
                 SectionNumber = PEHeader64->FileHeader.NumberOfSections;
                 __try
                 {
diff --git a/TitanEngine/TitanEngine.PE.Section.cpp b/TitanEngine/TitanEngine.PE.Section.cpp
index 4650056..6844acf 100644
--- a/TitanEngine/TitanEngine.PE.Section.cpp
+++ b/TitanEngine/TitanEngine.PE.Section.cpp
@@ -58,7 +58,7 @@ __declspec(dllexport) bool TITCALL ExtractSectionW(wchar_t* szFileName, wchar_t*
             }
             if(!FileIs64)
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader32);
                 if(SectionNumber <= PEHeader32->FileHeader.NumberOfSections)
                 {
                     PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PESections + SectionNumber * IMAGE_SIZEOF_SECTION_HEADER);
@@ -87,7 +87,7 @@ __declspec(dllexport) bool TITCALL ExtractSectionW(wchar_t* szFileName, wchar_t*
             }
             else
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader64);
                 if(SectionNumber <= PEHeader64->FileHeader.NumberOfSections)
                 {
                     PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PESections + SectionNumber * IMAGE_SIZEOF_SECTION_HEADER);
@@ -201,7 +201,7 @@ __declspec(dllexport) bool TITCALL ResortFileSectionsW(wchar_t* szFileName)
                 {
                     RtlMoveMemory(sortedFileName, (LPVOID)FileMapVA, FileSize);
                     SectionNumber = PEHeader32->FileHeader.NumberOfSections;
-                    PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                    PESections = IMAGE_FIRST_SECTION(PEHeader32);
                     while(SectionNumber > 0)
                     {
                         fileSectionData[i][0] = (ULONG_PTR)(PESections->PointerToRawData);
@@ -268,7 +268,7 @@ __declspec(dllexport) bool TITCALL ResortFileSectionsW(wchar_t* szFileName)
                 {
                     RtlMoveMemory(sortedFileName, (LPVOID)FileMapVA, FileSize);
                     SectionNumber = PEHeader64->FileHeader.NumberOfSections;
-                    PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                    PESections = IMAGE_FIRST_SECTION(PEHeader64);
                     while(SectionNumber > 0)
                     {
                         fileSectionData[i][0] = (ULONG_PTR)(PESections->PointerToRawData);
@@ -406,7 +406,7 @@ __declspec(dllexport) bool TITCALL MakeAllSectionsRWEW(wchar_t* szFileName)
             }
             if(!FileIs64)
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader32);
                 SectionNumber = PEHeader32->FileHeader.NumberOfSections;
                 __try
                 {
@@ -445,7 +445,7 @@ __declspec(dllexport) bool TITCALL MakeAllSectionsRWEW(wchar_t* szFileName)
             }
             else
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader64);
                 SectionNumber = PEHeader64->FileHeader.NumberOfSections;
                 __try
                 {
@@ -595,7 +595,7 @@ __declspec(dllexport) long TITCALL AddNewSectionExW(wchar_t* szFileName, char* s
             }
             if(!FileIs64)
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader32);
                 SectionNumber = PEHeader32->FileHeader.NumberOfSections;
                 __try
                 {
@@ -628,7 +628,7 @@ __declspec(dllexport) long TITCALL AddNewSectionExW(wchar_t* szFileName, char* s
             }
             else
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader64);
                 SectionNumber = PEHeader64->FileHeader.NumberOfSections;
                 __try
                 {
@@ -703,7 +703,7 @@ __declspec(dllexport) long TITCALL AddNewSectionExW(wchar_t* szFileName, char* s
                         {
                             alignedSectionSize = alignedSectionSize + PEHeader32->OptionalHeader.SectionAlignment;
                         }
-                        PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                        PESections = IMAGE_FIRST_SECTION(PEHeader32);
                         SectionNumber = PEHeader32->FileHeader.NumberOfSections;
                         PEHeader32->FileHeader.NumberOfSections = PEHeader32->FileHeader.NumberOfSections + 1;
                         PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PESections + (SectionNumber - 1)* IMAGE_SIZEOF_SECTION_HEADER);
@@ -785,7 +785,7 @@ __declspec(dllexport) long TITCALL AddNewSectionExW(wchar_t* szFileName, char* s
                         {
                             alignedSectionSize = alignedSectionSize + PEHeader64->OptionalHeader.SectionAlignment;
                         }
-                        PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                        PESections = IMAGE_FIRST_SECTION(PEHeader64);
                         SectionNumber = PEHeader64->FileHeader.NumberOfSections;
                         PEHeader32->FileHeader.NumberOfSections = PEHeader32->FileHeader.NumberOfSections + 1;
                         PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PESections + (SectionNumber - 1)* IMAGE_SIZEOF_SECTION_HEADER);
@@ -945,7 +945,7 @@ __declspec(dllexport) bool TITCALL ResizeLastSectionW(wchar_t* szFileName, DWORD
             }
             if(!FileIs64)
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader32);
                 SectionNumber = PEHeader32->FileHeader.NumberOfSections;
                 SectionNumber--;
                 PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PESections + SectionNumber * IMAGE_SIZEOF_SECTION_HEADER);
@@ -1014,7 +1014,7 @@ __declspec(dllexport) bool TITCALL ResizeLastSectionW(wchar_t* szFileName, DWORD
             }
             else
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader64);
                 SectionNumber = PEHeader64->FileHeader.NumberOfSections;
                 SectionNumber--;
                 PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PESections + SectionNumber * IMAGE_SIZEOF_SECTION_HEADER);
@@ -1161,7 +1161,7 @@ __declspec(dllexport) bool TITCALL DeleteLastSectionW(wchar_t* szFileName)
             }
             if(!FileIs64)
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader32);
                 SectionNumber = PEHeader32->FileHeader.NumberOfSections;
                 __try
                 {
@@ -1207,7 +1207,7 @@ __declspec(dllexport) bool TITCALL DeleteLastSectionW(wchar_t* szFileName)
             }
             else
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader64);
                 SectionNumber = PEHeader64->FileHeader.NumberOfSections;
                 __try
                 {
@@ -1362,7 +1362,7 @@ __declspec(dllexport) bool TITCALL WipeSectionW(wchar_t* szFileName, int WipeSec
                 {
                     WipeSectionVirSize = (DWORD)GetPE32DataFromMappedFile(FileMapVA, WipeSectionNumber, UE_SECTIONVIRTUALSIZE);
                     WipeSectionSize = (DWORD)GetPE32DataFromMappedFile(FileMapVA, WipeSectionNumber, UE_SECTIONRAWSIZE);
-                    PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                    PESections = IMAGE_FIRST_SECTION(PEHeader32);
                     FileAlignment = PEHeader32->OptionalHeader.FileAlignment;
                     __try
                     {
@@ -1448,7 +1448,7 @@ __declspec(dllexport) bool TITCALL WipeSectionW(wchar_t* szFileName, int WipeSec
                         WipeSectionVirSize = ((WipeSectionVirSize / PEHeader32->OptionalHeader.SectionAlignment) + 1) * PEHeader32->OptionalHeader.SectionAlignment;
                     }
                     WipeSectionSize = (DWORD)GetPE32DataFromMappedFile(FileMapVA, WipeSectionNumber, UE_SECTIONRAWSIZE);
-                    PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                    PESections = IMAGE_FIRST_SECTION(PEHeader64);
                     FileAlignment = PEHeader64->OptionalHeader.FileAlignment;
                     __try
                     {
diff --git a/TitanEngine/TitanEngine.Realigner.cpp b/TitanEngine/TitanEngine.Realigner.cpp
index 1415a7c..f41f771 100644
--- a/TitanEngine/TitanEngine.Realigner.cpp
+++ b/TitanEngine/TitanEngine.Realigner.cpp
@@ -79,7 +79,7 @@ __declspec(dllexport) long TITCALL RealignPE(ULONG_PTR FileMapVA, DWORD FileSize
             }
             if(!FileIs64)
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader32);
                 SectionNumber = PEHeader32->FileHeader.NumberOfSections;
                 FileAlignment = PEHeader32->OptionalHeader.FileAlignment;
                 if(FileAlignment == 0x1000)
@@ -143,7 +143,7 @@ __declspec(dllexport) long TITCALL RealignPE(ULONG_PTR FileMapVA, DWORD FileSize
             }
             else
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader64);
                 SectionNumber = PEHeader64->FileHeader.NumberOfSections;
                 FileAlignment = PEHeader64->OptionalHeader.FileAlignment;
                 if(FileAlignment == 0x1000)
@@ -286,7 +286,7 @@ __declspec(dllexport) long TITCALL RealignPEExW(wchar_t* szFileName, DWORD Reali
             }
             if(!FileIs64)
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader32);
                 SectionNumber = PEHeader32->FileHeader.NumberOfSections;
                 if(ForcedFileAlignment == 0x0)
                 {
@@ -376,7 +376,7 @@ __declspec(dllexport) long TITCALL RealignPEExW(wchar_t* szFileName, DWORD Reali
             }
             else
             {
-                PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                PESections = IMAGE_FIRST_SECTION(PEHeader64);
                 SectionNumber = PEHeader64->FileHeader.NumberOfSections;
                 if(ForcedFileAlignment == 0x0)
                 {
diff --git a/TitanEngine/TitanEngine.Static.cpp b/TitanEngine/TitanEngine.Static.cpp
index 0c5ea8e..bfdf914 100644
--- a/TitanEngine/TitanEngine.Static.cpp
+++ b/TitanEngine/TitanEngine.Static.cpp
@@ -128,7 +128,7 @@ __declspec(dllexport) bool TITCALL StaticFileUnloadW(wchar_t* szFileName, bool C
                     if(!FileIs64)
                     {
                         PeHeaderSize = PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_SECTION_HEADER) * PEHeader32->FileHeader.NumberOfSections;
-                        PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                        PESections = IMAGE_FIRST_SECTION(PEHeader32);
                         SectionNumber = PEHeader32->FileHeader.NumberOfSections;
                         RtlMoveMemory((LPVOID)myFileMapVA, (LPVOID)FileMapVA, PeHeaderSize);
 
@@ -147,7 +147,7 @@ __declspec(dllexport) bool TITCALL StaticFileUnloadW(wchar_t* szFileName, bool C
                     else
                     {
                         PeHeaderSize = PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_SECTION_HEADER) * PEHeader64->FileHeader.NumberOfSections;
-                        PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader64 + PEHeader64->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
+                        PESections = IMAGE_FIRST_SECTION(PEHeader64);
                         SectionNumber = PEHeader64->FileHeader.NumberOfSections;
                         RtlMoveMemory((LPVOID)myFileMapVA, (LPVOID)FileMapVA, PeHeaderSize);