---
From 789bdbbfa35f0145a656d31a06b4bb54d7181155 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsi...@codeweavers.com>
Date: Sun, 27 Jan 2019 19:15:17 +0300
Subject: [PATCH] headers: Update d2d1.h enums with missing members.
Signed-off-by: Nikolay Sivov <nsi...@codeweavers.com>
---
mingw-w64-headers/include/d2d1.h | 182 ++++++++++++++++++-------------
1 file changed, 107 insertions(+), 75 deletions(-)
diff --git a/mingw-w64-headers/include/d2d1.h b/mingw-w64-headers/include/d2d1.h
index ea8a0329..765c6809 100644
--- a/mingw-w64-headers/include/d2d1.h
+++ b/mingw-w64-headers/include/d2d1.h
@@ -190,21 +190,24 @@ typedef struct IDWriteTextLayout IDWriteTextLayout;
typedef struct IDWriteFontFace IDWriteFontFace;
#endif
-typedef enum _D2D1_ALPHA_MODE {
+typedef enum D2D1_ALPHA_MODE {
D2D1_ALPHA_MODE_UNKNOWN = 0,
D2D1_ALPHA_MODE_PREMULTIPLIED = 1,
D2D1_ALPHA_MODE_STRAIGHT = 2,
- D2D1_ALPHA_MODE_IGNORE = 3
+ D2D1_ALPHA_MODE_IGNORE = 3,
+ D2D1_ALPHA_MODE_FORCE_DWORD = 0xffffffff
} D2D1_ALPHA_MODE;
-typedef enum _D2D1_ANTIALIAS_MODE {
+typedef enum D2D1_ANTIALIAS_MODE {
D2D1_ANTIALIAS_MODE_PER_PRIMITIVE = 0,
- D2D1_ANTIALIAS_MODE_ALIASED = 1
+ D2D1_ANTIALIAS_MODE_ALIASED = 1,
+ D2D1_ANTIALIAS_MODE_FORCE_DWORD = 0xffffffff
} D2D1_ANTIALIAS_MODE;
-typedef enum _D2D1_ARC_SIZE {
- D2D1_ARC_SIZE_SMALL = 0,
- D2D1_ARC_SIZE_LARGE = 1
+typedef enum D2D1_ARC_SIZE {
+ D2D1_ARC_SIZE_SMALL = 0,
+ D2D1_ARC_SIZE_LARGE = 1,
+ D2D1_ARC_SIZE_FORCE_DWORD = 0xffffffff
} D2D1_ARC_SIZE;
enum {
@@ -218,164 +221,193 @@ enum {
D2D1_INTERPOLATION_MODE_DEFINITION_MIPMAP_LINEAR = 7
};
-typedef enum _D2D1_BITMAP_INTERPOLATION_MODE {
+typedef enum D2D1_BITMAP_INTERPOLATION_MODE {
D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR = 0,
- D2D1_BITMAP_INTERPOLATION_MODE_LINEAR = 1
+ D2D1_BITMAP_INTERPOLATION_MODE_LINEAR = 1,
+ D2D1_BITMAP_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff
} D2D1_BITMAP_INTERPOLATION_MODE;
-typedef enum _D2D1_CAP_STYLE {
- D2D1_CAP_STYLE_FLAT = 0,
- D2D1_CAP_STYLE_SQUARE = 1,
- D2D1_CAP_STYLE_ROUND = 2,
- D2D1_CAP_STYLE_TRIANGLE = 3
+typedef enum D2D1_CAP_STYLE {
+ D2D1_CAP_STYLE_FLAT = 0,
+ D2D1_CAP_STYLE_SQUARE = 1,
+ D2D1_CAP_STYLE_ROUND = 2,
+ D2D1_CAP_STYLE_TRIANGLE = 3,
+ D2D1_CAP_STYLE_FORCE_DWORD = 0xffffffff
} D2D1_CAP_STYLE;
-typedef enum _D2D1_COMBINE_MODE {
+typedef enum D2D1_COMBINE_MODE {
D2D1_COMBINE_MODE_UNION = 0,
D2D1_COMBINE_MODE_INTERSECT = 1,
D2D1_COMBINE_MODE_XOR = 2,
- D2D1_COMBINE_MODE_EXCLUDE = 3
+ D2D1_COMBINE_MODE_EXCLUDE = 3,
+ D2D1_COMBINE_MODE_FORCE_DWORD = 0xffffffff
} D2D1_COMBINE_MODE;
-typedef enum _D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS {
+typedef enum D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS {
D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE = 0x00000000,
- D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_GDI_COMPATIBLE = 0x00000001
+ D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_GDI_COMPATIBLE = 0x00000001,
+ D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_FORCE_DWORD = 0xffffffff
} D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS;
-typedef enum _D2D1_DASH_STYLE {
+typedef enum D2D1_DASH_STYLE {
D2D1_DASH_STYLE_SOLID = 0,
D2D1_DASH_STYLE_DASH = 1,
D2D1_DASH_STYLE_DOT = 2,
D2D1_DASH_STYLE_DASH_DOT = 3,
D2D1_DASH_STYLE_DASH_DOT_DOT = 4,
- D2D1_DASH_STYLE_CUSTOM = 5
+ D2D1_DASH_STYLE_CUSTOM = 5,
+ D2D1_DASH_STYLE_FORCE_DWORD = 0xffffffff
} D2D1_DASH_STYLE;
-typedef enum _D2D1_DC_INITIALIZE_MODE {
- D2D1_DC_INITIALIZE_MODE_COPY = 0,
- D2D1_DC_INITIALIZE_MODE_CLEAR = 1
+typedef enum D2D1_DC_INITIALIZE_MODE {
+ D2D1_DC_INITIALIZE_MODE_COPY = 0,
+ D2D1_DC_INITIALIZE_MODE_CLEAR = 1,
+ D2D1_DC_INITIALIZE_MODE_FORCE_DWORD = 0xffffffff
} D2D1_DC_INITIALIZE_MODE;
-typedef enum _D2D1_DEBUG_LEVEL {
+typedef enum D2D1_DEBUG_LEVEL {
D2D1_DEBUG_LEVEL_NONE = 0,
D2D1_DEBUG_LEVEL_ERROR = 1,
D2D1_DEBUG_LEVEL_WARNING = 2,
- D2D1_DEBUG_LEVEL_INFORMATION = 3
+ D2D1_DEBUG_LEVEL_INFORMATION = 3,
+ D2D1_DEBUG_LEVEL_FORCE_DWORD = 0xffffffff
} D2D1_DEBUG_LEVEL;
-typedef enum _D2D1_DRAW_TEXT_OPTIONS {
- D2D1_DRAW_TEXT_OPTIONS_NO_SNAP = 0x00000001,
- D2D1_DRAW_TEXT_OPTIONS_CLIP = 0x00000002,
- D2D1_DRAW_TEXT_OPTIONS_NONE = 0x00000000
+typedef enum D2D1_DRAW_TEXT_OPTIONS {
+ D2D1_DRAW_TEXT_OPTIONS_NO_SNAP = 0x00000001,
+ D2D1_DRAW_TEXT_OPTIONS_CLIP = 0x00000002,
+ D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT = 0x00000004,
+ D2D1_DRAW_TEXT_OPTIONS_DISABLE_COLOR_BITMAP_SNAPPING = 0x00000008,
+ D2D1_DRAW_TEXT_OPTIONS_NONE = 0x00000000,
+ D2D1_DRAW_TEXT_OPTIONS_FORCE_DWORD = 0xffffffff
} D2D1_DRAW_TEXT_OPTIONS;
-typedef enum _D2D1_EXTEND_MODE {
- D2D1_EXTEND_MODE_CLAMP = 0,
- D2D1_EXTEND_MODE_WRAP = 1,
- D2D1_EXTEND_MODE_MIRROR = 2
+typedef enum D2D1_EXTEND_MODE {
+ D2D1_EXTEND_MODE_CLAMP = 0,
+ D2D1_EXTEND_MODE_WRAP = 1,
+ D2D1_EXTEND_MODE_MIRROR = 2,
+ D2D1_EXTEND_MODE_FORCE_DWORD = 0xffffffff
} D2D1_EXTEND_MODE;
-typedef enum _D2D1_FACTORY_TYPE {
+typedef enum D2D1_FACTORY_TYPE {
D2D1_FACTORY_TYPE_SINGLE_THREADED = 0,
- D2D1_FACTORY_TYPE_MULTI_THREADED = 1
+ D2D1_FACTORY_TYPE_MULTI_THREADED = 1,
+ D2D1_FACTORY_TYPE_FORCE_DWORD = 0xffffffff
} D2D1_FACTORY_TYPE;
-typedef enum _D2D1_FEATURE_LEVEL {
- D2D1_FEATURE_LEVEL_DEFAULT = 0,
- D2D1_FEATURE_LEVEL_9 = D3D10_FEATURE_LEVEL_9_1,
- D2D1_FEATURE_LEVEL_10 = D3D10_FEATURE_LEVEL_10_0
+typedef enum D2D1_FEATURE_LEVEL {
+ D2D1_FEATURE_LEVEL_DEFAULT = 0,
+ D2D1_FEATURE_LEVEL_9 = D3D10_FEATURE_LEVEL_9_1,
+ D2D1_FEATURE_LEVEL_10 = D3D10_FEATURE_LEVEL_10_0,
+ D2D1_FEATURE_LEVEL_FORCE_DWORD = 0xffffffff
} D2D1_FEATURE_LEVEL;
-typedef enum _D2D1_FIGURE_BEGIN {
- D2D1_FIGURE_BEGIN_FILLED = 0,
- D2D1_FIGURE_BEGIN_HOLLOW = 1
+typedef enum D2D1_FIGURE_BEGIN {
+ D2D1_FIGURE_BEGIN_FILLED = 0,
+ D2D1_FIGURE_BEGIN_HOLLOW = 1,
+ D2D1_FIGURE_BEGIN_FORCE_DWORD = 0xffffffff
} D2D1_FIGURE_BEGIN;
-typedef enum _D2D1_FIGURE_END {
- D2D1_FIGURE_END_OPEN = 0,
- D2D1_FIGURE_END_CLOSED = 1
+typedef enum D2D1_FIGURE_END {
+ D2D1_FIGURE_END_OPEN = 0,
+ D2D1_FIGURE_END_CLOSED = 1,
+ D2D1_FIGURE_END_FORCE_DWORD = 0xffffffff
} D2D1_FIGURE_END;
-typedef enum _D2D1_FILL_MODE {
+typedef enum D2D1_FILL_MODE {
D2D1_FILL_MODE_ALTERNATE = 0,
- D2D1_FILL_MODE_WINDING = 1
+ D2D1_FILL_MODE_WINDING = 1,
+ D2D1_FILL_MODE_FORCE_DWORD = 0xffffffff
} D2D1_FILL_MODE;
-typedef enum _D2D1_GAMMA {
- D2D1_GAMMA_2_2 = 0,
- D2D1_GAMMA_1_0 = 1
+typedef enum D2D1_GAMMA {
+ D2D1_GAMMA_2_2 = 0,
+ D2D1_GAMMA_1_0 = 1,
+ D2D1_GAMMA_FORCE_DWORD = 0xffffffff
} D2D1_GAMMA;
-typedef enum _D2D1_GEOMETRY_RELATION {
+typedef enum D2D1_GEOMETRY_RELATION {
D2D1_GEOMETRY_RELATION_UNKNOWN = 0,
D2D1_GEOMETRY_RELATION_DISJOINT = 1,
D2D1_GEOMETRY_RELATION_IS_CONTAINED = 2,
D2D1_GEOMETRY_RELATION_CONTAINS = 3,
- D2D1_GEOMETRY_RELATION_OVERLAP = 4
+ D2D1_GEOMETRY_RELATION_OVERLAP = 4,
+ D2D1_GEOMETRY_RELATION_FORCE_DWORD = 0xffffffff
} D2D1_GEOMETRY_RELATION;
-typedef enum _D2D1_GEOMETRY_SIMPLIFICATION_OPTION {
+typedef enum D2D1_GEOMETRY_SIMPLIFICATION_OPTION {
D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES = 0,
- D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES = 1
+ D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES = 1,
+ D2D1_GEOMETRY_SIMPLIFICATION_OPTION_FORCE_DWORD = 0xffffffff
} D2D1_GEOMETRY_SIMPLIFICATION_OPTION;
-typedef enum _D2D1_LAYER_OPTIONS {
+typedef enum D2D1_LAYER_OPTIONS {
D2D1_LAYER_OPTIONS_NONE = 0x00000000,
- D2D1_LAYER_OPTIONS_INITIALIZE_FOR_CLEARTYPE = 0x00000001
+ D2D1_LAYER_OPTIONS_INITIALIZE_FOR_CLEARTYPE = 0x00000001,
+ D2D1_LAYER_OPTIONS_FORCE_DWORD = 0xffffffff
} D2D1_LAYER_OPTIONS;
-typedef enum _D2D1_LINE_JOIN {
+typedef enum D2D1_LINE_JOIN {
D2D1_LINE_JOIN_MITER = 0,
D2D1_LINE_JOIN_BEVEL = 1,
D2D1_LINE_JOIN_ROUND = 2,
- D2D1_LINE_JOIN_MITER_OR_BEVEL = 3
+ D2D1_LINE_JOIN_MITER_OR_BEVEL = 3,
+ D2D1_LINE_JOIN_FORCE_DWORD = 0xffffffff
} D2D1_LINE_JOIN;
-typedef enum _D2D1_OPACITY_MASK_CONTENT {
+typedef enum D2D1_OPACITY_MASK_CONTENT {
D2D1_OPACITY_MASK_CONTENT_GRAPHICS = 0,
D2D1_OPACITY_MASK_CONTENT_TEXT_NATURAL = 1,
- D2D1_OPACITY_MASK_CONTENT_TEXT_GDI_COMPATIBLE = 2
+ D2D1_OPACITY_MASK_CONTENT_TEXT_GDI_COMPATIBLE = 2,
+ D2D1_OPACITY_MASK_CONTENT_FORCE_DWORD = 0xffffffff
} D2D1_OPACITY_MASK_CONTENT;
-typedef enum _D2D1_PATH_SEGMENT {
+typedef enum D2D1_PATH_SEGMENT {
D2D1_PATH_SEGMENT_NONE = 0x00000000,
D2D1_PATH_SEGMENT_FORCE_UNSTROKED = 0x00000001,
- D2D1_PATH_SEGMENT_FORCE_ROUND_LINE_JOIN = 0x00000002
+ D2D1_PATH_SEGMENT_FORCE_ROUND_LINE_JOIN = 0x00000002,
+ D2D1_PATH_SEGMENT_FORCE_DWORD = 0xffffffff
} D2D1_PATH_SEGMENT;
-typedef enum _D2D1_PRESENT_OPTIONS {
+typedef enum D2D1_PRESENT_OPTIONS {
D2D1_PRESENT_OPTIONS_NONE = 0x00000000,
D2D1_PRESENT_OPTIONS_RETAIN_CONTENTS = 0x00000001,
- D2D1_PRESENT_OPTIONS_IMMEDIATELY = 0x00000002
+ D2D1_PRESENT_OPTIONS_IMMEDIATELY = 0x00000002,
+ D2D1_PRESENT_OPTIONS_FORCE_DWORD = 0xffffffff
} D2D1_PRESENT_OPTIONS;
-typedef enum _D2D1_RENDER_TARGET_TYPE {
+typedef enum D2D1_RENDER_TARGET_TYPE {
D2D1_RENDER_TARGET_TYPE_DEFAULT = 0,
D2D1_RENDER_TARGET_TYPE_SOFTWARE = 1,
- D2D1_RENDER_TARGET_TYPE_HARDWARE = 2
+ D2D1_RENDER_TARGET_TYPE_HARDWARE = 2,
+ D2D1_RENDER_TARGET_TYPE_FORCE_DWORD = 0xffffffff
} D2D1_RENDER_TARGET_TYPE;
-typedef enum _D2D1_RENDER_TARGET_USAGE {
+typedef enum D2D1_RENDER_TARGET_USAGE {
D2D1_RENDER_TARGET_USAGE_NONE = 0x00000000,
D2D1_RENDER_TARGET_USAGE_FORCE_BITMAP_REMOTING = 0x00000001,
- D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE = 0x00000002
+ D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE = 0x00000002,
+ D2D1_RENDER_TARGET_USAGE_FORCE_DWORD = 0xffffffff
} D2D1_RENDER_TARGET_USAGE;
-typedef enum _D2D1_SWEEP_DIRECTION {
+typedef enum D2D1_SWEEP_DIRECTION {
D2D1_SWEEP_DIRECTION_COUNTER_CLOCKWISE = 0,
- D2D1_SWEEP_DIRECTION_CLOCKWISE = 1
+ D2D1_SWEEP_DIRECTION_CLOCKWISE = 1,
+ D2D1_SWEEP_DIRECTION_FORCE_DWORD = 0xffffffff
} D2D1_SWEEP_DIRECTION;
-typedef enum _D2D1_TEXT_ANTIALIAS_MODE {
+typedef enum D2D1_TEXT_ANTIALIAS_MODE {
D2D1_TEXT_ANTIALIAS_MODE_DEFAULT = 0,
D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE = 1,
D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE = 2,
- D2D1_TEXT_ANTIALIAS_MODE_ALIASED = 3
+ D2D1_TEXT_ANTIALIAS_MODE_ALIASED = 3,
+ D2D1_TEXT_ANTIALIAS_MODE_FORCE_DWORD = 0xffffffff
} D2D1_TEXT_ANTIALIAS_MODE;
-typedef enum _D2D1_WINDOW_STATE {
- D2D1_WINDOW_STATE_NONE = 0x0000000,
- D2D1_WINDOW_STATE_OCCLUDED = 0x0000001
+typedef enum D2D1_WINDOW_STATE {
+ D2D1_WINDOW_STATE_NONE = 0x00000000,
+ D2D1_WINDOW_STATE_OCCLUDED = 0x00000001,
+ D2D1_WINDOW_STATE_FORCE_DWORD = 0xffffffff
} D2D1_WINDOW_STATE;
/* this is a hack so we can use forward declares in C (easier than reordering
interfaces) */
--
2.20.1
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
