November 2022 - Wine-commits

Michael Stefaniuc : dmstyle: Get rid of a no longer used function.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 44400613cb14883b0c347cfae656ac031ada2ff6 URL: https://gitlab.winehq.org/wine/wine/-/commit/44400613cb14883b0c347cfae656ac… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 29 00:49:53 2022 +0100 dmstyle: Get rid of a no longer used function. --- dlls/dmstyle/dmutils.c | 72 -------------------------------------------------- dlls/dmstyle/dmutils.h | 1 - 2 files changed, 73 deletions(-) diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index 58a1c40622a..4b9101e675a 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -143,75 +143,3 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* p return S_OK; } - -HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject) { - DMUS_PRIVATE_CHUNK Chunk; - DWORD ListSize[3], ListCount[3]; - LARGE_INTEGER liMove; /* used when skipping chunks */ - HRESULT hr; - - DMUS_IO_REFERENCE ref; - DMUS_OBJECTDESC ref_desc; - - memset(&ref, 0, sizeof(ref)); - memset(&ref_desc, 0, sizeof(ref_desc)); - - if (pChunk->fccID != DMUS_FOURCC_REF_LIST) { - ERR(": %s chunk should be a REF list\n", debugstr_fourcc (pChunk->fccID)); - return E_FAIL; - } - - ListSize[0] = pChunk->dwSize - sizeof(FOURCC); - ListCount[0] = 0; - - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - - hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &ref_desc); - if (FAILED(hr)) return hr; - - if (hr == S_FALSE) { - switch (Chunk.fccID) { - case DMUS_FOURCC_REF_CHUNK: { - TRACE(": Reference chunk\n"); - if (Chunk.dwSize != sizeof(DMUS_IO_REFERENCE)) return E_FAIL; - IStream_Read (pStm, &ref, sizeof(DMUS_IO_REFERENCE), NULL); - TRACE(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID)); - TRACE(" - dwValidData: %lu\n", ref.dwValidData); - break; - } - default: { - TRACE(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - } - TRACE(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); - - ref_desc.dwValidData |= DMUS_OBJ_CLASS; - ref_desc.guidClass = ref.guidClassID; - - TRACE("** DM Reference Begin of Load ***\n"); - TRACE("With Desc:\n"); - dump_DMUS_OBJECTDESC(&ref_desc); - - { - LPDIRECTMUSICGETLOADER pGetLoader = NULL; - LPDIRECTMUSICLOADER pLoader = NULL; - - IStream_QueryInterface (pStm, &IID_IDirectMusicGetLoader, (LPVOID*)&pGetLoader); - IDirectMusicGetLoader_GetLoader (pGetLoader, &pLoader); - IDirectMusicGetLoader_Release (pGetLoader); - - hr = IDirectMusicLoader_GetObject (pLoader, &ref_desc, &IID_IDirectMusicObject, (LPVOID*)ppObject); - IDirectMusicLoader_Release (pLoader); /* release loader */ - } - TRACE("** DM Reference End of Load ***\n"); - - return hr; -} diff --git a/dlls/dmstyle/dmutils.h b/dlls/dmstyle/dmutils.h index 2f13c4b1f44..dbeb7a2a978 100644 --- a/dlls/dmstyle/dmutils.h +++ b/dlls/dmstyle/dmutils.h @@ -32,6 +32,5 @@ typedef struct _DMUS_PRIVATE_CHUNK { */ extern HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; extern HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; -extern HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject) DECLSPEC_HIDDEN; #endif /* __WINE_DMUTILS_H */

1 0

Michael Stefaniuc : dmstyle: Move a struct declaration to the file it is used in.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: b58c88d14dd1943a265ead68cb83e8dd1dd9a112 URL: https://gitlab.winehq.org/wine/wine/-/commit/b58c88d14dd1943a265ead68cb83e8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 30 00:08:26 2022 +0100 dmstyle: Move a struct declaration to the file it is used in. And get rid of the typedef for that struct. --- dlls/dmstyle/dmstyle_private.h | 7 ------- dlls/dmstyle/styletrack.c | 32 +++++++++++++++++--------------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index fbe635e4388..0d7ede7f00d 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -55,13 +55,6 @@ extern HRESULT create_dmstyletrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDE /***************************************************************************** * Auxiliary definitions */ -typedef struct _DMUS_PRIVATE_STYLE_ITEM { - struct list entry; /* for listing elements */ - DWORD timestamp; - IDirectMusicStyle8* pObject; -} DMUS_PRIVATE_STYLE_ITEM, *LPDMUS_PRIVATE_STYLE_ITEM; - - typedef struct _DMUS_PRIVATE_COMMAND { struct list entry; /* for listing elements */ DMUS_IO_COMMAND pCommand; diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 822072bdb27..83b03807ddf 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -27,6 +27,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); /***************************************************************************** * IDirectMusicStyleTrack implementation */ +struct style_item { + struct list entry; + DWORD timestamp; + IDirectMusicStyle8 *dmstyle; +}; + typedef struct IDirectMusicStyleTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; struct dmobject dmobj; /* IPersistStream only */ @@ -81,14 +87,11 @@ static ULONG WINAPI style_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { - struct list *cursor, *cursor2; - DMUS_PRIVATE_STYLE_ITEM *item; - - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->Items) { - item = LIST_ENTRY(cursor, DMUS_PRIVATE_STYLE_ITEM, entry); - list_remove(cursor); + struct style_item *item, *item2; - IDirectMusicStyle8_Release(item->pObject); + LIST_FOR_EACH_ENTRY_SAFE(item, item2, &This->Items, struct style_item, entry) { + list_remove(&item->entry); + IDirectMusicStyle8_Release(item->dmstyle); free(item); } @@ -135,7 +138,7 @@ static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty MUSIC_TIME time, MUSIC_TIME *next, void *param) { IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - struct list *item = NULL; + struct style_item *item; TRACE("(%p, %s, %ld, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); @@ -143,10 +146,9 @@ static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty return E_POINTER; if (IsEqualGUID(&GUID_IDirectMusicStyle, type)) { - LIST_FOR_EACH (item, &This->Items) { - DMUS_PRIVATE_STYLE_ITEM *style = LIST_ENTRY(item, DMUS_PRIVATE_STYLE_ITEM, entry); - IDirectMusicStyle8_AddRef(style->pObject); - *((IDirectMusicStyle8 **)param) = style->pObject; + LIST_FOR_EACH_ENTRY(item, &This->Items, struct style_item, entry) { + IDirectMusicStyle8_AddRef(item->dmstyle); + *((IDirectMusicStyle8 **)param) = item->dmstyle; return S_OK; } @@ -304,7 +306,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, IStream *stream, co { struct chunk_entry chunk = {.parent = strf}; IDirectMusicObject *dmobj; - DMUS_PRIVATE_STYLE_ITEM *item; + struct style_item *item; HRESULT hr; /* First chunk is a timestamp */ @@ -326,7 +328,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, IStream *stream, co WARN("Failed to load reference: %#lx\n", hr); goto error; } - hr = IDirectMusicObject_QueryInterface(dmobj, &IID_IDirectMusicStyle8, (void **)&item->pObject); + hr = IDirectMusicObject_QueryInterface(dmobj, &IID_IDirectMusicStyle8, (void **)&item->dmstyle); if (FAILED(hr)) { WARN("Reference not an IDirectMusicStyle8\n"); IDirectMusicObject_Release(dmobj); @@ -334,7 +336,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, IStream *stream, co } list_add_tail(&This->Items, &item->entry); - TRACE("Found reference to style %p with timestamp %lu\n", item->pObject, item->timestamp); + TRACE("Found reference to style %p with timestamp %lu\n", item->dmstyle, item->timestamp); return S_OK;

1 0

Connor McAdams : uiautomationcore: Add UiaRemoveEvent stub.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 922706bd1e7ac4da9d77bb5be7f7c395d3374ec1 URL: https://gitlab.winehq.org/wine/wine/-/commit/922706bd1e7ac4da9d77bb5be7f7c3… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sun Oct 30 14:33:46 2022 -0400 uiautomationcore: Add UiaRemoveEvent stub. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 9 +++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 5e2026536d5..badbf8a1618 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -3013,3 +3013,12 @@ exit: return hr; } + +/*********************************************************************** + * UiaRemoveEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaRemoveEvent(HUIAEVENT huiaevent) +{ + FIXME("(%p): stub\n", huiaevent); + return E_NOTIMPL; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 0ad0cb6f437..5c33e1e926a 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -92,7 +92,7 @@ @ stub UiaRaiseStructureChangedEvent #@ stub UiaRaiseTextEditTextChangedEvent @ stdcall UiaRegisterProviderCallback(ptr) -@ stub UiaRemoveEvent +@ stdcall UiaRemoveEvent(ptr) @ stdcall UiaReturnRawElementProvider(long long long ptr) @ stub UiaSetFocus @ stub UiaTextRangeRelease diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index efb5eb35d06..cc38354f713 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -418,6 +418,7 @@ HRESULT WINAPI UiaNavigate(HUIANODE huianode, enum NavigateDirection dir, struct struct UiaCacheRequest *cache_req, SAFEARRAY **out_req, BSTR *tree_struct); HRESULT WINAPI UiaFind(HUIANODE huianode, struct UiaFindParams *find_params, struct UiaCacheRequest *cache_req, SAFEARRAY **out_req, SAFEARRAY **out_offsets, SAFEARRAY **out_tree_structs); +HRESULT WINAPI UiaRemoveEvent(HUIAEVENT huiaevent); #ifdef __cplusplus }

1 0

Connor McAdams : uiautomationcore: Add UiaEventAddWindow stub.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 9ea53ec2f6c4d67792507b8a3ed80f8cfffacf98 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ea53ec2f6c4d67792507b8a3ed80f… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sun Oct 30 14:37:53 2022 -0400 uiautomationcore: Add UiaEventAddWindow stub. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 9 +++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index badbf8a1618..cc77d8ab8a4 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -3022,3 +3022,12 @@ HRESULT WINAPI UiaRemoveEvent(HUIAEVENT huiaevent) FIXME("(%p): stub\n", huiaevent); return E_NOTIMPL; } + +/*********************************************************************** + * UiaEventAddWindow (uiautomationcore.@) + */ +HRESULT WINAPI UiaEventAddWindow(HUIAEVENT huiaevent, HWND hwnd) +{ + FIXME("(%p, %p): stub\n", huiaevent, hwnd); + return E_NOTIMPL; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 5c33e1e926a..1df5dfda851 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -57,7 +57,7 @@ @ stdcall UiaClientsAreListening() #@ stub UiaDisconnectAllProviders @ stdcall UiaDisconnectProvider(ptr) -@ stub UiaEventAddWindow +@ stdcall UiaEventAddWindow(ptr long) @ stub UiaEventRemoveWindow @ stdcall UiaFind(ptr ptr ptr ptr ptr ptr) @ stub UiaGetErrorDescription diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index cc38354f713..f5adb29393b 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -419,6 +419,7 @@ HRESULT WINAPI UiaNavigate(HUIANODE huianode, enum NavigateDirection dir, struct HRESULT WINAPI UiaFind(HUIANODE huianode, struct UiaFindParams *find_params, struct UiaCacheRequest *cache_req, SAFEARRAY **out_req, SAFEARRAY **out_offsets, SAFEARRAY **out_tree_structs); HRESULT WINAPI UiaRemoveEvent(HUIAEVENT huiaevent); +HRESULT WINAPI UiaEventAddWindow(HUIAEVENT huiaevent, HWND hwnd); #ifdef __cplusplus }

1 0

Connor McAdams : uiautomationcore: Add UiaEventRemoveWindow stub.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 41736eb5542561a3db3af639a18c27775e8ce19c URL: https://gitlab.winehq.org/wine/wine/-/commit/41736eb5542561a3db3af639a18c27… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sun Oct 30 14:39:57 2022 -0400 uiautomationcore: Add UiaEventRemoveWindow stub. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 9 +++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index cc77d8ab8a4..f7b3536802f 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -3031,3 +3031,12 @@ HRESULT WINAPI UiaEventAddWindow(HUIAEVENT huiaevent, HWND hwnd) FIXME("(%p, %p): stub\n", huiaevent, hwnd); return E_NOTIMPL; } + +/*********************************************************************** + * UiaEventRemoveWindow (uiautomationcore.@) + */ +HRESULT WINAPI UiaEventRemoveWindow(HUIAEVENT huiaevent, HWND hwnd) +{ + FIXME("(%p, %p): stub\n", huiaevent, hwnd); + return E_NOTIMPL; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 1df5dfda851..63df49980fc 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -58,7 +58,7 @@ #@ stub UiaDisconnectAllProviders @ stdcall UiaDisconnectProvider(ptr) @ stdcall UiaEventAddWindow(ptr long) -@ stub UiaEventRemoveWindow +@ stdcall UiaEventRemoveWindow(ptr long) @ stdcall UiaFind(ptr ptr ptr ptr ptr ptr) @ stub UiaGetErrorDescription @ stub UiaGetPatternProvider diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index f5adb29393b..9902a6d68e4 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -420,6 +420,7 @@ HRESULT WINAPI UiaFind(HUIANODE huianode, struct UiaFindParams *find_params, str SAFEARRAY **out_offsets, SAFEARRAY **out_tree_structs); HRESULT WINAPI UiaRemoveEvent(HUIAEVENT huiaevent); HRESULT WINAPI UiaEventAddWindow(HUIAEVENT huiaevent, HWND hwnd); +HRESULT WINAPI UiaEventRemoveWindow(HUIAEVENT huiaevent, HWND hwnd); #ifdef __cplusplus }

1 0

Connor McAdams : uiautomationcore: Add UiaAddEvent stub.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: c0360db5611cd70f8a00eee77191db546bcc5b3a URL: https://gitlab.winehq.org/wine/wine/-/commit/c0360db5611cd70f8a00eee77191db… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sun Oct 30 14:58:30 2022 -0400 uiautomationcore: Add UiaAddEvent stub. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 11 +++++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index f7b3536802f..14f9977a4d6 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -3014,6 +3014,17 @@ exit: return hr; } +/*********************************************************************** + * UiaAddEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaAddEvent(HUIANODE huianode, EVENTID event_id, UiaEventCallback *callback, enum TreeScope scope, + PROPERTYID *prop_ids, int prop_ids_count, struct UiaCacheRequest *cache_req, HUIAEVENT *huiaevent) +{ + FIXME("(%p, %d, %p, %#x, %p, %d, %p, %p)\n", huianode, event_id, callback, scope, prop_ids, prop_ids_count, + cache_req, huiaevent); + return E_NOTIMPL; +} + /*********************************************************************** * UiaRemoveEvent (uiautomationcore.@) */ diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 63df49980fc..11ca7be7f97 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -53,7 +53,7 @@ @ stub TransformPattern_Move @ stub TransformPattern_Resize @ stub TransformPattern_Rotate -@ stub UiaAddEvent +@ stdcall UiaAddEvent(ptr long ptr long ptr long ptr ptr) @ stdcall UiaClientsAreListening() #@ stub UiaDisconnectAllProviders @ stdcall UiaDisconnectProvider(ptr) diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 9902a6d68e4..ef94c72d162 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -393,6 +393,7 @@ struct UiaFindParams { }; typedef SAFEARRAY * WINAPI UiaProviderCallback(HWND hwnd,enum ProviderType providerType); +typedef void WINAPI UiaEventCallback(struct UiaEventArgs *pArgs,SAFEARRAY *pRequestedData,BSTR pTreeStructure); HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value); HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); @@ -418,6 +419,8 @@ HRESULT WINAPI UiaNavigate(HUIANODE huianode, enum NavigateDirection dir, struct struct UiaCacheRequest *cache_req, SAFEARRAY **out_req, BSTR *tree_struct); HRESULT WINAPI UiaFind(HUIANODE huianode, struct UiaFindParams *find_params, struct UiaCacheRequest *cache_req, SAFEARRAY **out_req, SAFEARRAY **out_offsets, SAFEARRAY **out_tree_structs); +HRESULT WINAPI UiaAddEvent(HUIANODE huianode, EVENTID event_id, UiaEventCallback *callback, enum TreeScope scope, + PROPERTYID *prop_ids, int prop_ids_count, struct UiaCacheRequest *cache_req, HUIAEVENT *huiaevent); HRESULT WINAPI UiaRemoveEvent(HUIAEVENT huiaevent); HRESULT WINAPI UiaEventAddWindow(HUIAEVENT huiaevent, HWND hwnd); HRESULT WINAPI UiaEventRemoveWindow(HUIAEVENT huiaevent, HWND hwnd);

1 0

Rémi Bernon : ntdll: Merge next free block before resizing in heap_reallocate.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 0c5f9e8d4ee0603ebf0a5f13065e520e08c58f2d URL: https://gitlab.winehq.org/wine/wine/-/commit/0c5f9e8d4ee0603ebf0a5f13065e52… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 25 18:00:52 2022 +0100 ntdll: Merge next free block before resizing in heap_reallocate. --- dlls/ntdll/heap.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 0c7300f8055..9a524b1a1aa 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1639,7 +1639,10 @@ BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE handle, ULONG flags, void * static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *block, SIZE_T block_size, SIZE_T size, void **ret ) { + SUBHEAP *subheap = block_get_subheap( heap, block ); SIZE_T old_block_size, old_size; + struct entry *entry; + struct block *next; NTSTATUS status; if (block_get_flags( block ) & BLOCK_FLAG_LARGE) @@ -1654,12 +1657,9 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b old_block_size = block_get_size( block ); old_size = old_block_size - block_get_overhead( block ); + if (block_size > old_block_size) { - SUBHEAP *subheap = block_get_subheap( heap, block ); - struct entry *entry; - struct block *next; - if (!(next = next_block( subheap, block )) || !(block_get_flags( next ) & BLOCK_FLAG_FREE) || block_size >= HEAP_MIN_LARGE_BLOCK_SIZE || block_size > old_block_size + block_get_size( next ) || !subheap_commit( heap, subheap, block, block_size )) @@ -1673,8 +1673,11 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b free_used_block( heap, flags, block ); return STATUS_SUCCESS; } + } - /* The next block is free and large enough */ + if ((next = next_block( subheap, block )) && (block_get_flags( next ) & BLOCK_FLAG_FREE)) + { + /* merge with next block if it is free */ entry = (struct entry *)next; list_remove( &entry->entry ); old_block_size += block_get_size( next );

1 0

Rémi Bernon : ntdll: Move large block resize in heap_reallocate.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 4334c5b0c10ecc5675e4bb595f5d0e50eeb2eb1b URL: https://gitlab.winehq.org/wine/wine/-/commit/4334c5b0c10ecc5675e4bb595f5d0e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 25 00:14:57 2022 +0100 ntdll: Move large block resize in heap_reallocate. --- dlls/ntdll/heap.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 9a524b1a1aa..505900b2573 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -878,19 +878,6 @@ static struct block *realloc_large_block( struct heap *heap, DWORD flags, struct SIZE_T old_size = arena->data_size; char *data = (char *)(block + 1); - if (arena->block_size - sizeof(*block) >= size) - { - /* FIXME: we could remap zero-pages instead */ - valgrind_notify_resize( data, old_size, size ); - initialize_block( block, old_size, size, flags ); - - arena->data_size = size; - valgrind_make_noaccess( (char *)block + sizeof(*block) + arena->data_size, - arena->block_size - sizeof(*block) - arena->data_size ); - - return block; - } - if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return NULL; if (!(block = allocate_large_block( heap, flags, size ))) { @@ -1647,7 +1634,24 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b if (block_get_flags( block ) & BLOCK_FLAG_LARGE) { - if (!(block = realloc_large_block( heap, flags, block, size ))) return STATUS_NO_MEMORY; + ARENA_LARGE *large = CONTAINING_RECORD( block, ARENA_LARGE, block ); + old_block_size = large->block_size; + old_size = large->data_size; + + if (old_block_size - sizeof(*block) < size) + { + if (!(block = realloc_large_block( heap, flags, block, size ))) return STATUS_NO_MEMORY; + *ret = block + 1; + return STATUS_SUCCESS; + } + + /* FIXME: we could remap zero-pages instead */ + valgrind_notify_resize( block + 1, old_size, size ); + initialize_block( block, old_size, size, flags ); + + large->data_size = size; + valgrind_make_noaccess( (char *)block + sizeof(*block) + large->data_size, + old_block_size - sizeof(*block) - large->data_size ); *ret = block + 1; return STATUS_SUCCESS;

1 0

Rémi Bernon : ntdll: Return the old data size from heap_reallocate.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: ce450253bd282fc92dd9f1a5e48abd2522a901ba URL: https://gitlab.winehq.org/wine/wine/-/commit/ce450253bd282fc92dd9f1a5e48abd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 25 00:18:21 2022 +0100 ntdll: Return the old data size from heap_reallocate. --- dlls/ntdll/heap.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 505900b2573..d2c5ee1ff3a 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1623,11 +1623,11 @@ BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE handle, ULONG flags, void * } -static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *block, - SIZE_T block_size, SIZE_T size, void **ret ) +static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *block, SIZE_T block_size, + SIZE_T size, SIZE_T *old_size, void **ret ) { SUBHEAP *subheap = block_get_subheap( heap, block ); - SIZE_T old_block_size, old_size; + SIZE_T old_block_size; struct entry *entry; struct block *next; NTSTATUS status; @@ -1636,7 +1636,7 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b { ARENA_LARGE *large = CONTAINING_RECORD( block, ARENA_LARGE, block ); old_block_size = large->block_size; - old_size = large->data_size; + *old_size = large->data_size; if (old_block_size - sizeof(*block) < size) { @@ -1646,8 +1646,8 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b } /* FIXME: we could remap zero-pages instead */ - valgrind_notify_resize( block + 1, old_size, size ); - initialize_block( block, old_size, size, flags ); + valgrind_notify_resize( block + 1, *old_size, size ); + initialize_block( block, *old_size, size, flags ); large->data_size = size; valgrind_make_noaccess( (char *)block + sizeof(*block) + large->data_size, @@ -1660,7 +1660,7 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b /* Check if we need to grow the block */ old_block_size = block_get_size( block ); - old_size = old_block_size - block_get_overhead( block ); + *old_size = old_block_size - block_get_overhead( block ); if (block_size > old_block_size) { @@ -1671,8 +1671,8 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return STATUS_NO_MEMORY; if ((status = heap_allocate( heap, flags & ~HEAP_ZERO_MEMORY, block_size, size, ret ))) return status; valgrind_notify_alloc( *ret, size, 0 ); - memcpy( *ret, block + 1, old_size ); - if (flags & HEAP_ZERO_MEMORY) memset( (char *)*ret + old_size, 0, size - old_size ); + memcpy( *ret, block + 1, *old_size ); + if (flags & HEAP_ZERO_MEMORY) memset( (char *)*ret + *old_size, 0, size - *old_size ); valgrind_notify_free( block + 1 ); free_used_block( heap, flags, block ); return STATUS_SUCCESS; @@ -1687,11 +1687,11 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b old_block_size += block_get_size( next ); } - valgrind_notify_resize( block + 1, old_size, size ); + valgrind_notify_resize( block + 1, *old_size, size ); block_set_flags( block, BLOCK_FLAG_USER_MASK & ~BLOCK_FLAG_USER_INFO, BLOCK_USER_FLAGS( flags ) ); shrink_used_block( heap, flags, block, old_block_size, block_size, size ); - initialize_block( block, old_size, size, flags ); + initialize_block( block, *old_size, size, flags ); mark_block_tail( block, flags ); *ret = block + 1; @@ -1703,9 +1703,9 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b */ void *WINAPI RtlReAllocateHeap( HANDLE handle, ULONG flags, void *ptr, SIZE_T size ) { + SIZE_T block_size, old_size; struct block *block; struct heap *heap; - SIZE_T block_size; ULONG heap_flags; void *ret = NULL; NTSTATUS status; @@ -1721,7 +1721,7 @@ void *WINAPI RtlReAllocateHeap( HANDLE handle, ULONG flags, void *ptr, SIZE_T si else { heap_lock( heap, heap_flags ); - status = heap_reallocate( heap, heap_flags, block, block_size, size, &ret ); + status = heap_reallocate( heap, heap_flags, block, block_size, size, &old_size, &ret ); heap_unlock( heap, heap_flags ); }

1 0

Rémi Bernon : ntdll: Make realloc implementation more generic.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: a7fda2f8cb7e09b16fd7dc0ce2e40b5939757e78 URL: https://gitlab.winehq.org/wine/wine/-/commit/a7fda2f8cb7e09b16fd7dc0ce2e40b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 15 00:50:05 2022 +0100 ntdll: Make realloc implementation more generic. Either resizing a block in place, or reallocating through RtlHeap calls. --- dlls/ntdll/heap.c | 74 ++++++++++++++++++------------------------------------- 1 file changed, 24 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index d2c5ee1ff3a..31650433aa5 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -869,31 +869,6 @@ static void free_large_block( struct heap *heap, struct block *block ) } -/*********************************************************************** - * realloc_large_block - */ -static struct block *realloc_large_block( struct heap *heap, DWORD flags, struct block *block, SIZE_T size ) -{ - ARENA_LARGE *arena = CONTAINING_RECORD( block, ARENA_LARGE, block ); - SIZE_T old_size = arena->data_size; - char *data = (char *)(block + 1); - - if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return NULL; - if (!(block = allocate_large_block( heap, flags, size ))) - { - WARN( "Could not allocate block for %#Ix bytes\n", size ); - return NULL; - } - - valgrind_notify_alloc( block + 1, size, 0 ); - memcpy( block + 1, data, old_size ); - valgrind_notify_free( data ); - free_large_block( heap, &arena->block ); - - return block; -} - - /*********************************************************************** * find_large_block */ @@ -1622,15 +1597,13 @@ BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE handle, ULONG flags, void * return !status; } - -static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *block, SIZE_T block_size, - SIZE_T size, SIZE_T *old_size, void **ret ) +static NTSTATUS heap_resize_block( struct heap *heap, ULONG flags, struct block *block, SIZE_T block_size, + SIZE_T size, SIZE_T *old_size, void **ret ) { SUBHEAP *subheap = block_get_subheap( heap, block ); SIZE_T old_block_size; struct entry *entry; struct block *next; - NTSTATUS status; if (block_get_flags( block ) & BLOCK_FLAG_LARGE) { @@ -1638,12 +1611,8 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b old_block_size = large->block_size; *old_size = large->data_size; - if (old_block_size - sizeof(*block) < size) - { - if (!(block = realloc_large_block( heap, flags, block, size ))) return STATUS_NO_MEMORY; - *ret = block + 1; - return STATUS_SUCCESS; - } + if (block_size < HEAP_MIN_LARGE_BLOCK_SIZE / 4) return STATUS_NO_MEMORY; /* shrinking large block to small block */ + if (old_block_size < block_size) return STATUS_NO_MEMORY; /* FIXME: we could remap zero-pages instead */ valgrind_notify_resize( block + 1, *old_size, size ); @@ -1657,25 +1626,20 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b return STATUS_SUCCESS; } - /* Check if we need to grow the block */ - old_block_size = block_get_size( block ); *old_size = old_block_size - block_get_overhead( block ); + if (block_size >= HEAP_MIN_LARGE_BLOCK_SIZE) return STATUS_NO_MEMORY; /* growing small block to large block */ + + heap_lock( heap, flags ); + if (block_size > old_block_size) { if (!(next = next_block( subheap, block )) || !(block_get_flags( next ) & BLOCK_FLAG_FREE) || - block_size >= HEAP_MIN_LARGE_BLOCK_SIZE || block_size > old_block_size + block_get_size( next ) || !subheap_commit( heap, subheap, block, block_size )) { - if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return STATUS_NO_MEMORY; - if ((status = heap_allocate( heap, flags & ~HEAP_ZERO_MEMORY, block_size, size, ret ))) return status; - valgrind_notify_alloc( *ret, size, 0 ); - memcpy( *ret, block + 1, *old_size ); - if (flags & HEAP_ZERO_MEMORY) memset( (char *)*ret + *old_size, 0, size - *old_size ); - valgrind_notify_free( block + 1 ); - free_used_block( heap, flags, block ); - return STATUS_SUCCESS; + heap_unlock( heap, flags ); + return STATUS_NO_MEMORY; } } @@ -1694,6 +1658,8 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b initialize_block( block, *old_size, size, flags ); mark_block_tail( block, flags ); + heap_unlock( heap, flags ); + *ret = block + 1; return STATUS_SUCCESS; } @@ -1718,11 +1684,19 @@ void *WINAPI RtlReAllocateHeap( HANDLE handle, ULONG flags, void *ptr, SIZE_T si status = STATUS_NO_MEMORY; else if (!(block = unsafe_block_from_ptr( heap, heap_flags, ptr ))) status = STATUS_INVALID_PARAMETER; - else + else if ((status = heap_resize_block( heap, heap_flags, block, block_size, size, + &old_size, &ret ))) { - heap_lock( heap, heap_flags ); - status = heap_reallocate( heap, heap_flags, block, block_size, size, &old_size, &ret ); - heap_unlock( heap, heap_flags ); + if (flags & HEAP_REALLOC_IN_PLACE_ONLY) + status = STATUS_NO_MEMORY; + else if (!(ret = RtlAllocateHeap( heap, flags, size ))) + status = STATUS_NO_MEMORY; + else + { + memcpy( ret, ptr, min( size, old_size ) ); + RtlFreeHeap( heap, flags, ptr ); + status = STATUS_SUCCESS; + } } TRACE( "handle %p, flags %#lx, ptr %p, size %#Ix, return %p, status %#lx.\n", handle, flags, ptr, size, ret, status );

1 0