got 64 bit projects working for Windows, fixed a whole slew of memory…

… leaks, and added the CRT leak checking stuff into the windows builds of the test programs so that they can be checked at any point. The major point is that the plugin cache must be cleared up somewhere along the line, and that the clips now take an index (what number clip they are) in the constructor, so we know which one is which. Mostly memory leak checking though.
AcademySoftwareFoundation · Sep 26, 2008 · 76f9ed6 · 76f9ed6
1 parent 8e9b328
commit 76f9ed6
Show file tree

Hide file tree

Showing 27 changed files with 937 additions and 529 deletions.
diff --git a/HostSupport/HostSupport.sln b/HostSupport/HostSupport.sln
@@ -1,44 +1,62 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HostSupport", "HostSupport.vcproj", "{AC66D35B-4E03-44F2-8510-F3DC4C1E4383}"
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HostSupport", "HostSupport.vcproj", "{A7C4BC47-C2BD-402A-B830-04CC45F6AB55}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CacheDemo", "examples\CacheDemo.vcproj", "{35D15EBD-F0D0-4DDF-ABEF-36B8E0F4BCAC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{AC66D35B-4E03-44F2-8510-F3DC4C1E4383} = {AC66D35B-4E03-44F2-8510-F3DC4C1E4383}
-		{3C318B12-4004-412D-A37B-DC5D6347E380} = {3C318B12-4004-412D-A37B-DC5D6347E380}
+		{A7C4BC47-C2BD-402A-B830-04CC45F6AB55} = {A7C4BC47-C2BD-402A-B830-04CC45F6AB55}
+		{BA70A56B-0F9A-4B63-9A1D-A5E4BAB95DED} = {BA70A56B-0F9A-4B63-9A1D-A5E4BAB95DED}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat_static", "expat-2.0.1\lib\expat_static.vcproj", "{3C318B12-4004-412D-A37B-DC5D6347E380}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat_static", "expat-2.0.1\lib\expat_static.vcproj", "{BA70A56B-0F9A-4B63-9A1D-A5E4BAB95DED}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HostDemo", "examples\hostDemo.vcproj", "{33D15EBD-FAD0-4DDF-ABEF-36BBE0F4BCAC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{3C318B12-4004-412D-A37B-DC5D6347E380} = {3C318B12-4004-412D-A37B-DC5D6347E380}
-		{AC66D35B-4E03-44F2-8510-F3DC4C1E4383} = {AC66D35B-4E03-44F2-8510-F3DC4C1E4383}
+		{BA70A56B-0F9A-4B63-9A1D-A5E4BAB95DED} = {BA70A56B-0F9A-4B63-9A1D-A5E4BAB95DED}
+		{A7C4BC47-C2BD-402A-B830-04CC45F6AB55} = {A7C4BC47-C2BD-402A-B830-04CC45F6AB55}
 	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AC66D35B-4E03-44F2-8510-F3DC4C1E4383}.Debug|Win32.ActiveCfg = Debug-Static|Win32
-		{AC66D35B-4E03-44F2-8510-F3DC4C1E4383}.Debug|Win32.Build.0 = Debug-Static|Win32
-		{AC66D35B-4E03-44F2-8510-F3DC4C1E4383}.Release|Win32.ActiveCfg = Release|Win32
-		{AC66D35B-4E03-44F2-8510-F3DC4C1E4383}.Release|Win32.Build.0 = Release|Win32
+		{A7C4BC47-C2BD-402A-B830-04CC45F6AB55}.Debug|Win32.ActiveCfg = Debug-Static|Win32
+		{A7C4BC47-C2BD-402A-B830-04CC45F6AB55}.Debug|Win32.Build.0 = Debug-Static|Win32
+		{A7C4BC47-C2BD-402A-B830-04CC45F6AB55}.Debug|x64.ActiveCfg = Debug-Static|x64
+		{A7C4BC47-C2BD-402A-B830-04CC45F6AB55}.Debug|x64.Build.0 = Debug-Static|x64
+		{A7C4BC47-C2BD-402A-B830-04CC45F6AB55}.Release|Win32.ActiveCfg = Release-Static|Win32
+		{A7C4BC47-C2BD-402A-B830-04CC45F6AB55}.Release|Win32.Build.0 = Release-Static|Win32
+		{A7C4BC47-C2BD-402A-B830-04CC45F6AB55}.Release|x64.ActiveCfg = Release-Static|x64
+		{A7C4BC47-C2BD-402A-B830-04CC45F6AB55}.Release|x64.Build.0 = Release-Static|x64
 		{35D15EBD-F0D0-4DDF-ABEF-36B8E0F4BCAC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{35D15EBD-F0D0-4DDF-ABEF-36B8E0F4BCAC}.Debug|Win32.Build.0 = Debug|Win32
+		{35D15EBD-F0D0-4DDF-ABEF-36B8E0F4BCAC}.Debug|x64.ActiveCfg = Debug|x64
+		{35D15EBD-F0D0-4DDF-ABEF-36B8E0F4BCAC}.Debug|x64.Build.0 = Debug|x64
 		{35D15EBD-F0D0-4DDF-ABEF-36B8E0F4BCAC}.Release|Win32.ActiveCfg = Release|Win32
 		{35D15EBD-F0D0-4DDF-ABEF-36B8E0F4BCAC}.Release|Win32.Build.0 = Release|Win32
-		{3C318B12-4004-412D-A37B-DC5D6347E380}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3C318B12-4004-412D-A37B-DC5D6347E380}.Debug|Win32.Build.0 = Debug|Win32
-		{3C318B12-4004-412D-A37B-DC5D6347E380}.Release|Win32.ActiveCfg = Release|Win32
-		{3C318B12-4004-412D-A37B-DC5D6347E380}.Release|Win32.Build.0 = Release|Win32
+		{35D15EBD-F0D0-4DDF-ABEF-36B8E0F4BCAC}.Release|x64.ActiveCfg = Release|x64
+		{35D15EBD-F0D0-4DDF-ABEF-36B8E0F4BCAC}.Release|x64.Build.0 = Release|x64
+		{BA70A56B-0F9A-4B63-9A1D-A5E4BAB95DED}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BA70A56B-0F9A-4B63-9A1D-A5E4BAB95DED}.Debug|Win32.Build.0 = Debug|Win32
+		{BA70A56B-0F9A-4B63-9A1D-A5E4BAB95DED}.Debug|x64.ActiveCfg = Debug|x64
+		{BA70A56B-0F9A-4B63-9A1D-A5E4BAB95DED}.Debug|x64.Build.0 = Debug|x64
+		{BA70A56B-0F9A-4B63-9A1D-A5E4BAB95DED}.Release|Win32.ActiveCfg = Release|Win32
+		{BA70A56B-0F9A-4B63-9A1D-A5E4BAB95DED}.Release|Win32.Build.0 = Release|Win32
+		{BA70A56B-0F9A-4B63-9A1D-A5E4BAB95DED}.Release|x64.ActiveCfg = Release|x64
+		{BA70A56B-0F9A-4B63-9A1D-A5E4BAB95DED}.Release|x64.Build.0 = Release|x64
 		{33D15EBD-FAD0-4DDF-ABEF-36BBE0F4BCAC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{33D15EBD-FAD0-4DDF-ABEF-36BBE0F4BCAC}.Debug|Win32.Build.0 = Debug|Win32
+		{33D15EBD-FAD0-4DDF-ABEF-36BBE0F4BCAC}.Debug|x64.ActiveCfg = Debug|x64
+		{33D15EBD-FAD0-4DDF-ABEF-36BBE0F4BCAC}.Debug|x64.Build.0 = Debug|x64
 		{33D15EBD-FAD0-4DDF-ABEF-36BBE0F4BCAC}.Release|Win32.ActiveCfg = Release|Win32
 		{33D15EBD-FAD0-4DDF-ABEF-36BBE0F4BCAC}.Release|Win32.Build.0 = Release|Win32
+		{33D15EBD-FAD0-4DDF-ABEF-36BBE0F4BCAC}.Release|x64.ActiveCfg = Release|x64
+		{33D15EBD-FAD0-4DDF-ABEF-36BBE0F4BCAC}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/HostSupport/HostSupport.vcproj b/HostSupport/HostSupport.vcproj
@@ -43,7 +43,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
-				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -81,12 +81,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Debug|x64"
 			OutputDirectory="$(TargetDir)"
 			IntermediateDirectory="$(TargetDir)"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -102,18 +101,19 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
-				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
-				RuntimeLibrary="2"
+				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="0"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -145,11 +145,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug-Static|Win32"
+			Name="Release|Win32"
 			OutputDirectory="$(TargetDir)"
 			IntermediateDirectory="$(TargetDir)"
 			ConfigurationType="4"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -168,15 +169,15 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
 				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -208,7 +209,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release-Static|Win32"
+			Name="Release|x64"
 			OutputDirectory="$(TargetDir)"
 			IntermediateDirectory="$(TargetDir)"
 			ConfigurationType="4"
@@ -229,9 +230,13 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
 				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
 				RuntimeLibrary="2"
@@ -269,9 +274,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="Debug-Static|Win32"
+			OutputDirectory="$(TargetDir)"
+			IntermediateDirectory="$(TargetDir)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -289,16 +294,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
-				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="1"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
@@ -333,12 +337,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="Debug-Static|x64"
+			OutputDirectory="$(TargetDir)"
+			IntermediateDirectory="$(TargetDir)"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -358,15 +361,15 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
-				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
-				RuntimeLibrary="2"
+				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="0"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -398,11 +401,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug-Static|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="Release-Static|Win32"
+			OutputDirectory="$(TargetDir)"
+			IntermediateDirectory="$(TargetDir)"
 			ConfigurationType="4"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -418,19 +422,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
 				AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
 				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -463,8 +463,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release-Static|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="$(TargetDir)"
+			IntermediateDirectory="$(TargetDir)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			WholeProgramOptimization="1"