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

Evan Stade : gdiplus: Added GdipCreateLineBrushFromRectI.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: d806c67821ebd2173353c90a43f64d005ed4731b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d806c67821ebd2173353c90a4… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 7 18:43:00 2007 -0700 gdiplus: Added GdipCreateLineBrushFromRectI. --- dlls/gdiplus/brush.c | 17 +++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusenums.h | 9 +++++++++ include/gdiplusflat.h | 2 ++ 4 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index dca3a41..1c17560 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -115,6 +115,23 @@ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint, return Ok; } +GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect* rect, + ARGB startcolor, ARGB endcolor, LinearGradientMode mode, GpWrapMode wrap, + GpLineGradient **line) +{ + GpPointF start, end; + + if(!line || !rect) + return InvalidParameter; + + start.X = (REAL) rect->X; + start.Y = (REAL) rect->Y; + end.X = (REAL) (rect->X + rect->Width); + end.Y = (REAL) (rect->Y + rect->Height); + + return GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line); +} + GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, INT count, GpWrapMode wrap, GpPathGradient **grad) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f5d0665..7c0ea9c 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -100,7 +100,7 @@ @ stdcall GdipCreateImageAttributes(ptr) @ stdcall GdipCreateLineBrush(ptr ptr long long long ptr) @ stub GdipCreateLineBrushFromRect -@ stub GdipCreateLineBrushFromRectI +@ stdcall GdipCreateLineBrushFromRectI(ptr long long long long ptr) @ stub GdipCreateLineBrushFromRectWithAngle @ stub GdipCreateLineBrushFromRectWithAngleI @ stub GdipCreateLineBrushI diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 9d81051..a2fe1fb 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -183,6 +183,14 @@ enum MetafileType MetafileTypeEmfPlusDual }; +enum LinearGradientMode +{ + LinearGradientModeHorizontal, + LinearGradientModeVertical, + LinearGradientModeForwardDiagonal, + LinearGradientModeBackwardDiagonal +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -202,6 +210,7 @@ typedef enum MatrixOrder MatrixOrder; typedef enum ImageType ImageType; typedef enum WrapMode WrapMode; typedef enum MetafileType MetafileType; +typedef enum LinearGradientMode LinearGradientMode; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0156bd5..0c2d8c4 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -146,6 +146,8 @@ GpStatus WINGDIPAPI GdipStartPathFigure(GpPath*); GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*); GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix*,GpMatrix**); +GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect*,ARGB,ARGB, + LinearGradientMode,GpWrapMode,GpLineGradient**); GpStatus WINGDIPAPI GdipCreateMatrix(GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *,GDIPCONST GpPointF*,

1 0

Evan Stade : gdiplus: Added GdipFillRectangleI.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: bb904a277946224da2f13f70ed6edb0d5ff27a5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb904a277946224da2f13f70e… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 7 18:43:04 2007 -0700 gdiplus: Added GdipFillRectangleI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 33 +++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 7c0ea9c..12fda8f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -227,7 +227,7 @@ @ stdcall GdipFillPolygon(ptr ptr ptr long long) @ stdcall GdipFillPolygonI(ptr ptr ptr long long) @ stub GdipFillRectangle -@ stub GdipFillRectangleI +@ stdcall GdipFillRectangleI(ptr ptr long long long long) @ stub GdipFillRectangles @ stub GdipFillRectanglesI @ stub GdipFillRegion diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 0059cc3..4c2385c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1324,6 +1324,39 @@ end: return retval; } +GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics *graphics, GpBrush *brush, + INT x, INT y, INT width, INT height) +{ + INT save_state; + GpPointF ptf[4]; + POINT pti[4]; + + if(!graphics || !brush) + return InvalidParameter; + + ptf[0].X = x; + ptf[0].Y = y; + ptf[1].X = x + width; + ptf[1].Y = y; + ptf[2].X = x + width; + ptf[2].Y = y + height; + ptf[3].X = x; + ptf[3].Y = y + height; + + save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); + SelectObject(graphics->hdc, brush->gdibrush); + SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); + + transform_and_round_points(graphics, pti, ptf, 4); + + Polygon(graphics->hdc, pti, 4); + + RestoreDC(graphics->hdc, save_state); + + return Ok; +} + /* FIXME: Compositing quality is not used anywhere except the getter/setter. */ GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics *graphics, CompositingQuality *quality) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0c2d8c4..04aa8c1 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -74,6 +74,7 @@ GpStatus WINGDIPAPI GdipFillPath(GpGraphics*,GpBrush*,GpPath*); GpStatus WINGDIPAPI GdipFillPie(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT, GpFillMode); +GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics*,GpBrush*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics*,InterpolationMode*); GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics*,REAL*);

1 0

Evan Stade : gdiplus: Updated GdipDrawRectangleI.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: c84c204b48d70b86ee24b6362102d8d98528c274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84c204b48d70b86ee24b6362… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 7 18:43:08 2007 -0700 gdiplus: Updated GdipDrawRectangleI. --- dlls/gdiplus/graphics.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4c2385c..f282519 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1177,14 +1177,26 @@ GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x, INT y, INT width, INT height) { INT save_state; + GpPointF ptf[4]; + POINT pti[4]; if(!pen || !graphics) return InvalidParameter; + ptf[0].X = x; + ptf[0].Y = y; + ptf[1].X = x + width; + ptf[1].Y = y; + ptf[2].X = x + width; + ptf[2].Y = y + height; + ptf[3].X = x; + ptf[3].Y = y + height; + save_state = prepare_dc(graphics, pen); SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); - Rectangle(graphics->hdc, x, y, x + width, y + height); + transform_and_round_points(graphics, pti, ptf, 4); + Polygon(graphics->hdc, pti, 4); restore_dc(graphics, save_state);

1 0

Alexandre Julliard : d3d9: Comment out some failing fog tests.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 427723cc37e47c9b15a902ca8852e758457b4043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=427723cc37e47c9b15a902ca8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 8 13:15:12 2007 +0200 d3d9: Comment out some failing fog tests. --- dlls/d3d9/tests/visual.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5da835f..dfaee3b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -931,6 +931,7 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, +#if 0 /* FIXME: these fail on GeForce 8500 */ /* foggy vertex shader */ {2, 0, 0, 0, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, @@ -944,6 +945,7 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) {2, 0, 3, 0, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, +#endif /* foggy vertex shader and pixel shader */ {2, 1, 0, 0, @@ -995,7 +997,7 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, end.i); ok(hr == D3D_OK, "Setting fog end failed (%08x)\n", hr); - for (i = 0; i < 22; i++) + for (i = 0; i < sizeof(test_data)/sizeof(test_data[0]); i++) { hr = IDirect3DDevice9_SetVertexShader(device, vertex_shader[test_data[i].vshader]); ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr);

1 0

Francois Gouget : ddraw: Better match the PSDK types and fix the winapi_check warnings.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 5b375aec71419a5a5bb57a42293ef348d6dc96a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b375aec71419a5a5bb57a422… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 8 10:39:04 2007 +0200 ddraw: Better match the PSDK types and fix the winapi_check warnings. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/main.c | 10 +++++----- include/ddraw.h | 13 +++++++------ tools/winapi/win32.api | 6 ++---- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index dbab8db..696552d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3112,7 +3112,7 @@ IDirectDrawImpl_AttachD3DDevice(IDirectDrawImpl *This, *****************************************************************************/ HRESULT WINAPI DirectDrawCreateClipper(DWORD Flags, - IDirectDrawClipper **Clipper, + LPDIRECTDRAWCLIPPER *Clipper, IUnknown *UnkOuter) { IDirectDrawClipperImpl* object; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 54b35dc..4e77d4f 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -345,7 +345,7 @@ err_out: ***********************************************************************/ HRESULT WINAPI DirectDrawCreate(GUID *GUID, - IDirectDraw **DD, + LPDIRECTDRAW *DD, IUnknown *UnkOuter) { HRESULT hr; @@ -368,7 +368,7 @@ DirectDrawCreate(GUID *GUID, ***********************************************************************/ HRESULT WINAPI DirectDrawCreateEx(GUID *GUID, - void **DD, + LPVOID *DD, REFIID iid, IUnknown *UnkOuter) { @@ -406,7 +406,7 @@ DirectDrawCreateEx(GUID *GUID, ***********************************************************************/ HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback, - void *Context) + LPVOID Context) { BOOL stop = FALSE; @@ -440,7 +440,7 @@ DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback, ***********************************************************************/ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA Callback, - void *Context, + LPVOID Context, DWORD Flags) { BOOL stop = FALSE; @@ -834,7 +834,7 @@ static inline DWORD get_config_key(HKEY defkey, HKEY appkey, const char* name, c BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD Reason, - void *lpv) + LPVOID lpv) { TRACE("(%p,%x,%p)\n", hInstDLL, Reason, lpv); if (Reason == DLL_PROCESS_ATTACH) diff --git a/include/ddraw.h b/include/ddraw.h index 938a19a..0f7a6c1 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1065,6 +1065,10 @@ typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXA)(GUID *, LPSTR, LPSTR, LPVOID, HMONI typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXW)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR); DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACKEX) +HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA,LPVOID); +HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW,LPVOID); +#define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate) + HRESULT WINAPI DirectDrawEnumerateExA( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags); HRESULT WINAPI DirectDrawEnumerateExW( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags); #define DirectDrawEnumerateEx WINELIB_NAME_AW(DirectDrawEnumerateEx) @@ -2663,12 +2667,9 @@ DECLARE_INTERFACE_(IDirectDrawGammaControl,IUnknown) #endif -HRESULT WINAPI DirectDrawCreate(LPGUID,LPDIRECTDRAW*,LPUNKNOWN); -HRESULT WINAPI DirectDrawCreateEx(LPGUID,LPVOID*,REFIID,LPUNKNOWN); -HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA,LPVOID); -HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW,LPVOID); -#define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate) -HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,LPUNKNOWN); +HRESULT WINAPI DirectDrawCreate(GUID*,LPDIRECTDRAW*,IUnknown*); +HRESULT WINAPI DirectDrawCreateEx(GUID*,LPVOID*,REFIID,IUnknown*); +HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,IUnknown*); #ifdef __cplusplus } /* extern "C" */ diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 2636c29..e28cfd1 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1008,14 +1008,12 @@ HRESULT %ptr +GUID * +IUnknown * LPDDENUMCALLBACKA LPDDENUMCALLBACKEXA -LPDDENUMCALLBACKEXW -LPDDENUMCALLBACKW LPDIRECTDRAW * LPDIRECTDRAWCLIPPER * -LPGUID -LPUNKNOWN LPVOID LPVOID * REFCLSID

1 0

Francois Gouget : pdh/tests: Add missing '\n' to ok() calls.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: e50f16e579780eef1ae80a272a6054103080be7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e50f16e579780eef1ae80a272… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 8 10:40:47 2007 +0200 pdh/tests: Add missing '\n' to ok() calls. --- dlls/pdh/tests/pdh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 220f35a..104589e 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -374,14 +374,14 @@ static void test_PdhGetRawCounterValue( void ) ret = PdhGetRawCounterValue( counter, NULL, &value ); ok(ret == ERROR_SUCCESS, "PdhGetRawCounterValue failed 0x%08x\n", ret); - ok(value.CStatus == ERROR_SUCCESS, "expected ERROR_SUCCESS got %x", value.CStatus); + ok(value.CStatus == ERROR_SUCCESS, "expected ERROR_SUCCESS got %x\n", value.CStatus); ret = PdhCollectQueryData( query ); ok(ret == ERROR_SUCCESS, "PdhCollectQueryData failed 0x%08x\n", ret); ret = PdhGetRawCounterValue( counter, NULL, &value ); ok(ret == ERROR_SUCCESS, "PdhGetRawCounterValue failed 0x%08x\n", ret); - ok(value.CStatus == ERROR_SUCCESS, "expected ERROR_SUCCESS got %x", value.CStatus); + ok(value.CStatus == ERROR_SUCCESS, "expected ERROR_SUCCESS got %x\n", value.CStatus); ret = PdhCloseQuery( query ); ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret);

1 0

Evan Stade : gdiplus: Added GdipSetCustomLineCapStrokeCaps stub.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 369dc8caba29162330981f3eadb931c47164ee0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=369dc8caba29162330981f3ea… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 7 18:42:52 2007 -0700 gdiplus: Added GdipSetCustomLineCapStrokeCaps stub. --- dlls/gdiplus/customlinecap.c | 14 ++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 2 ++ 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 417a740..e161e1b 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -115,3 +115,17 @@ GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap *customCap) return Ok; } + +GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap* custom, + GpLineCap start, GpLineCap end) +{ + static int calls; + + if(!custom) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 882a26e..f5d0665 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -516,7 +516,7 @@ @ stdcall GdipSetCompositingQuality(ptr long) @ stub GdipSetCustomLineCapBaseCap @ stub GdipSetCustomLineCapBaseInset -@ stub GdipSetCustomLineCapStrokeCaps +@ stdcall GdipSetCustomLineCapStrokeCaps(ptr long long) @ stub GdipSetCustomLineCapStrokeJoin @ stub GdipSetCustomLineCapWidthScale @ stub GdipSetEffectParameters diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 42df922..0156bd5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -170,6 +170,8 @@ GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap*,GpCustomLineCap**); GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath*,GpPath*,GpLineCap,REAL, GpCustomLineCap**); GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap*); +GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap*,GpLineCap, + GpLineCap); GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*); GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap*,GDIPCONST GpRect*,UINT,

1 0

Evan Stade : gdiplus: Added GdipSetImageAttributesColorMatrix stub.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: a93e61d377f03d390dddfb19b8f8c3a135e71def URL: http://source.winehq.org/git/wine.git/?a=commit;h=a93e61d377f03d390dddfb19b… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 7 18:42:48 2007 -0700 gdiplus: Added GdipSetImageAttributesColorMatrix stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/imageattributes.c | 15 +++++++++++++++ include/gdipluscolormatrix.h | 14 ++++++++++++++ include/gdiplusflat.h | 3 +++ 4 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8be35fa..882a26e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -523,7 +523,7 @@ @ stub GdipSetEmpty @ stub GdipSetImageAttributesCachedBackground @ stdcall GdipSetImageAttributesColorKeys(ptr long long long long) -@ stub GdipSetImageAttributesColorMatrix +@ stdcall GdipSetImageAttributesColorMatrix(ptr long long ptr ptr long) @ stub GdipSetImageAttributesGamma @ stub GdipSetImageAttributesNoOp @ stub GdipSetImageAttributesOutputChannel diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index bfef8b3..ac6caa5 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -62,6 +62,21 @@ GpStatus WINGDIPAPI GdipSetImageAttributesColorKeys(GpImageAttributes *imageattr return NotImplemented; } +GpStatus WINGDIPAPI GdipSetImageAttributesColorMatrix(GpImageAttributes *imageattr, + ColorAdjustType type, BOOL enableFlag, GDIPCONST ColorMatrix* colorMatrix, + GDIPCONST ColorMatrix* grayMatrix, ColorMatrixFlags flags) +{ + static int calls; + + if(!imageattr || !colorMatrix || !grayMatrix) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes *imageAttr, WrapMode wrap, ARGB argb, BOOL clamp) { diff --git a/include/gdipluscolormatrix.h b/include/gdipluscolormatrix.h index 893471c..afc04c0 100644 --- a/include/gdipluscolormatrix.h +++ b/include/gdipluscolormatrix.h @@ -19,6 +19,18 @@ #ifndef _GDIPLUSCOLORMATRIX_H #define _GDIPLUSCOLORMATRIX_H +struct ColorMatrix +{ + REAL m[5][5]; +}; + +enum ColorMatrixFlags +{ + ColorMatrixFlagsDefault = 0, + ColorMatrixFlagsSkipGrays = 1, + ColorMatrixFlagsAltGray = 2 +}; + enum ColorAdjustType { ColorAdjustTypeDefault, @@ -33,6 +45,8 @@ enum ColorAdjustType #ifndef __cplusplus typedef enum ColorAdjustType ColorAdjustType; +typedef enum ColorMatrixFlags ColorMatrixFlags; +typedef struct ColorMatrix ColorMatrix; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index b103801..42df922 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -203,6 +203,9 @@ GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes**); GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes*); GpStatus WINGDIPAPI GdipSetImageAttributesColorKeys(GpImageAttributes*, ColorAdjustType,BOOL,ARGB,ARGB); +GpStatus WINGDIPAPI GdipSetImageAttributesColorMatrix(GpImageAttributes*, + ColorAdjustType,BOOL,GDIPCONST ColorMatrix*,GDIPCONST ColorMatrix*, + ColorMatrixFlags); GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes*,WrapMode, ARGB,BOOL);

1 0

Evan Stade : gdiplus: Fixed bug drawing custom caps.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 02887b6c90bd927f23e8ff36ade05ecaf9ab397d URL: http://source.winehq.org/git/wine.git/?a=commit;h=02887b6c90bd927f23e8ff36a… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 7 18:42:44 2007 -0700 gdiplus: Fixed bug drawing custom caps. --- dlls/gdiplus/graphics.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3afdab2..0059cc3 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -488,7 +488,7 @@ static GpStatus draw_polyline(GpGraphics *graphics, GpPen *pen, else if((pen->startcap == LineCapCustom) && pen->customstart) shorten_line_amt(ptcopy[1].X, ptcopy[1].Y, &ptcopy[0].X, &ptcopy[0].Y, - pen->customend->inset * pen->width); + pen->customstart->inset * pen->width); draw_cap(graphics, pen->brush->lb.lbColor, pen->endcap, pen->width, pen->customend, pt[count - 2].X, pt[count - 2].Y, pt[count - 1].X, pt[count - 1].Y); @@ -582,7 +582,7 @@ static GpStatus draw_polybezier(GpGraphics *graphics, GpPen *pen, if(pen->startcap == LineCapArrowAnchor) shorten_bezier_amt(ptcopy, pen->width, TRUE); else if((pen->startcap == LineCapCustom) && pen->customstart) - shorten_bezier_amt(ptcopy, pen->width * pen->customend->inset, TRUE); + shorten_bezier_amt(ptcopy, pen->width * pen->customstart->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 @@ -689,7 +689,7 @@ static GpStatus draw_poly(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF * shorten_bezier_amt(&ptcopy[j - 1], pen->width, TRUE); else if((pen->startcap == LineCapCustom) && pen->customstart) shorten_bezier_amt(&ptcopy[j - 1], - pen->width * pen->customend->inset, TRUE); + pen->width * pen->customstart->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: Added GdipGetLineGammaCorrection/ GdipSetLineGammaCorrection.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: ddea5bd7bae511b3de0b5c40f707a7e91f4d7efb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddea5bd7bae511b3de0b5c40f… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 7 18:42:40 2007 -0700 gdiplus: Added GdipGetLineGammaCorrection/GdipSetLineGammaCorrection. --- dlls/gdiplus/brush.c | 23 +++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/gdiplus_private.h | 1 + include/gdiplusflat.h | 2 ++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 5fd6649..b855031 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -102,6 +102,7 @@ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint, (*line)->startcolor = startcolor; (*line)->endcolor = endcolor; (*line)->wrap = wrap; + (*line)->gamma = FALSE; return Ok; } @@ -246,6 +247,17 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) return Ok; } +GpStatus WINGDIPAPI GdipGetLineGammaCorrection(GpLineGradient *line, + BOOL *usinggamma) +{ + if(!line) + return InvalidParameter; + + *usinggamma = line->gamma; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient *grad, GpPointF *point) { @@ -316,6 +328,17 @@ GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill *sf, ARGB *argb) return Ok; } +GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient *line, + BOOL usegamma) +{ + if(!line) + return InvalidParameter; + + line->gamma = usegamma; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient *line, REAL focus, REAL scale) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 6d0f042..8be35fa 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -303,7 +303,7 @@ @ stub GdipGetLineBlend @ stub GdipGetLineBlendCount @ stub GdipGetLineColors -@ stub GdipGetLineGammaCorrection +@ stdcall GdipGetLineGammaCorrection(ptr ptr) @ stub GdipGetLinePresetBlend @ stub GdipGetLinePresetBlendCount @ stub GdipGetLineRect @@ -537,7 +537,7 @@ @ stdcall GdipSetInterpolationMode(ptr long) @ stub GdipSetLineBlend @ stub GdipSetLineColors -@ stub GdipSetLineGammaCorrection +@ stdcall GdipSetLineGammaCorrection(ptr long) @ stub GdipSetLineLinearBlend @ stub GdipSetLinePresetBlend @ stdcall GdipSetLineSigmaBlend(ptr long long) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 1eacd46..855d7ee 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -111,6 +111,7 @@ struct GpLineGradient{ ARGB startcolor; ARGB endcolor; GpWrapMode wrap; + BOOL gamma; }; struct GpPath{ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 00ce4fc..b103801 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -99,6 +99,7 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath*, GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**); GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); +GpStatus WINGDIPAPI GdipGetLineGammaCorrection(GpLineGradient*,BOOL*); GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient*,GpPointF*); GpStatus WINGDIPAPI GdipGetPathGradientFocusScales(GpPathGradient*,REAL*,REAL*); GpStatus WINGDIPAPI GdipGetPathGradientGammaCorrection(GpPathGradient*,BOOL*); @@ -106,6 +107,7 @@ GpStatus WINGDIPAPI GdipGetPathGradientPointCount(GpPathGradient*,INT*); GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient*, ARGB*,INT*); GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill*,ARGB*); +GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient*,BOOL); GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient*,GpWrapMode); GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient*,ARGB);

1 0