June 2022 - Wine-Devel - list.winehq.org

[PATCH 1/6] ntdll: Implement RtlGetUserValueHeap.

by Rémi Bernon

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 2 -- dlls/ntdll/heap.c | 29 +++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 4221fd39c0f..339921b83c3 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -2320,7 +2320,6 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags tmp_flags = 0; ret = pRtlGetUserInfoHeap( heap, 0, ptr0, (void **)&tmp_ptr, &tmp_flags ); ok( ret, "RtlGetUserInfoHeap failed, error %lu\n", GetLastError() ); - todo_wine ok( tmp_ptr == (void *)0xdeadbeef, "got ptr %p\n", tmp_ptr ); todo_wine ok( tmp_flags == 0xa00 || broken(tmp_flags == 0xc00) /* w1064v1507 */, @@ -2335,7 +2334,6 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags tmp_flags = 0; ret = pRtlGetUserInfoHeap( heap, 0, ptr0, (void **)&tmp_ptr, &tmp_flags ); ok( ret, "RtlGetUserInfoHeap failed, error %lu\n", GetLastError() ); - todo_wine ok( tmp_ptr == (void *)0xdeadbee0, "got ptr %p\n", tmp_ptr ); todo_wine ok( tmp_flags == 0xa00 || broken(tmp_flags == 0xc00) /* w1064v1507 */, diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 64d4f6644af..8ebd561dd1c 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1996,12 +1996,33 @@ NTSTATUS WINAPI RtlSetHeapInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_ /*********************************************************************** * RtlGetUserInfoHeap (NTDLL.@) */ -BOOLEAN WINAPI RtlGetUserInfoHeap( HANDLE heap, ULONG flags, void *ptr, void **user_value, ULONG *user_flags ) +BOOLEAN WINAPI RtlGetUserInfoHeap( HANDLE handle, ULONG flags, void *ptr, void **user_value, ULONG *user_flags ) { - FIXME( "heap %p, flags %#x, ptr %p, user_value %p, user_flags %p semi-stub!\n", - heap, flags, ptr, user_value, user_flags ); - *user_value = NULL; + ARENA_LARGE *large = (ARENA_LARGE *)ptr - 1; + struct block *block; + SUBHEAP *subheap; + HEAP *heap; + char *tmp; + + TRACE( "handle %p, flags %#x, ptr %p, user_value %p, user_flags %p semi-stub!\n", + handle, flags, ptr, user_value, user_flags ); + + *user_value = 0; *user_flags = 0; + + if (!(heap = HEAP_GetPtr( handle ))) return TRUE; + + heap_lock( heap, flags ); + if ((block = unsafe_block_from_ptr( heap, ptr, &subheap )) && !subheap) + *user_value = large->user_value; + else if (block) + { + tmp = (char *)block + block_get_size( block ) - block->tail_size + sizeof(void *); + if ((heap_get_flags( heap, flags ) & HEAP_TAIL_CHECKING_ENABLED) || RUNNING_ON_VALGRIND) tmp += ALIGNMENT; + *user_value = *(void **)tmp; + } + heap_unlock( heap, flags ); + return TRUE; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/222

June 10, 2022

[PATCH 0/6] MR222: ntdll: Implement RtlGetUserValueHeap and use it in Local/Global alloc.

by Rémi Bernon

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/222

June 10, 2022

Re: [PATCH vkd3d] include: Add ID3D12Device2 declaration in vkd3d_d3d12.idl.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 10, 2022

Re: [PATCH vkd3d 2/2] include: Add ID3D12SharingContract interface declarations in vkd3d_d3d12sdklayers.idl.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 10, 2022

Re: [PATCH vkd3d 1/2] include: Add ID3D12DebugDevice interface declarations in vkd3d_d3d12sdklayers.idl.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 10, 2022

Re: [PATCH 0/1] MR221: comctl32: Fix integer overflow in DPA_Search. - approved

by Zhiyi Zhang (＠zhiyi)

This merge request was approved by Zhiyi Zhang. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/221

June 10, 2022

Re: [PATCH v2 resend 6/6] comctl32/listview: Fix deselect on LVS_OWNERDATA.

by Zhiyi Zhang

On 5/26/22 04:00, Angelo Haller wrote: > From: Angelo Haller <angelo(a)szanni.org> > > Send one "deselect all items" notification on selection change for > LVS_OWNERDATA listviews instead of notifying about each individual > item change. > > Enable LVS_OWNERDATA multi select tests for wine. > > Signed-off-by: Angelo Haller <angelo(a)szanni.org> > --- > dlls/comctl32/listview.c | 6 ++++++ > dlls/comctl32/tests/listview.c | 8 ++++---- > 2 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c > index bb394974906..a71e34b99d9 100644 > --- a/dlls/comctl32/listview.c > +++ b/dlls/comctl32/listview.c > @@ -3406,6 +3406,12 @@ static BOOL LISTVIEW_DeselectAllSkipItems(LISTVIEW_INFO *infoPtr, RANGES toSkip) > > lvItem.state = 0; > lvItem.stateMask = LVIS_SELECTED; > + > + /* notify deselect of all items (-1) on LVS_OWNERDATA style */ > + if (infoPtr->dwStyle & LVS_OWNERDATA) { > + LISTVIEW_SetItemState(infoPtr, -1, &lvItem); > + return TRUE; > + } Please add a separate test for this. Select and then deselect all items instead of mixing it with other tests. > > /* need to clone the DPA because callbacks can change it */ > if (!(clone = ranges_clone(infoPtr->selectionRanges))) return FALSE; > diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c > index 78b3e3ae069..066858ac7e8 100644 > --- a/dlls/comctl32/tests/listview.c > +++ b/dlls/comctl32/tests/listview.c > @@ -3598,7 +3598,7 @@ static void test_ownerdata_multiselect(void) > > ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, > ownerdata_multiselect_select_0_to_1_seq, > - "ownerdata multiselect: select multiple via SHIFT", TRUE); > + "ownerdata multiselect: select multiple via SHIFT", FALSE); > > res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); > expect(0, res); > @@ -3615,7 +3615,7 @@ static void test_ownerdata_multiselect(void) > > ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, > ownerdata_multiselect_select_0_to_2_seq, > - "ownerdata multiselect: select multiple via SHIFT+CONTROL", TRUE); > + "ownerdata multiselect: select multiple via SHIFT+CONTROL", FALSE); > > res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); > expect(0, res); > @@ -3633,7 +3633,7 @@ static void test_ownerdata_multiselect(void) > > ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, > ownerdata_multiselect_deselect_all_select_3_seq, > - "ownerdata multiselect: deselect all, select item 3", TRUE); > + "ownerdata multiselect: deselect all, select item 3", FALSE); > > res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); > expect(1, res); > @@ -3645,7 +3645,7 @@ static void test_ownerdata_multiselect(void) > > ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, > ownerdata_multiselect_deselect_3_select_2_seq, > - "ownerdata multiselect: deselect item 3, select item 2", TRUE); > + "ownerdata multiselect: deselect item 3, select item 2", FALSE);; Extra ; Thanks, Zhiyi > > DestroyWindow(hwnd); > }

June 10, 2022

Re: [PATCH v2 resend 5/6] comctl32/listview: Send LVN_ODSTATECHANGED only for true ranges.

by Zhiyi Zhang

On 5/26/22 04:00, Angelo Haller wrote: > From: Angelo Haller <angelo(a)szanni.org> > > Signed-off-by: Angelo Haller <angelo(a)szanni.org> > --- > dlls/comctl32/listview.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c > index 3c3f5af2a27..bb394974906 100644 > --- a/dlls/comctl32/listview.c > +++ b/dlls/comctl32/listview.c > @@ -8953,6 +8953,7 @@ static VOID LISTVIEW_SetOwnerDataState(LISTVIEW_INFO *infoPtr, INT nFirst, INT n > NMLVODSTATECHANGE nmlv; > > if (!(infoPtr->dwStyle & LVS_OWNERDATA)) return; > + if (nFirst == nLast) return; > if (!item) return; > > ZeroMemory(&nmlv, sizeof(nmlv)); Add a test for this as well. You can merge it with the tests for 3/6.

June 10, 2022

Re: [PATCH v2 resend 4/6] comctl32/listview: Send LVN_ODSTATECHANGED notification.

by Zhiyi Zhang

On 5/26/22 04:00, Angelo Haller wrote: > From: Angelo Haller <angelo(a)szanni.org> > > Send LVN_ODSTATECHANGED notification on selection change for > listviews when LVS_OWNERDATA is set. > > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52534 > Signed-off-by: Angelo Haller <angelo(a)szanni.org> > --- > dlls/comctl32/listview.c | 16 +++++++++++----- > 1 file changed, 11 insertions(+), 5 deletions(-) > > diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c > index 318df0a4093..3c3f5af2a27 100644 > --- a/dlls/comctl32/listview.c > +++ b/dlls/comctl32/listview.c > @@ -3597,6 +3597,8 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) > */ > static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) > { > + INT nFirst = -1; > + INT nLast = -1; Let's merge it to a single line. > RANGES selection; > DWORD old_mask; > LVITEMW item; > @@ -3648,21 +3650,25 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) > iterator_destroy(&i); > } > > - /* disable per item notifications on LVS_OWNERDATA style > - FIXME: single LVN_ODSTATECHANGED should be used */ > + /* disable per item notifications on LVS_OWNERDATA style */ > old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; > if (infoPtr->dwStyle & LVS_OWNERDATA) > infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; > > LISTVIEW_DeselectAllSkipItems(infoPtr, selection); > > - > iterator_rangesitems(&i, selection); > - while(iterator_next(&i)) > - LISTVIEW_SetItemState(infoPtr, i.nItem, &item); > + while(iterator_next(&i)) { > + if (nFirst == -1) > + nFirst = i.nItem; > + nLast = i.nItem; > + LISTVIEW_SetItemState(infoPtr, i.nItem, &item); > + } > /* this will also destroy the selection */ > iterator_destroy(&i); > > + LISTVIEW_SetOwnerDataState(infoPtr, nFirst, nLast, &item); > + > infoPtr->notify_mask |= old_mask; > LISTVIEW_SetItemFocus(infoPtr, nItem); > }

June 10, 2022

Re: [PATCH v2 resend 3/6] comctl32/listview: Send LVN_ODSTATECHANGED only for virtual lists.

by Zhiyi Zhang

On 5/26/22 04:00, Angelo Haller wrote: > From: Angelo Haller <angelo(a)szanni.org> > > The LVN_ODSTATECHANGED notification should only be sent to lists > that have LVS_OWNERDATA set. > > Signed-off-by: Angelo Haller <angelo(a)szanni.org> > --- > dlls/comctl32/listview.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c > index 72ade724313..318df0a4093 100644 > --- a/dlls/comctl32/listview.c > +++ b/dlls/comctl32/listview.c > @@ -8946,6 +8946,7 @@ static VOID LISTVIEW_SetOwnerDataState(LISTVIEW_INFO *infoPtr, INT nFirst, INT n > { > NMLVODSTATECHANGE nmlv; > > + if (!(infoPtr->dwStyle & LVS_OWNERDATA)) return; Make sense. It will be better if you can add a simple test before this patch and remove the todo_wines after the fix. > if (!item) return; > > ZeroMemory(&nmlv, sizeof(nmlv));

June 10, 2022