June 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : qasf: Free type libraries on process detach (Valgrind).
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: b6c96cf763b2994b9b71d8a53988749d7dea1914 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6c96cf763b2994b9b71d8a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 7 17:23:31 2020 -0500 qasf: Free type libraries on process detach (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/qasf_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/qasf/qasf_main.c b/dlls/qasf/qasf_main.c index 2e65b693fa..ac671d3919 100644 --- a/dlls/qasf/qasf_main.c +++ b/dlls/qasf/qasf_main.c @@ -108,6 +108,10 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) DisableThreadLibraryCalls(instance); qasf_instance = instance; } + else if (reason == DLL_PROCESS_DETACH && !reserved) + { + strmbase_release_typelibs(); + } return TRUE; }

1 0

Vijay Kiran Kamuju : include: Add wownt16.h.
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: 9e87c6826eb5c0fe43e52e5a0631fe7a09c6c55b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e87c6826eb5c0fe43e52e5a… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Jun 7 23:03:22 2020 +0200 include: Add wownt16.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/thunk.c | 5 +---- include/Makefile.in | 1 + include/wownt16.h | 27 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index 78925f594b..e913a08f88 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "winerror.h" #include "winternl.h" +#include "wownt16.h" #include "wownt32.h" #include "wine/winbase16.h" @@ -2402,10 +2403,6 @@ DWORD WINAPI FreeLibrary32W16( DWORD hLibModule ) return (DWORD)retv; } - -#define CPEX_DEST_STDCALL 0x00000000 -#define CPEX_DEST_CDECL 0x80000000 - /********************************************************************** * WOW_CallProc32W */ diff --git a/include/Makefile.in b/include/Makefile.in index a4563920f6..9f70e72b4c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -781,6 +781,7 @@ SOURCES = \ wmsdk.h \ wmsdkidl.idl \ wnaspi32.h \ + wownt16.h \ wownt32.h \ wpcapi.idl \ ws2def.h \ diff --git a/include/wownt16.h b/include/wownt16.h new file mode 100644 index 0000000000..d477623127 --- /dev/null +++ b/include/wownt16.h @@ -0,0 +1,27 @@ +/* + * WOW16 Generic Thunk API + * + * Copyright (C) 2020 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WOWNT16_H_ +#define _WOWNT16_H_ + +#define CPEX_DEST_STDCALL 0x00000000 +#define CPEX_DEST_CDECL 0x80000000 + +#endif /* _WOWNT16_H_ */

1 0

Zebediah Figura : quartz/tests: Avoid leaking the media type from IPin::ConnectionMediaType() (Valgrind).
by Alexandre Julliard June 8, 2020

June 8, 2020

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 : d3dcompiler/tests: Add a test for struct assignment.
by Alexandre Julliard June 8, 2020

June 8, 2020

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 : msvcrt: Reimplement %a printf format handling.
by Alexandre Julliard June 8, 2020

June 8, 2020

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 : ucrtbase: Add more inf,nan,ind printf tests.
by Alexandre Julliard June 8, 2020

June 8, 2020

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

Zebediah Figura : strmbase: Avoid leaking the media type on failure in IEnumMediaTypes::Next().
by Alexandre Julliard June 8, 2020

June 8, 2020

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

Piotr Caban : msvcrt: Reimplement special doubles printing.
by Alexandre Julliard June 8, 2020

June 8, 2020

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

Gijs Vermeulen : msado15: Ignore IRunnableObject interface in recordset/connection_QueryInterface.
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: 79228f64a04d12a611643d1a8c01e05f518a5a23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79228f64a04d12a611643d1a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Jun 7 15:51:19 2020 +0200 msado15: Ignore IRunnableObject interface in recordset/connection_QueryInterface. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 7 +++++++ dlls/msado15/recordset.c | 7 +++++++ dlls/msado15/tests/msado15.c | 6 ++++++ 3 files changed, 20 insertions(+) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 9e8c05522e..b9474e1b78 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -98,6 +98,8 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid struct connection *connection = impl_from_Connection( iface ); TRACE( "%p, %s, %p\n", connection, debugstr_guid(riid), obj ); + *obj = NULL; + if (IsEqualGUID( riid, &IID__Connection ) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { @@ -111,6 +113,11 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid { *obj = &connection->IConnectionPointContainer_iface; } + else if (IsEqualGUID( riid, &IID_IRunnableObject )) + { + TRACE("IID_IRunnableObject not supported returning NULL\n"); + return E_NOINTERFACE; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index ffb3788531..a5096e5c4f 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -784,6 +784,8 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, struct recordset *recordset = impl_from_Recordset( iface ); TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + *obj = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID__ADO) || IsEqualIID(riid, &IID_Recordset15) || IsEqualIID(riid, &IID_Recordset20) || IsEqualIID(riid, &IID_Recordset21) || @@ -795,6 +797,11 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, { *obj = &recordset->ISupportErrorInfo_iface; } + else if (IsEqualGUID( riid, &IID_IRunnableObject )) + { + TRACE("IID_IRunnableObject not supported returning NULL\n"); + return E_NOINTERFACE; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index a8d2afdd41..1d457a703d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -61,6 +61,7 @@ static LONG get_refs_recordset( _Recordset *recordset ) static void test_Recordset(void) { _Recordset *recordset; + IRunnableObject *runtime; ISupportErrorInfo *errorinfo; Fields *fields, *fields2; Field *field; @@ -73,6 +74,10 @@ static void test_Recordset(void) hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Recordset_QueryInterface( recordset, &IID_IRunnableObject, (void**)&runtime); + ok(hr == E_NOINTERFACE, "Unexpected IRunnableObject interface\n"); + ok(runtime == NULL, "expected NULL\n"); + /* _Recordset object supports ISupportErrorInfo */ errorinfo = NULL; hr = _Recordset_QueryInterface( recordset, &IID_ISupportErrorInfo, (void **)&errorinfo ); @@ -676,6 +681,7 @@ static void test_Connection(void) hr = _Connection_QueryInterface(connection, &IID_IRunnableObject, (void**)&runtime); ok(hr == E_NOINTERFACE, "Unexpected IRunnableObject interface\n"); + ok(runtime == NULL, "expected NULL\n"); hr = _Connection_QueryInterface(connection, &IID_ISupportErrorInfo, (void**)&errorinfo); ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n");

1 0

Alexandre Julliard : kernel32/tests: Avoid some more compiler warning for HeapAlloc() invalid parameter tests.
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: 20a9ec6c4f95be000766edf5e4b2f468ccbca5d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20a9ec6c4f95be000766edf5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 8 14:17:56 2020 +0200 kernel32/tests: Avoid some more compiler warning for HeapAlloc() invalid parameter tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index bc57498bf9..fa372b14e2 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -38,6 +38,9 @@ #define HEAP_VALIDATE_ALL 0x20000000 #define HEAP_VALIDATE_PARAMS 0x40000000 +/* use function pointers to avoid warnings for invalid parameter tests */ +static LPVOID (WINAPI *pHeapAlloc)(HANDLE,DWORD,SIZE_T); +static LPVOID (WINAPI *pHeapReAlloc)(HANDLE,DWORD,LPVOID,SIZE_T); static BOOL (WINAPI *pHeapQueryInformation)(HANDLE, HEAP_INFORMATION_CLASS, PVOID, SIZE_T, PSIZE_T); static BOOL (WINAPI *pGetPhysicallyInstalledSystemMemory)(ULONGLONG *); static ULONG (WINAPI *pRtlGetNtGlobalFlags)(void); @@ -89,12 +92,6 @@ static void test_heap(void) HGLOBAL hsecond; SIZE_T size, size2; const SIZE_T max_size = 1024, init_size = 10; - /* use function pointers to avoid warnings for invalid parameter tests */ - LPVOID (WINAPI *pHeapAlloc)(HANDLE,DWORD,SIZE_T); - LPVOID (WINAPI *pHeapReAlloc)(HANDLE,DWORD,LPVOID,SIZE_T); - - pHeapAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapAlloc" ); - pHeapReAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapReAlloc" ); /* Heap*() functions */ mem = HeapAlloc(GetProcessHeap(), 0, 0); @@ -941,7 +938,7 @@ static void test_heap_checks( DWORD flags ) ret = HeapFree( GetProcessHeap(), 0, p ); ok( ret, "HeapFree failed\n" ); - p = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 17 ); + p = pHeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 17 ); ok( p != NULL, "HeapAlloc failed\n" ); old = p[17]; p[17] = 0xcc; @@ -1006,7 +1003,7 @@ static void test_heap_checks( DWORD flags ) /* now test large blocks */ - p = HeapAlloc( GetProcessHeap(), 0, large_size ); + p = pHeapAlloc( GetProcessHeap(), 0, large_size ); ok( p != NULL, "HeapAlloc failed\n" ); ret = HeapValidate( GetProcessHeap(), 0, p ); @@ -1221,6 +1218,9 @@ START_TEST(heap) int argc; char **argv; + pHeapAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapAlloc" ); + pHeapReAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapReAlloc" ); + pRtlGetNtGlobalFlags = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "RtlGetNtGlobalFlags" ); argc = winetest_get_mainargs( &argv );

1 0