Small cleanup for v1.2.0

zanzo420 · Feb 24, 2018 · 4be0b3f · 4be0b3f
1 parent 714d1e7
commit 4be0b3f
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 63 deletions.
diff --git a/.gitignore b/.gitignore
@@ -61,3 +61,5 @@ DriverPlugin_dbg.rc-plugin64d
 /BIN/plugins-lol/TestPlugin.rc-plugin64
 /BIN/plugins-lol/TestPlugin.rc-plugin
 /BIN/plugins-lol/TestPlugin.lib
+*.rc-plugin
+/BIN/plugins/TestPlugin.lib
diff --git a/ReClass/CClassView.cpp b/ReClass/CClassView.cpp
@@ -1714,7 +1714,7 @@ void CClassView::ReplaceSelectedWithType( NodeType Type )
 
 void CClassView::ClearSelection( )
 {
-    for (int i = 0; i < m_Selected.size( ); i++)
+    for (size_t i = 0; i < m_Selected.size( ); i++)
         m_Selected[i].Object->Unselect( );
     m_Selected.clear( );
 }

diff --git a/ReClass/CNodeDWORD.cpp b/ReClass/CNodeDWORD.cpp
@@ -8,26 +8,25 @@ CNodeDword::CNodeDword( )
 
 void CNodeDword::Update( const PHOTSPOT Spot )
 {
-    unsigned __int32 UInt32Value;
+    DWORD DwordValue;
 
 	StandardUpdate( Spot );
 
-    UInt32Value = _tcstoul( Spot->Text.GetString( ), NULL, g_bUnsignedHex ? 16 : 10 );
+    DwordValue = _tcstoul( Spot->Text.GetString( ), NULL, g_bUnsignedHex ? 16 : 10 );
 	if (Spot->Id == 0)
-		ReClassWriteMemory( (LPVOID)Spot->Address, &UInt32Value, sizeof( unsigned long ) );
+		ReClassWriteMemory( (LPVOID)Spot->Address, &DwordValue, sizeof( DWORD ) );
 }
 
 NODESIZE CNodeDword::Draw( const PVIEWINFO View, int x, int y )
 {
     int tx;
     NODESIZE DrawSize;
-    unsigned __int32* Data;
+    DWORD* Data;
 
 	if (m_bHidden)
 		return DrawHidden( View, x, y );
 
-
-    Data = (unsigned __int32*)(View->Data + m_Offset);
+    Data = (DWORD*)(View->Data + m_Offset);
 	AddSelection( View, 0, y, g_FontHeight );
 	AddDelete( View, x, y );
 	AddTypeDrop( View, x, y );

diff --git a/ReClass/CNodeDWORD.h b/ReClass/CNodeDWORD.h
@@ -8,7 +8,7 @@ class CNodeDword : public CNodeBase {
 
 	virtual void Update( const PHOTSPOT Spot );
 
-	virtual ULONG GetMemorySize( ) { return sizeof( unsigned __int32 ); }
+	virtual ULONG GetMemorySize( ) { return sizeof( DWORD ); }
 
 	virtual NODESIZE Draw( const PVIEWINFO View, int x, int y );
 };
diff --git a/ReClass/CNodeQWORD.cpp b/ReClass/CNodeQWORD.cpp
@@ -8,25 +8,25 @@ CNodeQword::CNodeQword( )
 
 void CNodeQword::Update( const PHOTSPOT Spot )
 {
-    unsigned __int64 UInt64Value;
+    UINT64 Uint64Value;
 
 	StandardUpdate( Spot );
 
-    UInt64Value = _tcstoull( Spot->Text.GetString( ), NULL, g_bUnsignedHex ? 16 : 10 );
+    Uint64Value = _tcstoull( Spot->Text.GetString( ), NULL, g_bUnsignedHex ? 16 : 10 );
 	if (Spot->Id == 0)
-		ReClassWriteMemory( (LPVOID)Spot->Address, &UInt64Value, sizeof( unsigned __int64 ) );
+		ReClassWriteMemory( (LPVOID)Spot->Address, &Uint64Value, sizeof( UINT64 ) );
 }
 
 NODESIZE CNodeQword::Draw( const PVIEWINFO View, int x, int y )
 {
     int tx;
     NODESIZE DrawSize;
-    unsigned __int64* Data;
+    UINT64* Data;
 
 	if (m_bHidden)
 		return DrawHidden( View, x, y );
 
-    Data = (unsigned __int64*)(View->Data + m_Offset);
+    Data = (UINT64*)(View->Data + m_Offset);
 	AddSelection( View, 0, y, g_FontHeight );
 	AddDelete( View, x, y );
 	AddTypeDrop( View, x, y );

diff --git a/ReClass/CNodeQWORD.h b/ReClass/CNodeQWORD.h
@@ -8,7 +8,7 @@ class CNodeQword : public CNodeBase {
 
 	virtual void Update( const PHOTSPOT Spot );
 
-	virtual ULONG GetMemorySize( ) { return sizeof( unsigned __int64 ); }
+	virtual ULONG GetMemorySize( ) { return sizeof( UINT64 ); }
 
 	virtual NODESIZE Draw( const PVIEWINFO View, int x, int y );
 };
diff --git a/ReClass/CNodeWORD.cpp b/ReClass/CNodeWORD.cpp
@@ -9,25 +9,25 @@ CNodeWord::CNodeWord( )
 
 void CNodeWord::Update( const PHOTSPOT Spot )
 {
-    unsigned __int16 UInt16Value;
+    WORD Uint16Value;
 
 	StandardUpdate( Spot );
 
-    UInt16Value = (unsigned __int16)_tcstoul( Spot->Text.GetString( ), NULL, g_bUnsignedHex ? 16 : 10 );
+    Uint16Value = (WORD)_tcstoul( Spot->Text.GetString( ), NULL, g_bUnsignedHex ? 16 : 10 );
 	if (Spot->Id == 0)
-		ReClassWriteMemory( (LPVOID)Spot->Address, &UInt16Value, sizeof( unsigned __int16 ) );
+		ReClassWriteMemory( (LPVOID)Spot->Address, &Uint16Value, sizeof( WORD ) );
 }
 
 NODESIZE CNodeWord::Draw( const PVIEWINFO View, int x, int y )
 {
     int tx;
     NODESIZE DrawSize;
-    unsigned __int16 *Data;
+    WORD *Data;
 
 	if (m_bHidden)
 		return DrawHidden( View, x, y );
 
-    Data = (unsigned __int16*)(View->Data + m_Offset);
+    Data = (WORD*)(View->Data + m_Offset);
 
 	AddSelection( View, 0, y, g_FontHeight );
 	AddDelete( View, x, y );

diff --git a/ReClass/CNodeWORD.h b/ReClass/CNodeWORD.h
@@ -8,7 +8,7 @@ class CNodeWord : public CNodeBase {
 
 	virtual void Update( const PHOTSPOT Spot );
 
-	virtual ULONG GetMemorySize( ) { return sizeof( unsigned __int16 ); }
+	virtual ULONG GetMemorySize( ) { return sizeof( WORD ); }
 
 	virtual NODESIZE Draw( const PVIEWINFO View, int x, int y );
 };
diff --git a/ReClass/ReClassEx.vcxproj b/ReClass/ReClassEx.vcxproj
@@ -127,7 +127,7 @@
       <OpenMPSupport>false</OpenMPSupport>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <AdditionalIncludeDirectories>..\DIA SDK\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(VSInstallDir)DIA SDK\include;$(SolutionDir)scintilla\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CreateHotpatchableImage>false</CreateHotpatchableImage>
       <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -143,7 +143,7 @@
       <AdditionalManifestDependencies>"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'"</AdditionalManifestDependencies>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
-      <AdditionalLibraryDirectories>..\DIA SDK\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(VSInstallDir)DIA SDK\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
@@ -169,7 +169,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <Optimization>Disabled</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AdditionalIncludeDirectories>..\DIA SDK\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(VSInstallDir)DIA SDK\include;$(SolutionDir)scintilla\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
@@ -182,7 +182,7 @@
       <IgnoreSpecificDefaultLibraries>crt.lib</IgnoreSpecificDefaultLibraries>
       <AdditionalDependencies>BeaEngine_s_stdcalld.lib;SciLexerd.lib;Psapi.lib;comctl32.lib</AdditionalDependencies>
       <AdditionalManifestDependencies>"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'";%(AdditionalManifestDependencies)</AdditionalManifestDependencies>
-      <AdditionalLibraryDirectories>..\DIA SDK\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(VSInstallDir)DIA SDK\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Midl>
@@ -206,7 +206,7 @@
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>..\DIA SDK\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(VSInstallDir)DIA SDK\include;$(SolutionDir)scintilla\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
@@ -245,7 +245,7 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(VSInstallDir)\DIA SDK\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(VSInstallDir)DIA SDK\include;$(SolutionDir)scintilla\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
@@ -258,7 +258,7 @@
       <IgnoreSpecificDefaultLibraries>LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
       <AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalManifestDependencies>"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'";%(AdditionalManifestDependencies)</AdditionalManifestDependencies>
-      <AdditionalLibraryDirectories>..\DIA SDK\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(VSInstallDir)DIA SDK\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>BeaEngine_s_stdcalld_64.lib;SciLexerd_64.lib;Psapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Midl>

diff --git a/ReClass/ReClassEx.vcxproj.filters b/ReClass/ReClassEx.vcxproj.filters
@@ -66,95 +66,95 @@
     <None Include="res\icon1.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\general_class_VS.ico">
+    <None Include="res\classicon.bmp">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\general_method_VS.ico">
+    <None Include="res\symsrv32.dll" />
+    <None Include="res\symsrv64.dll" />
+    <None Include="res\icons\about.bmp">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\open.ico">
+    <None Include="res\icons\add.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\closed.ico">
+    <None Include="res\icons\array.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\general_interface_VS.ico">
+    <None Include="res\icons\arrow_icon.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\close.ico">
+    <None Include="res\icons\button.bmp">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\add.ico">
+    <None Include="res\icons\camera.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\speles_random_ico.ico">
+    <None Include="res\icons\close.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\arrow_icon.ico">
+    <None Include="res\icons\closed.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\pointer.ico">
+    <None Include="res\icons\custom.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\array.ico">
+    <None Include="res\icons\enum.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\custom.ico">
+    <None Include="res\icons\exchange.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\enum.ico">
+    <None Include="res\icons\float.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\float.ico">
+    <None Include="res\icons\general_class_VS.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\left.ico">
+    <None Include="res\icons\general_interface_VS.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\right.ico">
+    <None Include="res\icons\general_method_VS.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\matrix.ico">
+    <None Include="res\icons\icon.bmp">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\signed.ico">
+    <None Include="res\icons\icon.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\text.ico">
+    <None Include="res\icons\left.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\unsigned.ico">
+    <None Include="res\icons\matrix.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\vector.ico">
+    <None Include="res\icons\open.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\icon.ico">
+    <None Include="res\icons\pointer.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\icon.bmp">
+    <None Include="res\icons\reclass.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\button.bmp">
+    <None Include="res\icons\right.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\about.bmp">
+    <None Include="res\icons\signed.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\exchange.ico">
+    <None Include="res\icons\speles_random_ico.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\camera.ico">
+    <None Include="res\icons\text.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="res\classicon.bmp">
+    <None Include="res\icons\unsigned.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Images\reclass.png">
+    <None Include="res\icons\vector.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="res\symsrv32.dll" />
-    <None Include="res\symsrv64.dll" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">

diff --git a/ReClass/stdafx.cpp b/ReClass/stdafx.cpp
@@ -128,7 +128,7 @@ CStringA ReadMemoryStringA( ULONG_PTR address, SIZE_T max )
 
 	if (ReClassReadMemory( (PVOID)address, (LPVOID)buffer.get( ), max, &bytesRead ) != 0)
 	{
-		for (int i = 0; i < bytesRead; i++)
+		for (size_t i = 0; i < bytesRead; i++)
 		{
 			if (!(buffer[i] > 0x1F && buffer[i] < 0xFF && buffer[i] != 0x7F) && buffer[i] != '\0')
 				buffer[i] = '.';
@@ -154,7 +154,7 @@ CStringW ReadMemoryStringW( ULONG_PTR address, SIZE_T max )
 	{
 		bytesRead /= sizeof( wchar_t );
 
-		for (int i = 0; i < bytesRead; i++)
+		for (size_t i = 0; i < bytesRead; i++)
 		{
 			if (!(buffer[i] > 0x1F && buffer[i] < 0xFF && buffer[i] != 0x7F) && buffer[i] != '\0')
 				buffer[i] = '.';

diff --git a/ReClass/stdafx.h b/ReClass/stdafx.h
@@ -46,8 +46,8 @@
 // Scintilla parser
 //
 #define PLAT_WIN 1
-#include "..\\scintilla\\include\\SciLexer.h"
-#include "..\\scintilla\\include\\Scintilla.h"
+#include "SciLexer.h"
+#include "Scintilla.h"
 
 // A few basic colors for scintilla editor
 const COLORREF black = RGB( 0, 0, 0 );
@@ -67,7 +67,6 @@ const COLORREF purple = RGB( 128, 0, 255 );
 //
 // TinyXml parser
 //
-//#include "tinyxml2_unicode.h"
 #include "tinyxml2.h"
 using namespace tinyxml2;