[commit] r2319 - trunk/GME/Meta
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Fri Aug 30 09:06:15 CDT 2013
Author: ksmyth
Date: Fri Aug 30 09:06:14 2013
New Revision: 2319
Log:
Convert Meta to #import
Modified:
trunk/GME/Meta/CoreMetaDefines.cpp
trunk/GME/Meta/Meta.cpp
trunk/GME/Meta/Meta.vcxproj
trunk/GME/Meta/Meta.vcxproj.filters
trunk/GME/Meta/MgaMetaAspect.h
trunk/GME/Meta/MgaMetaAtom.h
trunk/GME/Meta/MgaMetaAttribute.h
trunk/GME/Meta/MgaMetaBase.cpp
trunk/GME/Meta/MgaMetaBase.h
trunk/GME/Meta/MgaMetaConnJoint.h
trunk/GME/Meta/MgaMetaConnection.h
trunk/GME/Meta/MgaMetaConstraint.h
trunk/GME/Meta/MgaMetaEnumItem.h
trunk/GME/Meta/MgaMetaFolder.h
trunk/GME/Meta/MgaMetaModel.h
trunk/GME/Meta/MgaMetaPart.h
trunk/GME/Meta/MgaMetaPointerItem.h
trunk/GME/Meta/MgaMetaPointerSpec.h
trunk/GME/Meta/MgaMetaProject.cpp
trunk/GME/Meta/MgaMetaProject.h
trunk/GME/Meta/MgaMetaReference.h
trunk/GME/Meta/MgaMetaRegNode.h
trunk/GME/Meta/MgaMetaRole.h
trunk/GME/Meta/MgaMetaSet.h
trunk/GME/Meta/StdAfx.cpp
trunk/GME/Meta/StdAfx.h
Modified: trunk/GME/Meta/CoreMetaDefines.cpp
==============================================================================
--- trunk/GME/Meta/CoreMetaDefines.cpp Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/CoreMetaDefines.cpp Fri Aug 30 09:06:14 2013 (r2319)
@@ -66,7 +66,7 @@
CREATE_OBJECT(METAID_METAFOLDER, "MetaFolder", "Meta Folder");
DECLARE_FOLDER();
- CLSID_PUSH(CLSID_MgaMetaFolder);
+ CLSID_PUSH(__uuidof(MgaMetaFolder));
CREATE_OBJECT(METAID_METAFOLDERLINK, "MetaFolderLink", "Meta Folder Link");
DECLARE_COMMON();
@@ -90,7 +90,7 @@
CREATE_ATTRIBUTE(ATTRID_COMMENT, "Comment", "Comment", VALTYPE_STRING);
CREATE_ATTRIBUTE(ATTRID_CDATE, "CDate", "Create Date", VALTYPE_DATE);
CREATE_ATTRIBUTE(ATTRID_MDATE, "MDate", "Modification Date", VALTYPE_DATE);
- CLSID_PUSH(CLSID_MgaMetaFolder);
+ CLSID_PUSH(__uuidof(MgaMetaFolder));
// ------- FCO
@@ -110,7 +110,7 @@
CREATE_COLLECTION(ATTRID_DEFFCO_PTR, "DefinedFCOs", "Defined FCOs");
CREATE_COLLECTION(ATTRID_ROLES_COLL, "Roles", "Roles");
CREATE_COLLECTION(ATTRID_ASPECTS_COLL, "Aspects", "Aspects");
- CLSID_PUSH(CLSID_MgaMetaModel);
+ CLSID_PUSH(__uuidof(MgaMetaModel));
// ------- Aspect
@@ -119,7 +119,7 @@
CREATE_POINTER(ATTRID_ASPECTS_COLL, "Model", "Model");
CREATE_COLLECTION(ATTRID_PARTASPECT_PTR, "AspectParts", "Parts");
CREATE_COLLECTION(ATTRID_ATTRLINK_USEDIN_PTR, "Attributes", "Attributes");
- CLSID_PUSH(CLSID_MgaMetaAspect);
+ CLSID_PUSH(__uuidof(MgaMetaAspect));
// ------- Role
@@ -128,7 +128,7 @@
CREATE_POINTER(ATTRID_ROLES_COLL, "ParentModel", "Parent Model");
CREATE_COLLECTION(ATTRID_PARTROLE_PTR, "RoleParts", "Parts");
CREATE_POINTER(ATTRID_KIND_PTR, "Kind", "Kind");
- CLSID_PUSH(CLSID_MgaMetaRole);
+ CLSID_PUSH(__uuidof(MgaMetaRole));
// ------- Part
@@ -138,13 +138,13 @@
CREATE_POINTER(ATTRID_PARTASPECT_PTR, "Aspect", "Aspect");
CREATE_ATTRIBUTE(ATTRID_PARTDATA, "Data", "Part Data", VALTYPE_LONG);
CREATE_ATTRIBUTE(ATTRID_KINDASPECT, "KindAspect", "Kind Aspect", VALTYPE_STRING);
- CLSID_PUSH(CLSID_MgaMetaPart);
+ CLSID_PUSH(__uuidof(MgaMetaPart));
// ------- Atom
CREATE_OBJECT(METAID_METAATOM, "MetaAtom", "Meta Atom");
DECLARE_FCO();
- CLSID_PUSH(CLSID_MgaMetaAtom);
+ CLSID_PUSH(__uuidof(MgaMetaAtom));
// ------- Attribute
@@ -156,7 +156,7 @@
CREATE_ATTRIBUTE(ATTRID_ATTVALTYPE, "ValType", "Value Type", VALTYPE_LONG);
CREATE_ATTRIBUTE(ATTRID_VIEWABLE, "Viewable", "Viewable", VALTYPE_LONG);
CREATE_COLLECTION(ATTRID_ENUMITEMS_COLL, "EnumItems", "Enum Items");
- CLSID_PUSH(CLSID_MgaMetaAttribute);
+ CLSID_PUSH(__uuidof(MgaMetaAttribute));
CREATE_OBJECT(METAID_METAATTRLINK, "MetaAttrLink", "Meta Attribute Link");
DECLARE_COMMON();
@@ -173,7 +173,7 @@
DECLARE_COMMON();
DECLARE_POINTERSPEC();
CREATE_POINTER(ATTRID_PTRSPECS_COLL, "SpecParent", "Parent");
- CLSID_PUSH(CLSID_MgaMetaPointerSpec);
+ CLSID_PUSH(__uuidof(MgaMetaPointerSpec));
// ------- PointerItem
@@ -181,30 +181,30 @@
DECLARE_COMMON();
CREATE_POINTER(ATTRID_PTRITEMS_COLL, "ItemParent", "Parent");
CREATE_ATTRIBUTE(ATTRID_PTRITEMDESC, "Desc", "Description", VALTYPE_STRING);
- CLSID_PUSH(CLSID_MgaMetaPointerItem);
+ CLSID_PUSH(__uuidof(MgaMetaPointerItem));
// ------- Reference
CREATE_OBJECT(METAID_METAREFERENCE, "MetaReference", "Meta Reference");
DECLARE_FCO();
DECLARE_POINTERSPEC();
- CLSID_PUSH(CLSID_MgaMetaReference);
- CLSID_PUSH(CLSID_MgaMetaPointerSpec);
+ CLSID_PUSH(__uuidof(MgaMetaReference));
+ CLSID_PUSH(__uuidof(MgaMetaPointerSpec));
// ------- Set
CREATE_OBJECT(METAID_METASET, "MetaSet", "Meta Set");
DECLARE_FCO();
DECLARE_POINTERSPEC();
- CLSID_PUSH(CLSID_MgaMetaSet);
- CLSID_PUSH(CLSID_MgaMetaPointerSpec);
+ CLSID_PUSH(__uuidof(MgaMetaSet));
+ CLSID_PUSH(__uuidof(MgaMetaPointerSpec));
// ------- Connection
CREATE_OBJECT(METAID_METACONNECTION, "MetaConnection", "Meta Connection");
DECLARE_FCO();
CREATE_COLLECTION(ATTRID_CONNJOINTS_COLL, "Joints", "Connection Joints");
- CLSID_PUSH(CLSID_MgaMetaConnection);
+ CLSID_PUSH(__uuidof(MgaMetaConnection));
// ------- ConnJoint
@@ -212,7 +212,7 @@
DECLARE_COMMON();
CREATE_POINTER(ATTRID_CONNJOINTS_COLL, "JointParent", "Parent");
CREATE_COLLECTION(ATTRID_PTRSPECS_COLL, "Specs", "Pointer Specifications");
- CLSID_PUSH(CLSID_MgaMetaConnJoint);
+ CLSID_PUSH(__uuidof(MgaMetaConnJoint));
// ------- RegNode
@@ -222,7 +222,7 @@
CREATE_ATTRIBUTE(ATTRID_VALUE, "Value", "Value", VALTYPE_STRING);
CREATE_POINTER(ATTRID_REGNODES_COLL, "RegNodeParent", "Parent");
CREATE_COLLECTION(ATTRID_REGNODES_COLL, "RegNodes", "Registry Nodes");
- CLSID_PUSH(CLSID_MgaMetaRegNode);
+ CLSID_PUSH(__uuidof(MgaMetaRegNode));
// ------- EnumItem
@@ -231,7 +231,7 @@
CREATE_ATTRIBUTE(ATTRID_NAME, "Name", "Displayed Name", VALTYPE_STRING);
CREATE_ATTRIBUTE(ATTRID_VALUE, "Value", "Value", VALTYPE_STRING);
CREATE_POINTER(ATTRID_ENUMITEMS_COLL, "EnumItemParent", "Parent");
- CLSID_PUSH(CLSID_MgaMetaEnumItem);
+ CLSID_PUSH(__uuidof(MgaMetaEnumItem));
// ------- Constraint
@@ -246,6 +246,6 @@
CREATE_ATTRIBUTE(ATTRID_CONSPRIORITY, "Priority", "Constraint Priority", VALTYPE_LONG);
CREATE_ATTRIBUTE(ATTRID_CONSTYPE, "Type", "Constraint Type", VALTYPE_LONG);
CREATE_ATTRIBUTE(ATTRID_CONSNAMESPC, "DesiredNamespace", "DesiredNamespace", VALTYPE_STRING);
- CLSID_PUSH(CLSID_MgaMetaConstraint);
+ CLSID_PUSH(__uuidof(MgaMetaConstraint));
}
Modified: trunk/GME/Meta/Meta.cpp
==============================================================================
--- trunk/GME/Meta/Meta.cpp Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/Meta.cpp Fri Aug 30 09:06:14 2013 (r2319)
@@ -38,26 +38,26 @@
CComModule _Module;
BEGIN_OBJECT_MAP(ObjectMap)
-OBJECT_ENTRY(CLSID_MgaMetaProject, CMgaMetaProject)
-OBJECT_ENTRY(CLSID_MgaMetaFolder, CMgaMetaFolder)
-OBJECT_ENTRY(CLSID_MgaMetaModel, CMgaMetaModel)
-OBJECT_ENTRY(CLSID_MgaMetaAspect, CMgaMetaAspect)
-OBJECT_ENTRY(CLSID_MgaMetaRole, CMgaMetaRole)
-OBJECT_ENTRY(CLSID_MgaMetaAtom, CMgaMetaAtom)
-OBJECT_ENTRY(CLSID_MgaMetaReference, CMgaMetaReference)
-OBJECT_ENTRY(CLSID_MgaMetaSet, CMgaMetaSet)
-OBJECT_ENTRY(CLSID_MgaMetaConnection, CMgaMetaConnection)
-OBJECT_ENTRY(CLSID_MgaMetaConnJoint, CMgaMetaConnJoint)
-OBJECT_ENTRY(CLSID_MgaMetaAttribute, CMgaMetaAttribute)
-OBJECT_ENTRY(CLSID_MgaMetaPointerSpec, CMgaMetaPointerSpec)
-OBJECT_ENTRY(CLSID_MgaMetaPointerItem, CMgaMetaPointerItem)
-OBJECT_ENTRY(CLSID_MgaMetaPart, CMgaMetaPart)
-OBJECT_ENTRY(CLSID_MgaMetaRegNode, CMgaMetaRegNode)
-OBJECT_ENTRY(CLSID_MgaMetaEnumItem, CMgaMetaEnumItem)
-OBJECT_ENTRY(CLSID_MgaMetaConstraint, CMgaMetaConstraint)
+OBJECT_ENTRY(__uuidof(MgaMetaProject), CMgaMetaProject)
+OBJECT_ENTRY(__uuidof(MgaMetaFolder), CMgaMetaFolder)
+OBJECT_ENTRY(__uuidof(MgaMetaModel), CMgaMetaModel)
+OBJECT_ENTRY(__uuidof(MgaMetaAspect), CMgaMetaAspect)
+OBJECT_ENTRY(__uuidof(MgaMetaRole), CMgaMetaRole)
+OBJECT_ENTRY(__uuidof(MgaMetaAtom), CMgaMetaAtom)
+OBJECT_ENTRY(__uuidof(MgaMetaReference), CMgaMetaReference)
+OBJECT_ENTRY(__uuidof(MgaMetaSet), CMgaMetaSet)
+OBJECT_ENTRY(__uuidof(MgaMetaConnection), CMgaMetaConnection)
+OBJECT_ENTRY(__uuidof(MgaMetaConnJoint), CMgaMetaConnJoint)
+OBJECT_ENTRY(__uuidof(MgaMetaAttribute), CMgaMetaAttribute)
+OBJECT_ENTRY(__uuidof(MgaMetaPointerSpec), CMgaMetaPointerSpec)
+OBJECT_ENTRY(__uuidof(MgaMetaPointerItem), CMgaMetaPointerItem)
+OBJECT_ENTRY(__uuidof(MgaMetaPart), CMgaMetaPart)
+OBJECT_ENTRY(__uuidof(MgaMetaRegNode), CMgaMetaRegNode)
+OBJECT_ENTRY(__uuidof(MgaMetaEnumItem), CMgaMetaEnumItem)
+OBJECT_ENTRY(__uuidof(MgaMetaConstraint), CMgaMetaConstraint)
-OBJECT_ENTRY(CLSID_MgaMetaFCOs, FCOsExCOMType)
-OBJECT_ENTRY(CLSID_MgaMetaRoles, RolesExCOMType)
+OBJECT_ENTRY(__uuidof(MgaMetaFCOs), FCOsExCOMType)
+OBJECT_ENTRY(__uuidof(MgaMetaRoles), RolesExCOMType)
END_OBJECT_MAP()
/////////////////////////////////////////////////////////////////////////////
@@ -68,7 +68,7 @@
{
if (dwReason == DLL_PROCESS_ATTACH)
{
- _Module.Init(ObjectMap, hInstance, &LIBID_MGAMetaLib);
+ _Module.Init(ObjectMap, hInstance, &__uuidof(__MGAMetaLib));
DisableThreadLibraryCalls(hInstance);
}
else if (dwReason == DLL_PROCESS_DETACH)
Modified: trunk/GME/Meta/Meta.vcxproj
==============================================================================
--- trunk/GME/Meta/Meta.vcxproj Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/Meta.vcxproj Fri Aug 30 09:06:14 2013 (r2319)
@@ -466,6 +466,7 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\Common\CommonImport.h" />
<ClInclude Include="CoreMetaDefines.h" />
<ClInclude Include="MetaUtilities.h" />
<ClInclude Include="MgaMetaAspect.h" />
Modified: trunk/GME/Meta/Meta.vcxproj.filters
==============================================================================
--- trunk/GME/Meta/Meta.vcxproj.filters Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/Meta.vcxproj.filters Fri Aug 30 09:06:14 2013 (r2319)
@@ -238,6 +238,9 @@
<ClInclude Include="targetver.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\Common\CommonImport.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Manifest Include="Meta.dll.manifest">
Modified: trunk/GME/Meta/MgaMetaAspect.h
==============================================================================
--- trunk/GME/Meta/MgaMetaAspect.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaAspect.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -10,8 +10,8 @@
class ATL_NO_VTABLE CMgaMetaAspect :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaMetaAspect, &CLSID_MgaMetaAspect>,
- public IDispatchImpl<IMgaMetaAspect, &IID_IMgaMetaAspect, &LIBID_MGAMetaLib>,
+ public CComCoClass<CMgaMetaAspect, &__uuidof(MgaMetaAspect)>,
+ public IDispatchImpl<IMgaMetaAspect, &__uuidof(IMgaMetaAspect), &__uuidof(__MGAMetaLib)>,
public CMgaMetaBase
{
public:
Modified: trunk/GME/Meta/MgaMetaAtom.h
==============================================================================
--- trunk/GME/Meta/MgaMetaAtom.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaAtom.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -9,9 +9,9 @@
// --------------------------- CMgaMetaAtom
class ATL_NO_VTABLE CMgaMetaAtom :
- public CComCoClass<CMgaMetaAtom, &CLSID_MgaMetaAtom>,
+ public CComCoClass<CMgaMetaAtom, &__uuidof(MgaMetaAtom)>,
public CComObjectRootEx<CComSingleThreadModel>,
- public IDispatchImpl<IMgaMetaAtom, &IID_IMgaMetaAtom, &LIBID_MGAMetaLib>,
+ public IDispatchImpl<IMgaMetaAtom, &__uuidof(IMgaMetaAtom), &__uuidof(__MGAMetaLib)>,
public CMgaMetaFCO
{
public:
Modified: trunk/GME/Meta/MgaMetaAttribute.h
==============================================================================
--- trunk/GME/Meta/MgaMetaAttribute.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaAttribute.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -10,8 +10,8 @@
class ATL_NO_VTABLE CMgaMetaAttribute :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaMetaAttribute, &CLSID_MgaMetaAttribute>,
- public IDispatchImpl<IMgaMetaAttribute, &IID_IMgaMetaAttribute, &LIBID_MGAMetaLib>,
+ public CComCoClass<CMgaMetaAttribute, &__uuidof(MgaMetaAttribute)>,
+ public IDispatchImpl<IMgaMetaAttribute, &__uuidof(IMgaMetaAttribute), &__uuidof(__MGAMetaLib)>,
public CMgaMetaBase
{
public:
Modified: trunk/GME/Meta/MgaMetaBase.cpp
==============================================================================
--- trunk/GME/Meta/MgaMetaBase.cpp Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaBase.cpp Fri Aug 30 09:06:14 2013 (r2319)
@@ -16,7 +16,7 @@
#endif
}
-HRESULT CMgaMetaBase::PutMetaRef(metaref_type p)
+HRESULT CMgaMetaBase::PutMetaRef_(metaref_type p)
{
ASSERT( metaprojectref != NULL );
Modified: trunk/GME/Meta/MgaMetaBase.h
==============================================================================
--- trunk/GME/Meta/MgaMetaBase.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaBase.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -8,7 +8,7 @@
// --------------------------- CMgaMetaBase
class ATL_NO_VTABLE CMgaMetaBase :
- public IDispatchImpl<IMgaMetaBase, &IID_IMgaMetaBase, &LIBID_MGAMetaLib>,
+ public IDispatchImpl<IMgaMetaBase, &__uuidof(IMgaMetaBase), &__uuidof(__MGAMetaLib)>,
public CMgaMetaRegNodes
{
public:
@@ -16,7 +16,7 @@
~CMgaMetaBase();
public:
- HRESULT PutMetaRef(metaref_type p);
+ HRESULT PutMetaRef_(metaref_type p);
static void Traverse(CMgaMetaProject *metaproject, CCoreObjectPtr &me);
@@ -42,7 +42,7 @@
return S_OK; \
} \
STDMETHOD(put_MetaRef)(metaref_type p) \
- { HRESULT hr = PutMetaRef(p); \
+ { HRESULT hr = PutMetaRef_(p); \
if(hr == S_OK) hr = ComPutAttrValue(GetUnknown(), ATTRID_METAREF, p); \
return hr; \
} \
Modified: trunk/GME/Meta/MgaMetaConnJoint.h
==============================================================================
--- trunk/GME/Meta/MgaMetaConnJoint.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaConnJoint.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -6,8 +6,8 @@
class ATL_NO_VTABLE CMgaMetaConnJoint :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaMetaConnJoint, &CLSID_MgaMetaConnJoint>,
- public IDispatchImpl<IMgaMetaConnJoint, &IID_IMgaMetaConnJoint, &LIBID_MGAMetaLib>
+ public CComCoClass<CMgaMetaConnJoint, &__uuidof(MgaMetaConnJoint)>,
+ public IDispatchImpl<IMgaMetaConnJoint, &__uuidof(IMgaMetaConnJoint), &__uuidof(__MGAMetaLib)>
{
public:
IUnknown *GetUnknown() const { return (IMgaMetaConnJoint*)this; }
Modified: trunk/GME/Meta/MgaMetaConnection.h
==============================================================================
--- trunk/GME/Meta/MgaMetaConnection.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaConnection.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -9,9 +9,9 @@
// --------------------------- CMgaMetaConnection
class ATL_NO_VTABLE CMgaMetaConnection :
- public CComCoClass<CMgaMetaConnection, &CLSID_MgaMetaConnection>,
+ public CComCoClass<CMgaMetaConnection, &__uuidof(MgaMetaConnection)>,
public CComObjectRootEx<CComSingleThreadModel>,
- public IDispatchImpl<IMgaMetaConnection, &IID_IMgaMetaConnection, &LIBID_MGAMetaLib>,
+ public IDispatchImpl<IMgaMetaConnection, &__uuidof(IMgaMetaConnection), &__uuidof(__MGAMetaLib)>,
public CMgaMetaFCO
{
public:
Modified: trunk/GME/Meta/MgaMetaConstraint.h
==============================================================================
--- trunk/GME/Meta/MgaMetaConstraint.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaConstraint.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -6,8 +6,8 @@
class ATL_NO_VTABLE CMgaMetaConstraint :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaMetaConstraint, &CLSID_MgaMetaConstraint>,
- public IDispatchImpl<IMgaMetaConstraint, &IID_IMgaConstraint, &LIBID_MGAMetaLib>
+ public CComCoClass<CMgaMetaConstraint, &__uuidof(MgaMetaConstraint)>,
+ public IDispatchImpl<IMgaMetaConstraint, &__uuidof(IMgaConstraint), &__uuidof(__MGAMetaLib)>
{
public:
IUnknown *GetUnknown() const { return (IMgaMetaConstraint*)this; }
Modified: trunk/GME/Meta/MgaMetaEnumItem.h
==============================================================================
--- trunk/GME/Meta/MgaMetaEnumItem.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaEnumItem.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -6,8 +6,8 @@
class ATL_NO_VTABLE CMgaMetaEnumItem :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaMetaEnumItem, &CLSID_MgaMetaEnumItem>,
- public IDispatchImpl<IMgaMetaEnumItem, &IID_IMgaMetaEnumItem, &LIBID_MGAMetaLib>
+ public CComCoClass<CMgaMetaEnumItem, &__uuidof(MgaMetaEnumItem)>,
+ public IDispatchImpl<IMgaMetaEnumItem, &__uuidof(IMgaMetaEnumItem), &__uuidof(__MGAMetaLib)>
{
public:
IUnknown *GetUnknown() const { return (IMgaMetaEnumItem*)this; }
Modified: trunk/GME/Meta/MgaMetaFolder.h
==============================================================================
--- trunk/GME/Meta/MgaMetaFolder.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaFolder.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -10,8 +10,8 @@
class ATL_NO_VTABLE CMgaMetaFolder :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaMetaFolder, &CLSID_MgaMetaFolder>,
- public IDispatchImpl<IMgaMetaFolder, &IID_IMgaMetaFolder, &LIBID_MGAMetaLib>,
+ public CComCoClass<CMgaMetaFolder, &__uuidof(MgaMetaFolder)>,
+ public IDispatchImpl<IMgaMetaFolder, &__uuidof(IMgaMetaFolder), &__uuidof(__MGAMetaLib)>,
public CMgaMetaBase
{
public:
Modified: trunk/GME/Meta/MgaMetaModel.h
==============================================================================
--- trunk/GME/Meta/MgaMetaModel.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaModel.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -9,9 +9,9 @@
// --------------------------- CMgaMetaModel
class ATL_NO_VTABLE CMgaMetaModel :
- public CComCoClass<CMgaMetaModel, &CLSID_MgaMetaModel>,
+ public CComCoClass<CMgaMetaModel, &__uuidof(MgaMetaModel)>,
public CComObjectRootEx<CComSingleThreadModel>,
- public IDispatchImpl<IMgaMetaModel, &IID_IMgaMetaModel, &LIBID_MGAMetaLib>,
+ public IDispatchImpl<IMgaMetaModel, &__uuidof(IMgaMetaModel), &__uuidof(__MGAMetaLib)>,
public CMgaMetaFCO
{
public:
Modified: trunk/GME/Meta/MgaMetaPart.h
==============================================================================
--- trunk/GME/Meta/MgaMetaPart.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaPart.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -10,8 +10,8 @@
class ATL_NO_VTABLE CMgaMetaPart :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaMetaPart, &CLSID_MgaMetaPart>,
- public IDispatchImpl<IMgaMetaPart, &IID_IMgaMetaPart, &LIBID_MGAMetaLib>,
+ public CComCoClass<CMgaMetaPart, &__uuidof(MgaMetaPart)>,
+ public IDispatchImpl<IMgaMetaPart, &__uuidof(IMgaMetaPart), &__uuidof(__MGAMetaLib)>,
public CMgaMetaBase
{
public:
@@ -51,7 +51,7 @@
return S_OK;
}
STDMETHOD(put_MetaRef)(metaref_type p)
- { HRESULT hr = PutMetaRef(p);
+ { HRESULT hr = PutMetaRef_(p);
if(hr == S_OK) hr = ComPutAttrValue(GetUnknown(), ATTRID_METAREF, p);
return hr;
}
Modified: trunk/GME/Meta/MgaMetaPointerItem.h
==============================================================================
--- trunk/GME/Meta/MgaMetaPointerItem.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaPointerItem.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -6,8 +6,8 @@
class ATL_NO_VTABLE CMgaMetaPointerItem :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaMetaPointerItem, &CLSID_MgaMetaPointerItem>,
- public IDispatchImpl<IMgaMetaPointerItem, &IID_IMgaMetaPointerItem, &LIBID_MGAMetaLib>
+ public CComCoClass<CMgaMetaPointerItem, &__uuidof(MgaMetaPointerItem)>,
+ public IDispatchImpl<IMgaMetaPointerItem, &__uuidof(IMgaMetaPointerItem), &__uuidof(__MGAMetaLib)>
{
public:
IUnknown *GetUnknown() const { return (IMgaMetaPointerItem*)this; }
Modified: trunk/GME/Meta/MgaMetaPointerSpec.h
==============================================================================
--- trunk/GME/Meta/MgaMetaPointerSpec.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaPointerSpec.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -6,8 +6,8 @@
class ATL_NO_VTABLE CMgaMetaPointerSpec :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaMetaPointerSpec, &CLSID_MgaMetaPointerSpec>,
- public IDispatchImpl<IMgaMetaPointerSpec, &IID_IMgaMetaPointerSpec, &LIBID_MGAMetaLib>
+ public CComCoClass<CMgaMetaPointerSpec, &__uuidof(MgaMetaPointerSpec)>,
+ public IDispatchImpl<IMgaMetaPointerSpec, &__uuidof(IMgaMetaPointerSpec), &__uuidof(__MGAMetaLib)>
{
public:
IUnknown *GetUnknown() const { return (IMgaMetaPointerSpec*)this; }
Modified: trunk/GME/Meta/MgaMetaProject.cpp
==============================================================================
--- trunk/GME/Meta/MgaMetaProject.cpp Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaProject.cpp Fri Aug 30 09:06:14 2013 (r2319)
@@ -62,7 +62,7 @@
COMTHROW( coreproject.CoCreateInstance(OLESTR("MGA.CoreProject")) );
ASSERT( coreproject != NULL );
- COMTHROW( coreproject->OpenProject(connection, coremetaproject) );
+ COMTHROW( coreproject->OpenProject(connection, coremetaproject, NULL) );
COMTHROW( coreproject->CreateTerritory(PutOut(coreterritory)) );
ASSERT( coreterritory != NULL );
@@ -242,7 +242,7 @@
if( p->vt != (VT_UI1 | VT_ARRAY) || GetArrayLength(*p) != sizeof(GUID) )
{
- GUID guid;
+ ::GUID guid;
memset(&guid, 0, sizeof(GUID));
CopyTo(guid, p);
Modified: trunk/GME/Meta/MgaMetaProject.h
==============================================================================
--- trunk/GME/Meta/MgaMetaProject.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaProject.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -11,9 +11,8 @@
class ATL_NO_VTABLE CMgaMetaProject :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaMetaProject, &CLSID_MgaMetaProject>,
- public IDispatchImpl<IMgaMetaProject, &IID_IMgaMetaProject, &LIBID_MGAMetaLib>,
- public IGMEVersionInfoImpl
+ public CComCoClass<CMgaMetaProject, &__uuidof(MgaMetaProject)>,
+ public IDispatchImpl<IMgaMetaProject, &__uuidof(IMgaMetaProject), &__uuidof(__MGAMetaLib)>
{
public:
CMgaMetaProject();
@@ -26,7 +25,6 @@
BEGIN_COM_MAP(CMgaMetaProject)
COM_INTERFACE_ENTRY(IMgaMetaProject)
COM_INTERFACE_ENTRY2(IDispatch, IMgaMetaProject)
- COM_INTERFACE_ENTRY_IID(IID_IGMEVersionInfo, IGMEVersionInfoImpl)
END_COM_MAP()
// ------- Methods
Modified: trunk/GME/Meta/MgaMetaReference.h
==============================================================================
--- trunk/GME/Meta/MgaMetaReference.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaReference.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -9,9 +9,9 @@
// --------------------------- CMgaMetaReference
class ATL_NO_VTABLE CMgaMetaReference :
- public CComCoClass<CMgaMetaReference, &CLSID_MgaMetaReference>,
+ public CComCoClass<CMgaMetaReference, &__uuidof(MgaMetaReference)>,
public CComObjectRootEx<CComSingleThreadModel>,
- public IDispatchImpl<IMgaMetaReference, &IID_IMgaMetaReference, &LIBID_MGAMetaLib>,
+ public IDispatchImpl<IMgaMetaReference, &__uuidof(IMgaMetaReference), &__uuidof(__MGAMetaLib)>,
public CMgaMetaFCO
{
public:
Modified: trunk/GME/Meta/MgaMetaRegNode.h
==============================================================================
--- trunk/GME/Meta/MgaMetaRegNode.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaRegNode.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -40,9 +40,9 @@
// --------------------------- CMgaMetaRegNode
class ATL_NO_VTABLE CMgaMetaRegNode :
- public CComCoClass<CMgaMetaRegNode, &CLSID_MgaMetaRegNode>,
+ public CComCoClass<CMgaMetaRegNode, &__uuidof(MgaMetaRegNode)>,
public CComObjectRootEx<CComSingleThreadModel>,
- public IDispatchImpl<IMgaMetaRegNode, &IID_IMgaMetaRegNode, &LIBID_MGAMetaLib>,
+ public IDispatchImpl<IMgaMetaRegNode, &__uuidof(IMgaMetaRegNode), &__uuidof(__MGAMetaLib)>,
public CMgaMetaRegNodes
{
public:
Modified: trunk/GME/Meta/MgaMetaRole.h
==============================================================================
--- trunk/GME/Meta/MgaMetaRole.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaRole.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -10,8 +10,8 @@
class ATL_NO_VTABLE CMgaMetaRole :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaMetaRole, &CLSID_MgaMetaRole>,
- public IDispatchImpl<IMgaMetaRole, &IID_IMgaMetaRole, &LIBID_MGAMetaLib>,
+ public CComCoClass<CMgaMetaRole, &__uuidof(MgaMetaRole)>,
+ public IDispatchImpl<IMgaMetaRole, &__uuidof(IMgaMetaRole), &__uuidof(__MGAMetaLib)>,
public CMgaMetaBase
{
public:
Modified: trunk/GME/Meta/MgaMetaSet.h
==============================================================================
--- trunk/GME/Meta/MgaMetaSet.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/MgaMetaSet.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -9,9 +9,9 @@
// --------------------------- CMgaMetaSet
class ATL_NO_VTABLE CMgaMetaSet :
- public CComCoClass<CMgaMetaSet, &CLSID_MgaMetaSet>,
+ public CComCoClass<CMgaMetaSet, &__uuidof(MgaMetaSet)>,
public CComObjectRootEx<CComSingleThreadModel>,
- public IDispatchImpl<IMgaMetaSet, &IID_IMgaMetaSet, &LIBID_MGAMetaLib>,
+ public IDispatchImpl<IMgaMetaSet, &__uuidof(IMgaMetaSet), &__uuidof(__MGAMetaLib)>,
public CMgaMetaFCO
{
public:
Modified: trunk/GME/Meta/StdAfx.cpp
==============================================================================
--- trunk/GME/Meta/StdAfx.cpp Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/StdAfx.cpp Fri Aug 30 09:06:14 2013 (r2319)
@@ -7,3 +7,5 @@
#ifdef _ATL_STATIC_REGISTRY
#include <statreg.h>
#endif
+
+#import "CoreLib.tlb" implementation_only no_namespace raw_method_prefix("") high_method_prefix("__") no_registry
Modified: trunk/GME/Meta/StdAfx.h
==============================================================================
--- trunk/GME/Meta/StdAfx.h Fri Aug 30 09:05:12 2013 (r2318)
+++ trunk/GME/Meta/StdAfx.h Fri Aug 30 09:06:14 2013 (r2319)
@@ -31,10 +31,14 @@
#define ASSERT ATLASSERT
+#import "CoreLib.tlb" no_implementation no_namespace raw_method_prefix("") high_method_prefix("__") no_registry
+#import "MetaLib.tlb" no_implementation no_namespace raw_method_prefix("") high_method_prefix("__") no_registry
+#include "CommonImport.h"
+
#include "resource.h"
-#include "Core.h"
-#include "Gme.h"
-#include "MetaLib.h"
+//#include "Core.h"
+//#include "Gme.h"
+//#include "MetaLib.h"
#include "CommonSmart.h"
#include "CommonStl.h"
#include "MetaUtilities.h"
@@ -44,9 +48,9 @@
typedef IMgaConstraints IMgaMetaConstraints;
typedef CCoreCollectionEx<IMgaMetaRoles, std::vector<IMgaMetaRole*>,
- IMgaMetaRole, IMgaMetaRole, &CLSID_MgaMetaRoles, IDR_MGAMETAROLES> RolesExCOMType;
+ IMgaMetaRole, IMgaMetaRole, &__uuidof(MgaMetaRoles), IDR_MGAMETAROLES> RolesExCOMType;
typedef CCoreCollectionEx<IMgaMetaFCOs, std::vector<IMgaMetaFCO*>,
- IMgaMetaFCO, IMgaMetaFCO, &CLSID_MgaMetaFCOs, IDR_MGAMETAFCOS> FCOsExCOMType;
+ IMgaMetaFCO, IMgaMetaFCO, &__uuidof(MgaMetaFCOs), IDR_MGAMETAFCOS> FCOsExCOMType;
extern HRESULT check_location_compatibility(IMgaMetaBase *newobj, IMgaMetaBase *oldobj);
More information about the gme-commit
mailing list