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

Misha Koshelev : urlmon: Send BINDSTATUS_DOWNLOADINGDATA if we do not send BEGINDOWNLOADDATA or ENDDOWNLOADDATA .
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: b2beeea5b21aff8fee18f110ea19f13adc32189d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2beeea5b21aff8fee18f110e… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Aug 2 20:46:58 2007 -0500 urlmon: Send BINDSTATUS_DOWNLOADINGDATA if we do not send BEGINDOWNLOADDATA or ENDDOWNLOADDATA. --- dlls/urlmon/binding.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 51105d3..acf96b6 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -912,6 +912,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progress_max) { FORMATETC formatetc = {0, NULL, 1, -1, TYMED_ISTREAM}; + BOOL sent_begindownloaddata = FALSE; TRACE("(%p)->(%d %u %u)\n", This, bscf, progress, progress_max); @@ -939,6 +940,7 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres fill_stream_buffer(This->stream); This->download_state = DOWNLOADING; + sent_begindownloaddata = TRUE; IBindStatusCallback_OnProgress(This->callback, progress, progress_max, BINDSTATUS_BEGINDOWNLOADDATA, This->url); } @@ -947,6 +949,9 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres This->download_state = END_DOWNLOAD; IBindStatusCallback_OnProgress(This->callback, progress, progress_max, BINDSTATUS_ENDDOWNLOADDATA, This->url); + }else if(!sent_begindownloaddata) { + IBindStatusCallback_OnProgress(This->callback, progress, progress_max, + BINDSTATUS_DOWNLOADINGDATA, This->url); } if(!This->request_locked) {

1 0

Misha Koshelev : urlmon: Call IBindStatusCallback_OnStopBinding only if this actually is the last ReportData .
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: b2558480c28528333cbc136e4c9188e72e2727b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2558480c28528333cbc136e4… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Aug 2 20:45:17 2007 -0500 urlmon: Call IBindStatusCallback_OnStopBinding only if this actually is the last ReportData. --- dlls/urlmon/binding.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index e1fac1c..51105d3 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -944,6 +944,7 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres } if(This->stream->hres == S_FALSE || (bscf & BSCF_LASTDATANOTIFICATION)) { + This->download_state = END_DOWNLOAD; IBindStatusCallback_OnProgress(This->callback, progress, progress_max, BINDSTATUS_ENDDOWNLOADDATA, This->url); } @@ -956,8 +957,7 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres IBindStatusCallback_OnDataAvailable(This->callback, bscf, progress, &formatetc, &This->stgmed); - if(This->stream->hres == S_FALSE) { - This->download_state = END_DOWNLOAD; + if(This->download_state == END_DOWNLOAD) { IBindStatusCallback_OnStopBinding(This->callback, S_OK, NULL); } }

1 0

Misha Koshelev : Revert "urlmon: Use BSCF_ values passed to report_data to keep track of download state."
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 99989f8241be0374a81a71842638951301de156f URL: http://source.winehq.org/git/wine.git/?a=commit;h=99989f8241be0374a81a71842… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Aug 3 13:35:35 2007 +0200 Revert "urlmon: Use BSCF_ values passed to report_data to keep track of download state." This reverts commit 978f6b98c9a67055f5a0f878a44b3b66c16a6019. --- dlls/urlmon/binding.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index bf0d027..e1fac1c 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -67,6 +67,12 @@ typedef struct { HRESULT hres; } ProtocolStream; +typedef enum { + BEFORE_DOWNLOAD, + DOWNLOADING, + END_DOWNLOAD +} download_state_t; + struct Binding { const IBindingVtbl *lpBindingVtbl; const IInternetProtocolSinkVtbl *lpInternetProtocolSinkVtbl; @@ -88,6 +94,7 @@ struct Binding { BOOL report_mime; DWORD continue_call; BOOL request_locked; + download_state_t download_state; DWORD apartment_thread; HWND notif_hwnd; @@ -905,10 +912,12 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progress_max) { FORMATETC formatetc = {0, NULL, 1, -1, TYMED_ISTREAM}; - BOOL end_download = FALSE; TRACE("(%p)->(%d %u %u)\n", This, bscf, progress, progress_max); + if(This->download_state == END_DOWNLOAD) + return; + if(GetCurrentThreadId() != This->apartment_thread) FIXME("called from worked hread\n"); @@ -926,17 +935,15 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres BINDSTATUS_MIMETYPEAVAILABLE, mime); } - if(bscf & BSCF_FIRSTDATANOTIFICATION) { + if(This->download_state == BEFORE_DOWNLOAD) { fill_stream_buffer(This->stream); + This->download_state = DOWNLOADING; IBindStatusCallback_OnProgress(This->callback, progress, progress_max, BINDSTATUS_BEGINDOWNLOADDATA, This->url); } - if((bscf & BSCF_LASTDATANOTIFICATION) || - (bscf & BSCF_DATAFULLYAVAILABLE) || - progress == progress_max) { - end_download = TRUE; + if(This->stream->hres == S_FALSE || (bscf & BSCF_LASTDATANOTIFICATION)) { IBindStatusCallback_OnProgress(This->callback, progress, progress_max, BINDSTATUS_ENDDOWNLOADDATA, This->url); } @@ -949,7 +956,8 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres IBindStatusCallback_OnDataAvailable(This->callback, bscf, progress, &formatetc, &This->stgmed); - if(end_download) { + if(This->stream->hres == S_FALSE) { + This->download_state = END_DOWNLOAD; IBindStatusCallback_OnStopBinding(This->callback, S_OK, NULL); } } @@ -1302,6 +1310,7 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * ret->report_mime = TRUE; ret->continue_call = 0; ret->request_locked = FALSE; + ret->download_state = BEFORE_DOWNLOAD; ret->task_queue_head = ret->task_queue_tail = NULL; memset(&ret->bindinfo, 0, sizeof(BINDINFO));

1 0

Misha Koshelev : Revert "urlmon: Report BINDSTATUS_DOWNLOADINGDATA on BSCF_INTERMEDIATEDATANOTIFICATION."
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: aa12574d099a2a97966e5c8062c6672070eaeb2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa12574d099a2a97966e5c806… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Aug 3 13:35:19 2007 +0200 Revert "urlmon: Report BINDSTATUS_DOWNLOADINGDATA on BSCF_INTERMEDIATEDATANOTIFICATION." This reverts commit b3a660a69cb345d0960d787faa0229f2f25cc11c. --- dlls/urlmon/binding.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 0ba4cdb..bf0d027 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -939,9 +939,6 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres end_download = TRUE; IBindStatusCallback_OnProgress(This->callback, progress, progress_max, BINDSTATUS_ENDDOWNLOADDATA, This->url); - } else if(bscf & BSCF_INTERMEDIATEDATANOTIFICATION) { - IBindStatusCallback_OnProgress(This->callback, progress, progress_max, - BINDSTATUS_DOWNLOADINGDATA, This->url); } if(!This->request_locked) {

1 0

Evan Stade : gdiplus: Alphabetized header.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 46ce55bf99f8ed4670604c10a296f228e1f835fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ce55bf99f8ed4670604c10a… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 2 17:53:18 2007 -0700 gdiplus: Alphabetized header. --- include/gdiplusflat.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index f50f65e..fb15b88 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -93,6 +93,7 @@ GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF*,INT,GpWrapMode, GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath*, GpPathGradient**); GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**); +GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient*,GpPointF*); GpStatus WINGDIPAPI GdipGetPathGradientFocusScales(GpPathGradient*,REAL*,REAL*); @@ -100,7 +101,6 @@ GpStatus WINGDIPAPI GdipGetPathGradientGammaCorrection(GpPathGradient*,BOOL*); GpStatus WINGDIPAPI GdipGetPathGradientPointCount(GpPathGradient*,INT*); GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient*, ARGB*,INT*); -GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill*,ARGB*); GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient*,ARGB); GpStatus WINGDIPAPI GdipSetPathGradientCenterPoint(GpPathGradient*,GpPointF*); @@ -132,16 +132,16 @@ GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath*,GpRectF*,GDIPCONST GpMatrix*, GpStatus WINGDIPAPI GdipGetPointCount(GpPath*,INT*); GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPointI(GpPath*,INT,INT,GpPen*, GpGraphics*,BOOL*); -GpStatus WINGDIPAPI GdipStartPathFigure(GpPath*); GpStatus WINGDIPAPI GdipResetPath(GpPath*); GpStatus WINGDIPAPI GdipSetPathFillMode(GpPath*,GpFillMode); +GpStatus WINGDIPAPI GdipStartPathFigure(GpPath*); GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*); GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix*,GpMatrix**); +GpStatus WINGDIPAPI GdipCreateMatrix(GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *,GDIPCONST GpPointF*, GpMatrix**); -GpStatus WINGDIPAPI GdipCreateMatrix(GpMatrix**); GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*); GpStatus WINGDIPAPI GdipGetMatrixElements(GDIPCONST GpMatrix*,REAL*); GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix*,GpMatrix*,GpMatrixOrder);

1 0

Evan Stade : gdiplus: Removed old fixmes.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 88ab6d32d3597d9e4622092a7e35011c2889293d URL: http://source.winehq.org/git/wine.git/?a=commit;h=88ab6d32d3597d9e4622092a7… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 2 17:53:13 2007 -0700 gdiplus: Removed old fixmes. --- dlls/gdiplus/graphics.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ab19fa7..c21e891 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -471,7 +471,7 @@ static void shorten_line_amt(REAL x1, REAL y1, REAL *x2, REAL *y2, REAL amt) } /* Draws lines between the given points, and if caps is true then draws an endcap - * at the end of the last line. FIXME: Startcaps not implemented. */ + * at the end of the last line. */ static GpStatus draw_polyline(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF * pt, INT count, BOOL caps) { @@ -570,7 +570,7 @@ static void shorten_bezier_amt(GpPointF * pt, REAL amt, BOOL rev) } /* Draws bezier curves between given points, and if caps is true then draws an - * endcap at the end of the last line. FIXME: Startcaps not implemented. */ + * endcap at the end of the last line. */ static GpStatus draw_polybezier(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF * pt, INT count, BOOL caps) { @@ -814,7 +814,6 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, GDIPCONST WmfPlaceableFileHeader * placeable, GpMetafile **metafile) { - static int calls; IStream *stream = NULL; UINT read; BYTE* copy; @@ -823,10 +822,6 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, if(!hwmf || !metafile || !placeable) return InvalidParameter; - - if(!(calls++)) - FIXME("partially implemented\n"); - read = GetMetaFileBitsEx(hwmf, 0, NULL); if(!read) return GenericError;

1 0

Evan Stade : gdiplus: Added GdipG/SetPathGradientFocusScales.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 496c319c7001c3429cffda3cf747cf7a66d4b627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=496c319c7001c3429cffda3cf… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 2 17:53:04 2007 -0700 gdiplus: Added GdipG/SetPathGradientFocusScales. --- dlls/gdiplus/brush.c | 28 ++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/gdiplus_private.h | 1 + include/gdiplusflat.h | 2 ++ 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 1e08c42..33b48ad 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -116,6 +116,8 @@ GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, (*grad)->gamma = FALSE; (*grad)->center.X = 0.0; (*grad)->center.Y = 0.0; + (*grad)->focus.X = 0.0; + (*grad)->focus.Y = 0.0; return Ok; } @@ -159,6 +161,8 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, /* FIXME: this should be set to the "centroid" of the path by default */ (*grad)->center.X = 0.0; (*grad)->center.Y = 0.0; + (*grad)->focus.X = 0.0; + (*grad)->focus.Y = 0.0; return Ok; } @@ -225,6 +229,18 @@ GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient *grad, return Ok; } +GpStatus WINGDIPAPI GdipGetPathGradientFocusScales(GpPathGradient *grad, + REAL *x, REAL *y) +{ + if(!grad || !x || !y) + return InvalidParameter; + + *x = grad->focus.X; + *y = grad->focus.Y; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPathGradientGammaCorrection(GpPathGradient *grad, BOOL *gamma) { @@ -298,6 +314,18 @@ GpStatus WINGDIPAPI GdipSetPathGradientCenterPoint(GpPathGradient *grad, return Ok; } +GpStatus WINGDIPAPI GdipSetPathGradientFocusScales(GpPathGradient *grad, + REAL x, REAL y) +{ + if(!grad) + return InvalidParameter; + + grad->focus.X = x; + grad->focus.Y = y; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient *grad, BOOL gamma) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 0114952..db227c1 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -330,7 +330,7 @@ @ stub GdipGetPathGradientCenterColor @ stdcall GdipGetPathGradientCenterPoint(ptr ptr) @ stub GdipGetPathGradientCenterPointI -@ stub GdipGetPathGradientFocusScales +@ stdcall GdipGetPathGradientFocusScales(ptr ptr ptr) @ stdcall GdipGetPathGradientGammaCorrection(ptr ptr) @ stub GdipGetPathGradientPath @ stdcall GdipGetPathGradientPointCount(ptr ptr) @@ -552,7 +552,7 @@ @ stdcall GdipSetPathGradientCenterColor(ptr long) @ stdcall GdipSetPathGradientCenterPoint(ptr ptr) @ stub GdipSetPathGradientCenterPointI -@ stub GdipSetPathGradientFocusScales +@ stdcall GdipSetPathGradientFocusScales(ptr long long) @ stdcall GdipSetPathGradientGammaCorrection(ptr long) @ stub GdipSetPathGradientLinearBlend @ stub GdipSetPathGradientPath diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 53756c3..02db7aa 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -99,6 +99,7 @@ struct GpPathGradient{ GpWrapMode wrap; BOOL gamma; GpPointF center; + GpPointF focus; }; struct GpPath{ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 20d4ff9..f50f65e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -95,6 +95,7 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath*, GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient*,GpPointF*); +GpStatus WINGDIPAPI GdipGetPathGradientFocusScales(GpPathGradient*,REAL*,REAL*); GpStatus WINGDIPAPI GdipGetPathGradientGammaCorrection(GpPathGradient*,BOOL*); GpStatus WINGDIPAPI GdipGetPathGradientPointCount(GpPathGradient*,INT*); GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient*, @@ -103,6 +104,7 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill*,ARGB*); GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient*,ARGB); GpStatus WINGDIPAPI GdipSetPathGradientCenterPoint(GpPathGradient*,GpPointF*); +GpStatus WINGDIPAPI GdipSetPathGradientFocusScales(GpPathGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient*,BOOL); GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient*,

1 0

Evan Stade : gdiplus: Use custom cap base inset differently.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 7f0aa3af7c945a8e538e12eca2b631a44c9c3d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f0aa3af7c945a8e538e12eca… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 2 17:53:08 2007 -0700 gdiplus: Use custom cap base inset differently. --- dlls/gdiplus/graphics.c | 57 ++++++++++------------------------------------ 1 files changed, 13 insertions(+), 44 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 439dedd..ab19fa7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -574,9 +574,8 @@ static void shorten_bezier_amt(GpPointF * pt, REAL amt, BOOL rev) static GpStatus draw_polybezier(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF * pt, INT count, BOOL caps) { - POINT *pti, curpos; + POINT *pti; GpPointF *ptcopy; - REAL x, y; GpStatus status = GenericError; if(!count) @@ -595,30 +594,14 @@ static GpStatus draw_polybezier(GpGraphics *graphics, GpPen *pen, if(caps){ if(pen->endcap == LineCapArrowAnchor) shorten_bezier_amt(&ptcopy[count-4], pen->width, FALSE); - /* FIXME The following is seemingly correct only for baseinset < 0 or - * baseinset > ~3. With smaller baseinsets, windows actually - * lengthens the bezier line instead of shortening it. */ - else if((pen->endcap == LineCapCustom) && pen->customend){ - x = pt[count - 1].X; - y = pt[count - 1].Y; - shorten_line_amt(pt[count - 2].X, pt[count - 2].Y, &x, &y, - pen->width * pen->customend->inset); - MoveToEx(graphics->hdc, roundr(pt[count - 1].X), roundr(pt[count - 1].Y), &curpos); - LineTo(graphics->hdc, roundr(x), roundr(y)); - MoveToEx(graphics->hdc, curpos.x, curpos.y, NULL); - } + else if((pen->endcap == LineCapCustom) && pen->customend) + shorten_bezier_amt(&ptcopy[count-4], pen->width * pen->customend->inset, + FALSE); if(pen->startcap == LineCapArrowAnchor) shorten_bezier_amt(ptcopy, pen->width, TRUE); - else if((pen->startcap == LineCapCustom) && pen->customstart){ - x = ptcopy[0].X; - y = ptcopy[0].Y; - shorten_line_amt(ptcopy[1].X, ptcopy[1].Y, &x, &y, - pen->width * pen->customend->inset); - MoveToEx(graphics->hdc, roundr(pt[0].X), roundr(pt[0].Y), &curpos); - LineTo(graphics->hdc, roundr(x), roundr(y)); - MoveToEx(graphics->hdc, curpos.x, curpos.y, NULL); - } + else if((pen->startcap == LineCapCustom) && pen->customstart) + shorten_bezier_amt(ptcopy, pen->width * pen->customend->inset, TRUE); /* the direction of the line cap is parallel to the direction at the * end of the bezier (which, if it has been shortened, is not the same @@ -650,10 +633,9 @@ end: static GpStatus draw_poly(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF * pt, GDIPCONST BYTE * types, INT count, BOOL caps) { - POINT *pti = GdipAlloc(count * sizeof(POINT)), curpos; + POINT *pti = GdipAlloc(count * sizeof(POINT)); BYTE *tp = GdipAlloc(count); GpPointF *ptcopy = GdipAlloc(count * sizeof(GpPointF)); - REAL x = pt[count - 1].X, y = pt[count - 1].Y; INT i, j; GpStatus status = GenericError; @@ -686,16 +668,9 @@ static GpStatus draw_poly(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF * case PathPointTypeBezier: if(pen->endcap == LineCapArrowAnchor) shorten_bezier_amt(&ptcopy[count - 4], pen->width, FALSE); - else if((pen->endcap == LineCapCustom) && pen->customend){ - x = pt[count - 1].X; - y = pt[count - 1].Y; - shorten_line_amt(pt[count - 2].X, pt[count - 2].Y, &x, &y, - pen->width * pen->customend->inset); - MoveToEx(graphics->hdc, roundr(pt[count - 1].X), - roundr(pt[count - 1].Y), &curpos); - LineTo(graphics->hdc, roundr(x), roundr(y)); - MoveToEx(graphics->hdc, curpos.x, curpos.y, NULL); - } + else if((pen->endcap == LineCapCustom) && pen->customend) + shorten_bezier_amt(&ptcopy[count - 4], + pen->width * pen->customend->inset, FALSE); draw_cap(graphics, pen->brush->lb.lbColor, pen->endcap, pen->width, pen->customend, pt[count - 1].X - (ptcopy[count - 1].X - ptcopy[count - 2].X), @@ -731,15 +706,9 @@ static GpStatus draw_poly(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF * case PathPointTypeBezier: if(pen->startcap == LineCapArrowAnchor) shorten_bezier_amt(&ptcopy[j - 1], pen->width, TRUE); - else if((pen->startcap == LineCapCustom) && pen->customstart){ - x = pt[j - 1].X; - y = pt[j - 1].Y; - shorten_line_amt(ptcopy[j].X, ptcopy[j].Y, &x, &y, - pen->width * pen->customstart->inset); - MoveToEx(graphics->hdc, roundr(pt[j - 1].X), roundr(pt[j - 1].Y), &curpos); - LineTo(graphics->hdc, roundr(x), roundr(y)); - MoveToEx(graphics->hdc, curpos.x, curpos.y, NULL); - } + else if((pen->startcap == LineCapCustom) && pen->customstart) + shorten_bezier_amt(&ptcopy[j - 1], + pen->width * pen->customend->inset, TRUE); draw_cap(graphics, pen->brush->lb.lbColor, pen->startcap, pen->width, pen->customstart, pt[j - 1].X - (ptcopy[j - 1].X - ptcopy[j].X),

1 0

Evan Stade : gdiplus: Updated GpBrush functions.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 7929ba8dcecae2a0faaf8b7f7e32c5a4371f5bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=7929ba8dcecae2a0faaf8b7f7… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 2 17:52:55 2007 -0700 gdiplus: Updated GpBrush functions. --- dlls/gdiplus/brush.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index d993119..d9f06ad 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -41,6 +41,35 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) (*clone)->gdibrush = CreateBrushIndirect(&(*clone)->lb); break; + case BrushTypePathGradient:{ + GpPathGradient *src, *dest; + INT count; + + *clone = GdipAlloc(sizeof(GpPathGradient)); + if (!*clone) return OutOfMemory; + + src = (GpPathGradient*) brush, + dest = (GpPathGradient*) *clone; + count = src->pathdata.Count; + + memcpy(dest, src, sizeof(GpPathGradient)); + + dest->pathdata.Count = count; + dest->pathdata.Points = GdipAlloc(count * sizeof(PointF)); + dest->pathdata.Types = GdipAlloc(count); + + if(!dest->pathdata.Points || !dest->pathdata.Types){ + GdipFree(dest->pathdata.Points); + GdipFree(dest->pathdata.Types); + GdipFree(dest); + return OutOfMemory; + } + + memcpy(dest->pathdata.Points, src->pathdata.Points, count * sizeof(PointF)); + memcpy(dest->pathdata.Types, src->pathdata.Types, count); + + break; + } default: return NotImplemented; } @@ -162,6 +191,17 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) { if(!brush) return InvalidParameter; + switch(brush->bt) + { + case BrushTypePathGradient: + GdipFree(((GpPathGradient*) brush)->pathdata.Points); + GdipFree(((GpPathGradient*) brush)->pathdata.Types); + break; + case BrushTypeSolidColor: + default: + break; + } + DeleteObject(brush->gdibrush); GdipFree(brush);

1 0

Evan Stade : gdiplus: Added GdipG/SetPathGradientCenterPoint.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 9a9c857b3ffbc21d6fbde0d021daa9b2816373d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a9c857b3ffbc21d6fbde0d02… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 2 17:52:59 2007 -0700 gdiplus: Added GdipG/SetPathGradientCenterPoint. --- dlls/gdiplus/brush.c | 29 +++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/gdiplus_private.h | 1 + include/gdiplusflat.h | 2 ++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index d9f06ad..1e08c42 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -114,6 +114,8 @@ GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, (*grad)->centercolor = 0xffffffff; (*grad)->wrap = wrap; (*grad)->gamma = FALSE; + (*grad)->center.X = 0.0; + (*grad)->center.Y = 0.0; return Ok; } @@ -154,6 +156,9 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, (*grad)->centercolor = 0xffffffff; (*grad)->wrap = WrapModeClamp; (*grad)->gamma = FALSE; + /* FIXME: this should be set to the "centroid" of the path by default */ + (*grad)->center.X = 0.0; + (*grad)->center.Y = 0.0; return Ok; } @@ -208,6 +213,18 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) return Ok; } +GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient *grad, + GpPointF *point) +{ + if(!grad || !point) + return InvalidParameter; + + point->X = grad->center.X; + point->Y = grad->center.Y; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPathGradientGammaCorrection(GpPathGradient *grad, BOOL *gamma) { @@ -269,6 +286,18 @@ GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient *grad, return Ok; } +GpStatus WINGDIPAPI GdipSetPathGradientCenterPoint(GpPathGradient *grad, + GpPointF *point) +{ + if(!grad || !point) + return InvalidParameter; + + grad->center.X = point->X; + grad->center.Y = point->Y; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient *grad, BOOL gamma) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 467ba82..0114952 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -328,7 +328,7 @@ @ stub GdipGetPathGradientBlend @ stub GdipGetPathGradientBlendCount @ stub GdipGetPathGradientCenterColor -@ stub GdipGetPathGradientCenterPoint +@ stdcall GdipGetPathGradientCenterPoint(ptr ptr) @ stub GdipGetPathGradientCenterPointI @ stub GdipGetPathGradientFocusScales @ stdcall GdipGetPathGradientGammaCorrection(ptr ptr) @@ -550,7 +550,7 @@ @ stdcall GdipSetPathFillMode(ptr long) @ stub GdipSetPathGradientBlend @ stdcall GdipSetPathGradientCenterColor(ptr long) -@ stub GdipSetPathGradientCenterPoint +@ stdcall GdipSetPathGradientCenterPoint(ptr ptr) @ stub GdipSetPathGradientCenterPointI @ stub GdipSetPathGradientFocusScales @ stdcall GdipSetPathGradientGammaCorrection(ptr long) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 5f92680..53756c3 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -98,6 +98,7 @@ struct GpPathGradient{ ARGB centercolor; GpWrapMode wrap; BOOL gamma; + GpPointF center; }; struct GpPath{ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 35edfba..20d4ff9 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -94,6 +94,7 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath*, GpPathGradient**); GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); +GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient*,GpPointF*); GpStatus WINGDIPAPI GdipGetPathGradientGammaCorrection(GpPathGradient*,BOOL*); GpStatus WINGDIPAPI GdipGetPathGradientPointCount(GpPathGradient*,INT*); GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient*, @@ -101,6 +102,7 @@ GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient*, GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill*,ARGB*); GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient*,ARGB); +GpStatus WINGDIPAPI GdipSetPathGradientCenterPoint(GpPathGradient*,GpPointF*); GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient*,BOOL); GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient*,

1 0