Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
59d9a2e1
Commit
59d9a2e1
authored
Sep 25, 2014
by
Nikolay Sivov
Committed by
Alexandre Julliard
Sep 25, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
include: Update dwrite headers to match SDK 8.1.
parent
7f29fc7e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
21 deletions
+45
-21
dwrite.idl
include/dwrite.idl
+31
-21
winerror.h
include/winerror.h
+14
-0
No files found.
include/dwrite.idl
View file @
59d9a2e1
...
...
@@ -63,7 +63,8 @@ typedef enum DWRITE_FONT_FACE_TYPE
DWRITE_FONT_FACE_TYPE_TYPE1
,
DWRITE_FONT_FACE_TYPE_VECTOR
,
DWRITE_FONT_FACE_TYPE_BITMAP
,
DWRITE_FONT_FACE_TYPE_UNKNOWN
DWRITE_FONT_FACE_TYPE_UNKNOWN
,
DWRITE_FONT_FACE_TYPE_RAW_CFF
}
DWRITE_FONT_FACE_TYPE
;
typedef
enum
DWRITE_FONT_WEIGHT
...
...
@@ -125,14 +126,17 @@ typedef enum DWRITE_INFORMATIONAL_STRING_ID
DWRITE_INFORMATIONAL_STRING_WIN32_SUBFAMILY_NAMES
,
DWRITE_INFORMATIONAL_STRING_PREFERRED_FAMILY_NAMES
,
DWRITE_INFORMATIONAL_STRING_PREFERRED_SUBFAMILY_NAMES
,
DWRITE_INFORMATIONAL_STRING_SAMPLE_TEXT
DWRITE_INFORMATIONAL_STRING_SAMPLE_TEXT
,
DWRITE_INFORMATIONAL_STRING_FULL_NAME
,
DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_NAME
,
DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME
}
DWRITE_INFORMATIONAL_STRING_ID
;
typedef
enum
DWRITE_FONT_SIMULATIONS
{
DWRITE_FONT_SIMULATIONS_NONE
=
0
x0000
,
DWRITE_FONT_SIMULATIONS_BOLD
=
0
x0001
,
DWRITE_FONT_SIMULATIONS_OBLIQUE
=
0
x0002
DWRITE_FONT_SIMULATIONS_NONE
,
DWRITE_FONT_SIMULATIONS_BOLD
,
DWRITE_FONT_SIMULATIONS_OBLIQUE
}
DWRITE_FONT_SIMULATIONS
;
typedef
enum
DWRITE_PIXEL_GEOMETRY
...
...
@@ -146,11 +150,15 @@ typedef enum DWRITE_RENDERING_MODE
{
DWRITE_RENDERING_MODE_DEFAULT
,
DWRITE_RENDERING_MODE_ALIASED
,
DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC
,
DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL
,
DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL
,
DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC
,
DWRITE_RENDERING_MODE_OUTLINE
DWRITE_RENDERING_MODE_GDI_CLASSIC
,
DWRITE_RENDERING_MODE_GDI_NATURAL
,
DWRITE_RENDERING_MODE_NATURAL
,
DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC
,
DWRITE_RENDERING_MODE_OUTLINE
,
DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC
=
DWRITE_RENDERING_MODE_GDI_CLASSIC
,
DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL
=
DWRITE_RENDERING_MODE_GDI_NATURAL
,
DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL
=
DWRITE_RENDERING_MODE_NATURAL
,
DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC
=
DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC
}
DWRITE_RENDERING_MODE
;
typedef
enum
DWRITE_TEXT_ALIGNMENT
...
...
@@ -171,18 +179,26 @@ typedef enum DWRITE_PARAGRAPH_ALIGNMENT
typedef
enum
DWRITE_WORD_WRAPPING
{
DWRITE_WORD_WRAPPING_WRAP
,
DWRITE_WORD_WRAPPING_NO_WRAP
DWRITE_WORD_WRAPPING_NO_WRAP
,
DWRITE_WORD_WRAPPING_EMERGENCY_BREAK
,
DWRITE_WORD_WRAPPING_WHOLE_WORD
,
DWRITE_WORD_WRAPPING_CHARACTER
}
DWRITE_WORD_WRAPPING
;
typedef
enum
DWRITE_READING_DIRECTION
{
DWRITE_READING_DIRECTION_LEFT_TO_RIGHT
,
DWRITE_READING_DIRECTION_RIGHT_TO_LEFT
DWRITE_READING_DIRECTION_RIGHT_TO_LEFT
,
DWRITE_READING_DIRECTION_TOP_TO_BOTTOM
,
DWRITE_READING_DIRECTION_BOTTOM_TO_TOP
}
DWRITE_READING_DIRECTION
;
typedef
enum
DWRITE_FLOW_DIRECTION
{
DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM
DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM
,
DWRITE_FLOW_DIRECTION_BOTTOM_TO_TOP
,
DWRITE_FLOW_DIRECTION_LEFT_TO_RIGHT
,
DWRITE_FLOW_DIRECTION_RIGHT_TO_LEFT
}
DWRITE_FLOW_DIRECTION
;
typedef
enum
DWRITE_TRIMMING_GRANULARITY
...
...
@@ -286,6 +302,8 @@ typedef enum DWRITE_FONT_FEATURE_TAG
DWRITE_FONT_FEATURE_TAG_TRADITIONAL_FORMS
=
0
x64617274
,
/*
'trad'
*/
DWRITE_FONT_FEATURE_TAG_THIRD_WIDTHS
=
0
x64697774
,
/*
'twid'
*/
DWRITE_FONT_FEATURE_TAG_UNICASE
=
0
x63696e75
,
/*
'unic'
*/
DWRITE_FONT_FEATURE_TAG_VERTICAL_WRITING
=
0
x74726576
,
/*
'vert'
*/
DWRITE_FONT_FEATURE_TAG_VERTICAL_ALTERNATES_AND_ROTATION
=
0
x32747276
,
/*
'vrt2'
*/
DWRITE_FONT_FEATURE_TAG_SLASHED_ZERO
=
0
x6f72657a
,
/*
'zero'
*/
}
DWRITE_FONT_FEATURE_TAG
;
...
...
@@ -1413,11 +1431,3 @@ cpp_quote("#define FACILITY_DWRITE 0x898")
cpp_quote
(
"#define DWRITE_ERR_BASE 0x5000"
)
cpp_quote
(
"#define MAKE_DWRITE_HR(severity, code) MAKE_HRESULT(severity, FACILITY_DWRITE, (DWRITE_ERR_BASE + code))"
)
cpp_quote
(
"#define MAKE_DWRITE_HR_ERR(code) MAKE_DWRITE_HR(SEVERITY_ERROR, code)"
)
cpp_quote
(
"#define DWRITE_E_FILEFORMAT MAKE_DWRITE_HR_ERR(0x0)"
)
cpp_quote
(
"#define DWRITE_E_UNEXPECTED MAKE_DWRITE_HR_ERR(0x1)"
)
cpp_quote
(
"#define DWRITE_E_NOFONT MAKE_DWRITE_HR_ERR(0x2)"
)
cpp_quote
(
"#define DWRITE_E_FILENOTFOUND MAKE_DWRITE_HR_ERR(0x3)"
)
cpp_quote
(
"#define DWRITE_E_FILEACCESS MAKE_DWRITE_HR_ERR(0x4)"
)
cpp_quote
(
"#define DWRITE_E_FONTCOLLECTIONOBSOLETE MAKE_DWRITE_HR_ERR(0x5)"
)
cpp_quote
(
"#define DWRITE_E_ALREADYREGISTERED MAKE_DWRITE_HR_ERR(0x6)"
)
include/winerror.h
View file @
59d9a2e1
...
...
@@ -2995,6 +2995,20 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x)
#define SCARD_W_CACHE_ITEM_STALE _HRESULT_TYPEDEF_(0x80100071)
#define SCARD_W_CACHE_ITEM_TOO_BIG _HRESULT_TYPEDEF_(0x80100072)
#define DWRITE_E_FILEFORMAT _HRESULT_TYPEDEF_(0x88985000)
#define DWRITE_E_UNEXPECTED _HRESULT_TYPEDEF_(0x88985001)
#define DWRITE_E_NOFONT _HRESULT_TYPEDEF_(0x88985002)
#define DWRITE_E_FILENOTFOUND _HRESULT_TYPEDEF_(0x88985003)
#define DWRITE_E_FILEACCESS _HRESULT_TYPEDEF_(0x88985004)
#define DWRITE_E_FONTCOLLECTIONOBSOLETE _HRESULT_TYPEDEF_(0x88985005)
#define DWRITE_E_ALREADYREGISTERED _HRESULT_TYPEDEF_(0x88985006)
#define DWRITE_E_CACHEFORMAT _HRESULT_TYPEDEF_(0x88985007)
#define DWRITE_E_CACHEVERSION _HRESULT_TYPEDEF_(0x88985008)
#define DWRITE_E_UNSUPPORTEDOPERATION _HRESULT_TYPEDEF_(0x88985009)
#define DWRITE_E_TEXTRENDERERINCOMPATIBLE _HRESULT_TYPEDEF_(0x8898500A)
#define DWRITE_E_FLOWDIRECTIONCONFLICTS _HRESULT_TYPEDEF_(0x8898500B)
#define DWRITE_E_NOCOLOR _HRESULT_TYPEDEF_(0x8898500C)
#define ERROR_AUDITING_DISABLED _HRESULT_TYPEDEF_(0xC0090001)
#define ERROR_ALL_SIDS_FILTERED _HRESULT_TYPEDEF_(0xC0090002)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment