[svn-r22105] Description:

	Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously.  The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.

Tested on:
	Mac OSX/64 10.7.3 (amazon) w/debug

5 files changed, 581 insertions, 395 deletions

diff --git a/windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj b/windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj
index 2938143..2d1bbea 100644
--- a/windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj
+++ b/windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj
@@ -1,331 +1,331 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="hdf5_hl_cpp"

-	ProjectGUID="{7693B383-C2CB-43FD-A428-598F73D214F7}"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../../../src,../../../hl/src,../../../fortran/src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_LIB"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\proj\hdf5_hl_cpp\Release/hdf5_hl_cpp.pch"

-				AssemblerListingLocation=".\..\..\..\proj\hdf5_hl_cpp\Release/"

-				ObjectFile=".\..\..\..\proj\hdf5_hl_cpp\Release/"

-				ProgramDataBaseFileName=".\..\..\..\proj\hdf5_hl_cpp\Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)\$(ProjectName).lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../../../src,../../../hl/src,../../../fortran/src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_LIB"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\proj\hdf5_hl_cpp\Release/hdf5_hl_cpp.pch"

-				AssemblerListingLocation=".\..\..\..\proj\hdf5_hl_cpp\Release/"

-				ObjectFile=".\..\..\..\proj\hdf5_hl_cpp\Release/"

-				ProgramDataBaseFileName=".\..\..\..\proj\hdf5_hl_cpp\Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)\$(ProjectName).lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../../src,../../../hl/src,../../../c++/src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_LIB"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\proj\hdf5_hl_cpp\Debug/hdf5_hl_cpp.pch"

-				AssemblerListingLocation=".\..\..\..\proj\hdf5_hl_cpp\Debug/"

-				ObjectFile=".\..\..\..\proj\hdf5_hl_cpp\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\proj\hdf5_hl_cpp\Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)\$(ProjectName)d.lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../../src,../../../hl/src,../../../c++/src"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_LIB"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\proj\hdf5_hl_cpp\Debug/hdf5_hl_cpp.pch"

-				AssemblerListingLocation=".\..\..\..\proj\hdf5_hl_cpp\Debug/"

-				ObjectFile=".\..\..\..\proj\hdf5_hl_cpp\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\proj\hdf5_hl_cpp\Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)\$(ProjectName)d.lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\..\hl\c++\src\H5PacketTable.cpp"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

+  ProjectType="Visual C++"

+  Version="9.00"

+  Name="hdf5_hl_cpp"

+  ProjectGUID="{7693B383-C2CB-43FD-A428-598F73D214F7}"

+  TargetFrameworkVersion="131072"

+  >

+  <Platforms>

+    <Platform

+      Name="Win32"

+    />

+    <Platform

+      Name="x64"

+    />

+  </Platforms>

+  <ToolFiles>

+  </ToolFiles>

+  <Configurations>

+    <Configuration

+      Name="Release|Win32"

+      OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

+      IntermediateDirectory="$(OutDir)"

+      ConfigurationType="4"

+      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+      UseOfMFC="0"

+      ATLMinimizesCRunTimeLibraryUsage="false"

+      CharacterSet="2"

+      >

+      <Tool

+        Name="VCPreBuildEventTool"

+      />

+      <Tool

+        Name="VCCustomBuildTool"

+      />

+      <Tool

+        Name="VCXMLDataGeneratorTool"

+      />

+      <Tool

+        Name="VCWebServiceProxyGeneratorTool"

+      />

+      <Tool

+        Name="VCMIDLTool"

+      />

+      <Tool

+        Name="VCCLCompilerTool"

+        Optimization="2"

+        InlineFunctionExpansion="1"

+        AdditionalIncludeDirectories="../../../src,../../../hl/src,../../../fortran/src"

+        PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_LIB"

+        StringPooling="true"

+        RuntimeLibrary="0"

+        EnableFunctionLevelLinking="true"

+        UsePrecompiledHeader="0"

+        PrecompiledHeaderFile=".\..\..\..\proj\hdf5_hl_cpp\Release/hdf5_hl_cpp.pch"

+        AssemblerListingLocation=".\..\..\..\proj\hdf5_hl_cpp\Release/"

+        ObjectFile=".\..\..\..\proj\hdf5_hl_cpp\Release/"

+        ProgramDataBaseFileName=".\..\..\..\proj\hdf5_hl_cpp\Release/"

+        WarningLevel="3"

+        SuppressStartupBanner="true"

+        CompileAs="0"

+      />

+      <Tool

+        Name="VCManagedResourceCompilerTool"

+      />

+      <Tool

+        Name="VCResourceCompilerTool"

+        PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

+        Culture="1033"

+      />

+      <Tool

+        Name="VCPreLinkEventTool"

+      />

+      <Tool

+        Name="VCLibrarianTool"

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

+        SuppressStartupBanner="true"

+      />

+      <Tool

+        Name="VCALinkTool"

+      />

+      <Tool

+        Name="VCXDCMakeTool"

+      />

+      <Tool

+        Name="VCBscMakeTool"

+      />

+      <Tool

+        Name="VCFxCopTool"

+      />

+      <Tool

+        Name="VCPostBuildEventTool"

+      />

+    </Configuration>

+    <Configuration

+      Name="Release|x64"

+      OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

+      IntermediateDirectory="$(OutDir)"

+      ConfigurationType="4"

+      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+      UseOfMFC="0"

+      ATLMinimizesCRunTimeLibraryUsage="false"

+      CharacterSet="2"

+      >

+      <Tool

+        Name="VCPreBuildEventTool"

+      />

+      <Tool

+        Name="VCCustomBuildTool"

+      />

+      <Tool

+        Name="VCXMLDataGeneratorTool"

+      />

+      <Tool

+        Name="VCWebServiceProxyGeneratorTool"

+      />

+      <Tool

+        Name="VCMIDLTool"

+        TargetEnvironment="3"

+      />

+      <Tool

+        Name="VCCLCompilerTool"

+        Optimization="2"

+        InlineFunctionExpansion="1"

+        AdditionalIncludeDirectories="../../../src,../../../hl/src,../../../fortran/src"

+        PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_LIB"

+        StringPooling="true"

+        RuntimeLibrary="0"

+        EnableFunctionLevelLinking="true"

+        UsePrecompiledHeader="0"

+        PrecompiledHeaderFile=".\..\..\..\proj\hdf5_hl_cpp\Release/hdf5_hl_cpp.pch"

+        AssemblerListingLocation=".\..\..\..\proj\hdf5_hl_cpp\Release/"

+        ObjectFile=".\..\..\..\proj\hdf5_hl_cpp\Release/"

+        ProgramDataBaseFileName=".\..\..\..\proj\hdf5_hl_cpp\Release/"

+        WarningLevel="3"

+        SuppressStartupBanner="true"

+        CompileAs="0"

+      />

+      <Tool

+        Name="VCManagedResourceCompilerTool"

+      />

+      <Tool

+        Name="VCResourceCompilerTool"

+        PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

+        Culture="1033"

+      />

+      <Tool

+        Name="VCPreLinkEventTool"

+      />

+      <Tool

+        Name="VCLibrarianTool"

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

+        SuppressStartupBanner="true"

+      />

+      <Tool

+        Name="VCALinkTool"

+      />

+      <Tool

+        Name="VCXDCMakeTool"

+      />

+      <Tool

+        Name="VCBscMakeTool"

+      />

+      <Tool

+        Name="VCFxCopTool"

+      />

+      <Tool

+        Name="VCPostBuildEventTool"

+      />

+    </Configuration>

+    <Configuration

+      Name="Debug|Win32"

+      OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

+      IntermediateDirectory="$(OutDir)"

+      ConfigurationType="4"

+      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+      UseOfMFC="0"

+      ATLMinimizesCRunTimeLibraryUsage="false"

+      CharacterSet="2"

+      >

+      <Tool

+        Name="VCPreBuildEventTool"

+      />

+      <Tool

+        Name="VCCustomBuildTool"

+      />

+      <Tool

+        Name="VCXMLDataGeneratorTool"

+      />

+      <Tool

+        Name="VCWebServiceProxyGeneratorTool"

+      />

+      <Tool

+        Name="VCMIDLTool"

+      />

+      <Tool

+        Name="VCCLCompilerTool"

+        Optimization="0"

+        AdditionalIncludeDirectories="../../../src,../../../hl/src,../../../c++/src"

+        PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_LIB"

+        BasicRuntimeChecks="3"

+        RuntimeLibrary="1"

+        UsePrecompiledHeader="0"

+        PrecompiledHeaderFile=".\..\..\..\proj\hdf5_hl_cpp\Debug/hdf5_hl_cpp.pch"

+        AssemblerListingLocation=".\..\..\..\proj\hdf5_hl_cpp\Debug/"

+        ObjectFile=".\..\..\..\proj\hdf5_hl_cpp\Debug/"

+        ProgramDataBaseFileName=".\..\..\..\proj\hdf5_hl_cpp\Debug/"

+        WarningLevel="3"

+        SuppressStartupBanner="true"

+        DebugInformationFormat="3"

+        CompileAs="0"

+      />

+      <Tool

+        Name="VCManagedResourceCompilerTool"

+      />

+      <Tool

+        Name="VCResourceCompilerTool"

+        PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

+        Culture="1033"

+      />

+      <Tool

+        Name="VCPreLinkEventTool"

+      />

+      <Tool

+        Name="VCLibrarianTool"

+        OutputFile="$(OutDir)\$(ProjectName)d.lib"

+        SuppressStartupBanner="true"

+      />

+      <Tool

+        Name="VCALinkTool"

+      />

+      <Tool

+        Name="VCXDCMakeTool"

+      />

+      <Tool

+        Name="VCBscMakeTool"

+      />

+      <Tool

+        Name="VCFxCopTool"

+      />

+      <Tool

+        Name="VCPostBuildEventTool"

+      />

+    </Configuration>

+    <Configuration

+      Name="Debug|x64"

+      OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

+      IntermediateDirectory="$(OutDir)"

+      ConfigurationType="4"

+      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+      UseOfMFC="0"

+      ATLMinimizesCRunTimeLibraryUsage="false"

+      CharacterSet="2"

+      >

+      <Tool

+        Name="VCPreBuildEventTool"

+      />

+      <Tool

+        Name="VCCustomBuildTool"

+      />

+      <Tool

+        Name="VCXMLDataGeneratorTool"

+      />

+      <Tool

+        Name="VCWebServiceProxyGeneratorTool"

+      />

+      <Tool

+        Name="VCMIDLTool"

+        TargetEnvironment="3"

+      />

+      <Tool

+        Name="VCCLCompilerTool"

+        Optimization="0"

+        AdditionalIncludeDirectories="../../../src,../../../hl/src,../../../c++/src"

+        PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_LIB"

+        BasicRuntimeChecks="3"

+        RuntimeLibrary="1"

+        UsePrecompiledHeader="0"

+        PrecompiledHeaderFile=".\..\..\..\proj\hdf5_hl_cpp\Debug/hdf5_hl_cpp.pch"

+        AssemblerListingLocation=".\..\..\..\proj\hdf5_hl_cpp\Debug/"

+        ObjectFile=".\..\..\..\proj\hdf5_hl_cpp\Debug/"

+        ProgramDataBaseFileName=".\..\..\..\proj\hdf5_hl_cpp\Debug/"

+        WarningLevel="3"

+        SuppressStartupBanner="true"

+        DebugInformationFormat="3"

+        CompileAs="0"

+      />

+      <Tool

+        Name="VCManagedResourceCompilerTool"

+      />

+      <Tool

+        Name="VCResourceCompilerTool"

+        PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

+        Culture="1033"

+      />

+      <Tool

+        Name="VCPreLinkEventTool"

+      />

+      <Tool

+        Name="VCLibrarianTool"

+        OutputFile="$(OutDir)\$(ProjectName)d.lib"

+        SuppressStartupBanner="true"

+      />

+      <Tool

+        Name="VCALinkTool"

+      />

+      <Tool

+        Name="VCXDCMakeTool"

+      />

+      <Tool

+        Name="VCBscMakeTool"

+      />

+      <Tool

+        Name="VCFxCopTool"

+      />

+      <Tool

+        Name="VCPostBuildEventTool"

+      />

+    </Configuration>

+  </Configurations>

+  <References>

+  </References>

+  <Files>

+    <File

+      RelativePath="..\..\..\hl\c++\src\H5PacketTable.cpp"

+      >

+    </File>

+  </Files>

+  <Globals>

+  </Globals>

 </VisualStudioProject>

diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h
index e68c7d4..3a30f87 100755..100644
--- a/windows/src/H5pubconf.h
+++ b/windows/src/H5pubconf.h
@@ -1,24 +1,43 @@
-/* windows/src/H5pubconf.h. Adapted from generated Linux src/H5pubconf.h   */
-/* src/H5config.h.  Generated from H5config.h.in by configure.  */
-/* src/H5config.h.in.  Generated from configure.in by autoheader.  */
-
-/*
- * Windows Specific Definitions
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+ * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
+/* NOTE: This file is created by hand from the Linux src/H5pubconf.h file.
+ * Most Windows builds are handled by CMake which generates its own 
+ * H5pubconf.h file so this file can easily get out of date.  Please notify
+ * Dana Robinson <derobins@hdfgroup.org> if the settings here have issues.
  */
 
+/********************************
+ * Windows Specific Definitions *
+ ********************************/
+
 /* Define if the Windows virtual file driver should be compiled */
 #define H5_HAVE_WINDOWS 1
 
-/* Define if the Windows virtual file driver should use buffered IO functions */
-/* #undef WINDOWS_USE_STDIO */
+/* Define if on the Windows platform */
+#define H5_HAVE_WIN32_API 1
 
-/* Define the maximum write size for the Windows file driver.  Larger writes
-   will be split into many writes.  Safe values are 1 <= WINDOWS_MAX_BUF <= 2GB-1. */
-#define WINDOWS_MAX_BUF (1024 * 1024 * 1024)
+/* Define if using a Windows compiler (i.e. Visual Studio) */
+#define H5_HAVE_VISUAL_STUDIO 1
 
-/*
- * End of Windows Specific Definitions
- */
+/***************************************
+ * End of Windows Specific Definitions *
+ ***************************************/
+
+/* Define if building universal (internal helper macro) */
+/* #undef H5_AC_APPLE_UNIVERSAL_BUILD */
  
 /* Define if your system generates wrong code for log2 routine. */
 /* #undef H5_BAD_LOG2_CODE_GENERATED */
@@ -35,7 +54,7 @@
 #define H5_CXX_HAVE_OFFSETOF 1
 
 /* Define the default virtual file driver to compile */
-#define H5_DEFAULT_VFD H5FD_WINDOWS
+#define H5_DEFAULT_VFD H5FD_SEC2
 
 /* Define if `dev_t' is a scalar */
 #define H5_DEV_T_IS_SCALAR 1
@@ -68,7 +87,7 @@
 
 /* Define if your system has right maximum convert floating-point to unsigned
    long long values. */
-/* #undef H5_FP_TO_ULLONG_RIGHT_MAXIMUM 1 */
+/* #undef H5_FP_TO_ULLONG_RIGHT_MAXIMUM */
 
 /* Define if gettimeofday() populates the tz pointer passed in */
 #define H5_GETTIMEOFDAY_GIVES_TZ 1
@@ -89,6 +108,9 @@
 /* Define if the compiler understand the __func__ keyword */
 /* #undef H5_HAVE_C99_FUNC */
 
+/* Define to 1 if you have the `clock_gettime' function. */
+/* #undef H5_HAVE_CLOCK_GETTIME */
+
 /* Define if the function stack tracing code is to be compiled in */
 /* #undef H5_HAVE_CODESTACK */
 
@@ -108,6 +130,9 @@
 /* Define to 1 if you have the <dmalloc.h> header file. */
 /* #undef H5_HAVE_DMALLOC_H */
 
+/* Define if library information should be embedded in the executables */
+/* #undef H5_HAVE_EMBEDDED_LIBINFO */
+
 /* Define to 1 if you have the <features.h> header file. */
 /* #undef H5_HAVE_FEATURES_H */
 
@@ -138,18 +163,24 @@
 /* Define to 1 if you have the `frexpl' function. */
 /* #undef H5_HAVE_FREXPL */
 
-/* Define to 1 if you have the `fseek64' function. */
-/* #undef H5_HAVE_FSEEK64 */
-
 /* Define to 1 if you have the `fseeko' function. */
 /* #undef H5_HAVE_FSEEKO */
 
+/* Define to 1 if you have the `fseek64' function. */
+/* #undef H5_HAVE_FSEEKO64 */
+
 /* Define to 1 if you have the `fstat64' function. */
 /* #undef H5_HAVE_FSTAT64 */
 
 /* Define to 1 if you have the `ftello' function. */
 /* #undef H5_HAVE_FTELLO */
 
+/* Define to 1 if you have the `ftello64' function. */
+/* #undef H5_HAVE_FTELLO64 */
+
+/* Define to 1 if you have the `ftruncate64' function. */
+/* #undef H5_HAVE_FTRUNCATE64 */
+
 /* Define if the compiler understand the __FUNCTION__ keyword */
 #define H5_HAVE_FUNCTION 1
 
@@ -163,7 +194,7 @@
 /* #undef H5_HAVE_GETPWUID */
 
 /* Define to 1 if you have the `getrusage' function. */
-/* #define H5_HAVE_GETRUSAGE 1 */
+/* #undef H5_HAVE_GETRUSAGE */
 
 /* Define to 1 if you have the `gettextinfo' function. */
 /* #undef H5_HAVE_GETTEXTINFO */
@@ -235,6 +266,15 @@
 /* Define to 1 if you have the `lseek64' function. */
 /* #undef H5_HAVE_LSEEK64 */
 
+/* Define to 1 if you have the `lstat' function. */
+/* #undef H5_HAVE_LSTAT */
+
+/* Define to 1 if you have the <mach/mach_time.h> header file. */
+/* #undef H5_HAVE_MACH_MACH_TIME_H */
+
+/* Define to 1 if you have the <memory.h> header file. */
+/* #undef H5_HAVE_MEMORY_H */
+
 /* Define if we have MPE support */
 /* #undef H5_HAVE_MPE */
 
@@ -268,15 +308,18 @@
 /* Define to 1 if you have the `setsysinfo' function. */
 /* #undef H5_HAVE_SETSYSINFO */
 
-/* Define to 1 if you have the `sigaction' function. */
-/* #undef H5_HAVE_SIGACTION */
-
 /* Define to 1 if you have the `siglongjmp' function. */
 /* #undef H5_HAVE_SIGLONGJMP */
 
 /* Define to 1 if you have the `signal' function. */
 #define H5_HAVE_SIGNAL 1
 
+/* Define to 1 if you have the `sigprocmask' function. */
+/* #undef H5_HAVE_SIGPROCMASK */
+
+/* Define to 1 if you have the `sigsetjmp' function. */
+/* #undef H5_HAVE_SIGSETJMP */
+
 /* Define to 1 if you have the `snprintf' function. */
 /* #undef H5_HAVE_SNPRINTF */
 
@@ -319,6 +362,9 @@
 /* Define if `struct videoconfig' is defined */
 /* #undef H5_HAVE_STRUCT_VIDEOCONFIG */
 
+/* Define to 1 if you have the `symlink' function. */
+/* #undef H5_HAVE_SYMLINK */
+
 /* Define to 1 if you have the `system' function. */
 #define H5_HAVE_SYSTEM 1
 
@@ -432,6 +478,10 @@
    values correctly. */
 #define H5_LDOUBLE_TO_LLONG_ACCURATE 1
 
+/* Define if your system converts long double to (unsigned) long values with
+   special algorithm. */
+/* #undef H5_LDOUBLE_TO_LONG_SPECIAL */
+
 /* Define if your system can convert long double to unsigned int values
    correctly. */
 #define H5_LDOUBLE_TO_UINT_ACCURATE 1
@@ -443,6 +493,10 @@
    values correctly. */
 #define H5_LLONG_TO_LDOUBLE_CORRECT 1
 
+/* Define if your system can convert (unsigned) long to long double values
+   with special algorithm. */
+/* #undef H5_LONG_TO_LDOUBLE_SPECIAL */
+
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 #define H5_LT_OBJDIR ".libs/"
@@ -450,17 +504,10 @@
 /* Define if the metadata trace file code is to be compiled in */
 /* #undef H5_METADATA_TRACE_FILE */
 
-/* Define if your system can handle complicated MPI derived datatype
-   correctly. */
-#define H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS 1
-
 /* Define if your system's `MPI_File_set_size' function works for files over
    2GB. */
 #define H5_MPI_FILE_SET_SIZE_BIG 1
 
-/* Define if your system can handle special collective IO properly. */
-#define H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS 1
-
 /* Define if we can violate pointer alignment restrictions */
 #define H5_NO_ALIGNMENT_RESTRICTIONS 1
 
@@ -480,13 +527,16 @@
 #define H5_PACKAGE_NAME "HDF5"
 
 /* Define to the full name and version of this package. */
-#define H5_PACKAGE_STRING "HDF5 1.9.81-FA_a5"
+#define H5_PACKAGE_STRING "HDF5 1.9.111-FA_a5"
 
 /* Define to the one symbol short name of this package. */
 #define H5_PACKAGE_TARNAME "hdf5"
 
+/* Define to the home page for this package. */
+#define H5_PACKAGE_URL ""
+
 /* Define to the version of this package. */
-#define H5_PACKAGE_VERSION "1.9.81-FA_a5"
+#define H5_PACKAGE_VERSION "1.9.111-FA_a5"
 
 /* Width for printf() for type `long long' or `__int64', use `ll' */
 #define H5_PRINTF_LL_WIDTH "I64"
@@ -554,6 +604,13 @@
 /* The size of `off_t', as computed by sizeof. */
 #define H5_SIZEOF_OFF_T 4
 
+/* The size of `ptrdiff_t', as computed by sizeof. */
+#ifndef _WIN64
+#define H5_SIZEOF_PTRDIFF_T 4
+#else
+#define H5_SIZEOF_PTRDIFF_T 8
+#endif /* _WIN64 */
+
 /* The size of `short', as computed by sizeof. */
 #define H5_SIZEOF_SHORT 2
 
@@ -603,6 +660,9 @@
 /* The size of `uint_least8_t', as computed by sizeof. */
 #define H5_SIZEOF_UINT_LEAST8_T 0
 
+/* The size of `unsigned', as computed by sizeof. */
+#define H5_SIZEOF_UNSIGNED 4
+
 /* The size of `__int64', as computed by sizeof. */
 #define H5_SIZEOF___INT64 8
 
@@ -630,6 +690,10 @@
    correct precision. */
 #define H5_ULLONG_TO_LDOUBLE_PRECISION 1
 
+/* Define if your system accurately converting unsigned long to float values.
+   */
+/* #undef H5_ULONG_TO_FLOAT_ACCURATE */
+
 /* Define if your system can accurately convert unsigned (long) long values to
    floating-point values. */
 /* #undef H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE */
@@ -643,7 +707,7 @@
 /* #undef H5_USING_MEMCHECKER */
 
 /* Version number of package */
-#define H5_VERSION "1.9.81-FA_a5"
+#define H5_VERSION "1.9.111-FA_a5"
 
 /* Define if vsnprintf() returns the correct value for formatted strings that
    don't fit into size allowed */
@@ -659,6 +723,12 @@
    first (like Motorola and SPARC, unlike Intel and VAX). */
 /* #undef H5_WORDS_BIGENDIAN */
 
+/* Number of bits in a file offset, on hosts where this is settable. */
+/* #undef H5__FILE_OFFSET_BITS */
+
+/* Define for large files, on AIX-style hosts. */
+/* #undef H5__LARGE_FILES */
+
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef H5_const */
 
@@ -671,8 +741,15 @@
 /* Define to `long int' if <sys/types.h> does not define. */
 /* #undef H5_off_t */
 
+/* Define to `long' if <sys/types.h> does not define. */
+/* #undef H5_ptrdiff_t */
+
 /* Define to `unsigned long' if <sys/types.h> does not define. */
 /* #undef H5_size_t */
 
 /* Define to `long' if <sys/types.h> does not define. */
+#ifndef _WIN64
 #define H5_ssize_t long
+#else
+#define H5_ssize_t long long
+#endif /* _WIN64 */
diff --git a/windows/tools/h5diff/testh5diff.bat b/windows/tools/h5diff/testh5diff.bat
index 9b73b60..491332f 100644
--- a/windows/tools/h5diff/testh5diff.bat
+++ b/windows/tools/h5diff/testh5diff.bat
@@ -59,6 +59,8 @@ set srcexclude1_2=h5diff_exclude1-2.h5
 set srcexclude2_1=h5diff_exclude2-1.h5

 set srcexclude2_2=h5diff_exclude2-2.h5

 set src_comp_vl_strs=h5diff_comp_vl_strs.h5

+set src_COMPS_ARRAY_VLEN1=compounds_array_vlen1.h5

+set src_COMPS_ARRAY_VLEN2=compounds_array_vlen2.h5

 set src_ATTR_VERBOSE_LEVEL_FILE1=h5diff_attr_v_level1.h5

 set src_ATTR_VERBOSE_LEVEL_FILE2=h5diff_attr_v_level2.h5

 

@@ -93,6 +95,8 @@ set exclude1_2=%indir%\h5diff_exclude1-2.h5
 set exclude2_1=%indir%\h5diff_exclude2-1.h5

 set exclude2_2=%indir%\h5diff_exclude2-2.h5

 set comp_vl_strs=%indir%\h5diff_comp_vl_strs.h5

+set COMPS_ARRAY_VLEN1=%indir%\compounds_array_vlen1.h5

+set COMPS_ARRAY_VLEN2=%indir%\compounds_array_vlen2.h5

 set ATTR_VERBOSE_LEVEL_FILE1=%indir%\h5diff_attr_v_level1.h5

 set ATTR_VERBOSE_LEVEL_FILE2=%indir%\h5diff_attr_v_level2.h5

 

@@ -297,12 +301,12 @@ rem ############################################################################
     call :tooltest h5diff_17.txt -v %file1% %file2% 

 

     rem 1.71 test 32-bit INFINITY

-    call :testing %h5diff% -v %srcfile1% %srcfile1% /g1/fp19

-    call :tooltest h5diff_171.txt -v %file1% %file1% /g1/fp19 

+    call :testing %h5diff% -v %srcfile1% %srcfile1% /g1/fp19 /g1/fp19_COPY

+    call :tooltest h5diff_171.txt -v %file1% %file1% /g1/fp19 /g1/fp19_COPY

 

     rem 1.72 test 64-bit INFINITY

-    call :testing %h5diff% -v %srcfile1% %srcfile1% /g1/fp20

-    call :tooltest h5diff_172.txt -v %file1% %file1% /g1/fp20 

+    call :testing %h5diff% -v %srcfile1% %srcfile1% /g1/fp20 /g1/fp20_COPY

+    call :tooltest h5diff_172.txt -v %file1% %file1% /g1/fp20 /g1/fp20_COPY

 

     rem 1.8 quiet mode 

     call :testing %h5diff% -q %srcfile1% %srcfile2%

@@ -528,6 +532,16 @@ rem ############################################################################
     call :testing %h5diff% file1.h6 file2.h6

     call :tooltest h5diff_629.txt file1.h6 file2.h6

 

+    rem ######################################################################

+    rem # NaN

+    rem ######################################################################

+    rem 6.30: test (NaN == NaN) must be true based on our documentation -- XCAO

+    call :testing %h5diff% -v -d "0.0001" %srcfile1% %srcfile1% g1/fp18 g1/fp18_COPY

+    call :tooltest h5diff_630.txt -v -d "0.0001" %file1% %file1% g1/fp18 g1/fp18_COPY

+    call :testing %h5diff% -v --use-system-epsilon %srcfile1% %srcfile1% g1/fp18 g1/fp18_COPY

+    call :tooltest h5diff_631.txt -v --use-system-epsilon %file1% %file1% g1/fp18 g1/fp18_COPY

+

+

     rem ########################################################################

     rem 7.  attributes

     rem ########################################################################

@@ -884,9 +898,9 @@ rem ############################################################################
     call :tooltest h5diff_518.txt -v --follow-symlinks %grp_recurse1_ext% %grp_recurse2_ext1% /g1

 

 

-    rem ##############################################################################

+    rem #######################################################################

     rem # Exclude objects (--exclude-path)

-    rem ##############################################################################

+    rem #######################################################################

     rem #-------------------------------------------------

     rem # Same structure, same names and different value.

 

@@ -913,12 +927,45 @@ rem ############################################################################
     call :testing %h5diff% -v --exclude-path "/dset3" %srcexclude1_1% %srcexclude1_2% /group1

     call :tooltest h5diff_484.txt -v --exclude-path "/dset3"  %exclude1_1% %exclude1_2% /group1

 

-    rem ##############################################################################

+    rem #######################################################################

     rem # diff various multiple vlen and fixed strings in a compound type dataset

-    rem ##############################################################################

-    call :testing %h5diff% -v %src_comp_vl_strs% %src_comp_vl_strs%

-    call :tooltest h5diff_530.txt -v  %comp_vl_strs% %comp_vl_strs%

+    rem #######################################################################

+    call :testing %h5diff% -v %src_comp_vl_strs% %src_comp_vl_strs% /group /group_copy

+    call :tooltest h5diff_530.txt -v  %comp_vl_strs% %comp_vl_strs% /group /group_copy

+

+    rem # #####################################################################

+    rem # # Test container types (array,vlen) with multiple nested compound types

+    rem # # Complex compound types in dataset and attribute

+    rem # #####################################################################

+    call :testing %h5diff% -v %src_COMPS_ARRAY_VLEN1% %src_COMPS_ARRAY_VLEN2%

+    call :tooltest h5diff_540.txt -v %COMPS_ARRAY_VLEN1% %COMPS_ARRAY_VLEN2%

+

+    rem #######################################################################

+    rem # Test mutually exclusive options 

+    rem #######################################################################

+

+    rem ------------------------------------------------------

+    rem Test with -d , -p and --use-system-epsilon. 

+    call :testing %h5diff% -v -d 5 -p 0.05 --use-system-epsilon %srcfile1% %srcfile2% /g1/dset3 /g1/dset4

+    call :tooltest h5diff_640.txt -v -d 5 -p 0.05 --use-system-epsilon %file1% %file2% /g1/dset3 /g1/dset4

+

+    call :testing %h5diff% -v -d 5 -p 0.05 %srcfile1% %srcfile2% /g1/dset3 /g1/dset4

+    call :tooltest h5diff_641.txt -v -d 5 -p 0.05 %file1% %file2% /g1/dset3 /g1/dset4

+

+    call :testing %h5diff% -v -p 0.05 -d 5 %srcfile1% %srcfile2% /g1/dset3 /g1/dset4

+    call :tooltest h5diff_642.txt -v -p 0.05 -d 5 %file1% %file2% /g1/dset3 /g1/dset4

+

+    call :testing %h5diff% -v -d 5 --use-system-epsilon %srcfile1% %srcfile2% /g1/dset3 /g1/dset4

+    call :tooltest h5diff_643.txt -v -d 5 --use-system-epsilon %file1% %file2% /g1/dset3 /g1/dset4

+

+    call :testing %h5diff% -v --use-system-epsilon -d 5 %srcfile1% %srcfile2% /g1/dset3 /g1/dset4

+    call :tooltest h5diff_644.txt -v --use-system-epsilon -d 5 %file1% %file2% /g1/dset3 /g1/dset4

+

+    call :testing %h5diff% -v -p 0.05 --use-system-epsilon %srcfile1% %srcfile2% /g1/dset3 /g1/dset4

+    call :tooltest h5diff_645.txt -v -p 0.05 --use-system-epsilon %file1% %file2% /g1/dset3 /g1/dset4

 

+    call :testing %h5diff% -v --use-system-epsilon -p 0.05 %srcfile1% %srcfile2% /g1/dset3 /g1/dset4

+    call :tooltest h5diff_646.txt -v --use-system-epsilon -p 0.05 %file1% %file2% /g1/dset3 /g1/dset4

 	

     rem #######################################################################

     rem # END

diff --git a/windows/tools/h5dump/testh5dump.bat b/windows/tools/h5dump/testh5dump.bat
index dff1d1f..307765c 100644
--- a/windows/tools/h5dump/testh5dump.bat
+++ b/windows/tools/h5dump/testh5dump.bat
@@ -410,7 +410,8 @@ rem ############################################################################
     call :tooltest tall-4s.ddl --dataset=/g1/g1.1/dset1.1.1 --start=1,1 --stride=2,3 --count=3,2 --block=1,1 tall.h5

     call :tooltest tall-5s.ddl -d "/g1/g1.1/dset1.1.2[0;2;10;]" tall.h5

     call :tooltest tdset-3s.ddl -d "/dset1[1,1;;;]" tdset.h5

-

+    rem block

+    rem call :tooltest tdset2-1s.ddl -d "/dset1[;3,2;4,4;1,4]" tdset2.h5

 

     rem test printing characters in ASCII instead of decimal

     call :tooltest tchar1.ddl -r tchar.h5

@@ -614,8 +615,84 @@ rem ############################################################################
 
     rem test for dangling external links
     call :tooltest textlink.ddl textlink.h5
-    

-    

+

+	rem test for dataset packed bits 

+	rem Set up xCMD to test or skip.

+    rem Limits:

+    rem Maximum number of packed bits is 8 (for now).

+    rem Maximum integer size is 64 (for now).

+    rem Maximun Offset is 63 (Maximum size - 1).

+    rem Maximum Offset+Length is 64 (Maximum size).

+    rem Tests:

+    rem Normal operation on both signed and unsigned int datasets.

+    rem Sanity check

+    rem Their rawdata output should be the same.

+    call :tooltest tpbitsSignedWhole.ddl -d /DS08BITS -M 0,8 packedbits.h5

+    call :tooltest tpbitsUnsignedWhole.ddl -d /DU08BITS -M 0,8 packedbits.h5

+    call :tooltest tpbitsSignedIntWhole.ddl -d /DS16BITS -M 0,16 packedbits.h5

+    call :tooltest tpbitsUnsignedIntWhole.ddl -d /DU16BITS -M 0,16 packedbits.h5

+    call :tooltest tpbitsSignedLongWhole.ddl -d /DS32BITS -M 0,32 packedbits.h5

+    call :tooltest tpbitsUnsignedLongWhole.ddl -d /DU32BITS -M 0,32 packedbits.h5

+    call :tooltest tpbitsSignedLongLongWhole.ddl -d /DS64BITS -M 0,64 packedbits.h5

+    call :tooltest tpbitsUnsignedLongLongWhole.ddl -d /DU64BITS -M 0,64 packedbits.h5

+    call :tooltest tpbitsSignedLongLongWhole63.ddl -d /DS64BITS -M 0,63 packedbits.h5

+    call :tooltest tpbitsUnsignedLongLongWhole63.ddl -d /DU64BITS -M 0,63 packedbits.h5

+    call :tooltest tpbitsSignedLongLongWhole1.ddl -d /DS64BITS -M 1,63 packedbits.h5

+    call :tooltest tpbitsUnsignedLongLongWhole1.ddl -d /DU64BITS -M 1,63 packedbits.h5

+    rem Half sections

+    call :tooltest tpbitsSigned4.ddl -d /DS08BITS -M 0,4,4,4 packedbits.h5

+    call :tooltest tpbitsUnsigned4.ddl -d /DU08BITS -M 0,4,4,4 packedbits.h5

+    call :tooltest tpbitsSignedInt8.ddl -d /DS16BITS -M 0,8,8,8 packedbits.h5

+    call :tooltest tpbitsUnsignedInt8.ddl -d /DU16BITS -M 0,8,8,8 packedbits.h5

+    call :tooltest tpbitsSignedLong16.ddl -d /DS32BITS -M 0,16,16,16 packedbits.h5

+    call :tooltest tpbitsUnsignedLong16.ddl -d /DU32BITS -M 0,16,16,16 packedbits.h5

+    call :tooltest tpbitsSignedLongLong32.ddl -d /DS64BITS -M 0,32,32,32 packedbits.h5

+    call :tooltest tpbitsUnsignedLongLong32.ddl -d /DU64BITS -M 0,32,32,32 packedbits.h5

+    rem Quarter sections

+    call :tooltest tpbitsSigned2.ddl -d /DS08BITS -M 0,2,2,2,4,2,6,2 packedbits.h5

+    call :tooltest tpbitsUnsigned2.ddl -d /DU08BITS -M 0,2,2,2,4,2,6,2 packedbits.h5

+    call :tooltest tpbitsSignedInt4.ddl -d /DS16BITS -M 0,4,4,4,8,4,12,4 packedbits.h5

+    call :tooltest tpbitsUnsignedInt4.ddl -d /DU16BITS -M 0,4,4,4,8,4,12,4 packedbits.h5

+    call :tooltest tpbitsSignedLong8.ddl -d /DS32BITS -M 0,8,8,8,16,8,24,8 packedbits.h5

+    call :tooltest tpbitsUnsignedLong8.ddl -d /DU32BITS -M 0,8,8,8,16,8,24,8 packedbits.h5

+    call :tooltest tpbitsSignedLongLong16.ddl -d /DS64BITS -M 0,16,16,16,32,16,48,16 packedbits.h5

+    call :tooltest tpbitsUnsignedLongLong16.ddl -d /DU64BITS -M 0,16,16,16,32,16,48,16 packedbits.h5

+    rem Begin and End

+    call :tooltest tpbitsSigned.ddl -d /DS08BITS -M 0,2,2,6 packedbits.h5

+    call :tooltest tpbitsUnsigned.ddl -d /DU08BITS -M 0,2,2,6 packedbits.h5

+    call :tooltest tpbitsSignedInt.ddl -d /DS16BITS -M 0,2,10,6 packedbits.h5

+    call :tooltest tpbitsUnsignedInt.ddl -d /DU16BITS -M 0,2,10,6 packedbits.h5

+    call :tooltest tpbitsSignedLong.ddl -d /DS32BITS -M 0,2,26,6 packedbits.h5

+    call :tooltest tpbitsUnsignedLong.ddl -d /DU32BITS -M 0,2,26,6 packedbits.h5

+    call :tooltest tpbitsSignedLongLong.ddl -d /DS64BITS -M 0,2,58,6 packedbits.h5

+    call :tooltest tpbitsUnsignedLongLong.ddl -d /DU64BITS -M 0,2,58,6 packedbits.h5

+    rem Overlapped packed bits.

+    call :tooltest tpbitsOverlapped.ddl -d /DS08BITS -M 0,1,1,1,2,1,0,3 packedbits.h5

+    rem Maximum number of packed bits.

+    call :tooltest tpbitsMax.ddl -d /DS08BITS -M 0,1,1,1,2,1,3,1,4,1,5,1,6,1,7,1 packedbits.h5

+    rem Compound type.

+    call :tooltest tpbitsCompound.ddl -d /dset1 -M 0,1,1,1 tcompound.h5

+    rem Array type.

+    call :tooltest tpbitsArray.ddl -d /Dataset1 -M 0,1,1,1 tarray1.h5

+    rem Test Error handling.

+    rem Too many packed bits requested. Max is 8 for now.

+    call :tooltest tpbitsMaxExceeded.ddl -d /DS08BITS -M 0,1,0,1,1,1,2,1,3,1,4,1,5,1,6,1,7,1 packedbits.h5

+    rem Offset too large. Max is 7 (8-1) for now.

+    call :tooltest tpbitsOffsetExceeded.ddl -d /DS08BITS -M 64,1 packedbits.h5

+    call :tooltest tpbitsCharOffsetExceeded.ddl -d /DS08BITS -M 8,1 packedbits.h5

+    call :tooltest tpbitsIntOffsetExceeded.ddl -d /DS16BITS -M 16,1 packedbits.h5

+    call :tooltest tpbitsLongOffsetExceeded.ddl -d /DS32BITS -M 32,1 packedbits.h5

+    rem Bad offset, must not be negative.

+    call :tooltest tpbitsOffsetNegative.ddl -d /DS08BITS -M -1,1 packedbits.h5

+    rem Bad length, must not be positive.

+    call :tooltest tpbitsLengthPositive.ddl -d /DS08BITS -M 4,0 packedbits.h5

+    rem Offset+Length is too large. Max is 8 for now.

+    call :tooltest tpbitsLengthExceeded.ddl -d /DS08BITS -M 37,28 packedbits.h5

+    call :tooltest tpbitsCharLengthExceeded.ddl -d /DS08BITS -M 2,7 packedbits.h5

+    call :tooltest tpbitsIntLengthExceeded.ddl -d /DS16BITS -M 10,7 packedbits.h5

+    call :tooltest tpbitsLongLengthExceeded.ddl -d /DS32BITS -M 26,7 packedbits.h5

+    rem Incomplete pair of packed bits request.

+    call :tooltest tpbitsIncomplete.ddl -d /DS08BITS -M 0,2,2,1,0,2,2, packedbits.h5

     

     if %nerrors% equ 0 (

         echo.All %dumper% tests passed.

diff --git a/windows/tools/h5import/h5importtestutil.bat b/windows/tools/h5import/h5importtestutil.bat
index 9c224f5..6ac8077 100644
--- a/windows/tools/h5import/h5importtestutil.bat
+++ b/windows/tools/h5import/h5importtestutil.bat
@@ -22,6 +22,9 @@ rem
 setlocal enabledelayedexpansion

 pushd %~dp0

 

+rem srcdir is used on Unix-- define as the current directory for Windows.

+set srcdir=%CD%

+

 rem The tool name

 set h5import=h5import%2

 rem The path of the tool binary

@@ -37,9 +40,6 @@ set h5dump=..\h5dump%2\%1\h5dump%2
 rem The path of the h5dump tool binary

 set h5dump_bin=%CD%\%h5dump%

 

-rem source directory (this is already defined in the Linux script)

-set srcdir=%CD%

-

 rem initialize errors variables

 set errors=0

 

@@ -104,67 +104,52 @@ goto main
     rem On Windows, echo gives a carriage return, so we store the TESTING params

     rem and call TESTING from TOOLTEST.  --SJW 8/27/07

     set testing=ASCII I32 rank 3 - Output BE 

-    rem call :tooltest txtin32 -c %CD%\testfiles\textin32 -o test1.h5

     call :tooltest %srcdir%\testfiles\txtin16.txt -c %srcdir%\testfiles\txtin32.conf -o txtin32.h5

 

     set testing=ASCII I16 rank 3 - Output LE - CHUNKED - extended

-    rem call :tooltest txtin16 -c %CD%\testfiles\textin16 -o test2.h5

     call :tooltest %srcdir%\testfiles\txtin16.txt -c %srcdir%\testfiles\txtin16.conf -o txtin16.h5

 

     set testing=ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed

-    rem call :tooltest txtin16 -c %CD%\testfiles\textin8  -o test3.h5

     call :tooltest %srcdir%\testfiles\txtin16.txt -c %srcdir%\testfiles\txtin8.conf  -o txtin8.h5

 

     set testing=ASCII UI32 - rank 3 - Output BE

-    rem call :tooltest %CD%\testfiles\in1 -c %CD%\testfiles\textuin32 -o test4.h5

-    call :tooltest %srcdir%\testfiles\txtuin32.txt -c %srcdir%\testfiles\txtuin32.conf -o txtuin32.h5

+    call :tooltest %srcdir%\testfiles\txtin32.txt -c %srcdir%\testfiles\txtuin32.conf -o txtuin32.h5

 

     set testing=ASCII UI16 - rank 2 - Output LE+Chunked+Compressed

-    rem call :tooltest %CD%\testfiles\in1 -c %CD%\testfiles\textuin16 -o test5.h5

     call :tooltest %srcdir%\testfiles\txtuin32.txt -c %srcdir%\testfiles\txtuin16.conf -o txtuin16.h5

 

     set testing=ASCII F32 - rank 3 - Output LE

-    rem call :tooltest %CD%\testfiles\fp1 -c %CD%\testfiles\textfp32 -o test6.h5

     call :tooltest %srcdir%\testfiles\txtfp32.txt -c %srcdir%\testfiles\txtfp32.conf -o txtfp32.h5

 

     set testing=ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed

-    rem call :tooltest %CD%\testfiles\fp2 -c %CD%\testfiles\textfp64 -o test7.h5

     call :tooltest %srcdir%\testfiles\txtfp64.txt -c %srcdir%\testfiles\txtfp64.conf -o txtfp64.h5

 

     set testing=BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed

-    rem call :tooltest bfp64 -c %CD%\testfiles\conbfp64 -o test8.h5

     call :tooltest binfp64.bin -c %srcdir%\testfiles\binfp64.conf -o binfp64.h5

 

     set testing=BINARY I16 - rank 3 - Output order LE + CHUNKED + extended

-    rem call :tooltest bin16 -c %CD%\testfiles\conbin16 -o test9.h5

     call :tooltest binin16.bin -c %srcdir%\testfiles\binin16.conf -o binin16.h5

 

     set testing=BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed

-    rem call :tooltest bin8 -c %CD%\testfiles\conbin8  -o test10.h5

     call :tooltest binin8.bin -c %srcdir%\testfiles\binin8.conf  -o binin8.h5

 

     set testing=BINARY I32 - rank 3 - Output BE + CHUNKED

-    rem call :tooltest bin32 -c %CD%\testfiles\conbin32 -o test11.h5

     call :tooltest binin32.bin -c %srcdir%\testfiles\binin32.conf -o binin32.h5

 

     set testing=BINARY UI16 - rank 3 - Output byte BE + CHUNKED

-    rem call :tooltest buin16 -c %CD%\testfiles\conbuin16 -o test12.h5

     call :tooltest binuin16.bin -c %srcdir%\testfiles\binuin16.conf -o binuin16.h5

 

     set testing=BINARY UI32 - rank 3 - Output LE + CHUNKED

-    rem call :tooltest buin32 -c %CD%\testfiles\conbuin32 -o test13.h5

     call :tooltest binuin32.bin -c %srcdir%\testfiles\binuin32.conf -o binuin32.h5

 

     set testing=STR 

-    rem call :tooltest %CD%\testfiles\txtstr -c %CD%\testfiles\textstr -o teststr.h5

     call :tooltest %srcdir%\testfiles\txtstr.txt -c %srcdir%\testfiles\txtstr.conf -o txtstr.h5

 

     set testing=BINARY I8 CR LF EOF

     call :tooltest binin8w.bin -c %srcdir%\testfiles\binin8w.conf -o binin8w.h5

     

-    set testing=ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE

-    call :tooltest %srcdir%\testfiles\in64.txt -c %srcdir%\testfiles\textpfe.conf -o test15.h5

-

+    set testing=ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE 

+    call :tooltest %srcdir%\testfiles\textpfe64.txt -c %srcdir%\testfiles\textpfe.conf -o textpfe.h5

 

 

     del /f *.txt *.bin *.h5