build with VC2008 no warnings

4 files changed, 278 insertions, 136 deletions

diff --git a/SimpleIni.h b/SimpleIni.h
index b5a526a..69ad663 100644
--- a/SimpleIni.h
+++ b/SimpleIni.h
@@ -1978,7 +1978,11 @@ CSimpleIniTempl<SI_CHAR,SI_STRLESS,SI_CONVERTER>::SetLongValue(
 
     // convert to an ASCII string
     char szInput[64];
+#if __STDC_WANT_SECURE_LIB__ && !_WIN32_WCE
+    sprintf_s(szInput, a_bUseHex ? "0x%lx" : "%ld", a_nValue);
+#else // !__STDC_WANT_SECURE_LIB__
     sprintf(szInput, a_bUseHex ? "0x%lx" : "%ld", a_nValue);
+#endif // __STDC_WANT_SECURE_LIB__
 
     // convert to output text
     SI_CHAR szOutput[64];
diff --git a/SimpleIni.sln b/SimpleIni.sln
index 6fd8a73..5911b39 100644
--- a/SimpleIni.sln
+++ b/SimpleIni.sln
@@ -1,29 +1,25 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

+Microsoft Visual Studio Solution File, Format Version 10.00

+# Visual Studio 2008

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleIni", "SimpleIni.vcproj", "{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		Debug Unicode = Debug Unicode

-		Release = Release

-		Release Unicode = Release Unicode

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug Unicode|Win32 = Debug Unicode|Win32

+		Debug|Win32 = Debug|Win32

+		Release Unicode|Win32 = Release Unicode|Win32

+		Release|Win32 = Release|Win32

 	EndGlobalSection

-	GlobalSection(ProjectDependencies) = postSolution

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

+		{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Debug|Win32.ActiveCfg = Debug|Win32

+		{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Debug|Win32.Build.0 = Debug|Win32

+		{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+		{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Release|Win32.ActiveCfg = Release|Win32

+		{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Release|Win32.Build.0 = Release|Win32

 	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Debug.ActiveCfg = Debug|Win32

-		{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Debug.Build.0 = Debug|Win32

-		{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Debug Unicode.ActiveCfg = Debug Unicode|Win32

-		{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Debug Unicode.Build.0 = Debug Unicode|Win32

-		{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Release.ActiveCfg = Release|Win32

-		{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Release.Build.0 = Release|Win32

-		{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Release Unicode.ActiveCfg = Release Unicode|Win32

-		{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Release Unicode.Build.0 = Release Unicode|Win32

-	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

-	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

 	EndGlobalSection

 EndGlobal

diff --git a/SimpleIni.vcproj b/SimpleIni.vcproj
index e5ee0db..f6db4a2 100644
--- a/SimpleIni.vcproj
+++ b/SimpleIni.vcproj
@@ -1,203 +1,324 @@
 <?xml version="1.0" encoding="shift_jis"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="9.00"

 	Name="SimpleIni"

 	ProjectGUID="{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}"

 	RootNamespace="SimpleIni"

-	Keyword="Win32Proj">

+	Keyword="Win32Proj"

+	TargetFrameworkVersion="131072"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="Debug"

 			IntermediateDirectory="Debug"

 			ConfigurationType="1"

-			CharacterSet="2">

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

+				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="4"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)/testsi.exe"

 				LinkIncremental="2"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile="$(OutDir)/SimpleIni.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

 			IntermediateDirectory="Release"

 			ConfigurationType="1"

-			CharacterSet="2">

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

+				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

 				WarningLevel="4"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)/testsi.exe"

 				LinkIncremental="1"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				SubSystem="1"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug Unicode|Win32"

 			OutputDirectory="$(ConfigurationName)"

 			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="1"

-			CharacterSet="1">

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

+				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="4"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)/testsi.exe"

 				LinkIncremental="2"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile="$(OutDir)/SimpleIni.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release Unicode|Win32"

 			OutputDirectory="$(ConfigurationName)"

 			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="1"

-			CharacterSet="1">

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

+				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

 				WarningLevel="4"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)/testsi.exe"

 				LinkIncremental="1"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				SubSystem="1"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -206,83 +327,96 @@
 		<Filter

 			Name="Source Files"

 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

 			<File

-				RelativePath=".\snippets.cpp">

+				RelativePath=".\snippets.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\test1.cpp">

+				RelativePath=".\test1.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\testsi.cpp">

+				RelativePath=".\testsi.cpp"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Library Files"

 			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

 			<File

-				RelativePath=".\SimpleIni.h">

+				RelativePath=".\SimpleIni.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"

 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

 			<File

-				RelativePath=".\Makefile">

+				RelativePath=".\Makefile"

+				>

 			</File>

 			<File

-				RelativePath=".\testsi-EUCJP.ini">

+				RelativePath=".\testsi-EUCJP.ini"

+				>

 			</File>

 			<File

-				RelativePath=".\testsi-SJIS.ini">

+				RelativePath=".\testsi-SJIS.ini"

+				>

 			</File>

 			<File

-				RelativePath=".\testsi-UTF8.ini">

+				RelativePath=".\testsi-UTF8.ini"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Conversion Files"

-			Filter="">

+			>

 			<File

-				RelativePath=".\ConvertUTF.c">

+				RelativePath=".\ConvertUTF.c"

+				>

 			</File>

 			<File

-				RelativePath=".\ConvertUTF.h">

+				RelativePath=".\ConvertUTF.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Documentation"

-			Filter="">

+			>

 			<File

-				RelativePath=".\simpleini.doxy">

+				RelativePath=".\simpleini.doxy"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="if not exist &quot;C:\Program Files\doxygen\bin\doxygen.exe&quot; goto done

-

-echo Generating documentation...

-&quot;C:\Program Files\doxygen\bin\doxygen.exe&quot; $(InputDir)simpleini.doxy

-

-:done

-"

-						Outputs="d:\src\simpleini-doc\html\index.html"/>

+						CommandLine="if not exist &quot;C:\Program Files\doxygen\bin\doxygen.exe&quot; goto done&#x0D;&#x0A;&#x0D;&#x0A;echo Generating documentation...&#x0D;&#x0A;&quot;C:\Program Files\doxygen\bin\doxygen.exe&quot; $(InputDir)simpleini.doxy&#x0D;&#x0A;&#x0D;&#x0A;:done&#x0D;&#x0A;"

+						Outputs="d:\src\simpleini-doc\html\index.html"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Tests"

-			Filter="">

+			>

 			<File

-				RelativePath=".\test1-expected.ini">

+				RelativePath=".\test1-expected.ini"

+				>

 			</File>

 			<File

-				RelativePath=".\test1-input.ini">

+				RelativePath=".\test1-input.ini"

+				>

 			</File>

 			<File

-				RelativePath=".\test1-output.ini">

+				RelativePath=".\test1-output.ini"

+				>

 			</File>

 		</Filter>

 	</Files>

diff --git a/test.cmd b/test.cmd
index 2181328..2d319d5 100644
--- a/test.cmd
+++ b/test.cmd
@@ -4,10 +4,18 @@ Debug\testsi.exe -u -m -l test1-input.ini > test1-blah.ini
 fc test1-expected.ini test1-output.ini
 if errorlevel 1 goto error
 
+"Debug Unicode\testsi.exe" -u -m -l test1-input.ini > test1-blah.ini
+fc test1-expected.ini test1-output.ini
+if errorlevel 1 goto error
+
 Release\testsi.exe -u -m -l test1-input.ini > test1-blah.ini
 fc test1-expected.ini test1-output.ini
 if errorlevel 1 goto error
 
+"Release Unicode\testsi.exe" -u -m -l test1-input.ini > test1-blah.ini
+fc test1-expected.ini test1-output.ini
+if errorlevel 1 goto error
+
 exit /b 0
 
 :error