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

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

by Angelo Haller

On 10/06/2022 03.13, Zhiyi Zhang wrote: > > 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. Maybe the comment needs to be better. Deselect all (-1) is the ONLY signal ever sent on ANY deselection, be it one or multiple items (for LVS_OWNERDATA). This is how win32 implements it, hence there is no way of making this a separate test. Maybe the line should read: /* Always send one deselect all (-1) notification for LVS_OWNERDATA style instead of * informing individual items of deselection */ And I am still looking into the other remarks. Some might need reordering as I won't be able to enable the tests without this last patch. Thanks for the feedback so far! >> >> /* 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 v4 0/9] MR205: Add support for HRESULT and ID3DX10ThreadPump parameters in D3DX10GetImageInfo functions - approved

by Matteo Bruni (＠Mystral)

This merge request was approved by Matteo Bruni. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/205

June 10, 2022

Re: [PATCH v4 0/9] MR205: Add support for HRESULT and ID3DX10ThreadPump parameters in D3DX10GetImageInfo functions

by Matteo Bruni (＠Mystral)

On Fri Jun 10 17:52:39 2022 +0000, Matteo Bruni wrote: > changed this line in [version 4 of the diff](/wine/wine/-/merge_requests/205/diffs?diff_id=2359&start_sha=3b768b7a9c390b60c74a83a21ae1438973fb9a13#7af4349b75c315543424998c70f7c31a2fc44f6a_2050_2051) Thank YOU for the patches :smile: Please holler if you find something wrong with my tweaks (now or in the future). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/205#note_1866

June 10, 2022

[PATCH v4 9/9] d3dx10/tests: Add a test for loading an invalid resource from a valid module.

by Matteo Bruni

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 0a297188e19..0c6c4e5c8ce 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2120,6 +2120,11 @@ static void test_get_image_info(void) winetest_push_context("Test %u", i); resource_module = create_resource_module(test_resource_name, test_image[i].data, test_image[i].size); + hr2 = 0xdeadbeef; + hr = D3DX10GetImageInfoFromResourceW(resource_module, L"deadbeef", NULL, &image_info, &hr2); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + ok(hr2 == 0xdeadbeef, "Got unexpected hr2 %#x.\n", hr2); + hr2 = 0xdeadbeef; hr = D3DX10GetImageInfoFromResourceW(resource_module, test_resource_name, NULL, &image_info, &hr2); ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/205

June 10, 2022

[PATCH v4 8/9] d3dx10/tests: Initialize a function argument.

by Matteo Bruni

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 5df8d0d1c93..0a297188e19 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2025,6 +2025,7 @@ static void test_get_image_info(void) ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); ok(hr2 == 0xdeadbeef, "Got unexpected hr2 %#x.\n", hr2); hr2 = 0xdeadbeef; + dword = 0xdeadbeef; hr = D3DX10GetImageInfoFromMemory(&dword, sizeof(dword), NULL, &image_info, &hr2); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); ok(hr == hr2, "Got unexpected hr2 %#x.\n", hr2); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/205

June 10, 2022

[PATCH v4 7/9] d3dx10/tests: Add D3DX10GetImageInfoFromMemory thread pump tests.

by Piotr Caban

From: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 98 +++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index fe7a118cec9..5df8d0d1c93 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -822,6 +822,96 @@ static unsigned int get_bpp_from_format(DXGI_FORMAT format) } } +static HRESULT WINAPI D3DX10ThreadPump_QueryInterface(ID3DX10ThreadPump *iface, REFIID riid, void **out) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static ULONG WINAPI D3DX10ThreadPump_AddRef(ID3DX10ThreadPump *iface) +{ + return 2; +} + +static ULONG WINAPI D3DX10ThreadPump_Release(ID3DX10ThreadPump *iface) +{ + return 1; +} + +static int add_work_item_count = 1; + +static HRESULT WINAPI D3DX10ThreadPump_AddWorkItem(ID3DX10ThreadPump *iface, ID3DX10DataLoader *loader, + ID3DX10DataProcessor *processor, HRESULT *result, void **object) +{ + SIZE_T size; + void *data; + HRESULT hr; + + ok(!add_work_item_count++, "unexpected call\n"); + ok(!object, "object = %p\n", object); + + hr = ID3DX10DataLoader_Load(loader); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3DX10DataLoader_Decompress(loader, &data, &size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3DX10DataProcessor_Process(processor, data, size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3DX10DataProcessor_CreateDeviceObject(processor, object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3DX10DataProcessor_Destroy(processor); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3DX10DataLoader_Destroy(loader); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + if (result) *result = S_OK; + return S_OK; +} + +static UINT WINAPI D3DX10ThreadPump_GetWorkItemCount(ID3DX10ThreadPump *iface) +{ + ok(0, "unexpected call\n"); + return 0; +} + +static HRESULT WINAPI D3DX10ThreadPump_WaitForAllItems(ID3DX10ThreadPump *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI D3DX10ThreadPump_ProcessDeviceWorkItems(ID3DX10ThreadPump *iface, UINT count) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI D3DX10ThreadPump_PurgeAllItems(ID3DX10ThreadPump *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI D3DX10ThreadPump_GetQueueStatus(ID3DX10ThreadPump *iface, UINT *queue, + UINT *processqueue, UINT *devicequeue) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static ID3DX10ThreadPumpVtbl D3DX10ThreadPumpVtbl = +{ + D3DX10ThreadPump_QueryInterface, + D3DX10ThreadPump_AddRef, + D3DX10ThreadPump_Release, + D3DX10ThreadPump_AddWorkItem, + D3DX10ThreadPump_GetWorkItemCount, + D3DX10ThreadPump_WaitForAllItems, + D3DX10ThreadPump_ProcessDeviceWorkItems, + D3DX10ThreadPump_PurgeAllItems, + D3DX10ThreadPump_GetQueueStatus +}; +static ID3DX10ThreadPump thread_pump = { &D3DX10ThreadPumpVtbl }; + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -1954,6 +2044,14 @@ static void test_get_image_info(void) winetest_pop_context(); } + hr2 = 0xdeadbeef; + add_work_item_count = 0; + hr = D3DX10GetImageInfoFromMemory(test_image[0].data, test_image[0].size, &thread_pump, &image_info, &hr2); + ok(add_work_item_count == 1, "Got unexpected add_work_item_count %u.\n", add_work_item_count); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == hr2, "Got unexpected hr2 %#x.\n", hr2); + check_image_info(&image_info, test_image, __LINE__); + hr2 = 0xdeadbeef; hr = D3DX10GetImageInfoFromFileW(NULL, NULL, &image_info, &hr2); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/205

June 10, 2022

[PATCH v4 6/9] d3dx10: Support ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromMemory.

by Piotr Caban

From: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/texture.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 52d1331d30e..9c7762bc617 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -544,8 +544,26 @@ HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat if (!src_data) return E_FAIL; + if (pump) - FIXME("Thread pump is not supported yet.\n"); + { + ID3DX10DataProcessor *processor; + ID3DX10DataLoader *loader; + + if (FAILED((hr = D3DX10CreateAsyncMemoryLoader(src_data, src_data_size, &loader)))) + return hr; + if (FAILED((hr = D3DX10CreateAsyncTextureInfoProcessor(img_info, &processor)))) + { + ID3DX10DataLoader_Destroy(loader); + return hr; + } + if (FAILED((hr = ID3DX10ThreadPump_AddWorkItem(pump, loader, processor, result, NULL)))) + { + ID3DX10DataLoader_Destroy(loader); + ID3DX10DataProcessor_Destroy(processor); + } + return hr; + } hr = get_image_info(src_data, src_data_size, img_info); if (result) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/205

June 10, 2022

[PATCH v4 5/9] d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromResourceW.

by Piotr Caban

From: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/texture.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 090d480accd..52d1331d30e 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -411,10 +411,32 @@ HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *reso TRACE("module %p, resource %s, pump %p, info %p, result %p.\n", module, debugstr_w(resource), pump, info, result); - if (FAILED((hr = load_resourceW(module, resource, &buffer, &size)))) + if (pump) + { + ID3DX10DataProcessor *processor; + ID3DX10DataLoader *loader; + + if (FAILED((hr = D3DX10CreateAsyncResourceLoaderW(module, resource, &loader)))) + return hr; + if (FAILED((hr = D3DX10CreateAsyncTextureInfoProcessor(info, &processor)))) + { + ID3DX10DataLoader_Destroy(loader); + return hr; + } + if (FAILED((hr = ID3DX10ThreadPump_AddWorkItem(pump, loader, processor, result, NULL)))) + { + ID3DX10DataLoader_Destroy(loader); + ID3DX10DataProcessor_Destroy(processor); + } return hr; + } - return D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result); + if (FAILED((hr = load_resourceW(module, resource, &buffer, &size)))) + return hr; + hr = get_image_info(buffer, size, info); + if (result) + *result = hr; + return hr; } HRESULT get_image_info(const void *data, SIZE_T size, D3DX10_IMAGE_INFO *img_info) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/205

June 10, 2022

[PATCH v4 4/9] d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromResourceA.

by Piotr Caban

From: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/texture.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 3ee1eaba624..090d480accd 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -373,10 +373,32 @@ HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resou TRACE("module %p, resource %s, pump %p, info %p, result %p.\n", module, debugstr_a(resource), pump, info, result); - if (FAILED((hr = load_resourceA(module, resource, &buffer, &size)))) + if (pump) + { + ID3DX10DataProcessor *processor; + ID3DX10DataLoader *loader; + + if (FAILED((hr = D3DX10CreateAsyncResourceLoaderA(module, resource, &loader)))) + return hr; + if (FAILED((hr = D3DX10CreateAsyncTextureInfoProcessor(info, &processor)))) + { + ID3DX10DataLoader_Destroy(loader); + return hr; + } + if (FAILED((hr = ID3DX10ThreadPump_AddWorkItem(pump, loader, processor, result, NULL)))) + { + ID3DX10DataLoader_Destroy(loader); + ID3DX10DataProcessor_Destroy(processor); + } return hr; + } - return D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result); + if (FAILED((hr = load_resourceA(module, resource, &buffer, &size)))) + return hr; + hr = get_image_info(buffer, size, info); + if (result) + *result = hr; + return hr; } HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, ID3DX10ThreadPump *pump, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/205

June 10, 2022

[PATCH v4 3/9] d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromFileW.

by Piotr Caban

From: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/texture.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index c018487ae7a..3ee1eaba624 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -332,17 +332,34 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadP if (!src_file) return E_FAIL; - if (FAILED((hr = load_file(src_file, &buffer, &size)))) + if (pump) { - if (result) - *result = hr; + ID3DX10DataProcessor *processor; + ID3DX10DataLoader *loader; + + if (FAILED((hr = D3DX10CreateAsyncFileLoaderW(src_file, &loader)))) + return hr; + if (FAILED((hr = D3DX10CreateAsyncTextureInfoProcessor(info, &processor)))) + { + ID3DX10DataLoader_Destroy(loader); + return hr; + } + hr = ID3DX10ThreadPump_AddWorkItem(pump, loader, processor, result, NULL); + if (FAILED(hr)) + { + ID3DX10DataLoader_Destroy(loader); + ID3DX10DataProcessor_Destroy(processor); + } return hr; } - hr = D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result); - - free(buffer); - + if (SUCCEEDED((hr = load_file(src_file, &buffer, &size)))) + { + hr = get_image_info(buffer, size, info); + free(buffer); + } + if (result) + *result = hr; return hr; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/205

June 10, 2022