May 2014 - Wine-commits - list.winehq.org

Piotr Caban : oleacc: Add default client accessible object stub.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: da8005c75ecabac85731dd2dd47e80dcf99ed189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8005c75ecabac85731dd2dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:13:54 2014 +0200 oleacc: Add default client accessible object stub. --- dlls/oleacc/Makefile.in | 3 +- dlls/oleacc/client.c | 319 ++++++++++++++++++++++++++++++++++++++++++ dlls/oleacc/main.c | 53 ++++++- dlls/oleacc/oleacc_private.h | 33 +++++ 4 files changed, 403 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da8005c75ecabac85731d…

1 0

Piotr Caban : oleacc: Add Client_get_accChildCount implementation.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 99d0590b012f7890f0d314a6ebf479dc0c2ed016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d0590b012f7890f0d314a6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:17 2014 +0200 oleacc: Add Client_get_accChildCount implementation. --- dlls/oleacc/client.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index e7ff812..5e5ee6f 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -120,8 +120,15 @@ static HRESULT WINAPI Client_get_accParent(IAccessible *iface, IDispatch **ppdis static HRESULT WINAPI Client_get_accChildCount(IAccessible *iface, LONG *pcountChildren) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%p)\n", This, pcountChildren); - return E_NOTIMPL; + HWND cur; + + TRACE("(%p)->(%p)\n", This, pcountChildren); + + *pcountChildren = 0; + for(cur = GetWindow(This->hwnd, GW_CHILD); cur; cur = GetWindow(cur, GW_HWNDNEXT)) + (*pcountChildren)++; + + return S_OK; } static HRESULT WINAPI Client_get_accChild(IAccessible *iface,

1 0

Piotr Caban : oleacc: Add Client_get_accName implementation.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: a5f78530ddf45b7773a11af92117993abfb9c8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f78530ddf45b7773a11af92… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:24 2014 +0200 oleacc: Add Client_get_accName implementation. --- dlls/oleacc/Makefile.in | 2 +- dlls/oleacc/client.c | 25 +++++++++++++++++++++++-- dlls/oleacc/main.c | 11 +++++++++++ dlls/oleacc/oleacc_private.h | 1 + 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index d33f867..778791e 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -1,6 +1,6 @@ MODULE = oleacc.dll IMPORTLIB = oleacc -IMPORTS = ole32 user32 uuid +IMPORTS = uuid oleaut32 ole32 user32 C_SRCS = \ client.c \ diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 5e5ee6f..30673d3 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -142,8 +142,29 @@ static HRESULT WINAPI Client_get_accChild(IAccessible *iface, static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR *pszName) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszName); - return E_NOTIMPL; + WCHAR name[1024]; + UINT i, len; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszName); + + *pszName = NULL; + if(convert_child_id(&varID) != CHILDID_SELF || !IsWindow(This->hwnd)) + return E_INVALIDARG; + + len = SendMessageW(This->hwnd, WM_GETTEXT, sizeof(name)/sizeof(WCHAR), (LPARAM)name); + if(!len) + return S_FALSE; + + for(i=0; i<len; i++) { + if(name[i] == '&') { + len--; + memmove(name+i, name+i+1, (len-i)*sizeof(WCHAR)); + break; + } + } + + *pszName = SysAllocStringLen(name, len); + return *pszName ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI Client_get_accValue(IAccessible *iface, VARIANT varID, BSTR *pszValue) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 63dfe99..2777a38 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -70,6 +70,17 @@ const char *debugstr_variant(const VARIANT *v) } } +int convert_child_id(VARIANT *v) +{ + switch(V_VT(v)) { + case VT_I4: + return V_I4(v); + default: + FIXME("unhandled child ID variant type: %d\n", V_VT(v)); + return -1; + } +} + HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, REFIID riidInterface, void** ppvObject ) { diff --git a/dlls/oleacc/oleacc_private.h b/dlls/oleacc/oleacc_private.h index dbb0f8c..ebbab4c 100644 --- a/dlls/oleacc/oleacc_private.h +++ b/dlls/oleacc/oleacc_private.h @@ -21,6 +21,7 @@ HRESULT create_client_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; +int convert_child_id(VARIANT *v) DECLSPEC_HIDDEN; static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) {

1 0

Piotr Caban : oleacc: Add Client_get_accValue implementation.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 5224f093713e2231dcb77a8050bea8bc9aec2485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5224f093713e2231dcb77a805… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:31 2014 +0200 oleacc: Add Client_get_accValue implementation. --- dlls/oleacc/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 30673d3..e16d3f8 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -170,8 +170,13 @@ static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR static HRESULT WINAPI Client_get_accValue(IAccessible *iface, VARIANT varID, BSTR *pszValue) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszValue); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszValue); + + *pszValue = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static HRESULT WINAPI Client_get_accDescription(IAccessible *iface,

1 0

Piotr Caban : oleacc: Add Client_get_accDescription implementation.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 1eb9d7e703930ae99ec920a5ce58eb774563eed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb9d7e703930ae99ec920a5c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:37 2014 +0200 oleacc: Add Client_get_accDescription implementation. --- dlls/oleacc/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index e16d3f8..48c8d1c 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -183,8 +183,13 @@ static HRESULT WINAPI Client_get_accDescription(IAccessible *iface, VARIANT varID, BSTR *pszDescription) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszDescription); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszDescription); + + *pszDescription = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARIANT *pvarRole)

1 0

Piotr Caban : oleacc: Add Client_get_accRole implementation.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 2c8bb773b6e750f5696b48cfee44a2aaee977090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8bb773b6e750f5696b48cfe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:42 2014 +0200 oleacc: Add Client_get_accRole implementation. --- dlls/oleacc/client.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 48c8d1c..7af5c38 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -195,8 +195,17 @@ static HRESULT WINAPI Client_get_accDescription(IAccessible *iface, static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARIANT *pvarRole) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarRole); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarRole); + + if(convert_child_id(&varID) != CHILDID_SELF) { + V_VT(pvarRole) = VT_EMPTY; + return E_INVALIDARG; + } + + V_VT(pvarRole) = VT_I4; + V_I4(pvarRole) = ROLE_SYSTEM_CLIENT; + return S_OK; } static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VARIANT *pvarState)

1 0

Piotr Caban : oleacc: Add Client_get_accHelp implementation.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 4ecee6f7d824e4d734b5b93f3448ccb1ffe05cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ecee6f7d824e4d734b5b93f3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:48 2014 +0200 oleacc: Add Client_get_accHelp implementation. --- dlls/oleacc/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 7af5c38..104ebdb 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -218,8 +218,13 @@ static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VAR static HRESULT WINAPI Client_get_accHelp(IAccessible *iface, VARIANT varID, BSTR *pszHelp) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszHelp); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszHelp); + + *pszHelp = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static HRESULT WINAPI Client_get_accHelpTopic(IAccessible *iface,

1 0

Piotr Caban : oleacc: Add Client_get_accDefaultAction implementation.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: acc45124d630f0c315c0f8841e6c3f021eff050e URL: http://source.winehq.org/git/wine.git/?a=commit;h=acc45124d630f0c315c0f8841… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:53 2014 +0200 oleacc: Add Client_get_accDefaultAction implementation. --- dlls/oleacc/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 104ebdb..88009f3 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -261,8 +261,13 @@ static HRESULT WINAPI Client_get_accDefaultAction(IAccessible *iface, VARIANT varID, BSTR *pszDefaultAction) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszDefaultAction); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszDefaultAction); + + *pszDefaultAction = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static HRESULT WINAPI Client_accSelect(IAccessible *iface, LONG flagsSelect, VARIANT varID)

1 0

Piotr Caban : oleacc: Add Client_get_accHelpTopic implementation.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: f196551a4d465f726f19ecbc4e74a22d9ee51975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f196551a4d465f726f19ecbc4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:58 2014 +0200 oleacc: Add Client_get_accHelpTopic implementation. --- dlls/oleacc/client.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 88009f3..a60ec24 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -238,9 +238,31 @@ static HRESULT WINAPI Client_get_accHelpTopic(IAccessible *iface, static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, VARIANT varID, BSTR *pszKeyboardShortcut) { + static const WCHAR shortcut_fmt[] = {'A','l','t','+','!',0}; Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszKeyboardShortcut); - return E_NOTIMPL; + WCHAR name[1024]; + UINT i, len; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszKeyboardShortcut); + + *pszKeyboardShortcut = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + + len = SendMessageW(This->hwnd, WM_GETTEXT, sizeof(name)/sizeof(WCHAR), (LPARAM)name); + for(i=0; i<len; i++) { + if(name[i] == '&') + break; + } + if(i+1 >= len) + return S_FALSE; + + *pszKeyboardShortcut = SysAllocString(shortcut_fmt); + if(!*pszKeyboardShortcut) + return E_OUTOFMEMORY; + + (*pszKeyboardShortcut)[4] = name[i+1]; + return S_OK; } static HRESULT WINAPI Client_get_accFocus(IAccessible *iface, VARIANT *pvarID)

1 0

Piotr Caban : oleacc: Add Client_get_accRole implementaiton.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 0793010063a0714ec523438f675412aeeb59480c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0793010063a0714ec523438f6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:15:03 2014 +0200 oleacc: Add Client_get_accRole implementaiton. --- dlls/oleacc/client.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index a60ec24..e768657 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -211,8 +211,28 @@ static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARI static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VARIANT *pvarState) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarState); - return E_NOTIMPL; + LONG style; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarState); + + if(convert_child_id(&varID) != CHILDID_SELF) { + V_VT(pvarState) = VT_EMPTY; + return E_INVALIDARG; + } + + V_VT(pvarState) = VT_I4; + V_I4(pvarState) = 0; + + style = GetWindowLongW(This->hwnd, GWL_STYLE); + if(style & WS_DISABLED) + V_I4(pvarState) |= STATE_SYSTEM_UNAVAILABLE; + else if(IsWindow(This->hwnd)) + V_I4(pvarState) |= STATE_SYSTEM_FOCUSABLE; + if(GetFocus() == This->hwnd) + V_I4(pvarState) |= STATE_SYSTEM_FOCUSED; + if(!(style & WS_VISIBLE)) + V_I4(pvarState) |= STATE_SYSTEM_INVISIBLE; + return S_OK; } static HRESULT WINAPI Client_get_accHelp(IAccessible *iface, VARIANT varID, BSTR *pszHelp)

1 0