[commit] r1916 - in trunk/GME: Core Gme Meta Mga
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Fri May 4 10:12:00 CDT 2012
Author: ksmyth
Date: Fri May 4 10:12:00 2012
New Revision: 1916
Log:
SxS COM for Core and Meta
Added:
trunk/GME/Core/Core.dll.manifest
trunk/GME/Meta/Meta.dll.manifest
Modified:
trunk/GME/Core/Core.rc
trunk/GME/Core/Core.vcxproj
trunk/GME/Gme/GMEApp.cpp
trunk/GME/Meta/Meta.cpp
trunk/GME/Meta/Meta.rc
trunk/GME/Meta/Meta.vcxproj
trunk/GME/Meta/Meta.vcxproj.filters
trunk/GME/Mga/Mga.cpp
Added: trunk/GME/Core/Core.dll.manifest
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/GME/Core/Core.dll.manifest Fri May 4 10:12:00 2012 (r1916)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity type="win32" name="Core" version="1.0.0.0" />
+
+ <file name="core.dll" hashalg="SHA1">
+ <comClass progid="Mga.CoreProject" clsid="{AD9DFA4F-2A3B-11D3-B36C-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" description="CoreProject Class" threadingModel="Apartment"/>
+ <comClass progid="Mga.CoreMetaProject" clsid="{98AA02DD-2E2C-11D3-B36D-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" description="CoreMetaProject Class" threadingModel="Apartment"/>
+ <comClass clsid="{98AA02DC-2E2C-11D3-B36D-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" description="CoreMetaObject Class" threadingModel="Apartment"/>
+ <comClass clsid="{98AA02E2-2E2C-11D3-B36D-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" description="CoreMetaAttribute Class" threadingModel="Apartment"/>
+ <comClass clsid="{09D9DCAF-3209-11D3-B2F7-005004D38590}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" description="CoreStorage Class" threadingModel="Apartment"/>
+ <comClass progid="Mga.CoreBinFile" clsid="{7281C07A-3E09-11D3-B2F7-005004D38590}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" description="CoreBinFile Class" threadingModel="Apartment"/>
+ <comClass clsid="{826A8737-563B-11D3-B301-005004D38590}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" description="CoreObject Class" threadingModel="Apartment"/>
+ <comClass clsid="{826A8739-563B-11D3-B301-005004D38590}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" description="CoreAttribute Class" threadingModel="Apartment"/>
+ <comClass clsid="{4C3A57C4-8DFF-11D3-B336-005004D38590}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" description="CoreTerritory Class" threadingModel="Apartment"/>
+ <comClass clsid="{43D12112-12CA-11D3-A6EC-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" description="CoreMetaObjects Class" threadingModel="Apartment"/>
+ <comClass clsid="{43D12128-12CA-11D3-A6EC-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" description="CoreMetaAttributes Class" threadingModel="Apartment"/>
+ <comClass clsid="{43D12112-22CA-11D3-A6EC-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" description="CoreObjects Class" threadingModel="Apartment"/>
+ <comClass clsid="{43D12128-22CA-11D3-A6EC-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" description="CoreAttributes Class" threadingModel="Apartment"/>
+ <typelib tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" resourceid="1" version="1.0" helpdir="" flags="HASDISKIMAGE"></typelib>
+ </file>
+ <comInterfaceExternalProxyStub name="ICoreProject" iid="{AD9DFA4E-2A3B-11D3-B36C-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="ICoreStorage" iid="{AD9DFA4E-3A3B-11D3-B36C-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="ICoreMetaProject" iid="{98AA02D9-2E2C-11D3-B36D-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="ICoreMetaObject" iid="{98AA02DB-2E2C-11D3-B36D-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="ICoreMetaAttribute" iid="{98AA02E1-2E2C-11D3-B36D-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="ICoreMetaAttributes" iid="{43D12127-12CA-11D3-A6EC-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="ICoreMetaObjects" iid="{43D12111-12CA-11D3-A6EC-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="ICoreObject" iid="{826A8736-563B-11D3-B301-005004D38590}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="ICoreAttribute" iid="{826A8738-563B-11D3-B301-005004D38590}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="ICoreAttributes" iid="{43D12127-22CA-11D3-A6EC-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="ICoreTerritory" iid="{4C3A57C3-8DFF-11D3-B336-005004D38590}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="ISupportErrorInfo" iid="{DF0B3D60-548F-101B-8E65-08002B2BD119}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{DF0B3D60-548F-101B-8E65-08002B2BD119}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IGMEVersionInfo" iid="{9A228010-020B-11D2-BBB3-0040051F7117}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="ICoreObjects" iid="{43D12111-22CA-11D3-A6EC-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+</assembly>
Modified: trunk/GME/Core/Core.rc
==============================================================================
--- trunk/GME/Core/Core.rc Fri May 4 10:11:31 2012 (r1915)
+++ trunk/GME/Core/Core.rc Fri May 4 10:12:00 2012 (r1916)
@@ -49,6 +49,7 @@
#ifndef _MAC
+2 RT_MANIFEST "Core.dll.manifest"
/////////////////////////////////////////////////////////////////////////////
//
// Version
Modified: trunk/GME/Core/Core.vcxproj
==============================================================================
--- trunk/GME/Core/Core.vcxproj Fri May 4 10:11:31 2012 (r1915)
+++ trunk/GME/Core/Core.vcxproj Fri May 4 10:12:00 2012 (r1916)
@@ -173,6 +173,14 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|x64'">$(SolutionDir)$(Platform)\Release_PGO\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|Win32'">$(Platform)\Release_PGO\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|x64'">$(Platform)\Release_PGO\</IntDir>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|Win32'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Optimize|Win32'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|x64'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Optimize|x64'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<CustomBuildStep />
@@ -265,6 +273,7 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
+ <ManifestFile>$(IntDir)$(TargetName)$(TargetExt).intermediate.manifest2</ManifestFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Modified: trunk/GME/Gme/GMEApp.cpp
==============================================================================
--- trunk/GME/Gme/GMEApp.cpp Fri May 4 10:11:31 2012 (r1915)
+++ trunk/GME/Gme/GMEApp.cpp Fri May 4 10:12:00 2012 (r1916)
@@ -34,6 +34,9 @@
#pragma comment(lib, "CrashRpt.lib")
#endif
+#pragma comment(linker, "\"/manifestdependency:type='win32' name='Core' version='1.0.0.0' language='*'\"")
+#pragma comment(linker, "\"/manifestdependency:type='win32' name='Meta' version='1.0.0.0' language='*'\"")
+
#include "CrashTest.h"
#include <Gdiplus.h>
#include "GraphicsUtil.h"
Modified: trunk/GME/Meta/Meta.cpp
==============================================================================
--- trunk/GME/Meta/Meta.cpp Fri May 4 10:11:31 2012 (r1915)
+++ trunk/GME/Meta/Meta.cpp Fri May 4 10:12:00 2012 (r1916)
@@ -35,6 +35,8 @@
#include "MgaMetaEnumItem.h"
#include "MgaMetaConstraint.h"
+#pragma comment(linker, "\"/manifestdependency:type='win32' name='Core' version='1.0.0.0' language='*'\"")
+
CComModule _Module;
BEGIN_OBJECT_MAP(ObjectMap)
Added: trunk/GME/Meta/Meta.dll.manifest
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/GME/Meta/Meta.dll.manifest Fri May 4 10:12:00 2012 (r1916)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity type="win32" name="Meta" version="1.0.0.0" />
+
+ <file name="Meta.dll" hashalg="SHA1">
+ <comClass clsid="{83BA323E-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaRegNode Class" threadingModel="Apartment"/>
+ <comClass clsid="{83BA3242-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaConstraint Class" threadingModel="Apartment"/>
+ <comClass progid="Mga.MgaMetaProject" clsid="{83BA3244-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaProject Class" threadingModel="Apartment"/>
+ <comClass clsid="{83BA32F7-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaBase Class" threadingModel="Apartment"/>
+ <comClass clsid="{83BA3246-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaFolder Class" threadingModel="Apartment"/>
+ <comClass clsid="{83BA3248-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaFCO Class" threadingModel="Apartment"/>
+ <comClass clsid="{83BA324A-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaModel Class" threadingModel="Apartment"/>
+ <comClass clsid="{83BA324C-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaAspect Class" threadingModel="Apartment"/>
+ <comClass clsid="{83BA324E-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaRole Class" threadingModel="Apartment"/>
+ <comClass clsid="{A70CAB46-DD94-11D3-9308-444553540000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaPart Class" threadingModel="Apartment"/>
+ <comClass clsid="{83BA3250-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaAtom Class" threadingModel="Apartment"/>
+ <comClass clsid="{83BA3252-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaReference Class" threadingModel="Apartment"/>
+ <comClass clsid="{83BA3254-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaSet Class" threadingModel="Apartment"/>
+ <comClass clsid="{83BA3256-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaConnection Class" threadingModel="Apartment"/>
+ <comClass clsid="{83BA3258-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaConnJoint Class" threadingModel="Apartment"/>
+ <comClass clsid="{83BA325A-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaAttribute Class" threadingModel="Apartment"/>
+ <comClass clsid="{8216325A-B7C8-1AD3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaEnumItem Class" threadingModel="Apartment"/>
+ <comClass clsid="{83BA325C-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaPointerSpec Class" threadingModel="Apartment"/>
+ <comClass clsid="{83426258-B218-11D3-ABAE-000235612000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaPointerItem" threadingModel="Apartment"/>
+ <comClass clsid="{C61AF6A0-C1FD-11D3-9AD2-00AA00B6FE26}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaAspects Class" threadingModel="Apartment"/>
+ <comClass progid="Mga.MgaMetaRoles" clsid="{C6412A50-C1FD-11D3-9AD2-00AA00B6FE26}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaRoles Class" threadingModel="Apartment"/>
+ <comClass clsid="{C6739780-C1FD-11D3-9AD2-00AA00B6FE26}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaFCOs Class" threadingModel="Apartment"/>
+ <comClass clsid="{C69B5260-C1FD-11D3-9AD2-00AA00B6FE26}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaAttributes Class" threadingModel="Apartment"/>
+ <comClass clsid="{C6BFFEE0-C1FD-11D3-9AD2-00AA00B6FE26}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaFolders Class" threadingModel="Apartment"/>
+ <comClass clsid="{C76B23E0-C1FD-11D3-9AD2-00AA00B6FE26}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaPointerSpecs Class" threadingModel="Apartment"/>
+ <comClass clsid="{C79F1840-C1FD-11D3-9AD2-00AA00B6FE27}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaRegNodes Class" threadingModel="Apartment"/>
+ <comClass clsid="{C8F6E974-C1FD-11D3-9AD2-00AA00B6FE26}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaConstraints Class" threadingModel="Apartment"/>
+ <comClass clsid="{C8F6E970-C1FD-11D3-9AD2-00AA00B6FE27}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaParts Class" threadingModel="Apartment"/>
+ <comClass clsid="{C8F6E923-C1FD-11D3-9AD2-00AA00B6FE27}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaModels Class" threadingModel="Apartment"/>
+ <comClass clsid="{C8F62463-C1FD-11D3-9AD2-00AA00B6FE27}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaConnJoints Class" threadingModel="Apartment"/>
+ <comClass clsid="{C8F62353-C1FD-11D3-9AD2-00AA00B6FE27}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaPointerItems Class" threadingModel="Apartment"/>
+ <comClass clsid="{C8214353-C1FD-11D3-9AD2-00AACFB24E27}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" description="MgaMetaEnumItems Class" threadingModel="Apartment"/>
+ <typelib tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" resourceid="1" version="1.0" helpdir="" flags="HASDISKIMAGE"></typelib>
+ </file>
+ <comInterfaceExternalProxyStub name="IMgaMetaRegNode" iid="{83BA323D-B758-11D3-ABAE-000002387500}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaRegNodes" iid="{C795ED20-C1FD-11D3-9AD2-00AA00B6FE27}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaConstraint" iid="{83BA3241-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaProject" iid="{83BA3243-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaFolder" iid="{83BA3245-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaBase" iid="{DB1E0FB7-C9CB-11D3-9AD2-00AA00B6FE26}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaConstraints" iid="{C8EC3720-C1FD-11D3-9AD2-00AA00B6FE26}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaFolders" iid="{C6B85AF0-C1FD-11D3-9AD2-00AA00B6FE26}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaFCOs" iid="{C66A6C60-C1FD-11D3-9AD2-00AA00B6FE26}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaFCO" iid="{83BA3247-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaAttributes" iid="{C6922740-C1FD-11D3-9AD2-00AA00B6FE26}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaAttribute" iid="{83BA3259-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaEnumItems" iid="{C8124623-C51D-1AD3-9AD2-11AA0176FE27}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaEnumItem" iid="{83254259-B758-21D3-7BAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaRoles" iid="{C851E130-C1FD-11D3-9AD2-00AA00B6FE26}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaRole" iid="{83BA324D-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaModel" iid="{83BA3249-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaAtom" iid="{83BA324F-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaReference" iid="{83BA3251-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaPointerSpec" iid="{83BA325B-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaPointerItems" iid="{C8124623-C51D-11D3-9AD2-00AA00B6FE27}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaPointerItem" iid="{83518A5B-B758-11D3-ABAE-006928360000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaSet" iid="{83BA3253-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaConnection" iid="{83BA3255-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaConnJoints" iid="{C8432623-C1FD-11D3-9AD2-00AA00B6FE27}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaConnJoint" iid="{83BA3257-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaPointerSpecs" iid="{C761F8C0-C1FD-11D3-9AD2-00AA00B6FE26}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaAspects" iid="{C61352B0-C1FD-11D3-9AD2-00AA00B6FE26}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaAspect" iid="{83BA324B-B758-11D3-ABAE-000000000000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaParts" iid="{C8EC3720-C1FD-11D3-9AD2-00AA00B6FE27}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaPart" iid="{A70CAB45-DD94-11D3-9308-444553540000}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+ <comInterfaceExternalProxyStub name="IMgaMetaModels" iid="{C8EC3723-C1FD-11D3-9AD2-00AA00B6FE27}" tlbid="{0ADEEC71-D83A-11D3-B36B-005004D38590}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
+</assembly>
Modified: trunk/GME/Meta/Meta.rc
==============================================================================
--- trunk/GME/Meta/Meta.rc Fri May 4 10:11:31 2012 (r1915)
+++ trunk/GME/Meta/Meta.rc Fri May 4 10:12:00 2012 (r1916)
@@ -49,6 +49,7 @@
#ifndef _MAC
+2 RT_MANIFEST "Meta.dll.manifest"
/////////////////////////////////////////////////////////////////////////////
//
// Version
Modified: trunk/GME/Meta/Meta.vcxproj
==============================================================================
--- trunk/GME/Meta/Meta.vcxproj Fri May 4 10:11:31 2012 (r1915)
+++ trunk/GME/Meta/Meta.vcxproj Fri May 4 10:12:00 2012 (r1916)
@@ -175,6 +175,14 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|x64'">$(Platform)\Release_PGO\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Optimize|Win32'">$(Platform)\Release_PGO\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Optimize|x64'">$(Platform)\Release_PGO\</IntDir>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|Win32'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Optimize|Win32'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|x64'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Optimize|x64'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<CustomBuildStep />
@@ -501,6 +509,11 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <Manifest Include="Meta.dll.manifest">
+ <SubType>Designer</SubType>
+ </Manifest>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Modified: trunk/GME/Meta/Meta.vcxproj.filters
==============================================================================
--- trunk/GME/Meta/Meta.vcxproj.filters Fri May 4 10:11:31 2012 (r1915)
+++ trunk/GME/Meta/Meta.vcxproj.filters Fri May 4 10:12:00 2012 (r1916)
@@ -239,4 +239,9 @@
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
+ <ItemGroup>
+ <Manifest Include="Meta.dll.manifest">
+ <Filter>Resource Files</Filter>
+ </Manifest>
+ </ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/GME/Mga/Mga.cpp
==============================================================================
--- trunk/GME/Mga/Mga.cpp Fri May 4 10:11:31 2012 (r1915)
+++ trunk/GME/Mga/Mga.cpp Fri May 4 10:12:00 2012 (r1916)
@@ -19,6 +19,10 @@
#include "MgaProject.h"
#include "MgaFCO.h"
+#pragma comment(linker, "\"/manifestdependency:type='win32' name='Core' version='1.0.0.0' language='*'\"")
+#pragma comment(linker, "\"/manifestdependency:type='win32' name='Meta' version='1.0.0.0' language='*'\"")
+
+
CComModule _Module;
BEGIN_OBJECT_MAP(ObjectMap)
More information about the gme-commit
mailing list