February 2019 - Wine-Devel - list.winehq.org

[PATCH 2/4] windowscodecs: Fix the SupportsTransparency flag value for various pixel formats.
by Dmitry Timoshkov Feb. 20, 2019

Feb. 20, 2019

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/regsvr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index c8338f1bea..d215e30808 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1775,7 +1775,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_1bit, WICPixelFormatNumericRepresentationIndexed, - 1 + 0 }, { &GUID_WICPixelFormat2bppIndexed, "The Wine Project", @@ -1786,7 +1786,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_2bit, WICPixelFormatNumericRepresentationIndexed, - 1 + 0 }, { &GUID_WICPixelFormat4bppIndexed, "The Wine Project", @@ -1797,7 +1797,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_4bit, WICPixelFormatNumericRepresentationIndexed, - 1 + 0 }, { &GUID_WICPixelFormat8bppIndexed, "The Wine Project", @@ -1808,7 +1808,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_8bit, WICPixelFormatNumericRepresentationIndexed, - 1 + 0 }, { &GUID_WICPixelFormatBlackWhite, "The Wine Project", @@ -1995,7 +1995,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_32bit, WICPixelFormatNumericRepresentationFloat, - 1 + 0 }, { &GUID_WICPixelFormat48bppRGB, "The Wine Project", -- 2.20.1

2 1

[PATCH 1/4] windowscodecs/tests: Add a test for 8bpp indexed TIFF format.
by Dmitry Timoshkov Feb. 20, 2019

Feb. 20, 2019

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/tiffformat.c | 187 ++++++++++++++++++++++---- 1 file changed, 161 insertions(+), 26 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 7651ea154a..2f9a0ca65f 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -1,5 +1,5 @@ /* - * Copyright 2012 Dmitry Timoshkov + * Copyright 2012,2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -145,6 +145,49 @@ static const struct tiff_8bpp_alpha { 0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88 } }; +static const struct tiff_8bpp_data +{ + USHORT byte_order; + USHORT version; + ULONG dir_offset; + USHORT number_of_entries; + struct IFD_entry entry[14]; + ULONG next_IFD; + struct IFD_rational res; + short palette_data[3][256]; + BYTE pixel_data[4]; +} tiff_8bpp_data = +{ +#ifdef WORDS_BIGENDIAN + 'M' | 'M' << 8, +#else + 'I' | 'I' << 8, +#endif + 42, + FIELD_OFFSET(struct tiff_8bpp_data, number_of_entries), + 14, + { + { 0xff, IFD_SHORT, 1, 0 }, /* SUBFILETYPE */ + { 0x100, IFD_LONG, 1, 4 }, /* IMAGEWIDTH */ + { 0x101, IFD_LONG, 1, 1 }, /* IMAGELENGTH */ + { 0x102, IFD_SHORT, 1, 8 }, /* BITSPERSAMPLE: XP doesn't accept IFD_LONG here */ + { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION: XP doesn't accept IFD_LONG here */ + { 0x106, IFD_SHORT, 1, 3 }, /* PHOTOMETRIC */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_8bpp_data, pixel_data) }, /* STRIPOFFSETS */ + { 0x115, IFD_SHORT, 1, 1 }, /* SAMPLESPERPIXEL */ + { 0x116, IFD_LONG, 1, 1 }, /* ROWSPERSTRIP */ + { 0x117, IFD_LONG, 1, 1 }, /* STRIPBYTECOUNT */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_data, res) }, + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_data, res) }, + { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ + { 0x140, IFD_SHORT, 256*3, FIELD_OFFSET(struct tiff_8bpp_data, palette_data) } /* COLORMAP */ + }, + 0, + { 96, 1 }, + { { 0 } }, + { 0,1,2,3 } +}; + static const struct tiff_resolution_test_data { struct IFD_rational resx; @@ -284,29 +327,41 @@ static IStream *create_stream(const void *data, int data_size) return stream; } -static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size) +static HRESULT create_decoder(const void *image_data, UINT image_size, IWICBitmapDecoder **decoder) { + HGLOBAL hmem; + BYTE *data; HRESULT hr; IStream *stream; - IWICBitmapDecoder *decoder = NULL; - GUID guid; + GUID format; + LONG refcount; - stream = create_stream(image_data, image_size); + *decoder = NULL; - hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); - ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); - if (FAILED(hr)) return NULL; + hmem = GlobalAlloc(0, image_size); + data = GlobalLock(hmem); + memcpy(data, image_data, image_size); + GlobalUnlock(hmem); - hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guid); - ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); - ok(IsEqualGUID(&guid, &GUID_ContainerFormatTiff), "container format is not TIFF\n"); + hr = CreateStreamOnHGlobal(hmem, TRUE, &stream); + ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); - IStream_Release(stream); + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, decoder); + if (hr == S_OK) + { + hr = IWICBitmapDecoder_GetContainerFormat(*decoder, &format); + ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_ContainerFormatTiff), + "wrong container format %s\n", wine_dbgstr_guid(&format)); - return decoder; + refcount = IStream_Release(stream); + ok(refcount > 0, "expected stream refcount > 0\n"); + } + + return hr; } -static void test_tiff_palette(void) +static void test_tiff_1bpp_palette(void) { HRESULT hr; IWICBitmapDecoder *decoder; @@ -314,9 +369,9 @@ static void test_tiff_palette(void) IWICPalette *palette; GUID format; - decoder = create_decoder(&tiff_1bpp_data, sizeof(tiff_1bpp_data)); - ok(decoder != 0, "Failed to load TIFF image data\n"); - if (!decoder) return; + hr = create_decoder(&tiff_1bpp_data, sizeof(tiff_1bpp_data), &decoder); + ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr); + if (hr != S_OK) return; hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "GetFrame error %#x\n", hr); @@ -448,9 +503,9 @@ static void test_tiff_8bpp_alpha(void) static const BYTE expected_data[16] = { 0x11,0x11,0x11,0x22,0x33,0x33,0x33,0x44, 0x55,0x55,0x55,0x66,0x77,0x77,0x77,0x88 }; - decoder = create_decoder(&tiff_8bpp_alpha, sizeof(tiff_8bpp_alpha)); - ok(decoder != 0, "Failed to load TIFF image data\n"); - if (!decoder) return; + hr = create_decoder(&tiff_8bpp_alpha, sizeof(tiff_8bpp_alpha), &decoder); + ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr); + if (hr != S_OK) return; hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); ok(hr == S_OK, "GetFrameCount error %#x\n", hr); @@ -497,6 +552,84 @@ static void test_tiff_8bpp_alpha(void) IWICBitmapFrameDecode_Release(frame); } +static void generate_tiff_palette(void *buf, unsigned count) +{ + unsigned short *r, *g, *b; + unsigned i; + + r = buf; + g = r + count; + b = g + count; + + r[0] = 0x11 * 257; + g[0] = 0x22 * 257; + b[0] = 0x33 * 257; + r[1] = 0x44 * 257; + g[1] = 0x55 * 257; + b[1] = 0x66 * 257; + r[2] = 0x77 * 257; + g[2] = 0x88 * 257; + b[2] = 0x99 * 257; + r[3] = 0xa1 * 257; + g[3] = 0xb5 * 257; + b[3] = 0xff * 257; + + for (i = 4; i < count; i++) + { + r[i] = i * 257; + g[i] = (i | 0x40) * 257; + b[i] = (i | 0x80) * 257; + } +} + +static void test_tiff_8bpp_palette(void) +{ + char buf[sizeof(tiff_8bpp_data)]; + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + IWICPalette *palette; + GUID format; + UINT count, ret; + WICColor color[256]; + + memcpy(buf, &tiff_8bpp_data, sizeof(tiff_8bpp_data)); + generate_tiff_palette(buf + FIELD_OFFSET(struct tiff_8bpp_data, palette_data), 256); + + hr = create_decoder(buf, sizeof(buf), &decoder); + ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr); + if (hr != S_OK) return; + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed), + "expected GUID_WICPixelFormat8bppIndexed, got %s\n", wine_dbgstr_guid(&format)); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 256, "expected 256, got %u\n", count); + + hr = IWICPalette_GetColors(palette, 256, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[0] == 0xff112233, "got %#x\n", color[0]); + ok(color[1] == 0xff445566, "got %#x\n", color[1]); + ok(color[2] == 0xff778899, "got %#x\n", color[2]); + ok(color[3] == 0xffa1b5ff, "got %#x\n", color[3]); + + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + static void test_tiff_resolution(void) { HRESULT hr; @@ -512,9 +645,9 @@ static void test_tiff_resolution(void) tiff_resolution_image_data.resy = test_data->resy; tiff_resolution_image_data.entry[12].value = test_data->resolution_unit; - decoder = create_decoder(&tiff_resolution_image_data, sizeof(tiff_resolution_image_data)); - ok(decoder != 0, "%d: Failed to load TIFF image data\n", i); - if (!decoder) continue; + hr = create_decoder(&tiff_resolution_image_data, sizeof(tiff_resolution_image_data), &decoder); + ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr); + if (hr != S_OK) return; hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "%d: GetFrame error %#x\n", i, hr); @@ -561,8 +694,9 @@ static void test_tiff_24bpp(void) BYTE data[3]; static const BYTE expected_data[] = { 0x33,0x22,0x11 }; - decoder = create_decoder(&tiff_24bpp_data, sizeof(tiff_24bpp_data)); - ok(decoder != NULL, "Failed to load TIFF image data\n"); + hr = create_decoder(&tiff_24bpp_data, sizeof(tiff_24bpp_data), &decoder); + ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr); + if (hr != S_OK) return; hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); ok(hr == S_OK, "GetFrameCount error %#x\n", hr); @@ -620,7 +754,8 @@ START_TEST(tiffformat) ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); if (FAILED(hr)) return; - test_tiff_palette(); + test_tiff_1bpp_palette(); + test_tiff_8bpp_palette(); test_QueryCapability(); test_tiff_8bpp_alpha(); test_tiff_resolution(); -- 2.20.1

2 1

[PATCH] d3dx9: Simplify get_parameter_by_name().
by Matteo Bruni Feb. 20, 2019

Feb. 20, 2019

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/effect.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index fde87706739..81f16f6cbb3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -918,7 +918,6 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return NULL; } - /* Pass / technique annotations are not in the parameters tree. */ if (parameter->full_name) { name_len = strlen(name); @@ -948,9 +947,11 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return NULL; } + /* Pass / technique annotations are not stored in the parameters tree, + * do a linear search. */ count = parameter->member_count; - length = strcspn( name, "[.@" ); + length = strcspn( name, "[." ); part = name + length; for (i = 0; i < count; i++) @@ -969,9 +970,6 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, case '.': return get_parameter_by_name(base, temp_parameter, part); - case '@': - return NULL; - case '[': return get_parameter_element_by_name(base, temp_parameter, part); -- 2.19.2

2 1

[PATCH] d3dx9/tests: Avoid using the comma operator (coccinellery)
by Michael Stefaniuc Feb. 20, 2019

Feb. 20, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 114 ++++++++++++++++++------------------- dlls/d3dx9_36/tests/mesh.c | 2 +- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 04f5849850..0c3e001702 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -218,7 +218,7 @@ static void D3DXColorTest(void) scale = 0.3f; /*_______________D3DXColorAdd________________*/ - expected.r = 0.9f; expected.g = 1.05f; expected.b = 0.99f, expected.a = 0.93f; + expected.r = 0.9f; expected.g = 1.05f; expected.b = 0.99f; expected.a = 0.93f; D3DXColorAdd(&got,&color1,&color2); expect_color(&expected, &got, 1); /* Test the NULL case */ @@ -230,12 +230,12 @@ static void D3DXColorTest(void) ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); /*_______________D3DXColorAdjustContrast______*/ - expected.r = 0.41f; expected.g = 0.575f; expected.b = 0.473f, expected.a = 0.93f; + expected.r = 0.41f; expected.g = 0.575f; expected.b = 0.473f; expected.a = 0.93f; D3DXColorAdjustContrast(&got,&color,scale); expect_color(&expected, &got, 0); /*_______________D3DXColorAdjustSaturation______*/ - expected.r = 0.486028f; expected.g = 0.651028f; expected.b = 0.549028f, expected.a = 0.93f; + expected.r = 0.486028f; expected.g = 0.651028f; expected.b = 0.549028f; expected.a = 0.93f; D3DXColorAdjustSaturation(&got,&color,scale); expect_color(&expected, &got, 16); @@ -294,7 +294,7 @@ static void D3DXColorTest(void) ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); /*_______________D3DXColorSubtract_______________*/ - expected.r = -0.1f; expected.g = 0.25f; expected.b = -0.35f, expected.a = 0.82f; + expected.r = -0.1f; expected.g = 0.25f; expected.b = -0.35f; expected.a = 0.82f; D3DXColorSubtract(&got,&color,&color2); expect_color(&expected, &got, 1); /* Test the NULL case */ @@ -1143,8 +1143,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, &eye, &r, &last); expect_matrix(&expectedmat, &gotmat, 32); - q.x = 1.0f, q.y = 1.0f, q.z = 1.0f, q.w = 1.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 2.0f, + q.x = 1.0f; q.y = 1.0f; q.z = 1.0f; q.w = 1.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 2.0f; set_matrix(&expectedmat, 41.0f, -12.0f, -24.0f, 0.0f, @@ -1154,8 +1154,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 1.0f, q.z = 1.0f, q.w = 1.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + q.x = 1.0f; q.y = 1.0f; q.z = 1.0f; q.w = 1.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 3.0f; set_matrix(&expectedmat, 57.0f, -12.0f, -36.0f, 0.0f, @@ -1165,8 +1165,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 1.0f, q.z = 1.0f, q.w = 0.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + q.x = 1.0f; q.y = 1.0f; q.z = 1.0f; q.w = 0.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 3.0f; set_matrix(&expectedmat, 25.0f, 0.0f, -20.0f, 0.0f, @@ -1176,8 +1176,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 1.0f, q.z = 0.0f, q.w = 0.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + q.x = 1.0f; q.y = 1.0f; q.z = 0.0f; q.w = 0.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 3.0f; set_matrix(&expectedmat, 5.0f, -4.0f, 0.0f, 0.0f, @@ -1187,8 +1187,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 0.0f, - axis.x = 5.0f, axis.y = 2.0f, axis.z = 1.0f, + q.x = 1.0f; q.y = 0.0f; q.z = 0.0f; q.w = 0.0f; + axis.x = 5.0f; axis.y = 2.0f; axis.z = 1.0f; set_matrix(&expectedmat, 5.0f, 0.0f, 0.0f, 0.0f, @@ -1198,8 +1198,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 0.0f, - axis.x = 1.0f, axis.y = 4.0f, axis.z = 1.0f, + q.x = 1.0f; q.y = 0.0f; q.z = 0.0f; q.w = 0.0f; + axis.x = 1.0f; axis.y = 4.0f; axis.z = 1.0f; set_matrix(&expectedmat, 1.0f, 0.0f, 0.0f, 0.0f, @@ -1209,8 +1209,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 0.0f, q.y = 1.0f, q.z = 0.0f, q.w = 0.0f, - axis.x = 1.0f, axis.y = 4.0f, axis.z = 1.0f, + q.x = 0.0f; q.y = 1.0f; q.z = 0.0f; q.w = 0.0f; + axis.x = 1.0f; axis.y = 4.0f; axis.z = 1.0f; set_matrix(&expectedmat, 1.0f, 0.0f, 0.0f, 0.0f, @@ -1220,8 +1220,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 1.0f, - axis.x = 1.0f, axis.y = 4.0f, axis.z = 1.0f, + q.x = 1.0f; q.y = 0.0f; q.z = 0.0f; q.w = 1.0f; + axis.x = 1.0f; axis.y = 4.0f; axis.z = 1.0f; set_matrix(&expectedmat, 1.0f, 0.0f, 0.0f, 0.0f, @@ -1231,8 +1231,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 1.0f, - axis.x = 0.0f, axis.y = 4.0f, axis.z = 0.0f, + q.x = 1.0f; q.y = 0.0f; q.z = 0.0f; q.w = 1.0f; + axis.x = 0.0f; axis.y = 4.0f; axis.z = 0.0f; set_matrix(&expectedmat, 0.0f, 0.0f, 0.0f, 0.0f, @@ -1242,8 +1242,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 0.0f, q.y = 1.0f, q.z = 0.0f, q.w = 1.0f, - axis.x = 1.0f, axis.y = 4.0f, axis.z = 1.0f, + q.x = 0.0f; q.y = 1.0f; q.z = 0.0f; q.w = 1.0f; + axis.x = 1.0f; axis.y = 4.0f; axis.z = 1.0f; set_matrix(&expectedmat, 5.0f, 0.0f, 0.0f, 0.0f, @@ -1253,8 +1253,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 0.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + q.x = 1.0f; q.y = 0.0f; q.z = 0.0f; q.w = 0.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 3.0f; set_matrix(&expectedmat, 1.0f, 0.0f, 0.0f, 0.0f, @@ -1264,8 +1264,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 3.0f, axis.y = 3.0f, axis.z = 3.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 3.0f; axis.y = 3.0f; axis.z = 3.0f; set_matrix(&expectedmat, 3796587.0f, -1377948.0f, -1589940.0f, 0.0f, @@ -1275,8 +1275,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 1.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 1.0f; set_matrix(&expectedmat, 1265529.0f, -459316.0f, -529980.0f, 0.0f, @@ -1286,8 +1286,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 3.0f; set_matrix(&expectedmat, 2457497.0f, -434612.0f, -1423956.0f, 0.0f, @@ -1297,8 +1297,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 0.0f, axis.y = 0.0f, axis.z = 3.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 0.0f; axis.y = 0.0f; axis.z = 3.0f; set_matrix(&expectedmat, 1787952.0f, 37056.0f, -1340964.0f, 0.0f, @@ -1308,8 +1308,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 0.0f, axis.y = 0.0f, axis.z = 1.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 0.0f; axis.y = 0.0f; axis.z = 1.0f; set_matrix(&expectedmat, 595984.0f, 12352.0f, -446988.0f, 0.0f, @@ -1319,8 +1319,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 0.0f, axis.y = 3.0f, axis.z = 0.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 0.0f; axis.y = 3.0f; axis.z = 0.0f; set_matrix(&expectedmat, 150528.0f, 464352.0f, -513408.0f, 0.0f, @@ -1330,8 +1330,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 0.0f, axis.y = 1.0f, axis.z = 0.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 0.0f; axis.y = 1.0f; axis.z = 0.0f; set_matrix(&expectedmat, 50176.0f, 154784.0f, -171136.0f, 0.0f, @@ -1341,8 +1341,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 1.0f, axis.y = 0.0f, axis.z = 0.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 1.0f; axis.y = 0.0f; axis.z = 0.0f; set_matrix(&expectedmat, 619369.0f, -626452.0f, 88144.0f, 0.0f, @@ -1393,35 +1393,35 @@ static void D3DXPlaneTest(void) /*_______________D3DXPlaneDot________________*/ expected = 42.0f; - got = D3DXPlaneDot(&plane,&vec), + got = D3DXPlaneDot(&plane, &vec); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); expected = 0.0f; - got = D3DXPlaneDot(NULL,&vec), + got = D3DXPlaneDot(NULL, &vec); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); expected = 0.0f; - got = D3DXPlaneDot(NULL,NULL), + got = D3DXPlaneDot(NULL, NULL); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); /*_______________D3DXPlaneDotCoord________________*/ expected = -28.0f; - got = D3DXPlaneDotCoord(&plane,&vec), + got = D3DXPlaneDotCoord(&plane, &vec); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); expected = 0.0f; - got = D3DXPlaneDotCoord(NULL,&vec), + got = D3DXPlaneDotCoord(NULL, &vec); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); expected = 0.0f; - got = D3DXPlaneDotCoord(NULL,NULL), + got = D3DXPlaneDotCoord(NULL, NULL); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); /*_______________D3DXPlaneDotNormal______________*/ expected = -35.0f; - got = D3DXPlaneDotNormal(&plane,&vec), + got = D3DXPlaneDotNormal(&plane, &vec); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); expected = 0.0f; - got = D3DXPlaneDotNormal(NULL,&vec), + got = D3DXPlaneDotNormal(NULL, &vec); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); expected = 0.0f; - got = D3DXPlaneDotNormal(NULL,NULL), + got = D3DXPlaneDotNormal(NULL, NULL); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); /*_______________D3DXPlaneFromPointNormal_______*/ @@ -1463,7 +1463,7 @@ static void D3DXPlaneTest(void) expectedplane.a = -3.0f/sqrt(26.0f); expectedplane.b = -1.0f/sqrt(26.0f); expectedplane.c = 4.0f/sqrt(26.0f); expectedplane.d = 7.0/sqrt(26.0f); D3DXPlaneNormalize(&gotplane, &plane); expect_plane(&expectedplane, &gotplane, 2); - nulplane.a = 0.0; nulplane.b = 0.0f, nulplane.c = 0.0f; nulplane.d = 0.0f; + nulplane.a = 0.0; nulplane.b = 0.0f; nulplane.c = 0.0f; nulplane.d = 0.0f; expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f; D3DXPlaneNormalize(&gotplane, &nulplane); expect_plane(&expectedplane, &gotplane, 0); @@ -1484,9 +1484,9 @@ static void D3DXQuaternionTest(void) D3DXVECTOR3 axis, expectedvec; nul.x = 0.0f; nul.y = 0.0f; nul.z = 0.0f; nul.w = 0.0f; - q.x = 1.0f, q.y = 2.0f; q.z = 4.0f; q.w = 10.0f; + q.x = 1.0f; q.y = 2.0f; q.z = 4.0f; q.w = 10.0f; r.x = -3.0f; r.y = 4.0f; r.z = -5.0f; r.w = 7.0; - t.x = -1111.0f, t.y = 111.0f; t.z = -11.0f; t.w = 1.0f; + t.x = -1111.0f; t.y = 111.0f; t.z = -11.0f; t.w = 1.0f; u.x = 91.0f; u.y = - 82.0f; u.z = 7.3f; u.w = -6.4f; smallq.x = 0.1f; smallq.y = 0.2f; smallq.z= 0.3f; smallq.w = 0.4f; smallr.x = 0.5f; smallr.y = 0.6f; smallr.z= 0.7f; smallr.w = 0.8f; @@ -1790,9 +1790,9 @@ static void D3DXQuaternionTest(void) expect_quaternion(&expectedquat, &gotquat, 2); /*_______________D3DXQuaternionSquadSetup___________________*/ - r.x = 1.0f, r.y = 2.0f; r.z = 4.0f; r.w = 10.0f; + r.x = 1.0f; r.y = 2.0f; r.z = 4.0f; r.w = 10.0f; s.x = -3.0f; s.y = 4.0f; s.z = -5.0f; s.w = 7.0; - t.x = -1111.0f, t.y = 111.0f; t.z = -11.0f; t.w = 1.0f; + t.x = -1111.0f; t.y = 111.0f; t.z = -11.0f; t.w = 1.0f; u.x = 91.0f; u.y = - 82.0f; u.z = 7.3f; u.w = -6.4f; D3DXQuaternionSquadSetup(&gotquat, &Nq, &Nq1, &r, &s, &t, &u); expectedquat.x = 7.121285f; expectedquat.y = 2.159964f; expectedquat.z = -3.855094f; expectedquat.w = 5.362844f; @@ -2145,7 +2145,7 @@ static void D3DXVector3Test(void) ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXVec3Lerp__________________________*/ - expectedvec.x = 54.5f; expectedvec.y = 64.5f, expectedvec.z = 41.0f ; + expectedvec.x = 54.5f; expectedvec.y = 64.5f; expectedvec.z = 41.0f ; D3DXVec3Lerp(&gotvec,&u,&v,scale); expect_vec3(&expectedvec, &gotvec, 0); /* Tests the case NULL */ diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 3fcd65ffbb..e36ee0adcd 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -86,7 +86,7 @@ static void check_floats_(int line, const char *prefix, const float *got, const equal = equal && compare(*exp, *got); exp_buffer_ptr += sprintf(exp_buffer_ptr, "%g", *exp); got_buffer_ptr += sprintf(got_buffer_ptr, "%g", *got); - exp++, got++; + exp++; got++; } ok_(__FILE__,line)(equal, "%sExpected (%s), got (%s)", prefix, exp_buffer, got_buffer); } -- 2.20.1

2 1

[PATCH] d3dx9: Remove redundant "not NULL" checks (coccinellery)
by Michael Stefaniuc Feb. 20, 2019

Feb. 20, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- parameter is checked for not NULL at the beginning of the function. Those conditional expressions are blamed on 847f772fe1d but that just split an existing if (parameter) else construct. dlls/d3dx9_36/effect.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index e8ae7b54c2..1abc8dc7c8 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -948,15 +948,14 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return NULL; } - count = parameter ? parameter->member_count : base->parameter_count; + count = parameter->member_count; length = strcspn( name, "[.@" ); part = name + length; for (i = 0; i < count; i++) { - temp_parameter = !parameter ? &base->parameters[i].param - : &parameter->members[i]; + temp_parameter = &parameter->members[i]; if (!strcmp(temp_parameter->name, name)) { @@ -971,13 +970,8 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return get_parameter_by_name(base, temp_parameter, part); case '@': - { - struct d3dx_top_level_parameter *top_param - = top_level_parameter_from_parameter(temp_parameter); + return NULL; - return parameter ? NULL : get_annotation_by_name(base, top_param->annotation_count, - top_param->annotations, part); - } case '[': return get_parameter_element_by_name(base, temp_parameter, part); -- 2.20.1

3 2

[PATCH 1/5] kernel32/tests: Test ReadFileScatter() completion status with FILE_SKIP_COMPLETION_PORT_ON_SUCCESS.
by Paul Gofman Feb. 20, 2019

Feb. 20, 2019

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/kernel32/tests/file.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 18cd18d154..a4fba43242 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -61,6 +61,7 @@ static BOOL (WINAPI *pSetFileInformationByHandle)(HANDLE, FILE_INFO_BY_HANDLE_CL static BOOL (WINAPI *pGetQueuedCompletionStatusEx)(HANDLE, OVERLAPPED_ENTRY*, ULONG, ULONG*, DWORD, BOOL); static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); static void (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); +static BOOL (WINAPI *pSetFileCompletionNotificationModes)(HANDLE, UCHAR); static char filename[MAX_PATH]; static const char sillytext[] = @@ -109,6 +110,7 @@ static void InitFunctionPointers(void) pGetFinalPathNameByHandleW = (void *) GetProcAddress(hkernel32, "GetFinalPathNameByHandleW"); pSetFileInformationByHandle = (void *) GetProcAddress(hkernel32, "SetFileInformationByHandle"); pGetQueuedCompletionStatusEx = (void *) GetProcAddress(hkernel32, "GetQueuedCompletionStatusEx"); + pSetFileCompletionNotificationModes = (void *)GetProcAddress(hkernel32, "SetFileCompletionNotificationModes"); } static void test__hread( void ) @@ -4565,6 +4567,31 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf1 + si.dwPageSize / 2, rbuf2, si.dwPageSize - si.dwPageSize / 2 ) == 0, "invalid data was read into buffer\n" ); + if (pSetFileCompletionNotificationModes) + { + br = pSetFileCompletionNotificationModes(hfile, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); + ok(br, "SetFileCompletionNotificationModes failed, error %u.\n", GetLastError()); + + br = ReadFileScatter(hfile, fse, si.dwPageSize, NULL, &ovl); + ok(br == FALSE, "ReadFileScatter should be asynchronous.\n"); + ok(GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed, error %u.\n", GetLastError()); + + br = GetQueuedCompletionStatus(hiocp2, &size, &key, &povl, 1000); + todo_wine ok(br, "GetQueuedCompletionStatus failed, err %u.\n", GetLastError()); + todo_wine ok(povl == &ovl, "Wrong ovl %p.\n", povl); + + br = GetOverlappedResult(hfile, &ovl, &tx, TRUE); + ok(br, "GetOverlappedResult failed, err %u.\n", GetLastError()); + ok(tx == si.dwPageSize, "Got unexpected size %u.\n", tx); + + ResetEvent(evt); + + br = pSetFileCompletionNotificationModes(hfile, 0); + ok(br, "SetFileCompletionNotificationModes failed, error %u.\n", GetLastError()); + } + else + win_skip("SetFileCompletionNotificationModes not available.\n"); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); -- 2.20.1

1 4

[PATCH 1/3] ext-ms-win-ntuser-dialogbox-l1-1-0: Add dll.
by Andrey Gusev Feb. 20, 2019

Feb. 20, 2019

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- .../Makefile.in | 1 + .../ext-ms-win-ntuser-dialogbox-l1-1-0.spec | 21 +++++++++++++++++++ tools/make_specfiles | 1 + 3 files changed, 23 insertions(+) create mode 100644 dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/Makefile.in create mode 100644 dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/ext-ms-win-ntuser-dialogbox-l1-1-0.spec diff --git a/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/Makefile.in new file mode 100644 index 0000000000..e19c95d832 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-dialogbox-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/ext-ms-win-ntuser-dialogbox-l1-1-0.spec b/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/ext-ms-win-ntuser-dialogbox-l1-1-0.spec new file mode 100644 index 0000000000..6816e5f5d2 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/ext-ms-win-ntuser-dialogbox-l1-1-0.spec @@ -0,0 +1,21 @@ +@ stdcall CheckDlgButton(long long long) user32.CheckDlgButton +@ stdcall CreateDialogIndirectParamA(long ptr long ptr long) user32.CreateDialogIndirectParamA +@ stdcall CreateDialogIndirectParamW(long ptr long ptr long) user32.CreateDialogIndirectParamW +@ stdcall CreateDialogParamA(long str long ptr long) user32.CreateDialogParamA +@ stdcall CreateDialogParamW(long wstr long ptr long) user32.CreateDialogParamW +@ stdcall DialogBoxIndirectParamA(long ptr long ptr long) user32.DialogBoxIndirectParamA +@ stdcall DialogBoxIndirectParamW(long ptr long ptr long) user32.DialogBoxIndirectParamW +@ stdcall DialogBoxParamW(long wstr long ptr long) user32.DialogBoxParamW +@ stdcall EndDialog(long long) user32.EndDialog +@ stdcall GetDlgCtrlID(long) user32.GetDlgCtrlID +@ stdcall GetDlgItem(long long) user32.GetDlgItem +@ stdcall GetDlgItemTextW(long long ptr long) user32.GetDlgItemTextW +@ stdcall IsDlgButtonChecked(long long) user32.IsDlgButtonChecked +@ stdcall MessageBoxA(long str str long) user32.MessageBoxA +@ stdcall MessageBoxIndirectA(ptr) user32.MessageBoxIndirectA +@ stdcall MessageBoxIndirectW(ptr) user32.MessageBoxIndirectW +@ stdcall MessageBoxW(long wstr wstr long) user32.MessageBoxW +@ stdcall SendDlgItemMessageA(long long long long long) user32.SendDlgItemMessageA +@ stdcall SendDlgItemMessageW(long long long long long) user32.SendDlgItemMessageW +@ stdcall SetDlgItemTextA(long long str) user32.SetDlgItemTextA +@ stdcall SetDlgItemTextW(long long wstr) user32.SetDlgItemTextW diff --git a/tools/make_specfiles b/tools/make_specfiles index 8933ae46e8..f6cfea1f8d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -376,6 +376,7 @@ my @dll_groups = "api-ms-win-rtcore-ntuser-winevent-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-3", + "ext-ms-win-ntuser-dialogbox-l1-1-0", "ext-ms-win-ntuser-draw-l1-1-0", "ext-ms-win-ntuser-gui-l1-1-0", "ext-ms-win-ntuser-gui-l1-3-0", -- 2.20.1

1 2

[PATCH v6 6/6] comctl32/tests: Test negative counts in LB_SETCOUNT
by Huw Davies Feb. 20, 2019

Feb. 20, 2019

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/tests/listbox.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 0cdcdea7ec..de73ad2a56 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -1996,6 +1996,11 @@ static void test_set_count( void ) GetUpdateRect( listbox, &r, TRUE ); ok( !IsRectEmpty( &r ), "got empty rect\n"); + ret = SendMessageA( listbox, LB_SETCOUNT, -5, 0 ); + ok( ret == 0, "got %d\n", ret ); + ret = SendMessageA( listbox, LB_GETCOUNT, 0, 0 ); + ok( ret == -5, "got %d\n", ret ); + DestroyWindow( listbox ); for (i = 0; i < ARRAY_SIZE(styles); ++i) -- 2.18.0

1 0

[PATCH v6 5/6] comctl32/listbox: Implement LBS_NODATA for single-selection listboxes
by Huw Davies Feb. 20, 2019

Feb. 20, 2019

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> The LBS_NODATA style's purpose is to drastically improve performance and memory usage on very large lists, since they should function as virtual lists. Thus, don't store any data for single-selection listboxes (descr->items always NULL). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32374 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listbox.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index e89d25761e..cbe57f2616 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - LBS_NODATA + * - LBS_NODATA for multi-selection listboxes */ #include <string.h> @@ -135,17 +135,20 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) items_size + LB_ARRAY_GRANULARITY * 2 < descr->items_size) { items_size = (items_size + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); - items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA)); - if (!items) + if ((descr->style & (LBS_NODATA | LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) != LBS_NODATA) { - SEND_NOTIFICATION(descr, LBN_ERRSPACE); - return FALSE; + items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA)); + if (!items) + { + SEND_NOTIFICATION(descr, LBN_ERRSPACE); + return FALSE; + } + descr->items = items; } descr->items_size = items_size; - descr->items = items; } - if ((descr->style & LBS_NODATA) && items_size > descr->nb_items) + if ((descr->style & LBS_NODATA) && descr->items && items_size > descr->nb_items) { memset(&descr->items[descr->nb_items], 0, (items_size - descr->nb_items) * sizeof(LB_ITEMDATA)); @@ -190,6 +193,8 @@ static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR { LB_ITEMDATA *item; + if (!descr->items) return; + item = descr->items + index; if (index < descr->nb_items) memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); @@ -204,6 +209,8 @@ static void remove_item_data(LB_DESCR *descr, UINT index) { LB_ITEMDATA *item; + if (!descr->items) return; + item = descr->items + index; if (index < descr->nb_items) memmove(item, item + 1, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); @@ -1762,7 +1769,8 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) { INT i; - for(i = descr->nb_items - 1; i>=0; i--) LISTBOX_DeleteItem( descr, i); + if (!(descr->style & LBS_NODATA)) + for (i = descr->nb_items - 1; i >= 0; i--) LISTBOX_DeleteItem(descr, i); HeapFree( GetProcessHeap(), 0, descr->items ); descr->nb_items = 0; descr->top_item = 0; -- 2.18.0

1 0

[PATCH v6 4/6] comctl32/listbox: Move the item data removal into a separate function
by Huw Davies Feb. 20, 2019

Feb. 20, 2019

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listbox.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 44e3b1c7d1..e89d25761e 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -200,6 +200,15 @@ static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR item->selected = FALSE; } +static void remove_item_data(LB_DESCR *descr, UINT index) +{ + LB_ITEMDATA *item; + + item = descr->items + index; + if (index < descr->nb_items) + memmove(item, item + 1, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); +} + /*********************************************************************** * LISTBOX_GetCurrentPageSize * @@ -1699,8 +1708,6 @@ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) */ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) { - LB_ITEMDATA *item; - if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; /* We need to invalidate the original rect instead of the updated one. */ @@ -1713,15 +1720,9 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) } descr->nb_items--; LISTBOX_DeleteItem( descr, index ); + remove_item_data(descr, index); - /* Remove the item */ - - item = &descr->items[index]; - if (index < descr->nb_items) - RtlMoveMemory( item, item + 1, - (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); if (descr->anchor_item == descr->nb_items) descr->anchor_item--; - resize_storage(descr, descr->nb_items); /* Repaint the items */ -- 2.18.0

1 0