wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Nikolay Sivov : regedit: Simplify double-click listview handler.
by Alexandre Julliard 14 Jul '17

14 Jul '17

Module: wine Branch: master Commit: cbd6e05e681ffc08cdaf89d00d041aae59c40d5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbd6e05e681ffc08cdaf89d00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 14 00:27:11 2017 +0300 regedit: Simplify double-click listview handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 1797b52..f2359c4 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -347,12 +347,8 @@ static int listview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam case NM_DBLCLK: { NMITEMACTIVATE *nmitem = (NMITEMACTIVATE *)lParam; - LVHITTESTINFO info; - info.pt.x = nmitem->ptAction.x; - info.pt.y = nmitem->ptAction.y; - - if (SendMessageW(g_pChildWnd->hListWnd, LVM_HITTEST, 0, (LPARAM)&info) != -1) + if (nmitem->iItem != -1) { LVITEMW item; @@ -362,7 +358,7 @@ static int listview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam item.state = LVIS_FOCUSED | LVIS_SELECTED; item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; - SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, info.iItem, (LPARAM)&item); + SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, nmitem->iItem, (LPARAM)&item); SendMessageW(hFrameWnd, WM_COMMAND, ID_EDIT_MODIFY, 0); }

1 0

Piotr Caban : msvcr120: Fix exception object refcounting in __ExceptionPtrAssign.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: ab313dd3beb7e495b36f8320ffc2354b9c854d51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab313dd3beb7e495b36f8320f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 13 19:15:06 2017 +0200 msvcr120: Fix exception object refcounting in __ExceptionPtrAssign. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index b3bfc2e..2e17f62 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1773,7 +1773,12 @@ void __cdecl __ExceptionPtrAssign(exception_ptr *ep, const exception_ptr *assign TRACE("(%p %p)\n", ep, assign); /* don't destroy object stored in ep */ + if (ep->ref) + InterlockedDecrement(ep->ref); + *ep = *assign; + if (ep->ref) + InterlockedIncrement(ep->ref); } /*********************************************************************

1 0

Piotr Caban : gdiplus: Fix GdipGetVisibleClipBounds behavior on metafiles.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: f9b881e30c43b830c7b1b1bd13924517061da252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b881e30c43b830c7b1b1bd1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 13 11:54:06 2017 +0200 gdiplus: Fix GdipGetVisibleClipBounds behavior on metafiles. 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/graphics.c | 4 ++++ dlls/gdiplus/tests/metafile.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 10d581d..c5c66a9 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2098,6 +2098,10 @@ static GpStatus get_visible_clip_region(GpGraphics *graphics, GpRegion *rgn) GpRectF rectf; GpRegion* tmp; + /* Ignore graphics image bounds for metafiles */ + if (graphics->image && graphics->image_type == ImageTypeMetafile) + return GdipCombineRegionRegion(rgn, graphics->clip, CombineModeReplace); + if((stat = get_graphics_bounds(graphics, &rectf)) != Ok) return stat; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index feeaedb..28881f8 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2117,6 +2117,7 @@ static void test_clipping(void) GpGraphics *graphics; GpBitmap *bitmap; GpBrush *brush; + GpRectF rect; ARGB color; HDC hdc; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; @@ -2140,9 +2141,23 @@ static void test_clipping(void) stat = GdipSaveGraphics(graphics, &state); expect(Ok, stat); + stat = GdipGetVisibleClipBounds(graphics, &rect); + expect(Ok, stat); + ok(rect.X == -0x400000, "rect.X = %f\n", rect.X); + ok(rect.Y == -0x400000, "rect.Y = %f\n", rect.Y); + ok(rect.Width == 0x800000, "rect.Width = %f\n", rect.Width); + ok(rect.Height == 0x800000, "rect.Height = %f\n", rect.Height); + stat = GdipSetClipRect(graphics, 30, 30, 10, 10, CombineModeReplace); expect(Ok, stat); + stat = GdipGetVisibleClipBounds(graphics, &rect); + expect(Ok, stat); + ok(rect.X == 30, "rect.X = %f\n", rect.X); + ok(rect.Y == 30, "rect.Y = %f\n", rect.Y); + ok(rect.Width == 10, "rect.Width = %f\n", rect.Width); + ok(rect.Height == 10, "rect.Height = %f\n", rect.Height); + stat = GdipCreateSolidFill((ARGB)0xff000000, (GpSolidFill**)&brush); expect(Ok, stat);

1 0

Piotr Caban : gdiplus: Add partial support for GdipFillPath on metafiles.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: de37cedb70df9993eefcab48cd55421b128d1f32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de37cedb70df9993eefcab48c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 13 11:54:00 2017 +0200 gdiplus: Add partial support for GdipFillPath on metafiles. 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/graphics.c | 3 ++ dlls/gdiplus/metafile.c | 80 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 68 +++++++++++++++++++++++++++++++++++ 4 files changed, 152 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 8c23bbb..88109d7 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -112,6 +112,7 @@ extern GpStatus METAFILE_DrawImagePointsRect(GpMetafile* metafile, GpImage *imag DrawImageAbort callback, VOID *callbackData) DECLSPEC_HIDDEN; extern GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val) DECLSPEC_HIDDEN; extern GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 68614f1..10d581d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4140,6 +4140,9 @@ GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *p if(graphics->busy) return ObjectBusy; + if (graphics->image && graphics->image->type == ImageTypeMetafile) + return METAFILE_FillPath((GpMetafile*)graphics->image, brush, path); + if (!graphics->image && !graphics->alpha_hdc) stat = GDI32_GdipFillPath(graphics, brush, path); diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 3d6214d..a1db09b 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -309,6 +309,7 @@ typedef struct EmfPlusObject EmfPlusRecordHeader Header; union { + EmfPlusBrush brush; EmfPlusPen pen; EmfPlusPath path; EmfPlusImage image; @@ -351,6 +352,16 @@ typedef struct EmfPlusDrawPath DWORD PenId; } EmfPlusDrawPath; +typedef struct EmfPlusFillPath +{ + EmfPlusRecordHeader Header; + union + { + DWORD BrushId; + EmfPlusARGB Color; + } data; +} EmfPlusFillPath; + static DWORD METAFILE_AddObjectId(GpMetafile *metafile) { return (metafile->next_object_id++) % 64; @@ -2915,3 +2926,72 @@ GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) METAFILE_WriteRecords(metafile); return NotImplemented; } + +static GpStatus METAFILE_AddBrushObject(GpMetafile *metafile, GpBrush *brush, DWORD *id) +{ + EmfPlusObject *object_record; + GpStatus stat; + DWORD size; + + *id = -1; + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) + return Ok; + + stat = METAFILE_PrepareBrushData(brush, &size); + if (stat != Ok) return stat; + + stat = METAFILE_AllocateRecord(metafile, + FIELD_OFFSET(EmfPlusObject, ObjectData) + size, (void**)&object_record); + if (stat != Ok) return stat; + + *id = METAFILE_AddObjectId(metafile); + object_record->Header.Type = EmfPlusRecordTypeObject; + object_record->Header.Flags = *id | ObjectTypeBrush << 8; + METAFILE_FillBrushData(brush, &object_record->ObjectData.brush); + return Ok; +} + +GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) +{ + EmfPlusFillPath *fill_path_record; + DWORD brush_id = -1, path_id; + BOOL inline_color; + GpStatus stat; + + if (metafile->metafile_type == MetafileTypeEmf) + { + FIXME("stub!\n"); + return NotImplemented; + } + + inline_color = brush->bt == BrushTypeSolidColor; + if (!inline_color) + { + stat = METAFILE_AddBrushObject(metafile, brush, &brush_id); + if (stat != Ok) return stat; + } + + stat = METAFILE_AddPathObject(metafile, path, &path_id); + if (stat != Ok) return stat; + + stat = METAFILE_AllocateRecord(metafile, + sizeof(EmfPlusFillPath), (void**)&fill_path_record); + if (stat != Ok) return stat; + fill_path_record->Header.Type = EmfPlusRecordTypeFillPath; + if (inline_color) + { + fill_path_record->Header.Flags = 0x8000 | path_id; + fill_path_record->data.Color.Blue = ((GpSolidFill*)brush)->color & 0xff; + fill_path_record->data.Color.Green = (((GpSolidFill*)brush)->color >> 8) & 0xff; + fill_path_record->data.Color.Red = (((GpSolidFill*)brush)->color >> 16) & 0xff; + fill_path_record->data.Color.Alpha = ((GpSolidFill*)brush)->color >> 24; + } + else + { + fill_path_record->Header.Flags = path_id; + fill_path_record->data.BrushId = brush_id; + } + + METAFILE_WriteRecords(metafile); + return Ok; +} diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index fe14e29..feeaedb 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2549,6 +2549,73 @@ static void test_drawpath(void) expect(Ok, stat); } +static const emfplus_record fill_path_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeObject}, + {0, EmfPlusRecordTypeFillPath}, + {1, EMR_SAVEDC}, + {1, EMR_SETICMMODE}, + {1, EMR_BITBLT}, + {1, EMR_RESTOREDC}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_fillpath(void) +{ + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + + GpMetafile *metafile; + GpGraphics *graphics; + GpSolidFill *brush; + HENHMETAFILE hemf; + GpStatus stat; + GpPath *path; + HDC hdc; + + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, stat); + stat = GdipAddPathLine(path, 5, 5, 30, 30); + expect(Ok, stat); + stat = GdipAddPathLine(path, 30, 30, 5, 30); + expect(Ok, stat); + + stat = GdipCreateSolidFill(0xffaabbcc, &brush); + expect(Ok, stat); + + stat = GdipFillPath(graphics, (GpBrush*)brush, path); + expect(Ok, stat); + + stat = GdipDeleteBrush((GpBrush*)brush); + expect(Ok, stat); + stat = GdipDeletePath(path); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + sync_metafile(&metafile, "fill_path.emf"); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + check_emfplus(hemf, fill_path_records, "fill path"); + DeleteEnhMetaFile(hemf); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2589,6 +2656,7 @@ START_TEST(metafile) test_drawimage(); test_properties(); test_drawpath(); + test_fillpath(); GdiplusShutdown(gdiplusToken); }

1 0

Piotr Caban : gdiplus: Add partial support for GdipDrawPath on metafiles.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: e79c4caf143c9e143bae61f4de0659caf7b6a53c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79c4caf143c9e143bae61f4d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 13 11:53:55 2017 +0200 gdiplus: Add partial support for GdipDrawPath on metafiles. 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 | 21 ++++++++++++++++++++- dlls/gdiplus/tests/metafile.c | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 7767e39..3d6214d 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -345,6 +345,12 @@ typedef struct EmfPlusDrawImagePoints } PointData[3]; } EmfPlusDrawImagePoints; +typedef struct EmfPlusDrawPath +{ + EmfPlusRecordHeader Header; + DWORD PenId; +} EmfPlusDrawPath; + static DWORD METAFILE_AddObjectId(GpMetafile *metafile) { return (metafile->next_object_id++) % 64; @@ -2654,6 +2660,7 @@ static GpStatus METAFILE_AddPathObject(GpMetafile *metafile, GpPath *path, DWORD GpStatus stat; DWORD i, size; + *id = -1; if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) return Ok; @@ -2722,6 +2729,7 @@ static GpStatus METAFILE_AddPenObject(GpMetafile *metafile, GpPen *pen, DWORD *i GpStatus stat; BOOL result; + *id = -1; if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) return Ok; @@ -2881,11 +2889,16 @@ static GpStatus METAFILE_AddPenObject(GpMetafile *metafile, GpPen *pen, DWORD *i GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) { + EmfPlusDrawPath *draw_path_record; DWORD path_id; DWORD pen_id; GpStatus stat; - FIXME("stub!\n"); + if (metafile->metafile_type == MetafileTypeEmf) + { + FIXME("stub!\n"); + return NotImplemented; + } stat = METAFILE_AddPenObject(metafile, pen, &pen_id); if (stat != Ok) return stat; @@ -2893,6 +2906,12 @@ GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) stat = METAFILE_AddPathObject(metafile, path, &path_id); if (stat != Ok) return stat; + stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusDrawPath), (void**)&draw_path_record); + if (stat != Ok) return stat; + draw_path_record->Header.Type = EmfPlusRecordTypeDrawPath; + draw_path_record->Header.Flags = path_id; + draw_path_record->PenId = pen_id; + METAFILE_WriteRecords(metafile); return NotImplemented; } diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 7dd5234..fe14e29 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2488,7 +2488,7 @@ static const emfplus_record draw_path_records[] = { {0, EmfPlusRecordTypeHeader}, {0, EmfPlusRecordTypeObject}, {0, EmfPlusRecordTypeObject}, - {1, EmfPlusRecordTypeDrawPath}, + {0, EmfPlusRecordTypeDrawPath}, {1, EMR_SAVEDC}, {1, EMR_SETICMMODE}, {1, EMR_BITBLT},

1 0

Piotr Caban : gdiplus: Add helper for saving pens to metafile.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: 7d6896efee988cf326d5603d2c5ed61671b34159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d6896efee988cf326d5603d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 13 11:53:51 2017 +0200 gdiplus: Add helper for saving pens 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 | 276 ++++++++++++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/metafile.c | 2 +- 2 files changed, 269 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index ee1efa1..7767e39 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -43,6 +43,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); +typedef struct EmfPlusARGB +{ + BYTE Blue; + BYTE Green; + BYTE Red; + BYTE Alpha; +} EmfPlusARGB; + typedef struct EmfPlusRecordHeader { WORD Type; @@ -157,6 +165,69 @@ typedef struct container GpRegion *clip; } container; +enum PenDataFlags +{ + PenDataTransform = 0x0001, + PenDataStartCap = 0x0002, + PenDataEndCap = 0x0004, + PenDataJoin = 0x0008, + PenDataMiterLimit = 0x0010, + PenDataLineStyle = 0x0020, + PenDataDashedLineCap = 0x0040, + PenDataDashedLineOffset = 0x0080, + PenDataDashedLine = 0x0100, + PenDataNonCenter = 0x0200, + PenDataCompoundLine = 0x0400, + PenDataCustomStartCap = 0x0800, + PenDataCustomEndCap = 0x1000 +}; + +typedef struct EmfPlusTransformMatrix +{ + REAL TransformMatrix[6]; +} EmfPlusTransformMatrix; + +enum LineStyle +{ + LineStyleSolid, + LineStyleDash, + LineStyleDot, + LineStyleDashDot, + LineStyleDashDotDot, + LineStyleCustom +}; + +typedef struct EmfPlusPenData +{ + DWORD PenDataFlags; + DWORD PenUnit; + REAL PenWidth; + BYTE OptionalData[1]; +} EmfPlusPenData; + +typedef struct EmfPlusSolidBrushData +{ + EmfPlusARGB SolidColor; +} EmfPlusSolidBrushData; + +typedef struct EmfPlusBrush +{ + DWORD Version; + DWORD Type; + union { + EmfPlusSolidBrushData solid; + } BrushData; +} EmfPlusBrush; + +typedef struct EmfPlusPen +{ + DWORD Version; + DWORD Type; + /* EmfPlusPenData */ + /* EmfPlusBrush */ + BYTE data[1]; +} EmfPlusPen; + typedef struct EmfPlusPath { DWORD Version; @@ -209,14 +280,6 @@ typedef struct EmfPlusImage } ImageData; } EmfPlusImage; -typedef struct EmfPlusARGB -{ - BYTE Blue; - BYTE Green; - BYTE Red; - BYTE Alpha; -} EmfPlusARGB; - typedef struct EmfPlusImageAttributes { DWORD Version; @@ -246,6 +309,7 @@ typedef struct EmfPlusObject EmfPlusRecordHeader Header; union { + EmfPlusPen pen; EmfPlusPath path; EmfPlusImage image; EmfPlusImageAttributes image_attributes; @@ -2623,13 +2687,209 @@ static GpStatus METAFILE_AddPathObject(GpMetafile *metafile, GpPath *path, DWORD return Ok; } +static GpStatus METAFILE_PrepareBrushData(GpBrush *brush, DWORD *size) +{ + if (brush->bt == BrushTypeSolidColor) + { + *size = FIELD_OFFSET(EmfPlusBrush, BrushData.solid) + sizeof(EmfPlusSolidBrushData); + return Ok; + } + + FIXME("unsupported brush type: %d\n", brush->bt); + return NotImplemented; +} + +static void METAFILE_FillBrushData(GpBrush *brush, EmfPlusBrush *data) +{ + if (brush->bt == BrushTypeSolidColor) + { + GpSolidFill *solid = (GpSolidFill*)brush; + + data->Version = 0xDBC01002; + data->Type = solid->brush.bt; + data->BrushData.solid.SolidColor.Blue = solid->color & 0xff; + data->BrushData.solid.SolidColor.Green = (solid->color >> 8) & 0xff; + data->BrushData.solid.SolidColor.Red = (solid->color >> 16) & 0xff; + data->BrushData.solid.SolidColor.Alpha = solid->color >> 24; + } +} + +static GpStatus METAFILE_AddPenObject(GpMetafile *metafile, GpPen *pen, DWORD *id) +{ + DWORD i, data_flags, pen_data_size, brush_size; + EmfPlusObject *object_record; + EmfPlusPenData *pen_data; + GpStatus stat; + BOOL result; + + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) + return Ok; + + data_flags = 0; + pen_data_size = FIELD_OFFSET(EmfPlusPenData, OptionalData); + + GdipIsMatrixIdentity(&pen->transform, &result); + if (!result) + { + data_flags |= PenDataTransform; + pen_data_size += sizeof(EmfPlusTransformMatrix); + } + if (pen->startcap != LineCapFlat) + { + data_flags |= PenDataStartCap; + pen_data_size += sizeof(DWORD); + } + if (pen->endcap != LineCapFlat) + { + data_flags |= PenDataEndCap; + pen_data_size += sizeof(DWORD); + } + if (pen->join != LineJoinMiter) + { + data_flags |= PenDataJoin; + pen_data_size += sizeof(DWORD); + } + if (pen->miterlimit != 10.0) + { + data_flags |= PenDataMiterLimit; + pen_data_size += sizeof(REAL); + } + if (pen->style != GP_DEFAULT_PENSTYLE) + { + data_flags |= PenDataLineStyle; + pen_data_size += sizeof(DWORD); + } + if (pen->dash != (GpDashStyle)DashCapFlat) + { + data_flags |= PenDataDashedLineCap; + pen_data_size += sizeof(DWORD); + } + data_flags |= PenDataDashedLineOffset; + pen_data_size += sizeof(REAL); + if (pen->numdashes) + { + data_flags |= PenDataDashedLine; + pen_data_size += sizeof(DWORD) + pen->numdashes*sizeof(REAL); + } + if (pen->align != PenAlignmentCenter) + { + data_flags |= PenDataNonCenter; + pen_data_size += sizeof(DWORD); + } + /* TODO: Add support for PenDataCompoundLine */ + if (pen->customstart) + { + FIXME("ignoring custom start cup\n"); + } + if (pen->customend) + { + FIXME("ignoring custom end cup\n"); + } + + stat = METAFILE_PrepareBrushData(pen->brush, &brush_size); + if (stat != Ok) return stat; + + stat = METAFILE_AllocateRecord(metafile, + FIELD_OFFSET(EmfPlusObject, ObjectData.pen.data) + pen_data_size + brush_size, + (void**)&object_record); + if (stat != Ok) return stat; + + *id = METAFILE_AddObjectId(metafile); + object_record->Header.Type = EmfPlusRecordTypeObject; + object_record->Header.Flags = *id | ObjectTypePen << 8; + object_record->ObjectData.pen.Version = 0xDBC01002; + object_record->ObjectData.pen.Type = 0; + + pen_data = (EmfPlusPenData*)object_record->ObjectData.pen.data; + pen_data->PenDataFlags = data_flags; + pen_data->PenUnit = pen->unit; + pen_data->PenWidth = pen->width; + + i = 0; + if (data_flags & PenDataTransform) + { + EmfPlusTransformMatrix *m = (EmfPlusTransformMatrix*)(pen_data->OptionalData + i); + memcpy(m, &pen->transform, sizeof(*m)); + i += sizeof(EmfPlusTransformMatrix); + } + if (data_flags & PenDataStartCap) + { + *(DWORD*)(pen_data->OptionalData + i) = pen->startcap; + i += sizeof(DWORD); + } + if (data_flags & PenDataEndCap) + { + *(DWORD*)(pen_data->OptionalData + i) = pen->endcap; + i += sizeof(DWORD); + } + if (data_flags & PenDataJoin) + { + *(DWORD*)(pen_data->OptionalData + i) = pen->join; + i += sizeof(DWORD); + } + if (data_flags & PenDataMiterLimit) + { + *(REAL*)(pen_data->OptionalData + i) = pen->miterlimit; + i += sizeof(REAL); + } + if (data_flags & PenDataLineStyle) + { + switch (pen->style & PS_STYLE_MASK) + { + case PS_SOLID: *(DWORD*)(pen_data->OptionalData + i) = LineStyleSolid; break; + case PS_DASH: *(DWORD*)(pen_data->OptionalData + i) = LineStyleDash; break; + case PS_DOT: *(DWORD*)(pen_data->OptionalData + i) = LineStyleDot; break; + case PS_DASHDOT: *(DWORD*)(pen_data->OptionalData + i) = LineStyleDashDot; break; + case PS_DASHDOTDOT: *(DWORD*)(pen_data->OptionalData + i) = LineStyleDashDotDot; break; + default: *(DWORD*)(pen_data->OptionalData + i) = LineStyleCustom; break; + } + i += sizeof(DWORD); + } + if (data_flags & PenDataDashedLineCap) + { + *(DWORD*)(pen_data->OptionalData + i) = pen->dash; + i += sizeof(DWORD); + } + if (data_flags & PenDataDashedLineOffset) + { + *(REAL*)(pen_data->OptionalData + i) = pen->offset; + i += sizeof(REAL); + } + if (data_flags & PenDataDashedLine) + { + int j; + + *(DWORD*)(pen_data->OptionalData + i) = pen->numdashes; + i += sizeof(DWORD); + + for (j=0; j<pen->numdashes; j++) + { + *(REAL*)(pen_data->OptionalData + i) = pen->dashes[j]; + i += sizeof(REAL); + } + } + if (data_flags & PenDataNonCenter) + { + *(REAL*)(pen_data->OptionalData + i) = pen->align; + i += sizeof(DWORD); + } + + METAFILE_FillBrushData(pen->brush, + (EmfPlusBrush*)(object_record->ObjectData.pen.data + pen_data_size)); + return Ok; +} + GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) { DWORD path_id; + DWORD pen_id; GpStatus stat; FIXME("stub!\n"); + stat = METAFILE_AddPenObject(metafile, pen, &pen_id); + if (stat != Ok) return stat; + stat = METAFILE_AddPathObject(metafile, path, &path_id); if (stat != Ok) return stat; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 1d3a35d..7dd5234 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2487,7 +2487,7 @@ static const emfplus_record draw_path_records[] = { {0, EMR_HEADER}, {0, EmfPlusRecordTypeHeader}, {0, EmfPlusRecordTypeObject}, - {1, EmfPlusRecordTypeObject}, + {0, EmfPlusRecordTypeObject}, {1, EmfPlusRecordTypeDrawPath}, {1, EMR_SAVEDC}, {1, EMR_SETICMMODE},

1 0

Piotr Caban : gdiplus: Add helper for saving path objects in metafile.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: e502a8dd071d69065e2c23eeef3d7c847ce81e9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e502a8dd071d69065e2c23eee… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 13 11:53:48 2017 +0200 gdiplus: Add helper for saving path objects in 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 | 63 ++++++++++++++++++++++++++++++++++++++++++- dlls/gdiplus/tests/metafile.c | 2 +- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 2c3be42..ee1efa1 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -157,6 +157,17 @@ typedef struct container GpRegion *clip; } container; +typedef struct EmfPlusPath +{ + DWORD Version; + DWORD PathPointCount; + DWORD PathPointFlags; + /* PathPoints[] */ + /* PathPointTypes[] */ + /* AlignmentPadding */ + BYTE data[1]; +} EmfPlusPath; + typedef enum { BitmapDataTypePixel, @@ -235,6 +246,7 @@ typedef struct EmfPlusObject EmfPlusRecordHeader Header; union { + EmfPlusPath path; EmfPlusImage image; EmfPlusImageAttributes image_attributes; } ObjectData; @@ -2570,8 +2582,57 @@ GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val) return Ok; } +static GpStatus METAFILE_AddPathObject(GpMetafile *metafile, GpPath *path, DWORD *id) +{ + EmfPlusObject *object_record; + EmfPlusPointF *points; + BYTE *types; + GpStatus stat; + DWORD i, size; + + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) + return Ok; + + /* TODO: Add support for more point formats */ + size = sizeof(EmfPlusPointF)*path->pathdata.Count + path->pathdata.Count; + size = (size + 3) & ~3; + + stat = METAFILE_AllocateRecord(metafile, + FIELD_OFFSET(EmfPlusObject, ObjectData.path.data[size]), + (void**)&object_record); + if (stat != Ok) return stat; + + *id = METAFILE_AddObjectId(metafile); + object_record->Header.Type = EmfPlusRecordTypeObject; + object_record->Header.Flags = *id | ObjectTypePath << 8; + + object_record->ObjectData.path.Version = 0xDBC01002; + object_record->ObjectData.path.PathPointCount = path->pathdata.Count; + object_record->ObjectData.path.PathPointFlags = 0; + + points = (EmfPlusPointF*)object_record->ObjectData.path.data; + for (i=0; i<path->pathdata.Count; i++) + { + points[i].X = path->pathdata.Points[i].X; + points[i].Y = path->pathdata.Points[i].Y; + } + + types = (BYTE*)(points + path->pathdata.Count); + for (i=0; i<path->pathdata.Count; i++) + types[i] = path->pathdata.Types[i]; + return Ok; +} + GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) { - FIXME("stub\n"); + DWORD path_id; + GpStatus stat; + + FIXME("stub!\n"); + + stat = METAFILE_AddPathObject(metafile, path, &path_id); + if (stat != Ok) return stat; + + METAFILE_WriteRecords(metafile); return NotImplemented; } diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 805db91..1d3a35d 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2486,7 +2486,7 @@ static void test_properties(void) static const emfplus_record draw_path_records[] = { {0, EMR_HEADER}, {0, EmfPlusRecordTypeHeader}, - {1, EmfPlusRecordTypeObject}, + {0, EmfPlusRecordTypeObject}, {1, EmfPlusRecordTypeObject}, {1, EmfPlusRecordTypeDrawPath}, {1, EMR_SAVEDC},

1 0

Piotr Caban : gdiplus: Add DrawPath stub for metafiles.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: 8608bf532e76fc16a91b0a9bc42ba4644f24160c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8608bf532e76fc16a91b0a9bc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 13 11:53:43 2017 +0200 gdiplus: Add DrawPath stub for metafiles. 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/graphics.c | 4 ++- dlls/gdiplus/metafile.c | 6 ++++ dlls/gdiplus/tests/metafile.c | 69 +++++++++++++++++++++++++++++++++++++++++- 4 files changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index f24f38e..8c23bbb 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -111,6 +111,7 @@ extern GpStatus METAFILE_DrawImagePointsRect(GpMetafile* metafile, GpImage *imag REAL srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, DrawImageAbort callback, VOID *callbackData) DECLSPEC_HIDDEN; extern GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a56ac43..68614f1 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3819,7 +3819,9 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) if (path->pathdata.Count == 0) return Ok; - if (!graphics->hdc || !brush_can_fill_path(pen->brush, FALSE)) + if (graphics->image && graphics->image->type == ImageTypeMetafile) + retval = METAFILE_DrawPath((GpMetafile*)graphics->image, pen, path); + else if (!graphics->hdc || !brush_can_fill_path(pen->brush, FALSE)) retval = SOFTWARE_GdipDrawPath(graphics, pen, path); else retval = GDI32_GdipDrawPath(graphics, pen, path); diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index df87a66..2c3be42 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2569,3 +2569,9 @@ GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val) METAFILE_WriteRecords(metafile); return Ok; } + +GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) +{ + FIXME("stub\n"); + return NotImplemented; +} diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 2ed8355..805db91 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -939,7 +939,7 @@ static void test_emfonly(void) stat = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); expect(Ok, stat); stat = GdipDrawLineI(graphics, pen, 0, 0, 10, 10); - expect(Ok, stat); + todo_wine expect(Ok, stat); GdipDeletePen(pen); stat = GdipDeleteGraphics(graphics); @@ -2483,6 +2483,72 @@ static void test_properties(void) expect(Ok, stat); } +static const emfplus_record draw_path_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {1, EmfPlusRecordTypeObject}, + {1, EmfPlusRecordTypeObject}, + {1, EmfPlusRecordTypeDrawPath}, + {1, EMR_SAVEDC}, + {1, EMR_SETICMMODE}, + {1, EMR_BITBLT}, + {1, EMR_RESTOREDC}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_drawpath(void) +{ + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + + GpMetafile *metafile; + GpGraphics *graphics; + HENHMETAFILE hemf; + GpStatus stat; + GpPath *path; + GpPen *pen; + HDC hdc; + + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, stat); + stat = GdipAddPathLine(path, 5, 5, 30, 30); + expect(Ok, stat); + + stat = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, stat); + + stat = GdipDrawPath(graphics, pen, path); + todo_wine expect(Ok, stat); + + stat = GdipDeletePen(pen); + expect(Ok, stat); + stat = GdipDeletePath(path); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + sync_metafile(&metafile, "draw_path.emf"); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + check_emfplus(hemf, draw_path_records, "draw path"); + DeleteEnhMetaFile(hemf); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2522,6 +2588,7 @@ START_TEST(metafile) test_gditransform(); test_drawimage(); test_properties(); + test_drawpath(); GdiplusShutdown(gdiplusToken); }

1 0

Hugh McMaster : regedit: Use UpdateStatusBar() instead of updating the text manually.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: 5a391e18cbc966999da522ff26058a9cd292b74d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a391e18cbc966999da522ff2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 13 13:22:01 2017 +0000 regedit: Use UpdateStatusBar() instead of updating the text manually. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 2a9a14b..1797b52 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -158,17 +158,6 @@ LPWSTR GetItemFullPath(HWND hwndTV, HTREEITEM hItem, BOOL bFull) { return ret; } -static LPWSTR GetPathFullPath(HWND hwndTV, LPWSTR path) { - LPWSTR parts[2]; - LPWSTR ret; - - parts[0] = GetPathRoot(hwndTV, 0, TRUE); - parts[1] = path; - ret = CombinePaths((LPCWSTR*)parts, 2); - HeapFree(GetProcessHeap(), 0, parts[0]); - return ret; -} - static void OnTreeSelectionChanged(HWND hwndTV, HWND hwndLV, HTREEITEM hItem, BOOL bRefreshLV) { if (bRefreshLV) { @@ -325,7 +314,6 @@ static int treeview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam if (res) { TVITEMW item; - WCHAR *fullPath; item.mask = TVIF_HANDLE | TVIF_TEXT; item.hItem = dispInfo->item.hItem; @@ -334,11 +322,9 @@ static int treeview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); update_listview_path(path); - - fullPath = GetPathFullPath(g_pChildWnd->hTreeWnd, path); - SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); - HeapFree(GetProcessHeap(), 0, fullPath); HeapFree(GetProcessHeap(), 0, path); + + UpdateStatusBar(); } SetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA, 0);

1 0

Jacek Caban : winhttp: Allocate netconn_t separately from request_t.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: c5026298198732fd789253428a4d3e488c0379d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5026298198732fd789253428… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 13 13:01:03 2017 +0200 winhttp: Allocate netconn_t separately from request_t. Once persistent connections will be supported, life time of connection may exceed life time of request object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 34 ++++++++--------------------- dlls/winhttp/request.c | 49 ++++++++++++++++++++++-------------------- dlls/winhttp/session.c | 38 ++++++++++++++++---------------- dlls/winhttp/winhttp_private.h | 5 ++--- 4 files changed, 57 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5026298198732fd78925…

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
64
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 July 2017