June 2021 - Wine-commits - list.winehq.org

Rémi Bernon : ntoskrnl.exe/tests: Add some HidP_Get(Specific)ValueCaps tests.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: 3e36af2e965a06aecde518b774f84782c10d8ca6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e36af2e965a06aecde518b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 10 10:06:26 2021 +0200 ntoskrnl.exe/tests: Add some HidP_Get(Specific)ValueCaps tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 199 +++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e36af2e965a06aecde5…

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add some HidP_GetLinkCollectionNodes tests.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: 49f4db5e1af42d422408c30a2340ec344eddb9fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=49f4db5e1af42d422408c30a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 10 10:06:27 2021 +0200 ntoskrnl.exe/tests: Add some HidP_GetLinkCollectionNodes tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c931f5a02d0..6a73493aa39 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1524,6 +1524,20 @@ static inline void check_hidp_caps_(int line, HIDP_CAPS *caps, const HIDP_CAPS * check_member_(__FILE__, line, *caps, *exp, "%d", NumberFeatureDataIndices); } +#define check_hidp_link_collection_node(a, b) check_hidp_link_collection_node_(__LINE__, a, b) +static inline void check_hidp_link_collection_node_(int line, HIDP_LINK_COLLECTION_NODE *node, + const HIDP_LINK_COLLECTION_NODE *exp) +{ + check_member_(__FILE__, line, *node, *exp, "%04x", LinkUsage); + check_member_(__FILE__, line, *node, *exp, "%04x", LinkUsagePage); + check_member_(__FILE__, line, *node, *exp, "%d", Parent); + check_member_(__FILE__, line, *node, *exp, "%d", NumberOfChildren); + check_member_(__FILE__, line, *node, *exp, "%d", NextSibling); + check_member_(__FILE__, line, *node, *exp, "%d", FirstChild); + check_member_(__FILE__, line, *node, *exp, "%d", CollectionType); + check_member_(__FILE__, line, *node, *exp, "%d", IsAlias); +} + #define check_hidp_button_caps(a, b) check_hidp_button_caps_(__LINE__, a, b) static inline void check_hidp_button_caps_(int line, HIDP_BUTTON_CAPS *caps, const HIDP_BUTTON_CAPS *exp) { @@ -1693,10 +1707,20 @@ static void test_hidp(HANDLE file) .NotRange.DataIndex = 10, }, }; + static const HIDP_LINK_COLLECTION_NODE expect_collections[] = + { + { + .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .CollectionType = 1, + }, + }; + HIDP_LINK_COLLECTION_NODE collections[16]; PHIDP_PREPARSED_DATA preparsed_data; HIDP_BUTTON_CAPS button_caps[16]; HIDP_VALUE_CAPS value_caps[16]; + DWORD collection_count; char buffer[200]; NTSTATUS status; HIDP_CAPS caps; @@ -1714,6 +1738,27 @@ static void test_hidp(HANDLE file) ok(status == HIDP_STATUS_SUCCESS, "HidP_GetCaps returned %#x\n", status); check_hidp_caps(&caps, &expect_hidp_caps); + collection_count = 0; + status = HidP_GetLinkCollectionNodes(collections, &collection_count, preparsed_data); + ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetLinkCollectionNodes returned %#x\n", status); + todo_wine + ok(collection_count == caps.NumberLinkCollectionNodes, "got %d collection nodes, expected %d\n", + collection_count, caps.NumberLinkCollectionNodes); + collection_count = ARRAY_SIZE(collections); + status = HidP_GetLinkCollectionNodes(collections, &collection_count, (PHIDP_PREPARSED_DATA)buffer); + ok(status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetLinkCollectionNodes returned %#x\n", status); + status = HidP_GetLinkCollectionNodes(collections, &collection_count, preparsed_data); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetLinkCollectionNodes returned %#x\n", status); + ok(collection_count == caps.NumberLinkCollectionNodes, "got %d collection nodes, expected %d\n", + collection_count, caps.NumberLinkCollectionNodes); + + for (i = 0; i < ARRAY_SIZE(expect_collections); ++i) + { + winetest_push_context("collections[%d]", i); + check_hidp_link_collection_node(collections + i, expect_collections + i); + winetest_pop_context(); + } + count = ARRAY_SIZE(button_caps); status = HidP_GetButtonCaps(HidP_Output, button_caps, &count, preparsed_data); todo_wine

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add some HidP_InitializeReportForID tests.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: c1b80538b3d914ec6bdb6fb0c4c4ae1b0e29d6f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1b80538b3d914ec6bdb6fb0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 10 10:06:28 2021 +0200 ntoskrnl.exe/tests: Add some HidP_InitializeReportForID tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 6a73493aa39..ff73e8eae18 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1720,8 +1720,8 @@ static void test_hidp(HANDLE file) PHIDP_PREPARSED_DATA preparsed_data; HIDP_BUTTON_CAPS button_caps[16]; HIDP_VALUE_CAPS value_caps[16]; + char buffer[200], report[200]; DWORD collection_count; - char buffer[200]; NTSTATUS status; HIDP_CAPS caps; unsigned int i; @@ -1952,6 +1952,23 @@ static void test_hidp(HANDLE file) ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificValueCaps returned %#x\n", status); ok(count == 0, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, 0); + status = HidP_InitializeReportForID(HidP_Input, 0, (PHIDP_PREPARSED_DATA)buffer, report, sizeof(report)); + ok(status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_InitializeReportForID returned %#x\n", status); + status = HidP_InitializeReportForID(HidP_Feature + 1, 0, preparsed_data, report, sizeof(report)); + ok(status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_InitializeReportForID returned %#x\n", status); + status = HidP_InitializeReportForID(HidP_Input, 0, preparsed_data, report, sizeof(report)); + ok(status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_InitializeReportForID returned %#x\n", status); + status = HidP_InitializeReportForID(HidP_Input, 0, preparsed_data, report, caps.InputReportByteLength + 1); + ok(status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_InitializeReportForID returned %#x\n", status); + + memset(report, 0xcd, sizeof(report)); + status = HidP_InitializeReportForID(HidP_Input, 0, preparsed_data, report, caps.InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status); + + memset(buffer, 0xcd, sizeof(buffer)); + memset(buffer, 0, caps.InputReportByteLength); + ok(!memcmp(buffer, report, sizeof(buffer)), "unexpected report data\n"); + HidD_FreePreparsedData(preparsed_data); CloseHandle(file); }

1 0

Nikolay Sivov : d2d1: Cache sampler state objects at device context.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: 0a30088c39ad3ce9242d95579149730d6af6ec11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a30088c39ad3ce9242d9557… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 10 15:13:21 2021 +0300 d2d1: Cache sampler state objects at device context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 49 +++++++++++++++++------------------------------- dlls/d2d1/d2d1_private.h | 14 ++++++++++++-- dlls/d2d1/device.c | 17 ++++++++++++++--- 3 files changed, 43 insertions(+), 37 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 07d2e26a143..76276bafc7a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -859,8 +859,6 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_brush_Release(ID2D1BitmapBrush1 *iface if (!refcount) { - if (brush->u.bitmap.sampler_state) - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); if (brush->u.bitmap.bitmap) ID2D1Bitmap1_Release(&brush->u.bitmap.bitmap->ID2D1Bitmap1_iface); d2d_brush_destroy(brush); @@ -924,11 +922,6 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeX(ID2D1BitmapBrush1 TRACE("iface %p, mode %#x.\n", iface, mode); brush->u.bitmap.extend_mode_x = mode; - if (brush->u.bitmap.sampler_state) - { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); - brush->u.bitmap.sampler_state = NULL; - } } static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeY(ID2D1BitmapBrush1 *iface, D2D1_EXTEND_MODE mode) @@ -938,11 +931,6 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeY(ID2D1BitmapBrush1 TRACE("iface %p, mode %#x.\n", iface, mode); brush->u.bitmap.extend_mode_y = mode; - if (brush->u.bitmap.sampler_state) - { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); - brush->u.bitmap.sampler_state = NULL; - } } static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode(ID2D1BitmapBrush1 *iface, @@ -963,11 +951,6 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode(ID2D1BitmapB } brush->u.bitmap.interpolation_mode = d2d1_1_interp_mode_from_d2d1(mode); - if (brush->u.bitmap.sampler_state) - { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); - brush->u.bitmap.sampler_state = NULL; - } } static void STDMETHODCALLTYPE d2d_bitmap_brush_SetBitmap(ID2D1BitmapBrush1 *iface, ID2D1Bitmap *bitmap) @@ -1051,11 +1034,6 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode1(ID2D1Bitmap } brush->u.bitmap.interpolation_mode = mode; - if (brush->u.bitmap.sampler_state) - { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); - brush->u.bitmap.sampler_state = NULL; - } } static D2D1_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetInterpolationMode1(ID2D1BitmapBrush1 *iface) @@ -1292,12 +1270,20 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_b return hr; } -static void d2d_brush_bind_bitmap(struct d2d_brush *brush, ID3D10Device *device, unsigned int brush_idx) +static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_context *context, + unsigned int brush_idx) { + ID3D10SamplerState **sampler_state; HRESULT hr; - ID3D10Device_PSSetShaderResources(device, brush_idx, 1, &brush->u.bitmap.bitmap->srv); - if (!brush->u.bitmap.sampler_state) + ID3D10Device_PSSetShaderResources(context->d3d_device, brush_idx, 1, &brush->u.bitmap.bitmap->srv); + + sampler_state = &context->sampler_states + [brush->u.bitmap.interpolation_mode % D2D_SAMPLER_INTERPOLATION_MODE_COUNT] + [brush->u.bitmap.extend_mode_x % D2D_SAMPLER_EXTEND_MODE_COUNT] + [brush->u.bitmap.extend_mode_y % D2D_SAMPLER_EXTEND_MODE_COUNT]; + + if (!*sampler_state) { D3D10_SAMPLER_DESC sampler_desc; @@ -1318,14 +1304,13 @@ static void d2d_brush_bind_bitmap(struct d2d_brush *brush, ID3D10Device *device, sampler_desc.MinLOD = 0.0f; sampler_desc.MaxLOD = 0.0f; - if (FAILED(hr = ID3D10Device_CreateSamplerState(device, - &sampler_desc, &brush->u.bitmap.sampler_state))) + if (FAILED(hr = ID3D10Device_CreateSamplerState(context->d3d_device, &sampler_desc, sampler_state))) ERR("Failed to create sampler state, hr %#x.\n", hr); } - ID3D10Device_PSSetSamplers(device, brush_idx, 1, &brush->u.bitmap.sampler_state); + ID3D10Device_PSSetSamplers(context->d3d_device, brush_idx, 1, sampler_state); } -void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device, unsigned int brush_idx) +void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context, unsigned int brush_idx) { switch (brush->type) { @@ -1333,15 +1318,15 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device, uns break; case D2D_BRUSH_TYPE_LINEAR: - d2d_gradient_bind(brush->u.linear.gradient, device, brush_idx); + d2d_gradient_bind(brush->u.linear.gradient, context->d3d_device, brush_idx); break; case D2D_BRUSH_TYPE_RADIAL: - d2d_gradient_bind(brush->u.radial.gradient, device, brush_idx); + d2d_gradient_bind(brush->u.radial.gradient, context->d3d_device, brush_idx); break; case D2D_BRUSH_TYPE_BITMAP: - d2d_brush_bind_bitmap(brush, device, brush_idx); + d2d_brush_bind_bitmap(brush, context, brush_idx); break; default: diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 199439b4616..64bc10a4895 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -126,6 +126,12 @@ struct d2d_device_context_ops HRESULT (*device_context_present)(IUnknown *outer_unknown); }; +enum d2d_device_context_sampler_limits +{ + D2D_SAMPLER_INTERPOLATION_MODE_COUNT = 2, + D2D_SAMPLER_EXTEND_MODE_COUNT = 3, +}; + struct d2d_device_context { ID2D1DeviceContext ID2D1DeviceContext_iface; @@ -149,6 +155,10 @@ struct d2d_device_context ID3D10Buffer *vb; ID3D10RasterizerState *rs; ID3D10BlendState *bs; + ID3D10SamplerState *sampler_states + [D2D_SAMPLER_INTERPOLATION_MODE_COUNT] + [D2D_SAMPLER_EXTEND_MODE_COUNT] + [D2D_SAMPLER_EXTEND_MODE_COUNT]; struct d2d_error_state error; D2D1_DRAWING_STATE_DESCRIPTION1 drawing_state; @@ -287,7 +297,6 @@ struct d2d_brush D2D1_EXTEND_MODE extend_mode_x; D2D1_EXTEND_MODE extend_mode_y; D2D1_INTERPOLATION_MODE interpolation_mode; - ID3D10SamplerState *sampler_state; } bitmap; } u; }; @@ -303,7 +312,8 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, struct d2d_brush **brush) DECLSPEC_HIDDEN; -void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device, unsigned int brush_idx) DECLSPEC_HIDDEN; +void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context, + unsigned int brush_idx) DECLSPEC_HIDDEN; HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_brush, BOOL outline, BOOL is_arc, struct d2d_device_context *render_target, ID3D10Buffer **ps_cb) DECLSPEC_HIDDEN; struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 23ce03dce5e..0c89e802510 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -176,10 +176,10 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en if (brush) { ID3D10Device_OMSetBlendState(device, render_target->bs, NULL, D3D10_DEFAULT_SAMPLE_MASK); - d2d_brush_bind_resources(brush, device, 0); + d2d_brush_bind_resources(brush, render_target, 0); } if (opacity_brush) - d2d_brush_bind_resources(opacity_brush, device, 1); + d2d_brush_bind_resources(opacity_brush, render_target, 1); if (ib) ID3D10Device_DrawIndexed(device, index_count, 0, 0); @@ -254,7 +254,7 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) if (!refcount) { - unsigned int i; + unsigned int i, j, k; d2d_clip_stack_cleanup(&context->clip_stack); IDWriteRenderingParams_Release(context->default_text_rendering_params); @@ -271,6 +271,17 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) ID3D10VertexShader_Release(context->shape_resources[i].vs); ID3D10InputLayout_Release(context->shape_resources[i].il); } + for (i = 0; i < D2D_SAMPLER_INTERPOLATION_MODE_COUNT; ++i) + { + for (j = 0; j < D2D_SAMPLER_EXTEND_MODE_COUNT; ++j) + { + for (k = 0; k < D2D_SAMPLER_EXTEND_MODE_COUNT; ++k) + { + if (context->sampler_states[i][j][k]) + ID3D10SamplerState_Release(context->sampler_states[i][j][k]); + } + } + } context->stateblock->lpVtbl->Release(context->stateblock); if (context->target) ID2D1Bitmap1_Release(&context->target->ID2D1Bitmap1_iface);

1 0

Nikolay Sivov : d2d1: Remove unused argument from constant buffer initialization helper.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: 140c4a094a4f4007fd56e6d0f6286280e5c08c36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=140c4a094a4f4007fd56e6d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 10 15:13:22 2021 +0300 d2d1: Remove unused argument from constant buffer initialization helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 76276bafc7a..94ed95337f4 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1122,8 +1122,7 @@ static D3D10_TEXTURE_ADDRESS_MODE texture_address_mode_from_extend_mode(D2D1_EXT } } -static BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, - const struct d2d_device_context *render_target, struct d2d_brush_cb *cb) +static BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) { float theta, sin_theta, cos_theta; float dpi_scale, d, s1, s2, t, u; @@ -1249,9 +1248,9 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_b cb_data.outline = outline; cb_data.is_arc = is_arc; - if (!d2d_brush_fill_cb(brush, render_target, &cb_data.colour_brush)) + if (!d2d_brush_fill_cb(brush, &cb_data.colour_brush)) return E_NOTIMPL; - if (!d2d_brush_fill_cb(opacity_brush, render_target, &cb_data.opacity_brush)) + if (!d2d_brush_fill_cb(opacity_brush, &cb_data.opacity_brush)) return E_NOTIMPL; buffer_desc.ByteWidth = sizeof(cb_data);

1 0

Nikolay Sivov : d2d1: Reuse PS constant buffer object.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: f74163ad583303606ff6ef4caa54eba0f685c506 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f74163ad583303606ff6ef4c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 10 15:13:23 2021 +0300 d2d1: Reuse PS constant buffer object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 33 +----------- dlls/d2d1/d2d1_private.h | 4 +- dlls/d2d1/device.c | 133 +++++++++++++++++++++++++++-------------------- 3 files changed, 80 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f74163ad583303606ff6…

1 0

Nikolay Sivov : d3d11: Fix freed memory access when releasing device context (Coverity).
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: d26275f9053f46b71c6325cc1cade0c7cc5921dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d26275f9053f46b71c6325cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 9 08:57:00 2021 +0300 d3d11: Fix freed memory access when releasing device context (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d3e49879676..56f34c70ea1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -521,13 +521,14 @@ static ULONG STDMETHODCALLTYPE d3d11_device_context_Release(ID3D11DeviceContext1 if (!refcount) { + ID3D11Device2 *device = &context->device->ID3D11Device2_iface; if (context->type != D3D11_DEVICE_CONTEXT_IMMEDIATE) { wined3d_deferred_context_destroy(context->wined3d_context); d3d11_device_context_cleanup(context); heap_free(context); } - ID3D11Device2_Release(&context->device->ID3D11Device2_iface); + ID3D11Device2_Release(device); } return refcount;

1 0

Ziqing Hui : d3dx10/tests: Check more members of texture descriptor.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: 6161571a7228be7f2ac23bac4929956926d63720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6161571a7228be7f2ac23bac… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Jun 7 14:57:22 2021 +0800 d3dx10/tests: Check more members of texture descriptor. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index b0800d26407..235c60ebf7e 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -767,9 +767,25 @@ static void check_resource_info(ID3D10Resource *resource, unsigned int i, unsign ok_(__FILE__, line)(desc_2d.Format == test_image[i].expected.Format, "Test %u: Got unexpected Format %u, expected %u.\n", i, desc_2d.Format, test_image[i].expected.Format); + ok_(__FILE__, line)(desc_2d.SampleDesc.Count == 1, + "Test %u: Got unexpected SampleDesc.Count %u, expected %u\n", + i, desc_2d.SampleDesc.Count, 1); + ok_(__FILE__, line)(desc_2d.SampleDesc.Quality == 0, + "Test %u: Got unexpected SampleDesc.Quality %u, expected %u\n", + i, desc_2d.SampleDesc.Quality, 0); + ok_(__FILE__, line)(desc_2d.Usage == D3D10_USAGE_DEFAULT, + "Test %u: Got unexpected Usage %u, expected %u\n", + i, desc_2d.Usage, D3D10_USAGE_DEFAULT); + ok_(__FILE__, line)(desc_2d.BindFlags == D3D10_BIND_SHADER_RESOURCE, + "Test %u: Got unexpected BindFlags %#x, expected %#x\n", + i, desc_2d.BindFlags, D3D10_BIND_SHADER_RESOURCE); + ok_(__FILE__, line)(desc_2d.CPUAccessFlags == 0, + "Test %u: Got unexpected CPUAccessFlags %#x, expected %#x\n", + i, desc_2d.CPUAccessFlags, 0); ok_(__FILE__, line)(desc_2d.MiscFlags == test_image[i].expected.MiscFlags, - "Test %u: Got unexpected MiscFlags %u, expected %u.\n", + "Test %u: Got unexpected MiscFlags %#x, expected %#x.\n", i, desc_2d.MiscFlags, test_image[i].expected.MiscFlags); + ID3D10Texture2D_Release(texture_2d); break; @@ -792,8 +808,17 @@ static void check_resource_info(ID3D10Resource *resource, unsigned int i, unsign ok_(__FILE__, line)(desc_3d.Format == test_image[i].expected.Format, "Test %u: Got unexpected Format %u, expected %u.\n", i, desc_3d.Format, test_image[i].expected.Format); + ok_(__FILE__, line)(desc_3d.Usage == D3D10_USAGE_DEFAULT, + "Test %u: Got unexpected Usage %u, expected %u\n", + i, desc_3d.Usage, D3D10_USAGE_DEFAULT); + ok_(__FILE__, line)(desc_3d.BindFlags == D3D10_BIND_SHADER_RESOURCE, + "Test %u: Got unexpected BindFlags %#x, expected %#x\n", + i, desc_3d.BindFlags, D3D10_BIND_SHADER_RESOURCE); + ok_(__FILE__, line)(desc_3d.CPUAccessFlags == 0, + "Test %u: Got unexpected CPUAccessFlags %#x, expected %#x\n", + i, desc_3d.CPUAccessFlags, 0); ok_(__FILE__, line)(desc_3d.MiscFlags == test_image[i].expected.MiscFlags, - "Test %u: Got unexpected MiscFlags %u, expected %u.\n", + "Test %u: Got unexpected MiscFlags %#x, expected %#x.\n", i, desc_3d.MiscFlags, test_image[i].expected.MiscFlags); ID3D10Texture3D_Release(texture_3d); break;

1 0

Stefan Dösinger : user32: Release the icon frame in CopyImage.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: 7ec5a7e1b642cfc5d2adc25b1c1ded21f1dde872 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ec5a7e1b642cfc5d2adc25b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 10 16:12:19 2021 +0200 user32: Release the icon frame in CopyImage. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index a225303f80f..f820c10a0d8 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -3000,6 +3000,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, { if (!(info.hbmColor = create_color_bitmap( desiredx, desiredy ))) { + release_icon_frame( icon, frame ); release_user_handle_ptr( icon ); return 0; } @@ -3009,6 +3010,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, if (!(info.hbmMask = CreateBitmap( desiredx, desiredy, 1, 1, NULL ))) { DeleteObject( info.hbmColor ); + release_icon_frame( icon, frame ); release_user_handle_ptr( icon ); return 0; } @@ -3034,6 +3036,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, DeleteObject( info.hbmMask ); } + release_icon_frame( icon, frame ); release_user_handle_ptr( icon ); if (res && (flags & LR_COPYDELETEORG)) DeleteObject( hnd );

1 0

Stefan Dösinger : user32: Delete info.hbmColor and hbmMask after copying.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: efa52619af448cd1c30a2fc8b872030c6adcf25e URL: https://source.winehq.org/git/wine.git/?a=commit;h=efa52619af448cd1c30a2fc8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 10 16:12:20 2021 +0200 user32: Delete info.hbmColor and hbmMask after copying. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index f820c10a0d8..7ad0a04a551 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1670,12 +1670,16 @@ HICON WINAPI CreateIcon( HINSTANCE instance, int width, int height, BYTE planes, HICON WINAPI CopyIcon( HICON icon ) { ICONINFOEXW info; + HICON res; info.cbSize = sizeof(info); if (!GetIconInfoExW( icon, &info )) return NULL; - return CopyImage( icon, info.fIcon ? IMAGE_ICON : IMAGE_CURSOR, 0, 0, 0 ); + res = CopyImage( icon, info.fIcon ? IMAGE_ICON : IMAGE_CURSOR, 0, 0, 0 ); + DeleteObject( info.hbmColor ); + DeleteObject( info.hbmMask ); + return res; }

1 0