[svn-r17896] Description:

	Bring r17546:17895 from trunk to revise_chunks branch.  Changes to
fixed and extensible array dataset chunk indexing code to accommodate changes
to private APIs in those interfaces.  Also, other adjustments to source code
and expected output in response to changes on the trunk.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (smirom) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.6.2 (amazon) in debug mode
        Mac OS X/32 10.6.2 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode

27 files changed, 1159 insertions, 256 deletions

diff --git a/windows/c++/test/checkcpptests.bat b/windows/c++/test/checkcpptests.bat
index e092c04..93ccd2b 100644
--- a/windows/c++/test/checkcpptests.bat
+++ b/windows/c++/test/checkcpptests.bat
@@ -22,6 +22,8 @@ rem
 setlocal enabledelayedexpansion

 pushd %~dp0

 

+set /a nerrors=0

+

 rem Clean any variables starting with "HDF5_CPPTEST_", as we use these for our

 rem tests.  Also clear "HDF5_CPPTEST_TESTS", as we will be addding all of our tests

 rem to this variable.

@@ -61,12 +63,16 @@ rem     %2 - "dll" or nothing
         rem Only add our parameters for batch scripts.

         call !hdf5_cpptest_%%a_test:.bat= %1 %2!

         rem Exit early if test fails.

-        if !errorlevel! neq 0 exit /b

+        if errorlevel 1 (

+            set /a nerrors=!nerrors!+1

+			echo.

+			echo.************************************

+			echo.  Testing %%a ^(%1 %2^)  FAILED

+			exit /b 1

+		)

     )

     

     rem If we get here, that means all of our tests passed.

-    echo.All C++ library tests passed.

-

     exit /b

 

 

@@ -83,6 +89,12 @@ rem on it for sending parameters.  --SJW 9/6/07
     rem Run the tests, passing in which version to run

     call :run_tests %*

         

+    if "%nerrors%"=="0" (

+		echo.All C++ library tests passed.

+	) else (

+        echo.** FAILED C++ Library tests.

+    )

+        

     popd

-    endlocal & exit /b

+    endlocal & exit /b %nerrors%

     
\ No newline at end of file
diff --git a/windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj b/windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj
index c795d28..0d872af 100644
--- a/windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj
+++ b/windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj
@@ -428,6 +428,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\..\c++\test\tlinks.cpp"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\..\c++\test\trefer.cpp"

 				>

 			</File>

diff --git a/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj b/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj
index b169201..4ceef84 100644
--- a/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj
+++ b/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj
@@ -428,6 +428,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\..\c++\test\tlinks.cpp"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\..\c++\test\trefer.cpp"

 				>

 			</File>

diff --git a/windows/examples/allexamples/allexamples.vcproj b/windows/examples/allexamples/allexamples.vcproj
index 4c87ec0..d426da9 100644
--- a/windows/examples/allexamples/allexamples.vcproj
+++ b/windows/examples/allexamples/allexamples.vcproj
@@ -21,7 +21,7 @@
 			Name="Release|Win32"

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

 			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

+			ConfigurationType="10"

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

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

@@ -109,7 +109,7 @@
 			Name="Release|x64"

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

 			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

+			ConfigurationType="10"

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

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

@@ -198,7 +198,7 @@
 			Name="Debug|Win32"

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

 			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

+			ConfigurationType="10"

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

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

@@ -286,7 +286,7 @@
 			Name="Debug|x64"

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

 			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

+			ConfigurationType="10"

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

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

diff --git a/windows/examples/testExamples.bat b/windows/examples/testExamples.bat
index 57aa19c..e6367ac 100755
--- a/windows/examples/testExamples.bat
+++ b/windows/examples/testExamples.bat
@@ -19,111 +19,17 @@ REM Last Modified: 10/16/2004
 

 if %1.==. GOTO WRONG

 if "%1"=="/?" GOTO HELP

-if %1==release GOTO RELEASE

-if %1==debug GOTO DEBUG

-GOTO WRONG

 

-:RELEASE

-if %2.==. GOTO REL

-if %2==dll GOTO RELDLL

-GOTO WRONG

-

-:REL

-type nul > %1.txt

-cd examplesREL

-attributetest >> ..\%1.txt

-compoundtest >> ..\%1.txt

-extendwritetest >> ..\%1.txt

-grouptest >> ..\%1.txt

-intermgrouptest >> ..\%1.txt

-selectest >> ..\%1.txt

-writetest >> ..\%1.txt

-chunkread >> ..\%1.txt

-readtest >> ..\%1.txt

-cd ..

-more /e +3 testExamples_exp_output.txt  > output.txt

-fc %1.txt output.txt >temp.txt

-if %ERRORLEVEL%==0 (

-   echo All HDF5 C examples tests passed.

-) else (

-   echo HDF5 C examples tests failed.

-   echo.

-   more temp.txt

-)

-del output.txt

-del temp.txt

-GOTO END

-

-:RELDLL

-type nul > %1.txt

-cd examplesRELDLL

-attributetestdll >> ..\%1.txt

-compoundtestdll >> ..\%1.txt

-extendwritetestdll >> ..\%1.txt

-grouptestdll >> ..\%1.txt

-intermgrouptestdll >> ..\%1.txt

-selectestdll >> ..\%1.txt

-writetestdll >> ..\%1.txt

-chunkreaddll >> ..\%1.txt

-readtestdll >> ..\%1.txt

-cd ..

-more /e +3 testExamples_exp_output.txt  > output.txt

-fc %1.txt output.txt >temp.txt

-if %ERRORLEVEL%==0 (

-   echo All HDF5 C examples tests passed.

-) else (

-   echo HDF5 C examples tests failed.

-   echo.

-   more temp.txt

-)

-del output.txt

-del temp.txt

-GOTO END

-

-:DEBUG

-if %2.==. GOTO DBG

-if %2==dll GOTO DBGDLL

-GOTO WRONG

-

-:DBG

-type nul > %1.txt

-cd examplesDBG

-attributetest >> ..\%1.txt

-compoundtest >> ..\%1.txt

-extendwritetest >> ..\%1.txt

-grouptest >> ..\%1.txt

-intermgrouptest >> ..\%1.txt

-selectest >> ..\%1.txt

-writetest >> ..\%1.txt

-chunkread >> ..\%1.txt

-readtest >> ..\%1.txt

-cd ..

-more /e +3 testExamples_exp_output.txt  > output.txt

-fc %1.txt output.txt >temp.txt

-if %ERRORLEVEL%==0 (

-   echo All HDF5 C examples tests passed.

-) else (

-   echo HDF5 C examples tests failed.

-   echo.

-   more temp.txt

-)

-del output.txt

-del temp.txt

-GOTO END

-

-:DBGDLL

 type nul > %1.txt

-cd examplesDBGDLL

-attributetestdll >> ..\%1.txt

-compoundtestdll >> ..\%1.txt

-extendwritetestdll >> ..\%1.txt

-grouptestdll >> ..\%1.txt

-intermgrouptestdll >> ..\%1.txt

-selectestdll >> ..\%1.txt

-writetestdll >> ..\%1.txt

-chunkreaddll >> ..\%1.txt

-readtestdll >> ..\%1.txt

-cd ..

+attributetest%2\%1\attributetest%2 >> %1.txt

+compoundtest%2\%1\compoundtest%2 >> %1.txt

+extendwritetest%2\%1\extendwritetest%2 >> %1.txt

+grouptest%2\%1\grouptest%2 >> %1.txt

+intermgrouptest%2\%1\intermgrouptest%2 >> %1.txt

+selectest%2\%1\selectest%2 >> %1.txt

+writetest%2\%1\writetest%2 >> %1.txt

+chunkread%2\%1\chunkread%2 >> %1.txt

+readtest%2\%1\readtest%2 >> %1.txt

 more /e +3 testExamples_exp_output.txt  > output.txt

 fc %1.txt output.txt >temp.txt

 if %ERRORLEVEL%==0 (

diff --git a/windows/examples/testExamples_exp_output.txt b/windows/examples/testExamples_exp_output.txt
index 228c69f..b57688f 100755
--- a/windows/examples/testExamples_exp_output.txt
+++ b/windows/examples/testExamples_exp_output.txt
@@ -2,7 +2,9 @@
 Expected output for HDF5 C examples tests
 #############################
 The value of the attribute "Integer attribute" is 1 
-Found string attribute; its index is 1 , value =   ABCD 
+Found string attribute; its index is 2 , value =   ABCD 
+
+Name : Character attribute
 
 Name : Float attribute
 Rank : 2 
@@ -10,8 +12,6 @@ Dimension sizes : 2 3
 Type : FLOAT 
 Values : -1.000000 -1.000000 -1.000000 -1.000000 -1.000000 -1.000000 
 
-Name : Character attribute
-
 Name : Integer attribute
 
 Field c : 
diff --git a/windows/fortran/test/checkfortrantests.bat b/windows/fortran/test/checkfortrantests.bat
index 2b970f6..e4d7a4e 100644
--- a/windows/fortran/test/checkfortrantests.bat
+++ b/windows/fortran/test/checkfortrantests.bat
@@ -22,6 +22,8 @@ rem
 setlocal enabledelayedexpansion

 pushd %~dp0

 

+set /a nerrors=0

+

 rem Clean any variables starting with "HDF5_FORTTEST_", as we use these for our

 rem tests.  Also clear "HDF5_FORTTEST_TESTS", as we will be addding all of our tests

 rem to this variable.

@@ -61,12 +63,16 @@ rem     %2 - "dll" or nothing
         rem Only add our parameters for batch scripts.

         call !hdf5_forttest_%%a_test:.bat= %1 %2!

         rem Exit early if test fails.

-        if !errorlevel! neq 0 exit /b

+        if errorlevel 1 (

+            set /a nerrors=!nerrors!+1

+			echo.

+			echo.************************************

+			echo.  Testing %%a ^(%1 %2^)  FAILED

+			exit /b 1

+		)

     )

     

     rem If we get here, that means all of our tests passed.

-    echo.All Fortran library tests passed.

-

     exit /b

 

 

@@ -86,6 +92,11 @@ rem on it for sending parameters.  --SJW 9/6/07
     rem Run the tests, passing in which version to run

     call :run_tests %*

         

+    if "%nerrors%"=="0" (

+		echo.All Fortran library tests passed.

+	) else (

+        echo.** FAILED Fortran Library tests.

+    )

+        

     popd

-    endlocal & exit /b

-    
\ No newline at end of file
+    endlocal & exit /b %nerrors%

diff --git a/windows/hdf5bt.BAT b/windows/hdf5bt.BAT
index 1cb4644..c0b58a5 100755
--- a/windows/hdf5bt.BAT
+++ b/windows/hdf5bt.BAT
@@ -16,14 +16,15 @@ rem access to either file, you may request a copy from help@hdfgroup.org.
 rem File Name: hdf5bt.bat

 rem This batch file is used to build and test HDF5 Libraries and Tools.

 rem This batch file takes the following options:

+rem .  /vs8              Build HDF5 using Visual Studio 2005

 rem .  /vs9              Build HDF5 using Visual Studio 2008

 rem .                    Note: Default is Visual Studio 2005

 rem .  /fort             Build and test HDF5 with Fortran libraries

 rem .  /useenv           Build HDF5 using compiler settings defined

-rem .                    in the environment, rather than the IDE.

-rem .   /ivf101             Build HDF5 Fortran using Intel Visual Fortran 10.1

-rem .                       Note: Default is Intel Visual Fortran 9.1

-rem .  /log               Log the build and test results in files defined by

+rem .                     in the environment, rather than the IDE.

+rem .  /ivf101           Build HDF5 Fortran using Intel Visual Fortran 10.1

+rem .  /ivf91            Note: Default is Intel Visual Fortran 9.1

+rem .  /log              Log the build and test results in files defined by

 rem .                      environment variables HDF5BUILD_LOG and

 rem .                      HDF5CHECK_LOG

 rem .  /?                Help information

@@ -61,11 +62,12 @@ rem Print a help message
     echo.

     echo Usage: %~nx0 [OPTION]

     echo.

+    echo.   /vs8              Build HDF5 using Visual Studio 2005

     echo.   /vs9              Build HDF5 using Visual Studio 2008

     echo.                     Note: Default is Visual Studio 2005

     echo.   /fort             Build and test HDF5 with Fortran libraries

     echo.   /ivf101           Build HDF5 Fortran using Intel Visual Fortran 10.1

-    echo.                     Note: Default is Intel Visual Fortran 9.1

+    echo.   /ivf91            Note: Default is Intel Visual Fortran 9.1

     echo.   /useenv           Build HDF5 using compiler settings defined

     echo.                     in the environment, rather than the IDE.

     echo.   /?                Help information

@@ -77,12 +79,10 @@ rem Parse through the parameters sent to file, and set appropriate variables
 :parse_params

 

     for %%a in (%*) do (

-        if "%%a"=="/vs7" (

-            rem Visual Studio .NET not supported

-            rem Set errorlevel 1 and send to help

-            call :help

-            exit /b 1

-    

+        if "%%a"=="/vs8" (

+            rem Use Visual Studio 2005 to build

+            set hdf5_vs2005=true

+            

         ) else if "%%a"=="/vs9" (

             rem Use Visual Studio 2008 to build

             set hdf5_vs2008=true

@@ -91,6 +91,10 @@ rem Parse through the parameters sent to file, and set appropriate variables
             rem Enable Fortran

             set hdf5_enablefortran=true

             

+        ) else if "%%a"=="/ivf91" (

+            rem Enable Fortran

+            set hdf5_ivf91=true

+            

         ) else if "%%a"=="/ivf101" (

             rem Enable Fortran

             set hdf5_ivf101=true

@@ -127,8 +131,8 @@ rem Setup our environment
     set hdf5build_params=

     set hdf5check_params=enablecpp

     

-    if defined hdf5_vnet (

-        set hdf5build_params=%hdf5build_params% /vs7

+    if defined hdf5_vs2005 (

+        set hdf5build_params=%hdf5build_params% /vs8

     )

     

     if defined hdf5_vs2008 (

@@ -140,6 +144,10 @@ rem Setup our environment
         set hdf5check_params=enableall

     )

     

+    if defined hdf5_ivf91 (

+        set hdf5build_params=%hdf5build_params% /ivf91

+    )

+    

     if defined hdf5_ivf101 (

         set hdf5build_params=%hdf5build_params% /ivf101

     )

@@ -211,8 +219,8 @@ rem This is where the magic happens
 :main

 

     call :parse_params %*

-    if %errorlevel% neq 0 (

-        if !errorlevel! equ 1 (

+    if not errorlevel 0 (

+        if errorlevel 1 (

             rem This isn't an error case-- this means /? was specified.  Simply

             rem quit.

             goto end

@@ -225,7 +233,7 @@ rem This is where the magic happens
     )

 

     call :setup

-    if %errorlevel% neq 0 (

+    if not errorlevel 0 (

         echo.Error setting up hdf5bt environment!

         goto error

     )

@@ -236,13 +244,13 @@ rem This is where the magic happens
     echo.

 

     call :build

-    if %errorlevel% neq 0 (

+    if not errorlevel 0 (

         echo.Error building HDF5 libraries!

         goto error

     )

 

     call :test

-    if %errorlevel% neq 0 (

+    if not errorlevel 0 (

         echo.Error testing HDF5 libraries!

         goto error

     )

diff --git a/windows/hdf5build.BAT b/windows/hdf5build.BAT
index e2a062c..9c9d84d 100755
--- a/windows/hdf5build.BAT
+++ b/windows/hdf5build.BAT
@@ -16,17 +16,16 @@ rem access to either file, you may request a copy from helphdfgroup.org.
 rem File Name: hdf5build.bat

 rem This batch file is used to build HDF5 Libraries and Tools.

 rem This batch file takes the following options:

+rem .  /vs8              Build HDF5 using Visual Studio 2005

 rem .  /vs9              Build HDF5 using Visual Studio 2008

 rem .                    Note: Default is Visual Studio 2005

-rem .  /fort         Build HDF5 with Fortran libraries

-rem .   /ivf101             Build HDF5 Fortran using Intel Visual Fortran 10.1

-rem .                       Note: Default is Intel Visual Fortran 9.1

+rem .  /fort             Build HDF5 with Fortran libraries

+rem .  /ivf101           Build HDF5 Fortran using Intel Visual Fortran 10.1

+rem .  /ivf91            Note: Default is Intel Visual Fortran 9.1

+rem .  /nodebug          Note: Default is to build debug and release versions

 rem .  /useenv           Build HDF5 using compiler settings defined

 rem .                    in the environment, rather than the IDE.

 rem .  /?                Help information

-rem By Xuan Bai

-rem Created: Aug. 16, 2004

-rem Last Updated: Scott Wegner, 7/2/08

 

 rem This batch file makes the following assumptions:

 rem    - The appropriate version of Visual Studio is installed and setup

@@ -47,6 +46,8 @@ pushd %~dp0
 

 set nerrors=0

 if "%1"=="/?" goto help

+set blddebug=debug

+set bldrelease=release

 goto main

 

 rem Print a help message

@@ -56,12 +57,14 @@ rem Print a help message
     echo.

     echo.Usage: %~nx0 [OPTION]

     echo.

+    echo.   /vs8                Build HDF5 using Visual Studio 2005

     echo.   /vs9                Build HDF5 using Visual Studio 2008

     echo.                       Note: Default is Visual Studio 2005

     echo.   /fort               Build HDF5 with Fortran libraries using the

     echo.                       Intel Fortran version specified, or 9.1 by default

     echo.   /ivf101             Build HDF5 Fortran using Intel Visual Fortran 10.1

-    echo.                       Note: Default is Intel Visual Fortran 9.1

+    echo.   /ivf91              Note: Default is Intel Visual Fortran 9.1

+    echo.   /nodebug            Note: Default is to build debug and release versions

     echo.   /useenv             Build HDF5 using compiler settings defined

     echo.                       in the environment, rather than the IDE.

     echo.   /?                  Help information

@@ -73,24 +76,30 @@ rem Parse through the parameters sent to file, and set appropriate variables
 :parse_params

 

     for %%a in (%*) do (

-        if "%%a"=="/vs7" (

-            rem Visual Studio .NET 2003 not supported

-            rem Set errorlevel 1 and send to help

-            call :help

-            exit /b 1

+        if "%%a"=="/vs8" (

+            rem Use Visual Studio 2005

+            set hdf5_vs2005=true

             

         ) else if "%%a"=="/vs9" (

-            rem Use Visual Studio .NET 2003

+            rem Use Visual Studio 2008

             set hdf5_vs2008=true

             

         ) else if "%%a"=="/fort" (

             rem Enable Fortran

             set hdf5_enablefortran=true

             

+        ) else if "%%a"=="/ivf91" (

+            rem Enable Fortran

+            set hdf5_ivf91=true

+            

         ) else if "%%a"=="/ivf101" (

             rem Enable Fortran

             set hdf5_ivf101=true

             

+        ) else if "%%a"=="/nodebug" (

+            rem Enable Fortran

+            set blddebug=

+            

         ) else if "%%a"=="/useenv" (

             rem Pass /useenv flag to devenv

             set hdf5_useenv=true

@@ -118,29 +127,14 @@ rem Setup our environment
     

     echo.Setting up environment

 

-    rem Sanity check-- make sure VS.NET isn't specified with Fortran or x64

-    if defined hdf5_vnet (

-        if defined hdf5_enablefortran (

-            echo.Error: Building Fortran libraries with Visual Studio .NET is unsupported

-            exit /b 1

-        )

-        if "%PROCESSOR_ARCHITECTURE%"=="AMD64" (

-            echo.Error: Building HDF5 on x64 with Visual Studio .NET is unsupported

-            exit /b 1

-        )

-    )

-    rem Make sure /vs7 and /vs9 weren't specified together

-    if "%hdf5_vnet%%hdf5_vs2008%"=="truetrue" (

-        echo.Error: /vs7 and /vs9 should not be specified together.

+    rem Make sure /vs8 and /vs9 weren't specified together

+    if "%hdf5_vs2005%%hdf5_vs2008%"=="truetrue" (

+        echo.Error: /vs8 and /vs9 should not be specified together.

         exit /b 1

     )

 

     rem Figure out which solution file to use based on configuration

-    if defined hdf5_vnet (

-        echo.Using Visual Studio .NET 2003

-        set hdf5_sln="%CD%\windows_vnet\proj\all\all.sln"

-        

-    ) else if defined hdf5_vs2008 (

+    if defined hdf5_vs2008 (

         echo.Using Visual Studio 2008

         if defined hdf5_enablefortran (

             echo.Building Fortran projects enabled

@@ -176,17 +170,7 @@ rem Setup our environment
     

     set ccflags=

     

-    if defined hdf5_vnet (

-        if defined vs71comntools (

-            rem This sets the Visual Studio .NET path and environment variables

-            call "%vs71comntools%\vsvars32.bat" 

-        ) else (

-            echo.Error: Cannot setup Visual Studio .NET 2003 environment.  Please

-            echo.make sure VS71COMNTOOLS is defined in the environment.

-            exit /b 1

-        )

-        

-    ) else if defined hdf5_vs2008 (

+    if defined hdf5_vs2008 (

         if not defined hdf5_enablefortran (

             if defined vs90comntools (

                 rem This sets the Visual Studio 2005 path and environment variables

@@ -308,15 +292,18 @@ rem Build the HDF5 libraries.  By default, C and C++ libraries are built.
     echo.

 

     rem Build both debug and release versions

-    for %%a in (debug release) DO (

+    for %%a in (%blddebug% %bldrelease%) DO (

         echo.Building %hdf5_platform% %%a libraries...

-        rem Only add hdf5_platform if not using Visual Studio .NET, because it doesn't like the syntax

-        if defined hdf5_vnet (

-            devenv %hdf5_sln% %ccflags% /rebuild %%a

-        ) else (

-            devenv %hdf5_sln% %ccflags% /rebuild "%%a|%hdf5_platform%"

-        )

-        if !errorlevel! neq 0 exit /b

+        devenv %hdf5_sln% %ccflags% /rebuild "%%a|%hdf5_platform%"

+        if not errorlevel 0 (

+            set /a nerrors=!nerrors!+1

+			echo.  Building %%a FAILED

+			exit /b 1

+		) else if errorlevel 1 (

+            set /a nerrors=!nerrors!+1

+			echo.  Building %%a FAILED

+			exit /b 1

+		)

     )

 

     exit /b

@@ -338,8 +325,8 @@ rem This is where the magic happens
 :main

 

     call :parse_params %*

-    if %errorlevel% neq 0 (

-        if !errorlevel! equ 1 (

+    if not errorlevel 0 (

+        if errorlevel 1 (

             rem This isn't an error case-- this means /? was specified.  Simply

             rem quit.

             goto end

@@ -352,7 +339,7 @@ rem This is where the magic happens
     )

     

     call :setup

-    if %errorlevel% neq 0 (

+    if not errorlevel 0 (

         echo.Error setting up build environment.

         goto error

     )

@@ -360,7 +347,7 @@ rem This is where the magic happens
     rem Upgrade the project files if needed

     if defined hdf5_vs2008 (

         call :upgrade

-        if !errorlevel! neq 0 (

+        if not errorlevel 0 (

             echo.Error upgrading project files!

             goto error

         )

@@ -376,7 +363,10 @@ rem This is where the magic happens
 

 

     call :all

-    if %errorlevel% neq 0 (

+    if not errorlevel 0 (

+        echo.Error building HDF5 libraries!

+        goto error

+	) else if errorlevel 1 (

         echo.Error building HDF5 libraries!

         goto error

     )

diff --git a/windows/hdf5build_examples.BAT b/windows/hdf5build_examples.BAT
index 52b106a..d12fc0c 100644
--- a/windows/hdf5build_examples.BAT
+++ b/windows/hdf5build_examples.BAT
@@ -17,6 +17,7 @@ rem File Name: hdf5build_examples.bat
 rem This batch file is used to build HDF5 C/C++/Fortran examples.

 rem This batch file takes the following options:

 rem .  /fort             Build HDF5 examples, including Fortran

+rem .  /nodebug          Note: Default is to build debug and release versions

 rem .  /useenv           Build HDF5 examples using compiler settings defined

 rem .                    in the environment, rather than the IDE.

 rem .  /?                Help information

@@ -42,6 +43,8 @@ pushd %~dp0
 

 set nerrors=0

 if "%1"=="/?" goto help

+set blddebug=debug

+set bldrelease=release

 goto main

 

 rem Print a help message

@@ -52,6 +55,7 @@ rem Print a help message
     echo.Usage: %~nx0 [OPTION]

     echo.

     echo.   /fort             Build HDF5 examples, including Fortran

+    echo.   /nodebug          Note: Default is to build debug and release versions

     echo.   /useenv           Build HDF5 examples using compiler settings defined

     echo.                     in the environment, rather than the IDE.

     echo.   /?                Help information

@@ -67,6 +71,10 @@ rem Parse through the parameters sent to file, and set appropriate variables
             rem Enable Fortran

             set hdf5_enablefortran=true

             

+        ) else if "%%a"=="/nodebug" (

+            rem Enable Fortran

+            set blddebug=

+            

         ) else if "%%a"=="/useenv" (

             rem Pass /useenv flag to devenv

             set hdf5_useenv=true

@@ -163,7 +171,7 @@ rem Build the HDF5 libraries.  By default, C and C++ libraries are built.
             echo.**************************

             echo. Building %%a Examples

             echo.**************************

-            for %%b in (Debug Release) do (

+            for %%b in (%blddebug% %bldrelease%) do (

                 echo.Building %%a %%b examples...

                 devenv !%%a_SLN! %ccflags% /rebuild %%b

                 if !errorlevel! neq 0 (

diff --git a/windows/hdf5check.BAT b/windows/hdf5check.BAT
index f3caea2..2f14bfd 100755
--- a/windows/hdf5check.BAT
+++ b/windows/hdf5check.BAT
@@ -20,9 +20,7 @@ rem    1. hdf5check                -- HDF5 tools and c library tests
 rem    2. hdf5check enablecpp      -- HDF5 tools and c/c++ library tests

 rem    3. hdf5check enablefortran  -- HDF5 tools and c/fortran library tests

 rem    4. hdf5check enableall      -- HDF5 tools and c/c++/fortran library tests

-rem  By Xuan Bai

-rem  Created: Aug. 12, 2004

-rem  Last Updated: Scott Wegner, 9/10/07

+rem    disabledebug                -- can be added to any of the above to not test debug versions

 

 setlocal enabledelayedexpansion

 pushd %~dp0

@@ -35,6 +33,8 @@ rem --SJW 9/5/07
 set hdf5_test_=foo

 for /f "tokens=1 delims==" %%a in ('set hdf5_test_') do set %%a=

 set hdf5_test_tests=

+set chkdebug=debug

+set chkrelease=release

 

 rem Put built DLLs in the system folder for testing

 call install_dll.BAT

@@ -50,6 +50,11 @@ if /i "%1" equ "enablecpp" (
 ) else if /i "%1" equ "enableall" (

     set build_cpp_conditional=true

     set build_fortran_conditional=true

+) else if /i "%1" equ "disabledebug" (

+    set chkdebug=

+)

+if /i "%2" equ "disabledebug" (

+    set chkdebug=

 )

 

 goto main

@@ -75,14 +80,24 @@ rem     %2 - "dll" or nothing
 :run_tests

     for %%a in (%hdf5_test_tests%) do (

         echo.

-        echo.************************************

+        echo.**==**==**==**==**==**==**==**==**==**

         echo.  Testing %%a ^(%1 %2^)

-        echo.************************************

+        echo.**==**==**==**==**==**==**==**==**==**

         

         rem Only add our parameters for batch scripts.

         call !hdf5_test_%%a_test:.bat= %1 %2!

         rem Exit early if test fails.

-        if !errorlevel! neq 0 exit /b

+        if not errorlevel 0 (

+            set /a nerrors=!nerrors!+1

+			echo.  Testing %%a ^(%1 %2^)  FAILED

+			echo.**==**==**==**==**==**==**==**==**==**

+			exit /b 1

+		) else if errorlevel 1 (

+            set /a nerrors=!nerrors!+1

+			echo.  Testing %%a ^(%1 %2^)  FAILED

+			echo.**==**==**==**==**==**==**==**==**==**

+			exit /b 1

+		)

     )

     

     rem If we get here, that means all of our tests passed.

@@ -118,18 +133,24 @@ rem on it for sending parameters.  --SJW 9/6/07
     rem We use "nodll" here because we cannot simply leave it blank.  Filter

     rem it out below. --SJW 9/10/07

     for %%b in (nodll dll) do (

-        for %%a in (debug release) do (

+		echo.======================================

+        for %%a in (%chkdebug% %chkrelease%) do (

             set hdf5_config=%%a %%b

             call :run_tests !hdf5_config:nodll=!

-            if !errorlevel! neq 0 (

+            if not errorlevel 0 (

+                set /a nerrors=!nerrors!+1

+			) else if errorlevel 1 (

                 set /a nerrors=!nerrors!+1

             )

         )

+		echo.======================================

     )

     

-    if %nerrors% equ 0 (

+    if "%nerrors%"=="0" (

         echo.HDF5 Tests passed for all configurations!

-    )

+    ) else (

+        echo.** FAILED HDF5 Tests!

+	)

     

     popd

     endlocal & exit /b %nerrors%

diff --git a/windows/hl/c++/test/checkhlcpptests.bat b/windows/hl/c++/test/checkhlcpptests.bat
index 24b7f55..db3f329 100644
--- a/windows/hl/c++/test/checkhlcpptests.bat
+++ b/windows/hl/c++/test/checkhlcpptests.bat
@@ -22,6 +22,8 @@ rem
 setlocal enabledelayedexpansion

 pushd %~dp0

 

+set /a nerrors=0

+

 rem Clean any variables starting with "HDF5_HLCPPTEST_", as we use these for our

 rem tests.  Also clear "HDF5_HLCPPTEST_TESTS", as we will be addding all of our tests

 rem to this variable.

@@ -61,12 +63,16 @@ rem     %2 - "dll" or nothing
         rem Only add our parameters for batch scripts.

         call !hdf5_hlcpptest_%%a_test:.bat= %1 %2!

         rem Exit early if test fails.

-        if !errorlevel! neq 0 exit /b

+        if errorlevel 1 (

+            set /a nerrors=!nerrors!+1

+			echo.

+			echo.************************************

+			echo.  Testing %%a ^(%1 %2^)  FAILED

+			exit /b 1

+		)

     )

     

     rem If we get here, that means all of our tests passed.

-    echo.All HL C++ library tests passed.

-

     exit /b

 

 

@@ -82,6 +88,11 @@ rem on it for sending parameters.  --SJW 9/6/07
     rem Run the tests, passing in which version to run

     call :run_tests %*

         

+    if "%nerrors%"=="0" (

+		echo.All HL C++ library tests passed.

+	) else (

+        echo.** FAILED HL C++ Library tests.

+    )

+        

     popd

-    endlocal & exit /b

-    
\ No newline at end of file
+    endlocal & exit /b %nerrors%

diff --git a/windows/hl/examples/test_hl_cexamples.BAT b/windows/hl/examples/test_hl_cexamples.BAT
index 4fb6309..652a602 100644
--- a/windows/hl/examples/test_hl_cexamples.BAT
+++ b/windows/hl/examples/test_hl_cexamples.BAT
@@ -39,30 +39,30 @@ GOTO WRONG
     echo Testing %1 %2 version of High Level examples 

     echo.

 

-    HLCexamples%1%2\ex_ds1%2.exe HLCexamples%1%2

+    ex_ds1%2\%1\ex_ds1%2.exe ex_ds1%1%2

     

     for /l %%a in (1,1,2) do (

-        HLCexamples%1%2\ex_image%%a%2.exe HLCexamples%1%2

+        ex_image%%a%2\%1\ex_image%%a%2.exe ex_image%%a%1%2

         if not !errorlevel!==0 set /A total_error=!total_error!+1

     )

     

     for /l %%a in (1,1,3) do (

-        HLCexamples%1%2\ex_lite%%a%2.exe HLCexamples%1%2

+        ex_lite%%a%2\%1\ex_lite%%a%2.exe ex_lite%%a%1%2

         if not !errorlevel!==0 set /A total_error=!total_error!+1

     )

 

     for /l %%a in (1,1,9) do (

-        HLCexamples%1%2\ex_table0%%a%2.exe HLCexamples%1%2

+        ex_table0%%a%2\%1\ex_table0%%a%2.exe ex_table0%%a%1%2

         if not !errorlevel!==0 set /A total_error=!total_error!+1

     )

     

     for /l %%a in (10,1,12) do (

-        HLCexamples%1%2\ex_table%%a%2.exe HLCexamples%1%2

+        ex_table%%a%2\%1\ex_table%%a%2.exe ex_table%%a%1%2

         if not !errorlevel!==0 set /A total_error=!total_error!+1

     )

     

     for %%a in (FL VL) do (

-        HLCexamples%1%2\ptExample%%a%2.exe HLCexamples%1%2

+        ptExample%%a%2\%1\ptExample%%a%2.exe ptExample%%a%1%2

         if not !errorlevel!==0 set /A total_error=!total_error!+1

     )

 

diff --git a/windows/hl/fortran/test/checkhlfortrantests.bat b/windows/hl/fortran/test/checkhlfortrantests.bat
index 98d9c38..0710625 100644
--- a/windows/hl/fortran/test/checkhlfortrantests.bat
+++ b/windows/hl/fortran/test/checkhlfortrantests.bat
@@ -22,6 +22,8 @@ rem
 setlocal enabledelayedexpansion

 pushd %~dp0

 

+set /a nerrors=0

+

 rem Clean any variables starting with "HDF5_HLFORTTEST_", as we use these for our

 rem tests.  Also clear "HDF5_HLFORTTEST_TESTS", as we will be addding all of our tests

 rem to this variable.

@@ -61,12 +63,16 @@ rem     %2 - "dll" or nothing
         rem Only add our parameters for batch scripts.

         call !hdf5_hlforttest_%%a_test:.bat= %1 %2!

         rem Exit early if test fails.

-        if !errorlevel! neq 0 exit /b

+        if errorlevel 1 (

+            set /a nerrors=!nerrors!+1

+			echo.

+			echo.************************************

+			echo.  Testing %%a ^(%1 %2^)  FAILED

+			exit /b 1

+		)

     )

     

     rem If we get here, that means all of our tests passed.

-    echo.All HL Fortran library tests passed.

-

     exit /b

 

 

@@ -84,6 +90,11 @@ rem on it for sending parameters.  --SJW 9/6/07
     rem Run the tests, passing in which version to run

     call :run_tests %*

         

+    if "%nerrors%"=="0" (

+		echo.All HL Fortran library tests passed.

+	) else (

+        echo.** FAILED HL Fortran Library tests.

+    )

+        

     popd

-    endlocal & exit /b

-    
\ No newline at end of file
+    endlocal & exit /b %nerrors%

diff --git a/windows/hl/test/checkhltests.bat b/windows/hl/test/checkhltests.bat
index 925c245..0804148 100644
--- a/windows/hl/test/checkhltests.bat
+++ b/windows/hl/test/checkhltests.bat
@@ -22,6 +22,8 @@ rem
 setlocal enabledelayedexpansion

 pushd %~dp0

 

+set /a nerrors=0

+

 rem Clean any variables starting with "HDF5_HLTEST_", as we use these for our

 rem tests.  Also clear "HDF5_HLTEST_TESTS", as we will be addding all of our tests

 rem to this variable.

@@ -66,12 +68,16 @@ rem     %2 - "dll" or nothing
         rem Only add our parameters for batch scripts.

         call !hdf5_hltest_%%a_test:.bat= %1 %2!

         rem Exit early if test fails.

-        if !errorlevel! neq 0 exit /b

+        if errorlevel 1 (

+            set /a nerrors=!nerrors!+1

+			echo.

+			echo.************************************

+			echo.  Testing %%a ^(%1 %2^)  FAILED

+			exit /b 1

+		)

     )

     

     rem If we get here, that means all of our tests passed.

-    echo.All HL library tests passed.

-

     exit /b

 

 

@@ -134,6 +140,12 @@ rem on it for sending parameters.  --SJW 9/6/07
     rem Run the tests, passing in which version to run

     call :run_tests %*

         

+    if "%nerrors%"=="0" (

+		echo.All HL library tests passed.

+	) else (

+        echo.** FAILED HL Library tests.

+    )

+        

     popd

-    endlocal & exit /b

+    endlocal & exit /b %nerrors%

     
\ No newline at end of file
diff --git a/windows/install_dll.BAT b/windows/install_dll.BAT
index 8a133c3..089d169 100755
--- a/windows/install_dll.BAT
+++ b/windows/install_dll.BAT
@@ -45,15 +45,8 @@ rem Add the DLLS to be copied here.
     rem HDF5 Library

     call :copy_dll proj\hdf5dll\debug\hdf5ddll.dll

     call :copy_dll proj\hdf5dll\release\hdf5dll.dll

-    rem We need this conditional because vs6 uses libtestD rather than libtestdll,

-    rem Remove later when we fix the VS6 project name.

-    if exist test\libtestdll\debug\libtestddll.dll (

-        call :copy_dll test\libtestdll\debug\libtestddll.dll

-        call :copy_dll test\libtestdll\release\libtestdll.dll

-    ) else (

-        call :copy_dll test\libtestD\debug\libtestDd.dll

-        call :copy_dll test\libtestD\release\libtestD.dll

-    )

+    call :copy_dll test\libtestdll\debug\libtestddll.dll

+    call :copy_dll test\libtestdll\release\libtestdll.dll

     

     rem C++

     call :copy_dll proj\hdf5_cppdll\debug\hdf5_cppddll.dll

diff --git a/windows/perform/checkperformtests.bat b/windows/perform/checkperformtests.bat
index 35895cf..4d789d1 100644
--- a/windows/perform/checkperformtests.bat
+++ b/windows/perform/checkperformtests.bat
@@ -22,6 +22,8 @@ rem
 setlocal enabledelayedexpansion

 pushd %~dp0

 

+set /a nerrors=0

+

 rem Clean any variables starting with "HDF5_PERFTEST_", as we use these for our

 rem tests.  Also clear "HDF5_PERFTEST_TESTS", as we will be addding all of our tests

 rem to this variable.

@@ -61,12 +63,16 @@ rem     %2 - "dll" or nothing
         rem Only add our parameters for batch scripts.

         call !hdf5_perftest_%%a_test:.bat= %1 %2!

         rem Exit early if test fails.

-        if !errorlevel! neq 0 exit /b

+        if errorlevel 1 (

+            set /a nerrors=!nerrors!+1

+			echo.

+			echo.************************************

+			echo.  Testing %%a ^(%1 %2^)  FAILED

+			exit /b 1

+		)

     )

     

     rem If we get here, that means all of our tests passed.

-    echo.All performance tests passed.

-

     exit /b

 

 

@@ -85,6 +91,11 @@ rem on it for sending parameters.  --SJW 9/6/07
     rem Run the tests, passing in which version to run

     call :run_tests %*

         

+    if "%nerrors%"=="0" (

+		echo.All performance tests passed.

+	) else (

+        echo.** FAILED performance tests.

+    )

+        

     popd

-    endlocal & exit /b

-    
\ No newline at end of file
+    endlocal & exit /b %nerrors%

diff --git a/windows/proj/all/all.sln b/windows/proj/all/all.sln
index e553104..8167d2b 100755
--- a/windows/proj/all/all.sln
+++ b/windows/proj/all/all.sln
@@ -1133,6 +1133,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "farraydll", "..\..\test\far
 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcheckversion", "..\..\test\tcheckversion\tcheckversion.vcproj", "{DFB6DCC1-2E00-4566-B935-F32172FDA483}"

+	ProjectSection(ProjectDependencies) = postProject

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcheckversiondll", "..\..\test\tcheckversiondll\tcheckversiondll.vcproj", "{7B3EB7A5-DA01-4488-A06B-63E2941EE078}"

+	ProjectSection(ProjectDependencies) = postProject

+		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+	EndProjectSection

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -2473,6 +2485,22 @@ Global
 		{79FF58EE-7427-4732-AC25-370341859292}.Release|Win32.Build.0 = Release|Win32

 		{79FF58EE-7427-4732-AC25-370341859292}.Release|x64.ActiveCfg = Release|x64

 		{79FF58EE-7427-4732-AC25-370341859292}.Release|x64.Build.0 = Release|x64

+		{DFB6DCC1-2E00-4566-B935-F32172FDA483}.Debug|Win32.ActiveCfg = Debug|Win32

+		{DFB6DCC1-2E00-4566-B935-F32172FDA483}.Debug|Win32.Build.0 = Debug|Win32

+		{DFB6DCC1-2E00-4566-B935-F32172FDA483}.Debug|x64.ActiveCfg = Debug|x64

+		{DFB6DCC1-2E00-4566-B935-F32172FDA483}.Debug|x64.Build.0 = Debug|x64

+		{DFB6DCC1-2E00-4566-B935-F32172FDA483}.Release|Win32.ActiveCfg = Release|Win32

+		{DFB6DCC1-2E00-4566-B935-F32172FDA483}.Release|Win32.Build.0 = Release|Win32

+		{DFB6DCC1-2E00-4566-B935-F32172FDA483}.Release|x64.ActiveCfg = Release|x64

+		{DFB6DCC1-2E00-4566-B935-F32172FDA483}.Release|x64.Build.0 = Release|x64

+		{7B3EB7A5-DA01-4488-A06B-63E2941EE078}.Debug|Win32.ActiveCfg = Debug|Win32

+		{7B3EB7A5-DA01-4488-A06B-63E2941EE078}.Debug|Win32.Build.0 = Debug|Win32

+		{7B3EB7A5-DA01-4488-A06B-63E2941EE078}.Debug|x64.ActiveCfg = Debug|x64

+		{7B3EB7A5-DA01-4488-A06B-63E2941EE078}.Debug|x64.Build.0 = Debug|x64

+		{7B3EB7A5-DA01-4488-A06B-63E2941EE078}.Release|Win32.ActiveCfg = Release|Win32

+		{7B3EB7A5-DA01-4488-A06B-63E2941EE078}.Release|Win32.Build.0 = Release|Win32

+		{7B3EB7A5-DA01-4488-A06B-63E2941EE078}.Release|x64.ActiveCfg = Release|x64

+		{7B3EB7A5-DA01-4488-A06B-63E2941EE078}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/windows/proj/all_fortran/all_fortran.sln b/windows/proj/all_fortran/all_fortran.sln
index c4c5b22..f7ccad0 100644
--- a/windows/proj/all_fortran/all_fortran.sln
+++ b/windows/proj/all_fortran/all_fortran.sln
@@ -1374,6 +1374,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "farraydll", "..\..\test\far
 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcheckversion", "..\..\test\tcheckversion\tcheckversion.vcproj", "{DFB6DCC1-2E00-4566-B935-F32172FDA483}"

+	ProjectSection(ProjectDependencies) = postProject

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcheckversiondll", "..\..\test\tcheckversiondll\tcheckversiondll.vcproj", "{7B3EB7A5-DA01-4488-A06B-63E2941EE078}"

+	ProjectSection(ProjectDependencies) = postProject

+		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+	EndProjectSection

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -2946,6 +2958,22 @@ Global
 		{79FF58EE-7427-4732-AC25-370341859292}.Release|Win32.Build.0 = Release|Win32

 		{79FF58EE-7427-4732-AC25-370341859292}.Release|x64.ActiveCfg = Release|x64

 		{79FF58EE-7427-4732-AC25-370341859292}.Release|x64.Build.0 = Release|x64

+		{DFB6DCC1-2E00-4566-B935-F32172FDA483}.Debug|Win32.ActiveCfg = Debug|Win32

+		{DFB6DCC1-2E00-4566-B935-F32172FDA483}.Debug|Win32.Build.0 = Debug|Win32

+		{DFB6DCC1-2E00-4566-B935-F32172FDA483}.Debug|x64.ActiveCfg = Debug|x64

+		{DFB6DCC1-2E00-4566-B935-F32172FDA483}.Debug|x64.Build.0 = Debug|x64

+		{DFB6DCC1-2E00-4566-B935-F32172FDA483}.Release|Win32.ActiveCfg = Release|Win32

+		{DFB6DCC1-2E00-4566-B935-F32172FDA483}.Release|Win32.Build.0 = Release|Win32

+		{DFB6DCC1-2E00-4566-B935-F32172FDA483}.Release|x64.ActiveCfg = Release|x64

+		{DFB6DCC1-2E00-4566-B935-F32172FDA483}.Release|x64.Build.0 = Release|x64

+		{7B3EB7A5-DA01-4488-A06B-63E2941EE078}.Debug|Win32.ActiveCfg = Debug|Win32

+		{7B3EB7A5-DA01-4488-A06B-63E2941EE078}.Debug|Win32.Build.0 = Debug|Win32

+		{7B3EB7A5-DA01-4488-A06B-63E2941EE078}.Debug|x64.ActiveCfg = Debug|x64

+		{7B3EB7A5-DA01-4488-A06B-63E2941EE078}.Debug|x64.Build.0 = Debug|x64

+		{7B3EB7A5-DA01-4488-A06B-63E2941EE078}.Release|Win32.ActiveCfg = Release|Win32

+		{7B3EB7A5-DA01-4488-A06B-63E2941EE078}.Release|Win32.Build.0 = Release|Win32

+		{7B3EB7A5-DA01-4488-A06B-63E2941EE078}.Release|x64.ActiveCfg = Release|x64

+		{7B3EB7A5-DA01-4488-A06B-63E2941EE078}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/windows/proj/hdf5/hdf5.vcproj b/windows/proj/hdf5/hdf5.vcproj
index 779b05c..3cb9708 100644
--- a/windows/proj/hdf5/hdf5.vcproj
+++ b/windows/proj/hdf5/hdf5.vcproj
@@ -357,6 +357,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5B2hdr.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5B2int.c"

 				>

 			</File>

@@ -565,6 +569,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5Fdeprec.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5FDfamily.c"

 				>

 			</File>

@@ -941,6 +949,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5Ofsinfo.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5Oginfo.c"

 				>

 			</File>

diff --git a/windows/proj/hdf5dll/hdf5dll.vcproj b/windows/proj/hdf5dll/hdf5dll.vcproj
index 492fce9..7f18944 100644
--- a/windows/proj/hdf5dll/hdf5dll.vcproj
+++ b/windows/proj/hdf5dll/hdf5dll.vcproj
@@ -448,6 +448,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5B2hdr.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5B2int.c"

 				>

 			</File>

@@ -656,6 +660,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5Fdeprec.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5FDfamily.c"

 				>

 			</File>

@@ -1032,6 +1040,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5Ofsinfo.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5Oginfo.c"

 				>

 			</File>

diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h
index d8f5836..52ca244 100755
--- a/windows/src/H5pubconf.h
+++ b/windows/src/H5pubconf.h
@@ -479,13 +479,13 @@
 #define H5_PACKAGE_NAME "HDF5"
 
 /* Define to the full name and version of this package. */
-#define H5_PACKAGE_STRING "HDF5 1.9.47-FA_a4"
+#define H5_PACKAGE_STRING "HDF5 1.9.51-FA_a4"
 
 /* Define to the one symbol short name of this package. */
 #define H5_PACKAGE_TARNAME "hdf5"
 
 /* Define to the version of this package. */
-#define H5_PACKAGE_VERSION "1.9.47-FA_a4"
+#define H5_PACKAGE_VERSION "1.9.51-FA_a4"
 
 /* Width for printf() for type `long long' or `__int64', use `ll' */
 #define H5_PRINTF_LL_WIDTH "I64"
@@ -642,7 +642,7 @@
 /* #undef H5_USING_MEMCHECKER */
 
 /* Version number of package */
-#define H5_VERSION "1.9.47-FA_a4"
+#define H5_VERSION "1.9.51-FA_a4"
 
 /* Define if vsnprintf() returns the correct value for formatted strings that
    don't fit into size allowed */
diff --git a/windows/test/checktests.bat b/windows/test/checktests.bat
index 920e058..77a47aa 100644
--- a/windows/test/checktests.bat
+++ b/windows/test/checktests.bat
@@ -22,6 +22,8 @@ rem
 setlocal enabledelayedexpansion

 pushd %~dp0

 

+set /a nerrors=0

+

 rem Clean any variables starting with "HDF5_LIBTEST_", as we use these for our

 rem tests.  Also clear "HDF5_LIBTEST_TESTS", as we will be addding all of our tests

 rem to this variable.

@@ -61,12 +63,16 @@ rem     %2 - "dll" or nothing
         rem Only add our parameters for batch scripts.

         call !hdf5_libtest_%%a_test:.bat= %1 %2!

         rem Exit early if test fails.

-        if !errorlevel! neq 0 exit /b

+        if errorlevel 1 (

+            set /a nerrors=!nerrors!+1

+			echo.

+			echo.************************************

+			echo.  Testing %%a ^(%1 %2^)  FAILED

+			exit /b 1

+		)

     )

     

     rem If we get here, that means all of our tests passed.

-    echo.All library tests passed.

-

     exit /b

 

 

@@ -119,16 +125,24 @@ rem on it for sending parameters.  --SJW 9/6/07
     call :add_test reserved%2 .\reserved%2\%1

     call :add_test cross_read%2 .\cross_read%2\%1

     call :add_test freespace%2 .\freespace%2\%1

-    call :add_test mf%2 .\mf%2\%1

+	rem Test commented out until fixed - assert hangs daily test

+	rem call :add_test mf%2 .\mf%2\%1

     call :add_test btree2%2 .\btree2%2\%1

     call :add_test fheap%2 .\fheap%2\%1

     call :add_test earray%2 .\earray%2\%1

     call :add_test farray%2 .\farray%2\%1

+

+    call :add_test tcheckversion%2 .\tcheckversion%2\%1

     

     

     rem Run the tests, passing in which version to run

     call :run_tests %*

         

+    if "%nerrors%"=="0" (

+		echo.All library tests passed.

+	) else (

+        echo.** FAILED Library tests.

+    )

+        

     popd

-    endlocal & exit /b

-    
\ No newline at end of file
+    endlocal & exit /b %nerrors%

diff --git a/windows/test/tcheckversion/tcheckversion.vcproj b/windows/test/tcheckversion/tcheckversion.vcproj
new file mode 100644
index 0000000..0eae847
--- /dev/null
+++ b/windows/test/tcheckversion/tcheckversion.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="tcheckversion"

+	ProjectGUID="{DFB6DCC1-2E00-4566-B935-F32172FDA483}"

+	RootNamespace="tcheckversion"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Release|Win32"

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

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\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"

+				TypeLibraryName=".\../../../test/tcheckversion/Release/tcheckversion.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../test/tcheckversion/Release/tcheckversion.pch"

+				AssemblerListingLocation=".\../../../test/tcheckversion/Release/"

+				ObjectFile=".\../../../test/tcheckversion/Release/"

+				ProgramDataBaseFileName=".\../../../test/tcheckversion/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				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="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="0"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				ProgramDatabaseFile=".\../../../test/tcheckversion/Release/tcheckversion.pdb"

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

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\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"

+				TypeLibraryName=".\../../../test/tcheckversion/Release/tcheckversion.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../test/tcheckversion/Release/tcheckversion.pch"

+				AssemblerListingLocation=".\../../../test/tcheckversion/Release/"

+				ObjectFile=".\../../../test/tcheckversion/Release/"

+				ProgramDataBaseFileName=".\../../../test/tcheckversion/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				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="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="0"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				ProgramDatabaseFile=".\../../../test/tcheckversion/Release/tcheckversion.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|Win32"

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

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\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"

+				TypeLibraryName=".\../../../test/tcheckversion/Debug/tcheckversion.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../test/tcheckversion/Debug/tcheckversion.pch"

+				AssemblerListingLocation=".\../../../test/tcheckversion/Debug/"

+				ObjectFile=".\../../../test/tcheckversion/Debug/"

+				ProgramDataBaseFileName=".\../../../test/tcheckversion/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

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

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

+				LinkIncremental="0"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../test/tcheckversion/Debug/tcheckversion.pdb"

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

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\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"

+				TypeLibraryName=".\../../../test/tcheckversion/Debug/tcheckversion.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../test/tcheckversion/Debug/tcheckversion.pch"

+				AssemblerListingLocation=".\../../../test/tcheckversion/Debug/"

+				ObjectFile=".\../../../test/tcheckversion/Debug/"

+				ProgramDataBaseFileName=".\../../../test/tcheckversion/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

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

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

+				LinkIncremental="0"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../test/tcheckversion/Debug/tcheckversion.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>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<File

+			RelativePath="..\..\..\test\tcheck_version.c"

+			>

+		</File>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/windows/test/tcheckversiondll/tcheckversiondll.vcproj b/windows/test/tcheckversiondll/tcheckversiondll.vcproj
new file mode 100644
index 0000000..8139dcc
--- /dev/null
+++ b/windows/test/tcheckversiondll/tcheckversiondll.vcproj
@@ -0,0 +1,395 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="tcheckversiondll"

+	ProjectGUID="{7B3EB7A5-DA01-4488-A06B-63E2941EE078}"

+	RootNamespace="tcheckversiondll"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

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

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\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"

+				TypeLibraryName=".\../../../test/tcheckversiondll/Debug/tcheckversiondll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

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

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../test/tcheckversiondll/Debug/tcheckversiondll.pch"

+				AssemblerListingLocation=".\../../../test/tcheckversiondll/Debug/"

+				ObjectFile=".\../../../test/tcheckversiondll/Debug/"

+				ProgramDataBaseFileName=".\../../../test/tcheckversiondll/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

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

+				LinkIncremental="0"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../test/tcheckversiondll/Debug/tcheckversiondll.pdb"

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

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\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"

+				TypeLibraryName=".\../../../test/tcheckversiondll/Debug/tcheckversiondll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

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

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../test/tcheckversiondll/Debug/tcheckversiondll.pch"

+				AssemblerListingLocation=".\../../../test/tcheckversiondll/Debug/"

+				ObjectFile=".\../../../test/tcheckversiondll/Debug/"

+				ProgramDataBaseFileName=".\../../../test/tcheckversiondll/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

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

+				LinkIncremental="0"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../test/tcheckversiondll/Debug/tcheckversiondll.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|Win32"

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

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\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"

+				TypeLibraryName=".\../../../test/tcheckversiondll/Release/tcheckversiondll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

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

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../test/tcheckversiondll/Release/tcheckversiondll.pch"

+				AssemblerListingLocation=".\../../../test/tcheckversiondll/Release/"

+				ObjectFile=".\../../../test/tcheckversiondll/Release/"

+				ProgramDataBaseFileName=".\../../../test/tcheckversiondll/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

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

+				LinkIncremental="0"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\../../../test/tcheckversiondll/Release/tcheckversiondll.pdb"

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

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\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"

+				TypeLibraryName=".\../../../test/tcheckversiondll/Release/tcheckversiondll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

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

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

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../test/tcheckversiondll/Release/tcheckversiondll.pch"

+				AssemblerListingLocation=".\../../../test/tcheckversiondll/Release/"

+				ObjectFile=".\../../../test/tcheckversiondll/Release/"

+				ProgramDataBaseFileName=".\../../../test/tcheckversiondll/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

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

+				LinkIncremental="0"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\../../../test/tcheckversiondll/Release/tcheckversiondll.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>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<File

+			RelativePath="..\..\..\test\tcheck_version.c"

+			>

+		</File>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/windows/test/testerror.bat b/windows/test/testerror.bat
index 844e69c..24d39e0 100644
--- a/windows/test/testerror.bat
+++ b/windows/test/testerror.bat
@@ -146,11 +146,11 @@ rem
     )

         

     fc /w %expect1_parsed% %actual% > nul

-    if %errorlevel% equ 0 (

+    if errorlevel 0 (

             call :testing PASSED %test_err%

     ) else (

         fc /w %expect2_parsed% %actual% > nul

-        if !errorlevel! equ 0 (

+        if errorlevel 0 (

             call :testing PASSED %test_err%

         ) else (

             call :testing *FAILED* %test_err%

@@ -193,9 +193,11 @@ rem ############################################################################
     rem test for error_test

     call :test error_test %1 %2

 

-    if %nerrors% equ 0 (

+    if "%nerrors%"=="0" (

         echo.All Error API tests passed.

-    )

+    ) else (

+        echo.** FAILED Error API tests

+	)

     

     popd

     endlocal & exit /b %nerrors%

diff --git a/windows/tools/checktools.bat b/windows/tools/checktools.bat
index f5a5b82..376e1fb 100644
--- a/windows/tools/checktools.bat
+++ b/windows/tools/checktools.bat
@@ -22,6 +22,8 @@ rem
 setlocal enabledelayedexpansion

 pushd %~dp0

 

+set /a nerrors=0

+

 rem Clean any variables starting with "HDF5_TOOL_", as we use these for our

 rem tests.  Also clear "HDF5_TOOL_TESTS", as we will be addding all of our tests

 rem to this variable.

@@ -61,12 +63,16 @@ rem     %2 - "dll" or nothing
         rem Only add our parameters for batch scripts.

         call !hdf5_tool_%%a_test:.bat= %1 %2!

         rem Exit early if test fails.

-        if !errorlevel! neq 0 exit /b

+        if errorlevel 1 (

+            set /a nerrors=!nerrors!+1

+			echo.

+			echo.************************************

+			echo.  Testing %%a ^(%1 %2^)  FAILED

+			exit /b 1

+		)

     )

     

     rem If we get here, that means all of our tests passed.

-    echo.All tool tests passed.

-

     exit /b

 

 

@@ -147,6 +153,11 @@ rem on it for sending parameters.  --SJW 9/6/07
     rem Run the tests, passing in which version to run

     call :run_tests %*

         

+    if "%nerrors%"=="0" (

+		echo.All tool tests passed.

+	) else (

+        echo.** FAILED tool tests.

+    )

+        

     popd

-    endlocal & exit /b

-    
\ No newline at end of file
+    endlocal & exit /b %nerrors%