From 4284ffaaeebdcd4a7d945aa1b044947fdabede7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Mon, 22 Aug 2011 13:33:48 -0400 Subject: [PATCH] libfreerdp-gdi: added export definitions --- include/freerdp/gdi/16bpp.h | 1 + include/freerdp/gdi/32bpp.h | 11 +++++----- include/freerdp/gdi/8bpp.h | 9 +++++---- include/freerdp/gdi/bitmap.h | 29 +++++++++++++------------- include/freerdp/gdi/brush.h | 7 ++++--- include/freerdp/gdi/clipping.h | 9 +++++---- include/freerdp/gdi/dc.h | 11 +++++----- include/freerdp/gdi/drawing.h | 15 +++++++------- include/freerdp/gdi/line.h | 11 +++++----- include/freerdp/gdi/palette.h | 5 +++-- include/freerdp/gdi/pen.h | 9 +++++---- include/freerdp/gdi/region.h | 37 +++++++++++++++++----------------- include/freerdp/gdi/shape.h | 11 +++++----- libfreerdp-gdi/region.c | 32 ++++++++++++++--------------- 14 files changed, 105 insertions(+), 92 deletions(-) diff --git a/include/freerdp/gdi/16bpp.h b/include/freerdp/gdi/16bpp.h index 8566f0d87..629e6129b 100644 --- a/include/freerdp/gdi/16bpp.h +++ b/include/freerdp/gdi/16bpp.h @@ -17,6 +17,7 @@ * limitations under the License. */ +#include #include #include diff --git a/include/freerdp/gdi/32bpp.h b/include/freerdp/gdi/32bpp.h index ee484dac2..010cba9bd 100644 --- a/include/freerdp/gdi/32bpp.h +++ b/include/freerdp/gdi/32bpp.h @@ -17,14 +17,15 @@ * limitations under the License. */ +#include #include #include typedef void (*pSetPixel32_ROP2)(uint32 *pixel, uint32 *pen); -uint32 gdi_get_color_32bpp(HGDI_DC hdc, GDI_COLOR color); +FREERDP_API uint32 gdi_get_color_32bpp(HGDI_DC hdc, GDI_COLOR color); -int FillRect_32bpp(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr); -int BitBlt_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc, int rop); -int PatBlt_32bpp(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop); -int LineTo_32bpp(HGDI_DC hdc, int nXEnd, int nYEnd); +FREERDP_API int FillRect_32bpp(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr); +FREERDP_API int BitBlt_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc, int rop); +FREERDP_API int PatBlt_32bpp(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop); +FREERDP_API int LineTo_32bpp(HGDI_DC hdc, int nXEnd, int nYEnd); diff --git a/include/freerdp/gdi/8bpp.h b/include/freerdp/gdi/8bpp.h index e87750d6f..c55b77391 100644 --- a/include/freerdp/gdi/8bpp.h +++ b/include/freerdp/gdi/8bpp.h @@ -17,12 +17,13 @@ * limitations under the License. */ +#include #include #include typedef void (*pSetPixel8_ROP2)(uint8 *pixel, uint8 *pen); -int FillRect_8bpp(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr); -int BitBlt_8bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc, int rop); -int PatBlt_8bpp(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop); -int LineTo_8bpp(HGDI_DC hdc, int nXEnd, int nYEnd); +FREERDP_API int FillRect_8bpp(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr); +FREERDP_API int BitBlt_8bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc, int rop); +FREERDP_API int PatBlt_8bpp(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop); +FREERDP_API int LineTo_8bpp(HGDI_DC hdc, int nXEnd, int nYEnd); diff --git a/include/freerdp/gdi/bitmap.h b/include/freerdp/gdi/bitmap.h index 0b9bad9c5..a0ddb7bb0 100644 --- a/include/freerdp/gdi/bitmap.h +++ b/include/freerdp/gdi/bitmap.h @@ -20,22 +20,23 @@ #ifndef __GDI_BITMAP_H #define __GDI_BITMAP_H +#include #include -GDI_COLOR gdi_GetPixel(HGDI_DC hdc, int nXPos, int nYPos); -GDI_COLOR gdi_SetPixel(HGDI_DC hdc, int X, int Y, GDI_COLOR crColor); -uint8 gdi_GetPixel_8bpp(HGDI_BITMAP hBmp, int X, int Y); -uint16 gdi_GetPixel_16bpp(HGDI_BITMAP hBmp, int X, int Y); -uint32 gdi_GetPixel_32bpp(HGDI_BITMAP hBmp, int X, int Y); -uint8* gdi_GetPointer_8bpp(HGDI_BITMAP hBmp, int X, int Y); -uint16* gdi_GetPointer_16bpp(HGDI_BITMAP hBmp, int X, int Y); -uint32* gdi_GetPointer_32bpp(HGDI_BITMAP hBmp, int X, int Y); -void gdi_SetPixel_8bpp(HGDI_BITMAP hBmp, int X, int Y, uint8 pixel); -void gdi_SetPixel_16bpp(HGDI_BITMAP hBmp, int X, int Y, uint16 pixel); -void gdi_SetPixel_32bpp(HGDI_BITMAP hBmp, int X, int Y, uint32 pixel); -HGDI_BITMAP gdi_CreateBitmap(int nWidth, int nHeight, int cBitsPerPixel, uint8* data); -HGDI_BITMAP gdi_CreateCompatibleBitmap(HGDI_DC hdc, int nWidth, int nHeight); -int gdi_BitBlt(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc, int rop); +FREERDP_API GDI_COLOR gdi_GetPixel(HGDI_DC hdc, int nXPos, int nYPos); +FREERDP_API GDI_COLOR gdi_SetPixel(HGDI_DC hdc, int X, int Y, GDI_COLOR crColor); +FREERDP_API uint8 gdi_GetPixel_8bpp(HGDI_BITMAP hBmp, int X, int Y); +FREERDP_API uint16 gdi_GetPixel_16bpp(HGDI_BITMAP hBmp, int X, int Y); +FREERDP_API uint32 gdi_GetPixel_32bpp(HGDI_BITMAP hBmp, int X, int Y); +FREERDP_API uint8* gdi_GetPointer_8bpp(HGDI_BITMAP hBmp, int X, int Y); +FREERDP_API uint16* gdi_GetPointer_16bpp(HGDI_BITMAP hBmp, int X, int Y); +FREERDP_API uint32* gdi_GetPointer_32bpp(HGDI_BITMAP hBmp, int X, int Y); +FREERDP_API void gdi_SetPixel_8bpp(HGDI_BITMAP hBmp, int X, int Y, uint8 pixel); +FREERDP_API void gdi_SetPixel_16bpp(HGDI_BITMAP hBmp, int X, int Y, uint16 pixel); +FREERDP_API void gdi_SetPixel_32bpp(HGDI_BITMAP hBmp, int X, int Y, uint32 pixel); +FREERDP_API HGDI_BITMAP gdi_CreateBitmap(int nWidth, int nHeight, int cBitsPerPixel, uint8* data); +FREERDP_API HGDI_BITMAP gdi_CreateCompatibleBitmap(HGDI_DC hdc, int nWidth, int nHeight); +FREERDP_API int gdi_BitBlt(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc, int rop); typedef int (*pBitBlt)(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc, int rop); diff --git a/include/freerdp/gdi/brush.h b/include/freerdp/gdi/brush.h index e3da8b633..acafc2aba 100644 --- a/include/freerdp/gdi/brush.h +++ b/include/freerdp/gdi/brush.h @@ -20,11 +20,12 @@ #ifndef __GDI_BRUSH_H #define __GDI_BRUSH_H +#include #include -HGDI_BRUSH gdi_CreateSolidBrush(GDI_COLOR crColor); -HGDI_BRUSH gdi_CreatePatternBrush(HGDI_BITMAP hbmp); -int gdi_PatBlt(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop); +FREERDP_API HGDI_BRUSH gdi_CreateSolidBrush(GDI_COLOR crColor); +FREERDP_API HGDI_BRUSH gdi_CreatePatternBrush(HGDI_BITMAP hbmp); +FREERDP_API int gdi_PatBlt(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop); typedef int (*pPatBlt)(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop); diff --git a/include/freerdp/gdi/clipping.h b/include/freerdp/gdi/clipping.h index 931cd77c6..88fede0a2 100644 --- a/include/freerdp/gdi/clipping.h +++ b/include/freerdp/gdi/clipping.h @@ -20,11 +20,12 @@ #ifndef __GDI_CLIPPING_H #define __GDI_CLIPPING_H +#include #include -int gdi_SetClipRgn(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight); -HGDI_RGN gdi_GetClipRgn(HGDI_DC hdc); -int gdi_SetNullClipRgn(HGDI_DC hdc); -int gdi_ClipCoords(HGDI_DC hdc, int *x, int *y, int *w, int *h, int *srcx, int *srcy); +FREERDP_API int gdi_SetClipRgn(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight); +FREERDP_API HGDI_RGN gdi_GetClipRgn(HGDI_DC hdc); +FREERDP_API int gdi_SetNullClipRgn(HGDI_DC hdc); +FREERDP_API int gdi_ClipCoords(HGDI_DC hdc, int *x, int *y, int *w, int *h, int *srcx, int *srcy); #endif /* __GDI_CLIPPING_H */ diff --git a/include/freerdp/gdi/dc.h b/include/freerdp/gdi/dc.h index 14482f3ca..d95f266dd 100644 --- a/include/freerdp/gdi/dc.h +++ b/include/freerdp/gdi/dc.h @@ -20,12 +20,13 @@ #ifndef __GDI_DC_H #define __GDI_DC_H +#include #include -HGDI_DC gdi_GetDC(); -HGDI_DC gdi_CreateCompatibleDC(HGDI_DC hdc); -HGDIOBJECT gdi_SelectObject(HGDI_DC hdc, HGDIOBJECT hgdiobject); -int gdi_DeleteObject(HGDIOBJECT hgdiobject); -int gdi_DeleteDC(HGDI_DC hdc); +FREERDP_API HGDI_DC gdi_GetDC(); +FREERDP_API HGDI_DC gdi_CreateCompatibleDC(HGDI_DC hdc); +FREERDP_API HGDIOBJECT gdi_SelectObject(HGDI_DC hdc, HGDIOBJECT hgdiobject); +FREERDP_API int gdi_DeleteObject(HGDIOBJECT hgdiobject); +FREERDP_API int gdi_DeleteDC(HGDI_DC hdc); #endif /* __GDI_DC_H */ diff --git a/include/freerdp/gdi/drawing.h b/include/freerdp/gdi/drawing.h index 08fafa9e8..7447450c8 100644 --- a/include/freerdp/gdi/drawing.h +++ b/include/freerdp/gdi/drawing.h @@ -20,14 +20,15 @@ #ifndef __GDI_DRAWING_H #define __GDI_DRAWING_H +#include #include -int gdi_GetROP2(HGDI_DC hdc); -int gdi_SetROP2(HGDI_DC hdc, int fnDrawMode); -GDI_COLOR gdi_GetBkColor(HGDI_DC hdc); -GDI_COLOR gdi_SetBkColor(HGDI_DC hdc, GDI_COLOR crColor); -int gdi_GetBkMode(HGDI_DC hdc); -int gdi_SetBkMode(HGDI_DC hdc, int iBkMode); -GDI_COLOR gdi_SetTextColor(HGDI_DC hdc, GDI_COLOR crColor); +FREERDP_API int gdi_GetROP2(HGDI_DC hdc); +FREERDP_API int gdi_SetROP2(HGDI_DC hdc, int fnDrawMode); +FREERDP_API GDI_COLOR gdi_GetBkColor(HGDI_DC hdc); +FREERDP_API GDI_COLOR gdi_SetBkColor(HGDI_DC hdc, GDI_COLOR crColor); +FREERDP_API int gdi_GetBkMode(HGDI_DC hdc); +FREERDP_API int gdi_SetBkMode(HGDI_DC hdc, int iBkMode); +FREERDP_API GDI_COLOR gdi_SetTextColor(HGDI_DC hdc, GDI_COLOR crColor); #endif /* __GDI_DRAWING_H */ diff --git a/include/freerdp/gdi/line.h b/include/freerdp/gdi/line.h index f5b9797f9..3c4ed5e96 100644 --- a/include/freerdp/gdi/line.h +++ b/include/freerdp/gdi/line.h @@ -20,13 +20,14 @@ #ifndef __GDI_LINE_H #define __GDI_LINE_H +#include #include -int gdi_LineTo(HGDI_DC hdc, int nXEnd, int nYEnd); -int gdi_PolylineTo(HGDI_DC hdc, GDI_POINT *lppt, int cCount); -int gdi_Polyline(HGDI_DC hdc, GDI_POINT *lppt, int cPoints); -int gdi_PolyPolyline(HGDI_DC hdc, GDI_POINT *lppt, int *lpdwPolyPoints, int cCount); -int gdi_MoveToEx(HGDI_DC hdc, int X, int Y, HGDI_POINT lpPoint); +FREERDP_API int gdi_LineTo(HGDI_DC hdc, int nXEnd, int nYEnd); +FREERDP_API int gdi_PolylineTo(HGDI_DC hdc, GDI_POINT *lppt, int cCount); +FREERDP_API int gdi_Polyline(HGDI_DC hdc, GDI_POINT *lppt, int cPoints); +FREERDP_API int gdi_PolyPolyline(HGDI_DC hdc, GDI_POINT *lppt, int *lpdwPolyPoints, int cCount); +FREERDP_API int gdi_MoveToEx(HGDI_DC hdc, int X, int Y, HGDI_POINT lpPoint); typedef int (*pLineTo)(HGDI_DC hdc, int nXEnd, int nYEnd); diff --git a/include/freerdp/gdi/palette.h b/include/freerdp/gdi/palette.h index ffba58cc9..d07a8d0b5 100644 --- a/include/freerdp/gdi/palette.h +++ b/include/freerdp/gdi/palette.h @@ -20,9 +20,10 @@ #ifndef __GDI_PALETTE_H #define __GDI_PALETTE_H +#include #include -HGDI_PALETTE gdi_CreatePalette(HGDI_PALETTE palette); -HGDI_PALETTE gdi_GetSystemPalette(); +FREERDP_API HGDI_PALETTE gdi_CreatePalette(HGDI_PALETTE palette); +FREERDP_API HGDI_PALETTE gdi_GetSystemPalette(); #endif /* __GDI_PALETTE_H */ diff --git a/include/freerdp/gdi/pen.h b/include/freerdp/gdi/pen.h index 2e6e57b1c..c34773402 100644 --- a/include/freerdp/gdi/pen.h +++ b/include/freerdp/gdi/pen.h @@ -20,11 +20,12 @@ #ifndef __GDI_PEN_H #define __GDI_PEN_H +#include #include -HGDI_PEN gdi_CreatePen(int fnPenStyle, int nWidth, int crColor); -uint8 gdi_GetPenColor_8bpp(HGDI_PEN pen); -uint16 gdi_GetPenColor_16bpp(HGDI_PEN pen); -uint32 gdi_GetPenColor_32bpp(HGDI_PEN pen); +FREERDP_API HGDI_PEN gdi_CreatePen(int fnPenStyle, int nWidth, int crColor); +FREERDP_API uint8 gdi_GetPenColor_8bpp(HGDI_PEN pen); +FREERDP_API uint16 gdi_GetPenColor_16bpp(HGDI_PEN pen); +FREERDP_API uint32 gdi_GetPenColor_32bpp(HGDI_PEN pen); #endif /* __GDI_PEN_H */ diff --git a/include/freerdp/gdi/region.h b/include/freerdp/gdi/region.h index 10a9b101a..09b2129e8 100644 --- a/include/freerdp/gdi/region.h +++ b/include/freerdp/gdi/region.h @@ -20,25 +20,26 @@ #ifndef __GDI_REGION_H #define __GDI_REGION_H +#include #include -HGDI_RGN gdi_CreateRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); -HGDI_RECT gdi_CreateRect(int xLeft, int yTop, int xRight, int yBottom); -void gdi_RectToRgn(HGDI_RECT rect, HGDI_RGN rgn); -void gdi_CRectToRgn(int left, int top, int right, int bottom, HGDI_RGN rgn); -void gdi_RectToCRgn(HGDI_RECT rect, int *x, int *y, int *w, int *h); -void gdi_CRectToCRgn(int left, int top, int right, int bottom, int *x, int *y, int *w, int *h); -void gdi_RgnToRect(HGDI_RGN rgn, HGDI_RECT rect); -void gdi_CRgnToRect(int x, int y, int w, int h, HGDI_RECT rect); -void gdi_RgnToCRect(HGDI_RGN rgn, int *left, int *top, int *right, int *bottom); -void gdi_CRgnToCRect(int x, int y, int w, int h, int *left, int *top, int *right, int *bottom); -int gdi_CopyOverlap(int x, int y, int width, int height, int srcx, int srcy); -int gdi_SetRect(HGDI_RECT rc, int xLeft, int yTop, int xRight, int yBottom); -int gdi_SetRgn(HGDI_RGN hRgn, int nXLeft, int nYLeft, int nWidth, int nHeight); -int gdi_SetRectRgn(HGDI_RGN hRgn, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); -int gdi_EqualRgn(HGDI_RGN hSrcRgn1, HGDI_RGN hSrcRgn2); -int gdi_CopyRect(HGDI_RECT dst, HGDI_RECT src); -int gdi_PtInRect(HGDI_RECT rc, int x, int y); -int gdi_InvalidateRegion(HGDI_DC hdc, int x, int y, int w, int h); +FREERDP_API HGDI_RGN gdi_CreateRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); +FREERDP_API HGDI_RECT gdi_CreateRect(int xLeft, int yTop, int xRight, int yBottom); +FREERDP_API void gdi_RectToRgn(HGDI_RECT rect, HGDI_RGN rgn); +FREERDP_API void gdi_CRectToRgn(int left, int top, int right, int bottom, HGDI_RGN rgn); +FREERDP_API void gdi_RectToCRgn(HGDI_RECT rect, int *x, int *y, int *w, int *h); +FREERDP_API void gdi_CRectToCRgn(int left, int top, int right, int bottom, int *x, int *y, int *w, int *h); +FREERDP_API void gdi_RgnToRect(HGDI_RGN rgn, HGDI_RECT rect); +FREERDP_API void gdi_CRgnToRect(int x, int y, int w, int h, HGDI_RECT rect); +FREERDP_API void gdi_RgnToCRect(HGDI_RGN rgn, int *left, int *top, int *right, int *bottom); +FREERDP_API void gdi_CRgnToCRect(int x, int y, int w, int h, int *left, int *top, int *right, int *bottom); +FREERDP_API int gdi_CopyOverlap(int x, int y, int width, int height, int srcx, int srcy); +FREERDP_API int gdi_SetRect(HGDI_RECT rc, int xLeft, int yTop, int xRight, int yBottom); +FREERDP_API int gdi_SetRgn(HGDI_RGN hRgn, int nXLeft, int nYLeft, int nWidth, int nHeight); +FREERDP_API int gdi_SetRectRgn(HGDI_RGN hRgn, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); +FREERDP_API int gdi_EqualRgn(HGDI_RGN hSrcRgn1, HGDI_RGN hSrcRgn2); +FREERDP_API int gdi_CopyRect(HGDI_RECT dst, HGDI_RECT src); +FREERDP_API int gdi_PtInRect(HGDI_RECT rc, int x, int y); +FREERDP_API int gdi_InvalidateRegion(HGDI_DC hdc, int x, int y, int w, int h); #endif /* __GDI_REGION_H */ diff --git a/include/freerdp/gdi/shape.h b/include/freerdp/gdi/shape.h index 1b80f8e59..daa916e70 100644 --- a/include/freerdp/gdi/shape.h +++ b/include/freerdp/gdi/shape.h @@ -20,13 +20,14 @@ #ifndef __GDI_SHAPE_H #define __GDI_SHAPE_H +#include #include -int gdi_Ellipse(HGDI_DC hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); -int gdi_FillRect(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr); -int gdi_Polygon(HGDI_DC hdc, GDI_POINT *lpPoints, int nCount); -int gdi_PolyPolygon(HGDI_DC hdc, GDI_POINT *lpPoints, int *lpPolyCounts, int nCount); -int gdi_Rectangle(HGDI_DC hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); +FREERDP_API int gdi_Ellipse(HGDI_DC hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); +FREERDP_API int gdi_FillRect(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr); +FREERDP_API int gdi_Polygon(HGDI_DC hdc, GDI_POINT *lpPoints, int nCount); +FREERDP_API int gdi_PolyPolygon(HGDI_DC hdc, GDI_POINT *lpPoints, int *lpPolyCounts, int nCount); +FREERDP_API int gdi_Rectangle(HGDI_DC hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); typedef int (*pFillRect)(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr); diff --git a/libfreerdp-gdi/region.c b/libfreerdp-gdi/region.c index f15eee635..cab2f4cc2 100644 --- a/libfreerdp-gdi/region.c +++ b/libfreerdp-gdi/region.c @@ -74,7 +74,7 @@ HGDI_RECT gdi_CreateRect(int xLeft, int yTop, int xRight, int yBottom) * @param rgn destination region */ -void gdi_RectToRgn(HGDI_RECT rect, HGDI_RGN rgn) +inline void gdi_RectToRgn(HGDI_RECT rect, HGDI_RGN rgn) { rgn->x = rect->left; rgn->y = rect->top; @@ -91,7 +91,7 @@ void gdi_RectToRgn(HGDI_RECT rect, HGDI_RGN rgn) * @param rgn destination region */ -void gdi_CRectToRgn(int left, int top, int right, int bottom, HGDI_RGN rgn) +inline void gdi_CRectToRgn(int left, int top, int right, int bottom, HGDI_RGN rgn) { rgn->x = left; rgn->y = top; @@ -108,7 +108,7 @@ void gdi_CRectToRgn(int left, int top, int right, int bottom, HGDI_RGN rgn) * @param h height */ -void gdi_RectToCRgn(HGDI_RECT rect, int *x, int *y, int *w, int *h) +inline void gdi_RectToCRgn(HGDI_RECT rect, int *x, int *y, int *w, int *h) { *x = rect->left; *y = rect->top; @@ -128,7 +128,7 @@ void gdi_RectToCRgn(HGDI_RECT rect, int *x, int *y, int *w, int *h) * @param h height */ -void gdi_CRectToCRgn(int left, int top, int right, int bottom, int *x, int *y, int *w, int *h) +inline void gdi_CRectToCRgn(int left, int top, int right, int bottom, int *x, int *y, int *w, int *h) { *x = left; *y = top; @@ -142,7 +142,7 @@ void gdi_CRectToCRgn(int left, int top, int right, int bottom, int *x, int *y, i * @param rect destination rectangle */ -void gdi_RgnToRect(HGDI_RGN rgn, HGDI_RECT rect) +inline void gdi_RgnToRect(HGDI_RGN rgn, HGDI_RECT rect) { rect->left = rgn->x; rect->top = rgn->y; @@ -159,7 +159,7 @@ void gdi_RgnToRect(HGDI_RGN rgn, HGDI_RECT rect) * @param rect destination rectangle */ -void gdi_CRgnToRect(int x, int y, int w, int h, HGDI_RECT rect) +inline void gdi_CRgnToRect(int x, int y, int w, int h, HGDI_RECT rect) { rect->left = x; rect->top = y; @@ -176,7 +176,7 @@ void gdi_CRgnToRect(int x, int y, int w, int h, HGDI_RECT rect) * @param bottom y2 */ -void gdi_RgnToCRect(HGDI_RGN rgn, int *left, int *top, int *right, int *bottom) +inline void gdi_RgnToCRect(HGDI_RGN rgn, int *left, int *top, int *right, int *bottom) { *left = rgn->x; *top = rgn->y; @@ -196,7 +196,7 @@ void gdi_RgnToCRect(HGDI_RGN rgn, int *left, int *top, int *right, int *bottom) * @param bottom y2 */ -void gdi_CRgnToCRect(int x, int y, int w, int h, int *left, int *top, int *right, int *bottom) +inline void gdi_CRgnToCRect(int x, int y, int w, int h, int *left, int *top, int *right, int *bottom) { *left = x; *top = y; @@ -215,7 +215,7 @@ void gdi_CRgnToCRect(int x, int y, int w, int h, int *left, int *top, int *right * @return 1 if there is an overlap, 0 otherwise */ -int gdi_CopyOverlap(int x, int y, int width, int height, int srcx, int srcy) +inline int gdi_CopyOverlap(int x, int y, int width, int height, int srcx, int srcy) { GDI_RECT dst; GDI_RECT src; @@ -238,7 +238,7 @@ int gdi_CopyOverlap(int x, int y, int width, int height, int srcx, int srcy) * @return 1 if successful, 0 otherwise */ -int gdi_SetRect(HGDI_RECT rc, int xLeft, int yTop, int xRight, int yBottom) +inline int gdi_SetRect(HGDI_RECT rc, int xLeft, int yTop, int xRight, int yBottom) { rc->left = xLeft; rc->top = yTop; @@ -257,7 +257,7 @@ int gdi_SetRect(HGDI_RECT rc, int xLeft, int yTop, int xRight, int yBottom) * @return */ -int gdi_SetRgn(HGDI_RGN hRgn, int nXLeft, int nYLeft, int nWidth, int nHeight) +inline int gdi_SetRgn(HGDI_RGN hRgn, int nXLeft, int nYLeft, int nWidth, int nHeight) { hRgn->x = nXLeft; hRgn->y = nYLeft; @@ -277,7 +277,7 @@ int gdi_SetRgn(HGDI_RGN hRgn, int nXLeft, int nYLeft, int nWidth, int nHeight) * @return */ -int gdi_SetRectRgn(HGDI_RGN hRgn, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect) +inline int gdi_SetRectRgn(HGDI_RGN hRgn, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect) { gdi_CRectToRgn(nLeftRect, nTopRect, nRightRect, nBottomRect, hRgn); hRgn->null = 0; @@ -302,7 +302,7 @@ int gdi_SetRectRgn(HGDI_RGN hRgn, int nLeftRect, int nTopRect, int nRightRect, i * @return 1 if both regions are equal, 0 otherwise */ -int gdi_EqualRgn(HGDI_RGN hSrcRgn1, HGDI_RGN hSrcRgn2) +inline int gdi_EqualRgn(HGDI_RGN hSrcRgn1, HGDI_RGN hSrcRgn2) { if ((hSrcRgn1->x == hSrcRgn2->x) && (hSrcRgn1->y == hSrcRgn2->y) && @@ -322,7 +322,7 @@ int gdi_EqualRgn(HGDI_RGN hSrcRgn1, HGDI_RGN hSrcRgn2) * @return 1 if successful, 0 otherwise */ -int gdi_CopyRect(HGDI_RECT dst, HGDI_RECT src) +inline int gdi_CopyRect(HGDI_RECT dst, HGDI_RECT src) { dst->left = src->left; dst->top = src->top; @@ -340,7 +340,7 @@ int gdi_CopyRect(HGDI_RECT dst, HGDI_RECT src) * @return 1 if the point is inside, 0 otherwise */ -int gdi_PtInRect(HGDI_RECT rc, int x, int y) +inline int gdi_PtInRect(HGDI_RECT rc, int x, int y) { /* * points on the left and top sides are considered in, @@ -369,7 +369,7 @@ int gdi_PtInRect(HGDI_RECT rc, int x, int y) * @return */ -int gdi_InvalidateRegion(HGDI_DC hdc, int x, int y, int w, int h) +inline int gdi_InvalidateRegion(HGDI_DC hdc, int x, int y, int w, int h) { GDI_RECT inv; GDI_RECT rgn;