15 modified files
reactos/lib/gdi32/misc
diff -u -r1.54 -r1.55
--- stubs.c 24 Apr 2004 14:21:36 -0000 1.54
+++ stubs.c 25 Apr 2004 14:46:53 -0000 1.55
@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.54 2004/04/24 14:21:36 weiden Exp $
+/* $Id: stubs.c,v 1.55 2004/04/25 14:46:53 weiden Exp $
*
* reactos/lib/gdi32/misc/stubs.c
*
@@ -1230,40 +1230,6 @@
*/
BOOL
STDCALL
-SetBrushOrgEx(
- HDC a0,
- int a1,
- int a2,
- LPPOINT a3
- )
-{
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
-}
-
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-FixBrushOrgEx(
- HDC a0,
- int a1,
- int a2,
- LPPOINT a3
- )
-{
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
-}
-
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
UnrealizeObject(
HGDIOBJ a0
)
reactos/lib/gdi32/misc
diff -u -r1.3 -r1.4
--- wingl.c 9 Apr 2004 20:03:13 -0000 1.3
+++ wingl.c 25 Apr 2004 14:46:53 -0000 1.4
@@ -99,14 +99,14 @@
*/
INT
STDCALL
-ChoosePixelFormat(HDC hDC,
- CONST PIXELFORMATDESCRIPTOR * pfd)
+ChoosePixelFormat(HDC hdc,
+ CONST PIXELFORMATDESCRIPTOR * ppfd)
{
if (glChoosePixelFormat == NULL)
if (OpenGLEnable() == FALSE)
return(0);
- return(glChoosePixelFormat(hDC, pfd));
+ return(glChoosePixelFormat(hdc, ppfd));
}
@@ -116,16 +116,16 @@
*/
INT
STDCALL
-DescribePixelFormat(HDC hDC,
- INT PixelFormat,
- UINT BufSize,
- LPPIXELFORMATDESCRIPTOR pfd)
+DescribePixelFormat(HDC hdc,
+ INT iPixelFormat,
+ UINT nBytes,
+ LPPIXELFORMATDESCRIPTOR ppfd)
{
if (glDescribePixelFormat == NULL)
if (OpenGLEnable() == FALSE)
return(0);
- return(glDescribePixelFormat(hDC, PixelFormat, BufSize, pfd));
+ return(glDescribePixelFormat(hdc, iPixelFormat, nBytes, ppfd));
}
@@ -135,13 +135,13 @@
*/
INT
STDCALL
-GetPixelFormat(HDC hDC)
+GetPixelFormat(HDC hdc)
{
if (glGetPixelFormat == NULL)
if (OpenGLEnable() == FALSE)
return(0);
- return(glGetPixelFormat(hDC));
+ return(glGetPixelFormat(hdc));
}
@@ -151,15 +151,15 @@
*/
BOOL
STDCALL
-SetPixelFormat(HDC hDC,
- INT PixelFormat,
- CONST PIXELFORMATDESCRIPTOR * pfd)
+SetPixelFormat(HDC hdc,
+ INT iPixelFormat,
+ CONST PIXELFORMATDESCRIPTOR * ppfd)
{
if (glSetPixelFormat == NULL)
if (OpenGLEnable() == FALSE)
return(0);
- return(glSetPixelFormat(hDC, PixelFormat, pfd));
+ return(glSetPixelFormat(hdc, iPixelFormat, ppfd));
}
@@ -169,14 +169,14 @@
*/
BOOL
STDCALL
-SwapBuffers(HDC hDC)
+SwapBuffers(HDC hdc)
{
if (glSwapBuffers == NULL)
if (OpenGLEnable() == FALSE)
return(0);
- return(glSwapBuffers(hDC));
+ return(glSwapBuffers(hdc));
}
@@ -190,20 +190,20 @@
UINT
STDCALL
GetEnhMetaFilePixelFormat(
- HENHMETAFILE hEmh,
- DWORD cbBufz,
+ HENHMETAFILE hemf,
+ DWORD cbBuffer,
CONST PIXELFORMATDESCRIPTOR *ppfd
)
{
ENHMETAHEADER pemh;
- if(GetEnhMetaFileHeader(hEmh, sizeof(ENHMETAHEADER), &pemh))
+ if(GetEnhMetaFileHeader(hemf, sizeof(ENHMETAHEADER), &pemh))
{
if(pemh.bOpenGL)
{
if(pemh.cbPixelFormat)
{
- memcpy((void*)ppfd, (const void *)pemh.offPixelFormat, cbBufz );
+ memcpy((void*)ppfd, (const void *)pemh.offPixelFormat, cbBuffer );
return(pemh.cbPixelFormat);
}
}
reactos/lib/gdi32/objects
diff -u -r1.21 -r1.22
--- bitblt.c 9 Apr 2004 20:03:13 -0000 1.21
+++ bitblt.c 25 Apr 2004 14:46:54 -0000 1.22
@@ -1,4 +1,4 @@
-/* $Id: bitblt.c,v 1.21 2004/04/09 20:03:13 navaraf Exp $
+/* $Id: bitblt.c,v 1.22 2004/04/25 14:46:54 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@@ -22,17 +22,17 @@
*/
BOOL
STDCALL
-BitBlt(HDC hDCDest,
- INT XDest,
- INT YDest,
- INT Width,
- INT Height,
- HDC hDCSrc,
- INT XSrc,
- INT YSrc,
- DWORD ROP)
+BitBlt(HDC hdcDest,
+ INT nXDest,
+ INT nYDest,
+ INT nWidth,
+ INT nHeight,
+ HDC hdcSrc,
+ INT nXSrc,
+ INT nYSrc,
+ DWORD dwRop)
{
- return NtGdiBitBlt(hDCDest, XDest, YDest, Width, Height, hDCSrc, XSrc, YSrc, ROP);
+ return NtGdiBitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, dwRop);
}
@@ -41,13 +41,13 @@
*/
HBITMAP
STDCALL
-CreateBitmap(INT Width,
- INT Height,
- UINT Planes,
- UINT BitsPerPel,
- CONST VOID *Bits)
+CreateBitmap(INT nWidth,
+ INT nHeight,
+ UINT cPlanes,
+ UINT cBitsPerPel,
+ CONST VOID *lpvBits)
{
- return NtGdiCreateBitmap(Width, Height, Planes, BitsPerPel, Bits);
+ return NtGdiCreateBitmap(nWidth, nHeight, cPlanes, cBitsPerPel, lpvBits);
}
@@ -56,9 +56,9 @@
*/
HBITMAP
STDCALL
-CreateBitmapIndirect(CONST BITMAP *BM)
+CreateBitmapIndirect(CONST BITMAP *lpbm)
{
- return NtGdiCreateBitmapIndirect(BM);
+ return NtGdiCreateBitmapIndirect(lpbm);
}
@@ -67,11 +67,11 @@
*/
HBITMAP
STDCALL
-CreateCompatibleBitmap(HDC hDC,
- INT Width,
- INT Height)
+CreateCompatibleBitmap(HDC hdc,
+ INT nWidth,
+ INT nHeight)
{
- return NtGdiCreateCompatibleBitmap(hDC, Width, Height);
+ return NtGdiCreateCompatibleBitmap(hdc, nWidth, nHeight);
}
@@ -80,11 +80,11 @@
*/
HBITMAP
STDCALL
-CreateDiscardableBitmap(HDC hDC,
- INT Width,
- INT Height)
+CreateDiscardableBitmap(HDC hdc,
+ INT nWidth,
+ INT nHeight)
{
- return NtGdiCreateDiscardableBitmap(hDC, Width, Height);
+ return NtGdiCreateDiscardableBitmap(hdc, nWidth, nHeight);
}
@@ -93,14 +93,14 @@
*/
HBITMAP
STDCALL
-CreateDIBitmap(HDC hDC,
- CONST BITMAPINFOHEADER *bmih,
- DWORD Init,
- CONST VOID *bInit,
- CONST BITMAPINFO *bmi,
- UINT Usage)
+CreateDIBitmap(HDC hdc,
+ CONST BITMAPINFOHEADER *lpbmih,
+ DWORD fdwInit,
+ CONST VOID *lpbInit,
+ CONST BITMAPINFO *lpbmi,
+ UINT fuUsage)
{
- return NtGdiCreateDIBitmap(hDC, bmih, Init, bInit, bmi, Usage);
+ return NtGdiCreateDIBitmap(hdc, lpbmih, fdwInit, lpbInit, lpbmi, fuUsage);
}
@@ -109,11 +109,11 @@
*/
LONG
STDCALL
-GetBitmapBits(HBITMAP hBitmap,
- LONG Count,
- LPVOID Bits)
+GetBitmapBits(HBITMAP hbmp,
+ LONG cbBuffer,
+ LPVOID lpvBits)
{
- return NtGdiGetBitmapBits(hBitmap, Count, Bits);
+ return NtGdiGetBitmapBits(hbmp, cbBuffer, lpvBits);
}
@@ -123,9 +123,9 @@
BOOL
STDCALL
GetBitmapDimensionEx(HBITMAP hBitmap,
- LPSIZE Dimension)
+ LPSIZE lpDimension)
{
- return NtGdiGetBitmapDimensionEx(hBitmap, Dimension);
+ return NtGdiGetBitmapDimensionEx(hBitmap, lpDimension);
}
@@ -134,15 +134,15 @@
*/
int
STDCALL
-GetDIBits(HDC hDC,
- HBITMAP hBitmap,
- UINT StartScan,
- UINT ScanLines,
- LPVOID Bits,
- LPBITMAPINFO bi,
- UINT Usage)
+GetDIBits(HDC hdc,
+ HBITMAP hbmp,
+ UINT uStartScan,
+ UINT cScanLines,
+ LPVOID lpvBits,
+ LPBITMAPINFO lpbi,
+ UINT uUsage)
{
- return NtGdiGetDIBits(hDC, hBitmap, StartScan, ScanLines, Bits, bi, Usage);
+ return NtGdiGetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbi, uUsage);
}
@@ -151,20 +151,20 @@
*/
BOOL
STDCALL
-MaskBlt(HDC hDCDest,
- INT XDest,
- INT YDest,
- INT Width,
- INT Height,
- HDC hDCSrc,
- INT XSrc,
- INT YSrc,
- HBITMAP hMaskBitmap,
+MaskBlt(HDC hdcDest,
+ INT nXDest,
+ INT nYDest,
+ INT nWidth,
+ INT nHeight,
+ HDC hdcSrc,
+ INT nXSrc,
+ INT nYSrc,
+ HBITMAP hbmMask,
INT xMask,
INT yMask,
- DWORD ROP)
+ DWORD dwRop)
{
- return NtGdiMaskBlt(hDCDest, XDest, YDest, Width, Height, hDCSrc, XSrc, YSrc, hMaskBitmap, xMask, yMask, ROP);
+ return NtGdiMaskBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, hbmMask, xMask, yMask, dwRop);
}
@@ -173,18 +173,18 @@
*/
BOOL
STDCALL
-PlgBlt(HDC hDCDest,
- CONST POINT *Point,
- HDC hDCSrc,
- INT XSrc,
- INT YSrc,
- INT Width,
- INT Height,
- HBITMAP hMaskBitmap,
+PlgBlt(HDC hdcDest,
+ CONST POINT *lpPoint,
+ HDC hdcSrc,
+ INT nXSrc,
+ INT nYSrc,
+ INT nWidth,
+ INT nHeight,
+ HBITMAP hbmMask,
INT xMask,
INT yMask)
{
- return NtGdiPlgBlt(hDCDest, Point, hDCSrc, XSrc, YSrc, Width, Height, hMaskBitmap, xMask, yMask);
+ return NtGdiPlgBlt(hdcDest, lpPoint, hdcSrc, nXSrc, nYSrc, nWidth, nHeight, hbmMask, xMask, yMask);
}
@@ -193,11 +193,11 @@
*/
LONG
STDCALL
-SetBitmapBits(HBITMAP hBitmap,
- DWORD Bytes,
- CONST VOID *Bits)
+SetBitmapBits(HBITMAP hbmp,
+ DWORD cBytes,
+ CONST VOID *lpBits)
{
- return NtGdiSetBitmapBits(hBitmap, Bytes, Bits);
+ return NtGdiSetBitmapBits(hbmp, cBytes, lpBits);
}
@@ -206,15 +206,15 @@
*/
int
STDCALL
-SetDIBits(HDC hDC,
- HBITMAP hBitmap,
- UINT StartScan,
- UINT ScanLines,
- CONST VOID *Bits,
- CONST BITMAPINFO *bmi,
- UINT ColorUse)
+SetDIBits(HDC hdc,
+ HBITMAP hbmp,
+ UINT uStartScan,
+ UINT cScanLines,
+ CONST VOID *lpvBits,
+ CONST BITMAPINFO *lpbmi,
+ UINT fuColorUse)
{
- return NtGdiSetDIBits(hDC, hBitmap, StartScan, ScanLines, Bits, bmi, ColorUse);
+ return NtGdiSetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbmi, fuColorUse);
}
@@ -223,21 +223,21 @@
*/
int
STDCALL
-SetDIBitsToDevice(HDC hDC,
+SetDIBitsToDevice(HDC hdc,
INT XDest,
INT YDest,
- DWORD Width,
- DWORD Height,
+ DWORD dwWidth,
+ DWORD dwHeight,
INT XSrc,
INT YSrc,
- UINT StartScan,
- UINT ScanLines,
- CONST VOID *Bits,
- CONST BITMAPINFO *bmi,
- UINT ColorUse)
+ UINT uStartScan,
+ UINT cScanLines,
+ CONST VOID *lpvBits,
+ CONST BITMAPINFO *lpbmi,
+ UINT fuColorUse)
{
- return NtGdiSetDIBitsToDevice(hDC, XDest, YDest, Width, Height, XSrc, YSrc, StartScan, ScanLines,
- Bits, bmi, ColorUse);
+ return NtGdiSetDIBitsToDevice(hdc, XDest, YDest, dwWidth, dwHeight, XSrc, YSrc, uStartScan, cScanLines,
+ lpvBits, lpbmi, fuColorUse);
}
@@ -260,34 +260,14 @@
DWORD dwRop // raster operation code
)
{
- //SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- if ( (nWidthDest==nWidthSrc) && (nHeightDest==nHeightSrc) )
- {
- return BitBlt(hdcDest,
- nXOriginDest, // x-coord of destination upper-left corner
- nYOriginDest, // y-coord of destination upper-left corner
- nWidthDest, // width of destination rectangle
- nHeightDest, // height of destination rectangle
- hdcSrc, // handle to source DC
- nXOriginSrc, // x-coordinate of source upper-left corner
- nYOriginSrc, // y-coordinate of source upper-left corner
- dwRop // raster operation code
- );
- } else
- {
- DPRINT1("FIXME: StretchBlt is in development phase now...\n");
- return NtGdiStretchBlt(hdcDest,
- nXOriginDest,
- nYOriginDest,
- nWidthDest,
- nHeightDest,
- hdcSrc,
- nXOriginSrc,
- nYOriginSrc,
- nWidthSrc,
- nHeightSrc,
- dwRop);
- }
+ if ((nWidthDest != nWidthSrc) || (nHeightDest != nHeightSrc))
+ {
+ return NtGdiStretchBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest,
+ hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, dwRop);
+ }
+
+ return BitBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, hdcSrc,
+ nXOriginSrc, nYOriginSrc, dwRop);
}
@@ -296,22 +276,22 @@
*/
int
STDCALL
-StretchDIBits(HDC hDC,
+StretchDIBits(HDC hdc,
INT XDest,
INT YDest,
- INT DestWidth,
- INT DestHeight,
+ INT nDestWidth,
+ INT nDestHeight,
INT XSrc,
INT YSrc,
- INT SrcWidth,
- INT SrcHeight,
- CONST VOID *Bits,
- CONST BITMAPINFO *BitsInfo,
- UINT Usage,
- DWORD ROP)
+ INT nSrcWidth,
+ INT nSrcHeight,
+ CONST VOID *lpBits,
+ CONST BITMAPINFO *lpBitsInfo,
+ UINT iUsage,
+ DWORD dwRop)
{
- return NtGdiStretchDIBits(hDC, XDest, YDest, DestWidth, DestHeight, XSrc, YSrc,
- SrcWidth, SrcHeight, Bits, BitsInfo, Usage, ROP);
+ return NtGdiStretchDIBits(hdc, XDest, YDest, nDestWidth, nDestHeight, XSrc, YSrc,
+ nSrcWidth, nSrcHeight, lpBits, lpBitsInfo, iUsage, dwRop);
}
@@ -320,14 +300,14 @@
*/
HBITMAP
STDCALL
-CreateDIBSection(HDC hDC,
- CONST BITMAPINFO *bmi,
- UINT Usage,
- PVOID *Bits,
+CreateDIBSection(HDC hdc,
+ CONST BITMAPINFO *pbmi,
+ UINT iUsage,
+ VOID **ppvBits,
HANDLE hSection,
DWORD dwOffset)
{
- return NtGdiCreateDIBSection(hDC, bmi, Usage, Bits, hSection, dwOffset);
+ return NtGdiCreateDIBSection(hdc, pbmi, iUsage, ppvBits, hSection, dwOffset);
}
@@ -336,12 +316,12 @@
*/
COLORREF
STDCALL
-SetPixel(HDC hDC,
+SetPixel(HDC hdc,
INT X,
INT Y,
- COLORREF Color)
+ COLORREF crColor)
{
- return NtGdiSetPixel(hDC, X, Y, Color);
+ return NtGdiSetPixel(hdc, X, Y, crColor);
}
@@ -350,9 +330,9 @@
*/
BOOL
STDCALL
-SetPixelV ( HDC hDC, int XPos, int YPos, COLORREF Color )
+SetPixelV ( HDC hdc, int X, int Y, COLORREF crColor )
{
- return NtGdiSetPixelV ( hDC, XPos, YPos, Color );
+ return NtGdiSetPixelV(hdc, X, Y, crColor);
}
@@ -361,9 +341,9 @@
*/
COLORREF
STDCALL
-GetPixel(HDC hDC, int X, int Y)
+GetPixel(HDC hdc, int nXPos, int nYPos)
{
- return NtGdiGetPixel(hDC, X, Y);
+ return NtGdiGetPixel(hdc, nXPos, nYPos);
}
@@ -371,9 +351,9 @@
* @implemented
*/
BOOL STDCALL
-PatBlt(HDC hDC, INT Left, INT Top, INT Width, INT Height, ULONG Rop)
+PatBlt(HDC hdc, INT nXLeft, INT nYLeft, INT nWidth, INT nHeight, DWORD dwRop)
{
- return NtGdiPatBlt(hDC, Left, Top, Width, Height, Rop);
+ return NtGdiPatBlt(hdc, nXLeft, nYLeft, nWidth, nHeight, dwRop);
}
/*
@@ -381,9 +361,9 @@
*/
BOOL
STDCALL
-PolyPatBlt(HDC hDC,DWORD dwRop,PPATRECT pRects,int cRects,ULONG Reserved)
+PolyPatBlt(HDC hdc, DWORD dwRop, PPATRECT lppRects, int cRects, ULONG Reserved)
{
- return NtGdiPolyPatBlt(hDC,dwRop,pRects,cRects,Reserved);
+ return NtGdiPolyPatBlt(hdc, dwRop, lppRects, cRects, Reserved);
}
/******************************************************************************
@@ -393,50 +373,11 @@
*/
WINBOOL
STDCALL
-GdiTransparentBlt(HDC hdcDst, int xDst, int yDst, int cxDst, int cyDst,
- HDC hdcSrc, int xSrc, int ySrc, int cxSrc, int cySrc,
- COLORREF TransColor)
-{
- return (WINBOOL)NtGdiTransparentBlt(hdcDst, xDst, yDst, cxDst, cyDst, hdcSrc,
- xSrc, ySrc, cxSrc, cySrc, TransColor);
+GdiTransparentBlt(HDC hdcDst, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest,
+ HDC hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc,
+ COLORREF crTransparent)
+{
+ return (WINBOOL)NtGdiTransparentBlt(hdcDst, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, hdcSrc,
+ nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, crTransparent);
}
-/*
-
-BOOL STDCALL NtGdiExtFloodFill(HDC hDC, INT XStart, INT YStart, COLORREF Color, UINT FillType)
-BOOL STDCALL NtGdiFloodFill(HDC hDC, INT XStart, INT YStart, COLORREF Fill)
-UINT STDCALL NtGdiGetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, RGBQUAD *Colors)
-COLORREF STDCALL NtGdiGetPixel(HDC hDC,
- INT XPos,
- INT YPos)
-BOOL STDCALL NtGdiSetBitmapDimensionEx(HBITMAP hBitmap,
- INT Width,
- INT Height,
- LPSIZE Size)
-UINT STDCALL NtGdiSetDIBColorTable(HDC hDC,
- UINT StartIndex,
- UINT Entries,
- CONST RGBQUAD *Colors)
-BOOL STDCALL NtGdiSetPixelV(HDC hDC,
- INT X,
- INT Y,
- COLORREF Color)
-BOOL STDCALL NtGdiStretchBlt(HDC hDCDest,
- INT XOriginDest,
- INT YOriginDest,
- INT WidthDest,
- INT HeightDest,
- HDC hDCSrc,
- INT XOriginSrc,
- INT YOriginSrc,
- INT WidthSrc,
- INT HeightSrc,
- DWORD ROP)
-
-INT BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp)
-HBITMAP BITMAPOBJ_CopyBitmap(HBITMAP hBitmap)
-int DIB_GetDIBWidthBytes(int width, int depth)
-int DIB_GetDIBImageBytes (int width, int height, int depth)
-int DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse)
-
-*/
reactos/lib/gdi32/objects
diff -u -r1.4 -r1.5
--- brush.c 19 Aug 2003 11:48:49 -0000 1.4
+++ brush.c 25 Apr 2004 14:46:54 -0000 1.5
@@ -14,10 +14,10 @@
HBRUSH
STDCALL
CreateSolidBrush(
- COLORREF a0
+ COLORREF crColor
)
{
- return NtGdiCreateSolidBrush(a0);
+ return NtGdiCreateSolidBrush(crColor);
}
/*
@@ -26,10 +26,10 @@
HBRUSH
STDCALL
CreateBrushIndirect(
- CONST LOGBRUSH *a0
+ CONST LOGBRUSH *lplb
)
{
- return NtGdiCreateBrushIndirect(a0);
+ return NtGdiCreateBrushIndirect(lplb);
}
/*
@@ -38,11 +38,11 @@
HBRUSH
STDCALL
CreateDIBPatternBrushPt(
- CONST VOID *a0,
- UINT a1
+ CONST VOID *lpPackedDIB,
+ UINT iUsage
)
{
- return NtGdiCreateDIBPatternBrushPt(a0,a1);
+ return NtGdiCreateDIBPatternBrushPt(lpPackedDIB, iUsage);
}
/*
@@ -51,9 +51,21 @@
HBRUSH
STDCALL
CreateHatchBrush(
- int a0,
- COLORREF a1
+ int fnStyle,
+ COLORREF clrref
)
{
- return NtGdiCreateHatchBrush(a0,a1);
+ return NtGdiCreateHatchBrush(fnStyle, clrref);
+}
+
+/*
+ * @implemented
+ */
+HBRUSH
+STDCALL
+CreatePatternBrush(
+ HBITMAP hbmp
+ )
+{
+ return NtGdiCreatePatternBrush ( hbmp );
}
reactos/lib/gdi32/objects
diff -u -r1.4 -r1.5
--- clip.c 21 Dec 2003 22:41:00 -0000 1.4
+++ clip.c 25 Apr 2004 14:46:54 -0000 1.5
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: clip.c,v 1.4 2003/12/21 22:41:00 navaraf Exp $
+/* $Id: clip.c,v 1.5 2004/04/25 14:46:54 weiden Exp $
*
* PROJECT: ReactOS gdi32.dll
* FILE: lib/gdi32/objects/clip.c
@@ -34,9 +34,9 @@
*/
int
STDCALL
-SelectClipRgn(HDC DC, HRGN Rgn)
+SelectClipRgn(HDC hdc, HRGN hrgn)
{
- return NtGdiSelectClipRgn(DC, Rgn);
+ return NtGdiSelectClipRgn(hdc, hrgn);
}
/*
@@ -45,14 +45,14 @@
int
STDCALL
IntersectClipRect(
- HDC hDc,
- int a1,
- int a2,
- int a3,
- int a4
+ HDC hdc,
+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect
)
{
- return NtGdiIntersectClipRect(hDc, a1, a2, a3, a4);
+ return NtGdiIntersectClipRect(hdc, nLeftRect, nTopRect, nRightRect, nBottomRect);
}
reactos/lib/gdi32/objects
diff -u -r1.29 -r1.30
--- dc.c 9 Apr 2004 20:03:13 -0000 1.29
+++ dc.c 25 Apr 2004 14:46:54 -0000 1.30
@@ -17,10 +17,10 @@
DWORD
STDCALL
GetObjectType(
- HGDIOBJ a0
+ HGDIOBJ h
)
{
- return NtGdiGetObjectType(a0);
+ return NtGdiGetObjectType(h);
}
@@ -31,12 +31,12 @@
BOOL
STDCALL
DPtoLP(
- HDC a0,
- LPPOINT a1,
- int a2
+ HDC hdc,
+ LPPOINT lpPoints,
+ int nCount
)
{
- return NtGdiDPtoLP(a0, a1, a2);
+ return NtGdiDPtoLP(hdc, lpPoints, nCount);
}
@@ -46,11 +46,11 @@
COLORREF
STDCALL
SetBkColor(
- HDC a0,
- COLORREF a1
+ HDC hdc,
+ COLORREF crColor
)
{
- return NtGdiSetBkColor(a0, a1);
+ return NtGdiSetBkColor(hdc, crColor);
}
@@ -60,10 +60,10 @@
int
STDCALL
GetGraphicsMode(
- HDC a0
+ HDC hdc
)
{
- return NtGdiGetGraphicsMode(a0);
+ return NtGdiGetGraphicsMode(hdc);
}
@@ -77,7 +77,7 @@
int iMode
)
{
- return NtGdiSetGraphicsMode(hdc, iMode);
+ return NtGdiSetGraphicsMode(hdc, iMode);
}
@@ -87,10 +87,10 @@
int
STDCALL
GetMapMode(
- HDC a0
+ HDC hdc
)
{
- return NtGdiGetMapMode(a0);
+ return NtGdiGetMapMode(hdc);
}
/*
@@ -99,11 +99,11 @@
BOOL
STDCALL
GetCurrentPositionEx(
- HDC a0,
- LPPOINT a1
+ HDC hdc,
+ LPPOINT lpPoint
)
{
- return NtGdiGetCurrentPositionEx(a0, a1);
+ return NtGdiGetCurrentPositionEx(hdc, lpPoint);
}
@@ -113,10 +113,10 @@
COLORREF
STDCALL
GetBkColor(
- HDC a0
+ HDC hdc
)
{
- return NtGdiGetBkColor(a0);
+ return NtGdiGetBkColor(hdc);
}
@@ -126,10 +126,10 @@
int
STDCALL
GetBkMode(
- HDC a0
+ HDC hdc
)
{
- return NtGdiGetBkMode(a0);
+ return NtGdiGetBkMode(hdc);
}
/*
@@ -138,11 +138,11 @@
BOOL
STDCALL
GetBrushOrgEx(
- HDC a0,
- LPPOINT a1
+ HDC hdc,
+ LPPOINT lppt
)
{
- return NtGdiGetBrushOrgEx(a0, a1);
+ return NtGdiGetBrushOrgEx(hdc, lppt);
}
@@ -152,11 +152,10 @@
int
STDCALL
GetROP2(
- HDC a0
+ HDC hdc
)
{
- return NtGdiGetROP2(a0);
-
+ return NtGdiGetROP2(hdc);
}
@@ -166,11 +165,10 @@
int
STDCALL
GetStretchBltMode(
- HDC a0
+ HDC hdc
)
{
- return NtGdiGetStretchBltMode(a0);
-
+ return NtGdiGetStretchBltMode(hdc);
}
@@ -181,11 +179,10 @@
UINT
STDCALL
GetTextAlign(
- HDC hDc
+ HDC hdc
)
{
- return NtGdiGetTextAlign(hDc);
-
+ return NtGdiGetTextAlign(hdc);
}
@@ -195,11 +192,10 @@
COLORREF
STDCALL
GetTextColor(
- HDC hDc
+ HDC hdc
)
{
- return NtGdiGetTextColor(hDc);
-
+ return NtGdiGetTextColor(hdc);
}
@@ -209,12 +205,11 @@
BOOL
STDCALL
GetViewportExtEx(
- HDC hDc,
+ HDC hdc,
LPSIZE lpSize
)
{
- return NtGdiGetViewportExtEx(hDc, lpSize);
-
+ return NtGdiGetViewportExtEx(hdc, lpSize);
}
@@ -224,12 +219,11 @@
BOOL
STDCALL
GetViewportOrgEx(
- HDC hDc,
+ HDC hdc,
LPPOINT lpPoint
)
{
- return NtGdiGetViewportOrgEx(hDc, lpPoint);
-
+ return NtGdiGetViewportOrgEx(hdc, lpPoint);
}
@@ -239,11 +233,11 @@
BOOL
STDCALL
GetWindowExtEx(
- HDC hDc,
+ HDC hdc,
LPSIZE lpSize
)
{
- return NtGdiGetWindowExtEx(hDc, lpSize);
+ return NtGdiGetWindowExtEx(hdc, lpSize);
}
@@ -253,11 +247,11 @@
BOOL
STDCALL
GetWindowOrgEx(
- HDC hDc,
+ HDC hdc,
LPPOINT lpPoint
)
{
- return NtGdiGetWindowOrgEx(hDc, lpPoint);
+ return NtGdiGetWindowOrgEx(hdc, lpPoint);
}
@@ -267,12 +261,11 @@
int
STDCALL
SetBkMode(
- HDC a0,
- int a1
+ HDC hdc,
+ int iBkMode
)
{
- return NtGdiSetBkMode(a0, a1);
-
+ return NtGdiSetBkMode(hdc, iBkMode);
}
@@ -282,11 +275,11 @@
int
STDCALL
SetROP2(
- HDC a0,
- int a1
+ HDC hdc,
+ int fnDrawMode
)
{
- return NtGdiSetROP2(a0, a1);
+ return NtGdiSetROP2(hdc, fnDrawMode);
}
@@ -296,12 +289,11 @@
int
STDCALL
SetStretchBltMode(
- HDC a0,
- int a1
+ HDC hdc,
+ int iStretchMode
)
{
- return NtGdiSetStretchBltMode(a0, a1);
-
+ return NtGdiSetStretchBltMode(hdc, iStretchMode);
}
@@ -311,12 +303,11 @@
DWORD
STDCALL
GetRelAbs(
- HDC a0,
- DWORD a1
+ HDC hdc,
+ DWORD dwIgnore
)
{
- return NtGdiGetRelAbs(a0);
-
+ return NtGdiGetRelAbs(hdc);
}
@@ -324,9 +315,9 @@
* @implemented
*/
HGDIOBJ STDCALL
-GetStockObject(int Index)
+GetStockObject(int fnObject)
{
- return(NtGdiGetStockObject(Index));
+ return NtGdiGetStockObject(fnObject);
}
@@ -334,9 +325,11 @@
* @implemented
*/
int STDCALL
-GetClipBox(HDC hDc, LPRECT Rect)
+GetClipBox(
+ HDC hdc,
+ LPRECT lprc)
{
- return(NtGdiGetClipBox(hDc, Rect));
+ return NtGdiGetClipBox(hdc, lprc);
}
@@ -346,10 +339,10 @@
int
STDCALL
GetPolyFillMode(
- HDC a0
+ HDC hdc
)
{
- return NtGdiGetPolyFillMode(a0);
+ return NtGdiGetPolyFillMode(hdc);
}
@@ -457,9 +450,9 @@
/*
* @implemented
*/
-BOOL STDCALL DeleteDC( HDC hDC )
+BOOL STDCALL DeleteDC( HDC hdc )
{
- return NtGdiDeleteDC( hDC );
+ return NtGdiDeleteDC(hdc);
}
@@ -469,10 +462,10 @@
HDC
STDCALL
CreateCompatibleDC(
- HDC hDC
+ HDC hdc
)
{
- return NtGdiCreateCompatableDC(hDC);
+ return NtGdiCreateCompatableDC(hdc);
}
@@ -482,11 +475,11 @@
HGDIOBJ
STDCALL
SelectObject(
- HDC hDC,
- HGDIOBJ hGDIObj
+ HDC hdc,
+ HGDIOBJ hgdiobj
)
{
- return NtGdiSelectObject(hDC, hGDIObj);
+ return NtGdiSelectObject(hdc, hgdiobj);
}
@@ -496,11 +489,11 @@
int
STDCALL
SetMapMode(
- HDC a0,
- int a1
+ HDC hdc,
+ int fnMapMode
)
{
- return NtGdiSetMapMode( a0, a1 );
+ return NtGdiSetMapMode(hdc, fnMapMode);
}
@@ -510,13 +503,13 @@
BOOL
STDCALL
SetViewportOrgEx(
- HDC a0,
- int a1,
- int a2,
- LPPOINT a3
+ HDC hdc,
+ int X,
+ int Y,
+ LPPOINT lpPoint
)
{
- return NtGdiSetViewportOrgEx( a0, a1, a2, a3 );
+ return NtGdiSetViewportOrgEx(hdc, X, Y, lpPoint);
}
@@ -526,13 +519,13 @@
BOOL
STDCALL
OffsetViewportOrgEx(
- HDC DC,
- int XOffset,
- int YOffset,
- LPPOINT Point
+ HDC hdc,
+ int nXOffset,
+ int nYOffset,
+ LPPOINT lpPoint
)
{
- return NtGdiOffsetViewportOrgEx(DC, XOffset, YOffset, Point);
+ return NtGdiOffsetViewportOrgEx(hdc, nXOffset, nYOffset, lpPoint);
}
@@ -542,13 +535,13 @@
BOOL
STDCALL
SetWindowOrgEx(
- HDC a0,
- int a1,
- int a2,
- LPPOINT a3
+ HDC hdc,
+ int X,
+ int Y,
+ LPPOINT lpPoint
)
{
- return NtGdiSetWindowOrgEx( a0, a1, a2, a3 );
+ return NtGdiSetWindowOrgEx(hdc, X, Y, lpPoint);
}
@@ -557,15 +550,15 @@
*/
BOOL
STDCALL
-DeleteObject(HGDIOBJ Obj)
+DeleteObject(HGDIOBJ hObject)
{
- if (0 != ((DWORD) Obj & 0x00800000))
+ if (0 != ((DWORD) hObject & 0x00800000))
{
- DPRINT1("Trying to delete system object 0x%x\n", Obj);
+ DPRINT1("Trying to delete system object 0x%x\n", hObject);
return FALSE;
}
- return NtGdiDeleteObject(Obj);
+ return NtGdiDeleteObject(hObject);
}
@@ -575,12 +568,12 @@
HPALETTE
STDCALL
SelectPalette(
- HDC a0,
- HPALETTE a1,
- BOOL a2
+ HDC hdc,
+ HPALETTE hpal,
+ BOOL bForceBackground
)
{
- return NtGdiSelectPalette( a0, a1,a2 );
+ return NtGdiSelectPalette(hdc, hpal, bForceBackground);
}
@@ -590,10 +583,10 @@
UINT
STDCALL
RealizePalette(
- HDC a0
+ HDC hdc
)
{
- return NtGdiRealizePalette( a0 );
+ return NtGdiRealizePalette(hdc);
}
@@ -603,12 +596,12 @@
BOOL
STDCALL
LPtoDP(
- HDC a0,
- LPPOINT a1,
- int a2
+ HDC hdc,
+ LPPOINT lpPoints,
+ int nCount
)
{
- return NtGdiLPtoDP(a0, a1, a2);
+ return NtGdiLPtoDP(hdc, lpPoints, nCount);
}
@@ -618,11 +611,11 @@
int
STDCALL
SetPolyFillMode(
- HDC a0,
- int a1
+ HDC hdc,
+ int iPolyFillMode
)
{
- return NtGdiSetPolyFillMode(a0, a1);
+ return NtGdiSetPolyFillMode(hdc, iPolyFillMode);
}
@@ -632,11 +625,11 @@
int
STDCALL
GetDeviceCaps(
- HDC DC,
- int Index
+ HDC hdc,
+ int nIndex
)
{
- return NtGdiGetDeviceCaps(DC, Index);
+ return NtGdiGetDeviceCaps(hdc, nIndex);
}
/*
@@ -645,10 +638,10 @@
HPALETTE
STDCALL
CreatePalette(
- CONST LOGPALETTE *a0
+ CONST LOGPALETTE *lplgpl
)
{
- return NtGdiCreatePalette((CONST PLOGPALETTE)a0);
+ return NtGdiCreatePalette((CONST PLOGPALETTE)lplgpl);
}
/*
@@ -657,11 +650,11 @@
COLORREF
STDCALL
GetNearestColor(
- HDC a0,
- COLORREF a1
+ HDC hdc,
+ COLORREF crColor
)
{
- return NtGdiGetNearestColor(a0,a1);
+ return NtGdiGetNearestColor(hdc, crColor);
}
/*
@@ -670,11 +663,11 @@
UINT
STDCALL
GetNearestPaletteIndex(
- HPALETTE a0,
- COLORREF a1
+ HPALETTE hpal,
+ COLORREF crColor
)
{
- return NtGdiGetNearestPaletteIndex(a0,a1);
+ return NtGdiGetNearestPaletteIndex(hpal, crColor);
}
/*
@@ -683,13 +676,13 @@
UINT
STDCALL
GetPaletteEntries(
- HPALETTE a0,
- UINT a1,
- UINT a2,
- LPPALETTEENTRY a3
+ HPALETTE hpal,
+ UINT iStartIndex,
+ UINT nEntries,
+ LPPALETTEENTRY lppe
)
{
- return NtGdiGetPaletteEntries(a0,a1,a2,a3);
+ return NtGdiGetPaletteEntries(hpal, iStartIndex, nEntries, lppe);
}
/*
@@ -698,13 +691,13 @@
UINT
STDCALL
GetSystemPaletteEntries(
- HDC a0,
- UINT a1,
- UINT a2,
- LPPALETTEENTRY a3
+ HDC hdc,
+ UINT iStartIndex,
+ UINT nEntries,
+ LPPALETTEENTRY lppe
)
{
- return NtGdiGetSystemPaletteEntries(a0,a1,a2,a3);
+ return NtGdiGetSystemPaletteEntries(hdc, iStartIndex, nEntries, lppe);
}
/*
@@ -713,11 +706,11 @@
BOOL
STDCALL
RestoreDC(
- HDC a0,
- int a1
+ HDC hdc,
+ int nSavedDC
)
{
- return NtGdiRestoreDC(a0,a1);
+ return NtGdiRestoreDC(hdc, nSavedDC);
}
@@ -727,10 +720,10 @@
int
STDCALL
SaveDC(
- HDC a0
+ HDC hdc
)
{
- return NtGdiSaveDC(a0);
+ return NtGdiSaveDC(hdc);
}
/*
@@ -739,13 +732,13 @@
UINT
STDCALL
SetPaletteEntries(
- HPALETTE a0,
- UINT a1,
- UINT a2,
- CONST PALETTEENTRY *a3
+ HPALETTE hpal,
+ UINT iStart,
+ UINT cEntries,
+ CONST PALETTEENTRY *lppe
)
{
- return NtGdiSetPaletteEntries(a0,a1,a2,(CONST PPALETTEENTRY)a3);
+ return NtGdiSetPaletteEntries(hpal, iStart, cEntries, (CONST PPALETTEENTRY)lppe);
}
/*
@@ -755,10 +748,10 @@
STDCALL
GetWorldTransform(
HDC hdc,
- LPXFORM a1
+ LPXFORM lpXform
)
{
- return NtGdiGetWorldTransform(hdc,a1);
+ return NtGdiGetWorldTransform(hdc, lpXform);
}
/*
@@ -767,11 +760,11 @@
BOOL
STDCALL
SetWorldTransform(
- HDC a0,
- CONST XFORM *a1
+ HDC hdc,
+ CONST XFORM *lpXform
)
{
- return NtGdiSetWorldTransform(a0,(CONST PXFORM)a1);
+ return NtGdiSetWorldTransform(hdc, (CONST PXFORM)lpXform);
}
/*
@@ -780,12 +773,12 @@
BOOL
STDCALL
ModifyWorldTransform(
- HDC a0,
- CONST XFORM *a1,
- DWORD a2
+ HDC hdc,
+ CONST XFORM *lpXform,
+ DWORD iMode
)
{
- return NtGdiModifyWorldTransform(a0,(CONST PXFORM)a1,a2);
+ return NtGdiModifyWorldTransform(hdc, (CONST PXFORM)lpXform, iMode);
}
/*
@@ -794,12 +787,12 @@
BOOL
STDCALL
CombineTransform(
- LPXFORM a0,
- CONST XFORM *a1,
- CONST XFORM *a2
+ LPXFORM lpxformResult,
+ CONST XFORM *lpxform1,
+ CONST XFORM *lpxform2
)
{
- return NtGdiCombineTransform(a0,(CONST PXFORM)a1,(CONST PXFORM)a2);
+ return NtGdiCombineTransform(lpxformResult, (CONST PXFORM)lpxform1, (CONST PXFORM)lpxform2);
}
/*
@@ -809,12 +802,12 @@
STDCALL
SetDIBColorTable(
HDC hdc,
- UINT a1,
- UINT a2,
- CONST RGBQUAD *a3
+ UINT uStartIndex,
+ UINT cEntries,
+ CONST RGBQUAD *pColors
)
{
- return NtGdiSetDIBColorTable(hdc,a1,a2,(RGBQUAD*)a3);
+ return NtGdiSetDIBColorTable(hdc, uStartIndex, cEntries, (RGBQUAD*)pColors);
}
/*
@@ -826,7 +819,7 @@
HDC hdc
)
{
- return NtGdiCreateHalftonePalette(hdc);
+ return NtGdiCreateHalftonePalette(hdc);
}
/*
@@ -835,13 +828,13 @@
BOOL
STDCALL
SetViewportExtEx(
- HDC a0,
- int a1,
- int a2,
- LPSIZE a3
+ HDC hdc,
+ int nXExtent,
+ int nYExtent,
+ LPSIZE lpSize
)
{
- return NtGdiSetViewportExtEx(a0,a1,a2,a3);
+ return NtGdiSetViewportExtEx(hdc, nXExtent, nYExtent, lpSize);
}
/*
@@ -850,13 +843,13 @@
BOOL
STDCALL
SetWindowExtEx(
- HDC a0,
- int a1,
- int a2,
- LPSIZE a3
+ HDC hdc,
+ int nXExtent,
+ int nYExtent,
+ LPSIZE lpSize
)
{
- return NtGdiSetWindowExtEx(a0,a1,a2,a3);
+ return NtGdiSetWindowExtEx(hdc, nXExtent, nYExtent, lpSize);
}
/*
@@ -865,13 +858,13 @@
BOOL
STDCALL
OffsetWindowOrgEx(
- HDC a0,
- int a1,
- int a2,
- LPPOINT a3
+ HDC hdc,
+ int nXOffset,
+ int nYOffset,
+ LPPOINT lpPoint
)
{
- return NtGdiOffsetWindowOrgEx(a0,a1,a2,a3);
+ return NtGdiOffsetWindowOrgEx(hdc, nXOffset, nYOffset, lpPoint);
}
/*
@@ -880,13 +873,13 @@
BOOL
STDCALL
SetBitmapDimensionEx(
- HBITMAP a0,
- int a1,
- int a2,
- LPSIZE a3
+ HBITMAP hBitmap,
+ int nWidth,
+ int nHeight,
+ LPSIZE lpSize
)
{
- return NtGdiSetBitmapDimensionEx(a0,a1,a2,a3);
+ return NtGdiSetBitmapDimensionEx(hBitmap, nWidth, nHeight, lpSize);
}
/*
@@ -895,11 +888,11 @@
BOOL
STDCALL
GetDCOrgEx(
- HDC a0,
- LPPOINT a1
+ HDC hdc,
+ LPPOINT lpPoint
)
{
- return NtGdiGetDCOrgEx(a0,a1);
+ return NtGdiGetDCOrgEx(hdc, lpPoint);
}
/*
@@ -908,14 +901,14 @@
LONG
STDCALL
GetDCOrg(
- HDC a0
+ HDC hdc
)
{
- // Officially obsolete by Microsoft
- POINT Pt;
- if (!NtGdiGetDCOrgEx(a0,&Pt))
- return 0;
- return(MAKELONG(Pt.x, Pt.y));
+ // Officially obsolete by Microsoft
+ POINT Pt;
+ if (!NtGdiGetDCOrgEx(hdc, &Pt))
+ return 0;
+ return(MAKELONG(Pt.x, Pt.y));
}
/*
@@ -924,11 +917,11 @@
BOOL
STDCALL
RectVisible(
- HDC a0,
- CONST RECT *a1
+ HDC hdc,
+ CONST RECT *lprc
)
{
- return NtGdiRectVisible(a0,(RECT *)a1);
+ return NtGdiRectVisible(hdc, (RECT *)lprc);
}
/*
@@ -937,15 +930,15 @@
int
STDCALL
ExtEscape(
- HDC a0,
- int a1,
- int a2,
- LPCSTR a3,
- int a4,
- LPSTR a5
+ HDC hdc,
+ int nEscape,
+ int cbInput,
+ LPCSTR lpszInData,
+ int cbOutput,
+ LPSTR lpszOutData
)
{
- return NtGdiExtEscape(a0, a1, a2, a3, a4, a5);
+ return NtGdiExtEscape(hdc, nEscape, cbInput, lpszInData, cbOutput, lpszOutData);
}
@@ -999,3 +992,41 @@
{
return NtGdiGetObject(Handle, Size, Buffer);
}
+
+
+/*
+ * @implemented
+ */
+BOOL
+STDCALL
+SetBrushOrgEx(
+ HDC hdc,
+ int nXOrg,
+ int nYOrg,
+ LPPOINT lppt
+ )
+{
+ return NtGdiSetBrushOrgEx(hdc, nXOrg, nYOrg, lppt);
+}
+
+
+/*
+ * @implemented
+ */
+BOOL
+STDCALL
+FixBrushOrgEx(
+ HDC hdc,
+ int nXOrg,
+ int nYOrg,
+ LPPOINT lppt
+ )
+{
+ #if 0
+ /* FIXME - Check if we're emulating win95, if so, forward to SetBrushOrgEx() */
+ return SetBrushOrgEx(hdc, nXOrg, nYOrg, lppt);
+ #endif
+
+ return FALSE;
+}
+
reactos/lib/gdi32/objects
diff -u -r1.10 -r1.11
--- fillshap.c 8 Feb 2004 21:37:52 -0000 1.10
+++ fillshap.c 25 Apr 2004 14:46:54 -0000 1.11
@@ -12,11 +12,11 @@
*/
BOOL
STDCALL
-Polygon(HDC hDC,
+Polygon(HDC hdc,
CONST POINT *lpPoints,
int nCount)
{
- return NtGdiPolygon(hDC, (CONST PPOINT)lpPoints, nCount);
+ return NtGdiPolygon(hdc, (CONST PPOINT)lpPoints, nCount);
}
@@ -25,13 +25,13 @@
*/
BOOL
STDCALL
-Rectangle(HDC hDC,
- int LeftRect,
- int TopRect,
- int RightRect,
- int BottomRect)
+Rectangle(HDC hdc,
+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect)
{
- return NtGdiRectangle(hDC, LeftRect, TopRect, RightRect, BottomRect);
+ return NtGdiRectangle(hdc, nLeftRect, nTopRect, nRightRect, nBottomRect);
}
/*
@@ -41,15 +41,15 @@
STDCALL
RoundRect(
HDC hdc,
- int left,
- int top,
- int right,
- int bottom,
- int width,
- int height
+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect,
+ int nWidth,
+ int nHeight
)
{
- return NtGdiRoundRect ( hdc, left, top, right, bottom, width, height );
+ return NtGdiRoundRect(hdc, nLeftRect, nTopRect, nRightRect, nBottomRect, nWidth, nHeight);
}
/*
@@ -58,13 +58,13 @@
BOOL
STDCALL
PolyPolygon(
- HDC a0,
- CONST POINT *a1,
- CONST INT *a2,
- int a3
+ HDC hdc,
+ CONST POINT *lpPoints,
+ CONST INT *lpPolyCounts,
+ int nCount
)
{
- return PolyPolygon(a0,(LPPOINT)a1,(LPINT)a2,a3);
+ return PolyPolygon(hdc, (LPPOINT)lpPoints, (LPINT)lpPolyCounts, nCount);
}
@@ -73,13 +73,13 @@
*/
BOOL
STDCALL
-Ellipse(HDC hDc,
- int Left,
- int Top,
- int Right,
- int Bottom)
+Ellipse(HDC hdc,
+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect)
{
- return NtGdiEllipse(hDc, Left, Top, Right, Bottom);
+ return NtGdiEllipse(hdc, nLeftRect, nTopRect, nRightRect, nBottomRect);
}
@@ -88,18 +88,18 @@
*/
BOOL
STDCALL
-Pie(HDC hDc,
- int Left,
- int Top,
- int Right,
- int Bottom,
- int XRadialStart,
- int YRadialStart,
- int XRadialEnd,
- int YRadialEnd)
+Pie(HDC hdc,
+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect,
+ int nXRadial1,
+ int nYRadial1,
+ int nXRadial2,
+ int nYRadial2)
{
- return NtGdiPie(hDc, Left, Top, Right, Bottom, XRadialStart, YRadialStart,
- XRadialEnd, YRadialEnd);
+ return NtGdiPie(hdc, nLeftRect, nTopRect, nRightRect, nBottomRect, nXRadial1, nYRadial1,
+ nXRadial2, nYRadial2);
}
BOOL STDCALL
@@ -111,7 +111,7 @@
UINT fuFillType // fill type
)
{
- return NtGdiExtFloodFill( hdc, nXStart, nYStart, crColor, fuFillType );
+ return NtGdiExtFloodFill(hdc, nXStart, nYStart, crColor, fuFillType);
}
/*
@@ -125,7 +125,7 @@
COLORREF crFill // fill color
)
{
- return NtGdiFloodFill(hdc,nXStart, nYStart, crFill );
+ return NtGdiFloodFill(hdc, nXStart, nYStart, crFill);
}
/*
@@ -135,12 +135,12 @@
GdiGradientFill(
HDC hdc,
PTRIVERTEX pVertex,
- ULONG uVertex,
+ ULONG dwNumVertex,
PVOID pMesh,
- ULONG uMesh,
- ULONG ulMode
+ ULONG dwNumMesh,
+ ULONG dwMode
)
{
- return NtGdiGradientFill(hdc, pVertex, uVertex, pMesh, uMesh, ulMode);
+ return NtGdiGradientFill(hdc, pVertex, dwNumVertex, pMesh, dwNumMesh, dwMode);
}
reactos/lib/gdi32/objects
diff -u -r1.3 -r1.4
--- font.c 9 Apr 2004 20:03:13 -0000 1.3
+++ font.c 25 Apr 2004 14:46:54 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Id: font.c,v 1.3 2004/04/09 20:03:13 navaraf Exp $
+/* $Id: font.c,v 1.4 2004/04/25 14:46:54 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@@ -194,9 +194,9 @@
*/
BOOL
STDCALL
-TranslateCharsetInfo(DWORD *Src, LPCHARSETINFO Cs, DWORD Flags)
+TranslateCharsetInfo(DWORD *pSrc, LPCHARSETINFO lpCs, DWORD dwFlags)
{
- return NtGdiTranslateCharsetInfo(Src, Cs, Flags);
+ return NtGdiTranslateCharsetInfo(pSrc, lpCs, dwFlags);
}
static int FASTCALL
@@ -277,10 +277,10 @@
* @implemented
*/
int STDCALL
-EnumFontFamiliesExW(HDC Dc, LPLOGFONTW LogFont, FONTENUMPROCW EnumFontFamProc,
- LPARAM lParam, DWORD Flags)
+EnumFontFamiliesExW(HDC hdc, LPLOGFONTW lpLogfont, FONTENUMPROCW lpEnumFontFamExProc,
+ LPARAM lParam, DWORD dwFlags)
{
- return IntEnumFontFamilies(Dc, LogFont, EnumFontFamProc, lParam, TRUE);
+ return IntEnumFontFamilies(hdc, lpLogfont, lpEnumFontFamExProc, lParam, TRUE);
}
@@ -288,19 +288,19 @@
* @implemented
*/
int STDCALL
-EnumFontFamiliesW(HDC Dc, LPCWSTR Family, FONTENUMPROCW EnumFontFamProc,
+EnumFontFamiliesW(HDC hdc, LPCWSTR lpszFamily, FONTENUMPROCW lpEnumFontFamProc,
LPARAM lParam)
{
LOGFONTW LogFont;
ZeroMemory(&LogFont, sizeof(LOGFONTW));
LogFont.lfCharSet = DEFAULT_CHARSET;
- if (NULL != Family)
+ if (NULL != lpszFamily)
{
- lstrcpynW(LogFont.lfFaceName, Family, LF_FACESIZE);
+ lstrcpynW(LogFont.lfFaceName, lpszFamily, LF_FACESIZE);
}
- return IntEnumFontFamilies(Dc, &LogFont, EnumFontFamProc, lParam, TRUE);
+ return IntEnumFontFamilies(hdc, &LogFont, lpEnumFontFamProc, lParam, TRUE);
}
@@ -308,15 +308,15 @@
* @implemented
*/
int STDCALL
-EnumFontFamiliesExA (HDC Dc, LPLOGFONTA LogFont, FONTENUMPROCA EnumFontFamProc,
+EnumFontFamiliesExA (HDC hdc, LPLOGFONTA lpLogfont, FONTENUMPROCA lpEnumFontFamExProc,
LPARAM lParam, DWORD dwFlags)
{
LOGFONTW LogFontW;
- RosRtlLogFontA2W(&LogFontW, LogFont);
+ RosRtlLogFontA2W(&LogFontW, lpLogfont);
/* no need to convert LogFontW back to lpLogFont b/c it's an [in] parameter only */
- return IntEnumFontFamilies(Dc, &LogFontW, EnumFontFamProc, lParam, FALSE);
+ return IntEnumFontFamilies(hdc, &LogFontW, lpEnumFontFamExProc, lParam, FALSE);
}
@@ -324,19 +324,19 @@
* @implemented
*/
int STDCALL
-EnumFontFamiliesA(HDC Dc, LPCSTR Family, FONTENUMPROCA EnumFontFamProc,
+EnumFontFamiliesA(HDC hdc, LPCSTR lpszFamily, FONTENUMPROCA lpEnumFontFamProc,
LPARAM lParam)
{
LOGFONTW LogFont;
ZeroMemory(&LogFont, sizeof(LOGFONTW));
LogFont.lfCharSet = DEFAULT_CHARSET;
- if (NULL != Family)
+ if (NULL != lpszFamily)
{
- MultiByteToWideChar(CP_THREAD_ACP, 0, Family, -1, LogFont.lfFaceName, LF_FACESIZE);
+ MultiByteToWideChar(CP_THREAD_ACP, 0, lpszFamily, -1, LogFont.lfFaceName, LF_FACESIZE);
}
- return IntEnumFontFamilies(Dc, &LogFont, EnumFontFamProc, lParam, FALSE);
+ return IntEnumFontFamilies(hdc, &LogFont, lpEnumFontFamProc, lParam, FALSE);
}
reactos/lib/gdi32/objects
diff -u -r1.10 -r1.11
--- line.c 2 Dec 2003 11:45:37 -0000 1.10
+++ line.c 25 Apr 2004 14:46:54 -0000 1.11
@@ -14,18 +14,19 @@
BOOL
STDCALL
Arc(
- HDC a0,
- int a1,
- int a2,
- int a3,
- int a4,
- int a5,
- int a6,
- int a7,
- int a8
+ HDC hdc,
+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect,
+ int nXStartArc,
+ int nYStartArc,
+ int nXEndArc,
+ int nYEndArc
)
{
- return NtGdiArc(a0,a1,a2,a3,a4,a5,a6,a7,a8);
+ return NtGdiArc(hdc, nLeftRect, nTopRect, nRightRect, nBottomRect,
+ nXStartArc, nYStartArc, nXEndArc, nYEndArc);
}
/*
@@ -35,10 +36,10 @@
STDCALL
SetArcDirection(
HDC hdc,
- int a1
+ int ArcDirection
)
{
- return NtGdiSetArcDirection(hdc, a1);
+ return NtGdiSetArcDirection(hdc, ArcDirection);
}
@@ -51,7 +52,7 @@
HDC hdc
)
{
- return NtGdiGetArcDirection(hdc);
+ return NtGdiGetArcDirection(hdc);
}
@@ -60,9 +61,9 @@
*/
BOOL
STDCALL
-LineTo(HDC hDC, int XEnd, int YEnd)
+LineTo(HDC hdc, int nXEnd, int nYEnd)
{
- return NtGdiLineTo(hDC, XEnd, YEnd);
+ return NtGdiLineTo(hdc, nXEnd, nYEnd);
}
@@ -71,9 +72,9 @@
*/
BOOL
STDCALL
-MoveToEx(HDC hDC, int X, int Y, LPPOINT Point)
+MoveToEx(HDC hdc, int X, int Y, LPPOINT lpPoint)
{
- return NtGdiMoveToEx(hDC, X, Y, Point);
+ return NtGdiMoveToEx(hdc, X, Y, lpPoint);
}
@@ -84,7 +85,7 @@
STDCALL
Polyline( HDC hdc, CONST POINT *lppt, int cPoints )
{
- return NtGdiPolyline(hdc, (CONST LPPOINT) lppt, cPoints);
+ return NtGdiPolyline(hdc, (CONST LPPOINT) lppt, cPoints);
}
/*
@@ -94,17 +95,18 @@
STDCALL
ArcTo(
HDC hdc,
- int a1,
- int a2,
- int a3,
- int a4,
- int a5,
- int a6,
- int a7,
- int a8
+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect,
+ int nXRadial1,
+ int nYRadial1,
+ int nXRadial2,
+ int nYRadial2
)
{
- return NtGdiArcTo(hdc,a1,a2,a3,a4,a5,a6,a7,a8);
+ return NtGdiArcTo(hdc, nLeftRect, nTopRect, nRightRect, nBottomRect,
+ nXRadial1, nYRadial1, nXRadial2, nYRadial2);
}
@@ -114,12 +116,12 @@
BOOL
STDCALL
PolyBezier(
- HDC a0,
- CONST POINT *a1,
- DWORD a2
+ HDC hdc,
+ CONST POINT *lppt,
+ DWORD cPoints
)
{
- return NtGdiPolyBezier(a0,(CONST PPOINT)a1,a2);
+ return NtGdiPolyBezier(hdc, (CONST PPOINT)lppt, cPoints);
}
/*
@@ -128,12 +130,12 @@
BOOL
STDCALL
PolyBezierTo(
- HDC a0,
- CONST POINT *a1,
- DWORD a2
+ HDC hdc,
+ CONST POINT *lppt,
+ DWORD cCount
)
{
- return NtGdiPolyBezierTo(a0,(CONST PPOINT)a1,a2);
+ return NtGdiPolyBezierTo(hdc, (CONST PPOINT)lppt, cCount);
}
@@ -143,12 +145,12 @@
BOOL
STDCALL
PolylineTo(
- HDC a0,
- CONST POINT *a1,
- DWORD a2
+ HDC hdc,
+ CONST POINT *lppt,
+ DWORD cCount
)
{
- return NtGdiPolylineTo(a0,(CONST PPOINT)a1,a2);
+ return NtGdiPolylineTo(hdc, (CONST PPOINT)lppt, cCount);
}
/*
@@ -158,10 +160,10 @@
STDCALL
PolyPolyline(
HDC hdc,
- CONST POINT *a1,
- CONST DWORD *a2,
- DWORD a3
+ CONST POINT *lppt,
+ CONST DWORD *lpdwPolyPoints,
+ DWORD cCount
)
{
- return NtGdiPolyPolyline(hdc,(LPPOINT)a1,(LPDWORD)a2,a3);
+ return NtGdiPolyPolyline(hdc, (LPPOINT)lppt, (LPDWORD)lpdwPolyPoints, cCount);
}
reactos/lib/gdi32/objects
diff -u -r1.1 -r1.2
--- linedda.c 16 Nov 2003 22:44:39 -0000 1.1
+++ linedda.c 25 Apr 2004 14:46:54 -0000 1.2
@@ -37,7 +37,7 @@
* @implemented
*/
BOOL STDCALL LineDDA(INT nXStart, INT nYStart, INT nXEnd, INT nYEnd,
- LINEDDAPROC callback, LPARAM lParam )
+ LINEDDAPROC lpLineFunc, LPARAM lpData )
{
INT xadd = 1, yadd = 1;
INT err,erradd;
@@ -54,7 +54,7 @@
if (dx > dy) { /* line is "more horizontal" */
err = 2*dy - dx; erradd = 2*dy - 2*dx;
for(cnt = 0;cnt <= dx; cnt++) {
- callback(nXStart,nYStart,lParam);
+ lpLineFunc(nXStart,nYStart,lpData);
if (err > 0) {
nYStart += yadd;
err += erradd;
@@ -66,7 +66,7 @@
} else { /* line is "more vertical" */
err = 2*dx - dy; erradd = 2*dx - 2*dy;
for(cnt = 0;cnt <= dy; cnt++) {
- callback(nXStart,nYStart,lParam);
+ lpLineFunc(nXStart,nYStart,lpData);
if (err > 0) {
nXStart += xadd;
err += erradd;
reactos/lib/gdi32/objects
diff -u -r1.2 -r1.3
--- metafile.c 9 Apr 2004 20:03:13 -0000 1.2
+++ metafile.c 25 Apr 2004 14:46:54 -0000 1.3
@@ -19,11 +19,11 @@
HMETAFILE
STDCALL
CopyMetaFileW(
- HMETAFILE Src,
- LPCWSTR File
+ HMETAFILE hmfSrc,
+ LPCWSTR lpszFile
)
{
- return NtGdiCopyMetaFile ( Src, File );
+ return NtGdiCopyMetaFile (hmfSrc, lpszFile);
}
@@ -33,7 +33,7 @@
HMETAFILE
STDCALL
CopyMetaFileA(
- HMETAFILE Src,
+ HMETAFILE hmfSrc,
LPCSTR lpszFile
)
{
@@ -46,7 +46,7 @@
SetLastError (RtlNtStatusToDosError(Status));
else
{
- rc = NtGdiCopyMetaFile ( Src, lpszFileW );
+ rc = NtGdiCopyMetaFile ( hmfSrc, lpszFileW );
HEAP_free ( lpszFileW );
}
@@ -64,7 +64,7 @@
LPCWSTR lpszFile
)
{
- return NtGdiCreateMetaFile ( lpszFile );
+ return NtGdiCreateMetaFile ( lpszFile );
}
@@ -181,13 +181,13 @@
HDC
STDCALL
CreateEnhMetaFileW(
- HDC hdc,
+ HDC hdcRef,
LPCWSTR lpFileName,
CONST RECT *lpRect,
LPCWSTR lpDescription
)
{
- return NtGdiCreateEnhMetaFile ( hdc, lpFileName, (CONST LPRECT)lpRect, lpDescription );
+ return NtGdiCreateEnhMetaFile ( hdcRef, lpFileName, (CONST LPRECT)lpRect, lpDescription );
}
@@ -197,7 +197,7 @@
HDC
STDCALL
CreateEnhMetaFileA(
- HDC hdc,
+ HDC hdcRef,
LPCSTR lpFileName,
CONST RECT *lpRect,
LPCSTR lpDescription
@@ -218,7 +218,7 @@
else
{
rc = NtGdiCreateEnhMetaFile (
- hdc, lpFileNameW, (CONST LPRECT)lpRect, lpDescriptionW );
+ hdcRef, lpFileNameW, (CONST LPRECT)lpRect, lpDescriptionW );
HEAP_free ( lpDescriptionW );
}
reactos/lib/gdi32/objects
diff -u -r1.5 -r1.6
--- pen.c 19 Aug 2003 11:48:49 -0000 1.5
+++ pen.c 25 Apr 2004 14:46:54 -0000 1.6
@@ -13,9 +13,9 @@
*/
HPEN
STDCALL
-CreatePen(INT PenStyle, INT Width, COLORREF Color)
+CreatePen(INT fnPenStyle, INT nWidth, COLORREF crColor)
{
- return NtGdiCreatePen(PenStyle, Width, Color);
+ return NtGdiCreatePen(fnPenStyle, nWidth, crColor);
}
@@ -24,7 +24,7 @@
*/
HPEN
STDCALL
-CreatePenIndirect(CONST LOGPEN *lgpn)
+CreatePenIndirect(CONST LOGPEN *lplgpn)
{
- return NtGdiCreatePenIndirect((CONST PLOGPEN)lgpn);
+ return NtGdiCreatePenIndirect((CONST PLOGPEN)lplgpn);
}
reactos/lib/gdi32/objects
diff -u -r1.13 -r1.14
--- region.c 24 Apr 2004 14:21:36 -0000 1.13
+++ region.c 25 Apr 2004 14:46:54 -0000 1.14
@@ -14,12 +14,12 @@
int
STDCALL
OffsetClipRgn(
- HDC a0,
- int a1,
- int a2
+ HDC hdc,
+ int nXOffset,
+ int nYOffset
)
{
- return NtGdiOffsetClipRgn(a0, a1, a2);
+ return NtGdiOffsetClipRgn(hdc, nXOffset, nYOffset);
}
@@ -29,14 +29,14 @@
int
STDCALL
GetClipRgn(
- HDC a0,
- HRGN a1
+ HDC hdc,
+ HRGN hrgn
)
{
- HRGN rgn = NtGdiGetClipRgn(a0);
+ HRGN rgn = NtGdiGetClipRgn(hdc);
if(rgn)
{
- if(NtGdiCombineRgn(a1, rgn, 0, RGN_COPY) != ERROR) return 1;
+ if(NtGdiCombineRgn(hrgn, rgn, 0, RGN_COPY) != ERROR) return 1;
else
return -1;
}
@@ -45,31 +45,31 @@
/*
- * @unimplemented
+ * @implemented
*/
HRGN
STDCALL
CreateEllipticRgn(
- int a0,
- int a1,
- int a2,
- int a3
+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect
)
{
- return NtGdiCreateEllipticRgn(a0,a1,a2,a3);
+ return NtGdiCreateEllipticRgn(nLeftRect, nTopRect, nRightRect, nBottomRect);
}
/*
- * @unimplemented
+ * @implemented
*/
HRGN
STDCALL
CreateEllipticRgnIndirect(
- CONST RECT *a0
+ CONST RECT *lprc
)
{
- return NtGdiCreateEllipticRgnIndirect((RECT *)a0);
+ return NtGdiCreateEllipticRgnIndirect((RECT *)lprc);
}
@@ -93,29 +93,16 @@
/*
* @implemented
*/
-HBRUSH
-STDCALL
-CreatePatternBrush(
- HBITMAP hbmp
- )
-{
- return NtGdiCreatePatternBrush ( hbmp );
-}
-
-
-/*
- * @implemented
- */
HRGN
STDCALL
CreateRectRgn(
- int a0,
- int a1,
- int a2,
- int a3
+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect
)
{
- return NtGdiCreateRectRgn(a0,a1,a2,a3);
+ return NtGdiCreateRectRgn(nLeftRect, nTopRect, nRightRect, nBottomRect);
}
@@ -125,10 +112,10 @@
HRGN
STDCALL
CreateRectRgnIndirect(
- CONST RECT *a0
+ CONST RECT *lprc
)
{
- return NtGdiCreateRectRgnIndirect((RECT *)a0);
+ return NtGdiCreateRectRgnIndirect((RECT *)lprc);
}
@@ -146,8 +133,8 @@
int nHeightEllipse
)
{
- return NtGdiCreateRoundRectRgn (
- nLeftRect, nTopRect, nRightRect, nBottomRect, nWidthEllipse, nHeightEllipse );
+ return NtGdiCreateRoundRectRgn(nLeftRect, nTopRect, nRightRect, nBottomRect,
+ nWidthEllipse, nHeightEllipse);
}
@@ -157,11 +144,11 @@
BOOL
STDCALL
EqualRgn(
- HRGN a0,
- HRGN a1
+ HRGN hSrcRgn1,
+ HRGN hSrcRgn2
)
{
- return NtGdiEqualRgn(a0,a1);
+ return NtGdiEqualRgn(hSrcRgn1, hSrcRgn2);
}
@@ -171,12 +158,12 @@
int
STDCALL
OffsetRgn(
- HRGN a0,
- int a1,
- int a2
+ HRGN hrgn,
+ int nXOffset,
+ int nYOffset
)
{
- return NtGdiOffsetRgn(a0,a1,a2);
+ return NtGdiOffsetRgn(hrgn, nXOffset, nYOffset);
}
@@ -186,11 +173,11 @@
int
STDCALL
GetRgnBox(
- HRGN a0,
- LPRECT a1
+ HRGN hrgn,
+ LPRECT lprc
)
{
- return NtGdiGetRgnBox(a0,a1);
+ return NtGdiGetRgnBox(hrgn, lprc);
}
@@ -200,14 +187,14 @@
BOOL
STDCALL
SetRectRgn(
- HRGN a0,
- int a1,
- int a2,
- int a3,
- int a4
+ HRGN hrgn,
+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect
)
{
- return NtGdiSetRectRgn(a0,a1,a2,a3,a4);
+ return NtGdiSetRectRgn(hrgn, nLeftRect, nTopRect, nRightRect, nBottomRect);
}
@@ -217,13 +204,13 @@
int
STDCALL
CombineRgn(
- HRGN a0,
- HRGN a1,
- HRGN a2,
- int a3
+ HRGN hrgnDest,
+ HRGN hrgnSrc1,
+ HRGN hrgnSrc2,
+ int fnCombineMode
)
{
- return NtGdiCombineRgn(a0,a1,a2,a3);
+ return NtGdiCombineRgn(hrgnDest, hrgnSrc1, hrgnSrc2, fnCombineMode);
}
@@ -233,12 +220,12 @@
DWORD
STDCALL
GetRegionData(
- HRGN a0,
- DWORD a1,
- LPRGNDATA a2
+ HRGN hRgn,
+ DWORD dwCount,
+ LPRGNDATA lpRgnData
)
{
- return NtGdiGetRegionData(a0,a1,a2);
+ return NtGdiGetRegionData(hRgn, dwCount, lpRgnData);
}
@@ -248,11 +235,11 @@
BOOL
STDCALL
PaintRgn(
- HDC a0,
- HRGN a1
+ HDC hdc,
+ HRGN hrgn
)
{
- return NtGdiPaintRgn( a0, a1 );
+ return NtGdiPaintRgn(hdc, hrgn);
}
@@ -262,12 +249,12 @@
BOOL
STDCALL
FillRgn(
- HDC a0,
- HRGN a1,
- HBRUSH a2
+ HDC hdc,
+ HRGN hrgn,
+ HBRUSH hbr
)
{
- return NtGdiFillRgn(a0, a1, a2);
+ return NtGdiFillRgn(hdc, hrgn, hbr);
}
/*
@@ -276,12 +263,12 @@
BOOL
STDCALL
PtInRegion(
- HRGN a0,
- int a1,
- int a2
+ HRGN hrgn,
+ int X,
+ int Y
)
{
- return NtGdiPtInRegion(a0,a1,a2);
+ return NtGdiPtInRegion(hrgn, X, Y);
}
/*
@@ -290,11 +277,11 @@
BOOL
STDCALL
RectInRegion(
- HRGN a0,
- CONST RECT *a1
+ HRGN hrgn,
+ CONST RECT *lprc
)
{
- return NtGdiRectInRegion(a0,(CONST PRECT)a1);
+ return NtGdiRectInRegion(hrgn, (CONST PRECT)lprc);
}
/*
@@ -303,11 +290,11 @@
BOOL
STDCALL
InvertRgn(
- HDC hDc,
- HRGN hRgn
+ HDC hdc,
+ HRGN hrgn
)
{
- return NtGdiInvertRgn(hDc, hRgn);
+ return NtGdiInvertRgn(hdc, hrgn);
}
/*
@@ -323,5 +310,5 @@
int nHeight
)
{
- return NtGdiFrameRgn(hdc, hrgn, hbr, nWidth, nHeight);
+ return NtGdiFrameRgn(hdc, hrgn, hbr, nWidth, nHeight);
}
reactos/lib/gdi32/objects
diff -u -r1.18 -r1.19
--- text.c 27 Mar 2004 21:07:33 -0000 1.18
+++ text.c 25 Apr 2004 14:46:54 -0000 1.19
@@ -17,11 +17,11 @@
UINT
STDCALL
SetTextAlign(
- HDC a0,
- UINT a1
+ HDC hdc,
+ UINT fMode
)
{
- return NtGdiSetTextAlign(a0, a1);
+ return NtGdiSetTextAlign(hdc, fMode);
}
@@ -31,24 +31,24 @@
BOOL
STDCALL
TextOutA(
- HDC hDC,
- int XStart,
- int YStart,
- LPCSTR String,
- int Count)
+ HDC hdc,
+ int nXStart,
+ int nYStart,
+ LPCSTR lpString,
+ int cbString)
{
ANSI_STRING StringA;
UNICODE_STRING StringU;
BOOL ret;
- if (NULL != String)
+ if (NULL != lpString)
{
- RtlInitAnsiString(&StringA, (LPSTR)String);
+ RtlInitAnsiString(&StringA, (LPSTR)lpString);
RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE);
} else
StringU.Buffer = NULL;
- ret = TextOutW(hDC, XStart, YStart, StringU.Buffer, Count);
+ ret = TextOutW(hdc, nXStart, nYStart, StringU.Buffer, cbString);
RtlFreeUnicodeString(&StringU);
return ret;
}
@@ -60,13 +60,13 @@
BOOL
STDCALL
TextOutW(
- HDC hDC,
- int XStart,
- int YStart,
- LPCWSTR String,
- int Count)
+ HDC hdc,
+ int nXStart,
+ int nYStart,
+ LPCWSTR lpString,
+ int cbString)
{
- return NtGdiTextOut(hDC, XStart, YStart, String, Count);
+ return NtGdiTextOut(hdc, nXStart, nYStart, lpString, cbString);
}
@@ -74,9 +74,9 @@
* @implemented
*/
COLORREF STDCALL
-SetTextColor(HDC hDC, COLORREF color)
+SetTextColor(HDC hdc, COLORREF crColor)
{
- return(NtGdiSetTextColor(hDC, color));
+ return NtGdiSetTextColor(hdc, crColor);
}
@@ -87,7 +87,7 @@
STDCALL
GetTextMetricsA(
HDC hdc,
- LPTEXTMETRICA tm
+ LPTEXTMETRICA lptm
)
{
TEXTMETRICW tmw;
@@ -97,7 +97,7 @@
return FALSE;
}
- return TextMetricW2A(tm, &tmw);
+ return TextMetricW2A(lptm, &tmw);
}
@@ -108,10 +108,10 @@
STDCALL
GetTextMetricsW(
HDC hdc,
- LPTEXTMETRICW tm
+ LPTEXTMETRICW lptm
)
{
- return NtGdiGetTextMetrics(hdc, tm);
+ return NtGdiGetTextMetrics(hdc, lptm);
}
@@ -121,20 +121,20 @@
BOOL
APIENTRY
GetTextExtentPointA(
- HDC hDC,
- LPCSTR String,
- int Count,
- LPSIZE Size
+ HDC hdc,
+ LPCSTR lpString,
+ int cbString,
+ LPSIZE lpSize
)
{
ANSI_STRING StringA;
UNICODE_STRING StringU;
BOOL ret;
- RtlInitAnsiString(&StringA, (LPSTR)String);
+ RtlInitAnsiString(&StringA, (LPSTR)lpString);
RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE);
- ret = GetTextExtentPointW(hDC, StringU.Buffer, Count, Size);
+ ret = GetTextExtentPointW(hdc, StringU.Buffer, cbString, lpSize);
RtlFreeUnicodeString(&StringU);
@@ -148,13 +148,13 @@
BOOL
APIENTRY
GetTextExtentPointW(
- HDC hDC,
- LPCWSTR String,
- int Count,
- LPSIZE Size
+ HDC hdc,
+ LPCWSTR lpString,
+ int cbString,
+ LPSIZE lpSize
)
{
- return NtGdiGetTextExtentPoint(hDC, String, Count, Size);
+ return NtGdiGetTextExtentPoint(hdc, lpString, cbString, lpSize);
}
@@ -164,20 +164,20 @@
BOOL
APIENTRY
GetTextExtentPoint32A(
- HDC hDC,
- LPCSTR String,
- int Count,
- LPSIZE Size
+ HDC hdc,
+ LPCSTR lpString,
+ int cbString,
+ LPSIZE lpSize
)
{
ANSI_STRING StringA;
UNICODE_STRING StringU;
BOOL ret;
- RtlInitAnsiString(&StringA, (LPSTR)String);
+ RtlInitAnsiString(&StringA, (LPSTR)lpString);
RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE);
- ret = GetTextExtentPoint32W(hDC, StringU.Buffer, Count, Size);
+ ret = GetTextExtentPoint32W(hdc, StringU.Buffer, cbString, lpSize);
RtlFreeUnicodeString(&StringU);
@@ -191,13 +191,13 @@
BOOL
APIENTRY
GetTextExtentPoint32W(
- HDC hDC,
- LPCWSTR String,
- int Count,
- LPSIZE Size
+ HDC hdc,
+ LPCWSTR lpString,
+ int cbString,
+ LPSIZE lpSize
)
{
- return NtGdiGetTextExtentPoint32(hDC, String, Count, Size);
+ return NtGdiGetTextExtentPoint32(hdc, lpString, cbString, lpSize);
}
@@ -207,24 +207,24 @@
BOOL
STDCALL
ExtTextOutA(
- HDC hDC,
+ HDC hdc,
int X,
int Y,
- UINT Options,
- CONST RECT *Rect,
- LPCSTR String,
- UINT Count,
- CONST INT *Spacings
+ UINT fuOptions,
+ CONST RECT *lprc,
+ LPCSTR lpString,
+ UINT cbCount,
+ CONST INT *lpDx
)
{
ANSI_STRING StringA;
UNICODE_STRING StringU;
BOOL ret;
- RtlInitAnsiString(&StringA, (LPSTR)String);
+ RtlInitAnsiString(&StringA, (LPSTR)lpString);
RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE);
- ret = ExtTextOutW(hDC, X, Y, Options, Rect, StringU.Buffer, Count, Spacings);
+ ret = ExtTextOutW(hdc, X, Y, fuOptions, lprc, StringU.Buffer, cbCount, lpDx);
RtlFreeUnicodeString(&StringU);
@@ -242,13 +242,13 @@
int X,
int Y,
UINT fuOptions,
- CONST RECT *lpRect,
+ CONST RECT *lprc,
LPCWSTR lpString,
UINT cbCount,
CONST INT *lpDx
)
{
- return NtGdiExtTextOut(hdc, X, Y, fuOptions, lpRect, lpString, cbCount, lpDx);
+ return NtGdiExtTextOut(hdc, X, Y, fuOptions, lprc, lpString, cbCount, lpDx);
}
@@ -258,12 +258,12 @@
HFONT
STDCALL
CreateFontIndirectA(
- CONST LOGFONTA *lf
+ CONST LOGFONTA *lplf
)
{
LOGFONTW tlf;
- RosRtlLogFontA2W(&tlf, lf);
+ RosRtlLogFontA2W(&tlf, lplf);
return NtGdiCreateFontIndirect(&tlf);
}
@@ -275,10 +275,10 @@
HFONT
STDCALL
CreateFontIndirectW(
- CONST LOGFONTW *lf
+ CONST LOGFONTW *lplf
)
{
- return NtGdiCreateFontIndirect((CONST LPLOGFONTW)lf);
+ return NtGdiCreateFontIndirect((CONST LPLOGFONTW)lplf);
}
@@ -288,31 +288,31 @@
HFONT
STDCALL
CreateFontA(
- int Height,
- int Width,
- int Escapement,
- int Orientation,
- int Weight,
- DWORD Italic,
- DWORD Underline,
- DWORD StrikeOut,
- DWORD CharSet,
- DWORD OutputPrecision,
- DWORD ClipPrecision,
- DWORD Quality,
- DWORD PitchAndFamily,
- LPCSTR Face
+ int nHeight,
+ int nWidth,
+ int nEscapement,
+ int nOrientation,
+ int fnWeight,
+ DWORD fdwItalic,
+ DWORD fdwUnderline,
+ DWORD fdwStrikeOut,
+ DWORD fdwCharSet,
+ DWORD fdwOutputPrecision,
+ DWORD fdwClipPrecision,
+ DWORD fdwQuality,
+ DWORD fdwPitchAndFamily,
+ LPCSTR lpszFace
)
{
ANSI_STRING StringA;
UNICODE_STRING StringU;
HFONT ret;
- RtlInitAnsiString(&StringA, (LPSTR)Face);
+ RtlInitAnsiString(&StringA, (LPSTR)lpszFace);
RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE);
- ret = CreateFontW(Height, Width, Escapement, Orientation, Weight, Italic, Underline, StrikeOut,
- CharSet, OutputPrecision, ClipPrecision, Quality, PitchAndFamily, StringU.Buffer);
+ ret = CreateFontW(nHeight, nWidth, nEscapement, nOrientation, fnWeight, fdwItalic, fdwUnderline, fdwStrikeOut,
+ fdwCharSet, fdwOutputPrecision, fdwClipPrecision, fdwQuality, fdwPitchAndFamily, StringU.Buffer);
RtlFreeUnicodeString(&StringU);
@@ -326,23 +326,23 @@
HFONT
STDCALL
CreateFontW(
- int Height,
- int Width,
- int Escapement,
- int Orientation,
- int Weight,
- DWORD Italic,
- DWORD Underline,
- DWORD StrikeOut,
- DWORD CharSet,
- DWORD OutputPrecision,
- DWORD ClipPrecision,
- DWORD Quality,
- DWORD PitchAndFamily,
- LPCWSTR Face
+ int nHeight,
+ int nWidth,
+ int nEscapement,
+ int nOrientation,
+ int nWeight,
+ DWORD fnItalic,
+ DWORD fdwUnderline,
+ DWORD fdwStrikeOut,
+ DWORD fdwCharSet,
+ DWORD fdwOutputPrecision,
+ DWORD fdwClipPrecision,
+ DWORD fdwQuality,
+ DWORD fdwPitchAndFamily,
+ LPCWSTR lpszFace
)
{
- return NtGdiCreateFont(Height, Width, Escapement, Orientation, Weight, Italic, Underline, StrikeOut,
- CharSet, OutputPrecision, ClipPrecision, Quality, PitchAndFamily, Face);
+ return NtGdiCreateFont(nHeight, nWidth, nEscapement, nOrientation, nWeight, fnItalic, fdwUnderline, fdwStrikeOut,
+ fdwCharSet, fdwOutputPrecision, fdwClipPrecision, fdwQuality, fdwPitchAndFamily, lpszFace);
}
reactos/subsys/win32k/objects
diff -u -r1.35 -r1.36
--- brush.c 25 Apr 2004 11:34:13 -0000 1.35
+++ brush.c 25 Apr 2004 14:46:54 -0000 1.36
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: brush.c,v 1.35 2004/04/25 11:34:13 weiden Exp $
+ * $Id: brush.c,v 1.36 2004/04/25 14:46:54 weiden Exp $
*/
#undef WIN32_LEAN_AND_MEAN
@@ -336,10 +336,17 @@
if (Point != NULL)
{
+ NTSTATUS Status;
POINT SafePoint;
SafePoint.x = dc->w.brushOrgX;
SafePoint.y = dc->w.brushOrgY;
- MmCopyToCaller(Point, &SafePoint, sizeof(POINT));
+ Status = MmCopyToCaller(Point, &SafePoint, sizeof(POINT));
+ if(!NT_SUCCESS(Status))
+ {
+ DC_UnlockDc(hDC);
+ SetLastNtError(Status);
+ return FALSE;
+ }
}
dc->w.brushOrgX = XOrg;
CVSspam 0.2.8