wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Michael Stefaniuc : user32/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 7f5adb69cd0e9abcc23d1c715545a2aef1b83020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5adb69cd0e9abcc23d1c715… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 16 10:32:02 2016 +0200 user32/tests: Use wine_dbgstr_rect() to print RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dce.c | 54 +++++++++++++++++++++--------------------- dlls/user32/tests/edit.c | 10 ++++---- dlls/user32/tests/listbox.c | 12 ++++------ dlls/user32/tests/menu.c | 24 +++++++------------ dlls/user32/tests/monitor.c | 34 +++++++++++---------------- dlls/user32/tests/msg.c | 57 +++++++++++++++++++++------------------------ dlls/user32/tests/text.c | 3 +-- dlls/user32/tests/uitools.c | 20 ++++++++-------- 8 files changed, 94 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f5adb69cd0e9abcc23d1…

1 0

Michael Stefaniuc : user32/tests: Remove an unused macro.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 82fa7dea2a86a43af51f7d4b3f459acd54e4e2bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=82fa7dea2a86a43af51f7d4b3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 16 10:28:13 2016 +0200 user32/tests: Remove an unused macro. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/static.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 841889d..929b50d 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -33,9 +33,6 @@ static HWND hMainWnd; #define expect_eq(expr, value, type, fmt) { type val = expr; ok(val == (value), #expr " expected " fmt " got " fmt "\n", (value), val); } -#define expect_rect(r, _left, _top, _right, _bottom) ok(r.left == _left && r.top == _top && \ - r.bottom == _bottom && r.right == _right, "Invalid rect (%d,%d) (%d,%d) vs (%d,%d) (%d,%d)\n", \ - r.left, r.top, r.right, r.bottom, _left, _top, _right, _bottom); static int g_nReceivedColorStatic = 0;

1 0

Michael Cronenworth : secur32: Provide a static declaration for gnutls_cipher_get_block_size.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: bf5ac531a030bce9e798ab66bc53e84a65ca8fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5ac531a030bce9e798ab66b… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jun 16 00:21:13 2016 -0500 secur32: Provide a static declaration for gnutls_cipher_get_block_size. Instead of providing an extern provide a static declaration. The function return type changed from signed to unsigned in GnuTLS 3.5. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index b10b629..bcadd47 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); WINE_DECLARE_DEBUG_CHANNEL(winediag); /* Not present in gnutls version < 2.9.10. */ -extern int gnutls_cipher_get_block_size(gnutls_cipher_algorithm_t algorithm); +static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t algorithm); static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -52,7 +52,6 @@ MAKE_FUNCPTR(gnutls_certificate_allocate_credentials); MAKE_FUNCPTR(gnutls_certificate_free_credentials); MAKE_FUNCPTR(gnutls_certificate_get_peers); MAKE_FUNCPTR(gnutls_cipher_get); -MAKE_FUNCPTR(gnutls_cipher_get_block_size); MAKE_FUNCPTR(gnutls_cipher_get_key_size); MAKE_FUNCPTR(gnutls_credentials_set); MAKE_FUNCPTR(gnutls_deinit);

1 0

Nikolay Sivov : dwrite: Trace script name in shaping methods.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 0e913c4abc62e97b812ca808bb86578197394b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e913c4abc62e97b812ca808b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 16 07:43:24 2016 +0300 dwrite: Trace script name in shaping methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 9ae0cca..8660e9b 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -966,9 +966,10 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, HRESULT hr = S_OK; UINT16 script; - TRACE("(%s:%u %p %d %d %p %s %p %p %p %u %u %p %p %p %p %p)\n", debugstr_wn(text, length), - length, fontface, is_sideways, is_rtl, analysis, debugstr_w(locale), substitution, features, feature_range_len, - feature_ranges, max_glyph_count, clustermap, text_props, glyph_indices, glyph_props, actual_glyph_count); + TRACE("(%s:%u %p %d %d %s %s %p %p %p %u %u %p %p %p %p %p)\n", debugstr_wn(text, length), + length, fontface, is_sideways, is_rtl, debugstr_sa_script(analysis->script), debugstr_w(locale), substitution, + features, feature_range_len, feature_ranges, max_glyph_count, clustermap, text_props, glyph_indices, + glyph_props, actual_glyph_count); script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; @@ -1099,9 +1100,10 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 HRESULT hr; UINT32 i; - TRACE("(%s %p %p %u %p %p %u %p %.2f %d %d %p %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), + TRACE("(%s %p %p %u %p %p %u %p %.2f %d %d %s %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, is_sideways, - is_rtl, analysis, debugstr_w(locale), features, feature_range_len, feature_ranges, advances, offsets); + is_rtl, debugstr_sa_script(analysis->script), debugstr_w(locale), features, feature_range_len, + feature_ranges, advances, offsets); if (glyph_count == 0) return S_OK; @@ -1147,10 +1149,10 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite HRESULT hr; UINT32 i; - TRACE("(%s %p %p %u %p %p %u %p %.2f %.2f %p %d %d %d %p %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), + TRACE("(%s %p %p %u %p %p %u %p %.2f %.2f %p %d %d %d %s %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, ppdip, - transform, use_gdi_natural, is_sideways, is_rtl, analysis, debugstr_w(locale), features, feature_range_lengths, - feature_ranges, advances, offsets); + transform, use_gdi_natural, is_sideways, is_rtl, debugstr_sa_script(analysis->script), debugstr_w(locale), + features, feature_range_lengths, feature_ranges, advances, offsets); if (glyph_count == 0) return S_OK;

1 0

Alexandre Julliard : gdi32: Take the transform rotation into account to compute pen width.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 7cfcd2387861cf1570fc3099a633a576a6ca84ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cfcd2387861cf1570fc3099a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 14:19:08 2016 +0900 gdi32: Take the transform rotation into account to compute pen width. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/objects.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index f954def..a14c062 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1734,7 +1734,7 @@ static inline int get_pen_device_width( dibdrv_physdev *pdev, int width ) pts[0].x = pts[0].y = pts[1].y = 0; pts[1].x = width; LPtoDP( pdev->dev.hdc, pts, 2 ); - width = abs( pts[1].x - pts[0].x ); + width = floor( hypot( pts[1].x - pts[0].x, pts[1].y - pts[0].y )); return max( width, 1 ); }

1 0

Alexandre Julliard : gdi32: Remove the no longer needed (and broken) null driver implementation of some path functions.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 04e7215fafce4bb77c7e83be23c52c187d37170f URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e7215fafce4bb77c7e83be2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 14:16:12 2016 +0900 gdi32: Remove the no longer needed (and broken) null driver implementation of some path functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 312 ++++-------------------------------------------------- 1 file changed, 23 insertions(+), 289 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04e7215fafce4bb77c7e8…

1 0

Alexandre Julliard : winex11: Implement FillPath, StrokeAndFillPath and StrokePath.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 10b526733f1cde028ba8e5b2451a9e24284944cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b526733f1cde028ba8e5b24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 14:15:05 2016 +0900 winex11: Implement FillPath, StrokeAndFillPath and StrokePath. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/graphics.c | 101 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/init.c | 6 +-- dlls/winex11.drv/x11drv.h | 3 ++ 3 files changed, 107 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index f23a502..e8c59f9 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1227,6 +1227,107 @@ BOOL X11DRV_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO return TRUE; } +/* helper for path stroking and filling functions */ +static BOOL x11drv_stroke_and_fill_path( PHYSDEV dev, BOOL stroke, BOOL fill ) +{ + X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); + POINT *points; + BYTE *flags; + BOOL ret = FALSE; + XPoint *xpoints; + int i, j, size; + + FlattenPath( dev->hdc ); + if ((size = GetPath( dev->hdc, NULL, NULL, 0 )) == -1) return FALSE; + if (!size) + { + AbortPath( dev->hdc ); + return TRUE; + } + xpoints = HeapAlloc( GetProcessHeap(), 0, (size + 1) * sizeof(*xpoints) ); + points = HeapAlloc( GetProcessHeap(), 0, size * sizeof(*points) ); + flags = HeapAlloc( GetProcessHeap(), 0, size * sizeof(*flags) ); + if (!points || !flags || !xpoints) goto done; + if (GetPath( dev->hdc, points, flags, size ) == -1) goto done; + LPtoDP( dev->hdc, points, size ); + + if (fill && X11DRV_SetupGCForBrush( physDev )) + { + XRectangle *rect; + HRGN hrgn = PathToRegion( dev->hdc ); + RGNDATA *data = X11DRV_GetRegionData( hrgn, 0 ); + + DeleteObject( hrgn ); + if (!data) goto done; + rect = (XRectangle *)data->Buffer; + for (i = 0; i < data->rdh.nCount; i++) + { + rect[i].x += physDev->dc_rect.left; + rect[i].y += physDev->dc_rect.top; + } + + XFillRectangles( gdi_display, physDev->drawable, physDev->gc, rect, data->rdh.nCount ); + HeapFree( GetProcessHeap(), 0, data ); + } + + if (stroke && X11DRV_SetupGCForPen ( physDev )) + { + for (i = j = 0; i < size; i++, j++) + { + if (flags[i] == PT_MOVETO) + { + if (j > 1) + { + if (fill || (flags[i - 1] & PT_CLOSEFIGURE)) xpoints[j++] = xpoints[0]; + XDrawLines( gdi_display, physDev->drawable, physDev->gc, xpoints, j, CoordModeOrigin ); + } + j = 0; + } + xpoints[j].x = physDev->dc_rect.left + points[i].x; + xpoints[j].y = physDev->dc_rect.top + points[i].y; + } + if (j > 1) + { + if (fill || (flags[i - 1] & PT_CLOSEFIGURE)) xpoints[j++] = xpoints[0]; + XDrawLines( gdi_display, physDev->drawable, physDev->gc, xpoints, j, CoordModeOrigin ); + } + } + + add_pen_device_bounds( physDev, points, size ); + AbortPath( dev->hdc ); + ret = TRUE; + +done: + HeapFree( GetProcessHeap(), 0, xpoints ); + HeapFree( GetProcessHeap(), 0, points ); + HeapFree( GetProcessHeap(), 0, flags ); + return ret; +} + +/********************************************************************** + * X11DRV_FillPath + */ +BOOL X11DRV_FillPath( PHYSDEV dev ) +{ + return x11drv_stroke_and_fill_path( dev, FALSE, TRUE ); +} + +/********************************************************************** + * X11DRV_StrokeAndFillPath + */ +BOOL X11DRV_StrokeAndFillPath( PHYSDEV dev ) +{ + return x11drv_stroke_and_fill_path( dev, TRUE, TRUE ); +} + +/********************************************************************** + * X11DRV_StrokePath + */ +BOOL X11DRV_StrokePath( PHYSDEV dev ) +{ + return x11drv_stroke_and_fill_path( dev, TRUE, FALSE ); +} + /********************************************************************** * X11DRV_InternalFloodFill diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 6bc4fb3..af2fd92 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -494,7 +494,7 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_ExtFloodFill, /* pExtFloodFill */ NULL, /* pExtSelectClipRgn */ NULL, /* pExtTextOut */ - NULL, /* pFillPath */ + X11DRV_FillPath, /* pFillPath */ NULL, /* pFillRgn */ NULL, /* pFlattenPath */ NULL, /* pFontIsLinked */ @@ -589,8 +589,8 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pStartPage */ X11DRV_StretchBlt, /* pStretchBlt */ NULL, /* pStretchDIBits */ - NULL, /* pStrokeAndFillPath */ - NULL, /* pStrokePath */ + X11DRV_StrokeAndFillPath, /* pStrokeAndFillPath */ + X11DRV_StrokePath, /* pStrokePath */ X11DRV_UnrealizePalette, /* pUnrealizePalette */ NULL, /* pWidenPath */ X11DRV_wine_get_wgl_driver, /* wine_get_wgl_driver */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 23f4ab6..2180851 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -150,6 +150,7 @@ extern BOOL X11DRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, extern BOOL X11DRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern INT X11DRV_EnumICMProfiles( PHYSDEV dev, ICMENUMPROCW proc, LPARAM lparam ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) DECLSPEC_HIDDEN; extern DWORD X11DRV_GetImage( PHYSDEV dev, BITMAPINFO *info, @@ -183,6 +184,8 @@ extern BOOL X11DRV_SetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDE extern COLORREF X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL X11DRV_UnrealizePalette( HPALETTE hpal ) DECLSPEC_HIDDEN; /* X11 driver internal functions */

1 0

Alexandre Julliard : gdi32: Implement FillPath, StrokeAndFillPath and StrokePath in the DIB driver.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: b5cf73edd952ef91a525871d9b330fd51831197e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5cf73edd952ef91a525871d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 14:06:48 2016 +0900 gdi32: Implement FillPath, StrokeAndFillPath and StrokePath in the DIB driver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 6 +-- dlls/gdi32/dibdrv/dibdrv.h | 3 ++ dlls/gdi32/dibdrv/graphics.c | 97 ++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/path.c | 57 ++++++++++++++++++++++++++ 5 files changed, 161 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 4aa1d1d..314c651 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -424,7 +424,7 @@ const struct gdi_dc_funcs dib_driver = dibdrv_ExtFloodFill, /* pExtFloodFill */ NULL, /* pExtSelectClipRgn */ dibdrv_ExtTextOut, /* pExtTextOut */ - NULL, /* pFillPath */ + dibdrv_FillPath, /* pFillPath */ NULL, /* pFillRgn */ NULL, /* pFlattenPath */ NULL, /* pFontIsLinked */ @@ -519,8 +519,8 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pStartPage */ dibdrv_StretchBlt, /* pStretchBlt */ NULL, /* pStretchDIBits */ - NULL, /* pStrokeAndFillPath */ - NULL, /* pStrokePath */ + dibdrv_StrokeAndFillPath, /* pStrokeAndFillPath */ + dibdrv_StrokePath, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ dibdrv_wine_get_wgl_driver, /* wine_get_wgl_driver */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index c64058b..fc28acc 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -120,6 +120,7 @@ extern BOOL dibdrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT b extern BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) DECLSPEC_HIDDEN; extern BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern DWORD dibdrv_GetImage( PHYSDEV dev, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; @@ -150,6 +151,8 @@ extern COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HID extern COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern struct opengl_funcs *dibdrv_wine_get_wgl_driver( PHYSDEV dev, UINT version ) DECLSPEC_HIDDEN; static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 2c865c0..bfb3451 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -402,6 +402,73 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, return ret; } +/* helper for path stroking and filling functions */ +static BOOL stroke_and_fill_path( dibdrv_physdev *dev, BOOL stroke, BOOL fill ) +{ + POINT *points; + BYTE *types; + BOOL ret = TRUE; + HRGN outline = 0, interior = 0; + int i, pos, total; + + if (dev->brush.style == BS_NULL) fill = FALSE; + + total = get_gdi_flat_path( dev->dev.hdc, &points, &types, fill ? &interior : NULL ); + if (total == -1) return FALSE; + if (!total) goto done; + + if (stroke && dev->pen_uses_region) outline = CreateRectRgn( 0, 0, 0, 0 ); + + /* if not using a region, paint the interior first so the outline can overlap it */ + if (interior && !outline) + { + ret = brush_region( dev, interior ); + DeleteObject( interior ); + interior = 0; + } + + if (stroke) + { + pos = 0; + for (i = 1; i < total; i++) + { + if (types[i] != PT_MOVETO) continue; + if (i > pos + 1) + { + reset_dash_origin( dev ); + dev->pen_lines( dev, i - pos, points + pos, + fill || types[i - 1] & PT_CLOSEFIGURE, outline ); + } + pos = i; + } + if (i > pos + 1) + { + reset_dash_origin( dev ); + dev->pen_lines( dev, i - pos, points + pos, + fill || types[i - 1] & PT_CLOSEFIGURE, outline ); + } + } + + add_pen_lines_bounds( dev, total, points, outline ); + + if (interior) + { + CombineRgn( interior, interior, outline, RGN_DIFF ); + ret = brush_region( dev, interior ); + DeleteObject( interior ); + } + if (outline) + { + if (ret) ret = pen_region( dev, outline ); + DeleteObject( outline ); + } + +done: + HeapFree( GetProcessHeap(), 0, points ); + HeapFree( GetProcessHeap(), 0, types ); + return ret; +} + /* Intensities of the 17 glyph levels when drawn with text component of 0xff on a black bkgnd. [A log-log plot of these data gives: y = 77.05 * x^0.4315]. */ static const BYTE ramp[17] = @@ -1000,6 +1067,16 @@ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) } /*********************************************************************** + * dibdrv_FillPath + */ +BOOL dibdrv_FillPath( PHYSDEV dev ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + + return stroke_and_fill_path( pdev, FALSE, TRUE ); +} + +/*********************************************************************** * dibdrv_GetNearestColor */ COLORREF dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) @@ -1499,3 +1576,23 @@ COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) free_clipped_rects( &clipped_rects ); return color; } + +/*********************************************************************** + * dibdrv_StrokeAndFillPath + */ +BOOL dibdrv_StrokeAndFillPath( PHYSDEV dev ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + + return stroke_and_fill_path( pdev, TRUE, TRUE ); +} + +/*********************************************************************** + * dibdrv_StrokePath + */ +BOOL dibdrv_StrokePath( PHYSDEV dev ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + + return stroke_and_fill_path( pdev, TRUE, FALSE ); +} diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 08a5d3b..15e50e1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -335,6 +335,7 @@ typedef struct /* path.c */ extern void free_gdi_path( struct gdi_path *path ) DECLSPEC_HIDDEN; +extern int get_gdi_flat_path( HDC hdc, POINT **points, BYTE **flags, HRGN *rgn ) DECLSPEC_HIDDEN; extern BOOL PATH_SavePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; extern BOOL PATH_RestorePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 0d89cfb..06fac77 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -273,6 +273,32 @@ static BOOL start_new_stroke( struct path_physdev *physdev ) return add_log_points( physdev, &pos, 1, PT_MOVETO ) != NULL; } +/* convert a (flattened) path to a region */ +static HRGN path_to_region( const struct gdi_path *path, int mode ) +{ + int i, pos, polygons, *counts; + HRGN hrgn; + + if (!path->count) return 0; + + if (!(counts = HeapAlloc( GetProcessHeap(), 0, (path->count / 2) * sizeof(*counts) ))) return 0; + + pos = polygons = 0; + assert( path->flags[0] == PT_MOVETO ); + for (i = 1; i < path->count; i++) + { + if (path->flags[i] != PT_MOVETO) continue; + counts[polygons++] = i - pos; + pos = i; + } + if (i > pos + 1) counts[polygons++] = i - pos; + + assert( polygons <= path->count / 2 ); + hrgn = CreatePolyPolygonRgn( path->points, counts, polygons, mode ); + HeapFree( GetProcessHeap(), 0, counts ); + return hrgn; +} + /* PATH_CheckCorners * * Helper function for RoundRect() and Rectangle() @@ -505,6 +531,37 @@ static BOOL PATH_DoArcPart(struct gdi_path *pPath, FLOAT_POINT corners[], return TRUE; } +/* retrieve a flattened path in device coordinates, and optionally its region */ +/* the DC path is deleted; the returned data must be freed by caller */ +/* helper for stroke_and_fill_path in the DIB driver */ +int get_gdi_flat_path( HDC hdc, POINT **points, BYTE **flags, HRGN *rgn ) +{ + DC *dc = get_dc_ptr( hdc ); + int ret = -1; + + if (!dc) return -1; + + if (dc->path) + { + struct gdi_path *path = PATH_FlattenPath( dc->path ); + + free_gdi_path( dc->path ); + dc->path = NULL; + if (path) + { + ret = path->count; + *points = path->points; + *flags = path->flags; + if (rgn) *rgn = path_to_region( path, GetPolyFillMode( hdc )); + HeapFree( GetProcessHeap(), 0, path ); + } + } + else SetLastError( ERROR_CAN_NOT_COMPLETE ); + + release_dc_ptr( dc ); + return ret; +} + /*********************************************************************** * BeginPath (GDI32.@)

1 0

Matteo Bruni : d3dx9: Fix a couple of stub signatures in the spec files.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 3054c0fd1bc8e641bf505978937fcaac014612c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3054c0fd1bc8e641bf5059789… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 16 00:00:50 2016 +0200 d3dx9: Fix a couple of stub signatures in the spec files. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 4 ++-- dlls/d3dx9_25/d3dx9_25.spec | 4 ++-- dlls/d3dx9_26/d3dx9_26.spec | 4 ++-- dlls/d3dx9_27/d3dx9_27.spec | 4 ++-- dlls/d3dx9_28/d3dx9_28.spec | 4 ++-- dlls/d3dx9_29/d3dx9_29.spec | 4 ++-- dlls/d3dx9_30/d3dx9_30.spec | 4 ++-- dlls/d3dx9_31/d3dx9_31.spec | 4 ++-- dlls/d3dx9_32/d3dx9_32.spec | 4 ++-- dlls/d3dx9_33/d3dx9_33.spec | 4 ++-- dlls/d3dx9_34/d3dx9_34.spec | 4 ++-- dlls/d3dx9_35/d3dx9_35.spec | 4 ++-- dlls/d3dx9_36/d3dx9_36.spec | 4 ++-- dlls/d3dx9_37/d3dx9_37.spec | 4 ++-- dlls/d3dx9_38/d3dx9_38.spec | 4 ++-- dlls/d3dx9_39/d3dx9_39.spec | 4 ++-- dlls/d3dx9_40/d3dx9_40.spec | 4 ++-- dlls/d3dx9_41/d3dx9_41.spec | 4 ++-- dlls/d3dx9_42/d3dx9_42.spec | 4 ++-- dlls/d3dx9_43/d3dx9_43.spec | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3054c0fd1bc8e641bf505…

1 0

Andrey Gusev : d3dx10: Add D3DX10FilterTexture stub.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 768926b13d3afa1e34cc91f706972a4f73488db6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=768926b13d3afa1e34cc91f70… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 16 00:00:49 2016 +0200 d3dx10: Add D3DX10FilterTexture stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 7 +++++++ include/d3dx10tex.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 492a588..99aa8f3 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -47,7 +47,7 @@ @ stub D3DX10CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromResourceA(ptr long str ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromResourceW(ptr long wstr ptr ptr ptr ptr) -@ stub D3DX10FilterTexture(ptr long long) +@ stdcall D3DX10FilterTexture(ptr long long) @ stdcall D3DX10GetFeatureLevel1(ptr ptr) @ stub D3DX10GetImageInfoFromFileA(str ptr ptr ptr) @ stub D3DX10GetImageInfoFromFileW(wstr ptr ptr ptr) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 71d6ae8..0c1ff80 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -188,6 +188,13 @@ HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive return hr; } +HRESULT WINAPI D3DX10FilterTexture(ID3D10Resource *texture, UINT src_level, UINT filter) +{ + FIXME("texture %p, src_level %u, filter %#x stub!\n", texture, src_level, filter); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1) { TRACE("device %p, device1 %p.\n", device, device1); diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h index 9142c82..a0d5aa7 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -108,6 +108,8 @@ extern "C" { HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, SIZE_T src_data_size, D3DX10_IMAGE_LOAD_INFO *loadinfo, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult); +HRESULT WINAPI D3DX10FilterTexture(ID3D10Resource *texture, UINT src_level, UINT filter); + HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *img_info, HRESULT *hresult);

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
60
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 June 2016