[svn-r14093] Purpose: Convert Windows projects to VS2005 format and support 64-bit Fortran

Description:
This checkin is another Windows project cleanup, and also extends our Windows support for 64-bit Fortran.  Project files are now in VS2005 format, rather than VS.NET.  A couple projects have been renamed to be more descriptive (*cstub rather than *_lib), and project settings make better use of build macros.  This will make them much easier to update in the future.

Tested:
VS2005 on WinXP 32-bit
VS2005 on WinXP x64

38 files changed, 9653 insertions, 1798 deletions

diff --git a/windows/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj b/windows/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj
index 83fc731..cec63c8 100644
--- a/windows/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj
+++ b/windows/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj
@@ -1,136 +1,386 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="hl_test_table_cpp"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{6312B365-AA53-43AA-BD00-848C1323CA8B}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug"

-			IntermediateDirectory=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug"

+			OutputDirectory="..\..\..\..\..\hl\c++\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug/hl_test_table_cpp.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\..\hl\c++\src,..\..\..\..\..\hl\src,..\..\..\..\..\src,..\..\..\..\..\c++\src,..\..\..\..\..\test,..\..\..\..\..\hl\test"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug/hl_test_table_cpp.pch"

 				AssemblerListingLocation=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug/"

 				ObjectFile=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug/"

 				ProgramDataBaseFileName=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug/hl_test_table_cpp.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

-				GenerateDebugInformation="TRUE"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug/hl_test_table_cpp.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\..\hl\c++\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug/hl_test_table_cpp.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\..\hl\c++\src,..\..\..\..\..\hl\src,..\..\..\..\..\src,..\..\..\..\..\c++\src,..\..\..\..\..\test,..\..\..\..\..\hl\test"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug/hl_test_table_cpp.pch"

+				AssemblerListingLocation=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug/"

+				ObjectFile=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug/"

+				ProgramDataBaseFileName=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug/hl_test_table_cpp.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../../hl/c++/test/hl_test_table_cpp/Release"

-			IntermediateDirectory=".\../../../../../hl/c++/test/hl_test_table_cpp/Release"

+			OutputDirectory="..\..\..\..\..\hl\c++\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../../hl/c++/test/hl_test_table_cpp/Release/hl_test_table_cpp.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\..\hl\c++\src,..\..\..\..\..\hl\src,..\..\..\..\..\src,..\..\..\..\..\c++\src,..\..\..\..\..\test,..\..\..\..\..\hl\test"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../../hl/c++/test/hl_test_table_cpp/Release/hl_test_table_cpp.pch"

 				AssemblerListingLocation=".\../../../../../hl/c++/test/hl_test_table_cpp/Release/"

 				ObjectFile=".\../../../../../hl/c++/test/hl_test_table_cpp/Release/"

 				ProgramDataBaseFileName=".\../../../../../hl/c++/test/hl_test_table_cpp/Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../../hl/c++/test/hl_test_table_cpp/Release/hl_test_table_cpp.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../../hl/c++/test/hl_test_table_cpp/Release/hl_test_table_cpp.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\..\hl\c++\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../../hl/c++/test/hl_test_table_cpp/Release/hl_test_table_cpp.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\..\hl\c++\src,..\..\..\..\..\hl\src,..\..\..\..\..\src,..\..\..\..\..\c++\src,..\..\..\..\..\test,..\..\..\..\..\hl\test"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../../hl/c++/test/hl_test_table_cpp/Release/hl_test_table_cpp.pch"

+				AssemblerListingLocation=".\../../../../../hl/c++/test/hl_test_table_cpp/Release/"

+				ObjectFile=".\../../../../../hl/c++/test/hl_test_table_cpp/Release/"

+				ProgramDataBaseFileName=".\../../../../../hl/c++/test/hl_test_table_cpp/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\../../../../../hl/c++/test/hl_test_table_cpp/Release/hl_test_table_cpp.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -138,35 +388,64 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\..\hl\c++\test\ptableTest.cpp">

+				RelativePath="..\..\..\..\..\hl\c++\test\ptableTest.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.vcproj b/windows/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.vcproj
index 6ee6633..d79e83a 100644
--- a/windows/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.vcproj
+++ b/windows/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.vcproj
@@ -1,84 +1,231 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="hl_test_table_cppdll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{0D18A50F-52B3-4322-AC0D-F15CD657CEC4}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../../hl/c++/test/hl_test_table_cppdll/Release"

-			IntermediateDirectory=".\../../../../../hl/c++/test/hl_test_table_cppdll/Release"

+			OutputDirectory="..\..\..\..\..\hl\c++\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../../hl/c++/test/hl_test_table_cppdll/Release/hl_test_table_cppdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\..\hl\c++\src,..\..\..\..\..\hl\src,..\..\..\..\..\src,..\..\..\..\..\c++\src,..\..\..\..\..\test,..\..\..\..\..\hl\test"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEHLDLL_;_HDF5USEDLL_"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../../hl/c++/test/hl_test_table_cppdll/Release/hl_test_table_cppdll.pch"

 				AssemblerListingLocation=".\../../../../../hl/c++/test/hl_test_table_cppdll/Release/"

 				ObjectFile=".\../../../../../hl/c++/test/hl_test_table_cppdll/Release/"

 				ProgramDataBaseFileName=".\../../../../../hl/c++/test/hl_test_table_cppdll/Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../../hl/c++/test/hl_test_table_cppdll/Release/hl_test_table_cppdll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../../hl/c++/test/hl_test_table_cppdll/Release/hl_test_table_cppdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\..\hl\c++\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../../hl/c++/test/hl_test_table_cppdll/Release/hl_test_table_cppdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\..\hl\c++\src,..\..\..\..\..\hl\src,..\..\..\..\..\src,..\..\..\..\..\c++\src,..\..\..\..\..\test,..\..\..\..\..\hl\test"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEHLDLL_;_HDF5USEDLL_"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../../hl/c++/test/hl_test_table_cppdll/Release/hl_test_table_cppdll.pch"

+				AssemblerListingLocation=".\../../../../../hl/c++/test/hl_test_table_cppdll/Release/"

+				ObjectFile=".\../../../../../hl/c++/test/hl_test_table_cppdll/Release/"

+				ProgramDataBaseFileName=".\../../../../../hl/c++/test/hl_test_table_cppdll/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\../../../../../hl/c++/test/hl_test_table_cppdll/Release/hl_test_table_cppdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../../hl/c++/test/hl_test_table_cppdll/Debug"

-			IntermediateDirectory=".\../../../../../hl/c++/test/hl_test_table_cppdll/Debug"

+			OutputDirectory="..\..\..\..\..\hl\c++\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../../hl/c++/test/hl_test_table_cppdll/Debug/hl_test_table_cppdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -86,51 +233,154 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HDF5USE_HLCPPDLL;_HDF5USEHLDLL_;_HDF5USEDLL_"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../../hl/c++/test/hl_test_table_cppdll/Debug/hl_test_table_cppdll.pch"

 				AssemblerListingLocation=".\../../../../../hl/c++/test/hl_test_table_cppdll/Debug/"

 				ObjectFile=".\../../../../../hl/c++/test/hl_test_table_cppdll/Debug/"

 				ProgramDataBaseFileName=".\../../../../../hl/c++/test/hl_test_table_cppdll/Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../../hl/c++/test/hl_test_table_cppdll/Debug/hl_test_table_cppdll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

-				GenerateDebugInformation="TRUE"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../../hl/c++/test/hl_test_table_cppdll/Debug/hl_test_table_cppdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\..\hl\c++\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../../hl/c++/test/hl_test_table_cppdll/Debug/hl_test_table_cppdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\..\hl\c++\src,..\..\..\..\..\hl\src,..\..\..\..\..\c++\src,..\..\..\..\..\src,..\..\..\..\..\test,..\..\..\..\..\hl\test"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HDF5USE_HLCPPDLL;_HDF5USEHLDLL_;_HDF5USEDLL_"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../../hl/c++/test/hl_test_table_cppdll/Debug/hl_test_table_cppdll.pch"

+				AssemblerListingLocation=".\../../../../../hl/c++/test/hl_test_table_cppdll/Debug/"

+				ObjectFile=".\../../../../../hl/c++/test/hl_test_table_cppdll/Debug/"

+				ProgramDataBaseFileName=".\../../../../../hl/c++/test/hl_test_table_cppdll/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../../hl/c++/test/hl_test_table_cppdll/Debug/hl_test_table_cppdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -138,35 +388,64 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\..\hl\c++\test\ptableTest.cpp">

+				RelativePath="..\..\..\..\..\hl\c++\test\ptableTest.cpp"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/examples/allhlcexamples/allhlcexamples.sln b/windows/hl/examples/allhlcexamples/allhlcexamples.sln
index 99e6107..f0a4082 100644
--- a/windows/hl/examples/allhlcexamples/allhlcexamples.sln
+++ b/windows/hl/examples/allhlcexamples/allhlcexamples.sln
@@ -1,4 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual Studio 2005

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "allhlcexamples", "allhlcexamples.vcproj", "{5CAEEA27-2611-4398-8E10-BF58CA42F3F3}"

 	ProjectSection(ProjectDependencies) = postProject

 		{25DC2207-299D-4272-9530-B126539BE0E9} = {25DC2207-299D-4272-9530-B126539BE0E9}

@@ -6,108 +7,131 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "allhlcexamples", "allhlcexa
 		{C17AAC18-2DFC-46DE-AF5F-749F6F043DE0} = {C17AAC18-2DFC-46DE-AF5F-749F6F043DE0}

 		{70E7B820-4AEB-49EF-93C5-A6BBDF69B76F} = {70E7B820-4AEB-49EF-93C5-A6BBDF69B76F}

 		{4116EF37-EBA5-424F-A01B-2D80DB5807E3} = {4116EF37-EBA5-424F-A01B-2D80DB5807E3}

-		{334E19CF-8B74-4067-8303-A398E3F22593} = {334E19CF-8B74-4067-8303-A398E3F22593}

-		{DB7330C6-D009-4BF7-B85D-656185825950} = {DB7330C6-D009-4BF7-B85D-656185825950}

-		{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618} = {4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}

 		{E424C58A-BEA8-4801-8A9C-5E976A3FAA5D} = {E424C58A-BEA8-4801-8A9C-5E976A3FAA5D}

 		{B4DE42B5-0032-4175-BEEE-F65875360A45} = {B4DE42B5-0032-4175-BEEE-F65875360A45}

+		{DB7330C6-D009-4BF7-B85D-656185825950} = {DB7330C6-D009-4BF7-B85D-656185825950}

+		{334E19CF-8B74-4067-8303-A398E3F22593} = {334E19CF-8B74-4067-8303-A398E3F22593}

+		{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618} = {4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_ds", "..\ex_ds\ex_ds.vcproj", "{70E7B820-4AEB-49EF-93C5-A6BBDF69B76F}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_dsdll", "..\ex_dsdll\ex_dsdll.vcproj", "{C17AAC18-2DFC-46DE-AF5F-749F6F043DE0}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_images", "..\ex_images\ex_images.vcproj", "{B4DE42B5-0032-4175-BEEE-F65875360A45}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_imagesdll", "..\ex_imagesdll\ex_imagesdll.vcproj", "{E424C58A-BEA8-4801-8A9C-5E976A3FAA5D}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_lite", "..\ex_lite\ex_lite.vcproj", "{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_litedll", "..\ex_litedll\ex_litedll.vcproj", "{DB7330C6-D009-4BF7-B85D-656185825950}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_packet", "..\ex_packet\ex_packet.vcproj", "{47753B08-F9F5-409B-9EC2-9135B4508BAF}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_packetdll", "..\ex_packetdll\ex_packetdll.vcproj", "{25DC2207-299D-4272-9530-B126539BE0E9}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table", "..\ex_table\ex_table.vcproj", "{334E19CF-8B74-4067-8303-A398E3F22593}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_tabledll", "..\ex_tabledll\ex_tabledll.vcproj", "{4116EF37-EBA5-424F-A01B-2D80DB5807E3}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		Release = Release

-	EndGlobalSection

-	GlobalSection(ProjectDependencies) = postSolution

-	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{5CAEEA27-2611-4398-8E10-BF58CA42F3F3}.Debug.ActiveCfg = Debug|Win32

-		{5CAEEA27-2611-4398-8E10-BF58CA42F3F3}.Debug.Build.0 = Debug|Win32

-		{5CAEEA27-2611-4398-8E10-BF58CA42F3F3}.Release.ActiveCfg = Release|Win32

-		{5CAEEA27-2611-4398-8E10-BF58CA42F3F3}.Release.Build.0 = Release|Win32

-		{70E7B820-4AEB-49EF-93C5-A6BBDF69B76F}.Debug.ActiveCfg = Debug|Win32

-		{70E7B820-4AEB-49EF-93C5-A6BBDF69B76F}.Debug.Build.0 = Debug|Win32

-		{70E7B820-4AEB-49EF-93C5-A6BBDF69B76F}.Release.ActiveCfg = Release|Win32

-		{70E7B820-4AEB-49EF-93C5-A6BBDF69B76F}.Release.Build.0 = Release|Win32

-		{C17AAC18-2DFC-46DE-AF5F-749F6F043DE0}.Debug.ActiveCfg = Debug|Win32

-		{C17AAC18-2DFC-46DE-AF5F-749F6F043DE0}.Debug.Build.0 = Debug|Win32

-		{C17AAC18-2DFC-46DE-AF5F-749F6F043DE0}.Release.ActiveCfg = Release|Win32

-		{C17AAC18-2DFC-46DE-AF5F-749F6F043DE0}.Release.Build.0 = Release|Win32

-		{B4DE42B5-0032-4175-BEEE-F65875360A45}.Debug.ActiveCfg = Debug|Win32

-		{B4DE42B5-0032-4175-BEEE-F65875360A45}.Debug.Build.0 = Debug|Win32

-		{B4DE42B5-0032-4175-BEEE-F65875360A45}.Release.ActiveCfg = Release|Win32

-		{B4DE42B5-0032-4175-BEEE-F65875360A45}.Release.Build.0 = Release|Win32

-		{E424C58A-BEA8-4801-8A9C-5E976A3FAA5D}.Debug.ActiveCfg = Debug|Win32

-		{E424C58A-BEA8-4801-8A9C-5E976A3FAA5D}.Debug.Build.0 = Debug|Win32

-		{E424C58A-BEA8-4801-8A9C-5E976A3FAA5D}.Release.ActiveCfg = Release|Win32

-		{E424C58A-BEA8-4801-8A9C-5E976A3FAA5D}.Release.Build.0 = Release|Win32

-		{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}.Debug.ActiveCfg = Debug|Win32

-		{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}.Debug.Build.0 = Debug|Win32

-		{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}.Release.ActiveCfg = Release|Win32

-		{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}.Release.Build.0 = Release|Win32

-		{DB7330C6-D009-4BF7-B85D-656185825950}.Debug.ActiveCfg = Debug|Win32

-		{DB7330C6-D009-4BF7-B85D-656185825950}.Debug.Build.0 = Debug|Win32

-		{DB7330C6-D009-4BF7-B85D-656185825950}.Release.ActiveCfg = Release|Win32

-		{DB7330C6-D009-4BF7-B85D-656185825950}.Release.Build.0 = Release|Win32

-		{47753B08-F9F5-409B-9EC2-9135B4508BAF}.Debug.ActiveCfg = Debug|Win32

-		{47753B08-F9F5-409B-9EC2-9135B4508BAF}.Debug.Build.0 = Debug|Win32

-		{47753B08-F9F5-409B-9EC2-9135B4508BAF}.Release.ActiveCfg = Release|Win32

-		{47753B08-F9F5-409B-9EC2-9135B4508BAF}.Release.Build.0 = Release|Win32

-		{25DC2207-299D-4272-9530-B126539BE0E9}.Debug.ActiveCfg = Debug|Win32

-		{25DC2207-299D-4272-9530-B126539BE0E9}.Debug.Build.0 = Debug|Win32

-		{25DC2207-299D-4272-9530-B126539BE0E9}.Release.ActiveCfg = Release|Win32

-		{25DC2207-299D-4272-9530-B126539BE0E9}.Release.Build.0 = Release|Win32

-		{334E19CF-8B74-4067-8303-A398E3F22593}.Debug.ActiveCfg = Debug|Win32

-		{334E19CF-8B74-4067-8303-A398E3F22593}.Debug.Build.0 = Debug|Win32

-		{334E19CF-8B74-4067-8303-A398E3F22593}.Release.ActiveCfg = Release|Win32

-		{334E19CF-8B74-4067-8303-A398E3F22593}.Release.Build.0 = Release|Win32

-		{4116EF37-EBA5-424F-A01B-2D80DB5807E3}.Debug.ActiveCfg = Debug|Win32

-		{4116EF37-EBA5-424F-A01B-2D80DB5807E3}.Debug.Build.0 = Debug|Win32

-		{4116EF37-EBA5-424F-A01B-2D80DB5807E3}.Release.ActiveCfg = Release|Win32

-		{4116EF37-EBA5-424F-A01B-2D80DB5807E3}.Release.Build.0 = Release|Win32

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Debug|x64 = Debug|x64

+		Release|Win32 = Release|Win32

+		Release|x64 = Release|x64

 	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{5CAEEA27-2611-4398-8E10-BF58CA42F3F3}.Debug|Win32.ActiveCfg = Debug|Win32

+		{5CAEEA27-2611-4398-8E10-BF58CA42F3F3}.Debug|Win32.Build.0 = Debug|Win32

+		{5CAEEA27-2611-4398-8E10-BF58CA42F3F3}.Debug|x64.ActiveCfg = Debug|x64

+		{5CAEEA27-2611-4398-8E10-BF58CA42F3F3}.Debug|x64.Build.0 = Debug|x64

+		{5CAEEA27-2611-4398-8E10-BF58CA42F3F3}.Release|Win32.ActiveCfg = Release|Win32

+		{5CAEEA27-2611-4398-8E10-BF58CA42F3F3}.Release|Win32.Build.0 = Release|Win32

+		{5CAEEA27-2611-4398-8E10-BF58CA42F3F3}.Release|x64.ActiveCfg = Release|x64

+		{5CAEEA27-2611-4398-8E10-BF58CA42F3F3}.Release|x64.Build.0 = Release|x64

+		{70E7B820-4AEB-49EF-93C5-A6BBDF69B76F}.Debug|Win32.ActiveCfg = Debug|Win32

+		{70E7B820-4AEB-49EF-93C5-A6BBDF69B76F}.Debug|Win32.Build.0 = Debug|Win32

+		{70E7B820-4AEB-49EF-93C5-A6BBDF69B76F}.Debug|x64.ActiveCfg = Debug|x64

+		{70E7B820-4AEB-49EF-93C5-A6BBDF69B76F}.Debug|x64.Build.0 = Debug|x64

+		{70E7B820-4AEB-49EF-93C5-A6BBDF69B76F}.Release|Win32.ActiveCfg = Release|Win32

+		{70E7B820-4AEB-49EF-93C5-A6BBDF69B76F}.Release|Win32.Build.0 = Release|Win32

+		{70E7B820-4AEB-49EF-93C5-A6BBDF69B76F}.Release|x64.ActiveCfg = Release|x64

+		{70E7B820-4AEB-49EF-93C5-A6BBDF69B76F}.Release|x64.Build.0 = Release|x64

+		{C17AAC18-2DFC-46DE-AF5F-749F6F043DE0}.Debug|Win32.ActiveCfg = Debug|Win32

+		{C17AAC18-2DFC-46DE-AF5F-749F6F043DE0}.Debug|Win32.Build.0 = Debug|Win32

+		{C17AAC18-2DFC-46DE-AF5F-749F6F043DE0}.Debug|x64.ActiveCfg = Debug|x64

+		{C17AAC18-2DFC-46DE-AF5F-749F6F043DE0}.Debug|x64.Build.0 = Debug|x64

+		{C17AAC18-2DFC-46DE-AF5F-749F6F043DE0}.Release|Win32.ActiveCfg = Release|Win32

+		{C17AAC18-2DFC-46DE-AF5F-749F6F043DE0}.Release|Win32.Build.0 = Release|Win32

+		{C17AAC18-2DFC-46DE-AF5F-749F6F043DE0}.Release|x64.ActiveCfg = Release|x64

+		{C17AAC18-2DFC-46DE-AF5F-749F6F043DE0}.Release|x64.Build.0 = Release|x64

+		{B4DE42B5-0032-4175-BEEE-F65875360A45}.Debug|Win32.ActiveCfg = Debug|Win32

+		{B4DE42B5-0032-4175-BEEE-F65875360A45}.Debug|Win32.Build.0 = Debug|Win32

+		{B4DE42B5-0032-4175-BEEE-F65875360A45}.Debug|x64.ActiveCfg = Debug|x64

+		{B4DE42B5-0032-4175-BEEE-F65875360A45}.Debug|x64.Build.0 = Debug|x64

+		{B4DE42B5-0032-4175-BEEE-F65875360A45}.Release|Win32.ActiveCfg = Release|Win32

+		{B4DE42B5-0032-4175-BEEE-F65875360A45}.Release|Win32.Build.0 = Release|Win32

+		{B4DE42B5-0032-4175-BEEE-F65875360A45}.Release|x64.ActiveCfg = Release|x64

+		{B4DE42B5-0032-4175-BEEE-F65875360A45}.Release|x64.Build.0 = Release|x64

+		{E424C58A-BEA8-4801-8A9C-5E976A3FAA5D}.Debug|Win32.ActiveCfg = Debug|Win32

+		{E424C58A-BEA8-4801-8A9C-5E976A3FAA5D}.Debug|Win32.Build.0 = Debug|Win32

+		{E424C58A-BEA8-4801-8A9C-5E976A3FAA5D}.Debug|x64.ActiveCfg = Debug|x64

+		{E424C58A-BEA8-4801-8A9C-5E976A3FAA5D}.Debug|x64.Build.0 = Debug|x64

+		{E424C58A-BEA8-4801-8A9C-5E976A3FAA5D}.Release|Win32.ActiveCfg = Release|Win32

+		{E424C58A-BEA8-4801-8A9C-5E976A3FAA5D}.Release|Win32.Build.0 = Release|Win32

+		{E424C58A-BEA8-4801-8A9C-5E976A3FAA5D}.Release|x64.ActiveCfg = Release|x64

+		{E424C58A-BEA8-4801-8A9C-5E976A3FAA5D}.Release|x64.Build.0 = Release|x64

+		{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}.Debug|Win32.ActiveCfg = Debug|Win32

+		{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}.Debug|Win32.Build.0 = Debug|Win32

+		{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}.Debug|x64.ActiveCfg = Debug|x64

+		{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}.Debug|x64.Build.0 = Debug|x64

+		{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}.Release|Win32.ActiveCfg = Release|Win32

+		{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}.Release|Win32.Build.0 = Release|Win32

+		{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}.Release|x64.ActiveCfg = Release|x64

+		{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}.Release|x64.Build.0 = Release|x64

+		{DB7330C6-D009-4BF7-B85D-656185825950}.Debug|Win32.ActiveCfg = Debug|Win32

+		{DB7330C6-D009-4BF7-B85D-656185825950}.Debug|Win32.Build.0 = Debug|Win32

+		{DB7330C6-D009-4BF7-B85D-656185825950}.Debug|x64.ActiveCfg = Debug|x64

+		{DB7330C6-D009-4BF7-B85D-656185825950}.Debug|x64.Build.0 = Debug|x64

+		{DB7330C6-D009-4BF7-B85D-656185825950}.Release|Win32.ActiveCfg = Release|Win32

+		{DB7330C6-D009-4BF7-B85D-656185825950}.Release|Win32.Build.0 = Release|Win32

+		{DB7330C6-D009-4BF7-B85D-656185825950}.Release|x64.ActiveCfg = Release|x64

+		{DB7330C6-D009-4BF7-B85D-656185825950}.Release|x64.Build.0 = Release|x64

+		{47753B08-F9F5-409B-9EC2-9135B4508BAF}.Debug|Win32.ActiveCfg = Debug|Win32

+		{47753B08-F9F5-409B-9EC2-9135B4508BAF}.Debug|Win32.Build.0 = Debug|Win32

+		{47753B08-F9F5-409B-9EC2-9135B4508BAF}.Debug|x64.ActiveCfg = Debug|x64

+		{47753B08-F9F5-409B-9EC2-9135B4508BAF}.Debug|x64.Build.0 = Debug|x64

+		{47753B08-F9F5-409B-9EC2-9135B4508BAF}.Release|Win32.ActiveCfg = Release|Win32

+		{47753B08-F9F5-409B-9EC2-9135B4508BAF}.Release|Win32.Build.0 = Release|Win32

+		{47753B08-F9F5-409B-9EC2-9135B4508BAF}.Release|x64.ActiveCfg = Release|x64

+		{47753B08-F9F5-409B-9EC2-9135B4508BAF}.Release|x64.Build.0 = Release|x64

+		{25DC2207-299D-4272-9530-B126539BE0E9}.Debug|Win32.ActiveCfg = Debug|Win32

+		{25DC2207-299D-4272-9530-B126539BE0E9}.Debug|Win32.Build.0 = Debug|Win32

+		{25DC2207-299D-4272-9530-B126539BE0E9}.Debug|x64.ActiveCfg = Debug|x64

+		{25DC2207-299D-4272-9530-B126539BE0E9}.Debug|x64.Build.0 = Debug|x64

+		{25DC2207-299D-4272-9530-B126539BE0E9}.Release|Win32.ActiveCfg = Release|Win32

+		{25DC2207-299D-4272-9530-B126539BE0E9}.Release|Win32.Build.0 = Release|Win32

+		{25DC2207-299D-4272-9530-B126539BE0E9}.Release|x64.ActiveCfg = Release|x64

+		{25DC2207-299D-4272-9530-B126539BE0E9}.Release|x64.Build.0 = Release|x64

+		{334E19CF-8B74-4067-8303-A398E3F22593}.Debug|Win32.ActiveCfg = Debug|Win32

+		{334E19CF-8B74-4067-8303-A398E3F22593}.Debug|Win32.Build.0 = Debug|Win32

+		{334E19CF-8B74-4067-8303-A398E3F22593}.Debug|x64.ActiveCfg = Debug|x64

+		{334E19CF-8B74-4067-8303-A398E3F22593}.Debug|x64.Build.0 = Debug|x64

+		{334E19CF-8B74-4067-8303-A398E3F22593}.Release|Win32.ActiveCfg = Release|Win32

+		{334E19CF-8B74-4067-8303-A398E3F22593}.Release|Win32.Build.0 = Release|Win32

+		{334E19CF-8B74-4067-8303-A398E3F22593}.Release|x64.ActiveCfg = Release|x64

+		{334E19CF-8B74-4067-8303-A398E3F22593}.Release|x64.Build.0 = Release|x64

+		{4116EF37-EBA5-424F-A01B-2D80DB5807E3}.Debug|Win32.ActiveCfg = Debug|Win32

+		{4116EF37-EBA5-424F-A01B-2D80DB5807E3}.Debug|Win32.Build.0 = Debug|Win32

+		{4116EF37-EBA5-424F-A01B-2D80DB5807E3}.Debug|x64.ActiveCfg = Debug|x64

+		{4116EF37-EBA5-424F-A01B-2D80DB5807E3}.Debug|x64.Build.0 = Debug|x64

+		{4116EF37-EBA5-424F-A01B-2D80DB5807E3}.Release|Win32.ActiveCfg = Release|Win32

+		{4116EF37-EBA5-424F-A01B-2D80DB5807E3}.Release|Win32.Build.0 = Release|Win32

+		{4116EF37-EBA5-424F-A01B-2D80DB5807E3}.Release|x64.ActiveCfg = Release|x64

+		{4116EF37-EBA5-424F-A01B-2D80DB5807E3}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

 	EndGlobalSection

 EndGlobal

diff --git a/windows/hl/examples/allhlcexamples/allhlcexamples.vcproj b/windows/hl/examples/allhlcexamples/allhlcexamples.vcproj
index 0a3172c..3c2650e 100644
--- a/windows/hl/examples/allhlcexamples/allhlcexamples.vcproj
+++ b/windows/hl/examples/allhlcexamples/allhlcexamples.vcproj
@@ -1,51 +1,119 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="allhlcexamples"

-	SccProjectName=""

-	SccLocalPath=""

-	Keyword="MakeFileProj">

+	ProjectGUID="{5CAEEA27-2611-4398-8E10-BF58CA42F3F3}"

+	Keyword="MakeFileProj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\allhlcexamples\Release"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\allhlcexamples\Release"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="10"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCCustomBuildTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

 				TypeLibraryName=".\..\..\..\..\hl\examples\allhlcexamples\Release/allhlcexamples.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="10"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\..\..\..\..\hl\examples\allhlcexamples\Release/allhlcexamples.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\allhlcexamples\Debug"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\allhlcexamples\Debug"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="10"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

 				TypeLibraryName=".\..\..\..\..\hl\examples\allhlcexamples\Debug/allhlcexamples.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="10"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\..\..\..\..\hl\examples\allhlcexamples\Debug/allhlcexamples.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

diff --git a/windows/hl/examples/ex_ds/ex_ds.vcproj b/windows/hl/examples/ex_ds/ex_ds.vcproj
index 8cee5be..4aa8cd8 100644
--- a/windows/hl/examples/ex_ds/ex_ds.vcproj
+++ b/windows/hl/examples/ex_ds/ex_ds.vcproj
@@ -1,138 +1,391 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="ex_ds"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{70E7B820-4AEB-49EF-93C5-A6BBDF69B76F}"

+	RootNamespace="ex_ds"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_ds\Release"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_ds\Release"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds\Release/ex_ds.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds\Release/ex_ds.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds\Release/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_ds\Release/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds\Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_ds\Release/ex_ds.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds\Release/ex_ds.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds\Release/ex_ds.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds\Release/ex_ds.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_ds\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds\Release/ex_ds.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_ds\Debug"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_ds\Debug"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds\Debug/ex_ds.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds\Debug/ex_ds.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds\Debug/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_ds\Debug/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds\Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_ds\Debug/ex_ds.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds\Debug/ex_ds.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds\Debug/ex_ds.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds\Debug/ex_ds.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_ds\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds\Debug/ex_ds.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -140,35 +393,64 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\examples\ex_ds1.c">

+				RelativePath="..\..\..\..\hl\examples\ex_ds1.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/examples/ex_dsdll/ex_dsdll.vcproj b/windows/hl/examples/ex_dsdll/ex_dsdll.vcproj
index 7aef8e9..ef47818 100644
--- a/windows/hl/examples/ex_dsdll/ex_dsdll.vcproj
+++ b/windows/hl/examples/ex_dsdll/ex_dsdll.vcproj
@@ -1,23 +1,48 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="ex_dsdll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{C17AAC18-2DFC-46DE-AF5F-749F6F043DE0}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_dsdll\Debug"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_dsdll\Debug"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -25,114 +50,341 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_dsdll\Debug/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_dsdll\Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_dsdll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_dsdll\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_dsdll\Release"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_dsdll\Release"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_dsdll\Release/ex_dsdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_dsdll\Release/ex_dsdll.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_dsdll\Release/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_dsdll\Release/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_dsdll\Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_dsdll\Release/ex_dsdll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_dsdll\Release/ex_dsdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_dsdll\Release/ex_dsdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_dsdll\Release/ex_dsdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_dsdll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_dsdll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_dsdll\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_dsdll\Release/ex_dsdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -140,35 +392,64 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\examples\ex_ds1.c">

+				RelativePath="..\..\..\..\hl\examples\ex_ds1.c"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/examples/ex_images/ex_images.vcproj b/windows/hl/examples/ex_images/ex_images.vcproj
index 04bd96e..7707a24 100644
--- a/windows/hl/examples/ex_images/ex_images.vcproj
+++ b/windows/hl/examples/ex_images/ex_images.vcproj
@@ -1,138 +1,390 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="ex_images"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{B4DE42B5-0032-4175-BEEE-F65875360A45}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_images\Debug"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_images\Debug"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_images\Debug/ex_images.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_images\Debug/ex_images.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_images\Debug/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_images\Debug/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_images\Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_images\Debug/ex_images.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_images\Debug/ex_images.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_images\Debug/ex_images.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_images\Debug/ex_images.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_images\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_images\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_images\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_images\Debug/ex_images.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_images\Release"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_images\Release"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_images\Release/ex_images.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include,..\..\..\..\hl\src,..\..\..\..\src"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_images\Release/ex_images.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_images\Release/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_images\Release/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_images\Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_images\Release/ex_images.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_images\Release/ex_images.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_images\Release/ex_images.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_images\Release/ex_images.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_images\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_images\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_images\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_images\Release/ex_images.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -140,35 +392,64 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\examples\ex_image1.c">

+				RelativePath="..\..\..\..\hl\examples\ex_image1.c"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/examples/ex_imagesdll/ex_imagesdll.vcproj b/windows/hl/examples/ex_imagesdll/ex_imagesdll.vcproj
index 7ec9819..3c3e26a 100644
--- a/windows/hl/examples/ex_imagesdll/ex_imagesdll.vcproj
+++ b/windows/hl/examples/ex_imagesdll/ex_imagesdll.vcproj
@@ -1,138 +1,390 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="ex_imagesdll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{E424C58A-BEA8-4801-8A9C-5E976A3FAA5D}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_imagesdll\Debug"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_imagesdll\Debug"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_imagesdll\Release"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_imagesdll\Release"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_imagesdll\Release/ex_imagesdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include,..\..\..\..\hl\src,..\..\..\..\src"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_imagesdll\Release/ex_imagesdll.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_imagesdll\Release/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_imagesdll\Release/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_imagesdll\Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_imagesdll\Release/ex_imagesdll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_imagesdll\Release/ex_imagesdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_imagesdll\Release/ex_imagesdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_imagesdll\Release/ex_imagesdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_imagesdll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_imagesdll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_imagesdll\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_imagesdll\Release/ex_imagesdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -140,35 +392,64 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\examples\ex_image1.c">

+				RelativePath="..\..\..\..\hl\examples\ex_image1.c"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl">

+			Filter="h;hpp;hxx;hm;inl"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/examples/ex_lite/ex_lite.vcproj b/windows/hl/examples/ex_lite/ex_lite.vcproj
index f35d8fc..519c5ea 100644
--- a/windows/hl/examples/ex_lite/ex_lite.vcproj
+++ b/windows/hl/examples/ex_lite/ex_lite.vcproj
@@ -1,138 +1,390 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="ex_lite"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_lite\Release"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_lite\Release"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite\Release/ex_lite.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include,..\..\..\..\hl\src,..\..\..\..\src"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite\Release/ex_lite.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite\Release/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_lite\Release/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite\Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_lite\Release/ex_lite.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite\Release/ex_lite.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite\Release/ex_lite.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite\Release/ex_lite.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_lite\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite\Release/ex_lite.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_lite\Debug"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_lite\Debug"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite\Debug/ex_lite.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite\Debug/ex_lite.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite\Debug/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_lite\Debug/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite\Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_lite\Debug/ex_lite.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite\Debug/ex_lite.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite\Debug/ex_lite.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite\Debug/ex_lite.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_lite\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite\Debug/ex_lite.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -140,35 +392,64 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\examples\ex_lite1.c">

+				RelativePath="..\..\..\..\hl\examples\ex_lite1.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/examples/ex_litedll/ex_litedll.vcproj b/windows/hl/examples/ex_litedll/ex_litedll.vcproj
index 5eada93..cb014d7 100644
--- a/windows/hl/examples/ex_litedll/ex_litedll.vcproj
+++ b/windows/hl/examples/ex_litedll/ex_litedll.vcproj
@@ -1,85 +1,233 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="ex_litedll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{DB7330C6-D009-4BF7-B85D-656185825950}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_litedll\Release"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_litedll\Release"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_litedll\Release/ex_litedll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include,..\..\..\..\hl\src,..\..\..\..\src"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_litedll\Release/ex_litedll.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_litedll\Release/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_litedll\Release/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_litedll\Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_litedll\Release/ex_litedll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_litedll\Release/ex_litedll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_litedll\Release/ex_litedll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_litedll\Release/ex_litedll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_litedll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_litedll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_litedll\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_litedll\Release/ex_litedll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_litedll\Debug"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_litedll\Debug"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -87,52 +235,156 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_litedll\Debug/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_litedll\Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_litedll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_litedll\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -140,35 +392,64 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\examples\ex_lite1.c">

+				RelativePath="..\..\..\..\hl\examples\ex_lite1.c"

+				>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/examples/ex_packet/ex_packet.vcproj b/windows/hl/examples/ex_packet/ex_packet.vcproj
index 5653626..474803f 100644
--- a/windows/hl/examples/ex_packet/ex_packet.vcproj
+++ b/windows/hl/examples/ex_packet/ex_packet.vcproj
@@ -1,138 +1,390 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="ex_packet"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{47753B08-F9F5-409B-9EC2-9135B4508BAF}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_packet\Debug"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_packet\Debug"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packet\Debug/ex_packet.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packet\Debug/ex_packet.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packet\Debug/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_packet\Debug/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packet\Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_packet\Debug/ex_packet.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packet\Debug/ex_packet.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packet\Debug/ex_packet.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packet\Debug/ex_packet.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packet\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_packet\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packet\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packet\Debug/ex_packet.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_packet\Release"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_packet\Release"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packet\Release/ex_packet.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include,..\..\..\..\hl\src,..\..\..\..\src"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packet\Release/ex_packet.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packet\Release/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_packet\Release/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packet\Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_packet\Release/ex_packet.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packet\Release/ex_packet.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packet\Release/ex_packet.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packet\Release/ex_packet.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packet\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_packet\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packet\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packet\Release/ex_packet.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -140,35 +392,64 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\examples\ptExampleFL.c">

+				RelativePath="..\..\..\..\hl\examples\ptExampleFL.c"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/examples/ex_packetdll/ex_packetdll.vcproj b/windows/hl/examples/ex_packetdll/ex_packetdll.vcproj
index 33a9f34..3eb72f0 100644
--- a/windows/hl/examples/ex_packetdll/ex_packetdll.vcproj
+++ b/windows/hl/examples/ex_packetdll/ex_packetdll.vcproj
@@ -1,23 +1,48 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="ex_packetdll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{25DC2207-299D-4272-9530-B126539BE0E9}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_packetdll\Debug"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_packetdll\Debug"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -25,114 +50,341 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packetdll\Debug/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packetdll\Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packetdll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packetdll\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_packetdll\Release"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_packetdll\Release"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packetdll\Release/ex_packetdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include,..\..\..\..\hl\src,..\..\..\..\src"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packetdll\Release/ex_packetdll.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packetdll\Release/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_packetdll\Release/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packetdll\Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_packetdll\Release/ex_packetdll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packetdll\Release/ex_packetdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packetdll\Release/ex_packetdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packetdll\Release/ex_packetdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packetdll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_packetdll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packetdll\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packetdll\Release/ex_packetdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -140,35 +392,64 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\examples\ptExampleFL.c">

+				RelativePath="..\..\..\..\hl\examples\ptExampleFL.c"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/examples/ex_table/ex_table.vcproj b/windows/hl/examples/ex_table/ex_table.vcproj
index 2b5bf52..d438e79 100644
--- a/windows/hl/examples/ex_table/ex_table.vcproj
+++ b/windows/hl/examples/ex_table/ex_table.vcproj
@@ -1,138 +1,390 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="ex_table"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{334E19CF-8B74-4067-8303-A398E3F22593}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_table\Release"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_table\Release"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table\Release/ex_table.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include,..\..\..\..\hl\src,..\..\..\..\src"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table\Release/ex_table.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table\Release/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_table\Release/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table\Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_table\Release/ex_table.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table\Release/ex_table.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table\Release/ex_table.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table\Release/ex_table.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_table\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table\Release/ex_table.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_table\Debug"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_table\Debug"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table\Debug/ex_table.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table\Debug/ex_table.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table\Debug/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_table\Debug/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table\Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_table\Debug/ex_table.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table\Debug/ex_table.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table\Debug/ex_table.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table\Debug/ex_table.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_table\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table\Debug/ex_table.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -140,35 +392,64 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_01.c">

+				RelativePath="..\..\..\..\hl\examples\ex_table_01.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/examples/ex_tabledll/ex_tabledll.vcproj b/windows/hl/examples/ex_tabledll/ex_tabledll.vcproj
index ab7807b..7a05fac 100644
--- a/windows/hl/examples/ex_tabledll/ex_tabledll.vcproj
+++ b/windows/hl/examples/ex_tabledll/ex_tabledll.vcproj
@@ -1,85 +1,233 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="ex_tabledll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{4116EF37-EBA5-424F-A01B-2D80DB5807E3}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_tabledll\Release"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_tabledll\Release"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_tabledll\Release/ex_tabledll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include,..\..\..\..\hl\src,..\..\..\..\src"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_tabledll\Release/ex_tabledll.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_tabledll\Release/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_tabledll\Release/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_tabledll\Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_tabledll\Release/ex_tabledll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_tabledll\Release/ex_tabledll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_tabledll\Release/ex_tabledll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_tabledll\Release/ex_tabledll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_tabledll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_tabledll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_tabledll\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_tabledll\Release/ex_tabledll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\ex_tabledll\Debug"

-			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_tabledll\Debug"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -87,52 +235,156 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_tabledll\Debug/"

 				ObjectFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_tabledll\Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include,..\..\..\..\hl\src,..\..\..\..\src"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_tabledll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_tabledll\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -140,35 +392,64 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_01.c">

+				RelativePath="..\..\..\..\hl\examples\ex_table_01.c"

+				>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/fortran/examples/allhlf90examples/allhlf90examples.sln b/windows/hl/fortran/examples/allhlf90examples/allhlf90examples.sln
index 94dbbd4..4a173e4 100644
--- a/windows/hl/fortran/examples/allhlf90examples/allhlf90examples.sln
+++ b/windows/hl/fortran/examples/allhlf90examples/allhlf90examples.sln
@@ -1,4 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual Studio 2005

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "allhlf90examples", "allhlf90examples.vcproj", "{64F43EAB-0F7D-4D4F-B01D-52C698C97FDF}"

 	ProjectSection(ProjectDependencies) = postProject

 		{7B837653-CEF4-4B2D-8EB8-29ECC4A1F042} = {7B837653-CEF4-4B2D-8EB8-29ECC4A1F042}

@@ -6,36 +7,43 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "allhlf90examples", "allhlf9
 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "ex_lite", "..\ex_lite\ex_lite.vfproj", "{7B837653-CEF4-4B2D-8EB8-29ECC4A1F042}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "ex_litedll", "..\ex_litedll\ex_litedll.vfproj", "{3EB0EFA7-69F8-4541-8565-EC7AD3603DBB}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		Release = Release

-	EndGlobalSection

-	GlobalSection(ProjectDependencies) = postSolution

-	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{64F43EAB-0F7D-4D4F-B01D-52C698C97FDF}.Debug.ActiveCfg = Debug|Win32

-		{64F43EAB-0F7D-4D4F-B01D-52C698C97FDF}.Debug.Build.0 = Debug|Win32

-		{64F43EAB-0F7D-4D4F-B01D-52C698C97FDF}.Release.ActiveCfg = Release|Win32

-		{64F43EAB-0F7D-4D4F-B01D-52C698C97FDF}.Release.Build.0 = Release|Win32

-		{7B837653-CEF4-4B2D-8EB8-29ECC4A1F042}.Debug.ActiveCfg = Debug|Win32

-		{7B837653-CEF4-4B2D-8EB8-29ECC4A1F042}.Debug.Build.0 = Debug|Win32

-		{7B837653-CEF4-4B2D-8EB8-29ECC4A1F042}.Release.ActiveCfg = Release|Win32

-		{7B837653-CEF4-4B2D-8EB8-29ECC4A1F042}.Release.Build.0 = Release|Win32

-		{3EB0EFA7-69F8-4541-8565-EC7AD3603DBB}.Debug.ActiveCfg = Debug|Win32

-		{3EB0EFA7-69F8-4541-8565-EC7AD3603DBB}.Debug.Build.0 = Debug|Win32

-		{3EB0EFA7-69F8-4541-8565-EC7AD3603DBB}.Release.ActiveCfg = Release|Win32

-		{3EB0EFA7-69F8-4541-8565-EC7AD3603DBB}.Release.Build.0 = Release|Win32

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Debug|x64 = Debug|x64

+		Release|Win32 = Release|Win32

+		Release|x64 = Release|x64

 	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{64F43EAB-0F7D-4D4F-B01D-52C698C97FDF}.Debug|Win32.ActiveCfg = Debug|Win32

+		{64F43EAB-0F7D-4D4F-B01D-52C698C97FDF}.Debug|Win32.Build.0 = Debug|Win32

+		{64F43EAB-0F7D-4D4F-B01D-52C698C97FDF}.Debug|x64.ActiveCfg = Debug|x64

+		{64F43EAB-0F7D-4D4F-B01D-52C698C97FDF}.Debug|x64.Build.0 = Debug|x64

+		{64F43EAB-0F7D-4D4F-B01D-52C698C97FDF}.Release|Win32.ActiveCfg = Release|Win32

+		{64F43EAB-0F7D-4D4F-B01D-52C698C97FDF}.Release|Win32.Build.0 = Release|Win32

+		{64F43EAB-0F7D-4D4F-B01D-52C698C97FDF}.Release|x64.ActiveCfg = Release|x64

+		{64F43EAB-0F7D-4D4F-B01D-52C698C97FDF}.Release|x64.Build.0 = Release|x64

+		{7B837653-CEF4-4B2D-8EB8-29ECC4A1F042}.Debug|Win32.ActiveCfg = Debug|Win32

+		{7B837653-CEF4-4B2D-8EB8-29ECC4A1F042}.Debug|Win32.Build.0 = Debug|Win32

+		{7B837653-CEF4-4B2D-8EB8-29ECC4A1F042}.Debug|x64.ActiveCfg = Debug|x64

+		{7B837653-CEF4-4B2D-8EB8-29ECC4A1F042}.Debug|x64.Build.0 = Debug|x64

+		{7B837653-CEF4-4B2D-8EB8-29ECC4A1F042}.Release|Win32.ActiveCfg = Release|Win32

+		{7B837653-CEF4-4B2D-8EB8-29ECC4A1F042}.Release|Win32.Build.0 = Release|Win32

+		{7B837653-CEF4-4B2D-8EB8-29ECC4A1F042}.Release|x64.ActiveCfg = Release|x64

+		{7B837653-CEF4-4B2D-8EB8-29ECC4A1F042}.Release|x64.Build.0 = Release|x64

+		{3EB0EFA7-69F8-4541-8565-EC7AD3603DBB}.Debug|Win32.ActiveCfg = Debug|Win32

+		{3EB0EFA7-69F8-4541-8565-EC7AD3603DBB}.Debug|Win32.Build.0 = Debug|Win32

+		{3EB0EFA7-69F8-4541-8565-EC7AD3603DBB}.Debug|x64.ActiveCfg = Debug|x64

+		{3EB0EFA7-69F8-4541-8565-EC7AD3603DBB}.Debug|x64.Build.0 = Debug|x64

+		{3EB0EFA7-69F8-4541-8565-EC7AD3603DBB}.Release|Win32.ActiveCfg = Release|Win32

+		{3EB0EFA7-69F8-4541-8565-EC7AD3603DBB}.Release|Win32.Build.0 = Release|Win32

+		{3EB0EFA7-69F8-4541-8565-EC7AD3603DBB}.Release|x64.ActiveCfg = Release|x64

+		{3EB0EFA7-69F8-4541-8565-EC7AD3603DBB}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

 	EndGlobalSection

 EndGlobal

diff --git a/windows/hl/fortran/examples/allhlf90examples/allhlf90examples.vcproj b/windows/hl/fortran/examples/allhlf90examples/allhlf90examples.vcproj
index c2fff52..bfb987b 100644
--- a/windows/hl/fortran/examples/allhlf90examples/allhlf90examples.vcproj
+++ b/windows/hl/fortran/examples/allhlf90examples/allhlf90examples.vcproj
@@ -1,51 +1,120 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="allhlf90examples"

-	SccProjectName=""

-	SccLocalPath=""

-	Keyword="MakeFileProj">

+	ProjectGUID="{64F43EAB-0F7D-4D4F-B01D-52C698C97FDF}"

+	RootNamespace="allhlf90examples"

+	Keyword="MakeFileProj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\..\hl\fortran\examples\allhlf90examples\Debug"

-			IntermediateDirectory=".\..\..\..\..\..\hl\fortran\examples\allhlf90examples\Debug"

+			OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="10"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCCustomBuildTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

 				TypeLibraryName=".\..\..\..\..\..\hl\fortran\examples\allhlf90examples\Debug/allhlf90examples.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="10"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\..\..\..\..\..\hl\fortran\examples\allhlf90examples\Debug/allhlf90examples.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\..\hl\fortran\examples\allhlf90examples\Release"

-			IntermediateDirectory=".\..\..\..\..\..\hl\fortran\examples\allhlf90examples\Release"

+			OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="10"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

 				TypeLibraryName=".\..\..\..\..\..\hl\fortran\examples\allhlf90examples\Release/allhlf90examples.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="10"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\..\..\..\..\..\hl\fortran\examples\allhlf90examples\Release/allhlf90examples.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

diff --git a/windows/hl/fortran/examples/ex_lite/ex_lite.vfproj b/windows/hl/fortran/examples/ex_lite/ex_lite.vfproj
index 2da145f..a3e699b 100644
--- a/windows/hl/fortran/examples/ex_lite/ex_lite.vfproj
+++ b/windows/hl/fortran/examples/ex_lite/ex_lite.vfproj
@@ -1,24 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application - Converted from CVF" Version="9.10" ProjectIdGuid="{7B837653-CEF4-4B2D-8EB8-29ECC4A1F042}">

 	<Platforms>

-		<Platform Name="Win32"/></Platforms>

+		<Platform Name="Win32"/>

+		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\examples\ex_lite\Debug" IntermediateDirectory="..\..\..\..\..\hl\fortran\examples\ex_lite\Debug" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\windows\hl\fortran\examples\ex_lite\$(OUTDIR)\ex_lite.exe">

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_lite.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\debug/;..\..\..\..\..\proj\hdf5_hl_fortran\debug/" WarnArgMismatch="true" ModulePath="Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtSingleThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\debug/;..\..\..\..\..\proj\hdf5_hl_fortran\debug/" WarnArgMismatch="true" ModulePath="Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/ex_lite.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\..\proj\hdf5_hl_fortran\debug" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/ex_lite.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib hdf5_hl_fortrand.lib hdf5_hl_fortrand_lib.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\..\proj\hdf5_hl_fortran\debug" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/ex_lite.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib hdf5_hl_fortrand.lib hdf5_hl_fortrand_lib.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_lite.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\release/;..\..\..\..\..\proj\hdf5_hl_fortran\release/" ModulePath="Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\..\proj\hdf5_hl_fortran\release" ProgramDatabaseFile="$(OUTDIR)/ex_lite.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) hdf5_fortran.lib hdf5_hl_fortran.lib hdf5_hl_fortran_lib.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_lite.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\debug/;..\..\..\..\..\proj\hdf5_hl_fortran\debug/" WarnArgMismatch="true" ModulePath="Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\..\proj\hdf5_hl_fortran\debug" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/ex_lite.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib hdf5_hl_fortrand.lib hdf5_hl_fortrand_lib.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

 				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\examples\ex_lite\Release" IntermediateDirectory="..\..\..\..\..\hl\fortran\examples\ex_lite\Release" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\windows\hl\fortran\examples\ex_lite\$(OUTDIR)\ex_lite.exe">

+		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_lite.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\release/;..\..\..\..\..\proj\hdf5_hl_fortran\release/" ModulePath="Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" CompileOnly="true"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\release/;..\..\..\..\..\proj\hdf5_hl_fortran\release/" ModulePath="Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/ex_lite.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\..\proj\hdf5_hl_fortran\release" ProgramDatabaseFile="$(OUTDIR)/ex_lite.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) hdf5_fortran.lib hdf5_hl_fortran.lib hdf5_hl_fortran_lib.lib"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\..\proj\hdf5_hl_fortran\release" ProgramDatabaseFile="$(OUTDIR)/ex_lite.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) hdf5_fortran.lib hdf5_hl_fortran.lib hdf5_hl_fortran_lib.lib"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

 				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

diff --git a/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj b/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj
index cb092bf..dca50cc 100644
--- a/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj
+++ b/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj
@@ -1,24 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application - Converted from CVF" Version="9.10" ProjectIdGuid="{3EB0EFA7-69F8-4541-8565-EC7AD3603DBB}">

 	<Platforms>

-		<Platform Name="Win32"/></Platforms>

+		<Platform Name="Win32"/>

+		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\hl\fortran\examples\ex_litedll\Debug" IntermediateDirectory="..\..\..\..\hl\fortran\examples\ex_litedll\Debug" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\hl\fortran\examples\ex_litedll\Debug\ex_litedll.exe">

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_litedll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\debug/" WarnArgMismatch="true" ModulePath="Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\debug/" WarnArgMismatch="true" ModulePath="Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtSingleThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="..\..\..\..\..\hl\fortran\examples\ex_litedll\Debug\ex_litedll.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\..\proj\hdf5_hl_fortrandll\debug" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/ex_litedll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortranddll.lib hdf5_hl_fortranddll.lib"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\..\proj\hdf5_hl_fortrandll\debug" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/ex_litedll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortranddll.lib hdf5_hl_fortranddll.lib"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_litedll.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\release/" ModulePath="Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\..\proj\hdf5_hl_fortrandll\release" ProgramDatabaseFile="$(OUTDIR)/ex_litedll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrandll.lib hdf5_hl_fortrandll.lib"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_litedll.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\debug/" WarnArgMismatch="true" ModulePath="Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\..\proj\hdf5_hl_fortrandll\debug" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/ex_litedll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortranddll.lib hdf5_hl_fortranddll.lib"/>

 				<Tool Name="VFPreLinkEventTool"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\examples\ex_litedll\Release" IntermediateDirectory="..\..\..\..\..\hl\fortran\examples\ex_litedll\Release" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\windows\hl\fortran\examples\ex_litedll\$(OUTDIR)\ex_litedll.exe">

+		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_litedll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\release/" ModulePath="Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" CompileOnly="true"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\release/" ModulePath="Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/ex_litedll.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\..\proj\hdf5_hl_fortrandll\release" ProgramDatabaseFile="$(OUTDIR)/ex_litedll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrandll.lib hdf5_hl_fortrandll.lib"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\..\proj\hdf5_hl_fortrandll\release" ProgramDatabaseFile="$(OUTDIR)/ex_litedll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrandll.lib hdf5_hl_fortrandll.lib"/>

 				<Tool Name="VFPreLinkEventTool"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

 	<Files>

diff --git a/windows/hl/fortran/test/hl_test_image_fortran/hl_test_image_fortran.vfproj b/windows/hl/fortran/test/hl_test_image_fortran/hl_test_image_fortran.vfproj
index 715510e..d9b2172 100644
--- a/windows/hl/fortran/test/hl_test_image_fortran/hl_test_image_fortran.vfproj
+++ b/windows/hl/fortran/test/hl_test_image_fortran/hl_test_image_fortran.vfproj
@@ -1,26 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application - Converted from CVF" Version="9.10" ProjectIdGuid="{1C2FF3B6-639A-4047-90DE-327B82BF3ACB}">

 	<Platforms>

-		<Platform Name="Win32"/></Platforms>

+		<Platform Name="Win32"/>

+		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Release|Win32" OutputDirectory="../../../../../hl/fortran/test/hl_test_image_fortran/Release" IntermediateDirectory="../../../../../hl/fortran/test/hl_test_image_fortran/Release" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\windows\hl\fortran\test\hl_test_image_fortran\$(OUTDIR)\hl_test_image_fortran.exe">

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_image_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Release/;..\..\..\..\..\proj\hdf5_hl_fortran\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" CompileOnly="true"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Release/;..\..\..\..\..\proj\hdf5_hl_fortran\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/hl_test_image_fortran.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

 				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="../../../../../hl/fortran/test/hl_test_image_fortran/Debug" IntermediateDirectory="../../../../../hl/fortran/test/hl_test_image_fortran/Debug" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\windows\hl\fortran\test\hl_test_image_fortran\$(OUTDIR)\hl_test_image_fortran.exe">

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_image_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtSingleThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/hl_test_image_fortran.exe" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_image_fortran.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Release/;..\..\..\..\..\proj\hdf5_hl_fortran\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_image_fortran.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\..\hl\fortran\test\tstimage.f90"/>

 		<Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/></Files>

diff --git a/windows/hl/fortran/test/hl_test_image_fortrandll/hl_test_image_fortrandll.vfproj b/windows/hl/fortran/test/hl_test_image_fortrandll/hl_test_image_fortrandll.vfproj
index 770c28d..df43c76 100644
--- a/windows/hl/fortran/test/hl_test_image_fortrandll/hl_test_image_fortrandll.vfproj
+++ b/windows/hl/fortran/test/hl_test_image_fortrandll/hl_test_image_fortrandll.vfproj
@@ -1,24 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application - Converted from CVF" Version="9.10" ProjectIdGuid="{8659AEE0-2C9A-4666-B70F-C2B8280FD909}">

 	<Platforms>

-		<Platform Name="Win32"/></Platforms>

+		<Platform Name="Win32"/>

+		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="../../../../../hl/fortran/test/hl_test_image_fortrandll/Debug" IntermediateDirectory="../../../../../hl/fortran/test/hl_test_image_fortrandll/Debug" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\windows\hl\fortran\test\hl_test_image_fortrandll\$(OUTDIR)\hl_test_image_fortrandll.exe">

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_image_fortrandll.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_image_fortrandll.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_image_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/hl_test_image_fortrandll.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

 				<Tool Name="VFPreLinkEventTool"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="../../../../../hl/fortran/test/hl_test_image_fortrandll/Release" IntermediateDirectory="../../../../../hl/fortran/test/hl_test_image_fortrandll/Release" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\windows\hl\fortran\test\hl_test_image_fortrandll\$(OUTDIR)\hl_test_image_fortrandll.exe">

+		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_image_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/hl_test_image_fortrandll.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

 				<Tool Name="VFPreLinkEventTool"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

 	<Files>

diff --git a/windows/hl/fortran/test/hl_test_lite_fortran/hl_test_lite_fortran.vfproj b/windows/hl/fortran/test/hl_test_lite_fortran/hl_test_lite_fortran.vfproj
index 3e9ad1e..379f403 100644
--- a/windows/hl/fortran/test/hl_test_lite_fortran/hl_test_lite_fortran.vfproj
+++ b/windows/hl/fortran/test/hl_test_lite_fortran/hl_test_lite_fortran.vfproj
@@ -1,26 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application - Converted from CVF" Version="9.10" ProjectIdGuid="{3F8103CC-1DB2-4C23-9ABC-430434244D40}">

 	<Platforms>

-		<Platform Name="Win32"/></Platforms>

+		<Platform Name="Win32"/>

+		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="../../../../../hl/fortran/test/hl_test_lite_fortran/Debug" IntermediateDirectory="../../../../../hl/fortran/test/hl_test_lite_fortran/Debug" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\windows\hl\fortran\test\hl_test_lite_fortran\$(OUTDIR)\hl_test_lite_fortran.exe">

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_lite_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtSingleThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/hl_test_lite_fortran.exe" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

 				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="../../../../../hl/fortran/test/hl_test_lite_fortran/Release" IntermediateDirectory="../../../../../hl/fortran/test/hl_test_lite_fortran/Release" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\windows\hl\fortran\test\hl_test_lite_fortran\$(OUTDIR)\hl_test_lite_fortran.exe">

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_lite_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Release/;..\..\..\..\..\proj\hdf5_hl_fortran\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" CompileOnly="true"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Release/;..\..\..\..\..\proj\hdf5_hl_fortran\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/hl_test_lite_fortran.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_lite_fortran.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_lite_fortran.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Release/;..\..\..\..\..\proj\hdf5_hl_fortran\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\..\hl\fortran\test\tstlite.f90"/>

 		<Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/></Files>

diff --git a/windows/hl/fortran/test/hl_test_lite_fortrandll/hl_test_lite_fortrandll.vfproj b/windows/hl/fortran/test/hl_test_lite_fortrandll/hl_test_lite_fortrandll.vfproj
index 910c752..64d314d 100644
--- a/windows/hl/fortran/test/hl_test_lite_fortrandll/hl_test_lite_fortrandll.vfproj
+++ b/windows/hl/fortran/test/hl_test_lite_fortrandll/hl_test_lite_fortrandll.vfproj
@@ -1,24 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application - Converted from CVF" Version="9.10" ProjectIdGuid="{5E617A56-25B2-41E8-8D69-109600819716}">

 	<Platforms>

-		<Platform Name="Win32"/></Platforms>

+		<Platform Name="Win32"/>

+		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="../../../../../hl/fortran/test/hl_test_lite_fortrandll/Debug" IntermediateDirectory="../../../../../hl/fortran/test/hl_test_lite_fortrandll/Debug" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\windows\hl\fortran\test\hl_test_lite_fortrandll\$(OUTDIR)\hl_test_lite_fortrandll.exe">

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_lite_fortrandll.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_lite_fortrandll.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_lite_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/hl_test_lite_fortrandll.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

 				<Tool Name="VFPreLinkEventTool"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="../../../../../hl/fortran/test/hl_test_lite_fortrandll/Release" IntermediateDirectory="../../../../../hl/fortran/test/hl_test_lite_fortrandll/Release" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\windows\hl\fortran\test\hl_test_lite_fortrandll\$(OUTDIR)\hl_test_lite_fortrandll.exe">

+		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_lite_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/hl_test_lite_fortrandll.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

 				<Tool Name="VFPreLinkEventTool"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

 	<Files>

diff --git a/windows/hl/fortran/test/hl_test_table_fortran/hl_test_table_fortran.vfproj b/windows/hl/fortran/test/hl_test_table_fortran/hl_test_table_fortran.vfproj
index e20a722..140a6aa 100644
--- a/windows/hl/fortran/test/hl_test_table_fortran/hl_test_table_fortran.vfproj
+++ b/windows/hl/fortran/test/hl_test_table_fortran/hl_test_table_fortran.vfproj
@@ -1,26 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application - Converted from CVF" Version="9.10" ProjectIdGuid="{C8202A85-1F3A-4B34-869C-B1E8CA829299}">

 	<Platforms>

-		<Platform Name="Win32"/></Platforms>

+		<Platform Name="Win32"/>

+		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Release|Win32" OutputDirectory="../../../../../hl/fortran/test/hl_test_table_fortran/Release" IntermediateDirectory="../../../../../hl/fortran/test/hl_test_table_fortran/Release" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\windows\hl\fortran\test\hl_test_table_fortran\$(OUTDIR)\hl_test_table_fortran.exe">

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_table_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Release/;..\..\..\..\..\proj\hdf5_hl_fortran\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" CompileOnly="true"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Release/;..\..\..\..\..\proj\hdf5_hl_fortran\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/hl_test_table_fortran.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

 				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="../../../../../hl/fortran/test/hl_test_table_fortran/Debug" IntermediateDirectory="../../../../../hl/fortran/test/hl_test_table_fortran/Debug" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\windows\hl\fortran\test\hl_test_table_fortran\$(OUTDIR)\hl_test_table_fortran.exe">

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_table_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtSingleThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/hl_test_table_fortran.exe" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_table_fortran.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Release/;..\..\..\..\..\proj\hdf5_hl_fortran\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_table_fortran.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\..\hl\fortran\test\tsttable.f90"/>

 		<Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/></Files>

diff --git a/windows/hl/fortran/test/hl_test_table_fortrandll/hl_test_table_fortrandll.vfproj b/windows/hl/fortran/test/hl_test_table_fortrandll/hl_test_table_fortrandll.vfproj
index 7a39db2..f095faf 100644
--- a/windows/hl/fortran/test/hl_test_table_fortrandll/hl_test_table_fortrandll.vfproj
+++ b/windows/hl/fortran/test/hl_test_table_fortrandll/hl_test_table_fortrandll.vfproj
@@ -1,24 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application - Converted from CVF" Version="9.10" ProjectIdGuid="{3F645EFF-3A91-4CF3-9B60-76E0C33686A7}">

 	<Platforms>

-		<Platform Name="Win32"/></Platforms>

+		<Platform Name="Win32"/>

+		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="../../../../../hl/fortran/test/hl_test_table_fortrandll/Debug" IntermediateDirectory="../../../../../hl/fortran/test/hl_test_table_fortrandll/Debug" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\windows\hl\fortran\test\hl_test_table_fortrandll\$(OUTDIR)\hl_test_table_fortrandll.exe">

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_table_fortrandll.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_table_fortrandll.tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_table_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/hl_test_table_fortrandll.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

 				<Tool Name="VFPreLinkEventTool"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="../../../../../hl/fortran/test/hl_test_table_fortrandll/Release" IntermediateDirectory="../../../../../hl/fortran/test/hl_test_table_fortrandll/Release" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\windows\hl\fortran\test\hl_test_table_fortrandll\$(OUTDIR)\hl_test_table_fortrandll.exe">

+		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_table_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/hl_test_table_fortrandll.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

 				<Tool Name="VFPreLinkEventTool"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

 	<Files>

diff --git a/windows/hl/test/hl_test_ds/hl_test_ds.vcproj b/windows/hl/test/hl_test_ds/hl_test_ds.vcproj
index 815622d..3eeb105 100644
--- a/windows/hl/test/hl_test_ds/hl_test_ds.vcproj
+++ b/windows/hl/test/hl_test_ds/hl_test_ds.vcproj
@@ -1,137 +1,388 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="hl_test_ds"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{6410E6D2-EDBF-439D-8C43-1AB0C37AC851}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_ds/Debug"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_ds/Debug"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_ds/Debug/hl_test_ds.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\hl\src,..\..\..\..\src,..\..\..\..\test"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_ds/Debug/hl_test_ds.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_ds/Debug/"

 				ObjectFile=".\../../../../hl/test/hl_test_ds/Debug/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_ds/Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_ds/Debug/hl_test_ds.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_ds/Debug/hl_test_ds.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_ds/Debug/hl_test_ds.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\hl\src,..\..\..\..\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_ds/Debug/hl_test_ds.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_ds/Debug/"

+				ObjectFile=".\../../../../hl/test/hl_test_ds/Debug/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_ds/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="libc.lib"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_ds/Debug/hl_test_ds.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_ds/Release"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_ds/Release"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_ds/Release/hl_test_ds.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_ds/Release/hl_test_ds.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_ds/Release/"

 				ObjectFile=".\../../../../hl/test/hl_test_ds/Release/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_ds/Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_ds/Release/hl_test_ds.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_ds/Release/hl_test_ds.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_ds/Release/hl_test_ds.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_ds/Release/hl_test_ds.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_ds/Release/"

+				ObjectFile=".\../../../../hl/test/hl_test_ds/Release/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_ds/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_ds/Release/hl_test_ds.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -139,38 +390,68 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\test\test_ds.c">

+				RelativePath="..\..\..\..\hl\test\test_ds.c"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\src\H5DS.h">

+				RelativePath="..\..\..\..\hl\src\H5DS.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj b/windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj
index c253a2f..48880f7 100644
--- a/windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj
+++ b/windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj
@@ -1,85 +1,233 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="hl_test_dsdll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{3B4A4A62-FDAC-4219-98BD-80C4FE5D4B2F}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_dsdll/Release"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_dsdll/Release"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_dsdll/Release/hl_test_dsdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_dsdll/Release/hl_test_dsdll.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_dsdll/Release/"

 				ObjectFile=".\../../../../hl/test/hl_test_dsdll/Release/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_dsdll/Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_dsdll/Release/hl_test_dsdll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_hldll\hdf5_hlddll.dll"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_dsdll/Release/hl_test_dsdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_dsdll/Release/hl_test_dsdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_dsdll/Release/hl_test_dsdll.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_dsdll/Release/"

+				ObjectFile=".\../../../../hl/test/hl_test_dsdll/Release/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_dsdll/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_hldll\hdf5_hlddll.dll"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_dsdll/Release/hl_test_dsdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_dsdll/Debug"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_dsdll/Debug"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_dsdll/Debug/hl_test_dsdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -87,52 +235,156 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_dsdll/Debug/hl_test_dsdll.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_dsdll/Debug/"

 				ObjectFile=".\../../../../hl/test/hl_test_dsdll/Debug/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_dsdll/Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_dsdll/Debug/hl_test_dsdll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories=".."

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_dsdll/Debug/hl_test_dsdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_dsdll/Debug/hl_test_dsdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\hl\src,..\..\..\..\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_dsdll/Debug/hl_test_dsdll.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_dsdll/Debug/"

+				ObjectFile=".\../../../../hl/test/hl_test_dsdll/Debug/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_dsdll/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories=".."

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_dsdll/Debug/hl_test_dsdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -140,35 +392,64 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\test\test_ds.c">

+				RelativePath="..\..\..\..\hl\test\test_ds.c"

+				>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/test/hl_test_image/hl_test_image.vcproj b/windows/hl/test/hl_test_image/hl_test_image.vcproj
index 2c5992d..b2f0cc6 100644
--- a/windows/hl/test/hl_test_image/hl_test_image.vcproj
+++ b/windows/hl/test/hl_test_image/hl_test_image.vcproj
@@ -1,160 +1,437 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="hl_test_image"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{03359B45-E43D-44B3-BDE5-8B14D9F0D827}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_image/Debug"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_image/Debug"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_image/Debug/hl_test_image.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_image/Debug/hl_test_image.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_image/Debug/"

 				ObjectFile=".\../../../../hl/test/hl_test_image/Debug/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_image/Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_image/Debug/hl_test_image.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_image/Debug/hl_test_image.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_image/Debug/hl_test_image.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_image/Debug/hl_test_image.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_image/Debug/"

+				ObjectFile=".\../../../../hl/test/hl_test_image/Debug/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_image/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="libc.lib"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_image/Debug/hl_test_image.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_image/Release"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_image/Release"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_image/Release/hl_test_image.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_image/Release/hl_test_image.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_image/Release/"

 				ObjectFile=".\../../../../hl/test/hl_test_image/Release/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_image/Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_image/Release/hl_test_image.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_image/Release/hl_test_image.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_image/Release/hl_test_image.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_image/Release/hl_test_image.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_image/Release/"

+				ObjectFile=".\../../../../hl/test/hl_test_image/Release/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_image/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_image/Release/hl_test_image.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

 	</References>

 	<Files>

 		<File

-			RelativePath="..\..\..\..\hl\test\test_image.c">

+			RelativePath="..\..\..\..\hl\test\test_image.c"

+			>

+			<FileConfiguration

+				Name="Debug|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BasicRuntimeChecks="3"

+				/>

+			</FileConfiguration>

 			<FileConfiguration

-				Name="Debug|Win32">

+				Name="Debug|x64"

+				>

 				<Tool

 					Name="VCCLCompilerTool"

 					Optimization="0"

 					AdditionalIncludeDirectories=""

 					PreprocessorDefinitions=""

-					BasicRuntimeChecks="3"/>

+					BasicRuntimeChecks="3"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="2"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

 			</FileConfiguration>

 			<FileConfiguration

-				Name="Release|Win32">

+				Name="Release|x64"

+				>

 				<Tool

 					Name="VCCLCompilerTool"

 					Optimization="2"

 					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

+					PreprocessorDefinitions=""

+				/>

 			</FileConfiguration>

 		</File>

 	</Files>

diff --git a/windows/hl/test/hl_test_imagedll/hl_test_imagedll.vcproj b/windows/hl/test/hl_test_imagedll/hl_test_imagedll.vcproj
index 16f0cf0..d15b64c 100644
--- a/windows/hl/test/hl_test_imagedll/hl_test_imagedll.vcproj
+++ b/windows/hl/test/hl_test_imagedll/hl_test_imagedll.vcproj
@@ -1,23 +1,48 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="hl_test_imagedll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{9A226D92-9326-4907-A462-25997D5C9427}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_imagedll/Debug"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_imagedll/Debug"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_imagedll/Debug/hl_test_imagedll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -25,112 +50,337 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_imagedll/Debug/hl_test_imagedll.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_imagedll/Debug/"

 				ObjectFile=".\../../../../hl/test/hl_test_imagedll/Debug/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_imagedll/Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_imagedll/Debug/hl_test_imagedll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

-				GenerateDebugInformation="TRUE"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_imagedll/Debug/hl_test_imagedll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_imagedll/Debug/hl_test_imagedll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\hl\src,..\..\..\..\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_imagedll/Debug/hl_test_imagedll.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_imagedll/Debug/"

+				ObjectFile=".\../../../../hl/test/hl_test_imagedll/Debug/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_imagedll/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_imagedll/Debug/hl_test_imagedll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_imagedll/Release"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_imagedll/Release"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_imagedll/Release/hl_test_imagedll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_imagedll/Release/hl_test_imagedll.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_imagedll/Release/"

 				ObjectFile=".\../../../../hl/test/hl_test_imagedll/Release/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_imagedll/Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_imagedll/Release/hl_test_imagedll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_imagedll/Release/hl_test_imagedll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_imagedll/Release/hl_test_imagedll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_imagedll/Release/hl_test_imagedll.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_imagedll/Release/"

+				ObjectFile=".\../../../../hl/test/hl_test_imagedll/Release/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_imagedll/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_imagedll/Release/hl_test_imagedll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -138,35 +388,64 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\test\test_image.c">

+				RelativePath="..\..\..\..\hl\test\test_image.c"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/test/hl_test_lite/hl_test_lite.vcproj b/windows/hl/test/hl_test_lite/hl_test_lite.vcproj
index bf61de9..a718284 100644
--- a/windows/hl/test/hl_test_lite/hl_test_lite.vcproj
+++ b/windows/hl/test/hl_test_lite/hl_test_lite.vcproj
@@ -1,160 +1,437 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="hl_test_lite"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{6FFCE804-EF4A-468F-A174-561934C153A1}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_lite/Release"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_lite/Release"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_lite/Release/hl_test_lite.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_lite/Release/hl_test_lite.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_lite/Release/"

 				ObjectFile=".\../../../../hl/test/hl_test_lite/Release/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_lite/Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_lite/Release/hl_test_lite.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_lite/Release/hl_test_lite.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_lite/Release/hl_test_lite.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_lite/Release/hl_test_lite.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_lite/Release/"

+				ObjectFile=".\../../../../hl/test/hl_test_lite/Release/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_lite/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_lite/Release/hl_test_lite.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_lite/Debug"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_lite/Debug"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_lite/Debug/hl_test_lite.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\hl\src,..\..\..\..\src,..\..\..\..\test"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_lite/Debug/hl_test_lite.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_lite/Debug/"

 				ObjectFile=".\../../../../hl/test/hl_test_lite/Debug/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_lite/Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_lite/Debug/hl_test_lite.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_lite/Debug/hl_test_lite.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_lite/Debug/hl_test_lite.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\hl\src,..\..\..\..\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_lite/Debug/hl_test_lite.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_lite/Debug/"

+				ObjectFile=".\../../../../hl/test/hl_test_lite/Debug/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_lite/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="libc.lib"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_lite/Debug/hl_test_lite.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

 	</References>

 	<Files>

 		<File

-			RelativePath="..\..\..\..\hl\test\test_lite.c">

+			RelativePath="..\..\..\..\hl\test\test_lite.c"

+			>

+			<FileConfiguration

+				Name="Release|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="2"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 			<FileConfiguration

-				Name="Release|Win32">

+				Name="Release|x64"

+				>

 				<Tool

 					Name="VCCLCompilerTool"

 					Optimization="2"

 					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BasicRuntimeChecks="3"

+				/>

 			</FileConfiguration>

 			<FileConfiguration

-				Name="Debug|Win32">

+				Name="Debug|x64"

+				>

 				<Tool

 					Name="VCCLCompilerTool"

 					Optimization="0"

 					AdditionalIncludeDirectories=""

 					PreprocessorDefinitions=""

-					BasicRuntimeChecks="3"/>

+					BasicRuntimeChecks="3"

+				/>

 			</FileConfiguration>

 		</File>

 	</Files>

diff --git a/windows/hl/test/hl_test_litedll/hl_test_litedll.vcproj b/windows/hl/test/hl_test_litedll/hl_test_litedll.vcproj
index ccd3c2e..c4e4ef3 100644
--- a/windows/hl/test/hl_test_litedll/hl_test_litedll.vcproj
+++ b/windows/hl/test/hl_test_litedll/hl_test_litedll.vcproj
@@ -1,84 +1,231 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="hl_test_litedll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{98AE818A-E887-414B-985F-85F8411916C9}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_litedll/Release"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_litedll/Release"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_litedll/Release/hl_test_litedll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_litedll/Release/hl_test_litedll.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_litedll/Release/"

 				ObjectFile=".\../../../../hl/test/hl_test_litedll/Release/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_litedll/Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_litedll/Release/hl_test_litedll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_litedll/Release/hl_test_litedll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_litedll/Release/hl_test_litedll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_litedll/Release/hl_test_litedll.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_litedll/Release/"

+				ObjectFile=".\../../../../hl/test/hl_test_litedll/Release/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_litedll/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_litedll/Release/hl_test_litedll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_litedll/Debug"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_litedll/Debug"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_litedll/Debug/hl_test_litedll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -86,51 +233,154 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_litedll/Debug/hl_test_litedll.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_litedll/Debug/"

 				ObjectFile=".\../../../../hl/test/hl_test_litedll/Debug/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_litedll/Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_litedll/Debug/hl_test_litedll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

-				GenerateDebugInformation="TRUE"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_litedll/Debug/hl_test_litedll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_litedll/Debug/hl_test_litedll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_litedll/Debug/hl_test_litedll.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_litedll/Debug/"

+				ObjectFile=".\../../../../hl/test/hl_test_litedll/Debug/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_litedll/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_litedll/Debug/hl_test_litedll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -138,35 +388,64 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\test\test_lite.c">

+				RelativePath="..\..\..\..\hl\test\test_lite.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/test/hl_test_packet/hl_test_packet.vcproj b/windows/hl/test/hl_test_packet/hl_test_packet.vcproj
index 9735f23..0b483b6 100644
--- a/windows/hl/test/hl_test_packet/hl_test_packet.vcproj
+++ b/windows/hl/test/hl_test_packet/hl_test_packet.vcproj
@@ -1,137 +1,388 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="hl_test_packet"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{5CC7FFCE-2612-41B6-AF83-C1B61F67949B}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_packet/Release"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_packet/Release"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_packet/Release/hl_test_packet.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\hl\src,..\..\..\..\src,..\..\..\..\test"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_packet/Release/hl_test_packet.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_packet/Release/"

 				ObjectFile=".\../../../../hl/test/hl_test_packet/Release/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_packet/Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_packet/Release/hl_test_packet.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_packet/Release/hl_test_packet.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_packet/Release/hl_test_packet.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\hl\src,..\..\..\..\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_packet/Release/hl_test_packet.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_packet/Release/"

+				ObjectFile=".\../../../../hl/test/hl_test_packet/Release/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_packet/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_packet/Release/hl_test_packet.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_packet/Debug"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_packet/Debug"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_packet/Debug/hl_test_packet.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\hl\src,..\..\..\..\src,..\..\..\..\test"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_packet/Debug/hl_test_packet.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_packet/Debug/"

 				ObjectFile=".\../../../../hl/test/hl_test_packet/Debug/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_packet/Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_packet/Debug/hl_test_packet.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_packet/Debug/hl_test_packet.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_packet/Debug/hl_test_packet.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\hl\src,..\..\..\..\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_packet/Debug/hl_test_packet.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_packet/Debug/"

+				ObjectFile=".\../../../../hl/test/hl_test_packet/Debug/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_packet/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="libc.lib"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_packet/Debug/hl_test_packet.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -139,35 +390,64 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\test\test_packet.c">

+				RelativePath="..\..\..\..\hl\test\test_packet.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/test/hl_test_packetdll/hl_test_packetdll.vcproj b/windows/hl/test/hl_test_packetdll/hl_test_packetdll.vcproj
index 9a4897d..cbf5c43 100644
--- a/windows/hl/test/hl_test_packetdll/hl_test_packetdll.vcproj
+++ b/windows/hl/test/hl_test_packetdll/hl_test_packetdll.vcproj
@@ -1,84 +1,231 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="hl_test_packetdll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{E3B02B7C-6CF5-42C5-8AF5-48D2B6D8F94B}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_packetdll/Release"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_packetdll/Release"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_packetdll/Release/hl_test_packetdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\hl\src,..\..\..\..\src,..\..\..\..\test"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_packetdll/Release/hl_test_packetdll.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_packetdll/Release/"

 				ObjectFile=".\../../../../hl/test/hl_test_packetdll/Release/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_packetdll/Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_packetdll/Release/hl_test_packetdll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_packetdll/Release/hl_test_packetdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_packetdll/Release/hl_test_packetdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\hl\src,..\..\..\..\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_packetdll/Release/hl_test_packetdll.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_packetdll/Release/"

+				ObjectFile=".\../../../../hl/test/hl_test_packetdll/Release/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_packetdll/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_packetdll/Release/hl_test_packetdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_packetdll/Debug"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_packetdll/Debug"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_packetdll/Debug/hl_test_packetdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -86,51 +233,154 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_packetdll/Debug/hl_test_packetdll.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_packetdll/Debug/"

 				ObjectFile=".\../../../../hl/test/hl_test_packetdll/Debug/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_packetdll/Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_packetdll/Debug/hl_test_packetdll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

-				GenerateDebugInformation="TRUE"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_packetdll/Debug/hl_test_packetdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_packetdll/Debug/hl_test_packetdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\hl\src,..\..\..\..\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_packetdll/Debug/hl_test_packetdll.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_packetdll/Debug/"

+				ObjectFile=".\../../../../hl/test/hl_test_packetdll/Debug/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_packetdll/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_packetdll/Debug/hl_test_packetdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -138,35 +388,64 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\test\test_packet.c">

+				RelativePath="..\..\..\..\hl\test\test_packet.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/test/hl_test_table/hl_test_table.vcproj b/windows/hl/test/hl_test_table/hl_test_table.vcproj
index 309d7c9..3102709 100644
--- a/windows/hl/test/hl_test_table/hl_test_table.vcproj
+++ b/windows/hl/test/hl_test_table/hl_test_table.vcproj
@@ -1,160 +1,437 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="hl_test_table"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{43069CE7-E7CB-4EBF-A6CC-31E7A06D3835}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_table/Release"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_table/Release"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_table/Release/hl_test_table.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_table/Release/hl_test_table.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_table/Release/"

 				ObjectFile=".\../../../../hl/test/hl_test_table/Release/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_table/Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_table/Release/hl_test_table.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_table/Release/hl_test_table.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_table/Release/hl_test_table.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_table/Release/hl_test_table.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_table/Release/"

+				ObjectFile=".\../../../../hl/test/hl_test_table/Release/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_table/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_table/Release/hl_test_table.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_table/Debug"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_table/Debug"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_table/Debug/hl_test_table.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_table/Debug/hl_test_table.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_table/Debug/"

 				ObjectFile=".\../../../../hl/test/hl_test_table/Debug/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_table/Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_table/Debug/hl_test_table.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_table/Debug/hl_test_table.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_table/Debug/hl_test_table.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\hl\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_table/Debug/hl_test_table.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_table/Debug/"

+				ObjectFile=".\../../../../hl/test/hl_test_table/Debug/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_table/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="libc.lib"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_table/Debug/hl_test_table.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

 	</References>

 	<Files>

 		<File

-			RelativePath="..\..\..\..\hl\test\test_table.c">

+			RelativePath="..\..\..\..\hl\test\test_table.c"

+			>

+			<FileConfiguration

+				Name="Release|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="2"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 			<FileConfiguration

-				Name="Release|Win32">

+				Name="Release|x64"

+				>

 				<Tool

 					Name="VCCLCompilerTool"

 					Optimization="2"

 					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BasicRuntimeChecks="3"

+				/>

 			</FileConfiguration>

 			<FileConfiguration

-				Name="Debug|Win32">

+				Name="Debug|x64"

+				>

 				<Tool

 					Name="VCCLCompilerTool"

 					Optimization="0"

 					AdditionalIncludeDirectories=""

 					PreprocessorDefinitions=""

-					BasicRuntimeChecks="3"/>

+					BasicRuntimeChecks="3"

+				/>

 			</FileConfiguration>

 		</File>

 	</Files>

diff --git a/windows/hl/test/hl_test_tabledll/hl_test_tabledll.vcproj b/windows/hl/test/hl_test_tabledll/hl_test_tabledll.vcproj
index cb4b68e..351c560 100644
--- a/windows/hl/test/hl_test_tabledll/hl_test_tabledll.vcproj
+++ b/windows/hl/test/hl_test_tabledll/hl_test_tabledll.vcproj
@@ -1,23 +1,48 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="hl_test_tabledll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{D1AADCA9-FB5A-4F44-8E11-8232941E2C33}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_tabledll/Debug"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_tabledll/Debug"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_tabledll/Debug/hl_test_tabledll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -25,112 +50,337 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_tabledll/Debug/hl_test_tabledll.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_tabledll/Debug/"

 				ObjectFile=".\../../../../hl/test/hl_test_tabledll/Debug/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_tabledll/Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_tabledll/Debug/hl_test_tabledll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

-				GenerateDebugInformation="TRUE"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_tabledll/Debug/hl_test_tabledll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_tabledll/Debug/hl_test_tabledll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\hl\src,..\..\..\..\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_tabledll/Debug/hl_test_tabledll.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_tabledll/Debug/"

+				ObjectFile=".\../../../../hl/test/hl_test_tabledll/Debug/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_tabledll/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_tabledll/Debug/hl_test_tabledll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../hl/test/hl_test_tabledll/Release"

-			IntermediateDirectory=".\../../../../hl/test/hl_test_tabledll/Release"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../../hl/test/hl_test_tabledll/Release/hl_test_tabledll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\hl\src,..\..\..\..\src,..\..\..\..\test"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_tabledll/Release/hl_test_tabledll.pch"

 				AssemblerListingLocation=".\../../../../hl/test/hl_test_tabledll/Release/"

 				ObjectFile=".\../../../../hl/test/hl_test_tabledll/Release/"

 				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_tabledll/Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../hl/test/hl_test_tabledll/Release/hl_test_tabledll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_tabledll/Release/hl_test_tabledll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\../../../../hl/test/hl_test_tabledll/Release/hl_test_tabledll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\hl\src,..\..\..\..\src,..\..\..\..\test"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5USEHLDLL_"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../hl/test/hl_test_tabledll/Release/hl_test_tabledll.pch"

+				AssemblerListingLocation=".\../../../../hl/test/hl_test_tabledll/Release/"

+				ObjectFile=".\../../../../hl/test/hl_test_tabledll/Release/"

+				ProgramDataBaseFileName=".\../../../../hl/test/hl_test_tabledll/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\../../../../hl/test/hl_test_tabledll/Release/hl_test_tabledll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -138,35 +388,64 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\test\test_table.c">

+				RelativePath="..\..\..\..\hl\test\test_table.c"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/tools/gifconv/gif2h5.vcproj b/windows/hl/tools/gifconv/gif2h5.vcproj
index f3d510d..fa1e9d4 100644
--- a/windows/hl/tools/gifconv/gif2h5.vcproj
+++ b/windows/hl/tools/gifconv/gif2h5.vcproj
@@ -1,138 +1,390 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="gif2h5"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{7C30B2A4-A24D-4796-9754-CABBDB46D0F8}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\tools\gifconv\gif2h5\Debug"

-			IntermediateDirectory=".\..\..\..\..\hl\tools\gifconv\gif2h5\Debug"

+			OutputDirectory="..\..\..\..\hl\tools\gifconv\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\tools\gifconv\gif2h5\Debug/gif2h5.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib,..\..\..\..\hl\src"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Debug/gif2h5.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\tools\gifconv\gif2h5\Debug/"

 				ObjectFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Debug/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconv\gif2h5\Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Debug/gif2h5.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Debug/gif2h5.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\tools\gifconv\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\tools\gifconv\gif2h5\Debug/gif2h5.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib,..\..\..\..\hl\src"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Debug/gif2h5.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\tools\gifconv\gif2h5\Debug/"

+				ObjectFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconv\gif2h5\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="libc.lib"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Debug/gif2h5.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release"

-			IntermediateDirectory=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release"

+			OutputDirectory="..\..\..\..\hl\tools\gifconv\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release/gif2h5.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib,..\..\..\..\hl\src"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release/gif2h5.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release/"

 				ObjectFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release/gif2h5.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release/gif2h5.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\tools\gifconv\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release/gif2h5.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib,..\..\..\..\hl\src"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release/gif2h5.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release/"

+				ObjectFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="libcd.lib"

+				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release/gif2h5.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				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="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -140,115 +392,248 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\tools\gif2h5\decompress.c">

+				RelativePath="..\..\..\..\hl\tools\gif2h5\decompress.c"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\..\hl\tools\gif2h5\gif2hdf.c">

+				RelativePath="..\..\..\..\hl\tools\gif2h5\gif2hdf.c"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\..\hl\tools\gif2h5\gif2mem.c">

+				RelativePath="..\..\..\..\hl\tools\gif2h5\gif2mem.c"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\..\hl\tools\gif2h5\gifread.c">

+				RelativePath="..\..\..\..\hl\tools\gif2h5\gifread.c"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\..\hl\tools\gif2h5\writehdf.c">

+				RelativePath="..\..\..\..\hl\tools\gif2h5\writehdf.c"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/tools/gifconv/h52gif.vcproj b/windows/hl/tools/gifconv/h52gif.vcproj
index 96be977..a464744 100644
--- a/windows/hl/tools/gifconv/h52gif.vcproj
+++ b/windows/hl/tools/gifconv/h52gif.vcproj
@@ -1,138 +1,390 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="h52gif"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{AA7A40A2-A837-4557-AB3D-D64980F6F8E4}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\tools\gifconv\h52gif\Release"

-			IntermediateDirectory=".\..\..\..\..\hl\tools\gifconv\h52gif\Release"

+			OutputDirectory="..\..\..\..\hl\tools\gifconv\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\tools\gifconv\h52gif\Release/h52gif.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib,..\..\..\..\hl\src"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\tools\gifconv\h52gif\Release/h52gif.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\tools\gifconv\h52gif\Release/"

 				ObjectFile=".\..\..\..\..\hl\tools\gifconv\h52gif\Release/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconv\h52gif\Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\tools\gifconv\h52gif\Release/h52gif.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconv\h52gif\Release/h52gif.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\tools\gifconv\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\tools\gifconv\h52gif\Release/h52gif.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib,..\..\..\..\hl\src"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\tools\gifconv\h52gif\Release/h52gif.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\tools\gifconv\h52gif\Release/"

+				ObjectFile=".\..\..\..\..\hl\tools\gifconv\h52gif\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconv\h52gif\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="libcd.lib"

+				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconv\h52gif\Release/h52gif.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				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="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\tools\gifconv\h52gif\Debug"

-			IntermediateDirectory=".\..\..\..\..\hl\tools\gifconv\h52gif\debug"

+			OutputDirectory="..\..\..\..\hl\tools\gifconv\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\tools\gifconv\h52gif\Debug/h52gif.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib,..\..\..\..\hl\src"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\tools\gifconv\h52gif\debug/h52gif.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\tools\gifconv\h52gif\debug/"

 				ObjectFile=".\..\..\..\..\hl\tools\gifconv\h52gif\debug/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconv\h52gif\debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\tools\gifconv\h52gif\Debug/h52gif.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconv\h52gif\Debug/h52gif.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\tools\gifconv\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\tools\gifconv\h52gif\Debug/h52gif.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib,..\..\..\..\hl\src"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\tools\gifconv\h52gif\debug/h52gif.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\tools\gifconv\h52gif\debug/"

+				ObjectFile=".\..\..\..\..\hl\tools\gifconv\h52gif\debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconv\h52gif\debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="libc.lib"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconv\h52gif\Debug/h52gif.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -140,55 +392,110 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\tools\gif2h5\hdf2gif.c">

+				RelativePath="..\..\..\..\hl\tools\gif2h5\hdf2gif.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\..\hl\tools\gif2h5\hdfgifwr.c">

+				RelativePath="..\..\..\..\hl\tools\gif2h5\hdfgifwr.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/tools/gifconvdll/gif2h5dll.vcproj b/windows/hl/tools/gifconvdll/gif2h5dll.vcproj
index 425f7e4..6a3ba12 100644
--- a/windows/hl/tools/gifconvdll/gif2h5dll.vcproj
+++ b/windows/hl/tools/gifconvdll/gif2h5dll.vcproj
@@ -1,83 +1,229 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="gif2h5dll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{C325E167-DBC3-4611-8AC8-2A118432E35B}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release"

-			IntermediateDirectory=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release"

+			OutputDirectory="..\..\..\..\hl\tools\gifconvdll\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release/gif2h5dll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib,..\..\..\..\hl\src"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release/gif2h5dll.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release/"

 				ObjectFile=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release/gif2h5dll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release/gif2h5dll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\tools\gifconvdll\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release/gif2h5dll.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib,..\..\..\..\hl\src"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release/gif2h5dll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release/"

+				ObjectFile=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release/gif2h5dll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug"

-			IntermediateDirectory=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug"

+			OutputDirectory="..\..\..\..\hl\tools\gifconvdll\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug/gif2h5dll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -85,50 +231,152 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug/gif2h5dll.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug/"

 				ObjectFile=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug/gif2h5dll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

-				GenerateDebugInformation="TRUE"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug/gif2h5dll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\tools\gifconvdll\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug/gif2h5dll.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib,..\..\..\..\hl\src"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug/gif2h5dll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug/gif2h5dll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -136,115 +384,248 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\tools\gif2h5\decompress.c">

+				RelativePath="..\..\..\..\hl\tools\gif2h5\decompress.c"

+				>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\..\hl\tools\gif2h5\gif2hdf.c">

+				RelativePath="..\..\..\..\hl\tools\gif2h5\gif2hdf.c"

+				>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\..\hl\tools\gif2h5\gif2mem.c">

+				RelativePath="..\..\..\..\hl\tools\gif2h5\gif2mem.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\..\hl\tools\gif2h5\gifread.c">

+				RelativePath="..\..\..\..\hl\tools\gif2h5\gifread.c"

+				>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\..\hl\tools\gif2h5\writehdf.c">

+				RelativePath="..\..\..\..\hl\tools\gif2h5\writehdf.c"

+				>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/windows/hl/tools/gifconvdll/h52gifdll.vcproj b/windows/hl/tools/gifconvdll/h52gifdll.vcproj
index 99e6f99..1737f23 100644
--- a/windows/hl/tools/gifconvdll/h52gifdll.vcproj
+++ b/windows/hl/tools/gifconvdll/h52gifdll.vcproj
@@ -1,83 +1,229 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="h52gifdll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{834DD32C-D078-441F-95F4-9CDE108B60AE}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release"

-			IntermediateDirectory=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release"

+			OutputDirectory="..\..\..\..\hl\tools\gifconvdll\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release/h52gifdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib,..\..\..\..\hl\src"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release/h52gifdll.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release/"

 				ObjectFile=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release/h52gifdll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release/h52gifdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\..\hl\tools\gifconvdll\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release/h52gifdll.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib,..\..\..\..\hl\src"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release/h52gifdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release/"

+				ObjectFile=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release/h52gifdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				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="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug"

-			IntermediateDirectory=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug"

+			OutputDirectory="..\..\..\..\hl\tools\gifconvdll\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug/h52gifdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -85,50 +231,152 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug/h52gifdll.pch"

 				AssemblerListingLocation=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug/"

 				ObjectFile=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug/"

 				ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug/h52gifdll.exe"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

-				GenerateDebugInformation="TRUE"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug/h52gifdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\..\hl\tools\gifconvdll\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 				TypeLibraryName=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug/h52gifdll.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib,..\..\..\..\hl\src"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug/h52gifdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug/h52gifdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				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="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -136,55 +384,110 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"

+			>

 			<File

-				RelativePath="..\..\..\..\hl\tools\gif2h5\hdf2gif.c">

+				RelativePath="..\..\..\..\hl\tools\gif2h5\hdf2gif.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\..\hl\tools\gif2h5\hdfgifwr.c">

+				RelativePath="..\..\..\..\hl\tools\gif2h5\hdfgifwr.c"

+				>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd">

+			Filter="h;hpp;hxx;hm;inl;fi;fd"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 		</Filter>

 	</Files>

 	<Globals>