[commit] r1365 - trunk/GME/Interfaces
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Fri Jun 17 16:29:46 CDT 2011
Author: ksmyth
Date: Fri Jun 17 16:29:46 2011
New Revision: 1365
Log:
Work around "MIDL changes the case of identifier in generated type library" http://support.microsoft.com/kb/q220137/ . Not everything is case insensitive, e.g. Python COM (see gme.py) and #import, so we need the properties to be named properly
Modified:
trunk/GME/Interfaces/Gme.idl
trunk/GME/Interfaces/Meta.idl
trunk/GME/Interfaces/Mga.idl
trunk/GME/Interfaces/MgaUtil.idl
trunk/GME/Interfaces/Parser.idl
Modified: trunk/GME/Interfaces/Gme.idl
==============================================================================
--- trunk/GME/Interfaces/Gme.idl Wed Jun 15 13:16:27 2011 (r1364)
+++ trunk/GME/Interfaces/Gme.idl Fri Jun 17 16:29:46 2011 (r1365)
@@ -85,22 +85,22 @@
[propget, id(4)] HRESULT VersionMinor([out, retval] short* n);
[propget, id(5)] HRESULT VersionPatchLevel([out, retval] short* n);
[propget, id(6)] HRESULT Models([out, retval] IGMEOLEColl** coll);
- [propget, id(7)] HRESULT MgaProject([out, retval] IMgaProject** project);
+ [propget, id(7)] HRESULT MgaProject([out, retval] IMgaProject** p);
[propget, id(8)] HRESULT Panels([out, retval] IGMEOLEColl** coll);
[propput, id(9)] HRESULT ConsoleContents([in] BSTR contents);
[propget, id(9)] HRESULT ConsoleContents([out, retval] BSTR* contents);
// methods:
- [id(10)] HRESULT CreateProject([in] BSTR metaname, [in] BSTR connstr);
- [id(11)] HRESULT OpenProject([in] BSTR connstr);
+ [id(10)] HRESULT CreateProject([in] BSTR metaname, [in] BSTR ConnStr);
+ [id(11)] HRESULT OpenProject([in] BSTR ConnStr);
[id(12)] HRESULT CreateProjectDialog();
[id(13)] HRESULT OpenProjectDialog();
[id(14)] HRESULT CloseProject([in] VARIANT_BOOL saveOnClose);
[id(15)] HRESULT SaveProject();
- [id(16)] HRESULT SaveProjectAs([in] BSTR connstr);
+ [id(16)] HRESULT SaveProjectAs([in] BSTR ConnStr);
[id(17)] HRESULT SaveProjectAsDialog();
- [id(18)] HRESULT ExportProject([in] BSTR connstr);
- [id(19)] HRESULT ImportProject([in] BSTR connstr);
+ [id(18)] HRESULT ExportProject([in] BSTR ConnStr);
+ [id(19)] HRESULT ImportProject([in] BSTR ConnStr);
[id(20)] HRESULT ConstraintsDialog();
[id(21)] HRESULT CheckAllConstraints();
[id(22)] HRESULT RegisterParagimsDialog();
@@ -196,19 +196,19 @@
[helpstring("ShowFCOPtr - changes the view to fco.")]
HRESULT ShowFCOPtr( [in] IMgaFCO* fco, [in, defaultvalue(0)] VARIANT_BOOL inParent );
- HRESULT Child( [in] BSTR name, [out,retval] IMgaFCO** child_fco );
- HRESULT Create( [in] BSTR part, [in] BSTR name, [out,retval] IMgaFCO** new_fco );
+ HRESULT Child( [in] BSTR Name, [out,retval] IMgaFCO** child_fco );
+ HRESULT Create( [in] BSTR part, [in] BSTR Name, [out,retval] IMgaFCO** new_fco );
[helpstring("creates a 'part' named 'name' in child_as_parent model")]
- HRESULT CreateInChild( [in] BSTR child_as_parent, [in] BSTR part, [in] BSTR name, [out,retval] IMgaFCO** new_fco );
- HRESULT CreateInChildFCO( [in] IMgaFCO* child_as_parent, [in] BSTR part, [in] BSTR name, [out,retval] IMgaFCO** new_fco );
+ HRESULT CreateInChild( [in] BSTR child_as_parent, [in] BSTR part, [in] BSTR Name, [out,retval] IMgaFCO** new_fco );
+ HRESULT CreateInChildFCO( [in] IMgaFCO* child_as_parent, [in] BSTR part, [in] BSTR Name, [out,retval] IMgaFCO** new_fco );
HRESULT Duplicate([in] BSTR existing_fco_name, [in] BSTR new_fco_name, [out,retval] IMgaFCO** new_fco );
HRESULT DuplicateFCO([in] IMgaFCO* existing_fco, [in] BSTR new_fco_name, [out,retval] IMgaFCO** new_fco );
HRESULT Rename( [in] BSTR oldname, [in] BSTR newname);
- HRESULT SetName( [in] IMgaFCO*, [in] BSTR name);
+ HRESULT SetName( [in] IMgaFCO*, [in] BSTR Name);
- HRESULT Include( [in] BSTR setname, [in] BSTR name);
+ HRESULT Include( [in] BSTR setname, [in] BSTR Name);
HRESULT Exclude( [in] BSTR setname, [in] BSTR membername);
HRESULT IncludeFCO( [in] IMgaSet* p_set, [in] IMgaFCO* fco);
@@ -226,18 +226,18 @@
HRESULT ConnectFCOs( [in] IMgaFCO* src_part, [in] IMgaFCO* dst_part, [in] BSTR connection_role, [out, retval] IMgaConnection ** conn );
HRESULT DisconnectFCOs( [in] IMgaFCO* src_part, [in] IMgaFCO* dst_part, [in] BSTR connection_name);
- HRESULT Refer( [in] BSTR reference, [in] BSTR referred);
+ HRESULT Refer( [in] BSTR reference, [in] BSTR Referred);
HRESULT ClearRef( [in] BSTR reference);
HRESULT FollowRef( [in] BSTR reference);
- HRESULT ReferFCO( [in] IMgaReference* reference, [in] IMgaFCO* referred);
+ HRESULT ReferFCO( [in] IMgaReference* reference, [in] IMgaFCO* Referred);
HRESULT ClearRefFCO( [in] IMgaReference* reference);
HRESULT FollowRefFCO( [in] IMgaReference* reference);
HRESULT NullFCO( [out, retval] IMgaFCO** nullobj);
- HRESULT SetAttribute( [in] BSTR name, [in] BSTR attr_name, [in] VARIANT value);
- HRESULT GetAttribute( [in] BSTR name, [in] BSTR attr_name, [out, retval] VARIANT* value);
+ HRESULT SetAttribute( [in] BSTR Name, [in] BSTR attr_name, [in] VARIANT value);
+ HRESULT GetAttribute( [in] BSTR Name, [in] BSTR attr_name, [out, retval] VARIANT* value);
HRESULT SetAttributeFCO( [in] IMgaFCO* fco, [in] BSTR attr_name, [in] VARIANT value);
HRESULT GetAttributeFCO( [in] IMgaFCO* fco, [in] BSTR attr_name, [out, retval] VARIANT* value);
@@ -343,7 +343,7 @@
interface IGMEOLEPanel : IDispatch
{
// properties:
- [propget, id(1)] HRESULT Name([out, retval] BSTR* name);
+ [propget, id(1)] HRESULT Name([out, retval] BSTR* Name);
[propput, id(2)] HRESULT Visible([in] VARIANT_BOOL isVisible);
[propget, id(2)] HRESULT Visible([out, retval] VARIANT_BOOL* isVisible);
[propget, id(3)] HRESULT Interface([out, retval] IDispatch** interf);
@@ -428,12 +428,12 @@
]
interface IMgaDecorator : IUnknown
{
- [id(1), helpstring("method Initialize")] HRESULT Initialize([in] IMgaProject* project, [in] IMgaMetaPart* meta, [in] IMgaFCO* obj);
+ [id(1), helpstring("method Initialize")] HRESULT Initialize([in] IMgaProject* p, [in] IMgaMetaPart* meta, [in] IMgaFCO* obj);
[id(2), helpstring("method Destroy")] HRESULT Destroy();
[id(3), helpstring("method GetMnemonic")] HRESULT GetMnemonic([out] BSTR* mnemonic);
[id(4), helpstring("method GetFeatures")] HRESULT GetFeatures([out] feature_code* features);
- [id(5), helpstring("method SetParam")] HRESULT SetParam([in] BSTR name, [in] VARIANT value);
- [id(6), helpstring("method GetParam")] HRESULT GetParam([in] BSTR name, [out] VARIANT* value);
+ [id(5), helpstring("method SetParam")] HRESULT SetParam([in] BSTR Name, [in] VARIANT value);
+ [id(6), helpstring("method GetParam")] HRESULT GetParam([in] BSTR Name, [out] VARIANT* value);
[id(7), helpstring("method SetActive")] HRESULT SetActive([in] VARIANT_BOOL isActive);
[id(8), helpstring("method GetPreferredSize")] HRESULT GetPreferredSize([out] long* sizex, [out] long* sizey);
[id(9), helpstring("method SetLocation")] HRESULT SetLocation([in] long sx, [in] long sy, [in] long ex, [in] long ey);
@@ -484,7 +484,7 @@
]
interface IMgaDecoratorCommon : IMgaDecorator
{
- [id(20), helpstring("method InitializeEx")] HRESULT InitializeEx([in] IMgaProject* project, [in] IMgaMetaPart* meta, [in] IMgaFCO* obj, [in] IMgaCommonDecoratorEvents* eventSink, [in] ULONGLONG parentWnd);
+ [id(20), helpstring("method InitializeEx")] HRESULT InitializeEx([in] IMgaProject* p, [in] IMgaMetaPart* meta, [in] IMgaFCO* obj, [in] IMgaCommonDecoratorEvents* eventSink, [in] ULONGLONG parentWnd);
[id(21), helpstring("method DrawEx")] HRESULT DrawEx([in] ULONG hdc, [in] ULONGLONG gdip);
[id(22), helpstring("method SetSelected")] HRESULT SetSelected([in] VARIANT_BOOL isSelected);
[id(23), helpstring("method MouseMoved")] HRESULT MouseMoved([in] ULONG nFlags, [in] LONG pointx, [in] LONG pointy, [in] ULONGLONG transformHDC);
Modified: trunk/GME/Interfaces/Meta.idl
==============================================================================
--- trunk/GME/Interfaces/Meta.idl Wed Jun 15 13:16:27 2011 (r1364)
+++ trunk/GME/Interfaces/Meta.idl Fri Jun 17 16:29:46 2011 (r1365)
@@ -623,7 +623,7 @@
// --- edit containment
[helpstring("method CreateRole")]
- HRESULT CreateRole([in] IMgaMetaFCO *kind, [out, retval] IMgaMetaRole **p);
+ HRESULT CreateRole([in] IMgaMetaFCO *Kind, [out, retval] IMgaMetaRole **p);
[helpstring("method CreateAspect")]
HRESULT CreateAspect([out, retval] IMgaMetaAspect **p);
@@ -646,7 +646,7 @@
[out, retval] IMgaMetaRoles **p);
[helpstring("method LegalRoles")]
- HRESULT LegalRoles([in] IMgaMetaFCO *kind,
+ HRESULT LegalRoles([in] IMgaMetaFCO *k,
[out, retval] IMgaMetaRoles **p);
};
@@ -695,7 +695,7 @@
// --- edit containment
[helpstring("method CreatePart")]
- HRESULT CreatePart([in] IMgaMetaRole *role, [out, retval] IMgaMetaPart **p);
+ HRESULT CreatePart([in] IMgaMetaRole *r, [out, retval] IMgaMetaPart **p);
[helpstring("method AddAttribute")]
HRESULT AddAttribute([in] IMgaMetaAttribute *p);
Modified: trunk/GME/Interfaces/Mga.idl
==============================================================================
--- trunk/GME/Interfaces/Mga.idl Wed Jun 15 13:16:27 2011 (r1364)
+++ trunk/GME/Interfaces/Mga.idl Fri Jun 17 16:29:46 2011 (r1365)
@@ -562,7 +562,7 @@
[ helpstring("method Destroy: disable further callbacks to this addon")] HRESULT Destroy();
[ propget, helpstring("property Project")] HRESULT Project([out, retval] IMgaProject **pVal);
- [ helpstring("Check if object belongs to a project")] HRESULT CheckProject([in] IMgaProject *project);
+ [ helpstring("Check if object belongs to a project")] HRESULT CheckProject([in] IMgaProject *p_project);
};
@@ -1029,7 +1029,7 @@
{
[ helpstring("method CreateChildObject")] HRESULT CreateChildObject([in] IMgaMetaRole *meta, [out, retval] IMgaFCO **newobj);
[ helpstring("method DeriveChildObject")] HRESULT DeriveChildObject([in] IMgaFCO *base,
- [in] IMgaMetaRole *role, [in] VARIANT_BOOL instance, [out, retval] IMgaFCO **newobj);
+ [in] IMgaMetaRole *Role, [in] VARIANT_BOOL instance, [out, retval] IMgaFCO **newobj);
[propget, helpstring("property ChildDerivedFrom")] HRESULT ChildDerivedFrom([in] IMgaFCO *baseobj, [out, retval] IMgaFCO **pVal);
@@ -1041,10 +1041,10 @@
HRESULT GetAspectPartsDisp([in] IMgaMetaAspect * asp, [in] unsigned int filter, [out, retval] IMgaParts **pVal);
[ helpstring("method CreateSimpleConn")]
- HRESULT CreateSimpleConn([in] IMgaMetaRole *meta, [in] IMgaFCO *src, [in] IMgaFCO *dst,
+ HRESULT CreateSimpleConn([in] IMgaMetaRole *meta, [in] IMgaFCO *Src, [in] IMgaFCO *Dst,
[in] IMgaFCOs *srcrefs, [in] IMgaFCOs *dstrefs, [out, retval] IMgaFCO **newobj);
[ helpstring("method CreateReference")]
- HRESULT CreateReference([in] IMgaMetaRole *meta, [in] IMgaFCO *target, [out, retval] IMgaFCO **newobj);
+ HRESULT CreateReference([in] IMgaMetaRole *meta, [in] IMgaFCO *Target, [out, retval] IMgaFCO **newobj);
[ helpstring("method AddInternalConnections")] HRESULT AddInternalConnections([in] IMgaFCOs *inobjs, [out, retval] IMgaFCOs **outobjs);
[id(0x551), helpstring("method MoveFCOs")]
@@ -1072,11 +1072,11 @@
// Dispatch compatible connection creation
[helpstring("method CreateSimpleConn through Dispatch")]
- HRESULT CreateSimpleConnDisp([in] IMgaMetaRole *meta, [in] IMgaFCO *src, [in] IMgaFCO *dst,
- [in] IMgaFCO *srcref, [in] IMgaFCO *dstref, [out, retval] IMgaFCO **newobj);
+ HRESULT CreateSimpleConnDisp([in] IMgaMetaRole *meta, [in] IMgaFCO *Src, [in] IMgaFCO *Dst,
+ [in] IMgaFCO *Srcref, [in] IMgaFCO *Dstref, [out, retval] IMgaFCO **newobj);
[helpstring("method CreateSimpleConn through Dispatch")]
- HRESULT CreateSimplerConnDisp([in] IMgaMetaRole *meta, [in] IMgaFCO *src, [in] IMgaFCO *dst, [out, retval] IMgaFCO **newobj);
+ HRESULT CreateSimplerConnDisp([in] IMgaMetaRole *meta, [in] IMgaFCO *Src, [in] IMgaFCO *Dst, [out, retval] IMgaFCO **newobj);
// Dispatch compatible copy/move
[helpstring("method MoveFCO through Dispatch")]
@@ -1229,12 +1229,7 @@
{
[helpstring("property AddConnPoint")]
HRESULT AddConnPoint([in] BSTR rolename, [in] long maxinrole,
- [in] IMgaFCO *target, [in] IMgaFCOs *refs, [out] IMgaConnPoint **pVal);
-/*
- [helpstring("property AddPortConnPoint")]
- HRESULT AddConnPoint([in] BSTR rolename, [in] long maxinrole,
- [in] IMgaRefPort *port, [out] IMgaConnPoint **pVal);
-*/
+ [in] IMgaFCO *Target, [in] IMgaFCOs *refs, [out] IMgaConnPoint **pVal);
[propget, helpstring("property ConnPoints")] HRESULT ConnPoints([out, retval] IMgaConnPoints **pVal);
[helpstring("method CompareToBase; if connpoint is null, all connpoints are compared")]
@@ -1256,8 +1251,8 @@
[propget, helpstring("property Dst")] HRESULT Dst([out, retval] IMgaFCO * *pVal);
[propget, helpstring("property SrcReferences")] HRESULT SrcReferences([out, retval] IMgaFCOs **pVal);
[propget, helpstring("property DstReferences")] HRESULT DstReferences([out, retval] IMgaFCOs **pVal);
- [helpstring("method SetDst")] HRESULT SetDst([in] IMgaFCOs *references, [in] IMgaFCO *target);
- [helpstring("method SetSrc")] HRESULT SetSrc([in] IMgaFCOs *references, [in] IMgaFCO *target);
+ [helpstring("method SetDst")] HRESULT SetDst([in] IMgaFCOs *references, [in] IMgaFCO *Target);
+ [helpstring("method SetSrc")] HRESULT SetSrc([in] IMgaFCOs *references, [in] IMgaFCO *Target);
/*
[propget, helpstring("property SrcPort")] HRESULT SrcPort([out, retval] IMgaRefPort **pVal);
[propget, helpstring("property DstPort")] HRESULT DstPort([out, retval] IMgaRefPort **pVal);
Modified: trunk/GME/Interfaces/MgaUtil.idl
==============================================================================
--- trunk/GME/Interfaces/MgaUtil.idl Wed Jun 15 13:16:27 2011 (r1364)
+++ trunk/GME/Interfaces/MgaUtil.idl Fri Jun 17 16:29:46 2011 (r1365)
@@ -46,54 +46,54 @@
[propget, helpstring("property FolderByStr")]
HRESULT FolderByStr([in] IMgaFolder *parent,
- [in] BSTR kind, [out, retval] IMgaMetaFolder **p);
+ [in] BSTR kindname, [out, retval] IMgaMetaFolder **p);
[helpstring("getter for property FolderByStr")]
HRESULT GetFolderByStrDisp([in] IMgaFolder *parent,
- [in] BSTR kind, [out, retval] IMgaMetaFolder **p);
+ [in] BSTR kindname, [out, retval] IMgaMetaFolder **p);
[propget, helpstring("property KindByStr")]
HRESULT KindByStr([in] IMgaFolder *parent,
- [in] BSTR kind, [in] objtype_enum objtype,
+ [in] BSTR kindname, [in] objtype_enum objtype,
[out, retval] IMgaMetaFCO **p);
[helpstring("getter for property KindByStr")]
HRESULT GetKindByStrDisp([in] IMgaFolder *parent,
- [in] BSTR kind, [in] objtype_enum objtype,
+ [in] BSTR kindname, [in] objtype_enum objtype,
[out, retval] IMgaMetaFCO **p);
[propget, helpstring("property RoleByStr")]
HRESULT RoleByStr([in] IMgaModel *parent,
- [in] BSTR kind, [in] objtype_enum objtype,
- [in] BSTR role, [in] BSTR aspect,
+ [in] BSTR kindname, [in] objtype_enum objtype,
+ [in] BSTR rolename, [in] BSTR aspect,
[out, retval] IMgaMetaRole **p);
[helpstring("getter for property RoleByStr")]
HRESULT GetRoleByStrDisp([in] IMgaModel *parent,
- [in] BSTR kind, [in] objtype_enum objtype,
- [in] BSTR role, [in] BSTR aspect,
+ [in] BSTR kindname, [in] objtype_enum objtype,
+ [in] BSTR rolename, [in] BSTR aspect,
[out, retval] IMgaMetaRole **p);
[propget, helpstring("property AttrByStr")]
HRESULT AttrByStr([in] IMgaFCO *parent,
- [in] BSTR kind, [out, retval] IMgaMetaAttribute **p);
+ [in] BSTR kindname, [out, retval] IMgaMetaAttribute **p);
[helpstring("getter for property AttrByStr")]
HRESULT GetAttrByStrDisp([in] IMgaFCO *parent,
- [in] BSTR kind, [out, retval] IMgaMetaAttribute **p);
+ [in] BSTR kindname, [out, retval] IMgaMetaAttribute **p);
// --- resolve by meta objects
[propget, helpstring("property RoleByMeta")]
HRESULT RoleByMeta([in] IMgaModel *parent,
- [in] IMgaMetaFCO *kind, [in] objtype_enum objtype,
- [in] IMgaMetaRole *role, [in] IMgaMetaAspect *aspect,
+ [in] IMgaMetaFCO *p_kind, [in] objtype_enum objtype,
+ [in] IMgaMetaRole *p_role, [in] IMgaMetaAspect *aspect,
[out, retval] IMgaMetaRole **p);
[helpstring("getter for property RoleByMeta")]
HRESULT GetRoleByMetaDisp([in] IMgaModel *parent,
- [in] IMgaMetaFCO *kind, [in] objtype_enum objtype,
- [in] IMgaMetaRole *role, [in] IMgaMetaAspect *aspect,
+ [in] IMgaMetaFCO *p_kind, [in] objtype_enum objtype,
+ [in] IMgaMetaRole *p_role, [in] IMgaMetaAspect *aspect,
[out, retval] IMgaMetaRole **p);
@@ -125,12 +125,12 @@
[propget, helpstring("property RolesByMetas")]
HRESULT RolesByMetas([in] IMgaModel *dst_parent,
- [in] IMgaFCOs *src, [in] IMgaMetaAspect * aspect,
+ [in] IMgaFCOs *Src, [in] IMgaMetaAspect * aspect,
[in] BSTR sz_aspect, [out, retval] IMgaMetaRoles ** p);
[helpstring("property RolesByMetas")]
HRESULT GetRolesByMetasDisp([in] IMgaModel *dst_parent,
- [in] IMgaFCOs *src, [in] IMgaMetaAspect * aspect,
+ [in] IMgaFCOs *Src, [in] IMgaMetaAspect * aspect,
[in] BSTR sz_aspect, [out, retval] IMgaMetaRoles ** p);
@@ -401,16 +401,16 @@
HRESULT GetParadigmsDisp([in] regaccessmode_enum mode, [out, retval] VARIANT *names);
[helpstring("method RegisterParadigmFromData")]
- HRESULT RegisterParadigmFromData([in] BSTR connstr, [out] BSTR *newname, [in] regaccessmode_enum mode);
+ HRESULT RegisterParadigmFromData([in] BSTR ConnStr, [out] BSTR *newname, [in] regaccessmode_enum mode);
[helpstring("method RegisterParadigmFromData - Dispatch compatible signature")]
- HRESULT RegisterParadigmFromDataDisp([in] BSTR connstr, [in] regaccessmode_enum mode, [out, retval] BSTR *newname);
+ HRESULT RegisterParadigmFromDataDisp([in] BSTR ConnStr, [in] regaccessmode_enum mode, [out, retval] BSTR *newname);
[helpstring("method RegisterParadigm")]
- HRESULT RegisterParadigm([in] BSTR name, [in] BSTR connstr, [in] BSTR ver, [in] VARIANT guid, [in] regaccessmode_enum mode);
+ HRESULT RegisterParadigm([in] BSTR name, [in] BSTR ConnStr, [in] BSTR ver, [in] VARIANT guid, [in] regaccessmode_enum mode);
[helpstring("method QueryParadigm")]
- HRESULT QueryParadigm([in] BSTR name, [out] BSTR *connstr, [in,out] VARIANT *guid, [in] regaccessmode_enum mode);
+ HRESULT QueryParadigm([in] BSTR name, [out] BSTR *ConnStr, [in,out] VARIANT *guid, [in] regaccessmode_enum mode);
[propget, helpstring("property QueryParadigmGUIDString")]
HRESULT ParadigmGUIDString([in] regaccessmode_enum mode, [in] BSTR name, [out, retval] BSTR *guidstr);
@@ -443,68 +443,68 @@
HRESULT GetComponentsDisp([in] regaccessmode_enum mode, [out, retval] VARIANT *progids);
[helpstring("method RegisterComponent")]
- HRESULT RegisterComponent([in] BSTR progid, [in] componenttype_enum type, [in] BSTR desc, [in] regaccessmode_enum mode);
+ HRESULT RegisterComponent([in] BSTR ProgID, [in] componenttype_enum type, [in] BSTR desc, [in] regaccessmode_enum mode);
[helpstring("method QueryComponent")]
- HRESULT QueryComponent([in] BSTR progid, [out] componenttype_enum *type, [out] BSTR *desc, [in] regaccessmode_enum mode);
+ HRESULT QueryComponent([in] BSTR ProgID, [out] componenttype_enum *type, [out] BSTR *desc, [in] regaccessmode_enum mode);
[helpstring("method UnregisterComponent")]
- HRESULT UnregisterComponent([in] BSTR progid, [in] regaccessmode_enum mode);
+ HRESULT UnregisterComponent([in] BSTR ProgID, [in] regaccessmode_enum mode);
[propput, helpstring("property ComponentExtraInfo")]
HRESULT ComponentExtraInfo([in] regaccessmode_enum mode,
- [in] BSTR progid, [in] BSTR name,
+ [in] BSTR ProgID, [in] BSTR name,
[in] BSTR newVal);
[propget, helpstring("property ComponentExtraInfo")]
HRESULT ComponentExtraInfo([in] regaccessmode_enum mode,
- [in] BSTR progid, [in] BSTR name,
+ [in] BSTR ProgID, [in] BSTR name,
[out, retval] BSTR *pVal);
[helpstring("setter for property ComponentExtraInfo")]
HRESULT SetComponentExtraInfoDisp([in] regaccessmode_enum mode,
- [in] BSTR progid, [in] BSTR name,
+ [in] BSTR ProgID, [in] BSTR name,
[in] BSTR newVal);
[helpstring("getter for property ComponentExtraInfo")]
HRESULT GetComponentExtraInfoDisp([in] regaccessmode_enum mode,
- [in] BSTR progid, [in] BSTR name,
+ [in] BSTR ProgID, [in] BSTR name,
[out, retval] BSTR *pVal);
[propget, helpstring("property LocalDllPath")]
- HRESULT LocalDllPath([in] BSTR progid, [out, retval] BSTR *pVal);
+ HRESULT LocalDllPath([in] BSTR ProgID, [out, retval] BSTR *pVal);
[helpstring("getter for property LocalDllPath")]
- HRESULT GetLocalDllPathDisp([in] BSTR progid, [out, retval] BSTR *pVal);
+ HRESULT GetLocalDllPathDisp([in] BSTR ProgID, [out, retval] BSTR *pVal);
// --- Associate
// progids() As String
[propget, helpstring("method AssociatedComponents")]
- HRESULT AssociatedComponents([in] BSTR paradigm,
+ HRESULT AssociatedComponents([in] BSTR Paradigm,
[in] componenttype_enum type, [in] regaccessmode_enum mode, [out, retval] VARIANT *progids);
[helpstring("getter for method AssociatedComponents")]
- HRESULT GetAssociatedComponentsDisp([in] BSTR paradigm,
+ HRESULT GetAssociatedComponentsDisp([in] BSTR Paradigm,
[in] componenttype_enum type, [in] regaccessmode_enum mode, [out, retval] VARIANT *progids);
// paradigms() As String
[propget, helpstring("method AssociatedParadigms")]
- HRESULT AssociatedParadigms([in] BSTR progid,
+ HRESULT AssociatedParadigms([in] BSTR ProgID,
[in] regaccessmode_enum mode, [out, retval] VARIANT *paradigms);
[helpstring("getter for property AssociatedParadigms")]
- HRESULT GetAssociatedParadigmsDisp([in] BSTR progid,
+ HRESULT GetAssociatedParadigmsDisp([in] BSTR ProgID,
[in] regaccessmode_enum mode, [out, retval] VARIANT *paradigms);
[helpstring("method Associate")]
- HRESULT Associate([in] BSTR progid, [in] BSTR paradigm, [in] regaccessmode_enum mode);
+ HRESULT Associate([in] BSTR ProgID, [in] BSTR Paradigm, [in] regaccessmode_enum mode);
[helpstring("method Disassociate")]
- HRESULT Disassociate([in] BSTR progid, [in] BSTR paradigm, [in] regaccessmode_enum mode);
+ HRESULT Disassociate([in] BSTR ProgID, [in] BSTR Paradigm, [in] regaccessmode_enum mode);
[helpstring("method IsAssociated")]
- HRESULT IsAssociated([in] BSTR progid, [in] BSTR paradigm,
+ HRESULT IsAssociated([in] BSTR ProgID, [in] BSTR Paradigm,
[out] VARIANT_BOOL *is_ass, [out] VARIANT_BOOL *can_ass, [in] regaccessmode_enum mode);
// --- Actions
@@ -590,12 +590,8 @@
// --- Other stuff
-// [helpstring("method RunInterpreter")]
-// HRESULT RunInterpreter([in] IMgaProject *project,
-// [in] IMgaFCOs *selectedobjs, [in] long param);
-
[helpstring("method RunComponent")]
- HRESULT RunComponent([in] BSTR progid, [in] IMgaProject *project,
+ HRESULT RunComponent([in] BSTR ProgID, [in] IMgaProject *p,
[in] IMgaFCO *focusobj, [in] IMgaFCOs *selectedobjs, [in] long param);
};
@@ -651,12 +647,12 @@
{
[helpstring("method GetLastClosureId - returns the last closure id stored in the rootfolder's registry")]
HRESULT GetLastClosureId
- ( [in] IMgaProject* p_project
+ ( [in] IMgaProject* p
, [out, retval] long* p_pMarkWith);
[helpstring("method PutLastClosureId - saves the new last id")]
HRESULT PutLastClosureId
- ( [in] IMgaProject* p_project
+ ( [in] IMgaProject* p
, [in] long p_iMarkWith);
[helpstring("method SelectiveClosure")]
Modified: trunk/GME/Interfaces/Parser.idl
==============================================================================
--- trunk/GME/Interfaces/Parser.idl Wed Jun 15 13:16:27 2011 (r1364)
+++ trunk/GME/Interfaces/Parser.idl Fri Jun 17 16:29:46 2011 (r1365)
@@ -63,7 +63,7 @@
interface IMgaParser : IDispatch
{
[helpstring("method GetXMLInfo")]
- HRESULT GetXMLInfo([in] BSTR xmlfile, [out] BSTR *paradigm, [out] BSTR *parversion, [out] VARIANT *parguid, [out] BSTR *basename, [out] BSTR *ver);
+ HRESULT GetXMLInfo([in] BSTR xmlfile, [out] BSTR *Paradigm, [out] BSTR *parversion, [out] VARIANT *parguid, [out] BSTR *basename, [out] BSTR *ver);
[helpstring("method ParseProject")]
HRESULT ParseProject([in] IMgaProject *p, [in] BSTR xmlfile);
@@ -72,7 +72,7 @@
HRESULT ParseFCOs([in] IMgaObject *here, [in] BSTR xmlfile);
[helpstring("method GetClipXMLInfo")]
- HRESULT GetClipXMLInfo([in] BSTR xmlfile, [in] IMgaObject *target, [out] VARIANT_BOOL *parguid, [out] BSTR *acckind, [out] BSTR *ver);
+ HRESULT GetClipXMLInfo([in] BSTR xmlfile, [in] IMgaObject *Target, [out] VARIANT_BOOL *parguid, [out] BSTR *acckind, [out] BSTR *ver);
[helpstring("method ParseCLOSURE version 1 - basic")]
HRESULT ParseClos1([in] IMgaObject *here, [in] BSTR xmlfile);
More information about the gme-commit
mailing list