July 2007 - Wine-Commits - list.winehq.org

Evan Stade : gdiplus: Added GdipAddPathPath test.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 44691eefb452e5fdec54f87ca98413f9c90b3fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44691eefb452e5fdec54f87ca… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jul 12 19:43:19 2007 -0700 gdiplus: Added GdipAddPathPath test. --- dlls/gdiplus/tests/graphicspath.c | 51 +++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 7ee2cc3..729971e 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -383,6 +383,56 @@ static void test_worldbounds(void) expectf(945.0, bounds.Height); } +static path_test_t pathpath_path[] = { + {600.00, 450.00, PathPointTypeStart, 0, 0}, /*0*/ + {600.00, 643.30, PathPointTypeBezier, 0, 0}, /*1*/ + {488.07, 800.00, PathPointTypeBezier, 0, 0}, /*2*/ + {350.00, 800.00, PathPointTypeBezier, 0, 0}, /*3*/ + {319.61, 797.40, PathPointTypeStart, 0, 0}, /*4*/ + {182.56, 773.90, PathPointTypeBezier, 0, 0}, /*5*/ + {85.07, 599.31, PathPointTypeBezier, 0, 0}, /*6*/ + {101.85, 407.45, PathPointTypeBezier, 0, 0}, /*7*/ + {102.54, 399.66, PathPointTypeBezier, 0, 0}, /*8*/ + {103.40, 391.91, PathPointTypeBezier, 0, 0}, /*9*/ + {104.46, 384.21, PathPointTypeBezier, 0, 0}, /*10*/ + {409.92, 110.20, PathPointTypeLine, 0, 0}, /*11*/ + {543.96, 156.53, PathPointTypeBezier, 0, 0}, /*12*/ + {625.80, 346.22, PathPointTypeBezier, 0, 0}, /*13*/ + {592.71, 533.88, PathPointTypeBezier, 0, 0}, /*14*/ + {592.47, 535.28, PathPointTypeBezier, 0, 0}, /*15*/ + {592.22, 536.67, PathPointTypeBezier, 0, 0}, /*16*/ + {591.96, 538.06, PathPointTypeBezier, 0, 0}, /*17*/ + {319.61, 797.40, PathPointTypeLine, 0, 0}, /*18*/ + {182.56, 773.90, PathPointTypeBezier, 0, 0}, /*19*/ + {85.07, 599.31, PathPointTypeBezier, 0, 0}, /*20*/ + {101.85, 407.45, PathPointTypeBezier, 0, 0}, /*21*/ + {102.54, 399.66, PathPointTypeBezier, 0, 0}, /*22*/ + {103.40, 391.91, PathPointTypeBezier, 0, 0}, /*23*/ + {104.46, 384.21, PathPointTypeBezier, 0, 0} /*24*/ + }; + +static void test_pathpath(void) +{ + GpStatus status; + GpPath* path1, *path2; + + GdipCreatePath(FillModeAlternate, &path2); + GdipAddPathArc(path2, 100.0, 100.0, 500.0, 700.0, 95.0, 100.0); + + GdipCreatePath(FillModeAlternate, &path1); + GdipAddPathArc(path1, 100.0, 100.0, 500.0, 700.0, 0.0, 90.0); + status = GdipAddPathPath(path1, path2, FALSE); + expect(Ok, status); + GdipAddPathArc(path1, 100.0, 100.0, 500.0, 700.0, -80.0, 100.0); + status = GdipAddPathPath(path1, path2, TRUE); + expect(Ok, status); + + ok_path(path1, pathpath_path, sizeof(pathpath_path)/sizeof(path_test_t), FALSE); + + GdipDeletePath(path1); + GdipDeletePath(path2); +} + START_TEST(graphicspath) { struct GdiplusStartupInput gdiplusStartupInput; @@ -399,6 +449,7 @@ START_TEST(graphicspath) test_line2(); test_arc(); test_worldbounds(); + test_pathpath(); GdiplusShutdown(gdiplusToken); }

1 0

Vitaliy Margolen : dxdiagn: Add reporting of some display related information.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 116b807b9c375dba3f2a551efda492571b3d29f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=116b807b9c375dba3f2a551ef… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Jul 12 07:18:01 2007 -0600 dxdiagn: Add reporting of some display related information. --- dlls/dxdiagn/Makefile.in | 2 +- dlls/dxdiagn/provider.c | 114 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 100 insertions(+), 16 deletions(-) diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in index e2cf511..132d828 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dxdiagn.dll -IMPORTS = version ole32 oleaut32 user32 advapi32 kernel32 +IMPORTS = ddraw version ole32 oleaut32 user32 advapi32 kernel32 EXTRALIBS = -lstrmiids -ldxguid -luuid C_SRCS = \ diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 260c3a7..fe0543c 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -31,6 +31,7 @@ #include "strmif.h" #include "vfw.h" #include "mmddk.h" +#include <ddraw.h> WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); @@ -138,6 +139,32 @@ HRESULT DXDiag_CreateDXDiagProvider(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, R return IDxDiagProviderImpl_QueryInterface ((PDXDIAGPROVIDER)provider, riid, ppobj); } +static inline HRESULT add_prop_str( IDxDiagContainer* cont, LPCWSTR prop, LPCWSTR str ) +{ + HRESULT hr; + VARIANT var; + + V_VT( &var ) = VT_BSTR; + V_BSTR( &var ) = SysAllocString( str ); + hr = IDxDiagContainerImpl_AddProp( cont, prop, &var ); + VariantClear( &var ); + + return hr; +} + +static inline HRESULT add_prop_ui4( IDxDiagContainer* cont, LPCWSTR prop, DWORD data ) +{ + HRESULT hr; + VARIANT var; + + V_VT( &var ) = VT_UI4; + V_UI4( &var ) = data; + hr = IDxDiagContainerImpl_AddProp( cont, prop, &var ); + VariantClear( &var ); + + return hr; +} + /** * @param szFilePath: usually GetSystemDirectoryW * @param szFileName: name of the dll without path @@ -389,21 +416,78 @@ static HRESULT DXDiag_InitDXDiagDirectXFilesContainer(IDxDiagContainer* pSubCont return hr; } -static HRESULT DXDiag_InitDXDiagDisplayContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; - /* - static const WCHAR szDescription[] = {'s','z','D','e','s','c','r','i','p','t','i','o','n',0}; - static const WCHAR szDeviceName[] = {'s','z','D','e','v','i','c','e','N','a','m','e',0}; - static const WCHAR szKeyDeviceID[] = {'s','z','K','e','y','D','e','v','i','c','e','I','D',0}; - static const WCHAR szKeyDeviceKey[] = {'s','z','K','e','y','D','e','v','i','c','e','K','e','y',0}; - WCHAR szAdapterName[512]; - VARIANT v; - IDxDiagContainer* pDisplayAdapterSubCont = NULL; - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDisplayAdapterSubCont); - if (FAILED(hr)) { return hr; } - hr = IDxDiagContainerImpl_AddChildContainer(pSubCont, szAdapterName, pDisplayAdapterSubCont); - */ - return hr; +static HRESULT DXDiag_InitDXDiagDisplayContainer(IDxDiagContainer* pSubCont) +{ + static const WCHAR szDescription[] = {'s','z','D','e','s','c','r','i','p','t','i','o','n',0}; + static const WCHAR szDeviceName[] = {'s','z','D','e','v','i','c','e','N','a','m','e',0}; + static const WCHAR szKeyDeviceID[] = {'s','z','K','e','y','D','e','v','i','c','e','I','D',0}; + static const WCHAR szKeyDeviceKey[] = {'s','z','K','e','y','D','e','v','i','c','e','K','e','y',0}; + static const WCHAR szVendorId[] = {'s','z','V','e','n','d','o','r','I','d',0}; + static const WCHAR szDeviceId[] = {'s','z','D','e','v','i','c','e','I','d',0}; + static const WCHAR dwWidth[] = {'d','w','W','i','d','t','h',0}; + static const WCHAR dwHeight[] = {'d','w','H','e','i','g','h','t',0}; + static const WCHAR dwBpp[] = {'d','w','B','p','p',0}; + static const WCHAR szDisplayMemoryLocalized[] = {'s','z','D','i','s','p','l','a','y','M','e','m','o','r','y','L','o','c','a','l','i','z','e','d',0}; + static const WCHAR szDisplayMemoryEnglish[] = {'s','z','D','i','s','p','l','a','y','M','e','m','o','r','y','E','n','g','l','i','s','h',0}; + + static const WCHAR szAdapterID[] = {'0',0}; + static const WCHAR szEmpty[] = {0}; + + HRESULT hr; + IDxDiagContainer *pDisplayAdapterSubCont = NULL; + + IDirectDraw7 *pDirectDraw; + DDSCAPS2 dd_caps; + DISPLAY_DEVICEW disp_dev; + DDSURFACEDESC2 surface_descr; + DWORD tmp; + WCHAR buffer[256]; + + hr = DXDiag_CreateDXDiagContainer( &IID_IDxDiagContainer, (void**) &pDisplayAdapterSubCont ); + if (FAILED( hr )) return hr; + hr = IDxDiagContainerImpl_AddChildContainer( pSubCont, szAdapterID, pDisplayAdapterSubCont ); + if (FAILED( hr )) return hr; + + if (EnumDisplayDevicesW( NULL, 0, &disp_dev, 0 )) + { + add_prop_str( pDisplayAdapterSubCont, szDeviceName, disp_dev.DeviceName ); + add_prop_str( pDisplayAdapterSubCont, szDescription, disp_dev.DeviceString ); + } + + hr = DirectDrawCreateEx( NULL, (LPVOID *)&pDirectDraw, &IID_IDirectDraw7, NULL); + if (FAILED( hr )) return hr; + + dd_caps.dwCaps = DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; + dd_caps.dwCaps2 = dd_caps.dwCaps3 = dd_caps.dwCaps4 = 0; + hr = IDirectDraw7_GetAvailableVidMem( pDirectDraw, &dd_caps, &tmp, NULL ); + if (SUCCEEDED(hr)) + { + static const WCHAR mem_fmt[] = {'%','.','1','f',' ','M','B',0}; + + snprintfW( buffer, sizeof(buffer), mem_fmt, ((float)tmp) / 1000000.0 ); + add_prop_str( pDisplayAdapterSubCont, szDisplayMemoryLocalized, buffer ); + add_prop_str( pDisplayAdapterSubCont, szDisplayMemoryEnglish, buffer ); + } + + surface_descr.dwSize = sizeof(surface_descr); + hr = IDirectDraw7_GetDisplayMode( pDirectDraw, &surface_descr ); + if (SUCCEEDED(hr)) + { + if (surface_descr.dwFlags & DDSD_WIDTH) + add_prop_ui4( pDisplayAdapterSubCont, dwWidth, surface_descr.dwWidth ); + if (surface_descr.dwFlags & DDSD_HEIGHT) + add_prop_ui4( pDisplayAdapterSubCont, dwHeight, surface_descr.dwHeight ); + if (surface_descr.dwFlags & DDSD_PIXELFORMAT) + add_prop_ui4( pDisplayAdapterSubCont, dwBpp, surface_descr.ddpfPixelFormat.dwRGBBitCount ); + } + + add_prop_str( pDisplayAdapterSubCont, szVendorId, szEmpty ); + add_prop_str( pDisplayAdapterSubCont, szDeviceId, szEmpty ); + add_prop_str( pDisplayAdapterSubCont, szKeyDeviceKey, szEmpty ); + add_prop_str( pDisplayAdapterSubCont, szKeyDeviceID, szEmpty ); + + IUnknown_Release( pDirectDraw ); + return hr; } static HRESULT DXDiag_InitDXDiagDirectSoundContainer(IDxDiagContainer* pSubCont) {

1 0

Evan Stade : gdiplus: Added GdipAddPathPath.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: c41a77a358abeba54a629b87a1e4caed5db584d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41a77a358abeba54a629b87a… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jul 12 19:43:15 2007 -0700 gdiplus: Added GdipAddPathPath. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 29 +++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 1f23225..273a9ee 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -20,7 +20,7 @@ @ stub GdipAddPathLine2I @ stub GdipAddPathLine @ stub GdipAddPathLineI -@ stub GdipAddPathPath +@ stdcall GdipAddPathPath(ptr ptr long) @ stub GdipAddPathPie @ stub GdipAddPathPieI @ stub GdipAddPathPolygon diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index df6c6d6..2fabd49 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -123,6 +123,35 @@ GpStatus WINGDIPAPI GdipAddPathLine2(GpPath *path, GDIPCONST GpPointF *points, return Ok; } +GpStatus WINGDIPAPI GdipAddPathPath(GpPath *path, GDIPCONST GpPath* addingPath, + BOOL connect) +{ + INT old_count, count; + + if(!path || !addingPath) + return InvalidParameter; + + old_count = path->pathdata.Count; + count = addingPath->pathdata.Count; + + if(!lengthen_path(path, count)) + return OutOfMemory; + + memcpy(&path->pathdata.Points[old_count], addingPath->pathdata.Points, + count * sizeof(GpPointF)); + memcpy(&path->pathdata.Types[old_count], addingPath->pathdata.Types, count); + + if(path->newfigure || !connect) + path->pathdata.Types[old_count] = PathPointTypeStart; + else + path->pathdata.Types[old_count] = PathPointTypeLine; + + path->newfigure = FALSE; + path->pathdata.Count += count; + + return Ok; +} + GpStatus WINGDIPAPI GdipClosePathFigure(GpPath* path) { if(!path) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 787d01c..07f52e9 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -52,6 +52,7 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); GpStatus WINGDIPAPI GdipAddPathArc(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathLine2(GpPath*,GDIPCONST GpPointF*,INT); +GpStatus WINGDIPAPI GdipAddPathPath(GpPath*,GDIPCONST GpPath*,BOOL); GpStatus WINGDIPAPI GdipClosePathFigure(GpPath*); GpStatus WINGDIPAPI GdipClosePathFigures(GpPath*); GpStatus WINGDIPAPI GdipCreatePath(GpFillMode,GpPath**);

1 0

Evan Stade : gdiplus: Added GdipGetPathFillMode.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 64035b308e978f03796cf5cc7e28fd3460889cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64035b308e978f03796cf5cc7… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jul 12 19:43:07 2007 -0700 gdiplus: Added GdipGetPathFillMode. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 10 ++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ad0e44c..3413e3f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -308,7 +308,7 @@ @ stub GdipGetPageScale @ stub GdipGetPageUnit @ stub GdipGetPathData -@ stub GdipGetPathFillMode +@ stdcall GdipGetPathFillMode(ptr ptr) @ stub GdipGetPathGradientBlend @ stub GdipGetPathGradientBlendCount @ stub GdipGetPathGradientCenterColor diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index c9779d4..0f3b88b 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -179,6 +179,16 @@ GpStatus WINGDIPAPI GdipDeletePath(GpPath *path) return Ok; } +GpStatus WINGDIPAPI GdipGetPathFillMode(GpPath *path, GpFillMode *fillmode) +{ + if(!path || !fillmode) + return InvalidParameter; + + *fillmode = path->fill; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPathPoints(GpPath *path, GpPointF* points, INT count) { if(!path) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 5e275c9..4d36f53 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -56,6 +56,7 @@ GpStatus WINGDIPAPI GdipClosePathFigure(GpPath*); GpStatus WINGDIPAPI GdipClosePathFigures(GpPath*); GpStatus WINGDIPAPI GdipCreatePath(GpFillMode,GpPath**); GpStatus WINGDIPAPI GdipDeletePath(GpPath*); +GpStatus WINGDIPAPI GdipGetPathFillMode(GpPath*,GpFillMode*); GpStatus WINGDIPAPI GdipGetPathPoints(GpPath*,GpPointF*,INT); GpStatus WINGDIPAPI GdipGetPathTypes(GpPath*,BYTE*,INT); GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath*,GpRectF*,GDIPCONST GpMatrix*,

1 0

Evan Stade : gdiplus: Added GdipResetPath.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: d174bcc8a6955d1ad5f9493e1de679b0be89beee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d174bcc8a6955d1ad5f9493e1… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jul 12 19:43:10 2007 -0700 gdiplus: Added GdipResetPath. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 12 ++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 3413e3f..1f23225 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -458,7 +458,7 @@ @ stub GdipResetImageAttributes @ stub GdipResetLineTransform @ stub GdipResetPageTransform -@ stub GdipResetPath +@ stdcall GdipResetPath(ptr) @ stub GdipResetPathGradientTransform @ stub GdipResetPenTransform @ stub GdipResetTextureTransform diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 0f3b88b..df6c6d6 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -320,6 +320,18 @@ GpStatus WINGDIPAPI GdipStartPathFigure(GpPath *path) return Ok; } +GpStatus WINGDIPAPI GdipResetPath(GpPath *path) +{ + if(!path) + return InvalidParameter; + + path->pathdata.Count = 0; + path->newfigure = TRUE; + path->fill = FillModeAlternate; + + return Ok; +} + GpStatus WINGDIPAPI GdipTransformPath(GpPath *path, GpMatrix *matrix) { if(!path) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 4d36f53..787d01c 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -63,6 +63,7 @@ GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath*,GpRectF*,GDIPCONST GpMatrix*, GDIPCONST GpPen*); GpStatus WINGDIPAPI GdipGetPointCount(GpPath*,INT*); GpStatus WINGDIPAPI GdipStartPathFigure(GpPath*); +GpStatus WINGDIPAPI GdipResetPath(GpPath*); GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*); GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**);

1 0

Evan Stade : gdiplus: Improved GdipGetPathWorldBounds handling of both matrix and pen' s effect on bounding box.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 3dc17d2544570eb8db63fb2ac452318e1180bd3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc17d2544570eb8db63fb2ac… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jul 12 19:43:03 2007 -0700 gdiplus: Improved GdipGetPathWorldBounds handling of both matrix and pen's effect on bounding box. --- dlls/gdiplus/graphicspath.c | 72 +++++++++++++++++++++++++----------- dlls/gdiplus/tests/graphicspath.c | 20 ++++------ 2 files changed, 58 insertions(+), 34 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 72b718a..c9779d4 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -212,12 +212,9 @@ GpStatus WINGDIPAPI GdipGetPathTypes(GpPath *path, BYTE* types, INT count) GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath* path, GpRectF* bounds, GDIPCONST GpMatrix *matrix, GDIPCONST GpPen *pen) { - /* extrema[0] is upper left corner of bounding box, - * extrema[1] is lower right corner */ - GpPointF extrema[2]; - GpPointF * points; + GpPointF * points, temp_pts[4]; INT count, i; - REAL path_width; + REAL path_width = 1.0, width, height, temp, low_x, low_y, high_x, high_y; /* Matrix and pen can be null. */ if(!path || !bounds) @@ -231,33 +228,64 @@ GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath* path, GpRectF* bounds, } points = path->pathdata.Points; - extrema[0].X = extrema[1].X = points[0].X; - extrema[0].Y = extrema[1].Y = points[0].Y; + + low_x = high_x = points[0].X; + low_y = high_y = points[0].Y; for(i = 1; i < count; i++){ - extrema[0].X = min(points[i].X, extrema[0].X); - extrema[0].Y = min(points[i].Y, extrema[0].Y); - extrema[1].X = max(points[i].X, extrema[1].X); - extrema[1].Y = max(points[i].Y, extrema[1].Y); + low_x = min(low_x, points[i].X); + low_y = min(low_y, points[i].Y); + high_x = max(high_x, points[i].X); + high_y = max(high_y, points[i].Y); } - /* If matrix is non-null transform the points. */ + width = high_x - low_x; + height = high_y - low_y; + + /* This looks unusual but it's the only way I can imitate windows. */ if(matrix){ - GdipTransformMatrixPoints((GpMatrix*)matrix, extrema, 2); + temp_pts[0].X = low_x; + temp_pts[0].Y = low_y; + temp_pts[1].X = low_x; + temp_pts[1].Y = high_y; + temp_pts[2].X = high_x; + temp_pts[2].Y = high_y; + temp_pts[3].X = high_x; + temp_pts[3].Y = low_y; + + GdipTransformMatrixPoints((GpMatrix*)matrix, temp_pts, 4); + low_x = temp_pts[0].X; + low_y = temp_pts[0].Y; + + for(i = 1; i < 4; i++){ + low_x = min(low_x, temp_pts[i].X); + low_y = min(low_y, temp_pts[i].Y); + } + + temp = width; + width = height * fabs(matrix->matrix[2]) + width * fabs(matrix->matrix[0]); + height = height * fabs(matrix->matrix[3]) + temp * fabs(matrix->matrix[1]); } if(pen){ - path_width = pen->width * pen->miterlimit / 2.0; - extrema[0].X -= path_width; - extrema[0].Y -= path_width; - extrema[1].X += path_width; - extrema[1].Y += path_width; + path_width = pen->width / 2.0; + + if(count > 2) + path_width = max(path_width, pen->width * pen->miterlimit / 2.0); + /* FIXME: this should probably also check for the startcap */ + if(pen->endcap & LineCapNoAnchor) + path_width = max(path_width, pen->width * 2.2); + + low_x -= path_width; + low_y -= path_width; + width += 2.0 * path_width; + height += 2.0 * path_width; } - bounds->X = extrema[0].X; - bounds->Y = extrema[0].Y; - bounds->Width = extrema[1].X - extrema[0].X; - bounds->Height = extrema[1].Y - extrema[0].Y; + bounds->X = low_x; + bounds->Y = low_y; + bounds->Width = width; + bounds->Height = height; return Ok; } diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 22aa882..7ee2cc3 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -315,12 +315,10 @@ static void test_worldbounds(void) expect(Ok, status); GdipDeletePath(path); - todo_wine{ - expectf(156.0, bounds.X); - expectf(156.0, bounds.Y); - expectf(138.0, bounds.Width); - expectf(88.0, bounds.Height); - } + expectf(156.0, bounds.X); + expectf(156.0, bounds.Y); + expectf(138.0, bounds.Width); + expectf(88.0, bounds.Height); line2_points[2].X = 2 * line2_points[1].X - line2_points[0].X; line2_points[2].Y = 2 * line2_points[1].Y - line2_points[0].Y; @@ -379,12 +377,10 @@ static void test_worldbounds(void) expect(Ok, status); GdipDeletePath(path); - todo_wine{ - expectf(-209.6, bounds.X); - expectf(-1274.8, bounds.Y); - expectf(705.0, bounds.Width); - expectf(945.0, bounds.Height); - } + expectf(-209.6, bounds.X); + expectf(-1274.8, bounds.Y); + expectf(705.0, bounds.Width); + expectf(945.0, bounds.Height); } START_TEST(graphicspath)

1 0

Evan Stade : gdiplus: Added more GdipGetPathWorldBounds tests.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 41a9a838909d94e9e095748a3fb8437bfe495544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41a9a838909d94e9e095748a3… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jul 12 19:42:59 2007 -0700 gdiplus: Added more GdipGetPathWorldBounds tests. --- dlls/gdiplus/tests/graphicspath.c | 77 +++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 63c0bdc..22aa882 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -308,6 +308,83 @@ static void test_worldbounds(void) expectf(100.0, bounds.Y); expectf(650.0, bounds.Width); expectf(800.0, bounds.Height); + + GdipCreatePath(FillModeAlternate, &path); + GdipAddPathLine2(path, &(line2_points[0]), 2); + status = GdipGetPathWorldBounds(path, &bounds, NULL, pen); + expect(Ok, status); + GdipDeletePath(path); + + todo_wine{ + expectf(156.0, bounds.X); + expectf(156.0, bounds.Y); + expectf(138.0, bounds.Width); + expectf(88.0, bounds.Height); + } + + line2_points[2].X = 2 * line2_points[1].X - line2_points[0].X; + line2_points[2].Y = 2 * line2_points[1].Y - line2_points[0].Y; + + GdipCreatePath(FillModeAlternate, &path); + GdipAddPathLine2(path, &(line2_points[0]), 3); + status = GdipGetPathWorldBounds(path, &bounds, NULL, pen); + expect(Ok, status); + GdipDeletePath(path); + + expectf(100.0, bounds.X); + expectf(100.0, bounds.Y); + expectf(300.0, bounds.Width); + expectf(200.0, bounds.Height); + + GdipCreatePath(FillModeAlternate, &path); + GdipAddPathArc(path, 100.0, 100.0, 500.0, 700.0, 45.0, 20.0); + status = GdipGetPathWorldBounds(path, &bounds, NULL, pen); + expect(Ok, status); + GdipDeletePath(path); + + expectf(386.7, bounds.X); + expectf(553.4, bounds.Y); + expectf(266.8, bounds.Width); + expectf(289.6, bounds.Height); + + GdipCreatePath(FillModeAlternate, &path); + status = GdipGetPathWorldBounds(path, &bounds, matrix, pen); + expect(Ok, status); + GdipDeletePath(path); + + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf(0.0, bounds.Width); + expectf(0.0, bounds.Height); + + GdipCreatePath(FillModeAlternate, &path); + GdipAddPathLine2(path, &(line2_points[0]), 2); + status = GdipGetPathWorldBounds(path, &bounds, matrix, pen); + expect(Ok, status); + GdipDeletePath(path); + + todo_wine{ + expectf(427.9, bounds.X); + expectf(167.7, bounds.Y); + expectf(239.9, bounds.Width); + expectf(164.9, bounds.Height); + } + + GdipDeleteMatrix(matrix); + GdipCreateMatrix2(0.9, -0.5, -0.5, -1.2, 10.4, 10.2, &matrix); + GdipCreatePath(FillModeAlternate, &path); + GdipAddPathArc(path, 100.0, 100.0, 500.0, 700.0, 0.0, 100.0); + GdipAddPathLine2(path, &(line2_points[0]), 10); + status = GdipGetPathWorldBounds(path, &bounds, matrix, NULL); + expect(Ok, status); + GdipDeletePath(path); + + todo_wine{ + expectf(-209.6, bounds.X); + expectf(-1274.8, bounds.Y); + expectf(705.0, bounds.Width); + expectf(945.0, bounds.Height); + } } START_TEST(graphicspath)

1 0

Evan Stade : gdiplus: Use passed pen in GdipAddPathWorldBound.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: e547ceb1f65e3367b0e665f71cd218355300f57a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e547ceb1f65e3367b0e665f71… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jul 12 19:42:54 2007 -0700 gdiplus: Use passed pen in GdipAddPathWorldBound. --- dlls/gdiplus/graphicspath.c | 13 +++++++++---- dlls/gdiplus/tests/graphicspath.c | 13 +++++-------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 5b410d6..72b718a 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -217,6 +217,7 @@ GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath* path, GpRectF* bounds, GpPointF extrema[2]; GpPointF * points; INT count, i; + REAL path_width; /* Matrix and pen can be null. */ if(!path || !bounds) @@ -229,10 +230,6 @@ GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath* path, GpRectF* bounds, return Ok; } - /* FIXME: implement case where pen is non-NULL. */ - if(pen) - return NotImplemented; - points = path->pathdata.Points; extrema[0].X = extrema[1].X = points[0].X; extrema[0].Y = extrema[1].Y = points[0].Y; @@ -249,6 +246,14 @@ GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath* path, GpRectF* bounds, GdipTransformMatrixPoints((GpMatrix*)matrix, extrema, 2); } + if(pen){ + path_width = pen->width * pen->miterlimit / 2.0; + extrema[0].X -= path_width; + extrema[0].Y -= path_width; + extrema[1].X += path_width; + extrema[1].Y += path_width; + } + bounds->X = extrema[0].X; bounds->Y = extrema[0].Y; bounds->Width = extrema[1].X - extrema[0].X; diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 6754797..63c0bdc 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -301,16 +301,13 @@ static void test_worldbounds(void) GdipAddPathArc(path, 100.0, 100.0, 500.0, 700.0, 0.0, 100.0); GdipAddPathLine2(path, &(line2_points[0]), 10); status = GdipGetPathWorldBounds(path, &bounds, NULL, pen); - todo_wine - expect(Ok, status); + expect(Ok, status); GdipDeletePath(path); - todo_wine{ - expectf(100.0, bounds.X); - expectf(100.0, bounds.Y); - expectf(650.0, bounds.Width); - expectf(800.0, bounds.Height); - } + expectf(100.0, bounds.X); + expectf(100.0, bounds.Y); + expectf(650.0, bounds.Width); + expectf(800.0, bounds.Height); } START_TEST(graphicspath)

1 0

Evan Stade : gdiplus: Added GdipSetPenLineJoin.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: bcd0eda68701150fa98624d8b10fb1a221c7273a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd0eda68701150fa98624d8b… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jul 12 19:42:47 2007 -0700 gdiplus: Added GdipSetPenLineJoin. --- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/pen.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/gdiplusenums.h | 9 +++++++++ include/gdiplusflat.h | 1 + include/gdiplusgpstubs.h | 1 + 5 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 7b7ec62..1a2d67c 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -47,6 +47,8 @@ struct GpPen{ REAL width; HPEN gdipen; GpLineCap endcap; + GpLineJoin join; + REAL miterlimit; }; struct GpGraphics{ diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 52515d5..a4894d3 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -27,6 +27,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); +static DWORD gdip_to_gdi_join(GpLineJoin join) +{ + switch(join){ + case LineJoinRound: + return PS_JOIN_ROUND; + case LineJoinBevel: + return PS_JOIN_BEVEL; + case LineJoinMiter: + case LineJoinMiterClipped: + return PS_JOIN_MITER; + default: + ERR("Not a member of GpLineJoin enumeration\n"); + return 0; + } +} + GpStatus WINGDIPAPI GdipCreatePen1(ARGB color, FLOAT width, GpUnit unit, GpPen **pen) { @@ -44,6 +60,8 @@ GpStatus WINGDIPAPI GdipCreatePen1(ARGB color, FLOAT width, GpUnit unit, gp_pen->width = width; gp_pen->unit = unit; gp_pen->endcap = LineCapFlat; + gp_pen->join = LineJoinMiter; + gp_pen->miterlimit = 10.0; /* FIXME: Currently only solid lines supported. */ lb.lbStyle = BS_SOLID; @@ -81,3 +99,25 @@ GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen *pen, GpLineCap cap) return Ok; } + +/* FIXME: Miter line joins behave a bit differently than they do in windows. + * Both kinds of miter joins clip if the angle is less than 11 degrees. */ +GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen *pen, GpLineJoin join) +{ + LOGBRUSH lb; + + if(!pen) return InvalidParameter; + + DeleteObject(pen->gdipen); + pen->join = join; + pen->style &= ~(PS_JOIN_ROUND | PS_JOIN_BEVEL | PS_JOIN_MITER); + pen->style |= gdip_to_gdi_join(join); + + lb.lbStyle = BS_SOLID; + lb.lbColor = pen->color; + lb.lbHatch = 0; + + pen->gdipen = ExtCreatePen(pen->style, (INT) pen->width, &lb, 0, NULL); + + return Ok; +} diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 1d00188..629a741 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -73,6 +73,14 @@ enum PathPointType{ PathPointTypeBezier3 = 3 }; +enum LineJoin +{ + LineJoinMiter = 0, + LineJoinBevel = 1, + LineJoinRound = 2, + LineJoinMiterClipped = 3 +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -80,6 +88,7 @@ typedef enum BrushType BrushType; typedef enum FillMode FillMode; typedef enum LineCap LineCap; typedef enum PathPointType PathPointType; +typedef enum LineJoin LineJoin; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 4e5e95f..5e275c9 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -30,6 +30,7 @@ extern "C" { GpStatus WINGDIPAPI GdipCreatePen1(ARGB,REAL,GpUnit,GpPen**); GpStatus WINGDIPAPI GdipDeletePen(GpPen*); GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen*,GpLineCap); +GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen*,GpLineJoin); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**); diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 5c02268..b3962aa 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -47,5 +47,6 @@ typedef FillMode GpFillMode; typedef PathData GpPathData; typedef LineCap GpLineCap; typedef RectF GpRectF; +typedef LineJoin GpLineJoin; #endif

1 0

Dmitry Timoshkov : include: Add HandleToUlong, UlongToHandle, UintToPtr, UlongToPtr compatibility macros.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 3a12fa9e503d2f001346125386edac7b31aa55f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a12fa9e503d2f00134612538… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jul 13 14:18:29 2007 +0900 include: Add HandleToUlong, UlongToHandle, UintToPtr, UlongToPtr compatibility macros. --- include/basetsd.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 7fba324..440112a 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -233,6 +233,11 @@ typedef unsigned short UHALF_PTR, *PUHALF_PTR; #endif /* defined(_WIN64) || defined(_WIN32) */ +#define HandleToUlong(h) HandleToULong(h) +#define UlongToHandle(ul) ULongToHandle(ul) +#define UintToPtr(ui) UIntToPtr(ui) +#define UlongToPtr(ul) ULongToPtr(ul) + typedef LONG_PTR SSIZE_T, *PSSIZE_T; typedef ULONG_PTR SIZE_T, *PSIZE_T;

1 0