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

Evan Stade : gdiplus: Initial custom line caps implementation.
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: d07088ee8ae7c5d05e511c60f3c4280a47aae050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d07088ee8ae7c5d05e511c60f… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jul 19 18:22:34 2007 -0700 gdiplus: Initial custom line caps implementation. --- dlls/gdiplus/Makefile.in | 1 + dlls/gdiplus/customlinecap.c | 79 ++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/gdiplus_private.h | 7 ++++ include/gdiplusflat.h | 4 ++ include/gdiplusgpstubs.h | 2 + 6 files changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index f4bf072..c47b6a6 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -8,6 +8,7 @@ IMPORTS = user32 gdi32 advapi32 kernel32 ntdll C_SRCS = \ brush.c \ + customlinecap.c \ gdiplus.c \ graphics.c \ graphicspath.c \ diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c new file mode 100644 index 0000000..2a0cfb2 --- /dev/null +++ b/dlls/gdiplus/customlinecap.c @@ -0,0 +1,79 @@ +/* + * 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 "gdiplus.h" +#include "gdiplus_private.h" + +GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath* fillPath, GpPath* strokePath, + GpLineCap baseCap, REAL baseInset, GpCustomLineCap **customCap) +{ + GpPathData *pathdata; + + if(!customCap || !(fillPath || strokePath)) + return InvalidParameter; + + *customCap = GdipAlloc(sizeof(GpCustomLineCap)); + if(!*customCap) return OutOfMemory; + + if(strokePath){ + (*customCap)->fill = FALSE; + pathdata = &strokePath->pathdata; + } + else{ + (*customCap)->fill = TRUE; + pathdata = &fillPath->pathdata; + } + + (*customCap)->pathdata.Points = GdipAlloc(pathdata->Count * sizeof(PointF)); + (*customCap)->pathdata.Types = GdipAlloc(pathdata->Count); + + if((!(*customCap)->pathdata.Types || !(*customCap)->pathdata.Points) && + pathdata->Count){ + GdipFree((*customCap)->pathdata.Points); + GdipFree((*customCap)->pathdata.Types); + GdipFree(*customCap); + return OutOfMemory; + } + + memcpy((*customCap)->pathdata.Points, pathdata->Points, pathdata->Count + * sizeof(PointF)); + memcpy((*customCap)->pathdata.Types, pathdata->Types, pathdata->Count); + (*customCap)->pathdata.Count = pathdata->Count; + + (*customCap)->inset = baseInset; + (*customCap)->cap = baseCap; + + return Ok; +} + +GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap *customCap) +{ + if(!customCap) + return InvalidParameter; + + GdipFree(customCap->pathdata.Points); + GdipFree(customCap->pathdata.Types); + GdipFree(customCap); + + return Ok; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 308c05e..d80784e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -74,7 +74,7 @@ @ stub GdipCreateBitmapFromStream @ stub GdipCreateBitmapFromStreamICM @ stub GdipCreateCachedBitmap -@ stub GdipCreateCustomLineCap +@ stdcall GdipCreateCustomLineCap(ptr ptr long long ptr) @ stub GdipCreateFont @ stub GdipCreateFontFamilyFromName @ stub GdipCreateFontFromDC @@ -129,7 +129,7 @@ @ stub GdipCreateTextureIAI @ stdcall GdipDeleteBrush(ptr) @ stub GdipDeleteCachedBitmap -@ stub GdipDeleteCustomLineCap +@ stdcall GdipDeleteCustomLineCap(ptr) @ stub GdipDeleteFont @ stub GdipDeleteFontFamily @ stdcall GdipDeleteGraphics(ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 299806b..5350a19 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -91,4 +91,11 @@ struct GpPathIterator{ INT pathtype_pos; /* for NextPathType methods */ }; +struct GpCustomLineCap{ + GpPathData pathdata; + BOOL fill; /* TRUE for fill, FALSE for stroke */ + GpLineCap cap; /* as far as I can tell, this value is ignored */ + REAL inset; /* how much to adjust the end of the line */ +}; + #endif diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 11d36f5..136f469 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -101,6 +101,10 @@ GpStatus WINGDIPAPI GdipPathIterCopyData(GpPathIterator*,INT*,GpPointF*,BYTE*, GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator*,INT*,INT*,INT*,BOOL*); GpStatus WINGDIPAPI GdipPathIterRewind(GpPathIterator*); +GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath*,GpPath*,GpLineCap,REAL, + GpCustomLineCap**); +GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap*); + #ifdef __cplusplus } #endif diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 8bb5bb6..0e431c5 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -28,6 +28,7 @@ class GpSolidFill {}; class GpPath {}; class GpMatrix {}; class GpPathIterator {}; +class GpCustomLineCap {}; #else /* end of c++ declarations */ @@ -38,6 +39,7 @@ typedef struct GpSolidFill GpSolidFill; typedef struct GpPath GpPath; typedef struct GpMatrix GpMatrix; typedef struct GpPathIterator GpPathIterator; +typedef struct GpCustomLineCap GpCustomLineCap; #endif /* end of c declarations */

1 0

Evan Stade : gdiplus: Added GdipCloneCustomLineCap.
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: 628237f3344b315b5561681a76a2aedc8d4fa700 URL: http://source.winehq.org/git/wine.git/?a=commit;h=628237f3344b315b5561681a7… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jul 19 18:22:38 2007 -0700 gdiplus: Added GdipCloneCustomLineCap. --- dlls/gdiplus/customlinecap.c | 28 ++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 2a0cfb2..76e2c1d 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -24,6 +24,34 @@ #include "gdiplus.h" #include "gdiplus_private.h" +GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap* from, + GpCustomLineCap** to) +{ + if(!from || !to) + return InvalidParameter; + + *to = GdipAlloc(sizeof(GpCustomLineCap)); + if(!*to) return OutOfMemory; + + memcpy(*to, from, sizeof(GpCustomLineCap)); + + (*to)->pathdata.Points = GdipAlloc(from->pathdata.Count * sizeof(PointF)); + (*to)->pathdata.Types = GdipAlloc(from->pathdata.Count); + + if((!(*to)->pathdata.Types || !(*to)->pathdata.Points) && (*to)->pathdata.Count){ + GdipFree((*to)->pathdata.Points); + GdipFree((*to)->pathdata.Types); + GdipFree(*to); + return OutOfMemory; + } + + memcpy((*to)->pathdata.Points, from->pathdata.Points, from->pathdata.Count + * sizeof(PointF)); + memcpy((*to)->pathdata.Types, from->pathdata.Types, from->pathdata.Count); + + return Ok; +} + GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath* fillPath, GpPath* strokePath, GpLineCap baseCap, REAL baseInset, GpCustomLineCap **customCap) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index d80784e..1d8e424 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -44,7 +44,7 @@ @ stub GdipCloneBitmapArea @ stub GdipCloneBitmapAreaI @ stub GdipCloneBrush -@ stub GdipCloneCustomLineCap +@ stdcall GdipCloneCustomLineCap(ptr ptr) @ stub GdipCloneFont @ stub GdipCloneFontFamily @ stub GdipCloneImage diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 136f469..901e03b 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -101,6 +101,7 @@ GpStatus WINGDIPAPI GdipPathIterCopyData(GpPathIterator*,INT*,GpPointF*,BYTE*, GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator*,INT*,INT*,INT*,BOOL*); GpStatus WINGDIPAPI GdipPathIterRewind(GpPathIterator*); +GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap*,GpCustomLineCap**); GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath*,GpPath*,GpLineCap,REAL, GpCustomLineCap**); GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap*);

1 0

Evan Stade : gdiplus: Added GdipCreateMatrix.
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: a8322cb1ad1fc263e8634036dc125827ba2d7cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8322cb1ad1fc263e8634036d… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jul 19 18:22:31 2007 -0700 gdiplus: Added GdipCreateMatrix. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 18 ++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e4166e7..308c05e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -98,7 +98,7 @@ @ stdcall GdipCreateMatrix2(long long long long long long ptr) @ stub GdipCreateMatrix3 @ stub GdipCreateMatrix3I -@ stub GdipCreateMatrix +@ stdcall GdipCreateMatrix(ptr) @ stub GdipCreateMetafileFromEmf @ stub GdipCreateMetafileFromFile @ stub GdipCreateMetafileFromStream diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 928b5fe..0752077 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -70,6 +70,24 @@ GpStatus WINGDIPAPI GdipCreateMatrix2(REAL m11, REAL m12, REAL m21, REAL m22, return Ok; } +GpStatus WINGDIPAPI GdipCreateMatrix(GpMatrix **matrix) +{ + if(!matrix) + return InvalidParameter; + + *matrix = GdipAlloc(sizeof(GpMatrix)); + if(!*matrix) return OutOfMemory; + + (*matrix)->matrix[0] = 1.0; + (*matrix)->matrix[1] = 0.0; + (*matrix)->matrix[2] = 0.0; + (*matrix)->matrix[3] = 1.0; + (*matrix)->matrix[4] = 0.0; + (*matrix)->matrix[5] = 0.0; + + return Ok; +} + GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix *matrix) { if(!matrix) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index b0c9840..11d36f5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -86,6 +86,7 @@ GpStatus WINGDIPAPI GdipSetPathFillMode(GpPath*,GpFillMode); GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*); GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); +GpStatus WINGDIPAPI GdipCreateMatrix(GpMatrix**); GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*); GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix*,GpMatrix*,GpMatrixOrder); GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix*,REAL,GpMatrixOrder);

1 0

Evan Stade : gdiplus: Added GdipRotateMatrix.
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: eb478be84cfed37ad2bc6e8466a6b2f3ebee2d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb478be84cfed37ad2bc6e846… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jul 19 18:22:26 2007 -0700 gdiplus: Added GdipRotateMatrix. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 28 ++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 60e623c..e4166e7 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -466,7 +466,7 @@ @ stdcall GdipRestoreGraphics(ptr long) @ stub GdipReversePath @ stub GdipRotateLineTransform -@ stub GdipRotateMatrix +@ stdcall GdipRotateMatrix(ptr long long) @ stub GdipRotatePathGradientTransform @ stub GdipRotatePenTransform @ stub GdipRotateTextureTransform diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 9d3a78f..928b5fe 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <math.h> #include "windef.h" #include "winbase.h" @@ -93,6 +94,33 @@ GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix *matrix, GpMatrix* matrix2, return Ok; } +GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix *matrix, REAL angle, + GpMatrixOrder order) +{ + REAL cos_theta, sin_theta, rotate[6]; + + if(!matrix) + return InvalidParameter; + + angle = deg2rad(angle); + cos_theta = cos(angle); + sin_theta = sin(angle); + + rotate[0] = cos_theta; + rotate[1] = sin_theta; + rotate[2] = -sin_theta; + rotate[3] = cos_theta; + rotate[4] = 0.0; + rotate[5] = 0.0; + + if(order == MatrixOrderAppend) + matrix_multiply(matrix->matrix, rotate, matrix->matrix); + else + matrix_multiply(rotate, matrix->matrix, matrix->matrix); + + return Ok; +} + GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix *matrix, REAL scaleX, REAL scaleY, GpMatrixOrder order) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 09e5a09..b0c9840 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -88,6 +88,7 @@ GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*); GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*); GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix*,GpMatrix*,GpMatrixOrder); +GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix*,GpPointF*,INT); GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder);

1 0

Evan Stade : gdiplus: Added GdipTranslateMatrix.
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: 477874797c089172b322b1ba2a2184349645aa9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=477874797c089172b322b1ba2… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jul 19 18:22:21 2007 -0700 gdiplus: Added GdipTranslateMatrix. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 23 +++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f081ad9..60e623c 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -591,7 +591,7 @@ @ stub GdipTranslateClip @ stub GdipTranslateClipI @ stub GdipTranslateLineTransform -@ stub GdipTranslateMatrix +@ stdcall GdipTranslateMatrix(ptr long long long) @ stub GdipTranslatePathGradientTransform @ stub GdipTranslatePenTransform @ stub GdipTranslateRegion diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 8c90211..9d3a78f 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -136,3 +136,26 @@ GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix *matrix, GpPointF *pts, return Ok; } + +GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix *matrix, REAL offsetX, + REAL offsetY, GpMatrixOrder order) +{ + REAL translate[6]; + + if(!matrix) + return InvalidParameter; + + translate[0] = 1.0; + translate[1] = 0.0; + translate[2] = 0.0; + translate[3] = 1.0; + translate[4] = offsetX; + translate[5] = offsetY; + + if(order == MatrixOrderAppend) + matrix_multiply(matrix->matrix, translate, matrix->matrix); + else + matrix_multiply(translate, matrix->matrix, matrix->matrix); + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 16026dc..09e5a09 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -90,6 +90,7 @@ GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*); GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix*,GpMatrix*,GpMatrixOrder); GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix*,GpPointF*,INT); +GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator**,GpPath*); GpStatus WINGDIPAPI GdipDeletePathIter(GpPathIterator*);

1 0

Alexander Nicolaysen Sørnes : wordpad: Resize rebar control on window resize.
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: 0b381cee3075041871c5d9648f63c1f88ae78fcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b381cee3075041871c5d9648… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 19 00:24:45 2007 +0200 wordpad: Resize rebar control on window resize. --- programs/wordpad/wordpad.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 14f82f4..e380628 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -986,6 +986,11 @@ static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam ) rebarRows--; rebarHeight = rebarRows ? SendMessageW(hwndReBar, RB_GETBARHEIGHT, 0, 0) : 0; + + rc.top = rc.left = 0; + rc.bottom = rebarHeight; + rc.right = LOWORD(lParam); + SendMessageW(hwndReBar, RB_SIZETORECT, 0, (LPARAM)&rc); } if (hwndEditor) {

1 0

Evan Stade : gdiplus: Added GdipScaleMatrix.
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: d882fc043d83c7888dfa9a81813bb1e008b158d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d882fc043d83c7888dfa9a818… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jul 19 18:22:16 2007 -0700 gdiplus: Added GdipScaleMatrix. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 23 +++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 21e3828..f081ad9 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -477,7 +477,7 @@ @ stub GdipSaveImageToFile @ stub GdipSaveImageToStream @ stub GdipScaleLineTransform -@ stub GdipScaleMatrix +@ stdcall GdipScaleMatrix(ptr long long long) @ stub GdipScalePathGradientTransform @ stub GdipScalePenTransform @ stub GdipScaleTextureTransform diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index c8eb689..8c90211 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -93,6 +93,29 @@ GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix *matrix, GpMatrix* matrix2, return Ok; } +GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix *matrix, REAL scaleX, REAL scaleY, + GpMatrixOrder order) +{ + REAL scale[6]; + + if(!matrix) + return InvalidParameter; + + scale[0] = scaleX; + scale[1] = 0.0; + scale[2] = 0.0; + scale[3] = scaleY; + scale[4] = 0.0; + scale[5] = 0.0; + + if(order == MatrixOrderAppend) + matrix_multiply(matrix->matrix, scale, matrix->matrix); + else + matrix_multiply(scale, matrix->matrix, matrix->matrix); + + return Ok; +} + GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix *matrix, GpPointF *pts, INT count) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index e3ab4e0..16026dc 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -88,6 +88,7 @@ GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*); GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*); GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix*,GpMatrix*,GpMatrixOrder); +GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix*,GpPointF*,INT); GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator**,GpPath*);

1 0

Andrew Talbot : comctl32: Cast-qual warning fix.
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: 8dac319a12700d1c8e02efda73dbd66d0dd864e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dac319a12700d1c8e02efda7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jul 19 19:42:22 2007 +0100 comctl32: Cast-qual warning fix. --- dlls/comctl32/commctrl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 5d75d79..086d0ed 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1531,7 +1531,9 @@ LRESULT WINAPI SetPathWordBreakProc(HWND hwnd, BOOL bSet) int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, const RECT *pRect, DWORD dwFlags, COLORREF crText, COLORREF crShadow, int ixOffset, int iyOffset) { + RECT rect = *pRect; + FIXME("(%p, %s, %d, %p, %d, 0x%08x, 0x%08x, %d, %d): stub\n", hdc, debugstr_w(pszText), cch, pRect, dwFlags, crText, crShadow, ixOffset, iyOffset); - return DrawTextW(hdc, pszText, cch, (LPRECT)pRect, DT_LEFT); + return DrawTextW(hdc, pszText, cch, &rect, DT_LEFT); }

1 0

Andrew Talbot : dplayx: Cast-qual warning fix.
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: 9cc84f635972411dc34da2a8c901a67fb29de56e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cc84f635972411dc34da2a8c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jul 19 22:04:55 2007 +0100 dplayx: Cast-qual warning fix. --- dlls/dplayx/dplobby.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index e911bc8..98e4f33 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -694,7 +694,7 @@ extern HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, L /* Invoke the enum method. If false is returned, stop enumeration */ if ( !lpEnumAddressCallback( &lpElements->guidDataType, lpElements->dwDataSize, - (BYTE*)lpElements + sizeof( DPADDRESS ), + (const BYTE *)lpElements + sizeof( DPADDRESS ), lpContext ) ) { break;

1 0

Andrew Talbot : dbghelp: Cast-qual warnings fix.
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: f8198e668898d7dc501e5c524893a2cd8fcc550f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8198e668898d7dc501e5c524… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jul 19 22:04:50 2007 +0100 dbghelp: Cast-qual warnings fix. --- dlls/dbghelp/dwarf.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 2c1ab0c..66c761c 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2207,10 +2207,10 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, dwarf2_comp_unit_t comp_unit; comp_unit_stream = (const dwarf2_comp_unit_stream_t*) comp_unit_cursor; - comp_unit.length = *(unsigned long*) comp_unit_stream->length; - comp_unit.version = *(unsigned short*) comp_unit_stream->version; - comp_unit.abbrev_offset = *(unsigned long*) comp_unit_stream->abbrev_offset; - comp_unit.word_size = *(unsigned char*) comp_unit_stream->word_size; + comp_unit.length = *(const unsigned long*) comp_unit_stream->length; + comp_unit.version = *(const unsigned short*) comp_unit_stream->version; + comp_unit.abbrev_offset = *(const unsigned long*) comp_unit_stream->abbrev_offset; + comp_unit.word_size = *(const unsigned char*) comp_unit_stream->word_size; dwarf2_parse_compilation_unit(section, &comp_unit, module, thunks, comp_unit_cursor, load_offset);

1 0