Module: wine Branch: master Commit: 9a11e524801a1540dd3c36848e7f0e4b6778746f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a11e524801a1540dd3c36848e...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Wed Apr 29 00:58:00 2015 +0300
include: Fixed method arguments attributes for oleacc.idl.
---
include/oleacc.idl | 108 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 74 insertions(+), 34 deletions(-)
diff --git a/include/oleacc.idl b/include/oleacc.idl index 97b7858..dc7af15 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -228,7 +228,9 @@ interface IAccessibleHandler : IUnknown ] interface IAccIdentity : IUnknown { - HRESULT GetIdentityString ([in] DWORD dwIDChild, [out] BYTE **ppIDString, [out] DWORD *pdwIDStringLen); + HRESULT GetIdentityString([in] DWORD idchild, + [out, size_is(*string_len)] BYTE **str, + [out] DWORD *string_len); }
[ @@ -238,8 +240,11 @@ interface IAccIdentity : IUnknown ] interface IAccPropServer: IUnknown { - HRESULT GetPropValue ([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, [in] MSAAPROPID idProp, - [out] VARIANT *pvarValue, [out] BOOL *pfHasProp); + HRESULT GetPropValue([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [in] MSAAPROPID idProp, + [out] VARIANT *value, + [out] BOOL *has_prop); }
[ @@ -249,45 +254,80 @@ interface IAccPropServer: IUnknown ] interface IAccPropServices : IUnknown { - HRESULT SetPropValue([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, [in] MSAAPROPID idProp, [in] VARIANT var); - - HRESULT SetPropServer([in] const BYTE * pIDString, [in] DWORD dwIDStringLen, [in] const MSAAPROPID* paProps, - [in] int cProps, [in] IAccPropServer* pServer, [in] AnnoScope AnnoScope); - - HRESULT ClearProps([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, [in] const MSAAPROPID* paProps, [in] int cProps); + HRESULT SetPropValue([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [in] MSAAPROPID idProp, + [in] VARIANT var); + + HRESULT SetPropServer([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps, + [in] IAccPropServer* pServer, + [in] AnnoScope AnnoScope); + + HRESULT ClearProps([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps);
HRESULT SetHwndProp([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, [in] MSAAPROPID idProp, [in] VARIANT var);
HRESULT SetHwndPropStr([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, - [in] MSAAPROPID idProp, [in] LPWSTR str); - - HRESULT SetHwndPropServer([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, - [in] const MSAAPROPID* paProps, [in] int cProps, [in] IAccPropServer* pServer, [in] AnnoScope AnnoScope); - - HRESULT ClearHwndProps([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, - [in] const MSAAPROPID* paProps, [in] int cProps); - - HRESULT ComposeHwndIdentityString([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, - [out] BYTE **ppIDString, [out] DWORD* pdwIDStringLen); - - HRESULT DecomposeHwndIdentityString([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, - [out] HWND* phwnd, [out] DWORD* pidObject, [out] DWORD* pidChild); + [in] MSAAPROPID idProp, [in, string] LPWSTR str); + + HRESULT SetHwndPropServer([in] HWND hwnd, + [in] DWORD idObject, + [in] DWORD idChild, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps, + [in] IAccPropServer *server, + [in] AnnoScope scope); + + HRESULT ClearHwndProps([in] HWND hwnd, + [in] DWORD idObject, + [in] DWORD idChild, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps); + + HRESULT ComposeHwndIdentityString([in] HWND hwnd, + [in] DWORD idObject, + [in] DWORD idChild, + [out, size_is(*string_len)] BYTE **str, + [out] DWORD *string_len); + + HRESULT DecomposeHwndIdentityString([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [out] HWND *phwnd, + [out] DWORD *pidObject, + [out] DWORD *pidChild);
HRESULT SetHmenuProp([in] HMENU hmenu, [in] DWORD idChild, [in] MSAAPROPID idProp, [in] VARIANT var);
- HRESULT SetHmenuPropStr([in] HMENU hmenu, [in] DWORD idChild, [in] MSAAPROPID idProp, [in] LPWSTR str); - - HRESULT SetHmenuPropServer([in] HMENU hmenu, [in] DWORD idChild, [in] const MSAAPROPID* paProps, - [in] int cProps, [in] IAccPropServer* pServer, [in] AnnoScope AnnoScope); - - HRESULT ClearHmenuProps([in] HMENU hmenu, [in] DWORD idChild, [in] const MSAAPROPID* paProps, [in] int cProps); - - HRESULT ComposeHmenuIdentityString([in] HMENU hmenu, [in] DWORD idChild, - [out] BYTE **ppIDString, [out] DWORD *pdwIDStringLen); - - HRESULT DecomposeHmenuIdentityString([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, - [out] HMENU *phmenu, [out] DWORD *pidChild); + HRESULT SetHmenuPropStr([in] HMENU hmenu, [in] DWORD idChild, [in] MSAAPROPID idProp, [in, string] LPWSTR str); + + HRESULT SetHmenuPropServer([in] HMENU hmenu, + [in] DWORD idChild, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps, + [in] IAccPropServer *server, + [in] AnnoScope scope); + + HRESULT ClearHmenuProps([in] HMENU hmenu, + [in] DWORD idChild, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps); + + HRESULT ComposeHmenuIdentityString([in] HMENU hmenu, + [in] DWORD idChild, + [out, size_is(*string_len)] BYTE **str, + [out] DWORD *string_len); + + HRESULT DecomposeHmenuIdentityString([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [out] HMENU *phmenu, + [out] DWORD *pidChild); }
[
-
Alexandre Julliard