September 2017 - Wine-devel

Re: [PATCH] gdi32: Pick first charmap if none was selected using preferred encoding
by Huw Davies 25 Sep '17

25 Sep '17

On Mon, Sep 25, 2017 at 02:21:02PM +0300, Nikolay Sivov wrote: > FreeType 2.8.1 has similar logic removed from WinFNT module, > that always pre-selected first charmap. > > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > > For https://bugs.winehq.org/show_bug.cgi?id=43715 > > dlls/gdi32/freetype.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c > index 13edef6601..bf566f382c 100644 > --- a/dlls/gdi32/freetype.c > +++ b/dlls/gdi32/freetype.c > @@ -5150,6 +5150,10 @@ static FT_Encoding pick_charmap( FT_Face face, int charset ) > if (select_charmap( face, *encs )) break; > encs++; > } > + > + if (!face->charmap && face->num_charmaps) > + face->charmap = face->charmaps[0]; > + Manipulating face->charmap directly doesn't look right, you probably want to use FT_Set_Charmap(). Huw.

1 0

Re: [PATCH 1/2] msvcrt: Introduce vfprintf helper function.
by Piotr Caban 25 Sep '17

25 Sep '17

Hi, On 09/25/17 01:24, Gijs Vermeulen wrote: > -int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, __ms_va_list valist) > +static int vfprintf_helper(MSVCRT_FILE* file, const char *format, __ms_va_list valist, > + MSVCRT__locale_t locale, BOOL secure) > { > BOOL tmp_buf; > int ret; > > + if(secure) > + if(!MSVCRT_CHECK_PMT(file != NULL)) return -1; > + > MSVCRT__lock_file(file); > tmp_buf = add_std_buffer(file); > - ret = pf_printf_a(puts_clbk_file_a, file, format, NULL, 0, arg_clbk_valist, NULL, &valist); > + > + if(!secure) > + ret = pf_printf_a(puts_clbk_file_a, file, format, NULL, 0, arg_clbk_valist, NULL, &valist); > + else > + { > + if(!locale) > + ret = pf_printf_a(puts_clbk_file_a, file, format, NULL, > + MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, arg_clbk_valist, NULL, &valist); > + else > + ret = pf_printf_a(puts_clbk_file_a, file, format, locale, 0, arg_clbk_valist, NULL, &valist); > + } > + > if(tmp_buf) remove_std_buffer(file); > MSVCRT__unlock_file(file); > > return ret; > } This helper changes current functions behavior. Thanks, Piotr

1 0

Re: [v2 PATCH] msvcrt: Impement clearerr_s
by Piotr Caban 25 Sep '17

25 Sep '17

Hi Alistair, On 09/22/17 11:50, Alistair Leslie-Hughes wrote: > +int CDECL MSVCRT_clearerr_s(MSVCRT_FILE* file) > +{ > + TRACE(":file (%p) fd (%d)\n",file,file->_file); > + > + if (!MSVCRT_CHECK_PMT(file != NULL)) return MSVCRT_EINVAL; You're checking if file != NULL after using it in TRACE message. Thanks, Piotr

1 0

Re: [PATCH 1/2] include: Added stgprop.h
by Dmitry Timoshkov 25 Sep '17

25 Sep '17

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > include/ntquery.h | 25 +------------------------ > include/stgprop.h | 43 +++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 44 insertions(+), 24 deletions(-) > create mode 100644 include/stgprop.h > --- /dev/null > +++ b/include/stgprop.h > @@ -0,0 +1,43 @@ > +/* > + * Copyright 2017 Nikolay Sivov Shouldn't you convey the copyright information from ntquery.h? -- Dmitry.

1 0

Re: [v6 4/5] server: all objects must have a SD
by Jacek Caban 22 Sep '17

22 Sep '17

Hi Jonathan, If you're changing behaviour of about all objects, it needs tests for more object types first. Jacek

2 1

Re: Fabian Maurer : evr/tests: Add tests.
by Fabian Maurer 22 Sep '17

22 Sep '17

On Donnerstag, 21. September 2017 22:01:00 CEST Alexandre Julliard wrote: > Module: wine > Branch: master > Commit: 98923665105334ca6aaf39a756b62da606ecc861 > URL: > http://source.winehq.org/git/wine.git/?a=commit;h=98923665105334ca6aaf39a75 > 6b62da606ecc861 > > Author: Fabian Maurer <dark.shadow4(a)web.de> > Date: Wed Sep 20 14:03:36 2017 +0200 > > evr/tests: Add tests. > > Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> > Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Wasn't this rejected? Regards, Fabian Maurer

2 2

Re: vbscript: Improve parsing of separators in loops and switches.
by Jacek Caban 22 Sep '17

22 Sep '17

Hi Dmitry, Thanks for the patch, it generally looks good. I have a few comments bellow. On 20.09.2017 05:48, Dmitry Kislyuk wrote: > > +StSeps > + : StSep > + | StSep StSeps Since you're changing all uses of StSep, I think it would make more sense to change StSep itself to accept multiple separator. > x = 0 > -Do While x < 2 : x = x + 1 > +Do While x < 2 : > +x = x + 1 > Loop > Call ok(x = 2, "x not equal to 2") Please don't change existing tests like that. We want previous version tested as well. Add new ones instead. > @@ -511,7 +533,8 @@ Call collectionObj.reset() > y = 0 > x = 10 > z = 0 > -for each x in collectionObj : z = z + 2 > +for each x in collectionObj : > + :z = z + 2 Same here. Thanks, Jacek

1 0

Re: [PATCH 1/7] include: Convert dxgitype.h to IDL.
by Alistair Leslie-Hughes 22 Sep '17

22 Sep '17

Hi Henri, On 22/09/17 06:29, Henri Verbeet wrote: > Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> > --- > include/dxgi.idl | 2 +- > include/{dxgitype.h => dxgitype.idl} | 83 ++++++++++++++++++++---------------- You forgot to update the Makefile.in to reflect the name change. (same goes for rest of the patchset) Best Regards Alistair.

2 1

Re: [PATCH] msvcrt: Implement clearerr_s
by Nikolay Sivov 22 Sep '17

22 Sep '17

Docs say it should invoke invalid parameter handler and set error number.

1 0

Re: [PATCH v2 3/3] wined3d: Advertise AUTOGENMIPMAP only for renderable and filterable formats.
by Henri Verbeet 21 Sep '17

21 Sep '17

On 21 September 2017 at 01:07, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + || (format->flags[gl_type] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING)) > + != (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING))) As an aside, that could also be written as "~format->flags[gl_type] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING)"

1 0