[commit] r2014 - trunk/GME/Mga
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Tue Aug 14 14:28:28 CDT 2012
Author: ksmyth
Date: Tue Aug 14 14:28:26 2012
New Revision: 2014
Log:
Change Mga to #import
Modified:
trunk/GME/Mga/MgaAttribute.cpp
trunk/GME/Mga/MgaAttribute.h
trunk/GME/Mga/MgaConnection.h
trunk/GME/Mga/MgaConstraint.cpp
trunk/GME/Mga/MgaConstraint.h
trunk/GME/Mga/MgaFCO.cpp
trunk/GME/Mga/MgaFCO.h
trunk/GME/Mga/MgaFilter.h
trunk/GME/Mga/MgaFolder.h
trunk/GME/Mga/MgaGeneric.cpp
trunk/GME/Mga/MgaLibOps.cpp
trunk/GME/Mga/MgaModel.h
trunk/GME/Mga/MgaProject.cpp
trunk/GME/Mga/MgaProject.h
trunk/GME/Mga/MgaReference.h
trunk/GME/Mga/MgaSet.h
trunk/GME/Mga/MgaTerritory.h
trunk/GME/Mga/StdAfx.h
Modified: trunk/GME/Mga/MgaAttribute.cpp
==============================================================================
--- trunk/GME/Mga/MgaAttribute.cpp Tue Aug 14 14:27:52 2012 (r2013)
+++ trunk/GME/Mga/MgaAttribute.cpp Tue Aug 14 14:28:26 2012 (r2014)
@@ -986,7 +986,7 @@
if(next) next->prevptr = prevptr;
*prevptr = next;
}
-void CMgaPart::Initialize(metaref_type mr, FCO *o, CMgaProject *p) { // Throws!!!
+void CMgaPart::Initialize(metaref_type mr, ::FCO *o, CMgaProject *p) { // Throws!!!
mref = mr;
fco = o;
mgaproject = p;
Modified: trunk/GME/Mga/MgaAttribute.h
==============================================================================
--- trunk/GME/Mga/MgaAttribute.h Tue Aug 14 14:27:52 2012 (r2013)
+++ trunk/GME/Mga/MgaAttribute.h Tue Aug 14 14:28:26 2012 (r2014)
@@ -6,6 +6,7 @@
#include "resource.h" // main symbols
#include "MgaProject.h"
+#include "MgaFCO.h"
#include <unordered_map>
@@ -19,9 +20,9 @@
// CMgaAttribute
class ATL_NO_VTABLE CMgaAttribute :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaAttribute, &CLSID_MgaAttribute>,
- public IDispatchImpl<IMgaAttribute, &IID_IMgaAttribute, &LIBID_MGALib>,
- public ISupportErrorInfoImpl<&IID_IMgaAttribute>
+ public CComCoClass<CMgaAttribute, &__uuidof(MgaAttribute)>,
+ public IDispatchImpl<IMgaAttribute, &__uuidof(IMgaAttribute), &__uuidof(__MGALib)>,
+ public ISupportErrorInfoImpl<&__uuidof(IMgaAttribute)>
{
public:
CMgaAttribute() : prevptr(NULL), next(NULL), load_status(ATTSTATUS_INVALID) { }
@@ -154,9 +155,9 @@
// CMgaRegNode
class ATL_NO_VTABLE CMgaRegNode :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaRegNode, &CLSID_MgaRegNode>,
- public IDispatchImpl<IMgaRegNode, &IID_IMgaRegNode, &LIBID_MGALib>,
- public ISupportErrorInfoImpl<&IID_IMgaRegNode>
+ public CComCoClass<CMgaRegNode, &__uuidof(MgaRegNode)>,
+ public IDispatchImpl<IMgaRegNode, &__uuidof(IMgaRegNode), &__uuidof(__MGALib)>,
+ public ISupportErrorInfoImpl<&__uuidof(IMgaRegNode)>
{
public:
@@ -240,9 +241,9 @@
class ATL_NO_VTABLE CMgaPart :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaPart, &CLSID_MgaPart>,
- public IDispatchImpl<IMgaPart, &IID_IMgaPart, &LIBID_MGALib>,
- public ISupportErrorInfoImpl<&IID_IMgaPart>
+ public CComCoClass<CMgaPart, &__uuidof(MgaPart)>,
+ public IDispatchImpl<IMgaPart, &__uuidof(IMgaPart), &__uuidof(__MGALib)>,
+ public ISupportErrorInfoImpl<&__uuidof(IMgaPart)>
{
public:
@@ -279,7 +280,7 @@
STDMETHOD(SetRegistryValueDisp)( BSTR path, BSTR newval) { return put_RegistryValue( path, newval); }
CMgaPart();
~CMgaPart();
- void Initialize(metaref_type mr, FCO *o, CMgaProject *p);
+ void Initialize(metaref_type mr, ::FCO *o, CMgaProject *p);
typedef CMgaPart *hashobp;
hashobp *prevptr, next;
metaref_type mref;
Modified: trunk/GME/Mga/MgaConnection.h
==============================================================================
--- trunk/GME/Mga/MgaConnection.h Tue Aug 14 14:27:52 2012 (r2013)
+++ trunk/GME/Mga/MgaConnection.h Tue Aug 14 14:28:26 2012 (r2014)
@@ -12,16 +12,16 @@
class ATL_NO_VTABLE CMgaConnection :
- public CComCoClass<CMgaConnection, &CLSID_MgaSimpleConnection>,
+ public CComCoClass<CMgaConnection, &__uuidof(MgaSimpleConnection)>,
public IMgaFCOImpl<
CComObjectRootEx<CComSingleThreadModel>,
- IDispatchImpl<IMgaSimpleConnection, &IID_IMgaSimpleConnection, &LIBID_MGALib> >,
- public ISupportErrorInfoImpl<&IID_IMgaConnection>
+ IDispatchImpl<IMgaSimpleConnection, &__uuidof(IMgaSimpleConnection), &__uuidof(__MGALib)> >,
+ public ISupportErrorInfoImpl<&__uuidof(IMgaConnection)>
{
public:
static HRESULT WINAPI simpletest(void* pv, REFIID riid, LPVOID* ppv, DWORD_PTR dw) {
FCO *f = reinterpret_cast<CMgaConnection*>(pv)->innFCO;
- if(!f->simpleconn()) return E_NOINTERFACE;
+ if(!f->simpleconn()) return E_NOINTERFACE; // this breaks COM rules
IUnknown* pUnk = (IUnknown*)((int)pv+dw);
pUnk->AddRef();
*ppv = pUnk;
@@ -36,10 +36,10 @@
BEGIN_COM_MAP(CMgaConnection)
COM_INTERFACE_ENTRY(IMgaConnection)
COM_INTERFACE_ENTRY(IDispatch)
- COM_INTERFACE_ENTRY_IID(IID_IMgaFCO,IMgaConnection)
- COM_INTERFACE_ENTRY_IID(IID_IMgaObject,IMgaConnection)
+ COM_INTERFACE_ENTRY_IID(__uuidof(IMgaFCO),IMgaConnection)
+ COM_INTERFACE_ENTRY_IID(__uuidof(IMgaObject),IMgaConnection)
COM_INTERFACE_ENTRY_IID(IID_ISupportErrorInfo, IMyErrorInfoBase)
- COM_INTERFACE_ENTRY_FUNC(IID_IMgaSimpleConnection, offsetofclass(IMgaSimpleConnection, _ComMapClass), simpletest)
+ COM_INTERFACE_ENTRY_FUNC(__uuidof(IMgaSimpleConnection), offsetofclass(IMgaSimpleConnection, _ComMapClass), simpletest)
END_COM_MAP()
// IMgaSimpleConnection
@@ -74,10 +74,10 @@
/////////////////////////////////////////////////////////////////////////////
// CMgaConnPoint
class ATL_NO_VTABLE CMgaConnPoint :
- public CComCoClass<CMgaConnPoint, &CLSID_MgaConnPoint>,
+ public CComCoClass<CMgaConnPoint, &__uuidof(MgaConnPoint)>,
public CComObjectRootEx<CComSingleThreadModel>,
- public IDispatchImpl<IMgaConnPoint, &IID_IMgaConnPoint, &LIBID_MGALib>,
- public ISupportErrorInfoImpl<&IID_IMgaConnPoint>
+ public IDispatchImpl<IMgaConnPoint, &__uuidof(IMgaConnPoint), &__uuidof(__MGALib)>,
+ public ISupportErrorInfoImpl<&__uuidof(IMgaConnPoint)>
{
public:
DEFSIG;
Modified: trunk/GME/Mga/MgaConstraint.cpp
==============================================================================
--- trunk/GME/Mga/MgaConstraint.cpp Tue Aug 14 14:27:52 2012 (r2013)
+++ trunk/GME/Mga/MgaConstraint.cpp Tue Aug 14 14:28:26 2012 (r2014)
@@ -1,6 +1,6 @@
// MgaConstraint.cpp : Implementation of CMgaConstraint
-#include "stdafx.h"
-#include "Mga.h"
+
+#include "StdAfx.h"
#include "MgaFCO.h"
#include "MgaConstraint.h"
Modified: trunk/GME/Mga/MgaConstraint.h
==============================================================================
--- trunk/GME/Mga/MgaConstraint.h Tue Aug 14 14:27:52 2012 (r2013)
+++ trunk/GME/Mga/MgaConstraint.h Tue Aug 14 14:28:26 2012 (r2014)
@@ -9,8 +9,8 @@
// CMgaConstraint
class ATL_NO_VTABLE CMgaConstraint :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaConstraint, &CLSID_MgaConstraint>,
- public IDispatchImpl<IMgaConstraint, &IID_IMgaConstraint, &LIBID_MGALib>
+ public CComCoClass<CMgaConstraint, &__uuidof(MgaConstraint)>,
+ public IDispatchImpl<IMgaConstraint, &__uuidof(IMgaConstraint), &__uuidof(__MGALib)>
{
public:
CComBSTR name, expression;
Modified: trunk/GME/Mga/MgaFCO.cpp
==============================================================================
--- trunk/GME/Mga/MgaFCO.cpp Tue Aug 14 14:27:52 2012 (r2013)
+++ trunk/GME/Mga/MgaFCO.cpp Tue Aug 14 14:28:26 2012 (r2014)
@@ -25,7 +25,7 @@
COMTRY {
{
CoreObj myself;
- QueryInterface(IID_ICoreObject,(void **)&myself);
+ QueryInterface(__uuidof(ICoreObject),(void **)&myself);
self = myself; // self does not hold reference!!!
}
CComPtr<ICoreProject> cp;
@@ -37,7 +37,7 @@
pUnk->AddRef();
mgaproject.Attach((CMgaProject*)(IDispatchImpl<IMgaProject, &IID_IMgaProject, &LIBID_MGALib>*)(pUnk));
#else
- COMTHROW(cp->QueryInterface(IID_IMgaProject,(void **)&mgaproject));
+ COMTHROW(cp->QueryInterface(__uuidof(IMgaProject),(void **)&mgaproject));
#endif
} COMCATCH(;);
}
@@ -264,7 +264,7 @@
COMTHROW(pv->get_ObjType(l));
if(pVal != NULL) {
*pVal = pv.Detach();
- COMTHROW((*pVal)->Open());
+ COMTHROW((*pVal)->Open(OPEN_READ));
}
}
else {
@@ -285,7 +285,7 @@
CComPtr<IMgaModel> pv;
ObjForCore(par)->getinterface(&pv);
*pVal = pv.Detach();
- COMTHROW((*pVal)->Open());
+ COMTHROW((*pVal)->Open(OPEN_READ));
}
} COMCATCH(;);
}
@@ -300,7 +300,7 @@
CComPtr<IMgaFolder> pv;
ObjForCore(par)->getinterface(&pv);
*pVal = pv.Detach();
- COMTHROW((*pVal)->Open());
+ COMTHROW((*pVal)->Open(OPEN_READ));
}
} COMCATCH(;);
}
Modified: trunk/GME/Mga/MgaFCO.h
==============================================================================
--- trunk/GME/Mga/MgaFCO.h Tue Aug 14 14:27:52 2012 (r2013)
+++ trunk/GME/Mga/MgaFCO.h Tue Aug 14 14:28:26 2012 (r2014)
@@ -270,11 +270,11 @@
// MgaAtom is defined here (it is empty)
// ----------------------------------------
class ATL_NO_VTABLE CMgaAtom :
- public CComCoClass<CMgaAtom, &CLSID_MgaAtom>,
+ public CComCoClass<CMgaAtom, &__uuidof(MgaAtom)>,
public IMgaFCOImpl<
CComObjectRootEx<CComSingleThreadModel>,
- IDispatchImpl<IMgaAtom, &IID_IMgaAtom, &LIBID_MGALib> >,
- public ISupportErrorInfoImpl<&IID_IMgaAtom>
+ IDispatchImpl<IMgaAtom, &__uuidof(IMgaAtom), &__uuidof(__MGALib)> >,
+ public ISupportErrorInfoImpl<&__uuidof(IMgaAtom)>
{
public:
CMgaAtom() {}
@@ -284,8 +284,8 @@
BEGIN_COM_MAP(CMgaAtom)
COM_INTERFACE_ENTRY(IMgaAtom)
- COM_INTERFACE_ENTRY_IID(IID_IMgaObject,IMgaAtom)
- COM_INTERFACE_ENTRY_IID(IID_IMgaFCO,IMgaAtom)
+ COM_INTERFACE_ENTRY_IID(__uuidof(IMgaObject),IMgaAtom)
+ COM_INTERFACE_ENTRY_IID(__uuidof(IMgaFCO),IMgaAtom)
COM_INTERFACE_ENTRY(IDispatch)
COM_INTERFACE_ENTRY_IID(IID_ISupportErrorInfo, IMyErrorInfoBase)
END_COM_MAP()
@@ -328,8 +328,8 @@
class ATL_NO_VTABLE FCO :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<FCO, &CLSID_MgaO>,
- public IDispatchImpl<IMgaO, &IID_IMgaO, &LIBID_MGALib>
+ public CComCoClass<FCO, &__uuidof(MgaO)>,
+ public IDispatchImpl<IMgaO, &__uuidof(IMgaO), &__uuidof(__MGALib)>
{
public:
DEFSIG;
@@ -747,10 +747,10 @@
/* ******************* CollectionEx *************************************** */
-typedef CCoreCollectionEx<IMgaFCOs, std::vector<IMgaFCO*>, IMgaFCO, IMgaFCO, &CLSID_MgaFCOs, IDR_MGAFCOS> CMgaFCOs;
-typedef CCoreCollectionEx<IMgaFolders, std::vector<IMgaFolder*>, IMgaFolder, IMgaFolder, &CLSID_MgaFolders, IDR_MGAFOLDERS> CMgaFolders;
-typedef CCoreCollectionEx<IMgaObjects, std::vector<IMgaObject*>, IMgaObject, IMgaObject, &CLSID_MgaObjects, IDR_MGAOBJECTS> CMgaObjects;
-typedef CCoreCollectionEx<IMgaRegNodes, std::vector<IMgaRegNode*>, IMgaRegNode, IMgaRegNode, &CLSID_MgaRegNodes, IDR_MGAREGNODES> CMgaRegNodes;
+typedef CCoreCollectionEx<IMgaFCOs, std::vector<IMgaFCO*>, IMgaFCO, IMgaFCO, &__uuidof(MgaFCOs), IDR_MGAFCOS> CMgaFCOs;
+typedef CCoreCollectionEx<IMgaFolders, std::vector<IMgaFolder*>, IMgaFolder, IMgaFolder, &__uuidof(MgaFolders), IDR_MGAFOLDERS> CMgaFolders;
+typedef CCoreCollectionEx<IMgaObjects, std::vector<IMgaObject*>, IMgaObject, IMgaObject, &__uuidof(MgaObjects), IDR_MGAOBJECTS> CMgaObjects;
+typedef CCoreCollectionEx<IMgaRegNodes, std::vector<IMgaRegNode*>, IMgaRegNode, IMgaRegNode, &__uuidof(MgaRegNodes), IDR_MGAREGNODES> CMgaRegNodes;
#define CREATEEXCOLLECTION_FOR(x, q) CComPtr<C##x##s> q; CreateComObject(q);
#define EXCOLLECTIONTYPE_FOR(x) C##x##s
#endif //__MGAFCO_H_
Modified: trunk/GME/Mga/MgaFilter.h
==============================================================================
--- trunk/GME/Mga/MgaFilter.h Tue Aug 14 14:27:52 2012 (r2013)
+++ trunk/GME/Mga/MgaFilter.h Tue Aug 14 14:28:26 2012 (r2014)
@@ -12,9 +12,9 @@
// CMgaFilter
class ATL_NO_VTABLE CMgaFilter :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaFilter, &CLSID_MgaFilter>,
- public IDispatchImpl<IMgaFilter, &IID_IMgaFilter, &LIBID_MGALib>,
- public ISupportErrorInfoImpl<&IID_IMgaFilter>
+ public CComCoClass<CMgaFilter, &__uuidof(MgaFilter)>,
+ public IDispatchImpl<IMgaFilter, &__uuidof(IMgaFilter), &__uuidof(__MGALib)>,
+ public ISupportErrorInfoImpl<&__uuidof(IMgaFilter)>
{
public:
CMgaFilter()
Modified: trunk/GME/Mga/MgaFolder.h
==============================================================================
--- trunk/GME/Mga/MgaFolder.h Tue Aug 14 14:27:52 2012 (r2013)
+++ trunk/GME/Mga/MgaFolder.h Tue Aug 14 14:28:26 2012 (r2014)
@@ -27,10 +27,10 @@
// CMgaFolder
class ATL_NO_VTABLE CMgaFolder :
- public CComCoClass<CMgaFolder, &CLSID_MgaFolder>,
+ public CComCoClass<CMgaFolder, &__uuidof(MgaFolder)>,
public IMgaContainerImpl < IMgaFCOImpl <CComObjectRootEx<CComSingleThreadModel> ,
- IDispatchImpl<IMgaFolder, &IID_IMgaFolder, &LIBID_MGALib> > >,
- public ISupportErrorInfoImpl<&IID_IMgaFolder>
+ IDispatchImpl<IMgaFolder, &__uuidof(IMgaFolder), &__uuidof(__MGALib)> > >,
+ public ISupportErrorInfoImpl<&__uuidof(IMgaFolder)>
{
public:
@@ -40,7 +40,7 @@
BEGIN_COM_MAP(CMgaFolder)
COM_INTERFACE_ENTRY(IMgaFolder)
- COM_INTERFACE_ENTRY_IID(IID_IMgaObject,IMgaFolder)
+ COM_INTERFACE_ENTRY_IID(__uuidof(IMgaObject),IMgaFolder)
// COM_INTERFACE_ENTRY_IID(IID_IMgaContainer,IMgaFolder)
COM_INTERFACE_ENTRY(IDispatch)
COM_INTERFACE_ENTRY_IID(IID_ISupportErrorInfo, IMyErrorInfoBase)
Modified: trunk/GME/Mga/MgaGeneric.cpp
==============================================================================
--- trunk/GME/Mga/MgaGeneric.cpp Tue Aug 14 14:27:52 2012 (r2013)
+++ trunk/GME/Mga/MgaGeneric.cpp Tue Aug 14 14:28:26 2012 (r2014)
@@ -116,7 +116,7 @@
if( v2) GUID_ATTRS_DEFS;
if( v2) STATUS_ATTR_DEF;
- CLSID_PUSH( CLSID_MgaO );
+ CLSID_PUSH( __uuidof(MgaO) );
//FCO
#define FCO_DEF \
@@ -147,14 +147,14 @@
if( v2) GUID_ATTRS_DEFS;
if( v2) STATUS_ATTR_DEF;
- CLSID_PUSH( CLSID_MgaO );
+ CLSID_PUSH( __uuidof(MgaO) );
//ATOM
CREATE_OBJECT(DTID_ATOM, "Atom", "Template For Atom");
FCO_DEF
if( v2) GUID_ATTRS_DEFS;
- CLSID_PUSH( CLSID_MgaO );
+ CLSID_PUSH( __uuidof(MgaO) );
//REFERENCE
CREATE_OBJECT(DTID_REFERENCE, "Reference", "Template For Reference");
@@ -167,7 +167,7 @@
CREATE_ATTRIBUTE(ATTRID_REFASPECT, "RefAspect", "Ref Aspect", VALTYPE_METAREF);
if( v2) GUID_ATTRS_DEFS;
- CLSID_PUSH( CLSID_MgaO );
+ CLSID_PUSH( __uuidof(MgaO) );
//SET
CREATE_OBJECT(DTID_SET, "Set", "Template For Set");
@@ -177,7 +177,7 @@
CREATE_COLLECTION(ATTRID_SETMEMBER, "Members", "Set Members");
if( v2) GUID_ATTRS_DEFS;
- CLSID_PUSH( CLSID_MgaO );
+ CLSID_PUSH( __uuidof(MgaO) );
//SETNODE
@@ -197,7 +197,7 @@
CREATE_COLLECTION(ATTRID_CONNROLE, "ConnRoles", "ConnRoles");
if( v2) GUID_ATTRS_DEFS;
- CLSID_PUSH( CLSID_MgaO );
+ CLSID_PUSH( __uuidof(MgaO) );
//CONNECTION ROLE
CREATE_OBJECT(DTID_CONNROLE, "ConnRole", "Template for Connection Role");
Modified: trunk/GME/Mga/MgaLibOps.cpp
==============================================================================
--- trunk/GME/Mga/MgaLibOps.cpp Tue Aug 14 14:27:52 2012 (r2013)
+++ trunk/GME/Mga/MgaLibOps.cpp Tue Aug 14 14:28:26 2012 (r2014)
@@ -367,7 +367,7 @@
Reporter reporter( mgaproject);
try {
- COMTHROW(p.CoCreateInstance(CLSID_MgaProject));
+ COMTHROW(p.CoCreateInstance(__uuidof(MgaProject)));
CComBSTR paradigmname;
CComVariant paradigmGUID;
@@ -420,7 +420,7 @@
COMTHROW(dumper->put_FormatVersion(0));
COMTHROW(dumper->DumpProject( p, PutInBstr( szTempXmeFileName)) );
- COMTHROW(p->Close());
+ COMTHROW(p->Close(VARIANT_FALSE));
// Create a new 'paradigmname' project
COMTHROW(connstr_upgraded.Append( szTempMgaFileName)); // connection string prepared
@@ -431,7 +431,7 @@
ASSERT( parser != NULL );
COMTHROW(parser->ParseProject( p, PutInBstr( szTempXmeFileName)) );
- COMTHROW(p->Close());
+ COMTHROW(p->Close(VARIANT_FALSE));
upgraded = true;
}
else if(hr == E_MGA_PARADIGM_NOTREG || hr == E_MGA_PARADIGM_INVALID) {
@@ -541,7 +541,7 @@
matching_libs.clear();
COMTHROW(p->AbortTransaction());
- COMTHROW(p->Close());
+ COMTHROW(p->Close(VARIANT_FALSE));
} catch(...) {
fixup.clear();
superfluous_libs.clear();
@@ -552,7 +552,7 @@
if(st & 8)
p->AbortTransaction();
if(st & 1)
- p->Close();
+ p->Close(VARIANT_FALSE);
};
throw;
}
Modified: trunk/GME/Mga/MgaModel.h
==============================================================================
--- trunk/GME/Mga/MgaModel.h Tue Aug 14 14:27:52 2012 (r2013)
+++ trunk/GME/Mga/MgaModel.h Tue Aug 14 14:28:26 2012 (r2014)
@@ -11,11 +11,11 @@
/////////////////////////////////////////////////////////////////////////////
// CMgaModel
class ATL_NO_VTABLE CMgaModel :
- public CComCoClass<CMgaModel, &CLSID_MgaModel>,
+ public CComCoClass<CMgaModel, &__uuidof(MgaModel)>,
public IMgaContainerImpl< IMgaFCOImpl<
CComObjectRootEx<CComSingleThreadModel>,
- IDispatchImpl<IMgaModel, &IID_IMgaModel, &LIBID_MGALib> > >,
- public ISupportErrorInfoImpl<&IID_IMgaModel>
+ IDispatchImpl<IMgaModel, &__uuidof(IMgaModel), &__uuidof(__MGALib)> > >,
+ public ISupportErrorInfoImpl<&__uuidof(IMgaModel)>
{
public:
CMgaModel()
@@ -28,8 +28,8 @@
BEGIN_COM_MAP(CMgaModel)
COM_INTERFACE_ENTRY(IMgaModel)
COM_INTERFACE_ENTRY(IDispatch)
- COM_INTERFACE_ENTRY_IID(IID_IMgaFCO,IMgaModel)
- COM_INTERFACE_ENTRY_IID(IID_IMgaObject,IMgaModel)
+ COM_INTERFACE_ENTRY_IID(__uuidof(IMgaFCO),IMgaModel)
+ COM_INTERFACE_ENTRY_IID(__uuidof(IMgaObject),IMgaModel)
COM_INTERFACE_ENTRY_IID(IID_ISupportErrorInfo, IMyErrorInfoBase)
// COM_INTERFACE_ENTRY_IID(IID_IMgaContainer,IMgaModel)
END_COM_MAP()
Modified: trunk/GME/Mga/MgaProject.cpp
==============================================================================
--- trunk/GME/Mga/MgaProject.cpp Tue Aug 14 14:27:52 2012 (r2013)
+++ trunk/GME/Mga/MgaProject.cpp Tue Aug 14 14:28:26 2012 (r2014)
@@ -40,7 +40,7 @@
STDMETHODIMP CMgaProject::FinalConstruct() {
COMTRY {
// IDispatchImpl<IMgaProject, &IID_IMgaProject, &LIBID_MGALib> *xthis = this;
- COMTHROW( CoCreateInstance(CLSID_CoreProject, (IMgaProject *)this, CLSCTX_ALL, IID_IUnknown, (LPVOID *) &inner) );
+ COMTHROW( CoCreateInstance(__uuidof(CoreProject), (IMgaProject *)this, CLSCTX_ALL, IID_IUnknown, (LPVOID *) &inner) );
COMTHROW(inner.QueryInterface(&dataproject));
dataproject->Release(); // release reference to ourselves
} COMCATCH(;);
@@ -225,7 +225,7 @@
COMCATCH(
opened = CLOSED;
guidstat = CLEAN;
- if(dataproject) dataproject->CloseProject();
+ if(dataproject) dataproject->CloseProject(VARIANT_FALSE);
if(metapr) metapr->Close();
metapr = 0;
projconn.Empty();
@@ -359,7 +359,7 @@
COMCATCH(
opened = CLOSED;
guidstat = CLEAN;
- if(dataproject) dataproject->CloseProject();
+ if(dataproject) dataproject->CloseProject(VARIANT_FALSE);
if(metapr) metapr->Close();
metapr = 0;
projconn.Empty();
@@ -468,7 +468,7 @@
}
COMCATCH(
opened = CLOSED;
- if(dataproject) dataproject->CloseProject();
+ if(dataproject) dataproject->CloseProject(VARIANT_FALSE);
if(metapr) metapr->Close();
metapr = 0;
projconn.Empty();
@@ -498,7 +498,7 @@
CComPtr<ICoreMetaProject> genericproject;
CreateCoreMetaProject(genericproject); // use mgaversion = 1 project model
- COMTHROW(dp.CoCreateInstance(CLSID_CoreProject));
+ COMTHROW(dp.CoCreateInstance(__uuidof(CoreProject)));
COMTHROW(dp->OpenProject(projectname, genericproject, ro_mode));
CComPtr<ICoreTerritory> tt;
@@ -519,11 +519,11 @@
// FIXME
;
}
- dp->AbortTransaction();
- dp->CloseProject();
+ dp->AbortTransaction(TRANSTYPE_ANY);
+ dp->CloseProject(VARIANT_FALSE);
}
COMCATCH(
- if(dp) dp->CloseProject();
+ if(dp) dp->CloseProject(VARIANT_FALSE);
)
}
@@ -846,7 +846,7 @@
if( p.vt != (VT_UI1 | VT_ARRAY) || GetArrayLength(p) != sizeof(GUID) )
{
- GUID guid;
+ ::GUID guid;
memset(&guid, 0, sizeof(GUID));
CopyTo(guid, p);
@@ -906,7 +906,7 @@
if( p.vt != (VT_UI1 | VT_ARRAY) || GetArrayLength(p) != sizeof(GUID) )
{
- GUID guid;
+ ::GUID guid;
memset(&guid, 0, sizeof(GUID));
CopyTo(guid, p);
@@ -1494,7 +1494,8 @@
return S_OK;
}
COMTRY {
- if(!baseterr) COMTHROW(E_MGA_NOT_IN_TRANSACTION);
+ if(!baseterr)
+ COMTHROW(E_MGA_NOT_IN_TRANSACTION);
if(!changedobjs.empty()) notifyqueueprocessed = true;
while(!changedobjs.empty()) {
@@ -1730,7 +1731,7 @@
void CMgaProject::FixupGUID(bool write) {
if (guidstat == DIRTY) {
- GUID newGUID;
+ ::GUID newGUID;
COMTHROW(CoCreateGuid(&newGUID));
pendingguid.Clear();
CopyTo(newGUID, pendingguid);
Modified: trunk/GME/Mga/MgaProject.h
==============================================================================
--- trunk/GME/Mga/MgaProject.h Tue Aug 14 14:27:52 2012 (r2013)
+++ trunk/GME/Mga/MgaProject.h Tue Aug 14 14:28:26 2012 (r2014)
@@ -16,9 +16,9 @@
// CMgaProject
class ATL_NO_VTABLE CMgaProject :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaProject, &CLSID_MgaProject>,
- public IDispatchImpl<IMgaProject, &IID_IMgaProject, &LIBID_MGALib>,
- public ISupportErrorInfoImpl<&IID_IMgaProject>,
+ public CComCoClass<CMgaProject, &__uuidof(MgaProject)>,
+ public IDispatchImpl<IMgaProject, &__uuidof(IMgaProject), &__uuidof(__MGALib)>,
+ public ISupportErrorInfoImpl<&__uuidof(IMgaProject)>,
public IGMEVersionInfoImpl
{
@@ -39,7 +39,7 @@
COM_INTERFACE_ENTRY(IMgaProject)
COM_INTERFACE_ENTRY(IDispatch)
COM_INTERFACE_ENTRY_IID(IID_ISupportErrorInfo, IMyErrorInfoBase)
- COM_INTERFACE_ENTRY_IID(IID_IGMEVersionInfo, IGMEVersionInfoImpl)
+ COM_INTERFACE_ENTRY_IID(__uuidof(IGMEVersionInfo), IGMEVersionInfoImpl)
END_COM_MAP()
@@ -232,8 +232,8 @@
// CMgaClient
class ATL_NO_VTABLE CMgaClient :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaClient, &CLSID_MgaClient>,
- public IDispatchImpl<IMgaClient, &IID_IMgaClient, &LIBID_MGALib>
+ public CComCoClass<CMgaClient, &__uuidof(MgaClient)>,
+ public IDispatchImpl<IMgaClient, &__uuidof(IMgaClient), &__uuidof(__MGALib)>
{
public:
Modified: trunk/GME/Mga/MgaReference.h
==============================================================================
--- trunk/GME/Mga/MgaReference.h Tue Aug 14 14:27:52 2012 (r2013)
+++ trunk/GME/Mga/MgaReference.h Tue Aug 14 14:28:26 2012 (r2014)
@@ -9,11 +9,11 @@
/////////////////////////////////////////////////////////////////////////////
// CMgaReference
class ATL_NO_VTABLE CMgaReference :
- public CComCoClass<CMgaReference, &CLSID_MgaReference>,
+ public CComCoClass<CMgaReference, &__uuidof(MgaReference)>,
public IMgaFCOImpl<
CComObjectRootEx<CComSingleThreadModel>,
- IDispatchImpl<IMgaReference, &IID_IMgaReference, &LIBID_MGALib> >,
- public ISupportErrorInfoImpl<&IID_IMgaReference> {
+ IDispatchImpl<IMgaReference, &__uuidof(IMgaReference), &__uuidof(__MGALib)> >,
+ public ISupportErrorInfoImpl<&__uuidof(IMgaReference)> {
public:
CMgaReference()
{
@@ -24,8 +24,8 @@
BEGIN_COM_MAP(CMgaReference)
COM_INTERFACE_ENTRY(IMgaReference)
- COM_INTERFACE_ENTRY_IID(IID_IMgaObject,IMgaReference)
- COM_INTERFACE_ENTRY_IID(IID_IMgaFCO,IMgaReference)
+ COM_INTERFACE_ENTRY_IID(__uuidof(IMgaObject),IMgaReference)
+ COM_INTERFACE_ENTRY_IID(__uuidof(IMgaFCO),IMgaReference)
COM_INTERFACE_ENTRY(IDispatch)
COM_INTERFACE_ENTRY_IID(IID_ISupportErrorInfo, IMyErrorInfoBase)
END_COM_MAP()
Modified: trunk/GME/Mga/MgaSet.h
==============================================================================
--- trunk/GME/Mga/MgaSet.h Tue Aug 14 14:27:52 2012 (r2013)
+++ trunk/GME/Mga/MgaSet.h Tue Aug 14 14:28:26 2012 (r2014)
@@ -9,11 +9,11 @@
/////////////////////////////////////////////////////////////////////////////
// CMgaSet
class ATL_NO_VTABLE CMgaSet :
- public CComCoClass<CMgaSet, &CLSID_MgaSet>,
+ public CComCoClass<CMgaSet, &__uuidof(MgaSet)>,
public IMgaFCOImpl<
CComObjectRootEx<CComSingleThreadModel>,
- IDispatchImpl<IMgaSet, &IID_IMgaSet, &LIBID_MGALib> >,
- public ISupportErrorInfoImpl<&IID_IMgaSet>
+ IDispatchImpl<IMgaSet, &__uuidof(IMgaSet), &__uuidof(__MGALib)> >,
+ public ISupportErrorInfoImpl<&__uuidof(IMgaSet)>
{
public:
CMgaSet()
@@ -25,8 +25,8 @@
BEGIN_COM_MAP(CMgaSet)
COM_INTERFACE_ENTRY(IMgaSet)
- COM_INTERFACE_ENTRY_IID(IID_IMgaFCO,IMgaSet)
- COM_INTERFACE_ENTRY_IID(IID_IMgaObject,IMgaSet)
+ COM_INTERFACE_ENTRY_IID(__uuidof(IMgaFCO),IMgaSet)
+ COM_INTERFACE_ENTRY_IID(__uuidof(IMgaObject),IMgaSet)
COM_INTERFACE_ENTRY_IID(IID_ISupportErrorInfo, IMyErrorInfoBase)
COM_INTERFACE_ENTRY(IDispatch)
END_COM_MAP()
Modified: trunk/GME/Mga/MgaTerritory.h
==============================================================================
--- trunk/GME/Mga/MgaTerritory.h Tue Aug 14 14:27:52 2012 (r2013)
+++ trunk/GME/Mga/MgaTerritory.h Tue Aug 14 14:28:26 2012 (r2014)
@@ -11,8 +11,9 @@
class ATL_NO_VTABLE CMgaTerritory :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaTerritory, &CLSID_MgaTerritory>,
- public IDispatchImpl<IMgaTerritory, &IID_IMgaTerritory, &LIBID_MGALib>
+ public CComCoClass<CMgaTerritory, &__uuidof(MgaTerritory)>,
+ public IDispatchImpl<IMgaTerritory, &__uuidof(IMgaTerritory), &__uuidof(__MGALib)>
+ // TODO: ISupportErrorInfo
{
public:
DEFSIG;
@@ -90,8 +91,8 @@
// CMgaAddOn
class ATL_NO_VTABLE CMgaAddOn :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CMgaAddOn, &CLSID_MgaAddOn>,
- public IDispatchImpl<IMgaAddOn, &IID_IMgaAddOn, &LIBID_MGALib>
+ public CComCoClass<CMgaAddOn, &__uuidof(MgaAddOn)>,
+ public IDispatchImpl<IMgaAddOn, &__uuidof(IMgaAddOn), &__uuidof(__MGALib)>
{
DEFSIG;
bool active;
Modified: trunk/GME/Mga/StdAfx.h
==============================================================================
--- trunk/GME/Mga/StdAfx.h Tue Aug 14 14:27:52 2012 (r2013)
+++ trunk/GME/Mga/StdAfx.h Tue Aug 14 14:28:26 2012 (r2014)
@@ -53,8 +53,40 @@
#define MGA_TRACE 1 ? void(0) : NOOP_TRACE2
#endif
-#include "CoreLib.h"
-#include "MgaLib.h"
+// Imports
+#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
+#import "MgaLib.tlb" no_implementation no_namespace raw_method_prefix("") high_method_prefix("__") no_registry
+
+#include "CommonImport.h"
+
+#define cpp_quote(x)
+#include "Interfaceversion.h"
+#undef cpp_quote
+
+typedef GMEInterfaceVersion_enum GMEInterfaceVersion;
+typedef long metaref_type;
+#define ATTVAL_ENUM _attval_enum
+const attrid_type ATTRID_NONE = 0;
+const attrid_type ATTRID_LOCK = 1;
+const attrid_type ATTRID_NAME = 2;
+const attrid_type ATTRID_FATHER = 3;
+const attrid_type ATTRID_COLLECTION = 10000;
+const metaid_type METAID_NONE = 0;
+const metaid_type METAID_ROOT = 1;
+
+const objid_type OBJID_NONE = 0;
+const objid_type OBJID_ROOT = 1;
+const long RELID_BASE_MAX = 0x7FFFFFF; //assigned to non-derived ojects
+const long RELID_VALUE_MAX = 0x7FFFFFFF; // automatically assigned to deriveds
+
+
+// Don't load the MIDL-generated headers
+#define __Core_h__
+#define __Meta_h__
+#define __Mga_h__
+#define INTERFACECOLL_INCLUDED
+// End Imports
#define ASSERT ATLASSERT
#include "CommonSmart.h"
More information about the gme-commit
mailing list