January 2022 - Wine-Devel - list.winehq.org

[PATCH 2/6] wined3d: Use wined3d_bit_scan() in shader_glsl_load_constantsB().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1ebd067ae56..aa3c8780269 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1239,16 +1239,15 @@ static void shader_glsl_load_constants_i(const struct wined3d_shader *shader, co } /* Context activation is done by the caller. */ -static void shader_glsl_load_constantsB(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, - const GLint locations[WINED3D_MAX_CONSTS_B], const BOOL *constants, WORD constants_set) +static void shader_glsl_load_constants_b(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, + const BOOL *constants, const GLint locations[WINED3D_MAX_CONSTS_B], uint32_t constants_set) { unsigned int i; struct list* ptr; - for (i = 0; constants_set; constants_set >>= 1, ++i) + while (constants_set) { - if (!(constants_set & 1)) continue; - + i = wined3d_bit_scan(&constants_set); GL_EXTCALL(glUniform1iv(locations[i], 1, &constants[i])); } @@ -1546,8 +1545,8 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context prog->vs.uniform_i_locations, vshader->reg_maps.integer_constants); if (update_mask & WINED3D_SHADER_CONST_VS_B) - shader_glsl_load_constantsB(vshader, gl_info, prog->vs.uniform_b_locations, state->vs_consts_b, - vshader->reg_maps.boolean_constants); + shader_glsl_load_constants_b(vshader, gl_info, state->vs_consts_b, + prog->vs.uniform_b_locations, vshader->reg_maps.boolean_constants); if (update_mask & WINED3D_SHADER_CONST_VS_CLIP_PLANES) { @@ -1699,8 +1698,8 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context prog->ps.uniform_i_locations, pshader->reg_maps.integer_constants); if (update_mask & WINED3D_SHADER_CONST_PS_B) - shader_glsl_load_constantsB(pshader, gl_info, prog->ps.uniform_b_locations, state->ps_consts_b, - pshader->reg_maps.boolean_constants); + shader_glsl_load_constants_b(pshader, gl_info, state->ps_consts_b, + prog->ps.uniform_b_locations, pshader->reg_maps.boolean_constants); if (update_mask & WINED3D_SHADER_CONST_PS_BUMP_ENV) { -- 2.30.2

Jan. 28, 2022

[PATCH 1/6] wined3d: Use wined3d_bit_scan() in shader_glsl_load_constants_i().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c812b2d8b08..1ebd067ae56 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1211,16 +1211,15 @@ static void shader_glsl_load_constants_f(const struct wined3d_shader *shader, co /* Context activation is done by the caller. */ static void shader_glsl_load_constants_i(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, - const struct wined3d_ivec4 *constants, const GLint locations[WINED3D_MAX_CONSTS_I], WORD constants_set) + const struct wined3d_ivec4 *constants, const GLint locations[WINED3D_MAX_CONSTS_I], uint32_t constants_set) { unsigned int i; struct list* ptr; - for (i = 0; constants_set; constants_set >>= 1, ++i) + while (constants_set) { - if (!(constants_set & 1)) continue; - /* We found this uniform name in the program - go ahead and send the data */ + i = wined3d_bit_scan(&constants_set); GL_EXTCALL(glUniform4iv(locations[i], 1, &constants[i].x)); } -- 2.30.2

Jan. 28, 2022

Re: [PATCH 15/24] msvcirt/tests: Avoid "misleading indentation" warnings.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

Jan. 28, 2022

Re: [PATCH] dwrite/tests: Remove remaining kernel32 heap calls.

by Alexandre Julliard

Saulius Krasuckas <saulius2(a)ar-fi.lt> writes: > Hello folks, > > * On 2022-01-28 10:29, Nikolay Sivov wrote: > >> --- a/dlls/dwrite/tests/analyzer.c >> +++ b/dlls/dwrite/tests/analyzer.c > ... >> @@ -155,7 +152,7 @@ static inline void flush_sequence(struct >> call_sequence **seg, int sequence_index >> { >> struct call_sequence *call_seq = seg[sequence_index]; >> - HeapFree(GetProcessHeap(), 0, call_seq->sequence); >> + free(call_seq->sequence); >> call_seq->sequence = NULL; >> call_seq->count = call_seq->size = 0; >> } > > may I ask: what's about all the HeapAlloc() => malloc() huss inside > the test (or any tests) ? > 15y ago the idea was to use as much of WinAPI as possible (at least in > DLLs implementation). > I say the project is splitting modules into PE-part and the *nix-part > these days. Looks nice. > > But why to reverse the HeapAlloc() usage in tests? For all modules that have been converted to PE, malloc() is now also going through the Windows API, so there's no longer a reason to avoid it. And it's more standard and more readable than HeapAlloc(). -- Alexandre Julliard julliard(a)winehq.org

Jan. 28, 2022

Re: [PATCH vkd3d v4 1/6] tests: Test matrix multiplication.

by Francisco Casas

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Hmm, this proves that float1 and float are different things: January 28, 2022 5:03 AM, "Giovanni Mascellani" <gmascellani(a)codeweavers.com> wrote: > +[pixel shader] > +float4 main(float4 pos : sv_position) : sv_target > +{ > + float1 x = float1(10.0); > + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, > + 5.0, 6.0, 7.0, 8.0, > + 9.0, 10.0, 11.0, 12.0, > + 13.0, 14.0, 15.0, 16.0); > + > + return mul(x, y); > +} > + > +[test] > +draw quad > +probe all rgba (10.0, 20.0, 30.0, 40.0) > + It seems that mul checks whether it is a scalar-scalar, scalar-vector, scalar-matrix, vector-scalar, vector-vector, vector-matrix, matrix-scalar, matrix-vector, or matrix-matrix multiplication, using the equivalent to our hlsl_type_class. This difference makes me wonder whether we are wrong assuming float and float1 are the same in other parts of the codebase, for instance: --- static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { if (instr->type == HLSL_IR_EXPR) { struct hlsl_ir_expr *expr = hlsl_ir_expr(instr); const struct hlsl_type *src_type = expr->operands[0].node->data_type; const struct hlsl_type *dst_type = expr->node.data_type; if (expr->op != HLSL_OP1_CAST) return false; if (hlsl_types_are_equal(src_type, dst_type) || (src_type->base_type == dst_type->base_type && is_vec1(src_type) && is_vec1(dst_type))) { replace_node(&expr->node, expr->operands[0].node); return true; } } return false; } --- would dismiss a cast from float to float1, and, if I am not mistaken, the compiler would be failing with this shader: --- float4 main(float4 pos : sv_position) : sv_target { float xx = 10.0; float1 x = float1(xx); float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); return mul(x, y); } ---

Jan. 28, 2022

[PATCH v2] kernel32/tests: Add tests for SetCurrentConsoleFontEx

by Hugh McMaster

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- Changes in this version: - Simplify tests. - Verify font size change with GetConsoleFontSize instead of calculating manually. dlls/kernel32/tests/console.c | 69 ++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index e4d9d43f4c4..9766e5c9fa2 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3560,10 +3560,11 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output) static void test_SetCurrentConsoleFontEx(HANDLE std_output) { - CONSOLE_FONT_INFOEX orig_cfix, cfix; + CONSOLE_FONT_INFOEX orig_cfix, cfix, tmp; BOOL ret; HANDLE pipe1, pipe2; HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); + COORD c; orig_cfix.cbSize = sizeof(CONSOLE_FONT_INFOEX); @@ -3657,16 +3658,80 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) ok(!ret, "got %d, expected 0\n", ret); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + /* Try setting console font information for the current window size */ + cfix.cbSize = sizeof(cfix); + cfix.nFont = 0; + cfix.dwFontSize.X = 0; + cfix.FontFamily = TMPF_VECTOR | TMPF_TRUETYPE | FF_MODERN; + cfix.FontWeight = FW_NORMAL; + lstrcpyW(cfix.FaceName, L"Lucida Console"); + + tmp.cbSize = sizeof(tmp); + + /* Test font height 20 */ + cfix.dwFontSize.Y = 20; SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "GetCurrentConsoleFontEx failed: %u\n", GetLastError()); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %d, expected %d\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + c = GetConsoleFontSize(std_output, tmp.nFont); + todo_wine ok(c.Y == cfix.dwFontSize.Y, "got %d, expected %d\n", c.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + + /* Test font height 16 */ + cfix.dwFontSize.Y = 16; SetLastError(0xdeadbeef); - ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "GetCurrentConsoleFontEx failed: %u\n", GetLastError()); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %d, expected %d\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + c = GetConsoleFontSize(std_output, tmp.nFont); + ok(c.Y == cfix.dwFontSize.Y, "got %d, expected %d\n", c.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + + /* Test invalid font height */ + cfix.dwFontSize.Y = 0; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "GetCurrentConsoleFontEx failed: %u\n", GetLastError()); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %d, expected 12\n", tmp.dwFontSize.Y); + c = GetConsoleFontSize(std_output, tmp.nFont); + todo_wine ok(c.Y == 12, "got %d, expected 12\n", c.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + + /* Test invalid font weight */ + cfix.dwFontSize.Y = 16; + cfix.FontWeight = 0; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "GetCurrentConsoleFontEx failed: %u\n", GetLastError()); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %d, expected %d\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + c = GetConsoleFontSize(std_output, tmp.nFont); + ok(c.Y == cfix.dwFontSize.Y, "got %d, expected %d\n", c.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == FW_NORMAL, "got %u, expected %u\n", tmp.FontWeight, FW_NORMAL); + /* Restore original console font parameters */ SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); -- 2.34.1

Jan. 28, 2022

Re: [PATCH 7/7] winhttp: Don't allow queueing websocket receive if another is pending.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Jan. 28, 2022

Re: [PATCH 6/7] winhttp: Don't allow socket transfers after receiving close frame.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Jan. 28, 2022

Re: [PATCH 5/7] winhttp: Don't queue socket_close() in WinHttpWebSocketClose() if close frame is already received.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Jan. 28, 2022

Re: [PATCH 4/7] winhttp: Factor out socket_close_complete() function.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Jan. 28, 2022