[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

20 files changed, 7109 insertions, 1430 deletions

diff --git a/windows/c++/examples/allcppexamples/allcppexamples.sln b/windows/c++/examples/allcppexamples/allcppexamples.sln
index 2d974cb..1818ad9 100644
--- a/windows/c++/examples/allcppexamples/allcppexamples.sln
+++ b/windows/c++/examples/allcppexamples/allcppexamples.sln
@@ -1,149 +1,181 @@
-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}") = "allcppexamples", "allcppexamples.vcproj", "{27E3886B-0BAC-4E00-8F89-163208E03462}"

 	ProjectSection(ProjectDependencies) = postProject

-		{562DA812-6FD9-424A-BC3E-044362DC93C1} = {562DA812-6FD9-424A-BC3E-044362DC93C1}

-		{051AA0B9-BC9B-4732-BE21-F3949C6A179B} = {051AA0B9-BC9B-4732-BE21-F3949C6A179B}

 		{7AABEE0C-3749-49C6-B951-5081BE817897} = {7AABEE0C-3749-49C6-B951-5081BE817897}

-		{DA72AC9E-B53E-43B4-A9C1-A1E94F3733CD} = {DA72AC9E-B53E-43B4-A9C1-A1E94F3733CD}

-		{AC1F5EA5-2256-4E27-8D56-D9A5AA71F411} = {AC1F5EA5-2256-4E27-8D56-D9A5AA71F411}

-		{F144F936-D02D-4859-9FAA-FED36AC8A0C4} = {F144F936-D02D-4859-9FAA-FED36AC8A0C4}

-		{1D870142-6627-41ED-95C3-31CF9783FE70} = {1D870142-6627-41ED-95C3-31CF9783FE70}

+		{562DA812-6FD9-424A-BC3E-044362DC93C1} = {562DA812-6FD9-424A-BC3E-044362DC93C1}

 		{9C900514-5BB2-4BA2-B5DF-5FD8572982DC} = {9C900514-5BB2-4BA2-B5DF-5FD8572982DC}

 		{8A70FD1D-7E7E-448B-8F5F-7CF2A414F309} = {8A70FD1D-7E7E-448B-8F5F-7CF2A414F309}

-		{C75DC585-7E3D-472D-AB77-EAE48876FA8C} = {C75DC585-7E3D-472D-AB77-EAE48876FA8C}

 		{798DE42A-5B27-4B33-B54A-58D45EFD600B} = {798DE42A-5B27-4B33-B54A-58D45EFD600B}

-		{1F74A3E0-276B-4A85-BBB0-3421434D5946} = {1F74A3E0-276B-4A85-BBB0-3421434D5946}

+		{F144F936-D02D-4859-9FAA-FED36AC8A0C4} = {F144F936-D02D-4859-9FAA-FED36AC8A0C4}

+		{1D870142-6627-41ED-95C3-31CF9783FE70} = {1D870142-6627-41ED-95C3-31CF9783FE70}

 		{B187A146-D60D-4587-90F5-A501E4B826A6} = {B187A146-D60D-4587-90F5-A501E4B826A6}

+		{C75DC585-7E3D-472D-AB77-EAE48876FA8C} = {C75DC585-7E3D-472D-AB77-EAE48876FA8C}

 		{8CD35A8A-1D59-4ACE-B684-A7FD9952A45C} = {8CD35A8A-1D59-4ACE-B684-A7FD9952A45C}

+		{DA72AC9E-B53E-43B4-A9C1-A1E94F3733CD} = {DA72AC9E-B53E-43B4-A9C1-A1E94F3733CD}

+		{AC1F5EA5-2256-4E27-8D56-D9A5AA71F411} = {AC1F5EA5-2256-4E27-8D56-D9A5AA71F411}

+		{051AA0B9-BC9B-4732-BE21-F3949C6A179B} = {051AA0B9-BC9B-4732-BE21-F3949C6A179B}

+		{1F74A3E0-276B-4A85-BBB0-3421434D5946} = {1F74A3E0-276B-4A85-BBB0-3421434D5946}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunkstest", "..\chunkstest\chunkstest.vcproj", "{9C900514-5BB2-4BA2-B5DF-5FD8572982DC}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunkstestdll", "..\chunkstestdll\chunkstestdll.vcproj", "{1D870142-6627-41ED-95C3-31CF9783FE70}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compoundtest", "..\compoundtest\compoundtest.vcproj", "{8CD35A8A-1D59-4ACE-B684-A7FD9952A45C}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compoundtestdll", "..\compoundtestdll\compoundtestdll.vcproj", "{F144F936-D02D-4859-9FAA-FED36AC8A0C4}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "createtest", "..\createtest\createtest.vcproj", "{B187A146-D60D-4587-90F5-A501E4B826A6}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "createtestdll", "..\createtestdll\createtestdll.vcproj", "{AC1F5EA5-2256-4E27-8D56-D9A5AA71F411}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extend_dstest", "..\extend_dstest\extend_dstest.vcproj", "{1F74A3E0-276B-4A85-BBB0-3421434D5946}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extend_dstestdll", "..\extend_dstestdll\extend_dstestdll.vcproj", "{DA72AC9E-B53E-43B4-A9C1-A1E94F3733CD}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5grouptest", "..\h5grouptest\h5grouptest.vcproj", "{798DE42A-5B27-4B33-B54A-58D45EFD600B}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5grouptestdll", "..\h5grouptestdll\h5grouptestdll.vcproj", "{7AABEE0C-3749-49C6-B951-5081BE817897}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "readdatatest", "..\readdatatest\readdatatest.vcproj", "{C75DC585-7E3D-472D-AB77-EAE48876FA8C}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "readdatatestdll", "..\readdatatestdll\readdatatestdll.vcproj", "{051AA0B9-BC9B-4732-BE21-F3949C6A179B}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writedatatest", "..\writedatatest\writedatatest.vcproj", "{8A70FD1D-7E7E-448B-8F5F-7CF2A414F309}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writedatatestdll", "..\writedatatestdll\writedatatestdll.vcproj", "{562DA812-6FD9-424A-BC3E-044362DC93C1}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		Release = Release

-	EndGlobalSection

-	GlobalSection(ProjectDependencies) = postSolution

-	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{27E3886B-0BAC-4E00-8F89-163208E03462}.Debug.ActiveCfg = Debug|Win32

-		{27E3886B-0BAC-4E00-8F89-163208E03462}.Debug.Build.0 = Debug|Win32

-		{27E3886B-0BAC-4E00-8F89-163208E03462}.Release.ActiveCfg = Release|Win32

-		{27E3886B-0BAC-4E00-8F89-163208E03462}.Release.Build.0 = Release|Win32

-		{9C900514-5BB2-4BA2-B5DF-5FD8572982DC}.Debug.ActiveCfg = Debug|Win32

-		{9C900514-5BB2-4BA2-B5DF-5FD8572982DC}.Debug.Build.0 = Debug|Win32

-		{9C900514-5BB2-4BA2-B5DF-5FD8572982DC}.Release.ActiveCfg = Release|Win32

-		{9C900514-5BB2-4BA2-B5DF-5FD8572982DC}.Release.Build.0 = Release|Win32

-		{1D870142-6627-41ED-95C3-31CF9783FE70}.Debug.ActiveCfg = Debug|Win32

-		{1D870142-6627-41ED-95C3-31CF9783FE70}.Debug.Build.0 = Debug|Win32

-		{1D870142-6627-41ED-95C3-31CF9783FE70}.Release.ActiveCfg = Release|Win32

-		{1D870142-6627-41ED-95C3-31CF9783FE70}.Release.Build.0 = Release|Win32

-		{8CD35A8A-1D59-4ACE-B684-A7FD9952A45C}.Debug.ActiveCfg = Debug|Win32

-		{8CD35A8A-1D59-4ACE-B684-A7FD9952A45C}.Debug.Build.0 = Debug|Win32

-		{8CD35A8A-1D59-4ACE-B684-A7FD9952A45C}.Release.ActiveCfg = Release|Win32

-		{8CD35A8A-1D59-4ACE-B684-A7FD9952A45C}.Release.Build.0 = Release|Win32

-		{F144F936-D02D-4859-9FAA-FED36AC8A0C4}.Debug.ActiveCfg = Debug|Win32

-		{F144F936-D02D-4859-9FAA-FED36AC8A0C4}.Debug.Build.0 = Debug|Win32

-		{F144F936-D02D-4859-9FAA-FED36AC8A0C4}.Release.ActiveCfg = Release|Win32

-		{F144F936-D02D-4859-9FAA-FED36AC8A0C4}.Release.Build.0 = Release|Win32

-		{B187A146-D60D-4587-90F5-A501E4B826A6}.Debug.ActiveCfg = Debug|Win32

-		{B187A146-D60D-4587-90F5-A501E4B826A6}.Debug.Build.0 = Debug|Win32

-		{B187A146-D60D-4587-90F5-A501E4B826A6}.Release.ActiveCfg = Release|Win32

-		{B187A146-D60D-4587-90F5-A501E4B826A6}.Release.Build.0 = Release|Win32

-		{AC1F5EA5-2256-4E27-8D56-D9A5AA71F411}.Debug.ActiveCfg = Debug|Win32

-		{AC1F5EA5-2256-4E27-8D56-D9A5AA71F411}.Debug.Build.0 = Debug|Win32

-		{AC1F5EA5-2256-4E27-8D56-D9A5AA71F411}.Release.ActiveCfg = Release|Win32

-		{AC1F5EA5-2256-4E27-8D56-D9A5AA71F411}.Release.Build.0 = Release|Win32

-		{1F74A3E0-276B-4A85-BBB0-3421434D5946}.Debug.ActiveCfg = Debug|Win32

-		{1F74A3E0-276B-4A85-BBB0-3421434D5946}.Debug.Build.0 = Debug|Win32

-		{1F74A3E0-276B-4A85-BBB0-3421434D5946}.Release.ActiveCfg = Release|Win32

-		{1F74A3E0-276B-4A85-BBB0-3421434D5946}.Release.Build.0 = Release|Win32

-		{DA72AC9E-B53E-43B4-A9C1-A1E94F3733CD}.Debug.ActiveCfg = Debug|Win32

-		{DA72AC9E-B53E-43B4-A9C1-A1E94F3733CD}.Debug.Build.0 = Debug|Win32

-		{DA72AC9E-B53E-43B4-A9C1-A1E94F3733CD}.Release.ActiveCfg = Release|Win32

-		{DA72AC9E-B53E-43B4-A9C1-A1E94F3733CD}.Release.Build.0 = Release|Win32

-		{798DE42A-5B27-4B33-B54A-58D45EFD600B}.Debug.ActiveCfg = Debug|Win32

-		{798DE42A-5B27-4B33-B54A-58D45EFD600B}.Debug.Build.0 = Debug|Win32

-		{798DE42A-5B27-4B33-B54A-58D45EFD600B}.Release.ActiveCfg = Release|Win32

-		{798DE42A-5B27-4B33-B54A-58D45EFD600B}.Release.Build.0 = Release|Win32

-		{7AABEE0C-3749-49C6-B951-5081BE817897}.Debug.ActiveCfg = Debug|Win32

-		{7AABEE0C-3749-49C6-B951-5081BE817897}.Debug.Build.0 = Debug|Win32

-		{7AABEE0C-3749-49C6-B951-5081BE817897}.Release.ActiveCfg = Release|Win32

-		{7AABEE0C-3749-49C6-B951-5081BE817897}.Release.Build.0 = Release|Win32

-		{C75DC585-7E3D-472D-AB77-EAE48876FA8C}.Debug.ActiveCfg = Debug|Win32

-		{C75DC585-7E3D-472D-AB77-EAE48876FA8C}.Debug.Build.0 = Debug|Win32

-		{C75DC585-7E3D-472D-AB77-EAE48876FA8C}.Release.ActiveCfg = Release|Win32

-		{C75DC585-7E3D-472D-AB77-EAE48876FA8C}.Release.Build.0 = Release|Win32

-		{051AA0B9-BC9B-4732-BE21-F3949C6A179B}.Debug.ActiveCfg = Debug|Win32

-		{051AA0B9-BC9B-4732-BE21-F3949C6A179B}.Debug.Build.0 = Debug|Win32

-		{051AA0B9-BC9B-4732-BE21-F3949C6A179B}.Release.ActiveCfg = Release|Win32

-		{051AA0B9-BC9B-4732-BE21-F3949C6A179B}.Release.Build.0 = Release|Win32

-		{8A70FD1D-7E7E-448B-8F5F-7CF2A414F309}.Debug.ActiveCfg = Debug|Win32

-		{8A70FD1D-7E7E-448B-8F5F-7CF2A414F309}.Debug.Build.0 = Debug|Win32

-		{8A70FD1D-7E7E-448B-8F5F-7CF2A414F309}.Release.ActiveCfg = Release|Win32

-		{8A70FD1D-7E7E-448B-8F5F-7CF2A414F309}.Release.Build.0 = Release|Win32

-		{562DA812-6FD9-424A-BC3E-044362DC93C1}.Debug.ActiveCfg = Debug|Win32

-		{562DA812-6FD9-424A-BC3E-044362DC93C1}.Debug.Build.0 = Debug|Win32

-		{562DA812-6FD9-424A-BC3E-044362DC93C1}.Release.ActiveCfg = Release|Win32

-		{562DA812-6FD9-424A-BC3E-044362DC93C1}.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

+		{27E3886B-0BAC-4E00-8F89-163208E03462}.Debug|Win32.ActiveCfg = Debug|Win32

+		{27E3886B-0BAC-4E00-8F89-163208E03462}.Debug|Win32.Build.0 = Debug|Win32

+		{27E3886B-0BAC-4E00-8F89-163208E03462}.Debug|x64.ActiveCfg = Debug|x64

+		{27E3886B-0BAC-4E00-8F89-163208E03462}.Debug|x64.Build.0 = Debug|x64

+		{27E3886B-0BAC-4E00-8F89-163208E03462}.Release|Win32.ActiveCfg = Release|Win32

+		{27E3886B-0BAC-4E00-8F89-163208E03462}.Release|Win32.Build.0 = Release|Win32

+		{27E3886B-0BAC-4E00-8F89-163208E03462}.Release|x64.ActiveCfg = Release|x64

+		{27E3886B-0BAC-4E00-8F89-163208E03462}.Release|x64.Build.0 = Release|x64

+		{9C900514-5BB2-4BA2-B5DF-5FD8572982DC}.Debug|Win32.ActiveCfg = Debug|Win32

+		{9C900514-5BB2-4BA2-B5DF-5FD8572982DC}.Debug|Win32.Build.0 = Debug|Win32

+		{9C900514-5BB2-4BA2-B5DF-5FD8572982DC}.Debug|x64.ActiveCfg = Debug|x64

+		{9C900514-5BB2-4BA2-B5DF-5FD8572982DC}.Debug|x64.Build.0 = Debug|x64

+		{9C900514-5BB2-4BA2-B5DF-5FD8572982DC}.Release|Win32.ActiveCfg = Release|Win32

+		{9C900514-5BB2-4BA2-B5DF-5FD8572982DC}.Release|Win32.Build.0 = Release|Win32

+		{9C900514-5BB2-4BA2-B5DF-5FD8572982DC}.Release|x64.ActiveCfg = Release|x64

+		{9C900514-5BB2-4BA2-B5DF-5FD8572982DC}.Release|x64.Build.0 = Release|x64

+		{1D870142-6627-41ED-95C3-31CF9783FE70}.Debug|Win32.ActiveCfg = Debug|Win32

+		{1D870142-6627-41ED-95C3-31CF9783FE70}.Debug|Win32.Build.0 = Debug|Win32

+		{1D870142-6627-41ED-95C3-31CF9783FE70}.Debug|x64.ActiveCfg = Debug|x64

+		{1D870142-6627-41ED-95C3-31CF9783FE70}.Debug|x64.Build.0 = Debug|x64

+		{1D870142-6627-41ED-95C3-31CF9783FE70}.Release|Win32.ActiveCfg = Release|Win32

+		{1D870142-6627-41ED-95C3-31CF9783FE70}.Release|Win32.Build.0 = Release|Win32

+		{1D870142-6627-41ED-95C3-31CF9783FE70}.Release|x64.ActiveCfg = Release|x64

+		{1D870142-6627-41ED-95C3-31CF9783FE70}.Release|x64.Build.0 = Release|x64

+		{8CD35A8A-1D59-4ACE-B684-A7FD9952A45C}.Debug|Win32.ActiveCfg = Debug|Win32

+		{8CD35A8A-1D59-4ACE-B684-A7FD9952A45C}.Debug|Win32.Build.0 = Debug|Win32

+		{8CD35A8A-1D59-4ACE-B684-A7FD9952A45C}.Debug|x64.ActiveCfg = Debug|x64

+		{8CD35A8A-1D59-4ACE-B684-A7FD9952A45C}.Debug|x64.Build.0 = Debug|x64

+		{8CD35A8A-1D59-4ACE-B684-A7FD9952A45C}.Release|Win32.ActiveCfg = Release|Win32

+		{8CD35A8A-1D59-4ACE-B684-A7FD9952A45C}.Release|Win32.Build.0 = Release|Win32

+		{8CD35A8A-1D59-4ACE-B684-A7FD9952A45C}.Release|x64.ActiveCfg = Release|x64

+		{8CD35A8A-1D59-4ACE-B684-A7FD9952A45C}.Release|x64.Build.0 = Release|x64

+		{F144F936-D02D-4859-9FAA-FED36AC8A0C4}.Debug|Win32.ActiveCfg = Debug|Win32

+		{F144F936-D02D-4859-9FAA-FED36AC8A0C4}.Debug|Win32.Build.0 = Debug|Win32

+		{F144F936-D02D-4859-9FAA-FED36AC8A0C4}.Debug|x64.ActiveCfg = Debug|x64

+		{F144F936-D02D-4859-9FAA-FED36AC8A0C4}.Debug|x64.Build.0 = Debug|x64

+		{F144F936-D02D-4859-9FAA-FED36AC8A0C4}.Release|Win32.ActiveCfg = Release|Win32

+		{F144F936-D02D-4859-9FAA-FED36AC8A0C4}.Release|Win32.Build.0 = Release|Win32

+		{F144F936-D02D-4859-9FAA-FED36AC8A0C4}.Release|x64.ActiveCfg = Release|x64

+		{F144F936-D02D-4859-9FAA-FED36AC8A0C4}.Release|x64.Build.0 = Release|x64

+		{B187A146-D60D-4587-90F5-A501E4B826A6}.Debug|Win32.ActiveCfg = Debug|Win32

+		{B187A146-D60D-4587-90F5-A501E4B826A6}.Debug|Win32.Build.0 = Debug|Win32

+		{B187A146-D60D-4587-90F5-A501E4B826A6}.Debug|x64.ActiveCfg = Debug|x64

+		{B187A146-D60D-4587-90F5-A501E4B826A6}.Debug|x64.Build.0 = Debug|x64

+		{B187A146-D60D-4587-90F5-A501E4B826A6}.Release|Win32.ActiveCfg = Release|Win32

+		{B187A146-D60D-4587-90F5-A501E4B826A6}.Release|Win32.Build.0 = Release|Win32

+		{B187A146-D60D-4587-90F5-A501E4B826A6}.Release|x64.ActiveCfg = Release|x64

+		{B187A146-D60D-4587-90F5-A501E4B826A6}.Release|x64.Build.0 = Release|x64

+		{AC1F5EA5-2256-4E27-8D56-D9A5AA71F411}.Debug|Win32.ActiveCfg = Debug|Win32

+		{AC1F5EA5-2256-4E27-8D56-D9A5AA71F411}.Debug|Win32.Build.0 = Debug|Win32

+		{AC1F5EA5-2256-4E27-8D56-D9A5AA71F411}.Debug|x64.ActiveCfg = Debug|x64

+		{AC1F5EA5-2256-4E27-8D56-D9A5AA71F411}.Debug|x64.Build.0 = Debug|x64

+		{AC1F5EA5-2256-4E27-8D56-D9A5AA71F411}.Release|Win32.ActiveCfg = Release|Win32

+		{AC1F5EA5-2256-4E27-8D56-D9A5AA71F411}.Release|Win32.Build.0 = Release|Win32

+		{AC1F5EA5-2256-4E27-8D56-D9A5AA71F411}.Release|x64.ActiveCfg = Release|x64

+		{AC1F5EA5-2256-4E27-8D56-D9A5AA71F411}.Release|x64.Build.0 = Release|x64

+		{1F74A3E0-276B-4A85-BBB0-3421434D5946}.Debug|Win32.ActiveCfg = Debug|Win32

+		{1F74A3E0-276B-4A85-BBB0-3421434D5946}.Debug|Win32.Build.0 = Debug|Win32

+		{1F74A3E0-276B-4A85-BBB0-3421434D5946}.Debug|x64.ActiveCfg = Debug|x64

+		{1F74A3E0-276B-4A85-BBB0-3421434D5946}.Debug|x64.Build.0 = Debug|x64

+		{1F74A3E0-276B-4A85-BBB0-3421434D5946}.Release|Win32.ActiveCfg = Release|Win32

+		{1F74A3E0-276B-4A85-BBB0-3421434D5946}.Release|Win32.Build.0 = Release|Win32

+		{1F74A3E0-276B-4A85-BBB0-3421434D5946}.Release|x64.ActiveCfg = Release|x64

+		{1F74A3E0-276B-4A85-BBB0-3421434D5946}.Release|x64.Build.0 = Release|x64

+		{DA72AC9E-B53E-43B4-A9C1-A1E94F3733CD}.Debug|Win32.ActiveCfg = Debug|Win32

+		{DA72AC9E-B53E-43B4-A9C1-A1E94F3733CD}.Debug|Win32.Build.0 = Debug|Win32

+		{DA72AC9E-B53E-43B4-A9C1-A1E94F3733CD}.Debug|x64.ActiveCfg = Debug|x64

+		{DA72AC9E-B53E-43B4-A9C1-A1E94F3733CD}.Debug|x64.Build.0 = Debug|x64

+		{DA72AC9E-B53E-43B4-A9C1-A1E94F3733CD}.Release|Win32.ActiveCfg = Release|Win32

+		{DA72AC9E-B53E-43B4-A9C1-A1E94F3733CD}.Release|Win32.Build.0 = Release|Win32

+		{DA72AC9E-B53E-43B4-A9C1-A1E94F3733CD}.Release|x64.ActiveCfg = Release|x64

+		{DA72AC9E-B53E-43B4-A9C1-A1E94F3733CD}.Release|x64.Build.0 = Release|x64

+		{798DE42A-5B27-4B33-B54A-58D45EFD600B}.Debug|Win32.ActiveCfg = Debug|Win32

+		{798DE42A-5B27-4B33-B54A-58D45EFD600B}.Debug|Win32.Build.0 = Debug|Win32

+		{798DE42A-5B27-4B33-B54A-58D45EFD600B}.Debug|x64.ActiveCfg = Debug|x64

+		{798DE42A-5B27-4B33-B54A-58D45EFD600B}.Debug|x64.Build.0 = Debug|x64

+		{798DE42A-5B27-4B33-B54A-58D45EFD600B}.Release|Win32.ActiveCfg = Release|Win32

+		{798DE42A-5B27-4B33-B54A-58D45EFD600B}.Release|Win32.Build.0 = Release|Win32

+		{798DE42A-5B27-4B33-B54A-58D45EFD600B}.Release|x64.ActiveCfg = Release|x64

+		{798DE42A-5B27-4B33-B54A-58D45EFD600B}.Release|x64.Build.0 = Release|x64

+		{7AABEE0C-3749-49C6-B951-5081BE817897}.Debug|Win32.ActiveCfg = Debug|Win32

+		{7AABEE0C-3749-49C6-B951-5081BE817897}.Debug|Win32.Build.0 = Debug|Win32

+		{7AABEE0C-3749-49C6-B951-5081BE817897}.Debug|x64.ActiveCfg = Debug|x64

+		{7AABEE0C-3749-49C6-B951-5081BE817897}.Debug|x64.Build.0 = Debug|x64

+		{7AABEE0C-3749-49C6-B951-5081BE817897}.Release|Win32.ActiveCfg = Release|Win32

+		{7AABEE0C-3749-49C6-B951-5081BE817897}.Release|Win32.Build.0 = Release|Win32

+		{7AABEE0C-3749-49C6-B951-5081BE817897}.Release|x64.ActiveCfg = Release|x64

+		{7AABEE0C-3749-49C6-B951-5081BE817897}.Release|x64.Build.0 = Release|x64

+		{C75DC585-7E3D-472D-AB77-EAE48876FA8C}.Debug|Win32.ActiveCfg = Debug|Win32

+		{C75DC585-7E3D-472D-AB77-EAE48876FA8C}.Debug|Win32.Build.0 = Debug|Win32

+		{C75DC585-7E3D-472D-AB77-EAE48876FA8C}.Debug|x64.ActiveCfg = Debug|x64

+		{C75DC585-7E3D-472D-AB77-EAE48876FA8C}.Debug|x64.Build.0 = Debug|x64

+		{C75DC585-7E3D-472D-AB77-EAE48876FA8C}.Release|Win32.ActiveCfg = Release|Win32

+		{C75DC585-7E3D-472D-AB77-EAE48876FA8C}.Release|Win32.Build.0 = Release|Win32

+		{C75DC585-7E3D-472D-AB77-EAE48876FA8C}.Release|x64.ActiveCfg = Release|x64

+		{C75DC585-7E3D-472D-AB77-EAE48876FA8C}.Release|x64.Build.0 = Release|x64

+		{051AA0B9-BC9B-4732-BE21-F3949C6A179B}.Debug|Win32.ActiveCfg = Debug|Win32

+		{051AA0B9-BC9B-4732-BE21-F3949C6A179B}.Debug|Win32.Build.0 = Debug|Win32

+		{051AA0B9-BC9B-4732-BE21-F3949C6A179B}.Debug|x64.ActiveCfg = Debug|x64

+		{051AA0B9-BC9B-4732-BE21-F3949C6A179B}.Debug|x64.Build.0 = Debug|x64

+		{051AA0B9-BC9B-4732-BE21-F3949C6A179B}.Release|Win32.ActiveCfg = Release|Win32

+		{051AA0B9-BC9B-4732-BE21-F3949C6A179B}.Release|Win32.Build.0 = Release|Win32

+		{051AA0B9-BC9B-4732-BE21-F3949C6A179B}.Release|x64.ActiveCfg = Release|x64

+		{051AA0B9-BC9B-4732-BE21-F3949C6A179B}.Release|x64.Build.0 = Release|x64

+		{8A70FD1D-7E7E-448B-8F5F-7CF2A414F309}.Debug|Win32.ActiveCfg = Debug|Win32

+		{8A70FD1D-7E7E-448B-8F5F-7CF2A414F309}.Debug|Win32.Build.0 = Debug|Win32

+		{8A70FD1D-7E7E-448B-8F5F-7CF2A414F309}.Debug|x64.ActiveCfg = Debug|x64

+		{8A70FD1D-7E7E-448B-8F5F-7CF2A414F309}.Debug|x64.Build.0 = Debug|x64

+		{8A70FD1D-7E7E-448B-8F5F-7CF2A414F309}.Release|Win32.ActiveCfg = Release|Win32

+		{8A70FD1D-7E7E-448B-8F5F-7CF2A414F309}.Release|Win32.Build.0 = Release|Win32

+		{8A70FD1D-7E7E-448B-8F5F-7CF2A414F309}.Release|x64.ActiveCfg = Release|x64

+		{8A70FD1D-7E7E-448B-8F5F-7CF2A414F309}.Release|x64.Build.0 = Release|x64

+		{562DA812-6FD9-424A-BC3E-044362DC93C1}.Debug|Win32.ActiveCfg = Debug|Win32

+		{562DA812-6FD9-424A-BC3E-044362DC93C1}.Debug|Win32.Build.0 = Debug|Win32

+		{562DA812-6FD9-424A-BC3E-044362DC93C1}.Debug|x64.ActiveCfg = Debug|x64

+		{562DA812-6FD9-424A-BC3E-044362DC93C1}.Debug|x64.Build.0 = Debug|x64

+		{562DA812-6FD9-424A-BC3E-044362DC93C1}.Release|Win32.ActiveCfg = Release|Win32

+		{562DA812-6FD9-424A-BC3E-044362DC93C1}.Release|Win32.Build.0 = Release|Win32

+		{562DA812-6FD9-424A-BC3E-044362DC93C1}.Release|x64.ActiveCfg = Release|x64

+		{562DA812-6FD9-424A-BC3E-044362DC93C1}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

 	EndGlobalSection

 EndGlobal

diff --git a/windows/c++/examples/allcppexamples/allcppexamples.vcproj b/windows/c++/examples/allcppexamples/allcppexamples.vcproj
index 93d7c35..3313807 100644
--- a/windows/c++/examples/allcppexamples/allcppexamples.vcproj
+++ b/windows/c++/examples/allcppexamples/allcppexamples.vcproj
@@ -1,130 +1,122 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="allcppexamples"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{27E3886B-0BAC-4E00-8F89-163208E03462}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\Debug"

-			IntermediateDirectory=".\Debug"

-			ConfigurationType="1"

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

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="10"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\Debug/allcppexamples.pch"

-				AssemblerListingLocation=".\Debug/"

-				ObjectFile=".\Debug/"

-				ProgramDataBaseFileName=".\Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile=".\Debug/allcppexamples.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\Debug/allcppexamples.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Debug/allcppexamples.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCPreBuildEventTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Name="VCCustomBuildTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCMIDLTool"

+				TypeLibraryName=".\Debug/allcppexamples.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\Release"

-			IntermediateDirectory=".\Release"

-			ConfigurationType="1"

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

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="10"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\Release/allcppexamples.pch"

-				AssemblerListingLocation=".\Release/"

-				ObjectFile=".\Release/"

-				ProgramDataBaseFileName=".\Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="TRUE"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile=".\Release/allcppexamples.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

-				ProgramDatabaseFile=".\Release/allcppexamples.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

 				TypeLibraryName=".\Release/allcppexamples.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

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

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="10"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCPreBuildEventTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCCustomBuildTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\Debug/allcppexamples.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

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

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="10"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCPreBuildEventTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCCustomBuildTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\Release/allcppexamples.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

diff --git a/windows/c++/examples/chunkstest/chunkstest.vcproj b/windows/c++/examples/chunkstest/chunkstest.vcproj
index b8622ba..1ea58cd 100644
--- a/windows/c++/examples/chunkstest/chunkstest.vcproj
+++ b/windows/c++/examples/chunkstest/chunkstest.vcproj
@@ -1,163 +1,443 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="chunkstest"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{9C900514-5BB2-4BA2-B5DF-5FD8572982DC}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../c++/examples/chunkstest/Release"

-			IntermediateDirectory=".\../../../../c++/examples/chunkstest/Release"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/chunkstest/Release/chunkstest.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/chunkstest/Release/chunkstest.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/chunkstest/Release/"

 				ObjectFile=".\../../../../c++/examples/chunkstest/Release/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/chunkstest/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_cpp.lib hdf5.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../c++/examples/chunkstest/Release/chunkstest.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release;..\..\..\..\proj\hdf5\release;..\..\..\..\hdf5lib\release\lib"

 				IgnoreDefaultLibraryNames="libcpp.lib"

 				ProgramDatabaseFile=".\../../../../c++/examples/chunkstest/Release/chunkstest.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../c++/examples/chunkstest/Release/chunkstest.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				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=".\../../../../c++/examples/chunkstest/Debug"

-			IntermediateDirectory=".\../../../../c++/examples/chunkstest/Debug"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/chunkstest/Debug/chunkstest.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/chunkstest/Debug/chunkstest.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/chunkstest/Debug/"

 				ObjectFile=".\../../../../c++/examples/chunkstest/Debug/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/chunkstest/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_cppd.lib hdf5d.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../c++/examples/chunkstest/Debug/chunkstest.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug;..\..\..\..\proj\hdf5\debug;..\..\..\..\hdf5lib\debug\lib"

 				IgnoreDefaultLibraryNames="libc.lib"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../c++/examples/chunkstest/Debug/chunkstest.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="..\..\..\..\c++\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"

-				TypeLibraryName=".\../../../../c++/examples/chunkstest/Debug/chunkstest.tlb"

-				HeaderFileName=""/>

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/chunkstest/Release/chunkstest.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/chunkstest/Release/chunkstest.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/chunkstest/Release/"

+				ObjectFile=".\../../../../c++/examples/chunkstest/Release/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/chunkstest/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCLinkerTool"

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

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release;..\..\..\..\proj\hdf5\release;..\..\..\..\hdf5lib\release\lib"

+				IgnoreDefaultLibraryNames="libcpp.lib"

+				ProgramDatabaseFile=".\../../../../c++/examples/chunkstest/Release/chunkstest.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<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="..\..\..\..\c++\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCustomBuildTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/chunkstest/Debug/chunkstest.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/chunkstest/Debug/chunkstest.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/chunkstest/Debug/"

+				ObjectFile=".\../../../../c++/examples/chunkstest/Debug/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/chunkstest/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

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

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug;..\..\..\..\proj\hdf5\debug;..\..\..\..\hdf5lib\debug\lib"

+				IgnoreDefaultLibraryNames="libc.lib"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../c++/examples/chunkstest/Debug/chunkstest.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>

 	</References>

 	<Files>

 		<File

-			RelativePath="..\..\..\..\c++\examples\chunks.cpp">

+			RelativePath="..\..\..\..\c++\examples\chunks.cpp"

+			>

 			<FileConfiguration

-				Name="Release|Win32">

+				Name="Release|Win32"

+				>

 				<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="Release|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="2"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

 			</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/c++/examples/chunkstestdll/chunkstestdll.vcproj b/windows/c++/examples/chunkstestdll/chunkstestdll.vcproj
index 8b651ce..b3804d9 100644
--- a/windows/c++/examples/chunkstestdll/chunkstestdll.vcproj
+++ b/windows/c++/examples/chunkstestdll/chunkstestdll.vcproj
@@ -1,85 +1,140 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="chunkstestdll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{1D870142-6627-41ED-95C3-31CF9783FE70}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../c++/examples/chunkstestdll/Release"

-			IntermediateDirectory=".\../../../../c++/examples/chunkstestdll/Release"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/chunkstestdll/Release/chunkstestdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HDF5CPP_USEDLL"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/chunkstestdll/Release/chunkstestdll.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/chunkstestdll/Release/"

 				ObjectFile=".\../../../../c++/examples/chunkstestdll/Release/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/chunkstestdll/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_cppdll.lib"

-				OutputFile=".\../../../../c++/examples/chunkstestdll/Release/chunkstestdll.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

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

 				ProgramDatabaseFile=".\../../../../c++/examples/chunkstestdll/Release/chunkstestdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../c++/examples/chunkstestdll/Release/chunkstestdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				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=".\../../../../c++/examples/chunkstestdll/Debug"

-			IntermediateDirectory=".\../../../../c++/examples/chunkstestdll/Debug"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/chunkstestdll/Debug/chunkstestdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -87,75 +142,298 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HDF5CPP_USEDLL"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/chunkstestdll/Debug/chunkstestdll.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/chunkstestdll/Debug/"

 				ObjectFile=".\../../../../c++/examples/chunkstestdll/Debug/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/chunkstestdll/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 hdf5ddll.lib hdf5_cppddll.lib"

-				OutputFile=".\../../../../c++/examples/chunkstestdll/Debug/chunkstestdll.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

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

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../c++/examples/chunkstestdll/Debug/chunkstestdll.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="..\..\..\..\c++\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"

-				TypeLibraryName=".\../../../../c++/examples/chunkstestdll/Debug/chunkstestdll.tlb"

-				HeaderFileName=""/>

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/chunkstestdll/Release/chunkstestdll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

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

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/chunkstestdll/Release/chunkstestdll.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/chunkstestdll/Release/"

+				ObjectFile=".\../../../../c++/examples/chunkstestdll/Release/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/chunkstestdll/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_cppdll.lib"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

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

+				ProgramDatabaseFile=".\../../../../c++/examples/chunkstestdll/Release/chunkstestdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<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="..\..\..\..\c++\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="VCPreLinkEventTool"/>

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/chunkstestdll/Debug/chunkstestdll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

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

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/chunkstestdll/Debug/chunkstestdll.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/chunkstestdll/Debug/"

+				ObjectFile=".\../../../../c++/examples/chunkstestdll/Debug/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/chunkstestdll/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				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_cppddll.lib"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

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

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../c++/examples/chunkstestdll/Debug/chunkstestdll.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>

 	</References>

 	<Files>

 		<File

-			RelativePath="..\..\..\..\c++\examples\chunks.cpp">

+			RelativePath="..\..\..\..\c++\examples\chunks.cpp"

+			>

 			<FileConfiguration

-				Name="Release|Win32">

+				Name="Release|Win32"

+				>

 				<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="Release|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="2"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

 			</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/c++/examples/compoundtest/compoundtest.vcproj b/windows/c++/examples/compoundtest/compoundtest.vcproj
index 9d524b0..b43fb73 100644
--- a/windows/c++/examples/compoundtest/compoundtest.vcproj
+++ b/windows/c++/examples/compoundtest/compoundtest.vcproj
@@ -1,163 +1,443 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="compoundtest"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{8CD35A8A-1D59-4ACE-B684-A7FD9952A45C}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../c++/examples/compoundtest/Release"

-			IntermediateDirectory=".\../../../../c++/examples/compoundtest/Release"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/compoundtest/Release/compoundtest.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/compoundtest/Release/compoundtest.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/compoundtest/Release/"

 				ObjectFile=".\../../../../c++/examples/compoundtest/Release/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/compoundtest/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_cpp.lib hdf5.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../c++/examples/compoundtest/Release/compoundtest.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release;..\..\..\..\proj\hdf5\release;..\..\..\..\hdf5lib\release\lib"

 				IgnoreDefaultLibraryNames="libcpp.lib"

 				ProgramDatabaseFile=".\../../../../c++/examples/compoundtest/Release/compoundtest.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../c++/examples/compoundtest/Release/compoundtest.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				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=".\../../../../c++/examples/compoundtest/Debug"

-			IntermediateDirectory=".\../../../../c++/examples/compoundtest/Debug"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/compoundtest/Debug/compoundtest.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/compoundtest/Debug/compoundtest.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/compoundtest/Debug/"

 				ObjectFile=".\../../../../c++/examples/compoundtest/Debug/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/compoundtest/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_cppd.lib hdf5d.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../c++/examples/compoundtest/Debug/compoundtest.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug;..\..\..\..\proj\hdf5\debug;..\..\..\..\hdf5lib\debug\lib"

 				IgnoreDefaultLibraryNames="libc.lib"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../c++/examples/compoundtest/Debug/compoundtest.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="..\..\..\..\c++\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"

-				TypeLibraryName=".\../../../../c++/examples/compoundtest/Debug/compoundtest.tlb"

-				HeaderFileName=""/>

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/compoundtest/Release/compoundtest.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/compoundtest/Release/compoundtest.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/compoundtest/Release/"

+				ObjectFile=".\../../../../c++/examples/compoundtest/Release/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/compoundtest/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCLinkerTool"

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

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release;..\..\..\..\proj\hdf5\release;..\..\..\..\hdf5lib\release\lib"

+				IgnoreDefaultLibraryNames="libcpp.lib"

+				ProgramDatabaseFile=".\../../../../c++/examples/compoundtest/Release/compoundtest.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<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="..\..\..\..\c++\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCustomBuildTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/compoundtest/Debug/compoundtest.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/compoundtest/Debug/compoundtest.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/compoundtest/Debug/"

+				ObjectFile=".\../../../../c++/examples/compoundtest/Debug/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/compoundtest/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

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

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug;..\..\..\..\proj\hdf5\debug;..\..\..\..\hdf5lib\debug\lib"

+				IgnoreDefaultLibraryNames="libc.lib"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../c++/examples/compoundtest/Debug/compoundtest.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>

 	</References>

 	<Files>

 		<File

-			RelativePath="..\..\..\..\c++\examples\compound.cpp">

+			RelativePath="..\..\..\..\c++\examples\compound.cpp"

+			>

 			<FileConfiguration

-				Name="Release|Win32">

+				Name="Release|Win32"

+				>

 				<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="Release|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="2"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

 			</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/c++/examples/compoundtestdll/compoundtestdll.vcproj b/windows/c++/examples/compoundtestdll/compoundtestdll.vcproj
index 2649c74..0f67594 100644
--- a/windows/c++/examples/compoundtestdll/compoundtestdll.vcproj
+++ b/windows/c++/examples/compoundtestdll/compoundtestdll.vcproj
@@ -1,85 +1,140 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="compoundtestdll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{F144F936-D02D-4859-9FAA-FED36AC8A0C4}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../c++/examples/compoundtestdll/Release"

-			IntermediateDirectory=".\../../../../c++/examples/compoundtestdll/Release"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/compoundtestdll/Release/compoundtestdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HDF5CPP_USEDLL"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/compoundtestdll/Release/compoundtestdll.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/compoundtestdll/Release/"

 				ObjectFile=".\../../../../c++/examples/compoundtestdll/Release/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/compoundtestdll/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_cppdll.lib"

-				OutputFile=".\../../../../c++/examples/compoundtestdll/Release/compoundtestdll.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

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

 				ProgramDatabaseFile=".\../../../../c++/examples/compoundtestdll/Release/compoundtestdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../c++/examples/compoundtestdll/Release/compoundtestdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				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=".\../../../../c++/examples/compoundtestdll/Debug"

-			IntermediateDirectory=".\../../../../c++/examples/compoundtestdll/Debug"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/compoundtestdll/Debug/compoundtestdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -87,75 +142,298 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HDF5CPP_USEDLL"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/compoundtestdll/Debug/compoundtestdll.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/compoundtestdll/Debug/"

 				ObjectFile=".\../../../../c++/examples/compoundtestdll/Debug/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/compoundtestdll/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 hdf5ddll.lib hdf5_cppddll.lib"

-				OutputFile=".\../../../../c++/examples/compoundtestdll/Debug/compoundtestdll.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

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

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../c++/examples/compoundtestdll/Debug/compoundtestdll.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="..\..\..\..\c++\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"

-				TypeLibraryName=".\../../../../c++/examples/compoundtestdll/Debug/compoundtestdll.tlb"

-				HeaderFileName=""/>

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/compoundtestdll/Release/compoundtestdll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

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

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/compoundtestdll/Release/compoundtestdll.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/compoundtestdll/Release/"

+				ObjectFile=".\../../../../c++/examples/compoundtestdll/Release/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/compoundtestdll/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_cppdll.lib"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

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

+				ProgramDatabaseFile=".\../../../../c++/examples/compoundtestdll/Release/compoundtestdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<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="..\..\..\..\c++\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="VCPreLinkEventTool"/>

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/compoundtestdll/Debug/compoundtestdll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

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

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/compoundtestdll/Debug/compoundtestdll.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/compoundtestdll/Debug/"

+				ObjectFile=".\../../../../c++/examples/compoundtestdll/Debug/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/compoundtestdll/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				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_cppddll.lib"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

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

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../c++/examples/compoundtestdll/Debug/compoundtestdll.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>

 	</References>

 	<Files>

 		<File

-			RelativePath="..\..\..\..\c++\examples\compound.cpp">

+			RelativePath="..\..\..\..\c++\examples\compound.cpp"

+			>

 			<FileConfiguration

-				Name="Release|Win32">

+				Name="Release|Win32"

+				>

 				<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="Release|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="2"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

 			</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/c++/examples/createtest/createtest.vcproj b/windows/c++/examples/createtest/createtest.vcproj
index 24c9cc5..076df52 100644
--- a/windows/c++/examples/createtest/createtest.vcproj
+++ b/windows/c++/examples/createtest/createtest.vcproj
@@ -1,163 +1,443 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="createtest"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{B187A146-D60D-4587-90F5-A501E4B826A6}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../c++/examples/createtest/Debug"

-			IntermediateDirectory=".\../../../../c++/examples/createtest/Debug"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/createtest/Debug/createtest.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/createtest/Debug/createtest.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/createtest/Debug/"

 				ObjectFile=".\../../../../c++/examples/createtest/Debug/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/createtest/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_cppd.lib hdf5d.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../c++/examples/createtest/Debug/createtest.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug;..\..\..\..\proj\hdf5\debug;..\..\..\..\hdf5lib\debug\lib"

 				IgnoreDefaultLibraryNames="libc.lib"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../c++/examples/createtest/Debug/createtest.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../c++/examples/createtest/Debug/createtest.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				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=".\../../../../c++/examples/createtest/Release"

-			IntermediateDirectory=".\../../../../c++/examples/createtest/Release"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/createtest/Release/createtest.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/createtest/Release/createtest.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/createtest/Release/"

 				ObjectFile=".\../../../../c++/examples/createtest/Release/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/createtest/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_cpp.lib hdf5.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../c++/examples/createtest/Release/createtest.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release;..\..\..\..\proj\hdf5\release;..\..\..\..\hdf5lib\release\lib"

 				IgnoreDefaultLibraryNames="libcpp.lib"

 				ProgramDatabaseFile=".\../../../../c++/examples/createtest/Release/createtest.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="..\..\..\..\c++\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"

-				TypeLibraryName=".\../../../../c++/examples/createtest/Release/createtest.tlb"

-				HeaderFileName=""/>

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/createtest/Debug/createtest.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/createtest/Debug/createtest.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/createtest/Debug/"

+				ObjectFile=".\../../../../c++/examples/createtest/Debug/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/createtest/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCLinkerTool"

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

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug;..\..\..\..\proj\hdf5\debug;..\..\..\..\hdf5lib\debug\lib"

+				IgnoreDefaultLibraryNames="libc.lib"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../c++/examples/createtest/Debug/createtest.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<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="..\..\..\..\c++\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCustomBuildTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/createtest/Release/createtest.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/createtest/Release/createtest.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/createtest/Release/"

+				ObjectFile=".\../../../../c++/examples/createtest/Release/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/createtest/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

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

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release;..\..\..\..\proj\hdf5\release;..\..\..\..\hdf5lib\release\lib"

+				IgnoreDefaultLibraryNames="libcpp.lib"

+				ProgramDatabaseFile=".\../../../../c++/examples/createtest/Release/createtest.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>

 	</References>

 	<Files>

 		<File

-			RelativePath="..\..\..\..\c++\examples\create.cpp">

+			RelativePath="..\..\..\..\c++\examples\create.cpp"

+			>

 			<FileConfiguration

-				Name="Debug|Win32">

+				Name="Debug|Win32"

+				>

 				<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="Debug|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BasicRuntimeChecks="3"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="2"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

 			</FileConfiguration>

 		</File>

 	</Files>

diff --git a/windows/c++/examples/createtestdll/createtestdll.vcproj b/windows/c++/examples/createtestdll/createtestdll.vcproj
index ea5af0f..f744f19 100644
--- a/windows/c++/examples/createtestdll/createtestdll.vcproj
+++ b/windows/c++/examples/createtestdll/createtestdll.vcproj
@@ -1,23 +1,48 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="createtestdll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{AC1F5EA5-2256-4E27-8D56-D9A5AA71F411}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../c++/examples/createtestdll/Debug"

-			IntermediateDirectory=".\../../../../c++/examples/createtestdll/Debug"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/createtestdll/Debug/createtestdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -25,137 +50,390 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HDF5CPP_USEDLL"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/createtestdll/Debug/createtestdll.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/createtestdll/Debug/"

 				ObjectFile=".\../../../../c++/examples/createtestdll/Debug/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/createtestdll/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_cppddll.lib"

-				OutputFile=".\../../../../c++/examples/createtestdll/Debug/createtestdll.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

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

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../c++/examples/createtestdll/Debug/createtestdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../c++/examples/createtestdll/Debug/createtestdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				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=".\../../../../c++/examples/createtestdll/Release"

-			IntermediateDirectory=".\../../../../c++/examples/createtestdll/Release"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/createtestdll/Release/createtestdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HDF5CPP_USEDLL"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/createtestdll/Release/createtestdll.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/createtestdll/Release/"

 				ObjectFile=".\../../../../c++/examples/createtestdll/Release/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/createtestdll/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 hdf5dll.lib hdf5_cppdll.lib"

-				OutputFile=".\../../../../c++/examples/createtestdll/Release/createtestdll.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

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

 				ProgramDatabaseFile=".\../../../../c++/examples/createtestdll/Release/createtestdll.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="..\..\..\..\c++\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"

-				TypeLibraryName=".\../../../../c++/examples/createtestdll/Release/createtestdll.tlb"

-				HeaderFileName=""/>

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/createtestdll/Debug/createtestdll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

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

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/createtestdll/Debug/createtestdll.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/createtestdll/Debug/"

+				ObjectFile=".\../../../../c++/examples/createtestdll/Debug/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/createtestdll/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_cppddll.lib"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

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

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../c++/examples/createtestdll/Debug/createtestdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<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="..\..\..\..\c++\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="VCPreLinkEventTool"/>

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/createtestdll/Release/createtestdll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

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

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/createtestdll/Release/createtestdll.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/createtestdll/Release/"

+				ObjectFile=".\../../../../c++/examples/createtestdll/Release/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/createtestdll/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				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_cppdll.lib"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

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

+				ProgramDatabaseFile=".\../../../../c++/examples/createtestdll/Release/createtestdll.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>

 	</References>

 	<Files>

 		<File

-			RelativePath="..\..\..\..\c++\examples\create.cpp">

+			RelativePath="..\..\..\..\c++\examples\create.cpp"

+			>

 			<FileConfiguration

-				Name="Debug|Win32">

+				Name="Debug|Win32"

+				>

 				<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="Debug|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BasicRuntimeChecks="3"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="2"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

 			</FileConfiguration>

 		</File>

 	</Files>

diff --git a/windows/c++/examples/extend_dstest/extend_dstest.vcproj b/windows/c++/examples/extend_dstest/extend_dstest.vcproj
index 53c31d6..096d913 100644
--- a/windows/c++/examples/extend_dstest/extend_dstest.vcproj
+++ b/windows/c++/examples/extend_dstest/extend_dstest.vcproj
@@ -1,163 +1,443 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="extend_dstest"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{1F74A3E0-276B-4A85-BBB0-3421434D5946}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../c++/examples/extend_dstest/Release"

-			IntermediateDirectory=".\../../../../c++/examples/extend_dstest/Release"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/extend_dstest/Release/extend_dstest.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/extend_dstest/Release/extend_dstest.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/extend_dstest/Release/"

 				ObjectFile=".\../../../../c++/examples/extend_dstest/Release/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/extend_dstest/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_cpp.lib hdf5.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../c++/examples/extend_dstest/Release/extend_dstest.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release;..\..\..\..\proj\hdf5\release;..\..\..\..\hdf5lib\release\lib"

 				IgnoreDefaultLibraryNames="libcpp.lib"

 				ProgramDatabaseFile=".\../../../../c++/examples/extend_dstest/Release/extend_dstest.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../c++/examples/extend_dstest/Release/extend_dstest.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				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=".\../../../../c++/examples/extend_dstest/Debug"

-			IntermediateDirectory=".\../../../../c++/examples/extend_dstest/Debug"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/extend_dstest/Debug/extend_dstest.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/extend_dstest/Debug/extend_dstest.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/extend_dstest/Debug/"

 				ObjectFile=".\../../../../c++/examples/extend_dstest/Debug/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/extend_dstest/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_cppd.lib hdf5d.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../c++/examples/extend_dstest/Debug/extend_dstest.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug;..\..\..\..\proj\hdf5\debug;..\..\..\..\hdf5lib\debug\lib"

 				IgnoreDefaultLibraryNames="libc.lib"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../c++/examples/extend_dstest/Debug/extend_dstest.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="..\..\..\..\c++\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"

-				TypeLibraryName=".\../../../../c++/examples/extend_dstest/Debug/extend_dstest.tlb"

-				HeaderFileName=""/>

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/extend_dstest/Release/extend_dstest.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/extend_dstest/Release/extend_dstest.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/extend_dstest/Release/"

+				ObjectFile=".\../../../../c++/examples/extend_dstest/Release/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/extend_dstest/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCLinkerTool"

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

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release;..\..\..\..\proj\hdf5\release;..\..\..\..\hdf5lib\release\lib"

+				IgnoreDefaultLibraryNames="libcpp.lib"

+				ProgramDatabaseFile=".\../../../../c++/examples/extend_dstest/Release/extend_dstest.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<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="..\..\..\..\c++\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCustomBuildTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/extend_dstest/Debug/extend_dstest.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/extend_dstest/Debug/extend_dstest.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/extend_dstest/Debug/"

+				ObjectFile=".\../../../../c++/examples/extend_dstest/Debug/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/extend_dstest/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

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

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug;..\..\..\..\proj\hdf5\debug;..\..\..\..\hdf5lib\debug\lib"

+				IgnoreDefaultLibraryNames="libc.lib"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../c++/examples/extend_dstest/Debug/extend_dstest.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>

 	</References>

 	<Files>

 		<File

-			RelativePath="..\..\..\..\c++\examples\extend_ds.cpp">

+			RelativePath="..\..\..\..\c++\examples\extend_ds.cpp"

+			>

 			<FileConfiguration

-				Name="Release|Win32">

+				Name="Release|Win32"

+				>

 				<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="Release|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="2"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

 			</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/c++/examples/extend_dstestdll/extend_dstestdll.vcproj b/windows/c++/examples/extend_dstestdll/extend_dstestdll.vcproj
index ab2f25d..8e03d4e 100644
--- a/windows/c++/examples/extend_dstestdll/extend_dstestdll.vcproj
+++ b/windows/c++/examples/extend_dstestdll/extend_dstestdll.vcproj
@@ -1,23 +1,48 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="extend_dstestdll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{DA72AC9E-B53E-43B4-A9C1-A1E94F3733CD}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../c++/examples/extend_dstestdll/Debug"

-			IntermediateDirectory=".\../../../../c++/examples/extend_dstestdll/Debug"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/extend_dstestdll/Debug/extend_dstestdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -25,137 +50,390 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HDF5CPP_USEDLL"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/extend_dstestdll/Debug/extend_dstestdll.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/extend_dstestdll/Debug/"

 				ObjectFile=".\../../../../c++/examples/extend_dstestdll/Debug/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/extend_dstestdll/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_cppddll.lib"

-				OutputFile=".\../../../../c++/examples/extend_dstestdll/Debug/extend_dstestdll.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

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

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../c++/examples/extend_dstestdll/Debug/extend_dstestdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../c++/examples/extend_dstestdll/Debug/extend_dstestdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				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=".\../../../../c++/examples/extend_dstestdll/Release"

-			IntermediateDirectory=".\../../../../c++/examples/extend_dstestdll/Release"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/extend_dstestdll/Release/extend_dstestdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HDF5CPP_USEDLL"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/extend_dstestdll/Release/extend_dstestdll.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/extend_dstestdll/Release/"

 				ObjectFile=".\../../../../c++/examples/extend_dstestdll/Release/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/extend_dstestdll/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 hdf5dll.lib hdf5_cppdll.lib"

-				OutputFile=".\../../../../c++/examples/extend_dstestdll/Release/extend_dstestdll.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

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

 				ProgramDatabaseFile=".\../../../../c++/examples/extend_dstestdll/Release/extend_dstestdll.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="..\..\..\..\c++\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"

-				TypeLibraryName=".\../../../../c++/examples/extend_dstestdll/Release/extend_dstestdll.tlb"

-				HeaderFileName=""/>

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/extend_dstestdll/Debug/extend_dstestdll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

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

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/extend_dstestdll/Debug/extend_dstestdll.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/extend_dstestdll/Debug/"

+				ObjectFile=".\../../../../c++/examples/extend_dstestdll/Debug/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/extend_dstestdll/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_cppddll.lib"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

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

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../c++/examples/extend_dstestdll/Debug/extend_dstestdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<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="..\..\..\..\c++\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="VCPreLinkEventTool"/>

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/extend_dstestdll/Release/extend_dstestdll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

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

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/extend_dstestdll/Release/extend_dstestdll.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/extend_dstestdll/Release/"

+				ObjectFile=".\../../../../c++/examples/extend_dstestdll/Release/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/extend_dstestdll/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				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_cppdll.lib"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

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

+				ProgramDatabaseFile=".\../../../../c++/examples/extend_dstestdll/Release/extend_dstestdll.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>

 	</References>

 	<Files>

 		<File

-			RelativePath="..\..\..\..\c++\examples\extend_ds.cpp">

+			RelativePath="..\..\..\..\c++\examples\extend_ds.cpp"

+			>

 			<FileConfiguration

-				Name="Debug|Win32">

+				Name="Debug|Win32"

+				>

 				<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="Debug|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BasicRuntimeChecks="3"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="2"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

 			</FileConfiguration>

 		</File>

 	</Files>

diff --git a/windows/c++/examples/h5grouptest/h5grouptest.vcproj b/windows/c++/examples/h5grouptest/h5grouptest.vcproj
index bfa6b07..576f31d 100644
--- a/windows/c++/examples/h5grouptest/h5grouptest.vcproj
+++ b/windows/c++/examples/h5grouptest/h5grouptest.vcproj
@@ -1,163 +1,443 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="h5grouptest"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{798DE42A-5B27-4B33-B54A-58D45EFD600B}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../c++/examples/h5grouptest/Release"

-			IntermediateDirectory=".\../../../../c++/examples/h5grouptest/Release"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/h5grouptest/Release/h5grouptest.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/h5grouptest/Release/h5grouptest.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/h5grouptest/Release/"

 				ObjectFile=".\../../../../c++/examples/h5grouptest/Release/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/h5grouptest/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_cpp.lib hdf5.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../c++/examples/h5grouptest/Release/h5grouptest.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release;..\..\..\..\proj\hdf5\release;..\..\..\..\hdf5lib\release\lib"

 				IgnoreDefaultLibraryNames="libcpp.lib"

 				ProgramDatabaseFile=".\../../../../c++/examples/h5grouptest/Release/h5grouptest.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../c++/examples/h5grouptest/Release/h5grouptest.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				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=".\../../../../c++/examples/h5grouptest/Debug"

-			IntermediateDirectory=".\../../../../c++/examples/h5grouptest/Debug"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/h5grouptest/Debug/h5grouptest.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/h5grouptest/Debug/h5grouptest.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/h5grouptest/Debug/"

 				ObjectFile=".\../../../../c++/examples/h5grouptest/Debug/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/h5grouptest/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_cppd.lib hdf5d.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../c++/examples/h5grouptest/Debug/h5grouptest.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug;..\..\..\..\proj\hdf5\debug;..\..\..\..\hdf5lib\debug\lib"

 				IgnoreDefaultLibraryNames="libc.lib"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../c++/examples/h5grouptest/Debug/h5grouptest.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="..\..\..\..\c++\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"

-				TypeLibraryName=".\../../../../c++/examples/h5grouptest/Debug/h5grouptest.tlb"

-				HeaderFileName=""/>

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/h5grouptest/Release/h5grouptest.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/h5grouptest/Release/h5grouptest.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/h5grouptest/Release/"

+				ObjectFile=".\../../../../c++/examples/h5grouptest/Release/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/h5grouptest/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCLinkerTool"

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

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release;..\..\..\..\proj\hdf5\release;..\..\..\..\hdf5lib\release\lib"

+				IgnoreDefaultLibraryNames="libcpp.lib"

+				ProgramDatabaseFile=".\../../../../c++/examples/h5grouptest/Release/h5grouptest.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<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="..\..\..\..\c++\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCustomBuildTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/h5grouptest/Debug/h5grouptest.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/h5grouptest/Debug/h5grouptest.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/h5grouptest/Debug/"

+				ObjectFile=".\../../../../c++/examples/h5grouptest/Debug/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/h5grouptest/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

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

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug;..\..\..\..\proj\hdf5\debug;..\..\..\..\hdf5lib\debug\lib"

+				IgnoreDefaultLibraryNames="libc.lib"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../c++/examples/h5grouptest/Debug/h5grouptest.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>

 	</References>

 	<Files>

 		<File

-			RelativePath="..\..\..\..\c++\examples\h5group.cpp">

+			RelativePath="..\..\..\..\c++\examples\h5group.cpp"

+			>

 			<FileConfiguration

-				Name="Release|Win32">

+				Name="Release|Win32"

+				>

 				<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="Release|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="2"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

 			</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/c++/examples/h5grouptestdll/h5grouptestdll.vcproj b/windows/c++/examples/h5grouptestdll/h5grouptestdll.vcproj
index c57026c..6a7c1d9 100644
--- a/windows/c++/examples/h5grouptestdll/h5grouptestdll.vcproj
+++ b/windows/c++/examples/h5grouptestdll/h5grouptestdll.vcproj
@@ -1,85 +1,140 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="h5grouptestdll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{7AABEE0C-3749-49C6-B951-5081BE817897}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../c++/examples/h5grouptestdll/Release"

-			IntermediateDirectory=".\../../../../c++/examples/h5grouptestdll/Release"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/h5grouptestdll/Release/h5grouptestdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HDF5CPP_USEDLL"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/h5grouptestdll/Release/h5grouptestdll.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/h5grouptestdll/Release/"

 				ObjectFile=".\../../../../c++/examples/h5grouptestdll/Release/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/h5grouptestdll/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_cppdll.lib"

-				OutputFile=".\../../../../c++/examples/h5grouptestdll/Release/h5grouptestdll.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

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

 				ProgramDatabaseFile=".\../../../../c++/examples/h5grouptestdll/Release/h5grouptestdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../c++/examples/h5grouptestdll/Release/h5grouptestdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				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=".\../../../../c++/examples/h5grouptestdll/Debug"

-			IntermediateDirectory=".\../../../../c++/examples/h5grouptestdll/Debug"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/h5grouptestdll/Debug/h5grouptestdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -87,75 +142,298 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HDF5CPP_USEDLL"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/h5grouptestdll/Debug/h5grouptestdll.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/h5grouptestdll/Debug/"

 				ObjectFile=".\../../../../c++/examples/h5grouptestdll/Debug/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/h5grouptestdll/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 hdf5ddll.lib hdf5_cppddll.lib"

-				OutputFile=".\../../../../c++/examples/h5grouptestdll/Debug/h5grouptestdll.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

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

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../c++/examples/h5grouptestdll/Debug/h5grouptestdll.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="..\..\..\..\c++\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"

-				TypeLibraryName=".\../../../../c++/examples/h5grouptestdll/Debug/h5grouptestdll.tlb"

-				HeaderFileName=""/>

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/h5grouptestdll/Release/h5grouptestdll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

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

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/h5grouptestdll/Release/h5grouptestdll.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/h5grouptestdll/Release/"

+				ObjectFile=".\../../../../c++/examples/h5grouptestdll/Release/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/h5grouptestdll/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_cppdll.lib"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

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

+				ProgramDatabaseFile=".\../../../../c++/examples/h5grouptestdll/Release/h5grouptestdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<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="..\..\..\..\c++\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="VCPreLinkEventTool"/>

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/h5grouptestdll/Debug/h5grouptestdll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

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

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/h5grouptestdll/Debug/h5grouptestdll.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/h5grouptestdll/Debug/"

+				ObjectFile=".\../../../../c++/examples/h5grouptestdll/Debug/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/h5grouptestdll/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				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_cppddll.lib"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

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

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../c++/examples/h5grouptestdll/Debug/h5grouptestdll.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>

 	</References>

 	<Files>

 		<File

-			RelativePath="..\..\..\..\c++\examples\h5group.cpp">

+			RelativePath="..\..\..\..\c++\examples\h5group.cpp"

+			>

 			<FileConfiguration

-				Name="Release|Win32">

+				Name="Release|Win32"

+				>

 				<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="Release|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="2"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

 			</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/c++/examples/readdatatest/readdatatest.vcproj b/windows/c++/examples/readdatatest/readdatatest.vcproj
index 819bd46..601f73b 100644
--- a/windows/c++/examples/readdatatest/readdatatest.vcproj
+++ b/windows/c++/examples/readdatatest/readdatatest.vcproj
@@ -1,163 +1,443 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="readdatatest"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{C75DC585-7E3D-472D-AB77-EAE48876FA8C}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../c++/examples/readdatatest/Debug"

-			IntermediateDirectory=".\../../../../c++/examples/readdatatest/Debug"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/readdatatest/Debug/readdatatest.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/readdatatest/Debug/readdatatest.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/readdatatest/Debug/"

 				ObjectFile=".\../../../../c++/examples/readdatatest/Debug/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/readdatatest/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_cppd.lib hdf5d.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../c++/examples/readdatatest/Debug/readdatatest.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug;..\..\..\..\proj\hdf5\debug;..\..\..\..\hdf5lib\debug\lib"

 				IgnoreDefaultLibraryNames="libc.lib"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../c++/examples/readdatatest/Debug/readdatatest.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../c++/examples/readdatatest/Debug/readdatatest.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				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=".\../../../../c++/examples/readdatatest/Release"

-			IntermediateDirectory=".\../../../../c++/examples/readdatatest/Release"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/readdatatest/Release/readdatatest.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/readdatatest/Release/readdatatest.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/readdatatest/Release/"

 				ObjectFile=".\../../../../c++/examples/readdatatest/Release/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/readdatatest/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_cpp.lib hdf5.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../c++/examples/readdatatest/Release/readdatatest.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release;..\..\..\..\proj\hdf5\release;..\..\..\..\hdf5lib\release\lib"

 				IgnoreDefaultLibraryNames="libcpp.lib"

 				ProgramDatabaseFile=".\../../../../c++/examples/readdatatest/Release/readdatatest.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="..\..\..\..\c++\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"

-				TypeLibraryName=".\../../../../c++/examples/readdatatest/Release/readdatatest.tlb"

-				HeaderFileName=""/>

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/readdatatest/Debug/readdatatest.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/readdatatest/Debug/readdatatest.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/readdatatest/Debug/"

+				ObjectFile=".\../../../../c++/examples/readdatatest/Debug/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/readdatatest/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCLinkerTool"

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

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug;..\..\..\..\proj\hdf5\debug;..\..\..\..\hdf5lib\debug\lib"

+				IgnoreDefaultLibraryNames="libc.lib"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../c++/examples/readdatatest/Debug/readdatatest.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<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="..\..\..\..\c++\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCustomBuildTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/readdatatest/Release/readdatatest.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/readdatatest/Release/readdatatest.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/readdatatest/Release/"

+				ObjectFile=".\../../../../c++/examples/readdatatest/Release/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/readdatatest/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

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

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release;..\..\..\..\proj\hdf5\release;..\..\..\..\hdf5lib\release\lib"

+				IgnoreDefaultLibraryNames="libcpp.lib"

+				ProgramDatabaseFile=".\../../../../c++/examples/readdatatest/Release/readdatatest.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>

 	</References>

 	<Files>

 		<File

-			RelativePath="..\..\..\..\c++\examples\readdata.cpp">

+			RelativePath="..\..\..\..\c++\examples\readdata.cpp"

+			>

 			<FileConfiguration

-				Name="Debug|Win32">

+				Name="Debug|Win32"

+				>

 				<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="Debug|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BasicRuntimeChecks="3"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="2"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

 			</FileConfiguration>

 		</File>

 	</Files>

diff --git a/windows/c++/examples/readdatatestdll/readdatatestdll.vcproj b/windows/c++/examples/readdatatestdll/readdatatestdll.vcproj
index 748d13b..f4afec3 100644
--- a/windows/c++/examples/readdatatestdll/readdatatestdll.vcproj
+++ b/windows/c++/examples/readdatatestdll/readdatatestdll.vcproj
@@ -1,23 +1,48 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="readdatatestdll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{051AA0B9-BC9B-4732-BE21-F3949C6A179B}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../c++/examples/readdatatestdll/Debug"

-			IntermediateDirectory=".\../../../../c++/examples/readdatatestdll/Debug"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/readdatatestdll/Debug/readdatatestdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -25,137 +50,390 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HDF5CPP_USEDLL"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/readdatatestdll/Debug/readdatatestdll.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/readdatatestdll/Debug/"

 				ObjectFile=".\../../../../c++/examples/readdatatestdll/Debug/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/readdatatestdll/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_cppddll.lib"

-				OutputFile=".\../../../../c++/examples/readdatatestdll/Debug/readdatatestdll.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

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

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../c++/examples/readdatatestdll/Debug/readdatatestdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../c++/examples/readdatatestdll/Debug/readdatatestdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				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=".\../../../../c++/examples/readdatatestdll/Release"

-			IntermediateDirectory=".\../../../../c++/examples/readdatatestdll/Release"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/readdatatestdll/Release/readdatatestdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HDF5CPP_USEDLL"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/readdatatestdll/Release/readdatatestdll.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/readdatatestdll/Release/"

 				ObjectFile=".\../../../../c++/examples/readdatatestdll/Release/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/readdatatestdll/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 hdf5dll.lib hdf5_cppdll.lib"

-				OutputFile=".\../../../../c++/examples/readdatatestdll/Release/readdatatestdll.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

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

 				ProgramDatabaseFile=".\../../../../c++/examples/readdatatestdll/Release/readdatatestdll.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="..\..\..\..\c++\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"

-				TypeLibraryName=".\../../../../c++/examples/readdatatestdll/Release/readdatatestdll.tlb"

-				HeaderFileName=""/>

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/readdatatestdll/Debug/readdatatestdll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

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

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/readdatatestdll/Debug/readdatatestdll.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/readdatatestdll/Debug/"

+				ObjectFile=".\../../../../c++/examples/readdatatestdll/Debug/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/readdatatestdll/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_cppddll.lib"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

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

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../c++/examples/readdatatestdll/Debug/readdatatestdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<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="..\..\..\..\c++\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="VCPreLinkEventTool"/>

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/readdatatestdll/Release/readdatatestdll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

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

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/readdatatestdll/Release/readdatatestdll.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/readdatatestdll/Release/"

+				ObjectFile=".\../../../../c++/examples/readdatatestdll/Release/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/readdatatestdll/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				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_cppdll.lib"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

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

+				ProgramDatabaseFile=".\../../../../c++/examples/readdatatestdll/Release/readdatatestdll.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>

 	</References>

 	<Files>

 		<File

-			RelativePath="..\..\..\..\c++\examples\readdata.cpp">

+			RelativePath="..\..\..\..\c++\examples\readdata.cpp"

+			>

 			<FileConfiguration

-				Name="Debug|Win32">

+				Name="Debug|Win32"

+				>

 				<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="Debug|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BasicRuntimeChecks="3"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="2"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

 			</FileConfiguration>

 		</File>

 	</Files>

diff --git a/windows/c++/examples/writedatatest/writedatatest.vcproj b/windows/c++/examples/writedatatest/writedatatest.vcproj
index a049896..7ca5964 100644
--- a/windows/c++/examples/writedatatest/writedatatest.vcproj
+++ b/windows/c++/examples/writedatatest/writedatatest.vcproj
@@ -1,163 +1,444 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="writedatatest"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{8A70FD1D-7E7E-448B-8F5F-7CF2A414F309}"

+	RootNamespace="writedatatest"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../c++/examples/writedatatest/Release"

-			IntermediateDirectory=".\../../../../c++/examples/writedatatest/Release"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/writedatatest/Release/writedatatest.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/writedatatest/Release/writedatatest.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/writedatatest/Release/"

 				ObjectFile=".\../../../../c++/examples/writedatatest/Release/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/writedatatest/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_cpp.lib hdf5.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../c++/examples/writedatatest/Release/writedatatest.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release;..\..\..\..\proj\hdf5\release;..\..\..\..\hdf5lib\release\lib"

 				IgnoreDefaultLibraryNames="libcpp.lib"

 				ProgramDatabaseFile=".\../../../../c++/examples/writedatatest/Release/writedatatest.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../c++/examples/writedatatest/Release/writedatatest.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				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=".\../../../../c++/examples/writedatatest/Debug"

-			IntermediateDirectory=".\../../../../c++/examples/writedatatest/Debug"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/writedatatest/Debug/writedatatest.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/writedatatest/Debug/writedatatest.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/writedatatest/Debug/"

 				ObjectFile=".\../../../../c++/examples/writedatatest/Debug/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/writedatatest/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_cppd.lib hdf5d.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\../../../../c++/examples/writedatatest/Debug/writedatatest.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug;..\..\..\..\proj\hdf5\debug;..\..\..\..\hdf5lib\debug\lib"

 				IgnoreDefaultLibraryNames="libc.lib"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../c++/examples/writedatatest/Debug/writedatatest.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="..\..\..\..\c++\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"

-				TypeLibraryName=".\../../../../c++/examples/writedatatest/Debug/writedatatest.tlb"

-				HeaderFileName=""/>

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/writedatatest/Release/writedatatest.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/writedatatest/Release/writedatatest.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/writedatatest/Release/"

+				ObjectFile=".\../../../../c++/examples/writedatatest/Release/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/writedatatest/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCLinkerTool"

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

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release;..\..\..\..\proj\hdf5\release;..\..\..\..\hdf5lib\release\lib"

+				IgnoreDefaultLibraryNames="libcpp.lib"

+				ProgramDatabaseFile=".\../../../../c++/examples/writedatatest/Release/writedatatest.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<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="..\..\..\..\c++\examples\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

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

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCustomBuildTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/writedatatest/Debug/writedatatest.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/writedatatest/Debug/writedatatest.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/writedatatest/Debug/"

+				ObjectFile=".\../../../../c++/examples/writedatatest/Debug/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/writedatatest/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

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

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug;..\..\..\..\proj\hdf5\debug;..\..\..\..\hdf5lib\debug\lib"

+				IgnoreDefaultLibraryNames="libc.lib"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../c++/examples/writedatatest/Debug/writedatatest.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>

 	</References>

 	<Files>

 		<File

-			RelativePath="..\..\..\..\c++\examples\writedata.cpp">

+			RelativePath="..\..\..\..\c++\examples\writedata.cpp"

+			>

 			<FileConfiguration

-				Name="Release|Win32">

+				Name="Release|Win32"

+				>

 				<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="Release|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="2"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

 			</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/c++/examples/writedatatestdll/writedatatestdll.vcproj b/windows/c++/examples/writedatatestdll/writedatatestdll.vcproj
index bbe0a66..4117534 100644
--- a/windows/c++/examples/writedatatestdll/writedatatestdll.vcproj
+++ b/windows/c++/examples/writedatatestdll/writedatatestdll.vcproj
@@ -1,85 +1,140 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="writedatatestdll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{562DA812-6FD9-424A-BC3E-044362DC93C1}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../c++/examples/writedatatestdll/Release"

-			IntermediateDirectory=".\../../../../c++/examples/writedatatestdll/Release"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/writedatatestdll/Release/writedatatestdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HDF5CPP_USEDLL"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/writedatatestdll/Release/writedatatestdll.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/writedatatestdll/Release/"

 				ObjectFile=".\../../../../c++/examples/writedatatestdll/Release/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/writedatatestdll/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_cppdll.lib"

-				OutputFile=".\../../../../c++/examples/writedatatestdll/Release/writedatatestdll.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

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

 				ProgramDatabaseFile=".\../../../../c++/examples/writedatatestdll/Release/writedatatestdll.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\../../../../c++/examples/writedatatestdll/Release/writedatatestdll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				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=".\../../../../c++/examples/writedatatestdll/Debug"

-			IntermediateDirectory=".\../../../../c++/examples/writedatatestdll/Debug"

+			OutputDirectory="..\..\..\..\c++\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=".\../../../../c++/examples/writedatatestdll/Debug/writedatatestdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -87,75 +142,298 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HDF5CPP_USEDLL"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/examples/writedatatestdll/Debug/writedatatestdll.pch"

 				AssemblerListingLocation=".\../../../../c++/examples/writedatatestdll/Debug/"

 				ObjectFile=".\../../../../c++/examples/writedatatestdll/Debug/"

 				ProgramDataBaseFileName=".\../../../../c++/examples/writedatatestdll/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 hdf5ddll.lib hdf5_cppddll.lib"

-				OutputFile=".\../../../../c++/examples/writedatatestdll/Debug/writedatatestdll.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

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

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../c++/examples/writedatatestdll/Debug/writedatatestdll.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="..\..\..\..\c++\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"

-				TypeLibraryName=".\../../../../c++/examples/writedatatestdll/Debug/writedatatestdll.tlb"

-				HeaderFileName=""/>

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/writedatatestdll/Release/writedatatestdll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

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

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/writedatatestdll/Release/writedatatestdll.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/writedatatestdll/Release/"

+				ObjectFile=".\../../../../c++/examples/writedatatestdll/Release/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/writedatatestdll/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_cppdll.lib"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

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

+				ProgramDatabaseFile=".\../../../../c++/examples/writedatatestdll/Release/writedatatestdll.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<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="..\..\..\..\c++\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="VCPreLinkEventTool"/>

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../../c++/examples/writedatatestdll/Debug/writedatatestdll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

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

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/examples/writedatatestdll/Debug/writedatatestdll.pch"

+				AssemblerListingLocation=".\../../../../c++/examples/writedatatestdll/Debug/"

+				ObjectFile=".\../../../../c++/examples/writedatatestdll/Debug/"

+				ProgramDataBaseFileName=".\../../../../c++/examples/writedatatestdll/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				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_cppddll.lib"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

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

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../c++/examples/writedatatestdll/Debug/writedatatestdll.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>

 	</References>

 	<Files>

 		<File

-			RelativePath="..\..\..\..\c++\examples\writedata.cpp">

+			RelativePath="..\..\..\..\c++\examples\writedata.cpp"

+			>

 			<FileConfiguration

-				Name="Release|Win32">

+				Name="Release|Win32"

+				>

 				<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="Release|x64"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="2"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

 			</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/c++/test/dsets_cpp/dsets_cpp.vcproj b/windows/c++/test/dsets_cpp/dsets_cpp.vcproj
index 1992f46..3b37eee 100644
--- a/windows/c++/test/dsets_cpp/dsets_cpp.vcproj
+++ b/windows/c++/test/dsets_cpp/dsets_cpp.vcproj
@@ -1,138 +1,390 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="dsets_cpp"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{802B922A-E813-438E-A180-4A8839A11A55}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../test/dsets_cpp/Debug"

-			IntermediateDirectory=".\../../../../test/dsets_cpp/Debug"

+			OutputDirectory="..\..\..\..\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=".\../../../../test/dsets_cpp/Debug/dsets_cpp.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../test/dsets_cpp/Debug/dsets_cpp.pch"

 				AssemblerListingLocation=".\../../../../test/dsets_cpp/Debug/"

 				ObjectFile=".\../../../../test/dsets_cpp/Debug/"

 				ProgramDataBaseFileName=".\../../../../test/dsets_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 WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile="../../../../c++/test/dsets_cpp/Debug/dsets_cpp.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../test/dsets_cpp/Debug/dsets_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="..\..\..\..\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=".\../../../../test/dsets_cpp/Debug/dsets_cpp.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../test/dsets_cpp/Debug/dsets_cpp.pch"

+				AssemblerListingLocation=".\../../../../test/dsets_cpp/Debug/"

+				ObjectFile=".\../../../../test/dsets_cpp/Debug/"

+				ProgramDataBaseFileName=".\../../../../test/dsets_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 WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="libc.lib"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../test/dsets_cpp/Debug/dsets_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=".\../../../../test/dsets_cpp/Release"

-			IntermediateDirectory=".\../../../../test/dsets_cpp/Release"

+			OutputDirectory="..\..\..\..\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=".\../../../../test/dsets_cpp/Release/dsets_cpp.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../test/dsets_cpp/Release/dsets_cpp.pch"

 				AssemblerListingLocation=".\../../../../test/dsets_cpp/Release/"

 				ObjectFile=".\../../../../test/dsets_cpp/Release/"

 				ProgramDataBaseFileName=".\../../../../test/dsets_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 WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile="../../../../c++/test/dsets_cpp/Release/dsets_cpp.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../../test/dsets_cpp/Release/dsets_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="..\..\..\..\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=".\../../../../test/dsets_cpp/Release/dsets_cpp.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../test/dsets_cpp/Release/dsets_cpp.pch"

+				AssemblerListingLocation=".\../../../../test/dsets_cpp/Release/"

+				ObjectFile=".\../../../../test/dsets_cpp/Release/"

+				ProgramDataBaseFileName=".\../../../../test/dsets_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 WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="libcd.lib"

+				ProgramDatabaseFile=".\../../../../test/dsets_cpp/Release/dsets_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>

 	</Configurations>

 	<References>

@@ -140,69 +392,149 @@
 	<Files>

 		<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>

 		<File

-			RelativePath="..\..\..\..\c++\test\dsets.cpp">

+			RelativePath="..\..\..\..\c++\test\dsets.cpp"

+			>

 			<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="..\..\..\..\c++\test\h5cpputil.cpp">

+			RelativePath="..\..\..\..\c++\test\h5cpputil.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>

 		<File

-			RelativePath="..\..\..\..\c++\test\h5cpputil.h">

+			RelativePath="..\..\..\..\c++\test\h5cpputil.h"

+			>

 		</File>

 		<File

-			RelativePath="..\..\..\..\test\h5test.c">

+			RelativePath="..\..\..\..\test\h5test.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>

 	</Files>

diff --git a/windows/c++/test/dsets_cppdll/dsets_cppdll.vcproj b/windows/c++/test/dsets_cppdll/dsets_cppdll.vcproj
index 5cbeba0..8ff1c29 100644
--- a/windows/c++/test/dsets_cppdll/dsets_cppdll.vcproj
+++ b/windows/c++/test/dsets_cppdll/dsets_cppdll.vcproj
@@ -1,23 +1,48 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="dsets_cppdll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{76858167-F4DB-476C-A2B6-A3069D60D9E2}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../test/dsets_cppdll/Debug"

-			IntermediateDirectory=".\../../../../test/dsets_cppdll/Debug"

+			OutputDirectory="..\..\..\..\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=".\../../../../test/dsets_cppdll/Debug/dsets_cppdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../test/dsets_cppdll/Debug/dsets_cppdll.pch"

 				AssemblerListingLocation=".\../../../../test/dsets_cppdll/Debug/"

 				ObjectFile=".\../../../../test/dsets_cppdll/Debug/"

 				ProgramDataBaseFileName=".\../../../../test/dsets_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="hdf5ddll.lib odbc32.lib odbccp32.lib WS2_32.lib"

-				OutputFile="../../../../c++/test/dsets_cppdll/Debug/dsets_cppdll.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\Debug"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../test/dsets_cppdll/Debug/dsets_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="..\..\..\..\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=".\../../../../test/dsets_cppdll/Debug/dsets_cppdll.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

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

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../test/dsets_cppdll/Debug/dsets_cppdll.pch"

+				AssemblerListingLocation=".\../../../../test/dsets_cppdll/Debug/"

+				ObjectFile=".\../../../../test/dsets_cppdll/Debug/"

+				ProgramDataBaseFileName=".\../../../../test/dsets_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="hdf5ddll.lib odbc32.lib odbccp32.lib WS2_32.lib"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\Debug"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../test/dsets_cppdll/Debug/dsets_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="Release|Win32"

-			OutputDirectory=".\../../../../test/dsets_cppdll/Release"

-			IntermediateDirectory=".\../../../../test/dsets_cppdll/Release"

+			OutputDirectory="..\..\..\..\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=".\../../../../test/dsets_cppdll/Release/dsets_cppdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

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

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../test/dsets_cppdll/Release/dsets_cppdll.pch"

 				AssemblerListingLocation=".\../../../../test/dsets_cppdll/Release/"

 				ObjectFile=".\../../../../test/dsets_cppdll/Release/"

 				ProgramDataBaseFileName=".\../../../../test/dsets_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="hdf5dll.lib odbc32.lib odbccp32.lib WS2_32.lib"

-				OutputFile="../../../../c++/test/dsets_cppdll/Release/dsets_cppdll.exe"

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\Release"

 				ProgramDatabaseFile=".\../../../../test/dsets_cppdll/Release/dsets_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="..\..\..\..\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=".\../../../../test/dsets_cppdll/Release/dsets_cppdll.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

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

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../test/dsets_cppdll/Release/dsets_cppdll.pch"

+				AssemblerListingLocation=".\../../../../test/dsets_cppdll/Release/"

+				ObjectFile=".\../../../../test/dsets_cppdll/Release/"

+				ProgramDataBaseFileName=".\../../../../test/dsets_cppdll/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="hdf5dll.lib odbc32.lib odbccp32.lib WS2_32.lib"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\Release"

+				ProgramDatabaseFile=".\../../../../test/dsets_cppdll/Release/dsets_cppdll.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>

 	</Configurations>

 	<References>

@@ -140,69 +392,149 @@
 	<Files>

 		<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>

 		<File

-			RelativePath="..\..\..\..\c++\test\dsets.cpp">

+			RelativePath="..\..\..\..\c++\test\dsets.cpp"

+			>

 			<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="..\..\..\..\c++\test\h5cpputil.cpp">

+			RelativePath="..\..\..\..\c++\test\h5cpputil.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>

 		<File

-			RelativePath="..\..\..\..\c++\test\h5cpputil.h">

+			RelativePath="..\..\..\..\c++\test\h5cpputil.h"

+			>

 		</File>

 		<File

-			RelativePath="..\..\..\..\test\h5test.c">

+			RelativePath="..\..\..\..\test\h5test.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>

 	</Files>

diff --git a/windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj b/windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj
index 8442783..d60a52d 100644
--- a/windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj
+++ b/windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj
@@ -1,138 +1,390 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="testhdf5_cpp"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{EFA04391-B35B-44C0-AB27-1383D4C9E358}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\../../../../c++/test/testhdf5_cpp/Release"

-			IntermediateDirectory=".\../../../../c++/test/testhdf5_cpp/Release"

+			OutputDirectory="..\..\..\..\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=".\../../../../c++/test/testhdf5_cpp/Release/testhdf5_cpp.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/test/testhdf5_cpp/Release/testhdf5_cpp.pch"

 				AssemblerListingLocation=".\../../../../c++/test/testhdf5_cpp/Release/"

 				ObjectFile=".\../../../../c++/test/testhdf5_cpp/Release/"

 				ProgramDataBaseFileName=".\../../../../c++/test/testhdf5_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 WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

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

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../../c++/test/testhdf5_cpp/Release/testhdf5_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="..\..\..\..\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=".\../../../../c++/test/testhdf5_cpp/Release/testhdf5_cpp.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/test/testhdf5_cpp/Release/testhdf5_cpp.pch"

+				AssemblerListingLocation=".\../../../../c++/test/testhdf5_cpp/Release/"

+				ObjectFile=".\../../../../c++/test/testhdf5_cpp/Release/"

+				ProgramDataBaseFileName=".\../../../../c++/test/testhdf5_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 WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="libcd.lib"

+				ProgramDatabaseFile=".\../../../../c++/test/testhdf5_cpp/Release/testhdf5_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="Debug|Win32"

-			OutputDirectory=".\../../../../c++/test/testhdf5_cpp/Debug"

-			IntermediateDirectory=".\../../../../c++/test/testhdf5_cpp/Debug"

+			OutputDirectory="..\..\..\..\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=".\../../../../c++/test/testhdf5_cpp/Debug/testhdf5_cpp.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/test/testhdf5_cpp/Debug/testhdf5_cpp.pch"

 				AssemblerListingLocation=".\../../../../c++/test/testhdf5_cpp/Debug/"

 				ObjectFile=".\../../../../c++/test/testhdf5_cpp/Debug/"

 				ProgramDataBaseFileName=".\../../../../c++/test/testhdf5_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 WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

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

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../c++/test/testhdf5_cpp/Debug/testhdf5_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="..\..\..\..\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=".\../../../../c++/test/testhdf5_cpp/Debug/testhdf5_cpp.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/test/testhdf5_cpp/Debug/testhdf5_cpp.pch"

+				AssemblerListingLocation=".\../../../../c++/test/testhdf5_cpp/Debug/"

+				ObjectFile=".\../../../../c++/test/testhdf5_cpp/Debug/"

+				ProgramDataBaseFileName=".\../../../../c++/test/testhdf5_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 WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="libc.lib"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../c++/test/testhdf5_cpp/Debug/testhdf5_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>

 	</Configurations>

 	<References>

@@ -140,238 +392,528 @@
 	<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="..\..\..\..\c++\test\h5cpputil.cpp">

+				RelativePath="..\..\..\..\c++\test\h5cpputil.cpp"

+				>

 				<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="..\..\..\..\c++\test\tattr.cpp">

+				RelativePath="..\..\..\..\c++\test\tattr.cpp"

+				>

 				<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="..\..\..\..\c++\test\tcompound.cpp">

+				RelativePath="..\..\..\..\c++\test\tcompound.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">

+					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="..\..\..\..\test\testframe.c">

+				RelativePath="..\..\..\..\test\testframe.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="..\..\..\..\c++\test\testhdf5.cpp">

+				RelativePath="..\..\..\..\c++\test\testhdf5.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>

 			<File

-				RelativePath="..\..\..\..\c++\test\tfile.cpp">

+				RelativePath="..\..\..\..\c++\test\tfile.cpp"

+				>

 				<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">

+					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="..\..\..\..\c++\test\tfilter.cpp">

+				RelativePath="..\..\..\..\c++\test\tfilter.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>

 			<File

-				RelativePath="..\..\..\..\c++\test\th5s.cpp">

+				RelativePath="..\..\..\..\c++\test\th5s.cpp"

+				>

 				<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="..\..\..\..\c++\test\trefer.cpp">

+				RelativePath="..\..\..\..\c++\test\trefer.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>

 			<File

-				RelativePath="..\..\..\..\c++\test\ttypes.cpp">

+				RelativePath="..\..\..\..\c++\test\ttypes.cpp"

+				>

 				<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="..\..\..\..\c++\test\tvlstr.cpp">

+				RelativePath="..\..\..\..\c++\test\tvlstr.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">

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

+			>

 			<File

-				RelativePath="..\..\..\..\c++\test\h5cpputil.h">

+				RelativePath="..\..\..\..\c++\test\h5cpputil.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/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj b/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj
index 8f2f74d..d64d274 100644
--- a/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj
+++ b/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj
@@ -1,23 +1,48 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="testhdf5_cppdll"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{DBA493BD-3AF1-4616-8A80-F6FD41B70392}"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\../../../../c++/test/testhdf5_cppdll/Debug"

-			IntermediateDirectory=".\../../../../c++/test/testhdf5_cppdll/Debug"

+			OutputDirectory="..\..\..\..\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=".\../../../../c++/test/testhdf5_cppdll/Debug/testhdf5_cppdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/test/testhdf5_cppdll/Debug/testhdf5_cppdll.pch"

 				AssemblerListingLocation=".\../../../../c++/test/testhdf5_cppdll/Debug/"

 				ObjectFile=".\../../../../c++/test/testhdf5_cppdll/Debug/"

 				ProgramDataBaseFileName=".\../../../../c++/test/testhdf5_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="hdf5ddll.lib odbc32.lib odbccp32.lib"

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

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\Debug"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../c++/test/testhdf5_cppdll/Debug/testhdf5_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="..\..\..\..\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=".\../../../../c++/test/testhdf5_cppdll/Debug/testhdf5_cppdll.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

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

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/test/testhdf5_cppdll/Debug/testhdf5_cppdll.pch"

+				AssemblerListingLocation=".\../../../../c++/test/testhdf5_cppdll/Debug/"

+				ObjectFile=".\../../../../c++/test/testhdf5_cppdll/Debug/"

+				ProgramDataBaseFileName=".\../../../../c++/test/testhdf5_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="hdf5ddll.lib odbc32.lib odbccp32.lib"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\Debug"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../../c++/test/testhdf5_cppdll/Debug/testhdf5_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="Release|Win32"

-			OutputDirectory=".\../../../../c++/test/testhdf5_cppdll/Release"

-			IntermediateDirectory=".\../../../../c++/test/testhdf5_cppdll/Release"

+			OutputDirectory="..\..\..\..\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=".\../../../../c++/test/testhdf5_cppdll/Release/testhdf5_cppdll.tlb"

+				HeaderFileName=""

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

 				PreprocessorDefinitions="HDF5CPP_USEDLL;WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\../../../../c++/test/testhdf5_cppdll/Release/testhdf5_cppdll.pch"

 				AssemblerListingLocation=".\../../../../c++/test/testhdf5_cppdll/Release/"

 				ObjectFile=".\../../../../c++/test/testhdf5_cppdll/Release/"

 				ProgramDataBaseFileName=".\../../../../c++/test/testhdf5_cppdll/Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="hdf5dll.lib odbc32.lib odbccp32.lib"

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

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

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\Release"

 				ProgramDatabaseFile=".\../../../../c++/test/testhdf5_cppdll/Release/testhdf5_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="..\..\..\..\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=".\../../../../c++/test/testhdf5_cppdll/Release/testhdf5_cppdll.tlb"

-				HeaderFileName=""/>

+				HeaderFileName=""

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

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

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../../c++/test/testhdf5_cppdll/Release/testhdf5_cppdll.pch"

+				AssemblerListingLocation=".\../../../../c++/test/testhdf5_cppdll/Release/"

+				ObjectFile=".\../../../../c++/test/testhdf5_cppdll/Release/"

+				ProgramDataBaseFileName=".\../../../../c++/test/testhdf5_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="hdf5dll.lib odbc32.lib odbccp32.lib"

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

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\Release"

+				ProgramDatabaseFile=".\../../../../c++/test/testhdf5_cppdll/Release/testhdf5_cppdll.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,238 +392,528 @@
 	<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="..\..\..\..\c++\test\h5cpputil.cpp">

+				RelativePath="..\..\..\..\c++\test\h5cpputil.cpp"

+				>

 				<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="..\..\..\..\c++\test\tattr.cpp">

+				RelativePath="..\..\..\..\c++\test\tattr.cpp"

+				>

 				<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="..\..\..\..\c++\test\tcompound.cpp">

+				RelativePath="..\..\..\..\c++\test\tcompound.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">

+					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="..\..\..\..\test\testframe.c">

+				RelativePath="..\..\..\..\test\testframe.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="..\..\..\..\c++\test\testhdf5.cpp">

+				RelativePath="..\..\..\..\c++\test\testhdf5.cpp"

+				>

 				<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="..\..\..\..\c++\test\tfile.cpp">

+				RelativePath="..\..\..\..\c++\test\tfile.cpp"

+				>

 				<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="..\..\..\..\c++\test\tfilter.cpp">

+				RelativePath="..\..\..\..\c++\test\tfilter.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">

+					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="..\..\..\..\c++\test\th5s.cpp">

+				RelativePath="..\..\..\..\c++\test\th5s.cpp"

+				>

 				<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="..\..\..\..\c++\test\trefer.cpp">

+				RelativePath="..\..\..\..\c++\test\trefer.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>

 			<File

-				RelativePath="..\..\..\..\c++\test\ttypes.cpp">

+				RelativePath="..\..\..\..\c++\test\ttypes.cpp"

+				>

 				<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="..\..\..\..\c++\test\tvlstr.cpp">

+				RelativePath="..\..\..\..\c++\test\tvlstr.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">

+					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>

 		</Filter>

 		<Filter

 			Name="Header Files"

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

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

+			>

 			<File

-				RelativePath="..\h5cpputil.h">

+				RelativePath="..\h5cpputil.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>