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

dwrite: Avoid redefining the DWRITE_GLYPH_RUN typedef.

This commit is contained in:
Francois Gouget 2014-10-10 08:37:07 +02:00 committed by Alexandre Julliard
parent 25d7a1bbbf
commit 8127fd9599
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/d2d1.idl
View File

@ -37,7 +37,10 @@ interface IDWriteTextLayout;
interface IWICBitmapSource;
interface IWICBitmap;
cpp_quote("#ifndef __dwrite_h__")
/* already defined in dwrite.h but needed for WIDL */
typedef struct DWRITE_GLYPH_RUN DWRITE_GLYPH_RUN;
cpp_quote("#endif /* __dwrite_h__ */")
typedef D2D_POINT_2F D2D1_POINT_2F;
typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F;

8
include/dwrite.idl
View File

@ -382,7 +382,11 @@ typedef struct DWRITE_TRIMMING
UINT32 delimiterCount;
} DWRITE_TRIMMING;
typedef struct DWRITE_GLYPH_RUN
cpp_quote("#ifndef __d2d1_h__")
typedef struct DWRITE_GLYPH_RUN DWRITE_GLYPH_RUN;
cpp_quote("#endif /* __d2d1_h__ */")
struct DWRITE_GLYPH_RUN
{
IDWriteFontFace* fontFace;
FLOAT fontEmSize;
@ -392,7 +396,7 @@ typedef struct DWRITE_GLYPH_RUN
DWRITE_GLYPH_OFFSET const* glyphOffsets;
BOOL isSideways;
UINT32 bidiLevel;
} DWRITE_GLYPH_RUN;
};
typedef struct DWRITE_GLYPH_RUN_DESCRIPTION
{