summaryrefslogtreecommitdiffstats
path: root/windows/tools
diff options
context:
space:
mode:
Diffstat (limited to 'windows/tools')
-rwxr-xr-xwindows/tools/difftest.BAT894
-rwxr-xr-xwindows/tools/dumptest.bat1318
-rwxr-xr-xwindows/tools/h5debug/h5debug.dsp340
-rwxr-xr-xwindows/tools/h5debugdll/h5debugdll.dsp340
-rwxr-xr-xwindows/tools/h5diff/h5diff.dsp198
-rwxr-xr-xwindows/tools/h5diffdll/h5diffdll.dsp198
-rwxr-xr-xwindows/tools/h5dump/h5dump.dsp340
-rwxr-xr-xwindows/tools/h5dumpdll/h5dumpdll.dsp340
-rwxr-xr-xwindows/tools/h5import/h5import.dsp340
-rwxr-xr-xwindows/tools/h5importdll/h5importdll.dsp340
-rwxr-xr-xwindows/tools/h5jam/h5jam.dsp190
-rwxr-xr-xwindows/tools/h5ls/h5ls.dsp344
-rwxr-xr-xwindows/tools/h5lsdll/h5lsdll.dsp340
-rwxr-xr-xwindows/tools/h5repack/h5repack.dsp286
-rwxr-xr-xwindows/tools/h5repackdll/h5repackdll.dsp286
-rwxr-xr-xwindows/tools/h5repart/h5repart.dsp340
-rwxr-xr-xwindows/tools/h5repartdll/h5repartdll.dsp340
-rwxr-xr-xwindows/tools/h5stat/h5stat.dsp212
-rwxr-xr-xwindows/tools/h5statdll/h5statdll.dsp210
-rwxr-xr-xwindows/tools/h5unjam/h5unjam.dsp190
-rwxr-xr-xwindows/tools/importtest.BAT380
-rwxr-xr-xwindows/tools/lstest.BAT348
-rwxr-xr-xwindows/tools/mask.BAT42
-rwxr-xr-xwindows/tools/repacktest.BAT910
-rwxr-xr-xwindows/tools/talign/talign.dsp190
-rwxr-xr-xwindows/tools/taligndll/taligndll.dsp190
-rwxr-xr-xwindows/tools/testfiles/h5difftst/h5difftst.dsp222
-rwxr-xr-xwindows/tools/testfiles/h5dumptst/h5dumptst.dsp340
-rwxr-xr-xwindows/tools/testfiles/h5importtst/h5importtst.dsp190
-rwxr-xr-xwindows/tools/testfiles/h5jamtst/h5jamtst.dsp190
-rwxr-xr-xwindows/tools/testfiles/h5repacktst/h5repacktst.dsp318
-rwxr-xr-xwindows/tools/testfiles/h5repart_gentest/h5repart_gentest.dsp212
-rwxr-xr-xwindows/tools/testfiles/h5reparttst/h5reparttst.dsp210
-rwxr-xr-xwindows/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.dsp190
-rwxr-xr-xwindows/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.dsp190
-rwxr-xr-xwindows/tools/testhdf5tools.BAT100
-rwxr-xr-xwindows/tools/toolslib/toolslib.dsp748
-rwxr-xr-xwindows/tools/toolslibD/toolslibD.dsp748
-rwxr-xr-xwindows/tools/tooltest.bat634
39 files changed, 6869 insertions, 6869 deletions
diff --git a/windows/tools/difftest.BAT b/windows/tools/difftest.BAT
index d62eefd..ed089a9 100755
--- a/windows/tools/difftest.BAT
+++ b/windows/tools/difftest.BAT
@@ -1,447 +1,447 @@
-@REM Copyright by the Board of Trustees of the University of Illinois.
-@REM All rights reserved.
-@REM
-@REM This file is part of HDF5. The full HDF5 copyright notice, including
-@REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html. COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page. It can also be found at
-@REM http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have
-@REM access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-
-@echo off
-
-::This batch file is for h5diff tests.
-::Usage
-:: difftest release -- release static version
-:: difftest debug -- debug static version
-:: difftest release dll -- release dll version
-:: difftest debug dll -- debug dll version
-:: Written By: Fang GUO
-:: Date : Jan. 12, 2006
-
-:: Track total number of testing errors
- set /A totalerr=0
- set /A totalskip=0
-
-::**********************************************
-:: Generate a new temp directory for test h5diff
-::**********************************************
-
-:: Make a tempory directory for difftest
- mkdir temptest
-
-::****************************************************
-:: Set the Environment Variables & Change Dir to .EXE
-::****************************************************
-
- :: The first incoming parameter should be configuration (debug or release)
- set p1=%1
- :: The second parameter should be the types of library (dll or blank)
- set p2=%2
-
- :: Set up some variables for convenience
- :: tempResults will contain the tests results temporarily
- set tempResults=difftest%p2%_%p1%.txt
- :: exefile will contain the file name of the executable file
- set exefile=h5diff%p2%
- :: tooltest is the sub-batch file which will be called by tool test
- set tooltest=..\..\tooltest
- ::Handle the expected file and the actual output file
- ::ln is the total line numbers to be deleted from the actual output
- set ln=1
- ::ln_exp is the total line numbers to be deleted from the expected output
- set ln_exp=4
-
- :: NOTE1
- ::Set some variables to contain .h5 file and its path for convenience
- ::When you add new h5diff tests, check if the .h5 files is inside this for loop.
- ::For example, if you will add a new h5diff test using hdf5\tools\testfiles\file9.h5
- ::You need to add "9" after 8 or somewhere inside the ()
- for %%v in (1 2 3 4 5 6 7 8) do set file%%v=..\..\testfiles\file%%v.h5
-
- ::Create the file to contain the tests output
- type nul > %tempResults%
-
- ::Change directory to the directory where the .exe file is located
- cd h5diff%p2%\%p1%
-
-::*********************************************
-:: Test each function by calling TOOLTEST.BAT
-::*********************************************
-::USAGE of difftest.bat
-::1. Set flag
-::2. Call batch file tooltest.bat followed with the expected file name
-::3. Example
-::If we want to test h5diff ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 g1/dset1 g1/dset2
-::At first, we need to set the flag like
-::set flag=%file1% %file2% g1/dset1 g1/dset2
-::Secondly, we call batch file tooltest.bat by
-::call %tooltest% h5diff_12.txt
-
-echo.
-echo.****************************************************
-echo. H5diff%2 %1 T E S T S
-echo.****************************************************
-
-::--------------
-::Common usage
-::--------------
-
-::1.0
-set flag=-h
-call %tooltest% h5diff_10.txt
-
-::1.1 normal mode
-set flag=%file1% %file2%
-call %tooltest% h5diff_11.txt
-
-::1.2 normal mode with objects
-set flag=%file1% %file2% g1/dset1 g1/dset2
-call %tooltest% h5diff_12.txt
-
-::1.3 report mode
-set flag=%file1% %file2% -r
-call %tooltest% h5diff_13.txt
-
-::1.4 report mode with objects
-set flag=%file1% %file2% -r g1/dset1 g1/dset2
-call %tooltest% h5diff_14.txt
-
-::1.5 with -d
-set flag=%file1% %file2% -r -d 5 g1/dset3 g1/dset4
-call %tooltest% h5diff_15.txt
-
-::1.6 with -p
-set flag=%file1% %file2% -r -p 0.05 g1/dset3 g1/dset4
-call %tooltest% h5diff_16.txt
-
-::1.7 verbose mode
-set flag=%file1% %file2% -v
-call %tooltest% h5diff_17.txt
-
-::1.8 quiet mode
-set flag=%file1% %file2% -q
-call %tooltest% h5diff_18.txt
-
-::#1.9.1 with -p (int)
-set flag=%file1% %file1% -v -p 0.02 g1/dset5 g1/dset6
-call %tooltest% h5diff_191.txt
-
-::#1.9.2 with -p (unsigned long_long)
-set flag=%file1% %file1% -v -p 0.02 g1/dset7 g1/dset8
-call %tooltest% h5diff_192.txt
-
-::---------------------
-::Not Comparable Types
-::---------------------
-
-::2.0
-set flag=%file3% %file3% -v dset g1
-call %tooltest% h5diff_20.txt
-
-::2.1
-set flag=%file3% %file3% -v dset l1
-call %tooltest% h5diff_21.txt
-
-
-::2.2
-set flag=%file3% %file3% -v dset t1
-call %tooltest% h5diff_22.txt
-
-
-::2.3
-set flag=%file3% %file3% -v g1 g1
-call %tooltest% h5diff_23.txt
-
-::2.4
-set flag=%file3% %file3% -v t1 t1
-call %tooltest% h5diff_24.txt
-
-::2.5
-set flag=%file3% %file3% -v l1 l1
-call %tooltest% h5diff_25.txt
-
-::2.6
-set flag=%file3% %file3% -v g1 g2
-call %tooltest% h5diff_26.txt
-
-::2.7
-set flag=%file3% %file3% -v t1 t2
-call %tooltest% h5diff_27.txt
-
-::2.8
-set flag=%file3% %file3% -v l1 l2
-call %tooltest% h5diff_28.txt
-
-
-
-::-------------
-:: Dataset types
-:: -------------
-
-::5.0
-set flag=%file4% %file4% -v dset0a dset0b
-call %tooltest% h5diff_50.txt
-
-
-::5.1
-set flag=%file4% %file4% -v dset1a dset1b
-call %tooltest% h5diff_51.txt
-
-
-::5.2
-set flag=%file4% %file4% -v dset2a dset2b
-call %tooltest% h5diff_52.txt
-
-
-::5.3
-set flag=%file4% %file4% -v dset3a dset4b
-call %tooltest% h5diff_53.txt
-
-
-::5.4
-set flag=%file4% %file4% -v dset4a dset4b
-call %tooltest% h5diff_54.txt
-
-
-::5.5
-set flag=%file4% %file4% -v dset5a dset5b
-call %tooltest% h5diff_55.txt
-
-
-::5.6
-set flag=%file4% %file4% -v dset6a dset6b
-call %tooltest% h5diff_56.txt
-
-
-::5.7
-set flag=%file4% %file4% -v dset7a dset7b
-call %tooltest% h5diff_57.txt
-
-
-::5.8 long_long test; different format of long_long print in Linux and IRIX
-set flag=%file4% %file4% dset8a dset8b
-call %tooltest% h5diff_58.txt SKIP
-
-:: --------------
-:: Error messages
-:: --------------
-
-::6.0: Check if the command line number of arguments is less than 3
-set flag=%file1%
-call %tooltest% h5diff_600.txt
-
-::6.1: Check for invalid options
-set flag=%file1% %file2% -x
-call %tooltest% h5diff_601.txt
-
-:: ----
-:: -d
-:: ----
-
-::6.2: no value
-set flag=%file1% %file2% -d g1/dset3 g1/dset4
-call %tooltest% h5diff_602.txt
-
-
-::6.3: negative value
-set flag=%file1% %file2% -d -4 g1/dset3 g1/dset4
-call %tooltest% h5diff_603.txt
-
-
-::6.4: zero
-set flag=%file1% %file2% -d 0 g1/dset3 g1/dset4
-call %tooltest% h5diff_604.txt
-
-
-::6.5: non number
-set flag=%file1% %file2% -d u g1/dset3 g1/dset4
-call %tooltest% h5diff_605.txt
-
-
-::6.6: hexadecimal
-set flag=%file1% %file2% -d 0x1 g1/dset3 g1/dset4
-call %tooltest% h5diff_606.txt
-
-
-::6.7: string
-set flag=%file1% %file2% -d "1" g1/dset3 g1/dset4
-call %tooltest% h5diff_607.txt
-
-
-::6.8: repeated option
-set flag=%file1% %file2% -d 1 -d 2 g1/dset3 g1/dset4
-call %tooltest% h5diff_608.txt
-
-
-::6.9: number larger than biggest difference
-set flag=%file1% %file2% -d 200 g1/dset3 g1/dset4
-call %tooltest% h5diff_609.txt
-
-
-::6.10: number smaller than smallest difference
-set flag=%file1% %file2% -d 1 g1/dset3 g1/dset4
-call %tooltest% h5diff_610.txt
-
-::---
-::-p
-::---
-
-
-::6.11: no value
-set flag=%file1% %file2% -r -p g1/dset3 g1/dset4
-call %tooltest% h5diff_611.txt
-
-
-
-::6.12: negative value
-set flag=%file1% %file2% -p -4 g1/dset3 g1/dset4
-call %tooltest% h5diff_612.txt
-
-
-
-::6.13: zero
-set flag=%file1% %file2% -p 0 g1/dset3 g1/dset4
-call %tooltest% h5diff_613.txt
-
-
-
-::6.14: non number
-set flag=%file1% %file2% -p u g1/dset3 g1/dset4
-call %tooltest% h5diff_614.txt
-
-
-::6.15: hexadecimal
-set flag=%file1% %file2% -p 0x1 g1/dset3 g1/dset4
-call %tooltest% h5diff_615.txt
-
-
-::6.16: string
-set flag=%file1% %file2% -p "0.21" g1/dset3 g1/dset4
-call %tooltest% h5diff_616.txt
-
-
-::6.17: repeated option
-set flag=%file1% %file2% -p 0.21 -p 0.22 g1/dset3 g1/dset4
-call %tooltest% h5diff_617.txt
-
-
-::6.18: number larger than biggest difference
-set flag=%file1% %file2% -p 2 g1/dset3 g1/dset4
-call %tooltest% h5diff_618.txt
-
-
-::6.19: number smaller than smallest difference
-set flag=%file1% %file2% -p 0.005 g1/dset3 g1/dset4
-call %tooltest% h5diff_619.txt
-
-
-::---
-::-n
-::---
-
-::6.20: no value
-set flag=%file1% %file2% -n g1/dset3 g1/dset4
-call %tooltest% h5diff_620.txt
-
-
-::6.21: negative value
-set flag=%file1% %file2% -n -4 g1/dset3 g1/dset4
-call %tooltest% h5diff_621.txt
-
-
-::6.22: zero
-set flag=%file1% %file2% -n 0 g1/dset3 g1/dset4
-call %tooltest% h5diff_622.txt
-
-
-::6.23: non number
-set flag=%file1% %file2% -n u g1/dset3 g1/dset4
-call %tooltest% h5diff_623.txt
-
-
-::6.24: hexadecimal
-set flag=%file1% %file2% -n 0x1 g1/dset3 g1/dset4
-call %tooltest% h5diff_624.txt
-
-
-::6.25: string
-set flag=%file1% %file2% -n "2" g1/dset3 g1/dset4
-call %tooltest% h5diff_625.txt
-
-
-
-::6.26: repeated option
-set flag=%file1% %file2% -n 2 -n 3 g1/dset3 g1/dset4
-call %tooltest% h5diff_626.txt
-
-
-::6.27: number larger than biggest difference
-set flag=%file1% %file2% -n 200 g1/dset3 g1/dset4
-call %tooltest% h5diff_627.txt
-
-
-::6.28: number smaller than smallest difference
-set flag=%file1% %file2% -n 1 g1/dset3 g1/dset4
-call %tooltest% h5diff_628.txt
-
-
-::6.29: non valid %files
-
-set flag=file1.h6 file2.h6
-call %tooltest% h5diff_629.txt
-
-::--------------
-::7. attributes
-::--------------
-
-set flag=%file5% %file6% -v
-call %tooltest% h5diff_70.txt
-
-
-::-------------------------
-::8. all dataset datatypes
-::-------------------------
-
-set flag=%file7% %file8% -v
-call %tooltest% h5diff_80.txt
-
-
-::-----------------------------
-::9. compare a %file with itself
-::-----------------------------
-
-set flag=%file1% %file1%
-call %tooltest% h5diff_90.txt
-
-::Change directory to hdf5\tools
-cd ..\..
-
-::Check if any of tests failed or skiped for the time being
-echo.
-if "%totalerr%"=="0" (
-echo. All of the %exefile% %p1% Tests Passed!
-echo. All of the %exefile% %p1% Tests Passed! >> %tempResults%
-) else (
-echo. %exefile% %p1% Tests Finished with %totalerr% Errors!
-echo. %exefile% %p1% Tests Finished with %totalerr% Errors!>> %tempResults%
-)
-
-if not "%totalskip%"=="0" (
-echo. %totalskip% Tests in total Skiped! >> %tempResults%
-echo. %totalskip% Tests in total Skiped!
-find "SKIPED" %tempResults% | more +2
-)
-
-::NOTE1 CLEAN
-::Clean up Environment Variables
-for %%i in (p1 p2 tempResults exefile tooltest ln ln_exp totalskip totalerr) do set %%i=
-for %%v in (1 2 3 4 5 6 7 8) do set file%%v=
-set flag=
-
-::Clean up Temporary Files
-rmdir /s/q temptest
-
-
+@REM Copyright by the Board of Trustees of the University of Illinois.
+@REM All rights reserved.
+@REM
+@REM This file is part of HDF5. The full HDF5 copyright notice, including
+@REM terms governing use, modification, and redistribution, is contained in
+@REM the files COPYING and Copyright.html. COPYING can be found at the root
+@REM of the source code distribution tree; Copyright.html can be found at the
+@REM root level of an installed copy of the electronic HDF5 document set and
+@REM is linked from the top-level documents page. It can also be found at
+@REM http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have
+@REM access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+
+@echo off
+
+::This batch file is for h5diff tests.
+::Usage
+:: difftest release -- release static version
+:: difftest debug -- debug static version
+:: difftest release dll -- release dll version
+:: difftest debug dll -- debug dll version
+:: Written By: Fang GUO
+:: Date : Jan. 12, 2006
+
+:: Track total number of testing errors
+ set /A totalerr=0
+ set /A totalskip=0
+
+::**********************************************
+:: Generate a new temp directory for test h5diff
+::**********************************************
+
+:: Make a tempory directory for difftest
+ mkdir temptest
+
+::****************************************************
+:: Set the Environment Variables & Change Dir to .EXE
+::****************************************************
+
+ :: The first incoming parameter should be configuration (debug or release)
+ set p1=%1
+ :: The second parameter should be the types of library (dll or blank)
+ set p2=%2
+
+ :: Set up some variables for convenience
+ :: tempResults will contain the tests results temporarily
+ set tempResults=difftest%p2%_%p1%.txt
+ :: exefile will contain the file name of the executable file
+ set exefile=h5diff%p2%
+ :: tooltest is the sub-batch file which will be called by tool test
+ set tooltest=..\..\tooltest
+ ::Handle the expected file and the actual output file
+ ::ln is the total line numbers to be deleted from the actual output
+ set ln=1
+ ::ln_exp is the total line numbers to be deleted from the expected output
+ set ln_exp=4
+
+ :: NOTE1
+ ::Set some variables to contain .h5 file and its path for convenience
+ ::When you add new h5diff tests, check if the .h5 files is inside this for loop.
+ ::For example, if you will add a new h5diff test using hdf5\tools\testfiles\file9.h5
+ ::You need to add "9" after 8 or somewhere inside the ()
+ for %%v in (1 2 3 4 5 6 7 8) do set file%%v=..\..\testfiles\file%%v.h5
+
+ ::Create the file to contain the tests output
+ type nul > %tempResults%
+
+ ::Change directory to the directory where the .exe file is located
+ cd h5diff%p2%\%p1%
+
+::*********************************************
+:: Test each function by calling TOOLTEST.BAT
+::*********************************************
+::USAGE of difftest.bat
+::1. Set flag
+::2. Call batch file tooltest.bat followed with the expected file name
+::3. Example
+::If we want to test h5diff ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 g1/dset1 g1/dset2
+::At first, we need to set the flag like
+::set flag=%file1% %file2% g1/dset1 g1/dset2
+::Secondly, we call batch file tooltest.bat by
+::call %tooltest% h5diff_12.txt
+
+echo.
+echo.****************************************************
+echo. H5diff%2 %1 T E S T S
+echo.****************************************************
+
+::--------------
+::Common usage
+::--------------
+
+::1.0
+set flag=-h
+call %tooltest% h5diff_10.txt
+
+::1.1 normal mode
+set flag=%file1% %file2%
+call %tooltest% h5diff_11.txt
+
+::1.2 normal mode with objects
+set flag=%file1% %file2% g1/dset1 g1/dset2
+call %tooltest% h5diff_12.txt
+
+::1.3 report mode
+set flag=%file1% %file2% -r
+call %tooltest% h5diff_13.txt
+
+::1.4 report mode with objects
+set flag=%file1% %file2% -r g1/dset1 g1/dset2
+call %tooltest% h5diff_14.txt
+
+::1.5 with -d
+set flag=%file1% %file2% -r -d 5 g1/dset3 g1/dset4
+call %tooltest% h5diff_15.txt
+
+::1.6 with -p
+set flag=%file1% %file2% -r -p 0.05 g1/dset3 g1/dset4
+call %tooltest% h5diff_16.txt
+
+::1.7 verbose mode
+set flag=%file1% %file2% -v
+call %tooltest% h5diff_17.txt
+
+::1.8 quiet mode
+set flag=%file1% %file2% -q
+call %tooltest% h5diff_18.txt
+
+::#1.9.1 with -p (int)
+set flag=%file1% %file1% -v -p 0.02 g1/dset5 g1/dset6
+call %tooltest% h5diff_191.txt
+
+::#1.9.2 with -p (unsigned long_long)
+set flag=%file1% %file1% -v -p 0.02 g1/dset7 g1/dset8
+call %tooltest% h5diff_192.txt
+
+::---------------------
+::Not Comparable Types
+::---------------------
+
+::2.0
+set flag=%file3% %file3% -v dset g1
+call %tooltest% h5diff_20.txt
+
+::2.1
+set flag=%file3% %file3% -v dset l1
+call %tooltest% h5diff_21.txt
+
+
+::2.2
+set flag=%file3% %file3% -v dset t1
+call %tooltest% h5diff_22.txt
+
+
+::2.3
+set flag=%file3% %file3% -v g1 g1
+call %tooltest% h5diff_23.txt
+
+::2.4
+set flag=%file3% %file3% -v t1 t1
+call %tooltest% h5diff_24.txt
+
+::2.5
+set flag=%file3% %file3% -v l1 l1
+call %tooltest% h5diff_25.txt
+
+::2.6
+set flag=%file3% %file3% -v g1 g2
+call %tooltest% h5diff_26.txt
+
+::2.7
+set flag=%file3% %file3% -v t1 t2
+call %tooltest% h5diff_27.txt
+
+::2.8
+set flag=%file3% %file3% -v l1 l2
+call %tooltest% h5diff_28.txt
+
+
+
+::-------------
+:: Dataset types
+:: -------------
+
+::5.0
+set flag=%file4% %file4% -v dset0a dset0b
+call %tooltest% h5diff_50.txt
+
+
+::5.1
+set flag=%file4% %file4% -v dset1a dset1b
+call %tooltest% h5diff_51.txt
+
+
+::5.2
+set flag=%file4% %file4% -v dset2a dset2b
+call %tooltest% h5diff_52.txt
+
+
+::5.3
+set flag=%file4% %file4% -v dset3a dset4b
+call %tooltest% h5diff_53.txt
+
+
+::5.4
+set flag=%file4% %file4% -v dset4a dset4b
+call %tooltest% h5diff_54.txt
+
+
+::5.5
+set flag=%file4% %file4% -v dset5a dset5b
+call %tooltest% h5diff_55.txt
+
+
+::5.6
+set flag=%file4% %file4% -v dset6a dset6b
+call %tooltest% h5diff_56.txt
+
+
+::5.7
+set flag=%file4% %file4% -v dset7a dset7b
+call %tooltest% h5diff_57.txt
+
+
+::5.8 long_long test; different format of long_long print in Linux and IRIX
+set flag=%file4% %file4% dset8a dset8b
+call %tooltest% h5diff_58.txt SKIP
+
+:: --------------
+:: Error messages
+:: --------------
+
+::6.0: Check if the command line number of arguments is less than 3
+set flag=%file1%
+call %tooltest% h5diff_600.txt
+
+::6.1: Check for invalid options
+set flag=%file1% %file2% -x
+call %tooltest% h5diff_601.txt
+
+:: ----
+:: -d
+:: ----
+
+::6.2: no value
+set flag=%file1% %file2% -d g1/dset3 g1/dset4
+call %tooltest% h5diff_602.txt
+
+
+::6.3: negative value
+set flag=%file1% %file2% -d -4 g1/dset3 g1/dset4
+call %tooltest% h5diff_603.txt
+
+
+::6.4: zero
+set flag=%file1% %file2% -d 0 g1/dset3 g1/dset4
+call %tooltest% h5diff_604.txt
+
+
+::6.5: non number
+set flag=%file1% %file2% -d u g1/dset3 g1/dset4
+call %tooltest% h5diff_605.txt
+
+
+::6.6: hexadecimal
+set flag=%file1% %file2% -d 0x1 g1/dset3 g1/dset4
+call %tooltest% h5diff_606.txt
+
+
+::6.7: string
+set flag=%file1% %file2% -d "1" g1/dset3 g1/dset4
+call %tooltest% h5diff_607.txt
+
+
+::6.8: repeated option
+set flag=%file1% %file2% -d 1 -d 2 g1/dset3 g1/dset4
+call %tooltest% h5diff_608.txt
+
+
+::6.9: number larger than biggest difference
+set flag=%file1% %file2% -d 200 g1/dset3 g1/dset4
+call %tooltest% h5diff_609.txt
+
+
+::6.10: number smaller than smallest difference
+set flag=%file1% %file2% -d 1 g1/dset3 g1/dset4
+call %tooltest% h5diff_610.txt
+
+::---
+::-p
+::---
+
+
+::6.11: no value
+set flag=%file1% %file2% -r -p g1/dset3 g1/dset4
+call %tooltest% h5diff_611.txt
+
+
+
+::6.12: negative value
+set flag=%file1% %file2% -p -4 g1/dset3 g1/dset4
+call %tooltest% h5diff_612.txt
+
+
+
+::6.13: zero
+set flag=%file1% %file2% -p 0 g1/dset3 g1/dset4
+call %tooltest% h5diff_613.txt
+
+
+
+::6.14: non number
+set flag=%file1% %file2% -p u g1/dset3 g1/dset4
+call %tooltest% h5diff_614.txt
+
+
+::6.15: hexadecimal
+set flag=%file1% %file2% -p 0x1 g1/dset3 g1/dset4
+call %tooltest% h5diff_615.txt
+
+
+::6.16: string
+set flag=%file1% %file2% -p "0.21" g1/dset3 g1/dset4
+call %tooltest% h5diff_616.txt
+
+
+::6.17: repeated option
+set flag=%file1% %file2% -p 0.21 -p 0.22 g1/dset3 g1/dset4
+call %tooltest% h5diff_617.txt
+
+
+::6.18: number larger than biggest difference
+set flag=%file1% %file2% -p 2 g1/dset3 g1/dset4
+call %tooltest% h5diff_618.txt
+
+
+::6.19: number smaller than smallest difference
+set flag=%file1% %file2% -p 0.005 g1/dset3 g1/dset4
+call %tooltest% h5diff_619.txt
+
+
+::---
+::-n
+::---
+
+::6.20: no value
+set flag=%file1% %file2% -n g1/dset3 g1/dset4
+call %tooltest% h5diff_620.txt
+
+
+::6.21: negative value
+set flag=%file1% %file2% -n -4 g1/dset3 g1/dset4
+call %tooltest% h5diff_621.txt
+
+
+::6.22: zero
+set flag=%file1% %file2% -n 0 g1/dset3 g1/dset4
+call %tooltest% h5diff_622.txt
+
+
+::6.23: non number
+set flag=%file1% %file2% -n u g1/dset3 g1/dset4
+call %tooltest% h5diff_623.txt
+
+
+::6.24: hexadecimal
+set flag=%file1% %file2% -n 0x1 g1/dset3 g1/dset4
+call %tooltest% h5diff_624.txt
+
+
+::6.25: string
+set flag=%file1% %file2% -n "2" g1/dset3 g1/dset4
+call %tooltest% h5diff_625.txt
+
+
+
+::6.26: repeated option
+set flag=%file1% %file2% -n 2 -n 3 g1/dset3 g1/dset4
+call %tooltest% h5diff_626.txt
+
+
+::6.27: number larger than biggest difference
+set flag=%file1% %file2% -n 200 g1/dset3 g1/dset4
+call %tooltest% h5diff_627.txt
+
+
+::6.28: number smaller than smallest difference
+set flag=%file1% %file2% -n 1 g1/dset3 g1/dset4
+call %tooltest% h5diff_628.txt
+
+
+::6.29: non valid %files
+
+set flag=file1.h6 file2.h6
+call %tooltest% h5diff_629.txt
+
+::--------------
+::7. attributes
+::--------------
+
+set flag=%file5% %file6% -v
+call %tooltest% h5diff_70.txt
+
+
+::-------------------------
+::8. all dataset datatypes
+::-------------------------
+
+set flag=%file7% %file8% -v
+call %tooltest% h5diff_80.txt
+
+
+::-----------------------------
+::9. compare a %file with itself
+::-----------------------------
+
+set flag=%file1% %file1%
+call %tooltest% h5diff_90.txt
+
+::Change directory to hdf5\tools
+cd ..\..
+
+::Check if any of tests failed or skiped for the time being
+echo.
+if "%totalerr%"=="0" (
+echo. All of the %exefile% %p1% Tests Passed!
+echo. All of the %exefile% %p1% Tests Passed! >> %tempResults%
+) else (
+echo. %exefile% %p1% Tests Finished with %totalerr% Errors!
+echo. %exefile% %p1% Tests Finished with %totalerr% Errors!>> %tempResults%
+)
+
+if not "%totalskip%"=="0" (
+echo. %totalskip% Tests in total Skiped! >> %tempResults%
+echo. %totalskip% Tests in total Skiped!
+find "SKIPED" %tempResults% | more +2
+)
+
+::NOTE1 CLEAN
+::Clean up Environment Variables
+for %%i in (p1 p2 tempResults exefile tooltest ln ln_exp totalskip totalerr) do set %%i=
+for %%v in (1 2 3 4 5 6 7 8) do set file%%v=
+set flag=
+
+::Clean up Temporary Files
+rmdir /s/q temptest
+
+
diff --git a/windows/tools/dumptest.bat b/windows/tools/dumptest.bat
index ea21fc3..4c400b3 100755
--- a/windows/tools/dumptest.bat
+++ b/windows/tools/dumptest.bat
@@ -1,659 +1,659 @@
-@REM Copyright by the Board of Trustees of the University of Illinois.
-@REM All rights reserved.
-@REM
-@REM This file is part of HDF5. The full HDF5 copyright notice, including
-@REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html. COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page. It can also be found at
-@REM http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have
-@REM access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-
-@echo off
-
-::This batch file is for h5dump general and xml tests.
-::Usage
-:: dumptest release -- release static version
-:: dumptest debug -- debug static version
-:: dumptest release dll -- release dll version
-:: dumptest debug dll -- debug dll version
-:: Written By: Fang GUO
-:: Date : Jan. 12, 2006
-
-
-:: Track total number of testing errors
- set /A totalerr=0
- set /A totalskip=0
-
-
-::*******************************************************
-:: Generate a new temp directory for test h5dump
-::*******************************************************
- :: Make a temporary directory for h5dump test
- mkdir temptest
-
-::******************************************************************
-:: Set the Environment Variables & Change Dir to Dir with h5dump.EXE
-::******************************************************************
-
- :: The first incoming parameter should be configuration (debug or release)
- set p1=%1
- :: The second parameter should be the types of library (dll or blank)
- set p2=%2
-
- :: Before comparison between expected file and the actual outputfile,
- :: Ignore the first line in actual outputfile and the first four lines
- :: in the expected output file
-
- set ln=1
- set ln_exp=4
-
- :: Save the tests output into a temporary file
- set tempResults=dumptest%2_%1.txt
- type nul > %tempResults%
-
- :: Define the .exe file based on the second parameter
- set exefile=h5dump%p2%
-
- :: For convenience, set a variable for the sub batch file
- set tooltest=..\..\tooltest
-
- :: For convenience, set variable for all testfiles/*.h5 files
- for %%i in (testfiles\t*.h5) do set %%~ni=..\..\%%i
-
- :: Special cases: the following are not .h5 files but needed in the tests
- for %%i in (tsplit_file tmulti) do (
- set %%i=..\..\testfiles\%%i
- )
-
- :: Havn't find a way to use % inside a variable name
- set tfamily05d=..\..\testfiles\tfamily%%05d.h5
-
- :: Change the directory to dir including .exe file
- cd h5dump%p2%\%p1%
-
-::Test h5dump with different options
-
-echo.****************************************************
-echo. h5dump%2 %1 T E S T S
-echo.****************************************************
-
-::--------------------------
-::test for displaying groups
-::--------------------------
-set flag=%tgroup%
-call %tooltest% tgroup-1.ddl
-
-::---------------------------------------
-::test for displaying the selected groups
-::---------------------------------------
-set flag=--group=/g2 --group / -g /y %tgroup%
-call %tooltest% tgroup-2.ddl
-
-:: -----------------------------------------
-:: test for displaying simple space datasets
-::------------------------------------------
-set flag=%tdset%
-call %tooltest% tdset-1.ddl
-
-::--------------------------------------
-::test for displaying selected datasets
-::--------------------------------------
-set flag=-H -d dset1 -d /dset2 --dataset=dset3 %tdset%
-call %tooltest% tdset-2.ddl
-
-::------------------------------
-::test for displaying attributes
-::------------------------------
-set flag=%tattr%
-call %tooltest% tattr-1.ddl
-
-::---------------------------------------------------------------------------
-::test for displaying the selected attributes of string type and scalar space
-::---------------------------------------------------------------------------
-set flag=-a /attr1 --attribute /attr4 --attribute=/attr5 %tattr%
-call %tooltest% tattr-2.ddl
-
-::----------------------------------
-::test for header and error messages
-::----------------------------------
-set flag=--header -a /attr2 --attribute=/attr %tattr%
-call %tooltest% tattr-3.ddl
-
-::-----------------------------------------------------------------------------
-::test for displaying attributes in shared datatype (also in group and dataset)
-::-----------------------------------------------------------------------------
-set flag=%tnamed_dtype_attr%
-call %tooltest% tnamed_dtype_attr.ddl
-
-::------------------------------
-::test for displaying soft links
-::------------------------------
-set flag=%tslink%
-call %tooltest% tslink-1.ddl
-
-::-------------------------------------
-::test for displaying the selected link
-::-------------------------------------
-set flag=-l slink2 %tslink%
-call %tooltest% tslink-2.ddl
-
-::--------------------
-::tests for hard links
-::--------------------
-set flag=%thlink%
-call %tooltest% thlink-1.ddl
-
-set flag=-d /g1/dset2 --dataset /dset1 --dataset=/g1/g1.1/dset3 %thlink%
-call %tooltest% thlink-2.ddl
-
-set flag=-d /g1/g1.1/dset3 --dataset /g1/dset2 --dataset=/dset1 %thlink%
-call %tooltest% thlink-3.ddl
-
-set flag=-g /g1 %thlink%
-call %tooltest% thlink-4.ddl
-
-set flag=-d /dset1 -g /g2 -d /g1/dset2 %thlink%
-call %tooltest% thlink-5.ddl
-
-::-----------------------------
-::tests for compound data types
-::-----------------------------
-set flag=%tcompound%
-call %tooltest% tcomp-1.ddl
-
-::-------------------------
-::test for named data types
-::-------------------------
-set flag=-t /type1 --datatype /type2 --datatype=/group1/type3 %tcompound%
-call %tooltest% tcomp-2.ddl
-
-::--------------------
-::test for unamed type
-::--------------------
-set flag=-t /#6632:0 -g /group2 %tcompound%
-call %tooltest% tcomp-3.ddl
-
-::----------------------------------
-::test complicated compound datatype
-::----------------------------------
-set flag=%tcompound_complex%
-call %tooltest% tcomp-4.ddl
-
-::---------------------------------
-::test for the nested compound type
-::---------------------------------
-set flag=%tnestedcomp%
-call %tooltest% tnestcomp-1.ddl
-
-::----------------
-::test for options
-::----------------
-set flag=%tall%
-call %tooltest% tall-1.ddl
-
-set flag=--header -g /g1/g1.1 -a attr2 %tall%
-call %tooltest% tall-2.ddl
-
-set flag=-d /g2/dset2.1 -l /g1/g1.2/g1.2.1/slink %tall%
-call %tooltest% tall-3.ddl
-
-::------------------------
-::test for loop detection
-::------------------------
-set flag=%tloop%
-call %tooltest% tloop-1.ddl
-
-::---------------
-::test for string
-::---------------
-set flag=%tstr%
-call %tooltest% tstr-1.ddl
-
-set flag=%tstr2%
-call %tooltest% tstr-2.ddl
-
-::-------------------------------------
-::test for file created by Lib SAF team
-::-------------------------------------
-set flag=%tsaf%
-call %tooltest% tsaf.ddl
-
-::---------------------------------------
-::test for file with variable length data
-::---------------------------------------
-set tvldtypes=..\..\testfiles\tvldtypes
-for %%v in (1 2 3 4 5) do (
-set flag=%tvldtypes%%%v.h5
-call %tooltest% tvldtypes%%v.ddl
-)
-set tvldtypes=
-
-::----------------------------------------------
-::test for file with variable length string data
-::----------------------------------------------
-set flag=%tvlstr%
-call %tooltest% tvlstr.ddl
-
-::------------------------------
-::test for files with array data
-::------------------------------
-set tarray=..\..\testfiles\tarray
-for /L %%v in (1,1,7) do (
-set flag=%tarray%%%v%.h5
-call %tooltest% tarray%%v.ddl
-)
-set tarray=
-
-::------------------------------
-::test for files with empty data
-::------------------------------
-set flag=%tempty%
-call %tooltest% tempty.ddl
-
-::---------------------------------------------
-::test for files with groups that have comments
-::---------------------------------------------
-set flag=%tgrp_comments%
-call %tooltest% tgrp_comments.ddl
-
-::---------------------------
-::test the --filedriver flag
-::---------------------------
-set flag=--filedriver=split %tsplit_file%
-call %tooltest% tsplit_file.ddl
-
-::Special: Find a way to echo environment
-set flag=--filedriver=family %tfamily05d%
-call %tooltest% tfamily.ddl
-
-set flag=--filedriver=multi %tmulti%
-call %tooltest% tmulti.ddl
-
-::----------------------------------------------------------------
-::test for files with group names which reach > 1024 bytes in size
-::----------------------------------------------------------------
-set flag=-w157 %tlarge_objname%
-call %tooltest% tlarge_objname.ddl
-
-::-------------------------------------------
-::test '-A' to suppress data but print attr's
-::-------------------------------------------
-set flag=-A %tall%
-call %tooltest% tall-2A.ddl
-
-::---------------------------------------------------------
-::test '-r' to print attributes in ASCII instead of decimal
-::---------------------------------------------------------
-set flag=-A -r %tall%
-call %tooltest% tall-2B.ddl
-
-::---------------
-::test Subsetting
-::---------------
-set flag=--dataset=/g1/g1.1/dset1.1.1 --start=1,1 --stride=2,3 --count=3,2 --block=1,1 %tall%
-call %tooltest% tall-4s.ddl
-
-::set flag=-d "/g1/g1.1/dset1.1.2[0;2;10;]" %tall%
-::call %tooltest% tall-5s.ddl
-
-::set flag=-d "/dset1[1,1;;;]" %tdset%
-::call %tooltest% tdset-3s.ddl
-
-::set flag=-d "/dset1[;3,2;4,4;1,4]" %tdset2%
-::call %tooltest% tdset2-1s.ddl
-
-::----------------------------------------------------
-::test printing characters in ASCII instead of decimal
-::----------------------------------------------------
-set flag=-r %tchar%
-call %tooltest% tchar1.ddl
-
-::---------------------
-::test failure handling
-::---------------------
-
-::1. Missing file name
-set flag=
-call %tooltest% tnofilename.ddl
-
-:: rev. 2004
-
-::---------------------
-::tests for super block
-::---------------------
-set flag=-H -B -d dset %tfcontents1%
-call %tooltest% tboot1.ddl
-
-set flag=-B %tfcontents2%
-call %tooltest% tboot2.ddl
-
-::------------------------------------
-:: test -p with a non existing dataset
-::------------------------------------
-set flag=-p -d bogus %tfcontents1%
-call %tooltest% tperror.ddl
-
-::----------------------
-::test for file contents
-::----------------------
-set flag=-n %tfcontents1%
-call %tooltest% tcontents.ddl
-
-::-------------------------
-::tests for storage layout
-::-------------------------
-
-for %%v in (compact chunked external) do (
-set flag=-H -p -d %%v %tfilters%
-call %tooltest% t%%v.ddl
-)
-
-::contiguous (tcontiguos.ddl or tcontiguous.ddl)
-set flag=-H -p -d contiguous %tfilters%
-call %tooltest% tcontiguos.ddl
-
-::-----------
-::fill values
-::-----------
-set flag=-p %tfvalues%
-call %tooltest% tfill.ddl
-
-::-----------------------------------------------
-::several datatype, with references , print path
-::-----------------------------------------------
-set flag=%tattr2%
-call %tooltest% treference.ddl
-
-::------------------------------------------
-::escape/not escape non printable characters
-::------------------------------------------
-set flag=-e %tstr3%
-call %tooltest% tstringe.ddl
-
-set flag=%tstr3%
-call %tooltest% tstring.ddl
-
-::----------------------------------
-::char data as ASCII with non escape
-::----------------------------------
-set flag=-r -d str4 %tstr3%
-call %tooltest% tstring2.ddl
-
-::-----------------------------
-::array indices print/not print
-::-----------------------------
-set flag=%taindices%
-call %tooltest% tindicesyes.ddl
-
-set flag=-y %taindices%
-call %tooltest% tindicesno.ddl
-
-::-----------------
-::tests for filters
-::-----------------
-
-:: SZIP
-set flag=-H -p -d szip %tfilters%
-call %tooltest% tszip.ddl szip
-
-::deflate
-set flag=-H -p -d deflate %tfilters%
-call %tooltest% tdeflate.ddl zlib
-
-::shuffle
-set flag=-H -p -d shuffle %tfilters%
-call %tooltest% tshuffle.ddl
-
-::fletcher32
-set flag=-H -p -d fletcher32 %tfilters%
-call %tooltest% tfletcher32.ddl
-
-::nbit
-set flag=-H -p -d nbit %tfilters%
-call %tooltest% tnbit.ddl
-
-::scaleoffset
-set flag=-H -p -d scaleoffset %tfilters%
-call %tooltest% tscaleoffset.ddl
-
-::all
-set flag=-H -p -d all %tfilters%
-call %tooltest% tallfilters.ddl zlib szip
-
-::user defined
-set flag=-H -p -d myfilter %tfilters%
-call %tooltest% tuserfilter.ddl
-
-::test for displaying dataset and attribute of null space
-set flag=%tnullspace%
-call %tooltest% tnullspace.ddl
-
-::test for displaying objects with very long names
-set flag=%tlonglinks%
-call %tooltest% tlonglinks.ddl
-
-::test for long double (Some systems do not have long double)
-set flag=%tldouble%
-call %tooltest% tldouble.ddl SKIP
-
-::Test for vms
-set flag=%tvms%
-call %tooltest% tvms.ddl
-
-echo.
-echo.****************************************************
-echo. h5dump%2 %1 XML T E S T S
-echo.****************************************************
-
-::test XML
-set flag=--xml %tall%
-call %tooltest% tall.h5.xml
-
-set flag=--xml %tattr%
-call %tooltest% tattr.h5.xml
-
-set flag=--xml %tbitfields%
-call %tooltest% tbitfields.h5.xml
-
-set flag=--xml %tcompound%
-call %tooltest% tcompound.h5.xml
-
-set flag=--xml %tcompound2%
-call %tooltest% tcompound2.h5.xml
-
-set flag=--xml %tdatareg%
-call %tooltest% tdatareg.h5.xml
-
-set flag=--xml %tdset%
-call %tooltest% tdset.h5.xml
-
-set flag=--xml %tdset2%
-call %tooltest% tdset2.h5.xml
-
-set flag=--xml %tenum%
-call %tooltest% tenum.h5.xml
-
-set flag=--xml %tgroup%
-call %tooltest% tgroup.h5.xml
-
-set flag=--xml %thlink%
-call %tooltest% thlink.h5.xml SKIP
-
-set flag=--xml %tloop%
-call %tooltest% tloop.h5.xml
-
-set flag=--xml %tloop2%
-call %tooltest% tloop2.h5.xml
-
-set flag=--xml %tmany%
-call %tooltest% tmany.h5.xml SKIP
-
-set flag=--xml %tnestedcomp%
-call %tooltest% tnestedcomp.h5.xml
-
-set flag=--xml %tcompound_complex%
-call %tooltest% tcompound_complex.h5.xml
-
-set flag=--xml %tobjref%
-call %tooltest% tobjref.h5.xml
-
-set flag=--xml %topaque%
-call %tooltest% topaque.h5.xml
-
-set flag=--xml %tslink%
-call %tooltest% tslink.h5.xml
-
-set flag=--xml %tstr%
-call %tooltest% tstr.h5.xml
-
-set flag=--xml %tstr2%
-call %tooltest% tstr2.h5.xml
-
-set flag=--xml %tref%
-call %tooltest% tref.h5.xml
-
-set flag=--xml %tname-amp%
-call %tooltest% tname-amp.h5.xml
-
-set flag=--xml %tname-apos%
-call %tooltest% tname-apos.h5.xml
-
-set flag=--xml %tname-gt%
-call %tooltest% tname-gt.h5.xml
-
-set flag=--xml %tname-lt%
-call %tooltest% tname-lt.h5.xml
-
-set flag=--xml %tname-quot%
-call %tooltest% tname-quot.h5.xml
-
-set flag=--xml %tname-sp%
-call %tooltest% tname-sp.h5.xml
-
-set flag=--xml %tstring%
-call %tooltest% tstring.h5.xml
-
-set flag=--xml %tstring-at%
-call %tooltest% tstring-at.h5.xml
-
-set flag=--xml %tref-escapes%
-call %tooltest% tref-escapes.h5.xml
-
-set flag=--xml %tref-escapes-at%
-call %tooltest% tref-escapes-at.h5.xml
-
-set flag=--xml %tnodata%
-call %tooltest% tnodata.h5.xml
-
-set flag=--xml %tarray1%
-call %tooltest% tarray1.h5.xml
-
-set flag=--xml %tarray2%
-call %tooltest% tarray2.h5.xml
-
-set flag=--xml %tarray3%
-call %tooltest% tarray3.h5.xml
-
-set flag=--xml %tarray6%
-call %tooltest% tarray6.h5.xml
-
-set flag=--xml %tarray7%
-call %tooltest% tarray7.h5.xml
-
-set flag=--xml %tvldtypes1%
-call %tooltest% tvldtypes1.h5.xml
-
-set flag=--xml %tvldtypes2%
-call %tooltest% tvldtypes2.h5.xml
-
-set flag=--xml %tvldtypes3%
-call %tooltest% tvldtypes3.h5.xml
-
-set flag=--xml %tvldtypes4%
-call %tooltest% tvldtypes4.h5.xml
-
-set flag=--xml %tvldtypes5%
-call %tooltest% tvldtypes5.h5.xml
-
-set flag=--xml %tvlstr%
-call %tooltest% tvlstr.h5.xml
-
-set flag=--xml %tsaf%
-call %tooltest% tsaf.h5.xml
-
-set flag=--xml %tempty%
-call %tooltest% tempty.h5.xml
-
-set flag=--xml %tnamed_dtype_attr%
-call %tooltest% tnamed_dtype_attr.h5.xml
-
-
-::Test dataset and attribute of null space. Commented out:
-::wait until the XML schema is updated for null space.
-set flag=--xml tnulspace.h5
-call %tooltest% tnullspace.h5.xml SKIP
-
-::other options for xml
-
-set flag=--xml --use-dtd %tempty%
-call %tooltest% tempty-dtd.h5.xml
-
-set flag=--xml -u %tempty%
-call %tooltest% tempty-dtd-2.h5.xml
-
-set flag=--xml -X ":" %tempty%
-call %tooltest% tempty-nons.h5.xml
-
-set flag=--xml --xml-ns=":" %tempty%
-call %tooltest% tempty-nons-2.h5.xml
-
-::Some of these combinations are syntactically correct but
-::the URLs are dummies
-
-set flag=--xml -X "thing:" %tempty%
-call %tooltest% tempty-ns.h5.xml
-
-set flag=--xml --xml-ns="thing:" %tempty%
-call %tooltest% tempty-ns-2.h5.xml
-
-set flag=--xml --xml-ns=":" --xml-dtd="http://somewhere.net" %tempty%
-call %tooltest% tempty-nons-uri.h5.xml
-
-set flag=--xml --use-dtd --xml-dtd="http://somewhere.net" %tempty%
-call %tooltest% tempty-dtd-uri.h5.xml
-
-set flag=--xml -A %tall%
-call %tooltest% tall-2A.h5.xml
-
-::------------------
-::End of -xml Tests
-::------------------
-
-cd ..\..
-
-echo.
-if %totalerr%==0 (
-echo. All of the %exefile% %p1% Tests Passed!
-echo. All of the %exefile% %p1% Tests Passed! >> %tempResults%
-) else (
-echo. %exefile% %p1% Tests Finished with %totalerr% Errors!
-echo. %exefile% %p1% Tests Finished with %totalerr% Errors!>> %tempResults%
-)
-
-if not %totalskip%==0 (
-echo. %totalskip% Tests in total Skiped! >> %tempResults%
-echo. %totalskip% Tests in total Skiped!
-echo.
-find "SKIPED" %tempResults% | more +2
-)
-
-rmdir /s/q temptest
-
-for %%i in (testfiles\t*.h5) do set %%~ni=
-set test_szip=
-set output_szip=
-for %%v in (p1 p2 tempResults exefile tooltest ln ln_exp tsplit_file tmulti tfamily05d totalskip) do set %%v=
-for %%i in (tsplit_file tmulti) do set %%i=
-set tfamily05d=
+@REM Copyright by the Board of Trustees of the University of Illinois.
+@REM All rights reserved.
+@REM
+@REM This file is part of HDF5. The full HDF5 copyright notice, including
+@REM terms governing use, modification, and redistribution, is contained in
+@REM the files COPYING and Copyright.html. COPYING can be found at the root
+@REM of the source code distribution tree; Copyright.html can be found at the
+@REM root level of an installed copy of the electronic HDF5 document set and
+@REM is linked from the top-level documents page. It can also be found at
+@REM http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have
+@REM access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+
+@echo off
+
+::This batch file is for h5dump general and xml tests.
+::Usage
+:: dumptest release -- release static version
+:: dumptest debug -- debug static version
+:: dumptest release dll -- release dll version
+:: dumptest debug dll -- debug dll version
+:: Written By: Fang GUO
+:: Date : Jan. 12, 2006
+
+
+:: Track total number of testing errors
+ set /A totalerr=0
+ set /A totalskip=0
+
+
+::*******************************************************
+:: Generate a new temp directory for test h5dump
+::*******************************************************
+ :: Make a temporary directory for h5dump test
+ mkdir temptest
+
+::******************************************************************
+:: Set the Environment Variables & Change Dir to Dir with h5dump.EXE
+::******************************************************************
+
+ :: The first incoming parameter should be configuration (debug or release)
+ set p1=%1
+ :: The second parameter should be the types of library (dll or blank)
+ set p2=%2
+
+ :: Before comparison between expected file and the actual outputfile,
+ :: Ignore the first line in actual outputfile and the first four lines
+ :: in the expected output file
+
+ set ln=1
+ set ln_exp=4
+
+ :: Save the tests output into a temporary file
+ set tempResults=dumptest%2_%1.txt
+ type nul > %tempResults%
+
+ :: Define the .exe file based on the second parameter
+ set exefile=h5dump%p2%
+
+ :: For convenience, set a variable for the sub batch file
+ set tooltest=..\..\tooltest
+
+ :: For convenience, set variable for all testfiles/*.h5 files
+ for %%i in (testfiles\t*.h5) do set %%~ni=..\..\%%i
+
+ :: Special cases: the following are not .h5 files but needed in the tests
+ for %%i in (tsplit_file tmulti) do (
+ set %%i=..\..\testfiles\%%i
+ )
+
+ :: Havn't find a way to use % inside a variable name
+ set tfamily05d=..\..\testfiles\tfamily%%05d.h5
+
+ :: Change the directory to dir including .exe file
+ cd h5dump%p2%\%p1%
+
+::Test h5dump with different options
+
+echo.****************************************************
+echo. h5dump%2 %1 T E S T S
+echo.****************************************************
+
+::--------------------------
+::test for displaying groups
+::--------------------------
+set flag=%tgroup%
+call %tooltest% tgroup-1.ddl
+
+::---------------------------------------
+::test for displaying the selected groups
+::---------------------------------------
+set flag=--group=/g2 --group / -g /y %tgroup%
+call %tooltest% tgroup-2.ddl
+
+:: -----------------------------------------
+:: test for displaying simple space datasets
+::------------------------------------------
+set flag=%tdset%
+call %tooltest% tdset-1.ddl
+
+::--------------------------------------
+::test for displaying selected datasets
+::--------------------------------------
+set flag=-H -d dset1 -d /dset2 --dataset=dset3 %tdset%
+call %tooltest% tdset-2.ddl
+
+::------------------------------
+::test for displaying attributes
+::------------------------------
+set flag=%tattr%
+call %tooltest% tattr-1.ddl
+
+::---------------------------------------------------------------------------
+::test for displaying the selected attributes of string type and scalar space
+::---------------------------------------------------------------------------
+set flag=-a /attr1 --attribute /attr4 --attribute=/attr5 %tattr%
+call %tooltest% tattr-2.ddl
+
+::----------------------------------
+::test for header and error messages
+::----------------------------------
+set flag=--header -a /attr2 --attribute=/attr %tattr%
+call %tooltest% tattr-3.ddl
+
+::-----------------------------------------------------------------------------
+::test for displaying attributes in shared datatype (also in group and dataset)
+::-----------------------------------------------------------------------------
+set flag=%tnamed_dtype_attr%
+call %tooltest% tnamed_dtype_attr.ddl
+
+::------------------------------
+::test for displaying soft links
+::------------------------------
+set flag=%tslink%
+call %tooltest% tslink-1.ddl
+
+::-------------------------------------
+::test for displaying the selected link
+::-------------------------------------
+set flag=-l slink2 %tslink%
+call %tooltest% tslink-2.ddl
+
+::--------------------
+::tests for hard links
+::--------------------
+set flag=%thlink%
+call %tooltest% thlink-1.ddl
+
+set flag=-d /g1/dset2 --dataset /dset1 --dataset=/g1/g1.1/dset3 %thlink%
+call %tooltest% thlink-2.ddl
+
+set flag=-d /g1/g1.1/dset3 --dataset /g1/dset2 --dataset=/dset1 %thlink%
+call %tooltest% thlink-3.ddl
+
+set flag=-g /g1 %thlink%
+call %tooltest% thlink-4.ddl
+
+set flag=-d /dset1 -g /g2 -d /g1/dset2 %thlink%
+call %tooltest% thlink-5.ddl
+
+::-----------------------------
+::tests for compound data types
+::-----------------------------
+set flag=%tcompound%
+call %tooltest% tcomp-1.ddl
+
+::-------------------------
+::test for named data types
+::-------------------------
+set flag=-t /type1 --datatype /type2 --datatype=/group1/type3 %tcompound%
+call %tooltest% tcomp-2.ddl
+
+::--------------------
+::test for unamed type
+::--------------------
+set flag=-t /#6632:0 -g /group2 %tcompound%
+call %tooltest% tcomp-3.ddl
+
+::----------------------------------
+::test complicated compound datatype
+::----------------------------------
+set flag=%tcompound_complex%
+call %tooltest% tcomp-4.ddl
+
+::---------------------------------
+::test for the nested compound type
+::---------------------------------
+set flag=%tnestedcomp%
+call %tooltest% tnestcomp-1.ddl
+
+::----------------
+::test for options
+::----------------
+set flag=%tall%
+call %tooltest% tall-1.ddl
+
+set flag=--header -g /g1/g1.1 -a attr2 %tall%
+call %tooltest% tall-2.ddl
+
+set flag=-d /g2/dset2.1 -l /g1/g1.2/g1.2.1/slink %tall%
+call %tooltest% tall-3.ddl
+
+::------------------------
+::test for loop detection
+::------------------------
+set flag=%tloop%
+call %tooltest% tloop-1.ddl
+
+::---------------
+::test for string
+::---------------
+set flag=%tstr%
+call %tooltest% tstr-1.ddl
+
+set flag=%tstr2%
+call %tooltest% tstr-2.ddl
+
+::-------------------------------------
+::test for file created by Lib SAF team
+::-------------------------------------
+set flag=%tsaf%
+call %tooltest% tsaf.ddl
+
+::---------------------------------------
+::test for file with variable length data
+::---------------------------------------
+set tvldtypes=..\..\testfiles\tvldtypes
+for %%v in (1 2 3 4 5) do (
+set flag=%tvldtypes%%%v.h5
+call %tooltest% tvldtypes%%v.ddl
+)
+set tvldtypes=
+
+::----------------------------------------------
+::test for file with variable length string data
+::----------------------------------------------
+set flag=%tvlstr%
+call %tooltest% tvlstr.ddl
+
+::------------------------------
+::test for files with array data
+::------------------------------
+set tarray=..\..\testfiles\tarray
+for /L %%v in (1,1,7) do (
+set flag=%tarray%%%v%.h5
+call %tooltest% tarray%%v.ddl
+)
+set tarray=
+
+::------------------------------
+::test for files with empty data
+::------------------------------
+set flag=%tempty%
+call %tooltest% tempty.ddl
+
+::---------------------------------------------
+::test for files with groups that have comments
+::---------------------------------------------
+set flag=%tgrp_comments%
+call %tooltest% tgrp_comments.ddl
+
+::---------------------------
+::test the --filedriver flag
+::---------------------------
+set flag=--filedriver=split %tsplit_file%
+call %tooltest% tsplit_file.ddl
+
+::Special: Find a way to echo environment
+set flag=--filedriver=family %tfamily05d%
+call %tooltest% tfamily.ddl
+
+set flag=--filedriver=multi %tmulti%
+call %tooltest% tmulti.ddl
+
+::----------------------------------------------------------------
+::test for files with group names which reach > 1024 bytes in size
+::----------------------------------------------------------------
+set flag=-w157 %tlarge_objname%
+call %tooltest% tlarge_objname.ddl
+
+::-------------------------------------------
+::test '-A' to suppress data but print attr's
+::-------------------------------------------
+set flag=-A %tall%
+call %tooltest% tall-2A.ddl
+
+::---------------------------------------------------------
+::test '-r' to print attributes in ASCII instead of decimal
+::---------------------------------------------------------
+set flag=-A -r %tall%
+call %tooltest% tall-2B.ddl
+
+::---------------
+::test Subsetting
+::---------------
+set flag=--dataset=/g1/g1.1/dset1.1.1 --start=1,1 --stride=2,3 --count=3,2 --block=1,1 %tall%
+call %tooltest% tall-4s.ddl
+
+::set flag=-d "/g1/g1.1/dset1.1.2[0;2;10;]" %tall%
+::call %tooltest% tall-5s.ddl
+
+::set flag=-d "/dset1[1,1;;;]" %tdset%
+::call %tooltest% tdset-3s.ddl
+
+::set flag=-d "/dset1[;3,2;4,4;1,4]" %tdset2%
+::call %tooltest% tdset2-1s.ddl
+
+::----------------------------------------------------
+::test printing characters in ASCII instead of decimal
+::----------------------------------------------------
+set flag=-r %tchar%
+call %tooltest% tchar1.ddl
+
+::---------------------
+::test failure handling
+::---------------------
+
+::1. Missing file name
+set flag=
+call %tooltest% tnofilename.ddl
+
+:: rev. 2004
+
+::---------------------
+::tests for super block
+::---------------------
+set flag=-H -B -d dset %tfcontents1%
+call %tooltest% tboot1.ddl
+
+set flag=-B %tfcontents2%
+call %tooltest% tboot2.ddl
+
+::------------------------------------
+:: test -p with a non existing dataset
+::------------------------------------
+set flag=-p -d bogus %tfcontents1%
+call %tooltest% tperror.ddl
+
+::----------------------
+::test for file contents
+::----------------------
+set flag=-n %tfcontents1%
+call %tooltest% tcontents.ddl
+
+::-------------------------
+::tests for storage layout
+::-------------------------
+
+for %%v in (compact chunked external) do (
+set flag=-H -p -d %%v %tfilters%
+call %tooltest% t%%v.ddl
+)
+
+::contiguous (tcontiguos.ddl or tcontiguous.ddl)
+set flag=-H -p -d contiguous %tfilters%
+call %tooltest% tcontiguos.ddl
+
+::-----------
+::fill values
+::-----------
+set flag=-p %tfvalues%
+call %tooltest% tfill.ddl
+
+::-----------------------------------------------
+::several datatype, with references , print path
+::-----------------------------------------------
+set flag=%tattr2%
+call %tooltest% treference.ddl
+
+::------------------------------------------
+::escape/not escape non printable characters
+::------------------------------------------
+set flag=-e %tstr3%
+call %tooltest% tstringe.ddl
+
+set flag=%tstr3%
+call %tooltest% tstring.ddl
+
+::----------------------------------
+::char data as ASCII with non escape
+::----------------------------------
+set flag=-r -d str4 %tstr3%
+call %tooltest% tstring2.ddl
+
+::-----------------------------
+::array indices print/not print
+::-----------------------------
+set flag=%taindices%
+call %tooltest% tindicesyes.ddl
+
+set flag=-y %taindices%
+call %tooltest% tindicesno.ddl
+
+::-----------------
+::tests for filters
+::-----------------
+
+:: SZIP
+set flag=-H -p -d szip %tfilters%
+call %tooltest% tszip.ddl szip
+
+::deflate
+set flag=-H -p -d deflate %tfilters%
+call %tooltest% tdeflate.ddl zlib
+
+::shuffle
+set flag=-H -p -d shuffle %tfilters%
+call %tooltest% tshuffle.ddl
+
+::fletcher32
+set flag=-H -p -d fletcher32 %tfilters%
+call %tooltest% tfletcher32.ddl
+
+::nbit
+set flag=-H -p -d nbit %tfilters%
+call %tooltest% tnbit.ddl
+
+::scaleoffset
+set flag=-H -p -d scaleoffset %tfilters%
+call %tooltest% tscaleoffset.ddl
+
+::all
+set flag=-H -p -d all %tfilters%
+call %tooltest% tallfilters.ddl zlib szip
+
+::user defined
+set flag=-H -p -d myfilter %tfilters%
+call %tooltest% tuserfilter.ddl
+
+::test for displaying dataset and attribute of null space
+set flag=%tnullspace%
+call %tooltest% tnullspace.ddl
+
+::test for displaying objects with very long names
+set flag=%tlonglinks%
+call %tooltest% tlonglinks.ddl
+
+::test for long double (Some systems do not have long double)
+set flag=%tldouble%
+call %tooltest% tldouble.ddl SKIP
+
+::Test for vms
+set flag=%tvms%
+call %tooltest% tvms.ddl
+
+echo.
+echo.****************************************************
+echo. h5dump%2 %1 XML T E S T S
+echo.****************************************************
+
+::test XML
+set flag=--xml %tall%
+call %tooltest% tall.h5.xml
+
+set flag=--xml %tattr%
+call %tooltest% tattr.h5.xml
+
+set flag=--xml %tbitfields%
+call %tooltest% tbitfields.h5.xml
+
+set flag=--xml %tcompound%
+call %tooltest% tcompound.h5.xml
+
+set flag=--xml %tcompound2%
+call %tooltest% tcompound2.h5.xml
+
+set flag=--xml %tdatareg%
+call %tooltest% tdatareg.h5.xml
+
+set flag=--xml %tdset%
+call %tooltest% tdset.h5.xml
+
+set flag=--xml %tdset2%
+call %tooltest% tdset2.h5.xml
+
+set flag=--xml %tenum%
+call %tooltest% tenum.h5.xml
+
+set flag=--xml %tgroup%
+call %tooltest% tgroup.h5.xml
+
+set flag=--xml %thlink%
+call %tooltest% thlink.h5.xml SKIP
+
+set flag=--xml %tloop%
+call %tooltest% tloop.h5.xml
+
+set flag=--xml %tloop2%
+call %tooltest% tloop2.h5.xml
+
+set flag=--xml %tmany%
+call %tooltest% tmany.h5.xml SKIP
+
+set flag=--xml %tnestedcomp%
+call %tooltest% tnestedcomp.h5.xml
+
+set flag=--xml %tcompound_complex%
+call %tooltest% tcompound_complex.h5.xml
+
+set flag=--xml %tobjref%
+call %tooltest% tobjref.h5.xml
+
+set flag=--xml %topaque%
+call %tooltest% topaque.h5.xml
+
+set flag=--xml %tslink%
+call %tooltest% tslink.h5.xml
+
+set flag=--xml %tstr%
+call %tooltest% tstr.h5.xml
+
+set flag=--xml %tstr2%
+call %tooltest% tstr2.h5.xml
+
+set flag=--xml %tref%
+call %tooltest% tref.h5.xml
+
+set flag=--xml %tname-amp%
+call %tooltest% tname-amp.h5.xml
+
+set flag=--xml %tname-apos%
+call %tooltest% tname-apos.h5.xml
+
+set flag=--xml %tname-gt%
+call %tooltest% tname-gt.h5.xml
+
+set flag=--xml %tname-lt%
+call %tooltest% tname-lt.h5.xml
+
+set flag=--xml %tname-quot%
+call %tooltest% tname-quot.h5.xml
+
+set flag=--xml %tname-sp%
+call %tooltest% tname-sp.h5.xml
+
+set flag=--xml %tstring%
+call %tooltest% tstring.h5.xml
+
+set flag=--xml %tstring-at%
+call %tooltest% tstring-at.h5.xml
+
+set flag=--xml %tref-escapes%
+call %tooltest% tref-escapes.h5.xml
+
+set flag=--xml %tref-escapes-at%
+call %tooltest% tref-escapes-at.h5.xml
+
+set flag=--xml %tnodata%
+call %tooltest% tnodata.h5.xml
+
+set flag=--xml %tarray1%
+call %tooltest% tarray1.h5.xml
+
+set flag=--xml %tarray2%
+call %tooltest% tarray2.h5.xml
+
+set flag=--xml %tarray3%
+call %tooltest% tarray3.h5.xml
+
+set flag=--xml %tarray6%
+call %tooltest% tarray6.h5.xml
+
+set flag=--xml %tarray7%
+call %tooltest% tarray7.h5.xml
+
+set flag=--xml %tvldtypes1%
+call %tooltest% tvldtypes1.h5.xml
+
+set flag=--xml %tvldtypes2%
+call %tooltest% tvldtypes2.h5.xml
+
+set flag=--xml %tvldtypes3%
+call %tooltest% tvldtypes3.h5.xml
+
+set flag=--xml %tvldtypes4%
+call %tooltest% tvldtypes4.h5.xml
+
+set flag=--xml %tvldtypes5%
+call %tooltest% tvldtypes5.h5.xml
+
+set flag=--xml %tvlstr%
+call %tooltest% tvlstr.h5.xml
+
+set flag=--xml %tsaf%
+call %tooltest% tsaf.h5.xml
+
+set flag=--xml %tempty%
+call %tooltest% tempty.h5.xml
+
+set flag=--xml %tnamed_dtype_attr%
+call %tooltest% tnamed_dtype_attr.h5.xml
+
+
+::Test dataset and attribute of null space. Commented out:
+::wait until the XML schema is updated for null space.
+set flag=--xml tnulspace.h5
+call %tooltest% tnullspace.h5.xml SKIP
+
+::other options for xml
+
+set flag=--xml --use-dtd %tempty%
+call %tooltest% tempty-dtd.h5.xml
+
+set flag=--xml -u %tempty%
+call %tooltest% tempty-dtd-2.h5.xml
+
+set flag=--xml -X ":" %tempty%
+call %tooltest% tempty-nons.h5.xml
+
+set flag=--xml --xml-ns=":" %tempty%
+call %tooltest% tempty-nons-2.h5.xml
+
+::Some of these combinations are syntactically correct but
+::the URLs are dummies
+
+set flag=--xml -X "thing:" %tempty%
+call %tooltest% tempty-ns.h5.xml
+
+set flag=--xml --xml-ns="thing:" %tempty%
+call %tooltest% tempty-ns-2.h5.xml
+
+set flag=--xml --xml-ns=":" --xml-dtd="http://somewhere.net" %tempty%
+call %tooltest% tempty-nons-uri.h5.xml
+
+set flag=--xml --use-dtd --xml-dtd="http://somewhere.net" %tempty%
+call %tooltest% tempty-dtd-uri.h5.xml
+
+set flag=--xml -A %tall%
+call %tooltest% tall-2A.h5.xml
+
+::------------------
+::End of -xml Tests
+::------------------
+
+cd ..\..
+
+echo.
+if %totalerr%==0 (
+echo. All of the %exefile% %p1% Tests Passed!
+echo. All of the %exefile% %p1% Tests Passed! >> %tempResults%
+) else (
+echo. %exefile% %p1% Tests Finished with %totalerr% Errors!
+echo. %exefile% %p1% Tests Finished with %totalerr% Errors!>> %tempResults%
+)
+
+if not %totalskip%==0 (
+echo. %totalskip% Tests in total Skiped! >> %tempResults%
+echo. %totalskip% Tests in total Skiped!
+echo.
+find "SKIPED" %tempResults% | more +2
+)
+
+rmdir /s/q temptest
+
+for %%i in (testfiles\t*.h5) do set %%~ni=
+set test_szip=
+set output_szip=
+for %%v in (p1 p2 tempResults exefile tooltest ln ln_exp tsplit_file tmulti tfamily05d totalskip) do set %%v=
+for %%i in (tsplit_file tmulti) do set %%i=
+set tfamily05d=
diff --git a/windows/tools/h5debug/h5debug.dsp b/windows/tools/h5debug/h5debug.dsp
index 390fe05..f58b990 100755
--- a/windows/tools/h5debug/h5debug.dsp
+++ b/windows/tools/h5debug/h5debug.dsp
@@ -1,170 +1,170 @@
-# Microsoft Developer Studio Project File - Name="h5debug" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5debug - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5debug.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5debug.mak" CFG="h5debug - Win32 AlphaDbg"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5debug - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5debug - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5debug - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5debug - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "h5debug - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5debug/Release"
-# PROP Intermediate_Dir "../../../tools/h5debug/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF "$(CFG)" == "h5debug - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5debug/Debug"
-# PROP Intermediate_Dir "../../../tools/h5debug/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5debug - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5debug_"
-# PROP BASE Intermediate_Dir "h5debug_"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5debug_/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5debug - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5debug0"
-# PROP BASE Intermediate_Dir "h5debug0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5debug0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5debug - Win32 Release"
-# Name "h5debug - Win32 Debug"
-# Name "h5debug - Win32 AlphaDbg"
-# Name "h5debug - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\misc\h5debug.c
-
-!IF "$(CFG)" == "h5debug - Win32 Release"
-
-!ELSEIF "$(CFG)" == "h5debug - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "h5debug - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "h5debug - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5debug" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
+
+CFG=h5debug - Win32 AlphaDbg
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5debug.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5debug.mak" CFG="h5debug - Win32 AlphaDbg"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5debug - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5debug - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5debug - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "h5debug - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "h5debug - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/h5debug/Release"
+# PROP Intermediate_Dir "../../../tools/h5debug/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
+
+!ELSEIF "$(CFG)" == "h5debug - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/h5debug/Debug"
+# PROP Intermediate_Dir "../../../tools/h5debug/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5debug - Win32 AlphaDbg"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "h5debug_"
+# PROP BASE Intermediate_Dir "h5debug_"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"h5debug_/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5debug - Win32 AlphaRel"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "h5debug0"
+# PROP BASE Intermediate_Dir "h5debug0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"h5debug0/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5debug - Win32 Release"
+# Name "h5debug - Win32 Debug"
+# Name "h5debug - Win32 AlphaDbg"
+# Name "h5debug - Win32 AlphaRel"
+# Begin Source File
+
+SOURCE=..\..\..\tools\misc\h5debug.c
+
+!IF "$(CFG)" == "h5debug - Win32 Release"
+
+!ELSEIF "$(CFG)" == "h5debug - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "h5debug - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "h5debug - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/h5debugdll/h5debugdll.dsp b/windows/tools/h5debugdll/h5debugdll.dsp
index 6f7f1f7..9e8ba13 100755
--- a/windows/tools/h5debugdll/h5debugdll.dsp
+++ b/windows/tools/h5debugdll/h5debugdll.dsp
@@ -1,170 +1,170 @@
-# Microsoft Developer Studio Project File - Name="h5debugdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5debugdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5debugdll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5debugdll.mak" CFG="h5debugdll - Win32 AlphaDbg"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5debugdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5debugdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5debugdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5debugdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "h5debugdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5debugdll/Release"
-# PROP Intermediate_Dir "../../../tools/h5debugdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "h5debugdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5debugdll/Debug"
-# PROP Intermediate_Dir "../../../tools/h5debugdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5debugdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5debugd"
-# PROP BASE Intermediate_Dir "h5debugd"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5debugd/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5debugdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5debug0"
-# PROP BASE Intermediate_Dir "h5debug0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5debug0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5debugdll - Win32 Release"
-# Name "h5debugdll - Win32 Debug"
-# Name "h5debugdll - Win32 AlphaDbg"
-# Name "h5debugdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\misc\h5debug.c
-
-!IF "$(CFG)" == "h5debugdll - Win32 Release"
-
-!ELSEIF "$(CFG)" == "h5debugdll - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "h5debugdll - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "h5debugdll - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5debugdll" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
+
+CFG=h5debugdll - Win32 AlphaDbg
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5debugdll.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5debugdll.mak" CFG="h5debugdll - Win32 AlphaDbg"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5debugdll - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5debugdll - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5debugdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "h5debugdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "h5debugdll - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/h5debugdll/Release"
+# PROP Intermediate_Dir "../../../tools/h5debugdll/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /include:"Release/"
+# ADD F90 /include:"Release/"
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "h5debugdll - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/h5debugdll/Debug"
+# PROP Intermediate_Dir "../../../tools/h5debugdll/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /include:"Debug/"
+# ADD F90 /include:"Debug/"
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5debugdll - Win32 AlphaDbg"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "h5debugd"
+# PROP BASE Intermediate_Dir "h5debugd"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"h5debugd/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5debugdll - Win32 AlphaRel"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "h5debug0"
+# PROP BASE Intermediate_Dir "h5debug0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"h5debug0/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5debugdll - Win32 Release"
+# Name "h5debugdll - Win32 Debug"
+# Name "h5debugdll - Win32 AlphaDbg"
+# Name "h5debugdll - Win32 AlphaRel"
+# Begin Source File
+
+SOURCE=..\..\..\tools\misc\h5debug.c
+
+!IF "$(CFG)" == "h5debugdll - Win32 Release"
+
+!ELSEIF "$(CFG)" == "h5debugdll - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "h5debugdll - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "h5debugdll - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/h5diff/h5diff.dsp b/windows/tools/h5diff/h5diff.dsp
index 972d19e..e49dada 100755
--- a/windows/tools/h5diff/h5diff.dsp
+++ b/windows/tools/h5diff/h5diff.dsp
@@ -1,99 +1,99 @@
-# Microsoft Developer Studio Project File - Name="h5diff" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5diff - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5diff.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5diff.mak" CFG="h5diff - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5diff - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5diff - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "h5diff - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5diff/Release"
-# PROP Intermediate_Dir "../../../tools/h5diff/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF "$(CFG)" == "h5diff - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5diff/Debug"
-# PROP Intermediate_Dir "../../../tools/h5diff/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /browser /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5diff - Win32 Release"
-# Name "h5diff - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5diff\h5diff_common.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5diff\h5diff_main.c
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5diff" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=h5diff - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5diff.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5diff.mak" CFG="h5diff - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5diff - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5diff - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+F90=df.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "h5diff - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/h5diff/Release"
+# PROP Intermediate_Dir "../../../tools/h5diff/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
+
+!ELSEIF "$(CFG)" == "h5diff - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/h5diff/Debug"
+# PROP Intermediate_Dir "../../../tools/h5diff/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD F90 /browser /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5diff - Win32 Release"
+# Name "h5diff - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5diff\h5diff_common.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5diff\h5diff_main.c
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/h5diffdll/h5diffdll.dsp b/windows/tools/h5diffdll/h5diffdll.dsp
index 7f3caf9..acc00d0 100755
--- a/windows/tools/h5diffdll/h5diffdll.dsp
+++ b/windows/tools/h5diffdll/h5diffdll.dsp
@@ -1,99 +1,99 @@
-# Microsoft Developer Studio Project File - Name="h5diffdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5diffdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5diffdll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5diffdll.mak" CFG="h5diffdll - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5diffdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5diffdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "h5diffdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5diffdll/Release"
-# PROP Intermediate_Dir "../../../tools/h5diffdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "h5diffdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5diffdll/Debug"
-# PROP Intermediate_Dir "../../../tools/h5diffdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5diffdll - Win32 Release"
-# Name "h5diffdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5diff\h5diff_common.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5diff\h5diff_main.c
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5diffdll" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=h5diffdll - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5diffdll.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5diffdll.mak" CFG="h5diffdll - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5diffdll - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5diffdll - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+F90=df.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "h5diffdll - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/h5diffdll/Release"
+# PROP Intermediate_Dir "../../../tools/h5diffdll/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "h5diffdll - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/h5diffdll/Debug"
+# PROP Intermediate_Dir "../../../tools/h5diffdll/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5diffdll - Win32 Release"
+# Name "h5diffdll - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5diff\h5diff_common.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5diff\h5diff_main.c
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/h5dump/h5dump.dsp b/windows/tools/h5dump/h5dump.dsp
index de40ff7..291e28b 100755
--- a/windows/tools/h5dump/h5dump.dsp
+++ b/windows/tools/h5dump/h5dump.dsp
@@ -1,170 +1,170 @@
-# Microsoft Developer Studio Project File - Name="h5dump" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5dump - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5dump.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5dump.mak" CFG="h5dump - Win32 AlphaDbg"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5dump - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5dump - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5dump - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5dump - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "h5dump - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5dump/Release"
-# PROP Intermediate_Dir "../../../tools/h5dump/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF "$(CFG)" == "h5dump - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5dump/Debug"
-# PROP Intermediate_Dir "../../../tools/h5dump/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5dump - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5dump__"
-# PROP BASE Intermediate_Dir "h5dump__"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "../../tools" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "../../tools" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5dump__/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5dump - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5dump_0"
-# PROP BASE Intermediate_Dir "h5dump_0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5dump_0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5dump - Win32 Release"
-# Name "h5dump - Win32 Debug"
-# Name "h5dump - Win32 AlphaDbg"
-# Name "h5dump - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5dump\h5dump.c
-
-!IF "$(CFG)" == "h5dump - Win32 Release"
-
-!ELSEIF "$(CFG)" == "h5dump - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "h5dump - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "h5dump - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5dump" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
+
+CFG=h5dump - Win32 AlphaDbg
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5dump.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5dump.mak" CFG="h5dump - Win32 AlphaDbg"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5dump - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5dump - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5dump - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "h5dump - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "h5dump - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/h5dump/Release"
+# PROP Intermediate_Dir "../../../tools/h5dump/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
+
+!ELSEIF "$(CFG)" == "h5dump - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/h5dump/Debug"
+# PROP Intermediate_Dir "../../../tools/h5dump/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5dump - Win32 AlphaDbg"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "h5dump__"
+# PROP BASE Intermediate_Dir "h5dump__"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "../../tools" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "../../tools" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"h5dump__/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5dump - Win32 AlphaRel"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "h5dump_0"
+# PROP BASE Intermediate_Dir "h5dump_0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"h5dump_0/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5dump - Win32 Release"
+# Name "h5dump - Win32 Debug"
+# Name "h5dump - Win32 AlphaDbg"
+# Name "h5dump - Win32 AlphaRel"
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5dump\h5dump.c
+
+!IF "$(CFG)" == "h5dump - Win32 Release"
+
+!ELSEIF "$(CFG)" == "h5dump - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "h5dump - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "h5dump - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/h5dumpdll/h5dumpdll.dsp b/windows/tools/h5dumpdll/h5dumpdll.dsp
index c3b63de..42ea12e 100755
--- a/windows/tools/h5dumpdll/h5dumpdll.dsp
+++ b/windows/tools/h5dumpdll/h5dumpdll.dsp
@@ -1,170 +1,170 @@
-# Microsoft Developer Studio Project File - Name="h5dumpdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5dumpdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5dumpdll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5dumpdll.mak" CFG="h5dumpdll - Win32 AlphaDbg"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5dumpdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5dumpdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5dumpdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5dumpdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "h5dumpdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5dumpdll/Release"
-# PROP Intermediate_Dir "../../../tools/h5dumpdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "h5dumpdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5dumpdll/Debug"
-# PROP Intermediate_Dir "../../../tools/h5dumpdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /I /I"..\..tools"/Fp"Debug/h5dumpdll.pch" /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5dumpdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5dumpdl"
-# PROP BASE Intermediate_Dir "h5dumpdl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\tools" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /I /I"..\..tools"/Fp"Debug/h5dumpdll.pch" /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\tools" /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /I /I"..\..tools"/Fp"Debug/h5dumpdll.pch" /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5dumpdl/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5dumpdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5dumpd0"
-# PROP BASE Intermediate_Dir "h5dumpd0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5dumpd0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5dumpdll - Win32 Release"
-# Name "h5dumpdll - Win32 Debug"
-# Name "h5dumpdll - Win32 AlphaDbg"
-# Name "h5dumpdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5dump\h5dump.c
-
-!IF "$(CFG)" == "h5dumpdll - Win32 Release"
-
-!ELSEIF "$(CFG)" == "h5dumpdll - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "h5dumpdll - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "h5dumpdll - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5dumpdll" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
+
+CFG=h5dumpdll - Win32 AlphaDbg
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5dumpdll.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5dumpdll.mak" CFG="h5dumpdll - Win32 AlphaDbg"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5dumpdll - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5dumpdll - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5dumpdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "h5dumpdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "h5dumpdll - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/h5dumpdll/Release"
+# PROP Intermediate_Dir "../../../tools/h5dumpdll/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /include:"Release/"
+# ADD F90 /include:"Release/"
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "h5dumpdll - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/h5dumpdll/Debug"
+# PROP Intermediate_Dir "../../../tools/h5dumpdll/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /include:"Debug/"
+# ADD F90 /include:"Debug/"
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /I /I"..\..tools"/Fp"Debug/h5dumpdll.pch" /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5dumpdll - Win32 AlphaDbg"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "h5dumpdl"
+# PROP BASE Intermediate_Dir "h5dumpdl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\tools" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /I /I"..\..tools"/Fp"Debug/h5dumpdll.pch" /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\tools" /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /I /I"..\..tools"/Fp"Debug/h5dumpdll.pch" /c
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"h5dumpdl/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5dumpdll - Win32 AlphaRel"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "h5dumpd0"
+# PROP BASE Intermediate_Dir "h5dumpd0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"h5dumpd0/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5dumpdll - Win32 Release"
+# Name "h5dumpdll - Win32 Debug"
+# Name "h5dumpdll - Win32 AlphaDbg"
+# Name "h5dumpdll - Win32 AlphaRel"
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5dump\h5dump.c
+
+!IF "$(CFG)" == "h5dumpdll - Win32 Release"
+
+!ELSEIF "$(CFG)" == "h5dumpdll - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "h5dumpdll - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "h5dumpdll - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/h5import/h5import.dsp b/windows/tools/h5import/h5import.dsp
index af4e370..7528bc9 100755
--- a/windows/tools/h5import/h5import.dsp
+++ b/windows/tools/h5import/h5import.dsp
@@ -1,170 +1,170 @@
-# Microsoft Developer Studio Project File - Name="h5import" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5import - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5import.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5import.mak" CFG="h5import - Win32 AlphaDbg"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5import - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5import - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5import - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5import - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "h5import - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5import/Release"
-# PROP Intermediate_Dir "../../../tools/h5import/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF "$(CFG)" == "h5import - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5import/Debug"
-# PROP Intermediate_Dir "../../../tools/h5import/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5import - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5import"
-# PROP BASE Intermediate_Dir "h5import"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5import/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5import - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5impor0"
-# PROP BASE Intermediate_Dir "h5impor0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5impor0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5import - Win32 Release"
-# Name "h5import - Win32 Debug"
-# Name "h5import - Win32 AlphaDbg"
-# Name "h5import - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5import\h5import.c
-
-!IF "$(CFG)" == "h5import - Win32 Release"
-
-!ELSEIF "$(CFG)" == "h5import - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "h5import - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "h5import - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5import" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
+
+CFG=h5import - Win32 AlphaDbg
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5import.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5import.mak" CFG="h5import - Win32 AlphaDbg"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5import - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5import - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5import - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "h5import - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "h5import - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/h5import/Release"
+# PROP Intermediate_Dir "../../../tools/h5import/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
+
+!ELSEIF "$(CFG)" == "h5import - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/h5import/Debug"
+# PROP Intermediate_Dir "../../../tools/h5import/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5import - Win32 AlphaDbg"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "h5import"
+# PROP BASE Intermediate_Dir "h5import"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"h5import/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5import - Win32 AlphaRel"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "h5impor0"
+# PROP BASE Intermediate_Dir "h5impor0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"h5impor0/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5import - Win32 Release"
+# Name "h5import - Win32 Debug"
+# Name "h5import - Win32 AlphaDbg"
+# Name "h5import - Win32 AlphaRel"
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5import\h5import.c
+
+!IF "$(CFG)" == "h5import - Win32 Release"
+
+!ELSEIF "$(CFG)" == "h5import - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "h5import - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "h5import - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/h5importdll/h5importdll.dsp b/windows/tools/h5importdll/h5importdll.dsp
index e62e81d..935f64a 100755
--- a/windows/tools/h5importdll/h5importdll.dsp
+++ b/windows/tools/h5importdll/h5importdll.dsp
@@ -1,170 +1,170 @@
-# Microsoft Developer Studio Project File - Name="h5importdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5importdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5importdll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5importdll.mak" CFG="h5importdll - Win32 AlphaDbg"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5importdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5importdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5importdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5importdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "h5importdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5importdll/Release"
-# PROP Intermediate_Dir "../../../tools/h5importdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "h5importdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5importdll/Debug"
-# PROP Intermediate_Dir "../../../tools/h5importdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5importdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5import"
-# PROP BASE Intermediate_Dir "h5import"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5import/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5importdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5impor0"
-# PROP BASE Intermediate_Dir "h5impor0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5impor0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5importdll - Win32 Release"
-# Name "h5importdll - Win32 Debug"
-# Name "h5importdll - Win32 AlphaDbg"
-# Name "h5importdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5import\h5import.c
-
-!IF "$(CFG)" == "h5importdll - Win32 Release"
-
-!ELSEIF "$(CFG)" == "h5importdll - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "h5importdll - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "h5importdll - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5importdll" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
+
+CFG=h5importdll - Win32 AlphaDbg
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5importdll.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5importdll.mak" CFG="h5importdll - Win32 AlphaDbg"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5importdll - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5importdll - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5importdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "h5importdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "h5importdll - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/h5importdll/Release"
+# PROP Intermediate_Dir "../../../tools/h5importdll/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /include:"Release/"
+# ADD F90 /include:"Release/"
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "h5importdll - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/h5importdll/Debug"
+# PROP Intermediate_Dir "../../../tools/h5importdll/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /include:"Debug/"
+# ADD F90 /include:"Debug/"
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5importdll - Win32 AlphaDbg"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "h5import"
+# PROP BASE Intermediate_Dir "h5import"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"h5import/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5importdll - Win32 AlphaRel"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "h5impor0"
+# PROP BASE Intermediate_Dir "h5impor0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"h5impor0/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5importdll - Win32 Release"
+# Name "h5importdll - Win32 Debug"
+# Name "h5importdll - Win32 AlphaDbg"
+# Name "h5importdll - Win32 AlphaRel"
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5import\h5import.c
+
+!IF "$(CFG)" == "h5importdll - Win32 Release"
+
+!ELSEIF "$(CFG)" == "h5importdll - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "h5importdll - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "h5importdll - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/h5jam/h5jam.dsp b/windows/tools/h5jam/h5jam.dsp
index a1af956..0f5453c 100755
--- a/windows/tools/h5jam/h5jam.dsp
+++ b/windows/tools/h5jam/h5jam.dsp
@@ -1,95 +1,95 @@
-# Microsoft Developer Studio Project File - Name="h5jam" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5jam - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5jam.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5jam.mak" CFG="h5jam - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5jam - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5jam - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "h5jam - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5jam/Release"
-# PROP Intermediate_Dir "../../../tools/h5jam/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "h5jam - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5jam/Debug"
-# PROP Intermediate_Dir "../../../tools/h5jam/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5jam - Win32 Release"
-# Name "h5jam - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5jam\h5jam.c
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5jam" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=h5jam - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5jam.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5jam.mak" CFG="h5jam - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5jam - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5jam - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+F90=df.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "h5jam - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/h5jam/Release"
+# PROP Intermediate_Dir "../../../tools/h5jam/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "h5jam - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/h5jam/Debug"
+# PROP Intermediate_Dir "../../../tools/h5jam/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5jam - Win32 Release"
+# Name "h5jam - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5jam\h5jam.c
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/h5ls/h5ls.dsp b/windows/tools/h5ls/h5ls.dsp
index 5dcb655..e7d69cd 100755
--- a/windows/tools/h5ls/h5ls.dsp
+++ b/windows/tools/h5ls/h5ls.dsp
@@ -1,172 +1,172 @@
-# Microsoft Developer Studio Project File - Name="h5ls" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5ls - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5ls.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5ls.mak" CFG="h5ls - Win32 AlphaDbg"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5ls - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5ls - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5ls - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5ls - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "h5ls - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5ls/Release"
-# PROP Intermediate_Dir "../../../tools/h5ls/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF "$(CFG)" == "h5ls - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5ls/Debug"
-# PROP Intermediate_Dir "../../../tools/h5ls/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5ls - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5ls___W"
-# PROP BASE Intermediate_Dir "h5ls___W"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "../../tools" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "../../tools" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5ls___W/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5ls - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5ls___0"
-# PROP BASE Intermediate_Dir "h5ls___0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5ls___0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5ls - Win32 Release"
-# Name "h5ls - Win32 Debug"
-# Name "h5ls - Win32 AlphaDbg"
-# Name "h5ls - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5ls\h5ls.c
-
-!IF "$(CFG)" == "h5ls - Win32 Release"
-
-!ELSEIF "$(CFG)" == "h5ls - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "h5ls - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "h5ls - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5ls" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
+
+CFG=h5ls - Win32 AlphaDbg
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5ls.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5ls.mak" CFG="h5ls - Win32 AlphaDbg"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5ls - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5ls - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5ls - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "h5ls - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "h5ls - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/h5ls/Release"
+# PROP Intermediate_Dir "../../../tools/h5ls/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
+
+!ELSEIF "$(CFG)" == "h5ls - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/h5ls/Debug"
+# PROP Intermediate_Dir "../../../tools/h5ls/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5ls - Win32 AlphaDbg"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "h5ls___W"
+# PROP BASE Intermediate_Dir "h5ls___W"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "../../tools" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "../../tools" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"h5ls___W/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5ls - Win32 AlphaRel"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "h5ls___0"
+# PROP BASE Intermediate_Dir "h5ls___0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"h5ls___0/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5ls - Win32 Release"
+# Name "h5ls - Win32 Debug"
+# Name "h5ls - Win32 AlphaDbg"
+# Name "h5ls - Win32 AlphaRel"
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5ls\h5ls.c
+
+!IF "$(CFG)" == "h5ls - Win32 Release"
+
+!ELSEIF "$(CFG)" == "h5ls - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "h5ls - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "h5ls - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/h5lsdll/h5lsdll.dsp b/windows/tools/h5lsdll/h5lsdll.dsp
index 4eee108..a285ed5 100755
--- a/windows/tools/h5lsdll/h5lsdll.dsp
+++ b/windows/tools/h5lsdll/h5lsdll.dsp
@@ -1,170 +1,170 @@
-# Microsoft Developer Studio Project File - Name="h5lsdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5lsdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5lsdll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5lsdll.mak" CFG="h5lsdll - Win32 AlphaDbg"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5lsdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5lsdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5lsdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5lsdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "h5lsdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5lsdll/Release"
-# PROP Intermediate_Dir "../../../tools/h5lsdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "h5lsdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5lsdll/Debug"
-# PROP Intermediate_Dir "../../../tools/h5lsdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5lsdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5lsdll_"
-# PROP BASE Intermediate_Dir "h5lsdll_"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\tools" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5lsdll_/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5lsdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5lsdll0"
-# PROP BASE Intermediate_Dir "h5lsdll0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5lsdll0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5lsdll - Win32 Release"
-# Name "h5lsdll - Win32 Debug"
-# Name "h5lsdll - Win32 AlphaDbg"
-# Name "h5lsdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5ls\h5ls.c
-
-!IF "$(CFG)" == "h5lsdll - Win32 Release"
-
-!ELSEIF "$(CFG)" == "h5lsdll - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "h5lsdll - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "h5lsdll - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5lsdll" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
+
+CFG=h5lsdll - Win32 AlphaDbg
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5lsdll.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5lsdll.mak" CFG="h5lsdll - Win32 AlphaDbg"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5lsdll - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5lsdll - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5lsdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "h5lsdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "h5lsdll - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/h5lsdll/Release"
+# PROP Intermediate_Dir "../../../tools/h5lsdll/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /include:"Release/"
+# ADD F90 /include:"Release/"
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "h5lsdll - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/h5lsdll/Debug"
+# PROP Intermediate_Dir "../../../tools/h5lsdll/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /include:"Debug/"
+# ADD F90 /include:"Debug/"
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5lsdll - Win32 AlphaDbg"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "h5lsdll_"
+# PROP BASE Intermediate_Dir "h5lsdll_"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\tools" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"h5lsdll_/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5lsdll - Win32 AlphaRel"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "h5lsdll0"
+# PROP BASE Intermediate_Dir "h5lsdll0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"h5lsdll0/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5lsdll - Win32 Release"
+# Name "h5lsdll - Win32 Debug"
+# Name "h5lsdll - Win32 AlphaDbg"
+# Name "h5lsdll - Win32 AlphaRel"
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5ls\h5ls.c
+
+!IF "$(CFG)" == "h5lsdll - Win32 Release"
+
+!ELSEIF "$(CFG)" == "h5lsdll - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "h5lsdll - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "h5lsdll - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/h5repack/h5repack.dsp b/windows/tools/h5repack/h5repack.dsp
index 5e341af..4c42b45 100755
--- a/windows/tools/h5repack/h5repack.dsp
+++ b/windows/tools/h5repack/h5repack.dsp
@@ -1,143 +1,143 @@
-# Microsoft Developer Studio Project File - Name="h5repack" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5repack - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5repack.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5repack.mak" CFG="h5repack - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5repack - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5repack - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "h5repack - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5repack/Release"
-# PROP Intermediate_Dir "../../../tools/h5repack/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /I "..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF "$(CFG)" == "h5repack - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5repack/Debug"
-# PROP Intermediate_Dir "../../../tools/h5repack/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /browser /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /I "..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"D:\szip\all\lib\Debug"
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5repack - Win32 Release"
-# Name "h5repack - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_copy.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_filters.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_list.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_main.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_opttable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_parse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_refs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_verify.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5repack" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=h5repack - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5repack.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5repack.mak" CFG="h5repack - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5repack - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5repack - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+F90=df.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "h5repack - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/h5repack/Release"
+# PROP Intermediate_Dir "../../../tools/h5repack/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /I "..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
+
+!ELSEIF "$(CFG)" == "h5repack - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/h5repack/Debug"
+# PROP Intermediate_Dir "../../../tools/h5repack/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD F90 /browser /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /I "..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"D:\szip\all\lib\Debug"
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5repack - Win32 Release"
+# Name "h5repack - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack_copy.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack_filters.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack_list.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack_main.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack_opttable.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack_parse.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack_refs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack_verify.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/windows/tools/h5repackdll/h5repackdll.dsp b/windows/tools/h5repackdll/h5repackdll.dsp
index f1cee61..0533f1b 100755
--- a/windows/tools/h5repackdll/h5repackdll.dsp
+++ b/windows/tools/h5repackdll/h5repackdll.dsp
@@ -1,143 +1,143 @@
-# Microsoft Developer Studio Project File - Name="h5repackdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5repackdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5repackdll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5repackdll.mak" CFG="h5repackdll - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5repackdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5repackdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "h5repackdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5repackdll/Release"
-# PROP Intermediate_Dir "../../../tools/h5repackdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /I "..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "h5repackdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5repackdll/Debug"
-# PROP Intermediate_Dir "../../../tools/h5repackdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /I "..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5repackdll - Win32 Release"
-# Name "h5repackdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_copy.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_filters.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_list.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_main.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_opttable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_parse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_refs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_verify.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5repackdll" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=h5repackdll - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5repackdll.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5repackdll.mak" CFG="h5repackdll - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5repackdll - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5repackdll - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+F90=df.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "h5repackdll - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/h5repackdll/Release"
+# PROP Intermediate_Dir "../../../tools/h5repackdll/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /I "..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "h5repackdll - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/h5repackdll/Debug"
+# PROP Intermediate_Dir "../../../tools/h5repackdll/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /I "..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5repackdll - Win32 Release"
+# Name "h5repackdll - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack_copy.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack_filters.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack_list.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack_main.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack_opttable.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack_parse.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack_refs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack_verify.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5repack\h5repack.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/windows/tools/h5repart/h5repart.dsp b/windows/tools/h5repart/h5repart.dsp
index c12964a..b8875a4 100755
--- a/windows/tools/h5repart/h5repart.dsp
+++ b/windows/tools/h5repart/h5repart.dsp
@@ -1,170 +1,170 @@
-# Microsoft Developer Studio Project File - Name="h5repart" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5repart - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5repart.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5repart.mak" CFG="h5repart - Win32 AlphaDbg"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5repart - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5repart - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5repart - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5repart - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "h5repart - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5repart/Release"
-# PROP Intermediate_Dir "../../../tools/h5repart/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF "$(CFG)" == "h5repart - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5repart/Debug"
-# PROP Intermediate_Dir "../../../tools/h5repart/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5repart - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5repart"
-# PROP BASE Intermediate_Dir "h5repart"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5repart/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5repart - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5repar0"
-# PROP BASE Intermediate_Dir "h5repar0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5repar0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5repart - Win32 Release"
-# Name "h5repart - Win32 Debug"
-# Name "h5repart - Win32 AlphaDbg"
-# Name "h5repart - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\misc\h5repart.c
-
-!IF "$(CFG)" == "h5repart - Win32 Release"
-
-!ELSEIF "$(CFG)" == "h5repart - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "h5repart - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "h5repart - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5repart" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
+
+CFG=h5repart - Win32 AlphaDbg
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5repart.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5repart.mak" CFG="h5repart - Win32 AlphaDbg"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5repart - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5repart - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5repart - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "h5repart - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "h5repart - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/h5repart/Release"
+# PROP Intermediate_Dir "../../../tools/h5repart/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
+
+!ELSEIF "$(CFG)" == "h5repart - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/h5repart/Debug"
+# PROP Intermediate_Dir "../../../tools/h5repart/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5repart - Win32 AlphaDbg"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "h5repart"
+# PROP BASE Intermediate_Dir "h5repart"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"h5repart/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5repart - Win32 AlphaRel"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "h5repar0"
+# PROP BASE Intermediate_Dir "h5repar0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"h5repar0/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5repart - Win32 Release"
+# Name "h5repart - Win32 Debug"
+# Name "h5repart - Win32 AlphaDbg"
+# Name "h5repart - Win32 AlphaRel"
+# Begin Source File
+
+SOURCE=..\..\..\tools\misc\h5repart.c
+
+!IF "$(CFG)" == "h5repart - Win32 Release"
+
+!ELSEIF "$(CFG)" == "h5repart - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "h5repart - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "h5repart - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/h5repartdll/h5repartdll.dsp b/windows/tools/h5repartdll/h5repartdll.dsp
index e4250fc..5c11feb 100755
--- a/windows/tools/h5repartdll/h5repartdll.dsp
+++ b/windows/tools/h5repartdll/h5repartdll.dsp
@@ -1,170 +1,170 @@
-# Microsoft Developer Studio Project File - Name="h5repartdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5repartdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5repartdll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5repartdll.mak" CFG="h5repartdll - Win32 AlphaDbg"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5repartdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5repartdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5repartdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5repartdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "h5repartdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5repartdll/Release"
-# PROP Intermediate_Dir "../../../tools/h5repartdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "h5repartdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5repartdll/Debug"
-# PROP Intermediate_Dir "../../../tools/h5repartdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5repartdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5repart"
-# PROP BASE Intermediate_Dir "h5repart"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5repart/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5repartdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5repar0"
-# PROP BASE Intermediate_Dir "h5repar0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5repar0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5repartdll - Win32 Release"
-# Name "h5repartdll - Win32 Debug"
-# Name "h5repartdll - Win32 AlphaDbg"
-# Name "h5repartdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\misc\h5repart.c
-
-!IF "$(CFG)" == "h5repartdll - Win32 Release"
-
-!ELSEIF "$(CFG)" == "h5repartdll - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "h5repartdll - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "h5repartdll - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5repartdll" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
+
+CFG=h5repartdll - Win32 AlphaDbg
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5repartdll.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5repartdll.mak" CFG="h5repartdll - Win32 AlphaDbg"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5repartdll - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5repartdll - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5repartdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "h5repartdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "h5repartdll - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/h5repartdll/Release"
+# PROP Intermediate_Dir "../../../tools/h5repartdll/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /include:"Release/"
+# ADD F90 /include:"Release/"
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "h5repartdll - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/h5repartdll/Debug"
+# PROP Intermediate_Dir "../../../tools/h5repartdll/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /include:"Debug/"
+# ADD F90 /include:"Debug/"
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5repartdll - Win32 AlphaDbg"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "h5repart"
+# PROP BASE Intermediate_Dir "h5repart"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"h5repart/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5repartdll - Win32 AlphaRel"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "h5repar0"
+# PROP BASE Intermediate_Dir "h5repar0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"h5repar0/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5repartdll - Win32 Release"
+# Name "h5repartdll - Win32 Debug"
+# Name "h5repartdll - Win32 AlphaDbg"
+# Name "h5repartdll - Win32 AlphaRel"
+# Begin Source File
+
+SOURCE=..\..\..\tools\misc\h5repart.c
+
+!IF "$(CFG)" == "h5repartdll - Win32 Release"
+
+!ELSEIF "$(CFG)" == "h5repartdll - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "h5repartdll - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "h5repartdll - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/h5stat/h5stat.dsp b/windows/tools/h5stat/h5stat.dsp
index 6f4750d..607616c 100755
--- a/windows/tools/h5stat/h5stat.dsp
+++ b/windows/tools/h5stat/h5stat.dsp
@@ -1,106 +1,106 @@
-# Microsoft Developer Studio Project File - Name="h5stat" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5stat - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5stat.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5stat.mak" CFG="h5stat - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5stat - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5stat - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "h5stat - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5stat/Release"
-# PROP Intermediate_Dir "../../../tools/h5stat/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "h5stat - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5stat/Debug"
-# PROP Intermediate_Dir "../../../tools/h5stat/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5stat - Win32 Release"
-# Name "h5stat - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\tools\misc\h5stat.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5stat" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=h5stat - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5stat.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5stat.mak" CFG="h5stat - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5stat - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5stat - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+F90=df.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "h5stat - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/h5stat/Release"
+# PROP Intermediate_Dir "../../../tools/h5stat/Release"
+# PROP Target_Dir ""
+# ADD BASE F90 /compile_only /nologo /warn:nofileopt
+# ADD F90 /compile_only /nologo /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "h5stat - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/h5stat/Debug"
+# PROP Intermediate_Dir "../../../tools/h5stat/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
+# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5stat - Win32 Release"
+# Name "h5stat - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
+# Begin Source File
+
+SOURCE=..\..\..\tools\misc\h5stat.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/windows/tools/h5statdll/h5statdll.dsp b/windows/tools/h5statdll/h5statdll.dsp
index 9f1b2fa..8f7e1f0 100755
--- a/windows/tools/h5statdll/h5statdll.dsp
+++ b/windows/tools/h5statdll/h5statdll.dsp
@@ -1,105 +1,105 @@
-# Microsoft Developer Studio Project File - Name="h5statdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5statdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5statdll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5statdll.mak" CFG="h5statdll - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5statdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5statdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "h5statdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5statdll/Release"
-# PROP Intermediate_Dir "../../../tools/h5statdll/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "h5statdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5statdll/Debug"
-# PROP Intermediate_Dir "../../../tools/h5statdll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5statdll - Win32 Release"
-# Name "h5statdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\tools\misc\h5stat.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5statdll" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=h5statdll - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5statdll.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5statdll.mak" CFG="h5statdll - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5statdll - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5statdll - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+F90=df.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "h5statdll - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/h5statdll/Release"
+# PROP Intermediate_Dir "../../../tools/h5statdll/Release"
+# PROP Target_Dir ""
+# ADD BASE F90 /compile_only /nologo /warn:nofileopt
+# ADD F90 /compile_only /nologo /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "h5statdll - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/h5statdll/Debug"
+# PROP Intermediate_Dir "../../../tools/h5statdll/Debug"
+# PROP Target_Dir ""
+# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
+# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5statdll - Win32 Release"
+# Name "h5statdll - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
+# Begin Source File
+
+SOURCE=..\..\..\tools\misc\h5stat.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/windows/tools/h5unjam/h5unjam.dsp b/windows/tools/h5unjam/h5unjam.dsp
index e346ce7..02d6b58 100755
--- a/windows/tools/h5unjam/h5unjam.dsp
+++ b/windows/tools/h5unjam/h5unjam.dsp
@@ -1,95 +1,95 @@
-# Microsoft Developer Studio Project File - Name="h5unjam" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5unjam - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5unjam.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5unjam.mak" CFG="h5unjam - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5unjam - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5unjam - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "h5unjam - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5unjam/Release"
-# PROP Intermediate_Dir "../../../tools/h5unjam/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "h5unjam - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5unjam/Debug"
-# PROP Intermediate_Dir "../../../tools/h5unjam/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5unjam - Win32 Release"
-# Name "h5unjam - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5jam\h5unjam.c
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5unjam" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=h5unjam - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5unjam.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5unjam.mak" CFG="h5unjam - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5unjam - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5unjam - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+F90=df.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "h5unjam - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/h5unjam/Release"
+# PROP Intermediate_Dir "../../../tools/h5unjam/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "h5unjam - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/h5unjam/Debug"
+# PROP Intermediate_Dir "../../../tools/h5unjam/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5unjam - Win32 Release"
+# Name "h5unjam - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\..\tools\h5jam\h5unjam.c
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/importtest.BAT b/windows/tools/importtest.BAT
index 449109e..763bc70 100755
--- a/windows/tools/importtest.BAT
+++ b/windows/tools/importtest.BAT
@@ -1,190 +1,190 @@
-@REM Copyright by the Board of Trustees of the University of Illinois.
-@REM All rights reserved.
-@REM
-@REM This file is part of HDF5. The full HDF5 copyright notice, including
-@REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html. COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page. It can also be found at
-@REM http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have
-@REM access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-
-@echo off
-
-::This batch file is for h5import tests
-::Usage
-:: importtest release -- release static version
-:: importtest debug -- debug static version
-:: importtest release dll -- release dll version
-:: importtest debug dll -- debug dll version
-:: Written By: Fang GUO
-:: Date : Jan. 27, 2006
-
-:: Track total number of testing errors
- set /A totalerr=0
- set /A totalskip=0
-
-::**********************************************
-:: Generate a new temp directory for test h5diff
-::**********************************************
-
-:: Make a tempory directory for difftest
- mkdir temptest
-
-:: Run h5importtst
-cd testfiles\h5importtst\%1
-h5importtst.exe
-
-cd ..\..\..\
-
-::****************************************************
-:: Set the Environment Variables & Change Dir to .EXE
-::****************************************************
-
- :: The first incoming parameter should be configuration (debug or release)
- set p1=%1
- :: The second parameter should be the types of library (dll or blank)
- set p2=%2
-
- :: Set up some variables for convenience
- :: tempResults will contain the tests results temporarily
- set tempResults=importtest%2_%1.txt
- :: exefile will contain the file name of the executable file
- set exefile=h5import%p2%
- :: tooltest is the sub-batch file which will be called by tool test
- set tooltest=..\..\tooltest
- ::Handle the expected file and the actual output file
- ::ln is the total line numbers to be deleted from the actual output
- set ln=1
- ::ln_exp is the total line numbers to be deleted from the expected output
- set ln_exp=4
-
- ::Set some variables to contain .h5 file and its path for convenience
- ::Create the file to contain the tests output
- type nul > %tempResults%
-
- :: Set up Variables
- :: h5import%2 ..\..\testfiles\h5importtst\%1\txtin32 -c ..\..\h5import\testfiles\textin32 -o ..\..\temptest\act_h5\test1.h5
-
- ::Set up variables for h5import input files
- for %%i in (testfiles\h5importtst\%1\t*) do set %%~ni=..\..\testfiles\h5importtst\%p1%\%%~ni
- for %%i in (testfiles\h5importtst\%1\b*) do set %%~ni=..\..\testfiles\h5importtst\%p1%\%%~ni
-
- ::Set up variables for h5import configure files
- for %%i in (h5import\testfiles\text*) do set %%~ni=..\..\h5import\testfiles\%%~ni
- for %%i in (h5import\testfiles\con*) do set %%~ni=..\..\h5import\testfiles\%%~ni
- for %%i in (in1 fp1 fp2) do ( set %%i=..\..\h5import\testfiles\%%i)
-
- ::Set up variables for h5import output files
- for %%i in (h5import\testfiles\test*) do set out.%%~ni=..\..\temptest\out.%%~ni.h5
-
- ::Change directory to the directory where the .exe file is located
- cd h5import%p2%\%p1%
-
-::*********************************************
-:: Test each function by calling TOOLTEST.BAT
-::*********************************************
-::USAGE of importtest.bat
-::1. Set flag
-::2. Call batch file tooltest.bat followed with the expected file name
-::3. Example
-
-
-echo.
-echo.****************************************************
-echo. h5import%2 %1 T E S T S
-echo.****************************************************
-
-::TESTING "ASCII I32 rank 3 - Output BE
-set flag=%txtin32% -c %textin32% -o %out.test1%
-call %tooltest% textin32 test1.h5
-
-::TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended"
-set flag=%txtin16% -c %textin16% -o %out.test2%
-call %tooltest% textin16.txt test2.h5
-
-::TESTING "ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed "
-set flag=%txtin16% -c %textin8% -o %out.test3%
-call %tooltest% textin8.txt test3.h5
-
-::TESTING "ASCII UI32 - rank 3 - Output BE"
-set flag=%in1% -c %textuin32% -o %out.test4%
-call %tooltest% textuin32.txt test4.h5
-
-::TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed "
-set flag=%in1% -c %textuin16% -o %out.test5%
-call %tooltest% textuin16.txt test5.h5
-
-::TESTING "ASCII F32 - rank 3 - Output LE "
-set flag=%fp1% -c %textfp32% -o %out.test6%
-call %tooltest% textfp32.txt test6.h5
-
-::TESTING "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed "
-set flag=%fp2% -c %textfp64% -o %out.test7%
-call %tooltest% textfp64.txt test7.h5
-
-::TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed "
-set flag=%bfp64% -c %conbfp64% -o %out.test8%
-call %tooltest% conbfp64.txt test8.h5
-
-::TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended "
-set flag=%bin16% -c %conbin16% -o %out.test9%
-call %tooltest% conbin16.txt test9.h5
-
-::TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed "
-set flag=%bin8% -c %conbin8% -o %out.test10%
-call %tooltest% conbin8.txt test10.h5
-
-::TESTING "BINARY I32 - rank 3 - Output BE + CHUNKED "
-set flag=%bin32% -c %conbin32% -o %out.test11%
-call %tooltest% conbin32.txt test11.h5
-
-::TESTING "BINARY UI16 - rank 3 - Output byte BE + CHUNKED "
-set flag=%buin16% -c %conbuin16% -o %out.test12%
-call %tooltest% conbuin.txt test12.h5
-
-::TESTING "BINARY UI32 - rank 3 - Output LE + CHUNKED "
-set flag=%buin32% -c %conbuin32% -o %out.test13%
-call %tooltest% conbuin32.txt test13.h5
-
-::Change directory to hdf5\tools
-cd ..\..
-
-::Check if any of tests failed or skiped for the time being
-echo.
-if "%totalerr%"=="0" (
-echo. All of the %exefile% %p1% Tests Passed!
-echo. All of the %exefile% %p1% Tests Passed! >> %tempResults%
-) else (
-echo. %exefile% %p1% Tests Finished with %totalerr% Errors!
-echo. %exefile% %p1% Tests Finished with %totalerr% Errors!>> %tempResults%
-)
-
-if not "%totalskip%"=="0" (
-echo. %totalskip% Tests in total Skiped! >> %tempResults%
-echo. %totalskip% Tests in total Skiped!
-find "SKIPED" %tempResults% | more +2
-)
-
-::Clean up Environment Variables
-for %%i in (p1 p2 tempResults exefile tooltest ln ln_exp totalskip totalerr) do set %%i=
-set flag=
-
-::Clean up the variables set for h5import input files
-for %%i in (testfiles\h5importtst\%1\t*) do set %%~ni=
-for %%i in (testfiles\h5importtst\%1\b*) do set %%~ni=
-
-::Clean up the variables set for h5import configure files
-for %%i in (h5import\testfiles\text*) do set %%~ni=
-for %%i in (h5import\testfiles\con*) do set %%~ni=
-for %%i in (in1 fp1 fp2) do ( set %%i=..\..\h5import\testfiles\%%i)
-
-::Clean up the variables set for h5import output files
-for %%i in (h5import\testfiles\test*) do (
-set out.%%~ni=
-)
-::Clean up Temporary Files
-rmdir /s/q temptest
-
-
+@REM Copyright by the Board of Trustees of the University of Illinois.
+@REM All rights reserved.
+@REM
+@REM This file is part of HDF5. The full HDF5 copyright notice, including
+@REM terms governing use, modification, and redistribution, is contained in
+@REM the files COPYING and Copyright.html. COPYING can be found at the root
+@REM of the source code distribution tree; Copyright.html can be found at the
+@REM root level of an installed copy of the electronic HDF5 document set and
+@REM is linked from the top-level documents page. It can also be found at
+@REM http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have
+@REM access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+
+@echo off
+
+::This batch file is for h5import tests
+::Usage
+:: importtest release -- release static version
+:: importtest debug -- debug static version
+:: importtest release dll -- release dll version
+:: importtest debug dll -- debug dll version
+:: Written By: Fang GUO
+:: Date : Jan. 27, 2006
+
+:: Track total number of testing errors
+ set /A totalerr=0
+ set /A totalskip=0
+
+::**********************************************
+:: Generate a new temp directory for test h5diff
+::**********************************************
+
+:: Make a tempory directory for difftest
+ mkdir temptest
+
+:: Run h5importtst
+cd testfiles\h5importtst\%1
+h5importtst.exe
+
+cd ..\..\..\
+
+::****************************************************
+:: Set the Environment Variables & Change Dir to .EXE
+::****************************************************
+
+ :: The first incoming parameter should be configuration (debug or release)
+ set p1=%1
+ :: The second parameter should be the types of library (dll or blank)
+ set p2=%2
+
+ :: Set up some variables for convenience
+ :: tempResults will contain the tests results temporarily
+ set tempResults=importtest%2_%1.txt
+ :: exefile will contain the file name of the executable file
+ set exefile=h5import%p2%
+ :: tooltest is the sub-batch file which will be called by tool test
+ set tooltest=..\..\tooltest
+ ::Handle the expected file and the actual output file
+ ::ln is the total line numbers to be deleted from the actual output
+ set ln=1
+ ::ln_exp is the total line numbers to be deleted from the expected output
+ set ln_exp=4
+
+ ::Set some variables to contain .h5 file and its path for convenience
+ ::Create the file to contain the tests output
+ type nul > %tempResults%
+
+ :: Set up Variables
+ :: h5import%2 ..\..\testfiles\h5importtst\%1\txtin32 -c ..\..\h5import\testfiles\textin32 -o ..\..\temptest\act_h5\test1.h5
+
+ ::Set up variables for h5import input files
+ for %%i in (testfiles\h5importtst\%1\t*) do set %%~ni=..\..\testfiles\h5importtst\%p1%\%%~ni
+ for %%i in (testfiles\h5importtst\%1\b*) do set %%~ni=..\..\testfiles\h5importtst\%p1%\%%~ni
+
+ ::Set up variables for h5import configure files
+ for %%i in (h5import\testfiles\text*) do set %%~ni=..\..\h5import\testfiles\%%~ni
+ for %%i in (h5import\testfiles\con*) do set %%~ni=..\..\h5import\testfiles\%%~ni
+ for %%i in (in1 fp1 fp2) do ( set %%i=..\..\h5import\testfiles\%%i)
+
+ ::Set up variables for h5import output files
+ for %%i in (h5import\testfiles\test*) do set out.%%~ni=..\..\temptest\out.%%~ni.h5
+
+ ::Change directory to the directory where the .exe file is located
+ cd h5import%p2%\%p1%
+
+::*********************************************
+:: Test each function by calling TOOLTEST.BAT
+::*********************************************
+::USAGE of importtest.bat
+::1. Set flag
+::2. Call batch file tooltest.bat followed with the expected file name
+::3. Example
+
+
+echo.
+echo.****************************************************
+echo. h5import%2 %1 T E S T S
+echo.****************************************************
+
+::TESTING "ASCII I32 rank 3 - Output BE
+set flag=%txtin32% -c %textin32% -o %out.test1%
+call %tooltest% textin32 test1.h5
+
+::TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended"
+set flag=%txtin16% -c %textin16% -o %out.test2%
+call %tooltest% textin16.txt test2.h5
+
+::TESTING "ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed "
+set flag=%txtin16% -c %textin8% -o %out.test3%
+call %tooltest% textin8.txt test3.h5
+
+::TESTING "ASCII UI32 - rank 3 - Output BE"
+set flag=%in1% -c %textuin32% -o %out.test4%
+call %tooltest% textuin32.txt test4.h5
+
+::TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed "
+set flag=%in1% -c %textuin16% -o %out.test5%
+call %tooltest% textuin16.txt test5.h5
+
+::TESTING "ASCII F32 - rank 3 - Output LE "
+set flag=%fp1% -c %textfp32% -o %out.test6%
+call %tooltest% textfp32.txt test6.h5
+
+::TESTING "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed "
+set flag=%fp2% -c %textfp64% -o %out.test7%
+call %tooltest% textfp64.txt test7.h5
+
+::TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed "
+set flag=%bfp64% -c %conbfp64% -o %out.test8%
+call %tooltest% conbfp64.txt test8.h5
+
+::TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended "
+set flag=%bin16% -c %conbin16% -o %out.test9%
+call %tooltest% conbin16.txt test9.h5
+
+::TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed "
+set flag=%bin8% -c %conbin8% -o %out.test10%
+call %tooltest% conbin8.txt test10.h5
+
+::TESTING "BINARY I32 - rank 3 - Output BE + CHUNKED "
+set flag=%bin32% -c %conbin32% -o %out.test11%
+call %tooltest% conbin32.txt test11.h5
+
+::TESTING "BINARY UI16 - rank 3 - Output byte BE + CHUNKED "
+set flag=%buin16% -c %conbuin16% -o %out.test12%
+call %tooltest% conbuin.txt test12.h5
+
+::TESTING "BINARY UI32 - rank 3 - Output LE + CHUNKED "
+set flag=%buin32% -c %conbuin32% -o %out.test13%
+call %tooltest% conbuin32.txt test13.h5
+
+::Change directory to hdf5\tools
+cd ..\..
+
+::Check if any of tests failed or skiped for the time being
+echo.
+if "%totalerr%"=="0" (
+echo. All of the %exefile% %p1% Tests Passed!
+echo. All of the %exefile% %p1% Tests Passed! >> %tempResults%
+) else (
+echo. %exefile% %p1% Tests Finished with %totalerr% Errors!
+echo. %exefile% %p1% Tests Finished with %totalerr% Errors!>> %tempResults%
+)
+
+if not "%totalskip%"=="0" (
+echo. %totalskip% Tests in total Skiped! >> %tempResults%
+echo. %totalskip% Tests in total Skiped!
+find "SKIPED" %tempResults% | more +2
+)
+
+::Clean up Environment Variables
+for %%i in (p1 p2 tempResults exefile tooltest ln ln_exp totalskip totalerr) do set %%i=
+set flag=
+
+::Clean up the variables set for h5import input files
+for %%i in (testfiles\h5importtst\%1\t*) do set %%~ni=
+for %%i in (testfiles\h5importtst\%1\b*) do set %%~ni=
+
+::Clean up the variables set for h5import configure files
+for %%i in (h5import\testfiles\text*) do set %%~ni=
+for %%i in (h5import\testfiles\con*) do set %%~ni=
+for %%i in (in1 fp1 fp2) do ( set %%i=..\..\h5import\testfiles\%%i)
+
+::Clean up the variables set for h5import output files
+for %%i in (h5import\testfiles\test*) do (
+set out.%%~ni=
+)
+::Clean up Temporary Files
+rmdir /s/q temptest
+
+
diff --git a/windows/tools/lstest.BAT b/windows/tools/lstest.BAT
index 547cf21..1bb933e 100755
--- a/windows/tools/lstest.BAT
+++ b/windows/tools/lstest.BAT
@@ -1,174 +1,174 @@
-@REM Copyright by the Board of Trustees of the University of Illinois.
-@REM All rights reserved.
-@REM
-@REM This file is part of HDF5. The full HDF5 copyright notice, including
-@REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html. COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page. It can also be found at
-@REM http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have
-@REM access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-
-@echo off
-
-::This batch file is for h5ls tests
-::Usage
-:: lstest release -- release static version
-:: lstest debug -- debug static version
-:: lstest release dll -- release dll version
-:: lstest debug dll -- debug dll version
-:: Written By: Fang GUO
-:: Date : Jan. 27, 2006
-
-
-:: Track total number of testing errors
- set /A totalerr=0
- set /A totalskip=0
-
-
-::*******************************************************
-:: Generate a new temp directory for test h5dump
-::*******************************************************
- mkdir temptest
-
-::******************************************************************
-:: Set the Environment Variables & Change Dir to Dir with h5dump.EXE
-::******************************************************************
-
- :: The first incoming parameter should be configuration (debug or release)
- set p1=%1
- :: The second parameter should be the types of library (dll or blank)
- set p2=%2
-
- :: Before comparison between expected file and the actual outputfile,
- :: Ignore the first line in actual outputfile and the first four lines
- :: in the expected output file
-
- set ln=0
- set ln_exp=3
-
- :: Save the tests output into a temporary file
- set tempResults=lstest%2_%1.txt
- type nul > %tempResults%
-
- :: Define the .exe file based on the second parameter
- set exefile=h5ls%p2%
-
- :: For convenience, set a variable for the sub batch file
- set tooltest=..\..\tooltest
-
- :: For convenience, set variable for all testfiles/*.h5 files
- for %%i in (testfiles\*.h5) do set %%~ni=..\..\%%i
-
- :: Change the directory to dir including .exe file
- cd h5ls%p2%\%p1%
-
-::Test h5ls with different options
-
-echo.****************************************************
-echo. h5ls%2 %1 T E S T S
-echo.****************************************************
-
-:: The paramter following %tooltest% is the expected output file
-:: Path of the expected output file is not needed
-
-:: Toss in a bunch of tests. Not sure if they are the right kinds.
-:: test the help syntax
-set flag=-w80 -h
-call %tooltest% help-1.ls
-
-set flag=-w80 -help
-call %tooltest% help-2.ls
-
-set flag=-w80 -?
-call %tooltest% help-3.ls
-
-:: test simple command
-set flag=-w80 %tall%
-call %tooltest% tall-1.ls
-
-set flag=-w80 -r -d %tall%
-call %tooltest% tall-2.ls
-
-set flag=-w80 %tgroup%
-call %tooltest% tgroup.ls
-
-:: test for displaying groups
-set flag=-w80 -r -g %tgroup%
-call %tooltest% tgroup-1.ls
-
-:: test for displaying simple space datasets
-set flag=-w80 -r -d %tdset%
-call %tooltest% tdset-1.ls
-
-:: test for displaying soft links
-set flag=-w80 -r %tslink%
-call %tooltest% tslink-1.ls
-
-:: tests for hard links
-set flag=-w80 %thlink%
-call %tooltest% thlink-1.ls
-
-:: tests for compound data types
-set flag=-w80 -r -d %tcompound%
-call %tooltest% tcomp-1.ls
-
-::test for the nested compound type
-set flag=-w80 -r -d %tnestedcomp%
-call %tooltest% tnestcomp-1.ls
-
-:: test for loop detection
-set flag=-w80 -r -d %tloop%
-call %tooltest% tloop-1.ls
-
-:: test for string
-set flag=-w80 -r -d %tstr%
-call %tooltest% tstr-1.ls
-
-:: test test file created from lib SAF team
-set flag=-w80 -r -d %tsaf%
-call %tooltest% tsaf.ls
-
-:: test for variable length data types
-set flag=-w80 -r -d %tvldtypes1%
-call %tooltest% tvldtypes1.ls
-
-:: test for array data types
-set flag=-w80 -r -d %tarray1%
-call %tooltest% tarray1.ls
-
-:: test for empty data
-set flag=-w80 -d %tempty%
-call %tooltest% tempty.ls
-
-:: test for all dataset types written to attributes
-:: enable -S for avoiding printing NATIVE types
-:: need batch mask.bat
-set flag=-w80 -v -S %tattr2%
-call %tooltest% tattr2.ls MASK
-
-if %totalerr%==0 (
-echo. All of the %exefile% %p1% Tests Passed!
-echo. All of the %exefile% %p1% Tests Passed! >> %tempResults%
-) else (
-echo. %exefile% %p1% Tests Finished with %totalerr% Errors!
-echo. %exefile% %p1% Tests Finished with %totalerr% Errors!>> %tempResults%
-)
-
-if not %totalskip%==0 (
-echo. %totalskip% Tests in total Skiped! >> %tempResults%
-echo. %totalskip% Tests in total Skiped!
-echo.
-find "SKIPED" %tempResults% | more +2
-)
-
-
-cd ..\..
-rmdir /s/q temptest
-
-for %%i in (testfiles\*.h5) do set %%~ni=
-set test_szip=
-set output_szip=
-for %%v in (p1 p2 tempResults exefile tooltest ln ln_exp tsplit_file tmulti tfamily05d totalskip) do set %%v=
-
+@REM Copyright by the Board of Trustees of the University of Illinois.
+@REM All rights reserved.
+@REM
+@REM This file is part of HDF5. The full HDF5 copyright notice, including
+@REM terms governing use, modification, and redistribution, is contained in
+@REM the files COPYING and Copyright.html. COPYING can be found at the root
+@REM of the source code distribution tree; Copyright.html can be found at the
+@REM root level of an installed copy of the electronic HDF5 document set and
+@REM is linked from the top-level documents page. It can also be found at
+@REM http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have
+@REM access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+
+@echo off
+
+::This batch file is for h5ls tests
+::Usage
+:: lstest release -- release static version
+:: lstest debug -- debug static version
+:: lstest release dll -- release dll version
+:: lstest debug dll -- debug dll version
+:: Written By: Fang GUO
+:: Date : Jan. 27, 2006
+
+
+:: Track total number of testing errors
+ set /A totalerr=0
+ set /A totalskip=0
+
+
+::*******************************************************
+:: Generate a new temp directory for test h5dump
+::*******************************************************
+ mkdir temptest
+
+::******************************************************************
+:: Set the Environment Variables & Change Dir to Dir with h5dump.EXE
+::******************************************************************
+
+ :: The first incoming parameter should be configuration (debug or release)
+ set p1=%1
+ :: The second parameter should be the types of library (dll or blank)
+ set p2=%2
+
+ :: Before comparison between expected file and the actual outputfile,
+ :: Ignore the first line in actual outputfile and the first four lines
+ :: in the expected output file
+
+ set ln=0
+ set ln_exp=3
+
+ :: Save the tests output into a temporary file
+ set tempResults=lstest%2_%1.txt
+ type nul > %tempResults%
+
+ :: Define the .exe file based on the second parameter
+ set exefile=h5ls%p2%
+
+ :: For convenience, set a variable for the sub batch file
+ set tooltest=..\..\tooltest
+
+ :: For convenience, set variable for all testfiles/*.h5 files
+ for %%i in (testfiles\*.h5) do set %%~ni=..\..\%%i
+
+ :: Change the directory to dir including .exe file
+ cd h5ls%p2%\%p1%
+
+::Test h5ls with different options
+
+echo.****************************************************
+echo. h5ls%2 %1 T E S T S
+echo.****************************************************
+
+:: The paramter following %tooltest% is the expected output file
+:: Path of the expected output file is not needed
+
+:: Toss in a bunch of tests. Not sure if they are the right kinds.
+:: test the help syntax
+set flag=-w80 -h
+call %tooltest% help-1.ls
+
+set flag=-w80 -help
+call %tooltest% help-2.ls
+
+set flag=-w80 -?
+call %tooltest% help-3.ls
+
+:: test simple command
+set flag=-w80 %tall%
+call %tooltest% tall-1.ls
+
+set flag=-w80 -r -d %tall%
+call %tooltest% tall-2.ls
+
+set flag=-w80 %tgroup%
+call %tooltest% tgroup.ls
+
+:: test for displaying groups
+set flag=-w80 -r -g %tgroup%
+call %tooltest% tgroup-1.ls
+
+:: test for displaying simple space datasets
+set flag=-w80 -r -d %tdset%
+call %tooltest% tdset-1.ls
+
+:: test for displaying soft links
+set flag=-w80 -r %tslink%
+call %tooltest% tslink-1.ls
+
+:: tests for hard links
+set flag=-w80 %thlink%
+call %tooltest% thlink-1.ls
+
+:: tests for compound data types
+set flag=-w80 -r -d %tcompound%
+call %tooltest% tcomp-1.ls
+
+::test for the nested compound type
+set flag=-w80 -r -d %tnestedcomp%
+call %tooltest% tnestcomp-1.ls
+
+:: test for loop detection
+set flag=-w80 -r -d %tloop%
+call %tooltest% tloop-1.ls
+
+:: test for string
+set flag=-w80 -r -d %tstr%
+call %tooltest% tstr-1.ls
+
+:: test test file created from lib SAF team
+set flag=-w80 -r -d %tsaf%
+call %tooltest% tsaf.ls
+
+:: test for variable length data types
+set flag=-w80 -r -d %tvldtypes1%
+call %tooltest% tvldtypes1.ls
+
+:: test for array data types
+set flag=-w80 -r -d %tarray1%
+call %tooltest% tarray1.ls
+
+:: test for empty data
+set flag=-w80 -d %tempty%
+call %tooltest% tempty.ls
+
+:: test for all dataset types written to attributes
+:: enable -S for avoiding printing NATIVE types
+:: need batch mask.bat
+set flag=-w80 -v -S %tattr2%
+call %tooltest% tattr2.ls MASK
+
+if %totalerr%==0 (
+echo. All of the %exefile% %p1% Tests Passed!
+echo. All of the %exefile% %p1% Tests Passed! >> %tempResults%
+) else (
+echo. %exefile% %p1% Tests Finished with %totalerr% Errors!
+echo. %exefile% %p1% Tests Finished with %totalerr% Errors!>> %tempResults%
+)
+
+if not %totalskip%==0 (
+echo. %totalskip% Tests in total Skiped! >> %tempResults%
+echo. %totalskip% Tests in total Skiped!
+echo.
+find "SKIPED" %tempResults% | more +2
+)
+
+
+cd ..\..
+rmdir /s/q temptest
+
+for %%i in (testfiles\*.h5) do set %%~ni=
+set test_szip=
+set output_szip=
+for %%v in (p1 p2 tempResults exefile tooltest ln ln_exp tsplit_file tmulti tfamily05d totalskip) do set %%v=
+
diff --git a/windows/tools/mask.BAT b/windows/tools/mask.BAT
index a933caf..e4f6bf4 100755
--- a/windows/tools/mask.BAT
+++ b/windows/tools/mask.BAT
@@ -1,21 +1,21 @@
-@REM Copyright by the Board of Trustees of the University of Illinois.
-@REM All rights reserved.
-@REM
-@REM This file is part of HDF5. The full HDF5 copyright notice, including
-@REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html. COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page. It can also be found at
-@REM http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have
-@REM access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-
-type nul > %2
-for /f "tokens=1,2*" %%a in (
- %1
-) do ( if %%a==Modified: (
- echo Modified: XXXX-XX-XX XX:XX:XX XXX>> %2
-) else (
- echo %%a %%b %%c>>%2
-)
-)
+@REM Copyright by the Board of Trustees of the University of Illinois.
+@REM All rights reserved.
+@REM
+@REM This file is part of HDF5. The full HDF5 copyright notice, including
+@REM terms governing use, modification, and redistribution, is contained in
+@REM the files COPYING and Copyright.html. COPYING can be found at the root
+@REM of the source code distribution tree; Copyright.html can be found at the
+@REM root level of an installed copy of the electronic HDF5 document set and
+@REM is linked from the top-level documents page. It can also be found at
+@REM http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have
+@REM access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+
+type nul > %2
+for /f "tokens=1,2*" %%a in (
+ %1
+) do ( if %%a==Modified: (
+ echo Modified: XXXX-XX-XX XX:XX:XX XXX>> %2
+) else (
+ echo %%a %%b %%c>>%2
+)
+)
diff --git a/windows/tools/repacktest.BAT b/windows/tools/repacktest.BAT
index 76108b2..aa36438 100755
--- a/windows/tools/repacktest.BAT
+++ b/windows/tools/repacktest.BAT
@@ -1,455 +1,455 @@
-@REM Copyright by the Board of Trustees of the University of Illinois.
-@REM All rights reserved.
-@REM
-@REM This file is part of HDF5. The full HDF5 copyright notice, including
-@REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html. COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page. It can also be found at
-@REM http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have
-@REM access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-
-@echo off
-
-::This batch file is for h5repack tests
-::Usage
-:: repacktest release -- release static version
-:: repacktest debug -- debug static version
-:: repacktest release dll -- release dll version
-:: repacktest debug dll -- debug dll version
-:: Written By: Fang GUO
-:: Date : Jan. 12, 2006
-
-::What is actually doing?
-::Example case
-::h5repack -i ..\..\testfiles\test1.h5 -o ..\..\temptest\out.test1.h5
-::h5diff ..\..\testfiles\test1.h5 ..\..\temptest\out.test1.h5 > ..\..\temptest\temp.txt 2>&1
-::fc ..\..\temptest\temp.txt temptest\notcomp.txt
-::if %ERRORLEVEL%==0 (
-:: echo Testing h5repack test1.h5 PASSED >> ..\..\repacktest%2_%1.txt
-::) else (
-:: echo Testing h5repack test1.h5 FAILED >> ..\..\repacktest%2_%1.txt
-:: more temp.txt >> ..\..\repacktest%2_%1.txt
-::)
-
-
-
- :: We will check whether the SZIP library available includes encoder or not by
- :: calling the szip encoder detecting executable file testh5repack_detect_szip(dll).exe
- :: and check the printed value.
- :: If the printed value is "yes", then the SZIP library has encoder, HDF5_SZIP_ENCODE will be set as 1.
- :: Otherwise, HDF5_SZIP_ENCODE will be set as 0, and some tests will be skipped.
-
- FOR /F "delims=" %%a in ('testfiles\testh5repack_detect_szip%2\%1\testh5repack_detect_szip%2.exe') Do Set "Output=%%a"
- if "%Output%"=="yes" (
- Set HDF5_SZIP_ENCODE=1
- ) else (
- Set HDF5_SZIP_ENCODE=0
- )
-
-:: Track total number of testing errors
- set /A totalerr=0
- set /A totalskip=0
-
-::*******************************************************************
-:: Generate a new temp directory for test h5repack and reference file
-::*******************************************************************
- ::Make a temporary directory for testing h5repack
- mkdir temptest
-
- :: Reference Files
- :: After running h5repack with a input .h5 file, it will use
- :: h5diff to compare the expected .h5 file with the output
- :: .h5 file generated by h5repack. The comparison results will be
- :: one of the following two cases.
-
- :: Case 1: No difference between the expected .h5 and .h5 generated by h5repack file
- type nul > temptest\empty.txt
-
- ::Case 2: For test1.h5 and test2.h5, the output will be "Some objects
- :: are not comparable", but actually there is no difference between
-
- type nul > temptest\notcomp.txt
- echo -------------------------------->>temptest\notcomp.txt
- echo Some objects are not comparable>> temptest\notcomp.txt
- echo -------------------------------->>temptest\notcomp.txt
- echo Use -v for a list of objects.>> temptest\notcomp.txt
-
- :: Set two variables to contain the following two file names and paths
- set nodiff=..\..\temptest\empty.txt
- set notcomp=..\..\temptest\notcomp.txt
-
-::****************************************************
-:: Set the Environment Variables & Change Dir to .EXE
-::****************************************************
-
- :: The first incoming parameter should be configuration (debug or release)
- set p1=%1
- :: The second parameter should be the types of library (dll or blank)
- set p2=%2
-
- :: Set file name for the test results
- set tempResults=repacktest%2_%1.txt
- :: Set exe file name
- set exefile=h5repack%p2%
- :: Set a variable for the sub batch file tools\tooltest.bat
- set tooltest=..\..\tooltest
-
- :: Set Variables to contain the file name and path of input and output files for testing h5repack
- for %%v in (0 1 2 3 4 5 _szip _deflate _shuffle _fletcher32 _nbit _scaleoffset _all) do (
- set test%%v=..\..\testfiles\test%%v.h5
- set output%%v=..\..\temptest\out.test%%v.h5
- )
-
- :: Creat the file for saving the tests results
- type nul > %tempResults%
-
- :: Change to the direcotory where the .exe file is located
- cd h5repack%p2%\%p1%
-
-::*********************************************
-:: Test each function by calling TOOLTEST.BAT
-::*********************************************
-
-echo.
-echo.****************************************************
-echo. h5repack%2 %1 T E S T S
-echo.****************************************************
-
-::Basic Usage:
-::1. Set flag
-::2. Call batch file tooltest.bat followed with the expected file name
-::3. Example
-::If we want to test
-::h5repack -i ..\..\testfiles\test1.h5 -o ..\..\temptest\out.test1.h5
-::At first, we need to set the flag like
-::set flag=-i %test1% -o %output1%
-::Secondly, we call batch file tooltest.bat followed by one of reference files
-::call %tooltest% %test1% %notcomp%
-
-:: Using Filters (Zlib, SZIP)
-::1. Set flag
-::2. Call batch file tooltest.bat followed with the expected file name, zlib\szip
-::3. Example
-::If we want to test
-::h5repack -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 f dset2:SZIP=8,EC -l dset2:CHUNK=20x10
-
-::At first, we need to set the flag like
-::set flag=-i %test4% -o %output4% f dset2:SZIP=8,EC -l dset2:CHUNK=20x10
-
-::Secondly, we call batch file tooltest.bat followed by one of reference files and szip
-::call %tooltest% %test4% %nodiff% szip
-
-::Similarly, if you are using zlib, replace "szip" with "zlib" when calling %tooltest%
-::If you are using both zlib and szip, replace "szip" with "zlib szip" when calling %tooltest%
-::The order of "zlib szip" does matter.
-
-::Skip Tests
-::Put "skip" after the reference file, like the following
-::set flag=-i %test_scaleoffset% -o %output_scaleoffset% -f dset_none:S+O=31
-::call %tooltest% %test_scaleoffset% %nodiff% skip
-
-::--------------
-:: test0.h5
-::--------------
-set flag=-i %test0% -o %output0%
-call %tooltest% %test0% %nodiff%
-
-
-::This case will be used as an example case for
-::illustration purpose inside tooltest.bat for repacktest
-::--------------
-:: test1.h5
-::--------------
-
-:: Actually we are doing:
-:: set flag=-i ..\..\testfiles\test1.h5 -o ..\..\temptest\out.test1.h5
-:: call ..\..\tooltest ..\..\testfiles\test1.h5 ..\..\temptest\notcomp.txt
-
-set flag=-i %test1% -o %output1%
-call %tooltest% %test1% %notcomp%
-
-
-::--------------
-:: test2.h5
-::--------------
-set flag=-i %test2% -o %output2%
-call %tooltest% %test2% %notcomp%
-
-::--------------
-:: test3.h5
-::--------------
-set flag=-i %test3% -o %output3%
-call %tooltest% %test3% %nodiff%
-
-
-::--------------
-:: test4.h5
-::--------------
-set flag=-i %test4% -o %output4%
-call %tooltest% %test4% %nodiff%
-
-::--------------
-:: test5.h5
-::--------------
-set flag=-i %test5% -o %output5%
-call %tooltest% %test5% %nodiff%
-
-::****************************************************************
-:: use test4.h5 to write some filters (this file has no filters)
-::****************************************************************
-
-::---------------------------
-::gzip with individual object
-::---------------------------
-set flag=-i %test4% -o %output4% -f dset1:GZIP=1 -l dset1:CHUNK=20x10
-call %tooltest% %test4% %nodiff% zlib
-
-::-------------
-::gzip for all
-::-------------
-set flag=-i %test4% -o %output4% -f GZIP=1
-call %tooltest% %test4% %nodiff% zlib
-
-::--------------------------
-::szip for individual object
-::--------------------------
-set flag=-i %test4% -o %output4% f dset2:SZIP=8,EC -l dset2:CHUNK=20x10
-call %tooltest% %test4% %nodiff% szip
-
-::--------------
-:: szip for all
-::--------------
-set flag=-i %test4% -o %output4% -f SZIP=8,NN
-call %tooltest% %test4% %nodiff% szip
-
-::-------------------------------
-:: shuffle with individual object
-::-------------------------------
-set flag=-i %test4% -o %output4% -f dset2:SHUF -l dset2:CHUNK=20x10
-call %tooltest% %test4% %nodiff%
-
-::----------------
-:: shuffle for all
-::----------------
-set flag=-i %test4% -o %output4% -f SHUF
-call %tooltest% %test4% %nodiff%
-
-::-----------------------------------
-:: fletcher32 with individual object
-::-----------------------------------
-set flag=-i %test4% -o %output4% -f dset2:FLET -l dset2:CHUNK=20x10
-call %tooltest% %test4% %nodiff%
-
-::--------------------
-:: fletcher32 for all
-::--------------------
-set flag=-i %test4% -o %output4% -f FLET
-call %tooltest% %test4% %nodiff%
-
-::------------
-::all filters
-::------------
-set flag=-i %test4% -o %output4% -f dset2:SHUF -f dset2:FLET -f dset2:SZIP=8,NN -f dset2:GZIP=1 -l dset2:CHUNK=20x10
-call %tooltest% %test4% %nodiff%
-
-:: ***********************************************************
-:: the following tests assume the input files have filters
-:: ***********************************************************
-
-::-----------
-:: szip copy
-::-----------
-set flag=-i %test_szip% -o %output_szip%
-call %tooltest% %test_szip% %nodiff%
-
-::------------
-::szip remove
-::------------
-set flag=-i %test_szip% -o %output_szip% -f dset_szip:NONE
-call %tooltest% %test_szip% %nodiff%
-
-::--------------
-:: deflate copy
-::--------------
-set flag=-i %test_deflate% -o %output_deflate%
-call %tooltest% %test_deflate% %nodiff%
-
-::---------------
-:: deflate remove
-::---------------
-set flag=-i %test_deflate% -o %output_deflate% -f dset_deflate:NONE
-call %tooltest% %test_deflate% %nodiff%
-
-::--------------
-:: shuffle copy
-::--------------
-set flag=-i %test_shuffle% -o %output_shuffle%
-call %tooltest% %test_shuffle% %nodiff%
-
-::----------------
-:: shuffle remove
-::----------------
-set flag=-i %test_shuffle% -o %output_shuffle% -f dset_shuffle:NONE
-call %tooltest% %test_shuffle% %nodiff%
-
-::-----------------
-:: fletcher32 copy
-::-----------------
-set flag=-i %test_fletcher32% -o %output_fletcher32%
-call %tooltest% %test_fletcher32% %nodiff%
-
-::------------------
-:: fletcher32 remove
-::------------------
-set flag=-i %test_fletcher32% -o %output_fletcher32% -f dset_fletcher32:NONE
-call %tooltest% %test_fletcher32% %nodiff%
-
-::----------
-:: nbit copy
-::----------
-set flag=-i %test_nbit% -o %output_nbit%
-call %tooltest% %test_nbit% %nodiff%
-
-::------------
-:: nbit remove
-::------------
-set flag=-i %test_nbit% -o %output_nbit% -f dset_nbit:NONE
-call %tooltest% %test_nbit% %nodiff%
-
-::---------
-:: nbit add
-::---------
-set flag=-i %test_nbit% -o %output_nbit% -f dset_int31:NBIT
-call %tooltest% %test_nbit% %nodiff%
-
-::----------------
-:: scaleoffset add
-::----------------
-set flag=-i %test_scaleoffset% -o %output_scaleoffset% -f dset_none:S+O=31
-call %tooltest% %test_scaleoffset% %nodiff% skip
-
-::-----------------
-:: scaleoffset copy
-::-----------------
-set flag=-i %test_scaleoffset% -o %output_scaleoffset%
-call %tooltest% %test_scaleoffset% %nodiff% skip
-
-::-------------------
-:: scaleoffset remove
-::-------------------
-set flag=-i %test_scaleoffset% -o %output_scaleoffset% -f dset_scaleoffset:NONE
-call %tooltest% %test_scaleoffset% %nodiff% skip
-
-::--------------------
-:: remove all filters
-::--------------------
-set flag=-i %test_all% -o %output_all%
-call %tooltest% %test_scaleoffset% %nodiff% skip
-
-::------------------
-::filter conversions
-::------------------
-set flag=-i %test_deflate% -o %output_deflate% -f dset_deflate:SZIP=8,NN
-call %tooltest% %test_deflate% %nodiff% zlib szip
-
-set flag=-i %test_szip% -o %output_szip% -f dset_szip:GZIP=1
-call %tooltest% %test_szip% %nodiff% zlib szip
-
-::------
-::limit
-::------
-set flag=-i %test4% -o %output4% -f GZIP=1 -m 1024
-call %tooltest% %test4% %nodiff% zlib
-
-::-----
-::file
-::-----
-set flag=-i %test4% -o %output4% -e ..\..\testfiles\h5repack_info.txt
-call %tooltest% %test4% %nodiff% zlib
-
-echo. *********************************************
-echo layout options (these files have no filters)
-echo. *********************************************
-
-set flag=-i %test4% -o %output4% -l dset2:CHUNK=20x10
-call %tooltest% %test4% %nodiff%
-
-set flag=-i %test4% -o %output4% -l CHUNK=20x10
-call %tooltest% %test4% %nodiff%
-
-set flag=-i %test4% -o %output4% -l dset2:CONTI
-call %tooltest% %test4% %nodiff%
-
-set flag=-i %test4% -o %output4% -l CONTI
-call %tooltest% %test4% %nodiff%
-
-set flag=-i %test4% -o %output4% -l dset2:COMPA
-call %tooltest% %test4% %nodiff%
-
-set flag=-i %test4% -o %output4% -l COMPA
-call %tooltest% %test4% %nodiff%
-
-echo. *****************************************
-echo layout conversions (file has no filters)
-echo. *****************************************
-
-set flag=-i %test4% -o %output4% -l dset_compact:CONTI
-call %tooltest% %test4% %nodiff%
-
-set flag=-i %test4% -o %output4% -l dset_compact:CHUNK=2x5
-call %tooltest% %test4% %nodiff%
-
-set flag=-i %test4% -o %output4% -l dset_compact:COMPA
-call %tooltest% %test4% %nodiff%
-
-set flag=-i %test4% -o %output4% -l dset_contiguous:COMPA
-call %tooltest% %test4% %nodiff%
-
-set flag=-i %test4% -o %output4% -l dset_contiguous:CHUNK=3x6
-call %tooltest% %test4% %nodiff%
-
-set flag=-i %test4% -o %output4% -l dset_contiguous:CONTI
-call %tooltest% %test4% %nodiff%
-
-set flag=-i %test4% -o %output4% -l dset_chunk:COMPA
-call %tooltest% %test4% %nodiff%
-
-set flag=-i %test4% -o %output4% -l dset_chunk:CHUNK=18x13
-call %tooltest% %test4% %nodiff%
-
-set flag=-i %test4% -o %output4% -l dset_chunk:CONTI
-call %tooltest% %test4% %nodiff%
-
-cd ..\..
-
-echo.
-::Tests how many tests failed and how many tests skiped
-if %totalerr%==0 (
-echo. All of the %exefile% %p1% Tests Passed!
-echo. All of the %exefile% %p1% Tests Passed! >> %tempResults%
-) else (
-echo. %exefile% %p1% Tests Finished with %totalerr% Errors!
-echo. %exefile% %p1% Tests Finished with %totalerr% Errors!>> %tempResults%
-)
-
-if not %totalskip%==0 (
-echo. %totalskip% Tests in total Skiped! >> %tempResults%
-echo. %totalskip% Tests in total Skiped!
-echo.
-find "SKIPED" %tempResults% | more +2
-)
-
-:: remove direcotory temptest and all its contents
-rmdir /s/q temptest
-
-:: Clean environment variables
-
-for %%v in (p1 p2 tempResults exefile tooltest nodiff notcomp totalerr totalskip) do set %%v=
-for %%v in (0 1 2 3 4 5 _szip _deflate _shuffle _fletcher32 _nbit _scaleoffset _all) do (
-set test%%v=
-set output%%v=
-)
-
-
+@REM Copyright by the Board of Trustees of the University of Illinois.
+@REM All rights reserved.
+@REM
+@REM This file is part of HDF5. The full HDF5 copyright notice, including
+@REM terms governing use, modification, and redistribution, is contained in
+@REM the files COPYING and Copyright.html. COPYING can be found at the root
+@REM of the source code distribution tree; Copyright.html can be found at the
+@REM root level of an installed copy of the electronic HDF5 document set and
+@REM is linked from the top-level documents page. It can also be found at
+@REM http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have
+@REM access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+
+@echo off
+
+::This batch file is for h5repack tests
+::Usage
+:: repacktest release -- release static version
+:: repacktest debug -- debug static version
+:: repacktest release dll -- release dll version
+:: repacktest debug dll -- debug dll version
+:: Written By: Fang GUO
+:: Date : Jan. 12, 2006
+
+::What is actually doing?
+::Example case
+::h5repack -i ..\..\testfiles\test1.h5 -o ..\..\temptest\out.test1.h5
+::h5diff ..\..\testfiles\test1.h5 ..\..\temptest\out.test1.h5 > ..\..\temptest\temp.txt 2>&1
+::fc ..\..\temptest\temp.txt temptest\notcomp.txt
+::if %ERRORLEVEL%==0 (
+:: echo Testing h5repack test1.h5 PASSED >> ..\..\repacktest%2_%1.txt
+::) else (
+:: echo Testing h5repack test1.h5 FAILED >> ..\..\repacktest%2_%1.txt
+:: more temp.txt >> ..\..\repacktest%2_%1.txt
+::)
+
+
+
+ :: We will check whether the SZIP library available includes encoder or not by
+ :: calling the szip encoder detecting executable file testh5repack_detect_szip(dll).exe
+ :: and check the printed value.
+ :: If the printed value is "yes", then the SZIP library has encoder, HDF5_SZIP_ENCODE will be set as 1.
+ :: Otherwise, HDF5_SZIP_ENCODE will be set as 0, and some tests will be skipped.
+
+ FOR /F "delims=" %%a in ('testfiles\testh5repack_detect_szip%2\%1\testh5repack_detect_szip%2.exe') Do Set "Output=%%a"
+ if "%Output%"=="yes" (
+ Set HDF5_SZIP_ENCODE=1
+ ) else (
+ Set HDF5_SZIP_ENCODE=0
+ )
+
+:: Track total number of testing errors
+ set /A totalerr=0
+ set /A totalskip=0
+
+::*******************************************************************
+:: Generate a new temp directory for test h5repack and reference file
+::*******************************************************************
+ ::Make a temporary directory for testing h5repack
+ mkdir temptest
+
+ :: Reference Files
+ :: After running h5repack with a input .h5 file, it will use
+ :: h5diff to compare the expected .h5 file with the output
+ :: .h5 file generated by h5repack. The comparison results will be
+ :: one of the following two cases.
+
+ :: Case 1: No difference between the expected .h5 and .h5 generated by h5repack file
+ type nul > temptest\empty.txt
+
+ ::Case 2: For test1.h5 and test2.h5, the output will be "Some objects
+ :: are not comparable", but actually there is no difference between
+
+ type nul > temptest\notcomp.txt
+ echo -------------------------------->>temptest\notcomp.txt
+ echo Some objects are not comparable>> temptest\notcomp.txt
+ echo -------------------------------->>temptest\notcomp.txt
+ echo Use -v for a list of objects.>> temptest\notcomp.txt
+
+ :: Set two variables to contain the following two file names and paths
+ set nodiff=..\..\temptest\empty.txt
+ set notcomp=..\..\temptest\notcomp.txt
+
+::****************************************************
+:: Set the Environment Variables & Change Dir to .EXE
+::****************************************************
+
+ :: The first incoming parameter should be configuration (debug or release)
+ set p1=%1
+ :: The second parameter should be the types of library (dll or blank)
+ set p2=%2
+
+ :: Set file name for the test results
+ set tempResults=repacktest%2_%1.txt
+ :: Set exe file name
+ set exefile=h5repack%p2%
+ :: Set a variable for the sub batch file tools\tooltest.bat
+ set tooltest=..\..\tooltest
+
+ :: Set Variables to contain the file name and path of input and output files for testing h5repack
+ for %%v in (0 1 2 3 4 5 _szip _deflate _shuffle _fletcher32 _nbit _scaleoffset _all) do (
+ set test%%v=..\..\testfiles\test%%v.h5
+ set output%%v=..\..\temptest\out.test%%v.h5
+ )
+
+ :: Creat the file for saving the tests results
+ type nul > %tempResults%
+
+ :: Change to the direcotory where the .exe file is located
+ cd h5repack%p2%\%p1%
+
+::*********************************************
+:: Test each function by calling TOOLTEST.BAT
+::*********************************************
+
+echo.
+echo.****************************************************
+echo. h5repack%2 %1 T E S T S
+echo.****************************************************
+
+::Basic Usage:
+::1. Set flag
+::2. Call batch file tooltest.bat followed with the expected file name
+::3. Example
+::If we want to test
+::h5repack -i ..\..\testfiles\test1.h5 -o ..\..\temptest\out.test1.h5
+::At first, we need to set the flag like
+::set flag=-i %test1% -o %output1%
+::Secondly, we call batch file tooltest.bat followed by one of reference files
+::call %tooltest% %test1% %notcomp%
+
+:: Using Filters (Zlib, SZIP)
+::1. Set flag
+::2. Call batch file tooltest.bat followed with the expected file name, zlib\szip
+::3. Example
+::If we want to test
+::h5repack -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 f dset2:SZIP=8,EC -l dset2:CHUNK=20x10
+
+::At first, we need to set the flag like
+::set flag=-i %test4% -o %output4% f dset2:SZIP=8,EC -l dset2:CHUNK=20x10
+
+::Secondly, we call batch file tooltest.bat followed by one of reference files and szip
+::call %tooltest% %test4% %nodiff% szip
+
+::Similarly, if you are using zlib, replace "szip" with "zlib" when calling %tooltest%
+::If you are using both zlib and szip, replace "szip" with "zlib szip" when calling %tooltest%
+::The order of "zlib szip" does matter.
+
+::Skip Tests
+::Put "skip" after the reference file, like the following
+::set flag=-i %test_scaleoffset% -o %output_scaleoffset% -f dset_none:S+O=31
+::call %tooltest% %test_scaleoffset% %nodiff% skip
+
+::--------------
+:: test0.h5
+::--------------
+set flag=-i %test0% -o %output0%
+call %tooltest% %test0% %nodiff%
+
+
+::This case will be used as an example case for
+::illustration purpose inside tooltest.bat for repacktest
+::--------------
+:: test1.h5
+::--------------
+
+:: Actually we are doing:
+:: set flag=-i ..\..\testfiles\test1.h5 -o ..\..\temptest\out.test1.h5
+:: call ..\..\tooltest ..\..\testfiles\test1.h5 ..\..\temptest\notcomp.txt
+
+set flag=-i %test1% -o %output1%
+call %tooltest% %test1% %notcomp%
+
+
+::--------------
+:: test2.h5
+::--------------
+set flag=-i %test2% -o %output2%
+call %tooltest% %test2% %notcomp%
+
+::--------------
+:: test3.h5
+::--------------
+set flag=-i %test3% -o %output3%
+call %tooltest% %test3% %nodiff%
+
+
+::--------------
+:: test4.h5
+::--------------
+set flag=-i %test4% -o %output4%
+call %tooltest% %test4% %nodiff%
+
+::--------------
+:: test5.h5
+::--------------
+set flag=-i %test5% -o %output5%
+call %tooltest% %test5% %nodiff%
+
+::****************************************************************
+:: use test4.h5 to write some filters (this file has no filters)
+::****************************************************************
+
+::---------------------------
+::gzip with individual object
+::---------------------------
+set flag=-i %test4% -o %output4% -f dset1:GZIP=1 -l dset1:CHUNK=20x10
+call %tooltest% %test4% %nodiff% zlib
+
+::-------------
+::gzip for all
+::-------------
+set flag=-i %test4% -o %output4% -f GZIP=1
+call %tooltest% %test4% %nodiff% zlib
+
+::--------------------------
+::szip for individual object
+::--------------------------
+set flag=-i %test4% -o %output4% f dset2:SZIP=8,EC -l dset2:CHUNK=20x10
+call %tooltest% %test4% %nodiff% szip
+
+::--------------
+:: szip for all
+::--------------
+set flag=-i %test4% -o %output4% -f SZIP=8,NN
+call %tooltest% %test4% %nodiff% szip
+
+::-------------------------------
+:: shuffle with individual object
+::-------------------------------
+set flag=-i %test4% -o %output4% -f dset2:SHUF -l dset2:CHUNK=20x10
+call %tooltest% %test4% %nodiff%
+
+::----------------
+:: shuffle for all
+::----------------
+set flag=-i %test4% -o %output4% -f SHUF
+call %tooltest% %test4% %nodiff%
+
+::-----------------------------------
+:: fletcher32 with individual object
+::-----------------------------------
+set flag=-i %test4% -o %output4% -f dset2:FLET -l dset2:CHUNK=20x10
+call %tooltest% %test4% %nodiff%
+
+::--------------------
+:: fletcher32 for all
+::--------------------
+set flag=-i %test4% -o %output4% -f FLET
+call %tooltest% %test4% %nodiff%
+
+::------------
+::all filters
+::------------
+set flag=-i %test4% -o %output4% -f dset2:SHUF -f dset2:FLET -f dset2:SZIP=8,NN -f dset2:GZIP=1 -l dset2:CHUNK=20x10
+call %tooltest% %test4% %nodiff%
+
+:: ***********************************************************
+:: the following tests assume the input files have filters
+:: ***********************************************************
+
+::-----------
+:: szip copy
+::-----------
+set flag=-i %test_szip% -o %output_szip%
+call %tooltest% %test_szip% %nodiff%
+
+::------------
+::szip remove
+::------------
+set flag=-i %test_szip% -o %output_szip% -f dset_szip:NONE
+call %tooltest% %test_szip% %nodiff%
+
+::--------------
+:: deflate copy
+::--------------
+set flag=-i %test_deflate% -o %output_deflate%
+call %tooltest% %test_deflate% %nodiff%
+
+::---------------
+:: deflate remove
+::---------------
+set flag=-i %test_deflate% -o %output_deflate% -f dset_deflate:NONE
+call %tooltest% %test_deflate% %nodiff%
+
+::--------------
+:: shuffle copy
+::--------------
+set flag=-i %test_shuffle% -o %output_shuffle%
+call %tooltest% %test_shuffle% %nodiff%
+
+::----------------
+:: shuffle remove
+::----------------
+set flag=-i %test_shuffle% -o %output_shuffle% -f dset_shuffle:NONE
+call %tooltest% %test_shuffle% %nodiff%
+
+::-----------------
+:: fletcher32 copy
+::-----------------
+set flag=-i %test_fletcher32% -o %output_fletcher32%
+call %tooltest% %test_fletcher32% %nodiff%
+
+::------------------
+:: fletcher32 remove
+::------------------
+set flag=-i %test_fletcher32% -o %output_fletcher32% -f dset_fletcher32:NONE
+call %tooltest% %test_fletcher32% %nodiff%
+
+::----------
+:: nbit copy
+::----------
+set flag=-i %test_nbit% -o %output_nbit%
+call %tooltest% %test_nbit% %nodiff%
+
+::------------
+:: nbit remove
+::------------
+set flag=-i %test_nbit% -o %output_nbit% -f dset_nbit:NONE
+call %tooltest% %test_nbit% %nodiff%
+
+::---------
+:: nbit add
+::---------
+set flag=-i %test_nbit% -o %output_nbit% -f dset_int31:NBIT
+call %tooltest% %test_nbit% %nodiff%
+
+::----------------
+:: scaleoffset add
+::----------------
+set flag=-i %test_scaleoffset% -o %output_scaleoffset% -f dset_none:S+O=31
+call %tooltest% %test_scaleoffset% %nodiff% skip
+
+::-----------------
+:: scaleoffset copy
+::-----------------
+set flag=-i %test_scaleoffset% -o %output_scaleoffset%
+call %tooltest% %test_scaleoffset% %nodiff% skip
+
+::-------------------
+:: scaleoffset remove
+::-------------------
+set flag=-i %test_scaleoffset% -o %output_scaleoffset% -f dset_scaleoffset:NONE
+call %tooltest% %test_scaleoffset% %nodiff% skip
+
+::--------------------
+:: remove all filters
+::--------------------
+set flag=-i %test_all% -o %output_all%
+call %tooltest% %test_scaleoffset% %nodiff% skip
+
+::------------------
+::filter conversions
+::------------------
+set flag=-i %test_deflate% -o %output_deflate% -f dset_deflate:SZIP=8,NN
+call %tooltest% %test_deflate% %nodiff% zlib szip
+
+set flag=-i %test_szip% -o %output_szip% -f dset_szip:GZIP=1
+call %tooltest% %test_szip% %nodiff% zlib szip
+
+::------
+::limit
+::------
+set flag=-i %test4% -o %output4% -f GZIP=1 -m 1024
+call %tooltest% %test4% %nodiff% zlib
+
+::-----
+::file
+::-----
+set flag=-i %test4% -o %output4% -e ..\..\testfiles\h5repack_info.txt
+call %tooltest% %test4% %nodiff% zlib
+
+echo. *********************************************
+echo layout options (these files have no filters)
+echo. *********************************************
+
+set flag=-i %test4% -o %output4% -l dset2:CHUNK=20x10
+call %tooltest% %test4% %nodiff%
+
+set flag=-i %test4% -o %output4% -l CHUNK=20x10
+call %tooltest% %test4% %nodiff%
+
+set flag=-i %test4% -o %output4% -l dset2:CONTI
+call %tooltest% %test4% %nodiff%
+
+set flag=-i %test4% -o %output4% -l CONTI
+call %tooltest% %test4% %nodiff%
+
+set flag=-i %test4% -o %output4% -l dset2:COMPA
+call %tooltest% %test4% %nodiff%
+
+set flag=-i %test4% -o %output4% -l COMPA
+call %tooltest% %test4% %nodiff%
+
+echo. *****************************************
+echo layout conversions (file has no filters)
+echo. *****************************************
+
+set flag=-i %test4% -o %output4% -l dset_compact:CONTI
+call %tooltest% %test4% %nodiff%
+
+set flag=-i %test4% -o %output4% -l dset_compact:CHUNK=2x5
+call %tooltest% %test4% %nodiff%
+
+set flag=-i %test4% -o %output4% -l dset_compact:COMPA
+call %tooltest% %test4% %nodiff%
+
+set flag=-i %test4% -o %output4% -l dset_contiguous:COMPA
+call %tooltest% %test4% %nodiff%
+
+set flag=-i %test4% -o %output4% -l dset_contiguous:CHUNK=3x6
+call %tooltest% %test4% %nodiff%
+
+set flag=-i %test4% -o %output4% -l dset_contiguous:CONTI
+call %tooltest% %test4% %nodiff%
+
+set flag=-i %test4% -o %output4% -l dset_chunk:COMPA
+call %tooltest% %test4% %nodiff%
+
+set flag=-i %test4% -o %output4% -l dset_chunk:CHUNK=18x13
+call %tooltest% %test4% %nodiff%
+
+set flag=-i %test4% -o %output4% -l dset_chunk:CONTI
+call %tooltest% %test4% %nodiff%
+
+cd ..\..
+
+echo.
+::Tests how many tests failed and how many tests skiped
+if %totalerr%==0 (
+echo. All of the %exefile% %p1% Tests Passed!
+echo. All of the %exefile% %p1% Tests Passed! >> %tempResults%
+) else (
+echo. %exefile% %p1% Tests Finished with %totalerr% Errors!
+echo. %exefile% %p1% Tests Finished with %totalerr% Errors!>> %tempResults%
+)
+
+if not %totalskip%==0 (
+echo. %totalskip% Tests in total Skiped! >> %tempResults%
+echo. %totalskip% Tests in total Skiped!
+echo.
+find "SKIPED" %tempResults% | more +2
+)
+
+:: remove direcotory temptest and all its contents
+rmdir /s/q temptest
+
+:: Clean environment variables
+
+for %%v in (p1 p2 tempResults exefile tooltest nodiff notcomp totalerr totalskip) do set %%v=
+for %%v in (0 1 2 3 4 5 _szip _deflate _shuffle _fletcher32 _nbit _scaleoffset _all) do (
+set test%%v=
+set output%%v=
+)
+
+
diff --git a/windows/tools/talign/talign.dsp b/windows/tools/talign/talign.dsp
index d907c08..ce2195c 100755
--- a/windows/tools/talign/talign.dsp
+++ b/windows/tools/talign/talign.dsp
@@ -1,95 +1,95 @@
-# Microsoft Developer Studio Project File - Name="talign" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=talign - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "talign.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "talign.mak" CFG="talign - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "talign - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "talign - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "talign - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/talign/Release"
-# PROP Intermediate_Dir "../../../tools/talign/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\tools\lib" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF "$(CFG)" == "talign - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/talign/Debug"
-# PROP Intermediate_Dir "../../../tools/talign/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\tools\lib" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "talign - Win32 Release"
-# Name "talign - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\talign.c
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="talign" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=talign - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "talign.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "talign.mak" CFG="talign - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "talign - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "talign - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+F90=df.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "talign - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/talign/Release"
+# PROP Intermediate_Dir "../../../tools/talign/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /compile_only /nologo /warn:nofileopt
+# ADD F90 /compile_only /nologo /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\tools\lib" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
+
+!ELSEIF "$(CFG)" == "talign - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/talign/Debug"
+# PROP Intermediate_Dir "../../../tools/talign/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
+# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\tools\lib" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "talign - Win32 Release"
+# Name "talign - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\talign.c
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/taligndll/taligndll.dsp b/windows/tools/taligndll/taligndll.dsp
index acffceb..cc3e8c4 100755
--- a/windows/tools/taligndll/taligndll.dsp
+++ b/windows/tools/taligndll/taligndll.dsp
@@ -1,95 +1,95 @@
-# Microsoft Developer Studio Project File - Name="taligndll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=taligndll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "taligndll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "taligndll.mak" CFG="taligndll - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "taligndll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "taligndll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "taligndll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/taligndll/Release"
-# PROP Intermediate_Dir "../../../tools/taligndll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\tools\lib" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "taligndll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/taligndll/Debug"
-# PROP Intermediate_Dir "../../../tools/taligndll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\tools\lib" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "taligndll - Win32 Release"
-# Name "taligndll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\talign.c
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="taligndll" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=taligndll - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "taligndll.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "taligndll.mak" CFG="taligndll - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "taligndll - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "taligndll - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+F90=df.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "taligndll - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../tools/taligndll/Release"
+# PROP Intermediate_Dir "../../../tools/taligndll/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /compile_only /nologo /warn:nofileopt
+# ADD F90 /compile_only /nologo /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\tools\lib" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "taligndll - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../tools/taligndll/Debug"
+# PROP Intermediate_Dir "../../../tools/taligndll/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
+# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\tools\lib" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "taligndll - Win32 Release"
+# Name "taligndll - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\talign.c
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/testfiles/h5difftst/h5difftst.dsp b/windows/tools/testfiles/h5difftst/h5difftst.dsp
index d1bd2ad..979894f 100755
--- a/windows/tools/testfiles/h5difftst/h5difftst.dsp
+++ b/windows/tools/testfiles/h5difftst/h5difftst.dsp
@@ -1,111 +1,111 @@
-# Microsoft Developer Studio Project File - Name="h5difftst" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5difftst - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5difftst.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5difftst.mak" CFG="h5difftst - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5difftst - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5difftst - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "h5difftst - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/h5difftst/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5difftst/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF "$(CFG)" == "h5difftst - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/h5difftst/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5difftst/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5difftst - Win32 Release"
-# Name "h5difftst - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5diff\h5diffgentest.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5diff\testh5diff.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5difftst" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=h5difftst - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5difftst.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5difftst.mak" CFG="h5difftst - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5difftst - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5difftst - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+F90=df.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "h5difftst - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../../tools/testfiles/h5difftst/Release"
+# PROP Intermediate_Dir "../../../../tools/testfiles/h5difftst/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
+
+!ELSEIF "$(CFG)" == "h5difftst - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../../tools/testfiles/h5difftst/Debug"
+# PROP Intermediate_Dir "../../../../tools/testfiles/h5difftst/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5difftst - Win32 Release"
+# Name "h5difftst - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5diff\h5diffgentest.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5diff\testh5diff.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/windows/tools/testfiles/h5dumptst/h5dumptst.dsp b/windows/tools/testfiles/h5dumptst/h5dumptst.dsp
index 34dc637..f79af25 100755
--- a/windows/tools/testfiles/h5dumptst/h5dumptst.dsp
+++ b/windows/tools/testfiles/h5dumptst/h5dumptst.dsp
@@ -1,170 +1,170 @@
-# Microsoft Developer Studio Project File - Name="h5dumptst" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5dumptst - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5dumptst.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5dumptst.mak" CFG="h5dumptst - Win32 AlphaDbg"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5dumptst - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5dumptst - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5dumptst - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5dumptst - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "h5dumptst - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/h5dumptst/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5dumptst/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF "$(CFG)" == "h5dumptst - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/h5dumptst/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5dumptst/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5dumptst - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5dumpts"
-# PROP BASE Intermediate_Dir "h5dumpts"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "h5dumpts"
-# PROP Intermediate_Dir "h5dumpts"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5dumpts/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"h5dumpts/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "h5dumptst - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5dumpt0"
-# PROP BASE Intermediate_Dir "h5dumpt0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "h5dumpt0"
-# PROP Intermediate_Dir "h5dumpt0"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5dumpt0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"h5dumpt0/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5dumptst - Win32 Release"
-# Name "h5dumptst - Win32 Debug"
-# Name "h5dumptst - Win32 AlphaDbg"
-# Name "h5dumptst - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5dump\h5dumpgentest.c
-
-!IF "$(CFG)" == "h5dumptst - Win32 Release"
-
-!ELSEIF "$(CFG)" == "h5dumptst - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "h5dumptst - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "h5dumptst - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5dumptst" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
+
+CFG=h5dumptst - Win32 AlphaDbg
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5dumptst.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5dumptst.mak" CFG="h5dumptst - Win32 AlphaDbg"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5dumptst - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5dumptst - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5dumptst - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "h5dumptst - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "h5dumptst - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../../tools/testfiles/h5dumptst/Release"
+# PROP Intermediate_Dir "../../../../tools/testfiles/h5dumptst/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
+
+!ELSEIF "$(CFG)" == "h5dumptst - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../../tools/testfiles/h5dumptst/Debug"
+# PROP Intermediate_Dir "../../../../tools/testfiles/h5dumptst/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5dumptst - Win32 AlphaDbg"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "h5dumpts"
+# PROP BASE Intermediate_Dir "h5dumpts"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "h5dumpts"
+# PROP Intermediate_Dir "h5dumpts"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"h5dumpts/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"h5dumpts/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "h5dumptst - Win32 AlphaRel"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "h5dumpt0"
+# PROP BASE Intermediate_Dir "h5dumpt0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "h5dumpt0"
+# PROP Intermediate_Dir "h5dumpt0"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"h5dumpt0/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"h5dumpt0/" /nologo /warn:nofileopt
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5dumptst - Win32 Release"
+# Name "h5dumptst - Win32 Debug"
+# Name "h5dumptst - Win32 AlphaDbg"
+# Name "h5dumptst - Win32 AlphaRel"
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5dump\h5dumpgentest.c
+
+!IF "$(CFG)" == "h5dumptst - Win32 Release"
+
+!ELSEIF "$(CFG)" == "h5dumptst - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "h5dumptst - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "h5dumptst - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/testfiles/h5importtst/h5importtst.dsp b/windows/tools/testfiles/h5importtst/h5importtst.dsp
index 918288c..571705d 100755
--- a/windows/tools/testfiles/h5importtst/h5importtst.dsp
+++ b/windows/tools/testfiles/h5importtst/h5importtst.dsp
@@ -1,95 +1,95 @@
-# Microsoft Developer Studio Project File - Name="h5importtst" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5importtst - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5importtst.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5importtst.mak" CFG="h5importtst - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5importtst - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5importtst - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "h5importtst - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/h5importtst/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5importtst/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "h5importtst - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/h5importtst/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5importtst/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5importtst - Win32 Release"
-# Name "h5importtst - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5import\h5importtest.c
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5importtst" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=h5importtst - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5importtst.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5importtst.mak" CFG="h5importtst - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5importtst - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5importtst - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+F90=df.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "h5importtst - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../../tools/testfiles/h5importtst/Release"
+# PROP Intermediate_Dir "../../../../tools/testfiles/h5importtst/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "h5importtst - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../../tools/testfiles/h5importtst/Debug"
+# PROP Intermediate_Dir "../../../../tools/testfiles/h5importtst/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5importtst - Win32 Release"
+# Name "h5importtst - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5import\h5importtest.c
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/testfiles/h5jamtst/h5jamtst.dsp b/windows/tools/testfiles/h5jamtst/h5jamtst.dsp
index 87b6ac2..1682d36 100755
--- a/windows/tools/testfiles/h5jamtst/h5jamtst.dsp
+++ b/windows/tools/testfiles/h5jamtst/h5jamtst.dsp
@@ -1,95 +1,95 @@
-# Microsoft Developer Studio Project File - Name="h5jamtst" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5jamtst - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5jamtst.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5jamtst.mak" CFG="h5jamtst - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5jamtst - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5jamtst - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "h5jamtst - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/h5jamtst/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5jamtst/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "h5jamtst - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/h5jamtst/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5jamtst/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5jamtst - Win32 Release"
-# Name "h5jamtst - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5jam\h5jamgentest.c
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5jamtst" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=h5jamtst - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5jamtst.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5jamtst.mak" CFG="h5jamtst - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5jamtst - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5jamtst - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+F90=df.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "h5jamtst - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../../tools/testfiles/h5jamtst/Release"
+# PROP Intermediate_Dir "../../../../tools/testfiles/h5jamtst/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "h5jamtst - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../../tools/testfiles/h5jamtst/Debug"
+# PROP Intermediate_Dir "../../../../tools/testfiles/h5jamtst/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5jamtst - Win32 Release"
+# Name "h5jamtst - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5jam\h5jamgentest.c
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/testfiles/h5repacktst/h5repacktst.dsp b/windows/tools/testfiles/h5repacktst/h5repacktst.dsp
index 2059b72..47e159e 100755
--- a/windows/tools/testfiles/h5repacktst/h5repacktst.dsp
+++ b/windows/tools/testfiles/h5repacktst/h5repacktst.dsp
@@ -1,159 +1,159 @@
-# Microsoft Developer Studio Project File - Name="h5repacktst" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5repacktst - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5repacktst.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5repacktst.mak" CFG="h5repacktst - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5repacktst - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5repacktst - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "h5repacktst - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/h5repacktst/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5repacktst/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "h5repacktst - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/h5repacktst/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5repacktst/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /browser /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"D:\szip\all\lib\Debug"
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5repacktst - Win32 Release"
-# Name "h5repacktst - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repack.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repack_copy.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repack_filters.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repack_list.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repack_opttable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repack_parse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repack_refs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repack_verify.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\testh5repack_attr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\testh5repack_dset.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\testh5repack_main.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\testh5repack_make.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\testh5repack_util.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repack.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5repacktst" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=h5repacktst - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5repacktst.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5repacktst.mak" CFG="h5repacktst - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5repacktst - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5repacktst - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+F90=df.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "h5repacktst - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../../tools/testfiles/h5repacktst/Release"
+# PROP Intermediate_Dir "../../../../tools/testfiles/h5repacktst/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "h5repacktst - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../../tools/testfiles/h5repacktst/Debug"
+# PROP Intermediate_Dir "../../../../tools/testfiles/h5repacktst/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD F90 /browser /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"D:\szip\all\lib\Debug"
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5repacktst - Win32 Release"
+# Name "h5repacktst - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5repack\h5repack.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5repack\h5repack_copy.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5repack\h5repack_filters.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5repack\h5repack_list.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5repack\h5repack_opttable.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5repack\h5repack_parse.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5repack\h5repack_refs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5repack\h5repack_verify.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5repack\testh5repack_attr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5repack\testh5repack_dset.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5repack\testh5repack_main.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5repack\testh5repack_make.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5repack\testh5repack_util.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5repack\h5repack.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/windows/tools/testfiles/h5repart_gentest/h5repart_gentest.dsp b/windows/tools/testfiles/h5repart_gentest/h5repart_gentest.dsp
index a6c2002..bc5d3b8 100755
--- a/windows/tools/testfiles/h5repart_gentest/h5repart_gentest.dsp
+++ b/windows/tools/testfiles/h5repart_gentest/h5repart_gentest.dsp
@@ -1,106 +1,106 @@
-# Microsoft Developer Studio Project File - Name="h5repart_gentest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5repart_gentest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5repart_gentest.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5repart_gentest.mak" CFG="h5repart_gentest - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5repart_gentest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5repart_gentest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "h5repart_gentest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/h5repart_gentest/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5repart_gentest/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "h5repart_gentest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/h5repart_gentest/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5repart_gentest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5repart_gentest - Win32 Release"
-# Name "h5repart_gentest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\misc\h5repart_gentest.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5repart_gentest" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=h5repart_gentest - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5repart_gentest.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5repart_gentest.mak" CFG="h5repart_gentest - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5repart_gentest - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5repart_gentest - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+F90=df.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "h5repart_gentest - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../../tools/testfiles/h5repart_gentest/Release"
+# PROP Intermediate_Dir "../../../../tools/testfiles/h5repart_gentest/Release"
+# PROP Target_Dir ""
+# ADD BASE F90 /compile_only /nologo /warn:nofileopt
+# ADD F90 /compile_only /nologo /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "h5repart_gentest - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../../tools/testfiles/h5repart_gentest/Debug"
+# PROP Intermediate_Dir "../../../../tools/testfiles/h5repart_gentest/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
+# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5repart_gentest - Win32 Release"
+# Name "h5repart_gentest - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\misc\h5repart_gentest.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/windows/tools/testfiles/h5reparttst/h5reparttst.dsp b/windows/tools/testfiles/h5reparttst/h5reparttst.dsp
index 88b1e8c..7df8b68 100755
--- a/windows/tools/testfiles/h5reparttst/h5reparttst.dsp
+++ b/windows/tools/testfiles/h5reparttst/h5reparttst.dsp
@@ -1,105 +1,105 @@
-# Microsoft Developer Studio Project File - Name="h5reparttst" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5reparttst - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "h5reparttst.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "h5reparttst.mak" CFG="h5reparttst - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "h5reparttst - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5reparttst - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "h5reparttst - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/h5reparttst/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5reparttst/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "h5reparttst - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/h5reparttst/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5reparttst/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "h5reparttst - Win32 Release"
-# Name "h5reparttst - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\misc\repart_test.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="h5reparttst" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=h5reparttst - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "h5reparttst.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "h5reparttst.mak" CFG="h5reparttst - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "h5reparttst - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "h5reparttst - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+F90=df.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "h5reparttst - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../../tools/testfiles/h5reparttst/Release"
+# PROP Intermediate_Dir "../../../../tools/testfiles/h5reparttst/Release"
+# PROP Target_Dir ""
+# ADD BASE F90 /compile_only /nologo /warn:nofileopt
+# ADD F90 /compile_only /nologo /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "h5reparttst - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../../tools/testfiles/h5reparttst/Debug"
+# PROP Intermediate_Dir "../../../../tools/testfiles/h5reparttst/Debug"
+# PROP Target_Dir ""
+# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
+# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "h5reparttst - Win32 Release"
+# Name "h5reparttst - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\misc\repart_test.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/windows/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.dsp b/windows/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.dsp
index afe8e70..aa719a1 100755
--- a/windows/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.dsp
+++ b/windows/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.dsp
@@ -1,95 +1,95 @@
-# Microsoft Developer Studio Project File - Name="testh5repack_detect_szip" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=testh5repack_detect_szip - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "testh5repack_detect_szip.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "testh5repack_detect_szip.mak" CFG="testh5repack_detect_szip - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "testh5repack_detect_szip - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "testh5repack_detect_szip - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "testh5repack_detect_szip - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/testh5repack_detect_szip/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/testh5repack_detect_szip/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "testh5repack_detect_szip - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/testh5repack_detect_szip/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/testh5repack_detect_szip/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "testh5repack_detect_szip - Win32 Release"
-# Name "testh5repack_detect_szip - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\testh5repack_detect_szip.c
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="testh5repack_detect_szip" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=testh5repack_detect_szip - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "testh5repack_detect_szip.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "testh5repack_detect_szip.mak" CFG="testh5repack_detect_szip - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "testh5repack_detect_szip - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "testh5repack_detect_szip - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+F90=df.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "testh5repack_detect_szip - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../../tools/testfiles/testh5repack_detect_szip/Release"
+# PROP Intermediate_Dir "../../../../tools/testfiles/testh5repack_detect_szip/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /compile_only /nologo /warn:nofileopt
+# ADD F90 /compile_only /nologo /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "testh5repack_detect_szip - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../../tools/testfiles/testh5repack_detect_szip/Debug"
+# PROP Intermediate_Dir "../../../../tools/testfiles/testh5repack_detect_szip/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
+# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "testh5repack_detect_szip - Win32 Release"
+# Name "testh5repack_detect_szip - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5repack\testh5repack_detect_szip.c
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.dsp b/windows/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.dsp
index 32f3066..d06b4ed 100755
--- a/windows/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.dsp
+++ b/windows/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.dsp
@@ -1,95 +1,95 @@
-# Microsoft Developer Studio Project File - Name="testh5repack_detect_szipdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=testh5repack_detect_szipdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "testh5repack_detect_szipdll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "testh5repack_detect_szipdll.mak" CFG="testh5repack_detect_szipdll - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "testh5repack_detect_szipdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "testh5repack_detect_szipdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "testh5repack_detect_szipdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/testh5repack_detect_szipdll/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/testh5repack_detect_szipdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "testh5repack_detect_szipdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/testh5repack_detect_szipdll/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/testh5repack_detect_szipdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "testh5repack_detect_szipdll - Win32 Release"
-# Name "testh5repack_detect_szipdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\testh5repack_detect_szip.c
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="testh5repack_detect_szipdll" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=testh5repack_detect_szipdll - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "testh5repack_detect_szipdll.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "testh5repack_detect_szipdll.mak" CFG="testh5repack_detect_szipdll - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "testh5repack_detect_szipdll - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "testh5repack_detect_szipdll - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+F90=df.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "testh5repack_detect_szipdll - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../../tools/testfiles/testh5repack_detect_szipdll/Release"
+# PROP Intermediate_Dir "../../../../tools/testfiles/testh5repack_detect_szipdll/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /compile_only /nologo /warn:nofileopt
+# ADD F90 /compile_only /nologo /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "testh5repack_detect_szipdll - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../../tools/testfiles/testh5repack_detect_szipdll/Debug"
+# PROP Intermediate_Dir "../../../../tools/testfiles/testh5repack_detect_szipdll/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
+# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "testh5repack_detect_szipdll - Win32 Release"
+# Name "testh5repack_detect_szipdll - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\..\..\tools\h5repack\testh5repack_detect_szip.c
+# End Source File
+# End Target
+# End Project
diff --git a/windows/tools/testhdf5tools.BAT b/windows/tools/testhdf5tools.BAT
index 1a65805..6a2a405 100755
--- a/windows/tools/testhdf5tools.BAT
+++ b/windows/tools/testhdf5tools.BAT
@@ -1,50 +1,50 @@
-@REM Copyright by the Board of Trustees of the University of Illinois.
-@REM All rights reserved.
-@REM
-@REM This file is part of HDF5. The full HDF5 copyright notice, including
-@REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html. COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page. It can also be found at
-@REM http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have
-@REM access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-
-@ ECHO OFF
-
-REM This batch file includes hdf5 tool(h5dump, h5diff, h5ls, h5import, and h5repack) testings.
-REM testhdf5tools release -- release static version
-REM testhdf5tools debug -- debug static version
-REM testhdf5tools release dll -- release dll version
-REM testhdf5tools debug dll -- debug dll version
-REM By: Xuan Bai
-REM Created: August 2, 2004
-REM Last Modified: August 2, 2004
-
-@type nul > toolstest_%1%2.txt
-@echo ***************************************************************************** >> toolstest_%1%2.txt
-@echo HDF5 Tools Tests -- %1 %2 >> toolstest_%1%2.txt
-@echo ***************************************************************************** >> toolstest_%1%2.txt
-
-call dumptest %1 %2
-@more dumptest%2_%1.txt >> toolstest_%1%2.txt
-@del dumptest%2_%1.txt
-
-
-call difftest %1 %2
-@more difftest%2_%1.txt >> toolstest_%1%2.txt
-@del difftest%2_%1.txt
-
-call lstest %1 %2
-@more lstest%2_%1.txt >> toolstest_%1%2.txt
-@del lstest%2_%1.txt
-
-call importtest %1 %2
-@more importtest%2_%1.txt >> toolstest_%1%2.txt
-@del importtest%2_%1.txt
-
-call repacktest %1 %2
-@more repacktest%2_%1.txt >> toolstest_%1%2.txt
-@del repacktest%2_%1.txt
-
-
+@REM Copyright by the Board of Trustees of the University of Illinois.
+@REM All rights reserved.
+@REM
+@REM This file is part of HDF5. The full HDF5 copyright notice, including
+@REM terms governing use, modification, and redistribution, is contained in
+@REM the files COPYING and Copyright.html. COPYING can be found at the root
+@REM of the source code distribution tree; Copyright.html can be found at the
+@REM root level of an installed copy of the electronic HDF5 document set and
+@REM is linked from the top-level documents page. It can also be found at
+@REM http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have
+@REM access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+
+@ ECHO OFF
+
+REM This batch file includes hdf5 tool(h5dump, h5diff, h5ls, h5import, and h5repack) testings.
+REM testhdf5tools release -- release static version
+REM testhdf5tools debug -- debug static version
+REM testhdf5tools release dll -- release dll version
+REM testhdf5tools debug dll -- debug dll version
+REM By: Xuan Bai
+REM Created: August 2, 2004
+REM Last Modified: August 2, 2004
+
+@type nul > toolstest_%1%2.txt
+@echo ***************************************************************************** >> toolstest_%1%2.txt
+@echo HDF5 Tools Tests -- %1 %2 >> toolstest_%1%2.txt
+@echo ***************************************************************************** >> toolstest_%1%2.txt
+
+call dumptest %1 %2
+@more dumptest%2_%1.txt >> toolstest_%1%2.txt
+@del dumptest%2_%1.txt
+
+
+call difftest %1 %2
+@more difftest%2_%1.txt >> toolstest_%1%2.txt
+@del difftest%2_%1.txt
+
+call lstest %1 %2
+@more lstest%2_%1.txt >> toolstest_%1%2.txt
+@del lstest%2_%1.txt
+
+call importtest %1 %2
+@more importtest%2_%1.txt >> toolstest_%1%2.txt
+@del importtest%2_%1.txt
+
+call repacktest %1 %2
+@more repacktest%2_%1.txt >> toolstest_%1%2.txt
+@del repacktest%2_%1.txt
+
+
diff --git a/windows/tools/toolslib/toolslib.dsp b/windows/tools/toolslib/toolslib.dsp
index a693110..4d70e89 100755
--- a/windows/tools/toolslib/toolslib.dsp
+++ b/windows/tools/toolslib/toolslib.dsp
@@ -1,374 +1,374 @@
-# Microsoft Developer Studio Project File - Name="toolslib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (ALPHA) Static Library" 0x0604
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=toolslib - Win32 Alphadbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "toolslib.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "toolslib.mak" CFG="toolslib - Win32 Alphadbg"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "toolslib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "toolslib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "toolslib - Win32 AlphaRel" (based on "Win32 (ALPHA) Static Library")
-!MESSAGE "toolslib - Win32 Alphadbg" (based on "Win32 (ALPHA) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "toolslib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\tools\toolslib\Release"
-# PROP Intermediate_Dir "..\..\..\tools\toolslib\Release"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\tools\toolslib\Debug"
-# PROP Intermediate_Dir "..\..\..\tools\toolslib\Debug"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /Z7 /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "toolslib"
-# PROP BASE Intermediate_Dir "toolslib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "toolslib"
-# PROP Intermediate_Dir "toolslib"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I ".." /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I ".." /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"toolslib/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"toolslib/" /nologo /warn:nofileopt
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "toolsli0"
-# PROP BASE Intermediate_Dir "toolsli0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "toolsli0"
-# PROP Intermediate_Dir "toolsli0"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I ".." /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I ".." /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"toolsli0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"toolsli0/" /nologo /warn:nofileopt
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "toolslib - Win32 Release"
-# Name "toolslib - Win32 Debug"
-# Name "toolslib - Win32 AlphaRel"
-# Name "toolslib - Win32 Alphadbg"
-# Begin Group "source"
-
-# PROP Default_Filter "*.c"
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff.c
-
-!IF "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff_array.c
-
-!IF "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff_attr.c
-
-!IF "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff_dset.c
-
-!IF "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff_util.c
-
-!IF "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools.c
-
-!IF "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_filters.c
-
-!IF "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_ref.c
-
-!IF "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_str.c
-
-!IF "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_type.c
-
-!IF "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_utils.c
-
-!IF "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5trav.c
-
-!IF "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5trav_table.c
-
-!IF "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF
-
-# End Source File
-# End Group
-# Begin Group "headers"
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_ref.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_str.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_utils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5trav.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="toolslib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (ALPHA) Static Library" 0x0604
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=toolslib - Win32 Alphadbg
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "toolslib.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "toolslib.mak" CFG="toolslib - Win32 Alphadbg"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "toolslib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "toolslib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "toolslib - Win32 AlphaRel" (based on "Win32 (ALPHA) Static Library")
+!MESSAGE "toolslib - Win32 Alphadbg" (based on "Win32 (ALPHA) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "toolslib - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\tools\toolslib\Release"
+# PROP Intermediate_Dir "..\..\..\tools\toolslib\Release"
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\tools\toolslib\Debug"
+# PROP Intermediate_Dir "..\..\..\tools\toolslib\Debug"
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /Z7 /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "toolslib"
+# PROP BASE Intermediate_Dir "toolslib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "toolslib"
+# PROP Intermediate_Dir "toolslib"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I ".." /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I ".." /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"toolslib/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"toolslib/" /nologo /warn:nofileopt
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "toolsli0"
+# PROP BASE Intermediate_Dir "toolsli0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "toolsli0"
+# PROP Intermediate_Dir "toolsli0"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I ".." /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I ".." /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"toolsli0/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"toolsli0/" /nologo /warn:nofileopt
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "toolslib - Win32 Release"
+# Name "toolslib - Win32 Debug"
+# Name "toolslib - Win32 AlphaRel"
+# Name "toolslib - Win32 Alphadbg"
+# Begin Group "source"
+
+# PROP Default_Filter "*.c"
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5diff.c
+
+!IF "$(CFG)" == "toolslib - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5diff_array.c
+
+!IF "$(CFG)" == "toolslib - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5diff_attr.c
+
+!IF "$(CFG)" == "toolslib - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5diff_dset.c
+
+!IF "$(CFG)" == "toolslib - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5diff_util.c
+
+!IF "$(CFG)" == "toolslib - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools.c
+
+!IF "$(CFG)" == "toolslib - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools_filters.c
+
+!IF "$(CFG)" == "toolslib - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools_ref.c
+
+!IF "$(CFG)" == "toolslib - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools_str.c
+
+!IF "$(CFG)" == "toolslib - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools_type.c
+
+!IF "$(CFG)" == "toolslib - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools_utils.c
+
+!IF "$(CFG)" == "toolslib - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5trav.c
+
+!IF "$(CFG)" == "toolslib - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5trav_table.c
+
+!IF "$(CFG)" == "toolslib - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 AlphaRel"
+
+!ELSEIF "$(CFG)" == "toolslib - Win32 Alphadbg"
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "headers"
+
+# PROP Default_Filter "*.h"
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5diff.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools_ref.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools_str.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools_utils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5trav.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/windows/tools/toolslibD/toolslibD.dsp b/windows/tools/toolslibD/toolslibD.dsp
index f95eef0..bc1ae34 100755
--- a/windows/tools/toolslibD/toolslibD.dsp
+++ b/windows/tools/toolslibD/toolslibD.dsp
@@ -1,374 +1,374 @@
-# Microsoft Developer Studio Project File - Name="toolslibD" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (ALPHA) Static Library" 0x0604
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=toolslibD - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "toolslibD.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "toolslibD.mak" CFG="toolslibD - Win32 AlphaDbg"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "toolslibD - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "toolslibD - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "toolslibD - Win32 AlphaDbg" (based on "Win32 (ALPHA) Static Library")
-!MESSAGE "toolslibD - Win32 AlphaRel" (based on "Win32 (ALPHA) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "toolslibD - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\tools\toolslibD\Release"
-# PROP Intermediate_Dir "..\..\..\tools\toolslibD\Release"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\tools\toolslibD\Debug"
-# PROP Intermediate_Dir "..\..\..\tools\toolslibD\Debug"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "toolslib"
-# PROP BASE Intermediate_Dir "toolslib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "toolslib"
-# PROP Intermediate_Dir "toolslib"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I ".." /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I ".." /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"toolslib/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"toolslib/" /nologo /warn:nofileopt
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "toolsli0"
-# PROP BASE Intermediate_Dir "toolsli0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "toolsli0"
-# PROP Intermediate_Dir "toolsli0"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I ".." /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I ".." /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"toolsli0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"toolsli0/" /nologo /warn:nofileopt
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "toolslibD - Win32 Release"
-# Name "toolslibD - Win32 Debug"
-# Name "toolslibD - Win32 AlphaDbg"
-# Name "toolslibD - Win32 AlphaRel"
-# Begin Group "source"
-
-# PROP Default_Filter "*.c"
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff.c
-
-!IF "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff_array.c
-
-!IF "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff_attr.c
-
-!IF "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff_dset.c
-
-!IF "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff_util.c
-
-!IF "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools.c
-
-!IF "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_filters.c
-
-!IF "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_ref.c
-
-!IF "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_str.c
-
-!IF "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_type.c
-
-!IF "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_utils.c
-
-!IF "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5trav.c
-
-!IF "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5trav_table.c
-
-!IF "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF
-
-# End Source File
-# End Group
-# Begin Group "headers"
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_ref.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_str.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_utils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5trav.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="toolslibD" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (ALPHA) Static Library" 0x0604
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=toolslibD - Win32 AlphaDbg
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "toolslibD.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "toolslibD.mak" CFG="toolslibD - Win32 AlphaDbg"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "toolslibD - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "toolslibD - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "toolslibD - Win32 AlphaDbg" (based on "Win32 (ALPHA) Static Library")
+!MESSAGE "toolslibD - Win32 AlphaRel" (based on "Win32 (ALPHA) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "toolslibD - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\tools\toolslibD\Release"
+# PROP Intermediate_Dir "..\..\..\tools\toolslibD\Release"
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\tools\toolslibD\Debug"
+# PROP Intermediate_Dir "..\..\..\tools\toolslibD\Debug"
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /YX /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "toolslib"
+# PROP BASE Intermediate_Dir "toolslib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "toolslib"
+# PROP Intermediate_Dir "toolslib"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I ".." /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I ".." /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /debug:full /include:"toolslib/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /debug:full /include:"toolslib/" /nologo /warn:nofileopt
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "toolsli0"
+# PROP BASE Intermediate_Dir "toolsli0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "toolsli0"
+# PROP Intermediate_Dir "toolsli0"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I ".." /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /YX /FD /c
+# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I ".." /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /YX /FD /c
+F90=df.exe
+# ADD BASE F90 /compile_only /include:"toolsli0/" /nologo /warn:nofileopt
+# ADD F90 /compile_only /include:"toolsli0/" /nologo /warn:nofileopt
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "toolslibD - Win32 Release"
+# Name "toolslibD - Win32 Debug"
+# Name "toolslibD - Win32 AlphaDbg"
+# Name "toolslibD - Win32 AlphaRel"
+# Begin Group "source"
+
+# PROP Default_Filter "*.c"
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5diff.c
+
+!IF "$(CFG)" == "toolslibD - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5diff_array.c
+
+!IF "$(CFG)" == "toolslibD - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5diff_attr.c
+
+!IF "$(CFG)" == "toolslibD - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5diff_dset.c
+
+!IF "$(CFG)" == "toolslibD - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5diff_util.c
+
+!IF "$(CFG)" == "toolslibD - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools.c
+
+!IF "$(CFG)" == "toolslibD - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools_filters.c
+
+!IF "$(CFG)" == "toolslibD - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools_ref.c
+
+!IF "$(CFG)" == "toolslibD - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools_str.c
+
+!IF "$(CFG)" == "toolslibD - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools_type.c
+
+!IF "$(CFG)" == "toolslibD - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools_utils.c
+
+!IF "$(CFG)" == "toolslibD - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5trav.c
+
+!IF "$(CFG)" == "toolslibD - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5trav_table.c
+
+!IF "$(CFG)" == "toolslibD - Win32 Release"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "toolslibD - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "headers"
+
+# PROP Default_Filter "*.h"
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5diff.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools_ref.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools_str.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5tools_utils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tools\lib\h5trav.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/windows/tools/tooltest.bat b/windows/tools/tooltest.bat
index 3e4d0cb..b3e648a 100755
--- a/windows/tools/tooltest.bat
+++ b/windows/tools/tooltest.bat
@@ -1,317 +1,317 @@
-@REM Copyright by the Board of Trustees of the University of Illinois.
-@REM All rights reserved.
-@REM
-@REM This file is part of HDF5. The full HDF5 copyright notice, including
-@REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html. COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page. It can also be found at
-@REM http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have
-@REM access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-
-@echo off
-
-::This batch file will be called by the following batch files
-::---dumptest.bat
-::---difftest.bat
-::---importtest.bat
-::---lstest.bat
-::---repacktest.bat
-:: Written By: Fang GUO
-:: Date : Jan. 12, 2006
-
-
- :: Setting the starting column number for "PASSED/FAILED/SKIPED"
- set flagmax=65
-
-:: Decide which tool will be test
-:: Define an environment variable to decide which test should run
-
-:: Find string "dll" inside %exefile% and remove it
- set test_exefile=%exefile:dll=%
-
- if %test_exefile%==h5repack goto REPACK
- if %test_exefile%==h5diff goto COMMON
- if %test_exefile%==h5dump goto DUMP
- if %test_exefile%==h5ls goto COMMON
- if %test_exefile%==h5import goto IMPORT
-
-:: This block is for Repack test
-:REPACK
- ::----------------------------------
- ::Test for h5repack or h5repackdll
- ::----------------------------------
-
- :: Get the input parameters
- :: Example case for h5repack
- :: if %1 is ..\..\testfiles\test1.h5
- :: This line will set variable %testinput% equal to ..\..\testfiles\test1.h5
-
- set testinput=%1
-
- :: %testinput:~16% will get all of the chars of %testinput% except the first 16 chars
- :: Example case: %testinput:~16% will give you test1.h5
- :: The whole line will set varialbe %testoutput% equal to ..\..\temptest\out.test1.h5
-
- set testoutput=..\..\temptest\out.%testinput:~16%
-
- ::Set exp_file equal to the second parameter
- :: Example case: %exp_file% will be equal to %nodiff%
- set exp_file=%2
-
- :: Set a variable to be the path to the real output
- set actual_output=..\..\temptest\temp.txt
-
- :: Extract the string for printing results
- :: Variable flagout is for printing purpose only
- :: These lines will get rid of the paths inside %flag% and set it to %flagout%
- :: Example case:
- :: %flag% was set inside repacktest.bat to
- :: "-i ..\..\testfiles\test1.h5 -o ..\..\temptest\out.test1.h5"
- :: The following two lines will set %flagout% equal to
- :: "-i test1.h5 -o ..\..\temptest\out.test1.h5"
-
- set flagout=%flag:..\..\testfiles\t=t%
- set flagout=%flagout:..\..\temptest\t=t%
-
- :: "." will be used as a delimiter in the for loop for printing output
- :: But "." inside ".txt" and".." will not be treated as a delimiter. So replace it
- :: with a "#" and recover it before printing results.
-
- set flagout=%flagout:.txt=#txt%
- set flagout=%flagout:..=##%
-
- :: This for loop uses "." as a delimiter and gets the first and the fourth tokens
- :: and assign it to var1 and var4
- ::Example case:
- :: %flagout% now is "-i test1.h5 -o ##\##\temptest\out.test1.h5"
- :: This for loop will set %var1% as "-i test1" and %var4% as "h5"
-
- for /f "tokens=1,4 delims=." %%a in ("%flagout%") do (
- set var1=%%a
- set var4=%%b
- )
-
- ::Add in extension for input file
- ::Example case: %var1% is "-i test1" in previous step
- :: This step will set %var1% as %var1% as "-i test1.h5"
- set var1=%var1%.h5
-
- ::Check for output file name
- ::Example case: %var4% is ".h5" in previous step
- ::This step will set it to nothing
- set var4=%var4:~2%
-
- ::Check if %var4% is blank, we will print the "flagout" with the "var1" only
- if "%var4%"=="" (
- set flagout=%var1%
- goto CHOICE
- )
-
- ::If %var4% is not blank, for example in the "file test" we have flags like
- ::set flag=-i %test4% -o %output4% -e ..\..\testfiles\h5repack_info.txt
- ::In this case, we want to print the %var4% out
- ::Recover "."
- set var4=%var4:#=.%
- set flagout=%var1% %var4%
-
- ::Based on the third parameter, we will go to different part.
- :: GTEST means general test, no need to check zlib and szlib
-
- :CHOICE
- if "%3"=="" goto GTEST
- if "%3"=="SKIP" goto SKIP
- if "%3"=="zlib" (
- if "%4"=="" goto ZLIB
- if "%4"=="szip" goto ZSLIB
- goto SKIP
- )
- if "%3"=="szip" (
- if "%4"=="" goto SZIP
- goto SKIP
- )
- goto SKIP
-
- :ZLIB
- if "%HDF5_EXT_ZLIB%"=="zdll.lib" goto GTEST
- goto SKIP
-
- :SZIP
- if "%HDF5_EXT_SZIP%"=="szlibdll.lib" (
- if %HDF5_SZIP_ENCODE%==1 goto GTEST
- )
- goto SKIP
-
- :ZSLIB
- if "%HDF5_EXT_ZLIB%"=="zdll.lib" (
- if "%HDF5_EXT_SZIP%"=="szlibdll.lib" (
- if %HDF5_SZIP_ENCODE%==1 goto GTEST
- )
- )
- goto SKIP
-
- ::Run the .exe file with the specified flag and generate %testoutput%
- ::Compare the expected and the actual output and save the comparison
- ::results into .\..\temptest\temp.txt(%actual_output%)
- ::Example case:
- ::Expected output(%testinput%) is "..\..\testfiles\test1.h5"
- ::Actual output(%testoutput%) is "..\..\temptest\out.test1.h5"
- ::Save the comparion results into .\..\temptest\temp.txt
-
- :GTEST
- %exefile% %flag%
- ..\..\h5diff%p2%\%p1%\h5diff%p2% %testinput% %testoutput% > %actual_output% 2>&1
- goto RESULTS
-
-:: End of Repack tests
-
-
-::H5diff and H5ls Tests
-:COMMON
- :: ------------------------------------------------------
- :: Test for Tools which only need to run .exe and compare
- :: actual_output and expected_output
- :: ------------------------------------------------------
-
- :: Call tooltest with the following parameters set in difftest.bat
- :: 1. expected_outputfile.txt
- :: 2. flags
-
- ::Set a flaghandle for output tests results
- set flagout=%flag:..\..\testfiles\=%
- set flagout=%flagout:..\..\temptest\=%
-
- if "%2%"=="SKIP" goto SKIP
- ::Set the file name and path for the expected and actual outputs
- set exp_file=..\..\temptest\%1
- set actual_output=..\..\temptest\out.%1
-
- ::Run .exe file with flag and rediect the output to a temp file
- %exefile% %flag% > ..\..\temptest\temp.txt 2>&1 | more
-
- if "%2%"=="MASK" goto MASK
-
- more /e +%ln% ..\..\temptest\temp.txt > %actual_output%
- more /e +%ln_exp% ..\..\testfiles\%1 > %exp_file%
-
- ::Clean up temporary file
- del ..\..\temptest\temp.txt
- goto RESULTS
-
-:MASK
- call ..\..\mask ..\..\temptest\temp.txt %actual_output%
- call ..\..\mask ..\..\testfiles\%1 %exp_file%
- more /e +1 %actual_output% > ..\..\temptest\tempa%1
- more /e +4 %exp_file% > ..\..\temptest\tempe%1
- move /Y ..\..\temptest\tempa%1 %actual_output%
- move /Y ..\..\temptest\tempe%1 %exp_file%
- del ..\..\temptest\temp.txt
-
- goto RESULTS
-
-:DUMP
- :: -----------------------------
- :: Test for h5dump or h5dumpdll
- :: ------------------------------
-
- if "%2"=="" goto COMMON
- if "%2"=="zlib" (
- if "%3"=="" goto DUMPZLIB
- if "%3"=="szip" goto DUMPSZ
- )
- if "%2"=="szip" goto DUMPSZIP
- if "%2"=="SKIP" goto SKIP
-
- :DUMPZLIB
- if "%HDF5_EXT_ZLIB%"=="zdll.lib" goto COMMON
- goto SKIP
-
- :DUMPSZIP
- if "%HDF5_EXT_SZIP%"=="szlibdll.lib" goto COMMON
- goto SKIP
-
- :DUMPSZ
- if "%HDF5_EXT_ZLIB%"=="zdll.lib" (
- if "%HDF5_EXT_SZIP%"=="szlibdll.lib" goto COMMON
- )
- goto SKIP
-
-:IMPORT
-
- set exp_file=..\..\temptest\exp_%1
- set actual_output=..\..\temptest\act_%1
- set flagout=%flag:..\..\testfiles\=%
- set flagout=%flagout:..\..\h5import\=%
- set flagout=%flagout:..\..\temptest\=%
- %exefile% %flag%
- ..\..\h5dump%p2%\%p1%\h5dump%p2% ..\..\h5import\testfiles\%2 | more +%ln% >%exp_file% 2>&1
- ..\..\h5dump%p2%\%p1%\h5dump%p2% ..\..\temptest\out.%2 | more +%ln%>%actual_output% 2>&1
-
-
-:RESULTS
- ::-------------------
- ::Echo tests results
- ::-------------------
- fc %exp_file% %actual_output% > ..\..\temp_fc.txt
- if %ERRORLEVEL%==0 (
- set result=PASSED
- ) else (
- set result=FAILED
- set /A totalerr=totalerr+1
- )
- goto ALIGN
-
-:SKIP
- set flagout=%flag:..\..\testfiles\=%
- set flagout=%flagout:..\..\temptest\=%
- set result=-SKIPED-
- set /A totalskip=totalskip+1
- goto ALIGN
-
-:ALIGN
- ::Set a var to count the # of chars for %flagout%
- set flaghandle=%flagout:"=**%
-
- set /A n=0
- if not "%flaghandle%"=="" goto ALOOP
-
- :ALOOP
- set firstchar=%flaghandle:~0,1%
- set /A n=n+1
- set flaghandle=%flaghandle:~1%
- if not "%flaghandle%"=="" goto ALOOP
-
- :AOUT
- ::Test if the length of any flags is over the maximum setting
- if /I %n% GTR %flagmax% goto APRINT
-
- if not %n%==%flagmax% (
- set flagout=%flagout%@
- set /A n=n+1
- )
- if not %n%==%flagmax% goto AOUT
-
- :APRINT
- ::Recover " and space
- set flagout=%flagout:@= %
- set flagout=%flagout:**=" %
- echo %exefile% %flagout% %result%
- echo %exefile% %flagout% %result% >> ..\..\%tempResults%
- if "%result%"=="FAILED" (
- ::more ..\..\temp_fc.txt
- more ..\..\temp_fc.txt >> ..\..\%tempResults%
- )
-
-:END
-
- ::Clean up temporary file
- ::For repacktest, there will be a tempory file under directory tools\temptest
- if defined actual_ouput del %actual_output%
-
- ::clean the environment variables
- for %%v in (exp_file actual_output flag testinput testoutput test_exefile var1 var4 flagout flaghandle result tests) do set %%v=
-
-
-
-
+@REM Copyright by the Board of Trustees of the University of Illinois.
+@REM All rights reserved.
+@REM
+@REM This file is part of HDF5. The full HDF5 copyright notice, including
+@REM terms governing use, modification, and redistribution, is contained in
+@REM the files COPYING and Copyright.html. COPYING can be found at the root
+@REM of the source code distribution tree; Copyright.html can be found at the
+@REM root level of an installed copy of the electronic HDF5 document set and
+@REM is linked from the top-level documents page. It can also be found at
+@REM http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have
+@REM access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+
+@echo off
+
+::This batch file will be called by the following batch files
+::---dumptest.bat
+::---difftest.bat
+::---importtest.bat
+::---lstest.bat
+::---repacktest.bat
+:: Written By: Fang GUO
+:: Date : Jan. 12, 2006
+
+
+ :: Setting the starting column number for "PASSED/FAILED/SKIPED"
+ set flagmax=65
+
+:: Decide which tool will be test
+:: Define an environment variable to decide which test should run
+
+:: Find string "dll" inside %exefile% and remove it
+ set test_exefile=%exefile:dll=%
+
+ if %test_exefile%==h5repack goto REPACK
+ if %test_exefile%==h5diff goto COMMON
+ if %test_exefile%==h5dump goto DUMP
+ if %test_exefile%==h5ls goto COMMON
+ if %test_exefile%==h5import goto IMPORT
+
+:: This block is for Repack test
+:REPACK
+ ::----------------------------------
+ ::Test for h5repack or h5repackdll
+ ::----------------------------------
+
+ :: Get the input parameters
+ :: Example case for h5repack
+ :: if %1 is ..\..\testfiles\test1.h5
+ :: This line will set variable %testinput% equal to ..\..\testfiles\test1.h5
+
+ set testinput=%1
+
+ :: %testinput:~16% will get all of the chars of %testinput% except the first 16 chars
+ :: Example case: %testinput:~16% will give you test1.h5
+ :: The whole line will set varialbe %testoutput% equal to ..\..\temptest\out.test1.h5
+
+ set testoutput=..\..\temptest\out.%testinput:~16%
+
+ ::Set exp_file equal to the second parameter
+ :: Example case: %exp_file% will be equal to %nodiff%
+ set exp_file=%2
+
+ :: Set a variable to be the path to the real output
+ set actual_output=..\..\temptest\temp.txt
+
+ :: Extract the string for printing results
+ :: Variable flagout is for printing purpose only
+ :: These lines will get rid of the paths inside %flag% and set it to %flagout%
+ :: Example case:
+ :: %flag% was set inside repacktest.bat to
+ :: "-i ..\..\testfiles\test1.h5 -o ..\..\temptest\out.test1.h5"
+ :: The following two lines will set %flagout% equal to
+ :: "-i test1.h5 -o ..\..\temptest\out.test1.h5"
+
+ set flagout=%flag:..\..\testfiles\t=t%
+ set flagout=%flagout:..\..\temptest\t=t%
+
+ :: "." will be used as a delimiter in the for loop for printing output
+ :: But "." inside ".txt" and".." will not be treated as a delimiter. So replace it
+ :: with a "#" and recover it before printing results.
+
+ set flagout=%flagout:.txt=#txt%
+ set flagout=%flagout:..=##%
+
+ :: This for loop uses "." as a delimiter and gets the first and the fourth tokens
+ :: and assign it to var1 and var4
+ ::Example case:
+ :: %flagout% now is "-i test1.h5 -o ##\##\temptest\out.test1.h5"
+ :: This for loop will set %var1% as "-i test1" and %var4% as "h5"
+
+ for /f "tokens=1,4 delims=." %%a in ("%flagout%") do (
+ set var1=%%a
+ set var4=%%b
+ )
+
+ ::Add in extension for input file
+ ::Example case: %var1% is "-i test1" in previous step
+ :: This step will set %var1% as %var1% as "-i test1.h5"
+ set var1=%var1%.h5
+
+ ::Check for output file name
+ ::Example case: %var4% is ".h5" in previous step
+ ::This step will set it to nothing
+ set var4=%var4:~2%
+
+ ::Check if %var4% is blank, we will print the "flagout" with the "var1" only
+ if "%var4%"=="" (
+ set flagout=%var1%
+ goto CHOICE
+ )
+
+ ::If %var4% is not blank, for example in the "file test" we have flags like
+ ::set flag=-i %test4% -o %output4% -e ..\..\testfiles\h5repack_info.txt
+ ::In this case, we want to print the %var4% out
+ ::Recover "."
+ set var4=%var4:#=.%
+ set flagout=%var1% %var4%
+
+ ::Based on the third parameter, we will go to different part.
+ :: GTEST means general test, no need to check zlib and szlib
+
+ :CHOICE
+ if "%3"=="" goto GTEST
+ if "%3"=="SKIP" goto SKIP
+ if "%3"=="zlib" (
+ if "%4"=="" goto ZLIB
+ if "%4"=="szip" goto ZSLIB
+ goto SKIP
+ )
+ if "%3"=="szip" (
+ if "%4"=="" goto SZIP
+ goto SKIP
+ )
+ goto SKIP
+
+ :ZLIB
+ if "%HDF5_EXT_ZLIB%"=="zdll.lib" goto GTEST
+ goto SKIP
+
+ :SZIP
+ if "%HDF5_EXT_SZIP%"=="szlibdll.lib" (
+ if %HDF5_SZIP_ENCODE%==1 goto GTEST
+ )
+ goto SKIP
+
+ :ZSLIB
+ if "%HDF5_EXT_ZLIB%"=="zdll.lib" (
+ if "%HDF5_EXT_SZIP%"=="szlibdll.lib" (
+ if %HDF5_SZIP_ENCODE%==1 goto GTEST
+ )
+ )
+ goto SKIP
+
+ ::Run the .exe file with the specified flag and generate %testoutput%
+ ::Compare the expected and the actual output and save the comparison
+ ::results into .\..\temptest\temp.txt(%actual_output%)
+ ::Example case:
+ ::Expected output(%testinput%) is "..\..\testfiles\test1.h5"
+ ::Actual output(%testoutput%) is "..\..\temptest\out.test1.h5"
+ ::Save the comparion results into .\..\temptest\temp.txt
+
+ :GTEST
+ %exefile% %flag%
+ ..\..\h5diff%p2%\%p1%\h5diff%p2% %testinput% %testoutput% > %actual_output% 2>&1
+ goto RESULTS
+
+:: End of Repack tests
+
+
+::H5diff and H5ls Tests
+:COMMON
+ :: ------------------------------------------------------
+ :: Test for Tools which only need to run .exe and compare
+ :: actual_output and expected_output
+ :: ------------------------------------------------------
+
+ :: Call tooltest with the following parameters set in difftest.bat
+ :: 1. expected_outputfile.txt
+ :: 2. flags
+
+ ::Set a flaghandle for output tests results
+ set flagout=%flag:..\..\testfiles\=%
+ set flagout=%flagout:..\..\temptest\=%
+
+ if "%2%"=="SKIP" goto SKIP
+ ::Set the file name and path for the expected and actual outputs
+ set exp_file=..\..\temptest\%1
+ set actual_output=..\..\temptest\out.%1
+
+ ::Run .exe file with flag and rediect the output to a temp file
+ %exefile% %flag% > ..\..\temptest\temp.txt 2>&1 | more
+
+ if "%2%"=="MASK" goto MASK
+
+ more /e +%ln% ..\..\temptest\temp.txt > %actual_output%
+ more /e +%ln_exp% ..\..\testfiles\%1 > %exp_file%
+
+ ::Clean up temporary file
+ del ..\..\temptest\temp.txt
+ goto RESULTS
+
+:MASK
+ call ..\..\mask ..\..\temptest\temp.txt %actual_output%
+ call ..\..\mask ..\..\testfiles\%1 %exp_file%
+ more /e +1 %actual_output% > ..\..\temptest\tempa%1
+ more /e +4 %exp_file% > ..\..\temptest\tempe%1
+ move /Y ..\..\temptest\tempa%1 %actual_output%
+ move /Y ..\..\temptest\tempe%1 %exp_file%
+ del ..\..\temptest\temp.txt
+
+ goto RESULTS
+
+:DUMP
+ :: -----------------------------
+ :: Test for h5dump or h5dumpdll
+ :: ------------------------------
+
+ if "%2"=="" goto COMMON
+ if "%2"=="zlib" (
+ if "%3"=="" goto DUMPZLIB
+ if "%3"=="szip" goto DUMPSZ
+ )
+ if "%2"=="szip" goto DUMPSZIP
+ if "%2"=="SKIP" goto SKIP
+
+ :DUMPZLIB
+ if "%HDF5_EXT_ZLIB%"=="zdll.lib" goto COMMON
+ goto SKIP
+
+ :DUMPSZIP
+ if "%HDF5_EXT_SZIP%"=="szlibdll.lib" goto COMMON
+ goto SKIP
+
+ :DUMPSZ
+ if "%HDF5_EXT_ZLIB%"=="zdll.lib" (
+ if "%HDF5_EXT_SZIP%"=="szlibdll.lib" goto COMMON
+ )
+ goto SKIP
+
+:IMPORT
+
+ set exp_file=..\..\temptest\exp_%1
+ set actual_output=..\..\temptest\act_%1
+ set flagout=%flag:..\..\testfiles\=%
+ set flagout=%flagout:..\..\h5import\=%
+ set flagout=%flagout:..\..\temptest\=%
+ %exefile% %flag%
+ ..\..\h5dump%p2%\%p1%\h5dump%p2% ..\..\h5import\testfiles\%2 | more +%ln% >%exp_file% 2>&1
+ ..\..\h5dump%p2%\%p1%\h5dump%p2% ..\..\temptest\out.%2 | more +%ln%>%actual_output% 2>&1
+
+
+:RESULTS
+ ::-------------------
+ ::Echo tests results
+ ::-------------------
+ fc %exp_file% %actual_output% > ..\..\temp_fc.txt
+ if %ERRORLEVEL%==0 (
+ set result=PASSED
+ ) else (
+ set result=FAILED
+ set /A totalerr=totalerr+1
+ )
+ goto ALIGN
+
+:SKIP
+ set flagout=%flag:..\..\testfiles\=%
+ set flagout=%flagout:..\..\temptest\=%
+ set result=-SKIPED-
+ set /A totalskip=totalskip+1
+ goto ALIGN
+
+:ALIGN
+ ::Set a var to count the # of chars for %flagout%
+ set flaghandle=%flagout:"=**%
+
+ set /A n=0
+ if not "%flaghandle%"=="" goto ALOOP
+
+ :ALOOP
+ set firstchar=%flaghandle:~0,1%
+ set /A n=n+1
+ set flaghandle=%flaghandle:~1%
+ if not "%flaghandle%"=="" goto ALOOP
+
+ :AOUT
+ ::Test if the length of any flags is over the maximum setting
+ if /I %n% GTR %flagmax% goto APRINT
+
+ if not %n%==%flagmax% (
+ set flagout=%flagout%@
+ set /A n=n+1
+ )
+ if not %n%==%flagmax% goto AOUT
+
+ :APRINT
+ ::Recover " and space
+ set flagout=%flagout:@= %
+ set flagout=%flagout:**=" %
+ echo %exefile% %flagout% %result%
+ echo %exefile% %flagout% %result% >> ..\..\%tempResults%
+ if "%result%"=="FAILED" (
+ ::more ..\..\temp_fc.txt
+ more ..\..\temp_fc.txt >> ..\..\%tempResults%
+ )
+
+:END
+
+ ::Clean up temporary file
+ ::For repacktest, there will be a tempory file under directory tools\temptest
+ if defined actual_ouput del %actual_output%
+
+ ::clean the environment variables
+ for %%v in (exp_file actual_output flag testinput testoutput test_exefile var1 var4 flagout flaghandle result tests) do set %%v=
+
+
+
+