January 2019 - Wine-commits

Henri Verbeet : wined3d: Support WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST in the GLSL blitter.
by Alexandre Julliard 11 Jan '19

11 Jan '19

Module: wine Branch: master Commit: 536782bc1c74a65f72f0530141715f1f76acc001 URL: https://source.winehq.org/git/wine.git/?a=commit;h=536782bc1c74a65f72f05301… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 11 21:19:10 2019 +0330 wined3d: Support WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST in the GLSL blitter. Both the ARBfp and fixed-function blitter support WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST, but the fixed-function blitter requires a compatibility context, and the ARBfp blitter isn't created when the GLSL blitter is available. This fixes a regression introduced by commit 6fc027e5acfb7f7c7f50af421658e5442e896588. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45874 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fc0b2c7..d6fd565 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13116,7 +13116,8 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi blit_op = WINED3D_BLIT_OP_COLOR_BLIT; } - if (blit_op != WINED3D_BLIT_OP_COLOR_BLIT && blit_op != WINED3D_BLIT_OP_COLOR_BLIT_CKEY) + if (blit_op != WINED3D_BLIT_OP_COLOR_BLIT && blit_op != WINED3D_BLIT_OP_COLOR_BLIT_CKEY + && blit_op != WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) { TRACE("Unsupported blit_op %#x.\n", blit_op); return FALSE; @@ -13168,6 +13169,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *staging_texture = NULL; struct wined3d_glsl_blitter *glsl_blitter; + struct wined3d_color_key alpha_test_key; struct glsl_blitter_program *program; struct wined3d_blitter *next; unsigned int src_level; @@ -13284,8 +13286,20 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli context_invalidate_state(context, STATE_FRAMEBUFFER); } - if (!(program = glsl_blitter_get_program(glsl_blitter, context, src_texture_gl, - op == WINED3D_BLIT_OP_COLOR_BLIT_CKEY))) + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) + { + const struct wined3d_format *f = src_texture->resource.format; + + alpha_test_key.color_space_low_value = 0; + alpha_test_key.color_space_high_value = ~(((1u << f->alpha_size) - 1) << f->alpha_offset); + colour_key = &alpha_test_key; + } + else if (op != WINED3D_BLIT_OP_COLOR_BLIT_CKEY) + { + colour_key = NULL; + } + + if (!(program = glsl_blitter_get_program(glsl_blitter, context, src_texture_gl, !!colour_key))) { ERR("Failed to get blitter program.\n"); return dst_location; @@ -13310,7 +13324,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli default: break; } - if (op == WINED3D_BLIT_OP_COLOR_BLIT_CKEY) + if (colour_key) { struct wined3d_color float_key[2];

1 0

Alexandre Julliard : Release 4.0-rc6.
by Alexandre Julliard 11 Jan '19

11 Jan '19

Module: wine Branch: master Commit: 5b72f909bb80c690e21bb33cadd3913903c38019 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b72f909bb80c690e21bb33c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 11 19:03:44 2019 +0100 Release 4.0-rc6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 152 +++++++++++++++++++++++++++++++++++++++++++------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 ++++---- 4 files changed, 117 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5b72f909bb80c690e21b…

1 0

Tag wine-4.0-rc6 : Alexandre Julliard : Release 4.0-rc6
by Alexandre Julliard 11 Jan '19

11 Jan '19

Module: wine Branch: refs/tags/wine-4.0-rc6 Tag: 88a30b31d94a295732fe920d10654b448aa27959 URL: https://source.winehq.org/git/wine.git/?a=tag;h=88a30b31d94a295732fe920d106… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 11 19:03:44 2019 +0100 Release 4.0-rc6

1 0

Alexandre Julliard : shell32/tests: Wait a bit longer for the explorer window to be created.
by Alexandre Julliard 10 Jan '19

10 Jan '19

Module: wine Branch: master Commit: 2d6de2d129b39d2a0c4ffafa84dabed21c0e830e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d6de2d129b39d2a0c4ffafa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 10 12:58:48 2019 -0600 shell32/tests: Wait a bit longer for the explorer window to be created. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/progman_dde.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 62ed413..2d19404 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -166,7 +166,7 @@ static BOOL check_window_exists(const char *name) for (i = 0; i < 20; i++) { - Sleep(100); + Sleep(100 * i); if ((window = FindWindowA("ExplorerWClass", title)) || (window = FindWindowA("CabinetWClass", title))) {

1 0

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

10 Jan '19

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

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

10 Jan '19

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

Dmitry Timoshkov : windowscodecs: Simplify the buffer size check in copy_pixels() helper.
by Alexandre Julliard 10 Jan '19

10 Jan '19

Module: wine Branch: master Commit: 3887c04f4322a3611cb02be778f001ee59380deb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3887c04f4322a3611cb02be7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 9 14:51:18 2019 +0800 windowscodecs: Simplify the buffer size check in copy_pixels() helper. 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/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 7650c75..7828151 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -82,7 +82,7 @@ HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, if (dststride < bytesperrow) return E_INVALIDARG; - if ((dststride * (rc->Height-1)) + ((rc->Width * bpp) + 7)/8 > dstbuffersize) + if ((dststride * (rc->Height-1)) + bytesperrow > dstbuffersize) return E_INVALIDARG; /* if the whole bitmap is copied and the buffer format matches then it's a matter of a single memcpy */

1 0

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

10 Jan '19

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

Józef Kucia : wined3d: Sanitise clear flags passed to blitters.
by Alexandre Julliard 10 Jan '19

10 Jan '19

Module: wine Branch: master Commit: 2727a6ecf69397a988c29d168dc467fb7081f59c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2727a6ecf69397a988c29d16… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 10 15:10:13 2019 +0100 wined3d: Sanitise clear flags passed to blitters. In order to not trigger "if (flags)" conditions in ffp_blitter_clear() unnecessarily. Also, avoids passing WINED3DCLEAR_SYNCHRONOUS, which is handled at the level of command stream. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index aa8eef7..c67cc6c 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -612,7 +612,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_CLEAR; - op->flags = flags; + op->flags = flags & (WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); op->rt_count = rt_count; op->fb = &cs->fb; SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); @@ -655,7 +655,7 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined op->fb = (void *)&op->rects[1]; op->opcode = WINED3D_CS_OP_CLEAR; - op->flags = flags; + op->flags = flags & (WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); if (flags & WINED3DCLEAR_TARGET) { op->rt_count = 1;

1 0

Józef Kucia : wined3d: Use accurate rt_count in ffp_blitter_clear().
by Alexandre Julliard 10 Jan '19

10 Jan '19

Module: wine Branch: master Commit: cd3c3e56b10b64f85e5d02adc79a89227750e589 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd3c3e56b10b64f85e5d02ad… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 10 15:10:14 2019 +0100 wined3d: Use accurate rt_count in ffp_blitter_clear(). 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/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 85f9489..a36d010 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2089,11 +2089,11 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de } if (flags) - device_clear_render_targets(device, rt_count, fb, rect_count, + device_clear_render_targets(device, flags & WINED3DCLEAR_TARGET ? rt_count : 0, fb, rect_count, clear_rects, draw_rect, flags, colour, depth, stencil); if (next_flags && (next = blitter->next)) - next->ops->blitter_clear(next, device, rt_count, fb, rect_count, + next->ops->blitter_clear(next, device, next_flags & WINED3DCLEAR_TARGET ? rt_count : 0, fb, rect_count, clear_rects, draw_rect, next_flags, colour, depth, stencil); }

1 0