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

Re: [PATCH 1/9 v3] gdiplus: Add partial support for GdipDrawImagePointsRect on metafile

by Dmitry Timoshkov

Piotr Caban <piotr(a)codeweavers.com> wrote: > +static GpStatus METAFILE_CreateCompressedImageStream(GpImage *image, IStream **stream, DWORD *size) > +{ > + static const CLSID png_clsid = { 0x557cf406, 0x1a04, 0x11d3, > + { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } }; > + LARGE_INTEGER zero; > + STATSTG statstg; > + GpStatus stat; > + HRESULT hr; > + > + *size = 0; > + > + hr = CreateStreamOnHGlobal(NULL, TRUE, stream); > + if (FAILED(hr)) return hresult_to_status(hr); > + > + stat = GdipSaveImageToStream(image, *stream, &png_clsid, NULL); Even internally gdiplus shouldn't do this kind of hacks IMO, if there is a need for a shortcut for a particular encoder class id it's better to add a helper. Have a look at the encoder/decoder tests how it's supposed to look like. -- Dmitry.

June 30, 2017

Re: [PATCH 3/9 v3] gdiplus: Add support for ImageAttributes when drawing image to metafile

by Dmitry Timoshkov

Piotr Caban <piotr(a)codeweavers.com> wrote: > @@ -259,7 +278,7 @@ static DWORD METAFILE_AddObjectId(GpMetafile *metafile) > id = 0; > for (i=1; i<sizeof(metafile->objects_table)/sizeof(metafile->objects_table[0]); i++) > { > - if (metafile->objects_table[id] < metafile->objects_table[i]) > + if (metafile->objects_table[id] > metafile->objects_table[i]) This looks strange to change this right in the next patch. -- Dmitry.

June 30, 2017

Re: [PATCH 3/4 v2] gdiplus: Add partial support for GdipDrawImagePointsRect on metafile

by Vincent Povirk

+ draw_image_record->SrcRect.Width = units_to_pixels(srcwidth, srcUnit, metafile->image.xres);; + draw_image_record->SrcRect.Height = units_to_pixels(srcheight, srcUnit, metafile->image.yres);; One semicolon is probably enough. I think we should put a little more effort into object management up front. I would start it by having the Add*Object functions return an id to the caller, and adding a ReleaseObjects function to indicate that the current objects are no longer needed. For now, we could just implement this as a counter that we reset to 0.

June 29, 2017

Re: [PATCH 3/4] gdiplus: Add partial support for GdipDrawImagePointsRect on metafile

by Piotr Caban

On 06/29/17 18:21, Vincent Povirk wrote: > On Thu, Jun 29, 2017 at 5:49 AM, Piotr Caban <piotr.caban(a)gmail.com> wrote: >> I've done some basic tests and EmfPlusImage record is used for texture >> brushes. In my brush test image was stored in PNG format. I've moved the >> code to separate functions so it can be reused later. > > OK, I must be missing something in the spec that makes this possible, > or the spec is wrong. In that case, I'll review the earlier version. > I guess you misunderstood me - the PNG is stored in EmfPlusImage that is not stored inside EmfPlusObject. This means that the code can be reused for brush texture implementation. I think this makes v2 attempt better. Thanks, Piotr

June 29, 2017

Re: [PATCH] libs/wine: Use Windows collation when sorting and comparing strings

by Alexandre Julliard

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > This patch fixes bugs 10767 and 32490, amongst other bugs. > It also fixes subkey sorting issues in regedit's treeview control. > > From: Dmitry Timoshkov <dtimoshkov(a)codeweavers.com> > > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > dlls/kernel32/tests/locale.c | 9 +++---- > libs/wine/collation.c | 60 ++++++++++++++++++++++---------------------- > 2 files changed, 34 insertions(+), 35 deletions(-) That's a generated file, changes would have to be made in the generating script instead (tools/make_unicode). -- Alexandre Julliard julliard(a)winehq.org

June 29, 2017

Re: [PATCH] msi: Fix a buffer overrun.

by Austin English

On Thu, Jun 29, 2017 at 12:09 AM, Zebediah Figura <z.figura12(a)gmail.com> wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=43257 > > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/msi/package.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/dlls/msi/package.c b/dlls/msi/package.c > index bf6ae10..3a75a1c 100644 > --- a/dlls/msi/package.c > +++ b/dlls/msi/package.c > @@ -1812,17 +1812,17 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC > { > WCHAR template_s[1024]; > WCHAR *template_rec, *template; > - DWORD length; > > LoadStringW(msi_hInstance, IDS_INFO, template_s, 1024); > > - res = MSI_RecordGetStringW(record, 0, NULL, &length); > + res = MSI_RecordGetStringW(record, 0, NULL, &len); > if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) > return res; > len++; > template_rec = msi_alloc(len * sizeof(WCHAR)); > if (!template_rec) return ERROR_OUTOFMEMORY; > - MSI_RecordGetStringW(record, 0, template_rec, &length); > + MSI_RecordGetStringW(record, 0, template_rec, &len); > + len++; > > template = msi_alloc((len + strlenW(template_s)) * sizeof(WCHAR)); > if (!template) return ERROR_OUTOFMEMORY; > -- > 2.7.4 > > > Works for me, thanks. -- -Austin GPG: 14FB D7EA A041 937B

June 29, 2017

Re: [PATCH 3/4] gdiplus: Add partial support for GdipDrawImagePointsRect on metafile

by Vincent Povirk

On Thu, Jun 29, 2017 at 5:49 AM, Piotr Caban <piotr.caban(a)gmail.com> wrote: > I've done some basic tests and EmfPlusImage record is used for texture > brushes. In my brush test image was stored in PNG format. I've moved the > code to separate functions so it can be reused later. OK, I must be missing something in the spec that makes this possible, or the spec is wrong. In that case, I'll review the earlier version.

June 29, 2017

Re: [PATCH 3/4] gdiplus: Add partial support for GdipDrawImagePointsRect on metafile

by Piotr Caban

On 06/28/17 21:07, Vincent Povirk wrote: > I don't fully understand the spec, so I could be wrong about this, but > I think for texture brushes we'll need the ability to create an > EmfPlusImage structure without an EmfPlusObject record. I've done some basic tests and EmfPlusImage record is used for texture brushes. In my brush test image was stored in PNG format. I've moved the code to separate functions so it can be reused later. Thanks, Piotr

June 29, 2017

Re: [PATCH 1/6] include: Support wine_dbgstr_longlong in tests

by Michael Stefaniuc

Hello Alistair, On 06/29/2017 02:43 AM, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > include/wine/test.h | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/include/wine/test.h b/include/wine/test.h > index af602c0..d8e5490 100644 > --- a/include/wine/test.h > +++ b/include/wine/test.h > @@ -68,6 +68,7 @@ extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); > extern const char *wine_dbgstr_guid( const GUID *guid ); > extern const char *wine_dbgstr_rect( const RECT *rect ); > static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } > +extern const char *wine_dbgstr_longlong( ULONGLONG ll ); > > /* strcmpW is available for tests compiled under Wine, but not in standalone > * builds under Windows, so we reimplement it under a different name. */ > @@ -541,6 +542,17 @@ const char *wine_dbgstr_rect( const RECT *rect ) > return res; > } > > +const char *wine_dbgstr_longlong( ULONGLONG ll ) > +{ > + char *res; The other functions have an empty line after the variable declarations. > + res = get_temp_buffer( 17 ); > + if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) > + sprintf(res, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); Either place a space after the opening parenthesis and before the closing one or don't but please stay consistent inside a function. The file prefers the variant with the spaces. > + else > + sprintf(res, "%lx", (unsigned long)ll); > + return res; The other debug functions with variable length output release the unused part of the temp buffer. You can waste up to 15 bytes here. > +} > + > /* Find a test by name */ > static const struct test *find_test( const char *name ) > { > thanks bye michael

June 29, 2017

Re: [PATCH] libs/wine: Use Windows collation when sorting and comparing strings

by Marvin

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=31953 Your paranoid android. === w7u (32 bit locale) === locale.c:2927: Test failed: qsort using lstrcmpA failed for element 6 locale.c:2927: Test failed: qsort using lstrcmpA failed for element 7 locale.c:2927: Test failed: qsort using lstrcmpA failed for element 8 locale.c:2927: Test failed: qsort using lstrcmpA failed for element 9 locale.c:2927: Test failed: qsort using lstrcmpA failed for element 10 locale.c:2935: Test failed: qsort using CompareStringA failed for element 6 locale.c:2935: Test failed: qsort using CompareStringA failed for element 7 locale.c:2935: Test failed: qsort using CompareStringA failed for element 8 locale.c:2935: Test failed: qsort using CompareStringA failed for element 9 locale.c:2935: Test failed: qsort using CompareStringA failed for element 10 locale.c:2943: Test failed: qsort using sort keys failed for element 6 locale.c:2943: Test failed: qsort using sort keys failed for element 7 locale.c:2943: Test failed: qsort using sort keys failed for element 8 locale.c:2943: Test failed: qsort using sort keys failed for element 9 locale.c:2943: Test failed: qsort using sort keys failed for element 10

June 29, 2017