[svn-r14975] Purpose: Add Windows fixes for new Fortran code.

Description:
There were a number of small tweaks we needed to make to add the new fortran_1_8 code on Windows.  We create new project files, add new source to them, add the test to our test suite, and fix a few typos in the Windows-specific source code.

Tested:
VS2005 on WinXP

3 files changed, 106 insertions, 0 deletions

diff --git a/windows/fortran/test/checkfortrantests.bat b/windows/fortran/test/checkfortrantests.bat
index db17437..2b970f6 100644
--- a/windows/fortran/test/checkfortrantests.bat
+++ b/windows/fortran/test/checkfortrantests.bat
@@ -79,6 +79,8 @@ rem on it for sending parameters.  --SJW 9/6/07
     call :add_test testhdf5_fortran%2 .\testhdf5_fortran%2\%1

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

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

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

+

     

     

     rem Run the tests, passing in which version to run

diff --git a/windows/fortran/test/testhdf5_fortran_1_8/testhdf5_fortran_1_8.vfproj b/windows/fortran/test/testhdf5_fortran_1_8/testhdf5_fortran_1_8.vfproj
new file mode 100644
index 0000000..52bf6fd
--- /dev/null
+++ b/windows/fortran/test/testhdf5_fortran_1_8/testhdf5_fortran_1_8.vfproj
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="9.10" ProjectIdGuid="{04B72E84-6A91-4AF1-BFCD-110CD4F67E2C}">

+	<Platforms>

+		<Platform Name="Win32"/>

+		<Platform Name="x64"/></Platforms>

+	<Configurations>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

+				<Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" OutputFile="$(OUTDIR)/testhdf5_fortran_1_8.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/testhdf5_fortran_1_8.pdb" SubSystem="subSystemConsole" AdditionalDependencies="WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/testhdf5_fortran_1_8.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" SubSystem="subSystemConsole" AdditionalDependencies="WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/testhdf5_fortran_1_8.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/testhdf5_fortran_1_8.pdb" SubSystem="subSystemConsole" AdditionalDependencies="WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" CompileOnly="true"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/testhdf5_fortran_1_8.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" SubSystem="subSystemConsole" AdditionalDependencies="WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration></Configurations>

+	<Files>

+		<Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">

+		<File RelativePath="..\..\..\..\fortran\test\fortranlib_test_1_8.f90"/>

+		<File RelativePath="..\..\..\..\fortran\test\tH5A_1_8.f90"/>

+		<File RelativePath="..\..\..\..\fortran\test\tH5F.f90"/>

+		<File RelativePath="..\..\..\..\fortran\test\tH5G_1_8.f90"/>

+		<File RelativePath="..\..\..\..\fortran\test\tH5O.f90"/></Filter>

+		<Filter Name="Header Files" Filter="fi;fd"/>

+		<Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/></Files>

+	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/test/testhdf5_fortran_1_8dll/testhdf5_fortran_1_8dll.vfproj b/windows/fortran/test/testhdf5_fortran_1_8dll/testhdf5_fortran_1_8dll.vfproj
new file mode 100644
index 0000000..441e17d
--- /dev/null
+++ b/windows/fortran/test/testhdf5_fortran_1_8dll/testhdf5_fortran_1_8dll.vfproj
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="9.10" ProjectIdGuid="{531839A0-AFE6-482A-BF60-29890B89D4BF}">

+	<Platforms>

+		<Platform Name="Win32"/>

+		<Platform Name="x64"/></Platforms>

+	<Configurations>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

+				<Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\proj\hdf5_fortrandll\Debug" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug" ObjectFile="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" OutputFile="$(OUTDIR)/testhdf5_fortran_1_8dll.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/testhdf5_fortran_1_8dll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\proj\hdf5_fortrandll\Release" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/testhdf5_fortran_1_8dll.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" SubSystem="subSystemConsole" AdditionalDependencies="WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\proj\hdf5_fortrandll\Debug" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug" ObjectFile="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/testhdf5_fortran_1_8dll.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/testhdf5_fortran_1_8dll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

+				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\proj\hdf5_fortrandll\Release" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFCustomBuildTool"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/testhdf5_fortran_1_8dll.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" SubSystem="subSystemConsole" AdditionalDependencies="WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration></Configurations>

+	<Files>

+		<Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">

+		<File RelativePath="..\..\..\..\fortran\test\fortranlib_test_1_8.f90"/>

+		<File RelativePath="..\..\..\..\fortran\test\tH5A_1_8.f90"/>

+		<File RelativePath="..\..\..\..\fortran\test\tH5F.f90"/>

+		<File RelativePath="..\..\..\..\fortran\test\tH5G_1_8.f90"/>

+		<File RelativePath="..\..\..\..\fortran\test\tH5O.f90"/></Filter>

+		<Filter Name="Header Files" Filter="fi;fd"/>

+		<Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/></Files>

+	<Globals/></VisualStudioProject>