[GME-commit] GMESRC/Paradigms/MetaGME/MetaDecorator MetaDecorator.vcproj,NONE,1.1 DecoratorApp.def,1.2,1.3 MaskedBitmap.cpp,1.2,1.3 StdAfx.cpp,1.1,1.2 MetaDecorator.dsp,1.9,NONE

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Wed Jan 26 11:31:36 CST 2005


Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaDecorator
In directory braindrain:/tmp/cvs-serv19193/Paradigms/MetaGME/MetaDecorator

Modified Files:
	DecoratorApp.def MaskedBitmap.cpp StdAfx.cpp 
Added Files:
	MetaDecorator.vcproj 
Removed Files:
	MetaDecorator.dsp 
Log Message:
Checkin for VC7.1 upgrade


CVS User: zolmol

--- NEW FILE: MetaDecorator.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="MetaDecorator"
	SccProjectName=""
	SccLocalPath=""
	Keyword="MFCProj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Release|Win32"
			OutputDirectory=".\Release"
			IntermediateDirectory=".\Release"
			ConfigurationType="2"
			UseOfMFC="2"
			UseOfATL="2"
			ATLMinimizesCRunTimeLibraryUsage="FALSE"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				Optimization="1"
				InlineFunctionExpansion="1"
				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
				StringPooling="TRUE"
				RuntimeLibrary="2"
				EnableFunctionLevelLinking="TRUE"
				UsePrecompiledHeader="3"
				PrecompiledHeaderThrough="stdafx.h"
				PrecompiledHeaderFile=".\Release/MetaDecorator.pch"
				AssemblerListingLocation=".\Release/"
				ObjectFile=".\Release/"
				ProgramDataBaseFileName=".\Release/"
				WarningLevel="3"
				SuppressStartupBanner="TRUE"
				DebugInformationFormat="3"/>
			<Tool
				Name="VCCustomBuildTool"
				Description="Performing registration"
				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;
echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
"
				Outputs="$(OutDir)\regsvr32.trg"/>
			<Tool
				Name="VCLinkerTool"
				OutputFile=".\Release/MetaDecorator.dll"
				LinkIncremental="1"
				SuppressStartupBanner="TRUE"
				ModuleDefinitionFile=".\DecoratorApp.def"
				GenerateDebugInformation="TRUE"
				ProgramDatabaseFile=".\Release/MetaDecorator.pdb"
				GenerateMapFile="TRUE"
				MapFileName=".\Release/MetaDecorator.map"
				SubSystem="2"
				BaseAddress="0x64600000"
				ImportLibrary=".\Release/MetaDecorator.lib"
				TargetMachine="1"/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName=".\Release/MetaDecorator.tlb"
				HeaderFileName=""/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="NDEBUG"
				Culture="1033"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory=".\Debug"
			IntermediateDirectory=".\Debug"
			ConfigurationType="2"
			UseOfMFC="2"
			UseOfATL="2"
			ATLMinimizesCRunTimeLibraryUsage="FALSE"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				UsePrecompiledHeader="3"
				PrecompiledHeaderThrough="stdafx.h"
				PrecompiledHeaderFile=".\Debug/MetaDecorator.pch"
				AssemblerListingLocation=".\Debug/"
				ObjectFile=".\Debug/"
				ProgramDataBaseFileName=".\Debug/"
				BrowseInformation="1"
				WarningLevel="3"
				SuppressStartupBanner="TRUE"
				DebugInformationFormat="4"/>
			<Tool
				Name="VCCustomBuildTool"
				Description="Performing registration"
				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;
echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
"
				Outputs="$(OutDir)\regsvr32.trg"/>
			<Tool
				Name="VCLinkerTool"
				OutputFile=".\Debug/MetaDecorator.dll"
				LinkIncremental="1"
				SuppressStartupBanner="TRUE"
				ModuleDefinitionFile=".\DecoratorApp.def"
				GenerateDebugInformation="TRUE"
				ProgramDatabaseFile=".\Debug/MetaDecorator.pdb"
				SubSystem="2"
				BaseAddress="0x64600000"
				ImportLibrary=".\Debug/MetaDecorator.lib"
				TargetMachine="1"/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName=".\Debug/MetaDecorator.tlb"
				HeaderFileName=""/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="_DEBUG"
				Culture="1033"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
			<File
				RelativePath="Decorator.cpp">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						PreprocessorDefinitions=""/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="Decorator.rc">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCResourceCompilerTool"
						PreprocessorDefinitions=""
						AdditionalIncludeDirectories="$(OUTDIR)"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCResourceCompilerTool"
						PreprocessorDefinitions=""
						AdditionalIncludeDirectories="$(OUTDIR)"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="DecoratorApp.cpp">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						PreprocessorDefinitions=""/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="DecoratorApp.def">
			</File>
			<File
				RelativePath="DecoratorLib.idl">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCMIDLTool"
						GenerateStublessProxies="TRUE"
						TypeLibraryName="DecoratorLib.tlb"
						HeaderFileName="DecoratorLib.h"
						InterfaceIdentifierFileName="DecoratorLib_i.c"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCMIDLTool"
						GenerateStublessProxies="TRUE"
						TypeLibraryName="DecoratorLib.tlb"
						HeaderFileName="DecoratorLib.h"
						InterfaceIdentifierFileName="DecoratorLib_i.c"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="DecoratorUtil.cpp">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						PreprocessorDefinitions=""/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="MaskedBitmap.cpp">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						PreprocessorDefinitions=""/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="StdAfx.cpp">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						PreprocessorDefinitions=""
						UsePrecompiledHeader="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
						UsePrecompiledHeader="1"
						BrowseInformation="1"/>
				</FileConfiguration>
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl">
			<File
				RelativePath="Decorator.h">
			</File>
			<File
				RelativePath="DecoratorConfig.h">
			</File>
			<File
				RelativePath="DecoratorStd.h">
			</File>
			<File
				RelativePath="DecoratorUtil.h">
			</File>
			<File
				RelativePath="MaskedBitmap.h">
			</File>
			<File
				RelativePath="Resource.h">
			</File>
			<File
				RelativePath="StdAfx.h">
			</File>
		</Filter>
		<Filter
			Name="Resources"
			Filter="">
			<File
				RelativePath="constraint.bmp">
			</File>
			<File
				RelativePath="Decorator.rgs">
			</File>
			<File
				RelativePath="proxy.bmp">
			</File>
		</Filter>
		<File
			RelativePath="constraintfunc.bmp">
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

Index: DecoratorApp.def
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaDecorator/DecoratorApp.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DecoratorApp.def	16 Aug 2001 13:57:00 -0000	1.2
--- DecoratorApp.def	26 Jan 2005 17:31:03 -0000	1.3
***************
*** 4,9 ****
  
  EXPORTS
! 	DllCanUnloadNow     @1 PRIVATE
! 	DllGetClassObject   @2 PRIVATE
! 	DllRegisterServer   @3 PRIVATE
! 	DllUnregisterServer	@4 PRIVATE
--- 4,9 ----
  
  EXPORTS
! 	DllCanUnloadNow     PRIVATE
! 	DllGetClassObject   PRIVATE
! 	DllRegisterServer   PRIVATE
! 	DllUnregisterServer	PRIVATE

Index: MaskedBitmap.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaDecorator/MaskedBitmap.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MaskedBitmap.cpp	23 Aug 2001 21:23:00 -0000	1.2
--- MaskedBitmap.cpp	26 Jan 2005 17:31:03 -0000	1.3
***************
*** 135,139 ****
  {
  	DWORD dwReadBytes = 0;
! 	DWORD dwLength = file.GetLength();
  	
  	// Ensures no memory leaks will occur
--- 135,139 ----
  {
  	DWORD dwReadBytes = 0;
! 	DWORD dwLength = (DWORD) file.GetLength();
  	
  	// Ensures no memory leaks will occur

Index: StdAfx.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaDecorator/StdAfx.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StdAfx.cpp	9 Aug 2001 21:43:00 -0000	1.1
--- StdAfx.cpp	26 Jan 2005 17:31:03 -0000	1.2
***************
*** 7,12 ****
  #ifdef _ATL_STATIC_REGISTRY
  #include <statreg.h>
- #include <statreg.cpp>
  #endif
- 
- #include <atlimpl.cpp>
--- 7,9 ----

--- MetaDecorator.dsp DELETED ---



More information about the GME-commit mailing list