Skip to content

W
wine-winehq
Commit 8127fd95 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

dwrite: Avoid redefining the DWRITE_GLYPH_RUN typedef.

parent 25d7a1bb
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
include/d2d1.idl
View file @ 8127fd95
...@@ -37,7 +37,10 @@ interface IDWriteTextLayout; ...@@ -37,7 +37,10 @@ interface IDWriteTextLayout;
interface IWICBitmapSource; interface IWICBitmapSource;
interface IWICBitmap; interface IWICBitmap;
cpp_quote("#ifndef __dwrite_h__")
/* already defined in dwrite.h but needed for WIDL */
typedef struct DWRITE_GLYPH_RUN DWRITE_GLYPH_RUN; typedef struct DWRITE_GLYPH_RUN DWRITE_GLYPH_RUN;
cpp_quote("#endif /* __dwrite_h__ */")
typedef D2D_POINT_2F D2D1_POINT_2F; typedef D2D_POINT_2F D2D1_POINT_2F;
typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F;
......
include/dwrite.idl
View file @ 8127fd95
...@@ -382,7 +382,11 @@ typedef struct DWRITE_TRIMMING ...@@ -382,7 +382,11 @@ typedef struct DWRITE_TRIMMING
UINT32 delimiterCount; UINT32 delimiterCount;
} DWRITE_TRIMMING; } 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; IDWriteFontFace* fontFace;
FLOAT fontEmSize; FLOAT fontEmSize;
...@@ -392,7 +396,7 @@ typedef struct DWRITE_GLYPH_RUN ...@@ -392,7 +396,7 @@ typedef struct DWRITE_GLYPH_RUN
DWRITE_GLYPH_OFFSET const* glyphOffsets; DWRITE_GLYPH_OFFSET const* glyphOffsets;
BOOL isSideways; BOOL isSideways;
UINT32 bidiLevel; UINT32 bidiLevel;
} DWRITE_GLYPH_RUN; };
typedef struct DWRITE_GLYPH_RUN_DESCRIPTION typedef struct DWRITE_GLYPH_RUN_DESCRIPTION
{ {
......
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