Commit 204253b6 authored by Vincent Povirk's avatar Vincent Povirk Committed by Alexandre Julliard

gdiplus: Add test for GdipDrawDriverString.

parent 319a748f
...@@ -1954,6 +1954,8 @@ static void test_GdipDrawString(void) ...@@ -1954,6 +1954,8 @@ static void test_GdipDrawString(void)
LOGFONTA logfont; LOGFONTA logfont;
HDC hdc = GetDC( hwnd ); HDC hdc = GetDC( hwnd );
static const WCHAR string[] = {'T','e','s','t',0}; static const WCHAR string[] = {'T','e','s','t',0};
static const PointF positions[4] = {{0,0}, {1,1}, {2,2}, {3,3}};
GpMatrix *matrix;
memset(&logfont,0,sizeof(logfont)); memset(&logfont,0,sizeof(logfont));
strcpy(logfont.lfFaceName,"Arial"); strcpy(logfont.lfFaceName,"Arial");
...@@ -1985,6 +1987,36 @@ static void test_GdipDrawString(void) ...@@ -1985,6 +1987,36 @@ static void test_GdipDrawString(void)
status = GdipDrawString(graphics, string, 4, fnt, &rect, format, brush); status = GdipDrawString(graphics, string, 4, fnt, &rect, format, brush);
expect(Ok, status); expect(Ok, status);
status = GdipCreateMatrix(&matrix);
expect(Ok, status);
todo_wine {
status = GdipDrawDriverString(NULL, string, 4, fnt, brush, positions, DriverStringOptionsCmapLookup, matrix);
expect(InvalidParameter, status);
status = GdipDrawDriverString(graphics, NULL, 4, fnt, brush, positions, DriverStringOptionsCmapLookup, matrix);
expect(InvalidParameter, status);
status = GdipDrawDriverString(graphics, string, 4, NULL, brush, positions, DriverStringOptionsCmapLookup, matrix);
expect(InvalidParameter, status);
status = GdipDrawDriverString(graphics, string, 4, fnt, NULL, positions, DriverStringOptionsCmapLookup, matrix);
expect(InvalidParameter, status);
status = GdipDrawDriverString(graphics, string, 4, fnt, brush, NULL, DriverStringOptionsCmapLookup, matrix);
expect(InvalidParameter, status);
status = GdipDrawDriverString(graphics, string, 4, fnt, brush, positions, DriverStringOptionsCmapLookup|0x10, matrix);
expect(Ok, status);
status = GdipDrawDriverString(graphics, string, 4, fnt, brush, positions, DriverStringOptionsCmapLookup, NULL);
expect(Ok, status);
status = GdipDrawDriverString(graphics, string, 4, fnt, brush, positions, DriverStringOptionsCmapLookup, matrix);
expect(Ok, status);
}
GdipDeleteMatrix(matrix);
GdipDeleteGraphics(graphics); GdipDeleteGraphics(graphics);
GdipDeleteBrush(brush); GdipDeleteBrush(brush);
GdipDeleteFont(fnt); GdipDeleteFont(fnt);
......
...@@ -42,6 +42,14 @@ enum BrushType ...@@ -42,6 +42,14 @@ enum BrushType
BrushTypeLinearGradient = 4 BrushTypeLinearGradient = 4
}; };
enum DriverStringOptions
{
DriverStringOptionsCmapLookup = 1,
DriverStringOptionsVertical = 2,
DriverStringOptionsRealizedAdvance = 4,
DriverStringOptionsLimitSubpixel = 4
};
enum FillMode enum FillMode
{ {
FillModeAlternate = 0, FillModeAlternate = 0,
...@@ -707,6 +715,7 @@ enum EmfPlusRecordType { ...@@ -707,6 +715,7 @@ enum EmfPlusRecordType {
typedef enum Unit Unit; typedef enum Unit Unit;
typedef enum BrushType BrushType; typedef enum BrushType BrushType;
typedef enum DriverStringOptions DriverStringOptions;
typedef enum FillMode FillMode; typedef enum FillMode FillMode;
typedef enum LineCap LineCap; typedef enum LineCap LineCap;
typedef enum PathPointType PathPointType; typedef enum PathPointType PathPointType;
......
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