Commit b6b97b1e authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

gdiplus: Add some missing or related prototypes and types.

Fix the GdipDrawRectangles() prototype.
parent 643d1e88
...@@ -1231,7 +1231,7 @@ GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x, ...@@ -1231,7 +1231,7 @@ GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x,
} }
GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics *graphics, GpPen *pen, GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics *graphics, GpPen *pen,
GpRectF* rects, INT count) GDIPCONST GpRectF* rects, INT count)
{ {
GpPointF *ptf; GpPointF *ptf;
POINT *pti; POINT *pti;
......
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
typedef void ImageItemData;
#define PIXELFORMATBPP(x) ((x) ? ((x) >> 8) & 255 : 24) #define PIXELFORMATBPP(x) ((x) ? ((x) >> 8) & 255 : 24)
static INT ipicture_pixel_height(IPicture *pic) static INT ipicture_pixel_height(IPicture *pic)
......
...@@ -69,12 +69,12 @@ typedef FillMode GpFillMode; ...@@ -69,12 +69,12 @@ typedef FillMode GpFillMode;
typedef PathData GpPathData; typedef PathData GpPathData;
typedef LineCap GpLineCap; typedef LineCap GpLineCap;
typedef RectF GpRectF; typedef RectF GpRectF;
typedef Rect GpRect;
typedef LineJoin GpLineJoin; typedef LineJoin GpLineJoin;
typedef DashCap GpDashCap; typedef DashCap GpDashCap;
typedef DashStyle GpDashStyle; typedef DashStyle GpDashStyle;
typedef MatrixOrder GpMatrixOrder; typedef MatrixOrder GpMatrixOrder;
typedef Point GpPoint; typedef Point GpPoint;
typedef WrapMode GpWrapMode; typedef WrapMode GpWrapMode;
typedef Rect GpRect;
#endif #endif
...@@ -54,6 +54,18 @@ public: ...@@ -54,6 +54,18 @@ public:
UINT_PTR Reserved; UINT_PTR Reserved;
}; };
class ImageItemData
{
public:
UINT Size;
UINT Position;
VOID* Desc;
UINT DescSize;
VOID* Data;
UINT DataSize;
UINT Cookie;
};
#else /* end of c++ typedefs */ #else /* end of c++ typedefs */
typedef enum ImageLockMode ImageLockMode; typedef enum ImageLockMode ImageLockMode;
...@@ -80,7 +92,18 @@ typedef struct BitmapData ...@@ -80,7 +92,18 @@ typedef struct BitmapData
PixelFormat PixelFormat; PixelFormat PixelFormat;
VOID* Scan0; VOID* Scan0;
UINT_PTR Reserved; /* undocumented: stores the lock mode */ UINT_PTR Reserved; /* undocumented: stores the lock mode */
}BitmapData; } BitmapData;
typedef struct ImageItemData
{
UINT Size;
UINT Position;
VOID* Desc;
UINT DescSize;
VOID* Data;
UINT DataSize;
UINT Cookie;
} ImageItemData;
#endif /* end of c typedefs */ #endif /* end of c typedefs */
......
...@@ -177,6 +177,7 @@ public: ...@@ -177,6 +177,7 @@ public:
REAL Height; REAL Height;
}; };
/* FIXME: missing the methods. */
class Rect class Rect
{ {
public: public:
......
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