Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-25 23:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SDK][INCLUDE] Improve gdiplusgraphics.h (#2222)

Browse source 
CORE-16585
This commit is contained in:
Katayama Hirofumi MZ 2020-01-01 19:10:47 +09:00 committed by GitHub
parent 91f3c8f81a
commit 265a890d7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 81 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sdk/include/psdk/gdiplusbase.h
View file

@ -61,6 +61,7 @@ class Matrix;
class Metafile;
class Pen;
class Region;
class StringFormat;
// get native
GpBrush *&
@ -72,6 +73,9 @@ getNat(const CachedBitmap *cb);
GpCustomLineCap *&
getNat(const CustomLineCap *cap);
GpFont *&
getNat(const Font *font);
GpFontCollection *&
getNat(const FontCollection *fc);
@ -90,10 +94,16 @@ getNat(const ImageAttributes *ia);
GpMatrix *&
getNat(const Matrix *matrix);
GpMetafile *&
getNat(const Metafile *metafile);
GpPen *&
getNat(const Pen *pen);
GpRegion *&
getNat(const Region *region);
GpStringFormat *&
getNat(const StringFormat *sf);
#endif /* _GDIPLUSBASE_H */

102
sdk/include/psdk/gdiplusgraphics.h
View file

@ -25,6 +25,7 @@ class Graphics : public GdiplusBase
friend class Font;
friend class Bitmap;
friend class CachedBitmap;
friend class ImageAttributes;
public:
Graphics(Image *image)
@ -248,7 +249,9 @@ class Graphics : public GdiplusBase
INT flags,
const Matrix *matrix)
{
return NotImplemented;
return SetStatus(DllExports::GdipDrawDriverString(
nativeGraphics, text, length, font ? getNat(font) : NULL, brush ? getNat(brush) : NULL, positions, flags,
matrix ? getNat(matrix) : NULL));
}
Status
@ -569,13 +572,17 @@ class Graphics : public GdiplusBase
const StringFormat *stringFormat,
const Brush *brush)
{
return NotImplemented;
return SetStatus(DllExports::GdipDrawString(
nativeGraphics, string, length, font ? getNat(font) : NULL, &layoutRect,
stringFormat ? getNat(stringFormat) : NULL, brush ? brush->nativeBrush : NULL));
}
Status
DrawString(const WCHAR *string, INT length, const Font *font, const PointF &origin, const Brush *brush)
{
return NotImplemented;
RectF rect(origin.X, origin.Y, 0.0f, 0.0f);
return SetStatus(DllExports::GdipDrawString(
nativeGraphics, string, length, font ? getNat(font) : NULL, &rect, NULL, brush ? getNat(brush) : NULL));
}
Status
@ -587,7 +594,10 @@ class Graphics : public GdiplusBase
const StringFormat *stringFormat,
const Brush *brush)
{
return NotImplemented;
RectF rect(origin.X, origin.Y, 0.0f, 0.0f);
return SetStatus(DllExports::GdipDrawString(
nativeGraphics, string, length, font ? getNat(font) : NULL, &rect,
stringFormat ? getNat(stringFormat) : NULL, brush ? getNat(brush) : NULL));
}
Status
@ -599,12 +609,12 @@ class Graphics : public GdiplusBase
Status
EnumerateMetafile(
const Metafile *metafile,
const Metafile &destPoint,
const PointF &destPoint,
EnumerateMetafileProc callback,
VOID *callbackData = NULL,
ImageAttributes *imageAttributes = NULL)
const ImageAttributes *imageAttributes = NULL)
{
return NotImplemented;
return SetStatus(NotImplemented);
}
Status
@ -613,10 +623,10 @@ class Graphics : public GdiplusBase
const Point *destPoints,
INT count,
EnumerateMetafileProc callback,
VOID *callbackData,
ImageAttributes *imageAttributes)
VOID *callbackData = NULL,
const ImageAttributes *imageAttributes = NULL)
{
return NotImplemented;
return SetStatus(NotImplemented);
}
Status
@ -626,10 +636,10 @@ class Graphics : public GdiplusBase
const Rect &srcRect,
Unit srcUnit,
EnumerateMetafileProc callback,
VOID *callbackData,
ImageAttributes *imageAttributes)
VOID *callbackData = NULL,
const ImageAttributes *imageAttributes = NULL)
{
return NotImplemented;
return SetStatus(NotImplemented);
}
Status
@ -638,10 +648,10 @@ class Graphics : public GdiplusBase
const PointF *destPoints,
INT count,
EnumerateMetafileProc callback,
VOID *callbackData,
ImageAttributes *imageAttributes)
VOID *callbackData = NULL,
const ImageAttributes *imageAttributes = NULL)
{
return NotImplemented;
return SetStatus(NotImplemented);
}
Status
@ -649,10 +659,10 @@ class Graphics : public GdiplusBase
const Metafile *metafile,
const Rect &destRect,
EnumerateMetafileProc callback,
VOID *callbackData,
ImageAttributes *imageAttributes)
VOID *callbackData = NULL,
const ImageAttributes *imageAttributes = NULL)
{
return NotImplemented;
return SetStatus(NotImplemented);
}
Status
@ -662,10 +672,10 @@ class Graphics : public GdiplusBase
const RectF &srcRect,
Unit srcUnit,
EnumerateMetafileProc callback,
VOID *callbackData,
ImageAttributes *imageAttributes)
VOID *callbackData = NULL,
const ImageAttributes *imageAttributes = NULL)
{
return NotImplemented;
return SetStatus(NotImplemented);
}
Status
@ -673,23 +683,23 @@ class Graphics : public GdiplusBase
const Metafile *metafile,
const RectF &destRect,
EnumerateMetafileProc callback,
VOID *callbackData,
ImageAttributes *imageAttributes)
VOID *callbackData = NULL,
const ImageAttributes *imageAttributes = NULL)
{
return NotImplemented;
return SetStatus(NotImplemented);
}
Status
EnumerateMetafile(
const Metafile *metafile,
const PointF &destPoint,
const Rect &srcRect,
const RectF &srcRect,
Unit srcUnit,
EnumerateMetafileProc callback,
VOID *callbackData,
ImageAttributes *imageAttributes)
VOID *callbackData = NULL,
const ImageAttributes *imageAttributes = NULL)
{
return NotImplemented;
return SetStatus(NotImplemented);
}
Status
@ -700,10 +710,10 @@ class Graphics : public GdiplusBase
const Rect &srcRect,
Unit srcUnit,
EnumerateMetafileProc callback,
VOID *callbackData,
ImageAttributes *imageAttributes)
VOID *callbackData = NULL,
const ImageAttributes *imageAttributes = NULL)
{
return NotImplemented;
return SetStatus(NotImplemented);
}
Status
@ -713,35 +723,35 @@ class Graphics : public GdiplusBase
const Rect &srcRect,
Unit srcUnit,
EnumerateMetafileProc callback,
VOID *callbackData,
ImageAttributes *imageAttributes)
VOID *callbackData = NULL,
const ImageAttributes *imageAttributes = NULL)
{
return NotImplemented;
return SetStatus(NotImplemented);
}
Status
EnumerateMetafile(
const Metafile *metafile,
const Point *destPoints,
const PointF *destPoints,
INT count,
const RectF &srcRect,
Unit srcUnit,
EnumerateMetafileProc callback,
VOID *callbackData,
ImageAttributes *imageAttributes)
VOID *callbackData = NULL,
const ImageAttributes *imageAttributes = NULL)
{
return NotImplemented;
return SetStatus(NotImplemented);
}
Status
EnumerateMetafile(
const Metafile *metafile,
const PointF &destPoint,
const Point &destPoint,
EnumerateMetafileProc callback,
VOID *callbackData,
ImageAttributes *imageAttributes)
VOID *callbackData = NULL,
const ImageAttributes *imageAttributes = NULL)
{
return NotImplemented;
return SetStatus(NotImplemented);
}
Status
@ -1344,7 +1354,7 @@ class Graphics : public GdiplusBase
Status
Restore(GraphicsState gstate)
{
return NotImplemented;
return SetStatus(DllExports::GdipRestoreGraphics(nativeGraphics, gstate));
}
Status
@ -1356,7 +1366,9 @@ class Graphics : public GdiplusBase
GraphicsState
Save()
{
return 0;
GraphicsState gstate;
SetStatus(DllExports::GdipSaveGraphics(nativeGraphics, &gstate));
return gstate;
}
Status

7
sdk/include/psdk/gdiplusmetafile.h
View file

@ -242,6 +242,13 @@ class Metafile : public Image
{
return static_cast<GpMetafile *>(nativeImage);
}
// get native
friend inline GpMetafile *&
getNat(const Metafile *metafile)
{
return reinterpret_cast<GpMetafile *&>(const_cast<Metafile *>(metafile)->nativeImage);
}
};
#endif /* _GDIPLUSMETAFILE_H */

7
sdk/include/psdk/gdiplusstringformat.h
View file

@ -211,6 +211,13 @@ class StringFormat : public GdiplusBase
lastStatus = status;
return status;
}
// get native
friend inline GpStringFormat *&
getNat(const StringFormat *sf)
{
return const_cast<StringFormat *>(sf)->nativeFormat;
}
};
#endif /* _GDIPLUSSTRINGFORMAT_H */