wine-commits August 2007

wine-commits@winehq.org

3 participants
1085 discussions

Evan Stade : gdiplus: Added GdipCreateFontFromLogfontA.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: 1e33bdcfbd00410b280c4bf513722c10b9637295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e33bdcfbd00410b280c4bf51… Author: Evan Stade <estade(a)gmail.com> Date: Mon Aug 13 18:34:57 2007 -0700 gdiplus: Added GdipCreateFontFromLogfontA. --- dlls/gdiplus/font.c | 19 +++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 2cd514d..d02b04d 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -21,6 +21,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winnls.h" #include "objbase.h" @@ -40,3 +41,21 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, return Ok; } + +GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC hdc, + GDIPCONST LOGFONTA *lfa, GpFont **font) +{ + LOGFONTW lfw; + + if(!lfa || !font) + return InvalidParameter; + + memcpy(&lfw, lfa, sizeof(LOGFONTA)); + + if(!MultiByteToWideChar(CP_ACP, 0, lfa->lfFaceName, -1, lfw.lfFaceName, LF_FACESIZE)) + return GenericError; + + GdipCreateFontFromLogfontW(hdc, &lfw, font); + + return Ok; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index d311c45..39253a5 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -87,7 +87,7 @@ @ stub GdipCreateFont @ stub GdipCreateFontFamilyFromName @ stub GdipCreateFontFromDC -@ stub GdipCreateFontFromLogfontA +@ stdcall GdipCreateFontFromLogfontA(ptr ptr ptr) @ stdcall GdipCreateFontFromLogfontW(ptr ptr ptr) @ stub GdipCreateFromHDC2 @ stdcall GdipCreateFromHDC(long ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 05bf54e..ba2a3ca 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -236,6 +236,7 @@ GpStatus WINGDIPAPI GdipSetImageAttributesColorMatrix(GpImageAttributes*, GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes*,WrapMode, ARGB,BOOL); +GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC,GDIPCONST LOGFONTA*,GpFont**); GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**); #ifdef __cplusplus

1 0

Evan Stade : gdiplus: Added font constructor.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: d060aeccca03e48c82ff16fc5b2a9d90b9375bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d060aeccca03e48c82ff16fc5… Author: Evan Stade <estade(a)gmail.com> Date: Mon Aug 13 18:34:51 2007 -0700 gdiplus: Added font constructor. --- dlls/gdiplus/Makefile.in | 1 + dlls/gdiplus/font.c | 42 ++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 4 +++ include/gdiplusflat.h | 2 + include/gdiplusgpstubs.h | 2 + 6 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index ddf3d99..a826644 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -10,6 +10,7 @@ EXTRALIBS = -luuid C_SRCS = \ brush.c \ customlinecap.c \ + font.c \ gdiplus.c \ graphics.c \ graphicspath.c \ diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c new file mode 100644 index 0000000..2cd514d --- /dev/null +++ b/dlls/gdiplus/font.c @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2007 Google (Evan Stade) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" + +#include "objbase.h" + +#include "gdiplus.h" +#include "gdiplus_private.h" + +GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, + GDIPCONST LOGFONTW *logfont, GpFont **font) +{ + if(!logfont || !font) + return InvalidParameter; + + *font = GdipAlloc(sizeof(GpFont)); + if(!*font) return OutOfMemory; + + memcpy(&(*font)->lfw, logfont, sizeof(LOGFONTW)); + + return Ok; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 664600d..d311c45 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -88,7 +88,7 @@ @ stub GdipCreateFontFamilyFromName @ stub GdipCreateFontFromDC @ stub GdipCreateFontFromLogfontA -@ stub GdipCreateFontFromLogfontW +@ stdcall GdipCreateFontFromLogfontW(ptr ptr ptr) @ stub GdipCreateFromHDC2 @ stdcall GdipCreateFromHDC(long ptr) @ stdcall GdipCreateFromHWND(long ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index d36b8a2..5be21b1 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -170,4 +170,8 @@ struct GpImageAttributes{ WrapMode wrap; }; +struct GpFont{ + LOGFONTW lfw; +}; + #endif diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 8a45a23..05bf54e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -236,6 +236,8 @@ GpStatus WINGDIPAPI GdipSetImageAttributesColorMatrix(GpImageAttributes*, GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes*,WrapMode, ARGB,BOOL); +GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**); + #ifdef __cplusplus } #endif diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 253dd1f..d0fc8c4 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -36,6 +36,7 @@ class GpBitmap : public GpImage {}; class GpPathGradient : public GpBrush {}; class GpLineGradient : public GpBrush {}; class GpTexture : public GpBrush {}; +class GpFont {}; #else /* end of c++ declarations */ @@ -54,6 +55,7 @@ typedef struct GpBitmap GpBitmap; typedef struct GpPathGradient GpPathGradient; typedef struct GpLineGradient GpLineGradient; typedef struct GpTexture GpTexture; +typedef struct GpFont GpFont; #endif /* end of c declarations */

1 0

Evan Stade : gdiplus: Added GdipDrawRectangles.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: 9d6e0750f25db9f9df34fed6f091c96bda74710a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6e0750f25db9f9df34fed6f… Author: Evan Stade <estade(a)gmail.com> Date: Mon Aug 13 18:34:46 2007 -0700 gdiplus: Added GdipDrawRectangles. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 44 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f2b3107..664600d 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -196,7 +196,7 @@ @ stub GdipDrawPolygonI @ stub GdipDrawRectangle @ stdcall GdipDrawRectangleI(ptr ptr long long long long) -@ stub GdipDrawRectangles +@ stdcall GdipDrawRectangles(ptr ptr ptr long) @ stub GdipDrawRectanglesI @ stub GdipDrawString @ stub GdipEmfToWmfBits diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 319303f..68ceb4b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1228,6 +1228,48 @@ GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x, return Ok; } +GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics *graphics, GpPen *pen, + GpRectF* rects, INT count) +{ + GpPointF *ptf; + POINT *pti; + INT save_state, i; + + if(!graphics || !pen || !rects || count < 1) + return InvalidParameter; + + ptf = GdipAlloc(4 * count * sizeof(GpPointF)); + pti = GdipAlloc(4 * count * sizeof(POINT)); + + if(!ptf || !pti){ + GdipFree(ptf); + GdipFree(pti); + return OutOfMemory; + } + + for(i = 0; i < count; i++){ + ptf[4 * i + 3].X = ptf[4 * i].X = rects[i].X; + ptf[4 * i + 1].Y = ptf[4 * i].Y = rects[i].Y; + ptf[4 * i + 2].X = ptf[4 * i + 1].X = rects[i].X + rects[i].Width; + ptf[4 * i + 3].Y = ptf[4 * i + 2].Y = rects[i].Y + rects[i].Height; + } + + save_state = prepare_dc(graphics, pen); + SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); + + transform_and_round_points(graphics, pti, ptf, 4 * count); + + for(i = 0; i < count; i++) + Polygon(graphics->hdc, &pti[4 * i], 4); + + restore_dc(graphics, save_state); + + GdipFree(ptf); + GdipFree(pti); + + return Ok; +} + GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path) { INT save_state; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 7bafb42..8a45a23 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -75,6 +75,7 @@ GpStatus WINGDIPAPI GdipDrawLines(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipDrawPath(GpGraphics*,GpPen*,GpPath*); GpStatus WINGDIPAPI GdipDrawPie(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT); +GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics*,GpPen*,GpRectF*,INT); 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,

1 0

Evan Stade : gdiplus: Added GdipScaleWorldTransform.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: 30fdcc7612c539c82567d7925337079223014efb URL: http://source.winehq.org/git/wine.git/?a=commit;h=30fdcc7612c539c82567d7925… Author: Evan Stade <estade(a)gmail.com> Date: Mon Aug 13 18:34:38 2007 -0700 gdiplus: Added GdipScaleWorldTransform. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.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 9765573..f2b3107 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -501,7 +501,7 @@ @ stub GdipScalePathGradientTransform @ stub GdipScalePenTransform @ stub GdipScaleTextureTransform -@ stub GdipScaleWorldTransform +@ stdcall GdipScaleWorldTransform(ptr long long long) @ stub GdipSetAdjustableArrowCapFillState @ stub GdipSetAdjustableArrowCapHeight @ stub GdipSetAdjustableArrowCapMiddleInset diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 250e337..319303f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1550,6 +1550,15 @@ GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics *graphics, GraphicsState *state) return NotImplemented; } +GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics *graphics, REAL sx, + REAL sy, GpMatrixOrder order) +{ + if(!graphics) + return InvalidParameter; + + return GdipScaleMatrix(graphics->worldtrans, sx, sy, order); +} + GpStatus WINGDIPAPI GdipSetCompositingMode(GpGraphics *graphics, CompositingMode mode) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 865362d..7bafb42 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -92,6 +92,7 @@ GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*); GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics*,GraphicsState); GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics*,GraphicsState*); +GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetCompositingMode(GpGraphics*,CompositingMode); GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics*,CompositingQuality); GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics*,InterpolationMode);

1 0

Evan Stade : gdiplus: Added GdipRotateWorldTransform.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: 3126c7704ccbd7e3681afc3c1fb182c6f479b740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3126c7704ccbd7e3681afc3c1… Author: Evan Stade <estade(a)gmail.com> Date: Mon Aug 13 18:34:35 2007 -0700 gdiplus: Added GdipRotateWorldTransform. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.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 d6b6ee4..9765573 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -490,7 +490,7 @@ @ stub GdipRotatePathGradientTransform @ stub GdipRotatePenTransform @ stub GdipRotateTextureTransform -@ stub GdipRotateWorldTransform +@ stdcall GdipRotateWorldTransform(ptr long long) @ stub GdipSaveAdd @ stub GdipSaveAddImage @ stdcall GdipSaveGraphics(ptr ptr) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index fecabfb..250e337 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1528,6 +1528,15 @@ GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics *graphics, GraphicsState stat return NotImplemented; } +GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics *graphics, REAL angle, + GpMatrixOrder order) +{ + if(!graphics) + return InvalidParameter; + + return GdipRotateMatrix(graphics->worldtrans, angle, order); +} + GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics *graphics, GraphicsState *state) { static int calls; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 1b7f7ec..865362d 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -90,6 +90,7 @@ GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics*,PixelOffsetMode*); GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics*,SmoothingMode*); GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*); GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics*,GraphicsState); +GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics*,GraphicsState*); GpStatus WINGDIPAPI GdipSetCompositingMode(GpGraphics*,CompositingMode); GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics*,CompositingQuality);

1 0

Evan Stade : gdiplus: Better handle UnitPixel pen width.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: afa4d3233a073fa76119de0572bf715a5c5e7e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa4d3233a073fa76119de057… Author: Evan Stade <estade(a)gmail.com> Date: Mon Aug 13 18:34:31 2007 -0700 gdiplus: Better handle UnitPixel pen width. --- dlls/gdiplus/graphics.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1d2748a..fecabfb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -92,18 +92,23 @@ static INT prepare_dc(GpGraphics *graphics, GpPen *pen) EndPath(graphics->hdc); - /* Get an estimate for the amount the pen width is affected by the world - * transform. (This is similar to what some of the wine drivers do.) */ - pt[0].X = 0.0; - pt[0].Y = 0.0; - pt[1].X = 1.0; - pt[1].Y = 1.0; - GdipTransformMatrixPoints(graphics->worldtrans, pt, 2); - width = sqrt((pt[1].X - pt[0].X) * (pt[1].X - pt[0].X) + - (pt[1].Y - pt[0].Y) * (pt[1].Y - pt[0].Y)) / sqrt(2.0); - - width *= pen->width * convert_unit(graphics->hdc, - pen->unit == UnitWorld ? graphics->unit : pen->unit); + if(pen->unit == UnitPixel){ + width = pen->width; + } + else{ + /* Get an estimate for the amount the pen width is affected by the world + * transform. (This is similar to what some of the wine drivers do.) */ + pt[0].X = 0.0; + pt[0].Y = 0.0; + pt[1].X = 1.0; + pt[1].Y = 1.0; + GdipTransformMatrixPoints(graphics->worldtrans, pt, 2); + width = sqrt((pt[1].X - pt[0].X) * (pt[1].X - pt[0].X) + + (pt[1].Y - pt[0].Y) * (pt[1].Y - pt[0].Y)) / sqrt(2.0); + + width *= pen->width * convert_unit(graphics->hdc, + pen->unit == UnitWorld ? graphics->unit : pen->unit); + } if(pen->dash == DashStyleCustom){ numdashes = min(pen->numdashes, MAX_DASHLEN);

1 0

Evan Stade : gdiplus: Added GdipSetCompositingMode/GdipGetCompositingMode.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: e807eb9ad6027194114f0f65f87c720a690dd7ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=e807eb9ad6027194114f0f65f… Author: Evan Stade <estade(a)gmail.com> Date: Mon Aug 13 18:34:27 2007 -0700 gdiplus: Added GdipSetCompositingMode/GdipGetCompositingMode. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 24 ++++++++++++++++++++++++ include/gdiplusenums.h | 7 +++++++ include/gdiplusflat.h | 2 ++ 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 1f69314..d6b6ee4 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -247,7 +247,7 @@ @ stub GdipGetClip @ stub GdipGetClipBounds @ stub GdipGetClipBoundsI -@ stub GdipGetCompositingMode +@ stdcall GdipGetCompositingMode(ptr ptr) @ stdcall GdipGetCompositingQuality(ptr ptr) @ stub GdipGetCustomLineCapBaseCap @ stub GdipGetCustomLineCapBaseInset @@ -512,7 +512,7 @@ @ stub GdipSetClipRect @ stub GdipSetClipRectI @ stub GdipSetClipRegion -@ stub GdipSetCompositingMode +@ stdcall GdipSetCompositingMode(ptr long) @ stdcall GdipSetCompositingQuality(ptr long) @ stub GdipSetCustomLineCapBaseCap @ stub GdipSetCustomLineCapBaseInset diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 485394e..d36b8a2 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -79,6 +79,7 @@ struct GpGraphics{ CompositingQuality compqual; InterpolationMode interpolation; PixelOffsetMode pixeloffset; + CompositingMode compmode; GpUnit unit; /* page unit */ REAL scale; /* page scale */ GpMatrix * worldtrans; /* world transform */ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index d9cf86f..1d2748a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -760,6 +760,7 @@ GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) (*graphics)->compqual = CompositingQualityDefault; (*graphics)->interpolation = InterpolationModeDefault; (*graphics)->pixeloffset = PixelOffsetModeDefault; + (*graphics)->compmode = CompositingModeSourceOver; (*graphics)->unit = UnitDisplay; (*graphics)->scale = 1.0; @@ -1421,6 +1422,18 @@ GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics *graphics, GpBrush *brush, return Ok; } +/* FIXME: Compositing mode is not used anywhere except the getter/setter. */ +GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics *graphics, + CompositingMode *mode) +{ + if(!graphics || !mode) + return InvalidParameter; + + *mode = graphics->compmode; + + return Ok; +} + /* FIXME: Compositing quality is not used anywhere except the getter/setter. */ GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics *graphics, CompositingQuality *quality) @@ -1523,6 +1536,17 @@ GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics *graphics, GraphicsState *state) return NotImplemented; } +GpStatus WINGDIPAPI GdipSetCompositingMode(GpGraphics *graphics, + CompositingMode mode) +{ + if(!graphics) + return InvalidParameter; + + graphics->compmode = mode; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics *graphics, CompositingQuality quality) { diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 7d71b6d..e503da5 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -198,6 +198,12 @@ enum EmfType EmfTypeEmfPlusDual = MetafileTypeEmfPlusDual }; +enum CompositingMode +{ + CompositingModeSourceOver, + CompositingModeSourceCopy +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -219,6 +225,7 @@ typedef enum WrapMode WrapMode; typedef enum MetafileType MetafileType; typedef enum LinearGradientMode LinearGradientMode; typedef enum EmfType EmfType; +typedef enum CompositingMode CompositingMode; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 6b45368..1b7f7ec 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -81,6 +81,7 @@ GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT GpFillMode); GpStatus WINGDIPAPI GdipFillRectangle(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics*,GpBrush*,INT,INT,INT,INT); +GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics*,CompositingMode*); GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics*,InterpolationMode*); GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics*,REAL*); @@ -90,6 +91,7 @@ GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics*,SmoothingMode*); GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*); GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics*,GraphicsState); GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics*,GraphicsState*); +GpStatus WINGDIPAPI GdipSetCompositingMode(GpGraphics*,CompositingMode); GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics*,CompositingQuality); GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics*,InterpolationMode); GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics*,REAL);

1 0

Alexandre Julliard : comctl32: Create a manifest file at dll registration time.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: 6790cdb8f5c8d15df0b19702e36e888c996fc97c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6790cdb8f5c8d15df0b19702e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 14 12:31:27 2007 +0200 comctl32: Create a manifest file at dll registration time. --- dlls/comctl32/commctrl.c | 95 ++++++++++++++++++++++++++++++++++++++++++++-- tools/wine.inf | 1 + 2 files changed, 92 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 4bfe1a5..ea42db8 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -71,6 +71,58 @@ WINE_DEFAULT_DEBUG_CHANNEL(commctrl); + +#define NAME "microsoft.windows.common-controls" +#define FILE "comctl32.dll" +#define VERSION "6.0.0.0" +#define PUBLIC_KEY "6595b64144ccf1df" + +#ifdef __i386__ +#define ARCH "x86" +#elif defined __x86_64__ +#define ARCH "amd64" +#else +#define ARCH "none" +#endif + +static const char manifest[] = + "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" + "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">\n" + " <assemblyIdentity type=\"win32\" name=\"" NAME "\" version=\"" VERSION "\" processorArchitecture=\"" ARCH "\" publicKeyToken=\"" PUBLIC_KEY "\"/>\n" + " <file name=\"" FILE "\">\n" + " <windowClass>Button</windowClass>\n" + " <windowClass>ButtonListBox</windowClass>\n" + " <windowClass>ComboBoxEx32</windowClass>\n" + " <windowClass>ComboLBox</windowClass>\n" + " <windowClass>Combobox</windowClass>\n" + " <windowClass>Edit</windowClass>\n" + " <windowClass>Listbox</windowClass>\n" + " <windowClass>NativeFontCtl</windowClass>\n" + " <windowClass>ReBarWindow32</windowClass>\n" + " <windowClass>ScrollBar</windowClass>\n" + " <windowClass>Static</windowClass>\n" + " <windowClass>SysAnimate32</windowClass>\n" + " <windowClass>SysDateTimePick32</windowClass>\n" + " <windowClass>SysHeader32</windowClass>\n" + " <windowClass>SysIPAddress32</windowClass>\n" + " <windowClass>SysLink</windowClass>\n" + " <windowClass>SysListView32</windowClass>\n" + " <windowClass>SysMonthCal32</windowClass>\n" + " <windowClass>SysPager</windowClass>\n" + " <windowClass>SysTabControl32</windowClass>\n" + " <windowClass>SysTreeView32</windowClass>\n" + " <windowClass>ToolbarWindow32</windowClass>\n" + " <windowClass>msctls_hotkey32</windowClass>\n" + " <windowClass>msctls_progress32</windowClass>\n" + " <windowClass>msctls_statusbar32</windowClass>\n" + " <windowClass>msctls_trackbar32</windowClass>\n" + " <windowClass>msctls_updown32</windowClass>\n" + " <windowClass>tooltips_class32</windowClass>\n" + " </file>\n" + "</assembly>\n"; + +static const char manifest_filename[] = ARCH "_" NAME "_" PUBLIC_KEY "_" VERSION "_none_deadbeef.manifest"; + LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); LPWSTR COMCTL32_wSubclass = NULL; @@ -91,6 +143,42 @@ static const WCHAR strCC32SubclassInfo[] = { 'C','C','3','2','S','u','b','c','l','a','s','s','I','n','f','o',0 }; +static BOOL create_manifest( BOOL install ) +{ + static const WCHAR dirW[] = {'\\','w','i','n','s','x','s','\\','m','a','n','i','f','e','s','t','s','\\',0}; + + DWORD len, written; + WCHAR *buffer; + HANDLE file; + BOOL ret = FALSE; + + len = MultiByteToWideChar( CP_UTF8, 0, manifest_filename, sizeof(manifest_filename), NULL, 0 ); + len += GetWindowsDirectoryW( NULL, 0 ); + len = len * sizeof(WCHAR) + sizeof(dirW); + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, len ))) return FALSE; + GetWindowsDirectoryW( buffer, len ); + lstrcatW( buffer, dirW ); + MultiByteToWideChar( CP_UTF8, 0, manifest_filename, sizeof(manifest_filename), + buffer + lstrlenW(buffer), len ); + if (install) + { + file = CreateFileW( buffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL ); + if (file != INVALID_HANDLE_VALUE) + { + ret = (WriteFile( file, manifest, sizeof(manifest)-1, &written, NULL ) && + written == sizeof(manifest)-1); + CloseHandle( file ); + if (!ret) DeleteFileW( buffer ); + else TRACE("created %s\n", debugstr_w(buffer)); + } + } + else ret = DeleteFileW( buffer ); + + HeapFree( GetProcessHeap(), 0, buffer ); + return ret; +} + + /*********************************************************************** * DllMain [Internal] * @@ -917,10 +1005,9 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) */ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) { - FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE", - debugstr_w(cmdline)); - - return S_OK; + TRACE("(%u, %s): stub\n", bInstall, debugstr_w(cmdline)); + if (!create_manifest( bInstall )) return HRESULT_FROM_WIN32(GetLastError()); + return S_OK; } /*********************************************************************** diff --git a/tools/wine.inf b/tools/wine.inf index 30e7ee0..06702d2 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2126,6 +2126,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,avifil32.dll,1 11,,browseui.dll,1 11,,comcat.dll,1 +11,,comctl32.dll,2 11,,d3dxof.dll,1 11,,ddraw.dll,1 11,,ddrawex.dll,1

1 0

Alexandre Julliard : ntdll: Fixed the prototype of the open_nt_file wrapper .
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: f42b1e9b9cee0fc758baaf6b24230103dbfcd333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f42b1e9b9cee0fc758baaf6b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 14 12:31:04 2007 +0200 ntdll: Fixed the prototype of the open_nt_file wrapper. --- dlls/ntdll/actctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index f7a0fb9..5d13afd 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1525,7 +1525,7 @@ static NTSTATUS parse_manifest( struct actctx_loader* acl, struct assembly_ident return status; } -static NTSTATUS open_nt_file( HANDLE handle, UNICODE_STRING *name ) +static NTSTATUS open_nt_file( HANDLE *handle, UNICODE_STRING *name ) { OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io;

1 0

Juan Lang : crypt32: Test finding the issuer of a certificate.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: aa0f823429f8a51dcc1d78166c83dc98fab08705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa0f823429f8a51dcc1d78166… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 13 14:32:58 2007 -0700 crypt32: Test finding the issuer of a certificate. --- dlls/crypt32/tests/cert.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 2578ba3..6a73c91 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -929,7 +929,7 @@ static BYTE iTunesSerialNum[] = { static void testFindCert(void) { HCERTSTORE store; - PCCERT_CONTEXT context = NULL; + PCCERT_CONTEXT context = NULL, subject; BOOL ret; CERT_INFO certInfo = { 0 }; CRYPT_HASH_BLOB blob; @@ -1067,7 +1067,7 @@ static void testFindCert(void) ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, - iTunesCert3, sizeof(iTunesCert3), CERT_STORE_ADD_NEW, NULL); + iTunesCert3, sizeof(iTunesCert3), CERT_STORE_ADD_NEW, &subject); ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); @@ -1098,6 +1098,18 @@ static void testFindCert(void) ok(context == NULL, "Expected one cert only\n"); } + context = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, + CERT_FIND_ISSUER_OF, subject, NULL); + ok(context != NULL, "Expected an issuer\n"); + if (context) + { + PCCERT_CONTEXT none = CertFindCertificateInStore(store, + X509_ASN_ENCODING, 0, CERT_FIND_ISSUER_OF, context, NULL); + + ok(!none, "Expected no parent of issuer\n"); + CertFreeCertificateContext(context); + } + CertFreeCertificateContext(subject); CertCloseStore(store, 0); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2007