January 2023 - Wine-Commits

Rémi Bernon : services: Use a separate allocation for NotifyParamsArray[0].params.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 03aa9e13e70e0f4c8087a93c7435eff75fc7cddd URL: https://gitlab.winehq.org/wine/wine/-/commit/03aa9e13e70e0f4c8087a93c7435ef… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 15:13:41 2023 +0100 services: Use a separate allocation for NotifyParamsArray[0].params. The pointer might be freed by RPC NdrPointerFree, which will try to use a dedicated free call for the array elements, and fail. --- programs/services/rpc.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index de918d33b1f..e56d25ea1af 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -102,6 +102,8 @@ static void sc_notify_release(struct sc_notify_handle *notify) if (r == 0) { CloseHandle(notify->event); + if (notify->params_list) + free(notify->params_list->NotifyParamsArray[0].params); free(notify->params_list); free(notify); } @@ -841,11 +843,14 @@ static void fill_notify(struct sc_notify_handle *notify, struct service_entry *s SC_RPC_NOTIFY_PARAMS_LIST *list; SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *cparams; - list = calloc(1, sizeof(SC_RPC_NOTIFY_PARAMS_LIST) + sizeof(SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2)); + list = calloc(1, sizeof(SC_RPC_NOTIFY_PARAMS_LIST)); if (!list) return; - - cparams = (SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *)(list + 1); + if (!(cparams = calloc(1, sizeof(SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2)))) + { + free(list); + return; + } cparams->dwNotifyMask = notify->notify_mask; fill_status_process(&cparams->ServiceStatus, service);

1 0

Gerald Pfeifer : localspl: Avoid uninitialized variable in fill_builtin_form_info.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 9bf9b20c53ac843edf26e41eb1ef024876affd15 URL: https://gitlab.winehq.org/wine/wine/-/commit/9bf9b20c53ac843edf26e41eb1ef02… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 14 00:53:42 2023 +0100 localspl: Avoid uninitialized variable in fill_builtin_form_info. As diagnosed by GCC 13: dlls/localspl/provider.c: In function ‘fill_builtin_form_info’: dlls/localspl/provider.c:3045:16: warning: ‘res_len’ may be used uninitialized [-Wmaybe-uninitialized] 3045 | if (res_len) | ^ --- dlls/localspl/provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 790d9d64c00..7ab68b62c3d 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3008,7 +3008,7 @@ static void fill_builtin_form_info( BYTE **base, WCHAR **strings, const struct b DWORD size, DWORD *used ) { FORM_INFO_2W *info = *(FORM_INFO_2W**)base; - DWORD name_len = wcslen( form->name ) + 1, res_len, keyword_len, total_size; + DWORD name_len = wcslen( form->name ) + 1, res_len = 0, keyword_len, total_size; static const WCHAR dll_name[] = L"localspl.dll"; const WCHAR *resource;

1 0

Rémi Bernon : sechost: Use heap_strdup_multi_AtoW for dependencies in CreateServiceA.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: bea9ef83cc062372a1b6acfb31381a9ab86915ed URL: https://gitlab.winehq.org/wine/wine/-/commit/bea9ef83cc062372a1b6acfb31381a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 14:09:56 2023 +0100 sechost: Use heap_strdup_multi_AtoW for dependencies in CreateServiceA. --- dlls/sechost/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 011533b883e..b00e5536eda 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -356,7 +356,7 @@ SC_HANDLE WINAPI DECLSPEC_HOTPATCH CreateServiceA( SC_HANDLE manager, const char display_nameW = heap_strdupAtoW( display_name ); pathW = heap_strdupAtoW( path ); groupW = heap_strdupAtoW( group ); - dependenciesW = heap_strdupAtoW( dependencies ); + dependenciesW = heap_strdup_multi_AtoW( dependencies ); usernameW = heap_strdupAtoW( username ); passwordW = heap_strdupAtoW( password );

1 0

Zebediah Figura : d3d11/tests: Add a basic test for vertex formats.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: dc19f5c517af5d04bebb4f26bd79220b02f1ba64 URL: https://gitlab.winehq.org/wine/wine/-/commit/dc19f5c517af5d04bebb4f26bd7922… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 11 19:25:11 2023 -0600 d3d11/tests: Add a basic test for vertex formats. --- dlls/d3d11/tests/d3d11.c | 192 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 192 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1f6b211f693..70a8ff1f683 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -34725,6 +34725,197 @@ static void test_rtv_depth_slice(void) release_test_context(&test_context); } +static void test_vertex_formats(void) +{ + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + ID3D11Device *device; + ID3D11Texture2D *rt; + unsigned int i; + HRESULT hr; + + static const D3D11_TEXTURE2D_DESC rt_desc = + { + .Width = 4, + .Height = 4, + .MipLevels = 1, + .ArraySize = 1, + .Format = DXGI_FORMAT_R32G32B32A32_FLOAT, + .SampleDesc.Count = 1, + .Usage = D3D11_USAGE_DEFAULT, + .BindFlags = D3D11_BIND_RENDER_TARGET, + }; + + static const struct quad + { + struct vec2 position; + unsigned int color[4]; + } + quad[] = + { + {{-1.0f, -1.0f}, {0x87654321, 0x12345678, 0xcccccccc, 0xdeadbeef}}, + {{-1.0f, 1.0f}, {0x87654321, 0x12345678, 0xcccccccc, 0xdeadbeef}}, + {{ 1.0f, -1.0f}, {0x87654321, 0x12345678, 0xcccccccc, 0xdeadbeef}}, + {{ 1.0f, 1.0f}, {0x87654321, 0x12345678, 0xcccccccc, 0xdeadbeef}}, + }; + + static const unsigned int vs_code[] = + { +#if 0 + void main(inout float4 position : sv_position, inout float4 color : COLOR) + { + } +#endif + 0x43425844, 0xc2f6fe60, 0x8a304938, 0x14c1a190, 0xe6f3e35e, 0x00000001, 0x00000144, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x705f7673, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x705f7673, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000068, 0x00010040, + 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067, + 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, + 0x0100003e, + }; + + static const unsigned int ps_code[] = + { +#if 0 + float4 main(float4 position : sv_position, float4 color : COLOR) : sv_target + { + return color; + } +#endif + 0x43425844, 0xb9b047ca, 0x73193a19, 0xb9a919ed, 0x21c2ff5f, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x705f7673, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x745f7673, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + + static const struct vec4 white = {1.0f, 1.0f, 1.0f, 1.0f}; + + static const struct + { + DXGI_FORMAT format; + struct vec4 expect; + } + tests[] = + { + {DXGI_FORMAT_R32G32B32A32_FLOAT, {-1.72477726e-34, 5.69045661e-28, -1.07374176e+08, -6.25985340e+18}}, + {DXGI_FORMAT_R32G32B32_FLOAT, {-1.72477726e-34, 5.69045661e-28, -1.07374176e+08, 1.0}}, + {DXGI_FORMAT_R32G32_FLOAT, {-1.72477726e-34, 5.69045661e-28, 0.0, 1.0}}, + {DXGI_FORMAT_R32_FLOAT, {-1.72477726e-34, 0.0, 0.0, 1.0}}, + + {DXGI_FORMAT_R10G10B10A2_UNORM, { 7.82991230e-01, 3.28445762e-01, 1.15347020e-01, 6.66666666e-01}}, + + {DXGI_FORMAT_R11G11B10_FLOAT, { 1.89453125e-01, 1.30000000e+01, 3.81250000e+00, 1.0}}, + + {DXGI_FORMAT_R16G16B16A16_FLOAT, { 3.56445313e+00, -1.12831593e-04, 1.03500000e+02, 7.57217407e-04}}, + {DXGI_FORMAT_R16G16B16A16_UNORM, { 2.62226284e-01, 5.28892934e-01, 3.37773710e-01, 7.11070448e-02}}, + {DXGI_FORMAT_R16G16B16A16_SNORM, { 5.24460614e-01, -9.42258954e-01, 6.75557733e-01, 1.42216250e-01}}, + {DXGI_FORMAT_R16G16_FLOAT, { 3.56445313e+00, -1.12831593e-04, 0.0, 1.0}}, + {DXGI_FORMAT_R16G16_UNORM, { 2.62226284e-01, 5.28892934e-01, 0.0, 1.0}}, + {DXGI_FORMAT_R16G16_SNORM, { 5.24460614e-01, -9.42258954e-01, 0.0, 1.0}}, + {DXGI_FORMAT_R16_FLOAT, { 3.56445313e+00, 0.0, 0.0, 1.0}}, + {DXGI_FORMAT_R16_UNORM, { 2.62226284e-01, 0.0, 0.0, 1.0}}, + {DXGI_FORMAT_R16_SNORM, { 5.24460614e-01, 0.0, 0.0, 1.0}}, + + {DXGI_FORMAT_R8G8B8A8_UNORM, { 1.29411772e-01, 2.62745112e-01, 3.96078438e-01, 5.29411793e-01}}, + {DXGI_FORMAT_R8G8B8A8_SNORM, { 2.59842515e-01, 5.27559042e-01, 7.95275569e-01, -9.52755928e-01}}, + {DXGI_FORMAT_R8G8_UNORM, { 1.29411772e-01, 2.62745112e-01, 0.0, 1.0}}, + {DXGI_FORMAT_R8G8_SNORM, { 2.59842515e-01, 5.27559042e-01, 0.0, 1.0}}, + {DXGI_FORMAT_R8_UNORM, { 1.29411772e-01, 0.0, 0.0, 1.0}}, + {DXGI_FORMAT_R8_SNORM, { 2.59842515e-01, 0.0, 0.0, 1.0}}, + + {DXGI_FORMAT_B8G8R8A8_UNORM, { 3.96078438e-01, 2.62745112e-01, 1.29411772e-01, 5.29411793e-01}}, + {DXGI_FORMAT_B8G8R8X8_UNORM, { 3.96078438e-01, 2.62745112e-01, 1.29411772e-01, 1.0}}, + }; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreateTexture2D(device, &rt_desc, NULL, &rt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt, NULL, &rtv); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &test_context.vs); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &test_context.ps); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + test_context.vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(quad), quad); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + const D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + { + .SemanticName = "sv_position", + .SemanticIndex = 0, + .Format = DXGI_FORMAT_R32G32_FLOAT, + .InputSlot = 0, + .AlignedByteOffset = offsetof(struct quad, position), + .InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA, + }, + { + .SemanticName = "COLOR", + .SemanticIndex = 0, + .Format = tests[i].format, + .InputSlot = 0, + .AlignedByteOffset = offsetof(struct quad, color), + .InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA, + }, + }; + + static const unsigned int stride = sizeof(*quad); + static const unsigned int offset = 0; + ID3D11InputLayout *input_layout; + unsigned int format_support; + + hr = ID3D11Device_CheckFormatSupport(device, tests[i].format, &format_support); + ok(hr == S_OK || hr == E_FAIL, "Got hr %#lx.\n", hr); + + if (!(format_support & D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER)) + continue; + + winetest_push_context("Format %#x", tests[i].format); + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + clear_rtv(context, rtv, &white); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + ID3D11DeviceContext_IASetInputLayout(context, input_layout); + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &test_context.vb, &stride, &offset); + ID3D11DeviceContext_VSSetShader(context, test_context.vs, NULL, 0); + ID3D11DeviceContext_PSSetShader(context, test_context.ps, NULL, 0); + ID3D11DeviceContext_Draw(context, 4, 0); + + todo_wine_if (tests[i].format == DXGI_FORMAT_R11G11B10_FLOAT) + check_texture_vec4(rt, &tests[i].expect, 1); + + ID3D11InputLayout_Release(input_layout); + + winetest_pop_context(); + } + + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(rt); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -34907,6 +35098,7 @@ START_TEST(d3d11) queue_test(test_user_defined_annotation); queue_test(test_logic_op); queue_test(test_rtv_depth_slice); + queue_test(test_vertex_formats); run_queued_tests();

1 0

Zhiyi Zhang : comctl32/tests: Add WM_STYLECHANGED tests for changing listview view styles.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: cc84be8d897b88a767bb14341fdf6688df92742a URL: https://gitlab.winehq.org/wine/wine/-/commit/cc84be8d897b88a767bb14341fdf66… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Jan 21 15:39:17 2023 +0800 comctl32/tests: Add WM_STYLECHANGED tests for changing listview view styles. Changing view styles should repaint listviews according to the newly added tests. --- dlls/comctl32/tests/misc.c | 65 +++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 5613fba15f5..d128c202c67 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1021,6 +1021,15 @@ static const struct message wm_stylechanged_combox_seq[] = {0} }; +static const struct message wm_stylechanged_listview_report_seq[] = +{ + {WM_STYLECHANGED, sent}, + {WM_ERASEBKGND, sent | defwinproc}, + {WM_PAINT, sent}, + {WM_ERASEBKGND, sent | defwinproc}, + {0} +}; + static const struct message wm_stylechanged_pager_seq[] = { {WM_STYLECHANGED, sent}, @@ -1081,37 +1090,39 @@ static void test_WM_STYLECHANGED(void) static const struct test { const CHAR *class_name; + DWORD add_style; const struct message *seq; BOOL todo; } tests[] = { - {ANIMATE_CLASSA, wm_stylechanged_seq}, - {WC_BUTTONA, wm_stylechanged_seq}, - {WC_COMBOBOXA, wm_stylechanged_combox_seq, TRUE}, - {WC_COMBOBOXEXA, wm_stylechanged_seq}, - {DATETIMEPICK_CLASSA, wm_stylechanged_seq}, - {WC_EDITA, wm_stylechanged_seq}, - {WC_HEADERA, wm_stylechanged_repaint_seq, TRUE}, - {HOTKEY_CLASSA, wm_stylechanged_seq}, - {WC_IPADDRESSA, wm_stylechanged_seq}, - {WC_LISTBOXA, wm_stylechanged_repaint_seq, TRUE}, - {WC_LISTVIEWA, wm_stylechanged_seq}, - {MONTHCAL_CLASSA, wm_stylechanged_repaint_seq, TRUE}, - {WC_NATIVEFONTCTLA, wm_stylechanged_seq}, - {WC_PAGESCROLLERA, wm_stylechanged_pager_seq, TRUE}, - {PROGRESS_CLASSA, wm_stylechanged_progress_seq}, - {REBARCLASSNAMEA, wm_stylechanged_seq}, - {WC_STATICA, wm_stylechanged_seq}, - {STATUSCLASSNAMEA, wm_stylechanged_seq}, - {"SysLink", wm_stylechanged_seq}, - {WC_TABCONTROLA, wm_stylechanged_seq}, - {TOOLBARCLASSNAMEA, wm_stylechanged_seq}, - {TOOLTIPS_CLASSA, wm_stylechanged_seq}, - {TRACKBAR_CLASSA, wm_stylechanged_trackbar_seq, TRUE}, - {WC_TREEVIEWA, wm_stylechanged_seq}, - {UPDOWN_CLASSA, wm_stylechanged_seq}, - {WC_SCROLLBARA, wm_stylechanged_seq}, + {ANIMATE_CLASSA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_BUTTONA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_COMBOBOXA, WS_TABSTOP, wm_stylechanged_combox_seq, TRUE}, + {WC_COMBOBOXEXA, WS_TABSTOP, wm_stylechanged_seq}, + {DATETIMEPICK_CLASSA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_EDITA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_HEADERA, WS_TABSTOP, wm_stylechanged_repaint_seq, TRUE}, + {HOTKEY_CLASSA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_IPADDRESSA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_LISTBOXA, WS_TABSTOP, wm_stylechanged_repaint_seq, TRUE}, + {WC_LISTVIEWA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_LISTVIEWA, LVS_REPORT, wm_stylechanged_listview_report_seq, TRUE}, + {MONTHCAL_CLASSA, WS_TABSTOP, wm_stylechanged_repaint_seq, TRUE}, + {WC_NATIVEFONTCTLA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_PAGESCROLLERA, WS_TABSTOP, wm_stylechanged_pager_seq, TRUE}, + {PROGRESS_CLASSA, WS_TABSTOP, wm_stylechanged_progress_seq}, + {REBARCLASSNAMEA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_STATICA, WS_TABSTOP, wm_stylechanged_seq}, + {STATUSCLASSNAMEA, WS_TABSTOP, wm_stylechanged_seq}, + {"SysLink", WS_TABSTOP, wm_stylechanged_seq}, + {WC_TABCONTROLA, WS_TABSTOP, wm_stylechanged_seq}, + {TOOLBARCLASSNAMEA, WS_TABSTOP, wm_stylechanged_seq}, + {TOOLTIPS_CLASSA, WS_TABSTOP, wm_stylechanged_seq}, + {TRACKBAR_CLASSA, WS_TABSTOP, wm_stylechanged_trackbar_seq, TRUE}, + {WC_TREEVIEWA, WS_TABSTOP, wm_stylechanged_seq}, + {UPDOWN_CLASSA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_SCROLLBARA, WS_TABSTOP, wm_stylechanged_seq}, }; parent = CreateWindowA(WC_STATICA, "parent", WS_POPUP | WS_VISIBLE, 100, 100, 100, 100, @@ -1137,7 +1148,7 @@ static void test_WM_STYLECHANGED(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); style.styleOld = GetWindowLongA(hwnd, GWL_STYLE); - style.styleNew = style.styleOld | WS_TABSTOP; + style.styleNew = style.styleOld | tests[i].add_style; SendMessageA(hwnd, WM_STYLECHANGED, GWL_STYLE, (LPARAM)&style); flush_events(); ok_sequence(sequences, CHILD_SEQ_INDEX, tests[i].seq, "WM_STYLECHANGED", tests[i].todo);

1 0

Zhiyi Zhang : comctl32/listview: Repaint when changing view styles.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 1f1f99025d92e8e8b4428f3efc103ba7be9b63b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f1f99025d92e8e8b4428f3efc103b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Jan 22 12:39:53 2023 +0800 comctl32/listview: Repaint when changing view styles. Changing listview view styles should repaint according to the tests in test_WM_STYLECHANGED(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54215 --- dlls/comctl32/listview.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 07bea8574b6..fc22818c37b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11212,6 +11212,7 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) { UINT uNewView, uOldView; + BOOL repaint = FALSE; UINT style; TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", @@ -11236,6 +11237,8 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, { HIMAGELIST himl; + repaint = TRUE; + /* LVM_SETVIEW doesn't change window style bits within LVS_TYPEMASK, changing style updates current view only when view bits change. */ map_style_view(infoPtr); @@ -11297,6 +11300,9 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, /* add scrollbars if needed */ LISTVIEW_UpdateScroll(infoPtr); + if (repaint) + LISTVIEW_InvalidateList(infoPtr); + return 0; }

1 0

Jinoh Kang : ntdll: Validate blocks in the heap pending free request list.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: af557f0cbc644e5a46af0b13acef8eae59e1cbea URL: https://gitlab.winehq.org/wine/wine/-/commit/af557f0cbc644e5a46af0b13acef8e… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Dec 31 22:57:17 2022 +0900 ntdll: Validate blocks in the heap pending free request list. --- dlls/ntdll/heap.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index c8eec050b1a..2097a557789 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1174,6 +1174,36 @@ static BOOL heap_validate( const struct heap *heap ) } } + if (heap->pending_free) + { + unsigned int i; + + for (i = 0; i < MAX_FREE_PENDING; i++) + { + if (!(block = heap->pending_free[i])) break; + + subheap = find_subheap( heap, block, FALSE ); + if (!subheap) + { + ERR( "heap %p: cannot find valid subheap for delayed freed block %p\n", heap, block ); + if (TRACE_ON(heap)) heap_dump( heap ); + return FALSE; + } + + if (!validate_used_block( heap, subheap, block, BLOCK_TYPE_DEAD )) return FALSE; + } + + for (; i < MAX_FREE_PENDING; i++) + { + if ((block = heap->pending_free[i])) + { + ERR( "heap %p: unexpected delayed freed block %p at slot %u\n", heap, block, i ); + if (TRACE_ON(heap)) heap_dump( heap ); + return FALSE; + } + } + } + LIST_FOR_EACH_ENTRY( large_arena, &heap->large_list, ARENA_LARGE, entry ) if (!validate_large_block( heap, &large_arena->block )) return FALSE;

1 0

Evan Tang : mshtml: Implement IHTMLRect2 for HTMLRect.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 8b0868c1760121c8ae5cf5466d16e4d5f7faba3e URL: https://gitlab.winehq.org/wine/wine/-/commit/8b0868c1760121c8ae5cf5466d16e4… Author: Evan Tang <etang(a)codeweavers.com> Date: Wed Jan 18 16:14:19 2023 -0600 mshtml: Implement IHTMLRect2 for HTMLRect. --- dlls/mshtml/htmlelem.c | 110 +++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 17 ++++++ dlls/mshtml/tests/dom.js | 2 + include/mshtmdid.h | 4 ++ include/mshtml.idl | 18 +++++++ 6 files changed, 151 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b66b0c22552..f8b2eb46e6c 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -529,6 +529,7 @@ HRESULT create_element(HTMLDocumentNode *doc, const WCHAR *tag, HTMLElement **re typedef struct { DispatchEx dispex; IHTMLRect IHTMLRect_iface; + IHTMLRect2 IHTMLRect2_iface; LONG ref; @@ -550,6 +551,8 @@ static HRESULT WINAPI HTMLRect_QueryInterface(IHTMLRect *iface, REFIID riid, voi *ppv = &This->IHTMLRect_iface; }else if(IsEqualGUID(&IID_IHTMLRect, riid)) { *ppv = &This->IHTMLRect_iface; + }else if (IsEqualGUID(&IID_IHTMLRect2, riid)) { + *ppv = &This->IHTMLRect2_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { @@ -723,6 +726,91 @@ static HRESULT WINAPI HTMLRect_get_bottom(IHTMLRect *iface, LONG *p) return S_OK; } +static inline HTMLRect *impl_from_IHTMLRect2(IHTMLRect2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLRect, IHTMLRect2_iface); +} + +static HRESULT WINAPI HTMLRect2_QueryInterface(IHTMLRect2 *iface, REFIID riid, void **ppv) +{ + HTMLRect *This = impl_from_IHTMLRect2(iface); + return IHTMLRect_QueryInterface(&This->IHTMLRect_iface, riid, ppv); +} + +static ULONG WINAPI HTMLRect2_AddRef(IHTMLRect2 *iface) +{ + HTMLRect *This = impl_from_IHTMLRect2(iface); + return IHTMLRect_AddRef(&This->IHTMLRect_iface); +} + +static ULONG WINAPI HTMLRect2_Release(IHTMLRect2 *iface) +{ + HTMLRect *This = impl_from_IHTMLRect2(iface); + return IHTMLRect_Release(&This->IHTMLRect_iface); +} + +static HRESULT WINAPI HTMLRect2_GetTypeInfoCount(IHTMLRect2 *iface, UINT *pctinfo) +{ + HTMLRect *This = impl_from_IHTMLRect2(iface); + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLRect2_GetTypeInfo(IHTMLRect2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLRect *This = impl_from_IHTMLRect2(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLRect2_GetIDsOfNames(IHTMLRect2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLRect *This = impl_from_IHTMLRect2(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLRect2_Invoke(IHTMLRect2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLRect *This = impl_from_IHTMLRect2(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLRect2_get_width(IHTMLRect2 *iface, FLOAT *p) +{ + HTMLRect *This = impl_from_IHTMLRect2(iface); + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMClientRect_GetWidth(This->nsrect, p); + if (NS_FAILED(nsres)) { + ERR("GetWidth failed: %08lx\n", nsres); + return E_FAIL; + } + + return S_OK; +} + +static HRESULT WINAPI HTMLRect2_get_height(IHTMLRect2 *iface, FLOAT *p) +{ + HTMLRect *This = impl_from_IHTMLRect2(iface); + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMClientRect_GetHeight(This->nsrect, p); + if (NS_FAILED(nsres)) { + ERR("GetHeight failed: %08lx\n", nsres); + return E_FAIL; + } + + return S_OK; +} + static const IHTMLRectVtbl HTMLRectVtbl = { HTMLRect_QueryInterface, HTMLRect_AddRef, @@ -741,6 +829,24 @@ static const IHTMLRectVtbl HTMLRectVtbl = { HTMLRect_get_bottom }; +static const IHTMLRect2Vtbl HTMLRect2Vtbl = { + HTMLRect2_QueryInterface, + HTMLRect2_AddRef, + HTMLRect2_Release, + HTMLRect2_GetTypeInfoCount, + HTMLRect2_GetTypeInfo, + HTMLRect2_GetIDsOfNames, + HTMLRect2_Invoke, + HTMLRect2_get_width, + HTMLRect2_get_height, +}; + +void HTMLRect_init_dispex_info(dispex_data_t *info, compat_mode_t mode) +{ + if (mode >= COMPAT_MODE_IE9) + dispex_info_add_interface(info, IHTMLRect2_tid, NULL); +} + static const tid_t HTMLRect_iface_tids[] = { IHTMLRect_tid, 0 @@ -749,7 +855,8 @@ static dispex_static_data_t HTMLRect_dispex = { L"ClientRect", NULL, IHTMLRect_tid, - HTMLRect_iface_tids + HTMLRect_iface_tids, + HTMLRect_init_dispex_info }; static HRESULT create_html_rect(nsIDOMClientRect *nsrect, compat_mode_t compat_mode, IHTMLRect **ret) @@ -761,6 +868,7 @@ static HRESULT create_html_rect(nsIDOMClientRect *nsrect, compat_mode_t compat_m return E_OUTOFMEMORY; rect->IHTMLRect_iface.lpVtbl = &HTMLRectVtbl; + rect->IHTMLRect2_iface.lpVtbl = &HTMLRect2Vtbl; rect->ref = 1; init_dispatch(&rect->dispex, (IUnknown*)&rect->IHTMLRect_iface, &HTMLRect_dispex, compat_mode); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d5a9e02aa13..870ba14c8b4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -237,6 +237,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLPerformanceTiming) \ XIID(IHTMLPluginsCollection) \ XIID(IHTMLRect) \ + XIID(IHTMLRect2) \ XIID(IHTMLRectCollection) \ XIID(IHTMLScreen) \ XIID(IHTMLScriptElement) \ diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 760d8db5e38..cd639712a9f 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -557,6 +557,23 @@ sync_test("stylesheet_props", function() { test_exposed("rules", true); }); +sync_test("rect_props", function() { + document.body.innerHTML = '<div>test</div>'; + var elem = document.body.firstChild; + var rect = elem.getBoundingClientRect(); + function test_exposed(prop, expect) { + if(expect) + ok(prop in rect, prop + " not found in rect object."); + else + ok(!(prop in rect), prop + " found in rect object."); + } + + var v = document.documentMode; + + test_exposed("width", v >= 9); + test_exposed("height", v >= 9); +}); + sync_test("xhr open", function() { var e = false; try { diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 5a31b869c8f..e5a07027f7c 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -293,6 +293,8 @@ sync_test("rects", function() { ok(rects.length === 1, "rect.length = " + rects.length); ok(rects[0].top === rect.top, "rects[0].top = " + rects[0].top + " rect.top = " + rect.top); ok(rects[0].bottom === rect.bottom, "rects[0].bottom = " + rects[0].bottom + " rect.bottom = " + rect.bottom); + ok(rect.height === rect.bottom - rect.top, "rect.height = " + rect.height + " rect.bottom = " + rect.bottom + " rect.top = " + rect.top); + ok(rect.width === rect.right - rect.left, "rect.width = " + rect.width + " rect.right = " + rect.right + " rect.left = " + rect.left); elem = document.createElement("style"); rects = elem.getClientRects(); diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 0e95a7d7165..1673dd3cea0 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -4135,6 +4135,10 @@ #define DISPID_IHTMLRECT_RIGHT DISPID_OMRECT+3 #define DISPID_IHTMLRECT_BOTTOM DISPID_OMRECT+4 +/* IHTMLRect2 */ +#define DISPID_IHTMLRECT2_WIDTH DISPID_OMRECT+5 +#define DISPID_IHTMLRECT2_HEIGHT DISPID_OMRECT+6 + /* IHTMLRectCollection */ #define DISPID_IHTMLRECTCOLLECTION_LENGTH DISPID_COLLECTION #define DISPID_IHTMLRECTCOLLECTION__NEWENUM DISPID_NEWENUM diff --git a/include/mshtml.idl b/include/mshtml.idl index eff87a4593e..1a5c9bbaf28 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -7937,6 +7937,24 @@ interface IHTMLRect : IDispatch HRESULT bottom([retval, out] LONG *p); } +/***************************************************************************** + * IHTMLRect2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051076c-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLRect2 : IDispatch +{ + [propget, id(DISPID_IHTMLRECT2_WIDTH)] + HRESULT width([retval, out] FLOAT *p); + + [propget, id(DISPID_IHTMLRECT2_HEIGHT)] + HRESULT height([retval, out] FLOAT *p); +} + /***************************************************************************** * IHTMLRectCollection interface */

1 0

Jinoh Kang : ntdll: Remove redundant WARN_ON(heap) check.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: f9ab9292e7e23674c32a3af7a292732698058c68 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9ab9292e7e23674c32a3af7a29273… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Jan 2 20:07:13 2023 +0900 ntdll: Remove redundant WARN_ON(heap) check. --- dlls/ntdll/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 2097a557789..9403c83e92c 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1136,7 +1136,7 @@ static BOOL heap_validate_ptr( const struct heap *heap, const void *ptr ) { if (!find_large_block( heap, block )) { - if (WARN_ON(heap)) WARN("heap %p, ptr %p: block region not found\n", heap, ptr ); + WARN("heap %p, ptr %p: block region not found\n", heap, ptr ); return FALSE; }

1 0

Jinoh Kang : riched20: Obtain the composition start index after deleting selection.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 8c43577f0f9b4422d3641457c595c3998bd54a18 URL: https://gitlab.winehq.org/wine/wine/-/commit/8c43577f0f9b4422d3641457c595c3… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jan 24 01:08:10 2023 +0900 riched20: Obtain the composition start index after deleting selection. Today, the Rich Edit control handles the WM_IME_STARTCOMPOSITION message by the computing the composition start position (imeStartIndex) _before_ calling ME_DeleteSelection(), which shifts the character positions after the range of deletion. If the selection were not empty, imeStartIndex immediately becomes stale, since it does not take into account the number of deleted characters before it. Fix this by computing imeStartIndex after the ME_DeleteSelection() call. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54318 --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 57601745ab2..7b4f4b3cdf3 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4099,8 +4099,8 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; case WM_IME_STARTCOMPOSITION: { - editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]); ME_DeleteSelection(editor); + editor->imeStartIndex = ME_GetCursorOfs(&editor->pCursors[0]); ME_CommitUndo(editor); ME_UpdateRepaint(editor, FALSE); return 0;

1 0