WIN32K code cleanup.

Prefer FASTCALL/STDCALL in kernel mode code.
Make compiler check function signatures.
Tested under BOCHS 2.0.2 + FreeDOS + loadros.

svn path=/trunk/; revision=4715

diff --git a/reactos/include/win32k/bitmaps.h b/reactos/include/win32k/bitmaps.h
index 8196f14..1d1a5bb 100644 (file)
--- a/reactos/include/win32k/bitmaps.h
+++ b/reactos/include/win32k/bitmaps.h
@@ -41,14 +41,14 @@ typedef struct _BITMAPOBJ
 #define  BITMAPOBJ_LockBitmap(hBMObj) GDIOBJ_LockObject ((HGDIOBJ) hBMObj)
 #define  BITMAPOBJ_UnlockBitmap(hBMObj) GDIOBJ_UnlockObject ((HGDIOBJ) hBMObj)
 
 #define  BITMAPOBJ_LockBitmap(hBMObj) GDIOBJ_LockObject ((HGDIOBJ) hBMObj)
 #define  BITMAPOBJ_UnlockBitmap(hBMObj) GDIOBJ_UnlockObject ((HGDIOBJ) hBMObj)
 

-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);
-INT BITMAP_GetObject(BITMAPOBJ * bmp, INT count, LPVOID buffer);
-BOOL Bitmap_InternalDelete( PBITMAPOBJ pBmp );
-HBITMAP BitmapToSurf(PBITMAPOBJ BitmapObj);
+INT     FASTCALL BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp);
+HBITMAP FASTCALL BITMAPOBJ_CopyBitmap (HBITMAP  hBitmap);
+INT     FASTCALL DIB_GetDIBWidthBytes (INT  width, INT  depth);
+int     STDCALL  DIB_GetDIBImageBytes (INT  width, INT  height, INT  depth);
+int     FASTCALL DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse);
+INT     STDCALL  BITMAP_GetObject(BITMAPOBJ * bmp, INT count, LPVOID buffer);
+BOOL    FASTCALL Bitmap_InternalDelete( PBITMAPOBJ pBmp );
+HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj);

 
 /*  User Entry Points  */
 BOOL
 
 /*  User Entry Points  */
 BOOL

diff --git a/reactos/include/win32k/dc.h b/reactos/include/win32k/dc.h
index 0f45793..2c6ca8c 100644 (file)
--- a/reactos/include/win32k/dc.h
+++ b/reactos/include/win32k/dc.h
@@ -126,17 +126,17 @@ typedef struct
 #define  DC_ReleasePtr(hDC)  \
   GDIOBJ_UnlockObj ((HGDIOBJ) hDC, GO_DC_MAGIC)
 
 #define  DC_ReleasePtr(hDC)  \
   GDIOBJ_UnlockObj ((HGDIOBJ) hDC, GO_DC_MAGIC)
 

-HDC RetrieveDisplayHDC(VOID);
-HDC  DC_AllocDC(LPCWSTR  Driver);
-void  DC_InitDC(HDC  DCToInit);
-HDC  DC_FindOpenDC(LPCWSTR  Driver);
-void  DC_FreeDC(HDC  DCToFree);
-HDC  DC_GetNextDC (PDC pDC);
-void  DC_SetNextDC (PDC pDC, HDC hNextDC);
-BOOL DC_InternalDeleteDC( PDC DCToDelete );
-
-void DC_UpdateXforms(PDC  dc);
-BOOL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest);
+HDC  FASTCALL RetrieveDisplayHDC(VOID);
+HDC  FASTCALL DC_AllocDC(LPCWSTR  Driver);
+VOID FASTCALL DC_InitDC(HDC  DCToInit);
+HDC  FASTCALL DC_FindOpenDC(LPCWSTR  Driver);
+VOID FASTCALL DC_FreeDC(HDC  DCToFree);
+HDC  FASTCALL DC_GetNextDC (PDC pDC);
+VOID FASTCALL DC_SetNextDC (PDC pDC, HDC hNextDC);
+BOOL FASTCALL DC_InternalDeleteDC( PDC DCToDelete );
+
+VOID FASTCALL DC_UpdateXforms(PDC  dc);
+BOOL FASTCALL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest);

 
 /*  User entry points */
 
 
 /*  User entry points */
 


@@ -202,4 +202,3 @@ INT STDCALL  W32kSetStretchBltMode(HDC  hDC, INT  stretchBltMode);
 COLORREF STDCALL  W32kSetTextColor(HDC hDC, COLORREF color);
 
 #endif
 COLORREF STDCALL  W32kSetTextColor(HDC hDC, COLORREF color);
 
 #endif

-

diff --git a/reactos/include/win32k/gdiobj.h b/reactos/include/win32k/gdiobj.h
index 89475a2..cf5ec28 100644 (file)
--- a/reactos/include/win32k/gdiobj.h
+++ b/reactos/include/win32k/gdiobj.h
@@ -92,15 +92,15 @@ typedef struct _GDIMULTILOCK
        WORD            Magic;
 } GDIMULTILOCK, *PGDIMULTILOCK;
 
        WORD            Magic;
 } GDIMULTILOCK, *PGDIMULTILOCK;
 

-HGDIOBJ  GDIOBJ_AllocObj(WORD Size, WORD Magic);
-BOOL  GDIOBJ_FreeObj (HGDIOBJ Obj, WORD Magic, DWORD Flag);
-PGDIOBJ  GDIOBJ_LockObj (HGDIOBJ Obj, WORD Magic);
-BOOL GDIOBJ_LockMultipleObj( PGDIMULTILOCK pList, INT nObj );
-BOOL     GDIOBJ_UnlockObj (HGDIOBJ Obj, WORD Magic);
-BOOL GDIOBJ_UnlockMultipleObj( PGDIMULTILOCK pList, INT nObj );
-WORD  GDIOBJ_GetHandleMagic (HGDIOBJ ObjectHandle);
-VOID STDCALL W32kDumpGdiObjects( INT Process );
-BOOL STDCALL W32kCleanupForProcess( INT Process );
+HGDIOBJ FASTCALL GDIOBJ_AllocObj(WORD Size, WORD Magic);
+BOOL    STDCALL  GDIOBJ_FreeObj (HGDIOBJ Obj, WORD Magic, DWORD Flag);
+PGDIOBJ FASTCALL GDIOBJ_LockObj (HGDIOBJ Obj, WORD Magic);
+BOOL    FASTCALL GDIOBJ_LockMultipleObj( PGDIMULTILOCK pList, INT nObj );
+BOOL    FASTCALL GDIOBJ_UnlockObj (HGDIOBJ Obj, WORD Magic);
+BOOL    FASTCALL GDIOBJ_UnlockMultipleObj( PGDIMULTILOCK pList, INT nObj );
+WORD    FASTCALL GDIOBJ_GetHandleMagic (HGDIOBJ ObjectHandle);
+VOID    STDCALL W32kDumpGdiObjects( INT Process );
+BOOL    STDCALL W32kCleanupForProcess( INT Process );

 
 #define GDIOBJFLAG_DEFAULT             (0x0)
 #define GDIOBJFLAG_IGNOREPID   (0x1)
 
 #define GDIOBJFLAG_DEFAULT             (0x0)
 #define GDIOBJFLAG_IGNOREPID   (0x1)

diff --git a/reactos/include/win32k/region.h b/reactos/include/win32k/region.h
index 4c7783a..88da34c 100644 (file)
--- a/reactos/include/win32k/region.h
+++ b/reactos/include/win32k/region.h
@@ -14,9 +14,9 @@ typedef struct _ROSRGNDATA {
 #define  RGNDATA_FreeRgn(hRgn)  GDIOBJ_FreeObj((HGDIOBJ)hRgn, GO_REGION_MAGIC, GDIOBJFLAG_DEFAULT)
 #define  RGNDATA_LockRgn(hRgn) ((PROSRGNDATA)GDIOBJ_LockObj((HGDIOBJ)hRgn, GO_REGION_MAGIC))
 #define  RGNDATA_UnlockRgn(hRgn) GDIOBJ_UnlockObj((HGDIOBJ)hRgn, GO_REGION_MAGIC)
 #define  RGNDATA_FreeRgn(hRgn)  GDIOBJ_FreeObj((HGDIOBJ)hRgn, GO_REGION_MAGIC, GDIOBJFLAG_DEFAULT)
 #define  RGNDATA_LockRgn(hRgn) ((PROSRGNDATA)GDIOBJ_LockObj((HGDIOBJ)hRgn, GO_REGION_MAGIC))
 #define  RGNDATA_UnlockRgn(hRgn) GDIOBJ_UnlockObj((HGDIOBJ)hRgn, GO_REGION_MAGIC)

-HRGN RGNDATA_AllocRgn(INT n);
+HRGN FASTCALL RGNDATA_AllocRgn(INT n);

 
 

-BOOL RGNDATA_InternalDelete( PROSRGNDATA Obj );
+BOOL FASTCALL RGNDATA_InternalDelete( PROSRGNDATA Obj );

 
 /*  User entry points */
 HRGN STDCALL
 
 /*  User entry points */
 HRGN STDCALL


@@ -148,7 +148,8 @@ STDCALL
 W32kGetRegionData(HRGN hrgn,
                                                DWORD count,
                                                LPRGNDATA rgndata);
 W32kGetRegionData(HRGN hrgn,
                                                DWORD count,
                                                LPRGNDATA rgndata);

-HRGN REGION_CropRgn(HRGN hDst, HRGN hSrc, const PRECT lpRect, PPOINT lpPt);
+
+HRGN STDCALL REGION_CropRgn(HRGN hDst, HRGN hSrc, const PRECT lpRect, PPOINT lpPt);

 HRGN STDCALL
 UnsafeW32kCreateRectRgnIndirect(CONST PRECT rc);
 INT STDCALL
 HRGN STDCALL
 UnsafeW32kCreateRectRgnIndirect(CONST PRECT rc);
 INT STDCALL

diff --git a/reactos/include/win32k/text.h b/reactos/include/win32k/text.h
index 96e6507..9147044 100644 (file)
--- a/reactos/include/win32k/text.h
+++ b/reactos/include/win32k/text.h
@@ -17,8 +17,8 @@ typedef struct
 #define  TEXTOBJ_LockText(hBMObj) ((PTEXTOBJ) GDIOBJ_LockObj ((HGDIOBJ) hBMObj, GO_FONT_MAGIC))
 #define  TEXTOBJ_UnlockText(hBMObj) GDIOBJ_UnlockObj ((HGDIOBJ) hBMObj, GO_FONT_MAGIC)
 
 #define  TEXTOBJ_LockText(hBMObj) ((PTEXTOBJ) GDIOBJ_LockObj ((HGDIOBJ) hBMObj, GO_FONT_MAGIC))
 #define  TEXTOBJ_UnlockText(hBMObj) GDIOBJ_UnlockObj ((HGDIOBJ) hBMObj, GO_FONT_MAGIC)
 

-NTSTATUS TextIntRealizeFont(HFONT FontHandle);
-NTSTATUS TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont);
+NTSTATUS FASTCALL TextIntRealizeFont(HFONT FontHandle);
+NTSTATUS FASTCALL TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont);

 
 int
 STDCALL
 
 int
 STDCALL

diff --git a/reactos/include/win32k/userobj.h b/reactos/include/win32k/userobj.h
index caf2193..842d245 100644 (file)
--- a/reactos/include/win32k/userobj.h
+++ b/reactos/include/win32k/userobj.h
@@ -1,4 +1,4 @@
-/* $Id: userobj.h,v 1.1 2001/07/06 00:05:05 rex Exp $
+/* $Id: userobj.h,v 1.2 2003/05/18 17:22:31 ea Exp $

  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel


@@ -35,12 +35,12 @@ typedef  HANDLE  HUSEROBJ;
 #define  UserObjectHeaderToHandle(header) ((HUSEROBJ)header)
 #define  UserObjectHandleToHeader(handle) ((HUSEROBJ)handle)
 
 #define  UserObjectHeaderToHandle(header) ((HUSEROBJ)header)
 #define  UserObjectHandleToHeader(handle) ((HUSEROBJ)handle)
 

-PUSER_OBJECT  USEROBJ_AllocObject (WORD  size, WORD  magic);
-BOOL  USEROBJ_FreeObject (PUSER_OBJECT  object, WORD  magic);
-HUSEROBJ  USEROBJ_PtrToHandle (PUSER_OBJECT  object, WORD  magic);
-PUSER_OBJECT  USEROBJ_HandleToPtr (HUSEROBJ  object, WORD  magic);
-BOOL  USEROBJ_LockObject (HUSEROBJ Obj);
-BOOL  USEROBJ_UnlockObject (HUSEROBJ Obj);
+PUSER_OBJECT FASTCALL USEROBJ_AllocObject (WORD  size, WORD  magic);
+BOOL         FASTCALL USEROBJ_FreeObject (PUSER_OBJECT  object, WORD  magic);
+HUSEROBJ     FASTCALL USEROBJ_PtrToHandle (PUSER_OBJECT  object, WORD  magic);
+PUSER_OBJECT FASTCALL USEROBJ_HandleToPtr (HUSEROBJ  object, WORD  magic);
+BOOL         FASTCALL USEROBJ_LockObject (HUSEROBJ Obj);
+BOOL         FASTCALL USEROBJ_UnlockObject (HUSEROBJ Obj);

 
 #endif
 
 
 #endif