Modified: trunk/reactos/lib/gdiplus/gdiplus/arrow.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/bitmap.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/brush.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/clip.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/codec.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/container.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/dllmain.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/draw.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/effect.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/fill.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/font.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/graphics.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/image.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/linecap.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/linegradient.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/matrix.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/memory.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/metafile.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/palette.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/path.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/pathgradient.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/pathiterator.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/pen.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/region.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/string.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/texture.c
Modified: trunk/reactos/lib/gdiplus/gdiplus/transform.c
Deleted: trunk/reactos/lib/gdiplus/include/GdiPlusPrivate.h
Added: trunk/reactos/lib/gdiplus/include/gdiplusprivate.h
Deleted: trunk/reactos/w32api/include/GdiPlus.h
Deleted: trunk/reactos/w32api/include/GdiPlusBase.h
Deleted: trunk/reactos/w32api/include/GdiPlusBrush.h
Deleted: trunk/reactos/w32api/include/GdiPlusColor.h
Deleted: trunk/reactos/w32api/include/GdiPlusColorMatrix.h
Deleted: trunk/reactos/w32api/include/GdiPlusEffects.h
Deleted: trunk/reactos/w32api/include/GdiPlusEnums.h
Deleted: trunk/reactos/w32api/include/GdiPlusFlat.h
Deleted: trunk/reactos/w32api/include/GdiPlusGpStubs.h
Deleted: trunk/reactos/w32api/include/GdiPlusGraphics.h
Deleted: trunk/reactos/w32api/include/GdiPlusHeaders.h
Deleted: trunk/reactos/w32api/include/GdiPlusImageAttributes.h
Deleted: trunk/reactos/w32api/include/GdiPlusImaging.h
Deleted: trunk/reactos/w32api/include/GdiPlusInit.h
Deleted: trunk/reactos/w32api/include/GdiPlusLineCaps.h
Deleted: trunk/reactos/w32api/include/GdiPlusMatrix.h
Deleted: trunk/reactos/w32api/include/GdiPlusMem.h
Deleted: trunk/reactos/w32api/include/GdiPlusMetaFile.h
Deleted: trunk/reactos/w32api/include/GdiPlusMetaHeader.h
Deleted: trunk/reactos/w32api/include/GdiPlusPath.h
Deleted: trunk/reactos/w32api/include/GdiPlusPen.h
Deleted: trunk/reactos/w32api/include/GdiPlusPixelFormats.h
Deleted: trunk/reactos/w32api/include/GdiPlusStringFormat.h
Deleted: trunk/reactos/w32api/include/GdiPlusTypes.h
Added: trunk/reactos/w32api/include/gdiplus.h
Added: trunk/reactos/w32api/include/gdiplusbase.h
Added: trunk/reactos/w32api/include/gdiplusbrush.h
Added: trunk/reactos/w32api/include/gdipluscolor.h
Added: trunk/reactos/w32api/include/gdipluscolormatrix.h
Added: trunk/reactos/w32api/include/gdipluseffects.h
Added: trunk/reactos/w32api/include/gdiplusenums.h
Added: trunk/reactos/w32api/include/gdiplusflat.h
Added: trunk/reactos/w32api/include/gdiplusgpstubs.h
Added: trunk/reactos/w32api/include/gdiplusgraphics.h
Added: trunk/reactos/w32api/include/gdiplusheaders.h
Added: trunk/reactos/w32api/include/gdiplusimageattributes.h
Added: trunk/reactos/w32api/include/gdiplusimaging.h
Added: trunk/reactos/w32api/include/gdiplusinit.h
Added: trunk/reactos/w32api/include/gdipluslinecaps.h
Added: trunk/reactos/w32api/include/gdiplusmatrix.h
Added: trunk/reactos/w32api/include/gdiplusmem.h
Added: trunk/reactos/w32api/include/gdiplusmetafile.h
Added: trunk/reactos/w32api/include/gdiplusmetaheader.h
Added: trunk/reactos/w32api/include/gdipluspath.h
Added: trunk/reactos/w32api/include/gdipluspen.h
Added: trunk/reactos/w32api/include/gdipluspixelformats.h
Added: trunk/reactos/w32api/include/gdiplusstringformat.h
Added: trunk/reactos/w32api/include/gdiplustypes.h
--- trunk/reactos/lib/gdiplus/gdiplus/arrow.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/arrow.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/bitmap.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/bitmap.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/brush.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/brush.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/clip.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/clip.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/codec.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/codec.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/container.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/container.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/dllmain.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/dllmain.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
#ifdef DBG
--- trunk/reactos/lib/gdiplus/gdiplus/draw.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/draw.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/effect.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/effect.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/fill.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/fill.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/font.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/font.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/graphics.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/graphics.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/image.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/image.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/linecap.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/linecap.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,7 +1,6 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
-#include <GdiPlusPrivate.h>
/*
* @unimplemented
--- trunk/reactos/lib/gdiplus/gdiplus/linegradient.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/linegradient.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/matrix.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/matrix.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/memory.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/memory.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/metafile.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/metafile.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/palette.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/palette.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/path.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/path.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/pathgradient.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/pathgradient.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/pathiterator.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/pathiterator.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/pen.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/pen.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/region.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/region.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/string.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/string.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/texture.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/texture.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/gdiplus/transform.c 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/gdiplus/transform.c 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <GdiPlusPrivate.h>
+#include <gdiplusprivate.h>
#include <debug.h>
/*
--- trunk/reactos/lib/gdiplus/include/GdiPlusPrivate.h 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/lib/gdiplus/include/GdiPlusPrivate.h 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,342 +0,0 @@
-/*
- * COPYRIGHT: See COPYING in the top level directory
- * PROJECT: ReactOS gdiplus.dll
- * FILE: include/GdiPlusPrivate.h
- * PURPOSE: GDI+ private definitions
- */
-#ifndef __GDIPLUSPRIVATE_H
-#define __GDIPLUSPRIVATE_H
-
-#include <GdiPlusEnums.h>
-#include <GdiPlusPixelFormats.h>
-
-typedef float REAL;
-typedef ARGB Color;
-#include <GdiPlusColorMatrix.h>
-
-#define WINGDIPAPI __stdcall
-#define GDIPCONST const
-
-typedef BOOL (CALLBACK * ImageAbort)(VOID *);
-typedef ImageAbort DrawImageAbort;
-typedef ImageAbort GetThumbnailImageAbort;
-typedef BOOL (CALLBACK * EnumerateMetafileProc)(EmfPlusRecordType,
- UINT,
- UINT,
- const BYTE*,
- VOID*);
-
-typedef enum {
- Ok = 0,
- GenericError = 1,
- InvalidParameter = 2,
- OutOfMemory = 3,
- ObjectBusy = 4,
- InsufficientBuffer = 5,
- NotImplemented = 6,
- Win32Error = 7,
- WrongState = 8,
- Aborted = 9,
- FileNotFound = 10,
- ValueOverflow = 11,
- AccessDenied = 12,
- UnknownImageFormat = 13,
- FontFamilyNotFound = 14,
- FontStyleNotFound = 15,
- NotTrueTypeFont = 16,
- UnsupportedGdiplusVersion = 17,
- GdiplusNotInitialized = 18,
- PropertyNotFound = 19,
- PropertyNotSupported = 20,
- ProfileNotFound = 21
-} GpStatus;
-
-typedef GpStatus Status;
-
-typedef struct
-{
-} GpAdjustableArrowCap;
-
-typedef struct
-{
-} GpBitmap;
-
-typedef struct
-{
-} GpGraphics;
-
-typedef struct
-{
-} BitmapData;
-
-typedef struct
-{
-} CGpEffect;
-
-typedef struct
-{
-} GpCachedBitmap;
-
-typedef struct
-{
-} IDirectDrawSurface7;
-
-typedef struct
-{
-} GpBrush;
-
-typedef BrushType GpBrushType;
-
-typedef HatchStyle GpHatchStyle;
-
-typedef struct
-{
-} GpHatch;
-
-typedef struct
-{
-} GpPath;
-
-typedef struct
-{
-} GpRegion;
-
-typedef struct
-{
- CLSID Clsid;
- GUID FormatID;
- WCHAR *CodecName;
- WCHAR *DllName;
- WCHAR *FormatDescription;
- WCHAR *FilenameExtension;
- WCHAR *MimeType;
- DWORD Flags;
- DWORD Version;
- DWORD SigCount;
- DWORD SigSize;
- BYTE *SigPattern;
- BYTE *SigMask;
-} ImageCodecInfo;
-
-typedef Unit GpUnit;
-
-typedef struct
-{
-} GpPen;
-
-typedef struct
-{
- REAL X;
- REAL Y;
-} GpPointF;
-
-typedef struct
-{
- INT X;
- INT Y;
-} GpPoint;
-
-typedef FillMode GpFillMode;
-
-typedef struct
-{
-} GpSolidFill;
-
-typedef struct
-{
-} GpFont;
-
-typedef struct
-{
-} GpFontFamily;
-
-typedef struct
-{
-} GpFontCollection;
-
-typedef FlushIntention GpFlushIntention;
-
-typedef struct
-{
-} GpImage;
-
-typedef struct
-{
-} GpImageAttributes;
-
-typedef struct
-{
-} GpMatrix;
-
-typedef struct
-{
- GUID Guid;
- ULONG NumberOfValues;
- ULONG Type;
- VOID *Value;
-} EncoderParameter;
-
-typedef struct
-{
- UINT Count;
- EncoderParameter Parameter[1];
-} EncoderParameters;
-
-typedef struct
-{
- PROPID id;
- ULONG length;
- WORD type;
- VOID *value;
-} PropertyItem;
-
-typedef struct
-{
- UINT Size;
- UINT Position;
- VOID *Desc;
- UINT DescSize;
- UINT *Data;
- UINT DataSize;
- UINT Cookie;
-} ImageItemData;
-
-typedef enum {
- ColorChannelFlagsC = 0,
- ColorChannelFlagsM = 1,
- ColorChannelFlagsY = 2,
- ColorChannelFlagsK = 3,
- ColorChannelFlagsLast = 4
-} ColorChannelFlags;
-
-typedef LineCap GpLineCap;
-
-typedef struct
-{
-} GpCustomLineCap;
-
-typedef LineJoin GpLineJoin;
-
-typedef WrapMode GpWrapMode;
-
-typedef struct
-{
-} GpLineGradient;
-
-typedef MatrixOrder GpMatrixOrder;
-
-typedef struct
-{
-} GpMetafile;
-
-typedef struct
-{
- REAL X;
- REAL Y;
-} PointF;
-
-typedef struct
-{
- INT X;
- INT Y;
-} Point;
-
-typedef struct
-{
- REAL X;
- REAL Y;
- REAL Width;
- REAL Height;
-} RectF;
-
-typedef RectF GpRectF;
-
-typedef struct
-{
- INT X;
- INT Y;
- INT Width;
- INT Height;
-} Rect;
-
-typedef Rect GpRect;
-
-typedef struct
-{
-} MetafileHeader;
-
-typedef struct {
- INT16 Left;
- INT16 Top;
- INT16 Right;
- INT16 Bottom;
-} PWMFRect16;
-
-typedef struct {
- UINT32 Key;
- INT16 Hmf;
- PWMFRect16 BoundingBox;
- INT16 Inch;
- UINT32 Reserved;
- INT16 Checksum;
-} WmfPlaceableFileHeader;
-
-typedef struct
-{
-} GpPathData;
-
-typedef struct
-{
-} GpStringFormat;
-
-typedef struct
-{
-} GpPathGradient;
-
-typedef struct
-{
-} GpPathIterator;
-
-typedef DashCap GpDashCap;
-
-typedef PenAlignment GpPenAlignment;
-
-typedef PenType GpPenType;
-
-typedef DashStyle GpDashStyle;
-
-typedef struct
-{
-} CharacterRange;
-
-typedef struct
-{
-} GpTexture;
-
-typedef CoordinateSpace GpCoordinateSpace;
-
-typedef enum {
- DebugEventLevelFatal,
- DebugEventLevelWarning
-} DebugEventLevel;
-
-typedef VOID (WINAPI *DebugEventProc)(DebugEventLevel level,
- CHAR *message);
-
-typedef struct
-{
- UINT32 GdiplusVersion;
- DebugEventProc DebugEventCallback;
- BOOL SuppressBackgroundThread;
- BOOL SuppressExternalCodecs;
-} GdiplusStartupInput;
-
-typedef Status (WINAPI *NotificationHookProc)(OUT ULONG_PTR *token);
-typedef VOID (WINAPI *NotificationUnhookProc)(ULONG_PTR token);
-
-typedef struct {
- NotificationHookProc NotificationHook;
- NotificationUnhookProc NotificationUnhook;
-} GdiplusStartupOutput;
-
-#endif /* __GDIPLUSPRIVATE_H */
--- trunk/reactos/lib/gdiplus/include/GdiPlusPrivate.h 2005-06-23 13:31:33 UTC (rev 16244)
+++ trunk/reactos/lib/gdiplus/include/gdiplusprivate.h 2005-06-23 18:15:04 UTC (rev 16249)
@@ -0,0 +1,342 @@
+/*
+ * COPYRIGHT: See COPYING in the top level directory
+ * PROJECT: ReactOS gdiplus.dll
+ * FILE: include/GdiPlusPrivate.h
+ * PURPOSE: GDI+ private definitions
+ */
+#ifndef __GDIPLUSPRIVATE_H
+#define __GDIPLUSPRIVATE_H
+
+#include <gdiplusenums.h>
+#include <gdipluspixelformats.h>
+
+typedef float REAL;
+typedef ARGB Color;
+#include <gdipluscolormatrix.h>
+
+#define WINGDIPAPI __stdcall
+#define GDIPCONST const
+
+typedef BOOL (CALLBACK * ImageAbort)(VOID *);
+typedef ImageAbort DrawImageAbort;
+typedef ImageAbort GetThumbnailImageAbort;
+typedef BOOL (CALLBACK * EnumerateMetafileProc)(EmfPlusRecordType,
+ UINT,
+ UINT,
+ const BYTE*,
+ VOID*);
+
+typedef enum {
+ Ok = 0,
+ GenericError = 1,
+ InvalidParameter = 2,
+ OutOfMemory = 3,
+ ObjectBusy = 4,
+ InsufficientBuffer = 5,
+ NotImplemented = 6,
+ Win32Error = 7,
+ WrongState = 8,
+ Aborted = 9,
+ FileNotFound = 10,
+ ValueOverflow = 11,
+ AccessDenied = 12,
+ UnknownImageFormat = 13,
+ FontFamilyNotFound = 14,
+ FontStyleNotFound = 15,
+ NotTrueTypeFont = 16,
+ UnsupportedGdiplusVersion = 17,
+ GdiplusNotInitialized = 18,
+ PropertyNotFound = 19,
+ PropertyNotSupported = 20,
+ ProfileNotFound = 21
+} GpStatus;
+
+typedef GpStatus Status;
+
+typedef struct
+{
+} GpAdjustableArrowCap;
+
+typedef struct
+{
+} GpBitmap;
+
+typedef struct
+{
+} GpGraphics;
+
+typedef struct
+{
+} BitmapData;
+
+typedef struct
+{
+} CGpEffect;
+
+typedef struct
+{
+} GpCachedBitmap;
+
+typedef struct
+{
+} IDirectDrawSurface7;
+
+typedef struct
+{
+} GpBrush;
+
+typedef BrushType GpBrushType;
+
+typedef HatchStyle GpHatchStyle;
+
+typedef struct
+{
+} GpHatch;
+
+typedef struct
+{
+} GpPath;
+
+typedef struct
+{
+} GpRegion;
+
+typedef struct
+{
+ CLSID Clsid;
+ GUID FormatID;
+ WCHAR *CodecName;
+ WCHAR *DllName;
+ WCHAR *FormatDescription;
+ WCHAR *FilenameExtension;
+ WCHAR *MimeType;
+ DWORD Flags;
+ DWORD Version;
+ DWORD SigCount;
+ DWORD SigSize;
+ BYTE *SigPattern;
+ BYTE *SigMask;
+} ImageCodecInfo;
+
+typedef Unit GpUnit;
+
+typedef struct
+{
+} GpPen;
+
+typedef struct
+{
+ REAL X;
+ REAL Y;
+} GpPointF;
+
+typedef struct
+{
+ INT X;
+ INT Y;
+} GpPoint;
+
+typedef FillMode GpFillMode;
+
+typedef struct
+{
+} GpSolidFill;
+
+typedef struct
+{
+} GpFont;
+
+typedef struct
+{
+} GpFontFamily;
+
+typedef struct
+{
+} GpFontCollection;
+
+typedef FlushIntention GpFlushIntention;
+
+typedef struct
+{
+} GpImage;
+
+typedef struct
+{
+} GpImageAttributes;
+
+typedef struct
+{
+} GpMatrix;
+
+typedef struct
+{
+ GUID Guid;
+ ULONG NumberOfValues;
+ ULONG Type;
+ VOID *Value;
+} EncoderParameter;
+
+typedef struct
+{
+ UINT Count;
+ EncoderParameter Parameter[1];
+} EncoderParameters;
+
+typedef struct
+{
+ PROPID id;
+ ULONG length;
+ WORD type;
+ VOID *value;
+} PropertyItem;
+
+typedef struct
+{
+ UINT Size;
+ UINT Position;
+ VOID *Desc;
+ UINT DescSize;
+ UINT *Data;
+ UINT DataSize;
+ UINT Cookie;
+} ImageItemData;
+
+typedef enum {
+ ColorChannelFlagsC = 0,
+ ColorChannelFlagsM = 1,
+ ColorChannelFlagsY = 2,
+ ColorChannelFlagsK = 3,
+ ColorChannelFlagsLast = 4
+} ColorChannelFlags;
+
+typedef LineCap GpLineCap;
+
+typedef struct
+{
+} GpCustomLineCap;
+
+typedef LineJoin GpLineJoin;
+
+typedef WrapMode GpWrapMode;
+
+typedef struct
+{
+} GpLineGradient;
+
+typedef MatrixOrder GpMatrixOrder;
+
+typedef struct
+{
+} GpMetafile;
+
+typedef struct
+{
+ REAL X;
+ REAL Y;
+} PointF;
+
+typedef struct
+{
+ INT X;
+ INT Y;
+} Point;
+
+typedef struct
+{
+ REAL X;
+ REAL Y;
+ REAL Width;
+ REAL Height;
+} RectF;
+
+typedef RectF GpRectF;
+
+typedef struct
+{
+ INT X;
+ INT Y;
+ INT Width;
+ INT Height;
+} Rect;
+
+typedef Rect GpRect;
+
+typedef struct
+{
+} MetafileHeader;
+
+typedef struct {
+ INT16 Left;
+ INT16 Top;
+ INT16 Right;
+ INT16 Bottom;
+} PWMFRect16;
+
+typedef struct {
+ UINT32 Key;
+ INT16 Hmf;
+ PWMFRect16 BoundingBox;
+ INT16 Inch;
+ UINT32 Reserved;
+ INT16 Checksum;
+} WmfPlaceableFileHeader;
+
+typedef struct
+{
+} GpPathData;
+
+typedef struct
+{
+} GpStringFormat;
+
+typedef struct
+{
+} GpPathGradient;
+
+typedef struct
+{
+} GpPathIterator;
+
+typedef DashCap GpDashCap;
+
+typedef PenAlignment GpPenAlignment;
+
+typedef PenType GpPenType;
+
+typedef DashStyle GpDashStyle;
+
+typedef struct
+{
+} CharacterRange;
+
+typedef struct
+{
+} GpTexture;
+
+typedef CoordinateSpace GpCoordinateSpace;
+
+typedef enum {
+ DebugEventLevelFatal,
+ DebugEventLevelWarning
+} DebugEventLevel;
+
+typedef VOID (WINAPI *DebugEventProc)(DebugEventLevel level,
+ CHAR *message);
+
+typedef struct
+{
+ UINT32 GdiplusVersion;
+ DebugEventProc DebugEventCallback;
+ BOOL SuppressBackgroundThread;
+ BOOL SuppressExternalCodecs;
+} GdiplusStartupInput;
+
+typedef Status (WINAPI *NotificationHookProc)(OUT ULONG_PTR *token);
+typedef VOID (WINAPI *NotificationUnhookProc)(ULONG_PTR token);
+
+typedef struct {
+ NotificationHookProc NotificationHook;
+ NotificationUnhookProc NotificationUnhook;
+} GdiplusStartupOutput;
+
+#endif /* __GDIPLUSPRIVATE_H */
--- trunk/reactos/w32api/include/GdiPlus.h 2005-06-23 18:12:17 UTC (rev 16248)
+++ trunk/reactos/w32api/include/GdiPlus.h 2005-06-23 18:15:04 UTC (rev 16249)
@@ -1,78 +0,0 @@
-/*
- * GdiPlus.h
[truncated at 1000 lines; 7556 more skipped]