[GME-commit] GMESRC/GME/Mga Mga.vcproj,NONE,1.1 Mga.cpp,1.11,1.12
Mga.def,1.1,1.2 MgaAttribute.cpp,1.14,1.15 MgaAttribute.h,1.5,1.6
MgaCheck.cpp,1.6,1.7 MgaComplexOps.cpp,1.9,1.10
MgaConnection.cpp,1.16,1.17 MgaConnection.h,1.6,1.7
MgaConstraint.cpp,1.5,1.6 MgaConstraint.h,1.3,1.4
MgaCoreObj.h,1.3,1.4 MgaFCO.cpp,1.33,1.34 MgaFCO.h,1.20,1.21
MgaFilter.cpp,1.8,1.9 MgaFilter.h,1.6,1.7 MgaFolder.cpp,1.26,1.27
MgaFolder.h,1.6,1.7 MgaLib.idl,1.9,1.10 MgaModel.h,1.4,1.5
MgaProject.cpp,1.61,1.62 MgaReference.cpp,1.9,1.10
MgaReference.h,1.5,1.6 MgaSet.cpp,1.10,1.11 MgaSet.h,1.6,1.7
MgaTrukk.h,1.19,1.20 StdAfx.cpp,1.1,1.2 Mga.dsp,1.26,NONE
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Wed Jan 26 11:31:31 CST 2005
- Previous message: [GME-commit] GMESRC/GME/Core Core.vcproj,NONE,1.1 Core.cpp,1.6,1.7
Core.def,1.1,1.2 CoreAttribute.h,1.12,1.13
CoreBinFile.cpp,1.16,1.17 CoreBinFile.h,1.10,1.11
CoreProject.cpp,1.15,1.16 StdAfx.cpp,1.1,1.2 Core.dsp,1.15,NONE
- Next message: [GME-commit]
GMESRC/GME/GMEActiveBrowser GMEActiveBrowser.vcproj,NONE,1.1
ActiveBrowserPropertyPage.cpp,1.40,1.41
AggregateContextMenu.cpp,1.20,1.21 AggregateTreeCtrl.cpp,1.21,1.22
GMEActiveBrowser.def,1.1,1.2 GMEActiveBrowser.rc,1.11,1.12
StdAfx.cpp,1.1,1.2 StdAfx.h,1.3,1.4 TreeCtrlEx.cpp,1.4,1.5
resource.h,1.7,1.8 GMEActiveBrowser.dsp,1.14,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /var/lib/gme/GMESRC/GME/Mga
In directory braindrain:/tmp/cvs-serv19193/GME/Mga
Modified Files:
Mga.cpp Mga.def MgaAttribute.cpp MgaAttribute.h MgaCheck.cpp
MgaComplexOps.cpp MgaConnection.cpp MgaConnection.h
MgaConstraint.cpp MgaConstraint.h MgaCoreObj.h MgaFCO.cpp
MgaFCO.h MgaFilter.cpp MgaFilter.h MgaFolder.cpp MgaFolder.h
MgaLib.idl MgaModel.h MgaProject.cpp MgaReference.cpp
MgaReference.h MgaSet.cpp MgaSet.h MgaTrukk.h StdAfx.cpp
Added Files:
Mga.vcproj
Removed Files:
Mga.dsp
Log Message:
Checkin for VC7.1 upgrade
CVS User: zolmol
--- NEW FILE: Mga.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="Mga"
SccProjectName=""
SccLocalPath=""
Keyword="AtlProj">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="2"
UseOfMFC="0"
UseOfATL="2"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../include/STLport,../common,../Interfaces"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile=".\Release/Mga.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/Mga.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\lib"
ModuleDefinitionFile=".\Mga.def"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Release/Mga.pdb"
GenerateMapFile="TRUE"
MapFileName=".\Release/Mga.map"
SubSystem="2"
BaseAddress="0x60600000"
ImportLibrary=".\Release/Mga.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Release/Mga.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="0"
UseOfATL="2"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
OptimizeForProcessor="0"
AdditionalIncludeDirectories="../include/STLport,../common,../Interfaces"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile=".\Debug/Mga.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
BrowseInformation="1"
WarningLevel="4"
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/Mga.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\lib"
ModuleDefinitionFile=".\Mga.def"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Debug/Mga.pdb"
GenerateMapFile="TRUE"
MapFileName=".\Debug/Mga.map"
SubSystem="2"
BaseAddress="0x60600000"
ImportLibrary=".\Debug/Mga.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Debug/Mga.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="..\Common\CommonError.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="..\Common\CommonSmart.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="Mga.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="Mga.def">
</File>
<File
RelativePath="Mga.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="MgaAttribute.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="MgaCheck.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="MgaComplexOps.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="MgaConnection.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="MgaConstraint.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="MgaCoreObj.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="MgaDeriveOps.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="MgaFCO.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="MgaFilter.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="MgaFolder.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="MgaGeneric.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="MgaLib.idl">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCMIDLTool"
AdditionalIncludeDirectories="../Interfaces"
GenerateStublessProxies="TRUE"
TypeLibraryName=".\MgaLib.tlb"
HeaderFileName="MgaLib.h"
InterfaceIdentifierFileName="MgaLib_i.c"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCMIDLTool"
AdditionalIncludeDirectories="../Interfaces"
GenerateStublessProxies="TRUE"
TypeLibraryName=".\MgaLib.tlb"
HeaderFileName="MgaLib.h"
InterfaceIdentifierFileName="MgaLib_i.c"/>
</FileConfiguration>
</File>
<File
RelativePath="MgaLibOps.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="MgaModel.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="MgaProject.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="MgaReference.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="MgaSet.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="MgaTerritory.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
RelativePath="StdAfx.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
UsePrecompiledHeader="1"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
UsePrecompiledHeader="1"
BrowseInformation="1"/>
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl">
<File
RelativePath="MgaAttribute.h">
</File>
<File
RelativePath="MgaComplexOps.h">
</File>
<File
RelativePath="MgaConnection.h">
</File>
<File
RelativePath="MgaConstraint.h">
</File>
<File
RelativePath="MgaCoreObj.h">
</File>
<File
RelativePath="MgaFCO.h">
</File>
<File
RelativePath="MgaFilter.h">
</File>
<File
RelativePath="MgaFolder.h">
</File>
<File
RelativePath="MgaGeneric.h">
</File>
<File
RelativePath="MgaModel.h">
</File>
<File
RelativePath="MgaProject.h">
</File>
<File
RelativePath="MgaReference.h">
</File>
<File
RelativePath="MgaSet.h">
</File>
<File
RelativePath="MgaTerritory.h">
</File>
<File
RelativePath="MgaTrukk.h">
</File>
<File
RelativePath="Resource.h">
</File>
<File
RelativePath="StdAfx.h">
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
<File
RelativePath="MgaClient.rgs">
</File>
<File
RelativePath="MgaFCOs.rgs">
</File>
<File
RelativePath="MgaFolders.rgs">
</File>
<File
RelativePath="MgaO.rgs">
</File>
<File
RelativePath="MgaObjects.rgs">
</File>
<File
RelativePath="MgaProject.rgs">
</File>
<File
RelativePath="MgaRegNodes.rgs">
</File>
</Filter>
<File
RelativePath="doc\edf.dtd">
</File>
<File
RelativePath="doc\model.dtd">
</File>
<File
RelativePath="doc\operations.txt">
</File>
<File
RelativePath="TODO.txt">
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
Index: Mga.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/Mga.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Mga.cpp 2 Jun 2004 21:43:19 -0000 1.11
--- Mga.cpp 26 Jan 2005 17:30:46 -0000 1.12
***************
*** 141,149 ****
- //##ModelId=3C5AA09E0226
struct errtab {
- //##ModelId=3C5AA09E023B
long code;
- //##ModelId=3C5AA09E0245
LPOLESTR descr;
};
--- 141,146 ----
Index: Mga.def
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/Mga.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Mga.def 5 Jul 2000 19:20:00 -0000 1.1
--- Mga.def 26 Jan 2005 17:30:46 -0000 1.2
***************
*** 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: MgaAttribute.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaAttribute.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** MgaAttribute.cpp 13 Oct 2004 15:17:55 -0000 1.14
--- MgaAttribute.cpp 26 Jan 2005 17:30:46 -0000 1.15
***************
*** 9,13 ****
// Throws!!!
- //##ModelId=3C5AA09C0179
void CMgaAttribute::Initialize(metaref_type mr, FCO *o, CMgaProject *p) {
mref = mr;
--- 9,12 ----
***************
*** 24,28 ****
}
- //##ModelId=3C5AA09C0056
STDMETHODIMP CMgaAttribute::get_Owner( IMgaFCO **pVal) {
COMTRY {
--- 23,26 ----
***************
*** 33,37 ****
- //##ModelId=3C5AA09C0060
STDMETHODIMP CMgaAttribute::get_Status( long *status) {
COMTRY {
--- 31,34 ----
***************
*** 46,50 ****
}
- //##ModelId=3C5AA09C006D
STDMETHODIMP CMgaAttribute::get_Value(VARIANT *pVal) {
COMTRY {
--- 43,46 ----
***************
*** 95,99 ****
}
- //##ModelId=3C5AA09C00A7
STDMETHODIMP CMgaAttribute::get_OrigValue(VARIANT *pVal) {
COMTRY {
--- 91,94 ----
***************
*** 145,149 ****
- //##ModelId=3C5AA09C00B1
STDMETHODIMP CMgaAttribute::get_HasChanged(VARIANT_BOOL *pVal) {
COMTRY {
--- 140,143 ----
***************
*** 154,158 ****
- //##ModelId=3C5AA09C0167
STDMETHODIMP CMgaAttribute::Clear() {
COMTRY_IN_TRANSACTION {
--- 148,151 ----
***************
*** 169,175 ****
}
- //##ModelId=3C5AA09E0262
class attrnotifytask : public DeriveTreeTask {
- //##ModelId=3C5AA09E026D
bool Do(CoreObj self, std::vector<CoreObj> *peers = NULL) {
ObjForCore(self)->SelfMark(OBJEVENT_ATTR);
--- 162,166 ----
***************
*** 179,183 ****
- //##ModelId=3C5AA09C007F
STDMETHODIMP CMgaAttribute::put_Value(VARIANT newVal) {
COMTRY_IN_TRANSACTION {
--- 170,173 ----
***************
*** 231,235 ****
- //##ModelId=3C5AA09C0089
STDMETHODIMP CMgaAttribute::get_StringValue(BSTR *pVal) {
if(!(mgaproject->preferences & MGAPREF_RELAXED_RDATTRTYPES) &&
--- 221,224 ----
***************
*** 243,247 ****
}
- //##ModelId=3C5AA09C0095
STDMETHODIMP CMgaAttribute::put_StringValue(BSTR newVal) {
if(!(mgaproject->preferences & MGAPREF_RELAXED_WRATTRTYPES) &&
--- 232,235 ----
***************
*** 253,257 ****
}
- //##ModelId=3C5AA09C00BC
STDMETHODIMP CMgaAttribute::get_IntValue(long *pVal) {
if(!(mgaproject->preferences & MGAPREF_RELAXED_RDATTRTYPES) &&
--- 241,244 ----
***************
*** 282,286 ****
}
- //##ModelId=3C5AA09C00CF
STDMETHODIMP CMgaAttribute::put_IntValue(long newVal) {
if(!(mgaproject->preferences & MGAPREF_RELAXED_WRATTRTYPES) &&
--- 269,272 ----
***************
*** 305,309 ****
}
- //##ModelId=3C5AA09C00D9
STDMETHODIMP CMgaAttribute::get_BoolValue(VARIANT_BOOL *pVal) {
if(!(mgaproject->preferences & MGAPREF_RELAXED_RDATTRTYPES) &&
--- 291,294 ----
***************
*** 317,321 ****
}
- //##ModelId=3C5AA09C00E4
STDMETHODIMP CMgaAttribute::put_BoolValue(VARIANT_BOOL newVal) {
if(!(mgaproject->preferences & MGAPREF_RELAXED_WRATTRTYPES) &&
--- 302,305 ----
***************
*** 327,331 ****
}
- //##ModelId=3C5AA09C00F7
STDMETHODIMP CMgaAttribute::get_FloatValue(double *pVal) {
if(!(mgaproject->preferences & MGAPREF_RELAXED_RDATTRTYPES) &&
--- 311,314 ----
***************
*** 339,343 ****
}
- //##ModelId=3C5AA09C0101
STDMETHODIMP CMgaAttribute::put_FloatValue(double newVal) {
if(!(mgaproject->preferences & MGAPREF_RELAXED_WRATTRTYPES) &&
--- 322,325 ----
***************
*** 349,353 ****
}
- //##ModelId=3C5AA09C010C
STDMETHODIMP CMgaAttribute::get_FCOValue(IMgaFCO **pVal)
{
--- 331,334 ----
***************
*** 365,369 ****
}
- //##ModelId=3C5AA09C0117
STDMETHODIMP CMgaAttribute::put_FCOValue(IMgaFCO *newVal)
{
--- 346,349 ----
***************
*** 377,381 ****
- //##ModelId=3C5AA09C0129
STDMETHODIMP CMgaAttribute::get_RegistryNode( BSTR path, IMgaRegNode **pVal) {
COMTRY {
--- 357,360 ----
***************
*** 391,395 ****
}
- //##ModelId=3C5AA09C0134
STDMETHODIMP CMgaAttribute::get_Registry( VARIANT_BOOL virtuals, IMgaRegNodes **pVal) {
COMTRY {
--- 370,373 ----
***************
*** 402,406 ****
}
- //##ModelId=3C5AA09C0148
STDMETHODIMP CMgaAttribute::get_RegistryValue( BSTR path, BSTR *pVal) {
COMTRY {
--- 380,383 ----
***************
*** 414,418 ****
}
- //##ModelId=3C5AA09C015B
STDMETHODIMP CMgaAttribute::put_RegistryValue( BSTR path, BSTR newval) {
COMTRY_IN_TRANSACTION {
--- 391,394 ----
***************
*** 594,600 ****
- //##ModelId=3C5AA09E0294
class regnotifytask : public DeriveTreeTask {
- //##ModelId=3C5AA09E02A9
bool Do(CoreObj self, std::vector<CoreObj> *peers = NULL) {
ObjForCore(self)->SelfMark(OBJEVENT_REGISTRY);
--- 570,574 ----
***************
*** 605,609 ****
- //##ModelId=3C5AA09D0080
void CMgaRegNode::markchg() {
regnotifytask().DoWithDeriveds(fco->self);
--- 579,582 ----
***************
*** 614,618 ****
- //##ModelId=3C5AA09D009E
STDMETHODIMP CMgaRegNode::get_Object( IMgaObject **pVal) {
COMTRY {
--- 587,590 ----
***************
*** 624,628 ****
};
- //##ModelId=3C5AA09D010E
STDMETHODIMP CMgaRegNode::get_Status( long *status) {
COMTRY {
--- 596,599 ----
***************
*** 639,643 ****
- //##ModelId=3C5AA09D00A8
STDMETHODIMP CMgaRegNode::get_Value(BSTR *pVal) {
COMTRY {
--- 610,613 ----
***************
*** 694,698 ****
}
- //##ModelId=3C5AA09D00BE
STDMETHODIMP CMgaRegNode::get_FCOValue(IMgaFCO **pVal) {
COMTRY {
--- 664,667 ----
***************
*** 713,717 ****
}
- //##ModelId=3C5AA09D0120
STDMETHODIMP CMgaRegNode::get_Opacity( VARIANT_BOOL *pVal) {
COMTRY {
--- 682,685 ----
***************
*** 730,734 ****
}
- //##ModelId=3C5AA09D012A
STDMETHODIMP CMgaRegNode::put_Opacity( VARIANT_BOOL newVal) {
COMTRY_IN_TRANSACTION {
--- 698,701 ----
***************
*** 749,753 ****
- //##ModelId=3C5AA09D00B3
STDMETHODIMP CMgaRegNode::put_Value(BSTR newVal) {
COMTRY_IN_TRANSACTION {
--- 716,719 ----
***************
*** 765,769 ****
}
- //##ModelId=3C5AA09D00D0
STDMETHODIMP CMgaRegNode::put_FCOValue(IMgaFCO *newVal) {
COMTRY_IN_TRANSACTION {
--- 731,734 ----
***************
*** 781,785 ****
}
- //##ModelId=3C5AA09D00DA
STDMETHODIMP CMgaRegNode::get_SubNodes( VARIANT_BOOL virtuals, IMgaRegNodes **pVal) {
COMTRY {
--- 746,749 ----
***************
*** 834,838 ****
}
- //##ModelId=3C5AA09D00F8
STDMETHODIMP CMgaRegNode::get_SubNodeByName(BSTR name, IMgaRegNode **pVal) {
COMTRY {
--- 798,801 ----
***************
*** 848,852 ****
}
- //##ModelId=3C5AA09D0103
STDMETHODIMP CMgaRegNode::get_ParentNode(IMgaRegNode **pVal) {
COMTRY {
--- 811,814 ----
***************
*** 864,868 ****
- //##ModelId=3C5AA09D0135
STDMETHODIMP CMgaRegNode::Clear() {
COMTRY_IN_TRANSACTION {
--- 826,829 ----
***************
*** 888,892 ****
}
- //##ModelId=3C5AA09D013F
STDMETHODIMP CMgaRegNode::RemoveTree() {
COMTRY_IN_TRANSACTION {
--- 849,852 ----
***************
*** 923,927 ****
- //##ModelId=3C5AA09E0059
STDMETHODIMP CMgaPart::get_Model(struct IMgaModel **pVal ) {
COMTRY {
--- 883,886 ----
***************
*** 934,938 ****
};
- //##ModelId=3C5AA09E006F
STDMETHODIMP CMgaPart::get_MetaAspect(struct IMgaMetaAspect **pVal ) {
COMTRY {
--- 893,896 ----
***************
*** 945,949 ****
};
- //##ModelId=3C5AA09E0064
STDMETHODIMP CMgaPart::get_Meta(struct IMgaMetaPart **pVal ) {
COMTRY {
--- 903,906 ----
***************
*** 954,958 ****
};
- //##ModelId=3C5AA09E0079
STDMETHODIMP CMgaPart::get_MetaRole(struct IMgaMetaRole **pVal ) {
COMTRY {
--- 911,914 ----
***************
*** 964,968 ****
- //##ModelId=3C5AA09E008B
STDMETHODIMP CMgaPart::get_FCO(struct IMgaFCO **pVal) {
COMTRY {
--- 920,923 ----
***************
*** 972,979 ****
};
- //##ModelId=3C5AA09E0095
STDMETHODIMP CMgaPart::get_AccessMask(long *) { return E_MGA_NOT_IMPLEMENTED; }
- //##ModelId=3C5AA09E00A0
STDMETHODIMP CMgaPart::GetGmeAttrs(BSTR *icon,long *x,long *y) {
COMTRY {
--- 927,932 ----
***************
*** 991,995 ****
}
- //##ModelId=3C5AA09E00B4
STDMETHODIMP CMgaPart::SetGmeAttrs(BSTR icon,long x,long y) {
COMTRY_IN_TRANSACTION {
--- 944,947 ----
***************
*** 1007,1016 ****
- //##ModelId=3C5AA09E00C9
STDMETHODIMP CMgaPart::get_RegistryMode( VARIANT_BOOL *own) { return E_MGA_NOT_IMPLEMENTED; }
- //##ModelId=3C5AA09E00D4
STDMETHODIMP CMgaPart::put_RegistryMode( VARIANT_BOOL own) { return E_MGA_NOT_IMPLEMENTED; }
- //##ModelId=3C5AA09E00E6
STDMETHODIMP CMgaPart::get_RegistryNode( BSTR path, IMgaRegNode **pVal) {
COMTRY {
--- 959,965 ----
***************
*** 1026,1030 ****
}
- //##ModelId=3C5AA09E00F1
STDMETHODIMP CMgaPart::get_Registry(VARIANT_BOOL virtuals, IMgaRegNodes **pVal) {
COMTRY {
--- 975,978 ----
***************
*** 1037,1041 ****
}
- //##ModelId=3C5AA09E0104
STDMETHODIMP CMgaPart::get_RegistryValue( BSTR path, BSTR *pVal) {
COMTRY {
--- 985,988 ----
***************
*** 1049,1053 ****
}
- //##ModelId=3C5AA09E0118
STDMETHODIMP CMgaPart::put_RegistryValue( BSTR path, BSTR newval) {
COMTRY_IN_TRANSACTION {
--- 996,999 ----
***************
*** 1062,1073 ****
- //##ModelId=3C5AA09E0123
CMgaPart::CMgaPart() : prevptr(NULL), next(NULL), load_status(ATTSTATUS_INVALID) { }
- //##ModelId=3C5AA09E012C
CMgaPart::~CMgaPart() { // remove object from hash
if(next) next->prevptr = prevptr;
*prevptr = next;
}
- //##ModelId=3C5AA09E012D
void CMgaPart::Initialize(metaref_type mr, FCO *o, CMgaProject *p) { // Throws!!!
mref = mr;
--- 1008,1016 ----
Index: MgaAttribute.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaAttribute.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MgaAttribute.h 11 Mar 2002 22:15:00 -0000 1.5
--- MgaAttribute.h 26 Jan 2005 17:30:46 -0000 1.6
***************
*** 10,14 ****
/////////////////////////////////////////////////////////////////////////////
// CMgaAttribute
- //##ModelId=3C5AA09B0344
class ATL_NO_VTABLE CMgaAttribute :
public CComObjectRootEx<CComSingleThreadModel>,
--- 10,13 ----
***************
*** 18,22 ****
{
public:
- //##ModelId=3C5AA09C0042
CMgaAttribute() : prevptr(NULL), next(NULL), load_status(ATTSTATUS_INVALID) { }
--- 17,20 ----
***************
*** 31,35 ****
// IMgaAttribute
public:
- //##ModelId=3C5AA09C0043
STDMETHOD(get_Meta)( IMgaMetaAttribute **pVal) {
COMTRY {
--- 29,32 ----
***************
*** 39,114 ****
} COMCATCH(;)
}
- //##ModelId=3C5AA09C0056
STDMETHOD(get_Owner)( IMgaFCO **pVal);
- //##ModelId=3C5AA09C0060
STDMETHOD(get_Status)( long *status);
- //##ModelId=3C5AA09C006D
STDMETHOD(get_Value)( VARIANT *pVal);
- //##ModelId=3C5AA09C007F
STDMETHOD(put_Value)( VARIANT newVal);
- //##ModelId=3C5AA09C0089
STDMETHOD(get_StringValue)(BSTR *pVal);
- //##ModelId=3C5AA09C0095
STDMETHOD(put_StringValue)( BSTR newVal);
- //##ModelId=3C5AA09C00A7
STDMETHOD(get_OrigValue)( VARIANT *pVal);
- //##ModelId=3C5AA09C00B1
STDMETHOD(get_HasChanged)( VARIANT_BOOL *pVal);
- //##ModelId=3C5AA09C00BC
STDMETHOD(get_IntValue)( long *pVal);
- //##ModelId=3C5AA09C00CF
STDMETHOD(put_IntValue)( long newVal);
- //##ModelId=3C5AA09C00D9
STDMETHOD(get_BoolValue)( VARIANT_BOOL *pVal);
- //##ModelId=3C5AA09C00E4
STDMETHOD(put_BoolValue)( VARIANT_BOOL newVal);
- //##ModelId=3C5AA09C00F7
STDMETHOD(get_FloatValue)( double *pVal);
- //##ModelId=3C5AA09C0101
STDMETHOD(put_FloatValue)( double newVal);
- //##ModelId=3C5AA09C010C
STDMETHOD(get_FCOValue)( IMgaFCO **pVal);
- //##ModelId=3C5AA09C0117
STDMETHOD(put_FCOValue)( IMgaFCO * newVal);
- //##ModelId=3C5AA09C0129
STDMETHOD(get_RegistryNode)( BSTR path, IMgaRegNode **pVal);
- //##ModelId=3C5AA09C0134
STDMETHOD(get_Registry)(VARIANT_BOOL virtuals, IMgaRegNodes **pVal);
- //##ModelId=3C5AA09C0148
STDMETHOD(get_RegistryValue)( BSTR path, BSTR *pVal);
- //##ModelId=3C5AA09C015B
STDMETHOD(put_RegistryValue)( BSTR path, BSTR newval);
- //##ModelId=3C5AA09C0167
STDMETHOD(Clear)();
- //##ModelId=3C5AA09C0205
typedef CMgaAttribute *hashobp;
hashobp *prevptr, next;
- //##ModelId=3C5AA09C0170
~CMgaAttribute() { // remove object from hash
if(next) next->prevptr = prevptr;
*prevptr = next;
}
- //##ModelId=3C5AA09C0179
void Initialize(metaref_type mr, FCO *o, CMgaProject *p); // Throws!!!
- //##ModelId=3C5AA09C018E
metaref_type mref;
- //##ModelId=3C5AA09C0197
long load_status;
- //##ModelId=3C5AA09C01AC
CoreObj valueobj;
- //##ModelId=3C5AA09C01C0
CComQIPtr<IMgaMetaAttribute> mvalueobj;
- //##ModelId=3C5AA09C01CA
FCOPtr fco;
attval_enum attrtyp, inputtyp;
- //##ModelId=3C5AA09C01DE
CMgaProject *mgaproject;
- //##ModelId=3C5AA09C01F2
CComBSTR(regprefix);
};
--- 36,80 ----
***************
*** 119,128 ****
- //##ModelId=3C5AA09C0237
class attrpool {
- //##ModelId=3C5AA09C024C
CMgaAttribute::hashobp pool[APOOL_HASHSIZE];
public:
- //##ModelId=3C5AA09C025F
attrpool() {
int i;
--- 85,91 ----
***************
*** 130,134 ****
}
- //##ModelId=3C5AA09C0260
~attrpool() {
int i;
--- 93,96 ----
***************
*** 137,141 ****
// Throws (allocates)!!!!
- //##ModelId=3C5AA09C0261
CComPtr<IMgaAttribute> getpoolobj(metaref_type mref, FCO *o, CMgaProject *pr) {
CMgaAttribute::hashobp &k = pool[apool_hash(mref)], *kk;
--- 99,102 ----
***************
*** 153,157 ****
s->Initialize(mref, o, pr);
! return s;
}
};
--- 114,119 ----
s->Initialize(mref, o, pr);
! CComPtr<IMgaAttribute> retval = s;
! return retval;
}
};
***************
*** 162,166 ****
/////////////////////////////////////////////////////////////////////////////
// CMgaRegNode
- //##ModelId=3C5AA09C0378
class ATL_NO_VTABLE CMgaRegNode :
public CComObjectRootEx<CComSingleThreadModel>,
--- 124,127 ----
***************
*** 180,187 ****
// IMgaRegNode
- //##ModelId=3C5AA09D0080
void markchg();
public:
- //##ModelId=3C5AA09D0081
STDMETHOD(get_Name)( BSTR *pVal) {
COMTRY {
--- 141,146 ----
***************
*** 194,198 ****
} COMCATCH(;);
};
- //##ModelId=3C5AA09D0094
STDMETHOD(get_Path)( BSTR *pVal) {
COMTRY {
--- 153,156 ----
***************
*** 201,243 ****
} COMCATCH(;);
};
- //##ModelId=3C5AA09D009E
STDMETHOD(get_Object)( IMgaObject **pVal);
- //##ModelId=3C5AA09D00A8
STDMETHOD(get_Value)( BSTR *pVal);
- //##ModelId=3C5AA09D00B3
STDMETHOD(put_Value)( BSTR newVal);
- //##ModelId=3C5AA09D00BE
STDMETHOD(get_FCOValue)( IMgaFCO **pVal);
- //##ModelId=3C5AA09D00D0
STDMETHOD(put_FCOValue)( IMgaFCO *newVal);
- //##ModelId=3C5AA09D00DA
STDMETHOD(get_SubNodes)( VARIANT_BOOL virtuals, IMgaRegNodes **pVal);
- //##ModelId=3C5AA09D00F8
STDMETHOD(get_SubNodeByName)(BSTR name, IMgaRegNode **pVal);
- //##ModelId=3C5AA09D0103
STDMETHOD(get_ParentNode)( IMgaRegNode **pVal);
- //##ModelId=3C5AA09D010E
STDMETHOD(get_Status)( long *status);
- //##ModelId=3C5AA09D0120
STDMETHOD(get_Opacity)( VARIANT_BOOL *pVal);
- //##ModelId=3C5AA09D012A
STDMETHOD(put_Opacity)( VARIANT_BOOL newVal);
- //##ModelId=3C5AA09D0135
STDMETHOD(Clear)();
- //##ModelId=3C5AA09D013F
STDMETHOD(RemoveTree)();
- //##ModelId=3C5AA09D01C0
typedef CMgaRegNode *hashobp;
hashobp *prevptr, next;
- //##ModelId=3C5AA09D0148
CMgaRegNode() : prevptr(NULL), next(NULL), load_status(ATTSTATUS_INVALID) { }
- //##ModelId=3C5AA09D0149
~CMgaRegNode() { // remove object from hash
if(next) next->prevptr = prevptr;
*prevptr = next;
}
- //##ModelId=3C5AA09D0152
void Initialize(BSTR path, FCO *o, CMgaProject *p) { // Throws!!!
mypath = path;
--- 159,184 ----
***************
*** 246,258 ****
}
- //##ModelId=3C5AA09D0166
long load_status;
- //##ModelId=3C5AA09D0171
CoreObj valueobj;
- //##ModelId=3C5AA09D0185
FCOPtr fco;
- //##ModelId=3C5AA09D018F
CComBSTR mypath;
- //##ModelId=3C5AA09D01A3
CMgaProject *mgaproject;
};
--- 187,194 ----
***************
*** 262,271 ****
- //##ModelId=3C5AA09D01F3
class regnpool {
- //##ModelId=3C5AA09D0208
CMgaRegNode::hashobp pool[RPOOL_HASHSIZE];
public:
- //##ModelId=3C5AA09D021B
regnpool() {
int i;
--- 198,204 ----
***************
*** 273,277 ****
}
- //##ModelId=3C5AA09D021C
~regnpool() {
int i;
--- 206,209 ----
***************
*** 279,283 ****
}
- //##ModelId=3C5AA09D021D
int rpool_hash(BSTR nam) {
int i = SysStringLen(nam);
--- 211,214 ----
***************
*** 288,292 ****
// Throws (allocates)!!!!
- //##ModelId=3C5AA09D022F
CComPtr<IMgaRegNode> getpoolobj(BSTR nam, FCO *o, CMgaProject *pr) {
CMgaRegNode::hashobp &k = pool[rpool_hash(nam)], *kk;
--- 219,222 ----
***************
*** 304,308 ****
s->Initialize(nam, o, pr);
! return s;
}
};
--- 234,239 ----
s->Initialize(nam, o, pr);
! CComPtr<IMgaRegNode> retval = s;
! return retval;
}
};
***************
*** 317,321 ****
/////////////////////////////////////////////////////////////
- //##ModelId=3C5AA09D0347
class ATL_NO_VTABLE CMgaPart :
public CComObjectRootEx<CComSingleThreadModel>,
--- 248,251 ----
***************
*** 336,391 ****
// IMgaPart
public:
- //##ModelId=3C5AA09E0059
STDMETHOD(get_Model)(struct IMgaModel **pVal );
- //##ModelId=3C5AA09E0064
STDMETHOD(get_Meta)(struct IMgaMetaPart **pVal );
- //##ModelId=3C5AA09E006F
STDMETHOD(get_MetaAspect)(struct IMgaMetaAspect **pVal );
- //##ModelId=3C5AA09E0079
STDMETHOD(get_MetaRole)(struct IMgaMetaRole **pVal );
- //##ModelId=3C5AA09E008B
STDMETHOD(get_FCO)(struct IMgaFCO **pVal);
- //##ModelId=3C5AA09E0095
STDMETHOD(get_AccessMask)(long *);
- //##ModelId=3C5AA09E00A0
STDMETHOD(GetGmeAttrs)(BSTR *icon,long *x,long *y);
- //##ModelId=3C5AA09E00B4
STDMETHOD(SetGmeAttrs)(BSTR icon,long x,long y);
- //##ModelId=3C5AA09E00C9
STDMETHOD(get_RegistryMode)( VARIANT_BOOL *own);
- //##ModelId=3C5AA09E00D4
STDMETHOD(put_RegistryMode)( VARIANT_BOOL own);
- //##ModelId=3C5AA09E00E6
STDMETHOD(get_RegistryNode)( BSTR path, IMgaRegNode **pVal);
- //##ModelId=3C5AA09E00F1
STDMETHOD(get_Registry)( VARIANT_BOOL virtuals, IMgaRegNodes **pVal);
- //##ModelId=3C5AA09E0104
STDMETHOD(get_RegistryValue)( BSTR path, BSTR *pVal);
- //##ModelId=3C5AA09E0118
STDMETHOD(put_RegistryValue)( BSTR path, BSTR newval);
- //##ModelId=3C5AA09E0123
CMgaPart();
- //##ModelId=3C5AA09E012C
~CMgaPart();
- //##ModelId=3C5AA09E012D
void Initialize(metaref_type mr, FCO *o, CMgaProject *p);
- //##ModelId=3C5AA09E01AE
typedef CMgaPart *hashobp;
hashobp *prevptr, next;
- //##ModelId=3C5AA09E0141
metaref_type mref;
- //##ModelId=3C5AA09E014A
long load_status;
- //##ModelId=3C5AA09E015F
FCOPtr fco;
- //##ModelId=3C5AA09E0169
CMgaProject *mgaproject; // Holds no reference
- //##ModelId=3C5AA09E017D
CComBSTR(regprefix);
- //##ModelId=3C5AA09E0191
CComBSTR(aspname);
};
--- 266,297 ----
***************
*** 397,406 ****
- //##ModelId=3C5AA09E01E0
class partpool {
- //##ModelId=3C5AA09E01EB
CMgaPart::hashobp pool[PPOOL_HASHSIZE];
public:
- //##ModelId=3C5AA09E01FE
partpool() {
int i;
--- 303,309 ----
***************
*** 408,412 ****
}
- //##ModelId=3C5AA09E01FF
~partpool() {
int i;
--- 311,314 ----
***************
*** 415,419 ****
// Throws (allocates)!!!!
- //##ModelId=3C5AA09E0208
CComPtr<IMgaPart> getpoolobj(metaref_type mref, FCO *o, CMgaProject *pr) {
CMgaPart::hashobp &k = pool[ppool_hash(mref)], *kk;
--- 317,320 ----
***************
*** 431,435 ****
s->Initialize(mref, o, pr);
! return s;
}
};
--- 332,337 ----
s->Initialize(mref, o, pr);
! CComPtr<IMgaPart> retval = s;
! return retval;
}
};
Index: MgaCheck.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaCheck.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MgaCheck.cpp 9 Apr 2002 22:20:00 -0000 1.6
--- MgaCheck.cpp 26 Jan 2005 17:30:46 -0000 1.7
***************
*** 71,75 ****
- //##ModelId=3C5AA097004F
HRESULT FCO::GetAbsMetaPath(BSTR *abspath) {
COMTRY {
--- 71,74 ----
***************
*** 82,86 ****
}
- //##ModelId=3C5AA0970059
HRESULT FCO::GetRelMetaPath(IMgaFCO *begfco, BSTR *rp, IMgaFCOs *refs) {
COMTRY {
--- 81,84 ----
***************
*** 112,116 ****
- //##ModelId=3C5AA097009F
HRESULT FCO::CheckTree() {
COMTRY {
--- 110,113 ----
***************
*** 263,267 ****
- //##ModelId=3C5AA09700A0
HRESULT FCO::CheckRCS() {
COMTRY {
--- 260,263 ----
***************
*** 336,340 ****
- //##ModelId=3C5AA097010E
HRESULT FCO::put_Exempt(VARIANT_BOOL newVal) {
COMTRY_IN_TRANSACTION {
--- 332,335 ----
***************
*** 351,355 ****
}
- //##ModelId=3C5AA0970122
HRESULT FCO::get_Exempt(VARIANT_BOOL *pVal) {
COMTRY {
--- 346,349 ----
Index: MgaComplexOps.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaComplexOps.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MgaComplexOps.cpp 13 Oct 2004 15:17:55 -0000 1.9
--- MgaComplexOps.cpp 26 Jan 2005 17:30:46 -0000 1.10
***************
*** 912,916 ****
- //##ModelId=3C5AA0970352
HRESULT FCO::CopyFCOs(IMgaFCOs *copylist, IMgaMetaRoles *rlist,IMgaFCOs **objs) {
COMTRY_IN_TRANSACTION {
--- 912,915 ----
***************
*** 1160,1164 ****
- //##ModelId=3C5AA097037A
HRESULT FCO::MoveFCOs(IMgaFCOs *movelist, IMgaMetaRoles *rlist,IMgaFCOs **objs) {
COMTRY_IN_TRANSACTION {
--- 1159,1162 ----
***************
*** 1347,1351 ****
- //##ModelId=3C5AA09703A2
HRESULT FCO::DeriveFCO(IMgaFCO *base, IMgaMetaRole *role, VARIANT_BOOL binstance, IMgaFCO** newobj) {
COMTRY_IN_TRANSACTION {
--- 1345,1348 ----
Index: MgaConnection.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaConnection.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** MgaConnection.cpp 13 Oct 2004 15:17:55 -0000 1.16
--- MgaConnection.cpp 26 Jan 2005 17:30:46 -0000 1.17
***************
*** 255,259 ****
CHECK_INSTRPAR(newVal);
fco->CheckWrite();
! if(CComBSTR(cobj[ATTRID_NAME]) = newVal) {
cobj[ATTRID_MASTEROBJ] = NULLCOREOBJ;
put_ConnRoleTask(newVal).DoWithDeriveds(cobj);
--- 255,262 ----
CHECK_INSTRPAR(newVal);
fco->CheckWrite();
! //if(CComBSTR( cobj[ATTRID_NAME] ) = newVal) ... //zolmol: rewritten for VC7
! //if( (CComBSTR) cobj[ATTRID_NAME] = newVal) ... // also would be ok for vc7
! if( newVal) { // ... but this is more clear
! (CComBSTR) cobj[ATTRID_NAME] = newVal;
cobj[ATTRID_MASTEROBJ] = NULLCOREOBJ;
put_ConnRoleTask(newVal).DoWithDeriveds(cobj);
Index: MgaConnection.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaConnection.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MgaConnection.h 13 Oct 2004 15:17:55 -0000 1.6
--- MgaConnection.h 26 Jan 2005 17:30:47 -0000 1.7
***************
*** 12,16 ****
- //##ModelId=3C5AA09A0248
class ATL_NO_VTABLE CMgaConnection :
public CComCoClass<CMgaConnection, &CLSID_MgaSimpleConnection>,
--- 12,15 ----
***************
*** 21,25 ****
{
public:
- //##ModelId=3C5AA09A0311
static HRESULT WINAPI simpletest(void* pv, REFIID riid, LPVOID* ppv, DWORD dw) {
FCO *f = reinterpret_cast<CMgaConnection*>(pv)->innFCO;
--- 20,23 ----
***************
*** 31,35 ****
}
- //##ModelId=3C5AA09A0325
CMgaConnection() { }
--- 29,32 ----
***************
*** 48,86 ****
// IMgaSimpleConnection
public:
- //##ModelId=3C5AA09A0326
HRESULT findroleobj(BSTR rolename, ICoreObject **tt);
- //##ModelId=3C5AA09A0339
STDMETHOD(get_NamedRole)(BSTR rolename, IMgaFCO **pVal) {
return inFCO->get_NamedRoleTarget(rolename,pVal); }
- //##ModelId=3C5AA09A0344
STDMETHOD(get_NamedRoleReferences)(BSTR rolename, IMgaFCOs **pVal) {
return inFCO->get_NamedRoleReferences( rolename,pVal); }
- //##ModelId=3C5AA09A0357
STDMETHOD(get_Src)(IMgaFCO **pVal) { return inFCO->get_NamedRoleTarget(inFCO->SrcName, pVal); }
- //##ModelId=3C5AA09A0362
STDMETHOD(get_Dst)(IMgaFCO **pVal) { return inFCO->get_NamedRoleTarget(inFCO->DstName, pVal); }
- //##ModelId=3C5AA09A036D
STDMETHOD(get_SrcReferences)(IMgaFCOs **pVal) { return get_NamedRoleReferences(inFCO->SrcName, pVal); }
- //##ModelId=3C5AA09A037F
STDMETHOD(get_DstReferences)(IMgaFCOs **pVal) { return get_NamedRoleReferences(inFCO->DstName, pVal); }
- //##ModelId=3C5AA09A0389
STDMETHOD(SetSrc)(IMgaFCOs *refs, IMgaFCO * newVal) {
return inFCO->put_NamedRole(inFCO->SrcName, refs, newVal); }
- //##ModelId=3C5AA09A0394
STDMETHOD(SetDst)(IMgaFCOs *refs, IMgaFCO * newVal) {
return inFCO->put_NamedRole(inFCO->DstName, refs, newVal); }
- //##ModelId=3C5AA09A03A7
STDMETHOD(AddConnPoint)(BSTR rolename, long maxinrole, IMgaFCO *target, IMgaFCOs *refs, IMgaConnPoint **pVal) {
return inFCO->AddConnPoint(rolename, maxinrole, target, refs, pVal); }
- //##ModelId=3C5AA09A03C5
STDMETHOD(get_ConnPoints)(IMgaConnPoints **pVal) {
return inFCO->get_ConnPoints(pVal); }
- //##ModelId=3C5AA09A03CF
STDMETHOD(CompareToBase)(IMgaConnPoint *p, short *status) { return inFCO->ConnCompareToBase(p,status); }
- //##ModelId=3C5AA09A03DB
STDMETHOD(RevertToBase)(IMgaConnPoint *p) { return inFCO->ConnRevertToBase(p); }
};
--- 45,70 ----
***************
*** 90,94 ****
/////////////////////////////////////////////////////////////////////////////
// CMgaConnPoint
- //##ModelId=3C5AA09B0037
class ATL_NO_VTABLE CMgaConnPoint :
public CComCoClass<CMgaConnPoint, &CLSID_MgaConnPoint>,
--- 74,77 ----
***************
*** 99,114 ****
public:
DEFSIG;
- //##ModelId=3C5AA09B0113
CMgaConnPoint() {
INITSIG('C');
}
- //##ModelId=3C5AA09B011E
CComPtr<FCO> fco;
- //##ModelId=3C5AA09B0128
CoreObj cobj;
- //##ModelId=3C5AA09B013B
static void GetConnPoint(FCO *f, CoreObj &c, IMgaConnPoint **cp);
- //##ModelId=3C5AA09B0159
~CMgaConnPoint();
--- 82,92 ----
***************
*** 123,143 ****
// IMgaConnPoint
public:
- //##ModelId=3C5AA09B015A
STDMETHOD(get_Owner)(IMgaConnection **pVal);
- //##ModelId=3C5AA09B016D
STDMETHOD(get_ConnRole)(BSTR *pVal);
- //##ModelId=3C5AA09B0177
STDMETHOD(put_ConnRole)(BSTR newVal);
- //##ModelId=3C5AA09B018B
STDMETHOD(get_Target)(IMgaFCO **pVal);
- //##ModelId=3C5AA09B0195
STDMETHOD(get_References)(IMgaFCOs **pVal);
- //##ModelId=3C5AA09B01A1
STDMETHOD(Remove)();
};
- //##ModelId=3C5AA09B01BE
class RemoveConnPTask : public DeriveTreeTask {
- //##ModelId=3C5AA09B01C9
bool Do(CoreObj self, std::vector<CoreObj> *peers = NULL);
};
--- 101,113 ----
Index: MgaConstraint.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaConstraint.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MgaConstraint.cpp 18 May 2004 13:30:59 -0000 1.5
--- MgaConstraint.cpp 26 Jan 2005 17:30:47 -0000 1.6
***************
*** 9,13 ****
- //##ModelId=3C5AA09801E1
HRESULT FCO::DefineConstraint(BSTR name, long eventmask, BSTR expression, IMgaConstraint **pp) {
COMTRY {
--- 9,12 ----
***************
*** 19,23 ****
- //##ModelId=3C5AA09801D7
HRESULT FCO::AddConstraint(struct IMgaConstraint *p) {
COMTRY {
--- 18,21 ----
***************
*** 30,34 ****
- //##ModelId=3C5AA098019B
HRESULT FCO::get_Constraints(VARIANT_BOOL includemeta, IMgaConstraints **pVal) {
COMTRY {
--- 28,31 ----
***************
*** 49,52 ****
- //##ModelId=3C5AA09801B9
HRESULT FCO::CheckConstraints(long,int *,unsigned short ** ) { return E_MGA_NOT_IMPLEMENTED; };
--- 46,48 ----
Index: MgaConstraint.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaConstraint.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MgaConstraint.h 11 Mar 2002 22:16:00 -0000 1.3
--- MgaConstraint.h 26 Jan 2005 17:30:47 -0000 1.4
***************
*** 8,12 ****
/////////////////////////////////////////////////////////////////////////////
// CMgaConstraint
- //##ModelId=3C5AA09A0130
class ATL_NO_VTABLE CMgaConstraint :
public CComObjectRootEx<CComSingleThreadModel>,
--- 8,11 ----
***************
*** 16,26 ****
public:
CComBSTR name, expression;
- //##ModelId=3C5AA09A01C7
long eventmask;
- //##ModelId=3C5AA09A01D0
CMgaConstraint()
{
}
- //##ModelId=3C5AA09A01D1
static void GetConstraint(FCO *f, CoreObj &c, IMgaConstraint **cp);
--- 15,22 ----
***************
*** 34,45 ****
// IMgaConstraint
public:
- //##ModelId=3C5AA09A01E6
STDMETHOD(get_Name)(BSTR * ) { return E_MGA_NOT_IMPLEMENTED; };
// STDMETHOD(get_Priority)(long *) { return E_MGA_NOT_IMPLEMENTED; };
- //##ModelId=3C5AA09A01F8
STDMETHOD(get_EventMask)(long *) { return E_MGA_NOT_IMPLEMENTED; };
- //##ModelId=3C5AA09A0202
STDMETHOD(get_Expression)(BSTR * ) { return E_MGA_NOT_IMPLEMENTED; };
- //##ModelId=3C5AA09A020C
STDMETHOD(get_Status) (long *status) { return E_MGA_NOT_IMPLEMENTED; };
};
--- 30,37 ----
Index: MgaCoreObj.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaCoreObj.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MgaCoreObj.h 23 Jul 2004 21:55:24 -0000 1.3
--- MgaCoreObj.h 26 Jan 2005 17:30:47 -0000 1.4
***************
*** 151,156 ****
}
! template <class C>
! const C& operator= (const C &s) const {
CComVariant k(s);
COMTHROW(p->put_AttributeValue(i,k));
--- 151,156 ----
}
! template <class C>
! const C& operator= (const C &s) { //const removed
CComVariant k(s);
COMTHROW(p->put_AttributeValue(i,k));
Index: MgaFCO.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaFCO.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** MgaFCO.cpp 13 Oct 2004 15:17:55 -0000 1.33
--- MgaFCO.cpp 26 Jan 2005 17:30:47 -0000 1.34
***************
*** 47,51 ****
// return an IMgaObject for this FCO. By default, use the active territory to create it
! void FCO::getinterface(IMgaObject **p, CMgaTerritory *terr) {
ASSERT(mgaproject->activeterr);
if(terr == NULL) terr = mgaproject->activeterr;
--- 47,52 ----
// return an IMgaObject for this FCO. By default, use the active territory to create it
! template <>
! void FCO::getinterface<IMgaObject>(IMgaObject **p, CMgaTerritory *terr) {
ASSERT(mgaproject->activeterr);
if(terr == NULL) terr = mgaproject->activeterr;
***************
*** 213,217 ****
} COMCATCH(e.hr = E_MGA_META_INCOMPATIBILITY;)
! if(!(*pVal)) COMTHROW(E_MGA_META_INCOMPATIBILITY);
} COMCATCH(;)
}
--- 214,220 ----
} COMCATCH(e.hr = E_MGA_META_INCOMPATIBILITY;)
! // unreachable code ? really?
! if(!(*pVal))
! COMTHROW(E_MGA_META_INCOMPATIBILITY);
} COMCATCH(;)
}
Index: MgaFCO.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaFCO.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** MgaFCO.h 13 Oct 2004 15:17:55 -0000 1.20
--- MgaFCO.h 26 Jan 2005 17:30:47 -0000 1.21
***************
*** 513,520 ****
}
! template <>
void getinterface<IMgaObject>(IMgaObject **p, CMgaTerritory *terr);
! template <>
! void getinterface<IMgaObject>(IMgaObject **p) { getinterface(p, NULL); }
};
--- 513,524 ----
}
! template <> // specialization for the template method above
void getinterface<IMgaObject>(IMgaObject **p, CMgaTerritory *terr);
!
! //template <> //gives internal compiler error
! void getinterface(IMgaObject **p) // shorthand for the method above
! {
! getinterface<IMgaObject>(p, (CMgaTerritory *) NULL);
! }
};
Index: MgaFilter.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaFilter.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MgaFilter.cpp 14 Jan 2003 21:00:00 -0000 1.8
--- MgaFilter.cpp 26 Jan 2005 17:30:47 -0000 1.9
***************
*** 9,13 ****
#define MAXLEV 30
- //##ModelId=3C5AA090026D
void CMgaFilter::init() {
if(newlevel) {
--- 9,12 ----
***************
*** 152,156 ****
- //##ModelId=3C5AA0900245
STDMETHODIMP CMgaFilter::get_Name(BSTR *pVal)
{
--- 151,154 ----
***************
*** 161,165 ****
}
- //##ModelId=3C5AA0900258
STDMETHODIMP CMgaFilter::put_Name(BSTR newVal)
{
--- 159,162 ----
***************
*** 171,175 ****
}
- //##ModelId=3C5AA0900228
STDMETHODIMP CMgaFilter::get_Kind(BSTR *pVal)
{
--- 168,171 ----
***************
*** 180,184 ****
}
- //##ModelId=3C5AA090023A
STDMETHODIMP CMgaFilter::put_Kind(BSTR newVal)
{
--- 176,179 ----
***************
*** 190,194 ****
}
- //##ModelId=3C5AA0900212
STDMETHODIMP CMgaFilter::get_Role(BSTR *pVal)
{
--- 185,188 ----
***************
*** 199,203 ****
}
- //##ModelId=3C5AA090021C
STDMETHODIMP CMgaFilter::put_Role(BSTR newVal)
{
--- 193,196 ----
***************
*** 209,213 ****
}
- //##ModelId=3C5AA09001F4
STDMETHODIMP CMgaFilter::get_ObjType(BSTR *pVal)
{
--- 202,205 ----
***************
*** 218,222 ****
}
- //##ModelId=3C5AA0900200
STDMETHODIMP CMgaFilter::put_ObjType(BSTR newVal)
{
--- 210,213 ----
***************
*** 228,232 ****
}
- //##ModelId=3C5AA09001D6
STDMETHODIMP CMgaFilter::get_Level(BSTR *pVal)
{
--- 219,222 ----
***************
*** 237,241 ****
}
- //##ModelId=3C5AA09001EA
STDMETHODIMP CMgaFilter::put_Level(BSTR newVal)
{
--- 227,230 ----
***************
*** 248,252 ****
- //##ModelId=3C5AA0900262
STDMETHODIMP CMgaFilter::get_Project(IMgaProject **pVal) {
COMTRY {
--- 237,240 ----
Index: MgaFilter.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaFilter.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MgaFilter.h 13 Oct 2004 15:17:55 -0000 1.6
--- MgaFilter.h 26 Jan 2005 17:30:47 -0000 1.7
***************
*** 11,15 ****
/////////////////////////////////////////////////////////////////////////////
// CMgaFilter
- //##ModelId=3C5AA0900103
class ATL_NO_VTABLE CMgaFilter :
public CComObjectRootEx<CComSingleThreadModel>,
--- 11,14 ----
***************
*** 19,23 ****
{
public:
- //##ModelId=3C5AA09001A6
CMgaFilter()
{
--- 18,21 ----
***************
*** 38,83 ****
CComBSTR level, objtype, role, kind, name;
bool newlevel, newobjtype, newrole, newkind, newname;
- //##ModelId=3C5AA09001AE
unsigned long levels;
- //##ModelId=3C5AA09001B8
unsigned long objtypes;
- //##ModelId=3C5AA09002C6
typedef std::hash_set<CComBSTRNoAt, CComBSTR_hashfunc> BSTRhash;
- //##ModelId=3C5AA09002DA
typedef std::hash_set<metaref_type, metaref_hashfunc> mrefhash;
mrefhash rolenums, kindnums;
BSTRhash rolenames, kindnames, names;
- //##ModelId=3C5AA09001CD
CMgaProject *mgaproject;
// IMgaFilter
public:
- //##ModelId=3C5AA09001D6
STDMETHOD(get_Level)(BSTR *pVal);
- //##ModelId=3C5AA09001EA
STDMETHOD(put_Level)(BSTR newVal);
- //##ModelId=3C5AA09001F4
STDMETHOD(get_ObjType)(BSTR *pVal);
- //##ModelId=3C5AA0900200
STDMETHOD(put_ObjType)(BSTR newVal);
- //##ModelId=3C5AA0900212
STDMETHOD(get_Role)(BSTR *pVal);
- //##ModelId=3C5AA090021C
STDMETHOD(put_Role)(BSTR newVal);
- //##ModelId=3C5AA0900228
STDMETHOD(get_Kind)(BSTR *pVal);
- //##ModelId=3C5AA090023A
STDMETHOD(put_Kind)(BSTR newVal);
- //##ModelId=3C5AA0900245
STDMETHOD(get_Name)(BSTR *pVal);
- //##ModelId=3C5AA0900258
STDMETHOD(put_Name)(BSTR newVal);
- //##ModelId=3C5AA0900262
STDMETHOD(get_Project)(IMgaProject **pVal);
void searchFCOs(CoreObj &self, EXCOLLECTIONTYPE_FOR(MgaFCO) *retcoll, int level = 0);
- //##ModelId=3C5AA090026D
void init();
- //##ModelId=3C5AA09002B2
void setproject(CMgaProject *p ) { mgaproject = p; }
};
--- 36,63 ----
Index: MgaFolder.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaFolder.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** MgaFolder.cpp 13 Oct 2004 15:17:55 -0000 1.26
--- MgaFolder.cpp 26 Jan 2005 17:30:47 -0000 1.27
***************
*** 690,694 ****
}
- //##ModelId=3C5AA097033E
HRESULT FCO::get_ChildFCO(BSTR name, IMgaFCO ** pVal) {
COMTRY {
--- 690,693 ----
***************
*** 716,720 ****
- //##ModelId=3C5AA09702EE
HRESULT FCO::GetChildrenOfKind(BSTR kindname, IMgaFCOs ** pVal) {
COMTRY {
--- 715,718 ----
***************
*** 748,752 ****
- //##ModelId=3C5AA099025B
HRESULT FCO::ChangeObject(IMgaMetaRole *newrole, IMgaMetaFCO *kind) {
CoreObj selfsave = self;
--- 746,749 ----
***************
*** 834,838 ****
- //##ModelId=3C5AA09F0015
typedef std::hash_set<CoreObj, coreobj_hashfunc, coreobj_eqfunc> coreobjset;
--- 831,834 ----
***************
*** 859,863 ****
}
- //##ModelId=3C5AA08C020C
STDMETHODIMP CMgaProject::EnumExtReferences(IMgaFCOs *fcos, IMgaFCOs **pVal) {
COMTRY {
--- 855,858 ----
Index: MgaFolder.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaFolder.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MgaFolder.h 2 Jun 2004 21:43:19 -0000 1.6
--- MgaFolder.h 26 Jan 2005 17:30:47 -0000 1.7
***************
*** 6,10 ****
#include "resource.h" // main symbols
#include "MgaFCO.h"
-
/////////////////////////////////////////////////////////////////////////////
--- 6,9 ----
***************
*** 12,28 ****
- //##ModelId=3C5AA08F0116
template <class T>
class ATL_NO_VTABLE IMgaContainerImpl : public T {
public:
- //##ModelId=3C5AA08F012B
STDMETHOD(GetChildrenOfKind)(BSTR kn, IMgaFCOs **pVal) { return inFCO->GetChildrenOfKind(kn, pVal); }
- //##ModelId=3C5AA08F013E
STDMETHOD(GetDescendantFCOs)(IMgaFilter* filt, IMgaFCOs **pVal) {
return inFCO->GetDescendantFCOs(filt, pVal); };
- //##ModelId=3C5AA08F0149
STDMETHOD(get_ChildFCOs)(IMgaFCOs ** pVal) { return inFCO->get_ChildFCOs(pVal); };
- //##ModelId=3C5AA08F0154
STDMETHOD(get_ChildFCO)(BSTR n,IMgaFCO**pVal) { return inFCO->get_ChildFCO(n, pVal); };
--- 11,22 ----
***************
*** 32,36 ****
// CMgaFolder
- //##ModelId=3C5AA08F01CA
class ATL_NO_VTABLE CMgaFolder :
public CComCoClass<CMgaFolder, &CLSID_MgaFolder>,
--- 26,29 ----
***************
*** 41,46 ****
public:
! //##ModelId=3C5AA08F0262
! DECLARE_ONLY_AGGREGATEABLE(_CoClass);
DECLARE_PROTECT_FINAL_CONSTRUCT()
--- 34,38 ----
public:
! DECLARE_ONLY_AGGREGATABLE(_CoClass)
DECLARE_PROTECT_FINAL_CONSTRUCT()
***************
*** 55,138 ****
// IMgaFolder
- //##ModelId=3C5AA08F026B
STDMETHOD(DeriveRootObject)(IMgaFCO* base, VARIANT_BOOL instance, IMgaFCO **nobj) {
return inFCO->DeriveFCO(base, NULL, instance, nobj); }
- //##ModelId=3C5AA08F0280
STDMETHOD(CreateRootObject)(IMgaMetaFCO* meta, IMgaFCO **nobj) {
return inFCO->CreateRootObject(meta,nobj); }
- //##ModelId=3C5AA08F0294
STDMETHOD(CreateFolder)(IMgaMetaFolder *meta, IMgaFolder **nf) {
return inFCO->CreateFolder(meta, nf); }
- //##ModelId=3C5AA08F02A8
STDMETHOD(get_ChildFolders)(IMgaFolders **pVal) {
return inFCO->get_ChildFolders(pVal); }
- //##ModelId=3C5AA08F02BB
STDMETHOD(get_ParentFolder)(IMgaFolder **pVal) { return
inFCO->GetParent(reinterpret_cast<IMgaContainer **>(pVal),NULL); }
- //##ModelId=3C5AA08F02C5
STDMETHOD(get_MetaFolder)(IMgaMetaFolder **pVal) { return inFCO->get_MetaFolder(pVal); }
- //##ModelId=3C5AA08F02D0
STDMETHOD(CopyFCOs)(IMgaFCOs *list, IMgaFCOs **objs) { return inFCO->CopyFCOs(list, NULL, objs); }
- //##ModelId=3C5AA08F02E4
STDMETHOD(MoveFCOs)(IMgaFCOs *list, IMgaFCOs **objs) { return inFCO->MoveFCOs(list, NULL, objs); }
- //##ModelId=3C5AA08F02D0
STDMETHOD(CopyFolders)(IMgaFolders *list, IMgaFolders **objs) { return inFCO->CopyFolders(list, /*NULL,*/ objs); }
- //##ModelId=3C5AA08F02E4
STDMETHOD(MoveFolders)(IMgaFolders *list, IMgaFolders **objs) { return inFCO->MoveFolders(list, /*NULL,*/ objs); }
//STDMETHOD(MoveFCOsAndFolders)(IMgaFolders *list, IMgaFCOs *list2, IMgaFolders **objs, IMgaFCOs **objs2) { return inFCO->MoveFCOsAndFolders(list, list2, objs, objs2); }
STDMETHOD(RefreshParent)(IMgaFolder *parent) { return inFCO->RefreshParent( parent); }
- //##ModelId=3C5AA08F0301
STDMETHOD(AttachLibrary)(BSTR libname, IMgaFolder **nf)
{ return inFCO->AttachLibrary(libname, nf); }
- //##ModelId=3C5AA08F0316
STDMETHOD(RefreshLibrary)(BSTR libname)
{ return inFCO->RefreshLibrary(libname); }
- //##ModelId=3C5AA08F0329
STDMETHOD(get_LibraryName)(BSTR *libname)
{ return inFCO->get_LibraryName(libname); }
- //##ModelId=3C5AA08F0333
STDMETHOD(put_LibraryName)(BSTR libname)
{ return inFCO->put_LibraryName(libname); }
- //##ModelId=3C5AA08F033E
STDMETHOD(get_ChildRelIDCounter)(long *pVal) {
return inFCO->get_ChildRelIDCounter(pVal); }
- //##ModelId=3C5AA08F0351
STDMETHOD(put_ChildRelIDCounter)(long pVal) {
return inFCO->put_ChildRelIDCounter(pVal); }
- //##ModelId=3C5AA08F035B
STDMETHOD(get_Attributes)(/*[out, retval]*/ IMgaAttributes * *pVal) { return E_MGA_NOT_SUPPORTED; };
- //##ModelId=3C5AA08F0366
STDMETHOD(get_Attribute)(/*[in]*/ IMgaMetaAttribute *meta, /*[out, retval]*/ VARIANT *pVal) { return E_MGA_NOT_SUPPORTED; };
- //##ModelId=3C5AA08F037A
STDMETHOD(get_AttributeByName)(/*[in]*/ BSTR name, /*[out, retval]*/ VARIANT *pVal) { return E_MGA_NOT_SUPPORTED; };
- //##ModelId=3C5AA08F038E
STDMETHOD(put_AttributeByName)(/*[in]*/ BSTR name, /*[in]*/ VARIANT newVal) { return E_MGA_NOT_SUPPORTED; };
- //##ModelId=3C5AA08F03A1
STDMETHOD(get_StrAttrByName)( BSTR name, BSTR *pVal) { return E_MGA_NOT_SUPPORTED; }
- //##ModelId=3C5AA08F03B5
STDMETHOD(put_StrAttrByName)( BSTR name, BSTR newval) { return E_MGA_NOT_SUPPORTED; }
- //##ModelId=3C5AA08F03C9
STDMETHOD(get_IntAttrByName)( BSTR name, long *pVal) { return E_MGA_NOT_SUPPORTED; }
- //##ModelId=3C5AA08F03DD
STDMETHOD(put_IntAttrByName)( BSTR name, long newval) { return E_MGA_NOT_SUPPORTED; }
- //##ModelId=3C5AA0900009
STDMETHOD(get_FloatAttrByName)( BSTR name, double *pVal) { return E_MGA_NOT_SUPPORTED; }
- //##ModelId=3C5AA090001D
STDMETHOD(put_FloatAttrByName)( BSTR name, double newval) { return E_MGA_NOT_SUPPORTED; }
- //##ModelId=3C5AA0900063
STDMETHOD(get_BoolAttrByName)( BSTR name, VARIANT_BOOL *pVal) { return E_MGA_NOT_SUPPORTED; }
- //##ModelId=3C5AA0900077
STDMETHOD(put_BoolAttrByName)( BSTR name, VARIANT_BOOL newval) { return E_MGA_NOT_SUPPORTED; }
- //##ModelId=3C5AA090008B
STDMETHOD(get_RefAttrByName)( BSTR name, IMgaFCO **pVal) { return E_MGA_NOT_SUPPORTED; }
- //##ModelId=3C5AA090009F
STDMETHOD(put_RefAttrByName)( BSTR name, IMgaFCO * newval) { return E_MGA_NOT_SUPPORTED; }
- //##ModelId=3C5AA09000B3
STDMETHOD(RemoveAttrByName)( BSTR name) { return E_MGA_NOT_SUPPORTED; }
- //##ModelId=3C5AA09000BE
STDMETHOD(get_Meta)(IMgaMetaFCO * *pVal) { return E_MGA_NOT_SUPPORTED; }
// by ZolMol
--- 47,98 ----
Index: MgaLib.idl
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaLib.idl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MgaLib.idl 17 Dec 2003 13:45:03 -0000 1.9
--- MgaLib.idl 26 Jan 2005 17:30:47 -0000 1.10
***************
*** 37,41 ****
- //##ModelId=3C5AA4A30244
[
uuid(270B4F93-B17C-11D3-9AD1-00AA00B6FE26),
--- 37,40 ----
***************
*** 44,56 ****
coclass MgaProject
{
- //##ModelId=3C5AA4A40105
[default] interface IMgaProject;
- //##ModelId=3C5AA4A302B2
interface ISupportErrorInfo;
- //##ModelId=3C5AA4A30280
interface IMgaVersionInfo;
};
- //##ModelId=3C5AA4A2038D
[
uuid(32D1F3A4-D276-11D3-9AD5-00AA00B6FE26),
--- 43,51 ----
***************
*** 59,71 ****
coclass MgaTerritory
{
- //##ModelId=3C5AA4A30230
[default] interface IMgaTerritory;
- //##ModelId=3C5AA4A301FE
dispinterface IMgaEventSink;
- //##ModelId=3C5AA4A203C9
interface ISupportErrorInfo;
};
- //##ModelId=3C5AA4A200C6
[
uuid(80A6D662-D411-11D3-9AD5-00AA00B6FE26),
--- 54,62 ----
***************
*** 74,86 ****
coclass MgaAddOn
{
- //##ModelId=3C5AA4A20379
[default] interface IMgaAddOn;
- //##ModelId=3C5AA4A20347
dispinterface IMgaEventSink;
- //##ModelId=3C5AA4A200F8
interface ISupportErrorInfo;
};
- //##ModelId=3C5AA4A10205
[
uuid(32D1F3A8-D276-11D3-9AD5-00AA00B6FE26),
--- 65,73 ----
***************
*** 89,95 ****
coclass MgaObject
{
- //##ModelId=3C5AA4A200B2
[default] interface IMgaObject;
- //##ModelId=3C5AA4A10241
interface ISupportErrorInfo;
};
--- 76,80 ----
***************
*** 104,108 ****
};
*/
! //##ModelId=3C5AA49F002B
[
uuid(270B4F97-B17C-11D3-9AD1-00AA00B6FE26),
--- 89,93 ----
};
*/
!
[
uuid(270B4F97-B17C-11D3-9AD1-00AA00B6FE26),
***************
*** 111,120 ****
coclass MgaFolder
{
- //##ModelId=3C5AA4A101F1
[default] interface IMgaFolder;
- //##ModelId=3C5AA49F005D
interface ISupportErrorInfo;
};
- //##ModelId=3C5AA45100B5
[
uuid(270B4F99-B17C-11D3-9AD1-00AA00B6FE26),
--- 96,102 ----
***************
*** 123,132 ****
coclass MgaFCO
{
- //##ModelId=3C5AA49F0021
[default] interface IMgaFCO;
- //##ModelId=3C5AA4510282
interface ISupportErrorInfo;
};
- //##ModelId=3C5AA4500399
[
uuid(270B4F9B-B17C-11D3-9AD1-00AA00B6FE26),
--- 105,111 ----
***************
*** 135,144 ****
coclass MgaModel
{
- //##ModelId=3C5AA49E03D7
[default] interface IMgaModel;
- //##ModelId=3C5AA45003CB
interface ISupportErrorInfo;
};
- //##ModelId=3C5AA450026C
[
uuid(270B4F9D-B17C-11D3-9AD1-00AA00B6FE26),
--- 114,120 ----
***************
*** 147,156 ****
coclass MgaAtom
{
- //##ModelId=3C5AA49E03A5
[default] interface IMgaAtom;
- //##ModelId=3C5AA4500294
interface ISupportErrorInfo;
};
- //##ModelId=3C5AA4500104
[
uuid(270B4F9F-B17C-11D3-9AD1-00AA00B6FE26),
--- 123,129 ----
***************
*** 159,168 ****
coclass MgaPart
{
- //##ModelId=3C5AA49E0373
[default] interface IMgaPart;
- //##ModelId=3C5AA450012C
interface ISupportErrorInfo;
};
- //##ModelId=3C5AA44F030B
[
uuid(270B4FA1-B17C-11D3-9AD1-00AA00B6FE26),
--- 132,138 ----
***************
*** 171,180 ****
coclass MgaConnection
{
- //##ModelId=3C5AA49E0341
[default] interface IMgaConnection;
- //##ModelId=3C5AA44F0333
interface ISupportErrorInfo;
};
- //##ModelId=3C5AA44F013F
[
uuid(83BA3234-B758-11D3-ABAE-000000000000),
--- 141,147 ----
***************
*** 183,192 ****
coclass MgaReference
{
- //##ModelId=3C5AA49E030F
[default] interface IMgaReference;
- //##ModelId=3C5AA44F0167
interface ISupportErrorInfo;
};
- //##ModelId=3C5AA44E036E
[
uuid(83BA3236-B758-11D3-ABAE-000000000000),
--- 150,156 ----
***************
*** 195,204 ****
coclass MgaSet
{
- //##ModelId=3C5AA49E02DD
[default] interface IMgaSet;
- //##ModelId=3C5AA44E0396
interface ISupportErrorInfo;
};
- //##ModelId=3C5AA44E01AB
[
uuid(83BA3238-B758-11D3-ABAE-000000000000),
--- 159,165 ----
***************
*** 207,216 ****
coclass MgaSimpleConnection
{
- //##ModelId=3C5AA49E02A1
[default] interface IMgaSimpleConnection;
- //##ModelId=3C5AA44E01D3
interface ISupportErrorInfo;
};
- //##ModelId=3C5AA44D039F
[
uuid(cb64d6c0-c1fd-11d3-9ad2-00aa00b6fe26),
--- 168,174 ----
***************
*** 219,228 ****
coclass MgaConnPoint
{
- //##ModelId=3C5AA49E026F
[default] interface IMgaConnPoint;
- //##ModelId=3C5AA44D03BD
interface ISupportErrorInfo;
};
- //##ModelId=3C5AA44C032F
[
uuid(83BA323A-B758-11D3-ABAE-000000000000),
--- 177,183 ----
***************
*** 231,240 ****
coclass MgaFilter
{
- //##ModelId=3C5AA49E023C
[default] interface IMgaFilter;
- //##ModelId=3C5AA44C034D
interface ISupportErrorInfo;
};
- //##ModelId=3C5AA44C0086
[
uuid(CBF20085-BD43-11D3-9AD2-00AA00B6FE26),
--- 186,192 ----
***************
*** 243,252 ****
coclass MgaAttribute
{
- //##ModelId=3C5AA49E020A
[default] interface IMgaAttribute;
- //##ModelId=3C5AA44C00A4
interface ISupportErrorInfo;
};
- //##ModelId=3C5AA44A0141
[
uuid(83BA323E-B758-11D3-ABAE-000000000000),
--- 195,201 ----
***************
*** 255,264 ****
coclass MgaRegNode
{
- //##ModelId=3C5AA49E01D8
[default] interface IMgaRegNode;
- //##ModelId=3C5AA44A0155
interface ISupportErrorInfo;
};
- //##ModelId=3C5AA41B00C2
[
uuid(83BA3242-B758-11D3-ABAE-000000000000),
--- 204,210 ----
***************
*** 267,277 ****
coclass MgaConstraint
{
- //##ModelId=3C5AA49E01A6
[default] interface IMgaConstraint;
- //##ModelId=3C5AA41B00D6
interface ISupportErrorInfo;
};
- //##ModelId=3C5AA41B0072
[
uuid(1DF52E42-BCC0-4439-B3CD-75610AC372A3),
--- 213,220 ----
***************
*** 280,284 ****
coclass MgaO
{
- //##ModelId=3C5AA41B00B8
[default] interface IMgaO;
};
--- 223,226 ----
Index: MgaModel.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaModel.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MgaModel.h 11 Mar 2002 22:18:00 -0000 1.4
--- MgaModel.h 26 Jan 2005 17:30:47 -0000 1.5
***************
*** 11,15 ****
/////////////////////////////////////////////////////////////////////////////
// CMgaModel
- //##ModelId=3C5AA08E038C
class ATL_NO_VTABLE CMgaModel :
public CComCoClass<CMgaModel, &CLSID_MgaModel>,
--- 11,14 ----
***************
*** 20,24 ****
{
public:
- //##ModelId=3C5AA08F0031
CMgaModel()
{
--- 19,22 ----
***************
*** 39,73 ****
// IMgaModel
public:
- //##ModelId=3C5AA08F003A
STDMETHOD(DeriveChildObject)(IMgaFCO *base, IMgaMetaRole *role, VARIANT_BOOL inst, IMgaFCO **newobj) {
return inFCO->DeriveFCO(base, role, inst, newobj); }
- //##ModelId=3C5AA08F004F
STDMETHOD(CreateChildObject)(IMgaMetaRole *role, IMgaFCO **newobj) {
return inFCO->CreateChildObject(role, newobj); }
- //##ModelId=3C5AA08F0062
STDMETHOD(get_ChildDerivedFrom)(IMgaFCO *baseobj, IMgaFCO **pVal) {
return inFCO->get_ChildDerivedFrom(baseobj, pVal); }
- //##ModelId=3C5AA08F006D
STDMETHOD(CreateReference)( IMgaMetaRole *meta, IMgaFCO *target, IMgaFCO **newobj) {
return inFCO->CreateReference( meta, target, newobj); }
- //##ModelId=3C5AA08F0081
STDMETHOD(get_AspectParts)(IMgaMetaAspect * asp, unsigned int filter, IMgaParts **pVal) {
return inFCO->get_AspectParts(asp, filter, pVal); }
- //##ModelId=3C5AA08F0095
STDMETHOD(CopyFCOs)(IMgaFCOs *list, IMgaMetaRoles *rlist, IMgaFCOs **objs) {
return inFCO->CopyFCOs(list, rlist, objs); }
- //##ModelId=3C5AA08F00A9
STDMETHOD(MoveFCOs)(IMgaFCOs *list, IMgaMetaRoles *rlist, IMgaFCOs **objs) {
return inFCO->MoveFCOs(list, rlist, objs); }
- //##ModelId=3C5AA08F00BD
STDMETHOD(CreateSimpleConn)( IMgaMetaRole *meta, IMgaFCO *src, IMgaFCO *dst, IMgaFCOs *srcrefs, IMgaFCOs *dstrefs, IMgaFCO **newobj) {
return inFCO->CreateSimpleConn(meta, src, dst, srcrefs, dstrefs, newobj); }
- //##ModelId=3C5AA08F00DB
STDMETHOD(AddInternalConnections)(IMgaFCOs *inobjs, IMgaFCOs **objs) {
return inFCO->AddInternalConnections(inobjs, objs);}
- //##ModelId=3C5AA08F00EE
STDMETHOD(get_ChildRelIDCounter)(long *pVal) {
return inFCO->get_ChildRelIDCounter(pVal); }
- //##ModelId=3C5AA08F00F8
STDMETHOD(put_ChildRelIDCounter)(long pVal) {
return inFCO->put_ChildRelIDCounter(pVal); }
--- 37,60 ----
Index: MgaProject.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaProject.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** MgaProject.cpp 29 Oct 2004 15:57:14 -0000 1.61
--- MgaProject.cpp 26 Jan 2005 17:30:47 -0000 1.62
***************
*** 680,687 ****
CHECK_INSTRPAR(id);
CHECK_OUTPTRPAR(pVal);
! metaid_type mm;
! objid_type ss;
! if(swscanf(id,OLESTR("id-%04lx-%08lx"), &mm, &ss) != 2 ||
! mm < DTID_MODEL || mm > DTID_FOLDER) COMTHROW(E_MGA_BAD_ID);
CoreObj obj;
COMTHROW(dataproject->get_Object(mm,ss,&obj.ComPtr()));
--- 680,687 ----
CHECK_INSTRPAR(id);
CHECK_OUTPTRPAR(pVal);
! metaid_type mm; // short
! objid_type ss; // long
! if( swscanf(id,OLESTR("id-%04hx-%08lx"), &mm, &ss) != 2 ||
! mm < DTID_MODEL || mm > DTID_FOLDER) COMTHROW(E_MGA_BAD_ID);
CoreObj obj;
COMTHROW(dataproject->get_Object(mm,ss,&obj.ComPtr()));
Index: MgaReference.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaReference.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MgaReference.cpp 13 Oct 2004 15:17:55 -0000 1.9
--- MgaReference.cpp 26 Jan 2005 17:30:47 -0000 1.10
***************
*** 71,75 ****
CoreObj dt = d[ATTRID_REFERENCE];
if(dt) {
! for(CoreObj t(peer[0]); t; t = t[ATTRID_DERIVED]) {
if(COM_EQUAL(dt, t)) break;
}
--- 71,76 ----
CoreObj dt = d[ATTRID_REFERENCE];
if(dt) {
! CoreObj t(peer[0]);
! for( ; t; t = t[ATTRID_DERIVED]) {
if(COM_EQUAL(dt, t)) break;
}
Index: MgaReference.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaReference.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MgaReference.h 13 Oct 2004 15:17:55 -0000 1.5
--- MgaReference.h 26 Jan 2005 17:30:47 -0000 1.6
***************
*** 9,13 ****
/////////////////////////////////////////////////////////////////////////////
// CMgaReference
- //##ModelId=3C5AA0890320
class ATL_NO_VTABLE CMgaReference :
public CComCoClass<CMgaReference, &CLSID_MgaReference>,
--- 9,12 ----
***************
*** 17,21 ****
public ISupportErrorInfoImpl<&IID_IMgaReference> {
public:
- //##ModelId=3C5AA0890384
CMgaReference()
{
--- 16,19 ----
***************
*** 35,61 ****
// IMgaReference
public:
- //##ModelId=3C5AA0890385
STDMETHOD(get_Referred)(IMgaFCO * *pVal) { return inFCO->get_Referred(pVal); }
- //##ModelId=3C5AA0890390
STDMETHOD(put_Referred)(IMgaFCO * newVal) { return inFCO->put_Referred(newVal); }
- //##ModelId=3C5AA08903A2
STDMETHOD(get_RefAspect)(IMgaMetaAspect **pVal) { return inFCO->get_RefAspect(pVal); }
- //##ModelId=3C5AA08903AC
STDMETHOD(put_RefAspect)(IMgaMetaAspect * newVal) { return inFCO->put_RefAspect(newVal); }
- //##ModelId=3C5AA08903B6
STDMETHOD(get_UsedByConns)(IMgaConnPoints **pVal) { return inFCO->get_UsedByConns(pVal); }
- //##ModelId=3C5AA08903C1
STDMETHOD(CompareToBase)(short *status) { return inFCO->RefCompareToBase(status); }
- //##ModelId=3C5AA08903CC
STDMETHOD(RevertToBase)() { return inFCO->RefRevertToBase(); }
};
- //##ModelId=3C5AA08903DE
class putreftask : public DeriveTreeTask {
- //##ModelId=3C5AA08A0001
bool Do(CoreObj self, std::vector<CoreObj> *peers = NULL);
public:
// isext is true if the relation is sure to be external, false if not known
- //##ModelId=3C5AA08A0015
putreftask(bool isext) { masterattr = ATTRID_MASTEROBJ; if(isext) endreserve = 1; };
};
--- 33,49 ----
Index: MgaSet.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaSet.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MgaSet.cpp 13 Oct 2004 15:17:55 -0000 1.10
--- MgaSet.cpp 26 Jan 2005 17:30:48 -0000 1.11
***************
*** 8,12 ****
- //##ModelId=3C5AA0980155
HRESULT FCO::get_Members(IMgaFCOs **pVal)
{
--- 8,11 ----
***************
*** 25,29 ****
}
- //##ModelId=3C5AA0980169
HRESULT FCO::get_IsMember(IMgaFCO *obj, VARIANT_BOOL *pVal) {
COMTRY {
--- 24,27 ----
***************
*** 43,47 ****
}
- //##ModelId=3C5AA08902D1
bool addmember::Do(CoreObj self, std::vector<CoreObj> *peers) {
CoreObjs members = self[ATTRID_SETMEMBER + ATTRID_COLLECTION];
--- 41,44 ----
***************
*** 69,73 ****
// TODO: define semantics for assigning members that already exist for a set.
- //##ModelId=3C5AA0980142
HRESULT FCO::AddMember(IMgaFCO *member)
{
--- 66,69 ----
***************
*** 94,98 ****
- //##ModelId=3C5AA0890303
bool removemember::Do(CoreObj self, std::vector<CoreObj> *peers) {
ObjForCore(CoreObj(self[ATTRID_XREF]))->SelfMark(OBJEVENT_SETEXCLUDED);
--- 90,93 ----
***************
*** 105,109 ****
}
- //##ModelId=3C5AA098012D
HRESULT FCO::RemoveMember(IMgaFCO *member) {
COMTRY_IN_TRANSACTION {
--- 100,103 ----
***************
*** 123,127 ****
}
- //##ModelId=3C5AA0980141
HRESULT FCO::SetRemoveAll()
{
--- 117,120 ----
***************
*** 136,140 ****
- //##ModelId=3C5AA098030E
HRESULT FCO::SetCompareToBase(IMgaFCO *a, short *status) {
COMTRY {
--- 129,132 ----
Index: MgaSet.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaSet.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MgaSet.h 13 Oct 2004 15:17:55 -0000 1.6
--- MgaSet.h 26 Jan 2005 17:30:49 -0000 1.7
***************
*** 9,13 ****
/////////////////////////////////////////////////////////////////////////////
// CMgaSet
- //##ModelId=3C5AA0890212
class ATL_NO_VTABLE CMgaSet :
public CComCoClass<CMgaSet, &CLSID_MgaSet>,
--- 9,12 ----
***************
*** 18,22 ****
{
public:
- //##ModelId=3C5AA089026C
CMgaSet()
{
--- 17,20 ----
***************
*** 36,52 ****
// IMgaSet
public:
- //##ModelId=3C5AA089026D
STDMETHOD(RemoveMember)(IMgaFCO *member) { return inFCO->RemoveMember(member); };
- //##ModelId=3C5AA0890277
STDMETHOD(RemoveAll)() { return inFCO->SetRemoveAll(); };
- //##ModelId=3C5AA0890281
STDMETHOD(AddMember)(IMgaFCO *member) { return inFCO->AddMember(member); };
- //##ModelId=3C5AA089028B
STDMETHOD(get_Members)(IMgaFCOs * *pVal) { return inFCO->get_Members(pVal); };
- //##ModelId=3C5AA0890296
STDMETHOD(get_IsMember)(IMgaFCO *obj, VARIANT_BOOL *pVal) { return inFCO->get_IsMember(obj, pVal); };
- //##ModelId=3C5AA08902A8
STDMETHOD(CompareToBase)(short *status) { return inFCO->SetCompareToBase(NULL,status); }
- //##ModelId=3C5AA08902B3
STDMETHOD(RevertToBase)() { return inFCO->SetRevertToBase(NULL); }
};
--- 34,43 ----
***************
*** 54,69 ****
- //##ModelId=3C5AA08902C6
class addmember : public DeriveTreeTask {
- //##ModelId=3C5AA08902D1
bool Do(CoreObj self, std::vector<CoreObj> *peers = NULL);
public:
- //##ModelId=3C5AA08902E5
addmember(bool isext) { endreserve = isext ? 2:1; };
};
- //##ModelId=3C5AA08902F8
class removemember : public DeriveTreeTask {
- //##ModelId=3C5AA0890303
bool Do(CoreObj self, std::vector<CoreObj> *peers = NULL);
};
--- 45,55 ----
Index: MgaTrukk.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaTrukk.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** MgaTrukk.h 13 Oct 2004 15:17:55 -0000 1.19
--- MgaTrukk.h 26 Jan 2005 17:30:49 -0000 1.20
***************
*** 77,80 ****
--- 77,81 ----
+ //z! renamed to GetAll2 from GetAll (it was in conflict with GetAll defined in CommonCollection.h)
template<class COLLITF>
void GetAll2(COLLITF *coll, std::vector< CoreObj > &ret)
***************
*** 92,96 ****
if(count > 0) COMTHROW( coll->GetAll(count, &ret.front().p) );
}
- //z! renamed to GetAll2 from GetAll
--- 93,96 ----
Index: StdAfx.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/StdAfx.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StdAfx.cpp 5 Jul 2000 19:20:00 -0000 1.1
--- StdAfx.cpp 26 Jan 2005 17:30:49 -0000 1.2
***************
*** 7,12 ****
#ifdef _ATL_STATIC_REGISTRY
#include <statreg.h>
- #include <statreg.cpp>
#endif
-
- #include <atlimpl.cpp>
--- 7,9 ----
--- Mga.dsp DELETED ---
- Previous message: [GME-commit] GMESRC/GME/Core Core.vcproj,NONE,1.1 Core.cpp,1.6,1.7
Core.def,1.1,1.2 CoreAttribute.h,1.12,1.13
CoreBinFile.cpp,1.16,1.17 CoreBinFile.h,1.10,1.11
CoreProject.cpp,1.15,1.16 StdAfx.cpp,1.1,1.2 Core.dsp,1.15,NONE
- Next message: [GME-commit]
GMESRC/GME/GMEActiveBrowser GMEActiveBrowser.vcproj,NONE,1.1
ActiveBrowserPropertyPage.cpp,1.40,1.41
AggregateContextMenu.cpp,1.20,1.21 AggregateTreeCtrl.cpp,1.21,1.22
GMEActiveBrowser.def,1.1,1.2 GMEActiveBrowser.rc,1.11,1.12
StdAfx.cpp,1.1,1.2 StdAfx.h,1.3,1.4 TreeCtrlEx.cpp,1.4,1.5
resource.h,1.7,1.8 GMEActiveBrowser.dsp,1.14,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the GME-commit
mailing list