Huw Davies : include: Uncomment EMRGRADIENTFILL.
Alexandre Julliard
julliard at winehq.org
Wed Mar 16 12:22:36 CDT 2011
Module: wine
Branch: master
Commit: 58442c1b50e11644924779f5cf2ac149e4fdd851
URL: http://source.winehq.org/git/wine.git/?a=commit;h=58442c1b50e11644924779f5cf2ac149e4fdd851
Author: Huw Davies <huw at codeweavers.com>
Date: Wed Mar 16 10:07:40 2011 +0000
include: Uncomment EMRGRADIENTFILL.
---
include/wingdi.h | 86 +++++++++++++++++++++++++++---------------------------
1 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/include/wingdi.h b/include/wingdi.h
index 29fb351..ca6df30 100644
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -1966,6 +1966,49 @@ typedef struct
#define STOCK_LAST 19
#define CLR_INVALID 0xffffffff
+
+typedef USHORT COLOR16;
+
+typedef struct _TRIVERTEX
+{
+ LONG x;
+ LONG y;
+ COLOR16 Red;
+ COLOR16 Green;
+ COLOR16 Blue;
+ COLOR16 Alpha;
+} TRIVERTEX, *PTRIVERTEX, *LPTRIVERTEX;
+
+typedef struct _GRADIENT_TRIANGLE
+{
+ ULONG Vertex1;
+ ULONG Vertex2;
+ ULONG Vertex3;
+} GRADIENT_TRIANGLE, *PGRADIENT_TRIANGLE, *LPGRADIENT_TRIANGLE;
+
+typedef struct _GRADIENT_RECT
+{
+ ULONG UpperLeft;
+ ULONG LowerRight;
+} GRADIENT_RECT, *PGRADIENT_RECT, *LPGRADIENT_RECT;
+
+#define AC_SRC_OVER 0x00
+#define AC_SRC_ALPHA 0x01
+
+typedef struct _BLENDFUNCTION
+{
+ BYTE BlendOp;
+ BYTE BlendFlags;
+ BYTE SourceConstantAlpha;
+ BYTE AlphaFormat;
+} BLENDFUNCTION, *PBLENDFUNCTION;
+
+#define GRADIENT_FILL_RECT_H 0x00000000
+#define GRADIENT_FILL_RECT_V 0x00000001
+#define GRADIENT_FILL_TRIANGLE 0x00000002
+#define GRADIENT_FILL_OP_FLAG 0x000000ff
+
+
/* Metafile header structure */
#include <pshpack2.h>
typedef struct
@@ -2347,7 +2390,6 @@ typedef struct {
BYTE Data[1];
} EMRGDICOMMENT, *PEMRGDICOMMENT;
-#if 0
typedef struct {
EMR emr;
RECTL rclBounds;
@@ -2356,7 +2398,6 @@ typedef struct {
ULONG ulMode;
TRIVERTEX Ver[1];
} EMRGRADIENTFILL, *PEMRGRADIENTFILL;
-#endif
typedef struct {
EMR emr;
@@ -3255,47 +3296,6 @@ DECL_WINELIB_TYPE_AW(LPDISPLAY_DEVICE)
#define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008
#define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010
-typedef USHORT COLOR16;
-
-typedef struct _TRIVERTEX
-{
- LONG x;
- LONG y;
- COLOR16 Red;
- COLOR16 Green;
- COLOR16 Blue;
- COLOR16 Alpha;
-} TRIVERTEX, *PTRIVERTEX, *LPTRIVERTEX;
-
-typedef struct _GRADIENT_TRIANGLE
-{
- ULONG Vertex1;
- ULONG Vertex2;
- ULONG Vertex3;
-} GRADIENT_TRIANGLE, *PGRADIENT_TRIANGLE, *LPGRADIENT_TRIANGLE;
-
-typedef struct _GRADIENT_RECT
-{
- ULONG UpperLeft;
- ULONG LowerRight;
-} GRADIENT_RECT, *PGRADIENT_RECT, *LPGRADIENT_RECT;
-
-#define AC_SRC_OVER 0x00
-#define AC_SRC_ALPHA 0x01
-
-typedef struct _BLENDFUNCTION
-{
- BYTE BlendOp;
- BYTE BlendFlags;
- BYTE SourceConstantAlpha;
- BYTE AlphaFormat;
-} BLENDFUNCTION, *PBLENDFUNCTION;
-
-#define GRADIENT_FILL_RECT_H 0x00000000
-#define GRADIENT_FILL_RECT_V 0x00000001
-#define GRADIENT_FILL_TRIANGLE 0x00000002
-#define GRADIENT_FILL_OP_FLAG 0x000000ff
-
#define GDI_ERROR (~0u)
#define HGDI_ERROR ((HANDLE)~(ULONG_PTR)0)
More information about the wine-cvs
mailing list