- fixed some warnings with SIZE_T conversions

- renamed scylla_wrapper header file

TitanEngine/TitanEngine.cpp

@@ -20,8 +20,8 @@
 // Global.Engine:
 #include "definitions.h"
 #include "resource.h"
-// 3rd party
+// scylla wrapper
-#include "3rdparty-definitions.h"
+#include "scylla_wrapper.h"
 
 #define TE_VER_MAJOR 2
 #define TE_VER_MIDDLE 1
@@ -1201,7 +1201,7 @@ bool EngineValidateHeader(ULONG_PTR FileMapVA, HANDLE hFileProc, LPVOID ImageBas
     DWORD MemorySize = NULL;
     PIMAGE_NT_HEADERS32 PEHeader32;
     IMAGE_NT_HEADERS32 RemotePEHeader32;
-	MEMORY_BASIC_INFORMATION MemoryInfo={0};
+    MEMORY_BASIC_INFORMATION MemoryInfo= {0};
     ULONG_PTR NumberOfBytesRW = NULL;
 
     if(IsFile)
@@ -1418,8 +1418,8 @@ long long EngineSimulateDllLoader(HANDLE hProcess, char* szFileName)
     PIMAGE_EXPORT_DIRECTORY PEExports;
     PEXPORTED_DATA ExportedFunctionNames;
     ULONG_PTR ConvertedExport = NULL;
-	char szFileRemoteProc[1024]={0};
+    char szFileRemoteProc[1024]= {0};
-	char szDLLFileLocation[512]={0};
+    char szDLLFileLocation[512]= {0};
     char* szTranslatedProcName=0;
 
     GetProcessImageFileNameA(hProcess, szFileRemoteProc, sizeof(szFileRemoteProc));
@@ -1692,11 +1692,11 @@ long long EngineGlobalAPIHandler(HANDLE handleProcess, ULONG_PTR EnumedModulesBa
     HANDLE hProcess = NULL;
     ULONG_PTR EnumeratedModules[0x2000];
     ULONG_PTR LoadedModules[1000][4];
-	char RemoteDLLName[MAX_PATH]={0};
+    char RemoteDLLName[MAX_PATH]= {0};
-    char FullRemoteDLLName[MAX_PATH]={0};
+    char FullRemoteDLLName[MAX_PATH]= {0};
-    char szWindowsSideBySide[MAX_PATH]={0};
+    char szWindowsSideBySide[MAX_PATH]= {0};
-    char szWindowsSideBySideCmp[MAX_PATH]={0};
+    char szWindowsSideBySideCmp[MAX_PATH]= {0};
-    char szWindowsKernelBase[MAX_PATH]={0};
+    char szWindowsKernelBase[MAX_PATH]= {0};
     HANDLE hLoadedModule = NULL;
     HANDLE ModuleHandle = NULL;
     PIMAGE_DOS_HEADER DOSHeader;
@@ -15898,7 +15898,7 @@ __declspec(dllexport) bool TITCALL SetHardwareBreakPoint(ULONG_PTR bpxAddress, D
         return false;
     }
 
-    uintdr7(GetContextData(UE_DR7), &dr7);
+    uintdr7((ULONG_PTR)GetContextData(UE_DR7), &dr7);
 
     DebugRegister[hwbpIndex].DrxExecution=false;
 
@@ -16065,7 +16065,7 @@ __declspec(dllexport) bool TITCALL SetHardwareBreakPointEx(HANDLE hActiveThread,
         return false;
     }
 
-    uintdr7(GetContextDataEx(hActiveThread, UE_DR7), &dr7);
+    uintdr7((ULONG_PTR)GetContextDataEx(hActiveThread, UE_DR7), &dr7);
 
     DebugRegister[hwbpIndex].DrxExecution=false;
 
@@ -16236,7 +16236,7 @@ __declspec(dllexport) void TITCALL DebugLoop()
     fCustomBreakPoint myCustomBreakPoint;
     fFindOEPHandler myFindOEPHandler;
     ULONG_PTR MemoryBpxCallBack = 0;
-    DWORD ResetBPXSize = 0;
+    SIZE_T ResetBPXSize = 0;
     ULONG_PTR ResetBPXAddressTo =  0;
     ULONG_PTR ResetMemBPXAddress = 0;
     SIZE_T ResetMemBPXSize = 0;

TitanEngine/TitanEngine.vcxproj

@@ -118,6 +118,7 @@
       <SetChecksum>false</SetChecksum>
       <TargetMachine>MachineX86</TargetMachine>
       <CLRThreadAttribute>DefaultThreadingAttribute</CLRThreadAttribute>
+      <AdditionalOptions>/ignore:4197 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -151,6 +152,7 @@
       <SetChecksum>false</SetChecksum>
       <TargetMachine>MachineX64</TargetMachine>
       <CLRThreadAttribute>STAThreadingAttribute</CLRThreadAttribute>
+      <AdditionalOptions>/ignore:4197 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -175,6 +177,7 @@
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <LinkTimeCodeGeneration>
       </LinkTimeCodeGeneration>
+      <AdditionalOptions>/ignore:4197 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -208,6 +211,7 @@
       <TargetMachine>MachineX64</TargetMachine>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
+      <AdditionalOptions>/ignore:4197 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -235,9 +239,13 @@
     <ClCompile Include="LzmaDec.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="3rdparty-definitions.h" />
+    <ClInclude Include="aplib.h" />
     <ClInclude Include="definitions.h" />
+    <ClInclude Include="distorm.h" />
+    <ClInclude Include="LzmaDec.h" />
+    <ClInclude Include="LzmaTypes.h" />
     <ClInclude Include="resource.h" />
+    <ClInclude Include="scylla_wrapper.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
   </ItemGroup>

TitanEngine/TitanEngine.vcxproj.filters

@@ -50,7 +50,19 @@
     <ClInclude Include="definitions.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="3rdparty-definitions.h">
+    <ClInclude Include="scylla_wrapper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LzmaTypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LzmaDec.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="distorm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="aplib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

TitanEngine/stdafx.h

@@ -114,7 +114,7 @@ typedef struct
 {
     BYTE BreakPointActive;
     ULONG_PTR BreakPointAddress;
-    DWORD BreakPointSize;
+    SIZE_T BreakPointSize;
     BYTE OriginalByte[10];
     int BreakPointType;
     int AdvancedBreakPointType;