January 2017 - Wine-Devel - list.winehq.org

Re: [PATCH v2 1/2] user32: SetSysColors updates brushes from GetSysColorBrush and add test
by Marvin Jan. 14, 2017

Jan. 14, 2017

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=27774 Your paranoid android. === w8 (32 bit sysparams) === sysparams.c:2485: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2496: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w864 (32 bit sysparams) === sysparams.c:259: SPI_SETSCREENSAVETIMEOUT failed for reason: 329. Indicating test failure and skipping remainder of test sysparams.c:260: Test failed: SystemParametersInfoA: rc=0 err=329 sysparams.c:260: Test failed: SystemParametersInfoA: rc=0 err=329 sysparams.c:2485: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2496: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

1 0

Re: [PATCH 1/2] user32: SetSysColors updates brushes from GetSysColorBrush and add test
by Nikolay Sivov Jan. 14, 2017

Jan. 14, 2017

On 14.01.2017 22:33, Fabian Maurer wrote: > Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> > --- > dlls/gdi32/gdi32.spec | 2 ++ > dlls/gdi32/gdiobj.c | 12 ++++++++++++ > dlls/user32/sysparams.c | 23 +++++++++++++++++------ > dlls/user32/tests/sysparams.c | 16 ++++++++++++++++ > include/wine/gdi_driver.h | 2 ++ > 5 files changed, 49 insertions(+), 6 deletions(-) > > diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec > index 7792731b9e..f9c3fb9293 100644 > --- a/dlls/gdi32/gdi32.spec > +++ b/dlls/gdi32/gdi32.spec > @@ -518,6 +518,8 @@ > # GDI objects > @ cdecl __wine_make_gdi_object_system(long long) > @ cdecl __wine_set_visible_region(long long ptr ptr ptr) > +@ cdecl __wine_GDI_ReleaseObj(ptr) > +@ cdecl __wine_GDI_GetObjPtr(ptr long) > > # Graphics drivers > @ cdecl __wine_set_display_driver(long) > diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c > index 46b2241945..aa2ced1025 100644 > --- a/dlls/gdi32/gdiobj.c > +++ b/dlls/gdi32/gdiobj.c > @@ -880,6 +880,18 @@ void GDI_ReleaseObj( HGDIOBJ handle ) > LeaveCriticalSection( &gdi_section ); > } > > +/* Exports for user32, we need to be able to manipulate GDI objects where the official API doesn't allow us */ > + > +void* CDECL __wine_GDI_GetObjPtr( HGDIOBJ handle, WORD type ) > +{ > + return GDI_GetObjPtr( handle, type ); > +} > + > +void CDECL __wine_GDI_ReleaseObj( HGDIOBJ handle ) > +{ > + GDI_ReleaseObj( handle ); > +} > + > This is too much. If you only need to update object property while keeping same handle, you only need one additional call like __wine_set_gdi_object_color(), that should work for both brushes and pens, checking if it's a system object too, as an additional precaution. > +static void set_syscolors_gdi( INT index, COLORREF color ) > +{ > + HBRUSH brush = system_colors[index].brush; > + LOGBRUSH *brush_info; > + > + if(brush) > + { > + /* Since LOGBRUSH is the first member in BRUSHOBJ we just do a cast here */ > + brush_info = __wine_GDI_GetObjPtr( brush, OBJ_BRUSH ); > + if(brush_info->lbColor != color) > + brush_info->lbColor = color; > + __wine_GDI_ReleaseObj( brush ); > + } > +} > This looks very dirty.

2 1

Re: [PATCH 1/2] user32: SetSysColors updates brushes from GetSysColorBrush and add test
by Marvin Jan. 14, 2017

Jan. 14, 2017

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=27773 Your paranoid android. === w8 (32 bit sysparams) === sysparams.c:2485: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2496: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w864 (32 bit sysparams) === sysparams.c:259: SPI_SETSCREENSAVETIMEOUT failed for reason: 329. Indicating test failure and skipping remainder of test sysparams.c:260: Test failed: SystemParametersInfoA: rc=0 err=329 sysparams.c:260: Test failed: SystemParametersInfoA: rc=0 err=329 sysparams.c:2485: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2496: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

1 0

Re: [PATCH 2/3] winemac: Export HTML Format clipboard data to the public.html pasteboard type.
by Sebastian Lackner Jan. 13, 2017

Jan. 13, 2017

On 13.01.2017 20:36, Ken Thomases wrote: > Signed-off-by: Ken Thomases <ken(a)codeweavers.com> > --- > dlls/winemac.drv/clipboard.c | 68 +++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 67 insertions(+), 1 deletion(-) > > diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c > index fdd1110..49a3ed3 100644 > --- a/dlls/winemac.drv/clipboard.c > +++ b/dlls/winemac.drv/clipboard.c > @@ -82,6 +82,7 @@ static CFDataRef export_bitmap_to_bmp(HANDLE data); > static CFDataRef export_dib_to_bmp(HANDLE data); > static CFDataRef export_enhmetafile(HANDLE data); > static CFDataRef export_hdrop_to_filenames(HANDLE data); > +static CFDataRef export_html(HANDLE data); > static CFDataRef export_metafilepict(HANDLE data); > static CFDataRef export_text_to_utf8(HANDLE data); > static CFDataRef export_unicodetext_to_utf8(HANDLE data); > @@ -186,7 +187,7 @@ static const struct > { wszJFIF, CFSTR("public.jpeg"), import_clipboard_data, export_clipboard_data }, > { wszPNG, CFSTR("public.png"), import_clipboard_data, export_clipboard_data }, > { wszHTMLFormat, NULL, import_clipboard_data, export_clipboard_data }, > - { wszHTMLFormat, CFSTR("public.html"), import_html, NULL, TRUE }, > + { wszHTMLFormat, CFSTR("public.html"), import_html, export_html, TRUE }, > { CFSTR_SHELLURLW, CFSTR("public.url"), import_utf8_to_text, export_text_to_utf8 }, > }; > > @@ -522,6 +523,28 @@ static HANDLE create_bitmap_from_dib(HANDLE dib) > > > /************************************************************************** > + * get_html_description_field > + * > + * Find the value of a field in an HTML Format description. > + */ > +static const char* get_html_description_field(const char* data, const char* keyword) > +{ > + const char* pos = data; > + > + while (pos && *pos && *pos != '<') > + { > + if (memcmp(pos, keyword, strlen(keyword)) == 0) Its not safe to use memcmp, it could read past the terminating \0 of data. > + return pos + strlen(keyword); > + > + pos = strchr(pos, '\n'); > + if (pos) pos++; > + } > + > + return NULL; > +} > + > + > +/************************************************************************** > * import_clipboard_data > * > * Generic import clipboard data routine. > @@ -1141,6 +1164,49 @@ done: > > > /************************************************************************** > + * export_html > + * > + * Export HTML Format to public.html data. > + * > + * FIXME: We should attempt to add an <a base> tag and convert windows paths. > + */ > +static CFDataRef export_html(HANDLE handle) > +{ > + CFDataRef ret; > + const char *data, *field_value; > + int fragmentstart, fragmentend; > + > + data = GlobalLock(handle); > + > + /* read the important fields */ > + field_value = get_html_description_field(data, "StartFragment:"); > + if (!field_value) > + { > + ERR("Couldn't find StartFragment value\n"); > + goto failed; > + } > + fragmentstart = atoi(field_value); > + > + field_value = get_html_description_field(data, "EndFragment:"); > + if (!field_value) > + { > + ERR("Couldn't find EndFragment value\n"); > + goto failed; > + } > + fragmentend = atoi(field_value); > + > + /* export only the fragment */ > + ret = CFDataCreate(NULL, (const UInt8*)&data[fragmentstart], fragmentend - fragmentstart); Some validation of those offsets wouldn't hurt. > + GlobalUnlock(handle); > + return ret; > + > +failed: > + GlobalUnlock(handle); > + return NULL; > +} > + > + > +/************************************************************************** > * export_metafilepict > * > * Export a metafile to data. >

2 1

Re: [PATCH 03/12] d3d8: Return D3D_OK from UnlockRect() for not locked textures.
by Henri Verbeet Jan. 13, 2017

Jan. 13, 2017

On 13 January 2017 at 12:53, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > > Fixes bug 19862 > https://bugs.winehq.org/show_bug.cgi?id=19862 > Strictly speaking that's not a regression, but I'm willing to risk it.

1 0

Re: [PATCH] wined3d: Add Iris Haswell PCI ids and descriptions
by André Hentschel Jan. 13, 2017

Jan. 13, 2017

Am 13.01.2017 um 06:42 schrieb Michael Cronenworth: > --- > dlls/wined3d/directx.c | 11 +++++++++++ > dlls/wined3d/wined3d_private.h | 9 +++++++++ > 2 files changed, 20 insertions(+) > Hi, you forgot to sign off your patch

2 1

Re: [PATCH 03/12] d3d8: Return D3D_OK from UnlockRect() for not locked textures.
by Bruno Jesus Jan. 13, 2017

Jan. 13, 2017

On Fri, Jan 13, 2017 at 9:53 AM, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > > Fixes bug 19862 > https://bugs.winehq.org/show_bug.cgi?id=19862 Most likely also fixes https://bugs.winehq.org/show_bug.cgi?id=28874

1 0

Re: [PATCH 09/12] d3d9/tets: Remove redundant state setting calls.
by Józef Kucia Jan. 13, 2017

Jan. 13, 2017

On Fri, Jan 13, 2017 at 12:53 PM, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > dlls/d3d9/tests/visual.c | 81 ------------------------------------------------ > 1 file changed, 81 deletions(-) There is a typo in the subject prefix. It should read "d3d9/tests:".

1 0

Re: [tools] patches: Say "translation files" instead of "resource files".
by Henri Verbeet Jan. 13, 2017

Jan. 13, 2017

On 13 January 2017 at 05:47, Alex Henrie <alexhenrie24(a)gmail.com> wrote: > @@ -69,7 +69,7 @@ my @legend = > [ "formatting", "<ul><li>The patch author's full name, email address, or Signed-off-by headers are incorrect or missing.</li>" . > "<li>Whitespace got mangled in transit.</li>" . > "<li>Indentation is messed up (usually from editing with a non-standard tab size).</li>" . > - "<li>8-bit chars got mangled in transit (usually when sending patches to resource files).</li>" . > + "<li>8-bit chars got mangled in transit (usually when sending patches to translation files).</li>" . I guess this is fine, and not to make too much of a point of it, but this might as well read "usually when not using git send-email".

1 0

Re: [PATCH v3] ws2_32:Succeed IPV6_V6ONLY setsockopt for AF_INET sockets ignoring it
by Dmitry Timoshkov Jan. 12, 2017

Jan. 12, 2017

Anton Romanov <theli.ua(a)gmail.com> wrote: > +todo_wine { > + enabled = 2; > + ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); > + ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); > + ok(enabled == 1, "expected 1, got %d\n", enabled); > +} The 'todo_wine' statements should be added only around ok() call that will fail otherwise. This applies for other places in the patch as well. -- Dmitry.

2 4