From c477d606a4cbff0e016d0617dc221fa565ef523a Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 5 Oct 2004 02:16:11 +0000 Subject: [PATCH] Use propget/propput attributes where appropriate. --- include/amvideo.idl | 12 ++++---- include/exdisp.idl | 67 +++++++++++++++++++++++---------------------- include/ocidl.idl | 52 +++++++++++++++++------------------ 3 files changed, 66 insertions(+), 65 deletions(-) diff --git a/include/amvideo.idl b/include/amvideo.idl index cd4469e1768..23973f7b31d 100644 --- a/include/amvideo.idl +++ b/include/amvideo.idl @@ -89,12 +89,12 @@ interface IDirectDrawVideo : IUnknown ] interface IQualProp : IUnknown { - HRESULT get_FramesDroppedInRenderer([out] int * pcFrames); - HRESULT get_FramesDrawn([out] int * pcFramesDrawn); - HRESULT get_AvgFrameRate([out] int * piAvgFrameRate); - HRESULT get_Jitter([out] int * iJitter); - HRESULT get_AvgSyncOffset([out] int * piAvg); - HRESULT get_DevSyncOffset([out] int * piDev); + [propget] HRESULT FramesDroppedInRenderer([out] int * pcFrames); + [propget] HRESULT FramesDrawn([out] int * pcFramesDrawn); + [propget] HRESULT AvgFrameRate([out] int * piAvgFrameRate); + [propget] HRESULT Jitter([out] int * iJitter); + [propget] HRESULT AvgSyncOffset([out] int * piAvg); + [propget] HRESULT DevSyncOffset([out] int * piDev); } [ diff --git a/include/exdisp.idl b/include/exdisp.idl index 1ad76305368..6bee4f0a50a 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -65,23 +65,23 @@ interface IWebBrowser : IDispatch HRESULT Refresh(); HRESULT Refresh2( [in] VARIANT *Level ); HRESULT Stop(); - HRESULT get_Application([out] IDispatch** ppDisp); - HRESULT get_Parent([out] IDispatch** ppDisp); - HRESULT get_Container([out] IDispatch** ppDisp); - HRESULT get_Document([out] IDispatch** ppDisp); - HRESULT get_TopLevelContainer([out] VARIANT_BOOL* pBool); - HRESULT get_Type([out] BSTR* Type); - HRESULT get_Left([out] long *pl); - HRESULT put_Left([in] long Left); - HRESULT get_Top([out] long *pl); - HRESULT put_Top([in] long Top); - HRESULT get_Width([out] long *pl); - HRESULT put_Width([in] long Width); - HRESULT get_Height([out] long *pl); - HRESULT put_Height([in] long Height); - HRESULT get_LocationName([out] BSTR *LocationName); - HRESULT get_LocationURL([out] BSTR * LocationURL); - HRESULT get_Busy([out] VARIANT_BOOL *pBool); + [propget] HRESULT Application([out] IDispatch** ppDisp); + [propget] HRESULT Parent([out] IDispatch** ppDisp); + [propget] HRESULT Container([out] IDispatch** ppDisp); + [propget] HRESULT Document([out] IDispatch** ppDisp); + [propget] HRESULT TopLevelContainer([out] VARIANT_BOOL* pBool); + [propget] HRESULT Type([out] BSTR* Type); + [propget] HRESULT Left([out] long *pl); + [propput] HRESULT Left([in] long Left); + [propget] HRESULT Top([out] long *pl); + [propput] HRESULT Top([in] long Top); + [propget] HRESULT Width([out] long *pl); + [propput] HRESULT Width([in] long Width); + [propget] HRESULT Height([out] long *pl); + [propput] HRESULT Height([in] long Height); + [propget] HRESULT LocationName([out] BSTR *LocationName); + [propget] HRESULT LocationURL([out] BSTR * LocationURL); + [propget] HRESULT Busy([out] VARIANT_BOOL *pBool); } @@ -99,22 +99,23 @@ interface IWebBrowserApp : IWebBrowser HRESULT ClientToWindow([in,out] int* pcx, [in,out] int* pcy); HRESULT PutProperty([in] BSTR szProperty, [in] VARIANT vtValue); HRESULT GetProperty([in] BSTR szProperty, [out] VARIANT *pvtValue); - HRESULT get_Name([out] BSTR* Name); + [propget] HRESULT Name([out] BSTR* Name); + /* FIXME: get_HWND should be propget too but widl gets confused by the HWND */ HRESULT get_HWND([out] long *pHWND); - HRESULT get_FullName([out] BSTR* FullName); - HRESULT get_Path([out] BSTR* Path); - HRESULT get_Visible([out] VARIANT_BOOL* pBool); - HRESULT put_Visible([in] VARIANT_BOOL Value); - HRESULT get_StatusBar([out] VARIANT_BOOL* pBool); - HRESULT put_StatusBar([in] VARIANT_BOOL Value); - HRESULT get_StatusText([out] BSTR *StatusText); - HRESULT put_StatusText([in] BSTR StatusText); - HRESULT get_ToolBar([out] int * Value); - HRESULT put_ToolBar([in] int Value); - HRESULT get_MenuBar([out] VARIANT_BOOL * Value); - HRESULT put_MenuBar([in] VARIANT_BOOL Value); - HRESULT get_FullScreen([out] VARIANT_BOOL * pbFullScreen); - HRESULT put_FullScreen([in] VARIANT_BOOL bFullScreen); + [propget] HRESULT FullName([out] BSTR* FullName); + [propget] HRESULT Path([out] BSTR* Path); + [propget] HRESULT Visible([out] VARIANT_BOOL* pBool); + [propput] HRESULT Visible([in] VARIANT_BOOL Value); + [propget] HRESULT StatusBar([out] VARIANT_BOOL* pBool); + [propput] HRESULT StatusBar([in] VARIANT_BOOL Value); + [propget] HRESULT StatusText([out] BSTR *StatusText); + [propput] HRESULT StatusText([in] BSTR StatusText); + [propget] HRESULT ToolBar([out] int * Value); + [propput] HRESULT ToolBar([in] int Value); + [propget] HRESULT MenuBar([out] VARIANT_BOOL * Value); + [propput] HRESULT MenuBar([in] VARIANT_BOOL Value); + [propget] HRESULT FullScreen([out] VARIANT_BOOL * pbFullScreen); + [propput] HRESULT FullScreen([in] VARIANT_BOOL bFullScreen); } [ @@ -124,7 +125,7 @@ interface IWebBrowserApp : IWebBrowser ] interface IShellWindows : IDispatch { - HRESULT get_Count( [out] long *Count ); + [propget] HRESULT Count( [out] long *Count ); HRESULT Item( [in] VARIANT index, [out] IDispatch **Folder ); HRESULT _NewEnum( [out] IUnknown **ppunk ); HRESULT Register( [in] IDispatch *pid, [in] long hWnd, [in] int swClass, diff --git a/include/ocidl.idl b/include/ocidl.idl index 1d9e410d739..fbdb00d75ad 100644 --- a/include/ocidl.idl +++ b/include/ocidl.idl @@ -68,23 +68,23 @@ interface IFont : IUnknown typedef IFont *LPFONT; typedef TEXTMETRICW TEXTMETRICOLE, *LPTEXTMETRICOLE; - HRESULT get_Name( [out] BSTR *pname); - HRESULT put_Name( [in] BSTR name ); - HRESULT get_Size( [out] CY *psize ); - HRESULT put_Size( [in] CY size ); - HRESULT get_Bold( [out] BOOL *pbold ); - HRESULT put_Bold( [in] BOOL bold ); - HRESULT get_Italic( [out] BOOL *pitalic ); - HRESULT put_Italic( [in] BOOL italic ); - HRESULT get_Underline( [out] BOOL *punderline ); - HRESULT put_Underline( [in] BOOL underline ); - HRESULT get_Strikethrough( [out] BOOL *pstrikethrough ); - HRESULT put_Strikethrough( [in] BOOL strikethrough ); - HRESULT get_Weight( [out] SHORT *pweight ); - HRESULT put_Weight( [in] SHORT weight ); - HRESULT get_Charset( [out] SHORT *pcharset ); - HRESULT put_Charset( [in] SHORT charset ); - HRESULT get_hFont( [out] HFONT *phfont ); + [propget] HRESULT Name( [out] BSTR *pname); + [propput] HRESULT Name( [in] BSTR name ); + [propget] HRESULT Size( [out] CY *psize ); + [propput] HRESULT Size( [in] CY size ); + [propget] HRESULT Bold( [out] BOOL *pbold ); + [propput] HRESULT Bold( [in] BOOL bold ); + [propget] HRESULT Italic( [out] BOOL *pitalic ); + [propput] HRESULT Italic( [in] BOOL italic ); + [propget] HRESULT Underline( [out] BOOL *punderline ); + [propput] HRESULT Underline( [in] BOOL underline ); + [propget] HRESULT Strikethrough( [out] BOOL *pstrikethrough ); + [propput] HRESULT Strikethrough( [in] BOOL strikethrough ); + [propget] HRESULT Weight( [out] SHORT *pweight ); + [propput] HRESULT Weight( [in] SHORT weight ); + [propget] HRESULT Charset( [out] SHORT *pcharset ); + [propput] HRESULT Charset( [in] SHORT charset ); + [propget] HRESULT hFont( [out] HFONT *phfont ); HRESULT Clone( [out] IFont **ppfont ); HRESULT IsEqual( [in] IFont *pFontOther ); HRESULT SetRatio( [in] LONG cyLogical, [in] LONG cyHimetric ); @@ -133,11 +133,11 @@ interface IPicture : IUnknown typedef LONG OLE_XSIZE_HIMETRIC; typedef LONG OLE_YSIZE_HIMETRIC; - HRESULT get_Handle( [out] OLE_HANDLE *pHandle ); - HRESULT get_hPal( [out] OLE_HANDLE *phPal ); - HRESULT get_Type( [out] SHORT *pType ); - HRESULT get_Width( [out] OLE_XSIZE_HIMETRIC *pWidth ); - HRESULT get_Height( [out] OLE_YSIZE_HIMETRIC *pHeight ); + [propget] HRESULT Handle( [out] OLE_HANDLE *pHandle ); + [propget] HRESULT hPal( [out] OLE_HANDLE *phPal ); + [propget] HRESULT Type( [out] SHORT *pType ); + [propget] HRESULT Width( [out] OLE_XSIZE_HIMETRIC *pWidth ); + [propget] HRESULT Height( [out] OLE_YSIZE_HIMETRIC *pHeight ); HRESULT Render( [in] HDC hdc, @@ -153,16 +153,16 @@ interface IPicture : IUnknown HRESULT set_hPal( [in] OLE_HANDLE hPal ); - HRESULT get_CurDC( [out] HDC *phDC ); + [propget] HRESULT CurDC( [out] HDC *phDC ); HRESULT SelectPicture( [in] HDC hDCIn, [out] HDC * phDCOut, [out] OLE_HANDLE * phBmpOut); - HRESULT get_KeepOriginalFormat( [out] BOOL *pKeep ); + [propget] HRESULT KeepOriginalFormat( [out] BOOL *pKeep ); - HRESULT put_KeepOriginalFormat( [in] BOOL keep ); + [propput] HRESULT KeepOriginalFormat( [in] BOOL keep ); HRESULT PictureChanged(); @@ -171,7 +171,7 @@ interface IPicture : IUnknown [in] BOOL fSaveMemCopy, [out] LONG *pCbSize); - HRESULT get_Attributes( [out] DWORD *pDwAttr ); + [propget] HRESULT Attributes( [out] DWORD *pDwAttr ); }