wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Alex Henrie : wininet/tests: Skip cookie attributes tests on IE < 8.0.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: 16226c44dadec1b08042b93d4c2ce7044b7cb5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16226c44dadec1b08042b93d4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 23:54:17 2017 -0600 wininet/tests: Skip cookie attributes tests on IE < 8.0. INTERNET_COOKIE_HTTPONLY was introduced in IE 8.0. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 0b43d01..dd15a4b 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -565,7 +565,7 @@ static void test_cookie_attrs(void) DWORD size, state; BOOL ret; - if(!GetProcAddress(GetModuleHandleA("wininet.dll"), "InternetGetSecurityInfoByURLA")) { + if(!GetProcAddress(GetModuleHandleA("wininet.dll"), "DeleteWpadCacheForNetworks")) { win_skip("Skipping cookie attributes tests. Too old IE.\n"); return; }

1 0

Jacek Caban : mshtml: Fire message event with window as a target.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: d054357cbfdd88f1df94ff672f2e357ae1fefbc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d054357cbfdd88f1df94ff672… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 16 22:31:50 2017 +0200 mshtml: Fire message event with window as a target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 4084a18..1c27c13 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -153,7 +153,7 @@ static const event_info_t event_info[] = { {loadW, EVENTT_HTML, DISPID_EVMETH_ONLOAD, EVENT_BIND_TO_BODY}, {messageW, EVENTT_NONE, DISPID_EVMETH_ONMESSAGE, - EVENT_BUBBLE /* FIXME: remove when we get the target right */ }, + 0}, {mousedownW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEDOWN, EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE}, {mousemoveW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEMOVE, diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b366534..13963da 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2155,7 +2155,7 @@ static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VAR return E_FAIL; } - fire_event(This->inner_window->doc, EVENTID_MESSAGE, TRUE, &This->inner_window->doc->node, NULL, NULL); + fire_event(This->inner_window->doc, EVENTID_MESSAGE, TRUE, NULL, NULL, NULL); return S_OK; }

1 0

Jacek Caban : mshtml: Use window event target instead of body only for selected event properties.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: e38c2ceb51f29d8fcba610ed027a44cb44ac521f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e38c2ceb51f29d8fcba610ed0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 16 22:31:42 2017 +0200 mshtml: Use window event target instead of body only for selected event properties. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlbody.c | 19 ++++++++++++---- dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/htmlelem.c | 9 -------- dlls/mshtml/htmlevent.c | 53 +++++++++++++++---------------------------- dlls/mshtml/htmlevent.h | 13 +++++++---- dlls/mshtml/htmlwindow.c | 7 ------ dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/nsevents.c | 17 ++------------ dlls/mshtml/tests/events.html | 12 +++++++++- dlls/mshtml/xmlhttprequest.c | 1 - 10 files changed, 55 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e38c2ceb51f29d8fcba61…

1 0

Nikolay Sivov : gdiplus/metafile: Support serialized brushes in EmfPlusFillRects.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 57ca6b90bb7337cb90465b3bf1f147e3d2564f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=57ca6b90bb7337cb90465b3bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 16 10:12:25 2017 +0300 gdiplus/metafile: Support serialized brushes in EmfPlusFillRects. Signed-off-by: Nikolay Sivov <nsivov(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 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 43d2d8c..1fd4db2 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1852,8 +1852,12 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, } else { - FIXME("brush deserialization not implemented\n"); - return NotImplemented; + if (record->BrushID >= EmfPlusObjectTableSize || + real_metafile->objtable[record->BrushID].type != ObjectTypeBrush) + return InvalidParameter; + + brush = real_metafile->objtable[record->BrushID].u.brush; + stat = Ok; } if (stat == Ok)

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillPath.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 6cde9952f243f8df19dbe5051a43380120cb947c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cde9952f243f8df19dbe5051… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 16 10:12:24 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillPath. Signed-off-by: Nikolay Sivov <nsivov(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 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index db74c9dc..43d2d8c 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2233,6 +2233,39 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, points, 3, draw->SrcRect.X, draw->SrcRect.Y, draw->SrcRect.Width, draw->SrcRect.Height, draw->SrcUnit, real_metafile->objtable[draw->ImageAttributesID].u.image_attributes, NULL, NULL); } + case EmfPlusRecordTypeFillPath: + { + EmfPlusFillPath *fill = (EmfPlusFillPath *)header; + GpSolidFill *solidfill = NULL; + BYTE path = flags & 0xff; + GpBrush *brush; + + if (path >= EmfPlusObjectTableSize || real_metafile->objtable[path].type != ObjectTypePath) + return InvalidParameter; + + if (dataSize != sizeof(fill->data.BrushId)) + return InvalidParameter; + + if (flags & 0x8000) + { + stat = GdipCreateSolidFill(*(ARGB *)&fill->data.Color, (GpSolidFill **)&solidfill); + if (stat != Ok) + return stat; + brush = (GpBrush *)solidfill; + } + else + { + if (fill->data.BrushId >= EmfPlusObjectTableSize || + real_metafile->objtable[fill->data.BrushId].type != ObjectTypeBrush) + return InvalidParameter; + + brush = real_metafile->objtable[fill->data.BrushId].u.brush; + } + + stat = GdipFillPath(real_metafile->playback_graphics, brush, real_metafile->objtable[path].u.path); + GdipDeleteBrush((GpBrush *)solidfill); + return stat; + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Nikolay Sivov : gdiplus/metafile: Partially implement EmfPlusPath deserialization.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 2a2f61dfe96297e99400aea0688e347d4d89c1a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a2f61dfe96297e99400aea06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 16 10:12:23 2017 +0300 gdiplus/metafile: Partially implement EmfPlusPath deserialization. Signed-off-by: Nikolay Sivov <nsivov(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 | 75 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index f659ccf..dc2f0892 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -394,6 +394,7 @@ struct emfplus_object { EmfPlusObjectType type; union { GpBrush *brush; + GpPath *path; GpImage *image; GpImageAttributes *image_attributes; void *object; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index fa4bafd..db74c9dc 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -388,6 +388,9 @@ static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id) case ObjectTypeBrush: GdipDeleteBrush(object->u.brush); break; + case ObjectTypePath: + GdipDeletePath(object->u.path); + break; case ObjectTypeImage: GdipDisposeImage(object->u.image); break; @@ -1572,6 +1575,75 @@ static GpStatus metafile_deserialize_image(const BYTE *record_data, UINT data_si return status; } +static GpStatus metafile_deserialize_path(const BYTE *record_data, UINT data_size, GpPath **path) +{ + EmfPlusPath *data = (EmfPlusPath *)record_data; + GpStatus status; + BYTE *types; + UINT size; + DWORD i; + + *path = NULL; + + if (data_size <= FIELD_OFFSET(EmfPlusPath, data)) + return InvalidParameter; + data_size -= FIELD_OFFSET(EmfPlusPath, data); + + if (data->PathPointFlags & 0x800) /* R */ + { + FIXME("RLE encoded path data is not supported.\n"); + return NotImplemented; + } + else + { + if (data->PathPointFlags & 0x4000) /* C */ + size = sizeof(EmfPlusPoint); + else + size = sizeof(EmfPlusPointF); + size += sizeof(BYTE); /* EmfPlusPathPointType */ + size *= data->PathPointCount; + } + + if (data_size < size) + return InvalidParameter; + + status = GdipCreatePath(FillModeAlternate, path); + if (status != Ok) + return status; + + (*path)->pathdata.Count = data->PathPointCount; + (*path)->pathdata.Points = GdipAlloc(data->PathPointCount * sizeof(*(*path)->pathdata.Points)); + (*path)->pathdata.Types = GdipAlloc(data->PathPointCount * sizeof(*(*path)->pathdata.Types)); + (*path)->datalen = (*path)->pathdata.Count; + + if (!(*path)->pathdata.Points || !(*path)->pathdata.Types) + { + GdipDeletePath(*path); + return OutOfMemory; + } + + if (data->PathPointFlags & 0x4000) /* C */ + { + EmfPlusPoint *points = (EmfPlusPoint *)data->data; + for (i = 0; i < data->PathPointCount; i++) + { + (*path)->pathdata.Points[i].X = points[i].X; + (*path)->pathdata.Points[i].Y = points[i].Y; + } + types = (BYTE *)(points + i); + } + else + { + EmfPlusPointF *points = (EmfPlusPointF *)data->data; + memcpy((*path)->pathdata.Points, points, sizeof(*points) * data->PathPointCount); + types = (BYTE *)(points + data->PathPointCount); + } + + memcpy((*path)->pathdata.Types, types, sizeof(*types) * data->PathPointCount); + + return Ok; +} + static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_size, GpBrush **brush) { static const UINT header_size = FIELD_OFFSET(EmfPlusBrush, BrushData); @@ -1614,6 +1686,9 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d case ObjectTypeBrush: status = metafile_deserialize_brush(record_data, data_size, (GpBrush **)&object); break; + case ObjectTypePath: + status = metafile_deserialize_path(record_data, data_size, (GpPath **)&object); + break; case ObjectTypeImage: status = metafile_deserialize_image(record_data, data_size, (GpImage **)&object); break;

1 0

Nikolay Sivov : gdiplus/metafile: Implement EmfPlusRecordTypeDrawImagePoints record playback.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 440efc8244da18cb8a9bbd441645468fdbcba087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=440efc8244da18cb8a9bbd441… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 16 10:12:22 2017 +0300 gdiplus/metafile: Implement EmfPlusRecordTypeDrawImagePoints record playback. Signed-off-by: Nikolay Sivov <nsivov(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 | 89 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 79 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 2fc741e..fa4bafd 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -328,6 +328,18 @@ typedef struct EmfPlusRectF float Height; } EmfPlusRectF; +typedef struct EmfPlusPointR7 +{ + BYTE X; + BYTE Y; +} EmfPlusPointR7; + +typedef struct EmfPlusPoint +{ + short X; + short Y; +} EmfPlusPoint; + typedef struct EmfPlusPointF { float X; @@ -343,10 +355,10 @@ typedef struct EmfPlusDrawImagePoints DWORD count; union { - /*EmfPlusPointR pointR; - EmfPlusPoint point;*/ - EmfPlusPointF pointF; - } PointData[3]; + EmfPlusPointR7 pointsR[3]; + EmfPlusPoint points[3]; + EmfPlusPointF pointsF[3]; + } PointData; } EmfPlusDrawImagePoints; typedef struct EmfPlusDrawPath @@ -2084,6 +2096,68 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { return METAFILE_PlaybackObject(real_metafile, flags, dataSize, data); } + case EmfPlusRecordTypeDrawImagePoints: + { + EmfPlusDrawImagePoints *draw = (EmfPlusDrawImagePoints *)header; + static const UINT fixed_part_size = FIELD_OFFSET(EmfPlusDrawImagePoints, PointData) - + FIELD_OFFSET(EmfPlusDrawImagePoints, ImageAttributesID); + BYTE image = flags & 0xff; + GpPointF points[3]; + unsigned int i; + UINT size; + + if (image >= EmfPlusObjectTableSize || real_metafile->objtable[image].type != ObjectTypeImage) + return InvalidParameter; + + if (dataSize <= fixed_part_size) + return InvalidParameter; + dataSize -= fixed_part_size; + + if (draw->ImageAttributesID >= EmfPlusObjectTableSize || + real_metafile->objtable[draw->ImageAttributesID].type != ObjectTypeImageAttributes) + return InvalidParameter; + + if (draw->count != 3) + return InvalidParameter; + + if ((flags >> 13) & 1) /* E */ + FIXME("image effects are not supported.\n"); + + if ((flags >> 11) & 1) /* P */ + size = sizeof(EmfPlusPointR7) * draw->count; + else if ((flags >> 14) & 1) /* C */ + size = sizeof(EmfPlusPoint) * draw->count; + else + size = sizeof(EmfPlusPointF) * draw->count; + + if (dataSize != size) + return InvalidParameter; + + if ((flags >> 11) & 1) /* P */ + { + points[0].X = draw->PointData.pointsR[0].X; + points[0].Y = draw->PointData.pointsR[0].Y; + for (i = 1; i < 3; i++) + { + points[i].X = points[i-1].X + draw->PointData.pointsR[i].X; + points[i].Y = points[i-1].Y + draw->PointData.pointsR[i].Y; + } + } + else if ((flags >> 14) & 1) /* C */ + { + for (i = 0; i < 3; i++) + { + points[i].X = draw->PointData.points[i].X; + points[i].Y = draw->PointData.points[i].Y; + } + } + else + memcpy(points, draw->PointData.pointsF, sizeof(points)); + + return GdipDrawImagePointsRect(real_metafile->playback_graphics, real_metafile->objtable[image].u.image, + points, 3, draw->SrcRect.X, draw->SrcRect.Y, draw->SrcRect.Width, draw->SrcRect.Height, draw->SrcUnit, + real_metafile->objtable[draw->ImageAttributesID].u.image_attributes, NULL, NULL); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented; @@ -2982,12 +3056,7 @@ GpStatus METAFILE_DrawImagePointsRect(GpMetafile *metafile, GpImage *image, 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); draw_image_record->count = 3; - draw_image_record->PointData[0].pointF.X = points[0].X; - draw_image_record->PointData[0].pointF.Y = points[0].Y; - draw_image_record->PointData[1].pointF.X = points[1].X; - draw_image_record->PointData[1].pointF.Y = points[1].Y; - draw_image_record->PointData[2].pointF.X = points[2].X; - draw_image_record->PointData[2].pointF.Y = points[2].Y; + memcpy(draw_image_record->PointData.pointsF, points, 3 * sizeof(*points)); METAFILE_WriteRecords(metafile); return Ok; }

1 0

Nikolay Sivov : gdiplus/metafile: Implement EmfPlusImage deserialization for bitmaps.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 81459d652629b29eb19e4c14ba240034a0f3c4dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=81459d652629b29eb19e4c14b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 16 10:12:21 2017 +0300 gdiplus/metafile: Implement EmfPlusImage deserialization for bitmaps. Signed-off-by: Nikolay Sivov <nsivov(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 | 117 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 95445e8..f659ccf 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -394,6 +394,7 @@ struct emfplus_object { EmfPlusObjectType type; union { GpBrush *brush; + GpImage *image; GpImageAttributes *image_attributes; void *object; } u; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index de208a8..2fc741e 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); +HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT, IWICImagingFactory**); + typedef struct EmfPlusARGB { BYTE Blue; @@ -246,6 +248,13 @@ typedef struct EmfPlusRegion BYTE RegionNode[1]; } EmfPlusRegion; +typedef struct EmfPlusPalette +{ + DWORD PaletteStyleFlags; + DWORD PaletteCount; + BYTE PaletteEntries[1]; +} EmfPlusPalette; + typedef enum { BitmapDataTypePixel, @@ -367,6 +376,9 @@ static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id) case ObjectTypeBrush: GdipDeleteBrush(object->u.brush); break; + case ObjectTypeImage: + GdipDisposeImage(object->u.image); + break; case ObjectTypeImageAttributes: GdipDisposeImageAttributes(object->u.image_attributes); break; @@ -1446,6 +1458,108 @@ static void metafile_set_object_table_entry(GpMetafile *metafile, BYTE id, BYTE metafile->objtable[id].u.object = object; } +static GpStatus metafile_deserialize_image(const BYTE *record_data, UINT data_size, GpImage **image) +{ + EmfPlusImage *data = (EmfPlusImage *)record_data; + GpStatus status; + + *image = NULL; + + if (data_size < FIELD_OFFSET(EmfPlusImage, ImageData)) + return InvalidParameter; + data_size -= FIELD_OFFSET(EmfPlusImage, ImageData); + + switch (data->Type) + { + case ImageDataTypeBitmap: + { + EmfPlusBitmap *bitmapdata = &data->ImageData.bitmap; + + if (data_size <= FIELD_OFFSET(EmfPlusBitmap, BitmapData)) + return InvalidParameter; + data_size -= FIELD_OFFSET(EmfPlusBitmap, BitmapData); + + switch (bitmapdata->Type) + { + case BitmapDataTypePixel: + { + ColorPalette *palette; + BYTE *scan0; + + if (bitmapdata->PixelFormat & PixelFormatIndexed) + { + EmfPlusPalette *palette_obj = (EmfPlusPalette *)bitmapdata->BitmapData; + UINT palette_size = FIELD_OFFSET(EmfPlusPalette, PaletteEntries); + + if (data_size <= palette_size) + return InvalidParameter; + palette_size += palette_obj->PaletteCount * sizeof(EmfPlusARGB); + + if (data_size < palette_size) + return InvalidParameter; + data_size -= palette_size; + + palette = (ColorPalette *)bitmapdata->BitmapData; + scan0 = (BYTE *)bitmapdata->BitmapData + palette_size; + } + else + { + palette = NULL; + scan0 = bitmapdata->BitmapData; + } + + if (data_size < bitmapdata->Height * bitmapdata->Stride) + return InvalidParameter; + + status = GdipCreateBitmapFromScan0(bitmapdata->Width, bitmapdata->Height, bitmapdata->Stride, + bitmapdata->PixelFormat, scan0, (GpBitmap **)image); + if (status == Ok && palette) + { + status = GdipSetImagePalette(*image, palette); + if (status != Ok) + { + GdipDisposeImage(*image); + *image = NULL; + } + } + break; + } + case BitmapDataTypeCompressed: + { + IWICImagingFactory *factory; + IWICStream *stream; + HRESULT hr; + + if (WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory) != S_OK) + return GenericError; + + hr = IWICImagingFactory_CreateStream(factory, &stream); + IWICImagingFactory_Release(factory); + if (hr != S_OK) + return GenericError; + + if (IWICStream_InitializeFromMemory(stream, bitmapdata->BitmapData, data_size) == S_OK) + status = GdipCreateBitmapFromStream((IStream *)stream, (GpBitmap **)image); + else + status = GenericError; + + IWICStream_Release(stream); + break; + } + default: + WARN("Invalid bitmap type %d.\n", bitmapdata->Type); + return InvalidParameter; + } + break; + } + default: + FIXME("image type %d not supported.\n", data->Type); + return NotImplemented; + } + + return status; +} + static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_size, GpBrush **brush) { static const UINT header_size = FIELD_OFFSET(EmfPlusBrush, BrushData); @@ -1488,6 +1602,9 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d case ObjectTypeBrush: status = metafile_deserialize_brush(record_data, data_size, (GpBrush **)&object); break; + case ObjectTypeImage: + status = metafile_deserialize_image(record_data, data_size, (GpImage **)&object); + break; case ObjectTypeImageAttributes: { EmfPlusImageAttributes *data = (EmfPlusImageAttributes *)record_data;

1 0

Nikolay Sivov : qedit/tests: Fix some leaks in tests (Valgrind).
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 81eb827c98fa7a5016f802e92b2d9148a572f62c URL: http://source.winehq.org/git/wine.git/?a=commit;h=81eb827c98fa7a5016f802e92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 16 16:03:43 2017 +0300 qedit/tests: Fix some leaks in tests (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/timeline.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/qedit/tests/timeline.c b/dlls/qedit/tests/timeline.c index b1011fc..94c018e 100644 --- a/dlls/qedit/tests/timeline.c +++ b/dlls/qedit/tests/timeline.c @@ -106,6 +106,9 @@ static void test_timeline(void) hr = IAMTimelineObj_GetTimelineNoRef(obj, &timeline2); ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE got %08x\n", hr); ok(!timeline2, "Expected NULL got %p\n", timeline2); + + IAMTimelineObj_Release(obj); + IAMTimeline_Release(timeline); } static void test_timelineobj_interfaces(void)

1 0

Alexandre Julliard : server: Avoid potential double free (Coverity).
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: af238f5653a4dd1656eb2027d1605e8088613772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af238f5653a4dd1656eb2027d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 16 15:28:38 2017 +0200 server: Avoid potential double free (Coverity). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/mapping.c b/server/mapping.c index f9f50ed..d9bff4b 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -507,13 +507,13 @@ static int build_shared_mapping( struct mapping *mapping, int fd, } if (pwrite( shared_fd, buffer, file_size, write_pos ) != file_size) goto error; } - free( buffer ); if (!(shared = alloc_object( &shared_map_ops ))) goto error; shared->fd = (struct fd *)grab_object( mapping->fd ); shared->file = file; list_add_head( &shared_map_list, &shared->entry ); mapping->shared = shared; + free( buffer ); return 1; error:

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2017