ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdiplus: Return success from GdipImageSetAbort(). 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-11-03 23:34:44 +03:00 committed by Alexandre Julliard
parent c03e5ed3be
commit da2021e46f
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/gdiplus/image.c
View File

@ -5373,8 +5373,15 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type)
*/ */
GpStatus WINGDIPAPI GdipImageSetAbort(GpImage *image, GdiplusAbort *pabort) GpStatus WINGDIPAPI GdipImageSetAbort(GpImage *image, GdiplusAbort *pabort)
{ {
FIXME("(%p, %p): stub\n", image, pabort); TRACE("(%p, %p)\n", image, pabort);
return NotImplemented;
if (!image)
return InvalidParameter;
if (pabort)
FIXME("Abort callback is not supported.\n");
return Ok;
} }
/***************************************************************************** /*****************************************************************************

27
dlls/gdiplus/tests/image.c
View File

@ -32,6 +32,7 @@
static GpStatus (WINAPI *pGdipBitmapGetHistogramSize)(HistogramFormat,UINT*); static GpStatus (WINAPI *pGdipBitmapGetHistogramSize)(HistogramFormat,UINT*);
static GpStatus (WINAPI *pGdipBitmapGetHistogram)(GpBitmap*,HistogramFormat,UINT,UINT*,UINT*,UINT*,UINT*); static GpStatus (WINAPI *pGdipBitmapGetHistogram)(GpBitmap*,HistogramFormat,UINT,UINT*,UINT*,UINT*,UINT*);
static GpStatus (WINAPI *pGdipImageSetAbort)(GpImage*,GdiplusAbort*);
#define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (UINT)(expected), (UINT)(got)) #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (UINT)(expected), (UINT)(got))
#define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) #define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got))
@ -4916,6 +4917,30 @@ static void test_histogram(void)
GdipDisposeImage((GpImage*)bm); GdipDisposeImage((GpImage*)bm);
} }
static void test_imageabort(void)
{
GpStatus stat;
GpBitmap *bm;
if (!pGdipImageSetAbort)
{
win_skip("GdipImageSetAbort() is not supported.\n");
return;
}
bm = NULL;
stat = GdipCreateBitmapFromScan0(8, 8, 0, PixelFormat24bppRGB, NULL, &bm);
expect(Ok, stat);
stat = pGdipImageSetAbort(NULL, NULL);
expect(InvalidParameter, stat);
stat = pGdipImageSetAbort((GpImage*)bm, NULL);
expect(Ok, stat);
GdipDisposeImage((GpImage*)bm);
}
START_TEST(image) START_TEST(image)
{ {
HMODULE mod = GetModuleHandleA("gdiplus.dll"); HMODULE mod = GetModuleHandleA("gdiplus.dll");
@ -4931,6 +4956,7 @@ START_TEST(image)
pGdipBitmapGetHistogramSize = (void*)GetProcAddress(mod, "GdipBitmapGetHistogramSize"); pGdipBitmapGetHistogramSize = (void*)GetProcAddress(mod, "GdipBitmapGetHistogramSize");
pGdipBitmapGetHistogram = (void*)GetProcAddress(mod, "GdipBitmapGetHistogram"); pGdipBitmapGetHistogram = (void*)GetProcAddress(mod, "GdipBitmapGetHistogram");
pGdipImageSetAbort = (void*)GetProcAddress(mod, "GdipImageSetAbort");
test_supported_encoders(); test_supported_encoders();
test_CloneBitmapArea(); test_CloneBitmapArea();
@ -4979,6 +5005,7 @@ START_TEST(image)
test_createeffect(); test_createeffect();
test_getadjustedpalette(); test_getadjustedpalette();
test_histogram(); test_histogram();
test_imageabort();
GdiplusShutdown(gdiplusToken); GdiplusShutdown(gdiplusToken);
} }