Rename ReClassEx vcxproj files. Fixed some warnings when compiling with VS2017.

dude719 · dude719 · commit cc7384ed8243 · 2018-02-24T10:24:00.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -53,3 +53,4 @@ DriverPlugin_dbg.rc-plugin64d
 *.db-shm
 *.rc-plugin64d
 /ReClass/plugins/TestPlugin_dbg.lib
+*.tmp
diff --git a/ReClass.sln b/ReClass.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27004.2009
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReClassEx", "ReClass\ReClass 2016.vcxproj", "{FA80DCEB-16C4-43D1-8451-6EE506D5FF82}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReClassEx", "ReClass\ReClassEx.vcxproj", "{FA80DCEB-16C4-43D1-8451-6EE506D5FF82}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestPlugin", "TestPlugin\TestPlugin\TestPlugin.vcxproj", "{1C466572-2001-4FA9-B4EB-D4A819D802E8}"
 	ProjectSection(ProjectDependencies) = postProject
diff --git a/ReClass/CClassView.cpp b/ReClass/CClassView.cpp
@@ -620,11 +620,11 @@ void CClassView::OnLButtonDown( UINT nFlags, CPoint point )
                     for (j = 0; j < out[s].second.size( ); j++)
                     {
                         MenuInner.AppendMenu( MF_STRING | MF_ENABLED, WM_CHANGECLASSMENU + out[s].second[j].second, out[s].second[j].first );
-                        MenuInner.SetMenuItemBitmaps( j, MF_BYPOSITION, &bmp, &bmp );
+                        MenuInner.SetMenuItemBitmaps( (UINT)j, MF_BYPOSITION, &bmp, &bmp );
                     }
 
                     Menu.AppendMenu( MF_POPUP, (UINT_PTR)MenuInner.m_hMenu, CString( out[s].first ) );
-                    Menu.SetMenuItemBitmaps( s, MF_BYPOSITION, &bmp, &bmp );
+                    Menu.SetMenuItemBitmaps( (UINT)s, MF_BYPOSITION, &bmp, &bmp );
                 }
 
                 Menu.TrackPopupMenu( TPM_LEFTALIGN | TPM_NOANIMATION, pos.left, pos.bottom, this );
diff --git a/ReClass/CNodeArray.cpp b/ReClass/CNodeArray.cpp
@@ -10,25 +10,28 @@ CNodeArray::CNodeArray( )
 
 void CNodeArray::Update( const PHOTSPOT Spot )
 {
-    int IntValue;
+    LONG LongValue;
+    ULONG UlongValue;
 
 	StandardUpdate( Spot );
 
-    IntValue = _ttoi( Spot->Text.GetString( ) );
-	if (IntValue < 0)
+    LongValue = _ttol( Spot->Text.GetString( ) );
+	if (LongValue < 0)
 		return;
 
+    UlongValue = (ULONG)LongValue;
+
 	if (Spot->Id == 0)
 	{
-		if (IntValue == 0)
+		if (UlongValue == 0)
 			return;
-		m_ulTotal = (ULONG)IntValue;
+		m_ulTotal = UlongValue;
 	}
 	else if (Spot->Id == 1)
 	{
-		if (IntValue >= m_ulTotal)
+		if (UlongValue >= m_ulTotal)
 			return;
-		m_iCurrent = IntValue;
+		m_iCurrent = UlongValue;
 	}
 	else if (Spot->Id == 2)
 	{
@@ -37,7 +40,7 @@ void CNodeArray::Update( const PHOTSPOT Spot )
 	}
 	else if (Spot->Id == 3)
 	{
-		if ((ULONG)m_iCurrent < m_ulTotal - 1)
+		if (m_iCurrent < (INT)m_ulTotal - 1)
 			m_iCurrent++;
 	}
 }
@@ -70,7 +73,7 @@ NODESIZE CNodeArray::Draw( const PVIEWINFO View, int x, int y )
 	tx = AddText( View, tx, y, g_crType, HS_NONE, _T( "Array " ) );
 	tx = AddText( View, tx, y, g_crName, HS_NAME, _T( "%s" ), m_strName );
 	tx = AddText( View, tx, y, g_crIndex, HS_NONE, _T( "[" ) );
-	tx = AddText( View, tx, y, g_crIndex, HS_EDIT, _T( "%i" ), m_ulTotal );
+	tx = AddText( View, tx, y, g_crIndex, HS_EDIT, _T( "%u" ), m_ulTotal );
 	tx = AddText( View, tx, y, g_crIndex, HS_NONE, _T( "]" ) );
 
 	tx = AddIcon( View, tx, y, ICON_LEFT, HS_SELECT, HS_CLICK );
@@ -79,7 +82,7 @@ NODESIZE CNodeArray::Draw( const PVIEWINFO View, int x, int y )
 	tx = AddText( View, tx, y, g_crIndex, HS_NONE, _T( ")" ) );
 	tx = AddIcon( View, tx, y, ICON_RIGHT, HS_DROP, HS_CLICK );
 
-	tx = AddText( View, tx, y, g_crValue, HS_NONE, _T( "<%s Size=%i>" ), m_pNode->GetName( ), GetMemorySize( ) );
+	tx = AddText( View, tx, y, g_crValue, HS_NONE, _T( "<%s Size=%u>" ), m_pNode->GetName( ), GetMemorySize( ) );
 	tx = AddIcon( View, tx, y, ICON_CHANGE, HS_CLICK, HS_CHANGE_X );
 
 	tx += g_FontWidth;
diff --git a/ReClass/CNodeArray.h b/ReClass/CNodeArray.h
@@ -19,5 +19,5 @@ class CNodeArray : public CNodeBase {
 protected:
 	CNodeClass* m_pNode;
 	ULONG m_ulTotal;
-	int m_iCurrent;
+	INT m_iCurrent;
 };
diff --git a/ReClass/CNodeBase.h b/ReClass/CNodeBase.h
@@ -133,15 +133,15 @@ class CNodeBase {
 	inline void SetParent( CNodeBase* newParentNode ) { m_pParentNode = newParentNode; }
 
 	inline void AddNode( CNodeBase* newNode ) { m_ChildNodes.push_back( newNode ); }
-	inline void InsertNode( int idx, CNodeBase* newNode ) { m_ChildNodes.insert( m_ChildNodes.begin( ) + idx, newNode ); }
-	inline CNodeBase* GetNode( int idx ) { return (CNodeBase*)m_ChildNodes[idx]; }
+	inline void InsertNode( size_t idx, CNodeBase* newNode ) { m_ChildNodes.insert( m_ChildNodes.begin( ) + idx, newNode ); }
+	inline CNodeBase* GetNode( size_t idx ) { return (CNodeBase*)m_ChildNodes[idx]; }
 	inline int FindNode( CNodeBase* pNode ) {
 		auto found = std::find( m_ChildNodes.begin( ), m_ChildNodes.end( ), pNode );
 		return (found != m_ChildNodes.end( )) ? (int)(found - m_ChildNodes.begin( )) : -1;
 	}
-	inline void SetNode( int idx, CNodeBase* newNode ) { m_ChildNodes[idx] = newNode; }
-	inline void DeleteNode( int idx ) { if (m_ChildNodes[idx]) { delete(m_ChildNodes[idx]); RemoveNode( idx ); } }
-	inline void RemoveNode( int idx ) { m_ChildNodes.erase( m_ChildNodes.begin( ) + idx ); }
+	inline void SetNode( size_t idx, CNodeBase* newNode ) { m_ChildNodes[idx] = newNode; }
+	inline void DeleteNode( size_t idx ) { if (m_ChildNodes[idx]) { delete(m_ChildNodes[idx]); RemoveNode( idx ); } }
+	inline void RemoveNode( size_t idx ) { m_ChildNodes.erase( m_ChildNodes.begin( ) + idx ); }
 	inline size_t NodeCount( ) const { return m_ChildNodes.size( ); }
 
 	inline bool IsHidden( ) { return m_bHidden; }
diff --git a/ReClass/CNodePtrArray.cpp b/ReClass/CNodePtrArray.cpp
@@ -2,9 +2,9 @@
 #include "CNodePtrArray.h"
 
 CNodePtrArray::CNodePtrArray( )
-    : m_PtrCount( 1 )
-    , m_CurrentIndex( 0 )
-    , m_NodePtr( new CNodePtr )
+    : m_ulPtrCount( 1 )
+    , m_iCurrentIndex( 0 )
+    , m_pNodePtr( new CNodePtr )
 {
     m_nodeType = nt_ptrarray;
 }
@@ -35,16 +35,16 @@ NODESIZE CNodePtrArray::Draw( const PVIEWINFO View, int x, int y )
     tx = AddText( View, tx, y, g_crType, HS_NONE, _T( "ArrayOfPointers " ) );
     tx = AddText( View, tx, y, g_crName, HS_NAME, _T( "%s" ), m_strName );
     tx = AddText( View, tx, y, g_crIndex, HS_NONE, _T( "[" ) );
-    tx = AddText( View, tx, y, g_crIndex, HS_EDIT, _T( "%i" ), m_PtrCount );
+    tx = AddText( View, tx, y, g_crIndex, HS_EDIT, _T( "%u" ), m_ulPtrCount );
     tx = AddText( View, tx, y, g_crIndex, HS_NONE, _T( "]" ) );
 
     tx = AddIcon( View, tx, y, ICON_LEFT, HS_SELECT, HS_CLICK );
     tx = AddText( View, tx, y, g_crIndex, HS_NONE, _T( "(" ) );
-    tx = AddText( View, tx, y, g_crIndex, 1, _T( "%i" ), m_CurrentIndex );
+    tx = AddText( View, tx, y, g_crIndex, 1, _T( "%i" ), m_iCurrentIndex );
     tx = AddText( View, tx, y, g_crIndex, HS_NONE, _T( ")" ) );
     tx = AddIcon( View, tx, y, ICON_RIGHT, HS_DROP, HS_CLICK );
 
-    tx = AddText( View, tx, y, g_crValue, HS_NONE, _T( "<%s* Size=%i>" ), m_NodePtr->GetClass( )->GetName( ), GetMemorySize( ) );
+    tx = AddText( View, tx, y, g_crValue, HS_NONE, _T( "<%s* Size=%u>" ), m_pNodePtr->GetClass( )->GetName( ), GetMemorySize( ) );
     tx = AddIcon( View, tx, y, ICON_CHANGE, HS_CLICK, HS_CHANGE_X );
 
     tx += g_FontWidth;
@@ -53,19 +53,19 @@ NODESIZE CNodePtrArray::Draw( const PVIEWINFO View, int x, int y )
     y += g_FontHeight;
     if (m_LevelsOpen[View->Level])
     {
-        if (IsMemory( View->Address + m_Offset + (sizeof( uintptr_t ) * m_CurrentIndex) ))
+        if (IsMemory( View->Address + m_Offset + (sizeof( ULONG_PTR ) * m_iCurrentIndex) ))
         {
-            ClassSize = m_NodePtr->GetClass( )->GetMemorySize( );
-            m_NodePtr->Memory( )->SetSize( ClassSize );
+            ClassSize = m_pNodePtr->GetClass( )->GetMemorySize( );
+            m_pNodePtr->Memory( )->SetSize( ClassSize );
 
             VIEWINFO NewView;
             memcpy( &NewView, View, sizeof( NewView ) );
-            NewView.Data = m_NodePtr->Memory( )->Data( );
-            NewView.Address = *(uintptr_t*)(View->Data + m_Offset + (sizeof( uintptr_t ) * m_CurrentIndex));
+            NewView.Data = m_pNodePtr->Memory( )->Data( );
+            NewView.Address = *(ULONG_PTR*)(View->Data + m_Offset + (sizeof( ULONG_PTR ) * m_iCurrentIndex));
 
             ReClassReadMemory( (LPVOID)NewView.Address, (LPVOID)NewView.Data, ClassSize );
 
-            ChildDrawSize = m_NodePtr->GetClass( )->Draw( &NewView, x, y );
+            ChildDrawSize = m_pNodePtr->GetClass( )->Draw( &NewView, x, y );
 
             y = ChildDrawSize.y;
             if (ChildDrawSize.x > DrawSize.x)
@@ -79,36 +79,43 @@ NODESIZE CNodePtrArray::Draw( const PVIEWINFO View, int x, int y )
 
 ULONG CNodePtrArray::GetMemorySize( )
 {
-    return m_NodePtr->GetMemorySize( ) * m_PtrCount;
+    return m_pNodePtr->GetMemorySize( ) * m_ulPtrCount;
 }
 
 void CNodePtrArray::Update( const PHOTSPOT Spot )
 {
+    LONG LongValue;
+    ULONG UlongValue;
+
     StandardUpdate( Spot );
 
-    int v = _ttoi( Spot->Text.GetString( ) );
-    if (v < 0) return;
+    LongValue = _ttol( Spot->Text.GetString( ) );
+    if (LongValue < 0)
+        return;
+
+    UlongValue = (ULONG)LongValue;
 
     if (Spot->Id == 0)
     {
-        if (v == 0)
+        if (UlongValue == 0)
             return;
-        m_PtrCount = (size_t)v;
+        m_ulPtrCount = UlongValue;
     }
     else if (Spot->Id == 1)
     {
-        if (v >= (int)m_PtrCount) return;
-        m_CurrentIndex = (int)v;
+        if (UlongValue >= m_ulPtrCount) 
+            return;
+        m_iCurrentIndex = UlongValue;
     }
     else if (Spot->Id == 2)
     {
-        if (m_CurrentIndex > 0)
-            m_CurrentIndex--;
+        if (m_iCurrentIndex > 0)
+            m_iCurrentIndex--;
     }
     else if (Spot->Id == 3)
     {
-        if ((size_t)m_CurrentIndex < m_PtrCount - 1)
-            m_CurrentIndex++;
+        if (m_iCurrentIndex < (INT)m_ulPtrCount - 1)
+            m_iCurrentIndex++;
     }
 }
 
diff --git a/ReClass/CNodePtrArray.h b/ReClass/CNodePtrArray.h
@@ -11,15 +11,15 @@ class CNodePtrArray : public CNodeBase
 
 	virtual void Update( const PHOTSPOT Spot );
 
-	inline size_t Count( void ) { return m_PtrCount; }
-    inline void SetCount( size_t Count ) { m_PtrCount = Count; }
+	inline ULONG Count( void ) { return m_ulPtrCount; }
+    inline void SetCount( ULONG Count ) { m_ulPtrCount = Count; }
 
-	void SetClass( CNodeClass* pNode ) { m_NodePtr->SetClass( pNode ); }
-	CNodeClass* GetClass( void ) { return m_NodePtr->GetClass( ); }
+	void SetClass( CNodeClass* pNode ) { m_pNodePtr->SetClass( pNode ); }
+	CNodeClass* GetClass( void ) { return m_pNodePtr->GetClass( ); }
 
 protected:
-	CNodePtr* m_NodePtr;
-	size_t m_PtrCount;
-	unsigned m_CurrentIndex = 0;
+	CNodePtr* m_pNodePtr;
+    ULONG m_ulPtrCount;
+	INT m_iCurrentIndex;
 };
 
diff --git a/ReClass/DialogProcSelect.cpp b/ReClass/DialogProcSelect.cpp
@@ -290,14 +290,14 @@ void CDialogProcSelect::OnAttachButton( )
                     ProgressBar.SetStep( 1 );
                     ProgressBar.SetText( _T( "Symbols loading: " ) );
 
-					for (ULONG i = 0; i < g_MemMapModules.size( ); i++)
+					for (size_t i = 0; i < g_MemMapModules.size( ); i++)
 					{
 						TCHAR ProgressText[256];
 						MemMapInfo *CurrentModule = &g_MemMapModules[i];
 
                         ProgressBar.SetRange32( 0, (int)g_MemMapModules.size( ) );
 
-						_stprintf_s( ProgressText, _T( "[%d/%d] %s" ), i + 1, g_MemMapModules.size( ), CurrentModule->Name.GetString( ) );
+						_stprintf_s( ProgressText, _T( "[%d/%d] %s" ), (UINT)i + 1, (UINT)g_MemMapModules.size( ), CurrentModule->Name.GetString( ) );
                         StatusBar->SetPaneText( 1, ProgressText );
 
 						//MemMapInfo* pCurrentModule = new MemMapInfo( CurrentModule );
diff --git a/ReClass/ReClassEx.vcxproj b/ReClass/ReClassEx.vcxproj
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -32,31 +32,31 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Static</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Static</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Static</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Static</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -83,6 +83,7 @@
     <CodeAnalysisRules />
     <CodeAnalysisRuleAssemblies />
     <IncludePath>$(VSInstallDir)DIA SDK\include;$(IncludePath)</IncludePath>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <GenerateManifest>true</GenerateManifest>
@@ -92,6 +93,7 @@
     <CodeAnalysisRules />
     <CodeAnalysisRuleAssemblies />
     <TargetName>$(ProjectName)_dbg</TargetName>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
diff --git a/ReClass/ReClassEx.vcxproj.filters b/ReClass/ReClassEx.vcxproj.filters
diff --git a/TestPlugin/TestPlugin/TestPlugin.vcxproj b/TestPlugin/TestPlugin/TestPlugin.vcxproj
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,27 +28,27 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -620,11 +620,11 @@ void CClassView::OnLButtonDown( UINT nFlags, CPoint point )`
`620`	`620`	`for (j = 0; j < out[s].second.size( ); j++)`
`621`	`621`	`{`
`622`	`622`	`MenuInner.AppendMenu( MF_STRING \| MF_ENABLED, WM_CHANGECLASSMENU + out[s].second[j].second, out[s].second[j].first );`
`623`		`- MenuInner.SetMenuItemBitmaps( j, MF_BYPOSITION, &bmp, &bmp );`
	`623`	`+ MenuInner.SetMenuItemBitmaps( (UINT)j, MF_BYPOSITION, &bmp, &bmp );`
`624`	`624`	`}`
`625`	`625`
`626`	`626`	`Menu.AppendMenu( MF_POPUP, (UINT_PTR)MenuInner.m_hMenu, CString( out[s].first ) );`
`627`		`- Menu.SetMenuItemBitmaps( s, MF_BYPOSITION, &bmp, &bmp );`
	`627`	`+ Menu.SetMenuItemBitmaps( (UINT)s, MF_BYPOSITION, &bmp, &bmp );`
`628`	`628`	`}`
`629`	`629`
`630`	`630`	`Menu.TrackPopupMenu( TPM_LEFTALIGN \| TPM_NOANIMATION, pos.left, pos.bottom, this );`
Original file line number	Diff line number	Diff line change
`@@ -10,25 +10,28 @@ CNodeArray::CNodeArray( )`
`10`	`10`
`11`	`11`	`void CNodeArray::Update( const PHOTSPOT Spot )`
`12`	`12`	`{`
`13`		`- int IntValue;`
	`13`	`+ LONG LongValue;`
	`14`	`+ ULONG UlongValue;`
`14`	`15`
`15`	`16`	`StandardUpdate( Spot );`
`16`	`17`
`17`		`- IntValue = _ttoi( Spot->Text.GetString( ) );`
`18`		`- if (IntValue < 0)`
	`18`	`+ LongValue = _ttol( Spot->Text.GetString( ) );`
	`19`	`+ if (LongValue < 0)`
`19`	`20`	`return;`
`20`	`21`
	`22`	`+ UlongValue = (ULONG)LongValue;`
	`23`	`+`
`21`	`24`	`if (Spot->Id == 0)`
`22`	`25`	`{`
`23`		`- if (IntValue == 0)`
	`26`	`+ if (UlongValue == 0)`
`24`	`27`	`return;`
`25`		`- m_ulTotal = (ULONG)IntValue;`
	`28`	`+ m_ulTotal = UlongValue;`
`26`	`29`	`}`
`27`	`30`	`else if (Spot->Id == 1)`
`28`	`31`	`{`
`29`		`- if (IntValue >= m_ulTotal)`
	`32`	`+ if (UlongValue >= m_ulTotal)`
`30`	`33`	`return;`
`31`		`- m_iCurrent = IntValue;`
	`34`	`+ m_iCurrent = UlongValue;`
`32`	`35`	`}`
`33`	`36`	`else if (Spot->Id == 2)`
`34`	`37`	`{`
`@@ -37,7 +40,7 @@ void CNodeArray::Update( const PHOTSPOT Spot )`
`37`	`40`	`}`
`38`	`41`	`else if (Spot->Id == 3)`
`39`	`42`	`{`
`40`		`- if ((ULONG)m_iCurrent < m_ulTotal - 1)`
	`43`	`+ if (m_iCurrent < (INT)m_ulTotal - 1)`
`41`	`44`	`m_iCurrent++;`
`42`	`45`	`}`
`43`	`46`	`}`
`@@ -70,7 +73,7 @@ NODESIZE CNodeArray::Draw( const PVIEWINFO View, int x, int y )`
`70`	`73`	`tx = AddText( View, tx, y, g_crType, HS_NONE, _T( "Array " ) );`
`71`	`74`	`tx = AddText( View, tx, y, g_crName, HS_NAME, _T( "%s" ), m_strName );`
`72`	`75`	`tx = AddText( View, tx, y, g_crIndex, HS_NONE, _T( "[" ) );`
`73`		`- tx = AddText( View, tx, y, g_crIndex, HS_EDIT, _T( "%i" ), m_ulTotal );`
	`76`	`+ tx = AddText( View, tx, y, g_crIndex, HS_EDIT, _T( "%u" ), m_ulTotal );`
`74`	`77`	`tx = AddText( View, tx, y, g_crIndex, HS_NONE, _T( "]" ) );`
`75`	`78`
`76`	`79`	`tx = AddIcon( View, tx, y, ICON_LEFT, HS_SELECT, HS_CLICK );`
`@@ -79,7 +82,7 @@ NODESIZE CNodeArray::Draw( const PVIEWINFO View, int x, int y )`
`79`	`82`	`tx = AddText( View, tx, y, g_crIndex, HS_NONE, _T( ")" ) );`
`80`	`83`	`tx = AddIcon( View, tx, y, ICON_RIGHT, HS_DROP, HS_CLICK );`
`81`	`84`
`82`		`- tx = AddText( View, tx, y, g_crValue, HS_NONE, _T( "<%s Size=%i>" ), m_pNode->GetName( ), GetMemorySize( ) );`
	`85`	`+ tx = AddText( View, tx, y, g_crValue, HS_NONE, _T( "<%s Size=%u>" ), m_pNode->GetName( ), GetMemorySize( ) );`
`83`	`86`	`tx = AddIcon( View, tx, y, ICON_CHANGE, HS_CLICK, HS_CHANGE_X );`
`84`	`87`
`85`	`88`	`tx += g_FontWidth;`