marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdiplus: Basic implementation of GdipGetNearestColor with changes to test to reflect fixes.

oldstable
Justin Chevrier 2010-02-25 21:45:55 -05:00 committed by Alexandre Julliard
parent 56238cd70e
commit b4bfa6e1c1
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/gdiplus/graphics.c
View File

@ -3173,9 +3173,10 @@ GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics *graphics,
return Ok;
}
/* FIXME: Need to handle color depths less than 24bpp */
GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb)
{
FIXME("(%p, %p): stub\n", graphics, argb);
FIXME("(%p, %p): Passing color unmodified\n", graphics, argb);
if(!graphics || !argb)
return InvalidParameter;
@ -3183,7 +3184,7 @@ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb)
if(graphics->busy)
return ObjectBusy;
return NotImplemented;
return Ok;
}
GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics *graphics, REAL *scale)

22
dlls/gdiplus/tests/graphics.c
View File

@ -2299,7 +2299,7 @@ static void test_GdipGetNearestColor(void)
if (status == Ok)
{
status = GdipGetNearestColor(graphics, &color);
todo_wine expect(Ok, status);
expect(Ok, status);
expect(0xdeadbeef, color);
GdipDeleteGraphics(graphics);
}
@ -2312,7 +2312,7 @@ static void test_GdipGetNearestColor(void)
if (status == Ok)
{
status = GdipGetNearestColor(graphics, &color);
todo_wine expect(Ok, status);
expect(Ok, status);
expect(0xdeadbeef, color);
GdipDeleteGraphics(graphics);
}
@ -2325,7 +2325,7 @@ static void test_GdipGetNearestColor(void)
if (status == Ok)
{
status = GdipGetNearestColor(graphics, &color);
todo_wine expect(Ok, status);
expect(Ok, status);
expect(0xdeadbeef, color);
GdipDeleteGraphics(graphics);
}
@ -2344,7 +2344,7 @@ static void test_GdipGetNearestColor(void)
status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics);
expect(Ok, status);
status = GdipGetNearestColor(graphics, &color);
todo_wine expect(Ok, status);
expect(Ok, status);
expect(0xdeadbeef, color);
GdipDeleteGraphics(graphics);
GdipDisposeImage((GpImage*)bitmap);
@ -2354,7 +2354,7 @@ static void test_GdipGetNearestColor(void)
status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics);
expect(Ok, status);
status = GdipGetNearestColor(graphics, &color);
todo_wine expect(Ok, status);
expect(Ok, status);
expect(0xdeadbeef, color);
GdipDeleteGraphics(graphics);
GdipDisposeImage((GpImage*)bitmap);
@ -2364,7 +2364,7 @@ static void test_GdipGetNearestColor(void)
status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics);
expect(Ok, status);
status = GdipGetNearestColor(graphics, &color);
todo_wine expect(Ok, status);
expect(Ok, status);
expect(0xdeadbeef, color);
GdipDeleteGraphics(graphics);
GdipDisposeImage((GpImage*)bitmap);
@ -2374,7 +2374,7 @@ static void test_GdipGetNearestColor(void)
status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics);
expect(Ok, status);
status = GdipGetNearestColor(graphics, &color);
todo_wine expect(Ok, status);
expect(Ok, status);
expect(0xdeadbeef, color);
GdipDeleteGraphics(graphics);
GdipDisposeImage((GpImage*)bitmap);
@ -2384,7 +2384,7 @@ static void test_GdipGetNearestColor(void)
status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics);
expect(Ok, status);
status = GdipGetNearestColor(graphics, &color);
todo_wine expect(Ok, status);
expect(Ok, status);
expect(0xdeadbeef, color);
GdipDeleteGraphics(graphics);
GdipDisposeImage((GpImage*)bitmap);
@ -2394,7 +2394,7 @@ static void test_GdipGetNearestColor(void)
status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics);
expect(Ok, status);
status = GdipGetNearestColor(graphics, &color);
todo_wine expect(Ok, status);
expect(Ok, status);
expect(0xdeadbeef, color);
GdipDeleteGraphics(graphics);
GdipDisposeImage((GpImage*)bitmap);
@ -2404,7 +2404,7 @@ static void test_GdipGetNearestColor(void)
status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics);
expect(Ok, status);
status = GdipGetNearestColor(graphics, &color);
todo_wine expect(Ok, status);
expect(Ok, status);
todo_wine expect(0xffa8bce8, color);
GdipDeleteGraphics(graphics);
GdipDisposeImage((GpImage*)bitmap);
@ -2414,7 +2414,7 @@ static void test_GdipGetNearestColor(void)
status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics);
expect(Ok, status);
status = GdipGetNearestColor(graphics, &color);
todo_wine expect(Ok, status);
expect(Ok, status);
todo_wine expect(0xffa8b8e8, color);
GdipDeleteGraphics(graphics);
GdipDisposeImage((GpImage*)bitmap);