January 2019 - Wine-Commits

Dmitry Timoshkov : windowscodecs/tests: Fix typos in TIFF test data.
by Alexandre Julliard Jan. 10, 2019

Jan. 10, 2019

Module: wine Branch: master Commit: ebe15537d1a3de7505f851d2a6ab362f12e44d3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebe15537d1a3de7505f851d2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 10 11:30:59 2019 +0800 windowscodecs/tests: Fix typos in TIFF test data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/tiffformat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 8da843b..c15e498 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -220,7 +220,7 @@ static struct tiff_resolution_image_data { 0x11, 0x22, 0x33, 0 } }; -static const struct +static const struct tiff_24bpp_data { USHORT byte_order; USHORT version; @@ -247,12 +247,12 @@ static const struct { 0x102, IFD_SHORT, 1, 8 }, /* BITSPERSAMPLE */ { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION: XP doesn't accept IFD_LONG here */ { 0x106, IFD_SHORT, 1, 2 }, /* PHOTOMETRIC */ - { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_1bpp_data, pixel_data) }, /* STRIPOFFSETS */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_24bpp_data, pixel_data) }, /* STRIPOFFSETS */ { 0x115, IFD_SHORT, 1, 3 }, /* SAMPLESPERPIXEL */ { 0x116, IFD_LONG, 1, 1 }, /* ROWSPERSTRIP */ - { 0x117, IFD_LONG, 1, 1 }, /* STRIPBYTECOUNT */ - { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, /* XRESOLUTION */ - { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, /* YRESOLUTION */ + { 0x117, IFD_LONG, 1, 3 }, /* STRIPBYTECOUNT */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_24bpp_data, res) }, /* XRESOLUTION */ + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_24bpp_data, res) }, /* YRESOLUTION */ { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ }, 0,

1 0

Gijs Vermeulen : ntoskrnl.exe/tests: Avoid passing uninitialized data to DeviceIoControl().
by Alexandre Julliard Jan. 10, 2019

Jan. 10, 2019

Module: wine Branch: master Commit: db8f599863b2158fe854b3d937db8257c660bab5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db8f599863b2158fe854b3d9… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Jan 10 07:11:15 2019 +0100 ntoskrnl.exe/tests: Avoid passing uninitialized data to DeviceIoControl(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46346 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 5675818..9ab05bc 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -155,12 +155,13 @@ static void main_test(void) GetTempFileNameW(temppathW, dokW, 0, pathW); pRtlDosPathNameToNtPathName_U( pathW, &pathU, NULL, NULL ); - test_input = heap_alloc(sizeof(*test_input) + pathU.Length); + test_input = heap_alloc( offsetof( struct test_input, path[pathU.Length / sizeof(WCHAR)]) ); test_input->running_under_wine = !strcmp(winetest_platform, "wine"); test_input->winetest_report_success = winetest_report_success; test_input->winetest_debug = winetest_debug; - lstrcpynW(test_input->path, pathU.Buffer, pathU.Length); - res = DeviceIoControl(device, IOCTL_WINETEST_MAIN_TEST, test_input, sizeof(*test_input) + pathU.Length, + memcpy(test_input->path, pathU.Buffer, pathU.Length + sizeof(WCHAR)); + res = DeviceIoControl(device, IOCTL_WINETEST_MAIN_TEST, test_input, + offsetof( struct test_input, path[pathU.Length / sizeof(WCHAR)]), &new_failures, sizeof(new_failures), &written, NULL); ok(res, "DeviceIoControl failed: %u\n", GetLastError()); ok(written == sizeof(new_failures), "got size %x\n", written);

1 0

Alistair Leslie-Hughes : oledb32/tests: Add convert DBTYPE_DATE -> DBTYPE_DBTIMESTAMP test.
by Alexandre Julliard Jan. 10, 2019

Jan. 10, 2019

Module: wine Branch: master Commit: 217ab34f57fbe7d719df7eadfd9d6c3a524d0b49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=217ab34f57fbe7d719df7ead… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 10 01:08:17 2019 +0000 oledb32/tests: Add convert DBTYPE_DATE -> DBTYPE_DBTIMESTAMP test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/convert.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 5dab9ff..e79bb45 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3612,6 +3612,7 @@ static void test_converttotimestamp(void) '.','0','1','7','0','0','0','0','0','0',0}; DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; DBTIMESTAMP ts1 = {2013, 5, 14, 2, 4, 12, 17000000}; + DATE date; DBTIMESTAMP dst; DBSTATUS dst_status; DBLENGTH dst_len; @@ -3653,6 +3654,14 @@ static void test_converttotimestamp(void) ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); ok(dst_len == 77, "got %ld\n", dst_len); + + dst_len = 0x1234; + date = 41408.086250; + hr = IDataConvert_DataConvert(convert, DBTYPE_DATE, DBTYPE_DBTIMESTAMP, 0, &dst_len, &date, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); } static void test_converttoiunknown(void)

1 0

Józef Kucia : wined3d: Do not limit draw rect to intersection of all render target views.
by Alexandre Julliard Jan. 10, 2019

Jan. 10, 2019

Module: wine Branch: master Commit: 0435cac34007003f8d1172019e5a68ee250ac6a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0435cac34007003f8d117201… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 10 15:10:17 2019 +0100 wined3d: Do not limit draw rect to intersection of all render target views. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46067 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c67cc6c..7471d24 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -605,7 +605,6 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * struct wined3d_rendertarget_view *view; struct wined3d_cs_clear *op; unsigned int rt_count, i; - RECT view_rect; rt_count = flags & WINED3DCLEAR_TARGET ? cs->device->adapter->d3d_info.limits.max_rt_count : 0; @@ -627,17 +626,11 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * for (i = 0; i < rt_count; ++i) { if ((view = state->fb->render_targets[i])) - { - SetRect(&view_rect, 0, 0, view->width, view->height); - IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); wined3d_resource_acquire(view->resource); - } } if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { view = state->fb->depth_stencil; - SetRect(&view_rect, 0, 0, view->width, view->height); - IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); wined3d_resource_acquire(view->resource); }

1 0

Józef Kucia : Update copyright info for 2019.
by Alexandre Julliard Jan. 10, 2019

Jan. 10, 2019

Module: vkd3d Branch: master Commit: e84472d026166d86e3c6e6f9a89669c4236d4221 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e84472d026166d86e3c6e6f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 10 11:31:49 2019 +0100 Update copyright info for 2019. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- COPYING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COPYING b/COPYING index 32417ce..4bb951f 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright 2016-2018 the Vkd3d project authors (see the file AUTHORS for a +Copyright 2016-2019 the Vkd3d project authors (see the file AUTHORS for a complete list) Vkd3d is free software; you can redistribute it and/or modify it under

1 0

Józef Kucia : vkd3d: Protect private data with mutex.
by Alexandre Julliard Jan. 10, 2019

Jan. 10, 2019

Module: vkd3d Branch: master Commit: 2629d9703f0f3a43f492cc75b96d09bae65ab956 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2629d9703f0f3a43f492cc7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 10 11:16:48 2019 +0100 vkd3d: Protect private data with mutex. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 38 +++++++++++++++++++++++++++------- libs/vkd3d/device.c | 9 +++++--- libs/vkd3d/resource.c | 51 ++++++++++++++++++++++++++++++++++++++-------- libs/vkd3d/state.c | 20 +++++++++++++++--- libs/vkd3d/utils.c | 50 +++++++++++++++++++++++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 21 ++++++++++++++----- 6 files changed, 156 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=2629d9703f0f3a43f49…

1 0

Józef Kucia : tests: Add multithreaded private data test.
by Alexandre Julliard Jan. 10, 2019

Jan. 10, 2019

Module: vkd3d Branch: master Commit: 9a083f9c31a1f87802fa5c8f9f6e11c2dade04cc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9a083f9c31a1f87802fa5c8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 10 11:16:49 2019 +0100 tests: Add multithreaded private data test. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index b8563b3..f34b82c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2832,6 +2832,159 @@ static void test_private_data(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +struct private_data +{ + ID3D12Object *object; + GUID guid; + unsigned int value; +}; + +static void private_data_thread_main(void *untyped_data) +{ + struct private_data *data = untyped_data; + unsigned int i; + HRESULT hr; + + hr = ID3D12Object_SetPrivateData(data->object, &data->guid, sizeof(data->value), &data->value); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < 100000; ++i) + { + hr = ID3D12Object_SetPrivateData(data->object, &data->guid, 0, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateData(data->object, &data->guid, sizeof(data->value), &data->value); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } +} + +struct private_data_interface +{ + ID3D12Object *object; + GUID guid; + IUnknown *iface; +}; + +static void private_data_interface_thread_main(void *untyped_data) +{ + struct private_data_interface *data = untyped_data; + unsigned int i; + HRESULT hr; + + for (i = 0; i < 100000; ++i) + { + hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, data->iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, data->iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } +} + +static void test_multithread_private_data(void) +{ + static const GUID guid = {0xfdb37466, 0x428f, 0x4edf, {0xa3, 0x7f, 0x9b, 0x1d, 0xf4, 0x88, 0xc5, 0x00}}; + struct private_data_interface private_data_interface[4]; + HANDLE private_data_interface_thread[4]; + struct private_data private_data[4]; + ID3D12RootSignature *root_signature; + HANDLE private_data_thread[4]; + IUnknown *test_object, *unk; + ID3D12Device *device; + ID3D12Object *object; + unsigned int value; + unsigned int size; + unsigned int id; + unsigned int i; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + root_signature = create_empty_root_signature(device, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT); + hr = ID3D12RootSignature_QueryInterface(root_signature, &IID_ID3D12Object, (void **)&object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12RootSignature_Release(root_signature); + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&test_object); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + for (i = 0, id = 1; i < ARRAY_SIZE(private_data_interface); ++i, ++id) + { + private_data_interface[i].object = object; + private_data_interface[i].guid = guid; + private_data_interface[i].guid.Data4[7] = id; + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&private_data_interface[i].iface); + ok(hr == S_OK, "Failed to create fence %u, hr %#x.\n", i, hr); + } + for (i = 0; i < ARRAY_SIZE(private_data); ++i, ++id) + { + private_data[i].object = object; + private_data[i].guid = guid; + private_data[i].guid.Data4[7] = id; + private_data[i].value = id; + } + + for (i = 0; i < 4; ++i) + { + private_data_interface_thread[i] = create_thread(private_data_interface_thread_main, &private_data_interface[i]); + private_data_thread[i] = create_thread(private_data_thread_main, &private_data[i]); + } + + for (i = 0; i < 100000; ++i) + { + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + + for (i = 0; i < 4; ++i) + { + ok(join_thread(private_data_interface_thread[i]), "Failed to join thread %u.\n", i); + ok(join_thread(private_data_thread[i]), "Failed to join thread %u.\n", i); + } + + for (i = 0; i < ARRAY_SIZE(private_data_interface); ++i) + { + size = sizeof(unk); + hr = ID3D12Object_GetPrivateData(object, &private_data_interface[i].guid, &size, &unk); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ok(unk == private_data_interface[i].iface, "Got %p, expected %p.\n", unk, private_data_interface[i].iface); + IUnknown_Release(unk); + refcount = IUnknown_Release(private_data_interface[i].iface); + ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount); + } + for (i = 0; i < ARRAY_SIZE(private_data); ++i) + { + size = sizeof(value); + hr = ID3D12Object_GetPrivateData(object, &private_data[i].guid, &size, &value); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ok(value == private_data[i].value, "Got %u, expected %u.\n", value, private_data[i].value); + } + + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IUnknown_Release(test_object); + ok(!refcount, "Test object has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12Object_Release(object); + ok(!refcount, "Object has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_reset_command_allocator(void) { ID3D12CommandAllocator *command_allocator, *command_allocator2; @@ -22327,6 +22480,7 @@ START_TEST(d3d12) run_test(test_create_graphics_pipeline_state); run_test(test_create_fence); run_test(test_private_data); + run_test(test_multithread_private_data); run_test(test_reset_command_allocator); run_test(test_cpu_signal_fence); run_test(test_gpu_signal_fence);

1 0

Józef Kucia : vkd3d: Handle NULL pointers in vkd3d_private_store_set_private_data().
by Alexandre Julliard Jan. 10, 2019

Jan. 10, 2019

Module: vkd3d Branch: master Commit: 5a1408c78dafdeb98d156141f1aaeed552449632 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5a1408c78dafdeb98d15614… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 9 14:22:42 2019 +0100 vkd3d: Handle NULL pointers in vkd3d_private_store_set_private_data(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/utils.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 6841bfb..ed4d77f 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -527,6 +527,17 @@ static HRESULT vkd3d_private_store_set_private_data(struct vkd3d_private_store * struct vkd3d_private_data *d, *old_data; const void *ptr = data; + if (!data) + { + if ((d = vkd3d_private_store_get_private_data(store, tag))) + { + vkd3d_private_data_destroy(d); + return S_OK; + } + + return S_FALSE; + } + if (is_object) { if (data_size != sizeof(IUnknown *)) @@ -584,25 +595,12 @@ HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store, const GUID *tag, unsigned int data_size, const void *data) { - struct vkd3d_private_data *d; - - if (!data) - { - if (!(d = vkd3d_private_store_get_private_data(store, tag))) - return S_FALSE; - - vkd3d_private_data_destroy(d); - return S_OK; - } - return vkd3d_private_store_set_private_data(store, tag, data, data_size, false); } HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, const GUID *tag, const IUnknown *object) { - if (!object) - return vkd3d_set_private_data(store, tag, sizeof(object), &object); - - return vkd3d_private_store_set_private_data(store, tag, object, sizeof(object), true); + const void *data = object ? object : (void *)&object; + return vkd3d_private_store_set_private_data(store, tag, data, sizeof(object), !!object); }

1 0

Matteo Bruni : d3dcompiler_43: Define D3D_COMPILER_VERSION.
by Alexandre Julliard Jan. 9, 2019

Jan. 9, 2019

Module: wine Branch: master Commit: 6a7a635b46576b9417438eab6d36c540bbb00ccd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a7a635b46576b9417438eab… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 9 20:17:51 2019 +0100 d3dcompiler_43: Define D3D_COMPILER_VERSION. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index c31aa6c..40f8015 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -1,6 +1,7 @@ MODULE = d3dcompiler_43.dll IMPORTS = dxguid uuid EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=43 C_SRCS = \ asmparser.c \

1 0

Paul Gofman : user32/tests: Add tests for stretch mode in LoadImage().
by Alexandre Julliard Jan. 9, 2019

Jan. 9, 2019

Module: wine Branch: master Commit: fd68a9833eba1f6f181a25e600915918a181a393 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd68a9833eba1f6f181a25e6… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jan 9 15:49:35 2019 +0300 user32/tests: Add tests for stretch mode in LoadImage(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 49 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 6fe7bed..56621a6 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1203,6 +1203,40 @@ static void create_ico_file(const char *filename, const test_icon_entries_t *tes HeapFree(GetProcessHeap(), 0, buf); } +static void create_bitmap_file(const char *filename, const BITMAPINFO *bmi, const unsigned char *bits) +{ + unsigned int clr_used, bmi_size, bits_size, stride; + const BITMAPINFOHEADER *h = &bmi->bmiHeader; + BITMAPFILEHEADER hdr; + DWORD bytes_written; + HANDLE file; + BOOL ret; + + clr_used = h->biBitCount <= 8 ? 1u << h->biBitCount : 0; + stride = ((h->biBitCount * h->biWidth + 7) / 8 + 3) & ~3; + bits_size = h->biHeight * stride; + bmi_size = h->biSize + clr_used * sizeof(RGBQUAD); + + hdr.bfType = 0x4d42; + hdr.bfOffBits = (DWORD)sizeof(BITMAPFILEHEADER) + bmi_size; + hdr.bfSize = hdr.bfOffBits + bits_size; + hdr.bfReserved1 = 0; + hdr.bfReserved2 = 0; + + file = CreateFileA(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed, result %u.\n", GetLastError()); + ret = WriteFile(file, &hdr, sizeof(hdr), &bytes_written, NULL); + ok(ret && bytes_written == sizeof(hdr), "Unexpected WriteFile() result, ret %#x, bytes_written %u.\n", + ret, bytes_written); + ret = WriteFile(file, bmi, bmi_size, &bytes_written, NULL); + ok(ret && bytes_written == bmi_size, "Unexpected WriteFile() result, ret %#x, bytes_written %u.\n", + ret, bytes_written); + ret = WriteFile(file, bits, bits_size, &bytes_written, NULL); + ok(ret && bytes_written == bits_size, "Unexpected WriteFile() result, ret %#x, bytes_written %u.\n", + ret, bytes_written); + CloseHandle(file); +} + static void test_LoadImage_working_directory_run(char *path) { DWORD bytes_written; @@ -2806,7 +2840,7 @@ static void compare_bitmap_bits_(unsigned int line, HDC hdc, HBITMAP bitmap, BIT HeapFree(GetProcessHeap(), 0, result_bits); } -static void test_CopyImage_StretchMode(void) +static void test_Image_StretchMode(void) { static const unsigned char test_bits_24[] = { @@ -2888,7 +2922,7 @@ static void test_CopyImage_StretchMode(void) {4, 4, 2, 2, 16, (const unsigned char *)test_bits_16, (const unsigned char *)expected_bits_16, sizeof(test_bits_16), sizeof(expected_bits_16), NULL, 0, TRUE}, }; - + static const char filename[] = "test.bmp"; BITMAPINFO *bmi, *bmi_output; HBITMAP bitmap, bitmap_copy; unsigned int test_index; @@ -2935,6 +2969,15 @@ static void test_CopyImage_StretchMode(void) tests[test_index].expected_bits, test_index, tests[test_index].todo); DeleteObject(bitmap); DeleteObject(bitmap_copy); + + create_bitmap_file(filename, bmi, tests[test_index].test_bits); + bitmap = LoadImageA(NULL, filename, IMAGE_BITMAP, tests[test_index].output_width, + tests[test_index].output_height, LR_CREATEDIBSECTION | LR_LOADFROMFILE); + ok(!!bitmap, "LoadImageA() failed, result %u.\n", GetLastError()); + DeleteFileA(filename); + compare_bitmap_bits(hdc, bitmap, bmi_output, tests[test_index].result_bits_size, + tests[test_index].expected_bits, test_index, tests[test_index].todo); + DeleteObject(bitmap); } ReleaseDC(0, hdc); HeapFree(GetProcessHeap(), 0, bmi_output); @@ -2968,7 +3011,7 @@ START_TEST(cursoricon) test_CopyImage_Bitmap(16); test_CopyImage_Bitmap(24); test_CopyImage_Bitmap(32); - test_CopyImage_StretchMode(); + test_Image_StretchMode(); test_initial_cursor(); test_CreateIcon(); test_LoadImage();

1 0