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

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 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: 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 : 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

Alexandre Julliard : server: Return the top surface window even when not using OpenGL.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: 4f88a57ce72d72ca17a9b281f4cfefaa86729e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f88a57ce72d72ca17a9b281f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 10:59:38 2017 +0200 server: Return the top surface window even when not using OpenGL. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 5 +++-- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 3 ++- server/request.h | 1 + server/trace.c | 1 + server/window.c | 7 ++++--- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a9f3d9e..87f8deb 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2059,7 +2059,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, { WND *win; HWND surface_win = 0, parent = GetAncestor( hwnd, GA_PARENT ); - BOOL ret; + BOOL ret, needs_update = FALSE; int old_width; RECT visible_rect, old_visible_rect, old_window_rect; struct window_surface *old_surface, *new_surface = NULL; @@ -2116,6 +2116,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, win->visible_rect = visible_rect; win->surface = new_surface; surface_win = wine_server_ptr_handle( reply->surface_win ); + needs_update = reply->needs_update; if (GetWindowLongW( win->parent, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) { RECT client; @@ -2133,7 +2134,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (ret) { - if (surface_win) update_surface_region( surface_win ); + if (needs_update) update_surface_region( surface_win ); if (((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED | SWP_FRAMECHANGED))) invalidate_dce( win, &old_window_rect ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d31579c..261391a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3591,7 +3591,7 @@ struct set_window_pos_reply unsigned int new_style; unsigned int new_ex_style; user_handle_t surface_win; - char __pad_20[4]; + int needs_update; }; #define SET_WINPOS_PAINT_SURFACE 0x01 #define SET_WINPOS_PIXEL_FORMAT 0x02 @@ -6419,6 +6419,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 533 +#define SERVER_PROTOCOL_VERSION 534 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 1f88c6a..b834c89 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2592,7 +2592,8 @@ enum message_type @REPLY unsigned int new_style; /* new window style */ unsigned int new_ex_style; /* new window extended style */ - user_handle_t surface_win; /* window that needs a surface update */ + user_handle_t surface_win; /* parent window that holds the surface */ + int needs_update; /* whether the surface region needs an update */ @END #define SET_WINPOS_PAINT_SURFACE 0x01 /* window has a paintable surface */ #define SET_WINPOS_PIXEL_FORMAT 0x02 /* window has a custom pixel format */ diff --git a/server/request.h b/server/request.h index 30d2234..f76f668 100644 --- a/server/request.h +++ b/server/request.h @@ -1726,6 +1726,7 @@ C_ASSERT( sizeof(struct set_window_pos_request) == 56 ); C_ASSERT( FIELD_OFFSET(struct set_window_pos_reply, new_style) == 8 ); C_ASSERT( FIELD_OFFSET(struct set_window_pos_reply, new_ex_style) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_window_pos_reply, surface_win) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_window_pos_reply, needs_update) == 20 ); C_ASSERT( sizeof(struct set_window_pos_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_request, relative) == 16 ); diff --git a/server/trace.c b/server/trace.c index 7a4b4b2..ac0f8b0 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3146,6 +3146,7 @@ static void dump_set_window_pos_reply( const struct set_window_pos_reply *req ) fprintf( stderr, " new_style=%08x", req->new_style ); fprintf( stderr, ", new_ex_style=%08x", req->new_ex_style ); fprintf( stderr, ", surface_win=%08x", req->surface_win ); + fprintf( stderr, ", needs_update=%d", req->needs_update ); } static void dump_get_window_rectangles_request( const struct get_window_rectangles_request *req ) diff --git a/server/window.c b/server/window.c index f35d6f6..463c4f2 100644 --- a/server/window.c +++ b/server/window.c @@ -2298,10 +2298,11 @@ DECL_HANDLER(set_window_pos) reply->new_ex_style = win->ex_style; top = get_top_clipping_window( win ); - if (is_visible( top ) && - (top->paint_flags & PAINT_HAS_SURFACE) && - (top->paint_flags & (PAINT_HAS_PIXEL_FORMAT | PAINT_PIXEL_FORMAT_CHILD))) + if (is_visible( top ) && (top->paint_flags & PAINT_HAS_SURFACE)) + { reply->surface_win = top->handle; + reply->needs_update = !!(top->paint_flags & (PAINT_HAS_PIXEL_FORMAT | PAINT_PIXEL_FORMAT_CHILD)); + } }

1 0

Alexandre Julliard : user32: Add a helper function for copying bits from a window surface.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: 4e13c06f3bc043b454d931ba161b8bf0bfa400ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e13c06f3bc043b454d931ba1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:03:44 2017 +0200 user32: Add a helper function for copying bits from a window surface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 50 ++++++++++++++++++++++++++++------------------ dlls/user32/user_private.h | 2 +- dlls/user32/winpos.c | 2 +- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 7a6b0dc..1bfb86d 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -760,6 +760,32 @@ void erase_now( HWND hwnd, UINT rdw_flags ) /*********************************************************************** + * copy_bits_from_surface + * + * Copy bits from a window surface; helper for move_window_bits and move_window_bits_parent. + */ +static void copy_bits_from_surface( HWND hwnd, struct window_surface *surface, + const RECT *dst, const RECT *src ) +{ + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + void *bits; + UINT flags = UPDATE_NOCHILDREN; + HRGN rgn = get_update_region( hwnd, &flags, NULL ); + HDC hdc = GetDCEx( hwnd, rgn, DCX_CACHE | DCX_WINDOW | DCX_EXCLUDERGN ); + + bits = surface->funcs->get_info( surface, info ); + surface->funcs->lock( surface ); + SetDIBitsToDevice( hdc, dst->left, dst->top, dst->right - dst->left, dst->bottom - dst->top, + src->left - surface->rect.left, surface->rect.bottom - src->bottom, + 0, surface->rect.bottom - surface->rect.top, + bits, info, DIB_RGB_COLORS ); + surface->funcs->unlock( surface ); + ReleaseDC( hwnd, hdc ); +} + + +/*********************************************************************** * move_window_bits * * Move the window bits when a window is resized or its surface recreated. @@ -767,7 +793,7 @@ void erase_now( HWND hwnd, UINT rdw_flags ) void move_window_bits( HWND hwnd, struct window_surface *old_surface, struct window_surface *new_surface, const RECT *visible_rect, const RECT *old_visible_rect, - const RECT *client_rect, const RECT *valid_rects ) + const RECT *window_rect, const RECT *valid_rects ) { RECT dst = valid_rects[0]; RECT src = valid_rects[1]; @@ -776,24 +802,10 @@ void move_window_bits( HWND hwnd, struct window_surface *old_surface, src.left - old_visible_rect->left != dst.left - visible_rect->left || src.top - old_visible_rect->top != dst.top - visible_rect->top) { - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *info = (BITMAPINFO *)buffer; - void *bits; - UINT flags = UPDATE_NOCHILDREN; - HRGN rgn = get_update_region( hwnd, &flags, NULL ); - HDC hdc = GetDCEx( hwnd, rgn, DCX_CACHE | DCX_EXCLUDERGN ); - - OffsetRect( &dst, -client_rect->left, -client_rect->top ); - TRACE( "copying %s -> %s\n", wine_dbgstr_rect(&src), wine_dbgstr_rect(&dst) ); - bits = old_surface->funcs->get_info( old_surface, info ); - old_surface->funcs->lock( old_surface ); - SetDIBitsToDevice( hdc, dst.left, dst.top, dst.right - dst.left, dst.bottom - dst.top, - src.left - old_visible_rect->left - old_surface->rect.left, - old_surface->rect.bottom - (src.bottom - old_visible_rect->top), - 0, old_surface->rect.bottom - old_surface->rect.top, - bits, info, DIB_RGB_COLORS ); - old_surface->funcs->unlock( old_surface ); - ReleaseDC( hwnd, hdc ); + TRACE( "copying %s -> %s\n", wine_dbgstr_rect( &src ), wine_dbgstr_rect( &dst )); + OffsetRect( &src, -old_visible_rect->left, -old_visible_rect->top ); + OffsetRect( &dst, -window_rect->left, -window_rect->top ); + copy_bits_from_surface( hwnd, old_surface, &dst, &src ); } } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index b4a756c..a697fd9 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -231,7 +231,7 @@ extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN; extern void move_window_bits( HWND hwnd, struct window_surface *old_surface, struct window_surface *new_surface, const RECT *visible_rect, const RECT *old_visible_rect, - const RECT *client_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; + const RECT *window_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; extern void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 87f8deb..a37ab7c 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2151,7 +2151,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (!IsRectEmpty( valid_rects )) { move_window_bits( hwnd, old_surface, new_surface, &visible_rect, - &old_visible_rect, client_rect, valid_rects ); + &old_visible_rect, window_rect, valid_rects ); valid_rects = NULL; /* prevent the driver from trying to also move the bits */ } window_surface_release( old_surface );

1 0

Alexandre Julliard : user32: Copy the bits of child windows when the parent has a surface.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: 5b9c69b93ffa9dc9e4d71660cf076c43d4e05c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b9c69b93ffa9dc9e4d71660c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:04:52 2017 +0200 user32: Copy the bits of child windows when the parent has a surface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 35 +++++++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 2 ++ dlls/user32/winpos.c | 35 +++++++++++++++++++++++++++++++---- 3 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 1bfb86d..3c7f220 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -811,6 +811,41 @@ void move_window_bits( HWND hwnd, struct window_surface *old_surface, /*********************************************************************** + * move_window_bits_parent + * + * Move the window bits in the parent surface when a child is moved. + */ +void move_window_bits_parent( HWND hwnd, HWND parent, const RECT *window_rect, const RECT *valid_rects ) +{ + struct window_surface *surface; + RECT dst = valid_rects[0]; + RECT src = valid_rects[1]; + WND *win; + + if (src.left == dst.left && src.top == dst.top) return; + + if (!(win = WIN_GetPtr( parent ))) return; + if (win == WND_DESKTOP || win == WND_OTHER_PROCESS) return; + if (!(surface = win->surface)) + { + WIN_ReleasePtr( win ); + return; + } + + TRACE( "copying %s -> %s\n", wine_dbgstr_rect( &src ), wine_dbgstr_rect( &dst )); + MapWindowPoints( GetAncestor( hwnd, GA_PARENT ), parent, (POINT *)&src, 2 ); + OffsetRect( &src, win->rectClient.left - win->visible_rect.left, + win->rectClient.top - win->visible_rect.top ); + OffsetRect( &dst, -window_rect->left, -window_rect->top ); + window_surface_add_ref( surface ); + WIN_ReleasePtr( win ); + + copy_bits_from_surface( hwnd, surface, &dst, &src ); + window_surface_release( surface ); +} + + +/*********************************************************************** * update_now * * Implementation of RDW_UPDATENOW behavior. diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index a697fd9..052fdd8 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -232,6 +232,8 @@ extern void move_window_bits( HWND hwnd, struct window_surface *old_surface, struct window_surface *new_surface, const RECT *visible_rect, const RECT *old_visible_rect, const RECT *window_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; +extern void move_window_bits_parent( HWND hwnd, HWND parent, const RECT *window_rect, + const RECT *valid_rects ) DECLSPEC_HIDDEN; extern void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a37ab7c..a89c60d 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2060,8 +2060,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, WND *win; HWND surface_win = 0, parent = GetAncestor( hwnd, GA_PARENT ); BOOL ret, needs_update = FALSE; - int old_width; - RECT visible_rect, old_visible_rect, old_window_rect; + RECT visible_rect, old_visible_rect, old_window_rect, old_client_rect; struct window_surface *old_surface, *new_surface = NULL; if (!parent || parent == GetDesktopWindow()) @@ -2080,8 +2079,8 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (new_surface) window_surface_release( new_surface ); return FALSE; } - old_width = win->rectClient.right - win->rectClient.left; old_visible_rect = win->visible_rect; + old_client_rect = win->rectClient; old_surface = win->surface; if (old_surface != new_surface) swp_flags |= SWP_FRAMECHANGED; /* force refreshing non-client area */ @@ -2126,7 +2125,8 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, mirror_rect( &client, &win->visible_rect ); } /* if an RTL window is resized the children have moved */ - if (win->dwExStyle & WS_EX_LAYOUTRTL && client_rect->right - client_rect->left != old_width) + if (win->dwExStyle & WS_EX_LAYOUTRTL && + client_rect->right - client_rect->left != old_client_rect.right - old_client_rect.left) win->flags |= WIN_CHILDREN_MOVED; } } @@ -2156,6 +2156,33 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, } window_surface_release( old_surface ); } + else if (surface_win && surface_win != hwnd) + { + if (!IsRectEmpty( valid_rects )) + { + RECT rects[2]; + int x_offset = old_visible_rect.left - visible_rect.left; + int y_offset = old_visible_rect.top - visible_rect.top; + + /* if all that happened is that the whole window moved, copy everything */ + if (!(swp_flags & SWP_FRAMECHANGED) && + old_visible_rect.right - visible_rect.right == x_offset && + old_visible_rect.bottom - visible_rect.bottom == y_offset && + old_client_rect.left - client_rect->left == x_offset && + old_client_rect.right - client_rect->right == x_offset && + old_client_rect.top - client_rect->top == y_offset && + old_client_rect.bottom - client_rect->bottom == y_offset && + EqualRect( &valid_rects[0], client_rect )) + { + rects[0] = visible_rect; + rects[1] = old_visible_rect; + valid_rects = rects; + } + move_window_bits_parent( hwnd, surface_win, window_rect, valid_rects ); + valid_rects = NULL; /* prevent the driver from trying to also move the bits */ + } + } + USER_Driver->pWindowPosChanged( hwnd, insert_after, swp_flags, window_rect, client_rect, &visible_rect, valid_rects, new_surface ); }

1 0

Alex Henrie : msvcr120: If erff is not available, fall back to erf.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: ddff85a361a28d3b1d13689738d90395aa46ce06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddff85a361a28d3b1d1368973… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 12 18:04:40 2017 +0200 msvcr120: If erff is not available, fall back to erf. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ffb83a6..c5228aa 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2733,28 +2733,27 @@ short CDECL MSVCR120__ldtest(LDOUBLE *x) } /********************************************************************* - * erff (MSVCR120.@) + * erf (MSVCR120.@) */ -float CDECL MSVCR120_erff(float x) +double CDECL MSVCR120_erf(double x) { -#ifdef HAVE_ERFF - return erff(x); +#ifdef HAVE_ERF + return erf(x); #else FIXME( "not implemented\n" ); - return 0.0f; + return 0.0; #endif } /********************************************************************* - * erf (MSVCR120.@) + * erff (MSVCR120.@) */ -double CDECL MSVCR120_erf(double x) +float CDECL MSVCR120_erff(float x) { -#ifdef HAVE_ERF - return erf(x); +#ifdef HAVE_ERFF + return erff(x); #else - FIXME( "not implemented\n" ); - return 0.0; + return MSVCR120_erf(x); #endif }

1 0

Piotr Caban : msvcr120: Add fallback implementation of erf function.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: e495e25af75df8caa9afbfb070fe8feee327b674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e495e25af75df8caa9afbfb07… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 12 18:04:59 2017 +0200 msvcr120: Add fallback implementation of erf function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index c5228aa..04f09ac 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2740,8 +2740,15 @@ double CDECL MSVCR120_erf(double x) #ifdef HAVE_ERF return erf(x); #else - FIXME( "not implemented\n" ); - return 0.0; + /* Abramowitz and Stegun approximation, maximum error: 1.5*10^-7 */ + double t, y; + int sign = signbit(x); + + if (sign) x = -x; + t = 1 / (1 + 0.3275911 * x); + y = ((((1.061405429*t - 1.453152027)*t + 1.421413741)*t - 0.284496736)*t + 0.254829592)*t; + y = 1.0 - y*exp(-x*x); + return sign ? -y : y; #endif }

1 0

Piotr Caban : msvcr120: Add fallback implementation of asinh.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: 4df7ced7b08f3b2b9c73e4be16d4c07967c13038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df7ced7b08f3b2b9c73e4be1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 12 18:05:03 2017 +0200 msvcr120: Add fallback implementation of asinh. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 04f09ac..387aab3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2873,8 +2873,8 @@ double CDECL MSVCR120_asinh(double x) #ifdef HAVE_ASINH return asinh(x); #else - FIXME( "not implemented\n" ); - return 0.0; + if (!isfinite(x*x+1)) return log(2) + log(x); + return log(x + sqrt(x*x+1)); #endif } @@ -2886,8 +2886,7 @@ float CDECL MSVCR120_asinhf(float x) #ifdef HAVE_ASINHF return asinhf(x); #else - FIXME( "not implemented\n" ); - return 0.0f; + return MSVCR120_asinh(x); #endif }

1 0