July 2017 - Wine-commits - list.winehq.org

Nikolay Sivov : d2d1/tests: Fix stroke style object leak (Valgrind).
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: d6e2a6f370b50df06ec5957226f637e40d049527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e2a6f370b50df06ec595722… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 11 11:36:02 2017 +0300 d2d1/tests: Fix stroke style object leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index e0318ce..e9e73d8 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4440,6 +4440,8 @@ static void test_stroke_style(void) desc.dashStyle = D2D1_DASH_STYLE_CUSTOM; desc.dashOffset = 0.0f; + ID2D1StrokeStyle_Release(style); + hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, NULL, 0, &style); ok(hr == E_INVALIDARG, "Unexpected return value, %#x.\n", hr);

1 0

Francois Gouget : testbot/web: Only allow retrieving our cookies through Http.
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: tools Branch: master Commit: f5d82db8fdded58a0524f7f1ab0a03756f6f724d URL: http://source.winehq.org/git/tools.git/?a=commit;h=f5d82db8fdded58a0524f7f1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 11 12:39:59 2017 +0200 testbot/web: Only allow retrieving our cookies through Http. The WineTestBot JavaScript code does not need to access cookies so reduce the attack surface (and possibly prevent some XSS attacks). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 0f89e46..04759ca 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -163,7 +163,8 @@ sub SetCookies($) $Cookie = CGI::Cookie->new(-Name => "SessionId", -Value => $Session->Id, -Expires => $Expire, - -Secure => $UseSSL); + -Secure => $UseSSL, + -HttpOnly => 1); $Request->err_headers_out->add("Set-Cookie", $Cookie); } else @@ -183,7 +184,8 @@ sub SetCookies($) $Cookie = CGI::Cookie->new(-Name => "SessionActive", -Value => $SessionPermanent, -Expires => $Expire, - -Secure => !1); + -Secure => !1, + -HttpOnly => 1); $Request->err_headers_out->add("Set-Cookie", $Cookie); } else

1 0

Francois Gouget : testbot/testagentd: Fix handling the --run in/out/ err redirection options.
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: tools Branch: master Commit: 14a04dd784e2a593de188be92ad4969da01994cc URL: http://source.winehq.org/git/tools.git/?a=commit;h=14a04dd784e2a593de188be9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 11 12:35:22 2017 +0200 testbot/testagentd: Fix handling the --run in/out/err redirection options. Preventing handle inheritance at the CreateProcess() level also prevents us from redirecting the child processes stdin/out/err. So instead disable handle inheritance directly on the TestAgentd sockets. TestAgentd also opens file descriptors for the sendfile, getfile and upgrade operations but those are closed before handling any other operation. So we only have to prevent the sockets from being inherited. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/platform_windows.c | 2 +- testbot/src/testagentd/testagentd.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index c72cf25..70272a6 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -126,7 +126,7 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) si.hStdInput = fhs[0]; si.hStdOutput = fhs[1]; si.hStdError = fhs[2]; - if (!CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, + if (!CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &pi)) { set_status(ST_ERROR, "could not run '%s': %lu", cmdline, GetLastError()); diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index bc3d32b..fce28b2 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1347,6 +1347,9 @@ int main(int argc, char** argv) if (master < 0) continue; setsockopt(master, SOL_SOCKET, SO_REUSEADDR, (void*)&on, sizeof(on)); +#ifdef HANDLE_FLAG_INHERIT + SetHandleInformation((HANDLE)master, HANDLE_FLAG_INHERIT, 0); +#endif debug("Trying to bind to %s\n", sockaddr_to_string(addrp->ai_addr, addrp->ai_addrlen)); if (bind(master, addrp->ai_addr, addrp->ai_addrlen) == 0) @@ -1376,6 +1379,9 @@ int main(int argc, char** argv) #ifdef O_CLOEXEC fcntl(client, F_SETFL, fcntl(client, F_GETFL, 0) | O_CLOEXEC); #endif +#ifdef HANDLE_FLAG_INHERIT + SetHandleInformation((HANDLE)client, HANDLE_FLAG_INHERIT, 0); +#endif if (client >= 0) { if (is_host_allowed(client, opt_srchost, addrlen))

1 0

Francois Gouget : testbot/web: Remove an unused reference to CGI::Cookie.
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: tools Branch: master Commit: 9b237187edb63efb9b38561df1650d589aebdd47 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9b237187edb63efb9b38561d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 11 12:40:06 2017 +0200 testbot/web: Remove an unused reference to CGI::Cookie. All the cookie contains is the session id. So to log out a user all we need to do is delete the server-side session id. This instantly invalidates the client-side cookie and thus there is no need to use CGI:Cookie to modify it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Logout.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/web/Logout.pl b/testbot/web/Logout.pl index 6e6abc2..417232d 100644 --- a/testbot/web/Logout.pl +++ b/testbot/web/Logout.pl @@ -24,7 +24,6 @@ package LogoutPage; use ObjectModel::CGI::Page; use WineTestBot::CGI::Sessions; use CGI qw(:standard); -use CGI::Cookie; @LogoutPage::ISA = qw(ObjectModel::CGI::Page);

1 0

Francois Gouget : windowscodecs/tests: A spelling fix in an ok() message.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 5d8a1cf378524871081cbe66d4a4d590f6d6f4cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d8a1cf378524871081cbe66d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 6 12:22:16 2017 +0200 windowscodecs/tests: A spelling fix in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/metadata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 704a679..f0cfc09 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -2606,7 +2606,7 @@ static HRESULT WINAPI mdr_GetValue(IWICMetadataReader *iface, const PROPVARIANT ok(current_metadata_block != NULL, "current_metadata_block can't be NULL\n"); if (!current_metadata_block) return E_POINTER; - ok(schema != NULL && id != NULL && value != NULL, "%p, %p, %p shoud not be NULL\n", schema, id, value); + ok(schema != NULL && id != NULL && value != NULL, "%p, %p, %p should not be NULL\n", schema, id, value); for (i = 0; i < current_metadata_block->count; i++) {

1 0

Piotr Caban : gdiplus: Remove unused clsid parameter from encode_image_func helpers.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 1a75f763db60876c6b71dd3d25f5fa547d86157f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a75f763db60876c6b71dd3d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 10 11:29:56 2017 +0200 gdiplus: Remove unused clsid parameter from encode_image_func helpers. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 720f8f2..eb705d1 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4140,7 +4140,7 @@ static GpStatus decode_image_emf(IStream *stream, GpImage **image) } typedef GpStatus (*encode_image_func)(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params); + GDIPCONST EncoderParameters* params); typedef GpStatus (*decode_image_func)(IStream *stream, GpImage **image); @@ -4516,31 +4516,31 @@ static GpStatus encode_image_wic(GpImage *image, IStream* stream, } static GpStatus encode_image_BMP(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) + GDIPCONST EncoderParameters* params) { return encode_image_wic(image, stream, &GUID_ContainerFormatBmp, params); } static GpStatus encode_image_tiff(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) + GDIPCONST EncoderParameters* params) { return encode_image_wic(image, stream, &GUID_ContainerFormatTiff, params); } static GpStatus encode_image_png(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) + GDIPCONST EncoderParameters* params) { return encode_image_wic(image, stream, &GUID_ContainerFormatPng, params); } static GpStatus encode_image_jpeg(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) + GDIPCONST EncoderParameters* params) { return encode_image_wic(image, stream, &GUID_ContainerFormatJpeg, params); } static GpStatus encode_image_gif(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) + GDIPCONST EncoderParameters* params) { return encode_image_wic(image, stream, &CLSID_WICGifEncoder, params); } @@ -4570,7 +4570,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, if (encode_image == NULL) return UnknownImageFormat; - stat = encode_image(image, stream, clsid, params); + stat = encode_image(image, stream, params); return stat; }

1 0

Piotr Caban : gdiplus: Add partial support for GdipDrawImagePointsRect on metafile.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: e1e4dd202321318d821b5e93044f136f37fa7791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1e4dd202321318d821b5e930… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 10 11:30:08 2017 +0200 gdiplus: Add partial support for GdipDrawImagePointsRect on metafile. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 5 + dlls/gdiplus/graphics.c | 7 ++ dlls/gdiplus/image.c | 2 +- dlls/gdiplus/metafile.c | 244 +++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 5 +- 5 files changed, 260 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1e4dd202321318d821b5…

1 0

Piotr Caban : gdiplus: Add function for managing metafile objects id.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: ac231b14b946276615519198256968fe339956d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac231b14b9462766155191982… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 10 11:30:24 2017 +0200 gdiplus: Add function for managing metafile objects id. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/metafile.c | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 9da720b..6fd0968 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -370,6 +370,7 @@ struct GpMetafile{ IStream *record_stream; BOOL auto_frame; /* If true, determine the frame automatically */ GpPointF auto_frame_min, auto_frame_max; + DWORD next_object_id; /* playback */ GpGraphics *playback_graphics; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index f3bef73..a3f94a1 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -250,6 +250,11 @@ typedef struct EmfPlusDrawImagePoints } PointData[3]; } EmfPlusDrawImagePoints; +static DWORD METAFILE_AddObjectId(GpMetafile *metafile) +{ + return (metafile->next_object_id++) % 64; +} + static GpStatus METAFILE_AllocateRecord(GpMetafile *metafile, DWORD size, void **result) { DWORD size_needed; @@ -2363,8 +2368,10 @@ static GpStatus METAFILE_FillEmfPlusBitmap(EmfPlusBitmap *record, IStream *strea return Ok; } -static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image) +static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image, DWORD *id) { + *id = -1; + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) return Ok; @@ -2389,8 +2396,9 @@ static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image) } memset(object_record->ObjectData.image.ImageData.bitmap.BitmapData + size, 0, aligned_size - size); + *id = METAFILE_AddObjectId(metafile); object_record->Header.Type = EmfPlusRecordTypeObject; - object_record->Header.Flags = ObjectTypeImage << 8; + object_record->Header.Flags = *id | ObjectTypeImage << 8; object_record->ObjectData.image.Version = 0xDBC01002; object_record->ObjectData.image.Type = ImageDataTypeBitmap; @@ -2412,6 +2420,7 @@ GpStatus METAFILE_DrawImagePointsRect(GpMetafile *metafile, GpImage *image, DrawImageAbort callback, VOID *callbackData) { EmfPlusDrawImagePoints *draw_image_record; + DWORD image_id; GpStatus stat; if (count != 3) return InvalidParameter; @@ -2430,13 +2439,13 @@ GpStatus METAFILE_DrawImagePointsRect(GpMetafile *metafile, GpImage *image, return NotImplemented; } - stat = METAFILE_AddImageObject(metafile, image); + stat = METAFILE_AddImageObject(metafile, image, &image_id); if (stat != Ok) return stat; stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusDrawImagePoints), (void**)&draw_image_record); if (stat != Ok) return stat; draw_image_record->Header.Type = EmfPlusRecordTypeDrawImagePoints; - draw_image_record->Header.Flags = 0; + draw_image_record->Header.Flags = image_id; draw_image_record->ImageAttributesID = -1; draw_image_record->SrcUnit = UnitPixel; draw_image_record->SrcRect.X = units_to_pixels(srcx, srcUnit, metafile->image.xres);

1 0

Piotr Caban : gdiplus: Add support for ImageAttributes when drawing image to metafile.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 689268d2f2f6121c40bf2014baf8a958fd2948f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=689268d2f2f6121c40bf2014b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 10 11:30:40 2017 +0200 gdiplus: Add support for ImageAttributes when drawing image to metafile. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 99 ++++++++++++++++++++++++++++++++++++++++--- dlls/gdiplus/tests/metafile.c | 20 ++++++++- 2 files changed, 112 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index a3f94a1..1aafdf7 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -198,6 +198,24 @@ typedef struct EmfPlusImage } ImageData; } EmfPlusImage; +typedef struct EmfPlusARGB +{ + BYTE Blue; + BYTE Green; + BYTE Red; + BYTE Alpha; +} EmfPlusARGB; + +typedef struct EmfPlusImageAttributes +{ + DWORD Version; + DWORD Reserved1; + DWORD WrapMode; + EmfPlusARGB ClampColor; + DWORD ObjectClamp; + DWORD Reserved2; +} EmfPlusImageAttributes; + typedef enum ObjectType { ObjectTypeInvalid, @@ -218,6 +236,7 @@ typedef struct EmfPlusObject union { EmfPlusImage image; + EmfPlusImageAttributes image_attributes; } ObjectData; } EmfPlusObject; @@ -2414,13 +2433,48 @@ static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image, DW } } +static GpStatus METAFILE_AddImageAttributesObject(GpMetafile *metafile, const GpImageAttributes *attrs, DWORD *id) +{ + EmfPlusObject *object_record; + EmfPlusImageAttributes *attrs_record; + GpStatus stat; + + *id = -1; + + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) + return Ok; + + if (!attrs) + return Ok; + + stat = METAFILE_AllocateRecord(metafile, + FIELD_OFFSET(EmfPlusObject, ObjectData.image_attributes) + sizeof(EmfPlusImageAttributes), + (void**)&object_record); + if (stat != Ok) return stat; + + *id = METAFILE_AddObjectId(metafile); + object_record->Header.Type = EmfPlusRecordTypeObject; + object_record->Header.Flags = *id | (ObjectTypeImageAttributes << 8); + attrs_record = &object_record->ObjectData.image_attributes; + attrs_record->Version = 0xDBC01002; + attrs_record->Reserved1 = 0; + attrs_record->WrapMode = attrs->wrap; + attrs_record->ClampColor.Blue = attrs->outside_color & 0xff; + attrs_record->ClampColor.Green = (attrs->outside_color >> 8) & 0xff; + attrs_record->ClampColor.Red = (attrs->outside_color >> 16) & 0xff; + attrs_record->ClampColor.Alpha = attrs->outside_color >> 24; + attrs_record->ObjectClamp = attrs->clamp; + attrs_record->Reserved2 = 0; + return Ok; +} + GpStatus METAFILE_DrawImagePointsRect(GpMetafile *metafile, GpImage *image, GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, DrawImageAbort callback, VOID *callbackData) { EmfPlusDrawImagePoints *draw_image_record; - DWORD image_id; + DWORD image_id, attributes_id; GpStatus stat; if (count != 3) return InvalidParameter; @@ -2433,20 +2487,55 @@ GpStatus METAFILE_DrawImagePointsRect(GpMetafile *metafile, GpImage *image, else FIXME("semi-stub\n"); - if (imageAttributes) + if (!imageAttributes) { - FIXME("ImageAttributes != NULL not supported\n"); + stat = METAFILE_AddImageObject(metafile, image, &image_id); + } + else if (image->type == ImageTypeBitmap) + { + INT width = ((GpBitmap*)image)->width; + INT height = ((GpBitmap*)image)->height; + GpGraphics *graphics; + GpBitmap *bitmap; + + stat = GdipCreateBitmapFromScan0(width, height, + 0, PixelFormat32bppARGB, NULL, &bitmap); + if (stat != Ok) return stat; + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + if (stat != Ok) + { + GdipDisposeImage((GpImage*)bitmap); + return stat; + } + + stat = GdipDrawImageRectRectI(graphics, image, 0, 0, width, height, + 0, 0, width, height, UnitPixel, imageAttributes, NULL, NULL); + GdipDeleteGraphics(graphics); + if (stat != Ok) + { + GdipDisposeImage((GpImage*)bitmap); + return stat; + } + + stat = METAFILE_AddImageObject(metafile, (GpImage*)bitmap, &image_id); + GdipDisposeImage((GpImage*)bitmap); + } + else + { + FIXME("imageAttributes not supported (image type %d)\n", image->type); return NotImplemented; } + if (stat != Ok) return stat; - stat = METAFILE_AddImageObject(metafile, image, &image_id); + stat = METAFILE_AddImageAttributesObject(metafile, imageAttributes, &attributes_id); if (stat != Ok) return stat; stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusDrawImagePoints), (void**)&draw_image_record); if (stat != Ok) return stat; draw_image_record->Header.Type = EmfPlusRecordTypeDrawImagePoints; draw_image_record->Header.Flags = image_id; - draw_image_record->ImageAttributesID = -1; + draw_image_record->ImageAttributesID = attributes_id; draw_image_record->SrcUnit = UnitPixel; draw_image_record->SrcRect.X = units_to_pixels(srcx, srcUnit, metafile->image.xres); draw_image_record->SrcRect.Y = units_to_pixels(srcy, srcUnit, metafile->image.yres); diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 9048619..cbf63a6 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2326,6 +2326,7 @@ static const emfplus_record draw_image_records[] = { {0, EMR_HEADER}, {0, EmfPlusRecordTypeHeader}, {0, EmfPlusRecordTypeObject}, + {0, EmfPlusRecordTypeObject}, {0, EmfPlusRecordTypeDrawImagePoints}, {1, EMR_SAVEDC}, {1, EMR_SETICMMODE}, @@ -2341,7 +2342,14 @@ static void test_drawimage(void) static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; static const GpPointF dst_points[3] = {{10.0,10.0},{25.0,15.0},{10.0,20.0}}; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; - + const ColorMatrix double_red = {{ + {2.0,0.0,0.0,0.0,0.0}, + {0.0,1.0,0.0,0.0,0.0}, + {0.0,0.0,1.0,0.0,0.0}, + {0.0,0.0,0.0,1.0,0.0}, + {0.0,0.0,0.0,0.0,1.0}}}; + + GpImageAttributes *imageattr; GpMetafile *metafile; GpGraphics *graphics; HENHMETAFILE hemf; @@ -2370,8 +2378,16 @@ static void test_drawimage(void) stat = GdipCreateBitmapFromGdiDib(&info, buff, &bm); expect(Ok, stat); + stat = GdipCreateImageAttributes(&imageattr); + expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &double_red, NULL, ColorMatrixFlagsDefault); + expect(Ok, stat); + stat = GdipDrawImagePointsRect(graphics, (GpImage*)bm, dst_points, 3, - 0.0, 0.0, 10.0, 10.0, UnitPixel, NULL, NULL, NULL); + 0.0, 0.0, 10.0, 10.0, UnitPixel, imageattr, NULL, NULL); + GdipDisposeImageAttributes(imageattr); expect(Ok, stat); GdipDisposeImage((GpImage*)bm);

1 0

Nikolay Sivov : wininet: Fix potential use-after-free (Coverity).
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: f55a116101836a19f017ba42a1a99fc17a5f08c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55a116101836a19f017ba42a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 9 17:00:39 2017 +0300 wininet: Fix potential use-after-free (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ef9f144..078a5cb 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4133,12 +4133,12 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, WCHAR *url) request->path = heap_alloc(needed*sizeof(WCHAR)); rc = UrlEscapeW(path, request->path, &needed, URL_ESCAPE_SPACES_ONLY); - heap_free(path); if (rc != S_OK) { ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); strcpyW(request->path, path); } + heap_free(path); } /* Remove custom content-type/length headers on redirects. */

1 0