Skip to content

W
wine-cw
Commit 14f925d5 authored by Vincent Povirk's avatar Vincent Povirk Committed by Alexandre Julliard
Browse files
Options

gdiplus: Validate MatrixOrder in matrix functions.

parent 08f8f508
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 5 deletions
dlls/gdiplus/matrix.c
View file @ 14f925d5
...@@ -231,8 +231,10 @@ GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix *matrix, GDIPCONST GpMatrix* mat ...@@ -231,8 +231,10 @@ GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix *matrix, GDIPCONST GpMatrix* mat
if(order == MatrixOrderAppend) if(order == MatrixOrderAppend)
matrix_multiply(matrix->matrix, matrix2->matrix, matrix->matrix); matrix_multiply(matrix->matrix, matrix2->matrix, matrix->matrix);
else else if (order == MatrixOrderPrepend)
matrix_multiply(matrix2->matrix, matrix->matrix, matrix->matrix); matrix_multiply(matrix2->matrix, matrix->matrix, matrix->matrix);
else
return InvalidParameter;
return Ok; return Ok;
} }
...@@ -260,8 +262,10 @@ GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix *matrix, REAL angle, ...@@ -260,8 +262,10 @@ GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix *matrix, REAL angle,
if(order == MatrixOrderAppend) if(order == MatrixOrderAppend)
matrix_multiply(matrix->matrix, rotate, matrix->matrix); matrix_multiply(matrix->matrix, rotate, matrix->matrix);
else else if (order == MatrixOrderPrepend)
matrix_multiply(rotate, matrix->matrix, matrix->matrix); matrix_multiply(rotate, matrix->matrix, matrix->matrix);
else
return InvalidParameter;
return Ok; return Ok;
} }
...@@ -285,8 +289,10 @@ GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix *matrix, REAL scaleX, REAL scaleY, ...@@ -285,8 +289,10 @@ GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix *matrix, REAL scaleX, REAL scaleY,
if(order == MatrixOrderAppend) if(order == MatrixOrderAppend)
matrix_multiply(matrix->matrix, scale, matrix->matrix); matrix_multiply(matrix->matrix, scale, matrix->matrix);
else else if (order == MatrixOrderPrepend)
matrix_multiply(scale, matrix->matrix, matrix->matrix); matrix_multiply(scale, matrix->matrix, matrix->matrix);
else
return InvalidParameter;
return Ok; return Ok;
} }
...@@ -330,8 +336,10 @@ GpStatus WINGDIPAPI GdipShearMatrix(GpMatrix *matrix, REAL shearX, REAL shearY, ...@@ -330,8 +336,10 @@ GpStatus WINGDIPAPI GdipShearMatrix(GpMatrix *matrix, REAL shearX, REAL shearY,
if(order == MatrixOrderAppend) if(order == MatrixOrderAppend)
matrix_multiply(matrix->matrix, shear, matrix->matrix); matrix_multiply(matrix->matrix, shear, matrix->matrix);
else else if (order == MatrixOrderPrepend)
matrix_multiply(shear, matrix->matrix, matrix->matrix); matrix_multiply(shear, matrix->matrix, matrix->matrix);
else
return InvalidParameter;
return Ok; return Ok;
} }
...@@ -410,8 +418,10 @@ GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix *matrix, REAL offsetX, ...@@ -410,8 +418,10 @@ GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix *matrix, REAL offsetX,
if(order == MatrixOrderAppend) if(order == MatrixOrderAppend)
matrix_multiply(matrix->matrix, translate, matrix->matrix); matrix_multiply(matrix->matrix, translate, matrix->matrix);
else else if (order == MatrixOrderPrepend)
matrix_multiply(translate, matrix->matrix, matrix->matrix); matrix_multiply(translate, matrix->matrix, matrix->matrix);
else
return InvalidParameter;
return Ok; return Ok;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment