[PATCH 0/1] MR8917: gdi32: From Windows 2000 FixBrushOrgEx() is a NOP.

[PATCH 1/1] gdi32: From Windows 2000 FixBrushOrgEx() is a NOP.

[Bartosz Kosiorek]

From: Bartosz Kosiorek

---
 dlls/gdi32/dc.c          | 3 ++-
 dlls/gdi32/tests/brush.c | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
index 97cde2eb343..adfcd5195dc 100644
--- a/dlls/gdi32/dc.c
+++ b/dlls/gdi32/dc.c
@@ -1142,7 +1142,8 @@ BOOL WINAPI SetBrushOrgEx( HDC hdc, INT x, INT y, POINT *oldorg )
  */
 BOOL WINAPI FixBrushOrgEx( HDC hdc, INT x, INT y, POINT *oldorg )
 {
-    return SetBrushOrgEx( hdc, x, y, oldorg );
+    /* From Windows 2000 this is a NOP returning FALSE */
+    return FALSE;
 }

/***********************************************************************
diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c
index 8df3c48a20d..57b4ce4f0e0 100644
--- a/dlls/gdi32/tests/brush.c
+++ b/dlls/gdi32/tests/brush.c
@@ -431,14 +431,12 @@ static void test_brush_org( void )
     ok( pt.x == 0 && pt.y == 0, "got %ld,%ld\n", pt.x, pt.y );
     pt.x = 10;
     pt.y = 20;
+    /* From Windows 2000 function don't do anything and returns FALSE */
     ret = FixBrushOrgEx( hdc, 2, 3, &pt );
-    todo_wine
     ok(!ret, "Unexpected return value %d.\n", ret);
-    todo_wine
     ok( pt.x == 10 && pt.y == 20, "got %ld,%ld\n", pt.x, pt.y );
     ret = GetBrushOrgEx( hdc, &pt );
     ok(ret, "Unexpected return value %d.\n", ret);
-    todo_wine
     ok( pt.x == 0 && pt.y == 0, "got %ld,%ld\n", pt.x, pt.y );

ReleaseDC( 0, hdc );

[PATCH 0/1] MR8917: gdi32: From Windows 2000 FixBrushOrgEx() is a NOP. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.