February 2017 - Wine-Commits

Hugh McMaster : reg/tests: Test import with non-standard registry file headers.
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: c3a46653e1e91e5922a77470eba9619df911c1d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a46653e1e91e5922a77470e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Feb 24 11:34:02 2017 +0000 reg/tests: Test import with non-standard registry file headers. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 8786b0f..7c79b31 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -875,6 +875,84 @@ static void test_import(void) err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + test_import_str("REGEDIT3\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test1\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test1"); + + test_import_str("regedit4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test2\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test2"); + + test_import_str("Regedit4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test3\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test3"); + + test_import_str("REGEDIT 4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test4\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test4"); + + test_import_str("REGEDIT4FOO\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test5\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test5"); + + test_import_str("REGEDIT4 FOO\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test6\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test6"); + + test_import_str("REGEDIT5\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test7\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test7"); + + test_import_str("REGEDIT9\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test8\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test8"); + + test_import_str("Windows Registry Editor Version 4.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test9\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test9"); + + test_import_str("Windows Registry Editor Version 5\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test10\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test10"); + + test_import_str("WINDOWS REGISTRY EDITOR VERSION 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test11\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test11"); + + test_import_str("Windows Registry Editor version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test12\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test12"); + test_import_str("REGEDIT4\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test1\"=\"Value1\"\n", &r); @@ -1159,6 +1237,56 @@ static void test_import(void) err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + test_import_wstr("\xef\xbb\xbfREGEDIT3\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test1\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test1"); + + test_import_wstr("\xef\xbb\xbfregedit4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test2\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test2"); + + test_import_wstr("\xef\xbb\xbfRegedit4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test3\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test3"); + + test_import_wstr("\xef\xbb\xbfREGEDIT 4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test4\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test4"); + + test_import_wstr("\xef\xbb\xbfREGEDIT4FOO\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test5\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test5"); + + test_import_wstr("\xef\xbb\xbfREGEDIT4 FOO\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test6\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test6"); + + test_import_wstr("\xef\xbb\xbfREGEDIT5\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test7\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test7"); + + test_import_wstr("\xef\xbb\xbfREGEDIT9\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test8\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test8"); + test_import_wstr("\xef\xbb\xbfREGEDIT4\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Unicode1\"=\"Value1\"\n", &r); @@ -1209,6 +1337,34 @@ static void test_import(void) ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 4.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test9\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test9"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test10\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test10"); + + test_import_wstr("\xef\xbb\xbfWINDOWS REGISTRY EDITOR VERSION 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test11\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test11"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test12\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test12"); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Unicode4\"=\"Value4\"\n", &r);

1 0

Alex Henrie : user32: Include space for ampersands when determining MessageBox size.
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: 0a2f9f54ebfef4adc3e0438ffcb9cf531ac1ba73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2f9f54ebfef4adc3e0438ff… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Feb 24 01:08:36 2017 -0700 user32: Include space for ampersands when determining MessageBox size. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/msgbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 2ba98c9..0839f97 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -261,8 +261,8 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) /* Get the text size */ GetClientRect(GetDlgItem(hwnd, MSGBOX_IDTEXT), &rect); rect.top = rect.left = rect.bottom = 0; - DrawTextW( hdc, lpszText, -1, &rect, - DT_LEFT | DT_EXPANDTABS | DT_WORDBREAK | DT_CALCRECT); + DrawTextW(hdc, lpszText, -1, &rect, + DT_LEFT | DT_EXPANDTABS | DT_WORDBREAK | DT_CALCRECT | DT_NOPREFIX); /* Min text width corresponds to space for the buttons */ tleft = ileft; if (iwidth) tleft += ileft + iwidth;

1 0

Józef Kucia : wined3d: Update UAV read bitmask for ld_raw and ld_structured instructions.
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: dae8785bea94c3b13f1ca7e582af1e9984ff1859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dae8785bea94c3b13f1ca7e58… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:40 2017 +0100 wined3d: Update UAV read bitmask for ld_raw and ld_structured instructions. 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/shader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 14cb243..fa61674 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1331,11 +1331,15 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st || (WINED3DSIH_IMM_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_IMM_ATOMIC_XOR && ins.handler_idx != WINED3DSIH_IMM_ATOMIC_CONSUME) - || ins.handler_idx == WINED3DSIH_LD_UAV_TYPED) + || ins.handler_idx == WINED3DSIH_LD_UAV_TYPED + || (ins.handler_idx == WINED3DSIH_LD_RAW && ins.src[1].reg.type == WINED3DSPR_UAV) + || (ins.handler_idx == WINED3DSIH_LD_STRUCTURED && ins.src[2].reg.type == WINED3DSPR_UAV)) { unsigned int reg_idx; - if (ins.handler_idx == WINED3DSIH_LD_UAV_TYPED) + if (ins.handler_idx == WINED3DSIH_LD_UAV_TYPED || ins.handler_idx == WINED3DSIH_LD_RAW) reg_idx = ins.src[1].reg.idx[0].offset; + else if (ins.handler_idx == WINED3DSIH_LD_STRUCTURED) + reg_idx = ins.src[2].reg.idx[0].offset; else if (WINED3DSIH_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_ATOMIC_XOR) reg_idx = ins.dst[0].reg.idx[0].offset; else

1 0

Józef Kucia : wined3d: Record sampler usage for ld_structured.
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: 5392835f2992eb43b45e40de425ebd9d3f0d42e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5392835f2992eb43b45e40de4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:37 2017 +0100 wined3d: Record sampler usage for ld_structured. 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/shader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3085248..37c4352 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1385,6 +1385,12 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st shader_record_sample(reg_maps, ins.src[1].reg.idx[0].offset, WINED3D_SAMPLER_DEFAULT, reg_maps->sampler_map.count); } + else if (ins.handler_idx == WINED3DSIH_LD_STRUCTURED + && ins.src[2].reg.type == WINED3DSPR_RESOURCE) + { + shader_record_sample(reg_maps, ins.src[2].reg.idx[0].offset, + WINED3D_SAMPLER_DEFAULT, reg_maps->sampler_map.count); + } if (ins.predicate) if (!shader_record_register_usage(shader, reg_maps, &ins.predicate->reg,

1 0

Nikolay Sivov : d2d1: Use DrawLine() to draw underlines.
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: d51c60e11dbe4c85feed37df36dc98be1f8478ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51c60e11dbe4c85feed37df3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 24 14:11:33 2017 +0300 d2d1: Use DrawLine() to draw underlines. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index a9f7485..cc705ee 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1818,24 +1818,24 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRend struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); const D2D1_MATRIX_3X2_F *m = &render_target->drawing_state.transform; struct d2d_draw_text_layout_ctx *context = ctx; - float min_thickness; + D2D1_POINT_2F start, end; ID2D1Brush *brush; - D2D1_RECT_F rect; + float thickness; TRACE("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, underline %p, effect %p\n", iface, ctx, baseline_origin_x, baseline_origin_y, underline, effect); /* minimal thickness in DIPs that will result in at least 1 pixel thick line */ - min_thickness = 96.0f / (render_target->desc.dpiY * sqrtf(m->_21 * m->_21 + m->_22 * m->_22)); - - rect.left = baseline_origin_x; - rect.top = baseline_origin_y + underline->offset; - rect.right = baseline_origin_x + underline->width; - rect.bottom = baseline_origin_y + underline->offset + max(underline->thickness, min_thickness); + thickness = max(96.0f / (render_target->desc.dpiY * sqrtf(m->_21 * m->_21 + m->_22 * m->_22)), + underline->thickness); brush = d2d_draw_get_text_brush(context, effect); - ID2D1RenderTarget_FillRectangle(&render_target->ID2D1RenderTarget_iface, &rect, brush); + start.x = baseline_origin_x; + start.y = baseline_origin_y + underline->offset + thickness / 2.0f; + end.x = start.x + underline->width; + end.y = start.y; + d2d_d3d_render_target_DrawLine(&render_target->ID2D1RenderTarget_iface, start, end, brush, thickness, NULL); ID2D1Brush_Release(brush);

1 0

Henri Verbeet : ddraw/tests: Test depth fill results in test_color_fill().
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: 2cc9b854b10a973424c89d246d048612d77a4418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc9b854b10a973424c89d246… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 24 08:10:33 2017 +0100 ddraw/tests: Test depth fill results in test_color_fill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 36 ++++++++++++++++++++++++++++++++++-- 4 files changed, 144 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2cc9b854b10a973424c89…

1 0

Henri Verbeet : wined3d: Implement depth fills in the CPU blitter.
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: f0b6873734c201f0b228b6ef2fac6d07b50d388c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b6873734c201f0b228b6ef2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 24 08:10:32 2017 +0100 wined3d: Implement depth fills in the CPU blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1ac2e5f..51200d2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2975,10 +2975,8 @@ static BOOL cpu_blit_supported(const struct wined3d_gl_info *gl_info, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { - if (blit_op == WINED3D_BLIT_OP_COLOR_FILL) - { + if (blit_op == WINED3D_BLIT_OP_COLOR_FILL || blit_op == WINED3D_BLIT_OP_DEPTH_FILL) return TRUE; - } return FALSE; } @@ -3208,15 +3206,12 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int } /* First, all the 'source-less' blits */ - if (flags & WINED3D_BLT_COLOR_FILL) + if (flags & (WINED3D_BLT_COLOR_FILL | WINED3D_BLT_DEPTH_FILL)) { hr = _Blt_ColorFill(dbuf, dst_width, dst_height, bpp, dst_map.row_pitch, fx->fill_color); - flags &= ~WINED3D_BLT_COLOR_FILL; + flags &= ~(WINED3D_BLT_COLOR_FILL | WINED3D_BLT_DEPTH_FILL); } - if (flags & WINED3D_BLT_DEPTH_FILL) - FIXME("WINED3D_BLT_DEPTH_FILL needs to be implemented!\n"); - /* Now the 'with source' blits. */ if (src_texture) { @@ -3587,8 +3582,20 @@ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, const RECT *rect, DWORD clear_flags, float depth, DWORD stencil) { - FIXME("Depth/stencil filling not implemented by cpu_blit.\n"); - return WINED3DERR_INVALIDCALL; + const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; + struct wined3d_color color = {depth, 0.0f, 0.0f, 0.0f}; + static const struct wined3d_box src_box; + struct wined3d_blt_fx fx; + + if (clear_flags != WINED3DCLEAR_ZBUFFER) + { + FIXME("clear_flags %#x not implemented.\n", clear_flags); + return WINED3DERR_INVALIDCALL; + } + + fx.fill_color = wined3d_format_convert_from_float(view->format, &color); + return surface_cpu_blt(texture_from_resource(view->resource), view->sub_resource_idx, + &box, NULL, 0, &src_box, WINED3D_BLT_DEPTH_FILL, &fx, WINED3D_TEXF_POINT); } static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter,

1 0

Józef Kucia : wined3d: Implement ld_structured instruction.
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: 38e2a5ee22199dcd6dde82730bf4c22bb78defe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38e2a5ee22199dcd6dde82730… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:39 2017 +0100 wined3d: Implement ld_structured instruction. 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/glsl_shader.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 28a3b3b..8345888 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5068,28 +5068,51 @@ static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) shader_glsl_get_prefix(version->type), uav_idx, image_coord_param.param_str, dst_swizzle); } -static void shader_glsl_ld_raw(const struct wined3d_shader_instruction *ins) +static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) { const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); - const struct wined3d_shader_src_param *src = &ins->src[1]; + const struct wined3d_shader_src_param *src = &ins->src[ins->src_count - 1]; + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + unsigned int i, swizzle, resource_idx, stride, src_idx = 0; + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param structure_idx, offset; + struct wined3d_string_buffer *address; struct wined3d_shader_dst_param dst; const char *function, *resource; - struct glsl_src_param offset; - unsigned int i, swizzle; + resource_idx = src->reg.idx[0].offset; if (src->reg.type == WINED3DSPR_RESOURCE) { + if (resource_idx >= ARRAY_SIZE(reg_maps->resource_info)) + { + ERR("Invalid resource index %u.\n", resource_idx); + return; + } + stride = reg_maps->resource_info[resource_idx].stride; function = "texelFetch"; resource = "sampler"; } else { + if (resource_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV index %u.\n", resource_idx); + return; + } + stride = reg_maps->uav_resource_info[resource_idx].stride; function = "imageLoad"; resource = "image"; } - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &offset); + address = string_buffer_get(priv->string_buffers); + if (ins->handler_idx == WINED3DSIH_LD_STRUCTURED) + { + shader_glsl_add_src_param(ins, &ins->src[src_idx++], WINED3DSP_WRITEMASK_0, &structure_idx); + shader_addline(address, "%s * %u + ", structure_idx.param_str, stride); + } + shader_glsl_add_src_param(ins, &ins->src[src_idx++], WINED3DSP_WRITEMASK_0, &offset); + shader_addline(address, "%s / 4", offset.param_str); dst = ins->dst[0]; for (i = 0; i < 4; ++i) @@ -5099,9 +5122,11 @@ static void shader_glsl_ld_raw(const struct wined3d_shader_instruction *ins) continue; swizzle = shader_glsl_swizzle_get_component(src->swizzle, i); - shader_addline(buffer, "%s(%s_%s%u, %s / 4 + %u).x);\n", - function, prefix, resource, src->reg.idx[0].offset, offset.param_str, swizzle); + shader_addline(buffer, "%s(%s_%s%u, %s + %u).x);\n", + function, prefix, resource, src->reg.idx[0].offset, address->buffer, swizzle); } + + string_buffer_release(priv->string_buffers, address); } static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) @@ -5139,8 +5164,8 @@ static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) static void shader_glsl_store_buffer(const struct wined3d_shader_instruction *ins) { const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); - struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct glsl_src_param structure_idx, offset, data; struct wined3d_string_buffer *address; @@ -9450,8 +9475,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ shader_glsl_ld, /* WINED3DSIH_LD2DMS */ NULL, - /* WINED3DSIH_LD_RAW */ shader_glsl_ld_raw, - /* WINED3DSIH_LD_STRUCTURED */ NULL, + /* WINED3DSIH_LD_RAW */ shader_glsl_ld_buffer, + /* WINED3DSIH_LD_STRUCTURED */ shader_glsl_ld_buffer, /* WINED3DSIH_LD_UAV_TYPED */ shader_glsl_ld_uav, /* WINED3DSIH_LIT */ shader_glsl_lit, /* WINED3DSIH_LOD */ NULL,

1 0

Józef Kucia : wined3d: Always use correct sampler bind index for ld_raw and ld_structured.
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: adedebf47a9a02694b79965eb2aa670b3906b398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adedebf47a9a02694b79965eb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:41 2017 +0100 wined3d: Always use correct sampler bind index for ld_raw and ld_structured. 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/glsl_shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8345888..28d1c15 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5072,8 +5072,8 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) { const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); const struct wined3d_shader_src_param *src = &ins->src[ins->src_count - 1]; + unsigned int i, swizzle, resource_idx, bind_idx, stride, src_idx = 0; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; - unsigned int i, swizzle, resource_idx, stride, src_idx = 0; struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct glsl_src_param structure_idx, offset; @@ -5090,6 +5090,7 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) return; } stride = reg_maps->resource_info[resource_idx].stride; + bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, WINED3D_SAMPLER_DEFAULT); function = "texelFetch"; resource = "sampler"; } @@ -5101,6 +5102,7 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) return; } stride = reg_maps->uav_resource_info[resource_idx].stride; + bind_idx = resource_idx; function = "imageLoad"; resource = "image"; } @@ -5123,7 +5125,7 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) swizzle = shader_glsl_swizzle_get_component(src->swizzle, i); shader_addline(buffer, "%s(%s_%s%u, %s + %u).x);\n", - function, prefix, resource, src->reg.idx[0].offset, address->buffer, swizzle); + function, prefix, resource, bind_idx, address->buffer, swizzle); } string_buffer_release(priv->string_buffers, address);

1 0

Józef Kucia : wined3d: Use string_buffer_sprintf() in shader_glsl_sprintf_cast().
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: bff1ecac3bcd357d508a2c8a5587a11ed4c6a54b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff1ecac3bcd357d508a2c8a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:36 2017 +0100 wined3d: Use string_buffer_sprintf() in shader_glsl_sprintf_cast(). 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/glsl_shader.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a8bdba0..eefc248 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2955,12 +2955,12 @@ static void shader_glsl_get_swizzle(const struct wined3d_shader_src_param *param shader_glsl_swizzle_to_str(param->swizzle, fixup, mask, swizzle_str); } -static void shader_glsl_sprintf_cast(char *dst_param_str, const char *src_param_str, +static void shader_glsl_sprintf_cast(struct wined3d_string_buffer *dst_param, const char *src_param, enum wined3d_data_type dst_data_type, enum wined3d_data_type src_data_type) { if (dst_data_type == src_data_type) { - sprintf(dst_param_str, "%s", src_param_str); + string_buffer_sprintf(dst_param, "%s", src_param); return; } @@ -2969,12 +2969,12 @@ static void shader_glsl_sprintf_cast(char *dst_param_str, const char *src_param_ switch (dst_data_type) { case WINED3D_DATA_INT: - sprintf(dst_param_str, "floatBitsToInt(%s)", src_param_str); + string_buffer_sprintf(dst_param, "floatBitsToInt(%s)", src_param); return; case WINED3D_DATA_RESOURCE: case WINED3D_DATA_SAMPLER: case WINED3D_DATA_UINT: - sprintf(dst_param_str, "floatBitsToUint(%s)", src_param_str); + string_buffer_sprintf(dst_param, "floatBitsToUint(%s)", src_param); return; default: break; @@ -2983,18 +2983,18 @@ static void shader_glsl_sprintf_cast(char *dst_param_str, const char *src_param_ if (src_data_type == WINED3D_DATA_UINT && dst_data_type == WINED3D_DATA_FLOAT) { - sprintf(dst_param_str, "uintBitsToFloat(%s)", src_param_str); + string_buffer_sprintf(dst_param, "uintBitsToFloat(%s)", src_param); return; } if (src_data_type == WINED3D_DATA_INT && dst_data_type == WINED3D_DATA_FLOAT) { - sprintf(dst_param_str, "intBitsToFloat(%s)", src_param_str); + string_buffer_sprintf(dst_param, "intBitsToFloat(%s)", src_param); return; } FIXME("Unhandled cast from %#x to %#x.\n", src_data_type, dst_data_type); - sprintf(dst_param_str, "%s", src_param_str); + string_buffer_sprintf(dst_param, "%s", src_param); } /* From a given parameter token, generate the corresponding GLSL string. @@ -3004,10 +3004,11 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio const struct wined3d_shader_src_param *wined3d_src, DWORD mask, struct glsl_src_param *glsl_src, enum wined3d_data_type data_type) { + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + struct wined3d_string_buffer *reg_name = string_buffer_get(priv->string_buffers); enum wined3d_data_type param_data_type; BOOL is_color = FALSE; char swizzle_str[6]; - char reg_name[200]; glsl_src->reg_name[0] = '\0'; glsl_src->param_str[0] = '\0'; @@ -3036,7 +3037,9 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio } shader_glsl_sprintf_cast(reg_name, glsl_src->reg_name, data_type, param_data_type); - shader_glsl_gen_modifier(wined3d_src->modifiers, reg_name, swizzle_str, glsl_src->param_str); + shader_glsl_gen_modifier(wined3d_src->modifiers, reg_name->buffer, swizzle_str, glsl_src->param_str); + + string_buffer_release(priv->string_buffers, reg_name); } static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *ins,

1 0