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

gdiplus: Each pen dash array element must be greater than zero. 

Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jeff Smith 2020-02-15 15:51:37 -06:00 committed by Alexandre Julliard
parent 843e8e0726
commit ffd4bb2520
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/gdiplus/pen.c
View File

@ -598,13 +598,10 @@ GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash,
for(i = 0; i < count; i++){ for(i = 0; i < count; i++){
sum += dash[i]; sum += dash[i];
if(dash[i] < 0.0) if(dash[i] <= 0.0)
return InvalidParameter; return InvalidParameter;
} }
if(sum == 0.0 && count)
return InvalidParameter;
heap_free(pen->dashes); heap_free(pen->dashes);
pen->dashes = NULL; pen->dashes = NULL;

7
dlls/gdiplus/tests/pen.c
View File

@ -175,7 +175,7 @@ static void test_dasharray(void)
dashes[4] = 14.0; dashes[4] = 14.0;
dashes[5] = -100.0; dashes[5] = -100.0;
dashes[6] = -100.0; dashes[6] = -100.0;
dashes[7] = dashes[8] = dashes[9] = dashes[10] = dashes[11] = 0.0; dashes[7] = dashes[8] = dashes[9] = dashes[10] = dashes[11] = 1.0;
/* setting the array sets the type to custom */ /* setting the array sets the type to custom */
GdipGetPenDashStyle(pen, &style); GdipGetPenDashStyle(pen, &style);
@ -218,10 +218,13 @@ static void test_dasharray(void)
/* Some invalid array values. */ /* Some invalid array values. */
status = GdipSetPenDashArray(pen, &dashes[7], 5); status = GdipSetPenDashArray(pen, &dashes[7], 5);
expect(InvalidParameter, status); expect(Ok, status);
dashes[9] = -1.0; dashes[9] = -1.0;
status = GdipSetPenDashArray(pen, &dashes[7], 5); status = GdipSetPenDashArray(pen, &dashes[7], 5);
expect(InvalidParameter, status); expect(InvalidParameter, status);
dashes[9] = 0.0;
status = GdipSetPenDashArray(pen, &dashes[7], 5);
expect(InvalidParameter, status);
/* Try to set with count = 0. */ /* Try to set with count = 0. */
GdipSetPenDashStyle(pen, DashStyleDot); GdipSetPenDashStyle(pen, DashStyleDot);