[ctypes-commit] ctypes/comtypes persist.py,1.1.2.2,1.1.2.3
Brought to you by:
theller
Menu
▾
▴
[ctypes-commit] ctypes/comtypes persist.py,1.1.2.2,1.1.2.3
|
From: Thomas H. <th...@us...> - 2005-10-20 17:13:55
|
Update of /cvsroot/ctypes/ctypes/comtypes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30417 Modified Files: Tag: branch_1_0 persist.py Log Message: Remove dispid() from non-dispatch based interfaces. Correct the Read method. Hack around the POINTER(c_wchar) <-> c_wchar_p problem. Index: persist.py =================================================================== RCS file: /cvsroot/ctypes/ctypes/comtypes/Attic/persist.py,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** persist.py 19 Aug 2005 18:51:26 -0000 1.1.2.2 --- persist.py 20 Oct 2005 17:13:42 -0000 1.1.2.3 *************** *** 3,12 **** from comtypes.automation import VARIANT, tagEXCEPINFO class IErrorLog(IUnknown): _iid_ = GUID('{3127CA40-446E-11CE-8135-00AA004BB851}') _idlflags_ = [] _methods_ = [ ! COMMETHOD([dispid(1610678272)], HRESULT, 'AddError', ! ( ['in'], POINTER(c_wchar), 'pszPropName' ), ( ['in'], POINTER(tagEXCEPINFO), 'pExcepInfo' )), ] --- 3,15 ---- from comtypes.automation import VARIANT, tagEXCEPINFO + # XXX Replace by canonical solution!!! + POINTER_c_wchar = c_wchar_p + class IErrorLog(IUnknown): _iid_ = GUID('{3127CA40-446E-11CE-8135-00AA004BB851}') _idlflags_ = [] _methods_ = [ ! COMMETHOD([], HRESULT, 'AddError', ! ( ['in'], POINTER_c_wchar, 'pszPropName' ), ( ['in'], POINTER(tagEXCEPINFO), 'pExcepInfo' )), ] *************** *** 16,20 **** _idlflags_ = [] _methods_ = [ ! COMMETHOD([dispid(1610678272)], HRESULT, 'GetClassID', ( ['out'], POINTER(GUID), 'pClassID' )), ] --- 19,23 ---- _idlflags_ = [] _methods_ = [ ! COMMETHOD([], HRESULT, 'GetClassID', ( ['out'], POINTER(GUID), 'pClassID' )), ] *************** *** 24,35 **** _idlflags_ = [] _methods_ = [ ! COMMETHOD([dispid(1610678272)], HRESULT, 'Read', ! ( ['in'], POINTER(c_wchar), 'pszPropName' ), ( ['out'], POINTER(VARIANT), 'pVar' ), ! ( ['in'], POINTER(IErrorLog), 'pErrorLog' ), ! ( ['in'], c_ulong, 'varType' ), ! ( ['in'], POINTER(IUnknown), 'pUnkObj' )), ! COMMETHOD([dispid(1610678273)], HRESULT, 'Write', ! ( ['in'], POINTER(c_wchar), 'pszPropName' ), ( ['in'], POINTER(VARIANT), 'pVar' )), ] --- 27,36 ---- _idlflags_ = [] _methods_ = [ ! COMMETHOD([], HRESULT, 'Read', ! ( ['in'], POINTER_c_wchar, 'pszPropName' ), ( ['out'], POINTER(VARIANT), 'pVar' ), ! ( ['in'], POINTER(IErrorLog), 'pErrorLog' )), ! COMMETHOD([], HRESULT, 'Write', ! ( ['in'], POINTER_c_wchar, 'pszPropName' ), ( ['in'], POINTER(VARIANT), 'pVar' )), ] *************** *** 39,47 **** _idlflags_ = [] _methods_ = [ ! COMMETHOD([dispid(1610743808)], HRESULT, 'InitNew'), ! COMMETHOD([dispid(1610743809)], HRESULT, 'Load', ( ['in'], POINTER(IPropertyBag), 'pPropBag' ), ( ['in'], POINTER(IErrorLog), 'pErrorLog' )), ! COMMETHOD([dispid(1610743810)], HRESULT, 'Save', ( ['in'], POINTER(IPropertyBag), 'pPropBag' ), ( ['in'], c_int, 'fClearDirty' ), --- 40,48 ---- _idlflags_ = [] _methods_ = [ ! COMMETHOD([], HRESULT, 'InitNew'), ! COMMETHOD([], HRESULT, 'Load', ( ['in'], POINTER(IPropertyBag), 'pPropBag' ), ( ['in'], POINTER(IErrorLog), 'pErrorLog' )), ! COMMETHOD([], HRESULT, 'Save', ( ['in'], POINTER(IPropertyBag), 'pPropBag' ), ( ['in'], c_int, 'fClearDirty' ), *************** *** 66,70 **** ('cfType', CLIPFORMAT), ('dwHint', c_ulong), ! ('pstrName', POINTER(c_wchar)), ('clsid', GUID), ] --- 67,71 ---- ('cfType', CLIPFORMAT), ('dwHint', c_ulong), ! ('pstrName', POINTER_c_wchar), ('clsid', GUID), ] *************** *** 76,80 **** _idlflags_ = [] _methods_ = [ ! COMMETHOD([dispid(1610678272)], HRESULT, 'Read', ( ['in'], c_ulong, 'cProperties' ), ( ['in'], POINTER(tagPROPBAG2), 'pPropBag' ), --- 77,81 ---- _idlflags_ = [] _methods_ = [ ! COMMETHOD([], HRESULT, 'Read', ( ['in'], c_ulong, 'cProperties' ), ( ['in'], POINTER(tagPROPBAG2), 'pPropBag' ), *************** *** 82,98 **** ( ['out'], POINTER(VARIANT), 'pvarValue' ), ( ['out'], POINTER(HRESULT), 'phrError' )), ! COMMETHOD([dispid(1610678273)], HRESULT, 'Write', ( ['in'], c_ulong, 'cProperties' ), ( ['in'], POINTER(tagPROPBAG2), 'pPropBag' ), ( ['in'], POINTER(VARIANT), 'pvarValue' )), ! COMMETHOD([dispid(1610678274)], HRESULT, 'CountProperties', ( ['out'], POINTER(c_ulong), 'pcProperties' )), ! COMMETHOD([dispid(1610678275)], HRESULT, 'GetPropertyInfo', ( ['in'], c_ulong, 'iProperty' ), ( ['in'], c_ulong, 'cProperties' ), ( ['out'], POINTER(tagPROPBAG2), 'pPropBag' ), ( ['out'], POINTER(c_ulong), 'pcProperties' )), ! COMMETHOD([dispid(1610678276)], HRESULT, 'LoadObject', ! ( ['in'], POINTER(c_wchar), 'pstrName' ), ( ['in'], c_ulong, 'dwHint' ), ( ['in'], POINTER(IUnknown), 'punkObject' ), --- 83,99 ---- ( ['out'], POINTER(VARIANT), 'pvarValue' ), ( ['out'], POINTER(HRESULT), 'phrError' )), ! COMMETHOD([], HRESULT, 'Write', ( ['in'], c_ulong, 'cProperties' ), ( ['in'], POINTER(tagPROPBAG2), 'pPropBag' ), ( ['in'], POINTER(VARIANT), 'pvarValue' )), ! COMMETHOD([], HRESULT, 'CountProperties', ( ['out'], POINTER(c_ulong), 'pcProperties' )), ! COMMETHOD([], HRESULT, 'GetPropertyInfo', ( ['in'], c_ulong, 'iProperty' ), ( ['in'], c_ulong, 'cProperties' ), ( ['out'], POINTER(tagPROPBAG2), 'pPropBag' ), ( ['out'], POINTER(c_ulong), 'pcProperties' )), ! COMMETHOD([], HRESULT, 'LoadObject', ! ( ['in'], POINTER_c_wchar, 'pstrName' ), ( ['in'], c_ulong, 'dwHint' ), ( ['in'], POINTER(IUnknown), 'punkObject' ), *************** *** 104,116 **** _idlflags_ = [] _methods_ = [ ! COMMETHOD([dispid(1610743808)], HRESULT, 'InitNew'), ! COMMETHOD([dispid(1610743809)], HRESULT, 'Load', ( ['in'], POINTER(IPropertyBag2), 'pPropBag' ), ( ['in'], POINTER(IErrorLog), 'pErrLog' )), ! COMMETHOD([dispid(1610743810)], HRESULT, 'Save', ( ['in'], POINTER(IPropertyBag2), 'pPropBag' ), ( ['in'], c_int, 'fClearDirty' ), ( ['in'], c_int, 'fSaveAllProperties' )), ! COMMETHOD([dispid(1610743811)], HRESULT, 'IsDirty'), ] --- 105,117 ---- _idlflags_ = [] _methods_ = [ ! COMMETHOD([], HRESULT, 'InitNew'), ! COMMETHOD([], HRESULT, 'Load', ( ['in'], POINTER(IPropertyBag2), 'pPropBag' ), ( ['in'], POINTER(IErrorLog), 'pErrLog' )), ! COMMETHOD([], HRESULT, 'Save', ( ['in'], POINTER(IPropertyBag2), 'pPropBag' ), ( ['in'], c_int, 'fClearDirty' ), ( ['in'], c_int, 'fSaveAllProperties' )), ! COMMETHOD([], HRESULT, 'IsDirty'), ] |