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

Evan Stade : gdiplus: Added solid-color path gradient brush implementation.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: f18cdef727d34d4428d2cef01b151e555f5be25a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18cdef727d34d4428d2cef01… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 1 17:56:02 2007 -0700 gdiplus: Added solid-color path gradient brush implementation. --- dlls/gdiplus/brush.c | 26 ++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 5 +++++ include/gdiplusflat.h | 2 ++ include/gdiplusgpstubs.h | 4 +++- 5 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index ce01ccb..da432fd 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -23,6 +23,9 @@ #include "gdiplus.h" #include "gdiplus_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) { @@ -45,6 +48,29 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) return Ok; } +/* FIXME: path gradient brushes not truly supported (drawn as solid brushes) */ +GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, + GpPathGradient **grad) +{ + COLORREF col = ARGB2COLORREF(0xffffffff); + + if(!path || !grad) + return InvalidParameter; + + *grad = GdipAlloc(sizeof(GpPathGradient)); + if (!*grad) return OutOfMemory; + + (*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)->centercolor = 0xffffffff; + + return Ok; +} + GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB color, GpSolidFill **sf) { COLORREF col = ARGB2COLORREF(color); diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 871a9c4..8dcc155 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -117,7 +117,7 @@ @ stub GdipCreatePath2I @ stdcall GdipCreatePath(long ptr) @ stub GdipCreatePathGradient -@ stub GdipCreatePathGradientFromPath +@ stdcall GdipCreatePathGradientFromPath(ptr ptr) @ stub GdipCreatePathGradientI @ stdcall GdipCreatePathIter(ptr ptr) @ stdcall GdipCreatePen1(long long long ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 168f6ff..1a868cf 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -92,6 +92,11 @@ struct GpSolidFill{ ARGB color; }; +struct GpPathGradient{ + GpBrush brush; + ARGB centercolor; +}; + struct GpPath{ GpFillMode fill; GpPathData pathdata; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 25b9b1b..c04fef6 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 GdipCreatePathGradientFromPath(GDIPCONST GpPath*, + GpPathGradient**); GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index fec691a..6ca0073 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -24,7 +24,7 @@ class GpGraphics {}; class GpGraphics {}; class GpBrush {}; -class GpSolidFill {}; +class GpSolidFill : public GpBrush {}; class GpPath {}; class GpMatrix {}; class GpPathIterator {}; @@ -33,6 +33,7 @@ class GpImage {}; class GpMetafile : public GpImage {}; class GpImageAttributes {}; class GpBitmap : public GpImage {}; +class GpPathGradient : public GpBrush {}; #else /* end of c++ declarations */ @@ -48,6 +49,7 @@ typedef struct GpImage GpImage; typedef struct GpMetafile GpMetafile; typedef struct GpImageAttributes GpImageAttributes; typedef struct GpBitmap GpBitmap; +typedef struct GpPathGradient GpPathGradient; #endif /* end of c declarations */

1 0

Evan Stade : gdiplus: Added GdipSetPenWidth.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: 0d45cd0212365dd66898dbe895ebf18ded265b72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d45cd0212365dd66898dbe89… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 1 17:55:54 2007 -0700 gdiplus: Added GdipSetPenWidth. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 9 +++++++++ include/gdiplusflat.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 0087aef..bb5c36d 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -579,7 +579,7 @@ @ stdcall GdipSetPenStartCap(ptr long) @ stub GdipSetPenTransform @ stub GdipSetPenUnit -@ stub GdipSetPenWidth +@ stdcall GdipSetPenWidth(ptr long) @ stdcall GdipSetPixelOffsetMode(ptr long) @ stub GdipSetPropertyItem @ stub GdipSetRenderingOrigin diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index f121380..388567a 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -341,3 +341,12 @@ GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen *pen, GpLineCap cap) return Ok; } + +GpStatus WINGDIPAPI GdipSetPenWidth(GpPen *pen, REAL width) +{ + if(!pen) return InvalidParameter; + + pen->width = width; + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index cd4f3d6..9756403 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -45,6 +45,7 @@ GpStatus WINGDIPAPI GdipSetPenLineCap197819(GpPen*,GpLineCap,GpLineCap,GpDashCap GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen*,GpLineJoin); GpStatus WINGDIPAPI GdipSetPenMiterLimit(GpPen*,REAL); GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen*,GpLineCap); +GpStatus WINGDIPAPI GdipSetPenWidth(GpPen*,REAL); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**);

1 0

Evan Stade : gdiplus: Added GdipClonePath.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: bba20a68b8e4895583b917e9df8962d94f4b45bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bba20a68b8e4895583b917e9d… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 1 17:55:44 2007 -0700 gdiplus: Added GdipClonePath. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 26 ++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 1b96a3b..81ff0ae 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -55,7 +55,7 @@ @ stub GdipCloneImage @ stub GdipCloneImageAttributes @ stdcall GdipCloneMatrix(ptr ptr) -@ stub GdipClonePath +@ stdcall GdipClonePath(ptr ptr) @ stdcall GdipClonePen(ptr ptr) @ stub GdipCloneRegion @ stub GdipCloneStringFormat diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 82f5838..b11d918 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -212,6 +212,32 @@ GpStatus WINGDIPAPI GdipAddPathPath(GpPath *path, GDIPCONST GpPath* addingPath, return Ok; } +GpStatus WINGDIPAPI GdipClonePath(GpPath* path, GpPath **clone) +{ + if(!path || !clone) + return InvalidParameter; + + *clone = GdipAlloc(sizeof(GpPath)); + if(!*clone) return OutOfMemory; + + memcpy(*clone, path, sizeof(GpPath)); + + (*clone)->pathdata.Points = GdipAlloc(path->datalen * sizeof(PointF)); + (*clone)->pathdata.Types = GdipAlloc(path->datalen); + if(!(*clone)->pathdata.Points || !(*clone)->pathdata.Types){ + GdipFree(*clone); + GdipFree((*clone)->pathdata.Points); + GdipFree((*clone)->pathdata.Types); + return OutOfMemory; + } + + memcpy((*clone)->pathdata.Points, path->pathdata.Points, + path->datalen * sizeof(PointF)); + memcpy((*clone)->pathdata.Types, path->pathdata.Types, path->datalen); + + return Ok; +} + GpStatus WINGDIPAPI GdipClosePathFigure(GpPath* path) { if(!path) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 90c7e45..045c17b 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -97,6 +97,7 @@ GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathLine2(GpPath*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipAddPathPath(GpPath*,GDIPCONST GpPath*,BOOL); +GpStatus WINGDIPAPI GdipClonePath(GpPath*,GpPath**); GpStatus WINGDIPAPI GdipClosePathFigure(GpPath*); GpStatus WINGDIPAPI GdipClosePathFigures(GpPath*); GpStatus WINGDIPAPI GdipCreatePath(GpFillMode,GpPath**);

1 0

Evan Stade : gdiplus: Added GdipFillPolygon.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: 1ef7793b51339d37c3f695faa9e90576e8ff5d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef7793b51339d37c3f695faa… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 1 17:55:50 2007 -0700 gdiplus: Added GdipFillPolygon. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 39 +++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 81ff0ae..0087aef 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -224,7 +224,7 @@ @ stub GdipFillPieI @ stub GdipFillPolygon2 @ stub GdipFillPolygon2I -@ stub GdipFillPolygon +@ stdcall GdipFillPolygon(ptr ptr ptr long long) @ stdcall GdipFillPolygonI(ptr ptr ptr long long) @ stub GdipFillRectangle @ stub GdipFillRectangleI diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2be9fc7..7c8fc16 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1224,6 +1224,45 @@ GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, return Ok; } +GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics *graphics, GpBrush *brush, + GDIPCONST GpPointF *points, INT count, GpFillMode fillMode) +{ + INT save_state; + GpPointF *ptf = NULL; + POINT *pti = NULL; + GpStatus retval = Ok; + + if(!graphics || !brush || !points || !count) + return InvalidParameter; + + ptf = GdipAlloc(count * sizeof(GpPointF)); + pti = GdipAlloc(count * sizeof(POINT)); + if(!ptf || !pti){ + retval = OutOfMemory; + goto end; + } + + memcpy(ptf, points, count * sizeof(GpPointF)); + + save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); + SelectObject(graphics->hdc, brush->gdibrush); + SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); + SetPolyFillMode(graphics->hdc, (fillMode == FillModeAlternate ? ALTERNATE + : WINDING)); + + transform_and_round_points(graphics, pti, ptf, count); + Polygon(graphics->hdc, pti, count); + + RestoreDC(graphics->hdc, save_state); + +end: + GdipFree(ptf); + GdipFree(pti); + + return retval; +} + GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics *graphics, GpBrush *brush, GDIPCONST GpPoint *points, INT count, GpFillMode fillMode) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 045c17b..cd4f3d6 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -102,6 +102,8 @@ GpStatus WINGDIPAPI GdipClosePathFigure(GpPath*); GpStatus WINGDIPAPI GdipClosePathFigures(GpPath*); GpStatus WINGDIPAPI GdipCreatePath(GpFillMode,GpPath**); GpStatus WINGDIPAPI GdipDeletePath(GpPath*); +GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics*,GpBrush*,GDIPCONST GpPointF*, + INT,GpFillMode); GpStatus WINGDIPAPI GdipGetPathFillMode(GpPath*,GpFillMode*); GpStatus WINGDIPAPI GdipGetPathPoints(GpPath*,GpPointF*,INT); GpStatus WINGDIPAPI GdipGetPathTypes(GpPath*,BYTE*,INT);

1 0

Evan Stade : oleaut32: Slight correction to EMF rendering.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: a55f233219c3877db9defd1c86c4046e869da76f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a55f233219c3877db9defd1c8… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 1 17:55:27 2007 -0700 oleaut32: Slight correction to EMF rendering. --- dlls/oleaut32/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index e1c61b2..a7dc158 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -683,7 +683,7 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, case PICTYPE_ENHMETAFILE: { - RECT rc = { x, y, cx, cy }; + RECT rc = { x, y, x + cx, y + cy }; PlayEnhMetaFile(hdc, This->desc.u.emf.hemf, &rc); break; }

1 0

Evan Stade : gdiplus: Don't suggest image size when converting WMF to EMF.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: 192e1115bd9416944ff5fed8c3962271a795cf22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=192e1115bd9416944ff5fed8c… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 1 17:55:33 2007 -0700 gdiplus: Don't suggest image size when converting WMF to EMF. --- dlls/gdiplus/graphics.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7ba2d52..2be9fc7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -849,7 +849,6 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, IStream *stream = NULL; UINT read; BYTE* copy; - METAFILEPICT mfp; HENHMETAFILE hemf; GpStatus retval = GenericError; @@ -859,21 +858,13 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, if(!(calls++)) FIXME("partially implemented\n"); - if(placeable->Inch != INCH_HIMETRIC) - return NotImplemented; - - mfp.mm = MM_HIMETRIC; - mfp.xExt = placeable->BoundingBox.Right - placeable->BoundingBox.Left; - mfp.yExt = placeable->BoundingBox.Bottom - placeable->BoundingBox.Top; - mfp.hMF = NULL; - read = GetMetaFileBitsEx(hwmf, 0, NULL); if(!read) return GenericError; copy = GdipAlloc(read); GetMetaFileBitsEx(hwmf, read, copy); - hemf = SetWinMetaFileBits(read, copy, NULL, &mfp); + hemf = SetWinMetaFileBits(read, copy, NULL, NULL); GdipFree(copy); read = GetEnhMetaFileBits(hemf, 0, NULL);

1 0

Evan Stade : gdiplus: Added GdipIsOutlineVisiblePathPointI stub.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: fdf9f8fb0536d2f56198478e04f2f928f5c22323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf9f8fb0536d2f56198478e0… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 1 17:55:38 2007 -0700 gdiplus: Added GdipIsOutlineVisiblePathPointI stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 14 ++++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e1878e9..1b96a3b 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -422,7 +422,7 @@ @ stub GdipIsMatrixIdentity @ stub GdipIsMatrixInvertible @ stub GdipIsOutlineVisiblePathPoint -@ stub GdipIsOutlineVisiblePathPointI +@ stdcall GdipIsOutlineVisiblePathPointI(ptr long long ptr ptr ptr) @ stub GdipIsStyleAvailable @ stub GdipIsVisibleClipEmpty @ stub GdipIsVisiblePathPoint diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index ea52408..82f5838 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -399,6 +399,20 @@ GpStatus WINGDIPAPI GdipGetPointCount(GpPath *path, INT *count) return Ok; } +GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPointI(GpPath* path, INT x, INT y, + GpPen *pen, GpGraphics *graphics, BOOL *result) +{ + static int calls; + + if(!path || !pen) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipStartPathFigure(GpPath *path) { if(!path) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index e8b067d..90c7e45 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -107,6 +107,8 @@ GpStatus WINGDIPAPI GdipGetPathTypes(GpPath*,BYTE*,INT); GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath*,GpRectF*,GDIPCONST GpMatrix*, GDIPCONST GpPen*); 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);

1 0

H. Verbeet : wined3d: Only report 16 bit float declaration types as supported if we support them .
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: 3ac2271f5cb8722df501935e6a71e56ef8f6993d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac2271f5cb8722df501935e6… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Aug 1 23:14:03 2007 +0200 wined3d: Only report 16 bit float declaration types as supported if we support them. --- dlls/wined3d/directx.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d4a905a..7da3ef2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2301,10 +2301,12 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, *pCaps->DeclTypes = WINED3DDTCAPS_UBYTE4 | WINED3DDTCAPS_UBYTE4N | WINED3DDTCAPS_SHORT2N | - WINED3DDTCAPS_SHORT4N | + WINED3DDTCAPS_SHORT4N; + if (GL_SUPPORT(NV_HALF_FLOAT)) { + *pCaps->DeclTypes |= WINED3DDTCAPS_FLOAT16_2 | WINED3DDTCAPS_FLOAT16_4; - + } } else *pCaps->DeclTypes = 0;

1 0

James Hawkins : msi: Add tests for joining three tables.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: 4f6a93b9c87e930fe6bd5ba16c3e17507dbb1012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f6a93b9c87e930fe6bd5ba16… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Aug 1 14:24:01 2007 -0700 msi: Add tests for joining three tables. --- dlls/msi/tests/db.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 89cc48a..a857dbf 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2463,6 +2463,16 @@ struct join_res_4col const CHAR four[MAX_PATH]; }; +struct join_res_uint +{ + UINT one; + UINT two; + UINT three; + UINT four; + UINT five; + UINT six; +}; + static const struct join_res join_res_first[] = { { "alveolar", "procerus" }, @@ -2521,6 +2531,16 @@ static const struct join_res_4col join_res_eighth[] = { "msvcr.dll", "msvcr.dll.56789", "single.dll.31415", "msvcp.dll" }, }; +static const struct join_res_uint join_res_ninth[] = +{ + { 1, 2, 3, 4, 7, 8 }, + { 1, 2, 5, 6, 7, 8 }, + { 1, 2, 3, 4, 9, 10 }, + { 1, 2, 5, 6, 9, 10 }, + { 1, 2, 3, 4, 11, 12 }, + { 1, 2, 5, 6, 11, 12 }, +}; + static void test_join(void) { MSIHANDLE hdb, hview, hrec; @@ -2590,6 +2610,58 @@ static void test_join(void) r = add_binary_entry( hdb, "'single.dll.31415', 'msvcp.dll'" ); ok( r == ERROR_SUCCESS, "cannot add binary: %d\n", r ); + query = "CREATE TABLE `One` (`A` SHORT, `B` SHORT PRIMARY KEY `A`)"; + r = run_query( hdb, 0, query); + ok(r == ERROR_SUCCESS, "cannot create table: %d\n", r ); + + query = "CREATE TABLE `Two` (`C` SHORT, `D` SHORT PRIMARY KEY `C`)"; + r = run_query( hdb, 0, query); + ok(r == ERROR_SUCCESS, "cannot create table: %d\n", r ); + + query = "CREATE TABLE `Three` (`E` SHORT, `F` SHORT PRIMARY KEY `E`)"; + r = run_query( hdb, 0, query); + ok(r == ERROR_SUCCESS, "cannot create table: %d\n", r ); + + query = "INSERT INTO `One` (`A`, `B`) VALUES (1, 2)"; + r = run_query( hdb, 0, query); + ok(r == ERROR_SUCCESS, "cannot insert into table: %d\n", r ); + + query = "INSERT INTO `Two` (`C`, `D`) VALUES (3, 4)"; + r = run_query( hdb, 0, query); + ok(r == ERROR_SUCCESS, "cannot insert into table: %d\n", r ); + + query = "INSERT INTO `Two` (`C`, `D`) VALUES (5, 6)"; + r = run_query( hdb, 0, query); + ok(r == ERROR_SUCCESS, "cannot insert into table: %d\n", r ); + + query = "INSERT INTO `Three` (`E`, `F`) VALUES (7, 8)"; + r = run_query( hdb, 0, query); + ok(r == ERROR_SUCCESS, "cannot insert into table: %d\n", r ); + + query = "INSERT INTO `Three` (`E`, `F`) VALUES (9, 10)"; + r = run_query( hdb, 0, query); + ok(r == ERROR_SUCCESS, "cannot insert into table: %d\n", r ); + + query = "INSERT INTO `Three` (`E`, `F`) VALUES (11, 12)"; + r = run_query( hdb, 0, query); + ok(r == ERROR_SUCCESS, "cannot insert into table: %d\n", r ); + + query = "CREATE TABLE `Four` (`G` SHORT, `H` SHORT PRIMARY KEY `G`)"; + r = run_query( hdb, 0, query); + ok(r == ERROR_SUCCESS, "cannot create table: %d\n", r ); + + query = "CREATE TABLE `Five` (`I` SHORT, `J` SHORT PRIMARY KEY `I`)"; + r = run_query( hdb, 0, query); + ok(r == ERROR_SUCCESS, "cannot create table: %d\n", r ); + + query = "INSERT INTO `Five` (`I`, `J`) VALUES (13, 14)"; + r = run_query( hdb, 0, query); + ok(r == ERROR_SUCCESS, "cannot insert into table: %d\n", r ); + + query = "INSERT INTO `Five` (`I`, `J`) VALUES (15, 16)"; + r = run_query( hdb, 0, query); + ok(r == ERROR_SUCCESS, "cannot insert into table: %d\n", r ); + query = "SELECT `Component`.`ComponentId`, `FeatureComponents`.`Feature_` " "FROM `Component`, `FeatureComponents` " "WHERE `Component`.`Component` = `FeatureComponents`.`Component_` " @@ -2984,6 +3056,71 @@ static void test_join(void) MsiViewClose(hview); MsiCloseHandle(hview); + query = "SELECT * FROM `One`, `Two`, `Three` "; + r = MsiDatabaseOpenView(hdb, query, &hview); + todo_wine ok( r == ERROR_SUCCESS, "failed to open view: %d\n", r ); + + r = MsiViewExecute(hview, 0); + todo_wine ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); + + i = 0; + data_correct = TRUE; + while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) + { + count = MsiRecordGetFieldCount( hrec ); + ok( count == 6, "Expected 6 record fields, got %d\n", count ); + + r = MsiRecordGetInteger( hrec, 1 ); + if( r != join_res_ninth[i].one ) + data_correct = FALSE; + + r = MsiRecordGetInteger( hrec, 2 ); + if( r != join_res_ninth[i].two ) + data_correct = FALSE; + + r = MsiRecordGetInteger( hrec, 3 ); + if( r != join_res_ninth[i].three ) + data_correct = FALSE; + + r = MsiRecordGetInteger( hrec, 4 ); + if( r != join_res_ninth[i].four ) + data_correct = FALSE; + + r = MsiRecordGetInteger( hrec, 5 ); + if( r != join_res_ninth[i].five ) + data_correct = FALSE; + + r = MsiRecordGetInteger( hrec, 6); + if( r != join_res_ninth[i].six ) + data_correct = FALSE; + + i++; + MsiCloseHandle(hrec); + } + ok( data_correct, "data returned in the wrong order\n"); + + todo_wine + { + ok( i == 6, "Expected 6 rows, got %d\n", i ); + ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); + } + + MsiViewClose(hview); + MsiCloseHandle(hview); + + query = "SELECT * FROM `Four`, `Five`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok( r == ERROR_SUCCESS, "failed to open view: %d\n", r ); + + r = MsiViewExecute(hview, 0); + ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + MsiViewClose(hview); + MsiCloseHandle(hview); + MsiCloseHandle(hdb); DeleteFile(msifile); }

1 0

James Hawkins : msi: Reimplement joins to allow joining any number of tables, each of arbitrary size.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: 2e6ed06fdcfbb9b71dd550505e784f5d1041eff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e6ed06fdcfbb9b71dd550505… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Aug 1 14:25:45 2007 -0700 msi: Reimplement joins to allow joining any number of tables, each of arbitrary size. --- dlls/msi/join.c | 308 ++++++++++++++++++++++++++------------------------- dlls/msi/query.h | 3 +- dlls/msi/sql.y | 36 ++++++- dlls/msi/tests/db.c | 25 ++--- 4 files changed, 200 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e6ed06fdcfbb9b71dd55…

1 0