August 2022 - Wine-commits - list.winehq.org

Francois Gouget : dinput: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 31 Aug '22

31 Aug '22

Module: wine Branch: master Commit: 92b6c23790ae87be5a000f2e7be219f3d7ee200f URL: https://gitlab.winehq.org/wine/wine/-/commit/92b6c23790ae87be5a000f2e7be219… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 25 12:29:25 2022 +0200 dinput: Remove WINAPI on static functions where not needed. --- dlls/dinput/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index f0220252279..b85d97d1b95 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1346,8 +1346,8 @@ static void reset_device_state( IDirectInputDevice8W *iface ) impl->vtbl->enum_objects( iface, &filter, DIDFT_AXIS | DIDFT_POV, reset_object_value, impl ); } -static HRESULT WINAPI dinput_device_set_property( IDirectInputDevice8W *iface, const GUID *guid, - const DIPROPHEADER *header ) +static HRESULT dinput_device_set_property( IDirectInputDevice8W *iface, const GUID *guid, + const DIPROPHEADER *header ) { struct set_object_property_params params = {.iface = iface, .header = header, .property = LOWORD( guid )}; struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface );

1 0

Francois Gouget : dinput/tests: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 31 Aug '22

31 Aug '22

Module: wine Branch: master Commit: aeb97373882b2d2e830158392b12f1382cbd5aeb URL: https://gitlab.winehq.org/wine/wine/-/commit/aeb97373882b2d2e830158392b12f1… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 25 12:24:04 2022 +0200 dinput/tests: Remove WINAPI on static functions where not needed. --- dlls/dinput/tests/driver_bus.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/tests/driver_bus.c b/dlls/dinput/tests/driver_bus.c index f200b7745d5..a95ee569c1b 100644 --- a/dlls/dinput/tests/driver_bus.c +++ b/dlls/dinput/tests/driver_bus.c @@ -996,7 +996,7 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) return fdo_pnp( device, irp ); } -static NTSTATUS WINAPI pdo_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) +static NTSTATUS pdo_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); struct phys_device *impl = pdo_from_DEVICE_OBJECT( device ); @@ -1222,7 +1222,7 @@ static NTSTATUS WINAPI pdo_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) return status; } -static NTSTATUS WINAPI fdo_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) +static NTSTATUS fdo_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; @@ -1286,7 +1286,7 @@ static NTSTATUS pdo_handle_ioctl( struct phys_device *impl, IRP *irp, ULONG code } } -static NTSTATUS WINAPI pdo_ioctl( DEVICE_OBJECT *device, IRP *irp ) +static NTSTATUS pdo_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); struct phys_device *impl = pdo_from_DEVICE_OBJECT( device ); @@ -1307,7 +1307,7 @@ static NTSTATUS WINAPI pdo_ioctl( DEVICE_OBJECT *device, IRP *irp ) return status; } -static NTSTATUS WINAPI fdo_ioctl( DEVICE_OBJECT *device, IRP *irp ) +static NTSTATUS fdo_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); ULONG in_size = stack->Parameters.DeviceIoControl.InputBufferLength;

1 0

Kevin Puetz : winecrt0: Remove free_delay_imports.
by Alexandre Julliard 31 Aug '22

31 Aug '22

Module: wine Branch: master Commit: b5d3759fc5852f083632792d6213f54151a6467a URL: https://gitlab.winehq.org/wine/wine/-/commit/b5d3759fc5852f083632792d6213f5… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Wed Aug 31 09:53:17 2022 -0500 winecrt0: Remove free_delay_imports. MSVC's delayimp.lib does not actually free delayload dependencies. winecrt0's attempt to do so from ELF __attribute__((destructor)) is unnecessary and potentially harmful: - When triggered naturally via LdrUnloadDll, this leads to recursive calls to FreeLibrary, violating free_lib_count and missing DLL_PROCESS_DETACH - when triggered by glibc's _dl_fini (at process exit), it leads to use-after-free of the TEB (GetCurrentThreadID after the main thread is no longer Win32) via FreeLibrary -> LdrLdrUnloadDll -> RtlEnterCriticalSection( &loader_section ) - double-free of the library itself, since the DLL_PROCESS_DETACH has already been handled by LdrShutdownProcess - Race against wineserver sending a SIGKILL from process_killed, since all Win32 threads of the process have exited Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53032 --- dlls/winecrt0/delay_load.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index 8f28c94d1d5..4ba840479d8 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -69,14 +69,4 @@ FARPROC WINAPI DECLSPEC_HIDDEN __wine_spec_delay_load( unsigned int id ) return proc; } -#if defined(__GNUC__) && !defined(__APPLE__) /* we can't support destructors properly on Mac OS */ -static void free_delay_imports(void) __attribute__((destructor)); -static void free_delay_imports(void) -{ - struct ImgDelayDescr *descr; - for (descr = __wine_spec_delay_imports; descr->szName; descr++) - if (*descr->phmod) FreeLibrary( *descr->phmod ); -} -#endif - #endif /* __WINE_PE_BUILD */

1 0

Francois Gouget : windows.media.speech: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 31 Aug '22

31 Aug '22

Module: wine Branch: master Commit: 2924f64d3467489178dbcbac83bfa1b5fcfa572a URL: https://gitlab.winehq.org/wine/wine/-/commit/2924f64d3467489178dbcbac83bfa1… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 25 12:31:22 2022 +0200 windows.media.speech: Remove WINAPI on static functions where not needed. --- dlls/windows.media.speech/recognizer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index 6a058df86e5..bdcc57f883e 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -124,7 +124,7 @@ static const struct ISpeechRecognitionCompilationResultVtbl compilation_result_v }; -static HRESULT WINAPI compilation_result_create( SpeechRecognitionResultStatus status, ISpeechRecognitionCompilationResult **out ) +static HRESULT compilation_result_create( SpeechRecognitionResultStatus status, ISpeechRecognitionCompilationResult **out ) { struct compilation_result *impl;

1 0

Connor McAdams : include: Add more definitions to uiautomationcoreapi.h.
by Alexandre Julliard 31 Aug '22

31 Aug '22

Module: wine Branch: master Commit: de6f778915167ea3cb48312e90a3e66e13184897 URL: https://gitlab.winehq.org/wine/wine/-/commit/de6f778915167ea3cb48312e90a3e6… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Aug 24 13:44:34 2022 -0500 include: Add more definitions to uiautomationcoreapi.h. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/uiautomationcoreapi.h | 137 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index e74271007fe..66fa2119597 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -242,6 +242,143 @@ enum ProviderType ProviderType_NonClientArea, }; +#ifndef __uiautomationclient_h__ +enum TreeScope { + TreeScope_Element = 0x01, + TreeScope_Children = 0x02, + TreeScope_Descendants = 0x04, + TreeScope_Parent = 0x08, + TreeScope_Ancestors = 0x10, + TreeScope_SubTree = TreeScope_Element | TreeScope_Children | TreeScope_Descendants, +}; + +enum PropertyConditionFlags { + PropertyConditionFlags_None = 0x00, + PropertyConditionFlags_IgnoreCase = 0x01, + PropertyConditionFlags_MatchSubstring = 0x02, +}; + +enum AutomationElementMode { + AutomationElementMode_None = 0x00, + AutomationElementMode_Full = 0x01, +}; +#endif + +enum ConditionType { + ConditionType_True = 0x00, + ConditionType_False = 0x01, + ConditionType_Property = 0x02, + ConditionType_And = 0x03, + ConditionType_Or = 0x04, + ConditionType_Not = 0x05, +}; + +struct UiaCondition { + enum ConditionType ConditionType; +}; + +struct UiaPropertyCondition { + enum ConditionType ConditionType; + PROPERTYID PropertyId; + VARIANT Value; + enum PropertyConditionFlags Flags; +}; + +struct UiaAndOrCondition { + enum ConditionType ConditionType; + struct UiaCondition **ppConditions; + int cConditions; +}; + +struct UiaNotCondition { + enum ConditionType ConditionType; + struct UiaCondition *pConditions; +}; + +struct UiaCacheRequest { + struct UiaCondition *pViewCondition; + enum TreeScope Scope; + + PROPERTYID *pProperties; + int cProperties; + PATTERNID *pPatterns; + int cPatterns; + + enum AutomationElementMode automationElementMode; +}; + +enum EventArgsType { + EventArgsType_Simple = 0x00, + EventArgsType_PropertyChanged = 0x01, + EventArgsType_StructureChanged = 0x02, + EventArgsType_AsyncContentLoaded = 0x03, + EventArgsType_WindowClosed = 0x04, + EventArgsType_TextEditTextChanged = 0x05, + EventArgsType_Changes = 0x06, + EventArgsType_Notification = 0x07, +}; + +enum AsyncContentLoadedState { + AsyncContentLoadedState_Beginning = 0x00, + AsyncContentLoadedState_Progress = 0x01, + AsyncContentLoadedState_Completed = 0x02, +}; + +struct UiaEventArgs { + enum EventArgsType Type; + int EventId; +}; + +struct UiaPropertyChangedEventArgs { + enum EventArgsType Type; + int EventId; + + PROPERTYID PropertyId; + VARIANT OldValue; + VARIANT NewValue; +}; + +struct UiaStructureChangedEventArgs { + enum EventArgsType Type; + int EventId; + + enum StructureChangeType StructureChangeType; + int *pRuntimeId; + int cRuntimeIdLen; +}; + +struct UiaTextEditTextChangedEventArgs { + enum EventArgsType Type; + int EventId; + + enum TextEditChangeType TextEditChangeType; + SAFEARRAY *pTextChange; +}; + +struct UiaChangesEventArgs { + enum EventArgsType Type; + int EventId; + + int EventIdCount; + struct UiaChangeInfo *pUiaChanges; +}; + +struct UiaAsyncContentLoadedEventArgs { + enum EventArgsType Type; + int EventId; + + enum AsyncContentLoadedState AsyncContentLoadedState; + double percentComplete; +}; + +struct UiaWindowClosedEventArgs { + enum EventArgsType Type; + int EventId; + + int *pRuntimeId; + int cRuntimeIdLen; +}; + typedef SAFEARRAY * WINAPI UiaProviderCallback(HWND hwnd,enum ProviderType providerType); HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value);

1 0

Connor McAdams : include: Add IRawElementProviderHwndOverride definition.
by Alexandre Julliard 31 Aug '22

31 Aug '22

Module: wine Branch: master Commit: 3106380d5869544d8bd856cd37d748452eb3044d URL: https://gitlab.winehq.org/wine/wine/-/commit/3106380d5869544d8bd856cd37d748… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Jul 8 12:23:36 2022 -0400 include: Add IRawElementProviderHwndOverride definition. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/uiautomationcore.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/uiautomationcore.idl b/include/uiautomationcore.idl index 8ddfb1d5653..98894407441 100644 --- a/include/uiautomationcore.idl +++ b/include/uiautomationcore.idl @@ -204,6 +204,20 @@ library UIA HRESULT GetFocus([out, retval] IRawElementProviderFragment **pRetVal); } + + [ + object, + uuid(1d5df27c-8947-4425-b8d9-79787bb460b8), + pointer_default(unique), + oleautomation + ] + interface IRawElementProviderHwndOverride : IUnknown + { + HRESULT GetOverrideProviderForHwnd( + [in] HWND hwnd, + [out, retval] IRawElementProviderSimple **pRetVal); + } + [ object, uuid(e44c3566-915d-4070-99c6-047bff5a08f5),

1 0

Connor McAdams : uiautomationcore: Retrieve HWND from HUIANODE provider.
by Alexandre Julliard 31 Aug '22

31 Aug '22

Module: wine Branch: master Commit: cf9d7ee4b4d97e16c0da5fb609372341b965e9df URL: https://gitlab.winehq.org/wine/wine/-/commit/cf9d7ee4b4d97e16c0da5fb6093723… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Aug 23 10:23:37 2022 -0400 uiautomationcore: Retrieve HWND from HUIANODE provider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 32 ++++++++++++++-------------- dlls/uiautomationcore/uia_client.c | 34 ++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 4fd28f2ba8d..948198faea0 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -3647,8 +3647,8 @@ static const struct prov_method_sequence node_from_prov2[] = { { &Provider, PROV_GET_PROVIDER_OPTIONS }, /* Win10v1507 and below call this. */ { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_NativeWindowHandlePropertyId */ - { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER, METHOD_TODO }, - { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_NativeWindowHandlePropertyId */ + { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, + { &Provider, PROV_GET_PROPERTY_VALUE }, /* UIA_NativeWindowHandlePropertyId */ { &Provider, FRAG_NAVIGATE, METHOD_TODO }, /* NavigateDirection_Parent */ /* Only called on Windows versions past Win10v1507. */ { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, @@ -3660,8 +3660,8 @@ static const struct prov_method_sequence node_from_prov3[] = { { &Provider_child, PROV_GET_PROVIDER_OPTIONS }, /* Win10v1507 and below call this. */ { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_NativeWindowHandlePropertyId */ - { &Provider_child, PROV_GET_HOST_RAW_ELEMENT_PROVIDER, METHOD_TODO }, - { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_NativeWindowHandlePropertyId */ + { &Provider_child, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, + { &Provider_child, PROV_GET_PROPERTY_VALUE }, /* UIA_NativeWindowHandlePropertyId */ { &Provider_child, FRAG_NAVIGATE, METHOD_TODO }, /* NavigateDirection_Parent */ /* Only called on Windows versions past Win10v1507. */ { &Provider_child, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, @@ -3673,7 +3673,7 @@ static const struct prov_method_sequence node_from_prov4[] = { { &Provider, PROV_GET_PROVIDER_OPTIONS }, /* Win10v1507 and below call this. */ { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_NativeWindowHandlePropertyId */ - { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER, METHOD_TODO }, + { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, { &Provider, FRAG_NAVIGATE, METHOD_TODO }, /* NavigateDirection_Parent */ /* Only called on Windows versions past Win10v1507. */ { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, @@ -3685,7 +3685,7 @@ static const struct prov_method_sequence node_from_prov5[] = { { &Provider, PROV_GET_PROVIDER_OPTIONS }, /* Win10v1507 and below call this. */ { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_NativeWindowHandlePropertyId */ - { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER, METHOD_TODO }, + { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, { &Provider2, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, /* Win10v1507 and below call this. */ { &Provider2, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_NativeWindowHandlePropertyId */ @@ -3710,7 +3710,7 @@ static const struct prov_method_sequence node_from_prov6[] = { { &Provider, PROV_GET_PROVIDER_OPTIONS }, /* Win10v1507 and below call this. */ { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_NativeWindowHandlePropertyId */ - { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER, METHOD_TODO }, + { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, { &Provider2, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, /* Win10v1507 and below call this. */ { &Provider2, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_NativeWindowHandlePropertyId */ @@ -3735,7 +3735,7 @@ static const struct prov_method_sequence node_from_prov7[] = { { &Provider_child, PROV_GET_PROVIDER_OPTIONS }, /* Win10v1507 and below call this. */ { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_NativeWindowHandlePropertyId */ - { &Provider_child, PROV_GET_HOST_RAW_ELEMENT_PROVIDER, METHOD_TODO }, + { &Provider_child, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, { &Provider2, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, /* Win10v1507 and below call this. */ { &Provider2, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_NativeWindowHandlePropertyId */ @@ -3760,8 +3760,8 @@ static const struct prov_method_sequence node_from_prov8[] = { { &Provider, PROV_GET_PROVIDER_OPTIONS }, /* Win10v1507 and below call this. */ { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_NativeWindowHandlePropertyId */ - { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER, METHOD_TODO }, - { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_NativeWindowHandlePropertyId */ + { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, + { &Provider, PROV_GET_PROPERTY_VALUE }, /* UIA_NativeWindowHandlePropertyId */ { &Provider, FRAG_NAVIGATE, METHOD_TODO }, /* NavigateDirection_Parent */ /* Only called on Windows versions past Win10v1507. */ { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, @@ -4153,8 +4153,8 @@ static const struct prov_method_sequence get_elem_prop_seq[] = { { &Provider_child, PROV_GET_PROVIDER_OPTIONS }, /* Win10v1507 and below call this. */ { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_NativeWindowHandlePropertyId */ - { &Provider_child, PROV_GET_HOST_RAW_ELEMENT_PROVIDER, METHOD_TODO }, - { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_NativeWindowHandlePropertyId */ + { &Provider_child, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, + { &Provider_child, PROV_GET_PROPERTY_VALUE }, /* UIA_NativeWindowHandlePropertyId */ { &Provider_child, FRAG_NAVIGATE, METHOD_TODO }, /* NavigateDirection_Parent */ /* Only called on Windows versions past Win10v1507. */ { &Provider_child, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, @@ -4168,15 +4168,15 @@ static const struct prov_method_sequence get_elem_arr_prop_seq[] = { { &Provider_child, PROV_GET_PROVIDER_OPTIONS }, /* Win10v1507 and below call this. */ { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_NativeWindowHandlePropertyId */ - { &Provider_child, PROV_GET_HOST_RAW_ELEMENT_PROVIDER, METHOD_TODO }, - { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_NativeWindowHandlePropertyId */ + { &Provider_child, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, + { &Provider_child, PROV_GET_PROPERTY_VALUE }, /* UIA_NativeWindowHandlePropertyId */ { &Provider_child, FRAG_NAVIGATE, METHOD_TODO }, /* NavigateDirection_Parent */ { &Provider_child, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, { &Provider_child2, PROV_GET_PROVIDER_OPTIONS }, /* Win10v1507 and below call this. */ { &Provider_child2, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_NativeWindowHandlePropertyId */ - { &Provider_child2, PROV_GET_HOST_RAW_ELEMENT_PROVIDER, METHOD_TODO }, - { &Provider_child2, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_NativeWindowHandlePropertyId */ + { &Provider_child2, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, + { &Provider_child2, PROV_GET_PROPERTY_VALUE }, /* UIA_NativeWindowHandlePropertyId */ { &Provider_child2, FRAG_NAVIGATE, METHOD_TODO }, /* NavigateDirection_Parent */ { &Provider_child2, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, { &Provider_child, PROV_GET_PROPERTY_VALUE }, diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 405beb02b15..b7e8f45636a 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -160,6 +160,37 @@ static HRESULT get_global_interface_table(IGlobalInterfaceTable **git) return hr; } +static HWND get_hwnd_from_provider(IRawElementProviderSimple *elprov) +{ + IRawElementProviderSimple *host_prov; + HRESULT hr; + VARIANT v; + HWND hwnd; + + hwnd = NULL; + VariantInit(&v); + hr = IRawElementProviderSimple_get_HostRawElementProvider(elprov, &host_prov); + if (SUCCEEDED(hr) && host_prov) + { + hr = IRawElementProviderSimple_GetPropertyValue(host_prov, UIA_NativeWindowHandlePropertyId, &v); + if (SUCCEEDED(hr) && (V_VT(&v) == VT_I4)) + hwnd = UlongToHandle(V_I4(&v)); + + VariantClear(&v); + IRawElementProviderSimple_Release(host_prov); + } + + if (!IsWindow(hwnd)) + { + hr = IRawElementProviderSimple_GetPropertyValue(elprov, UIA_NativeWindowHandlePropertyId, &v); + if (SUCCEEDED(hr) && (V_VT(&v) == VT_I4)) + hwnd = UlongToHandle(V_I4(&v)); + VariantClear(&v); + } + + return hwnd; +} + /* * IWineUiaNode interface. */ @@ -169,6 +200,8 @@ struct uia_node { IWineUiaProvider *prov; DWORD git_cookie; + + HWND hwnd; }; static inline struct uia_node *impl_from_IWineUiaNode(IWineUiaNode *iface) @@ -482,6 +515,7 @@ static HRESULT create_wine_uia_provider(struct uia_node *node, IRawElementProvid prov->elprov = elprov; prov->ref = 1; node->prov = &prov->IWineUiaProvider_iface; + node->hwnd = get_hwnd_from_provider(elprov); /* * If the UseComThreading ProviderOption is specified, all calls to the

1 0

Connor McAdams : uiautomationcore: Partially implement UiaGetRuntimeId.
by Alexandre Julliard 31 Aug '22

31 Aug '22

Module: wine Branch: master Commit: 0520531c52fd3256d688affba414291cb2f9f016 URL: https://gitlab.winehq.org/wine/wine/-/commit/0520531c52fd3256d688affba41429… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Aug 23 10:35:00 2022 -0500 uiautomationcore: Partially implement UiaGetRuntimeId. Add RuntimeId support for HUIANODEs associated with an HWND. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 389 +++++++++++++++++++++++++++- dlls/uiautomationcore/uia_client.c | 54 ++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 4 files changed, 437 insertions(+), 9 deletions(-)

1 0

Connor McAdams : uiautomationcore: Add support for UIA_RuntimeIdPropertyId.
by Alexandre Julliard 31 Aug '22

31 Aug '22

Module: wine Branch: master Commit: dadfd3d424ab256677e1a1d3c253f3769f515066 URL: https://gitlab.winehq.org/wine/wine/-/commit/dadfd3d424ab256677e1a1d3c253f3… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Aug 4 15:20:56 2022 -0400 uiautomationcore: Add support for UIA_RuntimeIdPropertyId. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 72 ++++--- dlls/uiautomationcore/uia_classes.idl | 1 + dlls/uiautomationcore/uia_client.c | 334 ++++++++++++++++++++++++++--- dlls/uiautomationcore/uia_ids.c | 105 ++++----- dlls/uiautomationcore/uia_private.h | 6 + 5 files changed, 406 insertions(+), 112 deletions(-)

1 0

Connor McAdams : uiautomationcore: Implement UiaHUiaNodeFromVariant.
by Alexandre Julliard 31 Aug '22

31 Aug '22

Module: wine Branch: master Commit: 1f86e2c6d9955a084739e586bcbc848e9a8aad14 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f86e2c6d9955a084739e586bcbc84… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Aug 8 09:56:18 2022 -0400 uiautomationcore: Implement UiaHUiaNodeFromVariant. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 90 +++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_client.c | 37 ++++++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 4 files changed, 129 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 06309566990..9af859f1a7a 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -4835,6 +4835,95 @@ static void test_UiaGetRuntimeId(void) CoUninitialize(); } +static LONG Object_ref = 1; +static HRESULT WINAPI Object_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI Object_AddRef(IUnknown *iface) +{ + return InterlockedIncrement(&Object_ref); +} + +static ULONG WINAPI Object_Release(IUnknown *iface) +{ + return InterlockedDecrement(&Object_ref); +} + +static IUnknownVtbl ObjectVtbl = { + Object_QueryInterface, + Object_AddRef, + Object_Release +}; + +static IUnknown Object = {&ObjectVtbl}; +static void test_UiaHUiaNodeFromVariant(void) +{ + HUIANODE node; + HRESULT hr; + VARIANT v; + + hr = UiaHUiaNodeFromVariant(NULL, &node); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + hr = UiaHUiaNodeFromVariant(&v, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + node = (void *)0xdeadbeef; + V_VT(&v) = VT_R8; + hr = UiaHUiaNodeFromVariant(&v, &node); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(!node, "node != NULL\n"); + + node = (void *)0xdeadbeef; + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = &Object; + hr = UiaHUiaNodeFromVariant(&v, &node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(node == (void *)&Object, "node != NULL\n"); + ok(Object_ref == 2, "Unexpected Object_ref %ld\n", Object_ref); + VariantClear(&v); + +#ifdef _WIN64 + node = (void *)0xdeadbeef; + V_VT(&v) = VT_I4; + V_I4(&v) = 0xbeefdead; + hr = UiaHUiaNodeFromVariant(&v, &node); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(!node, "node != NULL\n"); + + node = (void *)0xdeadbeef; + V_VT(&v) = VT_I8; + V_I8(&v) = 0xbeefdead; + hr = UiaHUiaNodeFromVariant(&v, &node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(node == (void *)V_I8(&v), "node != V_I8\n"); +#else + node = (void *)0xdeadbeef; + V_VT(&v) = VT_I8; + V_I8(&v) = 0xbeefdead; + hr = UiaHUiaNodeFromVariant(&v, &node); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(!node, "node != NULL\n"); + + node = (void *)0xdeadbeef; + V_VT(&v) = VT_I4; + V_I4(&v) = 0xbeefdead; + hr = UiaHUiaNodeFromVariant(&v, &node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(node == (void *)V_I4(&v), "node != V_I8\n"); +#endif +} + START_TEST(uiautomation) { HMODULE uia_dll = LoadLibraryA("uiautomationcore.dll"); @@ -4857,6 +4946,7 @@ START_TEST(uiautomation) test_UiaNodeFromProvider(); test_UiaGetPropertyValue(); test_UiaGetRuntimeId(); + test_UiaHUiaNodeFromVariant(); if (uia_dll) { pUiaProviderFromIAccessible = (void *)GetProcAddress(uia_dll, "UiaProviderFromIAccessible"); diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index f166ed20b53..0ff01eba5af 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -979,3 +979,40 @@ HRESULT WINAPI UiaGetRuntimeId(HUIANODE huianode, SAFEARRAY **runtime_id) return S_OK; } + +/*********************************************************************** + * UiaHUiaNodeFromVariant (uiautomationcore.@) + */ +HRESULT WINAPI UiaHUiaNodeFromVariant(VARIANT *in_val, HUIANODE *huianode) +{ + const VARTYPE expected_vt = sizeof(void *) == 8 ? VT_I8 : VT_I4; + + TRACE("(%p, %p)\n", in_val, huianode); + + if (!in_val || !huianode) + return E_INVALIDARG; + + *huianode = NULL; + if ((V_VT(in_val) != expected_vt) && (V_VT(in_val) != VT_UNKNOWN)) + { + WARN("Invalid vt %d\n", V_VT(in_val)); + return E_INVALIDARG; + } + + if (V_VT(in_val) == VT_UNKNOWN) + { + if (V_UNKNOWN(in_val)) + IUnknown_AddRef(V_UNKNOWN(in_val)); + *huianode = (HUIANODE)V_UNKNOWN(in_val); + } + else + { +#ifdef _WIN64 + *huianode = (HUIANODE)V_I8(in_val); +#else + *huianode = (HUIANODE)V_I4(in_val); +#endif + } + + return S_OK; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 17e34ee259a..f4e745a644a 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -70,7 +70,7 @@ @ stub UiaGetUpdatedCache @ stub UiaHPatternObjectFromVariant @ stub UiaHTextRangeFromVariant -@ stub UiaHUiaNodeFromVariant +@ stdcall UiaHUiaNodeFromVariant(ptr ptr) @ stub UiaHasServerSideProvider @ stdcall UiaHostProviderFromHwnd(long ptr) #@ stub UiaIAccessibleFromProvider diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 78cbca2e25b..946c8b0fadc 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -396,6 +396,7 @@ HRESULT WINAPI UiaGetPropertyValue(HUIANODE huianode, PROPERTYID prop_id, VARIAN HRESULT WINAPI UiaNodeFromProvider(IRawElementProviderSimple *elprov, HUIANODE *huianode); BOOL WINAPI UiaNodeRelease(HUIANODE huianode); HRESULT WINAPI UiaGetRuntimeId(HUIANODE huianode, SAFEARRAY **runtime_id); +HRESULT WINAPI UiaHUiaNodeFromVariant(VARIANT *in_val, HUIANODE *huianode); #ifdef __cplusplus }

1 0