Patch level :

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :


git-svn-id: svn://10.65.10.50/branches/R_10_00@21808 c028cbd2-c16b-5b4b-a496-9718f37d4682

projects/Cg0.vcproj

@@ -501,6 +501,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\cg\cg0700.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\cg\cglib01.cpp"
 				>
@@ -600,6 +604,10 @@
 				RelativePath="..\cg\cg0500a.uml"
 				>
 			</File>
+			<File
+				RelativePath="..\cg\cg0700a.uml"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Trr"
@@ -787,6 +795,10 @@
 				RelativePath="..\cg\cg0500.h"
 				>
 			</File>
+			<File
+				RelativePath="..\cg\cg0700a.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Menu"

projects/Cg7.vcproj

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="cg7"
-	ProjectGUID="{03D7DF6B-8F3C-40BE-87D4-CB1BC94D8264}"
+	ProjectGUID="{E3DA0245-98B7-4CE7-820B-1841A7EFF0AF}"
+	RootNamespace="cg7"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -11,6 +13,9 @@
 		/>
 	</Platforms>
 	<ToolFiles>
+		<ToolFile
+			RelativePath=".\CampoRules.rules"
+		/>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
@@ -25,9 +30,63 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
+			<Tool
+				Name="DatCompiler"
+			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
+			<Tool
+				Name="BmpCompiler"
+			/>
+			<Tool
+				Name="GifCompiler"
+			/>
+			<Tool
+				Name="DesCompiler"
+			/>
+			<Tool
+				Name="SrcDebugCompiler"
+			/>
+			<Tool
+				Name="MskCompiler"
+			/>
+			<Tool
+				Name="FormCompiler"
+			/>
+			<Tool
+				Name="RptCompiler"
+			/>
+			<Tool
+				Name="AlxCompiler"
+			/>
+			<Tool
+				Name="TxtCompiler"
+			/>
+			<Tool
+				Name="PngCompiler"
+			/>
+			<Tool
+				Name="JpegCompiler"
+			/>
+			<Tool
+				Name="IniCompiler"
+			/>
+			<Tool
+				Name="MenCompiler"
+			/>
+			<Tool
+				Name="RepCompiler"
+			/>
+			<Tool
+				Name="SrcReleaseCompiler"
+			/>
+			<Tool
+				Name="DirCompiler"
+			/>
+			<Tool
+				Name="TrrCompiler"
+			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -40,7 +99,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\..\debug/Cg7.tlb"
+				TypeLibraryName=".\..\debug/cg7.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -50,7 +109,7 @@
 				PreprocessorDefinitions="_DEBUG;WIN32;DBG;_WINDOWS"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\..\debug/Cg7.pch"
+				PrecompiledHeaderFile=".\..\debug/cg7.pch"
 				AssemblerListingLocation=".\..\debug/"
 				ObjectFile=".\..\debug/"
 				ProgramDataBaseFileName=".\..\debug/"
@@ -81,6 +140,8 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\debug/cg7.pdb"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -95,7 +156,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\..\debug/Cg7.bsc"
+				OutputFile=".\..\debug/cg7.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -103,9 +164,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -122,9 +180,63 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
+			<Tool
+				Name="DatCompiler"
+			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
+			<Tool
+				Name="BmpCompiler"
+			/>
+			<Tool
+				Name="GifCompiler"
+			/>
+			<Tool
+				Name="DesCompiler"
+			/>
+			<Tool
+				Name="SrcDebugCompiler"
+			/>
+			<Tool
+				Name="MskCompiler"
+			/>
+			<Tool
+				Name="FormCompiler"
+			/>
+			<Tool
+				Name="RptCompiler"
+			/>
+			<Tool
+				Name="AlxCompiler"
+			/>
+			<Tool
+				Name="TxtCompiler"
+			/>
+			<Tool
+				Name="PngCompiler"
+			/>
+			<Tool
+				Name="JpegCompiler"
+			/>
+			<Tool
+				Name="IniCompiler"
+			/>
+			<Tool
+				Name="MenCompiler"
+			/>
+			<Tool
+				Name="RepCompiler"
+			/>
+			<Tool
+				Name="SrcReleaseCompiler"
+			/>
+			<Tool
+				Name="DirCompiler"
+			/>
+			<Tool
+				Name="TrrCompiler"
+			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -137,7 +249,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\..\release/Cg7.tlb"
+				TypeLibraryName=".\..\release/cg7.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -149,7 +261,7 @@
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\..\release/Cg7.pch"
+				PrecompiledHeaderFile=".\..\release/cg7.pch"
 				AssemblerListingLocation=".\..\release/"
 				ObjectFile=".\..\release/"
 				ProgramDataBaseFileName=".\..\release/"
@@ -177,6 +289,8 @@
 				IgnoreDefaultLibraryNames="libc.lib"
 				ProgramDatabaseFile=".\..\release/cg7.pdb"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -191,7 +305,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\..\release/Cg7.bsc"
+				OutputFile=".\..\release/cg7.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -199,9 +313,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -214,76 +325,6 @@
 			Name="Sources"
 			Filter="cpp"
 			>
-			<File
-				RelativePath="..\ca\calib01.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\ca\calib02.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\cg\cg2101.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\cg\cg2103.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\cg\cg7.cpp"
 				>
@@ -328,94 +369,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\cg\cg7200.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\cg\cg7300.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\cg\cglib01.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\cg\cgsaldac.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
 		</Filter>
 		<Filter
 			Name="Masks"
@@ -424,84 +377,12 @@
 			<File
 				RelativePath="..\cg\cg7100a.uml"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\cg\cg7200a.uml"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\cg\cg7300a.uml"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
-					/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
-			Name="Headers"
+			Name="Header"
 			Filter="h"
 			>
-			<File
-				RelativePath="..\ca\calib01.h"
-				>
-			</File>
 			<File
 				RelativePath="..\cg\cg7.h"
 				>
@@ -510,143 +391,6 @@
 				RelativePath="..\cg\cg7100a.h"
 				>
 			</File>
-			<File
-				RelativePath="..\cg\cg7200a.h"
-				>
-			</File>
-			<File
-				RelativePath="..\cg\cg7300a.h"
-				>
-			</File>
-			<File
-				RelativePath="..\cg\cglib01.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Ini"
-			Filter="ini"
-			>
-			<File
-				RelativePath="..\cg\cg7100a.ini"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying ini $(InputPath)..."
-						CommandLine="copy $(InputPath) $(TargetDir)$(InputName).ini&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).ini"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying ini $(InputPath)..."
-						CommandLine="copy $(InputPath) $(TargetDir)$(InputName).ini&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).ini"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\cg\cg7200a.ini"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying ini $(InputPath)..."
-						CommandLine="copy $(InputPath) $(TargetDir)$(InputName).ini&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).ini"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying ini $(InputPath)..."
-						CommandLine="copy $(InputPath) $(TargetDir)$(InputName).ini&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).ini"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\cg\proforma.ini"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying ini $(InputPath)..."
-						CommandLine="copy $(InputPath) $(TargetDir)$(InputName).ini&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).ini"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying ini $(InputPath)..."
-						CommandLine="copy $(InputPath) $(TargetDir)$(InputName).ini&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).ini"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\cg\sispac.ini"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying ini $(InputPath)..."
-						CommandLine="copy $(InputPath) $(TargetDir)$(InputName).ini&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).ini"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying ini $(InputPath)..."
-						CommandLine="copy $(InputPath) $(TargetDir)$(InputName).ini&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).ini"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\cg\zucchett.ini"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying ini $(InputPath)..."
-						CommandLine="copy $(InputPath) $(TargetDir)$(InputName).ini&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).ini"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying ini $(InputPath)..."
-						CommandLine="copy $(InputPath) $(TargetDir)$(InputName).ini&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).ini"
-					/>
-				</FileConfiguration>
-			</File>
 		</Filter>
 		<File
 			RelativePath="..\lib\AgaLib.lib"
@@ -682,6 +426,7 @@
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
 					AdditionalIncludeDirectories=""
+					ResourceOutputFileName="..\Debug/cg7.res"
 				/>
 			</FileConfiguration>
 			<FileConfiguration

projects/cg.sln

@@ -17,6 +17,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cg6", "Cg6.vcproj", "{4FD17
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cg_masktab", "cg_masktab.vcproj", "{97368DC9-8B0D-4F75-A89F-9A58701226B6}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cg7", "cg7.vcproj", "{E3DA0245-98B7-4CE7-820B-1841A7EFF0AF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -55,6 +57,10 @@ Global
 		{97368DC9-8B0D-4F75-A89F-9A58701226B6}.Debug|Win32.Build.0 = Debug|Win32
 		{97368DC9-8B0D-4F75-A89F-9A58701226B6}.Release|Win32.ActiveCfg = Release|Win32
 		{97368DC9-8B0D-4F75-A89F-9A58701226B6}.Release|Win32.Build.0 = Release|Win32
+		{E3DA0245-98B7-4CE7-820B-1841A7EFF0AF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E3DA0245-98B7-4CE7-820B-1841A7EFF0AF}.Debug|Win32.Build.0 = Debug|Win32
+		{E3DA0245-98B7-4CE7-820B-1841A7EFF0AF}.Release|Win32.ActiveCfg = Release|Win32
+		{E3DA0245-98B7-4CE7-820B-1841A7EFF0AF}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

projects/ci1.vcproj

@@ -399,6 +399,18 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\ci\ci1300.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\ci\ci1350.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\ci\ci1400.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\ci\cilib.cpp"
 				>
@@ -434,6 +446,14 @@
 				RelativePath="..\ci\ci1200.uml"
 				>
 			</File>
+			<File
+				RelativePath="..\ci\ci1300a.uml"
+				>
+			</File>
+			<File
+				RelativePath="..\ci\ci1400a.uml"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Headers"
@@ -451,16 +471,12 @@
 				RelativePath="..\ci\ci1200.h"
 				>
 			</File>
-			<File
-				RelativePath="..\ci\ci1300.h"
-				>
-			</File>
 			<File
 				RelativePath="..\ci\ci1300a.h"
 				>
 			</File>
 			<File
-				RelativePath="..\ci\ci1400.h"
+				RelativePath="..\ci\ci1350.h"
 				>
 			</File>
 			<File
@@ -544,6 +560,22 @@
 				RelativePath="..\ci\ci1200e.rep"
 				>
 			</File>
+			<File
+				RelativePath="..\ci\ci1300a.rep"
+				>
+			</File>
+			<File
+				RelativePath="..\ci\ci1300b.rep"
+				>
+			</File>
+			<File
+				RelativePath="..\ci\ci1400a.rep"
+				>
+			</File>
+			<File
+				RelativePath="..\ci\ci1400b.rep"
+				>
+			</File>
 		</Filter>
 		<File
 			RelativePath="..\LIB\AgaLib.lib"

projects/ha.sln

@@ -7,6 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hacnv", "hacnv.vcproj", "{F
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ha1", "ha1.vcproj", "{5C6DF9DD-C3A6-4562-8699-10E0B0FB4DC9}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ha2", "ha2.vcproj", "{4C15FF8A-4C27-4243-9E21-E7C96AE94E58}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -25,6 +27,10 @@ Global
 		{5C6DF9DD-C3A6-4562-8699-10E0B0FB4DC9}.Debug|Win32.Build.0 = Debug|Win32
 		{5C6DF9DD-C3A6-4562-8699-10E0B0FB4DC9}.Release|Win32.ActiveCfg = Release|Win32
 		{5C6DF9DD-C3A6-4562-8699-10E0B0FB4DC9}.Release|Win32.Build.0 = Release|Win32
+		{4C15FF8A-4C27-4243-9E21-E7C96AE94E58}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4C15FF8A-4C27-4243-9E21-E7C96AE94E58}.Debug|Win32.Build.0 = Debug|Win32
+		{4C15FF8A-4C27-4243-9E21-E7C96AE94E58}.Release|Win32.ActiveCfg = Release|Win32
+		{4C15FF8A-4C27-4243-9E21-E7C96AE94E58}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

projects/ha2.rc

@@ -0,0 +1,4 @@
+"9012"       ICON DISCARDABLE    "../res/exe.ico"
+
+rcinclude ../../wx289/include/wx/msw/wx.rc
+

projects/ha2.vcproj

@@ -0,0 +1,405 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="ha2"
+	ProjectGUID="{4C15FF8A-4C27-4243-9E21-E7C96AE94E58}"
+	RootNamespace="ha2"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+		<ToolFile
+			RelativePath=".\CampoRules.rules"
+		/>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\debug"
+			IntermediateDirectory=".\..\debug"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="DatCompiler"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="BmpCompiler"
+			/>
+			<Tool
+				Name="GifCompiler"
+			/>
+			<Tool
+				Name="DesCompiler"
+			/>
+			<Tool
+				Name="SrcDebugCompiler"
+			/>
+			<Tool
+				Name="MskCompiler"
+			/>
+			<Tool
+				Name="FormCompiler"
+			/>
+			<Tool
+				Name="RptCompiler"
+			/>
+			<Tool
+				Name="AlxCompiler"
+			/>
+			<Tool
+				Name="TxtCompiler"
+			/>
+			<Tool
+				Name="PngCompiler"
+			/>
+			<Tool
+				Name="JpegCompiler"
+			/>
+			<Tool
+				Name="IniCompiler"
+			/>
+			<Tool
+				Name="MenCompiler"
+			/>
+			<Tool
+				Name="RepCompiler"
+			/>
+			<Tool
+				Name="SrcReleaseCompiler"
+			/>
+			<Tool
+				Name="DirCompiler"
+			/>
+			<Tool
+				Name="TrrCompiler"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\debug/ha2.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include,..\xvaga,..\xi"
+				PreprocessorDefinitions="_DEBUG;WIN32;DBG;_WINDOWS"
+				MinimalRebuild="true"
+				RuntimeLibrary="1"
+				PrecompiledHeaderFile=".\..\debug/ha2.pch"
+				AssemblerListingLocation=".\..\debug/"
+				ObjectFile=".\..\debug/"
+				ProgramDataBaseFileName=".\..\debug/"
+				BrowseInformation="1"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1040"
+				AdditionalIncludeDirectories="..\..\wx289\include"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="version.lib wsock32.lib comctl32.lib rpcrt4.lib"
+				OutputFile="../exed/ha2.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames="libc.lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\..\debug/li0.pdb"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\..\debug/li0.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\release"
+			IntermediateDirectory=".\..\release"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="DatCompiler"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="BmpCompiler"
+			/>
+			<Tool
+				Name="GifCompiler"
+			/>
+			<Tool
+				Name="DesCompiler"
+			/>
+			<Tool
+				Name="SrcDebugCompiler"
+			/>
+			<Tool
+				Name="MskCompiler"
+			/>
+			<Tool
+				Name="FormCompiler"
+			/>
+			<Tool
+				Name="RptCompiler"
+			/>
+			<Tool
+				Name="AlxCompiler"
+			/>
+			<Tool
+				Name="TxtCompiler"
+			/>
+			<Tool
+				Name="PngCompiler"
+			/>
+			<Tool
+				Name="JpegCompiler"
+			/>
+			<Tool
+				Name="IniCompiler"
+			/>
+			<Tool
+				Name="MenCompiler"
+			/>
+			<Tool
+				Name="RepCompiler"
+			/>
+			<Tool
+				Name="SrcReleaseCompiler"
+			/>
+			<Tool
+				Name="DirCompiler"
+			/>
+			<Tool
+				Name="TrrCompiler"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\release/li0.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\include,..\xvaga,..\xi"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XVT"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\..\release/li0.pch"
+				AssemblerListingLocation=".\..\release/"
+				ObjectFile=".\..\release/"
+				ProgramDataBaseFileName=".\..\release/"
+				BrowseInformation="1"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1040"
+				AdditionalIncludeDirectories="..\..\wx289\include"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="version.lib wsock32.lib comctl32.lib rpcrt4.lib"
+				OutputFile="d:\release\campo100/ha2.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames="libc.lib"
+				ProgramDatabaseFile=".\..\release/li0.pdb"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\..\release/li0.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Sources"
+			Filter="cpp"
+			>
+			<File
+				RelativePath="..\ha\ha2.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\ha\ha2100.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Headers"
+			>
+			<File
+				RelativePath="..\ha\ha2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ha\ha2100a.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Masks"
+			>
+			<File
+				RelativePath="..\ha\ha2100a.uml"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\lib\AgaLib.lib"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				ExcludedFromBuild="true"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\lib\AgaLibD.lib"
+			>
+			<FileConfiguration
+				Name="Release|Win32"
+				ExcludedFromBuild="true"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath=".\ha2.rc"
+			>
+		</File>
+		<File
+			RelativePath="..\lib\vedoc.lib"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				ExcludedFromBuild="true"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\lib\vedocd.lib"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

projects/hacnv.vcproj

@@ -346,6 +346,10 @@
 				RelativePath="..\ha\hacnv300.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\ha\hacnv400.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\ha\hacnvlib.cpp"
 				>
@@ -371,6 +375,10 @@
 				RelativePath="..\ha\hacnv300a.uml"
 				>
 			</File>
+			<File
+				RelativePath="..\ha\hacnv400a.uml"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Headers"
@@ -396,6 +404,10 @@
 				RelativePath="..\ha\hacnv300a.h"
 				>
 			</File>
+			<File
+				RelativePath="..\ha\hacnv400a.h"
+				>
+			</File>
 			<File
 				RelativePath="..\ha\hacnvlib.h"
 				>

projects/lv0.vcproj

@@ -410,6 +410,10 @@
 				RelativePath="..\lv\lv0400f.uml"
 				>
 			</File>
+			<File
+				RelativePath="..\lv\lv0400g.uml"
+				>
+			</File>
 			<File
 				RelativePath="..\lv\lv0500a.uml"
 				>
@@ -485,6 +489,10 @@
 				RelativePath="..\lv\lv0400f.h"
 				>
 			</File>
+			<File
+				RelativePath="..\lv\lv0400g.h"
+				>
+			</File>
 			<File
 				RelativePath="..\lv\lv0500a.h"
 				>
@@ -727,6 +735,10 @@
 				RelativePath="..\lv\lv0400f.rep"
 				>
 			</File>
+			<File
+				RelativePath="..\lv\lv0400g.rep"
+				>
+			</File>
 			<File
 				RelativePath="..\lv\lv0500c.rep"
 				>

projects/lv3.vcproj

@@ -357,6 +357,10 @@
 				RelativePath="..\lv\lv3700.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\lv\lv3800.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\lv\lvlib.cpp"
 				>
@@ -398,6 +402,10 @@
 				RelativePath="..\lv\lv3700a.uml"
 				>
 			</File>
+			<File
+				RelativePath="..\lv\lv3800a.uml"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Headers"
@@ -427,6 +435,10 @@
 				RelativePath="..\lv\lv3700a.h"
 				>
 			</File>
+			<File
+				RelativePath="..\lv\lv3800a.h"
+				>
+			</File>
 			<File
 				RelativePath="..\lv\lv3uml.h"
 				>

projects/tc1.vcproj

@@ -452,6 +452,10 @@
 				RelativePath="..\tc\tctbziv.uml"
 				>
 			</File>
+			<File
+				RelativePath="..\tc\tctbzno.uml"
+				>
+			</File>
 			<File
 				RelativePath="..\tc\tczuban.uml"
 				>

projects/tc2.vcproj

@@ -402,10 +402,6 @@
 			Name="Masks"
 			Filter="uml"
 			>
-			<File
-				RelativePath="..\tc\tc2100a.uml"
-				>
-			</File>
 			<File
 				RelativePath="..\tc\tc2300a.uml"
 				>

projects/ve0.vcproj

@@ -54,6 +54,9 @@
 			<Tool
 				Name="FormCompiler"
 			/>
+			<Tool
+				Name="RptCompiler"
+			/>
 			<Tool
 				Name="AlxCompiler"
 			/>
@@ -75,15 +78,15 @@
 			<Tool
 				Name="RepCompiler"
 			/>
-			<Tool
-				Name="TrrCompiler"
-			/>
 			<Tool
 				Name="SrcReleaseCompiler"
 			/>
 			<Tool
 				Name="DirCompiler"
 			/>
+			<Tool
+				Name="TrrCompiler"
+			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -201,6 +204,9 @@
 			<Tool
 				Name="FormCompiler"
 			/>
+			<Tool
+				Name="RptCompiler"
+			/>
 			<Tool
 				Name="AlxCompiler"
 			/>
@@ -222,15 +228,15 @@
 			<Tool
 				Name="RepCompiler"
 			/>
-			<Tool
-				Name="TrrCompiler"
-			/>
 			<Tool
 				Name="SrcReleaseCompiler"
 			/>
 			<Tool
 				Name="DirCompiler"
 			/>
+			<Tool
+				Name="TrrCompiler"
+			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -479,6 +485,10 @@
 				RelativePath="..\ve\ve0100d.uml"
 				>
 			</File>
+			<File
+				RelativePath="..\ve\ve0100n.uml"
+				>
+			</File>
 			<File
 				RelativePath="..\ve\ve0100o.uml"
 				>
@@ -544,6 +554,14 @@
 				RelativePath="..\ve\ve0100b1.h"
 				>
 			</File>
+			<File
+				RelativePath="..\ve\ve0100c.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ve\ve0100n.h"
+				>
+			</File>
 			<File
 				RelativePath="..\ve\ve0100o.h"
 				>

projects/ve3.vcproj

@@ -54,6 +54,9 @@
 			<Tool
 				Name="FormCompiler"
 			/>
+			<Tool
+				Name="RptCompiler"
+			/>
 			<Tool
 				Name="AlxCompiler"
 			/>
@@ -75,15 +78,15 @@
 			<Tool
 				Name="RepCompiler"
 			/>
-			<Tool
-				Name="TrrCompiler"
-			/>
 			<Tool
 				Name="SrcReleaseCompiler"
 			/>
 			<Tool
 				Name="DirCompiler"
 			/>
+			<Tool
+				Name="TrrCompiler"
+			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -140,6 +143,7 @@
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
+				Profile="true"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -201,6 +205,9 @@
 			<Tool
 				Name="FormCompiler"
 			/>
+			<Tool
+				Name="RptCompiler"
+			/>
 			<Tool
 				Name="AlxCompiler"
 			/>
@@ -222,15 +229,15 @@
 			<Tool
 				Name="RepCompiler"
 			/>
-			<Tool
-				Name="TrrCompiler"
-			/>
 			<Tool
 				Name="SrcReleaseCompiler"
 			/>
 			<Tool
 				Name="DirCompiler"
 			/>
+			<Tool
+				Name="TrrCompiler"
+			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>

projects/ve_masktab.vcproj

@@ -55,6 +55,9 @@
 			<Tool
 				Name="FormCompiler"
 			/>
+			<Tool
+				Name="RptCompiler"
+			/>
 			<Tool
 				Name="AlxCompiler"
 			/>
@@ -76,15 +79,15 @@
 			<Tool
 				Name="RepCompiler"
 			/>
-			<Tool
-				Name="TrrCompiler"
-			/>
 			<Tool
 				Name="SrcReleaseCompiler"
 			/>
 			<Tool
 				Name="DirCompiler"
 			/>
+			<Tool
+				Name="TrrCompiler"
+			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -199,6 +202,9 @@
 			<Tool
 				Name="FormCompiler"
 			/>
+			<Tool
+				Name="RptCompiler"
+			/>
 			<Tool
 				Name="AlxCompiler"
 			/>
@@ -220,15 +226,15 @@
 			<Tool
 				Name="RepCompiler"
 			/>
-			<Tool
-				Name="TrrCompiler"
-			/>
 			<Tool
 				Name="SrcReleaseCompiler"
 			/>
 			<Tool
 				Name="DirCompiler"
 			/>
+			<Tool
+				Name="TrrCompiler"
+			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -466,6 +472,10 @@
 				RelativePath="..\ve\vetbmre.uml"
 				>
 			</File>
+			<File
+				RelativePath="..\ve\vetbnar.uml"
+				>
+			</File>
 			<File
 				RelativePath="..\ve\vetbnum.uml"
 				>
@@ -692,6 +702,10 @@
 				RelativePath="..\ve\vetbmre.h"
 				>
 			</File>
+			<File
+				RelativePath="..\ve\vetbnar.h"
+				>
+			</File>
 			<File
 				RelativePath="..\ve\vetbnum.h"
 				>