- fixed some warnings with SIZE_T conversions

- renamed scylla_wrapper header file
This commit is contained in:
mr.exodia 2014-01-26 13:44:39 +01:00
parent 11543652c5
commit 2d7313ed4c
5 changed files with 97 additions and 77 deletions

View File

@ -20,8 +20,8 @@
// Global.Engine: // Global.Engine:
#include "definitions.h" #include "definitions.h"
#include "resource.h" #include "resource.h"
// 3rd party // scylla wrapper
#include "3rdparty-definitions.h" #include "scylla_wrapper.h"
#define TE_VER_MAJOR 2 #define TE_VER_MAJOR 2
#define TE_VER_MIDDLE 1 #define TE_VER_MIDDLE 1
@ -15898,7 +15898,7 @@ __declspec(dllexport) bool TITCALL SetHardwareBreakPoint(ULONG_PTR bpxAddress, D
return false; return false;
} }
uintdr7(GetContextData(UE_DR7), &dr7); uintdr7((ULONG_PTR)GetContextData(UE_DR7), &dr7);
DebugRegister[hwbpIndex].DrxExecution=false; DebugRegister[hwbpIndex].DrxExecution=false;
@ -16065,7 +16065,7 @@ __declspec(dllexport) bool TITCALL SetHardwareBreakPointEx(HANDLE hActiveThread,
return false; return false;
} }
uintdr7(GetContextDataEx(hActiveThread, UE_DR7), &dr7); uintdr7((ULONG_PTR)GetContextDataEx(hActiveThread, UE_DR7), &dr7);
DebugRegister[hwbpIndex].DrxExecution=false; DebugRegister[hwbpIndex].DrxExecution=false;
@ -16236,7 +16236,7 @@ __declspec(dllexport) void TITCALL DebugLoop()
fCustomBreakPoint myCustomBreakPoint; fCustomBreakPoint myCustomBreakPoint;
fFindOEPHandler myFindOEPHandler; fFindOEPHandler myFindOEPHandler;
ULONG_PTR MemoryBpxCallBack = 0; ULONG_PTR MemoryBpxCallBack = 0;
DWORD ResetBPXSize = 0; SIZE_T ResetBPXSize = 0;
ULONG_PTR ResetBPXAddressTo = 0; ULONG_PTR ResetBPXAddressTo = 0;
ULONG_PTR ResetMemBPXAddress = 0; ULONG_PTR ResetMemBPXAddress = 0;
SIZE_T ResetMemBPXSize = 0; SIZE_T ResetMemBPXSize = 0;

View File

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

View File

@ -50,7 +50,19 @@
<ClInclude Include="definitions.h"> <ClInclude Include="definitions.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </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> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>

View File

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