Changeset 22121 for branches


Ignore:
Timestamp:
Feb 14, 2016, 2:28:41 PM (10 years ago)
Author:
rousseau
Message:

Odin modifications needed for 'gdiplus' [odin]

Modifications:
o dcdata.h

Use 'typedef' for the enum so its more compatible with plain C.

o gdiplus.h

Disabling the namespaces is a quick-hack to get 'gdiplus.dll' to
build. A more proper fix would probably be using '-xc' for g++
when building the 'gdiplus' module.

o gdiplusflat.h

Temporarily remove the majority of prototypes so yet undefined types
do not get introduced already.

o gdiplusimaging.h

Possibly revert this mod after it is clear how to properly handle the
namespaces in 'gdiplus.h'.

o shtypes.h

Includes 'wtypes.h' which defines 'PROPID'.

o windef.h

Not sure why these 'IN','OUT','...' definitions only got defined when
WINE was *not* defined.

o winnt.h

Park Wine macros here for now. Proper include ordering needs to be
revisited anyway.

Note:
The headers for GDI+ headers were already added in rev. #22082 to
satisfy building 'swt.dll'. They also came from the wine-repo.

Location:
branches/swt/include
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/swt/include/dcdata.h

    r10343 r22121  
    1616#define DC_FLAG_POLYGON_PRINTER_HACK            2
    1717
    18 enum PS_Type { MICRO_CACHED, MICRO, NORMAL };
    19 enum HDC_Type{ TYPE_0, TYPE_1, TYPE_2, TYPE_3, TYPE_4 };
     18typedef enum PS_Type { MICRO_CACHED, MICRO, NORMAL } PS_Type;
     19typedef enum HDC_Type{ TYPE_0, TYPE_1, TYPE_2, TYPE_3, TYPE_4 } HDC_Type;
    2020
    2121typedef struct _tagXFORM
    … …  
    9797   COLORREF    BkColor;
    9898   COLORREF    TextColor;
    99    ULONG       BkColor_PM; 
     99   ULONG       BkColor_PM;
    100100   ULONG       TextColor_PM;
    101101

  • branches/swt/include/win/gdiplus.h

    r22082 r22121  
    2222#ifdef __cplusplus
    2323
    24 namespace Gdiplus
    25 {
    26     namespace DllExports
    27     {
     24// rousseau.201602132022
     25// Wine uses mostly '.c' extensions and gcc, while Odin uses '.cpp' and g++.
     26// So under Odin, the namespaces below would be active, causing the 'Status'
     27// enum to become 'Gdiplus::Status'. For now we will disable the namespaces.
     28///namespace Gdiplus
     29///{
     30///    namespace DllExports
     31///    {
    2832#include "gdiplusmem.h"
    29     };
     33///    };
    3034
    3135#include "gdiplusenums.h"
    … …  
    3943#include "gdiplusgpstubs.h"
    4044
    41     namespace DllExports
    42     {
     45///    namespace DllExports
     46///    {
    4347#include "gdiplusflat.h"
    44     };
    45 };
     48///    };
     49///};
    4650
    4751#else /* end c++ includes */

  • branches/swt/include/win/gdiplusflat.h

    r22082 r22121  
    2222#define WINGDIPAPI __stdcall
    2323
    24 #define GDIPCONST const
    25 
    2624#ifdef __cplusplus
    2725extern "C" {
    2826#endif
    2927
    30 /* AdjustableArrowCap */
    31 GpStatus WINGDIPAPI GdipCreateAdjustableArrowCap(REAL,REAL,BOOL,GpAdjustableArrowCap**);
    32 GpStatus WINGDIPAPI GdipGetAdjustableArrowCapFillState(GpAdjustableArrowCap*,BOOL*);
    33 GpStatus WINGDIPAPI GdipGetAdjustableArrowCapHeight(GpAdjustableArrowCap*,REAL*);
    34 GpStatus WINGDIPAPI GdipGetAdjustableArrowCapMiddleInset(GpAdjustableArrowCap*,REAL*);
    35 GpStatus WINGDIPAPI GdipGetAdjustableArrowCapWidth(GpAdjustableArrowCap*,REAL*);
    36 GpStatus WINGDIPAPI GdipSetAdjustableArrowCapFillState(GpAdjustableArrowCap*,BOOL);
    37 GpStatus WINGDIPAPI GdipSetAdjustableArrowCapHeight(GpAdjustableArrowCap*,REAL);
    38 GpStatus WINGDIPAPI GdipSetAdjustableArrowCapMiddleInset(GpAdjustableArrowCap*,REAL);
    39 GpStatus WINGDIPAPI GdipSetAdjustableArrowCapWidth(GpAdjustableArrowCap*,REAL);
     28GpStatus WINGDIPAPI GdipCreatePen1(ARGB,REAL,GpUnit,GpPen**);
     29GpStatus WINGDIPAPI GdipDeletePen(GpPen*);
    4030
    41 /* Bitmap */
    42 GpStatus WINGDIPAPI GdipBitmapApplyEffect(GpBitmap*,CGpEffect*,RECT*,BOOL,VOID**,INT*);
    43 GpStatus WINGDIPAPI GdipBitmapCreateApplyEffect(GpBitmap**,INT,CGpEffect*,RECT*,RECT*,GpBitmap**,BOOL,VOID**,INT*);
    44 GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*);
    45 GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap*,GDIPCONST GpRect*,UINT,
    46     PixelFormat,BitmapData*);
    47 GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap*,INT,INT,ARGB);
    48 GpStatus WINGDIPAPI GdipBitmapSetResolution(GpBitmap*,REAL,REAL);
    49 GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap*,BitmapData*);
    50 GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL,REAL,REAL,REAL,PixelFormat,GpBitmap*,GpBitmap**);
    51 GpStatus WINGDIPAPI GdipCloneBitmapAreaI(INT,INT,INT,INT,PixelFormat,GpBitmap*,GpBitmap**);
    52 GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR*,GpBitmap**);
    53 GpStatus WINGDIPAPI GdipCreateBitmapFromFileICM(GDIPCONST WCHAR*,GpBitmap**);
    54 GpStatus WINGDIPAPI GdipCreateBitmapFromGdiDib(GDIPCONST BITMAPINFO*,VOID*,GpBitmap**);
    55 GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT,INT,GpGraphics*,GpBitmap**);
    56 GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP, HPALETTE, GpBitmap**);
    57 GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON, GpBitmap**);
    58 GpStatus WINGDIPAPI GdipCreateBitmapFromResource(HINSTANCE,GDIPCONST WCHAR*,GpBitmap**);
    59 GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT,INT,INT,PixelFormat,BYTE*,
    60     GpBitmap**);
    61 GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream*,GpBitmap**);
    62 GpStatus WINGDIPAPI GdipCreateBitmapFromStreamICM(IStream*,GpBitmap**);
    63 GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap*,HBITMAP*,ARGB);
    64 GpStatus WINGDIPAPI GdipCreateHICONFromBitmap(GpBitmap*,HICON*);
    65 GpStatus WINGDIPAPI GdipDeleteEffect(CGpEffect*);
    66 GpStatus WINGDIPAPI GdipSetEffectParameters(CGpEffect*,const VOID*,const UINT);
     31GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**);
     32GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**);
     33GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *);
     34GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics*,GpPen*,INT,INT,INT,INT);
     35GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT);
     36GpStatus WINGDIPAPI GdipFillPie(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL,REAL,REAL);
    6737
    68 /* Brush */
    69 GpStatus WINGDIPAPI GdipCloneBrush(GpBrush*,GpBrush**);
     38GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**);
     39GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*);
    7040GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*);
    71 GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*);
    72 
    73 /* CachedBitmap */
    74 GpStatus WINGDIPAPI GdipCreateCachedBitmap(GpBitmap*,GpGraphics*,
    75     GpCachedBitmap**);
    76 GpStatus WINGDIPAPI GdipDeleteCachedBitmap(GpCachedBitmap*);
    77 GpStatus WINGDIPAPI GdipDrawCachedBitmap(GpGraphics*,GpCachedBitmap*,INT,INT);
    78 
    79 /* CustomLineCap */
    80 GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap*,GpCustomLineCap**);
    81 GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath*,GpPath*,GpLineCap,REAL,
    82     GpCustomLineCap**);
    83 GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap*);
    84 GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap*,GpLineCap*);
    85 GpStatus WINGDIPAPI GdipSetCustomLineCapBaseCap(GpCustomLineCap*,GpLineCap);
    86 GpStatus WINGDIPAPI GdipGetCustomLineCapBaseInset(GpCustomLineCap*,REAL*);
    87 GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap*,REAL);
    88 GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap*,GpLineCap,
    89     GpLineCap);
    90 GpStatus WINGDIPAPI GdipGetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin*);
    91 GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin);
    92 GpStatus WINGDIPAPI GdipGetCustomLineCapWidthScale(GpCustomLineCap*,REAL*);
    93 GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap*,REAL);
    94 GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap*,REAL);
    95 
    96 /* Font */
    97 GpStatus WINGDIPAPI GdipCloneFont(GpFont*,GpFont**);
    98 GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily*, REAL, INT, Unit,
    99     GpFont**);
    100 GpStatus WINGDIPAPI GdipCreateFontFromDC(HDC,GpFont**);
    101 GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC,GDIPCONST LOGFONTA*,GpFont**);
    102 GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**);
    103 GpStatus WINGDIPAPI GdipDeleteFont(GpFont*);
    104 GpStatus WINGDIPAPI GdipGetLogFontA(GpFont*,GpGraphics*,LOGFONTA*);
    105 GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*);
    106 GpStatus WINGDIPAPI GdipGetFamily(GpFont*, GpFontFamily**);
    107 GpStatus WINGDIPAPI GdipGetFontUnit(GpFont*, Unit*);
    108 GpStatus WINGDIPAPI GdipGetFontSize(GpFont*, REAL*);
    109 GpStatus WINGDIPAPI GdipGetFontStyle(GpFont*, INT*);
    110 GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont*, GDIPCONST GpGraphics*,
    111         REAL*);
    112 GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont*, REAL, REAL*);
    113 
    114 /* FontCollection */
    115 GpStatus WINGDIPAPI GdipNewInstalledFontCollection(GpFontCollection**);
    116 GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection**);
    117 GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection**);
    118 GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection*, GDIPCONST WCHAR*);
    119 GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection*,
    120         GDIPCONST void*,INT);
    121 GpStatus WINGDIPAPI GdipGetFontCollectionFamilyCount(GpFontCollection*, INT*);
    122 GpStatus WINGDIPAPI GdipGetFontCollectionFamilyList(GpFontCollection*, INT,
    123         GpFontFamily*[], INT*);
    124 
    125 /* FontFamily */
    126 GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily*, GpFontFamily**);
    127 GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR*,
    128     GpFontCollection*, GpFontFamily**);
    129 GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily*);
    130 GpStatus WINGDIPAPI GdipGetFamilyName(GDIPCONST GpFontFamily*, WCHAR*, LANGID);
    131 GpStatus WINGDIPAPI GdipGetCellAscent(GDIPCONST GpFontFamily*, INT, UINT16*);
    132 GpStatus WINGDIPAPI GdipGetCellDescent(GDIPCONST GpFontFamily*, INT, UINT16*);
    133 GpStatus WINGDIPAPI GdipGetEmHeight(GDIPCONST GpFontFamily*, INT, UINT16*);
    134 GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily**);
    135 GpStatus WINGDIPAPI GdipGetGenericFontFamilySerif(GpFontFamily**);
    136 GpStatus WINGDIPAPI GdipGetGenericFontFamilyMonospace(GpFontFamily**);
    137 GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily*, INT, UINT16*);
    138 GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily *, INT, BOOL*);
    139 
    140 /* Graphics */
    141 GpStatus WINGDIPAPI GdipFlush(GpGraphics*, GpFlushIntention);
    142 GpStatus WINGDIPAPI GdipBeginContainer(GpGraphics*,GDIPCONST GpRectF*,GDIPCONST GpRectF*,GpUnit,GraphicsContainer*);
    143 GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics*,GraphicsContainer*);
    144 GpStatus WINGDIPAPI GdipBeginContainerI(GpGraphics*,GDIPCONST GpRect*,GDIPCONST GpRect*,GpUnit,GraphicsContainer*);
    145 GpStatus WINGDIPAPI GdipEndContainer(GpGraphics*,GraphicsContainer);
    146 GpStatus WINGDIPAPI GdipComment(GpGraphics*,UINT,GDIPCONST BYTE*);
    147 GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**);
    148 GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC,HANDLE,GpGraphics**);
    149 GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**);
    150 GpStatus WINGDIPAPI GdipCreateFromHWNDICM(HWND,GpGraphics**);
    151 HPALETTE WINGDIPAPI GdipCreateHalftonePalette(void);
    152 GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *);
    153 GpStatus WINGDIPAPI GdipDrawArc(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL);
    154 GpStatus WINGDIPAPI GdipDrawArcI(GpGraphics*,GpPen*,INT,INT,INT,INT,REAL,REAL);
    155 GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL,REAL,REAL);
    156 GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics*,GpPen*,INT,INT,INT,INT,INT,INT,INT,INT);
    157 GpStatus WINGDIPAPI GdipDrawBeziers(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT);
    158 GpStatus WINGDIPAPI GdipDrawBeziersI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT);
    159 GpStatus WINGDIPAPI GdipDrawClosedCurve(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT);
    160 GpStatus WINGDIPAPI GdipDrawClosedCurveI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT);
    161 GpStatus WINGDIPAPI GdipDrawClosedCurve2(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,REAL);
    162 GpStatus WINGDIPAPI GdipDrawClosedCurve2I(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT,REAL);
    163 GpStatus WINGDIPAPI GdipDrawCurve(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT);
    164 GpStatus WINGDIPAPI GdipDrawCurveI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT);
    165 GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,REAL);
    166 GpStatus WINGDIPAPI GdipDrawCurve2I(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT,REAL);
    167 GpStatus WINGDIPAPI GdipDrawCurve3(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,INT,INT,REAL);
    168 GpStatus WINGDIPAPI GdipDrawCurve3I(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT,INT,INT,REAL);
    169 GpStatus WINGDIPAPI GdipDrawDriverString(GpGraphics*,GDIPCONST UINT16*,INT,
    170     GDIPCONST GpFont*,GDIPCONST GpBrush*,GDIPCONST PointF*,INT,GDIPCONST GpMatrix*);
    171 GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL);
    172 GpStatus WINGDIPAPI GdipDrawEllipseI(GpGraphics*,GpPen*,INT,INT,INT,INT);
    173 GpStatus WINGDIPAPI GdipDrawImage(GpGraphics*,GpImage*,REAL,REAL);
    174 GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics*,GpImage*,INT,INT);
    175 GpStatus WINGDIPAPI GdipDrawImagePointRect(GpGraphics*,GpImage*,REAL,REAL,REAL,REAL,REAL,REAL,GpUnit);
    176 GpStatus WINGDIPAPI GdipDrawImagePointRectI(GpGraphics*,GpImage*,INT,INT,INT,INT,INT,INT,GpUnit);
    177 GpStatus WINGDIPAPI GdipDrawImagePoints(GpGraphics*,GpImage*,GDIPCONST GpPointF*,INT);
    178 GpStatus WINGDIPAPI GdipDrawImagePointsI(GpGraphics*,GpImage*,GDIPCONST GpPoint*,INT);
    179 GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics*,GpImage*,
    180     GDIPCONST GpPointF*,INT,REAL,REAL,REAL,REAL,GpUnit,
    181     GDIPCONST GpImageAttributes*,DrawImageAbort,VOID*);
    182 GpStatus WINGDIPAPI GdipDrawImagePointsRectI(GpGraphics*,GpImage*,
    183     GDIPCONST GpPoint*,INT,INT,INT,INT,INT,GpUnit,
    184     GDIPCONST GpImageAttributes*,DrawImageAbort,VOID*);
    185 GpStatus WINGDIPAPI GdipDrawImageRect(GpGraphics*,GpImage*,REAL,REAL,REAL,REAL);
    186 GpStatus WINGDIPAPI GdipDrawImageRectI(GpGraphics*,GpImage*,INT,INT,INT,INT);
    187 GpStatus WINGDIPAPI GdipDrawImageRectRect(GpGraphics*,GpImage*,REAL,REAL,REAL,
    188     REAL,REAL,REAL,REAL,REAL,GpUnit,GDIPCONST GpImageAttributes*,DrawImageAbort,
    189     VOID*);
    190 GpStatus WINGDIPAPI GdipDrawImageRectRectI(GpGraphics*,GpImage*,INT,INT,INT,
    191     INT,INT,INT,INT,INT,GpUnit,GDIPCONST GpImageAttributes*,DrawImageAbort,
    192     VOID*);
    193 GpStatus WINGDIPAPI GdipDrawLine(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL);
    194 GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics*,GpPen*,INT,INT,INT,INT);
    195 GpStatus WINGDIPAPI GdipDrawLines(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT);
    196 GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT);
    197 GpStatus WINGDIPAPI GdipDrawPath(GpGraphics*,GpPen*,GpPath*);
    198 GpStatus WINGDIPAPI GdipDrawPie(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL);
    199 GpStatus WINGDIPAPI GdipDrawPieI(GpGraphics*,GpPen*,INT,INT,INT,INT,REAL,REAL);
    200 GpStatus WINGDIPAPI GdipDrawPolygon(GpGraphics*,GpPen*,GDIPCONST GpPointF*, INT);
    201 GpStatus WINGDIPAPI GdipDrawPolygonI(GpGraphics*,GpPen*,GDIPCONST GpPoint*, INT);
    202 GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL);
    203 GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT);
    204 GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics*,GpPen*,GDIPCONST GpRectF*,INT);
    205 GpStatus WINGDIPAPI GdipDrawRectanglesI(GpGraphics*,GpPen*,GDIPCONST GpRect*,INT);
    206 GpStatus WINGDIPAPI GdipDrawString(GpGraphics*,GDIPCONST WCHAR*,INT,
    207     GDIPCONST GpFont*,GDIPCONST RectF*, GDIPCONST GpStringFormat*,
    208     GDIPCONST GpBrush*);
    209 GpStatus WINGDIPAPI GdipEnumerateMetafileDestPoint(GpGraphics*,GDIPCONST GpMetafile*,
    210     GDIPCONST GpPointF*,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);
    211 GpStatus WINGDIPAPI GdipEnumerateMetafileDestPointI(GpGraphics*,GDIPCONST GpMetafile*,
    212     GDIPCONST GpPoint*,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);
    213 GpStatus WINGDIPAPI GdipEnumerateMetafileDestRect(GpGraphics*,GDIPCONST GpMetafile*,
    214     GDIPCONST GpRectF*,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);
    215 GpStatus WINGDIPAPI GdipEnumerateMetafileDestRectI(GpGraphics*,GDIPCONST GpMetafile*,
    216     GDIPCONST GpRect*,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);
    217 GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics*,
    218     GDIPCONST GpMetafile*,GDIPCONST GpPointF*,INT,GDIPCONST GpRectF*,Unit,
    219     EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);
    220 GpStatus WINGDIPAPI GdipFillClosedCurve2(GpGraphics*,GpBrush*,GDIPCONST GpPointF*,INT,
    221     REAL,GpFillMode);
    222 GpStatus WINGDIPAPI GdipFillClosedCurve2I(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT,
    223     REAL,GpFillMode);
    224 GpStatus WINGDIPAPI GdipFillClosedCurve(GpGraphics*,GpBrush*,GDIPCONST GpPointF*,INT);
    225 GpStatus WINGDIPAPI GdipFillClosedCurveI(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT);
    226 GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL);
    227 GpStatus WINGDIPAPI GdipFillEllipseI(GpGraphics*,GpBrush*,INT,INT,INT,INT);
    228 GpStatus WINGDIPAPI GdipFillPath(GpGraphics*,GpBrush*,GpPath*);
    229 GpStatus WINGDIPAPI GdipFillPie(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL,REAL,REAL);
    230 GpStatus WINGDIPAPI GdipFillPieI(GpGraphics*,GpBrush*,INT,INT,INT,INT,REAL,REAL);
    231 GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics*,GpBrush*,GDIPCONST GpPointF*,
    232     INT,GpFillMode);
    233 GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,
    234     INT,GpFillMode);
    235 GpStatus WINGDIPAPI GdipFillPolygon2(GpGraphics*,GpBrush*,GDIPCONST GpPointF*,INT);
    236 GpStatus WINGDIPAPI GdipFillPolygon2I(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT);
    237 GpStatus WINGDIPAPI GdipFillRectangle(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL);
    238 GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics*,GpBrush*,INT,INT,INT,INT);
    239 GpStatus WINGDIPAPI GdipFillRectangles(GpGraphics*,GpBrush*,GDIPCONST GpRectF*,INT);
    240 GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics*,GpBrush*,GDIPCONST GpRect*,INT);
    241 GpStatus WINGDIPAPI GdipFillRegion(GpGraphics*,GpBrush*,GpRegion*);
    242 GpStatus WINGDIPAPI GdipGetClip(GpGraphics*,GpRegion*);
    243 GpStatus WINGDIPAPI GdipGetClipBounds(GpGraphics*,GpRectF*);
    244 GpStatus WINGDIPAPI GdipGetClipBoundsI(GpGraphics*,GpRect*);
    245 GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics*,CompositingMode*);
    246 GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*);
    247 GpStatus WINGDIPAPI GdipGetDC(GpGraphics*,HDC*);
    248 GpStatus WINGDIPAPI GdipGetDpiX(GpGraphics*,REAL*);
    249 GpStatus WINGDIPAPI GdipGetDpiY(GpGraphics*,REAL*);
    250 GpStatus WINGDIPAPI GdipGetImageDecoders(UINT,UINT,ImageCodecInfo*);
    251 GpStatus WINGDIPAPI GdipGetImageDecodersSize(UINT*,UINT*);
    252 GpStatus WINGDIPAPI GdipGetImageGraphicsContext(GpImage*,GpGraphics**);
    253 GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics*,InterpolationMode*);
    254 GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics*,ARGB*);
    255 GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics*,REAL*);
    256 GpStatus WINGDIPAPI GdipGetPageUnit(GpGraphics*,GpUnit*);
    257 GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics*,PixelOffsetMode*);
    258 GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics*,SmoothingMode*);
    259 GpStatus WINGDIPAPI GdipGetTextContrast(GpGraphics*,UINT*);
    260 GpStatus WINGDIPAPI GdipGetTextRenderingHint(GpGraphics*,TextRenderingHint*);
    261 GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*);
    262 GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics*,ARGB);
    263 GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics*,GpRectF*);
    264 GpStatus WINGDIPAPI GdipGetVisibleClipBoundsI(GpGraphics*,GpRect*);
    265 GpStatus WINGDIPAPI GdipIsClipEmpty(GpGraphics*, BOOL*);
    266 GpStatus WINGDIPAPI GdipIsVisiblePoint(GpGraphics*,REAL,REAL,BOOL*);
    267 GpStatus WINGDIPAPI GdipIsVisiblePointI(GpGraphics*,INT,INT,BOOL*);
    268 GpStatus WINGDIPAPI GdipIsVisibleRect(GpGraphics*,REAL,REAL,REAL,REAL,BOOL*);
    269 GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics*,INT,INT,INT,INT,BOOL*);
    270 GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics*, GDIPCONST WCHAR*,
    271     INT, GDIPCONST GpFont*, GDIPCONST RectF*, GDIPCONST GpStringFormat*, INT,
    272     GpRegion**);
    273 GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics*,GDIPCONST UINT16*,INT,
    274     GDIPCONST GpFont*,GDIPCONST PointF*,INT,GDIPCONST GpMatrix*,RectF*);
    275 GpStatus WINGDIPAPI GdipMeasureString(GpGraphics*,GDIPCONST WCHAR*,INT,
    276     GDIPCONST GpFont*,GDIPCONST RectF*,GDIPCONST GpStringFormat*,RectF*,INT*,INT*);
    277 GpStatus WINGDIPAPI GdipMultiplyWorldTransform(GpGraphics*,GDIPCONST GpMatrix*,GpMatrixOrder);
    278 GpStatus WINGDIPAPI GdipRecordMetafileFileName(GDIPCONST WCHAR*,HDC,EmfType,
    279     GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**);
    280 GpStatus WINGDIPAPI GdipRecordMetafileFileNameI(GDIPCONST WCHAR*,HDC,EmfType,
    281     GDIPCONST GpRect*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**);
    282 GpStatus WINGDIPAPI GdipRecordMetafileI(HDC,EmfType,GDIPCONST GpRect*,
    283     MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**);
    284 GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics*,HDC);
    285 GpStatus WINGDIPAPI GdipResetClip(GpGraphics*);
    286 GpStatus WINGDIPAPI GdipResetWorldTransform(GpGraphics*);
    287 GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics*,GraphicsState);
    288 GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics*,REAL,GpMatrixOrder);
    289 GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics*,GraphicsState*);
    290 GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics*,REAL,REAL,GpMatrixOrder);
    291 GpStatus WINGDIPAPI GdipSetClipHrgn(GpGraphics*,HRGN,CombineMode);
    292 GpStatus WINGDIPAPI GdipSetClipGraphics(GpGraphics*,GpGraphics*,CombineMode);
    293 GpStatus WINGDIPAPI GdipSetClipPath(GpGraphics*,GpPath*,CombineMode);
    294 GpStatus WINGDIPAPI GdipSetClipRect(GpGraphics*,REAL,REAL,REAL,REAL,CombineMode);
    295 GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics*,INT,INT,INT,INT,CombineMode);
    296 GpStatus WINGDIPAPI GdipSetClipRegion(GpGraphics*,GpRegion*,CombineMode);
    297 GpStatus WINGDIPAPI GdipSetCompositingMode(GpGraphics*,CompositingMode);
    298 GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics*,CompositingQuality);
    299 GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics*,InterpolationMode);
    300 GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics*,REAL);
    301 GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics*,GpUnit);
    302 GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics*,PixelOffsetMode);
    303 GpStatus WINGDIPAPI GdipSetRenderingOrigin(GpGraphics*,INT,INT);
    304 GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics*,SmoothingMode);
    305 GpStatus WINGDIPAPI GdipSetTextContrast(GpGraphics*,UINT);
    306 GpStatus WINGDIPAPI GdipSetTextRenderingHint(GpGraphics*,TextRenderingHint);
    307 GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics*,GpMatrix*);
    308 GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics*, GpCoordinateSpace, GpCoordinateSpace,
    309                                         GpPointF *, INT);
    310 GpStatus WINGDIPAPI GdipTransformPointsI(GpGraphics*, GpCoordinateSpace, GpCoordinateSpace,
    311                                          GpPoint *, INT);
    312 GpStatus WINGDIPAPI GdipTranslateClip(GpGraphics*,REAL,REAL);
    313 GpStatus WINGDIPAPI GdipTranslateClipI(GpGraphics*,INT,INT);
    314 GpStatus WINGDIPAPI GdipTranslateWorldTransform(GpGraphics*,REAL,REAL,GpMatrixOrder);
    315 
    316 /* GraphicsPath */
    317 GpStatus WINGDIPAPI GdipAddPathArc(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL);
    318 GpStatus WINGDIPAPI GdipAddPathArcI(GpPath*,INT,INT,INT,INT,REAL,REAL);
    319 GpStatus WINGDIPAPI GdipAddPathBezier(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL,REAL,REAL);
    320 GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath*,INT,INT,INT,INT,INT,INT,INT,INT);
    321 GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath*,GDIPCONST GpPointF*,INT);
    322 GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath*,GDIPCONST GpPoint*,INT);
    323 GpStatus WINGDIPAPI GdipAddPathClosedCurve(GpPath*,GDIPCONST GpPointF*,INT);
    324 GpStatus WINGDIPAPI GdipAddPathClosedCurveI(GpPath*,GDIPCONST GpPoint*,INT);
    325 GpStatus WINGDIPAPI GdipAddPathClosedCurve2(GpPath*,GDIPCONST GpPointF*,INT,REAL);
    326 GpStatus WINGDIPAPI GdipAddPathClosedCurve2I(GpPath*,GDIPCONST GpPoint*,INT,REAL);
    327 GpStatus WINGDIPAPI GdipAddPathCurve(GpPath*,GDIPCONST GpPointF*,INT);
    328 GpStatus WINGDIPAPI GdipAddPathCurveI(GpPath*,GDIPCONST GpPoint*,INT);
    329 GpStatus WINGDIPAPI GdipAddPathCurve2(GpPath*,GDIPCONST GpPointF*,INT,REAL);
    330 GpStatus WINGDIPAPI GdipAddPathCurve2I(GpPath*,GDIPCONST GpPoint*,INT,REAL);
    331 GpStatus WINGDIPAPI GdipAddPathCurve3(GpPath*,GDIPCONST GpPointF*,INT,INT,INT,REAL);
    332 GpStatus WINGDIPAPI GdipAddPathCurve3I(GpPath*,GDIPCONST GpPoint*,INT,INT,INT,REAL);
    333 GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath*,REAL,REAL,REAL,REAL);
    334 GpStatus WINGDIPAPI GdipAddPathEllipseI(GpPath*,INT,INT,INT,INT);
    335 GpStatus WINGDIPAPI GdipAddPathLine(GpPath*,REAL,REAL,REAL,REAL);
    336 GpStatus WINGDIPAPI GdipAddPathLineI(GpPath*,INT,INT,INT,INT);
    337 GpStatus WINGDIPAPI GdipAddPathLine2(GpPath*,GDIPCONST GpPointF*,INT);
    338 GpStatus WINGDIPAPI GdipAddPathLine2I(GpPath*,GDIPCONST GpPoint*,INT);
    339 GpStatus WINGDIPAPI GdipAddPathPath(GpPath*,GDIPCONST GpPath*,BOOL);
    340 GpStatus WINGDIPAPI GdipAddPathPie(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL);
    341 GpStatus WINGDIPAPI GdipAddPathPieI(GpPath*,INT,INT,INT,INT,REAL,REAL);
    342 GpStatus WINGDIPAPI GdipAddPathPolygon(GpPath*,GDIPCONST GpPointF*,INT);
    343 GpStatus WINGDIPAPI GdipAddPathPolygonI(GpPath*,GDIPCONST GpPoint*,INT);
    344 GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath*,REAL,REAL,REAL,REAL);
    345 GpStatus WINGDIPAPI GdipAddPathRectangleI(GpPath*,INT,INT,INT,INT);
    346 GpStatus WINGDIPAPI GdipAddPathRectangles(GpPath*,GDIPCONST GpRectF*,INT);
    347 GpStatus WINGDIPAPI GdipAddPathRectanglesI(GpPath*,GDIPCONST GpRect*,INT);
    348 GpStatus WINGDIPAPI GdipAddPathString(GpPath*,GDIPCONST WCHAR*,INT,GDIPCONST GpFontFamily*,INT,REAL,GDIPCONST RectF*,GDIPCONST GpStringFormat*);
    349 GpStatus WINGDIPAPI GdipAddPathStringI(GpPath*,GDIPCONST WCHAR*,INT,GDIPCONST GpFontFamily*,INT,REAL,GDIPCONST Rect*,GDIPCONST GpStringFormat*);
    350 GpStatus WINGDIPAPI GdipClearPathMarkers(GpPath*);
    351 GpStatus WINGDIPAPI GdipClonePath(GpPath*,GpPath**);
    352 GpStatus WINGDIPAPI GdipClosePathFigure(GpPath*);
    353 GpStatus WINGDIPAPI GdipClosePathFigures(GpPath*);
    354 GpStatus WINGDIPAPI GdipCreatePath(GpFillMode,GpPath**);
    355 GpStatus WINGDIPAPI GdipCreatePath2(GDIPCONST GpPointF*,GDIPCONST BYTE*,INT,
    356     GpFillMode,GpPath**);
    357 GpStatus WINGDIPAPI GdipCreatePath2I(GDIPCONST GpPoint*,GDIPCONST BYTE*,INT,GpFillMode,GpPath**);
    358 GpStatus WINGDIPAPI GdipDeletePath(GpPath*);
    359 GpStatus WINGDIPAPI GdipFlattenPath(GpPath*,GpMatrix*,REAL);
    360 GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPoint(GpPath*,REAL,REAL,GpPen*,
    361     GpGraphics*,BOOL*);
    362 GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPointI(GpPath*,INT,INT,GpPen*,
    363     GpGraphics*,BOOL*);
    364 GpStatus WINGDIPAPI GdipIsVisiblePathPoint(GpPath*,REAL,REAL,GpGraphics*,BOOL*);
    365 GpStatus WINGDIPAPI GdipIsVisiblePathPointI(GpPath*,INT,INT,GpGraphics*,BOOL*);
    366 GpStatus WINGDIPAPI GdipGetPathData(GpPath*,GpPathData*);
    367 GpStatus WINGDIPAPI GdipGetPathFillMode(GpPath*,GpFillMode*);
    368 GpStatus WINGDIPAPI GdipGetPathLastPoint(GpPath*,GpPointF*);
    369 GpStatus WINGDIPAPI GdipGetPathPoints(GpPath*,GpPointF*,INT);
    370 GpStatus WINGDIPAPI GdipGetPathPointsI(GpPath*,GpPoint*,INT);
    371 GpStatus WINGDIPAPI GdipGetPathTypes(GpPath*,BYTE*,INT);
    372 GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath*,GpRectF*,GDIPCONST GpMatrix*,GDIPCONST GpPen*);
    373 GpStatus WINGDIPAPI GdipGetPathWorldBoundsI(GpPath*,GpRect*,GDIPCONST GpMatrix*,GDIPCONST GpPen*);
    374 GpStatus WINGDIPAPI GdipGetPointCount(GpPath*,INT*);
    375 GpStatus WINGDIPAPI GdipResetPath(GpPath*);
    376 GpStatus WINGDIPAPI GdipReversePath(GpPath*);
    377 GpStatus WINGDIPAPI GdipSetPathFillMode(GpPath*,GpFillMode);
    378 GpStatus WINGDIPAPI GdipSetPathMarker(GpPath*);
    379 GpStatus WINGDIPAPI GdipStartPathFigure(GpPath*);
    380 GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*);
    381 GpStatus WINGDIPAPI GdipWarpPath(GpPath*,GpMatrix*,GDIPCONST GpPointF*,INT,REAL,
    382     REAL,REAL,REAL,WarpMode,REAL);
    383 GpStatus WINGDIPAPI GdipWidenPath(GpPath*,GpPen*,GpMatrix*,REAL);
    384 
    385 /* HatchBrush */
    386 GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle,ARGB,ARGB,GpHatch**);
    387 GpStatus WINGDIPAPI GdipGetHatchBackgroundColor(GpHatch*,ARGB*);
    388 GpStatus WINGDIPAPI GdipGetHatchForegroundColor(GpHatch*,ARGB*);
    389 GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch*,HatchStyle*);
    390 
    391 /* Image */
    392 GpStatus WINGDIPAPI GdipCloneImage(GpImage*, GpImage**);
    393 GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes*,GpImageAttributes**);
    394 GpStatus WINGDIPAPI GdipDisposeImage(GpImage*);
    395 GpStatus WINGDIPAPI GdipEmfToWmfBits(HENHMETAFILE,UINT,LPBYTE,INT,INT);
    396 GpStatus WINGDIPAPI GdipFindFirstImageItem(GpImage*,ImageItemData*);
    397 GpStatus WINGDIPAPI GdipFindNextImageItem(GpImage*,ImageItemData*);
    398 GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage*,UINT,UINT,PropertyItem*);
    399 GpStatus WINGDIPAPI GdipGetImageBounds(GpImage*,GpRectF*,GpUnit*);
    400 GpStatus WINGDIPAPI GdipGetImageDimension(GpImage*,REAL*,REAL*);
    401 GpStatus WINGDIPAPI GdipGetImageFlags(GpImage*,UINT*);
    402 GpStatus WINGDIPAPI GdipGetImageHeight(GpImage*,UINT*);
    403 GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage*,REAL*);
    404 GpStatus WINGDIPAPI GdipGetImageItemData(GpImage*,ImageItemData*);
    405 GpStatus WINGDIPAPI GdipGetImagePalette(GpImage*,ColorPalette*,INT);
    406 GpStatus WINGDIPAPI GdipGetImagePaletteSize(GpImage*,INT*);
    407 GpStatus WINGDIPAPI GdipGetImagePixelFormat(GpImage*,PixelFormat*);
    408 GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage*,GUID*);
    409 GpStatus WINGDIPAPI GdipGetImageThumbnail(GpImage*,UINT,UINT,GpImage**,GetThumbnailImageAbort,VOID*);
    410 GpStatus WINGDIPAPI GdipGetImageType(GpImage*,ImageType*);
    411 GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage*,REAL*);
    412 GpStatus WINGDIPAPI GdipGetImageWidth(GpImage*,UINT*);
    413 GpStatus WINGDIPAPI GdipGetPropertyCount(GpImage*,UINT*);
    414 GpStatus WINGDIPAPI GdipGetPropertyIdList(GpImage*,UINT,PROPID*);
    415 GpStatus WINGDIPAPI GdipGetPropertyItem(GpImage*,PROPID,UINT,PropertyItem*);
    416 GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage*,PROPID,UINT*);
    417 GpStatus WINGDIPAPI GdipGetPropertySize(GpImage*,UINT*,UINT*);
    418 GpStatus WINGDIPAPI GdipImageForceValidation(GpImage*);
    419 GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage*,GDIPCONST GUID*,UINT*);
    420 GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage*,UINT*);
    421 GpStatus WINGDIPAPI GdipImageGetFrameDimensionsList(GpImage*,GUID*,UINT);
    422 GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage*,RotateFlipType);
    423 GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage*,GDIPCONST GUID*,UINT);
    424 GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR*,GpImage**);
    425 GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR*,GpImage**);
    426 GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream*,GpImage**);
    427 GpStatus WINGDIPAPI GdipLoadImageFromStreamICM(IStream*,GpImage**);
    428 GpStatus WINGDIPAPI GdipRemovePropertyItem(GpImage*,PROPID);
    429 GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage*,GDIPCONST WCHAR*,GDIPCONST CLSID*,GDIPCONST EncoderParameters*);
    430 GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage*,IStream*,
    431     GDIPCONST CLSID*,GDIPCONST EncoderParameters*);
    432 GpStatus WINGDIPAPI GdipSetImagePalette(GpImage*,GDIPCONST ColorPalette*);
    433 GpStatus WINGDIPAPI GdipSetPropertyItem(GpImage*,GDIPCONST PropertyItem*);
    434 
    435 /* ImageAttributes */
    436 GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes**);
    437 GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes*);
    438 GpStatus WINGDIPAPI GdipSetImageAttributesCachedBackground(GpImageAttributes*,
    439     BOOL);
    440 GpStatus WINGDIPAPI GdipSetImageAttributesColorKeys(GpImageAttributes*,
    441     ColorAdjustType,BOOL,ARGB,ARGB);
    442 GpStatus WINGDIPAPI GdipSetImageAttributesColorMatrix(GpImageAttributes*,
    443     ColorAdjustType,BOOL,GDIPCONST ColorMatrix*,GDIPCONST ColorMatrix*,
    444     ColorMatrixFlags);
    445 GpStatus WINGDIPAPI GdipSetImageAttributesGamma(GpImageAttributes*,
    446     ColorAdjustType,BOOL,REAL);
    447 GpStatus WINGDIPAPI GdipSetImageAttributesNoOp(GpImageAttributes*,
    448     ColorAdjustType,BOOL);
    449 GpStatus WINGDIPAPI GdipSetImageAttributesOutputChannel(GpImageAttributes*,
    450     ColorAdjustType,BOOL,ColorChannelFlags);
    451 GpStatus WINGDIPAPI GdipSetImageAttributesOutputChannelColorProfile(
    452     GpImageAttributes*,ColorAdjustType,BOOL,GDIPCONST WCHAR*);
    453 GpStatus WINGDIPAPI GdipSetImageAttributesRemapTable(GpImageAttributes*,
    454     ColorAdjustType,BOOL,UINT,GDIPCONST ColorMap*);
    455 GpStatus WINGDIPAPI GdipSetImageAttributesThreshold(GpImageAttributes*,
    456     ColorAdjustType,BOOL,REAL);
    457 GpStatus WINGDIPAPI GdipSetImageAttributesToIdentity(GpImageAttributes*,
    458     ColorAdjustType);
    459 GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes*,WrapMode,
    460     ARGB,BOOL);
    461 GpStatus WINGDIPAPI GdipResetImageAttributes(GpImageAttributes*,
    462     ColorAdjustType);
    463 
    464 /* LinearGradientBrush */
    465 GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF*,GDIPCONST GpPointF*,
    466     ARGB,ARGB,GpWrapMode,GpLineGradient**);
    467 GpStatus WINGDIPAPI GdipCreateLineBrushI(GDIPCONST GpPoint*,GDIPCONST GpPoint*,
    468     ARGB,ARGB,GpWrapMode,GpLineGradient**);
    469 GpStatus WINGDIPAPI GdipCreateLineBrushFromRect(GDIPCONST GpRectF*,ARGB,ARGB,
    470     LinearGradientMode,GpWrapMode,GpLineGradient**);
    471 GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect*,ARGB,ARGB,
    472     LinearGradientMode,GpWrapMode,GpLineGradient**);
    473 GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF*,
    474     ARGB,ARGB,REAL,BOOL,GpWrapMode,GpLineGradient**);
    475 GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngleI(GDIPCONST GpRect*,
    476     ARGB,ARGB,REAL,BOOL,GpWrapMode,GpLineGradient**);
    477 GpStatus WINGDIPAPI GdipGetLineColors(GpLineGradient*,ARGB*);
    478 GpStatus WINGDIPAPI GdipGetLineGammaCorrection(GpLineGradient*,BOOL*);
    479 GpStatus WINGDIPAPI GdipGetLineRect(GpLineGradient*,GpRectF*);
    480 GpStatus WINGDIPAPI GdipGetLineRectI(GpLineGradient*,GpRect*);
    481 GpStatus WINGDIPAPI GdipGetLineWrapMode(GpLineGradient*,GpWrapMode*);
    482 GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient*,GDIPCONST REAL*,
    483     GDIPCONST REAL*,INT);
    484 GpStatus WINGDIPAPI GdipGetLineBlend(GpLineGradient*,REAL*,REAL*,INT);
    485 GpStatus WINGDIPAPI GdipGetLineBlendCount(GpLineGradient*,INT*);
    486 GpStatus WINGDIPAPI GdipSetLinePresetBlend(GpLineGradient*,GDIPCONST ARGB*,
    487     GDIPCONST REAL*,INT);
    488 GpStatus WINGDIPAPI GdipGetLinePresetBlend(GpLineGradient*,ARGB*,REAL*,INT);
    489 GpStatus WINGDIPAPI GdipGetLinePresetBlendCount(GpLineGradient*,INT*);
    490 GpStatus WINGDIPAPI GdipGetLineTransform(GpLineGradient*,GpMatrix*);
    491 GpStatus WINGDIPAPI GdipResetLineTransform(GpLineGradient*);
    492 GpStatus WINGDIPAPI GdipRotateLineTransform(GpLineGradient*,REAL,GpMatrixOrder);
    493 GpStatus WINGDIPAPI GdipScaleLineTransform(GpLineGradient*,REAL,REAL,
    494     GpMatrixOrder);
    495 GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient*,ARGB,ARGB);
    496 GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient*,BOOL);
    497 GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient*,REAL,REAL);
    498 GpStatus WINGDIPAPI GdipSetLineTransform(GpLineGradient*,GDIPCONST GpMatrix*);
    499 GpStatus WINGDIPAPI GdipSetLineLinearBlend(GpLineGradient*,REAL,REAL);
    500 GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient*,GpWrapMode);
    501 GpStatus WINGDIPAPI GdipTranslateLineTransform(GpLineGradient*,REAL,REAL,
    502     GpMatrixOrder);
    503 
    504 /* Matrix */
    505 GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix*,GpMatrix**);
    506 GpStatus WINGDIPAPI GdipCreateMatrix(GpMatrix**);
    507 GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**);
    508 GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *,GDIPCONST GpPointF*,GpMatrix**);
    509 GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect*,GDIPCONST GpPoint*,GpMatrix**);
    510 GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*);
    511 GpStatus WINGDIPAPI GdipGetMatrixElements(GDIPCONST GpMatrix*,REAL*);
    512 GpStatus WINGDIPAPI GdipInvertMatrix(GpMatrix*);
    513 GpStatus WINGDIPAPI GdipIsMatrixEqual(GDIPCONST GpMatrix*, GDIPCONST GpMatrix*, BOOL*);
    514 GpStatus WINGDIPAPI GdipIsMatrixIdentity(GDIPCONST GpMatrix*, BOOL*);
    515 GpStatus WINGDIPAPI GdipIsMatrixInvertible(GDIPCONST GpMatrix*, BOOL*);
    516 GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix*,GDIPCONST GpMatrix*,GpMatrixOrder);
    517 GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix*,REAL,GpMatrixOrder);
    518 GpStatus WINGDIPAPI GdipShearMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder);
    519 GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder);
    520 GpStatus WINGDIPAPI GdipSetMatrixElements(GpMatrix*,REAL,REAL,REAL,REAL,REAL,REAL);
    521 GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix*,GpPointF*,INT);
    522 GpStatus WINGDIPAPI GdipTransformMatrixPointsI(GpMatrix*,GpPoint*,INT);
    523 GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder);
    524 GpStatus WINGDIPAPI GdipVectorTransformMatrixPoints(GpMatrix*,GpPointF*,INT);
    525 GpStatus WINGDIPAPI GdipVectorTransformMatrixPointsI(GpMatrix*,GpPoint*,INT);
    526 
    527 /* Metafile */
    528 GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics*,GpMetafile*,INT*,
    529     EmfType,const WCHAR*,GpMetafile**);
    530 GpStatus WINGDIPAPI GdipConvertToEmfPlusToFile(const GpGraphics*,GpMetafile*,INT*,const WCHAR*,EmfType,const WCHAR*,GpMetafile**);
    531 GpStatus WINGDIPAPI GdipConvertToEmfPlusToStream(const GpGraphics*,GpMetafile*,INT*,IStream*,EmfType,const WCHAR*,GpMetafile**);
    532 GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE,BOOL,GpMetafile**);
    533 GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE,BOOL,
    534     GDIPCONST WmfPlaceableFileHeader*,GpMetafile**);
    535 GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR*, GDIPCONST WmfPlaceableFileHeader*,
    536     GpMetafile**);
    537 GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR*,GpMetafile**);
    538 GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream*,GpMetafile**);
    539 GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile*,HENHMETAFILE*);
    540 GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile*,EmfPlusRecordType,UINT,UINT,GDIPCONST BYTE*);
    541 GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT);
    542 GpStatus WINGDIPAPI GdipRecordMetafile(HDC,EmfType,GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**);
    543 
    544 /* MetafileHeader */
    545 GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE,MetafileHeader*);
    546 GpStatus WINGDIPAPI GdipGetMetafileHeaderFromFile(GDIPCONST WCHAR*,MetafileHeader*);
    547 GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile*,MetafileHeader*);
    548 GpStatus WINGDIPAPI GdipGetMetafileHeaderFromStream(IStream*,MetafileHeader*);
    549 GpStatus WINGDIPAPI GdipGetMetafileHeaderFromWmf(HMETAFILE,GDIPCONST WmfPlaceableFileHeader*,MetafileHeader*);
    550 
    551 /* Notification */
    552 GpStatus WINAPI GdiplusNotificationHook(ULONG_PTR*);
    553 void WINAPI GdiplusNotificationUnhook(ULONG_PTR);
    554 
    555 /* PathGradientBrush */
    556 GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF*,INT,GpWrapMode,GpPathGradient**);
    557 GpStatus WINGDIPAPI GdipCreatePathGradientI(GDIPCONST GpPoint*,INT,GpWrapMode,GpPathGradient**);
    558 GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath*,
    559     GpPathGradient**);
    560 GpStatus WINGDIPAPI GdipGetPathGradientBlend(GpPathGradient*,REAL*,REAL*,INT);
    561 GpStatus WINGDIPAPI GdipGetPathGradientBlendCount(GpPathGradient*,INT*);
    562 GpStatus WINGDIPAPI GdipGetPathGradientCenterColor(GpPathGradient*,ARGB*);
    563 GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient*,GpPointF*);
    564 GpStatus WINGDIPAPI GdipGetPathGradientCenterPointI(GpPathGradient*,GpPoint*);
    565 GpStatus WINGDIPAPI GdipGetPathGradientFocusScales(GpPathGradient*,REAL*,REAL*);
    566 GpStatus WINGDIPAPI GdipGetPathGradientGammaCorrection(GpPathGradient*,BOOL*);
    567 GpStatus WINGDIPAPI GdipGetPathGradientPath(GpPathGradient*,GpPath*);
    568 GpStatus WINGDIPAPI GdipGetPathGradientPresetBlend(GpPathGradient*,ARGB*,REAL*,INT);
    569 GpStatus WINGDIPAPI GdipGetPathGradientPresetBlendCount(GpPathGradient*,INT*);
    570 GpStatus WINGDIPAPI GdipGetPathGradientPointCount(GpPathGradient*,INT*);
    571 GpStatus WINGDIPAPI GdipSetPathGradientPresetBlend(GpPathGradient*,
    572     GDIPCONST ARGB*,GDIPCONST REAL*,INT);
    573 GpStatus WINGDIPAPI GdipGetPathGradientRect(GpPathGradient*,GpRectF*);
    574 GpStatus WINGDIPAPI GdipGetPathGradientRectI(GpPathGradient*,GpRect*);
    575 GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient*,
    576     ARGB*,INT*);
    577 GpStatus WINGDIPAPI GdipGetPathGradientWrapMode(GpPathGradient*,GpWrapMode*);
    578 GpStatus WINGDIPAPI GdipSetPathGradientBlend(GpPathGradient*,GDIPCONST REAL*,GDIPCONST REAL*,INT);
    579 GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient*,ARGB);
    580 GpStatus WINGDIPAPI GdipSetPathGradientCenterPoint(GpPathGradient*,GpPointF*);
    581 GpStatus WINGDIPAPI GdipSetPathGradientCenterPointI(GpPathGradient*,GpPoint*);
    582 GpStatus WINGDIPAPI GdipSetPathGradientFocusScales(GpPathGradient*,REAL,REAL);
    583 GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient*,BOOL);
    584 GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient*,REAL,REAL);
    585 GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient*,
    586     GDIPCONST ARGB*,INT*);
    587 GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient*,GpWrapMode);
    588 GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorCount(GpPathGradient*,INT*);
    589 
    590 /* PathIterator */
    591 GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator**,GpPath*);
    592 GpStatus WINGDIPAPI GdipDeletePathIter(GpPathIterator*);
    593 GpStatus WINGDIPAPI GdipPathIterCopyData(GpPathIterator*,INT*,GpPointF*,BYTE*,
    594     INT,INT);
    595 GpStatus WINGDIPAPI GdipPathIterGetCount(GpPathIterator*,INT*);
    596 GpStatus WINGDIPAPI GdipPathIterGetSubpathCount(GpPathIterator*,INT*);
    597 GpStatus WINGDIPAPI GdipPathIterEnumerate(GpPathIterator*,INT*,GpPointF*,BYTE*,INT);
    598 GpStatus WINGDIPAPI GdipPathIterHasCurve(GpPathIterator*,BOOL*);
    599 GpStatus WINGDIPAPI GdipPathIterIsValid(GpPathIterator*,BOOL*);
    600 GpStatus WINGDIPAPI GdipPathIterNextMarker(GpPathIterator*,INT*,INT*,INT*);
    601 GpStatus WINGDIPAPI GdipPathIterNextMarkerPath(GpPathIterator*,INT*,GpPath*);
    602 GpStatus WINGDIPAPI GdipPathIterNextPathType(GpPathIterator*,INT*,BYTE*,INT*,INT*);
    603 GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator*,INT*,INT*,INT*,BOOL*);
    604 GpStatus WINGDIPAPI GdipPathIterNextSubpathPath(GpPathIterator*,INT*,GpPath*,BOOL*);
    605 GpStatus WINGDIPAPI GdipPathIterRewind(GpPathIterator*);
    606 
    607 /* Pen */
    608 GpStatus WINGDIPAPI GdipClonePen(GpPen*,GpPen**);
    609 GpStatus WINGDIPAPI GdipCreatePen1(ARGB,REAL,GpUnit,GpPen**);
    610 GpStatus WINGDIPAPI GdipCreatePen2(GpBrush*,REAL,GpUnit,GpPen**);
    611 GpStatus WINGDIPAPI GdipDeletePen(GpPen*);
    612 GpStatus WINGDIPAPI GdipGetPenBrushFill(GpPen*,GpBrush**);
    613 GpStatus WINGDIPAPI GdipGetPenColor(GpPen*,ARGB*);
    614 GpStatus WINGDIPAPI GdipGetPenCustomStartCap(GpPen*,GpCustomLineCap**);
    615 GpStatus WINGDIPAPI GdipGetPenCustomEndCap(GpPen*,GpCustomLineCap**);
    616 GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen*,REAL*,INT);
    617 GpStatus WINGDIPAPI GdipGetPenDashCount(GpPen*,INT*);
    618 GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen*,REAL*);
    619 GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*);
    620 GpStatus WINGDIPAPI GdipGetPenMode(GpPen*,GpPenAlignment*);
    621 GpStatus WINGDIPAPI GdipResetPenTransform(GpPen*);
    622 GpStatus WINGDIPAPI GdipScalePenTransform(GpPen*,REAL,REAL,GpMatrixOrder);
    623 GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*);
    624 GpStatus WINGDIPAPI GdipSetPenColor(GpPen*,ARGB);
    625 GpStatus WINGDIPAPI GdipSetPenCompoundArray(GpPen*,GDIPCONST REAL*,INT);
    626 GpStatus WINGDIPAPI GdipSetPenCustomEndCap(GpPen*,GpCustomLineCap*);
    627 GpStatus WINGDIPAPI GdipSetPenCustomStartCap(GpPen*,GpCustomLineCap*);
    628 GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen*,GDIPCONST REAL*,INT);
    629 GpStatus WINGDIPAPI GdipSetPenDashCap197819(GpPen*,GpDashCap);
    630 GpStatus WINGDIPAPI GdipSetPenDashOffset(GpPen*,REAL);
    631 GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen*,GpDashStyle);
    632 GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen*,GpLineCap);
    633 GpStatus WINGDIPAPI GdipGetPenFillType(GpPen*,GpPenType*);
    634 GpStatus WINGDIPAPI GdipSetPenLineCap197819(GpPen*,GpLineCap,GpLineCap,GpDashCap);
    635 GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen*,GpLineJoin);
    636 GpStatus WINGDIPAPI GdipSetPenMode(GpPen*,GpPenAlignment);
    637 GpStatus WINGDIPAPI GdipSetPenMiterLimit(GpPen*,REAL);
    638 GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen*,GpLineCap);
    639 GpStatus WINGDIPAPI GdipSetPenWidth(GpPen*,REAL);
    640 GpStatus WINGDIPAPI GdipGetPenDashCap197819(GpPen*,GpDashCap*);
    641 GpStatus WINGDIPAPI GdipGetPenEndCap(GpPen*,GpLineCap*);
    642 GpStatus WINGDIPAPI GdipGetPenLineJoin(GpPen*,GpLineJoin*);
    643 GpStatus WINGDIPAPI GdipGetPenMiterLimit(GpPen*,REAL*);
    644 GpStatus WINGDIPAPI GdipGetPenStartCap(GpPen*,GpLineCap*);
    645 GpStatus WINGDIPAPI GdipGetPenUnit(GpPen*,GpUnit*);
    646 GpStatus WINGDIPAPI GdipGetPenWidth(GpPen*,REAL*);
    647 
    648 /* Region */
    649 GpStatus WINGDIPAPI GdipCloneRegion(GpRegion *, GpRegion **);
    650 GpStatus WINGDIPAPI GdipCombineRegionPath(GpRegion *, GpPath *, CombineMode);
    651 GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *, GDIPCONST GpRectF *, CombineMode);
    652 GpStatus WINGDIPAPI GdipCombineRegionRectI(GpRegion *, GDIPCONST GpRect *, CombineMode);
    653 GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *, GpRegion *, CombineMode);
    654 GpStatus WINGDIPAPI GdipCreateRegion(GpRegion **);
    655 GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *, GpRegion **);
    656 GpStatus WINGDIPAPI GdipCreateRegionRect(GDIPCONST GpRectF *, GpRegion **);
    657 GpStatus WINGDIPAPI GdipCreateRegionRectI(GDIPCONST GpRect *, GpRegion **);
    658 GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *, INT, GpRegion **);
    659 GpStatus WINGDIPAPI GdipCreateRegionHrgn(HRGN, GpRegion **);
    660 GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *);
    661 GpStatus WINGDIPAPI GdipGetRegionBounds(GpRegion *, GpGraphics *, GpRectF *);
    662 GpStatus WINGDIPAPI GdipGetRegionBoundsI(GpRegion *, GpGraphics *, GpRect *);
    663 GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *, BYTE *, UINT, UINT *);
    664 GpStatus WINGDIPAPI GdipGetRegionDataSize(GpRegion *, UINT *);
    665 GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *, GpGraphics *, HRGN *);
    666 GpStatus WINGDIPAPI GdipGetRegionScans(GpRegion *, GpRectF *, INT *, GpMatrix *);
    667 GpStatus WINGDIPAPI GdipGetRegionScansI(GpRegion *, GpRect *, INT *, GpMatrix *);
    668 GpStatus WINGDIPAPI GdipGetRegionScansCount(GpRegion *, UINT *, GpMatrix *);
    669 GpStatus WINGDIPAPI GdipIsEmptyRegion(GpRegion *, GpGraphics *, BOOL *);
    670 GpStatus WINGDIPAPI GdipIsEqualRegion(GpRegion *, GpRegion *, GpGraphics *, BOOL *);
    671 GpStatus WINGDIPAPI GdipIsInfiniteRegion(GpRegion *, GpGraphics *, BOOL *);
    672 GpStatus WINGDIPAPI GdipIsVisibleRegionPoint(GpRegion *, REAL, REAL, GpGraphics *, BOOL *);
    673 GpStatus WINGDIPAPI GdipIsVisibleRegionPointI(GpRegion *, INT, INT, GpGraphics *, BOOL *);
    674 GpStatus WINGDIPAPI GdipIsVisibleRegionRect(GpRegion *, REAL, REAL, REAL, REAL, GpGraphics *, BOOL *);
    675 GpStatus WINGDIPAPI GdipIsVisibleRegionRectI(GpRegion *, INT, INT, INT, INT, GpGraphics *, BOOL *);
    676 GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *);
    677 GpStatus WINGDIPAPI GdipSetInfinite(GpRegion *);
    678 GpStatus WINGDIPAPI GdipTransformRegion(GpRegion *, GpMatrix *);
    679 GpStatus WINGDIPAPI GdipTranslateRegion(GpRegion *, REAL, REAL);
    680 GpStatus WINGDIPAPI GdipTranslateRegionI(GpRegion *, INT, INT);
    681 
    682 /* SolidBrush */
    683 GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**);
    684 GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill*,ARGB*);
    685 GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill*,ARGB);
    686 
    687 /* StringFormat */
    688 GpStatus WINGDIPAPI GdipCloneStringFormat(GDIPCONST GpStringFormat*,GpStringFormat**);
    689 GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**);
    690 GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*);
    691 GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat*,StringAlignment*);
    692 GpStatus WINGDIPAPI GdipGetStringFormatDigitSubstitution(GDIPCONST GpStringFormat*,LANGID*,
    693         StringDigitSubstitute*);
    694 GpStatus WINGDIPAPI GdipGetStringFormatFlags(GDIPCONST GpStringFormat*, INT*);
    695 GpStatus WINGDIPAPI GdipGetStringFormatHotkeyPrefix(GDIPCONST GpStringFormat*,INT*);
    696 GpStatus WINGDIPAPI GdipGetStringFormatLineAlign(GpStringFormat*,StringAlignment*);
    697 GpStatus WINGDIPAPI GdipGetStringFormatMeasurableCharacterRangeCount(
    698         GDIPCONST GpStringFormat*, INT*);
    699 GpStatus WINGDIPAPI GdipGetStringFormatTabStopCount(GDIPCONST GpStringFormat*,INT*);
    700 GpStatus WINGDIPAPI GdipGetStringFormatTabStops(GDIPCONST GpStringFormat*,INT,REAL*,REAL*);
    701 GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat*,StringTrimming*);
    702 GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat*,StringAlignment);
    703 GpStatus WINGDIPAPI GdipSetStringFormatDigitSubstitution(GpStringFormat*,LANGID,StringDigitSubstitute);
    704 GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat*,INT);
    705 GpStatus WINGDIPAPI GdipSetStringFormatLineAlign(GpStringFormat*,StringAlignment);
    706 GpStatus WINGDIPAPI GdipSetStringFormatMeasurableCharacterRanges(
    707         GpStringFormat*, INT, GDIPCONST CharacterRange*);
    708 GpStatus WINGDIPAPI GdipSetStringFormatTabStops(GpStringFormat*,REAL,INT,GDIPCONST REAL*);
    709 GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat*,StringTrimming);
    710 GpStatus WINGDIPAPI GdipSetStringFormatFlags(GpStringFormat*, INT);
    711 GpStatus WINGDIPAPI GdipStringFormatGetGenericDefault(GpStringFormat **);
    712 GpStatus WINGDIPAPI GdipStringFormatGetGenericTypographic(GpStringFormat **);
    713 
    714 /* Texture */
    715 GpStatus WINGDIPAPI GdipCreateTexture(GpImage*,GpWrapMode,GpTexture**);
    716 GpStatus WINGDIPAPI GdipCreateTexture2(GpImage*,GpWrapMode,REAL,REAL,REAL,REAL,GpTexture**);
    717 GpStatus WINGDIPAPI GdipCreateTexture2I(GpImage*,GpWrapMode,INT,INT,INT,INT,GpTexture**);
    718 GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage*,GDIPCONST GpImageAttributes*,
    719     REAL,REAL,REAL,REAL,GpTexture**);
    720 GpStatus WINGDIPAPI GdipCreateTextureIAI(GpImage*,GDIPCONST GpImageAttributes*,
    721     INT,INT,INT,INT,GpTexture**);
    722 GpStatus WINGDIPAPI GdipGetTextureTransform(GpTexture*,GpMatrix*);
    723 GpStatus WINGDIPAPI GdipGetTextureWrapMode(GpTexture*, GpWrapMode*);
    724 GpStatus WINGDIPAPI GdipMultiplyTextureTransform(GpTexture*,
    725     GDIPCONST GpMatrix*,GpMatrixOrder);
    726 GpStatus WINGDIPAPI GdipResetTextureTransform(GpTexture*);
    727 GpStatus WINGDIPAPI GdipRotateTextureTransform(GpTexture*,REAL,GpMatrixOrder);
    728 GpStatus WINGDIPAPI GdipScaleTextureTransform(GpTexture*,REAL,REAL,GpMatrixOrder);
    729 GpStatus WINGDIPAPI GdipSetTextureTransform(GpTexture *,GDIPCONST GpMatrix*);
    730 GpStatus WINGDIPAPI GdipSetTextureWrapMode(GpTexture*, GpWrapMode);
    731 GpStatus WINGDIPAPI GdipTranslateTextureTransform(GpTexture*,REAL,REAL,
    732     GpMatrixOrder);
    733 
    734 /* Without wrapper methods */
    735 GpStatus WINGDIPAPI GdipCreateStreamOnFile(GDIPCONST WCHAR*,UINT,IStream**);
    736 GpStatus WINGDIPAPI GdipGetImageEncodersSize(UINT *numEncoders, UINT *size);
    737 GpStatus WINGDIPAPI GdipGetImageEncoders(UINT numEncoders, UINT size, ImageCodecInfo *encoders);
    738 GpStatus WINGDIPAPI GdipTestControl(GpTestControlEnum,void*);
    73941
    74042#ifdef __cplusplus

  • branches/swt/include/win/gdiplusimaging.h

    r22082 r22121  
    111111    UINT Height;
    112112    INT Stride;
    113     Gdiplus::PixelFormat PixelFormat;
     113    // rousseau.201602132032
     114    // Because the namespaces are disabled, we need to fall back on the base
     115    // type of INT, because we cannot have typename and membername the same.
     116///    Gdiplus::PixelFormat PixelFormat;
     117    INT PixelFormat;
    114118    VOID* Scan0;
    115119    UINT_PTR Reserved;

  • branches/swt/include/win/shtypes.h

    r21512 r22121  
    88#define STRRET_OFFSET   0x0001
    99#define STRRET_CSTR     0x0002
     10
     11#include "wtypes.h"
    1012
    1113typedef struct _STRRET

  • branches/swt/include/win/windef.h

    r22078 r22121  
    657657
    658658/* Define some empty macros for compatibility with Windows code. */
    659 
    660 #ifndef __WINE__
     659// rousseau.201602131406
     660// Why is this in a __WINE__ ifndef ?
     661// Macro __WINE__ is defined when compiling gdi32 and thus gdiplus, and
     662// gdiplus uses the 'IN' and 'OUT' stuff.
     663// Disabled ifndef for now.
     664///#ifndef __WINE__
    661665#define NEAR
    662666#define FAR
    … …  
    668672#define OUT
    669673#define OPTIONAL
    670 #endif  /* __WINE__ */
     674///#endif  /* __WINE__ */
    671675
    672676/* Macro for structure packing. */

  • branches/swt/include/win/winnt.h

    r22111 r22121  
    1818#define DLL_THREAD_DETACH       3       /* detach thread */
    1919
     20// rousseau.201602141646
     21// We will put this one here for the moment.
     22// (Required by 'gdiplusmem.h')
     23#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
     24#define __WINE_ALLOC_SIZE(x) __attribute__((__alloc_size__(x)))
     25#else
     26#define __WINE_ALLOC_SIZE(x)
     27#endif
    2028
    2129/* u.x.wProcessorArchitecture (NT) */
Note: See TracChangeset for help on using the changeset viewer.