[GME-commit] GMESRC/GME/Annotator Annotator.vcproj,NONE,1.1
DecoratorApp.cpp,1.2,1.3 DecoratorApp.def,1.3,1.4
StdAfx.cpp,1.2,1.3 Annotator.dsp,1.10,NONE
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Wed Jan 26 11:31:25 CST 2005
- Previous message: [GME-commit]
GMESRC/GME/Common Common.vcproj,NONE,1.1 CommonCollection.h,1.6,1.7
CommonStl.h,1.4,1.5 CommonVersionInfo.h,1.2,1.3 Common.dsp,1.8,NONE
- Next message: [GME-commit] GMESRC/GME/MgaDecorators MgaDecorators.vcproj,NONE,1.1
BitmapUtil.cpp,1.3,1.4 BitmapUtil.h,1.2,1.3
BoxDecorator.cpp,1.39,1.40 BoxDecorator.h,1.15,1.16
DIBRead.cpp,1.1,1.2 DecoratorUtil.cpp,1.7,1.8
MgaDecorators.cpp,1.3,1.4 MgaDecorators.def,1.1,1.2
StdAfx.cpp,1.1,1.2 StdAfx.h,1.8,1.9
StereotypeDecorators.cpp,1.13,1.14 MgaDecorators.dsp,1.16,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /var/lib/gme/GMESRC/GME/Annotator
In directory braindrain:/tmp/cvs-serv19193/GME/Annotator
Modified Files:
DecoratorApp.cpp DecoratorApp.def StdAfx.cpp
Added Files:
Annotator.vcproj
Removed Files:
Annotator.dsp
Log Message:
Checkin for VC7.1 upgrade
CVS User: zolmol
--- NEW FILE: Annotator.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="Annotator"
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"
AdditionalIncludeDirectories="../Common,../Interfaces"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile=".\Release/Annotator.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"
Description="Performing registration"
CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
Outputs="$(OutDir)\regsvr32.trg"/>
<Tool
Name="VCLinkerTool"
OutputFile=".\Release/Annotator.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
ModuleDefinitionFile=".\DecoratorApp.def"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Release/Annotator.pdb"
GenerateMapFile="TRUE"
MapFileName=".\Release/Annotator.map"
SubSystem="2"
BaseAddress="0x60100000"
ImportLibrary=".\Release/Annotator.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Release/Annotator.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"
AdditionalIncludeDirectories="../Common,../Interfaces"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile=".\Debug/Annotator.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"
Description="Performing registration"
CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
Outputs="$(OutDir)\regsvr32.trg"/>
<Tool
Name="VCLinkerTool"
OutputFile=".\Debug/Annotator.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
ModuleDefinitionFile=".\DecoratorApp.def"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Debug/Annotator.pdb"
SubSystem="2"
BaseAddress="0x60100000"
ImportLibrary=".\Debug/Annotator.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Debug/Annotator.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"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
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"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
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"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="StdAfx.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
UsePrecompiledHeader="1"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
UsePrecompiledHeader="1"
BrowseInformation="1"/>
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl">
<File
RelativePath="AnnotationDefs.h">
</File>
<File
RelativePath="Decorator.h">
</File>
<File
RelativePath="DecoratorConfig.h">
</File>
<File
RelativePath="DecoratorStd.h">
</File>
<File
RelativePath="DecoratorUtil.h">
</File>
<File
RelativePath="Resource.h">
</File>
<File
RelativePath="StdAfx.h">
</File>
</Filter>
<Filter
Name="Resources"
Filter="">
<File
RelativePath="Decorator.rgs">
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
Index: DecoratorApp.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Annotator/DecoratorApp.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DecoratorApp.cpp 3 Oct 2001 18:32:00 -0000 1.2
--- DecoratorApp.cpp 26 Jan 2005 17:28:19 -0000 1.3
***************
*** 76,80 ****
STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
{
! return _Module.GetClassObject(rclsid, riid, ppv);
}
--- 76,81 ----
STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
{
! AFX_MANAGE_STATE(AfxGetStaticModuleState());//z
! return _Module.GetClassObject(rclsid, riid, ppv);
}
***************
*** 84,87 ****
--- 85,90 ----
STDAPI DllRegisterServer(void)
{
+ AFX_MANAGE_STATE(AfxGetStaticModuleState());//z
+
_ATL_REGMAP_ENTRY regMap[] = {
{CONSTOLESTR("COCLASS_PROGID"), CONSTOLESTR(COCLASS_PROGID)},
***************
*** 107,111 ****
STDAPI DllUnregisterServer(void)
{
! _ATL_REGMAP_ENTRY regMap[] = {
{CONSTOLESTR("COCLASS_PROGID"), CONSTOLESTR(COCLASS_PROGID)},
{CONSTOLESTR("COCLASS_NAME"), CONSTOLESTR(COCLASS_NAME)},
--- 110,116 ----
STDAPI DllUnregisterServer(void)
{
! AFX_MANAGE_STATE(AfxGetStaticModuleState());//z
!
! _ATL_REGMAP_ENTRY regMap[] = {
{CONSTOLESTR("COCLASS_PROGID"), CONSTOLESTR(COCLASS_PROGID)},
{CONSTOLESTR("COCLASS_NAME"), CONSTOLESTR(COCLASS_NAME)},
Index: DecoratorApp.def
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Annotator/DecoratorApp.def,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DecoratorApp.def 21 Nov 2001 01:56:00 -0000 1.3
--- DecoratorApp.def 26 Jan 2005 17:28:19 -0000 1.4
***************
*** 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: StdAfx.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Annotator/StdAfx.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StdAfx.cpp 3 Oct 2001 18:32:00 -0000 1.2
--- StdAfx.cpp 26 Jan 2005 17:28:19 -0000 1.3
***************
*** 7,12 ****
#ifdef _ATL_STATIC_REGISTRY
#include <statreg.h>
- #include <statreg.cpp>
#endif
-
- #include <atlimpl.cpp>
--- 7,9 ----
--- Annotator.dsp DELETED ---
- Previous message: [GME-commit]
GMESRC/GME/Common Common.vcproj,NONE,1.1 CommonCollection.h,1.6,1.7
CommonStl.h,1.4,1.5 CommonVersionInfo.h,1.2,1.3 Common.dsp,1.8,NONE
- Next message: [GME-commit] GMESRC/GME/MgaDecorators MgaDecorators.vcproj,NONE,1.1
BitmapUtil.cpp,1.3,1.4 BitmapUtil.h,1.2,1.3
BoxDecorator.cpp,1.39,1.40 BoxDecorator.h,1.15,1.16
DIBRead.cpp,1.1,1.2 DecoratorUtil.cpp,1.7,1.8
MgaDecorators.cpp,1.3,1.4 MgaDecorators.def,1.1,1.2
StdAfx.cpp,1.1,1.2 StdAfx.h,1.8,1.9
StereotypeDecorators.cpp,1.13,1.14 MgaDecorators.dsp,1.16,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the GME-commit
mailing list