October 2021 - Wine-Commits

Jan Sikorski : wined3d: Set VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT for unordered access images.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: bacd0301ef56ba84c8a299d6a3a3291c9802ea5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bacd0301ef56ba84c8a299d6… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Oct 6 10:50:10 2021 +0200 wined3d: Set VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT for unordered access images. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index db32274960f..339bf4e205a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5092,8 +5092,13 @@ BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *texture_vk, resource = &texture_vk->t.resource; format_vk = wined3d_format_vk(resource->format); - if (wined3d_format_is_typeless(&format_vk->f) || texture_vk->t.swapchain) + if (wined3d_format_is_typeless(&format_vk->f) || texture_vk->t.swapchain + || (texture_vk->t.resource.bind_flags & WINED3D_BIND_UNORDERED_ACCESS)) + { + /* For UAVs, we need this in case a clear necessitates creation of a new view + * with a different format. */ flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; + } switch (resource->type) {

1 0

Matteo Bruni : d3d10core/tests: Use test contexts in test_stream_output().
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 9290f167972f5ad7661230ae329c58fcb4aec373 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9290f167972f5ad7661230ae… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 6 15:53:55 2021 +0200 d3d10core/tests: Use test contexts in test_stream_output(). Sneaked in a couple small changes: add a simpler gap test case, move a gap test in the proper place. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index e2fb870279e..c1178749345 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -15250,6 +15250,10 @@ static void test_stream_output(void) {"ATTRIB", 1, 0, 4, 0}, }, /* Gaps */ + { + {"SV_POSITION", 0, 0, 4, 0}, + {NULL, 0, 0, 8, 0}, + }, { {"SV_POSITION", 0, 0, 4, 0}, {NULL, 0, 0, 8, 0}, @@ -15261,6 +15265,13 @@ static void test_stream_output(void) {NULL, 0, 0, 4, 0}, {"ATTRIB", 1, 0, 4, 0}, }, + { + {"attrib", 1, 0, 4, 0}, + {"attrib", 2, 0, 3, 0}, + {"attrib", 3, 0, 2, 0}, + {NULL, 0, 0, 1, 0}, + {"attrib", 4, 0, 1, 0}, + }, /* ComponentCount */ { {"ATTRIB", 1, 0, 4, 0}, @@ -15316,13 +15327,6 @@ static void test_stream_output(void) {"attrib", 1, 0, 4, 0}, {"attrib", 2, 0, 3, 3}, }, - { - {"attrib", 1, 0, 4, 0}, - {"attrib", 2, 0, 3, 0}, - {"attrib", 3, 0, 2, 0}, - {NULL, 0, 0, 1, 0}, - {"attrib", 4, 0, 1, 0}, - }, /* Multiple occurrences of the same output */ { {"ATTRIB", 1, 0, 2, 0}, @@ -15460,6 +15464,8 @@ static void test_stream_output(void) for (i = 0; i < ARRAY_SIZE(valid_so_declarations); ++i) { unsigned int max_output_slot = 0; + + winetest_push_context("Test %u", i); for (count = 0; count < ARRAY_SIZE(valid_so_declarations[i]); ++count) { const D3D10_SO_DECLARATION_ENTRY *e = &valid_so_declarations[i][count]; @@ -15470,10 +15476,12 @@ static void test_stream_output(void) check_so_desc(device, gs_code, sizeof(gs_code), valid_so_declarations[i], count, 0, !!max_output_slot); check_so_desc(device, gs_code, sizeof(gs_code), valid_so_declarations[i], count, 64, !max_output_slot); + winetest_pop_context(); } for (i = 0; i < ARRAY_SIZE(invalid_so_declarations); ++i) { + winetest_push_context("Test %u", i); for (count = 0; count < ARRAY_SIZE(invalid_so_declarations[i]); ++count) { const D3D10_SO_DECLARATION_ENTRY *e = &invalid_so_declarations[i][count]; @@ -15483,6 +15491,7 @@ static void test_stream_output(void) check_so_desc(device, gs_code, sizeof(gs_code), invalid_so_declarations[i], count, 0, FALSE); check_so_desc(device, gs_code, sizeof(gs_code), invalid_so_declarations[i], count, 64, FALSE); + winetest_pop_context(); } /* Buffer stride */

1 0

Matteo Bruni : wined3d: Get rid of a WARN() in init_format_filter_info().
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: dc3408b1f4ee825bbf90acdfb049946f908a7580 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc3408b1f4ee825bbf90acdf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 6 15:53:58 2021 +0200 wined3d: Get rid of a WARN() in init_format_filter_info(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0cf7e5776d0..47718c9f710 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3414,7 +3414,6 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, if (wined3d_settings.offscreen_rendering_mode != ORM_FBO || !gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) { - WARN("No FBO support, or no FBO ORM, guessing filter info from GL caps\n"); if (vendor == HW_VENDOR_NVIDIA && gl_info->supported[ARB_TEXTURE_FLOAT]) { TRACE("Nvidia card with texture_float support: Assuming float16 blending\n");

1 0

Gabriel Ivăncescu : mshtml: Use proper compat mode for HTMLDOMAttribute.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 240e0d1d7c1c77d8ff3ded596577e8a51c6cfd81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=240e0d1d7c1c77d8ff3ded59… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Oct 6 18:11:35 2021 +0300 mshtml: Use proper compat mode for HTMLDOMAttribute. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 3 +-- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index e10c7c3826f..e4c98d9af06 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -495,9 +495,8 @@ HTMLDOMAttribute *unsafe_impl_from_IHTMLDOMAttribute(IHTMLDOMAttribute *iface) return iface->lpVtbl == &HTMLDOMAttributeVtbl ? impl_from_IHTMLDOMAttribute(iface) : NULL; } -HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dispid, HTMLDOMAttribute **attr) +HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dispid, compat_mode_t compat_mode, HTMLDOMAttribute **attr) { - compat_mode_t compat_mode = elem ? dispex_compat_mode(&elem->node.event_target.dispex) : COMPAT_MODE_QUIRKS; HTMLAttributeCollection *col; HTMLDOMAttribute *ret; HRESULT hres; diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 6bbf058aed4..12fce6d3015 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2856,7 +2856,7 @@ static HRESULT WINAPI HTMLDocument5_createAttribute(IHTMLDocument5 *iface, BSTR TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrattrName), ppattribute); - hres = HTMLDOMAttribute_Create(bstrattrName, NULL, 0, &attr); + hres = HTMLDOMAttribute_Create(bstrattrName, NULL, 0, dispex_compat_mode(&This->doc_node->node.event_target.dispex), &attr); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index cb7a528be39..dada4de9ab7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7251,7 +7251,7 @@ static inline HRESULT get_domattr(HTMLAttributeCollection *This, DISPID id, LONG return E_UNEXPECTED; } - hres = HTMLDOMAttribute_Create(NULL, This->elem, id, attr); + hres = HTMLDOMAttribute_Create(NULL, This->elem, id, dispex_compat_mode(&This->elem->node.event_target.dispex), attr); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9429a4bb5b4..6ee510572e6 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1090,7 +1090,7 @@ typedef struct { HTMLDOMAttribute *unsafe_impl_from_IHTMLDOMAttribute(IHTMLDOMAttribute*) DECLSPEC_HIDDEN; -HRESULT HTMLDOMAttribute_Create(const WCHAR*,HTMLElement*,DISPID,HTMLDOMAttribute**) DECLSPEC_HIDDEN; +HRESULT HTMLDOMAttribute_Create(const WCHAR*,HTMLElement*,DISPID,compat_mode_t,HTMLDOMAttribute**) DECLSPEC_HIDDEN; HRESULT HTMLElement_Create(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLCommentElement_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLElement**) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : winegstreamer: Avoid passing a NULL buffer to wg_parser_push_data() in the case of a zero-length read.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 585acfa04188f85fb9138e57d56dd44b870dca41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=585acfa04188f85fb9138e57… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 6 11:46:34 2021 -0500 winegstreamer: Avoid passing a NULL buffer to wg_parser_push_data() in the case of a zero-length read. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 7 +++++-- dlls/winegstreamer/quartz_parser.c | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 703bdd7c57d..dab85e4689d 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -613,9 +613,12 @@ static DWORD CALLBACK read_thread(void *arg) { struct media_source *source = arg; IMFByteStream *byte_stream = source->byte_stream; - size_t buffer_size = 0; + size_t buffer_size = 4096; uint64_t file_size; - void *data = NULL; + void *data; + + if (!(data = malloc(buffer_size))) + return 0; IMFByteStream_GetLength(byte_stream, &file_size); diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index b6655d5da3c..6d79d2ef129 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -786,9 +786,12 @@ static DWORD CALLBACK read_thread(void *arg) { struct parser *filter = arg; LONGLONG file_size, unused; - size_t buffer_size = 0; + size_t buffer_size = 4096; void *data = NULL; + if (!(data = malloc(buffer_size))) + return 0; + IAsyncReader_Length(filter->reader, &file_size, &unused); TRACE("Starting read thread for filter %p.\n", filter);

1 0

Rémi Bernon : winexinput.sys: Remove unnecessary IOCTL_HID_GET_STRING condition.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: aa9db743cd757957e7ad90b14a48bff75a174ce0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa9db743cd757957e7ad90b1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 14:01:47 2021 +0200 winexinput.sys: Remove unnecessary IOCTL_HID_GET_STRING condition. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winexinput.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index d9a6fd5dd70..05d64b05d4f 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -400,7 +400,7 @@ static NTSTATUS WINAPI internal_ioctl(DEVICE_OBJECT *device, IRP *irp) TRACE("device %p, irp %p, code %#x, bus_device %p.\n", device, irp, code, fdo->bus_device); if (code == IOCTL_HID_READ_REPORT) return try_complete_pending_read(device, irp); - if (impl->is_gamepad || code == IOCTL_HID_GET_STRING) return gamepad_internal_ioctl(device, irp); + if (impl->is_gamepad) return gamepad_internal_ioctl(device, irp); IoSkipCurrentIrpStackLocation(irp); return IoCallDriver(fdo->bus_device, irp);

1 0

Huw Davies : cryptnet/tests: Explicitly set cbSize before each test.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: be0004820342e49dcc21e85279a19da5f65e2ad2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0004820342e49dcc21e852… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 6 12:11:43 2021 +0100 cryptnet/tests: Explicitly set cbSize before each test. This is clearer and also avoids out-of-bounds compiler warnings relating to the memset()s. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/tests/cryptnet.c | 59 ++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be0004820342e49dcc21…

1 0

Rémi Bernon : winebus.sys: Remove "stub!" from lnxev_device_haptics_start trace.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: cf464a4d0b33f8c4ada4aa35d526b94193eab28d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf464a4d0b33f8c4ada4aa35… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 14:04:00 2021 +0200 winebus.sys: Remove "stub!" from lnxev_device_haptics_start trace. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 0aade2fd104..1f563ebb56f 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -791,7 +791,7 @@ static NTSTATUS lnxev_device_haptics_start(struct unix_device *iface, DWORD dura }; struct input_event event; - TRACE("iface %p, duration_ms %u, rumble_intensity %u, buzz_intensity %u stub!\n", iface, + TRACE("iface %p, duration_ms %u, rumble_intensity %u, buzz_intensity %u.\n", iface, duration_ms, rumble_intensity, buzz_intensity); effect.replay.length = duration_ms;

1 0

Rémi Bernon : joy.cpl: Pass DIEFF_OBJECTOFFSETS flag to IDirectInputEffect_SetParameters.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 13813894f2e41df4af12657985dc8a99898e7883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13813894f2e41df4af126579… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:26:42 2021 +0200 joy.cpl: Pass DIEFF_OBJECTOFFSETS flag to IDirectInputEffect_SetParameters. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 3c9949b7ef3..1498021db66 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -809,7 +809,7 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) ZeroMemory(&dieffect, sizeof(dieffect)); dieffect.dwSize = sizeof(dieffect); - dieffect.dwFlags = DIEFF_CARTESIAN; + dieffect.dwFlags = DIEFF_CARTESIAN|DIEFF_OBJECTOFFSETS; dieffect.dwDuration = FF_PLAY_TIME; dieffect.cAxes = 2;

1 0

Rémi Bernon : dinput8/tests: Add more force-feedback effects PID reports and caps.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: e9539722d1537b9fd35cae708f517c360cec9803 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9539722d1537b9fd35cae70… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:57 2021 +0200 dinput8/tests: Add more force-feedback effects PID reports and caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 227 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 208 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e9539722d1537b9fd35c…

1 0