wine-commits October 2022

wine-commits@winehq.org

1 participants
537 discussions

Rémi Bernon : winegstreamer: Wrap callback in a IWMReaderAllocatorEx in the async reader.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 18b1959749e2f8ecdc6b1cfaa9381241df5d348a URL: https://gitlab.winehq.org/wine/wine/-/commit/18b1959749e2f8ecdc6b1cfaa93812… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 15:44:48 2022 +0200 winegstreamer: Wrap callback in a IWMReaderAllocatorEx in the async reader. --- dlls/winegstreamer/wm_asyncreader.c | 127 ++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 84742d2f40f..089c96deddf 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -70,6 +70,7 @@ struct async_reader CRITICAL_SECTION cs; IWMReaderCallbackAdvanced *callback_advanced; + IWMReaderAllocatorEx *allocator; IWMReaderCallback *callback; void *context; @@ -87,6 +88,125 @@ struct async_reader QWORD user_time; }; +struct allocator +{ + IWMReaderAllocatorEx IWMReaderAllocatorEx_iface; + LONG refcount; + + IWMReaderCallbackAdvanced *callback; +}; + +static struct allocator *impl_from_IWMReaderAllocatorEx(IWMReaderAllocatorEx *iface) +{ + return CONTAINING_RECORD(iface, struct allocator, IWMReaderAllocatorEx_iface); +} + +static HRESULT WINAPI allocator_QueryInterface(IWMReaderAllocatorEx *iface, REFIID iid, void **out) +{ + struct allocator *allocator = impl_from_IWMReaderAllocatorEx(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualIID(iid, &IID_IUnknown) + || IsEqualIID(iid, &IID_IWMReaderAllocatorEx)) + *out = &allocator->IWMReaderAllocatorEx_iface; + else + { + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI allocator_AddRef(IWMReaderAllocatorEx *iface) +{ + struct allocator *allocator = impl_from_IWMReaderAllocatorEx(iface); + ULONG refcount = InterlockedIncrement(&allocator->refcount); + TRACE("iface %p increasing refcount to %lu.\n", iface, refcount); + return refcount; +} + +static ULONG WINAPI allocator_Release(IWMReaderAllocatorEx *iface) +{ + struct allocator *allocator = impl_from_IWMReaderAllocatorEx(iface); + ULONG refcount = InterlockedDecrement(&allocator->refcount); + + TRACE("iface %p decreasing refcount to %lu.\n", iface, refcount); + + if (!refcount) + { + if (allocator->callback) + IWMReaderCallbackAdvanced_Release(allocator->callback); + free(allocator); + } + + return refcount; +} + +static HRESULT WINAPI allocator_AllocateForStreamEx(IWMReaderAllocatorEx *iface, + WORD stream_number, DWORD size, INSSBuffer **sample, DWORD flags, + QWORD pts, QWORD duration, void *context) +{ + struct allocator *allocator = impl_from_IWMReaderAllocatorEx(iface); + + TRACE("iface %p, stream_number %u, size %#lx, sample %p, flags %#lx, pts %I64d, duration %I64d, context %p.\n", + iface, stream_number, size, sample, flags, pts, duration, context); + + if (allocator->callback) + return IWMReaderCallbackAdvanced_AllocateForStream(allocator->callback, + stream_number, size, sample, context); + + return E_NOTIMPL; +} + +static HRESULT WINAPI allocator_AllocateForOutputEx(IWMReaderAllocatorEx *iface, + DWORD output, DWORD size, INSSBuffer **sample, DWORD flags, + QWORD pts, QWORD duration, void *context) +{ + struct allocator *allocator = impl_from_IWMReaderAllocatorEx(iface); + + TRACE("iface %p, output %lu, size %#lx, sample %p, flags %#lx, pts %I64d, duration %I64d, context %p.\n", + iface, output, size, sample, flags, pts, duration, context); + + if (allocator->callback) + return IWMReaderCallbackAdvanced_AllocateForOutput(allocator->callback, + output, size, sample, context); + + return E_NOTIMPL; +} + +static const IWMReaderAllocatorExVtbl allocator_vtbl = +{ + allocator_QueryInterface, + allocator_AddRef, + allocator_Release, + allocator_AllocateForStreamEx, + allocator_AllocateForOutputEx, +}; + +static HRESULT allocator_create(IWMReaderCallback *callback, IWMReaderAllocatorEx **out) +{ + struct allocator *allocator; + HRESULT hr; + + if (!(allocator = calloc(1, sizeof(*allocator)))) + return E_OUTOFMEMORY; + allocator->IWMReaderAllocatorEx_iface.lpVtbl = &allocator_vtbl; + allocator->refcount = 1; + + if (FAILED(hr = IWMReaderCallback_QueryInterface(callback, + &IID_IWMReaderCallbackAdvanced, (void **)&allocator->callback))) + { + WARN("Failed to retrieve IWMReaderCallbackAdvanced interface, hr %#lx\n", hr); + allocator->callback = NULL; + } + + *out = &allocator->IWMReaderAllocatorEx_iface; + return S_OK; +} + static REFERENCE_TIME get_current_time(const struct async_reader *reader) { LARGE_INTEGER time; @@ -306,6 +426,10 @@ static void async_reader_close(struct async_reader *reader) free(op); } + if (reader->allocator) + IWMReaderAllocatorEx_Release(reader->allocator); + reader->allocator = NULL; + if (reader->callback_advanced) IWMReaderCallbackAdvanced_Release(reader->callback_advanced); reader->callback_advanced = NULL; @@ -323,6 +447,9 @@ static HRESULT async_reader_open(struct async_reader *reader, IWMReaderCallback IWMReaderCallback_AddRef((reader->callback = callback)); reader->context = context; + if (FAILED(hr = allocator_create(reader->callback, &reader->allocator))) + goto error; + if (FAILED(hr = IWMReaderCallback_QueryInterface(callback, &IID_IWMReaderCallbackAdvanced, (void **)&reader->callback_advanced))) {

1 0

Rémi Bernon : winegstreamer: Reorder video format struct in wg_format.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: c185b5a9660140da6716362698cc8b669690d8ac URL: https://gitlab.winehq.org/wine/wine/-/commit/c185b5a9660140da6716362698cc8b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 26 12:44:08 2022 +0200 winegstreamer: Reorder video format struct in wg_format. --- dlls/winegstreamer/unixlib.h | 57 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 07f2962f755..8e6c5e4cc0e 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -34,41 +34,17 @@ struct wg_format { enum wg_major_type { - WG_MAJOR_TYPE_UNKNOWN, - WG_MAJOR_TYPE_VIDEO, - WG_MAJOR_TYPE_VIDEO_CINEPAK, - WG_MAJOR_TYPE_VIDEO_H264, + WG_MAJOR_TYPE_UNKNOWN = 0, WG_MAJOR_TYPE_AUDIO, WG_MAJOR_TYPE_AUDIO_MPEG1, WG_MAJOR_TYPE_AUDIO_WMA, + WG_MAJOR_TYPE_VIDEO, + WG_MAJOR_TYPE_VIDEO_CINEPAK, + WG_MAJOR_TYPE_VIDEO_H264, } major_type; union { - struct - { - enum wg_video_format - { - WG_VIDEO_FORMAT_UNKNOWN, - - WG_VIDEO_FORMAT_BGRA, - WG_VIDEO_FORMAT_BGRx, - WG_VIDEO_FORMAT_BGR, - WG_VIDEO_FORMAT_RGB15, - WG_VIDEO_FORMAT_RGB16, - - WG_VIDEO_FORMAT_AYUV, - WG_VIDEO_FORMAT_I420, - WG_VIDEO_FORMAT_NV12, - WG_VIDEO_FORMAT_UYVY, - WG_VIDEO_FORMAT_YUY2, - WG_VIDEO_FORMAT_YV12, - WG_VIDEO_FORMAT_YVYU, - } format; - int32_t width, height; - uint32_t fps_n, fps_d; - RECT padding; - } video; struct { enum wg_audio_format @@ -104,6 +80,31 @@ struct wg_format uint32_t codec_data_len; unsigned char codec_data[64]; } audio_wma; + + struct + { + enum wg_video_format + { + WG_VIDEO_FORMAT_UNKNOWN, + + WG_VIDEO_FORMAT_BGRA, + WG_VIDEO_FORMAT_BGRx, + WG_VIDEO_FORMAT_BGR, + WG_VIDEO_FORMAT_RGB15, + WG_VIDEO_FORMAT_RGB16, + + WG_VIDEO_FORMAT_AYUV, + WG_VIDEO_FORMAT_I420, + WG_VIDEO_FORMAT_NV12, + WG_VIDEO_FORMAT_UYVY, + WG_VIDEO_FORMAT_YUY2, + WG_VIDEO_FORMAT_YV12, + WG_VIDEO_FORMAT_YVYU, + } format; + int32_t width, height; + uint32_t fps_n, fps_d; + RECT padding; + } video; struct { uint32_t width;

1 0

Rémi Bernon : winegstreamer: Rename WG_MAJOR_TYPE_H264 to WG_MAJOR_TYPE_VIDEO_H264.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 4af606298604c51b772bbf16641fa7d0837c743d URL: https://gitlab.winehq.org/wine/wine/-/commit/4af606298604c51b772bbf16641fa7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 26 12:41:18 2022 +0200 winegstreamer: Rename WG_MAJOR_TYPE_H264 to WG_MAJOR_TYPE_VIDEO_H264. --- dlls/winegstreamer/h264_decoder.c | 2 +- dlls/winegstreamer/mfplat.c | 24 ++++++++++++------------ dlls/winegstreamer/quartz_parser.c | 4 ++-- dlls/winegstreamer/unixlib.h | 4 ++-- dlls/winegstreamer/wg_format.c | 28 ++++++++++++++-------------- dlls/winegstreamer/wg_transform.c | 4 ++-- dlls/winegstreamer/wm_reader.c | 8 ++++---- 7 files changed, 37 insertions(+), 37 deletions(-)

1 0

Rémi Bernon : winegstreamer: Rename WG_MAJOR_TYPE_WMA to WG_MAJOR_TYPE_AUDIO_WMA.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 725b696a5d528d785239040c3388d02018d2105a URL: https://gitlab.winehq.org/wine/wine/-/commit/725b696a5d528d785239040c3388d0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 26 12:40:23 2022 +0200 winegstreamer: Rename WG_MAJOR_TYPE_WMA to WG_MAJOR_TYPE_AUDIO_WMA. --- dlls/winegstreamer/mfplat.c | 24 +++++++++++----------- dlls/winegstreamer/quartz_parser.c | 4 ++-- dlls/winegstreamer/unixlib.h | 4 ++-- dlls/winegstreamer/wg_format.c | 42 +++++++++++++++++++------------------- dlls/winegstreamer/wg_transform.c | 4 ++-- dlls/winegstreamer/wm_reader.c | 8 ++++---- dlls/winegstreamer/wma_decoder.c | 2 +- 7 files changed, 44 insertions(+), 44 deletions(-)

1 0

Rémi Bernon : winegstreamer: Rename WG_MAJOR_TYPE_MPEG1_AUDIO to WG_MAJOR_TYPE_AUDIO_MPEG1.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: fdf29b814ccaa5707734c9451d29605e0d1b5524 URL: https://gitlab.winehq.org/wine/wine/-/commit/fdf29b814ccaa5707734c9451d2960… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 26 12:36:49 2022 +0200 winegstreamer: Rename WG_MAJOR_TYPE_MPEG1_AUDIO to WG_MAJOR_TYPE_AUDIO_MPEG1. --- dlls/winegstreamer/mfplat.c | 2 +- dlls/winegstreamer/quartz_parser.c | 40 +++++++++++++++++------------------ dlls/winegstreamer/quartz_transform.c | 4 ++-- dlls/winegstreamer/unixlib.h | 4 ++-- dlls/winegstreamer/wg_format.c | 22 +++++++++---------- dlls/winegstreamer/wg_transform.c | 4 ++-- dlls/winegstreamer/wm_reader.c | 8 +++---- 7 files changed, 42 insertions(+), 42 deletions(-)

1 0

Rémi Bernon : winegstreamer: Move CINEPAK encoded format to a separate major type.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: b5916adfb6596b3a49055a44cae5525d1715e3f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5916adfb6596b3a49055a44cae552… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 26 12:19:55 2022 +0200 winegstreamer: Move CINEPAK encoded format to a separate major type. --- dlls/winegstreamer/mfplat.c | 1 + dlls/winegstreamer/quartz_parser.c | 49 ++++++++++++++++++++++++++++++-------- dlls/winegstreamer/unixlib.h | 10 ++++++-- dlls/winegstreamer/wg_format.c | 35 ++++++++++++++++++++++----- dlls/winegstreamer/wg_parser.c | 1 - dlls/winegstreamer/wg_transform.c | 2 ++ dlls/winegstreamer/wm_reader.c | 4 ++++ 7 files changed, 83 insertions(+), 19 deletions(-)

1 0

Brendan Shanks : kernel32: Remove shared heap functionality.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 9150071b34a666d6618794f13760c5bcab1a033e URL: https://gitlab.winehq.org/wine/wine/-/commit/9150071b34a666d6618794f13760c5… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Oct 11 13:50:34 2022 -0700 kernel32: Remove shared heap functionality. --- dlls/kernel32/heap.c | 66 ++-------------------------------------------------- 1 file changed, 2 insertions(+), 64 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index a2910688e44..1c1e6b05f25 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -41,57 +41,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(globalmem); -/* address where we try to map the system heap */ -#define SYSTEM_HEAP_BASE ((void*)0x80000000) -#define SYSTEM_HEAP_SIZE 0x1000000 /* Default heap size = 16Mb */ - -static HANDLE systemHeap; /* globally shared heap */ - BOOLEAN WINAPI RtlGetUserInfoHeap( HANDLE handle, ULONG flags, void *ptr, void **user_value, ULONG *user_flags ); BOOLEAN WINAPI RtlSetUserValueHeap( HANDLE handle, ULONG flags, void *ptr, void *user_value ); -/*********************************************************************** - * HEAP_CreateSystemHeap - * - * Create the system heap. - */ -static inline HANDLE HEAP_CreateSystemHeap(void) -{ - int created; - void *base; - HANDLE map, event; - - /* create the system heap event first */ - event = CreateEventA( NULL, TRUE, FALSE, "__wine_system_heap_event" ); - - if (!(map = CreateFileMappingA( INVALID_HANDLE_VALUE, NULL, SEC_COMMIT | PAGE_READWRITE, - 0, SYSTEM_HEAP_SIZE, "__wine_system_heap" ))) return 0; - created = (GetLastError() != ERROR_ALREADY_EXISTS); - - if (!(base = MapViewOfFileEx( map, FILE_MAP_ALL_ACCESS, 0, 0, 0, SYSTEM_HEAP_BASE ))) - { - /* pre-defined address not available */ - ERR( "system heap base address %p not available\n", SYSTEM_HEAP_BASE ); - return 0; - } - - if (created) /* newly created heap */ - { - systemHeap = RtlCreateHeap( HEAP_SHARED, base, SYSTEM_HEAP_SIZE, - SYSTEM_HEAP_SIZE, NULL, NULL ); - SetEvent( event ); - } - else - { - /* wait for the heap to be initialized */ - WaitForSingleObject( event, INFINITE ); - systemHeap = base; - } - CloseHandle( map ); - return systemHeap; -} - - /*********************************************************************** * HeapCreate (KERNEL32.@) * @@ -108,17 +60,8 @@ HANDLE WINAPI HeapCreate( ) { HANDLE ret; - if ( flags & HEAP_SHARED ) - { - if (!systemHeap) HEAP_CreateSystemHeap(); - else WARN( "Shared Heap requested, returning system heap.\n" ); - ret = systemHeap; - } - else - { - ret = RtlCreateHeap( flags, NULL, maxSize, initialSize, NULL, NULL ); - if (!ret) SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - } + ret = RtlCreateHeap( flags, NULL, maxSize, initialSize, NULL, NULL ); + if (!ret) SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return ret; } @@ -134,11 +77,6 @@ HANDLE WINAPI HeapCreate( */ BOOL WINAPI HeapDestroy( HANDLE heap /* [in] Handle of heap */ ) { - if (heap == systemHeap) - { - WARN( "attempt to destroy system heap, returning TRUE!\n" ); - return TRUE; - } if (!RtlDestroyHeap( heap )) return TRUE; SetLastError( ERROR_INVALID_HANDLE ); return FALSE;

1 0

Brendan Shanks : ntdll: Remove shared heap functionality.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 40c7cb0bcd4213e278d95401e733392988ad59a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/40c7cb0bcd4213e278d95401e73339… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Oct 11 14:55:01 2022 -0700 ntdll: Remove shared heap functionality. --- dlls/ntdll/heap.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ef91096f258..8530bdf223f 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -186,7 +186,6 @@ struct heap DWORD force_flags; /* 0044/0074 */ /* end of the Windows 10 compatible struct layout */ - BOOL shared; /* System shared heap */ struct list entry; /* Entry in process heap list */ struct list subheap_list; /* Sub-heap list */ struct list large_list; /* Large blocks list */ @@ -753,7 +752,7 @@ static void free_used_block( struct heap *heap, SUBHEAP *subheap, struct block * list_remove( &subheap->entry ); NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } - else if (!heap->shared) + else { /* keep room for a full committed block as hysteresis */ subheap_decommit( heap, subheap, (char *)(entry + 1) + (COMMIT_MASK + 1) ); @@ -921,7 +920,6 @@ static SUBHEAP *HEAP_CreateSubHeap( struct heap **heap_ptr, LPVOID address, DWOR if (!commitSize) commitSize = COMMIT_MASK + 1; totalSize = min( totalSize, 0xffff0000 ); /* don't allow a heap larger than 4GB */ if (totalSize < commitSize) totalSize = commitSize; - if (flags & HEAP_SHARED) commitSize = totalSize; /* always commit everything in a shared heap */ commitSize = min( totalSize, (commitSize + COMMIT_MASK) & ~COMMIT_MASK ); /* allocate the memory block */ @@ -955,7 +953,6 @@ static SUBHEAP *HEAP_CreateSubHeap( struct heap **heap_ptr, LPVOID address, DWOR heap->ffeeffee = 0xffeeffee; heap->auto_flags = (flags & HEAP_GROWABLE); heap->flags = (flags & ~HEAP_SHARED); - heap->shared = (flags & HEAP_SHARED) != 0; heap->magic = HEAP_MAGIC; heap->grow_size = max( HEAP_DEF_SIZE, totalSize ); heap->min_size = commitSize; @@ -993,19 +990,6 @@ static SUBHEAP *HEAP_CreateSubHeap( struct heap **heap_ptr, LPVOID address, DWOR RtlInitializeCriticalSection( &heap->cs ); heap->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": heap.cs"); } - - if (heap->shared) - { - /* let's assume that only one thread at a time will try to do this */ - HANDLE sem = heap->cs.LockSemaphore; - if (!sem) NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 ); - - NtDuplicateObject( NtCurrentProcess(), sem, NtCurrentProcess(), &sem, 0, 0, - DUPLICATE_MAKE_GLOBAL | DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE ); - heap->cs.LockSemaphore = sem; - RtlFreeHeap( process_heap, 0, heap->cs.DebugInfo ); - heap->cs.DebugInfo = NULL; - } } block_size = subheap_size( subheap ) - subheap_overhead( subheap );

1 0

Connor McAdams : uiautomationcore: Add UIAutomationType_Element property support for nested node providers.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: a6f428fae6313107c34fb7e43c26d1e602bd0a3d URL: https://gitlab.winehq.org/wine/wine/-/commit/a6f428fae6313107c34fb7e43c26d1… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Oct 5 17:04:14 2022 -0400 uiautomationcore: Add UIAutomationType_Element property support for nested node providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 214 ++++++++++++++--------------- dlls/uiautomationcore/uia_client.c | 93 ++++++++++--- dlls/uiautomationcore/uia_private.h | 14 ++ dlls/uiautomationcore/uia_provider.c | 5 +- 4 files changed, 194 insertions(+), 132 deletions(-)

1 0

Connor McAdams : uiautomationcore: Store provider thread nodes that have a runtime ID in an rbtree.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 5d3e444b1cbdbbeeef2b6b7b6508b0ca3dbbd9c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d3e444b1cbdbbeeef2b6b7b6508b0… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 10 14:27:35 2022 -0400 uiautomationcore: Store provider thread nodes that have a runtime ID in an rbtree. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 2 + dlls/uiautomationcore/uia_private.h | 4 +- dlls/uiautomationcore/uia_provider.c | 99 ++++++++++++++++++++++++++++++------ 3 files changed, 87 insertions(+), 18 deletions(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 2d97ff13159..24de251eb8a 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -851,6 +851,7 @@ HRESULT WINAPI UiaNodeFromProvider(IRawElementProviderSimple *elprov, HUIANODE * node->IWineUiaNode_iface.lpVtbl = &uia_node_vtbl; list_init(&node->prov_thread_list_entry); + list_init(&node->node_map_list_entry); node->ref = 1; *huianode = (void *)&node->IWineUiaNode_iface; @@ -1228,6 +1229,7 @@ HRESULT WINAPI UiaNodeFromHandle(HWND hwnd, HUIANODE *huianode) node->hwnd = hwnd; node->IWineUiaNode_iface.lpVtbl = &uia_node_vtbl; list_init(&node->prov_thread_list_entry); + list_init(&node->node_map_list_entry); node->ref = 1; hr = uia_get_provider_from_hwnd(node); diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index c4512ecd046..c94f2b6c1eb 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -40,9 +40,9 @@ struct uia_node { HWND hwnd; BOOL nested_node; BOOL disconnected; - /* This RuntimeId is used as a comparison for UiaDisconnectProvider(). */ - SAFEARRAY *runtime_id; struct list prov_thread_list_entry; + struct list node_map_list_entry; + struct uia_provider_thread_map_entry *map; }; static inline struct uia_node *impl_from_IWineUiaNode(IWineUiaNode *iface) diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 76eea75f855..17adf622ffe 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -21,6 +21,7 @@ #include "wine/debug.h" #include "wine/heap.h" +#include "wine/rbtree.h" #include "initguid.h" #include "wine/iaccessible2.h" @@ -1130,6 +1131,7 @@ HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, long child_id, DWORD */ struct uia_provider_thread { + struct rb_tree node_map; struct list nodes_list; HANDLE hthread; HWND hwnd; @@ -1146,6 +1148,20 @@ static CRITICAL_SECTION_DEBUG provider_thread_cs_debug = }; static CRITICAL_SECTION provider_thread_cs = { &provider_thread_cs_debug, -1, 0, 0, 0, 0 }; +struct uia_provider_thread_map_entry +{ + struct rb_entry entry; + + SAFEARRAY *runtime_id; + struct list nodes_list; +}; + +static int uia_runtime_id_compare(const void *key, const struct rb_entry *entry) +{ + struct uia_provider_thread_map_entry *prov_entry = RB_ENTRY_VALUE(entry, struct uia_provider_thread_map_entry, entry); + return uia_compare_runtime_ids(prov_entry->runtime_id, (SAFEARRAY *)key); +} + void uia_provider_thread_remove_node(HUIANODE node) { struct uia_node *node_data = impl_from_IWineUiaNode((IWineUiaNode *)node); @@ -1153,17 +1169,28 @@ void uia_provider_thread_remove_node(HUIANODE node) TRACE("Removing node %p\n", node); EnterCriticalSection(&provider_thread_cs); + list_remove(&node_data->prov_thread_list_entry); list_init(&node_data->prov_thread_list_entry); - SafeArrayDestroy(node_data->runtime_id); - node_data->runtime_id = NULL; + if (!list_empty(&node_data->node_map_list_entry)) + { + list_remove(&node_data->node_map_list_entry); + list_init(&node_data->node_map_list_entry); + if (list_empty(&node_data->map->nodes_list)) + { + rb_remove(&provider_thread.node_map, &node_data->map->entry); + SafeArrayDestroy(node_data->map->runtime_id); + heap_free(node_data->map); + } + node_data->map = NULL; + } + LeaveCriticalSection(&provider_thread_cs); } static void uia_provider_thread_disconnect_node(SAFEARRAY *sa) { - struct list *cursor, *cursor2; - struct uia_node *node_data; + struct rb_entry *rb_entry; EnterCriticalSection(&provider_thread_cs); @@ -1171,21 +1198,30 @@ static void uia_provider_thread_disconnect_node(SAFEARRAY *sa) if (!provider_thread.ref) goto exit; - LIST_FOR_EACH_SAFE(cursor, cursor2, &provider_thread.nodes_list) + rb_entry = rb_get(&provider_thread.node_map, sa); + if (rb_entry) { - node_data = LIST_ENTRY(cursor, struct uia_node, prov_thread_list_entry); + struct uia_provider_thread_map_entry *prov_map; + struct list *cursor, *cursor2; + struct uia_node *node_data; - if (node_data->runtime_id) + prov_map = RB_ENTRY_VALUE(rb_entry, struct uia_provider_thread_map_entry, entry); + LIST_FOR_EACH_SAFE(cursor, cursor2, &prov_map->nodes_list) { - if (!uia_compare_runtime_ids(sa, node_data->runtime_id)) - { - list_remove(cursor); - list_init(&node_data->prov_thread_list_entry); - IWineUiaNode_disconnect(&node_data->IWineUiaNode_iface); - SafeArrayDestroy(node_data->runtime_id); - node_data->runtime_id = NULL; - } + node_data = LIST_ENTRY(cursor, struct uia_node, node_map_list_entry); + + list_remove(cursor); + list_remove(&node_data->prov_thread_list_entry); + list_init(&node_data->prov_thread_list_entry); + list_init(&node_data->node_map_list_entry); + node_data->map = NULL; + + IWineUiaNode_disconnect(&node_data->IWineUiaNode_iface); } + + rb_remove(&provider_thread.node_map, &prov_map->entry); + SafeArrayDestroy(prov_map->runtime_id); + heap_free(prov_map); } exit: @@ -1206,8 +1242,38 @@ static HRESULT uia_provider_thread_add_node(HUIANODE node) TRACE("Adding node %p\n", node); EnterCriticalSection(&provider_thread_cs); - node_data->runtime_id = sa; list_add_tail(&provider_thread.nodes_list, &node_data->prov_thread_list_entry); + + /* If we have a runtime ID, create an entry in the rb tree. */ + if (sa) + { + struct uia_provider_thread_map_entry *prov_map; + struct rb_entry *rb_entry; + + if ((rb_entry = rb_get(&provider_thread.node_map, sa))) + { + prov_map = RB_ENTRY_VALUE(rb_entry, struct uia_provider_thread_map_entry, entry); + SafeArrayDestroy(sa); + } + else + { + prov_map = heap_alloc_zero(sizeof(*prov_map)); + if (!prov_map) + { + SafeArrayDestroy(sa); + LeaveCriticalSection(&provider_thread_cs); + return E_OUTOFMEMORY; + } + + prov_map->runtime_id = sa; + list_init(&prov_map->nodes_list); + rb_put(&provider_thread.node_map, sa, &prov_map->entry); + } + + list_add_tail(&prov_map->nodes_list, &node_data->node_map_list_entry); + node_data->map = prov_map; + } + LeaveCriticalSection(&provider_thread_cs); return S_OK; @@ -1311,6 +1377,7 @@ static BOOL uia_start_provider_thread(void) (const WCHAR *)uia_start_provider_thread, &hmodule); list_init(&provider_thread.nodes_list); + rb_init(&provider_thread.node_map, uia_runtime_id_compare); events[0] = ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); if (!(provider_thread.hthread = CreateThread(NULL, 0, uia_provider_thread_proc, ready_event, 0, NULL)))

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2022