October 2015 - Wine-devel - list.winehq.org

Re: [PATCH 1/3] msvcp120: implement _Thrd_sleep/yield
by Marvin 29 Oct '15

29 Oct '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17815 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/3] wined3d: Cleanup extension check for shader model 4 support.
by Henri Verbeet 29 Oct '15

29 Oct '15

On 28 October 2015 at 22:27, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > - if (gl_info->supported[EXT_GPU_SHADER4] && gl_info->supported[ARB_SHADER_BIT_ENCODING] > - && gl_info->supported[ARB_GEOMETRY_SHADER4] && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) > - && gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && gl_info->supported[ARB_DRAW_INSTANCED] > - && gl_info->supported[ARB_TEXTURE_RG] && gl_info->supported[ARB_SAMPLER_OBJECTS]) > + if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[ARB_SHADER_BIT_ENCODING] > + && gl_info->supported[ARB_SAMPLER_OBJECTS]) Dropping EXT_gpu_shader4 is fine. Does GLSL 1.50 imply all the other extensions you're dropping here? They're not strictly required for compiling SM4 shaders, but they are for d3d10+ features like e.g. geometry shaders and instanced draws.

2 1

Re: [PATCH 6/6] kernel32/tests: Add tests for GetConsoleFontSize (v2, resend)
by Marvin 29 Oct '15

29 Oct '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17811 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1445: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2359244 console.c:1689: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1689: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2359244 === w864 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2686924 console.c:1445: Test failed: [15] Expected output count to be 0, got 2686924 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2686924 console.c:1689: Test failed: [13] Expected output count to be 0, got 2686924 console.c:1689: Test failed: [15] Expected output count to be 0, got 2686924 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2686924 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 2752460 console.c:1445: Test failed: [15] Expected output count to be 0, got 2752460 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2752460 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 2752460 console.c:1689: Test failed: [15] Expected output count to be 0, got 2752460 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2752460 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

1 0

Re: [PATCH 1/6] wineconsole: Add if check to determine whether a font attribute has changed (v2)
by Dmitry Timoshkov 29 Oct '15

29 Oct '15

Hugh McMaster <hugh.mcmaster(a)outlook.com> wrote: > + if (strcmpW(data->curcfg.face_name, cfg->face_name) || data->curcfg.cell_width != cfg->cell_width || > + data->curcfg.cell_height != cfg->cell_height || data->curcfg.font_weight != cfg->font_weight) > { > data->fnSetFont(data, cfg->face_name, cfg->cell_height, cfg->font_weight); > } Font names should be tested using a case insensitive check. -- Dmitry.

2 2

Re: [PATCH 6/6] kernel32/tests: Add tests for GetConsoleFontSize (v2, resend)
by Marvin 29 Oct '15

29 Oct '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17809 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1445: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2359244 console.c:1689: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1689: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2359244 === w864 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2686924 console.c:1445: Test failed: [15] Expected output count to be 0, got 2686924 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2686924 console.c:1689: Test failed: [13] Expected output count to be 0, got 2686924 console.c:1689: Test failed: [15] Expected output count to be 0, got 2686924 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2686924 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 2752460 console.c:1445: Test failed: [15] Expected output count to be 0, got 2752460 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2752460 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 2752460 console.c:1689: Test failed: [15] Expected output count to be 0, got 2752460 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2752460 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

2 1

Re: [PATCH] ucrtbase: Implement vsscanf
by Piotr Caban 29 Oct '15

29 Oct '15

On 10/28/15 09:54, Martin Storsjo wrote: > +/********************************************************************* > + * _snscanf_s_l (MSVCRT.@) > + */ > +int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, const char *input, MSVCRT_size_t length, const char *format, MSVCRT__locale_t locale, __ms_va_list valist) > +{ > + return MSVCRT_vsnscanf_l(input, length, format, locale, valist); > +} Shouldn't this function also print some message about ignored options argument? Thanks, Piotr

2 3

Re: [PATCH] shell32: Stop memory leak (valgrind)
by Nikolay Sivov 29 Oct '15

29 Oct '15

On 29.10.2015 12:21, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/shell32/shellitem.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c > index f64c2d0..799c6c0 100644 > --- a/dlls/shell32/shellitem.c > +++ b/dlls/shell32/shellitem.c > @@ -1198,7 +1198,10 @@ HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, > { > ret = create_shellitemarray(array, cidl, ppsiItemArray); > if(SUCCEEDED(ret)) > + { > + HeapFree(GetProcessHeap(), 0, array); > return ret; > + } > } > > /* Something failed, clean up. */ > There is another place with same problem, I just sent a complete fix.

1 0

Re: [PATCH 1/6] wineconsole: Add if check to determine whether a font attribute has changed
by Sebastian Lackner 29 Oct '15

29 Oct '15

On 28.10.2015 09:40, Hugh McMaster wrote: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > programs/wineconsole/wineconsole.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c > index e1ee55b..c8e68c1 100644 > --- a/programs/wineconsole/wineconsole.c > +++ b/programs/wineconsole/wineconsole.c > @@ -421,7 +421,8 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf > } > data->curcfg.menu_mask = cfg->menu_mask; > data->curcfg.quick_edit = cfg->quick_edit; > - if (1 /* FIXME: font info has changed */) > + if (data->curcfg.face_name != cfg->face_name || data->curcfg.cell_width != cfg->cell_width || > + data->curcfg.cell_height != cfg->cell_height || data->curcfg.font_weight != cfg->font_weight) > { > data->fnSetFont(data, cfg->face_name, cfg->cell_height, cfg->font_weight); > } > It doesn't make sense to compare face_name pointer, this condition will always be true.

2 1

Re: [3/4] gdiplus: Use helper function for HeapReAlloc calls.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Sebastian Lackner <sebastian(a)fds-team.de> writes: > @@ -420,12 +420,10 @@ BOOL lengthen_path(GpPath *path, INT len) > while(path->datalen - path->pathdata.Count < len) > path->datalen *= 2; > > - path->pathdata.Points = HeapReAlloc(GetProcessHeap(), 0, > - path->pathdata.Points, path->datalen * sizeof(PointF)); > + path->pathdata.Points = heap_realloc(path->pathdata.Points, path->datalen * sizeof(PointF)); > if(!path->pathdata.Points) return FALSE; > > - path->pathdata.Types = HeapReAlloc(GetProcessHeap(), 0, > - path->pathdata.Types, path->datalen); > + path->pathdata.Types = heap_realloc(path->pathdata.Types, path->datalen); > if(!path->pathdata.Types) return FALSE; > } It's not directly related to your change, but as a follow-up patch, it would be nice to fix this to correctly handle allocation failures. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 1/2] wined3d: make wined3d_device_copy_sub_resource_region return an error code
by Stefan Dösinger 28 Oct '15

28 Oct '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2015-10-28 um 15:31 schrieb Riccardo Bortolato: > - if (src_resource->type != dst_resource->type) > - { > - WARN("Resource types (%s / %s) don't match.\n", > - debug_d3dresourcetype(dst_resource->type), > - debug_d3dresourcetype(src_resource->type)); > - return; > + return WINED3DERR_INVALIDCALL; > } This seems like something that should be its own patch. Did you check if a 2D texture -> cube texture copy works, both on Windows (are we required to support it) and in the current implementation? > - if (dst_resource->type != WINED3D_RTYPE_TEXTURE) > + if (dst_resource->type == WINED3D_RTYPE_VOLUME_TEXTURE > + || src_resource->type == WINED3D_RTYPE_VOLUME_TEXTURE) > { I guess your intention is to avoid having a type == TEXTURE || type == CUBE_TEXTURE kind of construct, but technically you'd also have to check for WINED3D_RTYPE_BUFFER. I'd prefer whitelisting known good resource types. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWMOWUAAoJEN0/YqbEcdMwwIsP/3MU73JRdCfxlLTwi7XANeoB w43lxvtcF1N/ZqCsTaGcXB0cln121cDeg5mlSeT4AQMIgc0glOTIKDRRKQ4RMpeE YtXtc9uWp+2oqJ1oXJchCnYEfbdAlNUqqWrgOO1o/4YmknHTjLI4lR5Xore/YFlG pVT9pzrQzK/FFNkJV7mJaW1Vya2jtHxzGt1v/PiDYPjOUo6hODj7L1razouvf5wS xrZAU3SfnlrRZ+SyEWnSQehniN6CH0Nn1Gp7YsThIvSS8KH5kuAtfTY0UGtda/DU 8cb2jJZ3EevrQFIr+kC7Y0EDvMSdjf2dYo1eOc10AYjeF+4cYOTbo+v+n/wkPdy+ 2leDdfggxl8ynb1NzvqoBuZArhyj2lvEG3LBloNOWczAwR1dc/RXpUO84zpLPVLS H9KGyFx5atJUJHvqA8AexRTPAHJ6I8hI8mXEatQwbfGNLd6Erq/tfcKJzAB9SQeE XTE9GkGMP+D8bAp88AwTPDznVva3KxLpHlEK4KS6XPJZRw5JxvaxOz1zLilXNwLu GdCwauQlYTtxg+fJFKWw85udF/tvXw6nF+MkK4xrs37D08kf98GPXnFln1NPCLvd aPQutjmZlLehLcbk3GmFFEuRy2D8vt48nfCltfMIXe03sql+GiNK8SqnQ151+as2 u1oVePmmJt89kdM+hQk/ =gsHT -----END PGP SIGNATURE-----

2 1