April 2008 - Wine-Commits - list.winehq.org

Eric Pouech : winhelp: Added support for richedit tabs in paragraph format.
by Alexandre Julliard April 25, 2008

April 25, 2008

Module: wine Branch: master Commit: 523a5b3f3141a0f746256ff059df8eab3efe3d1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=523a5b3f3141a0f746256ff05… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 24 22:05:59 2008 +0200 winhelp: Added support for richedit tabs in paragraph format. --- programs/winhelp/hlpfile.c | 35 ++++++++++++++++++++++++++++++----- programs/winhelp/hlpfile.h | 6 ++++++ 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 78a9643..3e85dc3 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -943,6 +943,18 @@ static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie, return link; } +unsigned HLPFILE_HalfPointsToTwips(unsigned pts) +{ + static unsigned logPxY; + if (!logPxY) + { + HDC hdc = GetDC(NULL); + logPxY = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(NULL, hdc); + } + return MulDiv(pts, 72 * 10, logPxY); +} + /*********************************************************************** * * HLPFILE_BrowseParagraph @@ -1034,13 +1046,26 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE if (bits & 0x0100) format += 3; if (bits & 0x0200) { - int ntab = fetch_short(&format); - unsigned short ts; + int i, ntab = fetch_short(&format); + unsigned tab, ts; + const char* kind; - while (ntab-- > 0) + for (i = 0; i < ntab; i++) { - ts = fetch_ushort(&format); - if (ts & 0x4000) fetch_ushort(&format); + tab = fetch_ushort(&format); + ts = (tab & 0x4000) ? fetch_ushort(&format) : 0 /* left */; + switch (ts) + { + default: WINE_FIXME("Unknown tab style %x\n", ts); + /* fall through */ + case 0: kind = ""; break; + case 1: kind = "\\tqr"; break; + case 2: kind = "\\tqc"; break; + } + /* FIXME: do kind */ + sprintf(tmp, "%s\\tx%d", + kind, HLPFILE_HalfPointsToTwips(tab & 0x3FFF)); + if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } } /* 0x0400, 0x0800 and 0x1000 don't need space */ diff --git a/programs/winhelp/hlpfile.h b/programs/winhelp/hlpfile.h index 63ddc0c..7b67259 100644 --- a/programs/winhelp/hlpfile.h +++ b/programs/winhelp/hlpfile.h @@ -201,6 +201,12 @@ HLPFILE_PAGE* HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset, ULONG* relativ LONG HLPFILE_Hash(LPCSTR lpszContext); void HLPFILE_FreeLink(HLPFILE_LINK* link); void HLPFILE_FreeHlpFile(HLPFILE*); +unsigned HLPFILE_HalfPointsToTwips(unsigned pts); + +static inline unsigned HLPFILE_PointsToTwips(unsigned pts) +{ + return HLPFILE_HalfPointsToTwips(2 * pts); +} void* HLPFILE_BPTreeSearch(BYTE*, const void*, HLPFILE_BPTreeCompare); void HLPFILE_BPTreeEnum(BYTE*, HLPFILE_BPTreeCallback cb, void *cookie);

1 0

Alexandre Julliard : makedep: Don't try to open .tlb files.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 5f4f2c0b9268427ebc91a7fb4118850b44d65713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4f2c0b9268427ebc91a7fb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 24 23:43:04 2008 +0200 makedep: Don't try to open .tlb files. --- tools/makedep.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index e311058..d7f820e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -727,6 +727,13 @@ static void parse_file( INCL_FILE *pFile, int src ) return; } + /* don't try to open .tlb files */ + if (strendswith( pFile->name, ".tlb" )) + { + pFile->filename = xstrdup( pFile->name ); + return; + } + file = src ? open_src_file( pFile ) : open_include_file( pFile ); if (!file) return;

1 0

Nikolay Sivov : gdiplus: Implemented GdipSetLineColors.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 59ef3c920d2eb0f43d28387b78cf73c31aed3bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ef3c920d2eb0f43d28387b7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 24 22:43:41 2008 +0400 gdiplus: Implemented GdipSetLineColors. --- dlls/gdiplus/brush.c | 9 +++++---- include/gdiplusflat.h | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index d2097eb..727d12d 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -675,12 +675,13 @@ GpStatus WINGDIPAPI GdipSetTextureTransform(GpTexture *texture, GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient *brush, ARGB color1, ARGB color2) { - static int calls; + if(!brush) + return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + brush->startcolor = color1; + brush->endcolor = color2; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipGetLineColors(GpLineGradient *brush, ARGB *colors) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index c369377..366e8a5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -175,6 +175,7 @@ GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient*,GDIPCONST REAL*, GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient*,BOOL); GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient*,GpWrapMode); +GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient*,ARGB,ARGB); GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient*,ARGB); GpStatus WINGDIPAPI GdipSetPathGradientCenterPoint(GpPathGradient*,GpPointF*); GpStatus WINGDIPAPI GdipSetPathGradientFocusScales(GpPathGradient*,REAL,REAL);

1 0

Nikolay Sivov : gdiplus: Implemented GdipGetLineColors.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: b31f2250dda236aa19f24b58cae46923bd02e3b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b31f2250dda236aa19f24b58c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 24 22:43:36 2008 +0400 gdiplus: Implemented GdipGetLineColors. --- dlls/gdiplus/brush.c | 11 +++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 15180e6..d2097eb 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -683,6 +683,17 @@ GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient *brush, ARGB color1, return NotImplemented; } +GpStatus WINGDIPAPI GdipGetLineColors(GpLineGradient *brush, ARGB *colors) +{ + if(!brush || !colors) + return InvalidParameter; + + colors[0] = brush->startcolor; + colors[1] = brush->endcolor; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetLineLinearBlend(GpLineGradient *brush, REAL focus, REAL scale) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 1353a87..3905c74 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -302,7 +302,7 @@ @ stdcall GdipGetInterpolationMode(ptr ptr) @ stub GdipGetLineBlend @ stub GdipGetLineBlendCount -@ stub GdipGetLineColors +@ stdcall GdipGetLineColors(ptr ptr) @ stdcall GdipGetLineGammaCorrection(ptr ptr) @ stub GdipGetLinePresetBlend @ stub GdipGetLinePresetBlendCount diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 16a10b6..c369377 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -159,6 +159,7 @@ GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); GpStatus WINGDIPAPI GdipGetLineGammaCorrection(GpLineGradient*,BOOL*); GpStatus WINGDIPAPI GdipGetLineRect(GpLineGradient*,GpRectF*); GpStatus WINGDIPAPI GdipGetLineRectI(GpLineGradient*,GpRect*); +GpStatus WINGDIPAPI GdipGetLineColors(GpLineGradient*,ARGB*); GpStatus WINGDIPAPI GdipGetPathGradientCenterColor(GpPathGradient*,ARGB*); GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient*,GpPointF*); GpStatus WINGDIPAPI GdipGetPathGradientFocusScales(GpPathGradient*,REAL*,REAL*);

1 0

Nikolay Sivov : gdiplus: Implemented GdipFillPieI.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 2c059d7f526a7c8a603b13d1e584165e1a25784e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c059d7f526a7c8a603b13d1e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 24 20:48:23 2008 +0400 gdiplus: Implemented GdipFillPieI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4ce7989..66eb23d 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -221,7 +221,7 @@ @ stub GdipFillEllipseI @ stdcall GdipFillPath(ptr ptr ptr) @ stdcall GdipFillPie(ptr ptr long long long long long long) -@ stub GdipFillPieI +@ stdcall GdipFillPieI(ptr ptr long long long long long long) @ stub GdipFillPolygon2 @ stub GdipFillPolygon2I @ stdcall GdipFillPolygon(ptr ptr ptr long long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c6a4e33..ef57def 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1626,6 +1626,12 @@ GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, return Ok; } +GpStatus WINGDIPAPI GdipFillPieI(GpGraphics *graphics, GpBrush *brush, INT x, + INT y, INT width, INT height, REAL startAngle, REAL sweepAngle) +{ + return GdipFillPie(graphics,brush,(REAL)x,(REAL)y,(REAL)width,(REAL)height,startAngle,sweepAngle); +} + GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics *graphics, GpBrush *brush, GDIPCONST GpPointF *points, INT count, GpFillMode fillMode) {

1 0

Nikolay Sivov : gdiplus: Implemented GdipGetLineRect/GdipGetLineRectI.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 3d274bc1cf16653acc2c230e46870f5ca927e10f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d274bc1cf16653acc2c230e4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 24 22:43:26 2008 +0400 gdiplus: Implemented GdipGetLineRect/GdipGetLineRectI. --- dlls/gdiplus/brush.c | 31 +++++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 4 ++-- include/gdiplusflat.h | 2 ++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 1c69518..15180e6 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -715,3 +715,34 @@ GpStatus WINGDIPAPI GdipSetLineTransform(GpLineGradient *brush, return NotImplemented; } + +GpStatus WINGDIPAPI GdipGetLineRect(GpLineGradient *brush, GpRectF *rect) +{ + if(!brush || !rect) + return InvalidParameter; + + rect->X = (brush->startpoint.X < brush->endpoint.X ? brush->startpoint.X: brush->endpoint.X); + rect->Y = (brush->startpoint.Y < brush->endpoint.Y ? brush->startpoint.Y: brush->endpoint.Y); + + rect->Width = fabs(brush->startpoint.X - brush->endpoint.X); + rect->Height = fabs(brush->startpoint.Y - brush->endpoint.Y); + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetLineRectI(GpLineGradient *brush, GpRect *rect) +{ + GpRectF rectF; + GpStatus ret; + + ret = GdipGetLineRect(brush, &rectF); + + if(ret == Ok){ + rect->X = roundr(rectF.X); + rect->Y = roundr(rectF.Y); + rect->Width = roundr(rectF.Width); + rect->Height = roundr(rectF.Height); + } + + return ret; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 66eb23d..1353a87 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -306,8 +306,8 @@ @ stdcall GdipGetLineGammaCorrection(ptr ptr) @ stub GdipGetLinePresetBlend @ stub GdipGetLinePresetBlendCount -@ stub GdipGetLineRect -@ stub GdipGetLineRectI +@ stdcall GdipGetLineRect(ptr ptr) +@ stdcall GdipGetLineRectI(ptr ptr) @ stub GdipGetLineSpacing @ stub GdipGetLineTransform @ stub GdipGetLineWrapMode diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 1e04a23..16a10b6 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -157,6 +157,8 @@ GpStatus WINGDIPAPI GdipCreateTextureIAI(GpImage*,GDIPCONST GpImageAttributes*, GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); GpStatus WINGDIPAPI GdipGetLineGammaCorrection(GpLineGradient*,BOOL*); +GpStatus WINGDIPAPI GdipGetLineRect(GpLineGradient*,GpRectF*); +GpStatus WINGDIPAPI GdipGetLineRectI(GpLineGradient*,GpRect*); GpStatus WINGDIPAPI GdipGetPathGradientCenterColor(GpPathGradient*,ARGB*); GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient*,GpPointF*); GpStatus WINGDIPAPI GdipGetPathGradientFocusScales(GpPathGradient*,REAL*,REAL*);

1 0

Nikolay Sivov : gdiplus: Implemented GdipDrawPolygon/GdipDrawPolygonI.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 4697593e859920ebba73138253d01450546b0d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4697593e859920ebba7313825… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 24 20:48:17 2008 +0400 gdiplus: Implemented GdipDrawPolygon/GdipDrawPolygonI. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphics.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 2e747ce..4ce7989 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -192,8 +192,8 @@ @ stdcall GdipDrawPath(ptr ptr ptr) @ stdcall GdipDrawPie(ptr ptr long long long long long long) @ stdcall GdipDrawPieI(ptr ptr long long long long long long) -@ stub GdipDrawPolygon -@ stub GdipDrawPolygonI +@ stdcall GdipDrawPolygon(ptr ptr ptr long) +@ stdcall GdipDrawPolygonI(ptr ptr ptr long) @ stdcall GdipDrawRectangle(ptr ptr long long long long) @ stdcall GdipDrawRectangleI(ptr ptr long long long long) @ stdcall GdipDrawRectangles(ptr ptr ptr long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 238712a..c6a4e33 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2161,3 +2161,47 @@ GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpGraphics *graph return NotImplemented; } + +GpStatus WINGDIPAPI GdipDrawPolygon(GpGraphics *graphics,GpPen *pen,GDIPCONST GpPointF *points, + INT count) +{ + INT save_state; + POINT *pti; + + if(!graphics || !pen || count<=0) + return InvalidParameter; + + pti = GdipAlloc(sizeof(POINT) * count); + + save_state = prepare_dc(graphics, pen); + SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); + + transform_and_round_points(graphics, pti, (GpPointF*)points, count); + Polygon(graphics->hdc, pti, count); + + restore_dc(graphics, save_state); + GdipFree(pti); + + return Ok; +} + +GpStatus WINGDIPAPI GdipDrawPolygonI(GpGraphics *graphics,GpPen *pen,GDIPCONST GpPoint *points, + INT count) +{ + GpStatus ret; + GpPointF *ptf; + INT i; + + if(count<=0) return InvalidParameter; + ptf = GdipAlloc(sizeof(GpPointF) * count); + + for(i = 0;i < count; i++){ + ptf[i].X = (REAL)points[i].X; + ptf[i].Y = (REAL)points[i].Y; + } + + ret = GdipDrawPolygon(graphics,pen,ptf,count); + GdipFree(ptf); + + return ret; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ba2c6ee..1e04a23 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -94,6 +94,8 @@ GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipDrawPath(GpGraphics*,GpPen*,GpPath*); GpStatus WINGDIPAPI GdipDrawPie(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawPieI(GpGraphics*,GpPen*,INT,INT,INT,INT,REAL,REAL); +GpStatus WINGDIPAPI GdipDrawPolygon(GpGraphics*,GpPen*,GDIPCONST GpPointF*, INT); +GpStatus WINGDIPAPI GdipDrawPolygonI(GpGraphics*,GpPen*,GDIPCONST GpPoint*, INT); GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics*,GpPen*,GDIPCONST GpRectF*,INT);

1 0

Nikolay Sivov : gdiplus: Implemented GdipDrawPieI.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 71931613f9b79501c48eadb21050ac18e8f8fa7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=71931613f9b79501c48eadb21… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 24 20:48:00 2008 +0400 gdiplus: Implemented GdipDrawPieI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 14f600a..0ac4314 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -191,7 +191,7 @@ @ stdcall GdipDrawLinesI(ptr ptr ptr long) @ stdcall GdipDrawPath(ptr ptr ptr) @ stdcall GdipDrawPie(ptr ptr long long long long long long) -@ stub GdipDrawPieI +@ stdcall GdipDrawPieI(ptr ptr long long long long long long) @ stub GdipDrawPolygon @ stub GdipDrawPolygonI @ stdcall GdipDrawRectangle(ptr ptr long long long long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4912759..691cefc 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1308,6 +1308,12 @@ GpStatus WINGDIPAPI GdipDrawPie(GpGraphics *graphics, GpPen *pen, REAL x, return Ok; } +GpStatus WINGDIPAPI GdipDrawPieI(GpGraphics *graphics, GpPen *pen, INT x, + INT y, INT width, INT height, REAL startAngle, REAL sweepAngle) +{ + return GdipDrawPie(graphics,pen,(REAL)x,(REAL)y,(REAL)width,(REAL)height,startAngle,sweepAngle); +} + GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height) {

1 0

Nikolay Sivov : gdiplus: Implemented GdipDrawRectanglesI.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 3903ac6ee819c8be3888168c3dfe936879ce619b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3903ac6ee819c8be3888168c3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 24 20:48:08 2008 +0400 gdiplus: Implemented GdipDrawRectanglesI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 0ac4314..2e747ce 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -197,7 +197,7 @@ @ stdcall GdipDrawRectangle(ptr ptr long long long long) @ stdcall GdipDrawRectangleI(ptr ptr long long long long) @ stdcall GdipDrawRectangles(ptr ptr ptr long) -@ stub GdipDrawRectanglesI +@ stdcall GdipDrawRectanglesI(ptr ptr ptr long) @ stdcall GdipDrawString(ptr ptr long ptr ptr ptr ptr) @ stub GdipEmfToWmfBits @ stub GdipEndContainer diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 691cefc..238712a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1392,6 +1392,33 @@ GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics *graphics, GpPen *pen, return Ok; } +GpStatus WINGDIPAPI GdipDrawRectanglesI(GpGraphics *graphics, GpPen *pen, + GDIPCONST GpRect* rects, INT count) +{ + GpRectF *rectsF; + GpStatus ret; + INT i; + + if(!rects || count<=0) + return InvalidParameter; + + rectsF = GdipAlloc(sizeof(GpRectF) * count); + if(!rectsF) + return OutOfMemory; + + for(i = 0;i < count;i++){ + rectsF[i].X = (REAL)rects[i].X; + rectsF[i].Y = (REAL)rects[i].Y; + rectsF[i].Width = (REAL)rects[i].Width; + rectsF[i].Height = (REAL)rects[i].Height; + } + + ret = GdipDrawRectangles(graphics, pen, rectsF, count); + GdipFree(rectsF); + + return ret; +} + GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, GDIPCONST GpBrush *brush)

1 0

Rob Shearman : widl: Add typedef statements to the statement lists.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 1fcc2084e849ba9b4e245029f0290c61ef8dcbc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fcc2084e849ba9b4e245029f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 24 19:06:42 2008 +0100 widl: Add typedef statements to the statement lists. --- tools/widl/parser.y | 61 +++++++++++++++++++++++++++++------------------- tools/widl/widltypes.h | 7 +++++ 2 files changed, 44 insertions(+), 24 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index a9c7d02..b4805ed 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -124,7 +124,7 @@ static void write_iid(type_t *iface); static int compute_method_indexes(type_t *iface); static char *gen_name(void); -static void process_typedefs(var_list_t *names); +static statement_t *process_typedefs(var_list_t *names); static void check_arg(var_t *arg); static void check_functions(const type_t *iface); static void check_all_user_types(const statement_list_t *stmts); @@ -301,7 +301,7 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %type <uuid> uuid_string %type <num> import_start %type <typelib> library_start librarydef -%type <statement> statement +%type <statement> statement typedef %type <stmt_list> gbl_statements imp_statements %left ',' @@ -393,7 +393,7 @@ statement: constdef ';' { $$ = make_statement_init_decl($1); fprintf(header, ";\n\n"); } } - | typedef ';' { $$ = NULL; /* FIXME */ } + | typedef ';' { $$ = $1; } | uniondef ';' { $$ = make_statement_type_decl($1); if (!parse_only && do_header) { write_type_def_or_decl(header, $1, FALSE, NULL); @@ -989,7 +989,7 @@ type: tVOID { $$ = duptype(find_type("void", 0), 1); } ; typedef: tTYPEDEF m_attributes type pident_list { reg_typedefs($3, $4, check_typedef_attrs($2)); - process_typedefs($4); + $$ = process_typedefs($4); } ; @@ -1989,26 +1989,6 @@ static char *gen_name(void) return name; } -static void process_typedefs(pident_list_t *pidents) -{ - pident_t *pident, *next; - - if (!pidents) return; - LIST_FOR_EACH_ENTRY_SAFE( pident, next, pidents, pident_t, entry ) - { - var_t *var = pident->var; - type_t *type = find_type(var->name, 0); - - if (! parse_only && do_header) - write_typedef(type); - if (in_typelib && type->attrs) - add_typelib_entry(type); - - free(pident); - free(var); - } -} - struct allowed_attr { unsigned int dce_compatible : 1; @@ -2603,6 +2583,39 @@ static statement_t *make_statement_module(type_t *type) return stmt; } +static statement_t *process_typedefs(pident_list_t *pidents) +{ + pident_t *pident, *next; + statement_t *stmt; + type_list_t **type_list; + + if (!pidents) return NULL; + + stmt = make_statement(STMT_TYPEDEF); + stmt->u.type_list = NULL; + type_list = &stmt->u.type_list; + + LIST_FOR_EACH_ENTRY_SAFE( pident, next, pidents, pident_t, entry ) + { + var_t *var = pident->var; + type_t *type = find_type(var->name, 0); + *type_list = xmalloc(sizeof(type_list_t)); + (*type_list)->type = type; + (*type_list)->next = NULL; + + if (! parse_only && do_header) + write_typedef(type); + if (in_typelib && type->attrs) + add_typelib_entry(type); + + type_list = &(*type_list)->next; + free(pident); + free(var); + } + + return stmt; +} + static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt) { if (!stmt) return list; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 10064b7..ab4acde 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -52,6 +52,7 @@ typedef struct _importinfo_t importinfo_t; typedef struct _typelib_t typelib_t; typedef struct _user_type_t user_type_t; typedef struct _user_type_t context_handle_t; +typedef struct _type_list_t type_list_t; typedef struct _statement_t statement_t; typedef struct list attr_list_t; @@ -357,6 +358,11 @@ struct _user_type_t { const char *name; }; +struct _type_list_t { + type_t *type; + struct _type_list_t *next; +}; + struct _statement_t { struct list entry; enum statement_type type; @@ -367,6 +373,7 @@ struct _statement_t { const char *str; var_t *var; typelib_t *lib; + type_list_t *type_list; } u; };

1 0