wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Zebediah Figura : quartz/tests: Avoid leaking the media type from IPin::ConnectionMediaType() (Valgrind).
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 036fcf96c83cddee001ef1f3358a7fa25d1db839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=036fcf96c83cddee001ef1f3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 7 16:24:44 2020 -0500 quartz/tests: Avoid leaking the media type from IPin::ConnectionMediaType() (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avidec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 0e1e92a950..9505bfb591 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -967,6 +967,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); ok(compare_media_types(&testsource.source.pin.mt, &req_mt), "Media types didn't match.\n"); + FreeMediaType(&mt); sink_bih = req_format.bmiHeader; @@ -1072,6 +1073,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); ok(compare_media_types(&testsink.sink.pin.mt, &req_mt), "Media types didn't match.\n"); + FreeMediaType(&mt); hr = IFilterGraph2_Disconnect(graph, source); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : strmbase: Avoid leaking the media type on failure in IEnumMediaTypes::Next().
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 07729ea4ef7d53dc39f32d47f7bf9f1b7e3a5f1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=07729ea4ef7d53dc39f32d47… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 6 16:22:44 2020 -0500 strmbase: Avoid leaking the media type on failure in IEnumMediaTypes::Next(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index eab7c0cb2e..f08c6d0186 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -119,6 +119,7 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, AM_MEDIA_TYPE **mts, ULONG *ret_count) { struct enum_media_types *enummt = impl_from_IEnumMediaTypes(iface); + AM_MEDIA_TYPE mt; unsigned int i; HRESULT hr; @@ -133,10 +134,14 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, for (i = 0; i < count; ++i) { - if ((mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) - hr = enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->index + i, mts[i]); - else - hr = E_OUTOFMEMORY; + hr = enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->index + i, &mt); + if (hr == S_OK) + { + if ((mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) + *mts[i] = mt; + else + hr = E_OUTOFMEMORY; + } if (FAILED(hr)) { while (i--)

1 0

Zebediah Figura : strmbase: Clear the debug info before calling DeleteCriticalSection (Valgrind).
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 2cf4b6016e3b1dffb59ccfaf55199380ebf64b65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cf4b6016e3b1dffb59ccfaf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 6 16:03:13 2020 -0500 strmbase: Clear the debug info before calling DeleteCriticalSection (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 2809832ee8..8b8182a13a 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -532,11 +532,13 @@ void strmbase_filter_init(struct strmbase_filter *filter, IUnknown *outer, filter->ops = ops; } -void strmbase_filter_cleanup(struct strmbase_filter *This) +void strmbase_filter_cleanup(struct strmbase_filter *filter) { - if (This->clock) - IReferenceClock_Release(This->clock); + if (filter->clock) + IReferenceClock_Release(filter->clock); - This->IBaseFilter_iface.lpVtbl = NULL; - DeleteCriticalSection(&This->csFilter); + filter->IBaseFilter_iface.lpVtbl = NULL; + if (filter->csFilter.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + filter->csFilter.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&filter->csFilter); }

1 0

Zebediah Figura : d3dcompiler/tests: Add a test for struct assignment.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 93f3b062fd42eaadb94182883fd884551bd6bc61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93f3b062fd42eaadb9418288… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 5 17:19:33 2020 -0500 d3dcompiler/tests: Add a test for struct assignment. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 42 +++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 059f39e4c3..fba8a638b5 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -859,6 +859,47 @@ static void test_majority(void) release_test_context(&test_context); } +static void test_struct_assignment(void) +{ + struct test_context test_context; + ID3D10Blob *ps_code = NULL; + struct vec4 v; + + static const char ps_source[] = + "struct apple\n" + "{\n" + " struct\n" + " {\n" + " float4 a;\n" + " } m;\n" + " float4 b;\n" + "};\n" + "float4 main() : COLOR\n" + "{\n" + " struct apple q, r, s;\n" + " q.m.a = float4(0.1, 0.2, 0.3, 0.4);\n" + " q.b = float4(0.5, 0.1, 0.4, 0.5);\n" + " s = r = q;\n" + " return s.m.a + s.b;\n" + "}"; + + if (!init_test_context(&test_context)) + return; + + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) + { + draw_quad(test_context.device, ps_code); + + v = get_color_vec4(test_context.device, 0, 0); + ok(compare_vec4(&v, 0.6f, 0.3f, 0.7f, 0.9f, 1), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + release_test_context(&test_context); +} + static void check_constant_desc(const char *prefix, const D3DXCONSTANT_DESC *desc, const D3DXCONSTANT_DESC *expect, BOOL nonzero_defaultvalue) { @@ -1154,6 +1195,7 @@ START_TEST(hlsl_d3d9) test_return(); test_array_dimensions(); test_majority(); + test_struct_assignment(); test_constant_table(); test_fail();

1 0

Piotr Caban : ucrtbase: Add more inf,nan,ind printf tests.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 55d51b1a39f5e234d47309ae3ffb1088b289e687 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55d51b1a39f5e234d47309ae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 8 17:21:02 2020 +0200 ucrtbase: Add more inf,nan,ind printf tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 72 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 64ccd4ca5d..9d925a06e1 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -657,11 +657,81 @@ static void test_printf_fp(void) _CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY | _CRT_INTERNAL_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS }; - static const struct { + const struct { const char *fmt; double d; const char *res[ARRAY_SIZE(flags)]; } tests[] = { + { "%a", NAN, { "nan", "0x1.#QNAN00000000p+0", "nan", "0x1.#QNAN00000000p+0" }}, + { "%A", NAN, { "NAN", "0X1.#QNAN00000000P+0", "NAN", "0X1.#QNAN00000000P+0" }}, + { "%e", NAN, { "nan", "1.#QNAN0e+00", "nan", "1.#QNAN0e+000" }}, + { "%E", NAN, { "NAN", "1.#QNAN0E+00", "NAN", "1.#QNAN0E+000" }}, + { "%g", NAN, { "nan", "1.#QNAN", "nan", "1.#QNAN" }}, + { "%G", NAN, { "NAN", "1.#QNAN", "NAN", "1.#QNAN" }}, + { "%21a", NAN, { " nan", " 0x1.#QNAN00000000p+0", " nan", " 0x1.#QNAN00000000p+0" }}, + { "%20e", NAN, { " nan", " 1.#QNAN0e+00", " nan", " 1.#QNAN0e+000" }}, + { "%20g", NAN, { " nan", " 1.#QNAN", " nan", " 1.#QNAN" }}, + { "%.21a", NAN, { "nan", "0x1.#QNAN0000000000000000p+0", "nan", "0x1.#QNAN0000000000000000p+0" }}, + { "%.20e", NAN, { "nan", "1.#QNAN000000000000000e+00", "nan", "1.#QNAN000000000000000e+000" }}, + { "%.20g", NAN, { "nan", "1.#QNAN", "nan", "1.#QNAN" }}, + { "%.021a", NAN, { "nan", "0x1.#QNAN0000000000000000p+0", "nan", "0x1.#QNAN0000000000000000p+0" }}, + { "%.020e", NAN, { "nan", "1.#QNAN000000000000000e+00", "nan", "1.#QNAN000000000000000e+000" }}, + { "%.020g", NAN, { "nan", "1.#QNAN", "nan", "1.#QNAN" }}, + { "%#.21a", NAN, { "nan", "0x1.#QNAN0000000000000000p+0", "nan", "0x1.#QNAN0000000000000000p+0" }}, + { "%#.20e", NAN, { "nan", "1.#QNAN000000000000000e+00", "nan", "1.#QNAN000000000000000e+000" }}, + { "%#.20g", NAN, { "nan", "1.#QNAN00000000000000", "nan", "1.#QNAN00000000000000" }}, + { "%.1g", NAN, { "nan", "1", "nan", "1" }}, + { "%.2g", NAN, { "nan", "1.$", "nan", "1.$" }}, + { "%.3g", NAN, { "nan", "1.#R", "nan", "1.#R" }}, + + { "%a", IND, { "-nan(ind)", "-0x1.#IND000000000p+0", "-nan(ind)", "-0x1.#IND000000000p+0" }}, + { "%e", IND, { "-nan(ind)", "-1.#IND00e+00", "-nan(ind)", "-1.#IND00e+000" }}, + { "%g", IND, { "-nan(ind)", "-1.#IND", "-nan(ind)", "-1.#IND" }}, + { "%21a", IND, { " -nan(ind)", "-0x1.#IND000000000p+0", " -nan(ind)", "-0x1.#IND000000000p+0" }}, + { "%20e", IND, { " -nan(ind)", " -1.#IND00e+00", " -nan(ind)", " -1.#IND00e+000" }}, + { "%20g", IND, { " -nan(ind)", " -1.#IND", " -nan(ind)", " -1.#IND" }}, + { "%.21a", IND, { "-nan(ind)", "-0x1.#IND00000000000000000p+0", "-nan(ind)", "-0x1.#IND00000000000000000p+0" }}, + { "%.20e", IND, { "-nan(ind)", "-1.#IND0000000000000000e+00", "-nan(ind)", "-1.#IND0000000000000000e+000" }}, + { "%.20g", IND, { "-nan(ind)", "-1.#IND", "-nan(ind)", "-1.#IND" }}, + { "%.021a", IND, { "-nan(ind)", "-0x1.#IND00000000000000000p+0", "-nan(ind)", "-0x1.#IND00000000000000000p+0" }}, + { "%.020e", IND, { "-nan(ind)", "-1.#IND0000000000000000e+00", "-nan(ind)", "-1.#IND0000000000000000e+000" }}, + { "%.020g", IND, { "-nan(ind)", "-1.#IND", "-nan(ind)", "-1.#IND" }}, + { "%#.21a", IND, { "-nan(ind)", "-0x1.#IND00000000000000000p+0", "-nan(ind)", "-0x1.#IND00000000000000000p+0" }}, + { "%#.20e", IND, { "-nan(ind)", "-1.#IND0000000000000000e+00", "-nan(ind)", "-1.#IND0000000000000000e+000" }}, + { "%#.20g", IND, { "-nan(ind)", "-1.#IND000000000000000", "-nan(ind)", "-1.#IND000000000000000" }}, + + { "%a", INFINITY, { "inf", "0x1.#INF000000000p+0", "inf", "0x1.#INF000000000p+0" }}, + { "%e", INFINITY, { "inf", "1.#INF00e+00", "inf", "1.#INF00e+000" }}, + { "%g", INFINITY, { "inf", "1.#INF", "inf", "1.#INF" }}, + { "%21a", INFINITY, { " inf", " 0x1.#INF000000000p+0", " inf", " 0x1.#INF000000000p+0" }}, + { "%20e", INFINITY, { " inf", " 1.#INF00e+00", " inf", " 1.#INF00e+000" }}, + { "%20g", INFINITY, { " inf", " 1.#INF", " inf", " 1.#INF" }}, + { "%.21a", INFINITY, { "inf", "0x1.#INF00000000000000000p+0", "inf", "0x1.#INF00000000000000000p+0" }}, + { "%.20e", INFINITY, { "inf", "1.#INF0000000000000000e+00", "inf", "1.#INF0000000000000000e+000" }}, + { "%.20g", INFINITY, { "inf", "1.#INF", "inf", "1.#INF" }}, + { "%.021a", INFINITY, { "inf", "0x1.#INF00000000000000000p+0", "inf", "0x1.#INF00000000000000000p+0" }}, + { "%.020e", INFINITY, { "inf", "1.#INF0000000000000000e+00", "inf", "1.#INF0000000000000000e+000" }}, + { "%.020g", INFINITY, { "inf", "1.#INF", "inf", "1.#INF" }}, + { "%#.21a", INFINITY, { "inf", "0x1.#INF00000000000000000p+0", "inf", "0x1.#INF00000000000000000p+0" }}, + { "%#.20e", INFINITY, { "inf", "1.#INF0000000000000000e+00", "inf", "1.#INF0000000000000000e+000" }}, + { "%#.20g", INFINITY, { "inf", "1.#INF000000000000000", "inf", "1.#INF000000000000000" }}, + + { "%a", -INFINITY, { "-inf", "-0x1.#INF000000000p+0", "-inf", "-0x1.#INF000000000p+0" }}, + { "%e", -INFINITY, { "-inf", "-1.#INF00e+00", "-inf", "-1.#INF00e+000" }}, + { "%g", -INFINITY, { "-inf", "-1.#INF", "-inf", "-1.#INF" }}, + { "%21a", -INFINITY, { " -inf", "-0x1.#INF000000000p+0", " -inf", "-0x1.#INF000000000p+0" }}, + { "%20e", -INFINITY, { " -inf", " -1.#INF00e+00", " -inf", " -1.#INF00e+000" }}, + { "%20g", -INFINITY, { " -inf", " -1.#INF", " -inf", " -1.#INF" }}, + { "%.21a", -INFINITY, { "-inf", "-0x1.#INF00000000000000000p+0", "-inf", "-0x1.#INF00000000000000000p+0" }}, + { "%.20e", -INFINITY, { "-inf", "-1.#INF0000000000000000e+00", "-inf", "-1.#INF0000000000000000e+000" }}, + { "%.20g", -INFINITY, { "-inf", "-1.#INF", "-inf", "-1.#INF" }}, + { "%.021a", -INFINITY, { "-inf", "-0x1.#INF00000000000000000p+0", "-inf", "-0x1.#INF00000000000000000p+0" }}, + { "%.020e", -INFINITY, { "-inf", "-1.#INF0000000000000000e+00", "-inf", "-1.#INF0000000000000000e+000" }}, + { "%.020g", -INFINITY, { "-inf", "-1.#INF", "-inf", "-1.#INF" }}, + { "%#.21a", -INFINITY, { "-inf", "-0x1.#INF00000000000000000p+0", "-inf", "-0x1.#INF00000000000000000p+0" }}, + { "%#.20e", -INFINITY, { "-inf", "-1.#INF0000000000000000e+00", "-inf", "-1.#INF0000000000000000e+000" }}, + { "%#.20g", -INFINITY, { "-inf", "-1.#INF000000000000000", "-inf", "-1.#INF000000000000000" }}, + { "%a", 0, { "0x0.0000000000000p+0" }}, { "%A", 0, { "0X0.0000000000000P+0" }}, { "%a", 0.5, { "0x1.0000000000000p-1" }},

1 0

Piotr Caban : ucrtbase: Add printf %a format tests.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: e30b853e3f810da4ab11742f46111a40d8df8cc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e30b853e3f810da4ab11742f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 8 17:20:57 2020 +0200 ucrtbase: Add printf %a format tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 7647ac57e2..64ccd4ca5d 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -648,6 +648,67 @@ static void test_printf_natural_string(void) ok(!lstrcmpW(wbuffer, wide_out), "buffer wrong, got=%s\n", wine_dbgstr_w(wbuffer)); } +static void test_printf_fp(void) +{ + static const int flags[] = { + 0, + _CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, + _CRT_INTERNAL_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS, + _CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY + | _CRT_INTERNAL_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS + }; + static const struct { + const char *fmt; + double d; + const char *res[ARRAY_SIZE(flags)]; + } tests[] = { + { "%a", 0, { "0x0.0000000000000p+0" }}, + { "%A", 0, { "0X0.0000000000000P+0" }}, + { "%a", 0.5, { "0x1.0000000000000p-1" }}, + { "%a", 1, { "0x1.0000000000000p+0" }}, + { "%a", 20, { "0x1.4000000000000p+4" }}, + { "%a", -1, { "-0x1.0000000000000p+0" }}, + { "%a", 0.1, { "0x1.999999999999ap-4" }}, + { "%24a", 0.1, { " 0x1.999999999999ap-4" }}, + { "%024a", 0.1, { "0x00001.999999999999ap-4" }}, + { "%.2a", 0.1, { "0x1.9ap-4" }}, + { "%.20a", 0.1, { "0x1.999999999999a0000000p-4" }}, + { "%.a", 0.1e-20, { "0x1p-70" }}, + { "%a", 0.1e-20, { "0x1.2e3b40a0e9b4fp-70" }}, + { "%a", 4.9406564584124654e-324, { "0x0.0000000000001p-1022" }}, + { "%.0a", -1.5, { "-0x1p+0" }}, + { "%.0a", -0.5, { "-0x1p-1" }}, + { "%.0a", 0.5, { "0x1p-1" }}, + { "%.0a", 1.5, { "0x1p+0" }}, + { "%.0a", 1.99, { "0x2p+0" }}, + { "%.0a", 2, { "0x1p+1" }}, + { "%.0a", 9.5, { "0x1p+3" }}, + { "%.0a", 10.5, { "0x1p+3" }}, + { "%#.0a", -1.5, { "-0x1.p+0" }}, + { "%#.0a", -0.5, { "-0x1.p-1" }}, + { "%#.0a", 0.5, { "0x1.p-1" }}, + { "%#.0a", 1.5, { "0x1.p+0" }}, + }; + + const char *res = NULL; + char buf[100]; + int i, j, r; + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + for (j = 0; j < ARRAY_SIZE(flags); j++) + { + if (tests[i].res[j]) res = tests[i].res[j]; + + r = vsprintf_wrapper(flags[j], buf, sizeof(buf), tests[i].fmt, tests[i].d); + ok(r == strlen(res), "%d,%d) r = %d, expected %d\n", + i, j, r, strlen(res)); + ok(!strcmp(buf, res), "%d,%d) buf = %s, expected %s\n", + i, j, buf, res); + } + } +} + START_TEST(printf) { ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, @@ -664,4 +725,5 @@ START_TEST(printf) test_printf_legacy_three_digit_exp(); test_printf_c99(); test_printf_natural_string(); + test_printf_fp(); }

1 0

Piotr Caban : msvcrt: Reimplement %a printf format handling.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 111e4221ac9ade7e3825dbc673d6855cf398e640 URL: https://source.winehq.org/git/wine.git/?a=commit;h=111e4221ac9ade7e3825dbc6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 8 17:20:51 2020 +0200 msvcrt: Reimplement %a printf format handling. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index b3219ae000..69eb8b1955 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -405,6 +405,120 @@ static inline int FUNC_NAME(pf_output_special_fp)(FUNC_NAME(puts_clbk) pf_puts, return len; } +static inline int FUNC_NAME(pf_output_hex_fp)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, + double v, FUNC_NAME(pf_flags) *flags, MSVCRT__locale_t locale) +{ +#define EXP_BITS 11 +#define MANT_BITS 53 + const APICHAR digits[2][16] = { + { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' }, + { '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F' } + }; + + APICHAR pfx[16], sfx[8], *p; + ULONGLONG mant; + int len = 0, sfx_len = 0, r, exp; + + mant = (*(ULONGLONG*)&v) << 1; + exp = (mant >> MANT_BITS); + exp -= (1 << (EXP_BITS - 1)) - 1; + mant = (mant << EXP_BITS) >> (EXP_BITS+1); + + p = pfx; + if(flags->PadZero) { + if(flags->Sign) *p++ = flags->Sign; + *p++ = '0'; + *p++ = (flags->Format=='a' ? 'x' : 'X'); + r = pf_puts(puts_ctx, p-pfx, pfx); + if(r < 0) return r; + len += r; + + flags->FieldLength -= p-pfx; + flags->Sign = 0; + p = pfx; + }else { + *p++ = '0'; + *p++ = (flags->Format=='a' ? 'x' : 'X'); + } + if(exp == -(1 << (EXP_BITS-1))+1) { + if(!mant) exp = 0; + else exp++; + *p++ = '0'; + }else { + *p++ = '1'; + } + *p++ = *(locale ? locale->locinfo : get_locinfo())->lconv->decimal_point; + for(r=MANT_BITS/4-1; r>=0; r--) { + p[r] = digits[flags->Format == 'A'][mant & 15]; + mant >>= 4; + } + if(!flags->Precision) { + if(p[0] > '8') p[-2]++; + if(!flags->Alternate) p--; + }else if(flags->Precision>0 && flags->Precision<MANT_BITS/4) { + BOOL round_up = (p[flags->Precision] > '8'); + for(r=flags->Precision-1; r>=0 && round_up; r--) { + round_up = FALSE; + if(p[r]=='f' || p[r]=='F') { + p[r] = '0'; + round_up = TRUE; + }else if(p[r] == '9') { + p[r] = (flags->Format == 'a' ? 'a' : 'A'); + }else { + p[r]++; + } + } + if(round_up) p[-2]++; + p += flags->Precision; + }else { + p += MANT_BITS/4; + if(flags->Precision > MANT_BITS/4) sfx_len += flags->Precision - MANT_BITS/4; + } + *p = 0; + + p = sfx; + *p++ = (flags->Format == 'a' ? 'p' : 'P'); + if(exp < 0) { + *p++ = '-'; + exp = -exp; + }else { + *p++ = '+'; + } + for(r=3; r>=0; r--) { + p[r] = exp%10 + '0'; + exp /= 10; + if(!exp) break; + } + for(exp=0; exp<4-r; exp++) + p[exp] = p[exp+r]; + p += exp; + *p = 0; + sfx_len += p - sfx; + + flags->FieldLength -= sfx_len; + flags->Precision = -1; +#ifdef PRINTF_WIDE + r = FUNC_NAME(pf_output_format_wstr)(pf_puts, puts_ctx, pfx, -1, flags, locale); +#else + r = FUNC_NAME(pf_output_format_str)(pf_puts, puts_ctx, pfx, -1, flags, locale); +#endif + if(r < 0) return r; + len += r; + + flags->FieldLength = sfx_len; + flags->PadZero = '0'; + flags->Sign = 0; +#ifdef PRINTF_WIDE + r = FUNC_NAME(pf_output_format_wstr)(pf_puts, puts_ctx, sfx, -1, flags, locale); +#else + r = FUNC_NAME(pf_output_format_str)(pf_puts, puts_ctx, sfx, -1, flags, locale); +#endif + if(r < 0) return r; + len += r; + + return len; +} + static inline void FUNC_NAME(pf_rebuild_format_string)(char *p, FUNC_NAME(pf_flags) *flags) { *p++ = '%'; @@ -749,6 +863,8 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API if(isinf(val) || isnan(val)) i = FUNC_NAME(pf_output_special_fp)(pf_puts, puts_ctx, val, &flags, locale, legacy_msvcrt_compat, three_digit_exp); + else if(flags.Format=='a' || flags.Format=='A') + i = FUNC_NAME(pf_output_hex_fp)(pf_puts, puts_ctx, val, &flags, locale); else { if(flags.Format=='f' || flags.Format=='F') { if(val<10.0)

1 0

Piotr Caban : msvcrt: Reimplement special doubles printing.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: c638730b6dd0921d92dd0ee8e141556adf5f1bf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c638730b6dd0921d92dd0ee8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 8 17:20:46 2020 +0200 msvcrt: Reimplement special doubles printing. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 278 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 171 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c638730b6dd0921d92dd…

1 0

Piotr Caban : msvcrt: Use internal sprintf implementation.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: bfa1e3ef8f592d74f1dfcc89ba940946ad327591 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfa1e3ef8f592d74f1dfcc89… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 8 17:20:39 2020 +0200 msvcrt: Use internal sprintf implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/errno.c | 4 ++-- dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/locale.c | 4 ++-- dlls/msvcrt/math.c | 8 ++++---- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/printf.h | 10 ++++++---- dlls/msvcrt/string.c | 4 ++-- dlls/msvcrt/undname.c | 2 +- 9 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index a80ac61f11..0497e59739 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -323,9 +323,9 @@ char* CDECL MSVCRT__strerror(const char* str) if (err < 0 || err > MSVCRT__sys_nerr) err = MSVCRT__sys_nerr; if (str && *str) - sprintf( data->strerror_buffer, "%s: %s\n", str, MSVCRT__sys_errlist[err] ); + MSVCRT_sprintf( data->strerror_buffer, "%s: %s\n", str, MSVCRT__sys_errlist[err] ); else - sprintf( data->strerror_buffer, "%s\n", MSVCRT__sys_errlist[err] ); + MSVCRT_sprintf( data->strerror_buffer, "%s\n", MSVCRT__sys_errlist[err] ); return data->strerror_buffer; } diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index b357b83b33..f631d4d727 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -237,7 +237,7 @@ void CDECL _amsg_exit(int errnum) ((MSVCRT_error_mode == MSVCRT__OUT_TO_DEFAULT) && (MSVCRT_app_type == 2))) { char text[32]; - sprintf(text, "Error: R60%d",errnum); + MSVCRT_sprintf(text, "Error: R60%d",errnum); DoMessageBox("Runtime error!", text); } else diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 72a52a20a9..bbcaed0ae0 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -454,7 +454,7 @@ static BOOL update_threadlocinfo_category(LCID lcid, unsigned short cp, len += GetLocaleInfoA(lcid, LOCALE_SENGCOUNTRY |LOCALE_NOUSEROVERRIDE, &buf[len], 256-len); buf[len-1] = '.'; - sprintf(buf+len, "%d", cp); + MSVCRT_sprintf(buf+len, "%d", cp); len += strlen(buf+len); return init_category_name(buf, len, locinfo, category); @@ -507,7 +507,7 @@ static inline char* construct_lc_all(MSVCRT_pthreadlocinfo locinfo) { if(i==MSVCRT_LC_MAX) return locinfo->lc_category[MSVCRT_LC_COLLATE].locale; - sprintf(current_lc_all, + MSVCRT_sprintf(current_lc_all, "LC_COLLATE=%s;LC_CTYPE=%s;LC_MONETARY=%s;LC_NUMERIC=%s;LC_TIME=%s", locinfo->lc_category[MSVCRT_LC_COLLATE].locale, locinfo->lc_category[MSVCRT_LC_CTYPE].locale, diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 19a4da222b..eae917076f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1735,7 +1735,7 @@ char * CDECL MSVCRT__ecvt( double number, int ndigits, int *decpt, int *sign ) /* handle cases with zero ndigits or less */ prec = ndigits; if( prec < 1) prec = 2; - len = snprintf(data->efcvt_buffer, 80, "%.*le", prec - 1, number); + len = MSVCRT__snprintf(data->efcvt_buffer, 80, "%.*le", prec - 1, number); /* take the decimal "point away */ if( prec != 1) memmove( data->efcvt_buffer + 1, data->efcvt_buffer + 2, len - 1 ); @@ -1795,7 +1795,7 @@ int CDECL MSVCRT__ecvt_s( char *buffer, MSVCRT_size_t length, double number, int number = -number; } else *sign = FALSE; - len = snprintf(result, prec + 7, "%.*le", prec - 1, number); + len = MSVCRT__snprintf(result, prec + 7, "%.*le", prec - 1, number); /* take the decimal "point away */ if( prec != 1) memmove( result + 1, result + 2, len - 1 ); @@ -1837,7 +1837,7 @@ char * CDECL MSVCRT__fcvt( double number, int ndigits, int *decpt, int *sign ) number = -number; } else *sign = 0; - stop = snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); + stop = MSVCRT__snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); ptr1 = buf; ptr2 = data->efcvt_buffer; first = NULL; @@ -1920,7 +1920,7 @@ int CDECL MSVCRT__fcvt_s(char* outbuffer, MSVCRT_size_t size, double number, int number = -number; } else *sign = 0; - stop = snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); + stop = MSVCRT__snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); ptr1 = buf; ptr2 = outbuffer; first = NULL; diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 39f94b17a3..5215eff0e3 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -239,7 +239,7 @@ int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo) } if(lcid == -1) { - sprintf(bufA, format, newcp); + MSVCRT_sprintf(bufA, format, newcp); mbcinfo->mblcid = MSVCRT_locale_to_LCID(bufA, NULL, NULL); } else { mbcinfo->mblcid = lcid; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a45b82a944..3ffc785d06 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1191,6 +1191,7 @@ int __cdecl MSVCRT_strcmp(const char*, const char*); char* __cdecl MSVCRT_strstr(const char*, const char*); unsigned int __cdecl MSVCRT__get_output_format(void); char* __cdecl MSVCRT_strtok_s(char*, const char*, char**); +char* __cdecl MSVCRT__itoa(int, char*, int); double parse_double(MSVCRT_wchar_t (*)(void*), void (*)(void*), void*, MSVCRT_pthreadlocinfo, int*); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index d7f3b6f225..a5a2f5c4a1 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -282,7 +282,9 @@ static inline void FUNC_NAME(pf_rebuild_format_string)(char *p, FUNC_NAME(pf_fla if(flags->Alternate) *p++ = flags->Alternate; if(flags->Precision >= 0) { - p += sprintf(p, ".%d", flags->Precision); + *p++ = '.'; + MSVCRT__itoa(flags->Precision, p, 10); + p += strlen(p); } *p++ = flags->Format; *p++ = 0; @@ -663,11 +665,11 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API static const char ind_str[] = "nan(ind)"; static const char nan_str[] = "nan"; if(inf) - sprintf(tmp, inf_str); + memcpy(tmp, inf_str, ARRAY_SIZE(inf_str)); else if(ind) - sprintf(tmp, ind_str); + memcpy(tmp, ind_str, ARRAY_SIZE(ind_str)); else - sprintf(tmp, nan_str); + memcpy(tmp, nan_str, ARRAY_SIZE(nan_str)); if (strchr("EFG", flags.Format)) for(i=0; tmp[i]; i++) tmp[i] = MSVCRT__toupper_l(tmp[i], NULL); diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 7baf8eee8e..1e3e0d15bf 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2301,8 +2301,8 @@ int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I1 prec = 0; } - sprintf(format, "%%.%dle", prec); - sprintf(buf, format, d); + MSVCRT_sprintf(format, "%%.%dle", prec); + MSVCRT_sprintf(buf, format, d); buf[1] = buf[0]; data->pos = atoi(buf+prec+3); diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index df3e4e8cc8..69eef44654 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -331,7 +331,7 @@ static const char* get_number(struct parsed_symbol* sym) if (*sym->current != '@') return NULL; ptr = und_alloc(sym, 17); - sprintf(ptr, "%s%u", sgn ? "-" : "", ret); + MSVCRT_sprintf(ptr, "%s%u", sgn ? "-" : "", ret); sym->current++; } else return NULL;

1 0

Gijs Vermeulen : quartz/filtergraph: Add a stub IVideoFrameStep interface.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 2680b076e33747bd20dcd283f6d526b1130d079d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2680b076e33747bd20dcd283… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Jun 8 10:17:22 2020 -0500 quartz/filtergraph: Add a stub IVideoFrameStep interface. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42372 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 57 ++++++++++++++++++++++++++++++++++++++++- dlls/quartz/tests/filtergraph.c | 1 + include/axextend.idl | 13 ++++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 6217516db1..918c41a3d6 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -181,7 +181,7 @@ typedef struct _IFilterGraphImpl { /* IRegisterServiceProvider */ /* IResourceManager */ /* IServiceProvider */ - /* IVideoFrameStep */ + IVideoFrameStep IVideoFrameStep_iface; IUnknown *outer_unk; LONG ref; @@ -454,6 +454,9 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown *iface, REFIID ri } else if (IsEqualGUID(&IID_IGraphVersion, riid)) { *ppvObj = &This->IGraphVersion_iface; TRACE(" returning IGraphVersion interface (%p)\n", *ppvObj); + } else if (IsEqualGUID(&IID_IVideoFrameStep, riid)) { + *ppvObj = &This->IVideoFrameStep_iface; + TRACE(" returning IVideoFrameStep interface (%p)\n", *ppvObj); } else { *ppvObj = NULL; FIXME("unknown interface %s\n", debugstr_guid(riid)); @@ -5638,6 +5641,57 @@ static const IGraphVersionVtbl IGraphVersion_VTable = GraphVersion_QueryVersion, }; +static IFilterGraphImpl *impl_from_IVideoFrameStep(IVideoFrameStep *iface) +{ + return CONTAINING_RECORD(iface, IFilterGraphImpl, IVideoFrameStep_iface); +} + +static HRESULT WINAPI VideoFrameStep_QueryInterface(IVideoFrameStep *iface, REFIID iid, void **out) +{ + IFilterGraphImpl *graph = impl_from_IVideoFrameStep(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); +} + +static ULONG WINAPI VideoFrameStep_AddRef(IVideoFrameStep *iface) +{ + IFilterGraphImpl *graph = impl_from_IVideoFrameStep(iface); + return IUnknown_AddRef(graph->outer_unk); +} + +static ULONG WINAPI VideoFrameStep_Release(IVideoFrameStep *iface) +{ + IFilterGraphImpl *graph = impl_from_IVideoFrameStep(iface); + return IUnknown_Release(graph->outer_unk); +} + +static HRESULT WINAPI VideoFrameStep_Step(IVideoFrameStep *iface, DWORD frame_count, IUnknown *filter) +{ + FIXME("iface %p, frame_count %u, filter %p, stub!\n", iface, frame_count, filter); + return E_NOTIMPL; +} + +static HRESULT WINAPI VideoFrameStep_CanStep(IVideoFrameStep *iface, LONG multiple, IUnknown *filter) +{ + FIXME("iface %p, multiple %d, filter %p, stub!\n", iface, multiple, filter); + return E_NOTIMPL; +} + +static HRESULT WINAPI VideoFrameStep_CancelStep(IVideoFrameStep *iface) +{ + FIXME("iface %p, stub!\n", iface); + return E_NOTIMPL; +} + +static const IVideoFrameStepVtbl VideoFrameStep_vtbl = +{ + VideoFrameStep_QueryInterface, + VideoFrameStep_AddRef, + VideoFrameStep_Release, + VideoFrameStep_Step, + VideoFrameStep_CanStep, + VideoFrameStep_CancelStep +}; + static const IUnknownVtbl IInner_VTable = { FilterGraphInner_QueryInterface, @@ -5668,6 +5722,7 @@ static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL fimpl->IMediaPosition_iface.lpVtbl = &IMediaPosition_VTable; fimpl->IObjectWithSite_iface.lpVtbl = &IObjectWithSite_VTable; fimpl->IGraphVersion_iface.lpVtbl = &IGraphVersion_VTable; + fimpl->IVideoFrameStep_iface.lpVtbl = &VideoFrameStep_vtbl; fimpl->ref = 1; list_init(&fimpl->filters); list_init(&fimpl->sorted_filters); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f0aa084192..a3378efe0b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -125,6 +125,7 @@ static void test_interfaces(void) check_interface(graph, &IID_IMediaPosition, TRUE); check_interface(graph, &IID_IMediaSeeking, TRUE); check_interface(graph, &IID_IObjectWithSite, TRUE); + check_interface(graph, &IID_IVideoFrameStep, TRUE); check_interface(graph, &IID_IVideoWindow, TRUE); check_interface(graph, &IID_IBaseFilter, FALSE); diff --git a/include/axextend.idl b/include/axextend.idl index 8b46d665b5..7630ea247c 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -1471,3 +1471,16 @@ interface IAMTVTuner : IAMTuner HRESULT get_VideoFrequency([out] long *freq); HRESULT get_AudioFrequency([out] long *freq); } + +[ + local, + object, + uuid(e46a9787-2b71-444d-a4b5-1fab7b708d6a), + pointer_default(unique), +] +interface IVideoFrameStep : IUnknown +{ + HRESULT Step(DWORD frame_count, [in] IUnknown *filter); + HRESULT CanStep(long multiple, [in] IUnknown *filter); + HRESULT CancelStep(); +}

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2020