October 2019 - Wine-Commits

Matteo Bruni : wined3d: Limit GLSL version to 1.30 when OpenGL 3 is not supported.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: dee191390cab67feecc2ab16a7d8b8932e551159 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dee191390cab67feecc2ab16… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 30 16:11:43 2019 +0100 wined3d: Limit GLSL version to 1.30 when OpenGL 3 is not supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index e83aebfa56..52f0fd7ae1 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3742,6 +3742,12 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, /* The format of the GLSL version string is "major.minor[.release] [vendor info]". */ sscanf(str, "%u.%u", &major, &minor); gl_info->glsl_version = MAKEDWORD_VERSION(major, minor); + if (gl_info->glsl_version > MAKEDWORD_VERSION(1, 30) && gl_version < MAKEDWORD_VERSION(3, 0)) + { + WARN("OpenGL version %u.%u too low, limiting GLSL version to 1.30.\n", + gl_version >> 16, gl_version & 0xffff); + gl_info->glsl_version = MAKEDWORD_VERSION(1, 30); + } if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30)) gl_info->supported[WINED3D_GLSL_130] = TRUE; }

1 0

Matteo Bruni : wined3d: Introduce a separate use_legacy_fragment_output() helper.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: 7dbdbcce46c5b8012207be3575faf11afbf50641 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dbdbcce46c5b8012207be35… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 30 16:11:42 2019 +0100 wined3d: Introduce a separate use_legacy_fragment_output() helper. Signed-off-by: Matteo Bruni <mbruni(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 | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0e0977e1d4..b1930d9a88 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2030,9 +2030,17 @@ static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_ } } +static BOOL use_legacy_fragment_output(const struct wined3d_gl_info *gl_info) +{ + /* Technically 1.30 does support user-defined fragment shader outputs but + * we might not have glBindFragDataLocation() available (i.e. GL version + * might be < 3.0). */ + return gl_info->glsl_version <= MAKEDWORD_VERSION(1, 30); +} + static const char *get_fragment_output(const struct wined3d_gl_info *gl_info) { - return needs_legacy_glsl_syntax(gl_info) ? "gl_FragData" : "ps_out"; + return use_legacy_fragment_output(gl_info) ? "gl_FragData" : "ps_out"; } static const char *glsl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) @@ -7545,7 +7553,7 @@ static void shader_glsl_generate_ps_epilogue(const struct wined3d_gl_info *gl_in if (reg_maps->sample_mask) shader_addline(buffer, "gl_SampleMask[0] = floatBitsToInt(sample_mask);\n"); - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) shader_glsl_generate_color_output(buffer, gl_info, shader, args, string_buffers); } @@ -7650,7 +7658,7 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ shader_addline(buffer, " float scale;\n"); shader_addline(buffer, "} ffp_fog;\n"); - if (needs_legacy_glsl_syntax(gl_info)) + if (legacy_syntax) { if (glsl_is_color_reg_read(shader, 0)) shader_addline(buffer, "vec4 ffp_varying_diffuse;\n"); @@ -7731,7 +7739,7 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ if (args->alpha_test_func + 1 != WINED3D_CMP_ALWAYS) shader_addline(buffer, "uniform float alpha_test_ref;\n"); - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) { const struct wined3d_shader_signature *output_signature = &shader->output_signature; @@ -9482,7 +9490,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n"); - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) { shader_addline(buffer, "vec4 ps_out[1];\n"); if (shader_glsl_use_explicit_attrib_location(gl_info)) @@ -9793,7 +9801,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * shader_glsl_generate_fog_code(buffer, gl_info, settings->fog); shader_glsl_generate_alpha_test(buffer, gl_info, alpha_test_func); - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) shader_addline(buffer, "color_out0 = ps_out[0];\n"); shader_addline(buffer, "}\n"); @@ -10338,7 +10346,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, } checkGLcall("glBindAttribLocation"); - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) { for (i = 0; i < MAX_RENDER_TARGET_VIEWS; ++i) { @@ -12763,7 +12771,7 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter declare_in_varying(gl_info, buffer, FALSE, "vec3 out_texcoord;\n"); /* TODO: Declare the out variable with the correct type (and put it in the * blitter args). */ - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) shader_addline(buffer, "out vec4 ps_out[1];\n"); output = string_buffer_get(&blitter->string_buffers); @@ -12795,7 +12803,7 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter GL_EXTCALL(glBindAttribLocation(program, 0, "pos")); GL_EXTCALL(glBindAttribLocation(program, 1, "texcoord")); - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) GL_EXTCALL(glBindFragDataLocation(program, 0, "ps_out")); GL_EXTCALL(glCompileShader(vshader_id));

1 0

Alexandre Julliard : msvcirt/tests: Fix some signed char issues.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: b445b7fe7bb55c648f30d820938ffbb82011ba89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b445b7fe7bb55c648f30d820… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 31 12:32:34 2019 +0100 msvcirt/tests: Fix some signed char issues. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 2cdd10d279..10056217ec 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -975,7 +975,7 @@ static int __thiscall test_streambuf_overflow(streambuf *this, int ch) return EOF; if (!test_this->unbuffered) test_this->pptr = test_this->pbase + 5; - return ch; + return (unsigned char)ch; } #ifdef __i386__ @@ -986,11 +986,11 @@ static int __thiscall test_streambuf_underflow(streambuf *this) { underflow_count++; if (test_this->unbuffered) { - return (buffer_pos < 23) ? test_get_buffer[buffer_pos++] : EOF; + return (buffer_pos < 23) ? (unsigned char)test_get_buffer[buffer_pos++] : EOF; } else if (test_this->gptr < test_this->egptr) { - return *test_this->gptr; + return (unsigned char)*test_this->gptr; } else { - return get_end ? EOF : *(test_this->gptr = test_this->eback); + return get_end ? EOF : (unsigned char)*(test_this->gptr = test_this->eback); } } @@ -1257,13 +1257,13 @@ static void test_streambuf(void) ret = (int) call_func2(p_streambuf_sputc, &sb, 150); ok(ret == 150, "wrong return value, expected 150 got %d\n", ret); ok(overflow_count == 0, "no call to overflow expected\n"); - ok(*sb.pbase == -106, "expected -106 in the put area, got %d\n", *sb.pbase); + ok((signed char)*sb.pbase == -106, "expected -106 in the put area, got %d\n", *sb.pbase); ok(sb.pptr == sb.pbase + 1, "wrong put pointer, expected %p got %p\n", sb.pbase + 1, sb.pptr); sb.pptr--; ret = (int) call_func2(p_streambuf_sputc, &sb, -50); ok(ret == 206, "wrong return value, expected 206 got %d\n", ret); ok(overflow_count == 0, "no call to overflow expected\n"); - ok(*sb.pbase == -50, "expected -50 in the put area, got %d\n", *sb.pbase); + ok((signed char)*sb.pbase == -50, "expected -50 in the put area, got %d\n", *sb.pbase); ok(sb.pptr == sb.pbase + 1, "wrong put pointer, expected %p got %p\n", sb.pbase + 1, sb.pptr); test_this = &sb2; ret = (int) call_func2(p_streambuf_sputc, &sb2, 'c'); @@ -1485,7 +1485,7 @@ static void test_streambuf(void) ok(sb.gptr == sb.eback + 2, "wrong get pointer, expected %p got %p\n", sb.eback + 2, sb.gptr); ok(*sb.gptr == 'A', "expected 'A' in the get area, got %c\n", *sb.gptr); ret = (int) call_func2(p_streambuf_pbackfail, &sb, EOF); - ok(ret == EOF, "expected EOF got '%c'\n", ret); + ok(ret == (char)EOF, "expected EOF got %d\n", ret); ok(sb.gptr == sb.eback + 1, "wrong get pointer, expected %p got %p\n", sb.eback + 1, sb.gptr); ok((signed char)*sb.gptr == EOF, "expected EOF in the get area, got %c\n", *sb.gptr); sb.gptr = sb.eback; @@ -2462,7 +2462,7 @@ static void test_strstreambuf(void) ok(ret == EOF, "wrong return, expected EOF got %d\n", ret); ssb1.base.gptr = ssb1.base.eback + 1; ret = (int) call_func2(p_streambuf_pbackfail, &ssb1.base, EOF); - ok(ret == EOF, "wrong return, expected EOF got %d\n", ret); + ok(ret == (char)EOF, "wrong return, expected EOF got %d\n", ret); ok(ssb1.base.gptr == ssb1.base.eback, "wrong get pointer, expected %p got %p\n", ssb1.base.eback, ssb1.base.gptr); ok((signed char)*ssb1.base.gptr == EOF, "expected EOF got '%c'\n", *ssb1.base.gptr); @@ -4812,7 +4812,7 @@ static void test_istream(void) ok(is1.count == 1, "expected 1 got %d\n", is1.count); ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); ok(fb1.base.gptr == fb1.base.base + 11, "wrong get pointer, expected %p got %p\n", fb1.base.base + 11, fb1.base.gptr); - ok(buffer[0] == -50, "expected 0 got %d\n", buffer[0]); + ok((signed char)buffer[0] == -50, "expected 0 got %d\n", buffer[0]); ok(buffer[1] == 0, "expected 0 got %d\n", buffer[1]); *fb1.base.gptr = -50; memset(buffer, 'A', sizeof(buffer)); @@ -4911,8 +4911,8 @@ static void test_istream(void) ok(is1.count == 2, "expected 2 got %d\n", is1.count); ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); ok(fb1.base.gptr == fb1.base.base + 25, "wrong get pointer, expected %p got %p\n", fb1.base.base + 25, fb1.base.gptr); - ok(buffer[0] == -50, "expected -50 got %d\n", buffer[0]); - ok(buffer[1] == -40, "expected -40 got %d\n", buffer[1]); + ok((signed char)buffer[0] == -50, "expected -50 got %d\n", buffer[0]); + ok((signed char)buffer[1] == -40, "expected -40 got %d\n", buffer[1]); ok(buffer[2] == 0, "expected 0 got %d\n", buffer[2]); /* get */ @@ -4978,7 +4978,7 @@ static void test_istream(void) ok(is1.count == 0, "expected 0 got %d\n", is1.count); ok(is1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", IOSTATE_eofbit|IOSTATE_failbit, is1.base_ios.state); - ok(c == EOF, "expected -1 got %d\n", c); + ok((signed char)c == EOF, "expected -1 got %d\n", c); is1.base_ios.state = IOSTATE_goodbit; fb1.base.eback = fb1.base.gptr = fb1.base.base; fb1.base.egptr = fb1.base.base + 30; @@ -4994,7 +4994,7 @@ static void test_istream(void) ok(is1.count == 1, "expected 1 got %d\n", is1.count); ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); ok(fb1.base.gptr == fb1.base.base + 3, "wrong get pointer, expected %p got %p\n", fb1.base.base + 3, fb1.base.gptr); - ok(c == -50, "expected %d got %d\n", -50, c); + ok((signed char)c == -50, "expected %d got %d\n", -50, c); if (0) /* crashes on native */ pis = call_func2(p_istream_get_char, &is1, NULL); fb1.base.gptr = fb1.base.base + 30; @@ -5004,7 +5004,7 @@ static void test_istream(void) ok(is1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", IOSTATE_eofbit|IOSTATE_failbit, is1.base_ios.state); ok(fb1.base.gptr == (char*) 1, "wrong get pointer, expected %p got %p\n", (char*) 1, fb1.base.gptr); - ok(c == EOF, "expected -1 got %d\n", c); + ok((signed char)c == EOF, "expected -1 got %d\n", c); is1.base_ios.state = IOSTATE_failbit; pis = call_func2(p_istream_get_char, &is1, NULL); ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); @@ -5123,7 +5123,7 @@ static void test_istream(void) is1.base_ios.state = IOSTATE_goodbit; fb1.base.eback = fb1.base.gptr = fb1.base.base; fb1.base.egptr = fb1.base.base + 30; - pis = call_func3(p_istream_get_sb, &is1, &fb2.base, 206); + pis = call_func3(p_istream_get_sb, &is1, &fb2.base, (char)206); ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); ok(is1.count == 30, "expected 30 got %d\n", is1.count); ok(is1.base_ios.state == IOSTATE_eofbit, "expected %d got %d\n", IOSTATE_eofbit, is1.base_ios.state); @@ -5178,7 +5178,7 @@ static void test_istream(void) ok(buffer[7] == 0, "expected 0 got %d\n", buffer[7]); is1.extract_delim = -1; memset(buffer, 'A', sizeof(buffer)); - pis = call_func4(p_istream_getline, &is1, buffer, 10, 206); + pis = call_func4(p_istream_getline, &is1, buffer, 10, (char)206); ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); ok(is1.extract_delim == 0, "expected 0 got %d\n", is1.extract_delim); ok(is1.count == 0, "expected 0 got %d\n", is1.count); @@ -5352,7 +5352,7 @@ static void test_istream(void) ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); ok(fb1.base.gptr == fb1.base.base + 14, "wrong get pointer, expected %p got %p\n", fb1.base.base + 14, fb1.base.gptr); - ok(*fb1.base.gptr == -40, "expected -40 got %d\n", *fb1.base.gptr); + ok((signed char)*fb1.base.gptr == -40, "expected -40 got %d\n", *fb1.base.gptr); /* read */ is1.extract_delim = is1.count = 0xabababab; @@ -5381,7 +5381,7 @@ static void test_istream(void) ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); ok(fb1.base.gptr == fb1.base.base + 30, "wrong get pointer, expected %p got %p\n", fb1.base.base + 30, fb1.base.gptr); ok(!strncmp(buffer, fb1.base.base + 10, 20), "unexpected buffer content, got '%s'\n", buffer); - ok(buffer[4] == -40, "expected -40 got %d\n", buffer[4]); + ok((signed char)buffer[4] == -40, "expected -40 got %d\n", buffer[4]); ok(buffer[20] == 'A', "expected 'A' got %d\n", buffer[20]); memset(buffer, 'A', sizeof(buffer)); pis = call_func3(p_istream_read, &is1, buffer, 5);

1 0

Alexandre Julliard : oleaut32: Fix scope of a local array variable.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: 27e976c4fbdb6c5e3aa41b9a5f879b4a359beeee URL: https://source.winehq.org/git/wine.git/?a=commit;h=27e976c4fbdb6c5e3aa41b9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 31 16:30:29 2019 +0100 oleaut32: Fix scope of a local array variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d652edc7ee..1971a41570 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7242,6 +7242,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( UINT cNamedArgs = pDispParams->cNamedArgs; DISPID *rgdispidNamedArgs = pDispParams->rgdispidNamedArgs; UINT vargs_converted=0; + SAFEARRAY *a; hres = S_OK; @@ -7363,7 +7364,6 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } else if ((rgvt[i] == (VT_VARIANT | VT_ARRAY) || rgvt[i] == (VT_VARIANT | VT_ARRAY | VT_BYREF)) && func_desc->cParamsOpt < 0) { - SAFEARRAY *a; SAFEARRAYBOUND bound; VARIANT *v; LONG j;

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_material().
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: 5072edde49b2a9a53974cf74adc5bbb396697a79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5072edde49b2a9a53974cf74… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 30 21:34:38 2019 -0500 wined3d: Introduce wined3d_stateblock_set_material(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 98986c735b..24fd551adc 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1537,6 +1537,15 @@ HRESULT CDECL wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *state return S_OK; } +void CDECL wined3d_stateblock_set_material(struct wined3d_stateblock *stateblock, + const struct wined3d_material *material) +{ + TRACE("stateblock %p, material %p.\n", stateblock, material); + + stateblock->stateblock_state.material = *material; + stateblock->changed.material = TRUE; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 43b6112714..4f3cdf9b7b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -265,6 +265,7 @@ @ cdecl wined3d_stateblock_reset(ptr) @ cdecl wined3d_stateblock_set_blend_factor(ptr ptr) @ cdecl wined3d_stateblock_set_clip_plane(ptr long ptr) +@ cdecl wined3d_stateblock_set_material(ptr ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) @ cdecl wined3d_stateblock_set_ps_consts_b(ptr long long ptr) @ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fabcdcb0d7..27a0e58a28 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2670,6 +2670,7 @@ void __cdecl wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stat const struct wined3d_color *blend_factor); HRESULT __cdecl wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *stateblock, UINT plane_idx, const struct wined3d_vec4 *plane); +void __cdecl wined3d_stateblock_set_material(struct wined3d_stateblock *stateblock, const struct wined3d_material *material); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); HRESULT __cdecl wined3d_stateblock_set_ps_consts_b(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const BOOL *constants);

1 0

Alexandre Julliard : msvcrt/tests: Fix more signed char issues.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: 79052f58907a11ec3cfa5346a30e72a4fc28fc57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79052f58907a11ec3cfa5346… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 31 09:14:17 2019 +0100 msvcrt/tests: Fix more signed char issues. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 8d28da1315..a74ba22cfc 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2936,7 +2936,7 @@ static void test_tolower(void) ch = 0xF4; errno = 0xdeadbeef; - ret = p_tolower(ch); + ret = p_tolower((signed char)ch); if(!MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, &ch, 1, &chw, 1) || LCMapStringW(CP_ACP, LCMAP_LOWERCASE, &chw, 1, &lower, 1) != 1 || (len = WideCharToMultiByte(CP_ACP, 0, &lower, 1, &lch, 1, NULL, NULL)) != 1) @@ -2950,7 +2950,7 @@ static void test_tolower(void) ch = 0xD0; errno = 0xdeadbeef; - ret = p_tolower(ch); + ret = p_tolower((signed char)ch); if(!MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, &ch, 1, &chw, 1) || LCMapStringW(CP_ACP, LCMAP_LOWERCASE, &chw, 1, &lower, 1) != 1 || (len = WideCharToMultiByte(CP_ACP, 0, &lower, 1, &lch, 1, NULL, NULL)) != 1) @@ -2962,15 +2962,15 @@ static void test_tolower(void) if(!len || ret==(unsigned char)lch) ok(errno == EILSEQ, "errno = %d\n", errno); - ret = p_tolower(0xD0); + ret = p_tolower((unsigned char)0xD0); ok(ret == 0xD0, "ret = %x\n", ret); ok(setlocale(LC_ALL, "us") != NULL, "setlocale failed\n"); - ret = p_tolower((char)0xD0); + ret = p_tolower((signed char)0xD0); ok(ret == 0xF0, "ret = %x\n", ret); - ret = p_tolower(0xD0); + ret = p_tolower((unsigned char)0xD0); ok(ret == 0xF0, "ret = %x\n", ret); setlocale(LC_ALL, "C");

1 0

Francois Gouget : testbot/testagentd: Fix the console when redirecting stdin/out/err on Windows.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: tools Branch: master Commit: dbe7ab2a74b347e773a74d7076dc1dabc521f94f URL: https://source.winehq.org/git/tools.git/?a=commit;h=dbe7ab2a74b347e773a74d7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 31 17:03:23 2019 +0100 testbot/testagentd: Fix the console when redirecting stdin/out/err on Windows. When When TestAgentd runs in --detach mode it does not have a console. The child console processes still get a console but when using STARTF_USESTDHANDLES the non-redirected stdin/out/err ifile handles would not point to it. This appears to be because CreateProcess() compares the STARTUPINFO handles with the parent's GetStdHandle() ones and only reconnects them to the child console if they match. So if the parent has no console the child inherits garbage values for the GetStdHandle()s, that is GetFileType() returns FILE_TYPE_UNKNOWN for those and their behavior is somewhat random. This would break some kernel32:console STD_INPUT_HANDLE tests. So when in --detach mode TestAgentd now creates a new console before calling CreateProcess(). This resets stdin/out/err to point to the console causing the child process to inherit proper handle values. TestAgentd then detaches from the console which means it may just flash on screen if starting a GUI application. Increment the version so clients can check whether Run() redirections are fully usable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/platform_windows.c | 8 +++++++- testbot/src/testagentd/testagentd.c | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index ea6f03f..057e8fc 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -29,9 +29,10 @@ struct child_t DWORD pid; HANDLE handle; }; - static struct list children = LIST_INIT(children); +static BOOLEAN detached = FALSE; + uint64_t platform_run(char** argv, uint32_t flags, char** redirects) { @@ -79,6 +80,8 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) *(d-1) = '\0'; /* Prepare the redirections */ + if (detached) + AllocConsole(); has_redirects = 0; for (i = 0; i < 3; i++) { @@ -149,6 +152,8 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) for (i = 0; i < 3; i++) if (redirects[i][0]) CloseHandle(fhs[i]); + if (detached) + platform_detach_console(); return pi.dwProcessId; } @@ -692,6 +697,7 @@ void platform_detach_console(void) SetStdHandle(STD_INPUT_HANDLE, INVALID_HANDLE_VALUE); SetStdHandle(STD_OUTPUT_HANDLE, INVALID_HANDLE_VALUE); SetStdHandle(STD_ERROR_HANDLE, INVALID_HANDLE_VALUE); + detached = TRUE; } int platform_init(void) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index eb93aa2..994f7c2 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -41,6 +41,7 @@ * 1.7: Add --show-restarts and the setproperty RPC. * 1.8: Add the restart RPC, server.arg* properties, fix upgrades if >1 * server. + * 1.9: Fix the console handling when redirecting stdin/out/err on Windows. */ #define PROTOCOL_VERSION "testagentd 1.8"

1 0

Francois Gouget : testbot/testagentd: Reset the console handle after closing it.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: tools Branch: master Commit: f8b3f02f851e8022c1fbba9fee999b2d6c080c77 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f8b3f02f851e8022c1fbba9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 31 17:02:57 2019 +0100 testbot/testagentd: Reset the console handle after closing it. GetStdHandle() still returns the pseudo handles for the closed console except they obviously don't work. So reset them to avoid confusion. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/platform_windows.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index b3db635..ea6f03f 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -689,6 +689,9 @@ void ta_freeaddrinfo(struct addrinfo *addresses) void platform_detach_console(void) { FreeConsole(); + SetStdHandle(STD_INPUT_HANDLE, INVALID_HANDLE_VALUE); + SetStdHandle(STD_OUTPUT_HANDLE, INVALID_HANDLE_VALUE); + SetStdHandle(STD_ERROR_HANDLE, INVALID_HANDLE_VALUE); } int platform_init(void)

1 0

Francois Gouget : testbot/testagentd: Don't close the GetStdHandle()s in case of error.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: tools Branch: master Commit: d9eb13f6fef026dccaff6ddba52e1dfaf6653d9f URL: https://source.winehq.org/git/tools.git/?a=commit;h=d9eb13f6fef026dccaff6dd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 31 17:02:38 2019 +0100 testbot/testagentd: Don't close the GetStdHandle()s in case of error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/platform_windows.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index acd0138..b3db635 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -112,7 +112,7 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) free(cmdline); while (i > 0) { - if (fhs[i] != INVALID_HANDLE_VALUE) + if (redirects[i][0] && fhs[i] != INVALID_HANDLE_VALUE) CloseHandle(fhs[i]); i--; }

1 0

Francois Gouget : testbot/WineRunTask: Use a trampoline script to capture cmd errors.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: tools Branch: master Commit: 443043bbe4c8d495912576b76625d82e43be57f9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=443043bbe4c8d495912576b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 31 16:54:23 2019 +0100 testbot/WineRunTask: Use a trampoline script to capture cmd errors. This side-steps the console / redirection bug in the currently deployed versions of TestAgentd. This also side-steps cmd's command line parsing bug. When given ["cmd". "/c", "script.bat >Task.log"] TestAgent would build a command line of the form '"cmd" "/c" "script.bat >Task.log"' which would lead cmd to try to run '"script.bat >Task.log'. This would fail because of the extraneous double quote. Note that cmd fails in the same way for 'cmd "/c" "script.bat >Task.log"'. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 0177e05..1f21050 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -502,14 +502,19 @@ if (!$TA->SendFileFromString($Script, "script.bat", $TestAgent::SENDFILE_EXE)) FatalTAError($TA, "Could not send the task script to the VM"); } +my $Logger = "script.bat >Task.log 2>&1\r\n"; +if (!$TA->SendFileFromString($Logger, "cmdlogger.bat", $TestAgent::SENDFILE_EXE)) +{ + FatalTAError($TA, "Could not send the logging script to the VM"); +} + # # Run the test # Debug(Elapsed($Start), " Starting the script\n"); -my $TaskLog = $TA->HasMinVersion(1, 7) ? "Task.log" : undef; -my $Pid = $TA->Run(["./script.bat"], 0, undef, $TaskLog, $TaskLog); +my $Pid = $TA->Run(["./cmdlogger.bat"], 0); if (!$Pid) { FatalTAError($TA, "Failed to start the test"); @@ -540,13 +545,10 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) } } -if (defined $TaskLog) +Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); +if (!$TA->GetFile("Task.log", "$TaskDir/log") and !defined $TAError) { - Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); - if (!$TA->GetFile($TaskLog, "$TaskDir/log") and !defined $TAError) - { - $TAError = "An error occurred while retrieving the task log: ". $TA->GetLastError(); - } + $TAError = "An error occurred while retrieving the task log: ". $TA->GetLastError(); } Debug(Elapsed($Start), " Retrieving the report file to '$RptFileName'\n");

1 0