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

Evan Stade : gdiplus: Added GdipS/GetPathGradientGammaCorrection.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 9ea7ef468b1911393bf95e3d6359cef3ba9e3a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea7ef468b1911393bf95e3d6… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 2 17:52:49 2007 -0700 gdiplus: Added GdipS/GetPathGradientGammaCorrection. --- dlls/gdiplus/brush.c | 24 ++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/gdiplus_private.h | 1 + include/gdiplusflat.h | 2 ++ 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 4864caf..d993119 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -84,6 +84,7 @@ GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, (*grad)->brush.bt = BrushTypePathGradient; (*grad)->centercolor = 0xffffffff; (*grad)->wrap = wrap; + (*grad)->gamma = FALSE; return Ok; } @@ -123,6 +124,7 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, (*grad)->brush.bt = BrushTypePathGradient; (*grad)->centercolor = 0xffffffff; (*grad)->wrap = WrapModeClamp; + (*grad)->gamma = FALSE; return Ok; } @@ -166,6 +168,17 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) return Ok; } +GpStatus WINGDIPAPI GdipGetPathGradientGammaCorrection(GpPathGradient *grad, + BOOL *gamma) +{ + if(!grad || !gamma) + return InvalidParameter; + + *gamma = grad->gamma; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPathGradientPointCount(GpPathGradient *grad, INT *count) { @@ -216,6 +229,17 @@ GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient *grad, return Ok; } +GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient *grad, + BOOL gamma) +{ + if(!grad) + return InvalidParameter; + + grad->gamma = gamma; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient *grad, REAL focus, REAL scale) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index a3da26a..467ba82 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -331,7 +331,7 @@ @ stub GdipGetPathGradientCenterPoint @ stub GdipGetPathGradientCenterPointI @ stub GdipGetPathGradientFocusScales -@ stub GdipGetPathGradientGammaCorrection +@ stdcall GdipGetPathGradientGammaCorrection(ptr ptr) @ stub GdipGetPathGradientPath @ stdcall GdipGetPathGradientPointCount(ptr ptr) @ stub GdipGetPathGradientPresetBlend @@ -553,7 +553,7 @@ @ stub GdipSetPathGradientCenterPoint @ stub GdipSetPathGradientCenterPointI @ stub GdipSetPathGradientFocusScales -@ stub GdipSetPathGradientGammaCorrection +@ stdcall GdipSetPathGradientGammaCorrection(ptr long) @ stub GdipSetPathGradientLinearBlend @ stub GdipSetPathGradientPath @ stub GdipSetPathGradientPresetBlend diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 1c59a59..5f92680 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -97,6 +97,7 @@ struct GpPathGradient{ PathData pathdata; ARGB centercolor; GpWrapMode wrap; + BOOL gamma; }; struct GpPath{ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 87b8ccb..35edfba 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -94,12 +94,14 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath*, GpPathGradient**); GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); +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 GdipSetPathGradientGammaCorrection(GpPathGradient*,BOOL); GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient*, ARGB*,INT*);

1 0

Evan Stade : gdiplus: Added GdipSetPathGradientSigmaBlend stub.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 15dce3a4324d8f69f9bd8124c09f2b37301910fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=15dce3a4324d8f69f9bd8124c… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 2 17:52:43 2007 -0700 gdiplus: Added GdipSetPathGradientSigmaBlend stub. --- dlls/gdiplus/brush.c | 14 ++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 3994771..4864caf 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -216,6 +216,20 @@ GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient *grad, return Ok; } +GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient *grad, + REAL focus, REAL scale) +{ + static int calls; + + if(!grad || focus < 0.0 || focus > 1.0 || scale < 0.0 || scale > 1.0) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient *grad, ARGB *argb, INT *count) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index fc4a8f3..a3da26a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -557,7 +557,7 @@ @ stub GdipSetPathGradientLinearBlend @ stub GdipSetPathGradientPath @ stub GdipSetPathGradientPresetBlend -@ stub GdipSetPathGradientSigmaBlend +@ stdcall GdipSetPathGradientSigmaBlend(ptr long long) @ stdcall GdipSetPathGradientSurroundColorsWithCount(ptr ptr ptr) @ stub GdipSetPathGradientTransform @ stdcall GdipSetPathGradientWrapMode(ptr long) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 60115a4..87b8ccb 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -100,6 +100,7 @@ GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient*, GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill*,ARGB*); GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient*,ARGB); +GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient*, ARGB*,INT*); GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient*,GpWrapMode);

1 0

Evan Stade : gdiplus: Added GdipS/ GetPathGradientSurroundColorsWithCount stubs.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 03af4ed338257ffc71018e620c1c23cc5d5c43de URL: http://source.winehq.org/git/wine.git/?a=commit;h=03af4ed338257ffc71018e620… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 2 17:51:58 2007 -0700 gdiplus: Added GdipS/GetPathGradientSurroundColorsWithCount stubs. --- dlls/gdiplus/brush.c | 29 +++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 4 ++-- include/gdiplusflat.h | 4 ++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 2bdeb89..3994771 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -177,6 +177,20 @@ GpStatus WINGDIPAPI GdipGetPathGradientPointCount(GpPathGradient *grad, return Ok; } +GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient + *grad, ARGB *argb, INT *count) +{ + static int calls; + + if(!grad || !argb || !count || (*count < grad->pathdata.Count)) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill *sf, ARGB *argb) { if(!sf || !argb) @@ -202,6 +216,21 @@ GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient *grad, return Ok; } +GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient + *grad, ARGB *argb, INT *count) +{ + static int calls; + + if(!grad || !argb || !count || (*count <= 0) || + (*count > grad->pathdata.Count)) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient *grad, GpWrapMode wrap) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index a502b14..fc4a8f3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -339,7 +339,7 @@ @ stub GdipGetPathGradientRect @ stub GdipGetPathGradientRectI @ stub GdipGetPathGradientSurroundColorCount -@ stub GdipGetPathGradientSurroundColorsWithCount +@ stdcall GdipGetPathGradientSurroundColorsWithCount(ptr ptr ptr) @ stub GdipGetPathGradientTransform @ stub GdipGetPathGradientWrapMode @ stub GdipGetPathLastPoint @@ -558,7 +558,7 @@ @ stub GdipSetPathGradientPath @ stub GdipSetPathGradientPresetBlend @ stub GdipSetPathGradientSigmaBlend -@ stub GdipSetPathGradientSurroundColorsWithCount +@ stdcall GdipSetPathGradientSurroundColorsWithCount(ptr ptr ptr) @ stub GdipSetPathGradientTransform @ stdcall GdipSetPathGradientWrapMode(ptr long) @ stub GdipSetPathMarker diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index fab9e0e..60115a4 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -95,9 +95,13 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath*, GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); 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 GdipSetPathGradientSurroundColorsWithCount(GpPathGradient*, + ARGB*,INT*); GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient*,GpWrapMode); GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill*,ARGB);

1 0

Evan Stade : gdiplus: Added GdipCreatePathGradient.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: b26d7ce82d959026143e128e0c28c110cf43d3b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b26d7ce82d959026143e128e0… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 2 17:54:24 2007 -0700 gdiplus: Added GdipCreatePathGradient. --- dlls/gdiplus/brush.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 2 ++ 3 files changed, 43 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 265aba0..2bdeb89 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -48,6 +48,46 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) return Ok; } +GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, + INT count, GpWrapMode wrap, GpPathGradient **grad) +{ + COLORREF col = ARGB2COLORREF(0xffffffff); + + if(!points || !grad) + return InvalidParameter; + + if(count <= 0) + return OutOfMemory; + + *grad = GdipAlloc(sizeof(GpPathGradient)); + if (!*grad) return OutOfMemory; + + (*grad)->pathdata.Count = count; + (*grad)->pathdata.Points = GdipAlloc(count * sizeof(PointF)); + (*grad)->pathdata.Types = GdipAlloc(count); + + if(!(*grad)->pathdata.Points || !(*grad)->pathdata.Types){ + GdipFree((*grad)->pathdata.Points); + GdipFree((*grad)->pathdata.Types); + GdipFree(*grad); + return OutOfMemory; + } + + memcpy((*grad)->pathdata.Points, points, count * sizeof(PointF)); + memset((*grad)->pathdata.Types, PathPointTypeLine, count); + + (*grad)->brush.lb.lbStyle = BS_SOLID; + (*grad)->brush.lb.lbColor = col; + (*grad)->brush.lb.lbHatch = 0; + + (*grad)->brush.gdibrush = CreateSolidBrush(col); + (*grad)->brush.bt = BrushTypePathGradient; + (*grad)->centercolor = 0xffffffff; + (*grad)->wrap = wrap; + + return Ok; +} + /* FIXME: path gradient brushes not truly supported (drawn as solid brushes) */ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, GpPathGradient **grad) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index dba0b24..a502b14 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -116,7 +116,7 @@ @ stub GdipCreatePath2 @ stub GdipCreatePath2I @ stdcall GdipCreatePath(long ptr) -@ stub GdipCreatePathGradient +@ stdcall GdipCreatePathGradient(ptr long long ptr) @ stdcall GdipCreatePathGradientFromPath(ptr ptr) @ stub GdipCreatePathGradientI @ stdcall GdipCreatePathIter(ptr ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 4a90d32..fab9e0e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -88,6 +88,8 @@ GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics*,SmoothingMode); GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics*,GpMatrix*); GpStatus WINGDIPAPI GdipCloneBrush(GpBrush*,GpBrush**); +GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF*,INT,GpWrapMode, + GpPathGradient**); GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath*, GpPathGradient**); GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**);

1 0

Evan Stade : gdi32: Don't print fixme more than once.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: cf8b59ef81d448d39204db2fd67972531f92c8e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8b59ef81d448d39204db2fd… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 2 17:51:40 2007 -0700 gdi32: Don't print fixme more than once. --- dlls/gdi32/enhmetafile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 9e7684b..2b4d03f 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1172,6 +1172,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_EXTSELECTCLIPRGN: { + static int extselectcliprgn_cases; #if 0 const EMREXTSELECTCLIPRGN lpRgn = (const EMREXTSELECTCLIPRGN *)mr; HRGN hRgn = ExtCreateRegion(NULL, lpRgn->cbRgnData, (RGNDATA *)lpRgn->RgnData); @@ -1180,7 +1181,8 @@ BOOL WINAPI PlayEnhMetaFileRecord( /* ExtSelectClipRgn created a copy of the region */ DeleteObject(hRgn); #endif - FIXME("ExtSelectClipRgn\n"); + if(!(extselectcliprgn_cases++)) + FIXME("ExtSelectClipRgn\n"); break; }

1 0

Francois Gouget : netapi32: Fix the NetUseAdd() calling convention.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: cec957d6843bf82b476c978199705637b38710ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=cec957d6843bf82b476c97819… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 3 00:45:40 2007 +0200 netapi32: Fix the NetUseAdd() calling convention. --- dlls/netapi32/access.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index f2a09ba..70adc97 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -833,7 +833,7 @@ NET_API_STATUS WINAPI NetUserChangePassword(LPCWSTR domainname, LPCWSTR username return NERR_Success; } -NET_API_STATUS NetUseAdd(LMSTR servername, DWORD level, LPBYTE bufptr, LPDWORD parm_err) +NET_API_STATUS WINAPI NetUseAdd(LMSTR servername, DWORD level, LPBYTE bufptr, LPDWORD parm_err) { FIXME("%s %d %p %p stub\n", debugstr_w(servername), level, bufptr, parm_err); return NERR_Success;

1 0

Francois Gouget : d3d9: Update win32.api to fix the winapi_check warnings.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 3c1c89eb6ec8601f9dc6246cc4510d87a82fd08f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c1c89eb6ec8601f9dc6246cc… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 3 00:47:12 2007 +0200 d3d9: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 88d1d94..30eee71 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -810,6 +810,8 @@ void %long BOOL +D3DCOLOR +DWORD HRESULT UINT int @@ -817,7 +819,14 @@ int %ptr IDirect3D9 * -LPVOID + +%wstr + +LPCWSTR + +%void + +void %%d3dx8.dll

1 0

Evan Stade : gdiplus: Added GdipGetPathGradientPointCount.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 490ca1cabb6d0fb75e1829e7e6d9fbd2fa9dccfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=490ca1cabb6d0fb75e1829e7e… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 2 17:51:49 2007 -0700 gdiplus: Added GdipGetPathGradientPointCount. --- dlls/gdiplus/brush.c | 28 +++++++++++++++++++++++++++- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 1 + include/gdiplusflat.h | 1 + 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index dbe221c..265aba0 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -60,12 +60,27 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, *grad = GdipAlloc(sizeof(GpPathGradient)); if (!*grad) return OutOfMemory; + (*grad)->pathdata.Count = path->pathdata.Count; + (*grad)->pathdata.Points = GdipAlloc(path->pathdata.Count * sizeof(PointF)); + (*grad)->pathdata.Types = GdipAlloc(path->pathdata.Count); + + if(!(*grad)->pathdata.Points || !(*grad)->pathdata.Types){ + GdipFree((*grad)->pathdata.Points); + GdipFree((*grad)->pathdata.Types); + GdipFree(*grad); + return OutOfMemory; + } + + memcpy((*grad)->pathdata.Points, path->pathdata.Points, + path->pathdata.Count * sizeof(PointF)); + memcpy((*grad)->pathdata.Types, path->pathdata.Types, path->pathdata.Count); + (*grad)->brush.lb.lbStyle = BS_SOLID; (*grad)->brush.lb.lbColor = col; (*grad)->brush.lb.lbHatch = 0; (*grad)->brush.gdibrush = CreateSolidBrush(col); - (*grad)->brush.bt = BrushTypeSolidColor; + (*grad)->brush.bt = BrushTypePathGradient; (*grad)->centercolor = 0xffffffff; (*grad)->wrap = WrapModeClamp; @@ -111,6 +126,17 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) return Ok; } +GpStatus WINGDIPAPI GdipGetPathGradientPointCount(GpPathGradient *grad, + INT *count) +{ + if(!grad || !count) + return InvalidParameter; + + *count = grad->pathdata.Count; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill *sf, ARGB *argb) { if(!sf || !argb) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f92c18c..dba0b24 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -333,7 +333,7 @@ @ stub GdipGetPathGradientFocusScales @ stub GdipGetPathGradientGammaCorrection @ stub GdipGetPathGradientPath -@ stub GdipGetPathGradientPointCount +@ stdcall GdipGetPathGradientPointCount(ptr ptr) @ stub GdipGetPathGradientPresetBlend @ stub GdipGetPathGradientPresetBlendCount @ stub GdipGetPathGradientRect diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index ee120d9..1c59a59 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -94,6 +94,7 @@ struct GpSolidFill{ struct GpPathGradient{ GpBrush brush; + PathData pathdata; ARGB centercolor; GpWrapMode wrap; }; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 83aea93..4a90d32 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -92,6 +92,7 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath*, GpPathGradient**); GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); +GpStatus WINGDIPAPI GdipGetPathGradientPointCount(GpPathGradient*,INT*); GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill*,ARGB*); GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient*,ARGB);

1 0

Francois Gouget : gdiplus: Fix a couple of prototypes in the spec file.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 9f42e78b6c03bdcea3b2ea6661316ed093557592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f42e78b6c03bdcea3b2ea666… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 3 00:44:01 2007 +0200 gdiplus: Fix a couple of prototypes in the spec file. --- dlls/gdiplus/gdiplus.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 6b79a71..f92c18c 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -495,7 +495,7 @@ @ stub GdipSaveAddImage @ stdcall GdipSaveGraphics(ptr ptr) @ stub GdipSaveImageToFile -@ stdcall GdipSaveImageToStream(ptr ptr ptr) +@ stdcall GdipSaveImageToStream(ptr ptr ptr ptr) @ stub GdipScaleLineTransform @ stdcall GdipScaleMatrix(ptr long long long) @ stub GdipScalePathGradientTransform @@ -522,7 +522,7 @@ @ stub GdipSetEffectParameters @ stub GdipSetEmpty @ stub GdipSetImageAttributesCachedBackground -@ stdcall GdipSetImageAttributesColorKeys(ptr long long long) +@ stdcall GdipSetImageAttributesColorKeys(ptr long long long long) @ stub GdipSetImageAttributesColorMatrix @ stub GdipSetImageAttributesGamma @ stub GdipSetImageAttributesNoOp

1 0

Francois Gouget : crypt32: Add and use HCRYPTPROV_LEGACY and HCRYPTPROV_OR_NCRYPT_KEY_HANDLE.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 74bf9f1f4e1967a479ebe869a0a7f4c12017105d URL: http://source.winehq.org/git/wine.git/?a=commit;h=74bf9f1f4e1967a479ebe869a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 3 00:44:26 2007 +0200 crypt32: Add and use HCRYPTPROV_LEGACY and HCRYPTPROV_OR_NCRYPT_KEY_HANDLE. --- dlls/crypt32/cert.c | 22 ++++++++-------- dlls/crypt32/encode.c | 8 +++--- dlls/crypt32/msg.c | 2 +- dlls/crypt32/store.c | 6 ++-- include/wincrypt.h | 62 +++++++++++++++++++++++++----------------------- 5 files changed, 51 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74bf9f1f4e1967a479ebe…

1 0