September 2021 - Wine-Commits

Jacek Caban : gdi32: Move __wine_get_wgl_driver to driver.c.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 1e8fa197b5b8732967e6aac1691428358c944f50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e8fa197b5b8732967e6aac1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 27 13:05:51 2021 +0200 gdi32: Move __wine_get_wgl_driver to driver.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 17 +++++++++++++++++ dlls/gdi32/opengl.c | 18 ------------------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index f9cf592b28e..aad5f08b78e 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1157,3 +1157,20 @@ NTSTATUS WINAPI NtGdiDdDDICheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNE return get_display_driver()->pD3DKMTCheckVidPnExclusiveOwnership( desc ); } + +/*********************************************************************** + * __wine_get_wgl_driver (win32u.@) + */ +struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ) +{ + struct opengl_funcs *ret = NULL; + DC * dc = get_dc_ptr( hdc ); + + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, wine_get_wgl_driver ); + ret = physdev->funcs->wine_get_wgl_driver( physdev, version ); + release_dc_ptr( dc ); + } + return ret; +} diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index c50d7bc2b43..0fbd851f67e 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -30,7 +30,6 @@ #include "winerror.h" #include "winternl.h" #include "winnt.h" -#include "ntgdi_private.h" static HMODULE opengl32; @@ -40,23 +39,6 @@ static INT (WINAPI *wglGetPixelFormat)(HDC); static BOOL (WINAPI *wglSetPixelFormat)(HDC,INT,const PIXELFORMATDESCRIPTOR*); static BOOL (WINAPI *wglSwapBuffers)(HDC); -/*********************************************************************** - * __wine_get_wgl_driver (GDI32.@) - */ -struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ) -{ - struct opengl_funcs *ret = NULL; - DC * dc = get_dc_ptr( hdc ); - - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, wine_get_wgl_driver ); - ret = physdev->funcs->wine_get_wgl_driver( physdev, version ); - release_dc_ptr( dc ); - } - return ret; -} - /****************************************************************************** * ChoosePixelFormat (GDI32.@) */

1 0

Nikolay Sivov : ole32/composite: Fix IsEqual() comparison logic.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 068ddc5b1b0b00ccef78817cd716815c916ea359 URL: https://source.winehq.org/git/wine.git/?a=commit;h=068ddc5b1b0b00ccef78817c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 27 15:31:39 2021 +0300 ole32/composite: Fix IsEqual() comparison logic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 65 +++++++++++++++++-------------------------- dlls/ole32/tests/moniker.c | 18 +++++++++--- 2 files changed, 39 insertions(+), 44 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 4eb9b32fe5e..60d11b3ba90 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -558,56 +558,41 @@ static HRESULT WINAPI CompositeMonikerImpl_Enum(IMoniker *iface, BOOL forward, I return hr; } -/****************************************************************************** - * CompositeMoniker_IsEqual - ******************************************************************************/ -static HRESULT WINAPI -CompositeMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) +static HRESULT WINAPI CompositeMonikerImpl_IsEqual(IMoniker *iface, IMoniker *other) { - IEnumMoniker *enumMoniker1,*enumMoniker2; - IMoniker *tempMk1,*tempMk2; - HRESULT res1,res2,res; - BOOL done; - - TRACE("(%p,%p)\n",iface,pmkOtherMoniker); + CompositeMonikerImpl *moniker = impl_from_IMoniker(iface), *other_moniker; + IMoniker **components, **other_components; + unsigned int i; + HRESULT hr; - if (pmkOtherMoniker==NULL) - return S_FALSE; + TRACE("%p, %p.\n", iface, other); - /* This method returns S_OK if the components of both monikers are equal when compared in the */ - /* left-to-right order.*/ - IMoniker_Enum(pmkOtherMoniker,TRUE,&enumMoniker1); + if (!other) + return E_INVALIDARG; - if (enumMoniker1==NULL) + if (!(other_moniker = unsafe_impl_from_IMoniker(other))) return S_FALSE; - IMoniker_Enum(iface,TRUE,&enumMoniker2); - - do { - - res1=IEnumMoniker_Next(enumMoniker1,1,&tempMk1,NULL); - res2=IEnumMoniker_Next(enumMoniker2,1,&tempMk2,NULL); - - if((res1==S_OK)&&(res2==S_OK)){ - done = (res = IMoniker_IsEqual(tempMk1,tempMk2)) == S_FALSE; - } - else - { - res = (res1==S_FALSE) && (res2==S_FALSE); - done = TRUE; - } + if (moniker->comp_count != other_moniker->comp_count) + return S_FALSE; - if (res1==S_OK) - IMoniker_Release(tempMk1); + if (FAILED(hr = composite_get_components_alloc(moniker, &components))) return hr; + if (FAILED(hr = composite_get_components_alloc(other_moniker, &other_components))) + { + heap_free(components); + return hr; + } - if (res2==S_OK) - IMoniker_Release(tempMk2); - } while (!done); + for (i = 0; i < moniker->comp_count; ++i) + { + if ((hr = IMoniker_IsEqual(components[i], other_components[i]) != S_OK)) + break; + } - IEnumMoniker_Release(enumMoniker1); - IEnumMoniker_Release(enumMoniker2); + heap_free(other_components); + heap_free(components); - return res; + return hr; } static HRESULT WINAPI CompositeMonikerImpl_Hash(IMoniker *iface, DWORD *hash) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 1e4c2e0211d..962ae6c269f 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3303,20 +3303,16 @@ todo_wine /* With itself */ hr = IMoniker_CommonPrefixWith(moniker, moniker, &moniker2); -todo_wine ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); hr = IMoniker_IsEqual(moniker, moniker2); -todo_wine ok(hr == S_OK && moniker2 != moniker, "Unexpected hr %#x.\n", hr); IMoniker_Release(moniker2); /* Equal composites */ hr = IMoniker_CommonPrefixWith(moniker, moniker1, &moniker2); -todo_wine ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); ok(moniker2 != moniker && moniker2 != moniker1, "Unexpected object.\n"); hr = IMoniker_IsEqual(moniker, moniker2); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMoniker_Release(moniker2); @@ -3349,6 +3345,20 @@ todo_wine IMoniker_Release(moniker); IMoniker_Release(moniker1); + /* IsEqual() */ + hr = create_moniker_from_desc("CI1I2", &moniker1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = create_moniker_from_desc("CI1I2", &moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMoniker_IsEqual(moniker1, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_IsEqual(moniker1, moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMoniker_IsEqual(moniker1, moniker1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker2); + IMoniker_Release(moniker1); + IBindCtx_Release(bindctx); }

1 0

Nikolay Sivov : ole32/composite: Implement CommonPrefixWith() without iterators.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: ca7e757fb934657c8de9b4a1bbcf498684621fc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca7e757fb934657c8de9b4a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 27 15:31:38 2021 +0300 ole32/composite: Implement CommonPrefixWith() without iterators. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 230 ++++++++++++++++++++++-------------------- dlls/ole32/tests/moniker.c | 15 ++- 2 files changed, 128 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca7e757fb934657c8de9…

1 0

Piotr Caban : oleacc: Add default client IAccessible::put_accValue implementation.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 38229c8a758f29f7cf81572f37972ce56da89cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38229c8a758f29f7cf81572f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 27 16:11:16 2021 +0200 oleacc: Add default client IAccessible::put_accValue implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/client.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index f111a1b9af8..1dd18240179 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -487,11 +487,15 @@ static HRESULT WINAPI Client_put_accName(IAccessible *iface, VARIANT varID, BSTR return E_NOTIMPL; } -static HRESULT WINAPI Client_put_accValue(IAccessible *iface, VARIANT varID, BSTR pszValue) +static HRESULT WINAPI Client_put_accValue(IAccessible *iface, VARIANT id, BSTR value) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %s)\n", This, debugstr_variant(&varID), debugstr_w(pszValue)); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&id), value); + + if(convert_child_id(&id) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static const IAccessibleVtbl ClientVtbl = {

1 0

Paul Gofman : kernelbase: Sanitize flags in GetModuleHandleExW().
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 7ddd79b8f5e814437afc4aaa25fa82fe45e0c742 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ddd79b8f5e814437afc4aaa… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 27 13:50:02 2021 +0300 kernelbase: Sanitize flags in GetModuleHandleExW(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 17 +++++++++++++++++ dlls/kernelbase/loader.c | 10 ++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 5ca137ad6ba..bfa389ac9ab 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -1011,6 +1011,23 @@ static void testGetModuleHandleEx(void) ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); ok( mod == NULL, "got %p\n", mod ); + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT + | GET_MODULE_HANDLE_EX_FLAG_PIN, (LPCWSTR)mod_kernel32, &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( mod == NULL, "got %p\n", mod ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = GetModuleHandleExW( 8, kernel32W, &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( mod == NULL, "got %p\n", mod ); + FreeLibrary( mod_kernel32 ); } diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index ac463528e3c..9aff460c955 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -384,6 +384,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetModuleHandleExW( DWORD flags, LPCWSTR name, HMO return FALSE; } + if ((flags & ~(GET_MODULE_HANDLE_EX_FLAG_PIN | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT + | GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)) + || (flags & (GET_MODULE_HANDLE_EX_FLAG_PIN | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + == (GET_MODULE_HANDLE_EX_FLAG_PIN | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + { + *module = NULL; + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + /* if we are messing with the refcount, grab the loader lock */ lock = (flags & GET_MODULE_HANDLE_EX_FLAG_PIN) || !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT); if (lock) LdrLockLoaderLock( 0, NULL, &magic );

1 0

Connor McAdams : oleacc: Add get_accKeyboardShortcut function for edit client accessible object.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: dbdebac3166f79207eef7fcd1ff7d7dfcf725924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbdebac3166f79207eef7fcd… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 27 16:11:09 2021 +0200 oleacc: Add get_accKeyboardShortcut function for edit client accessible object. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/client.c | 67 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 20 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 032f8867d31..6419e8dec31 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -46,6 +46,7 @@ struct win_class_vtbl { void (*init)(Client*); HRESULT (*get_state)(Client*, VARIANT, VARIANT*); HRESULT (*get_name)(Client*, VARIANT, BSTR*); + HRESULT (*get_kbd_shortcut)(Client*, VARIANT, BSTR*); }; static HRESULT win_get_name(HWND hwnd, BSTR *name) @@ -69,6 +70,29 @@ static HRESULT win_get_name(HWND hwnd, BSTR *name) return *name ? S_OK : E_OUTOFMEMORY; } +static HRESULT win_get_kbd_shortcut(HWND hwnd, BSTR *shortcut) +{ + WCHAR buf[1024]; + UINT i, len; + + len = SendMessageW(hwnd, WM_GETTEXT, ARRAY_SIZE(buf), (LPARAM)buf); + if(!len) + return S_FALSE; + + for(i=0; i<len; i++) { + if(buf[i] == '&') + break; + } + if(i+1 >= len) + return S_FALSE; + + *shortcut = SysAllocString(L"Alt+!"); + if(!*shortcut) + return E_OUTOFMEMORY; + (*shortcut)[4] = buf[i+1]; + return S_OK; +} + static inline Client* impl_from_Client(IAccessible *iface) { return CONTAINING_RECORD(iface, Client, IAccessible_iface); @@ -304,32 +328,20 @@ static HRESULT WINAPI Client_get_accHelpTopic(IAccessible *iface, } static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, - VARIANT varID, BSTR *pszKeyboardShortcut) + VARIANT id, BSTR *shortcut) { Client *This = impl_from_Client(iface); - 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; + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&id), shortcut); - len = SendMessageW(This->hwnd, WM_GETTEXT, ARRAY_SIZE(name), (LPARAM)name); - for(i=0; i<len; i++) { - if(name[i] == '&') - break; - } - if(i+1 >= len) - return S_FALSE; + *shortcut = NULL; + if(This->vtbl && This->vtbl->get_kbd_shortcut) + return This->vtbl->get_kbd_shortcut(This, id, shortcut); - *pszKeyboardShortcut = SysAllocString(L"Alt+!"); - if(!*pszKeyboardShortcut) - return E_OUTOFMEMORY; + if(convert_child_id(&id) != CHILDID_SELF) + return E_INVALIDARG; - (*pszKeyboardShortcut)[4] = name[i+1]; - return S_OK; + return win_get_kbd_shortcut(This->hwnd, shortcut); } static HRESULT WINAPI Client_get_accFocus(IAccessible *iface, VARIANT *focus) @@ -744,10 +756,25 @@ static HRESULT edit_get_name(Client *client, VARIANT id, BSTR *name) return win_get_name(label, name); } +static HRESULT edit_get_kbd_shortcut(Client *client, VARIANT id, BSTR *shortcut) +{ + HWND label; + + if(convert_child_id(&id) != CHILDID_SELF) + return E_INVALIDARG; + + label = edit_find_label(client->hwnd, TRUE); + if(!label) + return S_FALSE; + + return win_get_kbd_shortcut(label, shortcut); +} + static const win_class_vtbl edit_vtbl = { edit_init, edit_get_state, edit_get_name, + edit_get_kbd_shortcut, }; static const struct win_class_data classes[] = {

1 0

Connor McAdams : oleacc: Add get_accName function for edit client accessible object.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 583caf555d123ad15d96b84ddd42eca4e5896292 URL: https://source.winehq.org/git/wine.git/?a=commit;h=583caf555d123ad15d96b84d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 27 16:11:05 2021 +0200 oleacc: Add get_accName function for edit client accessible object. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/client.c | 92 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 72 insertions(+), 20 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index c94be37df0f..032f8867d31 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -45,8 +45,30 @@ typedef struct { struct win_class_vtbl { void (*init)(Client*); HRESULT (*get_state)(Client*, VARIANT, VARIANT*); + HRESULT (*get_name)(Client*, VARIANT, BSTR*); }; +static HRESULT win_get_name(HWND hwnd, BSTR *name) +{ + WCHAR buf[1024]; + UINT i, len; + + len = SendMessageW(hwnd, WM_GETTEXT, ARRAY_SIZE(buf), (LPARAM)buf); + if(!len) + return S_FALSE; + + for(i=0; i<len; i++) { + if(buf[i] == '&') { + len--; + memmove(buf+i, buf+i+1, (len-i)*sizeof(WCHAR)); + break; + } + } + + *name = SysAllocStringLen(buf, len); + return *name ? S_OK : E_OUTOFMEMORY; +} + static inline Client* impl_from_Client(IAccessible *iface) { return CONTAINING_RECORD(iface, Client, IAccessible_iface); @@ -166,32 +188,20 @@ static HRESULT WINAPI Client_get_accChild(IAccessible *iface, return E_INVALIDARG; } -static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR *pszName) +static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT id, BSTR *name) { Client *This = impl_from_Client(iface); - 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; + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&id), name); - len = SendMessageW(This->hwnd, WM_GETTEXT, ARRAY_SIZE(name), (LPARAM)name); - if(!len) - return S_FALSE; + *name = NULL; + if(This->vtbl && This->vtbl->get_name) + return This->vtbl->get_name(This, id, name); - for(i=0; i<len; i++) { - if(name[i] == '&') { - len--; - memmove(name+i, name+i+1, (len-i)*sizeof(WCHAR)); - break; - } - } + if(convert_child_id(&id) != CHILDID_SELF || !IsWindow(This->hwnd)) + return E_INVALIDARG; - *pszName = SysAllocStringLen(name, len); - return *pszName ? S_OK : E_OUTOFMEMORY; + return win_get_name(This->hwnd, name); } static HRESULT WINAPI Client_get_accValue(IAccessible *iface, VARIANT varID, BSTR *pszValue) @@ -693,9 +703,51 @@ static HRESULT edit_get_state(Client *client, VARIANT id, VARIANT *state) return S_OK; } +/* + * Edit control objects have their name property defined by the first static + * text control preceding them in the order of window creation. If one is not + * found, the edit has no name property. In the case of the keyboard shortcut + * property, the first preceding visible static text control is used. + */ +static HWND edit_find_label(HWND hwnd, BOOL visible) +{ + HWND cur; + + for(cur = hwnd; cur; cur = GetWindow(cur, GW_HWNDPREV)) { + WCHAR class_name[64]; + + if(!RealGetWindowClassW(cur, class_name, ARRAY_SIZE(class_name))) + continue; + + if(!wcsicmp(class_name, WC_STATICW)) { + if(visible && !(GetWindowLongW(cur, GWL_STYLE) & WS_VISIBLE)) + continue; + else + break; + } + } + + return cur; +} + +static HRESULT edit_get_name(Client *client, VARIANT id, BSTR *name) +{ + HWND label; + + if(convert_child_id(&id) != CHILDID_SELF || !IsWindow(client->hwnd)) + return E_INVALIDARG; + + label = edit_find_label(client->hwnd, FALSE); + if(!label) + return S_FALSE; + + return win_get_name(label, name); +} + static const win_class_vtbl edit_vtbl = { edit_init, edit_get_state, + edit_get_name, }; static const struct win_class_data classes[] = {

1 0

Connor McAdams : oleacc: Add get_accState function for edit client accessible object.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 44fba34992ee4a7fbd0f4e18267304f7bb42e5d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44fba34992ee4a7fbd0f4e18… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 27 16:10:59 2021 +0200 oleacc: Add get_accState function for edit client accessible object. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/client.c | 60 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index fe9026e5bc1..c94be37df0f 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -18,6 +18,7 @@ #define COBJMACROS +#include <assert.h> #include "oleacc_private.h" #include "commctrl.h" @@ -43,6 +44,7 @@ typedef struct { struct win_class_vtbl { void (*init)(Client*); + HRESULT (*get_state)(Client*, VARIANT, VARIANT*); }; static inline Client* impl_from_Client(IAccessible *iface) @@ -233,36 +235,44 @@ static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARI return S_OK; } -static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VARIANT *pvarState) +static HRESULT client_get_state(Client *client, VARIANT id, VARIANT *state) { - Client *This = impl_from_Client(iface); GUITHREADINFO info; LONG style; - TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarState); - - if(convert_child_id(&varID) != CHILDID_SELF) { - V_VT(pvarState) = VT_EMPTY; + if(convert_child_id(&id) != CHILDID_SELF) { + V_VT(state) = VT_EMPTY; return E_INVALIDARG; } - V_VT(pvarState) = VT_I4; - V_I4(pvarState) = 0; + V_VT(state) = VT_I4; + V_I4(state) = 0; - style = GetWindowLongW(This->hwnd, GWL_STYLE); + style = GetWindowLongW(client->hwnd, GWL_STYLE); if(style & WS_DISABLED) - V_I4(pvarState) |= STATE_SYSTEM_UNAVAILABLE; - else if(IsWindow(This->hwnd)) - V_I4(pvarState) |= STATE_SYSTEM_FOCUSABLE; + V_I4(state) |= STATE_SYSTEM_UNAVAILABLE; + else if(IsWindow(client->hwnd)) + V_I4(state) |= STATE_SYSTEM_FOCUSABLE; info.cbSize = sizeof(info); - if(GetGUIThreadInfo(0, &info) && info.hwndFocus == This->hwnd) - V_I4(pvarState) |= STATE_SYSTEM_FOCUSED; + if(GetGUIThreadInfo(0, &info) && info.hwndFocus == client->hwnd) + V_I4(state) |= STATE_SYSTEM_FOCUSED; if(!(style & WS_VISIBLE)) - V_I4(pvarState) |= STATE_SYSTEM_INVISIBLE; + V_I4(state) |= STATE_SYSTEM_INVISIBLE; return S_OK; } +static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT id, VARIANT *state) +{ + Client *This = impl_from_Client(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&id), state); + + if(This->vtbl && This->vtbl->get_state) + return This->vtbl->get_state(This, id, state); + return client_get_state(This, id, state); +} + static HRESULT WINAPI Client_get_accHelp(IAccessible *iface, VARIANT varID, BSTR *pszHelp) { Client *This = impl_from_Client(iface); @@ -664,8 +674,28 @@ static void edit_init(Client *client) client->role = ROLE_SYSTEM_TEXT; } +static HRESULT edit_get_state(Client *client, VARIANT id, VARIANT *state) +{ + HRESULT hres; + LONG style; + + hres = client_get_state(client, id, state); + if(FAILED(hres)) + return hres; + + assert(V_VT(state) == VT_I4); + + style = GetWindowLongW(client->hwnd, GWL_STYLE); + if(style & ES_READONLY) + V_I4(state) |= STATE_SYSTEM_READONLY; + if(style & ES_PASSWORD) + V_I4(state) |= STATE_SYSTEM_PROTECTED; + return S_OK; +} + static const win_class_vtbl edit_vtbl = { edit_init, + edit_get_state, }; static const struct win_class_data classes[] = {

1 0

Connor McAdams : oleacc: Add get_accRole implementation for edit client accessible object.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 8db8c473e978f75daf5235d087137e6787fd3373 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8db8c473e978f75daf5235d0… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 27 16:10:55 2021 +0200 oleacc: Add get_accRole implementation for edit client accessible object. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/client.c | 32 ++++++++++++++++++++++++++++---- dlls/oleacc/oleacc_private.h | 1 + 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index bb3d5641a08..fe9026e5bc1 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); +typedef struct win_class_vtbl win_class_vtbl; typedef struct { IAccessible IAccessible_iface; IOleWindow IOleWindow_iface; @@ -35,8 +36,15 @@ typedef struct { HWND hwnd; HWND enum_pos; + INT role; + + const win_class_vtbl *vtbl; } Client; +struct win_class_vtbl { + void (*init)(Client*); +}; + static inline Client* impl_from_Client(IAccessible *iface) { return CONTAINING_RECORD(iface, Client, IAccessible_iface); @@ -221,7 +229,7 @@ static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARI } V_VT(pvarRole) = VT_I4; - V_I4(pvarRole) = ROLE_SYSTEM_CLIENT; + V_I4(pvarRole) = This->role; return S_OK; } @@ -651,12 +659,21 @@ static const IEnumVARIANTVtbl ClientEnumVARIANTVtbl = { Client_EnumVARIANT_Clone }; +static void edit_init(Client *client) +{ + client->role = ROLE_SYSTEM_TEXT; +} + +static const win_class_vtbl edit_vtbl = { + edit_init, +}; + static const struct win_class_data classes[] = { {WC_LISTBOXW, 0x10000, TRUE}, {L"#32768", 0x10001, TRUE}, /* menu */ {WC_BUTTONW, 0x10002, TRUE}, {WC_STATICW, 0x10003, TRUE}, - {WC_EDITW, 0x10004, TRUE}, + {WC_EDITW, 0x10004, FALSE, &edit_vtbl}, {WC_COMBOBOXW, 0x10005, TRUE}, {L"#32770", 0x10006, TRUE}, /* dialog */ {L"#32771", 0x10007, TRUE}, /* winswitcher */ @@ -685,8 +702,9 @@ static const struct win_class_data classes[] = { HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) { + const struct win_class_data *data; Client *client; - HRESULT hres; + HRESULT hres = S_OK; if(!IsWindow(hwnd)) return E_FAIL; @@ -695,7 +713,7 @@ HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) if(!client) return E_OUTOFMEMORY; - find_class_data(hwnd, classes); + data = find_class_data(hwnd, classes); client->IAccessible_iface.lpVtbl = &ClientVtbl; client->IOleWindow_iface.lpVtbl = &ClientOleWindowVtbl; @@ -703,6 +721,12 @@ HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) client->ref = 1; client->hwnd = hwnd; client->enum_pos = 0; + client->role = ROLE_SYSTEM_CLIENT; + + if(data) + client->vtbl = data->vtbl; + if(client->vtbl && client->vtbl->init) + client->vtbl->init(client); hres = IAccessible_QueryInterface(&client->IAccessible_iface, iid, obj); IAccessible_Release(&client->IAccessible_iface); diff --git a/dlls/oleacc/oleacc_private.h b/dlls/oleacc/oleacc_private.h index 64926b6abb7..a01fc3615fe 100644 --- a/dlls/oleacc/oleacc_private.h +++ b/dlls/oleacc/oleacc_private.h @@ -22,6 +22,7 @@ struct win_class_data { const WCHAR *name; DWORD idx; BOOL stub; + const void *vtbl; }; const struct win_class_data* find_class_data(HWND, const struct win_class_data*) DECLSPEC_HIDDEN;

1 0

Piotr Caban : oleacc: Reorganize class specific behaviour handling.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 589be8c1be83150754cee321912e7eb56ee4e14a URL: https://source.winehq.org/git/wine.git/?a=commit;h=589be8c1be83150754cee321… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 27 16:10:51 2021 +0200 oleacc: Reorganize class specific behaviour handling. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/client.c | 35 ++++++++++++++++++ dlls/oleacc/main.c | 82 ++++++------------------------------------ dlls/oleacc/oleacc_private.h | 7 ++++ dlls/oleacc/tests/main.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ dlls/oleacc/window.c | 9 +++++ 5 files changed, 146 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=589be8c1be83150754ce…

1 0