Jeff Smith : gdiplus: Fix GdipSetPageUnit parameter validation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6972aa77c1c884b909f5c60c0fcb7e8bf9ef92a4
URL:    https://gitlab.winehq.org/wine/wine/-/commit/6972aa77c1c884b909f5c60c0fcb7e8...

Author: Jeff Smith 
Date:   Thu Oct 26 00:21:22 2023 -0500

gdiplus: Fix GdipSetPageUnit parameter validation.

---

dlls/gdiplus/graphics.c       | 2 +-
 dlls/gdiplus/tests/graphics.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 6cc0c3bfbe3..371629a5bef 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -6197,7 +6197,7 @@ GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics *graphics, GpUnit unit)
     if(graphics->busy)
         return ObjectBusy;

-    if(unit == UnitWorld)
+    if(unit == UnitWorld || unit > UnitMillimeter)
         return InvalidParameter;

if (is_metafile_graphics(graphics))
diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c
index 5f502b72593..724be3f1030 100644
--- a/dlls/gdiplus/tests/graphics.c
+++ b/dlls/gdiplus/tests/graphics.c
@@ -4104,7 +4104,6 @@ static void test_set_page_transform(void)
     {
         winetest_push_context("%u", i);
         status = GdipSetPageUnit(graphics, td_unit[i].unit);
-        todo_wine_if(td_unit[i].unit > UnitMillimeter)
         expect(td_unit[i].isInvalid ? InvalidParameter : Ok, status);
         if (status == Ok)
         {
@@ -4131,7 +4130,6 @@ static void test_set_page_transform(void)

status = GdipGetPageUnit(graphics, &unit);
     expect(Ok, status);
-    todo_wine
     expect(UnitMillimeter, unit);
     status = GdipGetPageScale(graphics, &scale);
     expect(Ok, status);