Alistair Leslie-Hughes : gdiplus: Implement GdipResetPenTransform.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Apr 12 06:45:27 CDT 2016
Module: wine
Branch: stable
Commit: 418af2e0edc49c0a2217c4179bb1c27f75a1dcd2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=418af2e0edc49c0a2217c4179bb1c27f75a1dcd2
Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Fri Feb 5 18:20:47 2016 +1100
gdiplus: Implement GdipResetPenTransform.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Signed-off-by: Vincent Povirk <vincent at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 0f94756728591338dffa569bba9017a28386d70e)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/gdiplus/pen.c | 7 ++-----
dlls/gdiplus/tests/pen.c | 6 +++---
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c
index a285bd8..2c49371 100644
--- a/dlls/gdiplus/pen.c
+++ b/dlls/gdiplus/pen.c
@@ -419,17 +419,14 @@ GpStatus WINGDIPAPI GdipGetPenWidth(GpPen *pen, REAL *width)
GpStatus WINGDIPAPI GdipResetPenTransform(GpPen *pen)
{
- static int calls;
-
TRACE("(%p)\n", pen);
if(!pen)
return InvalidParameter;
- if(!(calls++))
- FIXME("(%p) stub\n", pen);
+ GdipSetMatrixElements(&pen->transform, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0);
- return NotImplemented;
+ return Ok;
}
GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *pen, GpMatrix *matrix)
diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c
index 691386a..8591a3a 100644
--- a/dlls/gdiplus/tests/pen.c
+++ b/dlls/gdiplus/tests/pen.c
@@ -409,20 +409,20 @@ static void test_transform(void)
expectf(3.0, values[5]);
status = GdipResetPenTransform(pen);
- todo_wine expect(Ok, status);
+ expect(Ok, status);
status = GdipGetPenTransform(pen, matrix);
expect(Ok, status);
status = GdipGetMatrixElements(matrix, values);
expect(Ok, status);
-todo_wine {
+
expectf(1.0, values[0]);
expectf(0.0, values[1]);
expectf(0.0, values[2]);
expectf(1.0, values[3]);
expectf(0.0, values[4]);
expectf(0.0, values[5]);
-}
+
GdipDeletePen(pen);
GdipDeleteMatrix(matrix);
More information about the wine-cvs
mailing list