September 2021 - Wine-Devel

[PATCH v2 1/9] include: Add HID Physical Interface Device usage page.
by Rémi Bernon Sept. 29, 2021

Sept. 29, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Sorry for the spam, a v2 seems actually worth it, to have IID_IDirectInputPIDDriver addition in a dedicated patch. Also stripped out the outdated comment. include/hidusage.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/hidusage.h b/include/hidusage.h index 002040bddc0..da7274b5945 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -197,6 +197,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_PAGE_CONSUMER ((USAGE) 0x0C) #define HID_USAGE_PAGE_DIGITIZER ((USAGE) 0x0D) #define HID_USAGE_PAGE_HAPTICS ((USAGE) 0x0E) +#define HID_USAGE_PAGE_PID ((USAGE) 0x0F) #define HID_USAGE_PAGE_UNICODE ((USAGE) 0x10) #define HID_USAGE_PAGE_ALPHANUMERIC ((USAGE) 0x14) #define HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN ((USAGE) 0xff00) -- 2.33.0

2 12

[PATCH 1/8] include: Add HID Physical Interface Device usage page.
by Rémi Bernon Sept. 29, 2021

Sept. 29, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/hidusage.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/hidusage.h b/include/hidusage.h index 002040bddc0..da7274b5945 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -197,6 +197,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_PAGE_CONSUMER ((USAGE) 0x0C) #define HID_USAGE_PAGE_DIGITIZER ((USAGE) 0x0D) #define HID_USAGE_PAGE_HAPTICS ((USAGE) 0x0E) +#define HID_USAGE_PAGE_PID ((USAGE) 0x0F) #define HID_USAGE_PAGE_UNICODE ((USAGE) 0x10) #define HID_USAGE_PAGE_ALPHANUMERIC ((USAGE) 0x14) #define HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN ((USAGE) 0xff00) -- 2.33.0

1 8

[PATCH 1/6] ole32/composite: Handle per-component failure in GetDisplayName().
by Nikolay Sivov Sept. 29, 2021

Sept. 29, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/compositemoniker.c | 14 ++++--- dlls/ole32/tests/moniker.c | 79 ++++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 4451f0daae6..77e1e8aff35 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1023,17 +1023,19 @@ static HRESULT WINAPI CompositeMonikerImpl_GetDisplayName(IMoniker *iface, IBind { CompositeMonikerImpl *moniker = impl_from_IMoniker(iface); WCHAR *left_name = NULL, *right_name = NULL; + HRESULT hr; TRACE("%p, %p, %p, %p\n", iface, pbc, pmkToLeft, displayname); - if (!displayname) - return E_POINTER; - - if (!moniker->comp_count) + if (!pbc || !displayname || !moniker->comp_count) return E_INVALIDARG; - IMoniker_GetDisplayName(moniker->left, pbc, NULL, &left_name); - IMoniker_GetDisplayName(moniker->right, pbc, NULL, &right_name); + if (FAILED(hr = IMoniker_GetDisplayName(moniker->left, pbc, NULL, &left_name))) return hr; + if (FAILED(hr = IMoniker_GetDisplayName(moniker->right, pbc, NULL, &right_name))) + { + CoTaskMemFree(left_name); + return hr; + } if (!(*displayname = CoTaskMemAlloc((lstrlenW(left_name) + lstrlenW(right_name) + 1) * sizeof(WCHAR)))) { diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 795d8750d05..fcd8dd8310d 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -145,6 +145,38 @@ static IMoniker *create_antimoniker(DWORD level) return moniker; } +static HRESULT WINAPI pointer_moniker_obj_QueryInterface(IUnknown *iface, + REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI pointer_moniker_obj_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI pointer_moniker_obj_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl pointer_moniker_obj_vtbl = +{ + pointer_moniker_obj_QueryInterface, + pointer_moniker_obj_AddRef, + pointer_moniker_obj_Release, +}; + +static IUnknown pm_obj = { &pointer_moniker_obj_vtbl }; + static HRESULT create_moniker_parse_desc(const char *desc, unsigned int *eaten, IMoniker **moniker) { @@ -163,6 +195,9 @@ static HRESULT create_moniker_parse_desc(const char *desc, unsigned int *eaten, *eaten = 2; *moniker = create_antimoniker(desc[1] - '0'); return S_OK; + case 'P': + *eaten = 1; + return CreatePointerMoniker(&pm_obj, moniker); case 'C': *eaten = 1; desc++; @@ -860,7 +895,7 @@ static void test_ROT(void) '1','9','0','3','-','4','A','A','E','-','B','1','A','F','-', '2','0','4','6','E','5','8','6','C','9','2','5',0}; HRESULT hr; - IMoniker *pMoniker = NULL; + IMoniker *pMoniker = NULL, *moniker; struct test_moniker *test_moniker; IRunningObjectTable *pROT = NULL; struct test_factory factory; @@ -988,6 +1023,25 @@ static void test_ROT(void) IMoniker_Release(pMoniker); IMoniker_Release(&test_moniker->IMoniker_iface); + /* Pointer moniker does not implement IROTData or display name */ + hr = CreatePointerMoniker(NULL, &pMoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&factory.IClassFactory_iface, + pMoniker, &dwCookie); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMoniker_Release(pMoniker); + + hr = create_moniker_from_desc("I1", &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = CreatePointerMoniker((IUnknown *)moniker, &pMoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&factory.IClassFactory_iface, + pMoniker, &dwCookie); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + IMoniker_Release(pMoniker); + IMoniker_Release(moniker); + IRunningObjectTable_Release(pROT); } @@ -3537,6 +3591,23 @@ todo_wine IMoniker_Release(&m->IMoniker_iface); IMoniker_Release(&m2->IMoniker_iface); + /* Display name */ + + /* One component does not support it. */ + hr = create_moniker_from_desc("CPI1", &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_GetDisplayName(moniker, NULL, NULL, &str); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &str); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + IMoniker_Release(moniker); + IBindCtx_Release(bindctx); } @@ -3616,7 +3687,11 @@ todo_wine ok_ole_success(hr, CreateBindCtx); hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &display_name); - ok(hr == E_NOTIMPL, "IMoniker_GetDisplayName should have returned E_NOTIMPL instead of 0x%08x\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_GetDisplayName(moniker, NULL, NULL, &display_name); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); IBindCtx_Release(bindctx); -- 2.33.0

1 5

Re: [PATCH 5/6] Workaround GCC11 complaining about sizeof(a)/sizeof(b) constructs when it's
by Eric Pouech Sept. 29, 2021

Sept. 29, 2021

to be more precise, gcc11 complains with: /home/eric/work/wine/dlls/d3dx9_36/tests/effect.c: In function 'test_effect_parameter_value_GetMatrixPointerArray': /home/eric/work/wine/dlls/d3dx9_36/tests/effect.c:1478:52: warning: expression does not compute the number of elements in this array; element type is 'FLOAT' {aka 'float'}, not 'D3DXMATRIX' {aka 'struct _D3DMATRIX'} [-Wsizeof-array-div] 1478 | D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)/sizeof(D3DXMATRIX)]; | ^ /home/eric/work/wine/dlls/d3dx9_36/tests/effect.c:1478:52: note: add parentheses around the second 'sizeof' to silence this warning /home/eric/work/wine/dlls/d3dx9_36/tests/effect.c:1477:11: note: array 'fvalue' declared here 1477 | FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; | ^~~~~~ so the patch mainly silences GCC11 by following gcc advice of adding parenthesis A+ On Tue, 28 Sept 2021 at 23:03, Marvin <testbot(a)winehq.org> wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Assigned". > > This means that the patch has been assigned to a reviewer. If the > reviewer signs off on the patch, it will be committed, otherwise > you'll receive advice on how to improve it. If you don't hear anything > after a couple of weeks, please resend the patch. > -- -- Eric Pouech

1 0

[PATCH] secur32: Restore the done label.
by Huw Davies Sept. 29, 2021

Sept. 29, 2021

This was incorrectly removed by commit 5c0fe4db7d580784ab6adc361bfed981be25753c. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/secur32/schannel_macosx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 523f8c63562..f7f7db955ef 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -1107,6 +1107,7 @@ static SECURITY_STATUS CDECL schan_get_session_peer_certificate(schan_session se CFRelease(data); } +done: CFRelease(cert_array); return ret; } -- 2.23.0

1 0

[PATCH vkd3d 1/6] vkd3d: Introduce vkd3d_get_texture_layer_count() helper for UAVs.
by Conor McCarthy Sept. 29, 2021

Sept. 29, 2021

UINT_MAX is valid for specifying all remaining layers in all view types, although it's only documented for TEXTURE3D RTVs. If unhandled, UINT_MAX will be passed to vkd3d_compute_workgroup_count() during UAV clears, leading to nasty results in RADV. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/resource.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 1ca23a90..16dd07db 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2477,6 +2477,25 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, return true; } +static unsigned int vkd3d_get_texture_layer_count(unsigned int layer_idx, unsigned int layer_count, + const D3D12_RESOURCE_DESC *desc) +{ + if (desc->DepthOrArraySize > layer_idx) + { + unsigned int max_layer_count = desc->DepthOrArraySize - layer_idx; + + if (layer_count <= max_layer_count) + return layer_count; + + if (layer_count != UINT_MAX) + WARN("Layer count %u exceeds maximum %u.\n", layer_count, max_layer_count); + return max_layer_count; + } + + WARN("Layer index %u exceeds maximum available layer %u.\n", layer_idx, desc->DepthOrArraySize - 1); + return 1; +} + bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view) { @@ -2758,6 +2777,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } + /* Allow a UINT_MAX layer count through as it equals VK_REMAINING_ARRAY_LAYERS. */ } if (!vkd3d_create_texture_view(device, resource->u.vk_image, &vkd3d_desc, &view)) @@ -2931,6 +2951,9 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } + /* Prevent problems with UAV clears where the layer count is UINT_MAX. */ + vkd3d_desc.layer_count = vkd3d_get_texture_layer_count(vkd3d_desc.layer_idx, + vkd3d_desc.layer_count, &resource->desc); } if (!vkd3d_create_texture_view(device, resource->u.vk_image, &vkd3d_desc, &view)) -- 2.32.0

1 5

[PATCH 1/5] msxml3/tests: Add some processing instruction tests.
by Daniel Lehman Sept. 29, 2021

Sept. 29, 2021

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msxml3/tests/domdoc.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9e9789ebd9a..d98a87f6d9c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8594,6 +8594,31 @@ static void test_createProcessingInstruction(void) hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"windows-1252\" dummy=\"value\""), &pi); todo_wine ok(hr == XML_E_UNEXPECTED_ATTRIBUTE, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, NULL, _bstr_("version=\"1.0\" encoding=\"UTF-8\""), &pi); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), NULL, &pi); +todo_wine + ok(hr == XML_E_XMLDECLSYNTAX, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=UTF-8"), &pi); +todo_wine + ok(hr == XML_E_MISSINGQUOTE, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding='UTF-8\""), &pi); +todo_wine + ok(hr == XML_E_BADCHARINSTRING, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"UTF-8"), &pi); +todo_wine + ok(hr == XML_E_BADCHARINSTRING, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding='UTF-8'"), &pi); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMProcessingInstruction_QueryInterface(pi, &IID_IXMLDOMNode, (void **)&node); + node_map = NULL; + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMNode_get_attributes(node, &node_map); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + if (node_map) IXMLDOMNamedNodeMap_Release(node_map); + IXMLDOMNode_Release(node); + IXMLDOMProcessingInstruction_Release(pi); /* test for BSTR handling, pass broken BSTR */ memcpy(&buff[2], L"test", 5 * sizeof(WCHAR)); -- 2.25.1

1 4

Re: [PATCH v1] gdi32:Implement EngwideChartomultibyte.
by Marvin Sept. 28, 2021

Sept. 28, 2021

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=99014 Your paranoid android. === debiant2 (build log) === error: patch failed: dlls/gdi32/gdi32.spec:159 Task: Patch failed to apply === debiant2 (build log) === error: patch failed: dlls/gdi32/gdi32.spec:159 Task: Patch failed to apply

1 0

[PATCH v1] gdi32:Implement EngwideChartomultibyte.
by dongpengpeng Sept. 28, 2021

Sept. 28, 2021

1 0

Re: [PATCH] gdi32:Implement EngwideChartomultibyte.
by Marvin Sept. 28, 2021

Sept. 28, 2021

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=99013 Your paranoid android. === debiant2 (build log) === error: patch failed: dlls/gdi32/gdi32.spec:159 Task: Patch failed to apply === debiant2 (build log) === error: patch failed: dlls/gdi32/gdi32.spec:159 Task: Patch failed to apply

1 0