[Libreoffice-commits] core.git: 2 commits - external/CustomTarget_wine.mk external/Module_external.mk external/Package_wine.mk external/wine sw/source vcl/Library_vcl.mk vcl/source vcl/win

Fridrich Å trba fridrich.strba at bluewin.ch
Thu Jun 6 14:30:41 PDT 2013


 external/CustomTarget_wine.mk               |   22 
 external/Module_external.mk                 |    2 
 external/Package_wine.mk                    |   18 
 external/wine/include/gdiplus.h             |   65 -
 external/wine/include/gdipluscolor.h        |   59 
 external/wine/include/gdipluscolormatrix.h  |   60 
 external/wine/include/gdiplusenums.h        |  763 ------------
 external/wine/include/gdiplusflat.h         |  731 -----------
 external/wine/include/gdiplusgpstubs.h      |   99 -
 external/wine/include/gdiplusimaging.h      |  450 -------
 external/wine/include/gdiplusinit.h         |   69 -
 external/wine/include/gdiplusmem.h          |   35 
 external/wine/include/gdiplusmetaheader.h   |  167 --
 external/wine/include/gdipluspixelformats.h |   72 -
 external/wine/include/gdiplustypes.h        |  276 ----
 external/wine/include/vsstyle.h             | 1746 ----------------------------
 external/wine/include/vssym32.h             |  685 ----------
 external/wine/lib/gdiplus.def               |  510 --------
 external/wine/lib/msi.def                   |  234 ---
 external/wine/lib/urlmon.def                |   56 
 external/wine/makefile.mk                   |   26 
 sw/source/ui/config/optcomp.cxx             |    2 
 vcl/Library_vcl.mk                          |    2 
 vcl/source/control/lstbox.cxx               |    2 
 vcl/win/source/app/salinst.cxx              |   13 
 vcl/win/source/gdi/salgdi_gdiplus.cxx       |   13 
 26 files changed, 29 insertions(+), 6148 deletions(-)

New commits:
commit 6db2752e17dc298fbb83ea63bf7666a4befd187f
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Jun 6 23:28:55 2013 +0200

    Newer mingw-w64 has gdiplus headers, though a bit buggy
    
    Change-Id: Ibc25c621c0a97c11b617e920494cd311449c04d3

diff --git a/external/CustomTarget_wine.mk b/external/CustomTarget_wine.mk
deleted file mode 100644
index 9a51b0e..0000000
--- a/external/CustomTarget_wine.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,external/wine))
-
-$(eval $(call gb_CustomTarget_register_targets,external/wine,\
-	libgdiplus.dll.a \
-	libmsi.dll.a \
-	liburlmon.dll.a \
-))
-
-$(call gb_CustomTarget_get_workdir,external/wine)/lib%.dll.a : $(SRCDIR)/external/wine/lib/%.def
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DLT,1)
-	$(DLLTOOL) --kill-at --input-def=$< --output-lib=$@ --dllname=$*.dll
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 646a6d2..b81654a 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -15,11 +15,9 @@ $(eval $(call gb_Module_add_targets,external,\
 ifeq ($(OS)$(COM),WNTGCC)
 $(eval $(call gb_Module_add_targets,external,\
 	CustomTarget_jawt \
-	CustomTarget_wine \
 	Package_jawt \
 	Package_mingw_dlls \
 	Package_mingw_gccdlls \
-	Package_wine \
 ))
 endif
 
diff --git a/external/Package_wine.mk b/external/Package_wine.mk
deleted file mode 100644
index 0e33fe7..0000000
--- a/external/Package_wine.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,dbghelp,$(call gb_CustomTarget_get_workdir,external/wine)))
-
-$(eval $(call gb_Package_add_files,dbghelp,lib,\
-	libgdiplus.dll.a \
-	libmsi.dll.a \
-	liburlmon.dll.a \
-))
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/external/wine/include/gdiplus.h b/external/wine/include/gdiplus.h
deleted file mode 100644
index f063b3e..0000000
--- a/external/wine/include/gdiplus.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2007 Google (Evan Stade)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _GDIPLUS_H
-#define _GDIPLUS_H
-
-#ifdef __cplusplus
-
-namespace Gdiplus
-{
-    namespace DllExports
-    {
-#include "gdiplusmem.h"
-    };
-
-#include "gdiplusenums.h"
-#include "gdiplustypes.h"
-#include "gdiplusinit.h"
-#include "gdipluspixelformats.h"
-#include "gdiplusmetaheader.h"
-#include "gdiplusimaging.h"
-#include "gdipluscolor.h"
-#include "gdipluscolormatrix.h"
-#include "gdiplusgpstubs.h"
-
-    namespace DllExports
-    {
-#include "gdiplusflat.h"
-    };
-};
-
-#else /* end c++ includes */
-
-#include "gdiplusmem.h"
-
-#include "gdiplusenums.h"
-#include "gdiplustypes.h"
-#include "gdiplusinit.h"
-#include "gdipluspixelformats.h"
-#include "gdiplusmetaheader.h"
-#include "gdiplusimaging.h"
-#include "gdipluscolor.h"
-#include "gdipluscolormatrix.h"
-#include "gdiplusgpstubs.h"
-
-#include "gdiplusflat.h"
-
-#endif /* end c includes */
-
-#endif /* _GDIPLUS_H_ */
diff --git a/external/wine/include/gdipluscolor.h b/external/wine/include/gdipluscolor.h
deleted file mode 100644
index 47a2e04..0000000
--- a/external/wine/include/gdipluscolor.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2808 Google (Lei Zhang)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _GDIPLUSCOLOR_H
-#define _GDIPLUSCOLOR_H
-
-enum ColorChannelFlags
-{
-    ColorChannelFlagsC,
-    ColorChannelFlagsM,
-    ColorChannelFlagsY,
-    ColorChannelFlagsK,
-    ColorChannelFlagsLast
-};
-
-#ifdef __cplusplus
-
-class Color
-{
- public:
-    Color(BYTE a, BYTE r, BYTE g, BYTE b)
-    {
-        Argb = (((a<<24)&0xFF000000) | ((r<<16)&0x00FF0000) | ((g<<8)&0x0000FF00) | (b&0x000000FF));
-    }
-    ARGB GetValue() const
-    {
-        return Argb;
-    }
-protected:
-    ARGB Argb;
-};
-
-#else /* end of c++ typedefs */
-
-typedef struct Color
-{
-    ARGB Argb;
-} Color;
-
-typedef enum ColorChannelFlags ColorChannelFlags;
-
-#endif  /* end of c typedefs */
-
-#endif  /* _GDIPLUSCOLOR_H */
diff --git a/external/wine/include/gdipluscolormatrix.h b/external/wine/include/gdipluscolormatrix.h
deleted file mode 100644
index fbf1b2a..0000000
--- a/external/wine/include/gdipluscolormatrix.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2007 Google (Evan Stade)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _GDIPLUSCOLORMATRIX_H
-#define _GDIPLUSCOLORMATRIX_H
-
-struct ColorMatrix
-{
-    REAL m[5][5];
-};
-
-enum ColorMatrixFlags
-{
-    ColorMatrixFlagsDefault    = 0,
-    ColorMatrixFlagsSkipGrays  = 1,
-    ColorMatrixFlagsAltGray    = 2
-};
-
-enum ColorAdjustType
-{
-    ColorAdjustTypeDefault,
-    ColorAdjustTypeBitmap,
-    ColorAdjustTypeBrush,
-    ColorAdjustTypePen,
-    ColorAdjustTypeText,
-    ColorAdjustTypeCount,
-    ColorAdjustTypeAny
-};
-
-struct ColorMap
-{
-    Color oldColor;
-    Color newColor;
-};
-
-#ifndef __cplusplus
-
-typedef enum ColorAdjustType ColorAdjustType;
-typedef enum ColorMatrixFlags ColorMatrixFlags;
-typedef struct ColorMatrix ColorMatrix;
-typedef struct ColorMap ColorMap;
-
-#endif  /* end of c typedefs */
-
-#endif  /* _GDIPLUSCOLORMATRIX_H */
diff --git a/external/wine/include/gdiplusenums.h b/external/wine/include/gdiplusenums.h
deleted file mode 100644
index 94383d9..0000000
--- a/external/wine/include/gdiplusenums.h
+++ /dev/null
@@ -1,763 +0,0 @@
-/*
- * Copyright (C) 2007 Google (Evan Stade)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _GDIPLUSENUMS_H
-#define _GDIPLUSENUMS_H
-
-typedef UINT GraphicsState;
-typedef UINT GraphicsContainer;
-
-enum Unit
-{
-    UnitWorld       = 0,
-    UnitDisplay     = 1,
-    UnitPixel       = 2,
-    UnitPoint       = 3,
-    UnitInch        = 4,
-    UnitDocument    = 5,
-    UnitMillimeter  = 6
-};
-
-enum BrushType
-{
-   BrushTypeSolidColor       = 0,
-   BrushTypeHatchFill        = 1,
-   BrushTypeTextureFill      = 2,
-   BrushTypePathGradient     = 3,
-   BrushTypeLinearGradient   = 4
-};
-
-enum DriverStringOptions
-{
-   DriverStringOptionsCmapLookup      = 1,
-   DriverStringOptionsVertical        = 2,
-   DriverStringOptionsRealizedAdvance = 4,
-   DriverStringOptionsLimitSubpixel   = 4
-};
-
-enum FillMode
-{
-    FillModeAlternate   = 0,
-    FillModeWinding     = 1
-};
-
-enum LineCap
-{
-    LineCapFlat             = 0x00,
-    LineCapSquare           = 0x01,
-    LineCapRound            = 0x02,
-    LineCapTriangle         = 0x03,
-
-    LineCapNoAnchor         = 0x10,
-    LineCapSquareAnchor     = 0x11,
-    LineCapRoundAnchor      = 0x12,
-    LineCapDiamondAnchor    = 0x13,
-    LineCapArrowAnchor      = 0x14,
-
-    LineCapCustom           = 0xff,
-    LineCapAnchorMask       = 0xf0
-};
-
-enum PathPointType{
-    PathPointTypeStart          = 0,    /* start of a figure */
-    PathPointTypeLine           = 1,
-    PathPointTypeBezier         = 3,
-    PathPointTypePathTypeMask   = 7,
-    PathPointTypePathDashMode   = 16,   /* not used */
-    PathPointTypePathMarker     = 32,
-    PathPointTypeCloseSubpath   = 128,  /* end of a closed figure */
-    PathPointTypeBezier3        = 3
-};
-
-enum PenType
-{
-   PenTypeSolidColor       = BrushTypeSolidColor,
-   PenTypeHatchFill        = BrushTypeHatchFill,
-   PenTypeTextureFill      = BrushTypeTextureFill,
-   PenTypePathGradient     = BrushTypePathGradient,
-   PenTypeLinearGradient   = BrushTypeLinearGradient,
-   PenTypeUnknown          = -1
-};
-
-enum LineJoin
-{
-    LineJoinMiter           = 0,
-    LineJoinBevel           = 1,
-    LineJoinRound           = 2,
-    LineJoinMiterClipped    = 3
-};
-
-enum QualityMode
-{
-    QualityModeInvalid  = -1,
-    QualityModeDefault  = 0,
-    QualityModeLow      = 1,
-    QualityModeHigh     = 2
-};
-
-enum SmoothingMode
-{
-    SmoothingModeInvalid     = QualityModeInvalid,
-    SmoothingModeDefault     = QualityModeDefault,
-    SmoothingModeHighSpeed   = QualityModeLow,
-    SmoothingModeHighQuality = QualityModeHigh,
-    SmoothingModeNone,
-    SmoothingModeAntiAlias
-};
-
-enum CompositingQuality
-{
-    CompositingQualityInvalid          = QualityModeInvalid,
-    CompositingQualityDefault          = QualityModeDefault,
-    CompositingQualityHighSpeed        = QualityModeLow,
-    CompositingQualityHighQuality      = QualityModeHigh,
-    CompositingQualityGammaCorrected,
-    CompositingQualityAssumeLinear
-};
-
-enum InterpolationMode
-{
-    InterpolationModeInvalid        = QualityModeInvalid,
-    InterpolationModeDefault        = QualityModeDefault,
-    InterpolationModeLowQuality     = QualityModeLow,
-    InterpolationModeHighQuality    = QualityModeHigh,
-    InterpolationModeBilinear,
-    InterpolationModeBicubic,
-    InterpolationModeNearestNeighbor,
-    InterpolationModeHighQualityBilinear,
-    InterpolationModeHighQualityBicubic
-};
-
-enum PenAlignment
-{
-    PenAlignmentCenter   = 0,
-    PenAlignmentInset    = 1
-};
-
-enum PixelOffsetMode
-{
-    PixelOffsetModeInvalid     = QualityModeInvalid,
-    PixelOffsetModeDefault     = QualityModeDefault,
-    PixelOffsetModeHighSpeed   = QualityModeLow,
-    PixelOffsetModeHighQuality = QualityModeHigh,
-    PixelOffsetModeNone,
-    PixelOffsetModeHalf
-};
-
-enum DashCap
-{
-    DashCapFlat     = 0,
-    DashCapRound    = 2,
-    DashCapTriangle = 3
-};
-
-enum DashStyle
-{
-    DashStyleSolid,
-    DashStyleDash,
-    DashStyleDot,
-    DashStyleDashDot,
-    DashStyleDashDotDot,
-    DashStyleCustom
-};
-
-enum MatrixOrder
-{
-    MatrixOrderPrepend = 0,
-    MatrixOrderAppend  = 1
-};
-
-enum ImageType
-{
-    ImageTypeUnknown,
-    ImageTypeBitmap,
-    ImageTypeMetafile
-};
-
-enum WarpMode {
-    WarpModePerspective,
-    WarpModeBilinear
-};
-
-enum WrapMode
-{
-    WrapModeTile,
-    WrapModeTileFlipX,
-    WrapModeTileFlipY,
-    WrapModeTileFlipXY,
-    WrapModeClamp
-};
-
-enum MetafileType
-{
-    MetafileTypeInvalid,
-    MetafileTypeWmf,
-    MetafileTypeWmfPlaceable,
-    MetafileTypeEmf,
-    MetafileTypeEmfPlusOnly,
-    MetafileTypeEmfPlusDual
-};
-
-enum LinearGradientMode
-{
-    LinearGradientModeHorizontal,
-    LinearGradientModeVertical,
-    LinearGradientModeForwardDiagonal,
-    LinearGradientModeBackwardDiagonal
-};
-
-enum EmfType
-{
-    EmfTypeEmfOnly     = MetafileTypeEmf,
-    EmfTypeEmfPlusOnly = MetafileTypeEmfPlusOnly,
-    EmfTypeEmfPlusDual = MetafileTypeEmfPlusDual
-};
-
-enum CompositingMode
-{
-    CompositingModeSourceOver,
-    CompositingModeSourceCopy
-};
-
-enum TextRenderingHint
-{
-    TextRenderingHintSystemDefault = 0,
-    TextRenderingHintSingleBitPerPixelGridFit,
-    TextRenderingHintSingleBitPerPixel,
-    TextRenderingHintAntiAliasGridFit,
-    TextRenderingHintAntiAlias,
-    TextRenderingHintClearTypeGridFit
-};
-
-enum StringAlignment
-{
-    StringAlignmentNear    = 0,
-    StringAlignmentCenter  = 1,
-    StringAlignmentFar     = 2
-};
-
-enum  StringDigitSubstitute
-{
-    StringDigitSubstituteUser        = 0,
-    StringDigitSubstituteNone        = 1,
-    StringDigitSubstituteNational    = 2,
-    StringDigitSubstituteTraditional = 3
-};
-
-enum StringFormatFlags
-{
-    StringFormatFlagsDirectionRightToLeft  = 0x00000001,
-    StringFormatFlagsDirectionVertical     = 0x00000002,
-    StringFormatFlagsNoFitBlackBox         = 0x00000004,
-    StringFormatFlagsDisplayFormatControl  = 0x00000020,
-    StringFormatFlagsNoFontFallback        = 0x00000400,
-    StringFormatFlagsMeasureTrailingSpaces = 0x00000800,
-    StringFormatFlagsNoWrap                = 0x00001000,
-    StringFormatFlagsLineLimit             = 0x00002000,
-    StringFormatFlagsNoClip                = 0x00004000
-};
-
-enum StringTrimming
-{
-    StringTrimmingNone                 = 0,
-    StringTrimmingCharacter            = 1,
-    StringTrimmingWord                 = 2,
-    StringTrimmingEllipsisCharacter    = 3,
-    StringTrimmingEllipsisWord         = 4,
-    StringTrimmingEllipsisPath         = 5
-};
-
-enum FontStyle
-{
-    FontStyleRegular    = 0,
-    FontStyleBold       = 1,
-    FontStyleItalic     = 2,
-    FontStyleBoldItalic = 3,
-    FontStyleUnderline  = 4,
-    FontStyleStrikeout  = 8
-};
-
-enum HotkeyPrefix
-{
-    HotkeyPrefixNone   = 0,
-    HotkeyPrefixShow   = 1,
-    HotkeyPrefixHide   = 2
-};
-
-enum PaletteFlags
-{
-    PaletteFlagsHasAlpha        = 1,
-    PaletteFlagsGrayScale       = 2,
-    PaletteFlagsHalftone        = 4
-};
-
-enum ImageCodecFlags
-{
-    ImageCodecFlagsEncoder          = 1,
-    ImageCodecFlagsDecoder          = 2,
-    ImageCodecFlagsSupportBitmap    = 4,
-    ImageCodecFlagsSupportVector    = 8,
-    ImageCodecFlagsSeekableEncode   = 16,
-    ImageCodecFlagsBlockingDecode   = 32,
-    ImageCodecFlagsBuiltin          = 65536,
-    ImageCodecFlagsSystem           = 131072,
-    ImageCodecFlagsUser             = 262144
-};
-
-enum ImageFlags
-{
-    ImageFlagsNone              = 0,
-    ImageFlagsScalable          = 0x0001,
-    ImageFlagsHasAlpha          = 0x0002,
-    ImageFlagsHasTranslucent    = 0x0004,
-    ImageFlagsPartiallyScalable = 0x0008,
-    ImageFlagsColorSpaceRGB     = 0x0010,
-    ImageFlagsColorSpaceCMYK    = 0x0020,
-    ImageFlagsColorSpaceGRAY    = 0x0040,
-    ImageFlagsColorSpaceYCBCR   = 0x0080,
-    ImageFlagsColorSpaceYCCK    = 0x0100,
-    ImageFlagsHasRealDPI        = 0x1000,
-    ImageFlagsHasRealPixelSize  = 0x2000,
-    ImageFlagsReadOnly          = 0x00010000,
-    ImageFlagsCaching           = 0x00020000
-};
-
-enum CombineMode
-{
-    CombineModeReplace,
-    CombineModeIntersect,
-    CombineModeUnion,
-    CombineModeXor,
-    CombineModeExclude,
-    CombineModeComplement
-};
-
-enum FlushIntention
-{
-    FlushIntentionFlush = 0,
-    FlushIntentionSync  = 1
-};
-
-enum CoordinateSpace
-{
-    CoordinateSpaceWorld,
-    CoordinateSpacePage,
-    CoordinateSpaceDevice
-};
-
-enum GpTestControlEnum
-{
-    TestControlForceBilinear  = 0,
-    TestControlNoICM          = 1,
-    TestControlGetBuildNumber = 2
-};
-
-enum MetafileFrameUnit
-{
-    MetafileFrameUnitPixel      = UnitPixel,
-    MetafileFrameUnitPoint      = UnitPoint,
-    MetafileFrameUnitInch       = UnitInch,
-    MetafileFrameUnitDocument   = UnitDocument,
-    MetafileFrameUnitMillimeter = UnitMillimeter,
-    MetafileFrameUnitGdi
-};
-
-enum HatchStyle
-{
-    HatchStyleHorizontal = 0,
-    HatchStyleVertical = 1,
-    HatchStyleForwardDiagonal = 2,
-    HatchStyleBackwardDiagonal = 3,
-    HatchStyleCross = 4,
-    HatchStyleDiagonalCross = 5,
-    HatchStyle05Percent = 6,
-    HatchStyle10Percent = 7,
-    HatchStyle20Percent = 8,
-    HatchStyle25Percent = 9,
-    HatchStyle30Percent = 10,
-    HatchStyle40Percent = 11,
-    HatchStyle50Percent = 12,
-    HatchStyle60Percent = 13,
-    HatchStyle70Percent = 14,
-    HatchStyle75Percent = 15,
-    HatchStyle80Percent = 16,
-    HatchStyle90Percent = 17,
-    HatchStyleLightDownwardDiagonal = 18,
-    HatchStyleLightUpwardDiagonal = 19,
-    HatchStyleDarkDownwardDiagonal = 20,
-    HatchStyleDarkUpwardDiagonal = 21,
-    HatchStyleWideDownwardDiagonal = 22,
-    HatchStyleWideUpwardDiagonal = 23,
-    HatchStyleLightVertical = 24,
-    HatchStyleLightHorizontal = 25,
-    HatchStyleNarrowVertical = 26,
-    HatchStyleNarrowHorizontal = 27,
-    HatchStyleDarkVertical = 28,
-    HatchStyleDarkHorizontal = 29,
-    HatchStyleDashedDownwardDiagonal = 30,
-    HatchStyleDashedUpwardDiagonal = 31,
-    HatchStyleDashedHorizontal = 32,
-    HatchStyleDashedVertical = 33,
-    HatchStyleSmallConfetti = 34,
-    HatchStyleLargeConfetti = 35,
-    HatchStyleZigZag = 36,
-    HatchStyleWave = 37,
-    HatchStyleDiagonalBrick = 38,
-    HatchStyleHorizontalBrick = 39,
-    HatchStyleWeave = 40,
-    HatchStylePlaid = 41,
-    HatchStyleDivot = 42,
-    HatchStyleDottedGrid = 43,
-    HatchStyleDottedDiamond = 44,
-    HatchStyleShingle = 45,
-    HatchStyleTrellis = 46,
-    HatchStyleSphere = 47,
-    HatchStyleSmallGrid = 48,
-    HatchStyleSmallCheckerBoard = 49,
-    HatchStyleLargeCheckerBoard = 50,
-    HatchStyleOutlinedDiamond = 51,
-    HatchStyleSolidDiamond = 52,
-    HatchStyleTotal = 53,
-    HatchStyleLargeGrid = HatchStyleCross,
-    HatchStyleMin = HatchStyleHorizontal,
-    HatchStyleMax = HatchStyleTotal - 1
-};
-
-#define GDIP_EMFPLUS_RECORD_BASE 0x00004000
-#define GDIP_WMF_RECORD_BASE 0x00010000
-#define GDIP_WMF_RECORD_TO_EMFPLUS(x) ((x)|GDIP_WMF_RECORD_BASE)
-
-enum EmfPlusRecordType {
-    WmfRecordTypeSetBkColor = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETBKCOLOR),
-    WmfRecordTypeSetBkMode = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETBKMODE),
-    WmfRecordTypeSetMapMode = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETMAPMODE),
-    WmfRecordTypeSetROP2 = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETROP2),
-    WmfRecordTypeSetRelAbs = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETRELABS),
-    WmfRecordTypeSetPolyFillMode = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETPOLYFILLMODE),
-    WmfRecordTypeSetStretchBltMode = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETSTRETCHBLTMODE),
-    WmfRecordTypeSetTextCharExtra = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETTEXTCHAREXTRA),
-    WmfRecordTypeSetTextColor = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETTEXTCOLOR),
-    WmfRecordTypeSetTextJustification = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETTEXTJUSTIFICATION),
-    WmfRecordTypeSetWindowOrg = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETWINDOWORG),
-    WmfRecordTypeSetWindowExt = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETWINDOWEXT),
-    WmfRecordTypeSetViewportOrg = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETVIEWPORTORG),
-    WmfRecordTypeSetViewportExt = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETVIEWPORTEXT),
-    WmfRecordTypeOffsetWindowOrg = GDIP_WMF_RECORD_TO_EMFPLUS(META_OFFSETWINDOWORG),
-    WmfRecordTypeScaleWindowExt = GDIP_WMF_RECORD_TO_EMFPLUS(META_SCALEWINDOWEXT),
-    WmfRecordTypeOffsetViewportOrg = GDIP_WMF_RECORD_TO_EMFPLUS(META_OFFSETVIEWPORTORG),
-    WmfRecordTypeScaleViewportExt = GDIP_WMF_RECORD_TO_EMFPLUS(META_SCALEVIEWPORTEXT),
-    WmfRecordTypeLineTo = GDIP_WMF_RECORD_TO_EMFPLUS(META_LINETO),
-    WmfRecordTypeMoveTo = GDIP_WMF_RECORD_TO_EMFPLUS(META_MOVETO),
-    WmfRecordTypeExcludeClipRect = GDIP_WMF_RECORD_TO_EMFPLUS(META_EXCLUDECLIPRECT),
-    WmfRecordTypeIntersectClipRect = GDIP_WMF_RECORD_TO_EMFPLUS(META_INTERSECTCLIPRECT),
-    WmfRecordTypeArc = GDIP_WMF_RECORD_TO_EMFPLUS(META_ARC),
-    WmfRecordTypeEllipse = GDIP_WMF_RECORD_TO_EMFPLUS(META_ELLIPSE),
-    WmfRecordTypeFloodFill = GDIP_WMF_RECORD_TO_EMFPLUS(META_FLOODFILL),
-    WmfRecordTypePie = GDIP_WMF_RECORD_TO_EMFPLUS(META_PIE),
-    WmfRecordTypeRectangle = GDIP_WMF_RECORD_TO_EMFPLUS(META_RECTANGLE),
-    WmfRecordTypeRoundRect = GDIP_WMF_RECORD_TO_EMFPLUS(META_ROUNDRECT),
-    WmfRecordTypePatBlt = GDIP_WMF_RECORD_TO_EMFPLUS(META_PATBLT),
-    WmfRecordTypeSaveDC = GDIP_WMF_RECORD_TO_EMFPLUS(META_SAVEDC),
-    WmfRecordTypeSetPixel = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETPIXEL),
-    WmfRecordTypeOffsetClipRgn = GDIP_WMF_RECORD_TO_EMFPLUS(META_OFFSETCLIPRGN),
-    WmfRecordTypeTextOut = GDIP_WMF_RECORD_TO_EMFPLUS(META_TEXTOUT),
-    WmfRecordTypeBitBlt = GDIP_WMF_RECORD_TO_EMFPLUS(META_BITBLT),
-    WmfRecordTypeStretchBlt = GDIP_WMF_RECORD_TO_EMFPLUS(META_STRETCHBLT),
-    WmfRecordTypePolygon = GDIP_WMF_RECORD_TO_EMFPLUS(META_POLYGON),
-    WmfRecordTypePolyline = GDIP_WMF_RECORD_TO_EMFPLUS(META_POLYLINE),
-    WmfRecordTypeEscape = GDIP_WMF_RECORD_TO_EMFPLUS(META_ESCAPE),
-    WmfRecordTypeRestoreDC = GDIP_WMF_RECORD_TO_EMFPLUS(META_RESTOREDC),
-    WmfRecordTypeFillRegion = GDIP_WMF_RECORD_TO_EMFPLUS(META_FILLREGION),
-    WmfRecordTypeFrameRegion = GDIP_WMF_RECORD_TO_EMFPLUS(META_FRAMEREGION),
-    WmfRecordTypeInvertRegion = GDIP_WMF_RECORD_TO_EMFPLUS(META_INVERTREGION),
-    WmfRecordTypePaintRegion = GDIP_WMF_RECORD_TO_EMFPLUS(META_PAINTREGION),
-    WmfRecordTypeSelectClipRegion = GDIP_WMF_RECORD_TO_EMFPLUS(META_SELECTCLIPREGION),
-    WmfRecordTypeSelectObject = GDIP_WMF_RECORD_TO_EMFPLUS(META_SELECTOBJECT),
-    WmfRecordTypeSetTextAlign = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETTEXTALIGN),
-    WmfRecordTypeDrawText = GDIP_WMF_RECORD_TO_EMFPLUS(0x062F),
-    WmfRecordTypeChord = GDIP_WMF_RECORD_TO_EMFPLUS(META_CHORD),
-    WmfRecordTypeSetMapperFlags = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETMAPPERFLAGS),
-    WmfRecordTypeExtTextOut = GDIP_WMF_RECORD_TO_EMFPLUS(META_EXTTEXTOUT),
-    WmfRecordTypeSetDIBToDev = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETDIBTODEV),
-    WmfRecordTypeSelectPalette = GDIP_WMF_RECORD_TO_EMFPLUS(META_SELECTPALETTE),
-    WmfRecordTypeRealizePalette = GDIP_WMF_RECORD_TO_EMFPLUS(META_REALIZEPALETTE),
-    WmfRecordTypeAnimatePalette = GDIP_WMF_RECORD_TO_EMFPLUS(META_ANIMATEPALETTE),
-    WmfRecordTypeSetPalEntries = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETPALENTRIES),
-    WmfRecordTypePolyPolygon = GDIP_WMF_RECORD_TO_EMFPLUS(META_POLYPOLYGON),
-    WmfRecordTypeResizePalette = GDIP_WMF_RECORD_TO_EMFPLUS(META_RESIZEPALETTE),
-    WmfRecordTypeDIBBitBlt = GDIP_WMF_RECORD_TO_EMFPLUS(META_DIBBITBLT),
-    WmfRecordTypeDIBStretchBlt = GDIP_WMF_RECORD_TO_EMFPLUS(META_DIBSTRETCHBLT),
-    WmfRecordTypeDIBCreatePatternBrush = GDIP_WMF_RECORD_TO_EMFPLUS(META_DIBCREATEPATTERNBRUSH),
-    WmfRecordTypeStretchDIB = GDIP_WMF_RECORD_TO_EMFPLUS(META_STRETCHDIB),
-    WmfRecordTypeExtFloodFill = GDIP_WMF_RECORD_TO_EMFPLUS(META_EXTFLOODFILL),
-    WmfRecordTypeSetLayout = GDIP_WMF_RECORD_TO_EMFPLUS(0x0149),
-    WmfRecordTypeResetDC = GDIP_WMF_RECORD_TO_EMFPLUS(0x014C),
-    WmfRecordTypeStartDoc = GDIP_WMF_RECORD_TO_EMFPLUS(0x014D),
-    WmfRecordTypeStartPage = GDIP_WMF_RECORD_TO_EMFPLUS(0x004F),
-    WmfRecordTypeEndPage = GDIP_WMF_RECORD_TO_EMFPLUS(0x0050),
-    WmfRecordTypeAbortDoc = GDIP_WMF_RECORD_TO_EMFPLUS(0x0052),
-    WmfRecordTypeEndDoc = GDIP_WMF_RECORD_TO_EMFPLUS(0x005E),
-    WmfRecordTypeDeleteObject = GDIP_WMF_RECORD_TO_EMFPLUS(META_DELETEOBJECT),
-    WmfRecordTypeCreatePalette = GDIP_WMF_RECORD_TO_EMFPLUS(META_CREATEPALETTE),
-    WmfRecordTypeCreateBrush = GDIP_WMF_RECORD_TO_EMFPLUS(0x00F8),
-    WmfRecordTypeCreatePatternBrush = GDIP_WMF_RECORD_TO_EMFPLUS(META_CREATEPATTERNBRUSH),
-    WmfRecordTypeCreatePenIndirect = GDIP_WMF_RECORD_TO_EMFPLUS(META_CREATEPENINDIRECT),
-    WmfRecordTypeCreateFontIndirect = GDIP_WMF_RECORD_TO_EMFPLUS(META_CREATEFONTINDIRECT),
-    WmfRecordTypeCreateBrushIndirect = GDIP_WMF_RECORD_TO_EMFPLUS(META_CREATEBRUSHINDIRECT),
-    WmfRecordTypeCreateBitmapIndirect = GDIP_WMF_RECORD_TO_EMFPLUS(0x02FD),
-    WmfRecordTypeCreateBitmap = GDIP_WMF_RECORD_TO_EMFPLUS(0x06FE),
-    WmfRecordTypeCreateRegion = GDIP_WMF_RECORD_TO_EMFPLUS(META_CREATEREGION),
-    EmfRecordTypeHeader = EMR_HEADER,
-    EmfRecordTypePolyBezier = EMR_POLYBEZIER,
-    EmfRecordTypePolygon = EMR_POLYGON,
-    EmfRecordTypePolyline = EMR_POLYLINE,
-    EmfRecordTypePolyBezierTo = EMR_POLYBEZIERTO,
-    EmfRecordTypePolyLineTo = EMR_POLYLINETO,
-    EmfRecordTypePolyPolyline = EMR_POLYPOLYLINE,
-    EmfRecordTypePolyPolygon = EMR_POLYPOLYGON,
-    EmfRecordTypeSetWindowExtEx = EMR_SETWINDOWEXTEX,
-    EmfRecordTypeSetWindowOrgEx = EMR_SETWINDOWORGEX,
-    EmfRecordTypeSetViewportExtEx = EMR_SETVIEWPORTEXTEX,
-    EmfRecordTypeSetViewportOrgEx = EMR_SETVIEWPORTORGEX,
-    EmfRecordTypeSetBrushOrgEx = EMR_SETBRUSHORGEX,
-    EmfRecordTypeEOF = EMR_EOF,
-    EmfRecordTypeSetPixelV = EMR_SETPIXELV,
-    EmfRecordTypeSetMapperFlags = EMR_SETMAPPERFLAGS,
-    EmfRecordTypeSetMapMode = EMR_SETMAPMODE,
-    EmfRecordTypeSetBkMode = EMR_SETBKMODE,
-    EmfRecordTypeSetPolyFillMode = EMR_SETPOLYFILLMODE,
-    EmfRecordTypeSetROP2 = EMR_SETROP2,
-    EmfRecordTypeSetStretchBltMode = EMR_SETSTRETCHBLTMODE,
-    EmfRecordTypeSetTextAlign = EMR_SETTEXTALIGN,
-    EmfRecordTypeSetColorAdjustment = EMR_SETCOLORADJUSTMENT,
-    EmfRecordTypeSetTextColor = EMR_SETTEXTCOLOR,
-    EmfRecordTypeSetBkColor = EMR_SETBKCOLOR,
-    EmfRecordTypeOffsetClipRgn = EMR_OFFSETCLIPRGN,
-    EmfRecordTypeMoveToEx = EMR_MOVETOEX,
-    EmfRecordTypeSetMetaRgn = EMR_SETMETARGN,
-    EmfRecordTypeExcludeClipRect = EMR_EXCLUDECLIPRECT,
-    EmfRecordTypeIntersectClipRect = EMR_INTERSECTCLIPRECT,
-    EmfRecordTypeScaleViewportExtEx = EMR_SCALEVIEWPORTEXTEX,
-    EmfRecordTypeScaleWindowExtEx = EMR_SCALEWINDOWEXTEX,
-    EmfRecordTypeSaveDC = EMR_SAVEDC,
-    EmfRecordTypeRestoreDC = EMR_RESTOREDC,
-    EmfRecordTypeSetWorldTransform = EMR_SETWORLDTRANSFORM,
-    EmfRecordTypeModifyWorldTransform = EMR_MODIFYWORLDTRANSFORM,
-    EmfRecordTypeSelectObject = EMR_SELECTOBJECT,
-    EmfRecordTypeCreatePen = EMR_CREATEPEN,
-    EmfRecordTypeCreateBrushIndirect = EMR_CREATEBRUSHINDIRECT,
-    EmfRecordTypeDeleteObject = EMR_DELETEOBJECT,
-    EmfRecordTypeAngleArc = EMR_ANGLEARC,
-    EmfRecordTypeEllipse = EMR_ELLIPSE,
-    EmfRecordTypeRectangle = EMR_RECTANGLE,
-    EmfRecordTypeRoundRect = EMR_ROUNDRECT,
-    EmfRecordTypeArc = EMR_ARC,
-    EmfRecordTypeChord = EMR_CHORD,
-    EmfRecordTypePie = EMR_PIE,
-    EmfRecordTypeSelectPalette = EMR_SELECTPALETTE,
-    EmfRecordTypeCreatePalette = EMR_CREATEPALETTE,
-    EmfRecordTypeSetPaletteEntries = EMR_SETPALETTEENTRIES,
-    EmfRecordTypeResizePalette = EMR_RESIZEPALETTE,
-    EmfRecordTypeRealizePalette = EMR_REALIZEPALETTE,
-    EmfRecordTypeExtFloodFill = EMR_EXTFLOODFILL,
-    EmfRecordTypeLineTo = EMR_LINETO,
-    EmfRecordTypeArcTo = EMR_ARCTO,
-    EmfRecordTypePolyDraw = EMR_POLYDRAW,
-    EmfRecordTypeSetArcDirection = EMR_SETARCDIRECTION,
-    EmfRecordTypeSetMiterLimit = EMR_SETMITERLIMIT,
-    EmfRecordTypeBeginPath = EMR_BEGINPATH,
-    EmfRecordTypeEndPath = EMR_ENDPATH,
-    EmfRecordTypeCloseFigure = EMR_CLOSEFIGURE,
-    EmfRecordTypeFillPath = EMR_FILLPATH,
-    EmfRecordTypeStrokeAndFillPath = EMR_STROKEANDFILLPATH,
-    EmfRecordTypeStrokePath = EMR_STROKEPATH,
-    EmfRecordTypeFlattenPath = EMR_FLATTENPATH,
-    EmfRecordTypeWidenPath = EMR_WIDENPATH,
-    EmfRecordTypeSelectClipPath = EMR_SELECTCLIPPATH,
-    EmfRecordTypeAbortPath = EMR_ABORTPATH,
-    EmfRecordTypeReserved_069 = 69,
-    EmfRecordTypeGdiComment = EMR_GDICOMMENT,
-    EmfRecordTypeFillRgn = EMR_FILLRGN,
-    EmfRecordTypeFrameRgn = EMR_FRAMERGN,
-    EmfRecordTypeInvertRgn = EMR_INVERTRGN,
-    EmfRecordTypePaintRgn = EMR_PAINTRGN,
-    EmfRecordTypeExtSelectClipRgn = EMR_EXTSELECTCLIPRGN,
-    EmfRecordTypeBitBlt = EMR_BITBLT,
-    EmfRecordTypeStretchBlt = EMR_STRETCHBLT,
-    EmfRecordTypeMaskBlt = EMR_MASKBLT,
-    EmfRecordTypePlgBlt = EMR_PLGBLT,
-    EmfRecordTypeSetDIBitsToDevice = 80,
-    EmfRecordTypeStretchDIBits = EMR_STRETCHDIBITS,
-    EmfRecordTypeExtCreateFontIndirect = EMR_EXTCREATEFONTINDIRECTW,
-    EmfRecordTypeExtTextOutA = EMR_EXTTEXTOUTA,
-    EmfRecordTypeExtTextOutW = EMR_EXTTEXTOUTW,
-    EmfRecordTypePolyBezier16 = EMR_POLYBEZIER16,
-    EmfRecordTypePolygon16 = EMR_POLYGON16,
-    EmfRecordTypePolyline16 = EMR_POLYLINE16,
-    EmfRecordTypePolyBezierTo16 = EMR_POLYBEZIERTO16,
-    EmfRecordTypePolylineTo16 = EMR_POLYLINETO16,
-    EmfRecordTypePolyPolyline16 = EMR_POLYPOLYLINE16,
-    EmfRecordTypePolyPolygon16 = EMR_POLYPOLYGON16,
-    EmfRecordTypePolyDraw16 = EMR_POLYDRAW16,
-    EmfRecordTypeCreateMonoBrush = EMR_CREATEMONOBRUSH,
-    EmfRecordTypeCreateDIBPatternBrushPt = EMR_CREATEDIBPATTERNBRUSHPT,
-    EmfRecordTypeExtCreatePen = EMR_EXTCREATEPEN,
-    EmfRecordTypePolyTextOutA = EMR_POLYTEXTOUTA,
-    EmfRecordTypePolyTextOutW = EMR_POLYTEXTOUTW,
-    EmfRecordTypeSetICMMode = 98,
-    EmfRecordTypeCreateColorSpace = 99,
-    EmfRecordTypeSetColorSpace = 100,
-    EmfRecordTypeDeleteColorSpace = 101,
-    EmfRecordTypeGLSRecord = 102,
-    EmfRecordTypeGLSBoundedRecord = 103,
-    EmfRecordTypePixelFormat = 104,
-    EmfRecordTypeDrawEscape = 105,
-    EmfRecordTypeExtEscape = 106,
-    EmfRecordTypeStartDoc = 107,
-    EmfRecordTypeSmallTextOut = 108,
-    EmfRecordTypeForceUFIMapping = 109,
-    EmfRecordTypeNamedEscape = 110,
-    EmfRecordTypeColorCorrectPalette = 111,
-    EmfRecordTypeSetICMProfileA = 112,
-    EmfRecordTypeSetICMProfileW = 113,
-    EmfRecordTypeAlphaBlend = 114,
-    EmfRecordTypeSetLayout = 115,
-    EmfRecordTypeTransparentBlt = 116,
-    EmfRecordTypeReserved_117 = 117,
-    EmfRecordTypeGradientFill = 118,
-    EmfRecordTypeSetLinkedUFIs = 119,
-    EmfRecordTypeSetTextJustification = 120,
-    EmfRecordTypeColorMatchToTargetW = 121,
-    EmfRecordTypeCreateColorSpaceW = 122,
-    EmfRecordTypeMax = 122,
-    EmfRecordTypeMin = 1,
-    EmfPlusRecordTypeInvalid = GDIP_EMFPLUS_RECORD_BASE,
-    EmfPlusRecordTypeHeader,
-    EmfPlusRecordTypeEndOfFile,
-    EmfPlusRecordTypeComment,
-    EmfPlusRecordTypeGetDC,
-    EmfPlusRecordTypeMultiFormatStart,
-    EmfPlusRecordTypeMultiFormatSection,
-    EmfPlusRecordTypeMultiFormatEnd,
-    EmfPlusRecordTypeObject,
-    EmfPlusRecordTypeClear,
-    EmfPlusRecordTypeFillRects,
-    EmfPlusRecordTypeDrawRects,
-    EmfPlusRecordTypeFillPolygon,
-    EmfPlusRecordTypeDrawLines,
-    EmfPlusRecordTypeFillEllipse,
-    EmfPlusRecordTypeDrawEllipse,
-    EmfPlusRecordTypeFillPie,
-    EmfPlusRecordTypeDrawPie,
-    EmfPlusRecordTypeDrawArc,
-    EmfPlusRecordTypeFillRegion,
-    EmfPlusRecordTypeFillPath,
-    EmfPlusRecordTypeDrawPath,
-    EmfPlusRecordTypeFillClosedCurve,
-    EmfPlusRecordTypeDrawClosedCurve,
-    EmfPlusRecordTypeDrawCurve,
-    EmfPlusRecordTypeDrawBeziers,
-    EmfPlusRecordTypeDrawImage,
-    EmfPlusRecordTypeDrawImagePoints,
-    EmfPlusRecordTypeDrawString,
-    EmfPlusRecordTypeSetRenderingOrigin,
-    EmfPlusRecordTypeSetAntiAliasMode,
-    EmfPlusRecordTypeSetTextRenderingHint,
-    EmfPlusRecordTypeSetTextContrast,
-    EmfPlusRecordTypeSetGammaValue,
-    EmfPlusRecordTypeSetInterpolationMode,
-    EmfPlusRecordTypeSetPixelOffsetMode,
-    EmfPlusRecordTypeSetCompositingMode,
-    EmfPlusRecordTypeSetCompositingQuality,
-    EmfPlusRecordTypeSave,
-    EmfPlusRecordTypeRestore,
-    EmfPlusRecordTypeBeginContainer,
-    EmfPlusRecordTypeBeginContainerNoParams,
-    EmfPlusRecordTypeEndContainer,
-    EmfPlusRecordTypeSetWorldTransform,
-    EmfPlusRecordTypeResetWorldTransform,
-    EmfPlusRecordTypeMultiplyWorldTransform,
-    EmfPlusRecordTypeTranslateWorldTransform,
-    EmfPlusRecordTypeScaleWorldTransform,
-    EmfPlusRecordTypeRotateWorldTransform,
-    EmfPlusRecordTypeSetPageTransform,
-    EmfPlusRecordTypeResetClip,
-    EmfPlusRecordTypeSetClipRect,
-    EmfPlusRecordTypeSetClipPath,
-    EmfPlusRecordTypeSetClipRegion,
-    EmfPlusRecordTypeOffsetClip,
-    EmfPlusRecordTypeDrawDriverString,
-    EmfPlusRecordTypeStrokeFillPath,
-    EmfPlusRecordTypeSerializableObject,
-    EmfPlusRecordTypeSetTSGraphics,
-    EmfPlusRecordTypeSetTSClip,
-    EmfPlusRecordTotal,
-    EmfPlusRecordTypeMax = EmfPlusRecordTotal-1,
-    EmfPlusRecordTypeMin = EmfPlusRecordTypeHeader
-};
-
-#ifndef __cplusplus
-
-typedef enum Unit Unit;
-typedef enum BrushType BrushType;
-typedef enum DriverStringOptions DriverStringOptions;
-typedef enum FillMode FillMode;
-typedef enum LineCap LineCap;
-typedef enum PathPointType PathPointType;
-typedef enum LineJoin LineJoin;
-typedef enum QualityMode QualityMode;
-typedef enum SmoothingMode SmoothingMode;
-typedef enum CompositingQuality CompositingQuality;
-typedef enum InterpolationMode InterpolationMode;
-typedef enum PixelOffsetMode PixelOffsetMode;
-typedef enum DashCap DashCap;
-typedef enum DashStyle DashStyle;
-typedef enum MatrixOrder MatrixOrder;
-typedef enum ImageType ImageType;
-typedef enum ImageFlags ImageFlags;
-typedef enum WarpMode WarpMode;
-typedef enum WrapMode WrapMode;
-typedef enum MetafileType MetafileType;
-typedef enum LinearGradientMode LinearGradientMode;
-typedef enum EmfType EmfType;
-typedef enum CompositingMode CompositingMode;
-typedef enum TextRenderingHint TextRenderingHint;
-typedef enum StringAlignment StringAlignment;
-typedef enum StringDigitSubstitute StringDigitSubstitute;
-typedef enum StringTrimming StringTrimming;
-typedef enum FontStyle FontStyle;
-typedef enum StringFormatFlags StringFormatFlags;
-typedef enum HotkeyPrefix HotkeyPrefix;
-typedef enum PenAlignment PenAlignment;
-typedef enum PaletteFlags PaletteFlags;
-typedef enum ImageCodecFlags ImageCodecFlags;
-typedef enum CombineMode CombineMode;
-typedef enum FlushIntention FlushIntention;
-typedef enum CoordinateSpace CoordinateSpace;
-typedef enum GpTestControlEnum GpTestControlEnum;
-typedef enum MetafileFrameUnit MetafileFrameUnit;
-typedef enum PenType PenType;
-typedef enum HatchStyle HatchStyle;
-typedef enum EmfPlusRecordType EmfPlusRecordType;
-
-#endif /* end of c typedefs */
-
-#undef GDIP_WMF_RECORD_TO_EMFPLUS
-#define GDIP_WMF_RECORD_TO_EMFPLUS(x) ((EmfPlusRecordType)((x)|GDIP_WMF_RECORD_BASE))
-
-#endif
diff --git a/external/wine/include/gdiplusflat.h b/external/wine/include/gdiplusflat.h
deleted file mode 100644
index 6792004..0000000
--- a/external/wine/include/gdiplusflat.h
+++ /dev/null
@@ -1,731 +0,0 @@
-/*
- * Copyright (C) 2007 Google (Evan Stade)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _FLATAPI_H
-#define _FLATAPI_H
-
-#define WINGDIPAPI __stdcall
-
-#define GDIPCONST const
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* AdjustableArrowCap */
-GpStatus WINGDIPAPI GdipCreateAdjustableArrowCap(REAL,REAL,BOOL,GpAdjustableArrowCap**);
-GpStatus WINGDIPAPI GdipGetAdjustableArrowCapFillState(GpAdjustableArrowCap*,BOOL*);
-GpStatus WINGDIPAPI GdipGetAdjustableArrowCapHeight(GpAdjustableArrowCap*,REAL*);
-GpStatus WINGDIPAPI GdipGetAdjustableArrowCapMiddleInset(GpAdjustableArrowCap*,REAL*);
-GpStatus WINGDIPAPI GdipGetAdjustableArrowCapWidth(GpAdjustableArrowCap*,REAL*);
-GpStatus WINGDIPAPI GdipSetAdjustableArrowCapFillState(GpAdjustableArrowCap*,BOOL);
-GpStatus WINGDIPAPI GdipSetAdjustableArrowCapHeight(GpAdjustableArrowCap*,REAL);
-GpStatus WINGDIPAPI GdipSetAdjustableArrowCapMiddleInset(GpAdjustableArrowCap*,REAL);
-GpStatus WINGDIPAPI GdipSetAdjustableArrowCapWidth(GpAdjustableArrowCap*,REAL);
-
-/* Bitmap */
-GpStatus WINGDIPAPI GdipBitmapApplyEffect(GpBitmap*,CGpEffect*,RECT*,BOOL,VOID**,INT*);
-GpStatus WINGDIPAPI GdipBitmapCreateApplyEffect(GpBitmap**,INT,CGpEffect*,RECT*,RECT*,GpBitmap**,BOOL,VOID**,INT*);
-GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*);
-GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap*,GDIPCONST GpRect*,UINT,
-    PixelFormat,BitmapData*);
-GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap*,INT,INT,ARGB);
-GpStatus WINGDIPAPI GdipBitmapSetResolution(GpBitmap*,REAL,REAL);
-GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap*,BitmapData*);
-GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL,REAL,REAL,REAL,PixelFormat,GpBitmap*,GpBitmap**);
-GpStatus WINGDIPAPI GdipCloneBitmapAreaI(INT,INT,INT,INT,PixelFormat,GpBitmap*,GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR*,GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromFileICM(GDIPCONST WCHAR*,GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromGdiDib(GDIPCONST BITMAPINFO*,VOID*,GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT,INT,GpGraphics*,GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP, HPALETTE, GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON, GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromResource(HINSTANCE,GDIPCONST WCHAR*,GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT,INT,INT,PixelFormat,BYTE*,
-    GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream*,GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromStreamICM(IStream*,GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap*,HBITMAP*,ARGB);
-GpStatus WINGDIPAPI GdipCreateHICONFromBitmap(GpBitmap*,HICON*);
-GpStatus WINGDIPAPI GdipDeleteEffect(CGpEffect*);
-GpStatus WINGDIPAPI GdipSetEffectParameters(CGpEffect*,const VOID*,const UINT);
-
-/* Brush */
-GpStatus WINGDIPAPI GdipCloneBrush(GpBrush*,GpBrush**);
-GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*);
-GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*);
-
-/* CachedBitmap */
-GpStatus WINGDIPAPI GdipCreateCachedBitmap(GpBitmap*,GpGraphics*,
-    GpCachedBitmap**);
-GpStatus WINGDIPAPI GdipDeleteCachedBitmap(GpCachedBitmap*);
-GpStatus WINGDIPAPI GdipDrawCachedBitmap(GpGraphics*,GpCachedBitmap*,INT,INT);
-
-/* CustomLineCap */
-GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap*,GpCustomLineCap**);
-GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath*,GpPath*,GpLineCap,REAL,
-    GpCustomLineCap**);
-GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap*);
-GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap*,GpLineCap*);
-GpStatus WINGDIPAPI GdipSetCustomLineCapBaseCap(GpCustomLineCap*,GpLineCap);
-GpStatus WINGDIPAPI GdipGetCustomLineCapBaseInset(GpCustomLineCap*,REAL*);
-GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap*,REAL);
-GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap*,GpLineCap,
-    GpLineCap);
-GpStatus WINGDIPAPI GdipGetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin*);
-GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin);
-GpStatus WINGDIPAPI GdipGetCustomLineCapWidthScale(GpCustomLineCap*,REAL*);
-GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap*,REAL);
-GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap*,REAL);
-
-/* Font */
-GpStatus WINGDIPAPI GdipCloneFont(GpFont*,GpFont**);
-GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily*, REAL, INT, Unit,
-    GpFont**);
-GpStatus WINGDIPAPI GdipCreateFontFromDC(HDC,GpFont**);
-GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC,GDIPCONST LOGFONTA*,GpFont**);
-GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**);
-GpStatus WINGDIPAPI GdipDeleteFont(GpFont*);
-GpStatus WINGDIPAPI GdipGetLogFontA(GpFont*,GpGraphics*,LOGFONTA*);
-GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*);
-GpStatus WINGDIPAPI GdipGetFamily(GpFont*, GpFontFamily**);
-GpStatus WINGDIPAPI GdipGetFontUnit(GpFont*, Unit*);
-GpStatus WINGDIPAPI GdipGetFontSize(GpFont*, REAL*);
-GpStatus WINGDIPAPI GdipGetFontStyle(GpFont*, INT*);
-GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont*, GDIPCONST GpGraphics*,
-        REAL*);
-GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont*, REAL, REAL*);
-
-/* FontCollection */
-GpStatus WINGDIPAPI GdipNewInstalledFontCollection(GpFontCollection**);
-GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection**);
-GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection**);
-GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection*, GDIPCONST WCHAR*);
-GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection*,
-        GDIPCONST void*,INT);
-GpStatus WINGDIPAPI GdipGetFontCollectionFamilyCount(GpFontCollection*, INT*);
-GpStatus WINGDIPAPI GdipGetFontCollectionFamilyList(GpFontCollection*, INT,
-        GpFontFamily*[], INT*);
-
-/* FontFamily */
-GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily*, GpFontFamily**);
-GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR*,
-    GpFontCollection*, GpFontFamily**);
-GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily*);
-GpStatus WINGDIPAPI GdipGetFamilyName(GDIPCONST GpFontFamily*, WCHAR*, LANGID);
-GpStatus WINGDIPAPI GdipGetCellAscent(GDIPCONST GpFontFamily*, INT, UINT16*);
-GpStatus WINGDIPAPI GdipGetCellDescent(GDIPCONST GpFontFamily*, INT, UINT16*);
-GpStatus WINGDIPAPI GdipGetEmHeight(GDIPCONST GpFontFamily*, INT, UINT16*);
-GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily**);
-GpStatus WINGDIPAPI GdipGetGenericFontFamilySerif(GpFontFamily**);
-GpStatus WINGDIPAPI GdipGetGenericFontFamilyMonospace(GpFontFamily**);
-GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily*, INT, UINT16*);
-GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily *, INT, BOOL*);
-
-/* Graphics */
-GpStatus WINGDIPAPI GdipFlush(GpGraphics*, GpFlushIntention);
-GpStatus WINGDIPAPI GdipBeginContainer(GpGraphics*,GDIPCONST GpRectF*,GDIPCONST GpRectF*,GpUnit,GraphicsContainer*);
-GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics*,GraphicsContainer*);
-GpStatus WINGDIPAPI GdipBeginContainerI(GpGraphics*,GDIPCONST GpRect*,GDIPCONST GpRect*,GpUnit,GraphicsContainer*);
-GpStatus WINGDIPAPI GdipEndContainer(GpGraphics*,GraphicsContainer);
-GpStatus WINGDIPAPI GdipComment(GpGraphics*,UINT,GDIPCONST BYTE*);
-GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**);
-GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC,HANDLE,GpGraphics**);
-GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**);
-GpStatus WINGDIPAPI GdipCreateFromHWNDICM(HWND,GpGraphics**);
-HPALETTE WINGDIPAPI GdipCreateHalftonePalette(void);
-GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *);
-GpStatus WINGDIPAPI GdipDrawArc(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawArcI(GpGraphics*,GpPen*,INT,INT,INT,INT,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics*,GpPen*,INT,INT,INT,INT,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipDrawBeziers(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipDrawBeziersI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipDrawClosedCurve(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipDrawClosedCurveI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipDrawClosedCurve2(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,REAL);
-GpStatus WINGDIPAPI GdipDrawClosedCurve2I(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT,REAL);
-GpStatus WINGDIPAPI GdipDrawCurve(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipDrawCurveI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,REAL);
-GpStatus WINGDIPAPI GdipDrawCurve2I(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT,REAL);
-GpStatus WINGDIPAPI GdipDrawCurve3(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,INT,INT,REAL);
-GpStatus WINGDIPAPI GdipDrawCurve3I(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT,INT,INT,REAL);
-GpStatus WINGDIPAPI GdipDrawDriverString(GpGraphics*,GDIPCONST UINT16*,INT,
-    GDIPCONST GpFont*,GDIPCONST GpBrush*,GDIPCONST PointF*,INT,GDIPCONST GpMatrix*);
-GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawEllipseI(GpGraphics*,GpPen*,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipDrawImage(GpGraphics*,GpImage*,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics*,GpImage*,INT,INT);
-GpStatus WINGDIPAPI GdipDrawImagePointRect(GpGraphics*,GpImage*,REAL,REAL,REAL,REAL,REAL,REAL,GpUnit);
-GpStatus WINGDIPAPI GdipDrawImagePointRectI(GpGraphics*,GpImage*,INT,INT,INT,INT,INT,INT,GpUnit);
-GpStatus WINGDIPAPI GdipDrawImagePoints(GpGraphics*,GpImage*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipDrawImagePointsI(GpGraphics*,GpImage*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics*,GpImage*,
-    GDIPCONST GpPointF*,INT,REAL,REAL,REAL,REAL,GpUnit,
-    GDIPCONST GpImageAttributes*,DrawImageAbort,VOID*);
-GpStatus WINGDIPAPI GdipDrawImagePointsRectI(GpGraphics*,GpImage*,
-    GDIPCONST GpPoint*,INT,INT,INT,INT,INT,GpUnit,
-    GDIPCONST GpImageAttributes*,DrawImageAbort,VOID*);
-GpStatus WINGDIPAPI GdipDrawImageRect(GpGraphics*,GpImage*,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawImageRectI(GpGraphics*,GpImage*,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipDrawImageRectRect(GpGraphics*,GpImage*,REAL,REAL,REAL,
-    REAL,REAL,REAL,REAL,REAL,GpUnit,GDIPCONST GpImageAttributes*,DrawImageAbort,
-    VOID*);
-GpStatus WINGDIPAPI GdipDrawImageRectRectI(GpGraphics*,GpImage*,INT,INT,INT,
-    INT,INT,INT,INT,INT,GpUnit,GDIPCONST GpImageAttributes*,DrawImageAbort,
-    VOID*);
-GpStatus WINGDIPAPI GdipDrawLine(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics*,GpPen*,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipDrawLines(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipDrawPath(GpGraphics*,GpPen*,GpPath*);
-GpStatus WINGDIPAPI GdipDrawPie(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawPieI(GpGraphics*,GpPen*,INT,INT,INT,INT,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawPolygon(GpGraphics*,GpPen*,GDIPCONST GpPointF*, INT);
-GpStatus WINGDIPAPI GdipDrawPolygonI(GpGraphics*,GpPen*,GDIPCONST GpPoint*, INT);
-GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics*,GpPen*,GDIPCONST GpRectF*,INT);
-GpStatus WINGDIPAPI GdipDrawRectanglesI(GpGraphics*,GpPen*,GDIPCONST GpRect*,INT);
-GpStatus WINGDIPAPI GdipDrawString(GpGraphics*,GDIPCONST WCHAR*,INT,
-    GDIPCONST GpFont*,GDIPCONST RectF*, GDIPCONST GpStringFormat*,
-    GDIPCONST GpBrush*);
-GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics*,
-    GDIPCONST GpMetafile*,GDIPCONST GpPointF*,INT,GDIPCONST GpRectF*,Unit,
-    EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);
-GpStatus WINGDIPAPI GdipFillClosedCurve2(GpGraphics*,GpBrush*,GDIPCONST GpPointF*,INT,
-    REAL,GpFillMode);
-GpStatus WINGDIPAPI GdipFillClosedCurve2I(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT,
-    REAL,GpFillMode);
-GpStatus WINGDIPAPI GdipFillClosedCurve(GpGraphics*,GpBrush*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipFillClosedCurveI(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipFillEllipseI(GpGraphics*,GpBrush*,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipFillPath(GpGraphics*,GpBrush*,GpPath*);
-GpStatus WINGDIPAPI GdipFillPie(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipFillPieI(GpGraphics*,GpBrush*,INT,INT,INT,INT,REAL,REAL);
-GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics*,GpBrush*,GDIPCONST GpPointF*,
-    INT,GpFillMode);
-GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,
-    INT,GpFillMode);
-GpStatus WINGDIPAPI GdipFillPolygon2(GpGraphics*,GpBrush*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipFillPolygon2I(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipFillRectangle(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics*,GpBrush*,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipFillRectangles(GpGraphics*,GpBrush*,GDIPCONST GpRectF*,INT);
-GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics*,GpBrush*,GDIPCONST GpRect*,INT);
-GpStatus WINGDIPAPI GdipFillRegion(GpGraphics*,GpBrush*,GpRegion*);
-GpStatus WINGDIPAPI GdipGetClip(GpGraphics*,GpRegion*);
-GpStatus WINGDIPAPI GdipGetClipBounds(GpGraphics*,GpRectF*);
-GpStatus WINGDIPAPI GdipGetClipBoundsI(GpGraphics*,GpRect*);
-GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics*,CompositingMode*);
-GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*);
-GpStatus WINGDIPAPI GdipGetDC(GpGraphics*,HDC*);
-GpStatus WINGDIPAPI GdipGetDpiX(GpGraphics*,REAL*);
-GpStatus WINGDIPAPI GdipGetDpiY(GpGraphics*,REAL*);
-GpStatus WINGDIPAPI GdipGetImageDecoders(UINT,UINT,ImageCodecInfo*);
-GpStatus WINGDIPAPI GdipGetImageDecodersSize(UINT*,UINT*);
-GpStatus WINGDIPAPI GdipGetImageGraphicsContext(GpImage*,GpGraphics**);
-GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics*,InterpolationMode*);
-GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics*,ARGB*);
-GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics*,REAL*);
-GpStatus WINGDIPAPI GdipGetPageUnit(GpGraphics*,GpUnit*);
-GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics*,PixelOffsetMode*);
-GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics*,SmoothingMode*);
-GpStatus WINGDIPAPI GdipGetTextContrast(GpGraphics*,UINT*);
-GpStatus WINGDIPAPI GdipGetTextRenderingHint(GpGraphics*,TextRenderingHint*);
-GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*);
-GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics*,ARGB);
-GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics*,GpRectF*);
-GpStatus WINGDIPAPI GdipGetVisibleClipBoundsI(GpGraphics*,GpRect*);
-GpStatus WINGDIPAPI GdipIsClipEmpty(GpGraphics*, BOOL*);
-GpStatus WINGDIPAPI GdipIsVisiblePoint(GpGraphics*,REAL,REAL,BOOL*);
-GpStatus WINGDIPAPI GdipIsVisiblePointI(GpGraphics*,INT,INT,BOOL*);
-GpStatus WINGDIPAPI GdipIsVisibleRect(GpGraphics*,REAL,REAL,REAL,REAL,BOOL*);
-GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics*,INT,INT,INT,INT,BOOL*);
-GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics*, GDIPCONST WCHAR*,
-    INT, GDIPCONST GpFont*, GDIPCONST RectF*, GDIPCONST GpStringFormat*, INT,
-    GpRegion**);
-GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics*,GDIPCONST UINT16*,INT,
-    GDIPCONST GpFont*,GDIPCONST PointF*,INT,GDIPCONST GpMatrix*,RectF*);
-GpStatus WINGDIPAPI GdipMeasureString(GpGraphics*,GDIPCONST WCHAR*,INT,
-    GDIPCONST GpFont*,GDIPCONST RectF*,GDIPCONST GpStringFormat*,RectF*,INT*,INT*);
-GpStatus WINGDIPAPI GdipMultiplyWorldTransform(GpGraphics*,GDIPCONST GpMatrix*,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipRecordMetafileFileName(GDIPCONST WCHAR*,HDC,EmfType,
-    GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**);
-GpStatus WINGDIPAPI GdipRecordMetafileFileNameI(GDIPCONST WCHAR*,HDC,EmfType,
-    GDIPCONST GpRect*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**);
-GpStatus WINGDIPAPI GdipRecordMetafileI(HDC,EmfType,GDIPCONST GpRect*,
-    MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**);
-GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics*,HDC);
-GpStatus WINGDIPAPI GdipResetClip(GpGraphics*);
-GpStatus WINGDIPAPI GdipResetWorldTransform(GpGraphics*);
-GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics*,GraphicsState);
-GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics*,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics*,GraphicsState*);
-GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics*,REAL,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipSetClipHrgn(GpGraphics*,HRGN,CombineMode);
-GpStatus WINGDIPAPI GdipSetClipGraphics(GpGraphics*,GpGraphics*,CombineMode);
-GpStatus WINGDIPAPI GdipSetClipPath(GpGraphics*,GpPath*,CombineMode);
-GpStatus WINGDIPAPI GdipSetClipRect(GpGraphics*,REAL,REAL,REAL,REAL,CombineMode);
-GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics*,INT,INT,INT,INT,CombineMode);
-GpStatus WINGDIPAPI GdipSetClipRegion(GpGraphics*,GpRegion*,CombineMode);
-GpStatus WINGDIPAPI GdipSetCompositingMode(GpGraphics*,CompositingMode);
-GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics*,CompositingQuality);
-GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics*,InterpolationMode);
-GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics*,REAL);
-GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics*,GpUnit);
-GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics*,PixelOffsetMode);
-GpStatus WINGDIPAPI GdipSetRenderingOrigin(GpGraphics*,INT,INT);
-GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics*,SmoothingMode);
-GpStatus WINGDIPAPI GdipSetTextContrast(GpGraphics*,UINT);
-GpStatus WINGDIPAPI GdipSetTextRenderingHint(GpGraphics*,TextRenderingHint);
-GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics*,GpMatrix*);
-GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics*, GpCoordinateSpace, GpCoordinateSpace,
-                                        GpPointF *, INT);
-GpStatus WINGDIPAPI GdipTransformPointsI(GpGraphics*, GpCoordinateSpace, GpCoordinateSpace,
-                                         GpPoint *, INT);
-GpStatus WINGDIPAPI GdipTranslateClip(GpGraphics*,REAL,REAL);
-GpStatus WINGDIPAPI GdipTranslateClipI(GpGraphics*,INT,INT);
-GpStatus WINGDIPAPI GdipTranslateWorldTransform(GpGraphics*,REAL,REAL,GpMatrixOrder);
-
-/* GraphicsPath */
-GpStatus WINGDIPAPI GdipAddPathArc(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipAddPathArcI(GpPath*,INT,INT,INT,INT,REAL,REAL);
-GpStatus WINGDIPAPI GdipAddPathBezier(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath*,INT,INT,INT,INT,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipAddPathClosedCurve(GpPath*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipAddPathClosedCurveI(GpPath*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipAddPathClosedCurve2(GpPath*,GDIPCONST GpPointF*,INT,REAL);
-GpStatus WINGDIPAPI GdipAddPathClosedCurve2I(GpPath*,GDIPCONST GpPoint*,INT,REAL);
-GpStatus WINGDIPAPI GdipAddPathCurve(GpPath*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipAddPathCurveI(GpPath*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipAddPathCurve2(GpPath*,GDIPCONST GpPointF*,INT,REAL);
-GpStatus WINGDIPAPI GdipAddPathCurve2I(GpPath*,GDIPCONST GpPoint*,INT,REAL);
-GpStatus WINGDIPAPI GdipAddPathCurve3(GpPath*,GDIPCONST GpPointF*,INT,INT,INT,REAL);
-GpStatus WINGDIPAPI GdipAddPathCurve3I(GpPath*,GDIPCONST GpPoint*,INT,INT,INT,REAL);
-GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath*,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipAddPathEllipseI(GpPath*,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipAddPathLine(GpPath*,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipAddPathLineI(GpPath*,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipAddPathLine2(GpPath*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipAddPathLine2I(GpPath*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipAddPathPath(GpPath*,GDIPCONST GpPath*,BOOL);
-GpStatus WINGDIPAPI GdipAddPathPie(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipAddPathPieI(GpPath*,INT,INT,INT,INT,REAL,REAL);
-GpStatus WINGDIPAPI GdipAddPathPolygon(GpPath*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipAddPathPolygonI(GpPath*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath*,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipAddPathRectangleI(GpPath*,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipAddPathRectangles(GpPath*,GDIPCONST GpRectF*,INT);
-GpStatus WINGDIPAPI GdipAddPathRectanglesI(GpPath*,GDIPCONST GpRect*,INT);
-GpStatus WINGDIPAPI GdipAddPathString(GpPath*,GDIPCONST WCHAR*,INT,GDIPCONST GpFontFamily*,INT,REAL,GDIPCONST RectF*,GDIPCONST GpStringFormat*);
-GpStatus WINGDIPAPI GdipAddPathStringI(GpPath*,GDIPCONST WCHAR*,INT,GDIPCONST GpFontFamily*,INT,REAL,GDIPCONST Rect*,GDIPCONST GpStringFormat*);
-GpStatus WINGDIPAPI GdipClearPathMarkers(GpPath*);
-GpStatus WINGDIPAPI GdipClonePath(GpPath*,GpPath**);
-GpStatus WINGDIPAPI GdipClosePathFigure(GpPath*);
-GpStatus WINGDIPAPI GdipClosePathFigures(GpPath*);
-GpStatus WINGDIPAPI GdipCreatePath(GpFillMode,GpPath**);
-GpStatus WINGDIPAPI GdipCreatePath2(GDIPCONST GpPointF*,GDIPCONST BYTE*,INT,
-    GpFillMode,GpPath**);
-GpStatus WINGDIPAPI GdipCreatePath2I(GDIPCONST GpPoint*,GDIPCONST BYTE*,INT,GpFillMode,GpPath**);
-GpStatus WINGDIPAPI GdipDeletePath(GpPath*);
-GpStatus WINGDIPAPI GdipFlattenPath(GpPath*,GpMatrix*,REAL);
-GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPoint(GpPath*,REAL,REAL,GpPen*,
-    GpGraphics*,BOOL*);
-GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPointI(GpPath*,INT,INT,GpPen*,
-    GpGraphics*,BOOL*);
-GpStatus WINGDIPAPI GdipIsVisiblePathPoint(GpPath*,REAL,REAL,GpGraphics*,BOOL*);
-GpStatus WINGDIPAPI GdipIsVisiblePathPointI(GpPath*,INT,INT,GpGraphics*,BOOL*);
-GpStatus WINGDIPAPI GdipGetPathData(GpPath*,GpPathData*);
-GpStatus WINGDIPAPI GdipGetPathFillMode(GpPath*,GpFillMode*);
-GpStatus WINGDIPAPI GdipGetPathLastPoint(GpPath*,GpPointF*);
-GpStatus WINGDIPAPI GdipGetPathPoints(GpPath*,GpPointF*,INT);
-GpStatus WINGDIPAPI GdipGetPathPointsI(GpPath*,GpPoint*,INT);
-GpStatus WINGDIPAPI GdipGetPathTypes(GpPath*,BYTE*,INT);
-GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath*,GpRectF*,GDIPCONST GpMatrix*,GDIPCONST GpPen*);
-GpStatus WINGDIPAPI GdipGetPathWorldBoundsI(GpPath*,GpRect*,GDIPCONST GpMatrix*,GDIPCONST GpPen*);
-GpStatus WINGDIPAPI GdipGetPointCount(GpPath*,INT*);
-GpStatus WINGDIPAPI GdipResetPath(GpPath*);
-GpStatus WINGDIPAPI GdipReversePath(GpPath*);
-GpStatus WINGDIPAPI GdipSetPathFillMode(GpPath*,GpFillMode);
-GpStatus WINGDIPAPI GdipSetPathMarker(GpPath*);
-GpStatus WINGDIPAPI GdipStartPathFigure(GpPath*);
-GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*);
-GpStatus WINGDIPAPI GdipWarpPath(GpPath*,GpMatrix*,GDIPCONST GpPointF*,INT,REAL,
-    REAL,REAL,REAL,WarpMode,REAL);
-GpStatus WINGDIPAPI GdipWidenPath(GpPath*,GpPen*,GpMatrix*,REAL);
-
-/* HatchBrush */
-GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle,ARGB,ARGB,GpHatch**);
-GpStatus WINGDIPAPI GdipGetHatchBackgroundColor(GpHatch*,ARGB*);
-GpStatus WINGDIPAPI GdipGetHatchForegroundColor(GpHatch*,ARGB*);
-GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch*,HatchStyle*);
-
-/* Image */
-GpStatus WINGDIPAPI GdipCloneImage(GpImage*, GpImage**);
-GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes*,GpImageAttributes**);
-GpStatus WINGDIPAPI GdipDisposeImage(GpImage*);
-GpStatus WINGDIPAPI GdipEmfToWmfBits(HENHMETAFILE,UINT,LPBYTE,INT,INT);
-GpStatus WINGDIPAPI GdipFindFirstImageItem(GpImage*,ImageItemData*);
-GpStatus WINGDIPAPI GdipFindNextImageItem(GpImage*,ImageItemData*);
-GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage*,UINT,UINT,PropertyItem*);
-GpStatus WINGDIPAPI GdipGetImageBounds(GpImage*,GpRectF*,GpUnit*);
-GpStatus WINGDIPAPI GdipGetImageDimension(GpImage*,REAL*,REAL*);
-GpStatus WINGDIPAPI GdipGetImageFlags(GpImage*,UINT*);
-GpStatus WINGDIPAPI GdipGetImageHeight(GpImage*,UINT*);
-GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage*,REAL*);
-GpStatus WINGDIPAPI GdipGetImageItemData(GpImage*,ImageItemData*);
-GpStatus WINGDIPAPI GdipGetImagePalette(GpImage*,ColorPalette*,INT);
-GpStatus WINGDIPAPI GdipGetImagePaletteSize(GpImage*,INT*);
-GpStatus WINGDIPAPI GdipGetImagePixelFormat(GpImage*,PixelFormat*);
-GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage*,GUID*);
-GpStatus WINGDIPAPI GdipGetImageThumbnail(GpImage*,UINT,UINT,GpImage**,GetThumbnailImageAbort,VOID*);
-GpStatus WINGDIPAPI GdipGetImageType(GpImage*,ImageType*);
-GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage*,REAL*);
-GpStatus WINGDIPAPI GdipGetImageWidth(GpImage*,UINT*);
-GpStatus WINGDIPAPI GdipGetPropertyCount(GpImage*,UINT*);
-GpStatus WINGDIPAPI GdipGetPropertyIdList(GpImage*,UINT,PROPID*);
-GpStatus WINGDIPAPI GdipGetPropertyItem(GpImage*,PROPID,UINT,PropertyItem*);
-GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage*,PROPID,UINT*);
-GpStatus WINGDIPAPI GdipGetPropertySize(GpImage*,UINT*,UINT*);
-GpStatus WINGDIPAPI GdipImageForceValidation(GpImage*);
-GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage*,GDIPCONST GUID*,UINT*);
-GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage*,UINT*);
-GpStatus WINGDIPAPI GdipImageGetFrameDimensionsList(GpImage*,GUID*,UINT);
-GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage*,RotateFlipType);
-GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage*,GDIPCONST GUID*,UINT);
-GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR*,GpImage**);
-GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR*,GpImage**);
-GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream*,GpImage**);
-GpStatus WINGDIPAPI GdipLoadImageFromStreamICM(IStream*,GpImage**);
-GpStatus WINGDIPAPI GdipRemovePropertyItem(GpImage*,PROPID);
-GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage*,GDIPCONST WCHAR*,GDIPCONST CLSID*,GDIPCONST EncoderParameters*);
-GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage*,IStream*,
-    GDIPCONST CLSID*,GDIPCONST EncoderParameters*);
-GpStatus WINGDIPAPI GdipSetImagePalette(GpImage*,GDIPCONST ColorPalette*);
-GpStatus WINGDIPAPI GdipSetPropertyItem(GpImage*,GDIPCONST PropertyItem*);
-
-/* ImageAttributes */
-GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes**);
-GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes*);
-GpStatus WINGDIPAPI GdipSetImageAttributesCachedBackground(GpImageAttributes*,
-    BOOL);
-GpStatus WINGDIPAPI GdipSetImageAttributesColorKeys(GpImageAttributes*,
-    ColorAdjustType,BOOL,ARGB,ARGB);
-GpStatus WINGDIPAPI GdipSetImageAttributesColorMatrix(GpImageAttributes*,
-    ColorAdjustType,BOOL,GDIPCONST ColorMatrix*,GDIPCONST ColorMatrix*,
-    ColorMatrixFlags);
-GpStatus WINGDIPAPI GdipSetImageAttributesGamma(GpImageAttributes*,
-    ColorAdjustType,BOOL,REAL);
-GpStatus WINGDIPAPI GdipSetImageAttributesNoOp(GpImageAttributes*,
-    ColorAdjustType,BOOL);
-GpStatus WINGDIPAPI GdipSetImageAttributesOutputChannel(GpImageAttributes*,
-    ColorAdjustType,BOOL,ColorChannelFlags);
-GpStatus WINGDIPAPI GdipSetImageAttributesOutputChannelColorProfile(
-    GpImageAttributes*,ColorAdjustType,BOOL,GDIPCONST WCHAR*);
-GpStatus WINGDIPAPI GdipSetImageAttributesRemapTable(GpImageAttributes*,
-    ColorAdjustType,BOOL,UINT,GDIPCONST ColorMap*);
-GpStatus WINGDIPAPI GdipSetImageAttributesThreshold(GpImageAttributes*,
-    ColorAdjustType,BOOL,REAL);
-GpStatus WINGDIPAPI GdipSetImageAttributesToIdentity(GpImageAttributes*,
-    ColorAdjustType);
-GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes*,WrapMode,
-    ARGB,BOOL);
-
-/* LinearGradientBrush */
-GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF*,GDIPCONST GpPointF*,
-    ARGB,ARGB,GpWrapMode,GpLineGradient**);
-GpStatus WINGDIPAPI GdipCreateLineBrushI(GDIPCONST GpPoint*,GDIPCONST GpPoint*,
-    ARGB,ARGB,GpWrapMode,GpLineGradient**);
-GpStatus WINGDIPAPI GdipCreateLineBrushFromRect(GDIPCONST GpRectF*,ARGB,ARGB,
-    LinearGradientMode,GpWrapMode,GpLineGradient**);
-GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect*,ARGB,ARGB,
-    LinearGradientMode,GpWrapMode,GpLineGradient**);
-GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF*,
-    ARGB,ARGB,REAL,BOOL,GpWrapMode,GpLineGradient**);
-GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngleI(GDIPCONST GpRect*,
-    ARGB,ARGB,REAL,BOOL,GpWrapMode,GpLineGradient**);
-GpStatus WINGDIPAPI GdipGetLineColors(GpLineGradient*,ARGB*);
-GpStatus WINGDIPAPI GdipGetLineGammaCorrection(GpLineGradient*,BOOL*);
-GpStatus WINGDIPAPI GdipGetLineRect(GpLineGradient*,GpRectF*);
-GpStatus WINGDIPAPI GdipGetLineRectI(GpLineGradient*,GpRect*);
-GpStatus WINGDIPAPI GdipGetLineWrapMode(GpLineGradient*,GpWrapMode*);
-GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient*,GDIPCONST REAL*,
-    GDIPCONST REAL*,INT);
-GpStatus WINGDIPAPI GdipGetLineBlend(GpLineGradient*,REAL*,REAL*,INT);
-GpStatus WINGDIPAPI GdipGetLineBlendCount(GpLineGradient*,INT*);
-GpStatus WINGDIPAPI GdipSetLinePresetBlend(GpLineGradient*,GDIPCONST ARGB*,
-    GDIPCONST REAL*,INT);
-GpStatus WINGDIPAPI GdipGetLinePresetBlend(GpLineGradient*,ARGB*,REAL*,INT);
-GpStatus WINGDIPAPI GdipGetLinePresetBlendCount(GpLineGradient*,INT*);
-GpStatus WINGDIPAPI GdipGetLineTransform(GpLineGradient*,GpMatrix*);
-GpStatus WINGDIPAPI GdipResetLineTransform(GpLineGradient*);
-GpStatus WINGDIPAPI GdipRotateLineTransform(GpLineGradient*,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipScaleLineTransform(GpLineGradient*,REAL,REAL,
-    GpMatrixOrder);
-GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient*,ARGB,ARGB);
-GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient*,BOOL);
-GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient*,REAL,REAL);
-GpStatus WINGDIPAPI GdipSetLineTransform(GpLineGradient*,GDIPCONST GpMatrix*);
-GpStatus WINGDIPAPI GdipSetLineLinearBlend(GpLineGradient*,REAL,REAL);
-GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient*,GpWrapMode);
-GpStatus WINGDIPAPI GdipTranslateLineTransform(GpLineGradient*,REAL,REAL,
-    GpMatrixOrder);
-
-/* Matrix */
-GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix*,GpMatrix**);
-GpStatus WINGDIPAPI GdipCreateMatrix(GpMatrix**);
-GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**);
-GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *,GDIPCONST GpPointF*,GpMatrix**);
-GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect*,GDIPCONST GpPoint*,GpMatrix**);
-GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*);
-GpStatus WINGDIPAPI GdipGetMatrixElements(GDIPCONST GpMatrix*,REAL*);
-GpStatus WINGDIPAPI GdipInvertMatrix(GpMatrix*);
-GpStatus WINGDIPAPI GdipIsMatrixEqual(GDIPCONST GpMatrix*, GDIPCONST GpMatrix*, BOOL*);
-GpStatus WINGDIPAPI GdipIsMatrixIdentity(GDIPCONST GpMatrix*, BOOL*);
-GpStatus WINGDIPAPI GdipIsMatrixInvertible(GDIPCONST GpMatrix*, BOOL*);
-GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix*,GDIPCONST GpMatrix*,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix*,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipShearMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipSetMatrixElements(GpMatrix*,REAL,REAL,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix*,GpPointF*,INT);
-GpStatus WINGDIPAPI GdipTransformMatrixPointsI(GpMatrix*,GpPoint*,INT);
-GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipVectorTransformMatrixPoints(GpMatrix*,GpPointF*,INT);
-GpStatus WINGDIPAPI GdipVectorTransformMatrixPointsI(GpMatrix*,GpPoint*,INT);
-
-/* Metafile */
-GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics*,GpMetafile*,INT*,
-    EmfType,const WCHAR*,GpMetafile**);
-GpStatus WINGDIPAPI GdipConvertToEmfPlusToFile(const GpGraphics*,GpMetafile*,INT*,const WCHAR*,EmfType,const WCHAR*,GpMetafile**);
-GpStatus WINGDIPAPI GdipConvertToEmfPlusToStream(const GpGraphics*,GpMetafile*,INT*,IStream*,EmfType,const WCHAR*,GpMetafile**);
-GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE,BOOL,GpMetafile**);
-GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE,BOOL,
-    GDIPCONST WmfPlaceableFileHeader*,GpMetafile**);
-GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR*, GDIPCONST WmfPlaceableFileHeader*,
-    GpMetafile**);
-GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR*,GpMetafile**);
-GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream*,GpMetafile**);
-GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile*,HENHMETAFILE*);
-GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile*,EmfPlusRecordType,UINT,UINT,GDIPCONST BYTE*);
-GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT);
-GpStatus WINGDIPAPI GdipRecordMetafile(HDC,EmfType,GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**);
-
-/* MetafileHeader */
-GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE,MetafileHeader*);
-GpStatus WINGDIPAPI GdipGetMetafileHeaderFromFile(GDIPCONST WCHAR*,MetafileHeader*);
-GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile*,MetafileHeader*);
-GpStatus WINGDIPAPI GdipGetMetafileHeaderFromStream(IStream*,MetafileHeader*);
-GpStatus WINGDIPAPI GdipGetMetafileHeaderFromWmf(HMETAFILE,GDIPCONST WmfPlaceableFileHeader*,MetafileHeader*);
-
-/* Notification */
-GpStatus WINAPI GdiplusNotificationHook(ULONG_PTR*);
-void WINAPI GdiplusNotificationUnhook(ULONG_PTR);
-
-/* PathGradientBrush */
-GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF*,INT,GpWrapMode,GpPathGradient**);
-GpStatus WINGDIPAPI GdipCreatePathGradientI(GDIPCONST GpPoint*,INT,GpWrapMode,GpPathGradient**);
-GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath*,
-    GpPathGradient**);
-GpStatus WINGDIPAPI GdipGetPathGradientBlend(GpPathGradient*,REAL*,REAL*,INT);
-GpStatus WINGDIPAPI GdipGetPathGradientBlendCount(GpPathGradient*,INT*);
-GpStatus WINGDIPAPI GdipGetPathGradientCenterColor(GpPathGradient*,ARGB*);
-GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient*,GpPointF*);
-GpStatus WINGDIPAPI GdipGetPathGradientCenterPointI(GpPathGradient*,GpPoint*);
-GpStatus WINGDIPAPI GdipGetPathGradientFocusScales(GpPathGradient*,REAL*,REAL*);
-GpStatus WINGDIPAPI GdipGetPathGradientGammaCorrection(GpPathGradient*,BOOL*);
-GpStatus WINGDIPAPI GdipGetPathGradientPointCount(GpPathGradient*,INT*);
-GpStatus WINGDIPAPI GdipSetPathGradientPresetBlend(GpPathGradient*,
-    GDIPCONST ARGB*,GDIPCONST REAL*,INT);
-GpStatus WINGDIPAPI GdipGetPathGradientRect(GpPathGradient*,GpRectF*);
-GpStatus WINGDIPAPI GdipGetPathGradientRectI(GpPathGradient*,GpRect*);
-GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient*,
-    ARGB*,INT*);
-GpStatus WINGDIPAPI GdipGetPathGradientWrapMode(GpPathGradient*,GpWrapMode*);
-GpStatus WINGDIPAPI GdipSetPathGradientBlend(GpPathGradient*,GDIPCONST REAL*,GDIPCONST REAL*,INT);
-GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient*,ARGB);
-GpStatus WINGDIPAPI GdipSetPathGradientCenterPoint(GpPathGradient*,GpPointF*);
-GpStatus WINGDIPAPI GdipSetPathGradientCenterPointI(GpPathGradient*,GpPoint*);
-GpStatus WINGDIPAPI GdipSetPathGradientFocusScales(GpPathGradient*,REAL,REAL);
-GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient*,BOOL);
-GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient*,REAL,REAL);
-GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient*,
-    GDIPCONST ARGB*,INT*);
-GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient*,GpWrapMode);
-GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorCount(GpPathGradient*,INT*);
-
-/* PathIterator */
-GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator**,GpPath*);
-GpStatus WINGDIPAPI GdipDeletePathIter(GpPathIterator*);
-GpStatus WINGDIPAPI GdipPathIterCopyData(GpPathIterator*,INT*,GpPointF*,BYTE*,
-    INT,INT);
-GpStatus WINGDIPAPI GdipPathIterGetCount(GpPathIterator*,INT*);
-GpStatus WINGDIPAPI GdipPathIterGetSubpathCount(GpPathIterator*,INT*);
-GpStatus WINGDIPAPI GdipPathIterEnumerate(GpPathIterator*,INT*,GpPointF*,BYTE*,INT);
-GpStatus WINGDIPAPI GdipPathIterHasCurve(GpPathIterator*,BOOL*);
-GpStatus WINGDIPAPI GdipPathIterIsValid(GpPathIterator*,BOOL*);
-GpStatus WINGDIPAPI GdipPathIterNextMarker(GpPathIterator*,INT*,INT*,INT*);
-GpStatus WINGDIPAPI GdipPathIterNextMarkerPath(GpPathIterator*,INT*,GpPath*);
-GpStatus WINGDIPAPI GdipPathIterNextPathType(GpPathIterator*,INT*,BYTE*,INT*,INT*);
-GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator*,INT*,INT*,INT*,BOOL*);
-GpStatus WINGDIPAPI GdipPathIterNextSubpathPath(GpPathIterator*,INT*,GpPath*,BOOL*);
-GpStatus WINGDIPAPI GdipPathIterRewind(GpPathIterator*);
-
-/* Pen */
-GpStatus WINGDIPAPI GdipClonePen(GpPen*,GpPen**);
-GpStatus WINGDIPAPI GdipCreatePen1(ARGB,REAL,GpUnit,GpPen**);
-GpStatus WINGDIPAPI GdipCreatePen2(GpBrush*,REAL,GpUnit,GpPen**);
-GpStatus WINGDIPAPI GdipDeletePen(GpPen*);
-GpStatus WINGDIPAPI GdipGetPenBrushFill(GpPen*,GpBrush**);
-GpStatus WINGDIPAPI GdipGetPenColor(GpPen*,ARGB*);
-GpStatus WINGDIPAPI GdipGetPenCustomStartCap(GpPen*,GpCustomLineCap**);
-GpStatus WINGDIPAPI GdipGetPenCustomEndCap(GpPen*,GpCustomLineCap**);
-GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen*,REAL*,INT);
-GpStatus WINGDIPAPI GdipGetPenDashCount(GpPen*,INT*);
-GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen*,REAL*);
-GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*);
-GpStatus WINGDIPAPI GdipGetPenMode(GpPen*,GpPenAlignment*);
-GpStatus WINGDIPAPI GdipResetPenTransform(GpPen*);
-GpStatus WINGDIPAPI GdipScalePenTransform(GpPen*,REAL,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*);
-GpStatus WINGDIPAPI GdipSetPenColor(GpPen*,ARGB);
-GpStatus WINGDIPAPI GdipSetPenCompoundArray(GpPen*,GDIPCONST REAL*,INT);
-GpStatus WINGDIPAPI GdipSetPenCustomEndCap(GpPen*,GpCustomLineCap*);
-GpStatus WINGDIPAPI GdipSetPenCustomStartCap(GpPen*,GpCustomLineCap*);
-GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen*,GDIPCONST REAL*,INT);
-GpStatus WINGDIPAPI GdipSetPenDashCap197819(GpPen*,GpDashCap);
-GpStatus WINGDIPAPI GdipSetPenDashOffset(GpPen*,REAL);
-GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen*,GpDashStyle);
-GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen*,GpLineCap);
-GpStatus WINGDIPAPI GdipGetPenFillType(GpPen*,GpPenType*);
-GpStatus WINGDIPAPI GdipSetPenLineCap197819(GpPen*,GpLineCap,GpLineCap,GpDashCap);
-GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen*,GpLineJoin);
-GpStatus WINGDIPAPI GdipSetPenMode(GpPen*,GpPenAlignment);
-GpStatus WINGDIPAPI GdipSetPenMiterLimit(GpPen*,REAL);
-GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen*,GpLineCap);
-GpStatus WINGDIPAPI GdipSetPenWidth(GpPen*,REAL);
-GpStatus WINGDIPAPI GdipGetPenDashCap197819(GpPen*,GpDashCap*);
-GpStatus WINGDIPAPI GdipGetPenEndCap(GpPen*,GpLineCap*);
-GpStatus WINGDIPAPI GdipGetPenLineJoin(GpPen*,GpLineJoin*);
-GpStatus WINGDIPAPI GdipGetPenMiterLimit(GpPen*,REAL*);
-GpStatus WINGDIPAPI GdipGetPenStartCap(GpPen*,GpLineCap*);
-GpStatus WINGDIPAPI GdipGetPenUnit(GpPen*,GpUnit*);
-GpStatus WINGDIPAPI GdipGetPenWidth(GpPen*,REAL*);
-
-/* Region */
-GpStatus WINGDIPAPI GdipCloneRegion(GpRegion *, GpRegion **);
-GpStatus WINGDIPAPI GdipCombineRegionPath(GpRegion *, GpPath *, CombineMode);
-GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *, GDIPCONST GpRectF *, CombineMode);
-GpStatus WINGDIPAPI GdipCombineRegionRectI(GpRegion *, GDIPCONST GpRect *, CombineMode);
-GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *, GpRegion *, CombineMode);
-GpStatus WINGDIPAPI GdipCreateRegion(GpRegion **);
-GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *, GpRegion **);
-GpStatus WINGDIPAPI GdipCreateRegionRect(GDIPCONST GpRectF *, GpRegion **);
-GpStatus WINGDIPAPI GdipCreateRegionRectI(GDIPCONST GpRect *, GpRegion **);
-GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *, INT, GpRegion **);
-GpStatus WINGDIPAPI GdipCreateRegionHrgn(HRGN, GpRegion **);
-GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *);
-GpStatus WINGDIPAPI GdipGetRegionBounds(GpRegion *, GpGraphics *, GpRectF *);
-GpStatus WINGDIPAPI GdipGetRegionBoundsI(GpRegion *, GpGraphics *, GpRect *);
-GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *, BYTE *, UINT, UINT *);
-GpStatus WINGDIPAPI GdipGetRegionDataSize(GpRegion *, UINT *);
-GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *, GpGraphics *, HRGN *);
-GpStatus WINGDIPAPI GdipGetRegionScans(GpRegion *, GpRectF *, INT *, GpMatrix *);
-GpStatus WINGDIPAPI GdipGetRegionScansI(GpRegion *, GpRect *, INT *, GpMatrix *);
-GpStatus WINGDIPAPI GdipGetRegionScansCount(GpRegion *, UINT *, GpMatrix *);
-GpStatus WINGDIPAPI GdipIsEmptyRegion(GpRegion *, GpGraphics *, BOOL *);
-GpStatus WINGDIPAPI GdipIsEqualRegion(GpRegion *, GpRegion *, GpGraphics *, BOOL *);
-GpStatus WINGDIPAPI GdipIsInfiniteRegion(GpRegion *, GpGraphics *, BOOL *);
-GpStatus WINGDIPAPI GdipIsVisibleRegionPoint(GpRegion *, REAL, REAL, GpGraphics *, BOOL *);
-GpStatus WINGDIPAPI GdipIsVisibleRegionPointI(GpRegion *, INT, INT, GpGraphics *, BOOL *);
-GpStatus WINGDIPAPI GdipIsVisibleRegionRect(GpRegion *, REAL, REAL, REAL, REAL, GpGraphics *, BOOL *);
-GpStatus WINGDIPAPI GdipIsVisibleRegionRectI(GpRegion *, INT, INT, INT, INT, GpGraphics *, BOOL *);
-GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *);
-GpStatus WINGDIPAPI GdipSetInfinite(GpRegion *);
-GpStatus WINGDIPAPI GdipTransformRegion(GpRegion *, GpMatrix *);
-GpStatus WINGDIPAPI GdipTranslateRegion(GpRegion *, REAL, REAL);
-GpStatus WINGDIPAPI GdipTranslateRegionI(GpRegion *, INT, INT);
-
-/* SolidBrush */
-GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**);
-GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill*,ARGB*);
-GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill*,ARGB);
-
-/* StringFormat */
-GpStatus WINGDIPAPI GdipCloneStringFormat(GDIPCONST GpStringFormat*,GpStringFormat**);
-GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**);
-GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*);
-GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat*,StringAlignment*);
-GpStatus WINGDIPAPI GdipGetStringFormatDigitSubstitution(GDIPCONST GpStringFormat*,LANGID*,
-        StringDigitSubstitute*);
-GpStatus WINGDIPAPI GdipGetStringFormatFlags(GDIPCONST GpStringFormat*, INT*);
-GpStatus WINGDIPAPI GdipGetStringFormatHotkeyPrefix(GDIPCONST GpStringFormat*,INT*);
-GpStatus WINGDIPAPI GdipGetStringFormatLineAlign(GpStringFormat*,StringAlignment*);
-GpStatus WINGDIPAPI GdipGetStringFormatMeasurableCharacterRangeCount(
-        GDIPCONST GpStringFormat*, INT*);
-GpStatus WINGDIPAPI GdipGetStringFormatTabStopCount(GDIPCONST GpStringFormat*,INT*);
-GpStatus WINGDIPAPI GdipGetStringFormatTabStops(GDIPCONST GpStringFormat*,INT,REAL*,REAL*);
-GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat*,StringTrimming*);
-GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat*,StringAlignment);
-GpStatus WINGDIPAPI GdipSetStringFormatDigitSubstitution(GpStringFormat*,LANGID,StringDigitSubstitute);
-GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat*,INT);
-GpStatus WINGDIPAPI GdipSetStringFormatLineAlign(GpStringFormat*,StringAlignment);
-GpStatus WINGDIPAPI GdipSetStringFormatMeasurableCharacterRanges(
-        GpStringFormat*, INT, GDIPCONST CharacterRange*);
-GpStatus WINGDIPAPI GdipSetStringFormatTabStops(GpStringFormat*,REAL,INT,GDIPCONST REAL*);
-GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat*,StringTrimming);
-GpStatus WINGDIPAPI GdipSetStringFormatFlags(GpStringFormat*, INT);
-GpStatus WINGDIPAPI GdipStringFormatGetGenericDefault(GpStringFormat **);
-GpStatus WINGDIPAPI GdipStringFormatGetGenericTypographic(GpStringFormat **);
-
-/* Texture */
-GpStatus WINGDIPAPI GdipCreateTexture(GpImage*,GpWrapMode,GpTexture**);
-GpStatus WINGDIPAPI GdipCreateTexture2(GpImage*,GpWrapMode,REAL,REAL,REAL,REAL,GpTexture**);
-GpStatus WINGDIPAPI GdipCreateTexture2I(GpImage*,GpWrapMode,INT,INT,INT,INT,GpTexture**);
-GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage*,GDIPCONST GpImageAttributes*,
-    REAL,REAL,REAL,REAL,GpTexture**);
-GpStatus WINGDIPAPI GdipCreateTextureIAI(GpImage*,GDIPCONST GpImageAttributes*,
-    INT,INT,INT,INT,GpTexture**);
-GpStatus WINGDIPAPI GdipGetTextureTransform(GpTexture*,GpMatrix*);
-GpStatus WINGDIPAPI GdipGetTextureWrapMode(GpTexture*, GpWrapMode*);
-GpStatus WINGDIPAPI GdipMultiplyTextureTransform(GpTexture*,
-    GDIPCONST GpMatrix*,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipResetTextureTransform(GpTexture*);
-GpStatus WINGDIPAPI GdipRotateTextureTransform(GpTexture*,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipScaleTextureTransform(GpTexture*,REAL,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipSetTextureTransform(GpTexture *,GDIPCONST GpMatrix*);
-GpStatus WINGDIPAPI GdipSetTextureWrapMode(GpTexture*, GpWrapMode);
-GpStatus WINGDIPAPI GdipTranslateTextureTransform(GpTexture*,REAL,REAL,
-    GpMatrixOrder);
-
-/* Without wrapper methods */
-GpStatus WINGDIPAPI GdipCreateStreamOnFile(GDIPCONST WCHAR*,UINT,IStream**);
-GpStatus WINGDIPAPI GdipGetImageEncodersSize(UINT *numEncoders, UINT *size);
-GpStatus WINGDIPAPI GdipGetImageEncoders(UINT numEncoders, UINT size, ImageCodecInfo *encoders);
-GpStatus WINGDIPAPI GdipTestControl(GpTestControlEnum,void*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/external/wine/include/gdiplusgpstubs.h b/external/wine/include/gdiplusgpstubs.h
deleted file mode 100644
index 5a65cd8..0000000
--- a/external/wine/include/gdiplusgpstubs.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2007 Google (Evan Stade)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _GDIPLUSGPSTUBS_H
-#define _GDIPLUSGPSTUBS_H
-
-#ifdef __cplusplus
-
-class GpGraphics {};
-class GpPen {};
-class GpBrush {};
-class GpHatch : public GpBrush {};
-class GpSolidFill : public GpBrush {};
-class GpPath {};
-class GpMatrix {};
-class GpPathIterator {};
-class GpCustomLineCap {};
-class GpAdjustableArrowCap : public GpCustomLineCap {};
-class GpImage {};
-class GpMetafile : public GpImage {};
-class GpImageAttributes {};
-class GpCachedBitmap {};
-class GpBitmap : public GpImage {};
-class GpPathGradient : public GpBrush {};
-class GpLineGradient : public GpBrush {};
-class GpTexture : public GpBrush {};
-class GpFont {};
-class GpFontCollection {};
-class GpFontFamily {};
-class GpStringFormat {};
-class GpRegion {};
-class CGpEffect {};
-
-#else /* end of c++ declarations */
-
-typedef struct GpGraphics GpGraphics;
-typedef struct GpPen GpPen;
-typedef struct GpBrush GpBrush;
-typedef struct GpHatch GpHatch;
-typedef struct GpSolidFill GpSolidFill;
-typedef struct GpPath GpPath;
-typedef struct GpMatrix GpMatrix;
-typedef struct GpPathIterator GpPathIterator;
-typedef struct GpCustomLineCap GpCustomLineCap;
-typedef struct GpAdjustableArrowCap GpAdjustableArrowCap;
-typedef struct GpImage GpImage;
-typedef struct GpMetafile GpMetafile;
-typedef struct GpImageAttributes GpImageAttributes;
-typedef struct GpCachedBitmap GpCachedBitmap;
-typedef struct GpBitmap GpBitmap;
-typedef struct GpPathGradient GpPathGradient;
-typedef struct GpLineGradient GpLineGradient;
-typedef struct GpTexture GpTexture;
-typedef struct GpFont GpFont;
-typedef struct GpFontCollection GpFontCollection;
-typedef struct GpFontFamily GpFontFamily;
-typedef struct GpStringFormat GpStringFormat;
-typedef struct GpRegion GpRegion;
-typedef struct CGpEffect CGpEffect;
-
-#endif /* end of c declarations */
-
-typedef Status GpStatus;
-typedef Unit GpUnit;
-typedef BrushType GpBrushType;
-typedef PointF GpPointF;
-typedef FillMode GpFillMode;
-typedef PathData GpPathData;
-typedef LineCap GpLineCap;
-typedef RectF GpRectF;
-typedef Rect GpRect;
-typedef LineJoin GpLineJoin;
-typedef DashCap GpDashCap;
-typedef DashStyle GpDashStyle;
-typedef MatrixOrder GpMatrixOrder;
-typedef Point GpPoint;
-typedef WrapMode GpWrapMode;
-typedef Color GpColor;
-typedef FlushIntention GpFlushIntention;
-typedef CoordinateSpace GpCoordinateSpace;
-typedef PenAlignment GpPenAlignment;
-typedef PenType GpPenType;
-
-#endif
diff --git a/external/wine/include/gdiplusimaging.h b/external/wine/include/gdiplusimaging.h
deleted file mode 100644
index 7c199c3..0000000
--- a/external/wine/include/gdiplusimaging.h
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
- * Copyright (C) 2007 Google (Evan Stade)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _GDIPLUSIMAGING_H
-#define _GDIPLUSIMAGING_H
-
-DEFINE_GUID(ImageFormatUndefined, 0xb96b3ca9, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatMemoryBMP, 0xb96b3caa, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatBMP,       0xb96b3cab, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatEMF,       0xb96b3cac, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatWMF,       0xb96b3cad, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatJPEG,      0xb96b3cae, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatPNG,       0xb96b3caf, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatGIF,       0xb96b3cb0, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatTIFF,      0xb96b3cb1, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatEXIF,      0xb96b3cb2, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatIcon,      0xb96b3cb5, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-
-DEFINE_GUID(FrameDimensionTime,       0x6aedbd6d, 0x3fb5, 0x418a, 0x83, 0xa6, 0x7f, 0x45, 0x22, 0x9d, 0xc8, 0x72);
-DEFINE_GUID(FrameDimensionPage,       0x7462dc86, 0x6180, 0x4c7e, 0x8e, 0x3f, 0xee, 0x73, 0x33, 0xa7, 0xa4, 0x83);
-DEFINE_GUID(FrameDimensionResolution, 0x84236f7b, 0x3bd3, 0x428f, 0x8d, 0xab, 0x4e, 0xa1, 0x43, 0x9c, 0xa3, 0x15);
-
-enum ImageLockMode
-{
-    ImageLockModeRead           = 1,
-    ImageLockModeWrite          = 2,
-    ImageLockModeUserInputBuf   = 4
-};
-
-enum RotateFlipType
-{
-    RotateNoneFlipNone = 0,
-    Rotate180FlipXY    = RotateNoneFlipNone,
-
-    Rotate90FlipNone   = 1,
-    Rotate270FlipXY    = Rotate90FlipNone,
-
-    Rotate180FlipNone  = 2,
-    RotateNoneFlipXY   = Rotate180FlipNone,
-
-    Rotate270FlipNone  = 3,
-    Rotate90FlipXY     = Rotate270FlipNone,
-
-    RotateNoneFlipX    = 4,
-    Rotate180FlipY     = RotateNoneFlipX,
-
-    Rotate90FlipX      = 5,
-    Rotate270FlipY     = Rotate90FlipX,
-
-    Rotate180FlipX     = 6,
-    RotateNoneFlipY    = Rotate180FlipX,
-
-    Rotate270FlipX     = 7,
-    Rotate90FlipY      = Rotate270FlipX
-};
-
-#ifdef __cplusplus
-class EncoderParameter
-{
-public:
-    GUID    Guid;
-    ULONG   NumberOfValues;
-    ULONG   Type;
-    VOID*   Value;
-};
-
-class EncoderParameters
-{
-public:
-    UINT Count;
-    EncoderParameter Parameter[1];
-};
-
-class ImageCodecInfo
-{
-public:
-    CLSID Clsid;
-    GUID  FormatID;
-    const WCHAR* CodecName;
-    const WCHAR* DllName;
-    const WCHAR* FormatDescription;
-    const WCHAR* FilenameExtension;
-    const WCHAR* MimeType;
-    DWORD Flags;
-    DWORD Version;
-    DWORD SigCount;
-    DWORD SigSize;
-    const BYTE* SigPattern;
-    const BYTE* SigMask;
-};
-
-class BitmapData
-{
-public:
-    UINT Width;
-    UINT Height;
-    INT Stride;
-    Gdiplus::PixelFormat PixelFormat;
-    VOID* Scan0;
-    UINT_PTR Reserved;
-};
-
-class ImageItemData
-{
-public:
-    UINT  Size;
-    UINT  Position;
-    VOID* Desc;
-    UINT  DescSize;
-    VOID* Data;
-    UINT  DataSize;
-    UINT  Cookie;
-};
-
-class PropertyItem
-{
-public:
-    PROPID id;
-    ULONG  length;
-    WORD   type;
-    VOID*  value;
-};
-
-#else /* end of c++ typedefs */
-
-typedef enum ImageLockMode ImageLockMode;
-typedef enum RotateFlipType RotateFlipType;
-
-typedef struct EncoderParameter
-{
-    GUID Guid;
-    ULONG NumberOfValues;
-    ULONG Type;
-    VOID* Value;
-} EncoderParameter;
-
-typedef struct EncoderParameters
-{
-    UINT Count;
-    EncoderParameter Parameter[1];
-} EncoderParameters;
-
-typedef struct ImageCodecInfo
-{
-    CLSID Clsid;
-    GUID  FormatID;
-    const WCHAR* CodecName;
-    const WCHAR* DllName;
-    const WCHAR* FormatDescription;
-    const WCHAR* FilenameExtension;
-    const WCHAR* MimeType;
-    DWORD Flags;
-    DWORD Version;
-    DWORD SigCount;
-    DWORD SigSize;
-    const BYTE* SigPattern;
-    const BYTE* SigMask;
-} ImageCodecInfo;
-
-typedef struct BitmapData
-{
-    UINT Width;
-    UINT Height;
-    INT Stride;
-    PixelFormat PixelFormat;
-    VOID* Scan0;
-    UINT_PTR Reserved; /* undocumented: stores the lock mode */
-} BitmapData;
-
-typedef struct ImageItemData
-{
-    UINT  Size;
-    UINT  Position;
-    VOID* Desc;
-    UINT  DescSize;
-    VOID* Data;
-    UINT  DataSize;
-    UINT  Cookie;
-} ImageItemData;
-
-typedef struct PropertyItem
-{
-    PROPID id;
-    ULONG  length;
-    WORD   type;
-    VOID*  value;
-} PropertyItem;
-
-#endif /* end of c typedefs */
-
-/* property types */
-#define PropertyTagTypeByte       1
-#define PropertyTagTypeASCII      2
-#define PropertyTagTypeShort      3
-#define PropertyTagTypeLong       4
-#define PropertyTagTypeRational   5
-#define PropertyTagTypeUndefined  7
-#define PropertyTagTypeSLONG      9
-#define PropertyTagTypeSRational 10
-
-/* property IDs */
-#define PropertyTagExifIFD                0x8769
-#define PropertyTagGpsIFD                 0x8825
-
-#define PropertyTagNewSubfileType         0x00FE
-#define PropertyTagSubfileType            0x00FF
-#define PropertyTagImageWidth             0x0100
-#define PropertyTagImageHeight            0x0101
-#define PropertyTagBitsPerSample          0x0102
-#define PropertyTagCompression            0x0103
-#define PropertyTagPhotometricInterp      0x0106
-#define PropertyTagThreshHolding          0x0107
-#define PropertyTagCellWidth              0x0108
-#define PropertyTagCellHeight             0x0109
-#define PropertyTagFillOrder              0x010A
-#define PropertyTagDocumentName           0x010D
-#define PropertyTagImageDescription       0x010E
-#define PropertyTagEquipMake              0x010F
-#define PropertyTagEquipModel             0x0110
-#define PropertyTagStripOffsets           0x0111
-#define PropertyTagOrientation            0x0112
-#define PropertyTagSamplesPerPixel        0x0115
-#define PropertyTagRowsPerStrip           0x0116
-#define PropertyTagStripBytesCount        0x0117
-#define PropertyTagMinSampleValue         0x0118
-#define PropertyTagMaxSampleValue         0x0119
-#define PropertyTagXResolution            0x011A
-#define PropertyTagYResolution            0x011B
-#define PropertyTagPlanarConfig           0x011C
-#define PropertyTagPageName               0x011D
-#define PropertyTagXPosition              0x011E
-#define PropertyTagYPosition              0x011F
-#define PropertyTagFreeOffset             0x0120
-#define PropertyTagFreeByteCounts         0x0121
-#define PropertyTagGrayResponseUnit       0x0122
-#define PropertyTagGrayResponseCurve      0x0123
-#define PropertyTagT4Option               0x0124
-#define PropertyTagT6Option               0x0125
-#define PropertyTagResolutionUnit         0x0128
-#define PropertyTagPageNumber             0x0129
-#define PropertyTagTransferFuncition      0x012D
-#define PropertyTagSoftwareUsed           0x0131
-#define PropertyTagDateTime               0x0132
-#define PropertyTagArtist                 0x013B
-#define PropertyTagHostComputer           0x013C
-#define PropertyTagPredictor              0x013D
-#define PropertyTagWhitePoint             0x013E
-#define PropertyTagPrimaryChromaticities  0x013F
-#define PropertyTagColorMap               0x0140
-#define PropertyTagHalftoneHints          0x0141
-#define PropertyTagTileWidth              0x0142
-#define PropertyTagTileLength             0x0143
-#define PropertyTagTileOffset             0x0144
-#define PropertyTagTileByteCounts         0x0145
-#define PropertyTagInkSet                 0x014C
-#define PropertyTagInkNames               0x014D
-#define PropertyTagNumberOfInks           0x014E
-#define PropertyTagDotRange               0x0150
-#define PropertyTagTargetPrinter          0x0151
-#define PropertyTagExtraSamples           0x0152
-#define PropertyTagSampleFormat           0x0153
-#define PropertyTagSMinSampleValue        0x0154
-#define PropertyTagSMaxSampleValue        0x0155
-#define PropertyTagTransferRange          0x0156
-
-#define PropertyTagJPEGProc               0x0200
-#define PropertyTagJPEGInterFormat        0x0201
-#define PropertyTagJPEGInterLength        0x0202
-#define PropertyTagJPEGRestartInterval    0x0203
-#define PropertyTagJPEGLosslessPredictors 0x0205
-#define PropertyTagJPEGPointTransforms    0x0206
-#define PropertyTagJPEGQTables            0x0207
-#define PropertyTagJPEGDCTables           0x0208
-#define PropertyTagJPEGACTables           0x0209
-
-#define PropertyTagYCbCrCoefficients      0x0211
-#define PropertyTagYCbCrSubsampling       0x0212
-#define PropertyTagYCbCrPositioning       0x0213
-#define PropertyTagREFBlackWhite          0x0214
-
-#define PropertyTagICCProfile          0x8773
-
-#define PropertyTagGamma                0x0301
-#define PropertyTagICCProfileDescriptor 0x0302
-#define PropertyTagSRGBRenderingIntent  0x0303
-
-#define PropertyTagImageTitle          0x0320
-#define PropertyTagCopyright           0x8298
-
-#define PropertyTagResolutionXUnit            0x5001
-#define PropertyTagResolutionYUnit            0x5002
-#define PropertyTagResolutionXLengthUnit      0x5003
-#define PropertyTagResolutionYLengthUnit      0x5004
-#define PropertyTagPrintFlags                 0x5005
-#define PropertyTagPrintFlagsVersion          0x5006
-#define PropertyTagPrintFlagsCrop             0x5007
-#define PropertyTagPrintFlagsBleedWidth       0x5008
-#define PropertyTagPrintFlagsBleedWidthScale  0x5009
-#define PropertyTagHalftoneLPI                0x500A
-#define PropertyTagHalftoneLPIUnit            0x500B
-#define PropertyTagHalftoneDegree             0x500C
-#define PropertyTagHalftoneShape              0x500D
-#define PropertyTagHalftoneMisc               0x500E
-#define PropertyTagHalftoneScreen             0x500F
-#define PropertyTagJPEGQuality                0x5010
-#define PropertyTagGridSize                   0x5011
-#define PropertyTagThumbnailFormat            0x5012
-#define PropertyTagThumbnailWidth             0x5013
-#define PropertyTagThumbnailHeight            0x5014
-#define PropertyTagThumbnailColorDepth        0x5015
-#define PropertyTagThumbnailPlanes            0x5016
-#define PropertyTagThumbnailRawBytes          0x5017
-#define PropertyTagThumbnailSize              0x5018
-#define PropertyTagThumbnailCompressedSize    0x5019
-#define PropertyTagColorTransferFunction      0x501A
-#define PropertyTagThumbnailData              0x501B
-
-#define PropertyTagThumbnailImageWidth        0x5020
-#define PropertyTagThumbnailImageHeight       0x5021
-#define PropertyTagThumbnailBitsPerSample     0x5022
-#define PropertyTagThumbnailCompression       0x5023
-#define PropertyTagThumbnailPhotometricInterp 0x5024
-#define PropertyTagThumbnailImageDescription  0x5025
-#define PropertyTagThumbnailEquipMake         0x5026
-#define PropertyTagThumbnailEquipModel        0x5027
-#define PropertyTagThumbnailStripOffsets      0x5028
-#define PropertyTagThumbnailOrientation       0x5029
-#define PropertyTagThumbnailSamplesPerPixel   0x502A
-#define PropertyTagThumbnailRowsPerStrip      0x502B
-#define PropertyTagThumbnailStripBytesCount   0x502C
-#define PropertyTagThumbnailResolutionX       0x502D
-#define PropertyTagThumbnailResolutionY       0x502E
-#define PropertyTagThumbnailPlanarConfig      0x502F
-#define PropertyTagThumbnailResolutionUnit    0x5030
-#define PropertyTagThumbnailTransferFunction  0x5031
-#define PropertyTagThumbnailSoftwareUsed      0x5032
-#define PropertyTagThumbnailDateTime          0x5033
-#define PropertyTagThumbnailArtist            0x5034
-#define PropertyTagThumbnailWhitePoint        0x5035
-#define PropertyTagThumbnailPrimaryChromaticities 0x5036
-#define PropertyTagThumbnailYCbCrCoefficients 0x5037
-#define PropertyTagThumbnailYCbCrSubsampling  0x5038
-#define PropertyTagThumbnailYCbCrPositioning  0x5039
-#define PropertyTagThumbnailRefBlackWhite     0x503A
-#define PropertyTagThumbnailCopyRight         0x503B
-
-#define PropertyTagLuminanceTable    0x5090
-#define PropertyTagChrominanceTable  0x5091
-
-#define PropertyTagFrameDelay        0x5100
-#define PropertyTagLoopCount         0x5101
-
-#define PropertyTagPixelUnit         0x5110
-#define PropertyTagPixelPerUnitX     0x5111
-#define PropertyTagPixelPerUnitY     0x5112

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list