[GME-commit] GMESRC/GME/Meta MgaMetaConnJoint.h,1.1,1.2 MgaMetaFCO.h,1.2,1.3 MgaMetaFolder.h,1.2,1.3 MgaMetaModel.h,1.2,1.3 MgaMetaProject.h,1.5,1.6 MgaMetaRegNode.h,1.1,1.2

Mon Nov 28 22:01:48 CST 2005

Update of /project/gme-repository/GMESRC/GME/Meta
In directory escher:/tmp/cvs-serv27467

Modified Files:
	MgaMetaConnJoint.h MgaMetaFCO.h MgaMetaFolder.h MgaMetaModel.h 
	MgaMetaProject.h MgaMetaRegNode.h 
Log Message:
Adding dispatch compatible methods.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: MgaMetaConnJoint.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Meta/MgaMetaConnJoint.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MgaMetaConnJoint.h	5 Jul 2000 19:17:00 -0000	1.1
--- MgaMetaConnJoint.h	28 Nov 2005 22:01:46 -0000	1.2
***************
*** 32,35 ****
--- 32,37 ----
  	{ return ComGetCollValueByName(name, GetUnknown(), ATTRID_PTRSPECS_COLL, ATTRID_PTRSPECNAME, p); }
  
+ 	STDMETHOD(GetPointerSpecByNameDisp)(BSTR name, IMgaMetaPointerSpec **p)
+ 	{ return get_PointerSpecByName( name, p); }
  // ------- Edit
  

Index: MgaMetaFolder.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Meta/MgaMetaFolder.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MgaMetaFolder.h	28 Jun 2001 05:40:00 -0000	1.2
--- MgaMetaFolder.h	28 Nov 2005 22:01:46 -0000	1.3
***************
*** 40,43 ****
--- 40,46 ----
  	STDMETHOD(get_DefinedFolderByName)(BSTR name, VARIANT_BOOL inscope, IMgaMetaFolder **p);
  
+ 	STDMETHOD(GetDefinedFolderByNameDisp)(BSTR name, VARIANT_BOOL inscope, IMgaMetaFolder **p)
+ 	{ return get_DefinedFolderByName( name, inscope, p); }
+ 
  	STDMETHOD(get_DefinedFCOs)(IMgaMetaFCOs **p)
  	{ 	return ComGetSortedCollValue<IMgaMetaFCO>(GetUnknown(), ATTRID_DEFFCO_PTR, p); }
***************
*** 45,48 ****
--- 48,54 ----
  	STDMETHOD(get_DefinedFCOByName)(BSTR name, VARIANT_BOOL inscope, IMgaMetaFCO **p);
  
+ 	STDMETHOD(GetDefinedFCOByNameDisp)(BSTR name, VARIANT_BOOL inscope, IMgaMetaFCO **p)
+ 	{ return get_DefinedFCOByName( name, inscope, p); }
+ 
  	STDMETHOD(get_DefinedAttributes)(IMgaMetaAttributes **p)
  	{ return ComGetSortedCollValue<IMgaMetaAttribute>(GetUnknown(), ATTRID_DEFATTR_PTR, p); }
***************
*** 50,53 ****
--- 56,62 ----
  	STDMETHOD(get_DefinedAttributeByName)(BSTR name, VARIANT_BOOL inscope, IMgaMetaAttribute **p);
  
+ 	STDMETHOD(GetDefinedAttributeByNameDisp)(BSTR name, VARIANT_BOOL inscope, IMgaMetaAttribute **p)
+ 	{ return get_DefinedAttributeByName( name, inscope, p); }
+ 
  	STDMETHOD(get_LegalChildFolders)(IMgaMetaFolders **p)
  	{ return ComGetSortedLinkCollValue<IMgaMetaFolder>(GetUnknown(),
***************
*** 58,61 ****
--- 67,73 ----
  		ATTRID_FOLDERLINK_PARENT_PTR, ATTRID_FOLDERLINK_CHILD_PTR, p); }
  
+ 	STDMETHOD(GetLegalChildFolderByNameDisp)(BSTR name, IMgaMetaFolder **p)
+ 	{ return get_LegalChildFolderByName( name, p); }
+ 
  	STDMETHOD(get_LegalRootObjects)(IMgaMetaFCOs **p)
  	{   return ComGetSortedLinkCollValue<IMgaMetaFCO>(GetUnknown(),
***************
*** 65,68 ****
--- 77,83 ----
  	{ return ComGetLinkCollValueByName(name, GetUnknown(),
  		ATTRID_ROOTOBJLINK_FOLDER_PTR, ATTRID_ROOTOBJLINK_OBJECT_PTR, p); }
+ 
+ 	STDMETHOD(GetLegalRootObjectByNameDisp)(BSTR name, IMgaMetaFCO **p)
+ 	{ return get_LegalRootObjectByName( name, p); }
  
  	STDMETHOD(get_UsedInFolders)(IMgaMetaFolders **p)

Index: MgaMetaFCO.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Meta/MgaMetaFCO.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MgaMetaFCO.h	25 Apr 2001 15:10:00 -0000	1.2
--- MgaMetaFCO.h	28 Nov 2005 22:01:46 -0000	1.3
***************
*** 39,42 ****
--- 39,45 ----
  	{ return CMgaMetaFCO::get_DefinedAttributeByName(this, name, inscope, p); } \
  \
+ 	STDMETHOD(GetDefinedAttributeByNameDisp)(BSTR name, VARIANT_BOOL inscope, IMgaMetaAttribute **p) \
+ 	{ return get_DefinedAttributeByName( name, inscope, p); } \
+ \
  	STDMETHOD(get_UsedInRoles)(IMgaMetaRoles **p) \
  	{ return ComGetCollectionValue<IMgaMetaRole>(GetUnknown(), ATTRID_KIND_PTR, p); } \
***************
*** 53,58 ****
--- 56,67 ----
  	{ return CMgaMetaFCO::get_AttributeByName(this, name, p); } \
  \
+ 	STDMETHOD(GetAttributeByNameDisp)(BSTR name, IMgaMetaAttribute **p) \
+ 	{ return get_AttributeByName( name, p); } \
+ \
  	STDMETHOD(get_AttributeByRef)(metaref_type mref, IMgaMetaAttribute **p) \
  	{ return CMgaMetaFCO::get_AttributeByRef(this, mref, p); } \
+ \
+ 	STDMETHOD(GetAttributeByRefDisp)(metaref_type mref, IMgaMetaAttribute **p) \
+ 	{ return get_AttributeByRef( mref, p); } \
  \
  	STDMETHOD(DefineAttribute)(IMgaMetaAttribute **p) \

Index: MgaMetaModel.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Meta/MgaMetaModel.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MgaMetaModel.h	28 Jun 2001 05:40:00 -0000	1.2
--- MgaMetaModel.h	28 Nov 2005 22:01:46 -0000	1.3
***************
*** 36,39 ****
--- 36,42 ----
  	STDMETHOD(get_DefinedFCOByName)(BSTR name, VARIANT_BOOL inscope, IMgaMetaFCO **p);
  
+ 	STDMETHOD(GetDefinedFCOByNameDisp)(BSTR name, VARIANT_BOOL inscope, IMgaMetaFCO **p)
+ 	{ return get_DefinedFCOByName( name, inscope, p); }
+ 
  	STDMETHOD(get_Roles)(IMgaMetaRoles **p)
  	{ return ComGetSortedCollValue<IMgaMetaRole>(GetUnknown(), ATTRID_ROLES_COLL, p); }
***************
*** 41,48 ****
--- 44,57 ----
  	STDMETHOD(get_RoleByName)(BSTR name, IMgaMetaRole **p);
  
+ 	STDMETHOD(GetRoleByNameDisp)(BSTR name, IMgaMetaRole **p)
+ 	{ return get_RoleByName( name, p); }
+ 
  	STDMETHOD(get_Aspects)(IMgaMetaAspects **p)
  	{ return ComGetSortedCollValue<IMgaMetaAspect>(GetUnknown(), ATTRID_ASPECTS_COLL, p); }
  
  	STDMETHOD(get_AspectByName)(BSTR name, IMgaMetaAspect **p);
+ 
+ 	STDMETHOD(GetAspectByNameDisp)(BSTR name, IMgaMetaAspect **p)
+ 	{ return get_AspectByName( name, p); }
  
  	STDMETHOD(LegalConnectionRoles)(BSTR paths, IMgaMetaRoles **p);

Index: MgaMetaRegNode.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Meta/MgaMetaRegNode.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MgaMetaRegNode.h	5 Jul 2000 19:17:00 -0000	1.1
--- MgaMetaRegNode.h	28 Nov 2005 22:01:46 -0000	1.2
***************
*** 22,30 ****
  	{ return CMgaMetaRegNodes::get_RegistryNode(GetUnknown(), path, p); } \
  \
  	STDMETHOD(get_RegistryValue)(BSTR path, BSTR *p) \
  	{ return CMgaMetaRegNodes::get_RegistryValue(GetUnknown(), path, p); } \
  \
  	STDMETHOD(put_RegistryValue)(BSTR path, BSTR p) \
! 	{ return CMgaMetaRegNodes::put_RegistryValue(GetUnknown(), path, p); }
  
  // --------------------------- CMgaMetaRegNode
--- 22,40 ----
  	{ return CMgaMetaRegNodes::get_RegistryNode(GetUnknown(), path, p); } \
  \
+ 	STDMETHOD(GetRegistryNodeDisp)(BSTR path, IMgaMetaRegNode **p) \
+ 	{ return get_RegistryNode( path, p); } \
+ \
  	STDMETHOD(get_RegistryValue)(BSTR path, BSTR *p) \
  	{ return CMgaMetaRegNodes::get_RegistryValue(GetUnknown(), path, p); } \
  \
+ 	STDMETHOD(GetRegistryValueDisp)(BSTR path, BSTR *p) \
+ 	{ return get_RegistryValue( path, p); } \
+ \
  	STDMETHOD(put_RegistryValue)(BSTR path, BSTR p) \
! 	{ return CMgaMetaRegNodes::put_RegistryValue(GetUnknown(), path, p); } \
! \
! 	STDMETHOD(SetRegistryValueDisp)(BSTR path, BSTR p) \
! 	{ return put_RegistryValue( path, p); }
! 
  
  // --------------------------- CMgaMetaRegNode

Index: MgaMetaProject.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Meta/MgaMetaProject.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MgaMetaProject.h	13 Oct 2004 15:17:55 -0000	1.5
--- MgaMetaProject.h	28 Nov 2005 22:01:46 -0000	1.6
***************
*** 62,65 ****
--- 62,66 ----
  
  	STDMETHOD(get_FindObject)(metaref_type metaref, IMgaMetaBase **p);
+ 	STDMETHOD(DoFindObjectDisp)(metaref_type metaref, IMgaMetaBase **p) { return get_FindObject( metaref, p); }
  
  // ------- metaobj_lookup