99 modified files
reactos/include/win32k
diff -u -r1.24.6.1 -r1.24.6.2
--- bitmaps.h 12 Sep 2004 21:23:25 -0000 1.24.6.1
+++ bitmaps.h 14 Sep 2004 01:00:41 -0000 1.24.6.2
@@ -32,16 +32,16 @@
#define BITMAPOBJ_LockBitmap(hBMObj) GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP)
#define BITMAPOBJ_UnlockBitmap(BMObj) GDIOBJ_UnlockObj((PGDIOBJ) BMObj)
-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_Cleanup(PBITMAPOBJ pBmp);
-HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj, HDEV GDIDevice);
+INT INTERNAL_CALL BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp);
+HBITMAP INTERNAL_CALL BITMAPOBJ_CopyBitmap (HBITMAP hBitmap);
+INT INTERNAL_CALL DIB_GetDIBWidthBytes (INT width, INT depth);
+int INTERNAL_CALL DIB_GetDIBImageBytes (INT width, INT height, INT depth);
+INT INTERNAL_CALL DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse);
+INT INTERNAL_CALL BITMAP_GetObject(BITMAPOBJ * bmp, INT count, LPVOID buffer);
+BOOL INTERNAL_CALL BITMAP_Cleanup(PBITMAPOBJ pBmp);
+HBITMAP INTERNAL_CALL BitmapToSurf(PBITMAPOBJ BitmapObj, HDEV GDIDevice);
-HBITMAP FASTCALL IntCreateCompatibleBitmap(PDC Dc, INT Width, INT Height);
+HBITMAP INTERNAL_CALL IntCreateCompatibleBitmap(PDC Dc, INT Width, INT Height);
/* User Entry Points */
BOOL
reactos/include/win32k
diff -u -r1.16.4.1 -r1.16.4.2
--- brush.h 12 Sep 2004 21:23:25 -0000 1.16.4.1
+++ brush.h 14 Sep 2004 01:00:41 -0000 1.16.4.2
@@ -72,7 +72,7 @@
#define BRUSHOBJ_FreeBrush(hBrush) GDIOBJ_FreeObj((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH)
#define BRUSHOBJ_LockBrush(hBrush) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH))
#define BRUSHOBJ_UnlockBrush(BrushObj) GDIOBJ_UnlockObj((PGDIOBJ)BrushObj)
-BOOL FASTCALL BRUSH_Cleanup(PGDIBRUSHOBJ pBrush);
+BOOL INTERNAL_CALL BRUSH_Cleanup(PGDIBRUSHOBJ pBrush);
#ifdef __USE_W32API
typedef struct _PATRECT {
reactos/include/win32k
diff -u -r1.4 -r1.4.30.1
--- cliprgn.h 19 Aug 2003 11:48:49 -0000 1.4
+++ cliprgn.h 14 Sep 2004 01:00:41 -0000 1.4.30.1
@@ -1,8 +1,8 @@
#ifndef _WIN32K_CLIPRGN_H
#define _WIN32K_CLIPRGN_H
-HRGN WINAPI SaveVisRgn(HDC hdc);
-INT WINAPI SelectVisRgn(HDC hdc, HRGN hrgn);
+HRGN INTERNAL_CALL SaveVisRgn(HDC hdc);
+INT INTERNAL_CALL SelectVisRgn(HDC hdc, HRGN hrgn);
int
STDCALL
reactos/include/win32k
diff -u -r1.7 -r1.7.20.1
--- coord.h 21 Dec 2003 18:38:36 -0000 1.7
+++ coord.h 14 Sep 2004 01:00:41 -0000 1.7.20.1
@@ -12,11 +12,11 @@
);
VOID
-FASTCALL
+INTERNAL_CALL
IntDPtoLP ( PDC dc, LPPOINT Points, INT Count );
VOID
-FASTCALL
+INTERNAL_CALL
CoordDPtoLP ( PDC Dc, LPPOINT Point );
BOOL
@@ -28,7 +28,7 @@
);
int
-FASTCALL
+INTERNAL_CALL
IntGetGraphicsMode ( PDC dc );
int
@@ -43,11 +43,11 @@
);
VOID
-FASTCALL
+INTERNAL_CALL
CoordLPtoDP ( PDC Dc, LPPOINT Point );
VOID
-FASTCALL
+INTERNAL_CALL
IntLPtoDP ( PDC dc, LPPOINT Points, INT Count );
BOOL
reactos/include/win32k
diff -u -r1.37.4.1 -r1.37.4.2
--- dc.h 12 Sep 2004 21:23:25 -0000 1.37.4.1
+++ dc.h 14 Sep 2004 01:00:41 -0000 1.37.4.2
@@ -143,18 +143,18 @@
#define DC_UnlockDc(DC) \
GDIOBJ_UnlockObj ((PGDIOBJ) DC)
-HDC FASTCALL RetrieveDisplayHDC(VOID);
-HDC FASTCALL DC_AllocDC(PUNICODE_STRING Driver);
-VOID FASTCALL DC_InitDC(HDC DCToInit);
-HDC FASTCALL DC_FindOpenDC(PUNICODE_STRING Driver);
-VOID FASTCALL DC_FreeDC(HDC DCToFree);
-HDC FASTCALL DC_GetNextDC (PDC pDC);
-VOID FASTCALL DC_SetNextDC (PDC pDC, HDC hNextDC);
-BOOL FASTCALL DC_Cleanup(PDC pDc);
-VOID FASTCALL DC_SetOwnership(HDC DC, PEPROCESS Owner);
+HDC INTERNAL_CALL RetrieveDisplayHDC(VOID);
+HDC INTERNAL_CALL DC_AllocDC(PUNICODE_STRING Driver);
+VOID INTERNAL_CALL DC_InitDC(HDC DCToInit);
+HDC INTERNAL_CALL DC_FindOpenDC(PUNICODE_STRING Driver);
+VOID INTERNAL_CALL DC_FreeDC(HDC DCToFree);
+HDC INTERNAL_CALL DC_GetNextDC (PDC pDC);
+VOID INTERNAL_CALL DC_SetNextDC (PDC pDC, HDC hNextDC);
+BOOL INTERNAL_CALL DC_Cleanup(PDC pDc);
+VOID INTERNAL_CALL DC_SetOwnership(HDC DC, PEPROCESS Owner);
-VOID FASTCALL DC_UpdateXforms(PDC dc);
-BOOL FASTCALL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest);
+VOID INTERNAL_CALL DC_UpdateXforms(PDC dc);
+BOOL INTERNAL_CALL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest);
/* User entry points */
@@ -190,7 +190,7 @@
BOOL STDCALL NtGdiGetBrushOrgEx(HDC hDC, LPPOINT brushOrg);
HRGN STDCALL NtGdiGetClipRgn(HDC hDC);
HGDIOBJ STDCALL NtGdiGetCurrentObject(HDC hDC, UINT ObjectType);
-VOID FASTCALL IntGetCurrentPositionEx (PDC dc, LPPOINT currentPosition);
+VOID INTERNAL_CALL IntGetCurrentPositionEx (PDC dc, LPPOINT currentPosition);
BOOL STDCALL NtGdiGetCurrentPositionEx(HDC hDC, LPPOINT currentPosition);
BOOL STDCALL NtGdiGetDCOrgEx(HDC hDC, LPPOINT Point);
HDC STDCALL NtGdiGetDCState(HDC hDC);
reactos/include/win32k
diff -u -r1.1 -r1.1.34.1
--- debug.h 21 Nov 1999 18:39:11 -0000 1.1
+++ debug.h 14 Sep 2004 01:00:41 -0000 1.1.34.1
@@ -2,10 +2,10 @@
#ifndef H_WIN32K_DEBUG
#define H_WIN32K_DEBUG
-#ifdef CHECKED_BUILD
-#define FIXME(S) DbgPrint ("win32k: FIXME at: File:%s line:%d reason:%s", __FILE__, __LINE__, S)
+#ifdef DEBUG
+#define INTERNAL_CALL STDCALL
#else
-#define FIXME(S)
+#define INTERNAL_CALL FASTCALL
#endif
#endif
reactos/include/win32k
diff -u -r1.17 -r1.17.4.1
--- driver.h 17 Jul 2004 21:10:25 -0000 1.17
+++ driver.h 14 Sep 2004 01:00:41 -0000 1.17.4.1
@@ -160,14 +160,14 @@
PGD_GRADIENTFILL GradientFill;
} DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS;
-BOOL DRIVER_RegisterDriver(LPCWSTR Name, PGD_ENABLEDRIVER EnableDriver);
-PGD_ENABLEDRIVER DRIVER_FindDDIDriver(LPCWSTR Name);
-PFILE_OBJECT DRIVER_FindMPDriver(ULONG DisplayNumber);
-BOOL DRIVER_BuildDDIFunctions(PDRVENABLEDATA DED,
- PDRIVER_FUNCTIONS DF);
-BOOL DRIVER_UnregisterDriver(LPCWSTR Name);
-INT DRIVER_ReferenceDriver (LPCWSTR Name);
-INT DRIVER_UnreferenceDriver (LPCWSTR Name);
+BOOL INTERNAL_CALL DRIVER_RegisterDriver(LPCWSTR Name, PGD_ENABLEDRIVER EnableDriver);
+PGD_ENABLEDRIVER INTERNAL_CALL DRIVER_FindDDIDriver(LPCWSTR Name);
+PFILE_OBJECT INTERNAL_CALL DRIVER_FindMPDriver(ULONG DisplayNumber);
+BOOL INTERNAL_CALL DRIVER_BuildDDIFunctions(PDRVENABLEDATA DED,
+ PDRIVER_FUNCTIONS DF);
+BOOL INTERNAL_CALL DRIVER_UnregisterDriver(LPCWSTR Name);
+INT INTERNAL_CALL DRIVER_ReferenceDriver (LPCWSTR Name);
+INT INTERNAL_CALL DRIVER_UnreferenceDriver (LPCWSTR Name);
#endif
reactos/include/win32k
diff -u -r1.24.6.1 -r1.24.6.2
--- gdiobj.h 12 Sep 2004 21:23:25 -0000 1.24.6.1
+++ gdiobj.h 14 Sep 2004 01:00:41 -0000 1.24.6.2
@@ -55,7 +55,7 @@
typedef PVOID PGDIOBJ;
-typedef BOOL (FASTCALL *GDICLEANUPPROC)(PGDIOBJ Obj);
+typedef BOOL (INTERNAL_CALL *GDICLEANUPPROC)(PGDIOBJ Obj);
/*!
* GDI object header. This is a part of any GDI object
@@ -79,16 +79,16 @@
DWORD ObjectType;
} GDIMULTILOCK, *PGDIMULTILOCK;
-HGDIOBJ FASTCALL GDIOBJ_AllocObj(ULONG ObjectType);
-BOOL FASTCALL GDIOBJ_FreeObj (HGDIOBJ Obj, DWORD ObjectType);
-PGDIOBJ FASTCALL GDIOBJ_LockObj (HGDIOBJ Obj, DWORD ObjectType);
-BOOL FASTCALL GDIOBJ_LockMultipleObj(PGDIMULTILOCK pList, INT nObj);
-BOOL FASTCALL GDIOBJ_UnlockMultipleObj(PGDIMULTILOCK pList, INT nObj);
-BOOL FASTCALL GDIOBJ_OwnedByCurrentProcess(HGDIOBJ ObjectHandle);
-void FASTCALL GDIOBJ_SetOwnership(HGDIOBJ ObjectHandle, PEPROCESS Owner);
-void FASTCALL GDIOBJ_CopyOwnership(HGDIOBJ CopyFrom, HGDIOBJ CopyTo);
-BOOL FASTCALL GDIOBJ_ConvertToStockObj(HGDIOBJ *hObj);
-BOOL FASTCALL GDIOBJ_LockMultipleObj(PGDIMULTILOCK pList, INT nObj);
+HGDIOBJ INTERNAL_CALL GDIOBJ_AllocObj(ULONG ObjectType);
+BOOL INTERNAL_CALL GDIOBJ_FreeObj (HGDIOBJ Obj, DWORD ObjectType);
+PGDIOBJ INTERNAL_CALL GDIOBJ_LockObj (HGDIOBJ Obj, DWORD ObjectType);
+BOOL INTERNAL_CALL GDIOBJ_LockMultipleObj(PGDIMULTILOCK pList, INT nObj);
+BOOL INTERNAL_CALL GDIOBJ_UnlockMultipleObj(PGDIMULTILOCK pList, INT nObj);
+BOOL INTERNAL_CALL GDIOBJ_OwnedByCurrentProcess(HGDIOBJ ObjectHandle);
+void INTERNAL_CALL GDIOBJ_SetOwnership(HGDIOBJ ObjectHandle, PEPROCESS Owner);
+void INTERNAL_CALL GDIOBJ_CopyOwnership(HGDIOBJ CopyFrom, HGDIOBJ CopyTo);
+BOOL INTERNAL_CALL GDIOBJ_ConvertToStockObj(HGDIOBJ *hObj);
+BOOL INTERNAL_CALL GDIOBJ_LockMultipleObj(PGDIMULTILOCK pList, INT nObj);
#define GDIOBJ_GetObjectType(Handle) \
GDI_HANDLE_GET_TYPE(Handle)
@@ -99,13 +99,13 @@
#define GDIOBJ_LockObj(obj,ty) GDIOBJ_LockObjDbg(__FILE__,__LINE__,obj,ty)
#define GDIOBJ_UnlockObj(obj) GDIOBJ_UnlockObjDbg(__FILE__,__LINE__,obj)
-PGDIOBJ FASTCALL GDIOBJ_LockObjDbg (const char* file, int line, HGDIOBJ Obj, DWORD ObjectType);
-BOOL FASTCALL GDIOBJ_UnlockObjDbg (const char* file, int line, PGDIOBJ Object);
+PGDIOBJ INTERNAL_CALL GDIOBJ_LockObjDbg (const char* file, int line, HGDIOBJ Obj, DWORD ObjectType);
+BOOL INTERNAL_CALL GDIOBJ_UnlockObjDbg (const char* file, int line, PGDIOBJ Object);
#else /* !GDI_DEBUG */
-PGDIOBJ FASTCALL GDIOBJ_LockObj (HGDIOBJ Obj, DWORD ObjectType);
-BOOL FASTCALL GDIOBJ_UnlockObj (PGDIOBJ Object);
+PGDIOBJ INTERNAL_CALL GDIOBJ_LockObj (HGDIOBJ Obj, DWORD ObjectType);
+BOOL INTERNAL_CALL GDIOBJ_UnlockObj (PGDIOBJ Object);
#endif /* GDI_DEBUG */
@@ -113,6 +113,6 @@
#define GDIOBJFLAG_IGNOREPID (0x1)
#define GDIOBJFLAG_IGNORELOCK (0x2)
-PVOID FASTCALL GDI_MapHandleTable(HANDLE hProcess);
+PVOID INTERNAL_CALL GDI_MapHandleTable(HANDLE hProcess);
#endif
reactos/include/win32k
diff -u -r1.9 -r1.9.14.1
--- kapi.h 10 May 2004 17:07:16 -0000 1.9
+++ kapi.h 14 Sep 2004 01:00:41 -0000 1.9.14.1
@@ -1,5 +1,7 @@
#ifndef _WIN32K_KAPI_H
#define _WIN32K_KAPI_H
+
+#include <win32k/debug.h>
#include <win32k/bitmaps.h>
#include <win32k/brush.h>
#include <win32k/cliprgn.h>
@@ -7,7 +9,6 @@
#include <win32k/coord.h>
#include <win32k/cursoricon.h>
#include <win32k/dc.h>
-#include <win32k/debug.h>
#include <win32k/fillshap.h>
#include <win32k/font.h>
#include <win32k/icm.h>
reactos/include/win32k
diff -u -r1.9 -r1.9.14.1
--- misc.h 21 May 2004 10:09:31 -0000 1.9
+++ misc.h 14 Sep 2004 01:00:41 -0000 1.9.14.1
@@ -7,7 +7,7 @@
#define W32PF_CREATEDWINORDC (0x0004)
VOID
-FASTCALL
+INTERNAL_CALL
DestroyThreadWindows(struct _ETHREAD *Thread);
#endif /* __WIN32K_MISC_H */
reactos/include/win32k
diff -u -r1.23.6.1 -r1.23.6.2
--- region.h 12 Sep 2004 21:23:25 -0000 1.23.6.1
+++ region.h 14 Sep 2004 01:00:41 -0000 1.23.6.2
@@ -14,9 +14,9 @@
#define RGNDATA_FreeRgn(hRgn) GDIOBJ_FreeObj((HGDIOBJ)hRgn, GDI_OBJECT_TYPE_REGION)
#define RGNDATA_LockRgn(hRgn) ((PROSRGNDATA)GDIOBJ_LockObj((HGDIOBJ)hRgn, GDI_OBJECT_TYPE_REGION))
#define RGNDATA_UnlockRgn(Rgn) GDIOBJ_UnlockObj((PGDIOBJ)Rgn)
-HRGN FASTCALL RGNDATA_AllocRgn(INT n);
+HRGN INTERNAL_CALL RGNDATA_AllocRgn(INT n);
-BOOL FASTCALL RGNDATA_Cleanup(PROSRGNDATA pRgn);
+BOOL INTERNAL_CALL RGNDATA_Cleanup(PROSRGNDATA pRgn);
/* User entry points */
HRGN STDCALL
reactos/include/win32k
diff -u -r1.21.16.1 -r1.21.16.2
--- text.h 12 Sep 2004 21:23:25 -0000 1.21.16.1
+++ text.h 14 Sep 2004 01:00:41 -0000 1.21.16.2
@@ -17,8 +17,8 @@
#define TEXTOBJ_LockText(hBMObj) ((PTEXTOBJ) GDIOBJ_LockObj ((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_FONT))
#define TEXTOBJ_UnlockText(BMObj) GDIOBJ_UnlockObj ((PGDIOBJ) BMObj)
-NTSTATUS FASTCALL TextIntRealizeFont(HFONT FontHandle);
-NTSTATUS FASTCALL TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont);
+NTSTATUS INTERNAL_CALL TextIntRealizeFont(HFONT FontHandle);
+NTSTATUS INTERNAL_CALL TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont);
int
STDCALL
reactos/subsys/win32k/dib
diff -u -r1.12 -r1.12.2.1
--- dib.c 14 Jul 2004 20:48:56 -0000 1.12
+++ dib.c 14 Sep 2004 01:00:42 -0000 1.12.2.1
@@ -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: dib.c,v 1.12 2004/07/14 20:48:56 navaraf Exp $ */
+/* $Id: dib.c,v 1.12.2.1 2004/09/14 01:00:42 weiden Exp $ */
#include <w32k.h>
/* Static data */
@@ -89,7 +89,7 @@
}
};
-ULONG
+ULONG INTERNAL_CALL
DIB_DoRop(ULONG Rop, ULONG Dest, ULONG Source, ULONG Pattern)
{
ULONG ResultNibble;
@@ -189,43 +189,50 @@
return(Result);
}
-VOID Dummy_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c)
+VOID INTERNAL_CALL
+Dummy_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c)
{
return;
}
-ULONG Dummy_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y)
+ULONG INTERNAL_CALL
+Dummy_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y)
{
return 0;
}
-VOID Dummy_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
+VOID INTERNAL_CALL
+Dummy_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
{
return;
}
-VOID Dummy_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
+VOID INTERNAL_CALL
+Dummy_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
{
return;
}
-BOOLEAN Dummy_BitBlt(PBLTINFO BltInfo)
+BOOLEAN INTERNAL_CALL
+Dummy_BitBlt(PBLTINFO BltInfo)
{
return FALSE;
}
-BOOLEAN Dummy_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
- RECTL* DestRect, RECTL *SourceRect,
- POINTL* MaskOrigin, POINTL BrushOrign,
- CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
- ULONG Mode)
+BOOLEAN INTERNAL_CALL
+Dummy_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+ RECTL* DestRect, RECTL *SourceRect,
+ POINTL* MaskOrigin, POINTL BrushOrign,
+ CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
+ ULONG Mode)
{
return FALSE;
}
-BOOLEAN Dummy_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
- RECTL* DestRect, POINTL *SourcePoint,
- XLATEOBJ *ColorTranslation, ULONG iTransColor)
+BOOLEAN INTERNAL_CALL
+Dummy_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+ RECTL* DestRect, POINTL *SourcePoint,
+ XLATEOBJ *ColorTranslation, ULONG iTransColor)
{
return FALSE;
}
reactos/subsys/win32k/dib
diff -u -r1.24 -r1.24.2.1
--- dib.h 14 Jul 2004 20:48:56 -0000 1.24
+++ dib.h 14 Sep 2004 01:00:42 -0000 1.24.2.1
@@ -15,13 +15,13 @@
ULONG Rop4;
} BLTINFO, *PBLTINFO;
-typedef VOID (*PFN_DIB_PutPixel)(SURFOBJ*,LONG,LONG,ULONG);
-typedef ULONG (*PFN_DIB_GetPixel)(SURFOBJ*,LONG,LONG);
-typedef VOID (*PFN_DIB_HLine)(SURFOBJ*,LONG,LONG,LONG,ULONG);
-typedef VOID (*PFN_DIB_VLine)(SURFOBJ*,LONG,LONG,LONG,ULONG);
-typedef BOOLEAN (*PFN_DIB_BitBlt)(PBLTINFO);
-typedef BOOLEAN (*PFN_DIB_StretchBlt)(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
-typedef BOOLEAN (*PFN_DIB_TransparentBlt)(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
+typedef VOID (INTERNAL_CALL *PFN_DIB_PutPixel)(SURFOBJ*,LONG,LONG,ULONG);
+typedef ULONG (INTERNAL_CALL *PFN_DIB_GetPixel)(SURFOBJ*,LONG,LONG);
+typedef VOID (INTERNAL_CALL *PFN_DIB_HLine)(SURFOBJ*,LONG,LONG,LONG,ULONG);
+typedef VOID (INTERNAL_CALL *PFN_DIB_VLine)(SURFOBJ*,LONG,LONG,LONG,ULONG);
+typedef BOOLEAN (INTERNAL_CALL *PFN_DIB_BitBlt)(PBLTINFO);
+typedef BOOLEAN (INTERNAL_CALL *PFN_DIB_StretchBlt)(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
+typedef BOOLEAN (INTERNAL_CALL*PFN_DIB_TransparentBlt)(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
typedef struct
{
@@ -37,67 +37,67 @@
extern DIB_FUNCTIONS DibFunctionsForBitmapFormat[];
-VOID Dummy_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
-ULONG Dummy_GetPixel(SURFOBJ*,LONG,LONG);
-VOID Dummy_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
-VOID Dummy_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
-BOOLEAN Dummy_BitBlt(PBLTINFO);
-BOOLEAN Dummy_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
-BOOLEAN Dummy_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
-
-VOID DIB_1BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
-ULONG DIB_1BPP_GetPixel(SURFOBJ*,LONG,LONG);
-VOID DIB_1BPP_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
-VOID DIB_1BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
-BOOLEAN DIB_1BPP_BitBlt(PBLTINFO);
-BOOLEAN DIB_1BPP_BitBltSrcCopy(PBLTINFO);
-BOOLEAN DIB_1BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
-BOOLEAN DIB_1BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
-
-VOID DIB_4BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
-ULONG DIB_4BPP_GetPixel(SURFOBJ*,LONG,LONG);
-VOID DIB_4BPP_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
-VOID DIB_4BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
-BOOLEAN DIB_4BPP_BitBlt(PBLTINFO);
-BOOLEAN DIB_4BPP_BitBltSrcCopy(PBLTINFO);
-BOOLEAN DIB_4BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
-BOOLEAN DIB_4BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
-
-VOID DIB_8BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
-ULONG DIB_8BPP_GetPixel(SURFOBJ*,LONG,LONG);
-VOID DIB_8BPP_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
-VOID DIB_8BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
-BOOLEAN DIB_8BPP_BitBlt(PBLTINFO);
-BOOLEAN DIB_8BPP_BitBltSrcCopy(PBLTINFO);
-BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
-BOOLEAN DIB_8BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
-
-VOID DIB_16BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
-ULONG DIB_16BPP_GetPixel(SURFOBJ*,LONG,LONG);
-VOID DIB_16BPP_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
-VOID DIB_16BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
-BOOLEAN DIB_16BPP_BitBlt(PBLTINFO);
-BOOLEAN DIB_16BPP_BitBltSrcCopy(PBLTINFO);
-BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
-BOOLEAN DIB_16BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
-
-VOID DIB_24BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
-ULONG DIB_24BPP_GetPixel(SURFOBJ*,LONG,LONG);
-VOID DIB_24BPP_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
-VOID DIB_24BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
-BOOLEAN DIB_24BPP_BitBlt(PBLTINFO);
-BOOLEAN DIB_24BPP_BitBltSrcCopy(PBLTINFO);
-BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
-BOOLEAN DIB_24BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
-
-VOID DIB_32BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
-ULONG DIB_32BPP_GetPixel(SURFOBJ*,LONG,LONG);
-VOID DIB_32BPP_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
-VOID DIB_32BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
-BOOLEAN DIB_32BPP_BitBlt(PBLTINFO);
-BOOLEAN DIB_32BPP_BitBltSrcCopy(PBLTINFO);
-BOOLEAN DIB_32BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
-BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
+VOID INTERNAL_CALL Dummy_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
+ULONG INTERNAL_CALL Dummy_GetPixel(SURFOBJ*,LONG,LONG);
+VOID INTERNAL_CALL Dummy_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+VOID INTERNAL_CALL Dummy_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+BOOLEAN INTERNAL_CALL Dummy_BitBlt(PBLTINFO);
+BOOLEAN INTERNAL_CALL Dummy_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
+BOOLEAN INTERNAL_CALL Dummy_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
+
+VOID INTERNAL_CALL DIB_1BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
+ULONG INTERNAL_CALL DIB_1BPP_GetPixel(SURFOBJ*,LONG,LONG);
+VOID INTERNAL_CALL DIB_1BPP_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+VOID INTERNAL_CALL DIB_1BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+BOOLEAN INTERNAL_CALL DIB_1BPP_BitBlt(PBLTINFO);
+BOOLEAN INTERNAL_CALL DIB_1BPP_BitBltSrcCopy(PBLTINFO);
+BOOLEAN INTERNAL_CALL DIB_1BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
+BOOLEAN INTERNAL_CALL DIB_1BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
+
+VOID INTERNAL_CALL DIB_4BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
+ULONG INTERNAL_CALL DIB_4BPP_GetPixel(SURFOBJ*,LONG,LONG);
+VOID INTERNAL_CALL DIB_4BPP_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+VOID INTERNAL_CALL DIB_4BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+BOOLEAN INTERNAL_CALL DIB_4BPP_BitBlt(PBLTINFO);
+BOOLEAN INTERNAL_CALL DIB_4BPP_BitBltSrcCopy(PBLTINFO);
+BOOLEAN INTERNAL_CALL DIB_4BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
+BOOLEAN INTERNAL_CALL DIB_4BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
+
+VOID INTERNAL_CALL DIB_8BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
+ULONG INTERNAL_CALL DIB_8BPP_GetPixel(SURFOBJ*,LONG,LONG);
+VOID INTERNAL_CALL DIB_8BPP_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+VOID INTERNAL_CALL DIB_8BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+BOOLEAN INTERNAL_CALL DIB_8BPP_BitBlt(PBLTINFO);
+BOOLEAN INTERNAL_CALL DIB_8BPP_BitBltSrcCopy(PBLTINFO);
+BOOLEAN INTERNAL_CALL DIB_8BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
+BOOLEAN INTERNAL_CALL DIB_8BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
+
+VOID INTERNAL_CALL DIB_16BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
+ULONG INTERNAL_CALL DIB_16BPP_GetPixel(SURFOBJ*,LONG,LONG);
+VOID INTERNAL_CALL DIB_16BPP_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+VOID INTERNAL_CALL DIB_16BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+BOOLEAN INTERNAL_CALL DIB_16BPP_BitBlt(PBLTINFO);
+BOOLEAN INTERNAL_CALL DIB_16BPP_BitBltSrcCopy(PBLTINFO);
+BOOLEAN INTERNAL_CALL DIB_16BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
+BOOLEAN INTERNAL_CALL DIB_16BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
+
+VOID INTERNAL_CALL DIB_24BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
+ULONG INTERNAL_CALL DIB_24BPP_GetPixel(SURFOBJ*,LONG,LONG);
+VOID INTERNAL_CALL DIB_24BPP_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+VOID INTERNAL_CALL DIB_24BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+BOOLEAN INTERNAL_CALL DIB_24BPP_BitBlt(PBLTINFO);
+BOOLEAN INTERNAL_CALL DIB_24BPP_BitBltSrcCopy(PBLTINFO);
+BOOLEAN INTERNAL_CALL DIB_24BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
+BOOLEAN INTERNAL_CALL DIB_24BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
+
+VOID INTERNAL_CALL DIB_32BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
+ULONG INTERNAL_CALL DIB_32BPP_GetPixel(SURFOBJ*,LONG,LONG);
+VOID INTERNAL_CALL DIB_32BPP_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+VOID INTERNAL_CALL DIB_32BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+BOOLEAN INTERNAL_CALL DIB_32BPP_BitBlt(PBLTINFO);
+BOOLEAN INTERNAL_CALL DIB_32BPP_BitBltSrcCopy(PBLTINFO);
+BOOLEAN INTERNAL_CALL DIB_32BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
+BOOLEAN INTERNAL_CALL DIB_32BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
#define ROP_USES_SOURCE(Rop4) (((Rop4 & 0xCC0000) >> 2) != (Rop4 & 0x330000))
#define ROP_USES_PATTERN(Rop4) (((Rop4 & 0xF00000) >> 4) != (Rop4 & 0x0F0000))
@@ -106,7 +106,7 @@
extern unsigned char altnotmask[2];
#define MASK1BPP(x) (1<<(7-((x)&7)))
-ULONG DIB_DoRop(ULONG Rop, ULONG Dest, ULONG Source, ULONG Pattern);
+ULONG INTERNAL_CALL DIB_DoRop(ULONG Rop, ULONG Dest, ULONG Source, ULONG Pattern);
#define DIB_GetSource(SourceSurf,sx,sy,ColorTranslation) \
XLATEOBJ_iXlate(ColorTranslation, \
reactos/subsys/win32k/dib
diff -u -r1.35 -r1.35.2.1
--- dib16bpp.c 14 Jul 2004 20:48:56 -0000 1.35
+++ dib16bpp.c 14 Sep 2004 01:00:42 -0000 1.35.2.1
@@ -16,10 +16,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: dib16bpp.c,v 1.35 2004/07/14 20:48:56 navaraf Exp $ */
+/* $Id: dib16bpp.c,v 1.35.2.1 2004/09/14 01:00:42 weiden Exp $ */
#include <w32k.h>
-VOID
+VOID INTERNAL_CALL
DIB_16BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
{
PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta;
@@ -28,7 +28,7 @@
*addr = (WORD)c;
}
-ULONG
+ULONG INTERNAL_CALL
DIB_16BPP_GetPixel(SURFOBJ *SurfObj, LONG x, LONG y)
{
PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta;
@@ -37,7 +37,7 @@
return (ULONG)(*addr);
}
-VOID
+VOID INTERNAL_CALL
DIB_16BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
{
PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta;
@@ -51,7 +51,7 @@
}
}
-VOID
+VOID INTERNAL_CALL
DIB_16BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
{
PBYTE byteaddr = SurfObj->pvScan0 + y1 * SurfObj->lDelta;
@@ -67,7 +67,7 @@
}
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_16BPP_BitBltSrcCopy(PBLTINFO BltInfo)
{
LONG i, j, sx, sy, xColor, f1;
@@ -260,7 +260,7 @@
return TRUE;
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_16BPP_BitBlt(PBLTINFO BltInfo)
{
ULONG DestX, DestY;
@@ -402,7 +402,8 @@
}
//NOTE: If you change something here, please do the same in other dibXXbpp.c files!
-void ScaleLineAvg16(PIXEL *Target, PIXEL *Source, int SrcWidth, int TgtWidth)
+void INTERNAL_CALL
+ScaleLineAvg16(PIXEL *Target, PIXEL *Source, int SrcWidth, int TgtWidth)
{
int NumPixels = TgtWidth;
int IntPart = SrcWidth / TgtWidth;
@@ -431,7 +432,7 @@
*Target++ = *Source;
}
-static BOOLEAN
+static BOOLEAN INTERNAL_CALL
FinalCopy16(PIXEL *Target, PIXEL *Source, PSPAN ClipSpans, UINT ClipSpansCount, UINT *SpanIndex,
UINT DestY, RECTL *DestRect)
{
@@ -469,11 +470,12 @@
}
//NOTE: If you change something here, please do the same in other dibXXbpp.c files!
-BOOLEAN ScaleRectAvg16(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
- RECTL* DestRect, RECTL *SourceRect,
- POINTL* MaskOrigin, POINTL BrushOrigin,
- CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
- ULONG Mode)
+BOOLEAN INTERNAL_CALL
+ScaleRectAvg16(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+ RECTL* DestRect, RECTL *SourceRect,
+ POINTL* MaskOrigin, POINTL BrushOrigin,
+ CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
+ ULONG Mode)
{
int NumPixels = DestRect->bottom - DestRect->top;
int IntPart = (((SourceRect->bottom - SourceRect->top) / (DestRect->bottom - DestRect->top)) * SourceSurf->lDelta) >> 1;
@@ -574,11 +576,12 @@
}
//NOTE: If you change something here, please do the same in other dibXXbpp.c files!
-BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
- RECTL* DestRect, RECTL *SourceRect,
- POINTL* MaskOrigin, POINTL BrushOrigin,
- CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
- ULONG Mode)
+BOOLEAN INTERNAL_CALL
+DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+ RECTL* DestRect, RECTL *SourceRect,
+ POINTL* MaskOrigin, POINTL BrushOrigin,
+ CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
+ ULONG Mode)
{
DPRINT("DIB_16BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n",
BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom,
@@ -610,7 +613,7 @@
return TRUE;
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_16BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
RECTL* DestRect, POINTL *SourcePoint,
XLATEOBJ *ColorTranslation, ULONG iTransColor)
reactos/subsys/win32k/dib
diff -u -r1.32 -r1.32.2.1
--- dib1bpp.c 14 Jul 2004 20:48:56 -0000 1.32
+++ dib1bpp.c 14 Sep 2004 01:00:42 -0000 1.32.2.1
@@ -16,10 +16,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: dib1bpp.c,v 1.32 2004/07/14 20:48:56 navaraf Exp $ */
+/* $Id: dib1bpp.c,v 1.32.2.1 2004/09/14 01:00:42 weiden Exp $ */
#include <w32k.h>
-VOID
+VOID INTERNAL_CALL
DIB_1BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
{
PBYTE addr = SurfObj->pvScan0 + y * SurfObj->lDelta + (x >> 3);
@@ -30,7 +30,7 @@
*addr |= MASK1BPP(x);
}
-ULONG
+ULONG INTERNAL_CALL
DIB_1BPP_GetPixel(SURFOBJ *SurfObj, LONG x, LONG y)
{
PBYTE addr = SurfObj->pvScan0 + y * SurfObj->lDelta + (x >> 3);
@@ -38,7 +38,7 @@
return (*addr & MASK1BPP(x) ? 1 : 0);
}
-VOID
+VOID INTERNAL_CALL
DIB_1BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
{
while(x1 < x2) {
@@ -47,7 +47,7 @@
}
}
-VOID
+VOID INTERNAL_CALL
DIB_1BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
{
while(y1 < y2) {
@@ -57,7 +57,7 @@
}
static
-void
+void INTERNAL_CALL
DIB_1BPP_BitBltSrcCopy_From1BPP (
SURFOBJ* DestSurf, SURFOBJ* SourceSurf,
PRECTL DestRect, POINTL *SourcePoint )
@@ -226,7 +226,7 @@
}
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_1BPP_BitBltSrcCopy(PBLTINFO BltInfo)
{
LONG i, j, sx, sy = BltInfo->SourcePoint.y;
@@ -335,7 +335,7 @@
return TRUE;
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_1BPP_BitBlt(PBLTINFO BltInfo)
{
ULONG DestX, DestY;
@@ -478,7 +478,7 @@
return TRUE;
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_1BPP_StretchBlt (
SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
RECTL* DestRect, RECTL *SourceRect,
@@ -490,7 +490,7 @@
return FALSE;
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_1BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
RECTL* DestRect, POINTL *SourcePoint,
XLATEOBJ *ColorTranslation, ULONG iTransColor)
reactos/subsys/win32k/dib
diff -u -r1.31 -r1.31.2.1
--- dib24bpp.c 14 Jul 2004 20:48:56 -0000 1.31
+++ dib24bpp.c 14 Sep 2004 01:00:42 -0000 1.31.2.1
@@ -16,10 +16,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: dib24bpp.c,v 1.31 2004/07/14 20:48:56 navaraf Exp $ */
+/* $Id: dib24bpp.c,v 1.31.2.1 2004/09/14 01:00:42 weiden Exp $ */
#include <w32k.h>
-VOID
+VOID INTERNAL_CALL
DIB_24BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
{
PBYTE addr = SurfObj->pvScan0 + (y * SurfObj->lDelta) + (x << 1) + x;
@@ -27,14 +27,14 @@
*(addr + 2) = (c >> 16) & 0xFF;
}
-ULONG
+ULONG INTERNAL_CALL
DIB_24BPP_GetPixel(SURFOBJ *SurfObj, LONG x, LONG y)
{
PBYTE addr = SurfObj->pvScan0 + y * SurfObj->lDelta + (x << 1) + x;
return *(PUSHORT)(addr) + (*(addr + 2) << 16);
}
-VOID
+VOID INTERNAL_CALL
DIB_24BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
{
PBYTE addr = SurfObj->pvScan0 + y * SurfObj->lDelta + (x1 << 1) + x1;
@@ -50,7 +50,7 @@
}
}
-VOID
+VOID INTERNAL_CALL
DIB_24BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
{
PBYTE addr = SurfObj->pvScan0 + y1 * SurfObj->lDelta + (x << 1) + x;
@@ -65,7 +65,7 @@
}
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_24BPP_BitBltSrcCopy(PBLTINFO BltInfo)
{
LONG i, j, sx, sy, xColor, f1;
@@ -233,7 +233,7 @@
return TRUE;
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_24BPP_BitBlt(PBLTINFO BltInfo)
{
ULONG DestX, DestY;
@@ -302,17 +302,18 @@
return TRUE;
}
-BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
- RECTL* DestRect, RECTL *SourceRect,
- POINTL* MaskOrigin, POINTL BrushOrigin,
- CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
- ULONG Mode)
+BOOLEAN INTERNAL_CALL
+DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+ RECTL* DestRect, RECTL *SourceRect,
+ POINTL* MaskOrigin, POINTL BrushOrigin,
+ CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
+ ULONG Mode)
{
DbgPrint("DIB_24BPP_StretchBlt: Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
return FALSE;
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_24BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
RECTL* DestRect, POINTL *SourcePoint,
XLATEOBJ *ColorTranslation, ULONG iTransColor)
reactos/subsys/win32k/dib
diff -u -r1.31 -r1.31.2.1
--- dib32bpp.c 15 Jul 2004 18:13:22 -0000 1.31
+++ dib32bpp.c 14 Sep 2004 01:00:42 -0000 1.31.2.1
@@ -16,10 +16,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: dib32bpp.c,v 1.31 2004/07/15 18:13:22 navaraf Exp $ */
+/* $Id: dib32bpp.c,v 1.31.2.1 2004/09/14 01:00:42 weiden Exp $ */
#include <w32k.h>
-VOID
+VOID INTERNAL_CALL
DIB_32BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
{
PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta;
@@ -28,7 +28,7 @@
*addr = c;
}
-ULONG
+ULONG INTERNAL_CALL
DIB_32BPP_GetPixel(SURFOBJ *SurfObj, LONG x, LONG y)
{
PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta;
@@ -37,7 +37,7 @@
return (ULONG)(*addr);
}
-VOID
+VOID INTERNAL_CALL
DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
{
PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta;
@@ -51,7 +51,7 @@
}
}
-VOID
+VOID INTERNAL_CALL
DIB_32BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
{
PBYTE byteaddr = SurfObj->pvScan0 + y1 * SurfObj->lDelta;
@@ -66,7 +66,7 @@
}
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_32BPP_BitBltSrcCopy(PBLTINFO BltInfo)
{
LONG i, j, sx, sy, xColor, f1;
@@ -282,7 +282,7 @@
return TRUE;
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_32BPP_BitBlt(PBLTINFO BltInfo)
{
ULONG DestX, DestY;
@@ -370,7 +370,8 @@
return a; // FIXME: Temp hack to remove "PCB-effect" from the image
}
-void ScaleLineAvg32(PIXEL *Target, PIXEL *Source, int SrcWidth, int TgtWidth)
+void INTERNAL_CALL
+ScaleLineAvg32(PIXEL *Target, PIXEL *Source, int SrcWidth, int TgtWidth)
{
int NumPixels = TgtWidth;
int IntPart = SrcWidth / TgtWidth;
@@ -399,7 +400,7 @@
*Target++ = *Source;
}
-static BOOLEAN
+static BOOLEAN INTERNAL_CALL
FinalCopy32(PIXEL *Target, PIXEL *Source, PSPAN ClipSpans, UINT ClipSpansCount, UINT *SpanIndex,
UINT DestY, RECTL *DestRect)
{
@@ -437,11 +438,12 @@
}
//NOTE: If you change something here, please do the same in other dibXXbpp.c files!
-BOOLEAN ScaleRectAvg32(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
- RECTL* DestRect, RECTL *SourceRect,
- POINTL* MaskOrigin, POINTL BrushOrigin,
- CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
- ULONG Mode)
+BOOLEAN INTERNAL_CALL
+ScaleRectAvg32(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+ RECTL* DestRect, RECTL *SourceRect,
+ POINTL* MaskOrigin, POINTL BrushOrigin,
+ CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
+ ULONG Mode)
{
int NumPixels = DestRect->bottom - DestRect->top;
int IntPart = (((SourceRect->bottom - SourceRect->top) / (DestRect->bottom - DestRect->top)) * SourceSurf->lDelta) / 4;
@@ -542,11 +544,12 @@
}
//NOTE: If you change something here, please do the same in other dibXXbpp.c files!
-BOOLEAN DIB_32BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
- RECTL* DestRect, RECTL *SourceRect,
- POINTL* MaskOrigin, POINTL BrushOrigin,
- CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
- ULONG Mode)
+BOOLEAN INTERNAL_CALL
+DIB_32BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+ RECTL* DestRect, RECTL *SourceRect,
+ POINTL* MaskOrigin, POINTL BrushOrigin,
+ CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
+ ULONG Mode)
{
DPRINT("DIB_32BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n",
BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom,
@@ -578,7 +581,7 @@
return TRUE;
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_32BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
RECTL* DestRect, POINTL *SourcePoint,
XLATEOBJ *ColorTranslation, ULONG iTransColor)
reactos/subsys/win32k/dib
diff -u -r1.38 -r1.38.2.1
--- dib4bpp.c 14 Jul 2004 20:48:56 -0000 1.38
+++ dib4bpp.c 14 Sep 2004 01:00:42 -0000 1.38.2.1
@@ -16,24 +16,24 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: dib4bpp.c,v 1.38 2004/07/14 20:48:56 navaraf Exp $ */
+/* $Id: dib4bpp.c,v 1.38.2.1 2004/09/14 01:00:42 weiden Exp $ */
#include <w32k.h>
-VOID
+VOID INTERNAL_CALL
DIB_4BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
{
PBYTE addr = SurfObj->pvScan0 + (x>>1) + y * SurfObj->lDelta;
*addr = (*addr & notmask[x&1]) | (c << ((1-(x&1))<<2));
}
-ULONG
+ULONG INTERNAL_CALL
DIB_4BPP_GetPixel(SURFOBJ *SurfObj, LONG x, LONG y)
{
PBYTE addr = SurfObj->pvScan0 + (x>>1) + y * SurfObj->lDelta;
return (*addr >> ((1-(x&1))<<2)) & 0x0f;
}
-VOID
+VOID INTERNAL_CALL
DIB_4BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
{
PBYTE addr = SurfObj->pvScan0 + (x1>>1) + y * SurfObj->lDelta;
@@ -47,7 +47,7 @@
}
}
-VOID
+VOID INTERNAL_CALL
DIB_4BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
{
PBYTE addr = SurfObj->pvScan0;
@@ -60,7 +60,7 @@
}
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_4BPP_BitBltSrcCopy(PBLTINFO BltInfo)
{
LONG i, j, sx, sy, f2, xColor;
@@ -220,7 +220,7 @@
return(TRUE);
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_4BPP_BitBlt(PBLTINFO BltInfo)
{
ULONG DestX, DestY;
@@ -356,17 +356,18 @@
return TRUE;
}
-BOOLEAN DIB_4BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
- RECTL* DestRect, RECTL *SourceRect,
- POINTL* MaskOrigin, POINTL BrushOrigin,
- CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
- ULONG Mode)
+BOOLEAN INTERNAL_CALL
+DIB_4BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+ RECTL* DestRect, RECTL *SourceRect,
+ POINTL* MaskOrigin, POINTL BrushOrigin,
+ CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
+ ULONG Mode)
{
DbgPrint("DIB_4BPP_StretchBlt: Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
return FALSE;
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_4BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
RECTL* DestRect, POINTL *SourcePoint,
XLATEOBJ *ColorTranslation, ULONG iTransColor)
reactos/subsys/win32k/dib
diff -u -r1.29 -r1.29.2.1
--- dib8bpp.c 14 Jul 2004 20:48:56 -0000 1.29
+++ dib8bpp.c 14 Sep 2004 01:00:42 -0000 1.29.2.1
@@ -16,10 +16,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: dib8bpp.c,v 1.29 2004/07/14 20:48:56 navaraf Exp $ */
+/* $Id: dib8bpp.c,v 1.29.2.1 2004/09/14 01:00:42 weiden Exp $ */
#include <w32k.h>
-VOID
+VOID INTERNAL_CALL
DIB_8BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
{
PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta + x;
@@ -27,7 +27,7 @@
*byteaddr = c;
}
-ULONG
+ULONG INTERNAL_CALL
DIB_8BPP_GetPixel(SURFOBJ *SurfObj, LONG x, LONG y)
{
PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta + x;
@@ -35,7 +35,7 @@
return (ULONG)(*byteaddr);
}
-VOID
+VOID INTERNAL_CALL
DIB_8BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
{
PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta;
@@ -49,7 +49,7 @@
}
}
-VOID
+VOID INTERNAL_CALL
DIB_8BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
{
PBYTE byteaddr = SurfObj->pvScan0 + y1 * SurfObj->lDelta;
@@ -64,7 +64,7 @@
}
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_8BPP_BitBltSrcCopy(PBLTINFO BltInfo)
{
LONG i, j, sx, sy, xColor, f1;
@@ -256,7 +256,7 @@
return TRUE;
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_8BPP_BitBlt(PBLTINFO BltInfo)
{
ULONG DestX, DestY;
@@ -371,7 +371,8 @@
}
//NOTE: If you change something here, please do the same in other dibXXbpp.c files!
-void ScaleLineAvg8(PIXEL *Target, PIXEL *Source, int SrcWidth, int TgtWidth)
+void INTERNAL_CALL
+ScaleLineAvg8(PIXEL *Target, PIXEL *Source, int SrcWidth, int TgtWidth)
{
int NumPixels = TgtWidth;
int IntPart = SrcWidth / TgtWidth;
@@ -400,7 +401,7 @@
*Target++ = *Source;
}
-static BOOLEAN
+static BOOLEAN INTERNAL_CALL
FinalCopy8(PIXEL *Target, PIXEL *Source, PSPAN ClipSpans, UINT ClipSpansCount, UINT *SpanIndex,
UINT DestY, RECTL *DestRect)
{
@@ -438,11 +439,12 @@
}
//NOTE: If you change something here, please do the same in other dibXXbpp.c files!
-BOOLEAN ScaleRectAvg8(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
- RECTL* DestRect, RECTL *SourceRect,
- POINTL* MaskOrigin, POINTL BrushOrigin,
- CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
- ULONG Mode)
+BOOLEAN INTERNAL_CALL
+ScaleRectAvg8(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+ RECTL* DestRect, RECTL *SourceRect,
+ POINTL* MaskOrigin, POINTL BrushOrigin,
+ CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
+ ULONG Mode)
{
int NumPixels = DestRect->bottom - DestRect->top;
int IntPart = (((SourceRect->bottom - SourceRect->top) / (DestRect->bottom - DestRect->top)) * SourceSurf->lDelta); //((SourceRect->bottom - SourceRect->top) / (DestRect->bottom - DestRect->top)) * (SourceRect->right - SourceRect->left);
@@ -542,11 +544,12 @@
return TRUE;
}
-BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
- RECTL* DestRect, RECTL *SourceRect,
- POINTL* MaskOrigin, POINTL BrushOrigin,
- CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
- ULONG Mode)
+BOOLEAN INTERNAL_CALL
+DIB_8BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+ RECTL* DestRect, RECTL *SourceRect,
+ POINTL* MaskOrigin, POINTL BrushOrigin,
+ CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
+ ULONG Mode)
{
DPRINT("DIB_8BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n",
BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom,
@@ -576,7 +579,7 @@
return TRUE;
}
-BOOLEAN
+BOOLEAN INTERNAL_CALL
DIB_8BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
RECTL* DestRect, POINTL *SourcePoint,
XLATEOBJ *ColorTranslation, ULONG iTransColor)
reactos/subsys/win32k/eng
diff -u -r1.58.2.1 -r1.58.2.2
--- bitblt.c 12 Sep 2004 19:21:06 -0000 1.58.2.1
+++ bitblt.c 14 Sep 2004 01:00:42 -0000 1.58.2.2
@@ -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: bitblt.c,v 1.58.2.1 2004/09/12 19:21:06 weiden Exp $
+/* $Id: bitblt.c,v 1.58.2.2 2004/09/14 01:00:42 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -28,26 +28,26 @@
*/
#include <w32k.h>
-typedef BOOLEAN STDCALL (*PBLTRECTFUNC)(SURFOBJ* OutputObj,
- SURFOBJ* InputObj,
- SURFOBJ* Mask,
- XLATEOBJ* ColorTranslation,
- RECTL* OutputRect,
- POINTL* InputPoint,
- POINTL* MaskOrigin,
- BRUSHOBJ* Brush,
- POINTL* BrushOrigin,
- ROP4 Rop4);
-typedef BOOLEAN STDCALL (*PSTRETCHRECTFUNC)(SURFOBJ* OutputObj,
- SURFOBJ* InputObj,
- SURFOBJ* Mask,
- CLIPOBJ* ClipRegion,
- XLATEOBJ* ColorTranslation,
- RECTL* OutputRect,
- RECTL* InputRect,
- POINTL* MaskOrigin,
- POINTL* BrushOrigin,
- ULONG Mode);
+typedef BOOLEAN INTERNAL_CALL (*PBLTRECTFUNC)(SURFOBJ* OutputObj,
+ SURFOBJ* InputObj,
+ SURFOBJ* Mask,
+ XLATEOBJ* ColorTranslation,
+ RECTL* OutputRect,
+ POINTL* InputPoint,
+ POINTL* MaskOrigin,
+ BRUSHOBJ* Brush,
+ POINTL* BrushOrigin,
+ ROP4 Rop4);
+typedef BOOLEAN INTERNAL_CALL (*PSTRETCHRECTFUNC)(SURFOBJ* OutputObj,
+ SURFOBJ* InputObj,
+ SURFOBJ* Mask,
+ CLIPOBJ* ClipRegion,
+ XLATEOBJ* ColorTranslation,
+ RECTL* OutputRect,
+ RECTL* InputRect,
+ POINTL* MaskOrigin,
+ POINTL* BrushOrigin,
+ ULONG Mode);
BOOL STDCALL EngIntersectRect(RECTL* prcDst, RECTL* prcSrc1, RECTL* prcSrc2)
{
@@ -72,7 +72,7 @@
return FALSE;
}
-static BOOLEAN STDCALL
+static BOOLEAN INTERNAL_CALL
BltMask(SURFOBJ* Dest,
SURFOBJ* Source,
SURFOBJ* Mask,
@@ -162,7 +162,7 @@
return TRUE;
}
-static BOOLEAN STDCALL
+static BOOLEAN INTERNAL_CALL
BltPatCopy(SURFOBJ* Dest,
SURFOBJ* Source,
SURFOBJ* Mask,
@@ -189,7 +189,7 @@
return TRUE;
}
-static BOOLEAN STDCALL
+static BOOLEAN INTERNAL_CALL
CallDibBitBlt(SURFOBJ* OutputObj,
SURFOBJ* InputObj,
SURFOBJ* Mask,
@@ -478,7 +478,7 @@
return Ret;
}
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntEngBitBlt(BITMAPOBJ *DestObj,
BITMAPOBJ *SourceObj,
BITMAPOBJ *MaskObj,
@@ -601,7 +601,7 @@
return ret;
}
-static BOOLEAN STDCALL
+static BOOLEAN INTERNAL_CALL
CallDibStretchBlt(SURFOBJ* OutputObj,
SURFOBJ* InputObj,
SURFOBJ* Mask,
@@ -726,7 +726,7 @@
return Ret;
}
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntEngStretchBlt(BITMAPOBJ *DestObj,
BITMAPOBJ *SourceObj,
BITMAPOBJ *MaskObj,
@@ -795,7 +795,7 @@
/**** REACTOS FONT RENDERING CODE *********************************************/
/* renders the alpha mask bitmap */
-static BOOLEAN STDCALL
+static BOOLEAN INTERNAL_CALL
AlphaBltMask(SURFOBJ* Dest,
SURFOBJ* Source,
SURFOBJ* Mask,
@@ -1067,7 +1067,7 @@
return Ret;
}
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntEngMaskBlt(SURFOBJ *DestObj,
SURFOBJ *Mask,
CLIPOBJ *ClipRegion,
reactos/subsys/win32k/eng
diff -u -r1.22.10.1 -r1.22.10.2
--- clip.c 12 Sep 2004 19:21:06 -0000 1.22.10.1
+++ clip.c 14 Sep 2004 01:00:42 -0000 1.22.10.2
@@ -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.22.10.1 2004/09/12 19:21:06 weiden Exp $
+/* $Id: clip.c,v 1.22.10.2 2004/09/14 01:00:42 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -196,13 +196,13 @@
return Cmp;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
IntEngDeleteClipRegion(CLIPOBJ *ClipObj)
{
EngFreeMem(ObjToGDI(ClipObj, CLIP));
}
-CLIPOBJ* FASTCALL
+CLIPOBJ* INTERNAL_CALL
IntEngCreateClipRegion(ULONG count, PRECTL pRect, PRECTL rcBounds)
{
CLIPGDI *Clip;
@@ -375,7 +375,7 @@
return ClipGDI->EnumPos < ClipGDI->EnumRects.c;
}
-BOOLEAN FASTCALL
+BOOLEAN INTERNAL_CALL
ClipobjToSpans(PSPAN *Spans, UINT *Count, CLIPOBJ *ClipRegion, PRECTL Boundary)
{
BOOL EnumMore;
reactos/subsys/win32k/eng
diff -u -r1.10 -r1.10.4.1
--- gradient.c 3 Jul 2004 13:55:35 -0000 1.10
+++ gradient.c 14 Sep 2004 01:00:42 -0000 1.10.4.1
@@ -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: gradient.c,v 1.10 2004/07/03 13:55:35 navaraf Exp $
+/* $Id: gradient.c,v 1.10.4.1 2004/09/14 01:00:42 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -60,7 +60,7 @@
/* FUNCTIONS ******************************************************************/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntEngGradientFillRect(
IN SURFOBJ *psoDest,
IN CLIPOBJ *pco,
@@ -301,7 +301,7 @@
a = b;\
a = c
#define NLINES 3
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntEngGradientFillTriangle(
IN SURFOBJ *psoDest,
IN CLIPOBJ *pco,
@@ -448,7 +448,7 @@
}
-BOOL FASTCALL STATIC
+static BOOL INTERNAL_CALL
IntEngIsNULLTriangle(TRIVERTEX *pVertex, GRADIENT_TRIANGLE *gt)
{
if(COMPAREVERTEX(VERTEX(Vertex1), VERTEX(Vertex2)))
@@ -514,7 +514,7 @@
return FALSE;
}
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntEngGradientFill(
IN BITMAPOBJ *pboDest,
IN CLIPOBJ *pco,
reactos/subsys/win32k/eng
diff -u -r1.35 -r1.35.2.1
--- lineto.c 14 Jul 2004 20:48:57 -0000 1.35
+++ lineto.c 14 Sep 2004 01:00:42 -0000 1.35.2.1
@@ -16,11 +16,11 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: lineto.c,v 1.35 2004/07/14 20:48:57 navaraf Exp $
+ * $Id: lineto.c,v 1.35.2.1 2004/09/14 01:00:42 weiden Exp $
*/
#include <w32k.h>
-static void FASTCALL
+static void INTERNAL_CALL
TranslateRects(RECT_ENUM *RectEnum, POINTL* Translate)
{
RECTL* CurrentRect;
@@ -40,7 +40,7 @@
/*
* Draw a line from top-left to bottom-right
*/
-void FASTCALL
+void INTERNAL_CALL
NWtoSE(SURFOBJ* OutputObj, CLIPOBJ* Clip,
BRUSHOBJ* Brush, LONG x, LONG y, LONG deltax, LONG deltay,
POINTL* Translate)
@@ -111,7 +111,7 @@
}
}
-void FASTCALL
+void INTERNAL_CALL
SWtoNE(SURFOBJ* OutputObj, CLIPOBJ* Clip,
BRUSHOBJ* Brush, LONG x, LONG y, LONG deltax, LONG deltay,
POINTL* Translate)
@@ -181,7 +181,7 @@
}
}
-void FASTCALL
+void INTERNAL_CALL
NEtoSW(SURFOBJ* OutputObj, CLIPOBJ* Clip,
BRUSHOBJ* Brush, LONG x, LONG y, LONG deltax, LONG deltay,
POINTL* Translate)
@@ -251,7 +251,7 @@
}
}
-void FASTCALL
+void INTERNAL_CALL
SEtoNW(SURFOBJ* OutputObj, CLIPOBJ* Clip,
BRUSHOBJ* Brush, LONG x, LONG y, LONG deltax, LONG deltay,
POINTL* Translate)
@@ -479,7 +479,7 @@
return IntEngLeave(&EnterLeave);
}
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntEngLineTo(BITMAPOBJ *DestObj,
CLIPOBJ *Clip,
BRUSHOBJ *Brush,
@@ -538,7 +538,7 @@
return ret;
}
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntEngPolyline(BITMAPOBJ *DestObj,
CLIPOBJ *Clip,
BRUSHOBJ *Brush,
reactos/subsys/win32k/eng
diff -u -r1.9 -r1.9.4.1
--- misc.c 3 Jul 2004 17:40:25 -0000 1.9
+++ misc.c 14 Sep 2004 01:00:42 -0000 1.9.4.1
@@ -16,10 +16,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: misc.c,v 1.9 2004/07/03 17:40:25 navaraf Exp $ */
+/* $Id: misc.c,v 1.9.4.1 2004/09/14 01:00:42 weiden Exp $ */
#include <w32k.h>
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave,
SURFOBJ *DestObj,
RECTL *DestRect,
@@ -130,7 +130,7 @@
return TRUE;
}
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave)
{
POINTL SrcPoint;
reactos/subsys/win32k/eng
diff -u -r1.3 -r1.3.4.1
--- misc.h 3 Jul 2004 13:55:35 -0000 1.3
+++ misc.h 14 Sep 2004 01:00:42 -0000 1.3.4.1
@@ -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: misc.h,v 1.3 2004/07/03 13:55:35 navaraf Exp $ */
+/* $Id: misc.h,v 1.3.4.1 2004/09/14 01:00:42 weiden Exp $ */
#ifndef __ENG_MISC_H
#define __ENG_MISC_H
@@ -35,12 +35,12 @@
BOOL ReadOnly;
} INTENG_ENTER_LEAVE, *PINTENG_ENTER_LEAVE;
-extern BOOL STDCALL IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave,
- SURFOBJ *DestObj,
- RECTL *DestRect,
- BOOL ReadOnly,
- POINTL *Translate,
- SURFOBJ **OutputObj);
-extern BOOL STDCALL IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave);
+extern BOOL INTERNAL_CALL IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave,
+ SURFOBJ *DestObj,
+ RECTL *DestRect,
+ BOOL ReadOnly,
+ POINTL *Translate,
+ SURFOBJ **OutputObj);
+extern BOOL INTERNAL_CALL IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave);
#endif
reactos/subsys/win32k/eng
diff -u -r1.76.2.3 -r1.76.2.4
--- mouse.c 12 Sep 2004 19:21:06 -0000 1.76.2.3
+++ mouse.c 14 Sep 2004 01:00:42 -0000 1.76.2.4
@@ -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: mouse.c,v 1.76.2.3 2004/09/12 19:21:06 weiden Exp $
+/* $Id: mouse.c,v 1.76.2.4 2004/09/14 01:00:42 weiden Exp $
*
* PROJECT: ReactOS kernel
* PURPOSE: Mouse
@@ -30,10 +30,10 @@
/* FUNCTIONS *****************************************************************/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntIsPrimarySurface(SURFOBJ *SurfObj);
-VOID FASTCALL
+VOID INTERNAL_CALL
EnableMouse(HDC hDisplayDC)
{
PDC dc;
@@ -89,7 +89,7 @@
}
}
-INT FASTCALL
+INT INTERNAL_CALL
MouseSafetyOnDrawStart(SURFOBJ *SurfObj, LONG HazardX1,
LONG HazardY1, LONG HazardX2, LONG HazardY2)
/*
@@ -173,7 +173,7 @@
return(TRUE);
}
-VOID FASTCALL
+VOID INTERNAL_CALL
SetPointerRect(PSYSTEM_CURSORINFO CurInfo, PRECTL PointerRect)
{
CurInfo->PointerRectLeft = PointerRect->left;
@@ -182,7 +182,7 @@
CurInfo->PointerRectBottom = PointerRect->bottom;
}
-INT FASTCALL
+INT INTERNAL_CALL
MouseSafetyOnDrawEnd(SURFOBJ *SurfObj)
/*
* FUNCTION: Notify the mouse driver that drawing has finished on a surface.
@@ -247,7 +247,7 @@
/* SOFTWARE MOUSE POINTER IMPLEMENTATION **************************************/
-VOID FASTCALL
+VOID INTERNAL_CALL
IntHideMousePointer(GDIDEVICE *ppdev, SURFOBJ *DestSurface)
{
if (ppdev->PointerAttributes.Enable == FALSE)
@@ -290,7 +290,7 @@
}
}
-VOID FASTCALL
+VOID INTERNAL_CALL
IntShowMousePointer(GDIDEVICE *ppdev, SURFOBJ *DestSurface)
{
if (ppdev->PointerAttributes.Enable == TRUE)
reactos/subsys/win32k/eng
diff -u -r1.20 -r1.20.4.1
--- paint.c 3 Jul 2004 13:55:35 -0000 1.20
+++ paint.c 14 Sep 2004 01:00:42 -0000 1.20.4.1
@@ -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: paint.c,v 1.20 2004/07/03 13:55:35 navaraf Exp $
+/* $Id: paint.c,v 1.20.4.1 2004/09/14 01:00:42 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -29,7 +29,8 @@
#include <w32k.h>
-BOOL STDCALL FillSolid(SURFOBJ *Surface, PRECTL pRect, ULONG iColor)
+BOOL INTERNAL_CALL
+FillSolid(SURFOBJ *Surface, PRECTL pRect, ULONG iColor)
{
LONG y;
ULONG LineWidth;
@@ -105,7 +106,7 @@
return ret;
}
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntEngPaint(IN BITMAPOBJ *BitmapObj,
IN CLIPOBJ *ClipRegion,
IN BRUSHOBJ *Brush,
reactos/subsys/win32k/eng
diff -u -r1.44.4.2 -r1.44.4.3
--- surface.c 13 Sep 2004 21:28:16 -0000 1.44.4.2
+++ surface.c 14 Sep 2004 01:00:42 -0000 1.44.4.3
@@ -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: surface.c,v 1.44.4.2 2004/09/13 21:28:16 weiden Exp $
+/* $Id: surface.c,v 1.44.4.3 2004/09/14 01:00:42 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -39,7 +39,8 @@
RLE_DELTA = 2 /* Delta */
};
-INT FASTCALL BitsPerFormat(ULONG Format)
+INT INTERNAL_CALL
+BitsPerFormat(ULONG Format)
{
switch(Format)
{
@@ -55,7 +56,8 @@
}
}
-ULONG FASTCALL BitmapFormat(WORD Bits, DWORD Compression)
+ULONG INTERNAL_CALL
+BitmapFormat(WORD Bits, DWORD Compression)
{
switch(Compression)
{
@@ -100,7 +102,8 @@
return NewBitmap;
}
-VOID Decompress4bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta)
+VOID INTERNAL_CALL
+Decompress4bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta)
{
int x = 0;
int y = Size.cy - 1;
@@ -157,7 +160,8 @@
}
}
-VOID Decompress8bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta)
+VOID INTERNAL_CALL
+Decompress8bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta)
{
int x = 0;
int y = Size.cy - 1;
@@ -213,7 +217,7 @@
}
}
-HBITMAP FASTCALL
+HBITMAP INTERNAL_CALL
IntCreateBitmap(IN SIZEL Size,
IN LONG Width,
IN ULONG Format,
@@ -379,7 +383,8 @@
return NewSurface;
}
-PFN FASTCALL DriverFunction(DRVENABLEDATA *DED, ULONG DriverFunc)
+PFN INTERNAL_CALL
+DriverFunction(DRVENABLEDATA *DED, ULONG DriverFunc)
{
ULONG i;
reactos/subsys/win32k/eng
diff -u -r1.21 -r1.21.4.1
--- transblt.c 3 Jul 2004 17:40:25 -0000 1.21
+++ transblt.c 14 Sep 2004 01:00:42 -0000 1.21.4.1
@@ -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: transblt.c,v 1.21 2004/07/03 17:40:25 navaraf Exp $
+/* $Id: transblt.c,v 1.21.4.1 2004/09/14 01:00:42 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -192,7 +192,7 @@
return Ret;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntEngTransparentBlt(BITMAPOBJ *DestObj,
BITMAPOBJ *SourceObj,
CLIPOBJ *Clip,
reactos/subsys/win32k/eng
diff -u -r1.41.2.2 -r1.41.2.3
--- xlate.c 12 Sep 2004 19:21:06 -0000 1.41.2.2
+++ xlate.c 14 Sep 2004 01:00:42 -0000 1.41.2.3
@@ -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: xlate.c,v 1.41.2.2 2004/09/12 19:21:06 weiden Exp $
+/* $Id: xlate.c,v 1.41.2.3 2004/09/14 01:00:42 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -143,7 +143,7 @@
return Shift;
}
-XLATEOBJ* FASTCALL
+XLATEOBJ* INTERNAL_CALL
IntEngCreateXlate(USHORT DestPalType, USHORT SourcePalType,
HPALETTE PaletteDest, HPALETTE PaletteSource)
{
@@ -278,7 +278,7 @@
return XlateObj;
}
-XLATEOBJ* FASTCALL
+XLATEOBJ* INTERNAL_CALL
IntEngCreateMonoXlate(
USHORT SourcePalType, HPALETTE PaletteDest, HPALETTE PaletteSource,
ULONG BackgroundColor)
@@ -342,7 +342,7 @@
return XlateObj;
}
-XLATEOBJ* FASTCALL
+XLATEOBJ* INTERNAL_CALL
IntEngCreateSrcMonoXlate(HPALETTE PaletteDest,
ULONG ForegroundColor,
ULONG BackgroundColor)
@@ -417,7 +417,7 @@
/*
* @implemented
*/
-VOID FASTCALL
+VOID STDCALL
EngDeleteXlate(XLATEOBJ *XlateObj)
{
XLATEGDI *XlateGDI;
reactos/subsys/win32k/include
diff -u -r1.18.8.2 -r1.18.8.3
--- callback.h 31 Aug 2004 11:38:55 -0000 1.18.8.2
+++ callback.h 14 Sep 2004 01:00:43 -0000 1.18.8.3
@@ -1,7 +1,7 @@
#ifndef _WIN32K_CALLBACK_H
#define _WIN32K_CALLBACK_H
-LRESULT STDCALL
+LRESULT INTERNAL_CALL
IntCallWindowProc(WNDPROC Proc,
BOOLEAN IsAnsiProc,
PWINDOW_OBJECT Window,
@@ -10,7 +10,7 @@
LPARAM lParam,
INT lParamBufferSize);
-VOID STDCALL
+VOID INTERNAL_CALL
IntCallSentMessageCallback(SENDASYNCPROC CompletionCallback,
PWINDOW_OBJECT Window,
UINT Msg,
@@ -18,13 +18,13 @@
LRESULT Result);
-HMENU STDCALL
+HMENU INTERNAL_CALL
IntLoadSysMenuTemplate();
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntLoadDefaultCursors(VOID);
-LRESULT STDCALL
+LRESULT INTERNAL_CALL
IntCallHookProc(INT HookId,
INT Code,
WPARAM wParam,
@@ -33,13 +33,13 @@
BOOLEAN Ansi,
PUNICODE_STRING ModuleName);
-VOID FASTCALL
+VOID INTERNAL_CALL
IntCleanupThreadCallbacks(PW32THREAD W32Thread);
-PVOID FASTCALL
+PVOID INTERNAL_CALL
IntCbAllocateMemory(ULONG Size);
-VOID FASTCALL
+VOID INTERNAL_CALL
IntCbFreeMemory(PVOID Data);
#endif /* _WIN32K_CALLBACK_H */
reactos/subsys/win32k/include
diff -u -r1.8 -r1.8.12.1
--- color.h 9 Apr 2004 20:03:18 -0000 1.8
+++ color.h 14 Sep 2004 01:00:43 -0000 1.8.12.1
@@ -3,9 +3,9 @@
#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */
-const PALETTEENTRY* FASTCALL COLOR_GetSystemPaletteTemplate (VOID);
-COLORREF STDCALL COLOR_LookupNearestColor (PALETTEENTRY* palPalEntry, INT size, COLORREF color);
-INT STDCALL COLOR_PaletteLookupExactIndex (PALETTEENTRY* palPalEntry, INT size, COLORREF col);
-INT STDCALL COLOR_PaletteLookupPixel(PALETTEENTRY *palPalEntry, INT size, XLATEOBJ *XlateObj, COLORREF col, BOOL skipReserved);
+const PALETTEENTRY* INTERNAL_CALL COLOR_GetSystemPaletteTemplate (VOID);
+COLORREF INTERNAL_CALL COLOR_LookupNearestColor (PALETTEENTRY* palPalEntry, INT size, COLORREF color);
+INT INTERNAL_CALL COLOR_PaletteLookupExactIndex (PALETTEENTRY* palPalEntry, INT size, COLORREF col);
+INT INTERNAL_CALL COLOR_PaletteLookupPixel(PALETTEENTRY *palPalEntry, INT size, XLATEOBJ *XlateObj, COLORREF col, BOOL skipReserved);
#endif /* _WIN32K_COLOR_H */
reactos/subsys/win32k/include
diff -u -r1.5 -r1.5.4.1
--- dib.h 3 Jul 2004 13:55:36 -0000 1.5
+++ dib.h 14 Sep 2004 01:00:43 -0000 1.5.4.1
@@ -3,20 +3,20 @@
#include <win32k/dc.h>
-INT FASTCALL
+INT INTERNAL_CALL
DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse);
-HBITMAP STDCALL
+HBITMAP INTERNAL_CALL
DIB_CreateDIBSection (PDC dc, PBITMAPINFO bmi, UINT usage, LPVOID *bits, HANDLE section, DWORD offset, DWORD ovr_pitch);
-INT STDCALL
+INT INTERNAL_CALL
DIB_GetBitmapInfo (const BITMAPINFOHEADER *header, PDWORD width, PINT height, PWORD bpp, PWORD compr);
-INT STDCALL
+INT INTERNAL_CALL
DIB_GetDIBImageBytes (INT width, INT height, INT depth);
-INT FASTCALL
+INT INTERNAL_CALL
DIB_GetDIBWidthBytes (INT width, INT depth);
-RGBQUAD * FASTCALL
+RGBQUAD * INTERNAL_CALL
DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi);
-HPALETTE FASTCALL
+HPALETTE INTERNAL_CALL
BuildDIBPalette (PBITMAPINFO bmi, PINT paletteType);
#endif /* _WIN32K_DIB_H */
reactos/subsys/win32k/include
diff -u -r1.9 -r1.9.4.1
--- eng.h 3 Jul 2004 13:55:36 -0000 1.9
+++ eng.h 14 Sep 2004 01:00:43 -0000 1.9.4.1
@@ -1,9 +1,9 @@
#ifndef _WIN32K_ENG_H
#define _WIN32K_ENG_H
-BOOL STDCALL EngIntersectRect (PRECTL prcDst, PRECTL prcSrc1, PRECTL prcSrc2);
-VOID FASTCALL EngDeleteXlate (XLATEOBJ *XlateObj);
-BOOL STDCALL
+BOOL STDCALL EngIntersectRect (PRECTL prcDst, PRECTL prcSrc1, PRECTL prcSrc2);
+VOID STDCALL EngDeleteXlate (XLATEOBJ *XlateObj);
+BOOL INTERNAL_CALL
IntEngMaskBlt(SURFOBJ *DestObj,
SURFOBJ *Mask,
CLIPOBJ *ClipRegion,
reactos/subsys/win32k/include
diff -u -r1.4 -r1.4.22.1
--- error.h 18 Nov 2003 20:49:39 -0000 1.4
+++ error.h 14 Sep 2004 01:00:43 -0000 1.4.22.1
@@ -1,15 +1,15 @@
#ifndef _WIN32K_ERROR_H
#define _WIN32K_ERROR_H
-VOID FASTCALL
+VOID INTERNAL_CALL
SetLastNtError(
NTSTATUS Status);
-VOID FASTCALL
+VOID INTERNAL_CALL
SetLastWin32Error(
DWORD Status);
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
GetLastNtError();
#endif /* _WIN32K_ERROR_H */
reactos/subsys/win32k/include
diff -u -r1.9 -r1.9.18.1
--- guicheck.h 25 Nov 2003 22:06:31 -0000 1.9
+++ guicheck.h 14 Sep 2004 01:00:43 -0000 1.9.18.1
@@ -4,9 +4,9 @@
#include <windows.h>
#include <ddk/ntddk.h>
-BOOL FASTCALL IntGraphicsCheck(BOOL Create);
-BOOL FASTCALL IntCreatePrimarySurface();
-VOID FASTCALL IntDestroyPrimarySurface();
+BOOL INTERNAL_CALL IntGraphicsCheck(BOOL Create);
+BOOL INTERNAL_CALL IntCreatePrimarySurface();
+VOID INTERNAL_CALL IntDestroyPrimarySurface();
#endif /* _WIN32K_GUICHECK_H */
reactos/subsys/win32k/include
diff -u -r1.1.2.1 -r1.1.2.2
--- intddraw.h 12 Sep 2004 19:21:06 -0000 1.1.2.1
+++ intddraw.h 14 Sep 2004 01:00:43 -0000 1.1.2.2
@@ -61,7 +61,7 @@
PDD_SURFCB_UNLOCK DdUnlockD3DBuffer;
} DD_DIRECTDRAW, *PDD_DIRECTDRAW;
-BOOL FASTCALL DD_Cleanup(PDD_DIRECTDRAW pDD);
-BOOL FASTCALL DDSURF_Cleanup(PDD_SURFACE pDDSurf);
+BOOL INTERNAL_CALL DD_Cleanup(PDD_DIRECTDRAW pDD);
+BOOL INTERNAL_CALL DDSURF_Cleanup(PDD_SURFACE pDDSurf);
#endif /* _INT_W32k_DDRAW */
reactos/subsys/win32k/include
diff -u -r1.15.2.1 -r1.15.2.2
--- inteng.h 12 Sep 2004 19:21:06 -0000 1.15.2.1
+++ inteng.h 14 Sep 2004 01:00:43 -0000 1.15.2.2
@@ -22,7 +22,7 @@
/* Definitions of IntEngXxx functions */
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntEngLineTo(BITMAPOBJ *Surface,
CLIPOBJ *Clip,
BRUSHOBJ *Brush,
@@ -33,7 +33,7 @@
RECTL *RectBounds,
MIX mix);
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntEngBitBlt(BITMAPOBJ *DestObj,
BITMAPOBJ *SourceObj,
BITMAPOBJ *Mask,
@@ -46,7 +46,7 @@
POINTL *BrushOrigin,
ROP4 rop4);
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntEngStretchBlt(BITMAPOBJ *DestObj,
BITMAPOBJ *SourceObj,
BITMAPOBJ *Mask,
@@ -59,7 +59,7 @@
POINTL *BrushOrigin,
ULONG Mode);
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntEngGradientFill(BITMAPOBJ *psoDest,
CLIPOBJ *pco,
XLATEOBJ *pxlo,
@@ -71,24 +71,24 @@
POINTL *pptlDitherOrg,
ULONG ulMode);
-XLATEOBJ* FASTCALL
+XLATEOBJ* INTERNAL_CALL
IntEngCreateXlate(USHORT DestPalType,
USHORT SourcePalType,
HPALETTE PaletteDest,
HPALETTE PaletteSource);
-XLATEOBJ* FASTCALL
+XLATEOBJ* INTERNAL_CALL
IntEngCreateMonoXlate(USHORT SourcePalType,
HPALETTE PaletteDest,
HPALETTE PaletteSource,
ULONG BackgroundColor);
-XLATEOBJ* FASTCALL
+XLATEOBJ* INTERNAL_CALL
IntEngCreateSrcMonoXlate(HPALETTE PaletteDest,
ULONG ForegroundColor,
ULONG BackgroundColor);
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntEngPolyline(BITMAPOBJ *DestSurf,
CLIPOBJ *Clip,
BRUSHOBJ *Brush,
@@ -96,21 +96,21 @@
LONG dCount,
MIX mix);
-CLIPOBJ* FASTCALL
+CLIPOBJ* INTERNAL_CALL
IntEngCreateClipRegion(ULONG count,
PRECTL pRect,
PRECTL rcBounds);
-VOID FASTCALL
+VOID INTERNAL_CALL
IntEngDeleteClipRegion(CLIPOBJ *ClipObj);
-BOOLEAN FASTCALL
+BOOLEAN INTERNAL_CALL
ClipobjToSpans(PSPAN *Spans,
UINT *Count,
CLIPOBJ *ClipRegion,
PRECTL Boundary);
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntEngTransparentBlt(BITMAPOBJ *Dest,
BITMAPOBJ *Source,
CLIPOBJ *Clip,
@@ -120,7 +120,7 @@
ULONG iTransColor,
ULONG Reserved);
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntEngPaint(IN BITMAPOBJ *Surface,
IN CLIPOBJ *ClipRegion,
IN BRUSHOBJ *Brush,
reactos/subsys/win32k/include
diff -u -r1.1.4.10 -r1.1.4.11
--- internal.h 13 Sep 2004 22:40:18 -0000 1.1.4.10
+++ internal.h 14 Sep 2004 01:00:43 -0000 1.1.4.11
@@ -103,7 +103,7 @@
(((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000))
#define ClassReferenceObject(ClassObj) \
- InterlockedIncrement((LONG*)(ClassObj))
+ InterlockedIncrement((LONG*)&((ClassObj)->RefCount))
#define ClassDereferenceObject(ClassObj) \
if(InterlockedDecrement((LONG*)&((ClassObj)->RefCount)) == 0) \
@@ -136,20 +136,20 @@
LIST_ENTRY ClassWindowsListHead;
} CLASS_OBJECT;
-PCLASS_OBJECT FASTCALL IntCreateClass(CONST WNDCLASSEXW *lpwcx,
+PCLASS_OBJECT INTERNAL_CALL IntCreateClass(CONST WNDCLASSEXW *lpwcx,
DWORD Flags,
WNDPROC wpExtra,
PUNICODE_STRING MenuName,
RTL_ATOM Atom);
-PCLASS_OBJECT FASTCALL IntRegisterClass(CONST WNDCLASSEXW *lpwcx, PUNICODE_STRING ClassName,
+PCLASS_OBJECT INTERNAL_CALL IntRegisterClass(CONST WNDCLASSEXW *lpwcx, PUNICODE_STRING ClassName,
PUNICODE_STRING MenuName, WNDPROC wpExtra, DWORD Flags);
-ULONG FASTCALL IntGetClassLong(PWINDOW_OBJECT WindowObject, ULONG Offset, BOOL Ansi);
-ULONG FASTCALL IntSetClassLong(PWINDOW_OBJECT WindowObject, ULONG Offset, LONG dwNewLong, BOOL Ansi);
-BOOL FASTCALL IntGetClassName(PWINDOW_OBJECT WindowObject, PUNICODE_STRING ClassName, ULONG nMaxCount);
-BOOL FASTCALL IntReferenceClassByNameOrAtom(PCLASS_OBJECT *Class, PUNICODE_STRING ClassNameOrAtom, HINSTANCE hInstance);
-BOOL FASTCALL IntReferenceClassByName(PCLASS_OBJECT *Class, PUNICODE_STRING ClassName, HINSTANCE hInstance);
-BOOL FASTCALL IntReferenceClassByAtom(PCLASS_OBJECT* Class, RTL_ATOM Atom, HINSTANCE hInstance);
-BOOL FASTCALL IntGetClassInfo(HINSTANCE hInstance, PUNICODE_STRING ClassName, LPWNDCLASSEXW lpWndClassEx, BOOL Ansi);
+ULONG INTERNAL_CALL IntGetClassLong(PWINDOW_OBJECT WindowObject, ULONG Offset, BOOL Ansi);
+ULONG INTERNAL_CALL IntSetClassLong(PWINDOW_OBJECT WindowObject, ULONG Offset, LONG dwNewLong, BOOL Ansi);
+BOOL INTERNAL_CALL IntGetClassName(PWINDOW_OBJECT WindowObject, PUNICODE_STRING ClassName, ULONG nMaxCount);
+BOOL INTERNAL_CALL IntReferenceClassByNameOrAtom(PCLASS_OBJECT *Class, PUNICODE_STRING ClassNameOrAtom, HINSTANCE hInstance);
+BOOL INTERNAL_CALL IntReferenceClassByName(PCLASS_OBJECT *Class, PUNICODE_STRING ClassName, HINSTANCE hInstance);
+BOOL INTERNAL_CALL IntReferenceClassByAtom(PCLASS_OBJECT* Class, RTL_ATOM Atom, HINSTANCE hInstance);
+BOOL INTERNAL_CALL IntGetClassInfo(HINSTANCE hInstance, PUNICODE_STRING ClassName, LPWNDCLASSEXW lpWndClassEx, BOOL Ansi);
/* CURSORS AND ICONS **********************************************************/
@@ -209,19 +209,19 @@
HANDLE LastClkWnd;
} SYSTEM_CURSORINFO;
-PCURSOR_OBJECT FASTCALL IntSetCursor(PCURSOR_OBJECT NewCursor, BOOL ForceChange);
-PCURSOR_OBJECT FASTCALL IntCreateCursorObject(HANDLE *Handle);
-VOID FASTCALL IntCleanupCurIcons(struct _EPROCESS *Process, PW32PROCESS Win32Process);
-VOID FASTCALL IntGetCursorIconInfo(PCURSOR_OBJECT Cursor, PICONINFO IconInfo);
-BOOL FASTCALL IntGetCursorIconSize(PCURSOR_OBJECT Cursor, BOOL *fIcon, SIZE *Size);
-BOOL FASTCALL IntGetCursorInfo(PCURSORINFO pci);
-BOOL FASTCALL IntDestroyCursorObject(PCURSOR_OBJECT Object, BOOL RemoveFromProcess);
-PCURSOR_OBJECT FASTCALL IntFindExistingCursorObject(HMODULE hModule, HRSRC hRsrc, LONG cx, LONG cy);
-VOID FASTCALL IntGetClipCursor(RECT *lpRect);
-VOID FASTCALL IntSetCursorIconData(PCURSOR_OBJECT Cursor, BOOL *fIcon, POINT *Hotspot,
- HMODULE hModule, HRSRC hRsrc, HRSRC hGroupRsrc);
-BOOL FASTCALL IntDrawIconEx(HDC hdc, int xLeft, int yTop, PCURSOR_OBJECT Cursor, int cxWidth, int cyWidth,
- UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags);
+PCURSOR_OBJECT INTERNAL_CALL IntSetCursor(PCURSOR_OBJECT NewCursor, BOOL ForceChange);
+PCURSOR_OBJECT INTERNAL_CALL IntCreateCursorObject(HANDLE *Handle);
+VOID INTERNAL_CALL IntCleanupCurIcons(struct _EPROCESS *Process, PW32PROCESS Win32Process);
+VOID INTERNAL_CALL IntGetCursorIconInfo(PCURSOR_OBJECT Cursor, PICONINFO IconInfo);
+BOOL INTERNAL_CALL IntGetCursorIconSize(PCURSOR_OBJECT Cursor, BOOL *fIcon, SIZE *Size);
+BOOL INTERNAL_CALL IntGetCursorInfo(PCURSORINFO pci);
+BOOL INTERNAL_CALL IntDestroyCursorObject(PCURSOR_OBJECT Object, BOOL RemoveFromProcess);
+PCURSOR_OBJECT INTERNAL_CALL IntFindExistingCursorObject(HMODULE hModule, HRSRC hRsrc, LONG cx, LONG cy);
+VOID INTERNAL_CALL IntGetClipCursor(RECT *lpRect);
+VOID INTERNAL_CALL IntSetCursorIconData(PCURSOR_OBJECT Cursor, BOOL *fIcon, POINT *Hotspot,
+ HMODULE hModule, HRSRC hRsrc, HRSRC hGroupRsrc);
+BOOL INTERNAL_CALL IntDrawIconEx(HDC hdc, int xLeft, int yTop, PCURSOR_OBJECT Cursor, int cxWidth, int cyWidth,
+ UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags);
/* DCES ***********************************************************************/
@@ -257,20 +257,20 @@
DWORD DCXFlags;
} DCE; /* PDCE already declared at top of file */
-PDCE FASTCALL DceAllocDCE(PWINDOW_OBJECT Window, DCE_TYPE Type);
-PDCE FASTCALL DCE_FreeDCE(PDCE dce);
-VOID FASTCALL DCE_FreeWindowDCE(PWINDOW_OBJECT);
-BOOL FASTCALL DCE_Cleanup(PDCE pDce);
-HRGN FASTCALL DceGetVisRgn(PWINDOW_OBJECT Window, ULONG Flags, PWINDOW_OBJECT Child, ULONG CFlags);
-INT FASTCALL DCE_ExcludeRgn(HDC, PWINDOW_OBJECT, HRGN);
-BOOL FASTCALL DCE_InvalidateDCE(PWINDOW_OBJECT, const PRECTL);
-PWINDOW_OBJECT FASTCALL IntWindowFromDC(HDC hDc);
-PDCE FASTCALL DceFreeDCE(PDCE dce);
-void FASTCALL DceFreeWindowDCE(PWINDOW_OBJECT Window);
-void FASTCALL DceEmptyCache(void);
-VOID FASTCALL DceResetActiveDCEs(PWINDOW_OBJECT Window, int DeltaX, int DeltaY);
-HDC FASTCALL IntGetDCEx(PWINDOW_OBJECT Window, HRGN ClipRegion, ULONG Flags);
-INT FASTCALL IntReleaseDC(PWINDOW_OBJECT Window, HDC hDc);
+PDCE INTERNAL_CALL DceAllocDCE(PWINDOW_OBJECT Window, DCE_TYPE Type);
+PDCE INTERNAL_CALL DCE_FreeDCE(PDCE dce);
+VOID INTERNAL_CALL DCE_FreeWindowDCE(PWINDOW_OBJECT);
+BOOL INTERNAL_CALL DCE_Cleanup(PDCE pDce);
+HRGN INTERNAL_CALL DceGetVisRgn(PWINDOW_OBJECT Window, ULONG Flags, PWINDOW_OBJECT Child, ULONG CFlags);
+INT INTERNAL_CALL DCE_ExcludeRgn(HDC, PWINDOW_OBJECT, HRGN);
+BOOL INTERNAL_CALL DCE_InvalidateDCE(PWINDOW_OBJECT, const PRECTL);
+PWINDOW_OBJECT INTERNAL_CALL IntWindowFromDC(HDC hDc);
+PDCE INTERNAL_CALL DceFreeDCE(PDCE dce);
+void INTERNAL_CALL DceFreeWindowDCE(PWINDOW_OBJECT Window);
+void INTERNAL_CALL DceEmptyCache(void);
+VOID INTERNAL_CALL DceResetActiveDCEs(PWINDOW_OBJECT Window, int DeltaX, int DeltaY);
+HDC INTERNAL_CALL IntGetDCEx(PWINDOW_OBJECT Window, HRGN ClipRegion, ULONG Flags);
+INT INTERNAL_CALL IntReleaseDC(PWINDOW_OBJECT Window, HDC hDc);
/* DESKTOPS *******************************************************************/
@@ -280,33 +280,33 @@
#define IntIsActiveDesktop(Desktop) \
((Desktop)->WindowStation->ActiveDesktop == (Desktop))
-NTSTATUS FASTCALL InitDesktopImpl(VOID);
-NTSTATUS FASTCALL CleanupDesktopImpl(VOID);
-VOID FASTCALL IntGetDesktopWorkArea(PDESKTOP_OBJECT Desktop, PRECT Rect);
-HDC FASTCALL IntGetScreenDC(VOID);
-PWINDOW_OBJECT FASTCALL IntGetDesktopWindow (VOID);
-PWINDOW_OBJECT FASTCALL IntGetCurrentThreadDesktopWindow(VOID);
-PUSER_MESSAGE_QUEUE FASTCALL IntGetActiveMessageQueue(VOID);
-PUSER_MESSAGE_QUEUE FASTCALL IntSetActiveMessageQueue(PUSER_MESSAGE_QUEUE NewQueue);
-PDESKTOP_OBJECT FASTCALL IntGetInputDesktop(VOID);
-NTSTATUS FASTCALL IntShowDesktop(PDESKTOP_OBJECT Desktop, ULONG Width, ULONG Height);
-NTSTATUS FASTCALL IntHideDesktop(PDESKTOP_OBJECT Desktop);
-HDESK FASTCALL IntGetDesktopObjectHandle(PDESKTOP_OBJECT DesktopObject);
-NTSTATUS FASTCALL IntValidateDesktopHandle(HDESK Desktop, KPROCESSOR_MODE AccessMode, ACCESS_MASK DesiredAccess, PDESKTOP_OBJECT *Object);
-BOOL FASTCALL IntPaintDesktop(HDC hDC);
+NTSTATUS INTERNAL_CALL InitDesktopImpl(VOID);
+NTSTATUS INTERNAL_CALL CleanupDesktopImpl(VOID);
+VOID INTERNAL_CALL IntGetDesktopWorkArea(PDESKTOP_OBJECT Desktop, PRECT Rect);
+HDC INTERNAL_CALL IntGetScreenDC(VOID);
+PWINDOW_OBJECT INTERNAL_CALL IntGetDesktopWindow (VOID);
+PWINDOW_OBJECT INTERNAL_CALL IntGetCurrentThreadDesktopWindow(VOID);
+PUSER_MESSAGE_QUEUE INTERNAL_CALL IntGetActiveMessageQueue(VOID);
+PUSER_MESSAGE_QUEUE INTERNAL_CALL IntSetActiveMessageQueue(PUSER_MESSAGE_QUEUE NewQueue);
+PDESKTOP_OBJECT INTERNAL_CALL IntGetInputDesktop(VOID);
+NTSTATUS INTERNAL_CALL IntShowDesktop(PDESKTOP_OBJECT Desktop, ULONG Width, ULONG Height);
+NTSTATUS INTERNAL_CALL IntHideDesktop(PDESKTOP_OBJECT Desktop);
+HDESK INTERNAL_CALL IntGetDesktopObjectHandle(PDESKTOP_OBJECT DesktopObject);
+NTSTATUS INTERNAL_CALL IntValidateDesktopHandle(HDESK Desktop, KPROCESSOR_MODE AccessMode, ACCESS_MASK DesiredAccess, PDESKTOP_OBJECT *Object);
+BOOL INTERNAL_CALL IntPaintDesktop(HDC hDC);
/* FOCUS **********************************************************************/
-PWINDOW_OBJECT FASTCALL IntGetCaptureWindow(VOID);
-PWINDOW_OBJECT FASTCALL IntGetFocusWindow(VOID);
-PWINDOW_OBJECT FASTCALL IntGetThreadFocusWindow(VOID);
-BOOL FASTCALL IntMouseActivateWindow(PWINDOW_OBJECT DesktopWindow, PWINDOW_OBJECT Window);
-BOOL FASTCALL IntSetForegroundWindow(PWINDOW_OBJECT Window);
-PWINDOW_OBJECT FASTCALL IntSetActiveWindow(PWINDOW_OBJECT Window);
-PWINDOW_OBJECT FASTCALL IntGetForegroundWindow(VOID);
-PWINDOW_OBJECT FASTCALL IntGetActiveWindow(VOID);
-PWINDOW_OBJECT FASTCALL IntSetFocus(PWINDOW_OBJECT Window);
-PWINDOW_OBJECT FASTCALL IntSetCapture(PWINDOW_OBJECT Window);
+PWINDOW_OBJECT INTERNAL_CALL IntGetCaptureWindow(VOID);
+PWINDOW_OBJECT INTERNAL_CALL IntGetFocusWindow(VOID);
+PWINDOW_OBJECT INTERNAL_CALL IntGetThreadFocusWindow(VOID);
+BOOL INTERNAL_CALL IntMouseActivateWindow(PWINDOW_OBJECT DesktopWindow, PWINDOW_OBJECT Window);
+BOOL INTERNAL_CALL IntSetForegroundWindow(PWINDOW_OBJECT Window);
+PWINDOW_OBJECT INTERNAL_CALL IntSetActiveWindow(PWINDOW_OBJECT Window);
+PWINDOW_OBJECT INTERNAL_CALL IntGetForegroundWindow(VOID);
+PWINDOW_OBJECT INTERNAL_CALL IntGetActiveWindow(VOID);
+PWINDOW_OBJECT INTERNAL_CALL IntSetFocus(PWINDOW_OBJECT Window);
+PWINDOW_OBJECT INTERNAL_CALL IntSetCapture(PWINDOW_OBJECT Window);
/* HOOKS **********************************************************************/
@@ -349,15 +349,15 @@
#define ThreadHasInputAccess(W32Thread) \
(TRUE)
-NTSTATUS FASTCALL InitInputImpl(VOID);
-NTSTATUS FASTCALL InitKeyboardImpl(VOID);
-PUSER_MESSAGE_QUEUE FASTCALL W32kGetPrimitiveMessageQueue(VOID);
-PKBDTABLES FASTCALL W32kGetDefaultKeyLayout(VOID);
-VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyLayout);
-BOOL FASTCALL IntBlockInput(PW32THREAD W32Thread, BOOL BlockIt);
-BOOL FASTCALL IntMouseInput(MOUSEINPUT *mi);
-BOOL FASTCALL IntKeyboardInput(KEYBDINPUT *ki);
-UINT FASTCALL IntSendInput(UINT nInputs, LPINPUT pInput, INT cbSize);
+NTSTATUS INTERNAL_CALL InitInputImpl(VOID);
+NTSTATUS INTERNAL_CALL InitKeyboardImpl(VOID);
+PUSER_MESSAGE_QUEUE INTERNAL_CALL W32kGetPrimitiveMessageQueue(VOID);
+PKBDTABLES INTERNAL_CALL W32kGetDefaultKeyLayout(VOID);
+VOID INTERNAL_CALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyLayout);
+BOOL INTERNAL_CALL IntBlockInput(PW32THREAD W32Thread, BOOL BlockIt);
+BOOL INTERNAL_CALL IntMouseInput(MOUSEINPUT *mi);
+BOOL INTERNAL_CALL IntKeyboardInput(KEYBDINPUT *ki);
+UINT INTERNAL_CALL IntSendInput(UINT nInputs, LPINPUT pInput, INT cbSize);
/* MENUS **********************************************************************/
@@ -577,69 +577,69 @@
INT Flags;
} MSGMEMORY;
-BOOL FASTCALL MsqIsHung(PUSER_MESSAGE_QUEUE MessageQueue);
-NTSTATUS FASTCALL MsqSendMessage(PUSER_MESSAGE_QUEUE MessageQueue,
- PWINDOW_OBJECT Window, UINT Msg, WPARAM wParam, LPARAM lParam,
- UINT uTimeout, BOOL Block, ULONG_PTR *uResult);
-PUSER_MESSAGE FASTCALL MsqCreateMessage(PKMSG Msg, BOOLEAN FreeLParam);
-VOID FASTCALL MsqDestroyMessage(PUSER_MESSAGE Message);
-VOID FASTCALL MsqPostMessage(PUSER_MESSAGE_QUEUE MessageQueue, PKMSG Msg, BOOLEAN FreeLParam);
-VOID FASTCALL MsqPostQuitMessage(PUSER_MESSAGE_QUEUE MessageQueue, ULONG ExitCode);
-BOOLEAN FASTCALL MsqFindMessage(IN PUSER_MESSAGE_QUEUE MessageQueue,
- IN BOOLEAN Hardware,
- IN BOOLEAN Remove,
- IN PWINDOW_OBJECT FilterWindow,
- IN UINT MsgFilterLow,
- IN UINT MsgFilterHigh,
- OUT PUSER_MESSAGE* Message);
-VOID FASTCALL MsqInitializeMessageQueue(struct _ETHREAD *Thread, PUSER_MESSAGE_QUEUE MessageQueue);
-VOID FASTCALL MsqCleanupMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue);
-PUSER_MESSAGE_QUEUE FASTCALL MsqCreateMessageQueue(struct _ETHREAD *Thread);
-VOID FASTCALL MsqDestroyMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue);
-PUSER_MESSAGE_QUEUE FASTCALL MsqGetHardwareMessageQueue(VOID);
-NTSTATUS FASTCALL MsqWaitForNewMessage(PUSER_MESSAGE_QUEUE MessageQueue);
-NTSTATUS FASTCALL MsqInitializeImpl(VOID);
-BOOLEAN FASTCALL MsqDispatchOneSentMessage(PUSER_MESSAGE_QUEUE MessageQueue);
-NTSTATUS FASTCALL MsqWaitForNewMessages(PUSER_MESSAGE_QUEUE MessageQueue);
-VOID FASTCALL MsqSendNotifyMessage(PUSER_MESSAGE_QUEUE MessageQueue, PUSER_SENT_MESSAGE_NOTIFY NotifyMessage);
-VOID FASTCALL MsqIncPaintCountQueue(PUSER_MESSAGE_QUEUE Queue);
-VOID FASTCALL MsqDecPaintCountQueue(PUSER_MESSAGE_QUEUE Queue);
-NTSTATUS FASTCALL CopyMsgToKernelMem(PKMSG KernelModeMsg, MSG *UserModeMsg, PMSGMEMORY MsgMemoryEntry, PWINDOW_OBJECT MsgWindow);
-NTSTATUS FASTCALL CopyMsgToUserMem(MSG *UserModeMsg, PKMSG KernelModeMsg);
-LRESULT FASTCALL IntSendMessage(PWINDOW_OBJECT Window, UINT Msg, WPARAM wParam, LPARAM lParam);
-LRESULT FASTCALL IntSendMessageTimeout(PWINDOW_OBJECT Window, UINT Msg, WPARAM wParam, LPARAM lParam,
- UINT uFlags, UINT uTimeout, ULONG_PTR *uResult);
-BOOL FASTCALL IntPostThreadMessage(PW32THREAD W32Thread, UINT Msg, WPARAM wParam, LPARAM lParam);
-BOOL FASTCALL IntPostMessage(PWINDOW_OBJECT Window, UINT Msg, WPARAM wParam, LPARAM lParam);
-BOOL FASTCALL IntWaitMessage(PWINDOW_OBJECT Window, UINT MsgFilterMin, UINT MsgFilterMax);
-BOOL FASTCALL IntTranslateKbdMessage(PKMSG lpMsg, HKL dwhkl);
-inline VOID MsqSetQueueBits(PUSER_MESSAGE_QUEUE queue, WORD bits);
-inline VOID MsqClearQueueBits(PUSER_MESSAGE_QUEUE queue, WORD bits);
-BOOL IntInitMessagePumpHook(VOID);
-BOOL IntUninitMessagePumpHook(VOID);
-PHOOKTABLE FASTCALL MsqGetHooks(PUSER_MESSAGE_QUEUE Queue);
-VOID FASTCALL MsqSetHooks(PUSER_MESSAGE_QUEUE Queue, PHOOKTABLE Hooks);
-LPARAM FASTCALL MsqSetMessageExtraInfo(LPARAM lParam);
-LPARAM FASTCALL MsqGetMessageExtraInfo(VOID);
+BOOL INTERNAL_CALL MsqIsHung(PUSER_MESSAGE_QUEUE MessageQueue);
+NTSTATUS INTERNAL_CALL MsqSendMessage(PUSER_MESSAGE_QUEUE MessageQueue,
+ PWINDOW_OBJECT Window, UINT Msg, WPARAM wParam, LPARAM lParam,
+ UINT uTimeout, BOOL Block, ULONG_PTR *uResult);
+PUSER_MESSAGE INTERNAL_CALL MsqCreateMessage(PKMSG Msg, BOOLEAN FreeLParam);
+VOID INTERNAL_CALL MsqDestroyMessage(PUSER_MESSAGE Message);
+VOID INTERNAL_CALL MsqPostMessage(PUSER_MESSAGE_QUEUE MessageQueue, PKMSG Msg, BOOLEAN FreeLParam);
+VOID INTERNAL_CALL MsqPostQuitMessage(PUSER_MESSAGE_QUEUE MessageQueue, ULONG ExitCode);
+BOOLEAN INTERNAL_CALL MsqFindMessage(IN PUSER_MESSAGE_QUEUE MessageQueue,
+ IN BOOLEAN Hardware,
+ IN BOOLEAN Remove,
+ IN PWINDOW_OBJECT FilterWindow,
+ IN UINT MsgFilterLow,
+ IN UINT MsgFilterHigh,
+ OUT PUSER_MESSAGE* Message);
+VOID INTERNAL_CALL MsqInitializeMessageQueue(struct _ETHREAD *Thread, PUSER_MESSAGE_QUEUE MessageQueue);
+VOID INTERNAL_CALL MsqCleanupMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue);
+PUSER_MESSAGE_QUEUE INTERNAL_CALL MsqCreateMessageQueue(struct _ETHREAD *Thread);
+VOID INTERNAL_CALL MsqDestroyMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue);
+PUSER_MESSAGE_QUEUE INTERNAL_CALL MsqGetHardwareMessageQueue(VOID);
+NTSTATUS INTERNAL_CALL MsqWaitForNewMessage(PUSER_MESSAGE_QUEUE MessageQueue);
+NTSTATUS INTERNAL_CALL MsqInitializeImpl(VOID);
+BOOLEAN INTERNAL_CALL MsqDispatchOneSentMessage(PUSER_MESSAGE_QUEUE MessageQueue);
+NTSTATUS INTERNAL_CALL MsqWaitForNewMessages(PUSER_MESSAGE_QUEUE MessageQueue);
+VOID INTERNAL_CALL MsqSendNotifyMessage(PUSER_MESSAGE_QUEUE MessageQueue, PUSER_SENT_MESSAGE_NOTIFY NotifyMessage);
+VOID INTERNAL_CALL MsqIncPaintCountQueue(PUSER_MESSAGE_QUEUE Queue);
+VOID INTERNAL_CALL MsqDecPaintCountQueue(PUSER_MESSAGE_QUEUE Queue);
+NTSTATUS INTERNAL_CALL CopyMsgToKernelMem(PKMSG KernelModeMsg, MSG *UserModeMsg, PMSGMEMORY MsgMemoryEntry, PWINDOW_OBJECT MsgWindow);
+NTSTATUS INTERNAL_CALL CopyMsgToUserMem(MSG *UserModeMsg, PKMSG KernelModeMsg);
+LRESULT INTERNAL_CALL IntSendMessage(PWINDOW_OBJECT Window, UINT Msg, WPARAM wParam, LPARAM lParam);
+LRESULT INTERNAL_CALL IntSendMessageTimeout(PWINDOW_OBJECT Window, UINT Msg, WPARAM wParam, LPARAM lParam,
+ UINT uFlags, UINT uTimeout, ULONG_PTR *uResult);
+BOOL INTERNAL_CALL IntPostThreadMessage(PW32THREAD W32Thread, UINT Msg, WPARAM wParam, LPARAM lParam);
+BOOL INTERNAL_CALL IntPostMessage(PWINDOW_OBJECT Window, UINT Msg, WPARAM wParam, LPARAM lParam);
+BOOL INTERNAL_CALL IntWaitMessage(PWINDOW_OBJECT Window, UINT MsgFilterMin, UINT MsgFilterMax);
+BOOL INTERNAL_CALL IntTranslateKbdMessage(PKMSG lpMsg, HKL dwhkl);
+inline VOID INTERNAL_CALL MsqSetQueueBits(PUSER_MESSAGE_QUEUE queue, WORD bits);
+inline VOID INTERNAL_CALL MsqClearQueueBits(PUSER_MESSAGE_QUEUE queue, WORD bits);
+BOOL INTERNAL_CALL IntInitMessagePumpHook(VOID);
+BOOL INTERNAL_CALL IntUninitMessagePumpHook(VOID);
+PHOOKTABLE INTERNAL_CALL MsqGetHooks(PUSER_MESSAGE_QUEUE Queue);
+VOID INTERNAL_CALL MsqSetHooks(PUSER_MESSAGE_QUEUE Queue, PHOOKTABLE Hooks);
+LPARAM INTERNAL_CALL MsqSetMessageExtraInfo(LPARAM lParam);
+LPARAM INTERNAL_CALL MsqGetMessageExtraInfo(VOID);
/* MESSAGES *******************************************************************/
-BOOL FASTCALL IntPeekMessage(PUSER_MESSAGE Msg, PWINDOW_OBJECT FilterWindow,
- UINT MsgFilterMin, UINT MsgFilterMax, UINT RemoveMsg);
-BOOL FASTCALL IntTranslateMouseMessage(PUSER_MESSAGE_QUEUE ThreadQueue, PKMSG Msg, USHORT *HitTest, BOOL Remove);
-PMSGMEMORY FASTCALL FindMsgMemory(UINT Msg);
-UINT FASTCALL MsgMemorySize(PMSGMEMORY MsgMemoryEntry, WPARAM wParam, LPARAM lParam);
-BOOL FASTCALL IntGetMessage(PUSER_MESSAGE Msg, PWINDOW_OBJECT FilterWindow,
- UINT MsgFilterMin, UINT MsgFilterMax, BOOL *GotMessage);
-LRESULT FASTCALL IntDispatchMessage(PNTUSERDISPATCHMESSAGEINFO MsgInfo, PWINDOW_OBJECT Window);
+BOOL INTERNAL_CALL IntPeekMessage(PUSER_MESSAGE Msg, PWINDOW_OBJECT FilterWindow,
+ UINT MsgFilterMin, UINT MsgFilterMax, UINT RemoveMsg);
+BOOL INTERNAL_CALL IntTranslateMouseMessage(PUSER_MESSAGE_QUEUE ThreadQueue, PKMSG Msg, USHORT *HitTest, BOOL Remove);
+PMSGMEMORY INTERNAL_CALL FindMsgMemory(UINT Msg);
+UINT INTERNAL_CALL MsgMemorySize(PMSGMEMORY MsgMemoryEntry, WPARAM wParam, LPARAM lParam);
+BOOL INTERNAL_CALL IntGetMessage(PUSER_MESSAGE Msg, PWINDOW_OBJECT FilterWindow,
+ UINT MsgFilterMin, UINT MsgFilterMax, BOOL *GotMessage);
+LRESULT INTERNAL_CALL IntDispatchMessage(PNTUSERDISPATCHMESSAGEINFO MsgInfo, PWINDOW_OBJECT Window);
/* KEYBOARD *******************************************************************/
-VOID FASTCALL MsqPostKeyboardMessage(UINT uMsg, WPARAM wParam, LPARAM lParam);
-VOID FASTCALL MsqPostHotKeyMessage(PVOID Thread, PWINDOW_OBJECT Window, WPARAM wParam, LPARAM lParam);
-VOID FASTCALL MsqInsertSystemMessage(PKMSG Msg);
-BOOL FASTCALL MsqIsDblClk(PKMSG Msg, BOOL Remove);
-PWINDOW_OBJECT FASTCALL MsqSetStateWindow(PUSER_MESSAGE_QUEUE MessageQueue, ULONG Type, PWINDOW_OBJECT Window);
+VOID INTERNAL_CALL MsqPostKeyboardMessage(UINT uMsg, WPARAM wParam, LPARAM lParam);
+VOID INTERNAL_CALL MsqPostHotKeyMessage(PVOID Thread, PWINDOW_OBJECT Window, WPARAM wParam, LPARAM lParam);
+VOID INTERNAL_CALL MsqInsertSystemMessage(PKMSG Msg);
+BOOL INTERNAL_CALL MsqIsDblClk(PKMSG Msg, BOOL Remove);
+PWINDOW_OBJECT INTERNAL_CALL MsqSetStateWindow(PUSER_MESSAGE_QUEUE MessageQueue, ULONG Type, PWINDOW_OBJECT Window);
/* PAINTING *******************************************************************/
@@ -683,14 +683,14 @@
(Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) || \
(Window->Flags & WINDOWOBJECT_NEED_NCPAINT)))
-VOID FASTCALL IntValidateParent(PWINDOW_OBJECT Child, HRGN ValidRegion);
-BOOL FASTCALL IntRedrawWindow(PWINDOW_OBJECT Window, LPRECT UpdateRect, HRGN UpdateRgn, UINT Flags);
-BOOL FASTCALL IntGetPaintMessage(PWINDOW_OBJECT Window, UINT MsgFilterMin, UINT MsgFilterMax,
- PW32THREAD Thread, PKMSG Message, BOOL Remove);
-HDC FASTCALL IntBeginPaint(PWINDOW_OBJECT Window, PAINTSTRUCT* lPs);
-BOOL FASTCALL IntEndPaint(PWINDOW_OBJECT Window, CONST PAINTSTRUCT* lPs);
-BOOL FASTCALL IntGetUpdateRect(PWINDOW_OBJECT Window, LPRECT Rect, BOOL Erase);
-INT FASTCALL IntGetUpdateRgn(PWINDOW_OBJECT Window, HRGN hRgn, BOOL bErase);
+VOID INTERNAL_CALL IntValidateParent(PWINDOW_OBJECT Child, HRGN ValidRegion);
+BOOL INTERNAL_CALL IntRedrawWindow(PWINDOW_OBJECT Window, LPRECT UpdateRect, HRGN UpdateRgn, UINT Flags);
+BOOL INTERNAL_CALL IntGetPaintMessage(PWINDOW_OBJECT Window, UINT MsgFilterMin, UINT MsgFilterMax,
+ PW32THREAD Thread, PKMSG Message, BOOL Remove);
+HDC INTERNAL_CALL IntBeginPaint(PWINDOW_OBJECT Window, PAINTSTRUCT* lPs);
+BOOL INTERNAL_CALL IntEndPaint(PWINDOW_OBJECT Window, CONST PAINTSTRUCT* lPs);
+BOOL INTERNAL_CALL IntGetUpdateRect(PWINDOW_OBJECT Window, LPRECT Rect, BOOL Erase);
+INT INTERNAL_CALL IntGetUpdateRgn(PWINDOW_OBJECT Window, HRGN hRgn, BOOL bErase);
/* WINDOW PROPERTIES **********************************************************/
@@ -701,9 +701,9 @@
ATOM Atom;
} PROPERTY;
-BOOL FASTCALL IntSetProp(PWINDOW_OBJECT WindowObject, ATOM Atom, HANDLE Data);
-BOOL FASTCALL IntRemoveProp(PWINDOW_OBJECT WindowObject, ATOM Atom, HANDLE *Data);
-PPROPERTY FASTCALL IntGetProp(PWINDOW_OBJECT WindowObject, ATOM Atom);
+BOOL INTERNAL_CALL IntSetProp(PWINDOW_OBJECT WindowObject, ATOM Atom, HANDLE Data);
+BOOL INTERNAL_CALL IntRemoveProp(PWINDOW_OBJECT WindowObject, ATOM Atom, HANDLE *Data);
+PPROPERTY INTERNAL_CALL IntGetProp(PWINDOW_OBJECT WindowObject, ATOM Atom);
/* SCROLL BARS ****************************************************************/
@@ -722,16 +722,16 @@
SCROLLINFO ScrollInfo;
} WINDOW_SCROLLINFO;
-BOOL FASTCALL IntCreateScrollBars(PWINDOW_OBJECT Window);
-BOOL FASTCALL IntDestroyScrollBars(PWINDOW_OBJECT Window);
-BOOL FASTCALL IntGetScrollBarInfo(PWINDOW_OBJECT Window, LONG idObject, PSCROLLBARINFO psbi);
-BOOL FASTCALL IntEnableScrollBar(BOOL Horz, PSCROLLBARINFO Info, UINT wArrows);
-BOOL FASTCALL IntEnableWindowScrollBar(PWINDOW_OBJECT Window, UINT wSBflags, UINT wArrows);
-BOOL FASTCALL IntSetScrollBarInfo(PWINDOW_OBJECT Window, LONG idObject, SETSCROLLBARINFO *info);
-DWORD FASTCALL IntShowScrollBar(PWINDOW_OBJECT Window, int wBar, DWORD bShow);
-BOOL FASTCALL IntGetScrollBarRect (PWINDOW_OBJECT Window, INT nBar, PRECT lprect);
-DWORD FASTCALL IntSetScrollInfo(PWINDOW_OBJECT Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw);
-BOOL FASTCALL IntGetScrollInfo(PWINDOW_OBJECT Window, INT nBar, LPSCROLLINFO lpsi);
+BOOL INTERNAL_CALL IntCreateScrollBars(PWINDOW_OBJECT Window);
+BOOL INTERNAL_CALL IntDestroyScrollBars(PWINDOW_OBJECT Window);
+BOOL INTERNAL_CALL IntGetScrollBarInfo(PWINDOW_OBJECT Window, LONG idObject, PSCROLLBARINFO psbi);
+BOOL INTERNAL_CALL IntEnableScrollBar(BOOL Horz, PSCROLLBARINFO Info, UINT wArrows);
+BOOL INTERNAL_CALL IntEnableWindowScrollBar(PWINDOW_OBJECT Window, UINT wSBflags, UINT wArrows);
+BOOL INTERNAL_CALL IntSetScrollBarInfo(PWINDOW_OBJECT Window, LONG idObject, SETSCROLLBARINFO *info);
+DWORD INTERNAL_CALL IntShowScrollBar(PWINDOW_OBJECT Window, int wBar, DWORD bShow);
+BOOL INTERNAL_CALL IntGetScrollBarRect (PWINDOW_OBJECT Window, INT nBar, PRECT lprect);
+DWORD INTERNAL_CALL IntSetScrollInfo(PWINDOW_OBJECT Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw);
+BOOL INTERNAL_CALL IntGetScrollInfo(PWINDOW_OBJECT Window, INT nBar, LPSCROLLINFO lpsi);
/* TIMERS *********************************************************************/
@@ -743,17 +743,17 @@
KMSG Msg;
} MSG_TIMER_ENTRY;
-NTSTATUS FASTCALL InitTimerImpl(VOID);
-VOID FASTCALL RemoveTimersThread(HANDLE ThreadID);
-VOID FASTCALL RemoveTimersWindow(PWINDOW_OBJECT Window);
-PMSG_TIMER_ENTRY FASTCALL IntRemoveTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, HANDLE ThreadID, BOOL SysTimer);
-UINT_PTR FASTCALL IntSetTimer(PWINDOW_OBJECT WindowObject, UINT_PTR nIDEvent, UINT uElapse, TIMERPROC lpTimerFunc, BOOL SystemTimer);
+NTSTATUS INTERNAL_CALL InitTimerImpl(VOID);
+VOID INTERNAL_CALL RemoveTimersThread(HANDLE ThreadID);
+VOID INTERNAL_CALL RemoveTimersWindow(PWINDOW_OBJECT Window);
+PMSG_TIMER_ENTRY INTERNAL_CALL IntRemoveTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, HANDLE ThreadID, BOOL SysTimer);
+UINT_PTR INTERNAL_CALL IntSetTimer(PWINDOW_OBJECT WindowObject, UINT_PTR nIDEvent, UINT uElapse, TIMERPROC lpTimerFunc, BOOL SystemTimer);
/* VISIBLE REGION *************************************************************/
-HRGN FASTCALL VIS_ComputeVisibleRegion(PWINDOW_OBJECT Window, BOOLEAN ClientArea,
- BOOLEAN ClipChildren, BOOLEAN ClipSiblings);
-VOID FASTCALL VIS_WindowLayoutChanged(PWINDOW_OBJECT Window, HRGN UncoveredRgn);
+HRGN INTERNAL_CALL VIS_ComputeVisibleRegion(PWINDOW_OBJECT Window, BOOLEAN ClientArea,
+ BOOLEAN ClipChildren, BOOLEAN ClipSiblings);
+VOID INTERNAL_CALL VIS_WindowLayoutChanged(PWINDOW_OBJECT Window, HRGN UncoveredRgn);
/* WINDOWS ********************************************************************/
@@ -904,40 +904,40 @@
ULONG TiledCounter;
} WINDOW_OBJECT; /* PWINDOW_OBJECT already declared at top of file */
-PWINDOW_OBJECT FASTCALL IntCreateWindow(DWORD dwExStyle, PUNICODE_STRING ClassName, PUNICODE_STRING WindowName,
- ULONG dwStyle, LONG x, LONG y, LONG nWidth, LONG nHeight,
- PWINDOW_OBJECT Parent, PMENU_OBJECT Menu, ULONG WindowID, HINSTANCE hInstance,
- LPVOID lpParam, DWORD dwShowMode, BOOL bUnicodeWindow);
-BOOL FASTCALL IntDestroyWindow(PWINDOW_OBJECT Window, PW32PROCESS ProcessData, PW32THREAD ThreadData, BOOL SendMessages);
-NTSTATUS FASTCALL InitWindowImpl (VOID);
-NTSTATUS FASTCALL CleanupWindowImpl (VOID);
-VOID FASTCALL IntGetClientRect (PWINDOW_OBJECT WindowObject, PRECT Rect);
-PWINDOW_OBJECT FASTCALL IntGetActiveWindow (VOID);
-BOOL FASTCALL IntIsWindowVisible (PWINDOW_OBJECT Wnd);
-BOOL FASTCALL IntIsChildWindow (PWINDOW_OBJECT Parent, PWINDOW_OBJECT Child);
-VOID FASTCALL IntUnlinkWindow(PWINDOW_OBJECT Wnd);
-VOID FASTCALL IntLinkWindow(PWINDOW_OBJECT Wnd, PWINDOW_OBJECT WndParent, PWINDOW_OBJECT WndPrevSibling);
-PWINDOW_OBJECT FASTCALL IntGetAncestor(PWINDOW_OBJECT Wnd, UINT Type);
-PWINDOW_OBJECT FASTCALL IntGetParent(PWINDOW_OBJECT Wnd);
-INT FASTCALL IntGetWindowRgn(PWINDOW_OBJECT Window, HRGN hRgn);
-INT FASTCALL IntGetWindowRgnBox(PWINDOW_OBJECT Window, RECT *Rect);
-BOOL FASTCALL IntGetWindowInfo(PWINDOW_OBJECT WindowObject, PWINDOWINFO pwi);
-LONG FASTCALL IntGetWindowLong(PWINDOW_OBJECT WindowObject, INT Index, BOOL Ansi);
-LONG FASTCALL IntSetWindowLong(PWINDOW_OBJECT WindowObject, INT Index, LONG NewValue, BOOL Ansi);
-VOID FASTCALL IntGetWindowBorderMeasures(PWINDOW_OBJECT WindowObject, INT *cx, INT *cy);
-BOOL FASTCALL IntAnyPopup(VOID);
-PWINDOW_OBJECT FASTCALL IntGetShellWindow(VOID);
-PWINDOW_OBJECT FASTCALL IntSetParent(PWINDOW_OBJECT Window, PWINDOW_OBJECT WndNewParent);
-BOOL FASTCALL IntSetShellWindowEx(PWINDOW_OBJECT Shell, PWINDOW_OBJECT ListView);
-WORD FASTCALL IntSetWindowWord(PWINDOW_OBJECT WindowObject, INT Index, WORD NewValue);
-ULONG FASTCALL IntGetWindowThreadProcessId(PWINDOW_OBJECT Window, ULONG *Pid);
-PWINDOW_OBJECT FASTCALL IntGetWindow(PWINDOW_OBJECT Window, UINT uCmd);
-BOOL FASTCALL IntDefSetText(PWINDOW_OBJECT WindowObject, PUNICODE_STRING WindowText);
-INT FASTCALL IntInternalGetWindowText(PWINDOW_OBJECT WindowObject, LPWSTR lpString, INT nMaxCount);
-BOOL FASTCALL IntDereferenceWndProcHandle(WNDPROC wpHandle, WndProcHandle *Data);
-DWORD FASTCALL IntRemoveWndProcHandle(WNDPROC Handle);
-DWORD FASTCALL IntRemoveProcessWndProcHandles(HANDLE ProcessID);
-DWORD FASTCALL IntAddWndProcHandle(WNDPROC WindowProc, BOOL IsUnicode);
+PWINDOW_OBJECT INTERNAL_CALL IntCreateWindow(DWORD dwExStyle, PUNICODE_STRING ClassName, PUNICODE_STRING WindowName,
+ ULONG dwStyle, LONG x, LONG y, LONG nWidth, LONG nHeight,
+ PWINDOW_OBJECT Parent, PMENU_OBJECT Menu, ULONG WindowID, HINSTANCE hInstance,
+ LPVOID lpParam, DWORD dwShowMode, BOOL bUnicodeWindow);
+BOOL INTERNAL_CALL IntDestroyWindow(PWINDOW_OBJECT Window, PW32PROCESS ProcessData, PW32THREAD ThreadData, BOOL SendMessages);
+NTSTATUS INTERNAL_CALL InitWindowImpl (VOID);
+NTSTATUS INTERNAL_CALL CleanupWindowImpl (VOID);
+VOID INTERNAL_CALL IntGetClientRect (PWINDOW_OBJECT WindowObject, PRECT Rect);
+PWINDOW_OBJECT INTERNAL_CALL IntGetActiveWindow (VOID);
+BOOL INTERNAL_CALL IntIsWindowVisible (PWINDOW_OBJECT Wnd);
+BOOL INTERNAL_CALL IntIsChildWindow (PWINDOW_OBJECT Parent, PWINDOW_OBJECT Child);
+VOID INTERNAL_CALL IntUnlinkWindow(PWINDOW_OBJECT Wnd);
+VOID INTERNAL_CALL IntLinkWindow(PWINDOW_OBJECT Wnd, PWINDOW_OBJECT WndParent, PWINDOW_OBJECT WndPrevSibling);
+PWINDOW_OBJECT INTERNAL_CALL IntGetAncestor(PWINDOW_OBJECT Wnd, UINT Type);
+PWINDOW_OBJECT INTERNAL_CALL IntGetParent(PWINDOW_OBJECT Wnd);
+INT INTERNAL_CALL IntGetWindowRgn(PWINDOW_OBJECT Window, HRGN hRgn);
+INT INTERNAL_CALL IntGetWindowRgnBox(PWINDOW_OBJECT Window, RECT *Rect);
+BOOL INTERNAL_CALL IntGetWindowInfo(PWINDOW_OBJECT WindowObject, PWINDOWINFO pwi);
+LONG INTERNAL_CALL IntGetWindowLong(PWINDOW_OBJECT WindowObject, INT Index, BOOL Ansi);
+LONG INTERNAL_CALL IntSetWindowLong(PWINDOW_OBJECT WindowObject, INT Index, LONG NewValue, BOOL Ansi);
+VOID INTERNAL_CALL IntGetWindowBorderMeasures(PWINDOW_OBJECT WindowObject, INT *cx, INT *cy);
+BOOL INTERNAL_CALL IntAnyPopup(VOID);
+PWINDOW_OBJECT INTERNAL_CALL IntGetShellWindow(VOID);
+PWINDOW_OBJECT INTERNAL_CALL IntSetParent(PWINDOW_OBJECT Window, PWINDOW_OBJECT WndNewParent);
+BOOL INTERNAL_CALL IntSetShellWindowEx(PWINDOW_OBJECT Shell, PWINDOW_OBJECT ListView);
+WORD INTERNAL_CALL IntSetWindowWord(PWINDOW_OBJECT WindowObject, INT Index, WORD NewValue);
+ULONG INTERNAL_CALL IntGetWindowThreadProcessId(PWINDOW_OBJECT Window, ULONG *Pid);
+PWINDOW_OBJECT INTERNAL_CALL IntGetWindow(PWINDOW_OBJECT Window, UINT uCmd);
+BOOL INTERNAL_CALL IntDefSetText(PWINDOW_OBJECT WindowObject, PUNICODE_STRING WindowText);
+INT INTERNAL_CALL IntInternalGetWindowText(PWINDOW_OBJECT WindowObject, LPWSTR lpString, INT nMaxCount);
+BOOL INTERNAL_CALL IntDereferenceWndProcHandle(WNDPROC wpHandle, WndProcHandle *Data);
+DWORD INTERNAL_CALL IntRemoveWndProcHandle(WNDPROC Handle);
+DWORD INTERNAL_CALL IntRemoveProcessWndProcHandles(HANDLE ProcessID);
+DWORD INTERNAL_CALL IntAddWndProcHandle(WNDPROC WindowProc, BOOL IsUnicode);
/* WINPOS *********************************************************************/
@@ -968,16 +968,16 @@
UINT flags;
} INTERNAL_WINDOWPOS;
-BOOL FASTCALL IntGetClientOrigin(PWINDOW_OBJECT Window, LPPOINT Point);
-LRESULT FASTCALL WinPosGetNonClientSize(PWINDOW_OBJECT Window, RECT* WindowRect, RECT* ClientRect);
-UINT FASTCALL WinPosGetMinMaxInfo(PWINDOW_OBJECT Window, POINT* MaxSize, POINT* MaxPos, POINT* MinTrack, POINT* MaxTrack);
-UINT FASTCALL WinPosMinMaximize(PWINDOW_OBJECT WindowObject, UINT ShowFlag, RECT* NewPos);
-BOOLEAN FASTCALL WinPosSetWindowPos(PWINDOW_OBJECT Window, PWINDOW_OBJECT InsertAfter, INT x, INT y, INT cx, INT cy, UINT flags);
-BOOLEAN FASTCALL WinPosShowWindow(PWINDOW_OBJECT Window, INT Cmd);
-USHORT FASTCALL WinPosWindowFromPoint(PWINDOW_OBJECT ScopeWin, PUSER_MESSAGE_QUEUE OnlyHitTests, POINT *WinPoint, PWINDOW_OBJECT* Window);
-VOID FASTCALL WinPosActivateOtherWindow(PWINDOW_OBJECT Window);
-PINTERNALPOS FASTCALL WinPosInitInternalPos(PWINDOW_OBJECT WindowObject, POINT *pt, PRECT RestoreRect);
-VOID FASTCALL WinPosSetupInternalPos(VOID);
+BOOL INTERNAL_CALL IntGetClientOrigin(PWINDOW_OBJECT Window, LPPOINT Point);
+LRESULT INTERNAL_CALL WinPosGetNonClientSize(PWINDOW_OBJECT Window, RECT* WindowRect, RECT* ClientRect);
+UINT INTERNAL_CALL WinPosGetMinMaxInfo(PWINDOW_OBJECT Window, POINT* MaxSize, POINT* MaxPos, POINT* MinTrack, POINT* MaxTrack);
+UINT INTERNAL_CALL WinPosMinMaximize(PWINDOW_OBJECT WindowObject, UINT ShowFlag, RECT* NewPos);
+BOOLEAN INTERNAL_CALL WinPosSetWindowPos(PWINDOW_OBJECT Window, PWINDOW_OBJECT InsertAfter, INT x, INT y, INT cx, INT cy, UINT flags);
+BOOLEAN INTERNAL_CALL WinPosShowWindow(PWINDOW_OBJECT Window, INT Cmd);
+USHORT INTERNAL_CALL WinPosWindowFromPoint(PWINDOW_OBJECT ScopeWin, PUSER_MESSAGE_QUEUE OnlyHitTests, POINT *WinPoint, PWINDOW_OBJECT* Window);
+VOID INTERNAL_CALL WinPosActivateOtherWindow(PWINDOW_OBJECT Window);
+PINTERNALPOS INTERNAL_CALL WinPosInitInternalPos(PWINDOW_OBJECT WindowObject, POINT *pt, PRECT RestoreRect);
+VOID INTERNAL_CALL WinPosSetupInternalPos(VOID);
/* WINDOW STATION *************************************************************/
@@ -997,19 +997,19 @@
#define SET_PROCESS_WINDOW_STATION(WinSta) \
((IoGetCurrentProcess()->Win32WindowStation) = (PVOID)(WinSta))
-NTSTATUS FASTCALL InitWindowStationImpl(VOID);
-NTSTATUS FASTCALL CleanupWindowStationImpl(VOID);
-NTSTATUS FASTCALL IntValidateWindowStationHandle(HWINSTA WindowStation,
- KPROCESSOR_MODE AccessMode,
- ACCESS_MASK DesiredAccess,
- PWINSTATION_OBJECT *Object);
-
-BOOL FASTCALL IntGetWindowStationObject(PWINSTATION_OBJECT Object);
-BOOL FASTCALL IntInitializeDesktopGraphics(VOID);
-VOID FASTCALL IntEndDesktopGraphics(VOID);
-BOOL FASTCALL IntGetFullWindowStationName(OUT PUNICODE_STRING FullName,
- IN PUNICODE_STRING WinStaName,
- IN OPTIONAL PUNICODE_STRING DesktopName);
+NTSTATUS INTERNAL_CALL InitWindowStationImpl(VOID);
+NTSTATUS INTERNAL_CALL CleanupWindowStationImpl(VOID);
+NTSTATUS INTERNAL_CALL IntValidateWindowStationHandle(HWINSTA WindowStation,
+ KPROCESSOR_MODE AccessMode,
+ ACCESS_MASK DesiredAccess,
+ PWINSTATION_OBJECT *Object);
+
+BOOL INTERNAL_CALL IntGetWindowStationObject(PWINSTATION_OBJECT Object);
+BOOL INTERNAL_CALL IntInitializeDesktopGraphics(VOID);
+VOID INTERNAL_CALL IntEndDesktopGraphics(VOID);
+BOOL INTERNAL_CALL IntGetFullWindowStationName(OUT PUNICODE_STRING FullName,
+ IN PUNICODE_STRING WinStaName,
+ IN OPTIONAL PUNICODE_STRING DesktopName);
/* MOUSE **********************************************************************/
@@ -1026,26 +1026,25 @@
#define MOUSEEVENTF_XUP (0x100)
#endif
-BOOL FASTCALL IntCheckClipCursor(LONG *x, LONG *y, PSYSTEM_CURSORINFO CurInfo);
-BOOL FASTCALL IntSwapMouseButton(PWINSTATION_OBJECT WinStaObject, BOOL Swap);
-INT FASTCALL MouseSafetyOnDrawStart(SURFOBJ *SurfObj, LONG HazardX1, LONG HazardY1, LONG HazardX2, LONG HazardY2);
-INT FASTCALL MouseSafetyOnDrawEnd(SURFOBJ *SurfObj);
-BOOL FASTCALL MouseMoveCursor(LONG X, LONG Y);
-VOID FASTCALL EnableMouse(HDC hDisplayDC);
-VOID MouseGDICallBack(PMOUSE_INPUT_DATA Data, ULONG InputCount);
-VOID FASTCALL SetPointerRect(PSYSTEM_CURSORINFO CurInfo, PRECTL PointerRect);
+BOOL INTERNAL_CALL IntCheckClipCursor(LONG *x, LONG *y, PSYSTEM_CURSORINFO CurInfo);
+BOOL INTERNAL_CALL IntSwapMouseButton(PWINSTATION_OBJECT WinStaObject, BOOL Swap);
+INT INTERNAL_CALL MouseSafetyOnDrawStart(SURFOBJ *SurfObj, LONG HazardX1, LONG HazardY1, LONG HazardX2, LONG HazardY2);
+INT INTERNAL_CALL MouseSafetyOnDrawEnd(SURFOBJ *SurfObj);
+BOOL INTERNAL_CALL MouseMoveCursor(LONG X, LONG Y);
+VOID INTERNAL_CALL EnableMouse(HDC hDisplayDC);
+VOID INTERNAL_CALL SetPointerRect(PSYSTEM_CURSORINFO CurInfo, PRECTL PointerRect);
/* MISC FUNCTIONS *************************************************************/
-NTSTATUS FASTCALL InitGuiCheckImpl(VOID);
-NTSTATUS FASTCALL CsrInit(VOID);
-NTSTATUS FASTCALL CsrNotify(PCSRSS_API_REQUEST Request, PCSRSS_API_REPLY Reply);
-PEPROCESS FASTCALL CsrAttachToCsrss(VOID);
-VOID FASTCALL CsrDetachFromCsrss(PEPROCESS PrevProcess);
-
-INT FASTCALL IntGetSystemMetrics(INT nIndex);
-BOOL FASTCALL IntSystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni);
-BOOL FASTCALL IntRegisterLogonProcess(DWORD dwProcessId, BOOL bRegister);
-void W32kRegisterPrimitiveMessageQueue();
+NTSTATUS INTERNAL_CALL InitGuiCheckImpl(VOID);
+NTSTATUS INTERNAL_CALL CsrInit(VOID);
+NTSTATUS INTERNAL_CALL CsrNotify(PCSRSS_API_REQUEST Request, PCSRSS_API_REPLY Reply);
+PEPROCESS INTERNAL_CALL CsrAttachToCsrss(VOID);
+VOID INTERNAL_CALL CsrDetachFromCsrss(PEPROCESS PrevProcess);
+
+INT INTERNAL_CALL IntGetSystemMetrics(INT nIndex);
+BOOL INTERNAL_CALL IntSystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni);
+BOOL INTERNAL_CALL IntRegisterLogonProcess(DWORD dwProcessId, BOOL bRegister);
+void INTERNAL_CALL W32kRegisterPrimitiveMessageQueue();
#endif /* _NTUSER_H */
reactos/subsys/win32k/include
diff -u -r1.15.2.1 -r1.15.2.2
--- intgdi.h 12 Sep 2004 19:21:06 -0000 1.15.2.1
+++ intgdi.h 14 Sep 2004 01:00:43 -0000 1.15.2.2
@@ -3,24 +3,24 @@
/* Brush functions */
-XLATEOBJ* FASTCALL
+XLATEOBJ* INTERNAL_CALL
IntGdiCreateBrushXlate(PDC Dc, GDIBRUSHOBJ *BrushObj, BOOLEAN *Failed);
-VOID FASTCALL
+VOID INTERNAL_CALL
IntGdiInitBrushInstance(GDIBRUSHINST *BrushInst, PGDIBRUSHOBJ BrushObj, XLATEOBJ *XlateObj);
-HBRUSH FASTCALL
+HBRUSH INTERNAL_CALL
IntGdiCreateBrushIndirect(PLOGBRUSH lb);
-HBRUSH FASTCALL
+HBRUSH INTERNAL_CALL
IntGdiCreateDIBPatternBrush(HGLOBAL hDIBPacked,
UINT ColorSpec);
-HBRUSH FASTCALL
+HBRUSH INTERNAL_CALL
IntGdiCreateDIBPatternBrushPt(CONST VOID *PackedDIB,
UINT Usage);
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntPatBlt(
PDC dc,
INT XLeft,
@@ -32,49 +32,49 @@
/* Pen functions */
-HPEN FASTCALL
+HPEN INTERNAL_CALL
IntGdiCreatePenIndirect(PLOGPEN lgpn);
/* Line functions */
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiLineTo(DC *dc,
int XEnd,
int YEnd);
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiMoveToEx(DC *dc,
int X,
int Y,
LPPOINT Point);
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiPolyBezier(DC *dc,
LPPOINT pt,
DWORD Count);
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiPolyline(DC *dc,
LPPOINT pt,
int Count);
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiPolyBezierTo(DC *dc,
LPPOINT pt,
DWORD Count);
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiPolyPolyline(DC *dc,
LPPOINT pt,
LPDWORD PolyPoints,
DWORD Count);
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiPolylineTo(DC *dc,
LPPOINT pt,
DWORD Count);
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiArc(DC *dc,
int LeftRect,
int TopRect,
@@ -85,17 +85,17 @@
int XEndArc,
int YEndArc);
-INT FASTCALL
+INT INTERNAL_CALL
IntGdiGetArcDirection(DC *dc);
/* Shape functions */
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiPolygon(PDC dc,
PPOINT UnsafePoints,
int Count);
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiPolyPolygon(DC *dc,
LPPOINT Points,
LPINT PolyCounts,
@@ -103,14 +103,14 @@
/* Rgn functions */
-int FASTCALL
+int INTERNAL_CALL
IntGdiGetClipBox(HDC hDC,
LPRECT rc);
-HRGN FASTCALL REGION_CropRgn(HRGN hDst, HRGN hSrc, const PRECT lpRect, PPOINT lpPt);
-void FASTCALL REGION_UnionRectWithRegion(const RECT *rect, ROSRGNDATA *rgn);
-INT FASTCALL UnsafeIntGetRgnBox(PROSRGNDATA Rgn, LPRECT pRect);
-BOOL FASTCALL UnsafeIntRectInRegion(PROSRGNDATA Rgn, CONST LPRECT rc);
+HRGN INTERNAL_CALL REGION_CropRgn(HRGN hDst, HRGN hSrc, const PRECT lpRect, PPOINT lpPt);
+void INTERNAL_CALL REGION_UnionRectWithRegion(const RECT *rect, ROSRGNDATA *rgn);
+INT INTERNAL_CALL UnsafeIntGetRgnBox(PROSRGNDATA Rgn, LPRECT pRect);
+BOOL INTERNAL_CALL UnsafeIntRectInRegion(PROSRGNDATA Rgn, CONST LPRECT rc);
#define UnsafeIntCreateRectRgnIndirect(prc) \
NtGdiCreateRectRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom)
@@ -120,43 +120,43 @@
/* DC functions */
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiGetDCOrgEx(DC *dc, LPPOINT Point);
-INT FASTCALL
+INT INTERNAL_CALL
IntGdiGetObject(HANDLE handle, INT count, LPVOID buffer);
-HDC FASTCALL
+HDC INTERNAL_CALL
IntGdiCreateDC(PUNICODE_STRING Driver,
PUNICODE_STRING Device,
PUNICODE_STRING Output,
CONST PDEVMODEW InitData);
-COLORREF FASTCALL
+COLORREF INTERNAL_CALL
IntGetDCColor(HDC hDC, ULONG Object);
-COLORREF FASTCALL
+COLORREF INTERNAL_CALL
IntSetDCColor(HDC hDC, ULONG Object, COLORREF Color);
/* Coord functions */
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiCombineTransform(LPXFORM XFormResult,
LPXFORM xform1,
LPXFORM xform2);
/* Stock objects */
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntSetSysColors(UINT nColors, INT *Elements, COLORREF *Colors);
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetSysColorBrushes(HBRUSH *Brushes, UINT nBrushes);
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetSysColorPens(HPEN *Pens, UINT nPens);
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetSysColors(COLORREF *Colors, UINT nColors);
#endif /* _WIN32K_INTGDI_H */
reactos/subsys/win32k/include
diff -u -r1.1.4.2 -r1.1.4.3
--- misc.h 1 Sep 2004 22:14:50 -0000 1.1.4.2
+++ misc.h 14 Sep 2004 01:00:43 -0000 1.1.4.3
@@ -1,30 +1,30 @@
#ifndef _SUBSYS_WIN32K_INCLUDE_CLEANUP_H
#define _SUBSYS_WIN32K_INCLUDE_CLEANUP_H
-NTSTATUS FASTCALL InitCleanupImpl(VOID);
+NTSTATUS INTERNAL_CALL InitCleanupImpl(VOID);
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
IntSafeCopyUnicodeString(PUNICODE_STRING Dest,
PUNICODE_STRING Source);
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
IntSafeCopyUnicodeStringTerminateNULL(PUNICODE_STRING Dest,
PUNICODE_STRING Source);
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
IntUnicodeStringToNULLTerminated(PWSTR *Dest, PUNICODE_STRING Src);
-void FASTCALL
+void INTERNAL_CALL
IntFreeNULLTerminatedFromUnicodeString(PWSTR NullTerminated, PUNICODE_STRING UnicodeString);
/*
* User Locks
*/
-VOID FASTCALL
+VOID INTERNAL_CALL
IntInitUserResourceLocks(VOID);
-VOID FASTCALL
+VOID INTERNAL_CALL
IntCleanupUserResourceLocks(VOID);
inline VOID
reactos/subsys/win32k/include
diff -u -r1.24.4.2 -r1.24.4.3
--- object.h 12 Sep 2004 19:21:06 -0000 1.24.4.2
+++ object.h 14 Sep 2004 01:00:43 -0000 1.24.4.3
@@ -32,62 +32,62 @@
PUSER_OBJECT_HEADER Handles[N_USER_HANDLES];
} USER_HANDLE_TABLE, *PUSER_HANDLE_TABLE;
-typedef BOOL (FASTCALL *PFNENUMHANDLESPROC)(PVOID ObjectBody, PVOID UserData);
+typedef BOOL (INTERNAL_CALL *PFNENUMHANDLESPROC)(PVOID ObjectBody, PVOID UserData);
-VOID FASTCALL
+VOID INTERNAL_CALL
ObmReferenceObject(
PVOID ObjectBody);
-VOID FASTCALL
+VOID INTERNAL_CALL
ObmDereferenceObject(
PVOID ObjectBody);
-PVOID FASTCALL
+PVOID INTERNAL_CALL
ObmEnumHandles(
PUSER_HANDLE_TABLE HandleTable,
USER_OBJECT_TYPE ObjectType,
PVOID UserData,
PFNENUMHANDLESPROC EnumProc);
-BOOL FASTCALL
+BOOL INTERNAL_CALL
ObmObjectDeleted(
PVOID ObjectBody);
-PVOID FASTCALL
+PVOID INTERNAL_CALL
ObmCreateObject(
PUSER_HANDLE_TABLE HandleTable,
PHANDLE Handle,
USER_OBJECT_TYPE ObjectType,
ULONG ObjectSize);
-USER_OBJECT_TYPE FASTCALL
+USER_OBJECT_TYPE INTERNAL_CALL
ObmGetObjectType(
PUSER_HANDLE_TABLE HandleTable,
PVOID ObjectBody);
-BOOL FASTCALL
+BOOL INTERNAL_CALL
ObmDeleteObject(
PUSER_HANDLE_TABLE HandleTable,
PVOID ObjectBody);
-PVOID FASTCALL
+PVOID INTERNAL_CALL
ObmGetObject(
PUSER_HANDLE_TABLE HandleTable,
HANDLE Handle,
USER_OBJECT_TYPE ObjectType);
-VOID FASTCALL
+VOID INTERNAL_CALL
ObmInitializeHandleTable(
PUSER_HANDLE_TABLE HandleTable);
-VOID FASTCALL
+VOID INTERNAL_CALL
ObmFreeHandleTable(
PUSER_HANDLE_TABLE HandleTable);
-PUSER_HANDLE_TABLE FASTCALL
+PUSER_HANDLE_TABLE INTERNAL_CALL
ObmCreateHandleTable(VOID);
-VOID FASTCALL
+VOID INTERNAL_CALL
ObmDestroyHandleTable (PUSER_HANDLE_TABLE HandleTable);
#define IntGetUserObject(ObjectType, Handle) \
@@ -97,14 +97,14 @@
* GDI
*/
-VOID FASTCALL InitGdiObjectHandleTable (VOID);
+VOID INTERNAL_CALL InitGdiObjectHandleTable (VOID);
-VOID FASTCALL CreateStockObjects (VOID);
-VOID FASTCALL CreateSysColorObjects (VOID);
+VOID INTERNAL_CALL CreateStockObjects (VOID);
+VOID INTERNAL_CALL CreateSysColorObjects (VOID);
-BOOL FASTCALL CleanupForProcess (struct _EPROCESS *Process, INT Pid);
+BOOL INTERNAL_CALL CleanupForProcess (struct _EPROCESS *Process, INT Pid);
-PPOINT FASTCALL GDI_Bezier (const POINT *Points, INT count, PINT nPtsOut);
+PPOINT INTERNAL_CALL GDI_Bezier (const POINT *Points, INT count, PINT nPtsOut);
#endif /* _WIN32K_OBJECT_H */
reactos/subsys/win32k/include
diff -u -r1.9 -r1.9.4.1
--- paint.h 3 Jul 2004 13:55:36 -0000 1.9
+++ paint.h 14 Sep 2004 01:00:43 -0000 1.9.4.1
@@ -1,7 +1,7 @@
#ifndef _WIN32K_PAINT_H
#define _WIN32K_PAINT_H
-BOOL STDCALL FillSolid (SURFOBJ* Surface, RECTL* Dimensions, ULONG iColor);
-BOOL STDCALL FillPolygon ( DC* dc, BITMAPOBJ* SurfObj, BRUSHOBJ* BrushObj, MIX RopMode, CONST PPOINT Points, INT Count, RECTL BoundRect );
+BOOL INTERNAL_CALL FillSolid (SURFOBJ* Surface, RECTL* Dimensions, ULONG iColor);
+BOOL INTERNAL_CALL FillPolygon ( DC* dc, BITMAPOBJ* SurfObj, BRUSHOBJ* BrushObj, MIX RopMode, CONST PPOINT Points, INT Count, RECTL BoundRect );
#endif /* _WIN32K_PAINT_H */
reactos/subsys/win32k/include
diff -u -r1.9.4.1 -r1.9.4.2
--- palette.h 12 Sep 2004 19:21:06 -0000 1.9.4.1
+++ palette.h 14 Sep 2004 01:00:43 -0000 1.9.4.2
@@ -27,26 +27,26 @@
ULONG BlueMask;
} PALGDI, *PPALGDI;
-HPALETTE FASTCALL PALETTE_AllocPalette(ULONG Mode,
- ULONG NumColors,
- ULONG *Colors,
- ULONG Red,
- ULONG Green,
- ULONG Blue);
-HPALETTE FASTCALL PALETTE_AllocPaletteIndexedRGB(ULONG NumColors,
- CONST RGBQUAD *Colors);
+HPALETTE INTERNAL_CALL PALETTE_AllocPalette(ULONG Mode,
+ ULONG NumColors,
+ ULONG *Colors,
+ ULONG Red,
+ ULONG Green,
+ ULONG Blue);
+HPALETTE INTERNAL_CALL PALETTE_AllocPaletteIndexedRGB(ULONG NumColors,
+ CONST RGBQUAD *Colors);
#define PALETTE_FreePalette(hPalette) GDIOBJ_FreeObj((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE)
#define PALETTE_LockPalette(hPalette) ((PPALGDI)GDIOBJ_LockObj((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE))
#define PALETTE_UnlockPalette(Palette) GDIOBJ_UnlockObj((PGDIOBJ)Palette)
-BOOL FASTCALL PALETTE_Cleanup(PPALGDI pPal);
+BOOL INTERNAL_CALL PALETTE_Cleanup(PPALGDI pPal);
-HPALETTE FASTCALL PALETTE_Init (VOID);
-VOID FASTCALL PALETTE_ValidateFlags (PALETTEENTRY* lpPalE, INT size);
+HPALETTE INTERNAL_CALL PALETTE_Init (VOID);
+VOID INTERNAL_CALL PALETTE_ValidateFlags (PALETTEENTRY* lpPalE, INT size);
#ifndef NO_MAPPING
-INT STDCALL PALETTE_SetMapping(PALOBJ* palPtr, UINT uStart, UINT uNum, BOOL mapOnly);
+INT INTERNAL_CALL PALETTE_SetMapping(PALOBJ* palPtr, UINT uStart, UINT uNum, BOOL mapOnly);
#endif
-INT FASTCALL PALETTE_ToPhysical (PDC dc, COLORREF color);
+INT INTERNAL_CALL PALETTE_ToPhysical (PDC dc, COLORREF color);
-PPALETTEENTRY FASTCALL ReturnSystemPalette (VOID);
+PPALETTEENTRY INTERNAL_CALL ReturnSystemPalette (VOID);
#endif /* _WIN32K_PALETTE_H */
reactos/subsys/win32k/include
diff -u -r1.5 -r1.5.12.1
--- path.h 10 May 2004 17:07:17 -0000 1.5
+++ path.h 14 Sep 2004 01:00:43 -0000 1.5.12.1
@@ -1,23 +1,23 @@
#ifndef _WIN32K_PATH_H
#define _WIN32K_PATH_H
-BOOL FASTCALL PATH_Arc (PDC dc, INT x1, INT y1, INT x2, INT y2, INT xStart, INT yStart, INT xEnd, INT yEnd);
-BOOL FASTCALL PATH_AssignGdiPath (GdiPath *pPathDest, const GdiPath *pPathSrc);
-VOID FASTCALL PATH_DestroyGdiPath (GdiPath *pPath);
-BOOL FASTCALL PATH_Ellipse (PDC dc, INT x1, INT y1, INT x2, INT y2);
-VOID FASTCALL PATH_EmptyPath (GdiPath *pPath);
-VOID FASTCALL PATH_InitGdiPath (GdiPath *pPath);
-BOOL FASTCALL PATH_LineTo (PDC dc, INT x, INT y);
-BOOL FASTCALL PATH_MoveTo (PDC dc);
-BOOL FASTCALL PATH_PolyBezier (PDC dc, const POINT *pts, DWORD cbPoints);
-BOOL FASTCALL PATH_PolyBezierTo (PDC dc, const POINT *pts, DWORD cbPoints);
-BOOL FASTCALL PATH_Polygon (PDC dc, const POINT *pts, DWORD cbPoints);
-BOOL FASTCALL PATH_Polyline (PDC dc, const POINT *pts, DWORD cbPoints);
-BOOL FASTCALL PATH_PolylineTo (PDC dc, const POINT *pts, DWORD cbPoints);
-BOOL FASTCALL PATH_PolyPolygon ( PDC dc, const POINT* pts, const INT* counts, UINT polygons);
-BOOL FASTCALL PATH_PolyPolyline( PDC dc, const POINT* pts, const DWORD* counts, DWORD polylines);
-BOOL FASTCALL PATH_Rectangle (PDC dc, INT x1, INT y1, INT x2, INT y2);
-BOOL FASTCALL PATH_RoundRect (PDC dc, INT x1, INT y1, INT x2, INT y2, INT xradius, INT yradius);
-BOOL FASTCALL PATH_PathToRegion (const GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn);
+BOOL INTERNAL_CALL PATH_Arc (PDC dc, INT x1, INT y1, INT x2, INT y2, INT xStart, INT yStart, INT xEnd, INT yEnd);
+BOOL INTERNAL_CALL PATH_AssignGdiPath (GdiPath *pPathDest, const GdiPath *pPathSrc);
+VOID INTERNAL_CALL PATH_DestroyGdiPath (GdiPath *pPath);
+BOOL INTERNAL_CALL PATH_Ellipse (PDC dc, INT x1, INT y1, INT x2, INT y2);
+VOID INTERNAL_CALL PATH_EmptyPath (GdiPath *pPath);
+VOID INTERNAL_CALL PATH_InitGdiPath (GdiPath *pPath);
+BOOL INTERNAL_CALL PATH_LineTo (PDC dc, INT x, INT y);
+BOOL INTERNAL_CALL PATH_MoveTo (PDC dc);
+BOOL INTERNAL_CALL PATH_PolyBezier (PDC dc, const POINT *pts, DWORD cbPoints);
+BOOL INTERNAL_CALL PATH_PolyBezierTo (PDC dc, const POINT *pts, DWORD cbPoints);
+BOOL INTERNAL_CALL PATH_Polygon (PDC dc, const POINT *pts, DWORD cbPoints);
+BOOL INTERNAL_CALL PATH_Polyline (PDC dc, const POINT *pts, DWORD cbPoints);
+BOOL INTERNAL_CALL PATH_PolylineTo (PDC dc, const POINT *pts, DWORD cbPoints);
+BOOL INTERNAL_CALL PATH_PolyPolygon ( PDC dc, const POINT* pts, const INT* counts, UINT polygons);
+BOOL INTERNAL_CALL PATH_PolyPolyline( PDC dc, const POINT* pts, const DWORD* counts, DWORD polylines);
+BOOL INTERNAL_CALL PATH_Rectangle (PDC dc, INT x1, INT y1, INT x2, INT y2);
+BOOL INTERNAL_CALL PATH_RoundRect (PDC dc, INT x1, INT y1, INT x2, INT y2, INT xradius, INT yradius);
+BOOL INTERNAL_CALL PATH_PathToRegion (const GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn);
#endif /* _WIN32K_PATH_H */
reactos/subsys/win32k/include
diff -u -r1.4 -r1.4.4.1
--- surface.h 3 Jul 2004 13:55:36 -0000 1.4
+++ surface.h 14 Sep 2004 01:00:43 -0000 1.4.4.1
@@ -4,8 +4,8 @@
#define GDIDEV(SurfObj) ((GDIDEVICE *)((SurfObj)->hdev))
#define GDIDEVFUNCS(SurfObj) ((GDIDEVICE *)((SurfObj)->hdev))->DriverFunctions
-INT FASTCALL BitsPerFormat (ULONG Format);
-ULONG FASTCALL BitmapFormat (WORD Bits, DWORD Compression);
-HBITMAP FASTCALL IntCreateBitmap(IN SIZEL Size, IN LONG Width, IN ULONG Format, IN ULONG Flags, IN PVOID Bits);
+INT INTERNAL_CALL BitsPerFormat (ULONG Format);
+ULONG INTERNAL_CALL BitmapFormat (WORD Bits, DWORD Compression);
+HBITMAP INTERNAL_CALL IntCreateBitmap(IN SIZEL Size, IN LONG Width, IN ULONG Format, IN ULONG Flags, IN PVOID Bits);
#endif /* _WIN32K_SURFACE_H */
reactos/subsys/win32k/include
diff -u -r1.5 -r1.5.14.1
--- text.h 23 Mar 2004 19:46:49 -0000 1.5
+++ text.h 14 Sep 2004 01:00:43 -0000 1.5.14.1
@@ -1,11 +1,11 @@
#ifndef _WIN32K_TEXT_H
#define _WIN32K_TEXT_H
-BOOL FASTCALL InitFontSupport(VOID);
-BOOL FASTCALL IntIsFontRenderingEnabled(VOID);
-BOOL FASTCALL IntIsFontRenderingEnabled(VOID);
-VOID FASTCALL IntEnableFontRendering(BOOL Enable);
-INT FASTCALL FontGetObject(PTEXTOBJ TextObj, INT Count, PVOID Buffer);
+BOOL INTERNAL_CALL InitFontSupport(VOID);
+BOOL INTERNAL_CALL IntIsFontRenderingEnabled(VOID);
+BOOL INTERNAL_CALL IntIsFontRenderingEnabled(VOID);
+VOID INTERNAL_CALL IntEnableFontRendering(BOOL Enable);
+INT INTERNAL_CALL FontGetObject(PTEXTOBJ TextObj, INT Count, PVOID Buffer);
#define IntLockProcessPrivateFonts(W32Process) \
ExAcquireFastMutex(&W32Process->PrivateFontListLock)
reactos/subsys/win32k/include
diff -u -r1.2 -r1.2.12.1
--- useratom.h 9 Apr 2004 20:03:18 -0000 1.2
+++ useratom.h 14 Sep 2004 01:00:43 -0000 1.2.12.1
@@ -4,9 +4,9 @@
#include <windows.h>
#include <ddk/ntapi.h>
-RTL_ATOM FASTCALL
+RTL_ATOM INTERNAL_CALL
IntAddAtom(LPWSTR AtomName);
-ULONG FASTCALL
+ULONG INTERNAL_CALL
IntGetAtomName(RTL_ATOM nAtom, LPWSTR lpBuffer, ULONG nSize);
#endif /* _WIN32K_USERATOM_H */
reactos/subsys/win32k/main
diff -u -r1.76.12.3 -r1.76.12.4
--- dllmain.c 12 Sep 2004 19:21:07 -0000 1.76.12.3
+++ dllmain.c 14 Sep 2004 01:00:43 -0000 1.76.12.4
@@ -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: dllmain.c,v 1.76.12.3 2004/09/12 19:21:07 weiden Exp $
+/* $Id: dllmain.c,v 1.76.12.4 2004/09/14 01:00:43 weiden Exp $
*
* Entry Point for win32k.sys
*/
@@ -156,7 +156,7 @@
}
else
{
- DPRINT("W32k: Destroy thread\n");
+ DPRINT1("=== W32k: Destroy thread ===\n");
Win32Thread->IsExiting = TRUE;
#if 0
reactos/subsys/win32k
diff -u -r1.101.4.2 -r1.101.4.3
--- makefile 12 Sep 2004 19:21:07 -0000 1.101.4.2
+++ makefile 14 Sep 2004 01:00:43 -0000 1.101.4.3
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.101.4.2 2004/09/12 19:21:07 weiden Exp $
+# $Id: makefile,v 1.101.4.3 2004/09/14 01:00:43 weiden Exp $
PATH_TO_TOP = ../..
@@ -21,7 +21,7 @@
include $(PATH_TO_TOP)/config
ifeq ($(DBG), 1)
-CFLAGS_DBG := -g
+CFLAGS_DBG := -g -DDEBUG -DGDI_DEBUG
else
CFLAGS_DBG :=
endif
@@ -32,7 +32,6 @@
-I$(PATH_TO_TOP)/ntoskrnl/include \
-I$(FREETYPE_DIR)/include \
-DUNICODE \
- -DGDI_DEBUG \
-Wall -Werror \
-D__USE_W32API -D_WIN32_WINNT=0x0501 \
-DWINVER=0x600 -D_WIN32K_
reactos/subsys/win32k/misc
diff -u -r1.40.8.1 -r1.40.8.2
--- driver.c 18 Jul 2004 23:44:01 -0000 1.40.8.1
+++ driver.c 14 Sep 2004 01:00:43 -0000 1.40.8.2
@@ -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: driver.c,v 1.40.8.1 2004/07/18 23:44:01 weiden Exp $
+/* $Id: driver.c,v 1.40.8.2 2004/09/14 01:00:43 weiden Exp $
*
* GDI Driver support routines
* (mostly swiped from Wine)
@@ -28,6 +28,7 @@
#include <ddk/ntddk.h>
#include <windows.h>
+#include <win32k/debug.h>
#include <win32k/driver.h>
#include <win32k/misc.h>
#include <wchar.h>
@@ -50,7 +51,8 @@
static PGRAPHICS_DRIVER DriverList;
static PGRAPHICS_DRIVER GenericDriver = 0;
-BOOL DRIVER_RegisterDriver(LPCWSTR Name, PGD_ENABLEDRIVER EnableDriver)
+BOOL INTERNAL_CALL
+DRIVER_RegisterDriver(LPCWSTR Name, PGD_ENABLEDRIVER EnableDriver)
{
PGRAPHICS_DRIVER Driver = ExAllocatePoolWithTag(PagedPool, sizeof(*Driver), TAG_DRIVER);
DPRINT( "DRIVER_RegisterDriver( Name: %S )\n", Name );
@@ -78,7 +80,8 @@
return TRUE;
}
-PGD_ENABLEDRIVER DRIVER_FindDDIDriver(LPCWSTR Name)
+PGD_ENABLEDRIVER INTERNAL_CALL
+DRIVER_FindDDIDriver(LPCWSTR Name)
{
static WCHAR DefaultPath[] = L"\\SystemRoot\\System32\\";
static WCHAR DefaultExtension[] = L".DLL";
@@ -176,8 +179,9 @@
} \
}
-BOOL DRIVER_BuildDDIFunctions(PDRVENABLEDATA DED,
- PDRIVER_FUNCTIONS DF)
+BOOL INTERNAL_CALL
+DRIVER_BuildDDIFunctions(PDRVENABLEDATA DED,
+ PDRIVER_FUNCTIONS DF)
{
BEGIN_FUNCTION_MAP();
@@ -248,7 +252,8 @@
typedef LONG VP_STATUS;
typedef VP_STATUS (STDCALL *PMP_DRIVERENTRY)(PVOID, PVOID);
-PFILE_OBJECT DRIVER_FindMPDriver(ULONG DisplayNumber)
+PFILE_OBJECT INTERNAL_CALL
+DRIVER_FindMPDriver(ULONG DisplayNumber)
{
OBJECT_ATTRIBUTES ObjectAttributes;
WCHAR DeviceNameBuffer[20];
@@ -293,7 +298,8 @@
}
-BOOL DRIVER_UnregisterDriver(LPCWSTR Name)
+BOOL INTERNAL_CALL
+DRIVER_UnregisterDriver(LPCWSTR Name)
{
PGRAPHICS_DRIVER Driver = NULL;
@@ -338,7 +344,8 @@
}
}
-INT DRIVER_ReferenceDriver (LPCWSTR Name)
+INT INTERNAL_CALL
+DRIVER_ReferenceDriver (LPCWSTR Name)
{
GRAPHICS_DRIVER *Driver = DriverList;
@@ -356,7 +363,8 @@
return ++GenericDriver->ReferenceCount;
}
-INT DRIVER_UnreferenceDriver (LPCWSTR Name)
+INT INTERNAL_CALL
+DRIVER_UnreferenceDriver (LPCWSTR Name)
{
GRAPHICS_DRIVER *Driver = DriverList;
reactos/subsys/win32k/misc
diff -u -r1.7 -r1.7.14.1
--- error.c 14 Mar 2004 11:25:33 -0000 1.7
+++ error.c 14 Sep 2004 01:00:43 -0000 1.7.14.1
@@ -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: error.c,v 1.7 2004/03/14 11:25:33 gvg Exp $
+/* $Id: error.c,v 1.7.14.1 2004/09/14 01:00:43 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -27,17 +27,11 @@
* 06-06-2001 CSH Created
*/
#include <ddk/ntddk.h>
+#include <win32k/debug.h>
#include <internal/ps.h>
-#include <include/error.h>
-VOID FASTCALL
-SetLastNtError(NTSTATUS Status)
-{
- SetLastWin32Error(RtlNtStatusToDosError(Status));
-}
-
-VOID FASTCALL
+VOID INTERNAL_CALL
SetLastWin32Error(DWORD Status)
{
PTEB Teb = PsGetCurrentThread()->Tcb.Teb;
@@ -48,7 +42,13 @@
}
}
-NTSTATUS FASTCALL
+VOID INTERNAL_CALL
+SetLastNtError(NTSTATUS Status)
+{
+ SetLastWin32Error(RtlNtStatusToDosError(Status));
+}
+
+NTSTATUS INTERNAL_CALL
GetLastNtError()
{
// FIXME - not 100% sure this is correct
reactos/subsys/win32k/misc
diff -u -r1.12.8.2 -r1.12.8.3
--- object.c 22 Jul 2004 13:07:08 -0000 1.12.8.2
+++ object.c 14 Sep 2004 01:00:43 -0000 1.12.8.3
@@ -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: object.c,v 1.12.8.2 2004/07/22 13:07:08 weiden Exp $
+/* $Id: object.c,v 1.12.8.3 2004/09/14 01:00:43 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -43,7 +43,7 @@
-VOID FASTCALL
+VOID INTERNAL_CALL
ObmReferenceObject(PVOID ObjectBody)
/*
* FUNCTION: Increments a given object's reference count and performs
@@ -61,7 +61,7 @@
InterlockedIncrement(&ObjectHeader->RefCount);
}
-VOID FASTCALL
+VOID INTERNAL_CALL
ObmDereferenceObject(PVOID ObjectBody)
/*
* FUNCTION: Decrements a given object's reference count and performs
@@ -83,7 +83,7 @@
}
}
-PVOID FASTCALL
+PVOID INTERNAL_CALL
ObmEnumHandles(PUSER_HANDLE_TABLE HandleTable,
USER_OBJECT_TYPE ObjectType,
PVOID UserData,
@@ -110,7 +110,7 @@
return NULL;
}
-PVOID FASTCALL
+PVOID INTERNAL_CALL
ObmCreateObject(PUSER_HANDLE_TABLE HandleTable,
PHANDLE Handle,
USER_OBJECT_TYPE ObjectType,
@@ -164,7 +164,7 @@
return NULL;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
ObmObjectDeleted(PVOID ObjectBody)
{
PUSER_OBJECT_HEADER ObjectHeader;
@@ -175,7 +175,7 @@
return ((ObjectHeader->Slot == NULL) || (*(ObjectHeader->Slot) != ObjectHeader));
}
-USER_OBJECT_TYPE FASTCALL
+USER_OBJECT_TYPE INTERNAL_CALL
ObmGetObjectType(PUSER_HANDLE_TABLE HandleTable,
PVOID ObjectBody)
{
@@ -187,7 +187,7 @@
return ObjectHeader->Type;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
ObmDeleteObject(PUSER_HANDLE_TABLE HandleTable,
PVOID ObjectBody)
{
@@ -213,7 +213,7 @@
return TRUE;
}
-PVOID FASTCALL
+PVOID INTERNAL_CALL
ObmGetObject(PUSER_HANDLE_TABLE HandleTable,
HANDLE Handle,
USER_OBJECT_TYPE ObjectType)
@@ -234,7 +234,7 @@
return NULL;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
ObmInitializeHandleTable(PUSER_HANDLE_TABLE HandleTable)
{
PUSER_OBJECT_HEADER *Slot, *LastSlot;
@@ -248,13 +248,13 @@
}
}
-VOID FASTCALL
+VOID INTERNAL_CALL
ObmFreeHandleTable(PUSER_HANDLE_TABLE HandleTable)
{
/* FIXME - delete all handles */
}
-PUSER_HANDLE_TABLE FASTCALL
+PUSER_HANDLE_TABLE INTERNAL_CALL
ObmCreateHandleTable(VOID)
{
PUSER_HANDLE_TABLE HandleTable;
@@ -272,7 +272,7 @@
return HandleTable;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
ObmDestroyHandleTable(PUSER_HANDLE_TABLE HandleTable)
{
ObmFreeHandleTable(HandleTable);
reactos/subsys/win32k/ntddraw
diff -u -r1.2.12.1 -r1.2.12.2
--- ddraw.c 12 Sep 2004 19:21:07 -0000 1.2.12.1
+++ ddraw.c 14 Sep 2004 01:00:43 -0000 1.2.12.2
@@ -22,7 +22,7 @@
/* DIRECT DRAW OBJECT */
/************************************************************************/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
DD_Cleanup(PDD_DIRECTDRAW pDD)
{
pDD->DrvDisableDirectDraw(pDD->Global.dhpdev);
@@ -197,7 +197,7 @@
/* SURFACE OBJECT */
/************************************************************************/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
DDSURF_Cleanup(PDD_SURFACE pDDSurf)
{
//FIXME: implement
reactos/subsys/win32k/ntuser
diff -u -r1.25.8.3 -r1.25.8.4
--- callback.c 1 Sep 2004 22:14:50 -0000 1.25.8.3
+++ callback.c 14 Sep 2004 01:00:44 -0000 1.25.8.4
@@ -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: callback.c,v 1.25.8.3 2004/09/01 22:14:50 weiden Exp $
+/* $Id: callback.c,v 1.25.8.4 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -62,7 +62,7 @@
LIST_ENTRY ListEntry;
} INT_CALLBACK_HEADER, *PINT_CALLBACK_HEADER;
-PVOID FASTCALL
+PVOID INTERNAL_CALL
IntCbAllocateMemory(ULONG Size)
{
PINT_CALLBACK_HEADER Mem;
@@ -86,7 +86,7 @@
return (Mem + 1);
}
-VOID FASTCALL
+VOID INTERNAL_CALL
IntCbFreeMemory(PVOID Data)
{
PINT_CALLBACK_HEADER Mem;
@@ -108,7 +108,7 @@
ExFreePool(Mem);
}
-VOID FASTCALL
+VOID INTERNAL_CALL
IntCleanupThreadCallbacks(PW32THREAD W32Thread)
{
PLIST_ENTRY CurrentEntry;
@@ -129,7 +129,7 @@
/* FUNCTIONS *****************************************************************/
-VOID STDCALL
+VOID INTERNAL_CALL
IntCallSentMessageCallback(SENDASYNCPROC CompletionCallback,
PWINDOW_OBJECT Window,
UINT Msg,
@@ -157,7 +157,7 @@
return;
}
-LRESULT STDCALL
+LRESULT INTERNAL_CALL
IntCallWindowProc(WNDPROC Proc,
BOOLEAN IsAnsiProc,
PWINDOW_OBJECT Window,
@@ -229,7 +229,7 @@
return Result;
}
-HMENU STDCALL
+HMENU INTERNAL_CALL
IntLoadSysMenuTemplate()
{
LRESULT Result;
@@ -252,7 +252,7 @@
return (HMENU)Result;
}
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntLoadDefaultCursors(VOID)
{
LRESULT Result;
@@ -276,7 +276,7 @@
return TRUE;
}
-LRESULT STDCALL
+LRESULT INTERNAL_CALL
IntCallHookProc(INT HookId,
INT Code,
WPARAM wParam,
reactos/subsys/win32k/ntuser
diff -u -r1.59.8.3 -r1.59.8.4
--- class.c 13 Sep 2004 21:28:17 -0000 1.59.8.3
+++ class.c 14 Sep 2004 01:00:44 -0000 1.59.8.4
@@ -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: class.c,v 1.59.8.3 2004/09/13 21:28:17 weiden Exp $
+/* $Id: class.c,v 1.59.8.4 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -35,19 +35,19 @@
/* FUNCTIONS *****************************************************************/
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
InitClassImpl(VOID)
{
return(STATUS_SUCCESS);
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
CleanupClassImpl(VOID)
{
return(STATUS_SUCCESS);
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntReferenceClassByAtom(PCLASS_OBJECT* Class,
RTL_ATOM Atom,
HINSTANCE hInstance)
@@ -84,7 +84,7 @@
return FALSE;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntReferenceClassByName(PCLASS_OBJECT *Class,
PUNICODE_STRING ClassName,
HINSTANCE hInstance)
@@ -109,7 +109,7 @@
return IntReferenceClassByAtom(Class, ClassAtom, hInstance);
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntReferenceClassByNameOrAtom(PCLASS_OBJECT *Class,
PUNICODE_STRING ClassNameOrAtom,
HINSTANCE hInstance)
@@ -120,7 +120,7 @@
return IntReferenceClassByName(Class, ClassNameOrAtom, hInstance);
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetClassName(PWINDOW_OBJECT WindowObject, PUNICODE_STRING ClassName, ULONG nMaxCount)
{
ULONG Length;
@@ -173,7 +173,7 @@
return TRUE;
}
-PCLASS_OBJECT FASTCALL
+PCLASS_OBJECT INTERNAL_CALL
IntCreateClass(
CONST WNDCLASSEXW *lpwcx,
DWORD Flags,
@@ -279,7 +279,7 @@
return(ClassObject);
}
-PCLASS_OBJECT FASTCALL
+PCLASS_OBJECT INTERNAL_CALL
IntRegisterClass(CONST WNDCLASSEXW *lpwcx, PUNICODE_STRING ClassName, PUNICODE_STRING MenuName,
WNDPROC wpExtra, DWORD Flags)
{
@@ -338,7 +338,7 @@
return Ret;
}
-ULONG FASTCALL
+ULONG INTERNAL_CALL
IntGetClassLong(PWINDOW_OBJECT WindowObject, ULONG Offset, BOOL Ansi)
{
LONG Ret;
@@ -402,7 +402,7 @@
return(Ret);
}
-ULONG FASTCALL
+ULONG INTERNAL_CALL
IntSetClassLong(PWINDOW_OBJECT WindowObject, ULONG Offset, LONG dwNewLong, BOOL Ansi)
{
ULONG Ret = 0;
@@ -494,7 +494,7 @@
return Ret;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetClassInfo(HINSTANCE hInstance, PUNICODE_STRING ClassName, LPWNDCLASSEXW lpWndClassEx, BOOL Ansi)
{
PCLASS_OBJECT Class;
reactos/subsys/win32k/ntuser
diff -u -r1.2.2.1 -r1.2.2.2
--- csr.c 18 Jul 2004 23:44:01 -0000 1.2.2.1
+++ csr.c 14 Sep 2004 01:00:44 -0000 1.2.2.2
@@ -1,4 +1,4 @@
-/* $Id: csr.c,v 1.2.2.1 2004/07/18 23:44:01 weiden Exp $
+/* $Id: csr.c,v 1.2.2.2 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -12,7 +12,7 @@
static HANDLE WindowsApiPort = NULL;
static PEPROCESS CsrProcess = NULL;
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
CsrInit(VOID)
{
NTSTATUS Status;
@@ -40,7 +40,7 @@
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
CsrNotify(PCSRSS_API_REQUEST Request, PCSRSS_API_REPLY Reply)
{
NTSTATUS Status;
@@ -76,7 +76,7 @@
return Status;
}
-PEPROCESS FASTCALL
+PEPROCESS INTERNAL_CALL
CsrAttachToCsrss(VOID)
{
PEPROCESS OldProcess;
@@ -90,7 +90,7 @@
return OldProcess;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
CsrDetachFromCsrss(PEPROCESS PrevProcess)
{
if(PrevProcess != PsGetCurrentProcess())
reactos/subsys/win32k/ntuser
diff -u -r1.17.2.5 -r1.17.2.6
--- desktop.c 12 Sep 2004 19:21:07 -0000 1.17.2.5
+++ desktop.c 14 Sep 2004 01:00:44 -0000 1.17.2.6
@@ -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: desktop.c,v 1.17.2.5 2004/09/12 19:21:07 weiden Exp $
+ * $Id: desktop.c,v 1.17.2.6 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -52,13 +52,13 @@
/* INITALIZATION FUNCTIONS ****************************************************/
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
InitDesktopImpl(VOID)
{
return STATUS_SUCCESS;
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
CleanupDesktopImpl(VOID)
{
return STATUS_SUCCESS;
@@ -76,7 +76,7 @@
* fucntion fails, last error is set.
*/
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
IntValidateDesktopHandle(
HDESK Desktop,
KPROCESSOR_MODE AccessMode,
@@ -99,7 +99,7 @@
return Status;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
IntGetDesktopWorkArea(PDESKTOP_OBJECT Desktop, PRECT Rect)
{
PRECT Ret;
@@ -129,7 +129,7 @@
}
}
-PDESKTOP_OBJECT FASTCALL
+PDESKTOP_OBJECT INTERNAL_CALL
IntGetInputDesktop(VOID)
{
PWINSTATION_OBJECT WinSta;
@@ -138,7 +138,7 @@
return (WinSta != NULL ? WinSta->InputDesktop : NULL);
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntGetCurrentThreadDesktopWindow(VOID)
{
PDESKTOP_OBJECT pdo = PsGetWin32Thread()->Desktop;
@@ -149,7 +149,7 @@
/*
* returns or creates a handle to the desktop object
*/
-HDESK FASTCALL
+HDESK INTERNAL_CALL
IntGetDesktopObjectHandle(PDESKTOP_OBJECT DesktopObject)
{
NTSTATUS Status;
@@ -183,7 +183,7 @@
return Ret;
}
-PUSER_MESSAGE_QUEUE FASTCALL
+PUSER_MESSAGE_QUEUE INTERNAL_CALL
IntGetActiveMessageQueue(VOID)
{
PDESKTOP_OBJECT pdo = PsGetWin32Thread()->Desktop;
@@ -195,14 +195,14 @@
return (PUSER_MESSAGE_QUEUE)pdo->ActiveMessageQueue;
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntGetForegroundWindow(VOID)
{
PUSER_MESSAGE_QUEUE ForegroundQueue = IntGetActiveMessageQueue();
return (ForegroundQueue != NULL ? ForegroundQueue->ActiveWindow : NULL);
}
-PUSER_MESSAGE_QUEUE FASTCALL
+PUSER_MESSAGE_QUEUE INTERNAL_CALL
IntSetActiveMessageQueue(PUSER_MESSAGE_QUEUE NewQueue)
{
PUSER_MESSAGE_QUEUE Prev;
@@ -229,7 +229,7 @@
return Prev;
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntGetDesktopWindow(VOID)
{
PDESKTOP_OBJECT pdo = PsGetWin32Thread()->Desktop;
@@ -243,7 +243,7 @@
/* PUBLIC FUNCTIONS ***********************************************************/
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
IntShowDesktop(PDESKTOP_OBJECT Desktop, ULONG Width, ULONG Height)
{
CSRSS_API_REQUEST Request;
@@ -265,7 +265,7 @@
return Status;
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
IntHideDesktop(PDESKTOP_OBJECT Desktop)
{
#if 0
@@ -692,7 +692,7 @@
* @implemented
*/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntPaintDesktop(HDC hDC)
{
PWINDOW_OBJECT DesktopWindow;
reactos/subsys/win32k/ntuser
diff -u -r1.24.4.2 -r1.24.4.3
--- focus.c 27 Aug 2004 15:56:05 -0000 1.24.4.2
+++ focus.c 14 Sep 2004 01:00:44 -0000 1.24.4.3
@@ -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: focus.c,v 1.24.4.2 2004/08/27 15:56:05 weiden Exp $
+ * $Id: focus.c,v 1.24.4.3 2004/09/14 01:00:44 weiden Exp $
*/
#include <w32k.h>
@@ -24,7 +24,7 @@
#include <debug.h>
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntGetActiveWindow(VOID)
{
PUSER_MESSAGE_QUEUE ThreadQueue;
@@ -32,7 +32,7 @@
return (ThreadQueue != NULL ? ThreadQueue->ActiveWindow : NULL);
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntGetCaptureWindow(VOID)
{
PUSER_MESSAGE_QUEUE ThreadQueue;
@@ -41,7 +41,7 @@
return (ThreadQueue != NULL ? ThreadQueue->CaptureWindow : NULL);
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntGetFocusWindow(VOID)
{
PUSER_MESSAGE_QUEUE ForegroundQueue = IntGetActiveMessageQueue();
@@ -58,14 +58,14 @@
return NULL;
}
-PWINDOW_OBJECT
-FASTCALL IntGetThreadFocusWindow(VOID)
+PWINDOW_OBJECT INTERNAL_CALL
+IntGetThreadFocusWindow(VOID)
{
PUSER_MESSAGE_QUEUE ThreadQueue = PsGetWin32Thread()->MessageQueue;
return (ThreadQueue != NULL ? ThreadQueue->FocusWindow : NULL);
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntSetForegroundWindow(PWINDOW_OBJECT Window)
{
PDESKTOP_OBJECT pdo;
@@ -144,7 +144,7 @@
return TRUE;
}
-STATIC BOOL FASTCALL
+STATIC BOOL INTERNAL_CALL
IntSetForegroundAndFocusWindow(PWINDOW_OBJECT Window, PWINDOW_OBJECT FocusWindow, BOOL MouseActivate)
{
PUSER_MESSAGE_QUEUE PrevForegroundQueue;
@@ -243,7 +243,7 @@
return TRUE;
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntFindChildWindowToOwner(PWINDOW_OBJECT Root, PWINDOW_OBJECT Owner)
{
PWINDOW_OBJECT Child;
@@ -264,7 +264,7 @@
return NULL;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntMouseActivateWindow(PWINDOW_OBJECT DesktopWindow, PWINDOW_OBJECT Window)
{
PWINDOW_OBJECT TopWindow;
@@ -291,7 +291,7 @@
return TRUE;
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntSetActiveWindow(PWINDOW_OBJECT Window)
{
PWINDOW_OBJECT PrevWindow;
@@ -332,7 +332,7 @@
return PrevWindow;
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntSetFocusWindow(PWINDOW_OBJECT Window)
{
PWINDOW_OBJECT PrevWindow;
@@ -350,7 +350,7 @@
return PrevWindow;
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntSetFocus(PWINDOW_OBJECT Window)
{
if(Window != NULL)
@@ -388,7 +388,7 @@
return IntSetFocusWindow(NULL);
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntSetCapture(PWINDOW_OBJECT Window)
{
PUSER_MESSAGE_QUEUE ThreadQueue;
reactos/subsys/win32k/ntuser
diff -u -r1.19.12.3 -r1.19.12.4
--- guicheck.c 27 Aug 2004 15:56:05 -0000 1.19.12.3
+++ guicheck.c 14 Sep 2004 01:00:44 -0000 1.19.12.4
@@ -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: guicheck.c,v 1.19.12.3 2004/08/27 15:56:05 weiden Exp $
+/* $Id: guicheck.c,v 1.19.12.4 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -45,7 +45,7 @@
/* FUNCTIONS *****************************************************************/
-static BOOL FASTCALL
+static BOOL INTERNAL_CALL
AddGuiApp(PW32PROCESS W32Data)
{
W32Data->Flags |= W32PF_CREATEDWINORDC;
@@ -67,7 +67,7 @@
return TRUE;
}
-static void FASTCALL
+static void INTERNAL_CALL
RemoveGuiApp(PW32PROCESS W32Data)
{
W32Data->Flags &= ~W32PF_CREATEDWINORDC;
@@ -79,7 +79,7 @@
}
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGraphicsCheck(BOOL Create)
{
PW32PROCESS W32Data;
@@ -129,7 +129,7 @@
}
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
InitGuiCheckImpl (VOID)
{
ExInitializeFastMutex(&GuiSwitchLock);
reactos/subsys/win32k/ntuser
diff -u -r1.36.4.6 -r1.36.4.7
--- input.c 12 Sep 2004 19:21:07 -0000 1.36.4.6
+++ input.c 14 Sep 2004 01:00:44 -0000 1.36.4.7
@@ -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: input.c,v 1.36.4.6 2004/09/12 19:21:07 weiden Exp $
+/* $Id: input.c,v 1.36.4.7 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -59,7 +59,7 @@
IntMouseInput(&mi); \
ClearMouseInput(mi);
-VOID FASTCALL
+VOID INTERNAL_CALL
ProcessMouseInputData(PMOUSE_INPUT_DATA Data, ULONG InputCount)
{
PMOUSE_INPUT_DATA mid;
@@ -418,7 +418,7 @@
return(STATUS_SUCCESS);
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
InitInputImpl(VOID)
{
NTSTATUS Status;
@@ -456,13 +456,13 @@
return STATUS_SUCCESS;
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
CleanupInputImp(VOID)
{
return(STATUS_SUCCESS);
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntMouseInput(MOUSEINPUT *mi)
{
const UINT SwapBtnMsg[2][2] = {{WM_LBUTTONDOWN, WM_RBUTTONDOWN},
@@ -694,13 +694,13 @@
return TRUE;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntKeyboardInput(KEYBDINPUT *ki)
{
return FALSE;
}
-UINT FASTCALL
+UINT INTERNAL_CALL
IntSendInput(
UINT nInputs,
LPINPUT pInput,
@@ -764,7 +764,7 @@
return cnt;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntBlockInput(PW32THREAD W32Thread, BOOL BlockIt)
{
//UNIMPLEMENTED;
reactos/subsys/win32k/ntuser
diff -u -r1.31.2.2 -r1.31.2.3
--- keyboard.c 31 Aug 2004 11:38:56 -0000 1.31.2.2
+++ keyboard.c 14 Sep 2004 01:00:44 -0000 1.31.2.3
@@ -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: keyboard.c,v 1.31.2.2 2004/08/31 11:38:56 weiden Exp $
+/* $Id: keyboard.c,v 1.31.2.3 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -64,7 +64,8 @@
/* FUNCTIONS *****************************************************************/
/* Initialization -- Right now, just zero the key state and init the lock */
-NTSTATUS FASTCALL InitKeyboardImpl(VOID) {
+NTSTATUS INTERNAL_CALL
+InitKeyboardImpl(VOID) {
ExInitializeFastMutex(&QueueStateLock);
RtlZeroMemory(&QueueKeyStateTable,0x100);
return STATUS_SUCCESS;
@@ -74,14 +75,16 @@
/*** Shift state code was out of hand, sorry. --- arty */
-static UINT DontDistinguishShifts( UINT ret ) {
+static UINT INTERNAL_CALL
+DontDistinguishShifts( UINT ret ) {
if( ret == VK_LSHIFT || ret == VK_RSHIFT ) ret = VK_LSHIFT;
if( ret == VK_LCONTROL || ret == VK_RCONTROL ) ret = VK_LCONTROL;
if( ret == VK_LMENU || ret == VK_RMENU ) ret = VK_LMENU;
return ret;
}
-static VOID STDCALL SetKeyState(DWORD key, DWORD vk, DWORD ext, BOOL down) {
+static VOID INTERNAL_CALL
+SetKeyState(DWORD key, DWORD vk, DWORD ext, BOOL down) {
ASSERT(vk <= 0xff);
/* Special handling for toggles like numpad and caps lock */
@@ -122,7 +125,8 @@
}
}
-VOID DumpKeyState( PBYTE KeyState ) {
+VOID INTERNAL_CALL
+DumpKeyState( PBYTE KeyState ) {
int i;
DbgPrint( "KeyState { " );
@@ -132,8 +136,9 @@
DbgPrint( "};\n" );
}
-static BYTE KeysSet( PKBDTABLES pkKT, PBYTE KeyState,
- int FakeModLeft, int FakeModRight ) {
+static BYTE INTERNAL_CALL
+KeysSet( PKBDTABLES pkKT, PBYTE KeyState,
+ int FakeModLeft, int FakeModRight ) {
if( !KeyState || !pkKT ) return 0;
/* Search special codes first */
@@ -149,7 +154,8 @@
* want to count on the shift bit not moving, because it can be specified
* in the layout */
-static DWORD FASTCALL GetShiftBit( PKBDTABLES pkKT, DWORD Vk ) {
+static DWORD INTERNAL_CALL
+GetShiftBit( PKBDTABLES pkKT, DWORD Vk ) {
int i;
for( i = 0; pkKT->pCharModifiers->pVkToBit[i].Vk; i++ )
@@ -159,7 +165,8 @@
return 0;
}
-static DWORD ModBits( PKBDTABLES pkKT, PBYTE KeyState ) {
+static DWORD INTERNAL_CALL
+ModBits( PKBDTABLES pkKT, PBYTE KeyState ) {
DWORD ModBits = 0;
if( !KeyState ) return 0;
@@ -200,12 +207,13 @@
return ModBits;
}
-static BOOL TryToTranslateChar(WORD wVirtKey,
- DWORD ModBits,
- PBOOL pbDead,
- PBOOL pbLigature,
- PWCHAR pwcTranslatedChar,
- PKBDTABLES keyLayout )
+static BOOL INTERNAL_CALL
+TryToTranslateChar(WORD wVirtKey,
+ DWORD ModBits,
+ PBOOL pbDead,
+ PBOOL pbLigature,
+ PWCHAR pwcTranslatedChar,
+ PKBDTABLES keyLayout )
{
PVK_TO_WCHAR_TABLE vtwTbl;
PVK_TO_WCHARS10 vkPtr;
@@ -274,7 +282,7 @@
}
static
-int STDCALL
+int INTERNAL_CALL
ToUnicodeInner(UINT wVirtKey,
UINT wScanCode,
PBYTE lpKeyState,
@@ -326,13 +334,14 @@
return ret;
}
-int STDCALL ToUnicodeEx( UINT wVirtKey,
- UINT wScanCode,
- PBYTE lpKeyState,
- LPWSTR pwszBuff,
- int cchBuff,
- UINT wFlags,
- HKL dwhkl ) {
+int INTERNAL_CALL
+IntToUnicodeEx( UINT wVirtKey,
+ UINT wScanCode,
+ PBYTE lpKeyState,
+ LPWSTR pwszBuff,
+ int cchBuff,
+ UINT wFlags,
+ HKL dwhkl ) {
int ToUnicodeResult = 0;
IntLockQueueState;
@@ -355,13 +364,13 @@
LPWSTR pwszBuff,
int cchBuff,
UINT wFlags ) {
- return ToUnicodeEx( wVirtKey,
- wScanCode,
- QueueKeyStateTable,
- pwszBuff,
- cchBuff,
- wFlags,
- 0 );
+ return IntToUnicodeEx( wVirtKey,
+ wScanCode,
+ QueueKeyStateTable,
+ pwszBuff,
+ cchBuff,
+ wFlags,
+ 0 );
}
/*
@@ -479,7 +488,8 @@
DWORD flags,
PVOID *func_addr);
-void InitKbdLayout( PVOID *pkKeyboardLayout ) {
+void INTERNAL_CALL
+InitKbdLayout( PVOID *pkKeyboardLayout ) {
UNICODE_STRING KeyName;
UNICODE_STRING ValueName;
UNICODE_STRING LayoutKeyName;
@@ -593,14 +603,14 @@
#undef XX_STATUS
}
-PKBDTABLES FASTCALL
+PKBDTABLES INTERNAL_CALL
W32kGetDefaultKeyLayout(VOID) {
PKBDTABLES pkKeyboardLayout = 0;
InitKbdLayout( (PVOID) &pkKeyboardLayout );
return pkKeyboardLayout;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntTranslateKbdMessage(PKMSG lpMsg,
HKL dwhkl)
{
@@ -770,7 +780,8 @@
* @implemented
*/
-static UINT IntMapVirtualKeyEx( UINT Code, UINT Type, PKBDTABLES keyLayout ) {
+static UINT INTERNAL_CALL
+IntMapVirtualKeyEx( UINT Code, UINT Type, PKBDTABLES keyLayout ) {
UINT ret = 0;
switch( Type ) {
@@ -844,13 +855,13 @@
}
RtlZeroMemory( OutPwszBuff, sizeof( WCHAR ) * cchBuff );
- ret = ToUnicodeEx( wVirtKey,
- wScanCode,
- KeyStateBuf,
- OutPwszBuff,
- cchBuff,
- wFlags,
- dwhkl );
+ ret = IntToUnicodeEx( wVirtKey,
+ wScanCode,
+ KeyStateBuf,
+ OutPwszBuff,
+ cchBuff,
+ wFlags,
+ dwhkl );
MmCopyToCaller(pwszBuff,OutPwszBuff,sizeof(WCHAR)*cchBuff);
ExFreePool(OutPwszBuff);
@@ -936,7 +947,8 @@
* appropriately.
*/
-VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyboardLayout) {
+VOID INTERNAL_CALL
+W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyboardLayout) {
DWORD ScanCode = 0, ModifierBits = 0;
DWORD i = 0;
DWORD BaseMapping = 0;
reactos/subsys/win32k/ntuser
diff -u -r1.71.4.5 -r1.71.4.6
--- message.c 13 Sep 2004 21:28:17 -0000 1.71.4.5
+++ message.c 14 Sep 2004 01:00:44 -0000 1.71.4.6
@@ -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: message.c,v 1.71.4.5 2004/09/13 21:28:17 weiden Exp $
+/* $Id: message.c,v 1.71.4.6 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -57,7 +57,7 @@
{ WM_WINDOWPOSCHANGING, sizeof(WINDOWPOS), MMS_FLAG_READWRITE },
};
-PMSGMEMORY FASTCALL
+PMSGMEMORY INTERNAL_CALL
FindMsgMemory(UINT Msg)
{
PMSGMEMORY MsgMemoryEntry;
@@ -76,7 +76,7 @@
return NULL;
}
-UINT FASTCALL
+UINT INTERNAL_CALL
MsgMemorySize(PMSGMEMORY MsgMemoryEntry, WPARAM wParam, LPARAM lParam)
{
CREATESTRUCTW *Cs;
@@ -133,7 +133,7 @@
}
}
-static FASTCALL NTSTATUS
+static NTSTATUS INTERNAL_CALL
PackParam(LPARAM *lParamPacked, UINT Msg, WPARAM wParam, LPARAM lParam)
{
NCCALCSIZE_PARAMS *UnpackedNcCalcsize;
@@ -216,7 +216,7 @@
return STATUS_SUCCESS;
}
-static FASTCALL NTSTATUS
+static NTSTATUS INTERNAL_CALL
UnpackParam(LPARAM lParamPacked, UINT Msg, WPARAM wParam, LPARAM lParam)
{
NCCALCSIZE_PARAMS *UnpackedParams;
@@ -253,7 +253,7 @@
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntTranslateMouseMessage(PUSER_MESSAGE_QUEUE ThreadQueue, PKMSG Msg, USHORT *HitTest, BOOL Remove)
{
PWINDOW_OBJECT Window;
@@ -342,7 +342,7 @@
}
-VOID FASTCALL
+VOID INTERNAL_CALL
IntSendHitTestMessages(PUSER_MESSAGE_QUEUE ThreadQueue, PKMSG Msg)
{
PWINDOW_OBJECT Window;
@@ -405,7 +405,7 @@
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntActivateWindowMouse(PUSER_MESSAGE_QUEUE ThreadQueue, PKMSG Msg, USHORT *HitTest)
{
PWINDOW_OBJECT Parent;
@@ -439,7 +439,7 @@
return FALSE;
}
-LRESULT FASTCALL
+LRESULT INTERNAL_CALL
IntDispatchMessage(PNTUSERDISPATCHMESSAGEINFO MsgInfo, PWINDOW_OBJECT Window)
{
if((MsgInfo->Msg.message == WM_TIMER || MsgInfo->Msg.message == WM_SYSTIMER) &&
@@ -496,7 +496,7 @@
/*
* Internal version of PeekMessage() doing all the work
*/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntPeekMessage(PUSER_MESSAGE Msg,
PWINDOW_OBJECT FilterWindow,
UINT MsgFilterMin,
@@ -649,7 +649,7 @@
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntWaitMessage(PWINDOW_OBJECT Window,
UINT MsgFilterMin,
UINT MsgFilterMax)
@@ -678,7 +678,7 @@
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetMessage(PUSER_MESSAGE Msg, PWINDOW_OBJECT FilterWindow,
UINT MsgFilterMin, UINT MsgFilterMax, BOOL *GotMessage)
{
@@ -707,7 +707,7 @@
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
CopyMsgToKernelMem(PKMSG KernelModeMsg, MSG *UserModeMsg, PMSGMEMORY MsgMemoryEntry,
PWINDOW_OBJECT MsgWindow)
{
@@ -764,7 +764,7 @@
return STATUS_SUCCESS;
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
CopyMsgToUserMem(MSG *UserModeMsg, PKMSG KernelModeMsg)
{
NTSTATUS Status;
@@ -802,7 +802,7 @@
return STATUS_SUCCESS;
}
-LRESULT FASTCALL
+LRESULT INTERNAL_CALL
IntSendMessage(PWINDOW_OBJECT Window,
UINT Msg,
WPARAM wParam,
@@ -816,7 +816,7 @@
return 0;
}
-LRESULT FASTCALL
+LRESULT INTERNAL_CALL
IntSendMessageTimeout(PWINDOW_OBJECT Window,
UINT Msg,
WPARAM wParam,
@@ -920,7 +920,7 @@
return TRUE;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntPostThreadMessage(PW32THREAD W32Thread,
UINT Msg,
WPARAM wParam,
@@ -956,7 +956,7 @@
return TRUE;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntPostMessage(PWINDOW_OBJECT Window,
UINT Msg,
WPARAM wParam,
@@ -1013,14 +1013,14 @@
return TRUE;
}
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntInitMessagePumpHook()
{
PsGetCurrentThread()->Win32Thread->MessagePumpHookValue++;
return TRUE;
}
-BOOL STDCALL
+BOOL INTERNAL_CALL
IntUninitMessagePumpHook()
{
if (PsGetCurrentThread()->Win32Thread->MessagePumpHookValue <= 0)
reactos/subsys/win32k/ntuser
diff -u -r1.21.12.1 -r1.21.12.2
--- metric.c 15 Jul 2004 20:07:18 -0000 1.21.12.1
+++ metric.c 14 Sep 2004 01:00:44 -0000 1.21.12.2
@@ -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: metric.c,v 1.21.12.1 2004/07/15 20:07:18 weiden Exp $
+/* $Id: metric.c,v 1.21.12.2 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -32,7 +32,7 @@
#include <debug.h>
-INT FASTCALL
+INT INTERNAL_CALL
IntGetSystemMetrics(INT nIndex)
{
PW32PROCESS W32Process = PsGetWin32Process();
reactos/subsys/win32k/ntuser
diff -u -r1.83.2.2 -r1.83.2.3
--- misc.c 12 Sep 2004 19:21:07 -0000 1.83.2.2
+++ misc.c 14 Sep 2004 01:00:44 -0000 1.83.2.3
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.83.2.2 2004/09/12 19:21:07 weiden Exp $
+/* $Id: misc.c,v 1.83.2.3 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -17,7 +17,8 @@
/* registered Logon process */
PW32PROCESS LogonProcess = NULL;
-void W32kRegisterPrimitiveMessageQueue() {
+void INTERNAL_CALL
+W32kRegisterPrimitiveMessageQueue() {
extern PUSER_MESSAGE_QUEUE pmPrimitiveMessageQueue;
if( !pmPrimitiveMessageQueue ) {
PW32THREAD pThread;
@@ -31,13 +32,13 @@
}
}
-PUSER_MESSAGE_QUEUE FASTCALL
+PUSER_MESSAGE_QUEUE INTERNAL_CALL
W32kGetPrimitiveMessageQueue(VOID) {
extern PUSER_MESSAGE_QUEUE pmPrimitiveMessageQueue;
return pmPrimitiveMessageQueue;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntRegisterLogonProcess(DWORD ProcessId, BOOL Register)
{
PEPROCESS Process;
@@ -94,7 +95,7 @@
-VOID FASTCALL
+VOID INTERNAL_CALL
IntGetFontMetricSetting(LPWSTR lpValueName, PLOGFONTW font)
{
RTL_QUERY_REGISTRY_TABLE QueryTable[2];
@@ -124,7 +125,7 @@
}
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntSystemParametersInfo(
UINT uiAction,
UINT uiParam,
@@ -314,7 +315,7 @@
return FALSE;
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
IntSafeCopyUnicodeString(PUNICODE_STRING Dest,
PUNICODE_STRING Source)
{
@@ -360,7 +361,7 @@
return STATUS_SUCCESS;
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
IntSafeCopyUnicodeStringTerminateNULL(PUNICODE_STRING Dest,
PUNICODE_STRING Source)
{
@@ -409,7 +410,7 @@
return STATUS_SUCCESS;
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
IntUnicodeStringToNULLTerminated(PWSTR *Dest, PUNICODE_STRING Src)
{
if (Src->Length + sizeof(WCHAR) <= Src->MaximumLength
@@ -431,7 +432,7 @@
return STATUS_SUCCESS;
}
-void FASTCALL
+void INTERNAL_CALL
IntFreeNULLTerminatedFromUnicodeString(PWSTR NullTerminated, PUNICODE_STRING UnicodeString)
{
if (NullTerminated != UnicodeString->Buffer)
reactos/subsys/win32k/ntuser
diff -u -r1.100.12.4 -r1.100.12.5
--- msgqueue.c 13 Sep 2004 21:28:17 -0000 1.100.12.4
+++ msgqueue.c 14 Sep 2004 01:00:44 -0000 1.100.12.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: msgqueue.c,v 1.100.12.4 2004/09/13 21:28:17 weiden Exp $
+/* $Id: msgqueue.c,v 1.100.12.5 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -66,7 +66,8 @@
/* FUNCTIONS *****************************************************************/
/* set some queue bits */
-inline VOID MsqSetQueueBits( PUSER_MESSAGE_QUEUE Queue, WORD Bits )
+inline VOID INTERNAL_CALL
+MsqSetQueueBits( PUSER_MESSAGE_QUEUE Queue, WORD Bits )
{
Queue->WakeBits |= Bits;
Queue->ChangedBits |= Bits;
@@ -74,13 +75,14 @@
}
/* clear some queue bits */
-inline VOID MsqClearQueueBits( PUSER_MESSAGE_QUEUE Queue, WORD Bits )
+inline VOID INTERNAL_CALL
+MsqClearQueueBits( PUSER_MESSAGE_QUEUE Queue, WORD Bits )
{
Queue->WakeBits &= ~Bits;
Queue->ChangedBits &= ~Bits;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
MsqIncPaintCountQueue(PUSER_MESSAGE_QUEUE Queue)
{
IntLockMessageQueue(Queue);
@@ -90,7 +92,7 @@
IntUnLockMessageQueue(Queue);
}
-VOID FASTCALL
+VOID INTERNAL_CALL
MsqDecPaintCountQueue(PUSER_MESSAGE_QUEUE Queue)
{
IntLockMessageQueue(Queue);
@@ -103,7 +105,7 @@
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
MsqInitializeImpl(VOID)
{
/*CurrentFocusMessageQueue = NULL;*/
@@ -123,7 +125,7 @@
return(STATUS_SUCCESS);
}
-VOID FASTCALL
+VOID INTERNAL_CALL
MsqInsertSystemMessage(PKMSG Msg)
{
LARGE_INTEGER LargeTickCount;
@@ -170,14 +172,14 @@
KeSetEvent(&HardwareMessageEvent, IO_NO_INCREMENT, FALSE);
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
MsqIsDblClk(PKMSG Msg, BOOL Remove)
{
/* FIXME */
return FALSE;
}
-BOOL STATIC STDCALL
+BOOL INTERNAL_CALL
MsqTranslateMouseMessage(PUSER_MESSAGE_QUEUE MessageQueue, PWINDOW_OBJECT FilterWindow, UINT FilterLow, UINT FilterHigh,
PUSER_MESSAGE Message, BOOL Remove, PBOOL Freed,
PWINDOW_OBJECT ScopeWin, PPOINT ScreenPoint, BOOL FromGlobalQueue)
@@ -350,7 +352,7 @@
return(TRUE);
}
-BOOL STDCALL
+BOOL INTERNAL_CALL
MsqPeekHardwareMessage(PUSER_MESSAGE_QUEUE MessageQueue, PWINDOW_OBJECT FilterWindow,
UINT FilterLow, UINT FilterHigh, BOOL Remove,
PUSER_MESSAGE* Message)
@@ -515,7 +517,7 @@
return(FALSE);
}
-VOID FASTCALL
+VOID INTERNAL_CALL
MsqPostKeyboardMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
{
PUSER_MESSAGE_QUEUE FocusMessageQueue;
@@ -555,7 +557,7 @@
}
}
-VOID FASTCALL
+VOID INTERNAL_CALL
MsqPostHotKeyMessage(PVOID Thread, PWINDOW_OBJECT Window, WPARAM wParam, LPARAM lParam)
{
PW32THREAD Win32Thread;
@@ -606,7 +608,7 @@
}
-PUSER_MESSAGE FASTCALL
+PUSER_MESSAGE INTERNAL_CALL
MsqCreateMessage(PKMSG Msg, BOOLEAN FreeLParam)
{
PUSER_MESSAGE Message;
@@ -623,13 +625,13 @@
return Message;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
MsqDestroyMessage(PUSER_MESSAGE Message)
{
ExFreeToPagedLookasideList(&MessageLookasideList, Message);
}
-VOID FASTCALL
+VOID INTERNAL_CALL
MsqDispatchSentNotifyMessages(PUSER_MESSAGE_QUEUE MessageQueue)
{
PLIST_ENTRY ListEntry;
@@ -654,13 +656,13 @@
IntUnLockMessageQueue(MessageQueue);
}
-BOOLEAN FASTCALL
+BOOLEAN INTERNAL_CALL
MsqPeekSentMessages(PUSER_MESSAGE_QUEUE MessageQueue)
{
return(!IsListEmpty(&MessageQueue->SentMessagesListHead));
}
-BOOLEAN FASTCALL
+BOOLEAN INTERNAL_CALL
MsqDispatchOneSentMessage(PUSER_MESSAGE_QUEUE MessageQueue)
{
PUSER_SENT_MESSAGE Message;
@@ -762,7 +764,7 @@
return(TRUE);
}
-VOID FASTCALL
+VOID INTERNAL_CALL
MsqSendNotifyMessage(PUSER_MESSAGE_QUEUE MessageQueue,
PUSER_SENT_MESSAGE_NOTIFY NotifyMessage)
{
@@ -773,7 +775,7 @@
IntUnLockMessageQueue(MessageQueue);
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
MsqSendMessage(PUSER_MESSAGE_QUEUE MessageQueue,
PWINDOW_OBJECT Window, UINT Msg, WPARAM wParam, LPARAM lParam,
UINT uTimeout, BOOL Block, ULONG_PTR *uResult)
@@ -955,7 +957,7 @@
return WaitStatus;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
MsqPostMessage(PUSER_MESSAGE_QUEUE MessageQueue, PKMSG Msg, BOOLEAN FreeLParam)
{
PUSER_MESSAGE Message;
@@ -971,7 +973,7 @@
IntUnLockMessageQueue(MessageQueue);
}
-VOID FASTCALL
+VOID INTERNAL_CALL
MsqPostQuitMessage(PUSER_MESSAGE_QUEUE MessageQueue, ULONG ExitCode)
{
IntLockMessageQueue(MessageQueue);
@@ -981,7 +983,7 @@
IntUnLockMessageQueue(MessageQueue);
}
-BOOLEAN FASTCALL
+BOOLEAN INTERNAL_CALL
MsqFindMessage(IN PUSER_MESSAGE_QUEUE MessageQueue,
IN BOOLEAN Hardware,
IN BOOLEAN Remove,
@@ -1027,7 +1029,7 @@
return(FALSE);
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
MsqWaitForNewMessages(PUSER_MESSAGE_QUEUE MessageQueue)
{
PVOID WaitObjects[2] = {&MessageQueue->NewMessages, &HardwareMessageEvent};
@@ -1041,7 +1043,7 @@
NULL));
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
MsqIsHung(PUSER_MESSAGE_QUEUE MessageQueue)
{
LARGE_INTEGER LargeTickCount;
@@ -1050,7 +1052,7 @@
return ((LargeTickCount.u.LowPart - MessageQueue->LastMsgRead) > MSQ_HUNG);
}
-VOID FASTCALL
+VOID INTERNAL_CALL
MsqInitializeMessageQueue(struct _ETHREAD *Thread, PUSER_MESSAGE_QUEUE MessageQueue)
{
LARGE_INTEGER LargeTickCount;
@@ -1074,7 +1076,7 @@
MessageQueue->PaintCount = 0;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
MsqCleanupMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue)
{
PLIST_ENTRY CurrentEntry;
@@ -1157,7 +1159,7 @@
IntUnLockMessageQueue(MessageQueue);
}
-PUSER_MESSAGE_QUEUE FASTCALL
+PUSER_MESSAGE_QUEUE INTERNAL_CALL
MsqCreateMessageQueue(struct _ETHREAD *Thread)
{
PUSER_MESSAGE_QUEUE MessageQueue;
@@ -1180,7 +1182,7 @@
return MessageQueue;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
MsqDestroyMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue)
{
MsqCleanupMessageQueue(MessageQueue);
@@ -1188,19 +1190,19 @@
IntDereferenceMessageQueue(MessageQueue);
}
-PHOOKTABLE FASTCALL
+PHOOKTABLE INTERNAL_CALL
MsqGetHooks(PUSER_MESSAGE_QUEUE Queue)
{
return Queue->Hooks;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
MsqSetHooks(PUSER_MESSAGE_QUEUE Queue, PHOOKTABLE Hooks)
{
Queue->Hooks = Hooks;
}
-LPARAM FASTCALL
+LPARAM INTERNAL_CALL
MsqSetMessageExtraInfo(LPARAM lParam)
{
LPARAM Ret;
@@ -1218,7 +1220,7 @@
return Ret;
}
-LPARAM FASTCALL
+LPARAM INTERNAL_CALL
MsqGetMessageExtraInfo(VOID)
{
PUSER_MESSAGE_QUEUE MessageQueue;
@@ -1232,7 +1234,7 @@
return MessageQueue->ExtraInfo;
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
MsqSetStateWindow(PUSER_MESSAGE_QUEUE MessageQueue, ULONG Type, PWINDOW_OBJECT Window)
{
PWINDOW_OBJECT *Change;
reactos/subsys/win32k/ntuser
diff -u -r1.84.2.3 -r1.84.2.4
--- painting.c 12 Sep 2004 19:21:07 -0000 1.84.2.3
+++ painting.c 14 Sep 2004 01:00:44 -0000 1.84.2.4
@@ -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: painting.c,v 1.84.2.3 2004/09/12 19:21:07 weiden Exp $
+ * $Id: painting.c,v 1.84.2.4 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -34,7 +34,7 @@
/* PRIVATE FUNCTIONS **********************************************************/
-VOID FASTCALL
+VOID INTERNAL_CALL
IntValidateParent(PWINDOW_OBJECT Child, HRGN ValidRegion)
{
PWINDOW_OBJECT OldWindow;
@@ -74,7 +74,7 @@
* Internal function used by IntRedrawWindow.
*/
-STATIC VOID FASTCALL
+STATIC VOID INTERNAL_CALL
IntPaintWindows(PWINDOW_OBJECT Window, ULONG Flags)
{
HDC hDC;
@@ -186,7 +186,7 @@
* Internal function used by IntRedrawWindow.
*/
-VOID FASTCALL
+VOID INTERNAL_CALL
IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags)
{
INT RgnType;
@@ -399,7 +399,7 @@
* minimized.
*/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntIsWindowDrawable(PWINDOW_OBJECT Window)
{
PWINDOW_OBJECT Wnd;
@@ -423,7 +423,7 @@
* first parameter.
*/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntRedrawWindow(PWINDOW_OBJECT Window, LPRECT UpdateRect, HRGN UpdateRgn, UINT Flags)
{
HRGN hRgn = NULL;
@@ -513,7 +513,7 @@
return TRUE;
}
-PWINDOW_OBJECT STDCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntFindWindowToRepaint(PWINDOW_OBJECT Parent, PW32THREAD Thread)
{
PWINDOW_OBJECT Child;
@@ -553,7 +553,7 @@
return FoundWnd;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetPaintMessage(PWINDOW_OBJECT Window, UINT MsgFilterMin, UINT MsgFilterMax,
PW32THREAD Thread, PKMSG Message, BOOL Remove)
{
@@ -630,7 +630,7 @@
return FALSE;
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntFixCaret(PWINDOW_OBJECT Window, LPRECT lprc, UINT flags)
{
PUSER_MESSAGE_QUEUE ActiveQueue;
@@ -672,7 +672,7 @@
return NULL;
}
-HDC FASTCALL
+HDC INTERNAL_CALL
IntBeginPaint(PWINDOW_OBJECT Window, PAINTSTRUCT* lPs)
{
ASSERT(Window);
@@ -718,7 +718,7 @@
return lPs->hdc;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntEndPaint(PWINDOW_OBJECT Window, CONST PAINTSTRUCT* lPs)
{
IntReleaseDC(Window, lPs->hdc);
@@ -730,7 +730,7 @@
}
-INT FASTCALL
+INT INTERNAL_CALL
IntGetUpdateRgn(PWINDOW_OBJECT Window, HRGN hRgn, BOOL bErase)
{
int RegionType;
@@ -759,7 +759,7 @@
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetUpdateRect(PWINDOW_OBJECT Window, LPRECT Rect, BOOL Erase)
{
HRGN Rgn;
@@ -798,7 +798,7 @@
}
-DWORD FASTCALL
+DWORD INTERNAL_CALL
IntScrollDC(HDC hDC, INT dx, INT dy, LPRECT lprcScroll,
LPRECT lprcClip, HRGN hrgnUpdate, LPRECT lprcUpdate)
{
@@ -897,7 +897,7 @@
}
-DWORD FASTCALL
+DWORD INTERNAL_CALL
IntScrollWindowEx(PWINDOW_OBJECT Window, INT dx, INT dy, LPRECT rect,
LPRECT clipRect, HRGN hrgnUpdate, LPRECT rcUpdate, UINT flags)
{
reactos/subsys/win32k/ntuser
diff -u -r1.11.12.2 -r1.11.12.3
--- prop.c 1 Sep 2004 14:14:26 -0000 1.11.12.2
+++ prop.c 14 Sep 2004 01:00:44 -0000 1.11.12.3
@@ -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: prop.c,v 1.11.12.2 2004/09/01 14:14:26 weiden Exp $
+/* $Id: prop.c,v 1.11.12.3 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -41,7 +41,7 @@
/* FUNCTIONS *****************************************************************/
-PPROPERTY FASTCALL
+PPROPERTY INTERNAL_CALL
IntGetProp(PWINDOW_OBJECT WindowObject, ATOM Atom)
{
PLIST_ENTRY ListEntry;
@@ -61,7 +61,7 @@
return NULL;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntRemoveProp(PWINDOW_OBJECT WindowObject, ATOM Atom, HANDLE *Data)
{
PLIST_ENTRY ListEntry;
@@ -86,7 +86,7 @@
return FALSE;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntSetProp(PWINDOW_OBJECT WindowObject, ATOM Atom, HANDLE Data)
{
PPROPERTY Prop = IntGetProp(WindowObject, Atom);
reactos/subsys/win32k/ntuser
diff -u -r1.34.4.1 -r1.34.4.2
--- scrollbar.c 15 Jul 2004 20:07:18 -0000 1.34.4.1
+++ scrollbar.c 14 Sep 2004 01:00:44 -0000 1.34.4.2
@@ -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: scrollbar.c,v 1.34.4.1 2004/07/15 20:07:18 weiden Exp $
+/* $Id: scrollbar.c,v 1.34.4.2 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -60,7 +60,7 @@
* 'thumbSize' returns the size of the thumb, and 'thumbPos' returns the position of the thumb relative to the left or to
* the top. Return TRUE if the scrollbar is vertical, FALSE if horizontal.
*/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetScrollBarRect (PWINDOW_OBJECT Window, INT nBar, PRECT lprect)
{
BOOL vertical;
@@ -105,7 +105,7 @@
return vertical;
}
-static BOOL FASTCALL
+static BOOL INTERNAL_CALL
IntCalculateThumb(PWINDOW_OBJECT Window, LONG idObject, PSCROLLBARINFO psbi, LPSCROLLINFO psi)
{
INT Thumb, ThumbBox, ThumbPos, cxy, mx;
@@ -181,7 +181,7 @@
return TRUE;
}
-static VOID FASTCALL
+static VOID INTERNAL_CALL
IntUpdateSBInfo(PWINDOW_OBJECT Window, int wBar)
{
PSCROLLBARINFO sbi;
@@ -196,7 +196,7 @@
IntCalculateThumb(Window, wBar, sbi, psi);
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetScrollInfo(PWINDOW_OBJECT Window, INT nBar, LPSCROLLINFO lpsi)
{
UINT Mask;
@@ -249,7 +249,7 @@
return TRUE;
}
-DWORD FASTCALL
+DWORD INTERNAL_CALL
IntSetScrollInfo(PWINDOW_OBJECT Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw)
{
/*
@@ -404,7 +404,7 @@
return Info->nPos;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetScrollBarInfo(PWINDOW_OBJECT Window, LONG idObject, PSCROLLBARINFO psbi)
{
INT Bar;
@@ -436,7 +436,7 @@
return TRUE;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntCreateScrollBars(PWINDOW_OBJECT Window)
{
PSCROLLBARINFO psbi;
@@ -483,7 +483,7 @@
return TRUE;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntDestroyScrollBars(PWINDOW_OBJECT Window)
{
if(Window->Scroll)
@@ -495,7 +495,7 @@
return FALSE;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntEnableScrollBar(BOOL Horz, PSCROLLBARINFO Info, UINT wArrows)
{
BOOL Chg = FALSE;
@@ -533,7 +533,7 @@
return Chg;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntEnableWindowScrollBar(PWINDOW_OBJECT Window,
UINT wSBflags,
UINT wArrows)
@@ -588,7 +588,7 @@
return TRUE;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntSetScrollBarInfo(PWINDOW_OBJECT Window,
LONG idObject,
SETSCROLLBARINFO *info)
@@ -623,7 +623,7 @@
}
/* Ported from WINE20020904 (SCROLL_ShowScrollBar) */
-DWORD FASTCALL
+DWORD INTERNAL_CALL
IntShowScrollBar(PWINDOW_OBJECT Window, int wBar, DWORD bShow)
{
DWORD Style, OldStyle;
reactos/subsys/win32k/ntuser
diff -u -r1.33.4.2 -r1.33.4.3
--- timer.c 31 Aug 2004 11:38:56 -0000 1.33.4.2
+++ timer.c 14 Sep 2004 01:00:44 -0000 1.33.4.3
@@ -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: timer.c,v 1.33.4.2 2004/08/31 11:38:56 weiden Exp $
+/* $Id: timer.c,v 1.33.4.3 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -61,7 +61,7 @@
//return true if the new timer became the first entry
//must hold mutex while calling this
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntInsertTimerAscendingOrder(PMSG_TIMER_ENTRY NewTimer)
{
PLIST_ENTRY current;
@@ -84,7 +84,7 @@
//must hold mutex while calling this
-PMSG_TIMER_ENTRY FASTCALL
+PMSG_TIMER_ENTRY INTERNAL_CALL
IntRemoveTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, HANDLE ThreadID, BOOL SysTimer)
{
PMSG_TIMER_ENTRY MsgTimer;
@@ -114,7 +114,7 @@
/*
* NOTE: It doesn't kill the timer. It just removes them from the list.
*/
-VOID FASTCALL
+VOID INTERNAL_CALL
RemoveTimersThread(HANDLE ThreadID)
{
PMSG_TIMER_ENTRY MsgTimer;
@@ -147,7 +147,7 @@
/*
* NOTE: It doesn't kill the timer. It just removes them from the list.
*/
-VOID FASTCALL
+VOID INTERNAL_CALL
RemoveTimersWindow(PWINDOW_OBJECT Window)
{
PMSG_TIMER_ENTRY MsgTimer;
@@ -172,7 +172,7 @@
}
-UINT_PTR FASTCALL
+UINT_PTR INTERNAL_CALL
IntSetTimer(PWINDOW_OBJECT WindowObject, UINT_PTR nIDEvent, UINT uElapse, TIMERPROC lpTimerFunc, BOOL SystemTimer)
{
PMSG_TIMER_ENTRY MsgTimer = NULL;
@@ -279,7 +279,7 @@
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntKillTimer(PWINDOW_OBJECT WindowObject, UINT_PTR uIDEvent, BOOL SystemTimer)
{
PMSG_TIMER_ENTRY MsgTimer;
@@ -435,7 +435,7 @@
}
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
InitTimerImpl(VOID)
{
NTSTATUS Status;
reactos/subsys/win32k/ntuser
diff -u -r1.2 -r1.2.12.1
--- useratom.c 10 May 2004 17:07:18 -0000 1.2
+++ useratom.c 14 Sep 2004 01:00:44 -0000 1.2.12.1
@@ -29,7 +29,7 @@
#define NDEBUG
#include <debug.h>
-RTL_ATOM FASTCALL
+RTL_ATOM INTERNAL_CALL
IntAddAtom(LPWSTR AtomName)
{
PWINSTATION_OBJECT WinStaObject;
@@ -54,7 +54,7 @@
return Atom;
}
-ULONG FASTCALL
+ULONG INTERNAL_CALL
IntGetAtomName(RTL_ATOM nAtom, LPWSTR lpBuffer, ULONG nSize)
{
PWINSTATION_OBJECT WinStaObject;
reactos/subsys/win32k/ntuser
diff -u -r1.1.4.2 -r1.1.4.3
--- userlock.c 1 Sep 2004 22:14:50 -0000 1.1.4.2
+++ userlock.c 14 Sep 2004 01:00:44 -0000 1.1.4.3
@@ -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: userlock.c,v 1.1.4.2 2004/09/01 22:14:50 weiden Exp $
+/* $Id: userlock.c,v 1.1.4.3 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -31,13 +31,13 @@
static ERESOURCE UserLock;
-VOID FASTCALL
+VOID INTERNAL_CALL
IntInitUserResourceLocks(VOID)
{
ExInitializeResourceLite(&UserLock);
}
-VOID FASTCALL
+VOID INTERNAL_CALL
IntCleanupUserResourceLocks(VOID)
{
ExDeleteResourceLite(&UserLock);
reactos/subsys/win32k/ntuser
diff -u -r1.29.12.2 -r1.29.12.3
--- vis.c 12 Sep 2004 19:21:07 -0000 1.29.12.2
+++ vis.c 14 Sep 2004 01:00:44 -0000 1.29.12.3
@@ -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: vis.c,v 1.29.12.2 2004/09/12 19:21:07 weiden Exp $
+ * $Id: vis.c,v 1.29.12.3 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -31,7 +31,7 @@
#include <win32k/debug1.h>
#include <debug.h>
-HRGN FASTCALL
+HRGN INTERNAL_CALL
VIS_ComputeVisibleRegion(
PWINDOW_OBJECT Window,
BOOLEAN ClientArea,
@@ -146,7 +146,7 @@
return VisRgn;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
VIS_WindowLayoutChanged(
PWINDOW_OBJECT Window,
HRGN NewlyExposed)
reactos/subsys/win32k/ntuser
diff -u -r1.66.12.2 -r1.66.12.3
--- windc.c 12 Sep 2004 19:21:07 -0000 1.66.12.2
+++ windc.c 14 Sep 2004 01:00:44 -0000 1.66.12.3
@@ -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: windc.c,v 1.66.12.2 2004/09/12 19:21:07 weiden Exp $
+/* $Id: windc.c,v 1.66.12.3 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -47,13 +47,13 @@
/* FUNCTIONS *****************************************************************/
-VOID FASTCALL
+VOID INTERNAL_CALL
DceInit(VOID)
{
ExInitializeFastMutex(&DceListLock);
}
-HRGN FASTCALL
+HRGN INTERNAL_CALL
DceGetVisRgn(PWINDOW_OBJECT Window, ULONG Flags, PWINDOW_OBJECT Child, ULONG CFlags)
{
HRGN VisRgn;
@@ -68,7 +68,7 @@
return VisRgn;
}
-PDCE FASTCALL
+PDCE INTERNAL_CALL
DceAllocDCE(PWINDOW_OBJECT Window, DCE_TYPE Type)
{
HDCE DceHandle;
@@ -121,7 +121,7 @@
return(Dce);
}
-VOID STATIC STDCALL
+VOID STATIC INTERNAL_CALL
DceSetDrawable(PWINDOW_OBJECT WindowObject, HDC hDC, ULONG Flags,
BOOL SetClipOrigin)
{
@@ -151,7 +151,7 @@
}
-STATIC VOID FASTCALL
+STATIC VOID INTERNAL_CALL
DceDeleteClipRgn(DCE* Dce)
{
Dce->DCXFlags &= ~(DCX_EXCLUDERGN | DCX_INTERSECTRGN | DCX_WINDOWPAINT);
@@ -171,7 +171,7 @@
Dce->DCXFlags |= DCX_DCEDIRTY;
}
-STATIC INT FASTCALL
+STATIC INT INTERNAL_CALL
DceReleaseDC(DCE* dce)
{
if (DCX_DCEBUSY != (dce->DCXFlags & (DCX_DCEEMPTY | DCX_DCEBUSY)))
@@ -207,7 +207,7 @@
return 1;
}
-STATIC VOID FASTCALL
+STATIC VOID INTERNAL_CALL
DceUpdateVisRgn(DCE *Dce, PWINDOW_OBJECT Window, ULONG Flags)
{
HANDLE hRgnVisible = NULL;
@@ -294,7 +294,7 @@
}
}
-HDC FASTCALL
+HDC INTERNAL_CALL
IntGetDCEx(PWINDOW_OBJECT Window, HRGN ClipRegion, ULONG Flags)
{
PWINDOW_OBJECT Parent;
@@ -517,7 +517,7 @@
return(Dce->hDC);
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
DCE_Cleanup(PDCE pDce)
{
PDCE PrevInList;
@@ -545,7 +545,7 @@
return NULL != PrevInList;
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntWindowFromDC(HDC hDc)
{
DCE *Dce;
@@ -560,7 +560,7 @@
return 0;
}
-INT FASTCALL
+INT INTERNAL_CALL
IntReleaseDC(PWINDOW_OBJECT Window, HDC hDc)
{
DCE *dce;
@@ -588,7 +588,7 @@
/***********************************************************************
* DceFreeDCE
*/
-PDCE FASTCALL
+PDCE INTERNAL_CALL
DceFreeDCE(PDCE dce)
{
DCE *ret;
@@ -623,7 +623,7 @@
*
* Remove owned DCE and reset unreleased cache DCEs.
*/
-void FASTCALL
+void INTERNAL_CALL
DceFreeWindowDCE(PWINDOW_OBJECT Window)
{
DCE *pDCE;
@@ -671,7 +671,7 @@
}
}
-void FASTCALL
+void INTERNAL_CALL
DceEmptyCache()
{
while (FirstDce != NULL)
@@ -680,7 +680,7 @@
}
}
-VOID FASTCALL
+VOID INTERNAL_CALL
DceResetActiveDCEs(PWINDOW_OBJECT Window, int DeltaX, int DeltaY)
{
DCE *pDCE;
reactos/subsys/win32k/ntuser
diff -u -r1.244.2.7 -r1.244.2.8
--- window.c 13 Sep 2004 21:28:17 -0000 1.244.2.7
+++ window.c 14 Sep 2004 01:00:44 -0000 1.244.2.8
@@ -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: window.c,v 1.244.2.7 2004/09/13 21:28:17 weiden Exp $
+/* $Id: window.c,v 1.244.2.8 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -45,7 +45,7 @@
* Initialize windowing implementation.
*/
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
InitWindowImpl(VOID)
{
WndProcHandlesArray = ExAllocatePoolWithTag(PagedPool,WPH_SIZE * sizeof(WndProcHandle), TAG_WINPROCLST);
@@ -59,7 +59,7 @@
* Cleanup windowing implementation.
*/
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
CleanupWindowImpl(VOID)
{
ExFreePool(WndProcHandlesArray);
@@ -71,7 +71,7 @@
/* HELPER FUNCTIONS ***********************************************************/
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntGetParent(PWINDOW_OBJECT Wnd)
{
if (Wnd->Style & WS_POPUP)
@@ -89,7 +89,8 @@
/***********************************************************************
* IntSendDestroyMsg
*/
-static void IntSendDestroyMsg(PWINDOW_OBJECT Window)
+static void INTERNAL_CALL
+IntSendDestroyMsg(PWINDOW_OBJECT Window)
{
#if 0 /* FIXME */
GUITHREADINFO info;
@@ -141,7 +142,7 @@
*
* Destroy storage associated to a window. "Internals" p.358
*/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntDestroyWindow(PWINDOW_OBJECT Window,
PW32PROCESS ProcessData,
PW32THREAD ThreadData,
@@ -286,7 +287,7 @@
return 0;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
IntGetWindowBorderMeasures(PWINDOW_OBJECT WindowObject, INT *cx, INT *cy)
{
if(HAS_DLGFRAME(WindowObject->Style, WindowObject->ExStyle) && !(WindowObject->Style & WS_MINIMIZE))
@@ -313,7 +314,7 @@
}
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetWindowInfo(PWINDOW_OBJECT WindowObject, PWINDOWINFO pwi)
{
pwi->cbSize = sizeof(WINDOWINFO);
@@ -332,7 +333,7 @@
/* INTERNAL ******************************************************************/
-VOID FASTCALL
+VOID INTERNAL_CALL
DestroyThreadWindows(struct _ETHREAD *Thread)
{
PLIST_ENTRY Current;
@@ -400,7 +401,7 @@
*
* \note Does not check the validity of the parameters
*/
-VOID FASTCALL
+VOID INTERNAL_CALL
IntGetClientRect(PWINDOW_OBJECT WindowObject, PRECT Rect)
{
ASSERT( WindowObject );
@@ -412,7 +413,7 @@
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntIsChildWindow(PWINDOW_OBJECT Parent, PWINDOW_OBJECT Child)
{
PWINDOW_OBJECT Window;
@@ -436,7 +437,7 @@
return(FALSE);
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntIsWindowVisible(PWINDOW_OBJECT Wnd)
{
PWINDOW_OBJECT Window;
@@ -463,7 +464,7 @@
/* link the window into siblings and parent. children are kept in place. */
-VOID FASTCALL
+VOID INTERNAL_CALL
IntLinkWindow(
PWINDOW_OBJECT Wnd,
PWINDOW_OBJECT WndParent,
@@ -510,14 +511,14 @@
}
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntSetOwner(PWINDOW_OBJECT Window, PWINDOW_OBJECT NewOwner)
{
ASSERT(Window);
return (PWINDOW_OBJECT)InterlockedExchange((LONG*)&Window->Owner, (LONG)NewOwner);
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntSetParent(PWINDOW_OBJECT Window, PWINDOW_OBJECT WndNewParent)
{
PWINDOW_OBJECT WndOldParent, Sibling, InsertAfter;
@@ -612,7 +613,7 @@
/* unlink the window from siblings and parent. children are kept in place. */
-VOID FASTCALL
+VOID INTERNAL_CALL
IntUnlinkWindow(PWINDOW_OBJECT Wnd)
{
PWINDOW_OBJECT WndParent;
@@ -628,7 +629,7 @@
Wnd->PrevSibling = Wnd->NextSibling = Wnd->Parent = NULL;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntAnyPopup(VOID)
{
PWINDOW_OBJECT Window, Child;
@@ -657,7 +658,7 @@
/*
* calculates the default position of a window
*/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntCalcDefPosSize(PWINDOW_OBJECT Parent, PWINDOW_OBJECT WindowObject, RECT *rc, BOOL IncPos)
{
SIZE Sz;
@@ -701,7 +702,7 @@
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntCreateWindow(DWORD dwExStyle,
PUNICODE_STRING ClassName,
PUNICODE_STRING WindowName,
@@ -1263,7 +1264,7 @@
return WindowObject;
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntFindWindow(PWINDOW_OBJECT Parent,
PWINDOW_OBJECT ChildAfter,
PCLASS_OBJECT ClassObject,
@@ -1305,7 +1306,7 @@
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntGetAncestor(PWINDOW_OBJECT Window, UINT Type)
{
PWINDOW_OBJECT WndAncestor, Parent;
@@ -1350,7 +1351,7 @@
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntGetShellWindow(VOID)
{
PWINSTATION_OBJECT WinStaObject;
@@ -1368,7 +1369,7 @@
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntSetShellWindowEx(PWINDOW_OBJECT Shell, PWINDOW_OBJECT ListView)
{
PWINSTATION_OBJECT WinStaObject;
@@ -1424,7 +1425,7 @@
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntGetRelatedWindow(PWINDOW_OBJECT WindowObject, UINT Relationship)
{
PWINDOW_OBJECT Parent;
@@ -1464,7 +1465,7 @@
}
-LONG FASTCALL
+LONG INTERNAL_CALL
IntGetWindowLong(PWINDOW_OBJECT WindowObject, INT Index, BOOL Ansi)
{
LONG Result = 0;
@@ -1547,7 +1548,7 @@
}
-LONG FASTCALL
+LONG INTERNAL_CALL
IntSetWindowLong(PWINDOW_OBJECT WindowObject, INT Index, LONG NewValue, BOOL Ansi)
{
PWINDOW_OBJECT Parent;
@@ -1663,7 +1664,7 @@
return OldValue;
}
-WORD FASTCALL
+WORD INTERNAL_CALL
IntSetWindowWord(PWINDOW_OBJECT WindowObject, INT Index, WORD NewValue)
{
WORD OldValue;
@@ -1698,7 +1699,7 @@
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetWindowPlacement(PWINDOW_OBJECT WindowObject,
WINDOWPLACEMENT *lpwndpl)
{
@@ -1728,7 +1729,7 @@
}
-ULONG FASTCALL
+ULONG INTERNAL_CALL
IntGetWindowThreadProcessId(PWINDOW_OBJECT Window, ULONG *Pid)
{
ASSERT(Window);
@@ -1754,7 +1755,7 @@
DesktopWindow, it shutdown the system
and rebooted.
*/
-DWORD FASTCALL
+DWORD INTERNAL_CALL
IntQueryWindow(PWINDOW_OBJECT Window, DWORD Index)
{
DWORD Result;
@@ -1784,7 +1785,7 @@
}
-UINT FASTCALL
+UINT INTERNAL_CALL
IntRegisterWindowMessage(PUNICODE_STRING MessageName)
{
/* WARNING !!! The Unicode string is supposed to be NULL-Terminated! */
@@ -1794,7 +1795,7 @@
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntSetWindowPlacement(PWINDOW_OBJECT WindowObject,
WINDOWPLACEMENT *lpwndpl)
{
@@ -1831,7 +1832,7 @@
}
-INT FASTCALL
+INT INTERNAL_CALL
IntGetWindowRgn(PWINDOW_OBJECT WindowObject, HRGN hRgn)
{
INT Ret;
@@ -1867,7 +1868,7 @@
return Ret;
}
-INT FASTCALL
+INT INTERNAL_CALL
IntGetWindowRgnBox(PWINDOW_OBJECT WindowObject, RECT *Rect)
{
INT Ret;
@@ -1903,7 +1904,7 @@
}
-INT FASTCALL
+INT INTERNAL_CALL
IntSetWindowRgn(
PWINDOW_OBJECT WindowObject,
HRGN hRgn,
@@ -1932,7 +1933,7 @@
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntWindowFromPoint(LONG X, LONG Y)
{
POINT pt;
@@ -1953,7 +1954,7 @@
return NULL;
}
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
IntGetWindow(PWINDOW_OBJECT Window, UINT uCmd)
{
ASSERT(Window);
@@ -1985,7 +1986,7 @@
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntDefSetText(PWINDOW_OBJECT WindowObject, PUNICODE_STRING WindowText)
{
/* WARNING - do not use or free the WindowText after this call ! */
@@ -2007,7 +2008,7 @@
return FALSE;
}
-INT FASTCALL
+INT INTERNAL_CALL
IntInternalGetWindowText(PWINDOW_OBJECT WindowObject, WCHAR *Buffer, INT nMaxCount)
{
INT Result;
@@ -2036,7 +2037,7 @@
/* WINPROC ********************************************************************/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntDereferenceWndProcHandle(WNDPROC wpHandle, WndProcHandle *Data)
{
WndProcHandle Entry;
@@ -2053,7 +2054,7 @@
return FALSE;
}
-DWORD FASTCALL
+DWORD INTERNAL_CALL
IntAddWndProcHandle(WNDPROC WindowProc, BOOL IsUnicode)
{
WORD i;
@@ -2086,7 +2087,7 @@
return FreeSpot + 0xFFFF0000;
}
-DWORD FASTCALL
+DWORD INTERNAL_CALL
IntRemoveWndProcHandle(WNDPROC Handle)
{
WORD position;
@@ -2101,7 +2102,7 @@
return TRUE;
}
-DWORD FASTCALL
+DWORD INTERNAL_CALL
IntRemoveProcessWndProcHandles(HANDLE ProcessID)
{
WORD i;
reactos/subsys/win32k/ntuser
diff -u -r1.120.2.3 -r1.120.2.4
--- winpos.c 12 Sep 2004 19:21:08 -0000 1.120.2.3
+++ winpos.c 14 Sep 2004 01:00:44 -0000 1.120.2.4
@@ -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: winpos.c,v 1.120.2.3 2004/09/12 19:21:08 weiden Exp $
+/* $Id: winpos.c,v 1.120.2.4 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -49,7 +49,7 @@
/* FUNCTIONS *****************************************************************/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetClientOrigin(PWINDOW_OBJECT Window, LPPOINT Point)
{
if(Window == NULL)
@@ -74,7 +74,7 @@
*
* Activates window other than pWnd.
*/
-VOID FASTCALL
+VOID INTERNAL_CALL
WinPosActivateOtherWindow(PWINDOW_OBJECT Window)
{
PWINDOW_OBJECT Wnd;
@@ -118,13 +118,13 @@
}
}
-VOID STATIC FASTCALL
+VOID STATIC INTERNAL_CALL
WinPosFindIconPos(PWINDOW_OBJECT Window, POINT *Pos)
{
/* FIXME */
}
-PINTERNALPOS FASTCALL
+PINTERNALPOS INTERNAL_CALL
WinPosInitInternalPos(PWINDOW_OBJECT WindowObject, POINT *pt, PRECT RestoreRect)
{
PWINDOW_OBJECT Parent;
@@ -174,7 +174,7 @@
return WindowObject->InternalPos;
}
-UINT FASTCALL
+UINT INTERNAL_CALL
WinPosMinMaximize(PWINDOW_OBJECT WindowObject, UINT ShowFlag, RECT* NewPos)
{
POINT Size;
@@ -280,7 +280,7 @@
return(SwpFlags);
}
-VOID FASTCALL
+VOID INTERNAL_CALL
WinPosFillMinMaxInfoStruct(PWINDOW_OBJECT Window, MINMAXINFO *Info)
{
INT XInc, YInc;
@@ -312,7 +312,7 @@
}
}
-UINT FASTCALL
+UINT INTERNAL_CALL
WinPosGetMinMaxInfo(PWINDOW_OBJECT Window, POINT* MaxSize, POINT* MaxPos,
POINT* MinTrack, POINT* MaxTrack)
{
@@ -335,7 +335,7 @@
return 0; //FIXME: what does it return?
}
-STATIC VOID FASTCALL
+STATIC VOID INTERNAL_CALL
FixClientRect(PRECT ClientRect, PRECT WindowRect)
{
if (ClientRect->left < WindowRect->left)
@@ -372,7 +372,7 @@
}
}
-VOID STATIC FASTCALL
+VOID STATIC INTERNAL_CALL
InternalWindowPosToWinPosStructure(PWINDOWPOS WinPos, PINTERNAL_WINDOWPOS WindowPos)
{
/* convert the PWINDOW_OBJECTs to HWNDs or HWND_* constants */
@@ -385,7 +385,7 @@
WinPos->flags = WindowPos->flags;
}
-VOID STATIC FASTCALL
+VOID STATIC INTERNAL_CALL
WinPosToInternalWindowPosStructure(PINTERNAL_WINDOWPOS WindowPos, PWINDOWPOS WinPos)
{
/* convert the HWNDs to PWINDOW_OBJECTs or WINDOW_* constants */
@@ -412,7 +412,7 @@
WindowPos->flags = WinPos->flags;
}
-LONG STATIC FASTCALL
+LONG STATIC INTERNAL_CALL
WinPosDoNCCALCSize(PWINDOW_OBJECT Window, PINTERNAL_WINDOWPOS WinPos,
RECT* WindowRect, RECT* ClientRect)
{
@@ -488,7 +488,7 @@
return wvrFlags;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
WinPosDoWinPosChanging(PWINDOW_OBJECT WindowObject,
PINTERNAL_WINDOWPOS WinPos,
PRECT WindowRect,
@@ -544,7 +544,7 @@
* Fix Z order taking into account owned popups -
* basically we need to maintain them above the window that owns them
*/
-PWINDOW_OBJECT FASTCALL
+PWINDOW_OBJECT INTERNAL_CALL
WinPosDoOwnedPopups(PWINDOW_OBJECT Window, PWINDOW_OBJECT InsertAfter)
{
LONG Style;
@@ -624,7 +624,7 @@
* Update WindowRect and ClientRect of Window and all of its children
* We keep both WindowRect and ClientRect in screen coordinates internally
*/
-VOID STATIC FASTCALL
+VOID STATIC INTERNAL_CALL
WinPosInternalMoveWindow(PWINDOW_OBJECT Window, INT MoveX, INT MoveY)
{
PWINDOW_OBJECT Child;
@@ -651,7 +651,7 @@
* Fix redundant flags and values in the WINDOWPOS structure.
*/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
WinPosFixupFlags(PWINDOW_OBJECT Window, INTERNAL_WINDOWPOS *WinPos)
{
if (Window->Style & WS_VISIBLE)
@@ -758,7 +758,7 @@
}
/* x and y are always screen relative */
-BOOLEAN FASTCALL
+BOOLEAN INTERNAL_CALL
WinPosSetWindowPos(PWINDOW_OBJECT Window, PWINDOW_OBJECT InsertAfter, INT x, INT y, INT cx,
INT cy, UINT flags)
{
@@ -1147,7 +1147,7 @@
return TRUE;
}
-LRESULT FASTCALL
+LRESULT INTERNAL_CALL
WinPosGetNonClientSize(PWINDOW_OBJECT Window, RECT* WindowRect, RECT* ClientRect)
{
LRESULT Result;
@@ -1162,7 +1162,7 @@
return Result;
}
-BOOLEAN FASTCALL
+BOOLEAN INTERNAL_CALL
WinPosShowWindow(PWINDOW_OBJECT Window, INT Cmd)
{
BOOLEAN WasVisible;
@@ -1326,7 +1326,7 @@
return(WasVisible);
}
-STATIC VOID FASTCALL
+STATIC VOID INTERNAL_CALL
WinPosSearchChildren(
PWINDOW_OBJECT ScopeWin, PUSER_MESSAGE_QUEUE OnlyHitTests, POINT *Point,
PWINDOW_OBJECT* Window, USHORT *HitTest)
@@ -1378,7 +1378,7 @@
}
}
-USHORT FASTCALL
+USHORT INTERNAL_CALL
WinPosWindowFromPoint(PWINDOW_OBJECT ScopeWin, PUSER_MESSAGE_QUEUE OnlyHitTests, POINT *WinPoint,
PWINDOW_OBJECT* Window)
{
reactos/subsys/win32k/ntuser
diff -u -r1.64.8.2 -r1.64.8.3
--- winsta.c 18 Jul 2004 23:44:01 -0000 1.64.8.2
+++ winsta.c 14 Sep 2004 01:00:44 -0000 1.64.8.3
@@ -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: winsta.c,v 1.64.8.2 2004/07/18 23:44:01 weiden Exp $
+ * $Id: winsta.c,v 1.64.8.3 2004/09/14 01:00:44 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -47,7 +47,7 @@
/* INITALIZATION FUNCTIONS ****************************************************/
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
InitWindowStationImpl(VOID)
{
OBJECT_ATTRIBUTES ObjectAttributes;
@@ -74,7 +74,7 @@
return STATUS_SUCCESS;
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
CleanupWindowStationImpl(VOID)
{
return STATUS_SUCCESS;
@@ -93,7 +93,7 @@
* TRUE on success, FALSE on failure.
*/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetFullWindowStationName(
OUT PUNICODE_STRING FullName,
IN PUNICODE_STRING WinStaName,
@@ -143,7 +143,7 @@
* fucntion fails, last error is set.
*/
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
IntValidateWindowStationHandle(
HWINSTA WindowStation,
KPROCESSOR_MODE AccessMode,
@@ -166,7 +166,7 @@
return Status;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetWindowStationObject(PWINSTATION_OBJECT Object)
{
NTSTATUS Status;
@@ -180,7 +180,7 @@
return NT_SUCCESS(Status);
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntInitializeDesktopGraphics(VOID)
{
UNICODE_STRING DriverName;
@@ -206,7 +206,7 @@
return TRUE;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
IntEndDesktopGraphics(VOID)
{
NtUserAcquireOrReleaseInputOwnership(TRUE);
@@ -221,7 +221,7 @@
IntDestroyPrimarySurface();
}
-HDC FASTCALL
+HDC INTERNAL_CALL
IntGetScreenDC(VOID)
{
return ScreenDeviceContext;
reactos/subsys/win32k/objects
diff -u -r1.9 -r1.9.8.1
--- bezier.c 20 Jun 2004 00:45:37 -0000 1.9
+++ bezier.c 14 Sep 2004 01:00:45 -0000 1.9.8.1
@@ -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: bezier.c,v 1.9 2004/06/20 00:45:37 navaraf Exp $ */
+/* $Id: bezier.c,v 1.9.8.1 2004/09/14 01:00:45 weiden Exp $ */
#include <w32k.h>
@@ -71,7 +71,8 @@
* level is the recursion depth
* returns true if the recusion can be terminated
*/
-static BOOL FASTCALL BezierCheck( int level, POINT *Points)
+static BOOL INTERNAL_CALL
+BezierCheck( int level, POINT *Points)
{
INT dx, dy;
@@ -140,8 +141,9 @@
/* Helper for GDI_Bezier.
* Just handles one Bezier, so Points should point to four POINTs
*/
-static void STDCALL GDI_InternalBezier( POINT *Points, POINT **PtsOut, INT *dwOut,
- INT *nPtsOut, INT level )
+static void INTERNAL_CALL
+GDI_InternalBezier( POINT *Points, POINT **PtsOut, INT *dwOut,
+ INT *nPtsOut, INT level )
{
if(*nPtsOut == *dwOut) {
*dwOut *= 2;
@@ -200,7 +202,8 @@
* alternative would be to call the function twice, once to determine the size
* and a second time to do the work - I decided this was too much of a pain].
*/
-POINT * FASTCALL GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut )
+POINT * INTERNAL_CALL
+GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut )
{
POINT *out;
INT Bezier, dwOut = BEZIER_INITBUFSIZE, i;
reactos/subsys/win32k/objects
diff -u -r1.79.2.1 -r1.79.2.2
--- bitmaps.c 12 Sep 2004 19:21:08 -0000 1.79.2.1
+++ bitmaps.c 14 Sep 2004 01:00:45 -0000 1.79.2.2
@@ -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: bitmaps.c,v 1.79.2.1 2004/09/12 19:21:08 weiden Exp $ */
+/* $Id: bitmaps.c,v 1.79.2.2 2004/09/14 01:00:45 weiden Exp $ */
#include <w32k.h>
#define IN_RECT(r,x,y) \
@@ -418,7 +418,7 @@
return hBitmap;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
BITMAP_Cleanup(PBITMAPOBJ pBmp)
{
if (pBmp->SurfObj.pvBits != NULL &&
@@ -438,7 +438,7 @@
}
-HBITMAP FASTCALL
+HBITMAP INTERNAL_CALL
IntCreateCompatibleBitmap(
PDC Dc,
INT Width,
@@ -1160,7 +1160,7 @@
/* Internal Functions */
-INT FASTCALL
+INT INTERNAL_CALL
BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp)
{
#if 0
@@ -1194,7 +1194,7 @@
return ((bmWidth * bpp + 15) & ~15) >> 3;
}
-HBITMAP FASTCALL
+HBITMAP INTERNAL_CALL
BITMAPOBJ_CopyBitmap(HBITMAP hBitmap)
{
HBITMAP res;
@@ -1219,7 +1219,7 @@
return res;
}
-INT STDCALL
+INT INTERNAL_CALL
BITMAP_GetObject(BITMAPOBJ * bmp, INT count, LPVOID buffer)
{
if(bmp->dib)
reactos/subsys/win32k/objects
diff -u -r1.40.2.1 -r1.40.2.2
--- brush.c 12 Sep 2004 19:21:08 -0000 1.40.2.1
+++ brush.c 14 Sep 2004 01:00:45 -0000 1.40.2.2
@@ -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.40.2.1 2004/09/12 19:21:08 weiden Exp $
+ * $Id: brush.c,v 1.40.2.2 2004/09/14 01:00:45 weiden Exp $
*/
#include <w32k.h>
@@ -31,7 +31,7 @@
{0x81, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x81} /* HS_DIAGCROSS */
};
-BOOL FASTCALL
+BOOL INTERNAL_CALL
BRUSH_Cleanup(PGDIBRUSHOBJ pBrush)
{
if(pBrush->flAttrs & (GDIBRUSH_IS_HATCH | GDIBRUSH_IS_BITMAP))
@@ -43,7 +43,7 @@
return TRUE;
}
-XLATEOBJ* FASTCALL
+XLATEOBJ* INTERNAL_CALL
IntGdiCreateBrushXlate(PDC Dc, GDIBRUSHOBJ *BrushObj, BOOLEAN *Failed)
{
XLATEOBJ *Result = NULL;
@@ -78,7 +78,7 @@
return Result;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
IntGdiInitBrushInstance(GDIBRUSHINST *BrushInst, PGDIBRUSHOBJ BrushObj, XLATEOBJ *XlateObj)
{
if (BrushObj->flAttrs & GDIBRUSH_IS_NULL)
@@ -93,7 +93,7 @@
BrushInst->XlateObject = XlateObj;
}
-HBRUSH FASTCALL
+HBRUSH INTERNAL_CALL
IntGdiCreateBrushIndirect(PLOGBRUSH LogBrush)
{
PGDIBRUSHOBJ BrushObject;
@@ -169,7 +169,7 @@
return NULL;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntPatBlt(
PDC dc,
INT XLeft,
@@ -242,7 +242,7 @@
return ret;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiPolyPatBlt(
HDC hDC,
DWORD dwRop,
reactos/subsys/win32k/objects
diff -u -r1.42.2.1 -r1.42.2.2
--- cliprgn.c 12 Sep 2004 19:21:08 -0000 1.42.2.1
+++ cliprgn.c 14 Sep 2004 01:00:45 -0000 1.42.2.2
@@ -16,10 +16,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: cliprgn.c,v 1.42.2.1 2004/09/12 19:21:08 weiden Exp $ */
+/* $Id: cliprgn.c,v 1.42.2.2 2004/09/14 01:00:45 weiden Exp $ */
#include <w32k.h>
-int FASTCALL
+int INTERNAL_CALL
CLIPPING_UpdateGCRegion(DC* Dc)
{
PROSRGNDATA CombinedRegion;
@@ -50,7 +50,8 @@
return NtGdiOffsetRgn(Dc->w.hGCClipRgn, -Dc->w.DCOrgX, -Dc->w.DCOrgY);
}
-HRGN WINAPI SaveVisRgn(HDC hdc)
+HRGN INTERNAL_CALL
+SaveVisRgn(HDC hdc)
{
HRGN copy;
PROSRGNDATA obj, copyObj;
@@ -171,7 +172,7 @@
return retval;
}
-INT FASTCALL
+INT INTERNAL_CALL
IntGdiGetClipBox(HDC hDC, LPRECT rc)
{
PROSRGNDATA Rgn;
reactos/subsys/win32k/objects
diff -u -r1.50.2.1 -r1.50.2.2
--- color.c 12 Sep 2004 19:21:08 -0000 1.50.2.1
+++ color.c 14 Sep 2004 01:00:45 -0000 1.50.2.2
@@ -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: color.c,v 1.50.2.1 2004/09/12 19:21:08 weiden Exp $ */
+/* $Id: color.c,v 1.50.2.2 2004/09/14 01:00:45 weiden Exp $ */
#include <w32k.h>
// FIXME: Use PXLATEOBJ logicalToSystem instead of int *mapping
@@ -62,7 +62,8 @@
{ 0xff, 0xff, 0xff, PC_SYS_USED } // last 10
};
-const PALETTEENTRY* FASTCALL COLOR_GetSystemPaletteTemplate(void)
+const PALETTEENTRY* INTERNAL_CALL
+COLOR_GetSystemPaletteTemplate(void)
{
return (const PALETTEENTRY*)&COLOR_sysPalTemplate;
}
@@ -140,7 +141,7 @@
return FALSE;
}
-unsigned short GetNumberOfBits(unsigned int dwMask)
+inline unsigned short GetNumberOfBits(unsigned int dwMask)
{
unsigned short wBits;
for (wBits = 0; dwMask; dwMask = dwMask & (dwMask - 1))
@@ -545,8 +546,9 @@
return NtUserRedrawWindow(hWnd, NULL, 0, RDW_INVALIDATE);
}
-INT STDCALL COLOR_PaletteLookupPixel(PALETTEENTRY *palPalEntry, INT size,
- XLATEOBJ *XlateObj, COLORREF col, BOOL skipReserved)
+INT INTERNAL_CALL
+COLOR_PaletteLookupPixel(PALETTEENTRY *palPalEntry, INT size,
+ XLATEOBJ *XlateObj, COLORREF col, BOOL skipReserved)
{
int i, best = 0, diff = 0x7fffffff;
int r, g, b;
@@ -573,7 +575,8 @@
return (XlateObj->pulXlate) ? (INT)XlateObj->pulXlate[best] : best;
}
-COLORREF STDCALL COLOR_LookupNearestColor( PALETTEENTRY* palPalEntry, int size, COLORREF color )
+COLORREF INTERNAL_CALL
+COLOR_LookupNearestColor( PALETTEENTRY* palPalEntry, int size, COLORREF color )
{
INT index;
@@ -584,8 +587,9 @@
palPalEntry[index].peBlue);
}
-int STDCALL COLOR_PaletteLookupExactIndex( PALETTEENTRY* palPalEntry, int size,
- COLORREF col )
+int INTERNAL_CALL
+COLOR_PaletteLookupExactIndex( PALETTEENTRY* palPalEntry, int size,
+ COLORREF col )
{
int i;
BYTE r = GetRValue(col), g = GetGValue(col), b = GetBValue(col);
reactos/subsys/win32k/objects
diff -u -r1.26.2.1 -r1.26.2.2
--- coord.c 12 Sep 2004 19:21:08 -0000 1.26.2.1
+++ coord.c 14 Sep 2004 01:00:45 -0000 1.26.2.2
@@ -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: coord.c,v 1.26.2.1 2004/09/12 19:21:08 weiden Exp $
+/* $Id: coord.c,v 1.26.2.2 2004/09/14 01:00:45 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -30,7 +30,7 @@
/* FUNCTIONS *****************************************************************/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiCombineTransform(LPXFORM XFormResult,
LPXFORM xform1,
LPXFORM xform2)
@@ -89,7 +89,7 @@
return Ret;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
CoordDPtoLP(PDC Dc, LPPOINT Point)
{
FLOAT x, y;
@@ -101,8 +101,7 @@
y * Dc->w.xformVport2World.eM22 + Dc->w.xformVport2World.eDy;
}
-VOID
-FASTCALL
+VOID INTERNAL_CALL
IntDPtoLP ( PDC dc, LPPOINT Points, INT Count )
{
INT i;
@@ -180,8 +179,7 @@
return TRUE;
}
-int
-FASTCALL
+int INTERNAL_CALL
IntGetGraphicsMode ( PDC dc )
{
ASSERT ( dc );
@@ -235,8 +233,7 @@
return NT_SUCCESS(Status);
}
-VOID
-FASTCALL
+VOID INTERNAL_CALL
CoordLPtoDP ( PDC Dc, LPPOINT Point )
{
FLOAT x, y;
@@ -252,8 +249,7 @@
y * Dc->w.xformWorld2Vport.eM22 + Dc->w.xformWorld2Vport.eDy;
}
-VOID
-FASTCALL
+VOID INTERNAL_CALL
IntLPtoDP ( PDC dc, LPPOINT Points, INT Count )
{
INT i;
reactos/subsys/win32k/objects
diff -u -r1.63.2.2 -r1.63.2.3
--- cursoricon.c 12 Sep 2004 19:21:08 -0000 1.63.2.2
+++ cursoricon.c 14 Sep 2004 01:00:45 -0000 1.63.2.3
@@ -16,11 +16,11 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: cursoricon.c,v 1.63.2.2 2004/09/12 19:21:08 weiden Exp $ */
+/* $Id: cursoricon.c,v 1.63.2.3 2004/09/14 01:00:45 weiden Exp $ */
#include <w32k.h>
#define COLORCURSORS_ALLOWED FALSE
-PCURSOR_OBJECT FASTCALL
+PCURSOR_OBJECT INTERNAL_CALL
IntSetCursor(PCURSOR_OBJECT NewCursor, BOOL ForceChange)
{
BITMAPOBJ *BitmapObj;
@@ -225,7 +225,7 @@
LONG cy;
} INT_FINDEXISTINGCURSOR, *PINT_FINDEXISTINGCURSOR;
-BOOL FASTCALL
+BOOL INTERNAL_CALL
_FindExistingCursorObjectCallBack(PCURSOR_OBJECT CursorObject, PINT_FINDEXISTINGCURSOR FindData)
{
if(CursorObject->hModule == FindData->hModule && CursorObject->hRsrc == FindData->hRsrc &&
@@ -238,7 +238,7 @@
return FALSE;
}
-PCURSOR_OBJECT FASTCALL
+PCURSOR_OBJECT INTERNAL_CALL
IntFindExistingCursorObject(HMODULE hModule, HRSRC hRsrc, LONG cx, LONG cy)
{
INT_FINDEXISTINGCURSOR fec;
@@ -252,7 +252,7 @@
otCURSOR, &fec, (PFNENUMHANDLESPROC)_FindExistingCursorObjectCallBack);
}
-PCURSOR_OBJECT FASTCALL
+PCURSOR_OBJECT INTERNAL_CALL
IntCreateCursorObject(HANDLE *Handle)
{
PCURSOR_OBJECT Object;
@@ -281,7 +281,7 @@
return Object;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntDestroyCursorObject(PCURSOR_OBJECT Object, BOOL RemoveFromProcess)
{
PSYSTEM_CURSORINFO CurInfo;
@@ -329,7 +329,7 @@
return TRUE;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
IntCleanupCurIcons(struct _EPROCESS *Process, PW32PROCESS Win32Process)
{
PWINSTATION_OBJECT WinStaObject;
@@ -354,7 +354,7 @@
IntUnLockProcessCursorIcons(Win32Process);
}
-VOID FASTCALL
+VOID INTERNAL_CALL
IntGetCursorIconInfo(PCURSOR_OBJECT Cursor, PICONINFO IconInfo)
{
ASSERT(Cursor);
@@ -366,7 +366,7 @@
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetCursorIconSize(PCURSOR_OBJECT Cursor,
BOOL *fIcon,
SIZE *Size)
@@ -396,7 +396,7 @@
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetCursorInfo(PCURSORINFO pci)
{
PSYSTEM_CURSORINFO CurInfo;
@@ -421,7 +421,7 @@
}
-VOID FASTCALL
+VOID INTERNAL_CALL
IntGetClipCursor(RECT *lpRect)
{
/* FIXME - check if process has WINSTA_READATTRIBUTES */
@@ -447,7 +447,7 @@
}
-VOID FASTCALL
+VOID INTERNAL_CALL
IntSetCursorIconData(PCURSOR_OBJECT Cursor, BOOL *fIcon, POINT *Hotspot,
HMODULE hModule, HRSRC hRsrc, HRSRC hGroupRsrc)
{
@@ -470,7 +470,7 @@
#define CANSTRETCHBLT 0
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntDrawIconEx(HDC hdc, int xLeft, int yTop, PCURSOR_OBJECT Cursor, int cxWidth, int cyWidth,
UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags)
{
reactos/subsys/win32k/objects
diff -u -r1.144.2.3 -r1.144.2.4
--- dc.c 13 Sep 2004 21:28:17 -0000 1.144.2.3
+++ dc.c 14 Sep 2004 01:00:45 -0000 1.144.2.4
@@ -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: dc.c,v 1.144.2.3 2004/09/13 21:28:17 weiden Exp $
+/* $Id: dc.c,v 1.144.2.4 2004/09/14 01:00:45 weiden Exp $
*
* DC.C - Device context functions
*
@@ -56,7 +56,7 @@
* we can do whatever we want.
*/
#define DC_GET_VAL_EX( FuncName, ret_x, ret_y, type, ax, ay ) \
-VOID FASTCALL Int##FuncName ( PDC dc, LP##type pt) \
+VOID INTERNAL_CALL Int##FuncName ( PDC dc, LP##type pt) \
{ \
ASSERT(dc); \
ASSERT(pt); \
@@ -228,7 +228,7 @@
return hNewDC;
}
-static BOOL FASTCALL
+static BOOL INTERNAL_CALL
GetRegistryPath(PUNICODE_STRING RegistryPath, ULONG DisplayNumber)
{
RTL_QUERY_REGISTRY_TABLE QueryTable[2];
@@ -258,7 +258,7 @@
return TRUE;
}
-static BOOL FASTCALL
+static BOOL INTERNAL_CALL
FindDriverFileNames(PUNICODE_STRING DriverFileNames, ULONG DisplayNumber)
{
RTL_QUERY_REGISTRY_TABLE QueryTable[2];
@@ -341,7 +341,7 @@
return STATUS_SUCCESS;
}
-static BOOL FASTCALL
+static BOOL INTERNAL_CALL
SetupDevMode(PDEVMODEW DevMode, ULONG DisplayNumber)
{
static WCHAR RegistryMachineSystem[] = L"\\REGISTRY\\MACHINE\\SYSTEM\\";
@@ -453,7 +453,7 @@
return Valid;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntCreatePrimarySurface()
{
PGD_ENABLEDRIVER GDEnableDriver;
@@ -660,7 +660,7 @@
return TRUE;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
IntDestroyPrimarySurface()
{
DRIVER_UnreferenceDriver(L"DISPLAY");
@@ -680,7 +680,7 @@
ObDereferenceObject(PrimarySurface.VideoFileObject);
}
-HDC FASTCALL
+HDC INTERNAL_CALL
IntGdiCreateDC(PUNICODE_STRING Driver,
PUNICODE_STRING Device,
PUNICODE_STRING Output,
@@ -977,7 +977,7 @@
DC_GET_VAL_EX ( GetCurrentPositionEx, w.CursPosX, w.CursPosY, POINT, x, y )
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiGetDCOrgEx(DC *dc, LPPOINT Point)
{
Point->x = dc->w.DCOrgX;
@@ -1464,7 +1464,7 @@
DC_GET_VAL( INT, NtGdiGetMapMode, w.MapMode )
DC_GET_VAL( INT, NtGdiGetPolyFillMode, w.polyFillMode )
-INT FASTCALL
+INT INTERNAL_CALL
IntGdiGetObject(HANDLE Handle, INT Count, LPVOID Buffer)
{
PGDIOBJHDR GdiObject;
@@ -1945,7 +1945,7 @@
// ---------------------------------------------------- Private Interface
-HDC FASTCALL
+HDC INTERNAL_CALL
DC_AllocDC(PUNICODE_STRING Driver)
{
PDC NewDC;
@@ -2008,7 +2008,7 @@
return hDC;
}
-HDC FASTCALL
+HDC INTERNAL_CALL
DC_FindOpenDC(PUNICODE_STRING Driver)
{
return NULL;
@@ -2017,7 +2017,7 @@
/*!
* Initialize some common fields in the Device Context structure.
*/
-VOID FASTCALL
+VOID INTERNAL_CALL
DC_InitDC(HDC DCHandle)
{
// NtGdiRealizeDefaultPalette(DCHandle);
@@ -2030,7 +2030,7 @@
}
-VOID FASTCALL
+VOID INTERNAL_CALL
DC_FreeDC(HDC DCToFree)
{
if (!GDIOBJ_FreeObj(DCToFree, GDI_OBJECT_TYPE_DC))
@@ -2039,26 +2039,26 @@
}
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
DC_Cleanup( PDC pDC )
{
RtlFreeUnicodeString(&pDC->DriverName);
return TRUE;
}
-HDC FASTCALL
+HDC INTERNAL_CALL
DC_GetNextDC (PDC pDC)
{
return pDC->hNext;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
DC_SetNextDC (PDC pDC, HDC hNextDC)
{
pDC->hNext = hNextDC;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
DC_UpdateXforms(PDC dc)
{
XFORM xformWnd2Vport;
@@ -2081,7 +2081,7 @@
dc->w.vport2WorldValid = DC_InvertXform(&dc->w.xformWorld2Vport, &dc->w.xformVport2World);
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
DC_InvertXform(const XFORM *xformSrc,
XFORM *xformDest)
{
@@ -2103,7 +2103,7 @@
return TRUE;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
DC_SetOwnership(HDC hDC, PEPROCESS Owner)
{
PDC DC;
@@ -2128,7 +2128,7 @@
}
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntIsPrimarySurface(SURFOBJ *SurfObj)
{
if (PrimarySurface.Handle == NULL)
@@ -2142,7 +2142,7 @@
* Returns the color of the brush or pen that is currently selected into the DC.
* This function is called from GetDCBrushColor() and GetDCPenColor()
*/
-COLORREF FASTCALL
+COLORREF INTERNAL_CALL
IntGetDCColor(HDC hDC, ULONG Object)
{
/*
@@ -2165,7 +2165,7 @@
* Changes the color of the brush or pen that is currently selected into the DC.
* This function is called from SetDCBrushColor() and SetDCPenColor()
*/
-COLORREF FASTCALL
+COLORREF INTERNAL_CALL
IntSetDCColor(HDC hDC, ULONG Object, COLORREF Color)
{
/* See the comment in IntGetDCColor. */
reactos/subsys/win32k/objects
diff -u -r1.56.4.1 -r1.56.4.2
--- dib.c 12 Sep 2004 19:21:08 -0000 1.56.4.1
+++ dib.c 14 Sep 2004 01:00:45 -0000 1.56.4.2
@@ -1,5 +1,5 @@
/*
- * $Id: dib.c,v 1.56.4.1 2004/09/12 19:21:08 weiden Exp $
+ * $Id: dib.c,v 1.56.4.2 2004/09/14 01:00:45 weiden Exp $
*
* ReactOS W32 Subsystem
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team
@@ -108,7 +108,7 @@
}
// Converts a DIB to a device-dependent bitmap
-static INT FASTCALL
+static INT INTERNAL_CALL
IntSetDIBits(
PDC DC,
HBITMAP hBitmap,
@@ -585,7 +585,7 @@
return ret;
}
-static HBITMAP FASTCALL
+static HBITMAP INTERNAL_CALL
IntCreateDIBitmap(PDC Dc, const BITMAPINFOHEADER *header,
DWORD init, LPCVOID bits, const BITMAPINFO *data,
UINT coloruse)
@@ -718,7 +718,7 @@
return hbitmap;
}
-HBITMAP STDCALL
+HBITMAP INTERNAL_CALL
DIB_CreateDIBSection(
PDC dc, BITMAPINFO *bmi, UINT usage,
LPVOID *bits, HANDLE section,
@@ -893,7 +893,8 @@
* http://www.microsoft.com/msdn/sdk/platforms/doc/sdk/win32/struc/src/str01.htm
* 11/16/1999 (RJJ) lifted from wine
*/
-INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth)
+INT INTERNAL_CALL
+DIB_GetDIBWidthBytes (INT width, INT depth)
{
int words;
@@ -922,7 +923,8 @@
* 11/16/1999 (RJJ) lifted from wine
*/
-INT STDCALL DIB_GetDIBImageBytes (INT width, INT height, INT depth)
+INT INTERNAL_CALL
+DIB_GetDIBImageBytes (INT width, INT height, INT depth)
{
return DIB_GetDIBWidthBytes( width, depth ) * (height < 0 ? -height : height);
}
@@ -934,7 +936,8 @@
* 11/16/1999 (RJJ) lifted from wine
*/
-INT FASTCALL DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse)
+INT INTERNAL_CALL
+DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse)
{
int colors;
@@ -952,11 +955,12 @@
}
}
-INT STDCALL DIB_GetBitmapInfo (const BITMAPINFOHEADER *header,
- PDWORD width,
- PINT height,
- PWORD bpp,
- PWORD compr)
+INT INTERNAL_CALL
+DIB_GetBitmapInfo (const BITMAPINFOHEADER *header,
+ PDWORD width,
+ PINT height,
+ PWORD bpp,
+ PWORD compr)
{
if (header->biSize == sizeof(BITMAPINFOHEADER))
{
@@ -981,7 +985,8 @@
// Converts a Device Independent Bitmap (DIB) to a Device Dependant Bitmap (DDB)
// The specified Device Context (DC) defines what the DIB should be converted to
-PBITMAPOBJ FASTCALL DIBtoDDB(HGLOBAL hPackedDIB, HDC hdc) // FIXME: This should be removed. All references to this function should
+PBITMAPOBJ INTERNAL_CALL
+DIBtoDDB(HGLOBAL hPackedDIB, HDC hdc) // FIXME: This should be removed. All references to this function should
// change to NtGdiSetDIBits
{
HBITMAP hBmp = 0;
@@ -1007,7 +1012,7 @@
return pBmp;
}
-RGBQUAD * FASTCALL
+RGBQUAD * INTERNAL_CALL
DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi)
{
RGBQUAD *lpRGB;
@@ -1045,7 +1050,7 @@
return lpRGB;
}
-HPALETTE FASTCALL
+HPALETTE INTERNAL_CALL
BuildDIBPalette (PBITMAPINFO bmi, PINT paletteType)
{
BYTE bits;
reactos/subsys/win32k/objects
diff -u -r1.52.2.1 -r1.52.2.2
--- fillshap.c 12 Sep 2004 19:21:08 -0000 1.52.2.1
+++ fillshap.c 14 Sep 2004 01:00:45 -0000 1.52.2.2
@@ -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: fillshap.c,v 1.52.2.1 2004/09/12 19:21:08 weiden Exp $ */
+/* $Id: fillshap.c,v 1.52.2.2 2004/09/14 01:00:45 weiden Exp $ */
#include <w32k.h>
/*
@@ -38,7 +38,7 @@
&RectBounds, \
dc->w.ROPmode);
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiPolygon(PDC dc,
PPOINT UnsafePoints,
int Count)
@@ -139,7 +139,7 @@
return ret;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiPolyPolygon(DC *dc,
LPPOINT Points,
LPINT PolyCounts,
@@ -413,7 +413,7 @@
#ifdef TODO
STATIC VOID
-FASTCALL
+INTERNAL_CALL
CirclePoints(UINT *PointCount, PSHAPEPOINT ShapePoints, int Left, int Top,
int Right, int Bottom)
{
@@ -507,7 +507,7 @@
}
}
-STATIC VOID
+STATIC VOID INTERNAL_CALL
LinePoints(UINT *PointCount, PSHAPEPOINT ShapePoints, int Left, int Top,
int Right, int Bottom, int XTo, int YTo, BOOL Start)
{
@@ -593,8 +593,7 @@
}
}
-STATIC int
-CDECL
+STATIC int INTERNAL_CALL
CompareShapePoints(const void *pv1, const void *pv2)
{
if (((const PSHAPEPOINT) pv1)->Y < ((const PSHAPEPOINT) pv2)->Y)
@@ -926,8 +925,7 @@
return Ret;
}
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
IntRectangle(PDC dc,
int LeftRect,
int TopRect,
@@ -1066,8 +1064,7 @@
}
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
IntRoundRect(
PDC dc,
int left,
@@ -1349,7 +1346,7 @@
return ret;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiGradientFill(
DC *dc,
PTRIVERTEX pVertex,
reactos/subsys/win32k/objects
diff -u -r1.71.4.2 -r1.71.4.3
--- gdiobj.c 13 Sep 2004 21:28:17 -0000 1.71.4.2
+++ gdiobj.c 14 Sep 2004 01:00:45 -0000 1.71.4.3
@@ -19,7 +19,7 @@
/*
* GDIOBJ.C - GDI object manipulation routines
*
- * $Id: gdiobj.c,v 1.71.4.2 2004/09/13 21:28:17 weiden Exp $
+ * $Id: gdiobj.c,v 1.71.4.3 2004/09/14 01:00:45 weiden Exp $
*/
#include <w32k.h>
@@ -76,7 +76,7 @@
/*
* Dummy GDI Cleanup Callback
*/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
GDI_CleanupDummy(PGDIOBJ pObj)
{
return TRUE;
@@ -118,7 +118,7 @@
* Allocate GDI object table.
* \param Size - number of entries in the object table.
*/
-static PGDI_HANDLE_TABLE FASTCALL
+static PGDI_HANDLE_TABLE INTERNAL_CALL
GDIOBJ_iAllocHandleTable(ULONG Entries)
{
PGDI_HANDLE_TABLE handleTable;
@@ -216,7 +216,7 @@
* \note Use GDIOBJ_Lock() to obtain pointer to the new object.
* \todo return the object pointer and lock it by default.
*/
-HGDIOBJ FASTCALL
+HGDIOBJ INTERNAL_CALL
GDIOBJ_AllocObj(ULONG ObjectType)
{
PW32PROCESS W32Process;
@@ -307,7 +307,7 @@
* \return Returns FALSE if the cleanup routine returned FALSE or the object doesn't belong
* to the calling process.
*/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
GDIOBJ_FreeObj(HGDIOBJ hObj, DWORD ObjectType)
{
/* FIXME - get rid of the ObjectType and Flag parameters, they're obsolete! */
@@ -441,7 +441,7 @@
*
* \note this function uses an O(n^2) algoritm because we shouldn't need to call it with more than 3 or 4 objects.
*/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
GDIOBJ_LockMultipleObj(PGDIMULTILOCK pList, INT nObj)
{
INT i, j;
@@ -483,7 +483,7 @@
*
* \note this function uses O(n^2) algoritm because we shouldn't need to call it with more than 3 or 4 objects.
*/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
GDIOBJ_UnlockMultipleObj(PGDIMULTILOCK pList, INT nObj)
{
INT i, j;
@@ -513,7 +513,7 @@
/*!
* Initialization of the GDI object engine.
*/
-VOID FASTCALL
+VOID INTERNAL_CALL
InitGdiObjectHandleTable (VOID)
{
DPRINT("InitGdiObjectHandleTable\n");
@@ -540,7 +540,7 @@
* Internal function. Called when the process is destroyed to free the remaining GDI handles.
* \param Process - PID of the process that will be destroyed.
*/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
CleanupForProcess (struct _EPROCESS *Process, INT Pid)
{
PGDI_TABLE_ENTRY Entry;
@@ -611,7 +611,7 @@
*
* \todo Get rid of the ObjectType parameter!
*/
-PGDIOBJ FASTCALL
+PGDIOBJ INTERNAL_CALL
#ifdef GDI_DEBUG
GDIOBJ_LockObjDbg (const char* file, int line, HGDIOBJ hObj, DWORD ObjectType)
#else /* !GDI_DEBUG */
@@ -754,7 +754,7 @@
* \note This function performs delayed cleanup. If the object is locked when GDI_FreeObj() is called
* then \em this function frees the object when reference count is zero.
*/
-BOOL FASTCALL
+BOOL INTERNAL_CALL
#ifdef GDI_DEBUG
GDIOBJ_UnlockObjDbg (const char* file, int line, PGDIOBJ Object)
#else /* !GDI_DEBUG */
@@ -793,7 +793,7 @@
return TRUE;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
GDIOBJ_OwnedByCurrentProcess(HGDIOBJ ObjectHandle)
{
PGDI_TABLE_ENTRY Entry;
@@ -817,7 +817,7 @@
return FALSE;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
GDIOBJ_ConvertToStockObj(HGDIOBJ *hObj)
{
PGDI_TABLE_ENTRY Entry;
@@ -934,7 +934,7 @@
return FALSE;
}
-void FASTCALL
+void INTERNAL_CALL
GDIOBJ_SetOwnership(HGDIOBJ ObjectHandle, PEPROCESS NewOwner)
{
PGDI_TABLE_ENTRY Entry;
@@ -1054,7 +1054,7 @@
}
}
-void FASTCALL
+void INTERNAL_CALL
GDIOBJ_CopyOwnership(HGDIOBJ CopyFrom, HGDIOBJ CopyTo)
{
PGDI_TABLE_ENTRY FromEntry;
@@ -1154,7 +1154,7 @@
}
}
-PVOID FASTCALL
+PVOID INTERNAL_CALL
GDI_MapHandleTable(HANDLE hProcess)
{
DPRINT("%s:%i: %s(): FIXME - Map handle table into the process memory space!\n",
reactos/subsys/win32k/objects
diff -u -r1.37.2.1 -r1.37.2.2
--- line.c 12 Sep 2004 19:21:08 -0000 1.37.2.1
+++ line.c 14 Sep 2004 01:00:45 -0000 1.37.2.2
@@ -16,13 +16,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: line.c,v 1.37.2.1 2004/09/12 19:21:08 weiden Exp $ */
+/* $Id: line.c,v 1.37.2.2 2004/09/14 01:00:45 weiden Exp $ */
#include <w32k.h>
// Some code from the WINE project source (www.winehq.com)
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiMoveToEx(DC *dc,
int X,
int Y,
@@ -46,7 +46,7 @@
return TRUE;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiLineTo(DC *dc,
int XEnd,
int YEnd)
@@ -126,7 +126,7 @@
return Ret;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiPolyBezier(DC *dc,
LPPOINT pt,
DWORD Count)
@@ -155,7 +155,7 @@
return ret;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiPolyBezierTo(DC *dc,
LPPOINT pt,
DWORD Count)
@@ -186,7 +186,7 @@
return ret;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiPolyline(DC *dc,
LPPOINT pt,
int Count)
@@ -244,7 +244,7 @@
return Ret;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiPolylineTo(DC *dc,
LPPOINT pt,
DWORD Count)
@@ -276,13 +276,13 @@
return ret;
}
-INT FASTCALL
+INT INTERNAL_CALL
IntGdiGetArcDirection(DC *dc)
{
return dc->w.ArcDirection;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiArc(DC *dc,
int LeftRect,
int TopRect,
@@ -306,7 +306,7 @@
return TRUE;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGdiPolyPolyline(DC *dc,
LPPOINT pt,
LPDWORD PolyPoints,
reactos/subsys/win32k/objects
diff -u -r1.20.4.1 -r1.20.4.2
--- palette.c 12 Sep 2004 19:21:08 -0000 1.20.4.1
+++ palette.c 14 Sep 2004 01:00:45 -0000 1.20.4.2
@@ -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: palette.c,v 1.20.4.1 2004/09/12 19:21:08 weiden Exp $ */
+/* $Id: palette.c,v 1.20.4.2 2004/09/14 01:00:45 weiden Exp $ */
#include <w32k.h>
#ifndef NO_MAPPING
@@ -31,12 +31,13 @@
int COLOR_gapFilled;
int COLOR_max;
-PPALETTEENTRY FASTCALL ReturnSystemPalette (VOID)
+PPALETTEENTRY INTERNAL_CALL
+ReturnSystemPalette (VOID)
{
return COLOR_sysPal;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
PALETTE_Cleanup(PPALGDI pPal)
{
if (NULL != pPal->IndexedColors)
@@ -47,7 +48,7 @@
return TRUE;
}
-HPALETTE FASTCALL
+HPALETTE INTERNAL_CALL
PALETTE_AllocPalette(ULONG Mode,
ULONG NumColors,
ULONG *Colors,
@@ -99,7 +100,7 @@
return NewPalette;
}
-HPALETTE FASTCALL
+HPALETTE INTERNAL_CALL
PALETTE_AllocPaletteIndexedRGB(ULONG NumColors,
CONST RGBQUAD *Colors)
{
@@ -143,7 +144,8 @@
}
// Create the system palette
-HPALETTE FASTCALL PALETTE_Init(VOID)
+HPALETTE INTERNAL_CALL
+PALETTE_Init(VOID)
{
int i;
HPALETTE hpalette;
@@ -189,7 +191,8 @@
}
#ifndef NO_MAPPING
-static void FASTCALL PALETTE_FormatSystemPalette(void)
+static void INTERNAL_CALL
+PALETTE_FormatSystemPalette(void)
{
// Build free list so we'd have an easy way to find
// out if there are any available colorcells.
@@ -210,7 +213,8 @@
}
#endif
-VOID FASTCALL PALETTE_ValidateFlags(PALETTEENTRY* lpPalE, INT size)
+VOID INTERNAL_CALL
+PALETTE_ValidateFlags(PALETTEENTRY* lpPalE, INT size)
{
int i = 0;
for( ; i<size ; i++ )
@@ -220,7 +224,8 @@
#ifndef NO_MAPPING
// Set the color-mapping table for selected palette.
// Return number of entries which mapping has changed.
-INT STDCALL PALETTE_SetMapping(PALOBJ *palPtr, UINT uStart, UINT uNum, BOOL mapOnly)
+INT INTERNAL_CALL
+PALETTE_SetMapping(PALOBJ *palPtr, UINT uStart, UINT uNum, BOOL mapOnly)
{
char flag;
int prevMapping = (palPtr->mapping) ? 1 : 0;
reactos/subsys/win32k/objects
diff -u -r1.24.2.1 -r1.24.2.2
--- path.c 12 Sep 2004 19:21:08 -0000 1.24.2.1
+++ path.c 14 Sep 2004 01:00:45 -0000 1.24.2.2
@@ -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: path.c,v 1.24.2.1 2004/09/12 19:21:08 weiden Exp $ */
+/* $Id: path.c,v 1.24.2.2 2004/09/14 01:00:45 weiden Exp $ */
#include <w32k.h>
#include <win32k/float.h>
@@ -24,18 +24,18 @@
#define GROW_FACTOR_NUMER 2 /* Numerator of grow factor for the array */
#define GROW_FACTOR_DENOM 1 /* Denominator of grow factor */
-BOOL FASTCALL PATH_AddEntry (GdiPath *pPath, const POINT *pPoint, BYTE flags);
-BOOL FASTCALL PATH_AddFlatBezier (GdiPath *pPath, POINT *pt, BOOL closed);
-BOOL FASTCALL PATH_DoArcPart (GdiPath *pPath, FLOAT_POINT corners[], double angleStart, double angleEnd, BOOL addMoveTo);
-BOOL FASTCALL PATH_FlattenPath (GdiPath *pPath);
-VOID FASTCALL PATH_GetPathFromDC (PDC dc, GdiPath **ppPath);
-VOID FASTCALL PATH_NormalizePoint (FLOAT_POINT corners[], const FLOAT_POINT *pPoint, double *pX, double *pY);
-BOOL FASTCALL PATH_PathToRegion(const GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn);
-BOOL FASTCALL PATH_ReserveEntries (GdiPath *pPath, INT numEntries);
-VOID FASTCALL PATH_ScaleNormalizedPoint (FLOAT_POINT corners[], double x, double y, POINT *pPoint);
+BOOL INTERNAL_CALL PATH_AddEntry (GdiPath *pPath, const POINT *pPoint, BYTE flags);
+BOOL INTERNAL_CALL PATH_AddFlatBezier (GdiPath *pPath, POINT *pt, BOOL closed);
+BOOL INTERNAL_CALL PATH_DoArcPart (GdiPath *pPath, FLOAT_POINT corners[], double angleStart, double angleEnd, BOOL addMoveTo);
+BOOL INTERNAL_CALL PATH_FlattenPath (GdiPath *pPath);
+VOID INTERNAL_CALL PATH_GetPathFromDC (PDC dc, GdiPath **ppPath);
+VOID INTERNAL_CALL PATH_NormalizePoint (FLOAT_POINT corners[], const FLOAT_POINT *pPoint, double *pX, double *pY);
+BOOL INTERNAL_CALL PATH_PathToRegion(const GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn);
+BOOL INTERNAL_CALL PATH_ReserveEntries (GdiPath *pPath, INT numEntries);
+VOID INTERNAL_CALL PATH_ScaleNormalizedPoint (FLOAT_POINT corners[], double x, double y, POINT *pPoint);
-INT FASTCALL
+INT INTERNAL_CALL
IntGdiGetArcDirection(DC *dc);
BOOL
@@ -55,7 +55,7 @@
}
BOOL
-FASTCALL
+INTERNAL_CALL
IntCloseFigure ( PDC dc )
{
UNIMPLEMENTED;
@@ -173,8 +173,7 @@
*
* Initializes the GdiPath structure.
*/
-VOID
-FASTCALL
+VOID INTERNAL_CALL
PATH_InitGdiPath ( GdiPath *pPath )
{
assert(pPath!=NULL);
@@ -190,8 +189,7 @@
*
* Destroys a GdiPath structure (frees the memory in the arrays).
*/
-VOID
-FASTCALL
+VOID INTERNAL_CALL
PATH_DestroyGdiPath ( GdiPath *pPath )
{
assert(pPath!=NULL);
@@ -210,8 +208,7 @@
* not a copy constructor).
* Returns TRUE if successful, else FALSE.
*/
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_AssignGdiPath ( GdiPath *pPathDest, const GdiPath *pPathSrc )
{
assert(pPathDest!=NULL && pPathSrc!=NULL);
@@ -239,8 +236,7 @@
* open path. This starts a new stroke. Returns TRUE if successful, else
* FALSE.
*/
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_MoveTo ( PDC dc )
{
GdiPath *pPath;
@@ -266,8 +262,7 @@
* a PT_MOVETO entry, if this is the first LineTo in a stroke).
* Returns TRUE if successful, else FALSE.
*/
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_LineTo ( PDC dc, INT x, INT y )
{
GdiPath *pPath;
@@ -304,8 +299,7 @@
* Should be called when a call to Rectangle is performed on a DC that has
* an open path. Returns TRUE if successful, else FALSE.
*/
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_Rectangle ( PDC dc, INT x1, INT y1, INT x2, INT y2 )
{
GdiPath *pPath;
@@ -380,8 +374,7 @@
return TRUE;
}
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_RoundRect (PDC dc, INT x1, INT y1, INT x2, INT y2, INT xradius, INT yradius)
{
UNIMPLEMENTED;
@@ -394,8 +387,7 @@
* an open path. This adds four Bezier splines representing the ellipse
* to the path. Returns TRUE if successful, else FALSE.
*/
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_Ellipse ( PDC dc, INT x1, INT y1, INT x2, INT y2 )
{
/* TODO: This should probably be revised to call PATH_AngleArc */
@@ -409,8 +401,7 @@
* an open path. This adds up to five Bezier splines representing the arc
* to the path. Returns TRUE if successful, else FALSE.
*/
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_Arc ( PDC dc, INT x1, INT y1, INT x2, INT y2,
INT xStart, INT yStart, INT xEnd, INT yEnd)
{
@@ -545,8 +536,7 @@
return TRUE;
}
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_PolyBezierTo ( PDC dc, const POINT *pts, DWORD cbPoints )
{
GdiPath *pPath;
@@ -582,8 +572,7 @@
return TRUE;
}
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_PolyBezier ( PDC dc, const POINT *pts, DWORD cbPoints )
{
GdiPath *pPath;
@@ -610,8 +599,7 @@
return TRUE;
}
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_Polyline ( PDC dc, const POINT *pts, DWORD cbPoints )
{
GdiPath *pPath;
@@ -637,8 +625,7 @@
return TRUE;
}
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_PolylineTo ( PDC dc, const POINT *pts, DWORD cbPoints )
{
GdiPath *pPath;
@@ -676,8 +663,7 @@
}
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_Polygon ( PDC dc, const POINT *pts, DWORD cbPoints )
{
GdiPath *pPath;
@@ -704,8 +690,7 @@
return TRUE;
}
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_PolyPolygon ( PDC dc, const POINT* pts, const INT* counts, UINT polygons )
{
GdiPath *pPath;
@@ -738,8 +723,7 @@
return TRUE;
}
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_PolyPolyline ( PDC dc, const POINT* pts, const DWORD* counts, DWORD polylines )
{
GdiPath *pPath;
@@ -777,8 +761,7 @@
/* PATH_AddFlatBezier
*
*/
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_AddFlatBezier ( GdiPath *pPath, POINT *pt, BOOL closed )
{
POINT *pts;
@@ -799,8 +782,7 @@
* Replaces Beziers with line segments
*
*/
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_FlattenPath(GdiPath *pPath)
{
GdiPath newPath;
@@ -840,8 +822,7 @@
// expecting a non-const*. Since this function isn't being called
// at the moment, I'm commenting it out until the issue needs to
// be addressed.
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_PathToRegion ( const GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn )
{
int numStrokes, iStroke, i;
@@ -906,8 +887,7 @@
*
* Removes all entries from the path and sets the path state to PATH_Null.
*/
-VOID
-FASTCALL
+VOID INTERNAL_CALL
PATH_EmptyPath ( GdiPath *pPath )
{
assert(pPath!=NULL);
@@ -922,8 +902,7 @@
* or PT_BEZIERTO, optionally ORed with PT_CLOSEFIGURE. Returns TRUE if
* successful, FALSE otherwise (e.g. if not enough memory was available).
*/
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_AddEntry ( GdiPath *pPath, const POINT *pPoint, BYTE flags )
{
assert(pPath!=NULL);
@@ -960,8 +939,7 @@
* been allocated; allocates larger arrays and copies the existing entries
* to those arrays, if necessary. Returns TRUE if successful, else FALSE.
*/
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_ReserveEntries ( GdiPath *pPath, INT numEntries )
{
INT numEntriesToAllocate;
@@ -1020,8 +998,7 @@
* Retrieves a pointer to the GdiPath structure contained in an HDC and
* places it in *ppPath. TRUE is returned if successful, FALSE otherwise.
*/
-VOID
-FASTCALL
+VOID INTERNAL_CALL
PATH_GetPathFromDC ( PDC dc, GdiPath **ppPath )
{
ASSERT ( dc );
@@ -1038,8 +1015,7 @@
* point is added to the path; otherwise, it is assumed that the current
* position is equal to the first control point.
*/
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
PATH_DoArcPart ( GdiPath *pPath, FLOAT_POINT corners[],
double angleStart, double angleEnd, BOOL addMoveTo )
{
@@ -1098,8 +1074,7 @@
* coordinates (-1.0, -1.0) correspond to corners[0], the coordinates
* (1.0, 1.0) correspond to corners[1].
*/
-VOID
-FASTCALL
+VOID INTERNAL_CALL
PATH_ScaleNormalizedPoint ( FLOAT_POINT corners[], double x,
double y, POINT *pPoint )
{
@@ -1114,8 +1089,7 @@
* Normalizes a point with respect to the box whose corners are passed in
* corners. The normalized coordinates are stored in *pX and *pY.
*/
-VOID
-FASTCALL
+VOID INTERNAL_CALL
PATH_NormalizePoint ( FLOAT_POINT corners[],
const FLOAT_POINT *pPoint,
double *pX, double *pY)
reactos/subsys/win32k/objects
diff -u -r1.16.2.1 -r1.16.2.2
--- pen.c 12 Sep 2004 19:21:08 -0000 1.16.2.1
+++ pen.c 14 Sep 2004 01:00:45 -0000 1.16.2.2
@@ -17,13 +17,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: pen.c,v 1.16.2.1 2004/09/12 19:21:08 weiden Exp $
+ * $Id: pen.c,v 1.16.2.2 2004/09/14 01:00:45 weiden Exp $
*/
#include <w32k.h>
/* PRIVATE FUNCTIONS **********************************************************/
-HPEN FASTCALL
+HPEN INTERNAL_CALL
IntGdiCreatePenIndirect(PLOGPEN LogPen)
{
HPEN hPen;
reactos/subsys/win32k/objects
diff -u -r1.15 -r1.15.4.1
--- polyfill.c 3 Jul 2004 13:55:37 -0000 1.15
+++ polyfill.c 14 Sep 2004 01:00:45 -0000 1.15.4.1
@@ -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: polyfill.c,v 1.15 2004/07/03 13:55:37 navaraf Exp $
+/* $Id: polyfill.c,v 1.15.4.1 2004/09/14 01:00:45 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -91,8 +91,7 @@
** Hide memory clean up.
*/
static
-void
-FASTCALL
+void INTERNAL_CALL
POLYGONFILL_DestroyEdgeList(FILL_EDGE_LIST* list)
{
int i;
@@ -115,8 +114,7 @@
** This makes and initiaizes an Edge struct for a line between two points.
*/
static
-FILL_EDGE*
-FASTCALL
+FILL_EDGE* INTERNAL_CALL
POLYGONFILL_MakeEdge(POINT From, POINT To)
{
FILL_EDGE* rc = (FILL_EDGE*)EngAllocMem(FL_ZERO_MEMORY, sizeof(FILL_EDGE), FILL_EDGE_ALLOC_TAG);
@@ -186,8 +184,7 @@
** Positive integer element1 > element2
*/
static
-INT
-FASTCALL
+INT INTERNAL_CALL
FILL_EDGE_Compare(FILL_EDGE* Edge1, FILL_EDGE* Edge2)
{
int e1 = Edge1->XIntercept[0] + Edge1->XIntercept[1];
@@ -201,8 +198,7 @@
** Insert an edge into a list keeping the list in order.
*/
static
-void
-FASTCALL
+void INTERNAL_CALL
POLYGONFILL_ActiveListInsert(FILL_EDGE** activehead, FILL_EDGE* NewEdge )
{
FILL_EDGE *pPrev, *pThis;
@@ -244,8 +240,7 @@
** Create a list of edges for a list of points.
*/
static
-FILL_EDGE_LIST*
-FASTCALL
+FILL_EDGE_LIST* INTERNAL_CALL
POLYGONFILL_MakeEdgeList(PPOINT Points, int Count)
{
int CurPt = 0;
@@ -298,8 +293,7 @@
**TODO: Get rid of this floating point arithmetic
*/
static
-void
-FASTCALL
+void INTERNAL_CALL
POLYGONFILL_UpdateScanline(FILL_EDGE* pEdge, int Scanline)
{
if ( 0 == pEdge->dy )
@@ -365,8 +359,7 @@
** This method updates the Active edge collection for the scanline Scanline.
*/
static
-void
-STDCALL
+void INTERNAL_CALL
POLYGONFILL_BuildActiveList ( int Scanline, FILL_EDGE_LIST* list, FILL_EDGE** ActiveHead )
{
int i;
@@ -390,8 +383,7 @@
** Scanline.
*/
static
-void
-STDCALL
+void INTERNAL_CALL
POLYGONFILL_FillScanLineAlternate(
PDC dc,
int ScanLine,
@@ -438,8 +430,7 @@
}
static
-void
-STDCALL
+void INTERNAL_CALL
POLYGONFILL_FillScanLineWinding(
PDC dc,
int ScanLine,
@@ -538,8 +529,7 @@
//This value is defined as the number of times a pen used to draw the polygon would go around the region.
//The direction of each edge of the polygon is important.
-BOOL
-STDCALL
+BOOL INTERNAL_CALL
FillPolygon(
PDC dc,
BITMAPOBJ *BitmapObj,
@@ -554,8 +544,7 @@
int ScanLine;
void
- STDCALL
- (*FillScanLine)(
+ (INTERNAL_CALL *FillScanLine)(
PDC dc,
int ScanLine,
FILL_EDGE* ActiveHead,
reactos/subsys/win32k/objects
diff -u -r1.62.2.1 -r1.62.2.2
--- region.c 12 Sep 2004 19:21:08 -0000 1.62.2.1
+++ region.c 14 Sep 2004 01:00:45 -0000 1.62.2.2
@@ -113,7 +113,7 @@
* the y-x-banding that's so nice to have...
*/
-/* $Id: region.c,v 1.62.2.1 2004/09/12 19:21:08 weiden Exp $ */
+/* $Id: region.c,v 1.62.2.2 2004/09/14 01:00:45 weiden Exp $ */
#include <w32k.h>
#include <win32k/float.h>
@@ -421,8 +421,8 @@
#define MEMCHECK(reg, rect, firstrect) xmemcheck(reg,&(rect),(LPRECT *)&(firstrect))
-typedef void FASTCALL (*overlapProcp)(PROSRGNDATA, PRECT, PRECT, PRECT, PRECT, INT, INT);
-typedef void FASTCALL (*nonOverlapProcp)(PROSRGNDATA, PRECT, PRECT, INT, INT);
+typedef void INTERNAL_CALL (*overlapProcp)(PROSRGNDATA, PRECT, PRECT, PRECT, PRECT, INT, INT);
+typedef void INTERNAL_CALL (*nonOverlapProcp)(PROSRGNDATA, PRECT, PRECT, INT, INT);
// Number of points to buffer before sending them off to scanlines() : Must be an even number
#define NUMPTSTOBUFFER 200
@@ -441,7 +441,7 @@
* This function is left there for debugging purposes.
*/
-VOID FASTCALL
+VOID INTERNAL_CALL
IntDumpRegion(HRGN hRgn)
{
ROSRGNDATA *Data;
@@ -465,7 +465,8 @@
}
#endif /* NDEBUG */
-static BOOL FASTCALL REGION_CopyRegion(PROSRGNDATA dst, PROSRGNDATA src)
+static BOOL INTERNAL_CALL
+REGION_CopyRegion(PROSRGNDATA dst, PROSRGNDATA src)
{
if(dst != src) // don't want to copy to itself
{
@@ -493,7 +494,8 @@
return TRUE;
}
-static void FASTCALL REGION_SetExtents (ROSRGNDATA *pReg)
+static void INTERNAL_CALL
+REGION_SetExtents (ROSRGNDATA *pReg)
{
RECT *pRect, *pRectEnd, *pExtents;
@@ -538,7 +540,8 @@
/***********************************************************************
* REGION_CropAndOffsetRegion
*/
-static BOOL FASTCALL REGION_CropAndOffsetRegion(const PPOINT off, const PRECT rect, PROSRGNDATA rgnSrc, PROSRGNDATA rgnDst)
+static BOOL INTERNAL_CALL
+REGION_CropAndOffsetRegion(const PPOINT off, const PRECT rect, PROSRGNDATA rgnSrc, PROSRGNDATA rgnDst)
{
if(!rect) // just copy and offset
{
@@ -704,7 +707,8 @@
*
* \return hDst if success, 0 otherwise.
*/
-HRGN FASTCALL REGION_CropRgn(HRGN hDst, HRGN hSrc, const PRECT lpRect, PPOINT lpPt)
+HRGN INTERNAL_CALL
+REGION_CropRgn(HRGN hDst, HRGN hSrc, const PRECT lpRect, PPOINT lpPt)
{
PROSRGNDATA objSrc, rgnDst;
HRGN hNewDst, hRet = NULL;
@@ -763,7 +767,8 @@
* - pReg->numRects will be decreased.
*
*/
-static INT FASTCALL REGION_Coalesce (
+static INT INTERNAL_CALL
+REGION_Coalesce (
PROSRGNDATA pReg, /* Region to coalesce */
INT prevStart, /* Index of start of previous band */
INT curStart /* Index of start of current band */
@@ -904,7 +909,7 @@
* to reduce the number of rectangles in the region.
*
*/
-static void FASTCALL
+static void INTERNAL_CALL
REGION_RegionOp(
ROSRGNDATA *newReg, /* Place to store result */
ROSRGNDATA *reg1, /* First region in operation */
@@ -1200,7 +1205,7 @@
* Rectangles may be added to the region.
*
*/
-static void FASTCALL
+static void INTERNAL_CALL
REGION_IntersectO (
PROSRGNDATA pReg,
PRECT r1,
@@ -1264,8 +1269,9 @@
/***********************************************************************
* REGION_IntersectRegion
*/
-static void FASTCALL REGION_IntersectRegion(ROSRGNDATA *newReg, ROSRGNDATA *reg1,
- ROSRGNDATA *reg2)
+static void INTERNAL_CALL
+REGION_IntersectRegion(ROSRGNDATA *newReg, ROSRGNDATA *reg1,
+ ROSRGNDATA *reg2)
{
/* check for trivial reject */
if ( (!(reg1->rdh.nCount)) || (!(reg2->rdh.nCount)) ||
@@ -1303,7 +1309,7 @@
* with the rectangles we're passed.
*
*/
-static void FASTCALL
+static void INTERNAL_CALL
REGION_UnionNonO (
PROSRGNDATA pReg,
PRECT r,
@@ -1342,7 +1348,7 @@
* be changed.
*
*/
-static void FASTCALL
+static void INTERNAL_CALL
REGION_UnionO (
PROSRGNDATA pReg,
PRECT r1,
@@ -1409,8 +1415,9 @@
/***********************************************************************
* REGION_UnionRegion
*/
-static void FASTCALL REGION_UnionRegion(ROSRGNDATA *newReg, ROSRGNDATA *reg1,
- ROSRGNDATA *reg2)
+static void INTERNAL_CALL
+REGION_UnionRegion(ROSRGNDATA *newReg, ROSRGNDATA *reg1,
+ ROSRGNDATA *reg2)
{
/* checks all the simple cases */
@@ -1497,7 +1504,7 @@
* pReg may be affected.
*
*/
-static void FASTCALL
+static void INTERNAL_CALL
REGION_SubtractNonO1 (
PROSRGNDATA pReg,
PRECT r,
@@ -1536,7 +1543,7 @@
* pReg may have rectangles added to it.
*
*/
-static void FASTCALL
+static void INTERNAL_CALL
REGION_SubtractO (
PROSRGNDATA pReg,
PRECT r1,
@@ -1670,8 +1677,9 @@
* regD is overwritten.
*
*/
-static void FASTCALL REGION_SubtractRegion(ROSRGNDATA *regD, ROSRGNDATA *regM,
- ROSRGNDATA *regS )
+static void INTERNAL_CALL
+REGION_SubtractRegion(ROSRGNDATA *regD, ROSRGNDATA *regM,
+ ROSRGNDATA *regS )
{
/* check for trivial reject */
if ( (!(regM->rdh.nCount)) || (!(regS->rdh.nCount)) ||
@@ -1697,8 +1705,9 @@
/***********************************************************************
* REGION_XorRegion
*/
-static void FASTCALL REGION_XorRegion(ROSRGNDATA *dr, ROSRGNDATA *sra,
- ROSRGNDATA *srb)
+static void INTERNAL_CALL
+REGION_XorRegion(ROSRGNDATA *dr, ROSRGNDATA *sra,
+ ROSRGNDATA *srb)
{
HRGN htra, htrb;
ROSRGNDATA *tra, *trb;
@@ -1740,7 +1749,8 @@
/*!
* Adds a rectangle to a REGION
*/
-void FASTCALL REGION_UnionRectWithRegion(const RECT *rect, ROSRGNDATA *rgn)
+void INTERNAL_CALL
+REGION_UnionRectWithRegion(const RECT *rect, ROSRGNDATA *rgn)
{
ROSRGNDATA region;
@@ -1751,7 +1761,8 @@
REGION_UnionRegion(rgn, rgn, ®ion);
}
-BOOL FASTCALL REGION_CreateFrameRgn(HRGN hDest, HRGN hSrc, INT x, INT y)
+BOOL INTERNAL_CALL
+REGION_CreateFrameRgn(HRGN hDest, HRGN hSrc, INT x, INT y)
{
PROSRGNDATA srcObj, destObj;
PRECT rc;
@@ -1838,7 +1849,8 @@
}
-BOOL FASTCALL REGION_LPTODP(HDC hdc, HRGN hDest, HRGN hSrc)
+BOOL INTERNAL_CALL
+REGION_LPTODP(HDC hdc, HRGN hDest, HRGN hSrc)
{
RECT *pCurRect, *pEndRect;
PROSRGNDATA srcObj = NULL;
@@ -1896,7 +1908,8 @@
return ret;
}
-HRGN FASTCALL RGNDATA_AllocRgn(INT n)
+HRGN INTERNAL_CALL
+RGNDATA_AllocRgn(INT n)
{
HRGN hReg;
PROSRGNDATA pReg;
@@ -1939,7 +1952,7 @@
return NULL;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
RGNDATA_Cleanup(PROSRGNDATA pRgn)
{
if(pRgn->Buffer && pRgn->Buffer != &pRgn->rdh.rcBound)
@@ -2284,7 +2297,7 @@
return Ret;
}
-INT FASTCALL
+INT INTERNAL_CALL
UnsafeIntGetRgnBox(PROSRGNDATA Rgn,
LPRECT pRect)
{
@@ -2499,8 +2512,7 @@
return FALSE;
}
-BOOL
-FASTCALL
+BOOL INTERNAL_CALL
UnsafeIntRectInRegion(PROSRGNDATA Rgn,
CONST LPRECT rc)
{
@@ -2660,8 +2672,9 @@
* bucket. Finally, we can insert it.
*
*/
-static void FASTCALL REGION_InsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE,
- INT scanline, ScanLineListBlock **SLLBlock, INT *iSLLBlock)
+static void INTERNAL_CALL
+REGION_InsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE,
+ INT scanline, ScanLineListBlock **SLLBlock, INT *iSLLBlock)
{
EdgeTableEntry *start, *prev;
@@ -2732,7 +2745,8 @@
* leaving them sorted by smaller x coordinate.
*
*/
-static void FASTCALL REGION_loadAET(EdgeTableEntry *AET, EdgeTableEntry *ETEs)
+static void INTERNAL_CALL
+REGION_loadAET(EdgeTableEntry *AET, EdgeTableEntry *ETEs)
{
EdgeTableEntry *pPrevAET;
EdgeTableEntry *tmp;
@@ -2778,7 +2792,8 @@
* V-------------------> V---> ...
*
*/
-static void FASTCALL REGION_computeWAET(EdgeTableEntry *AET)
+static void INTERNAL_CALL
+REGION_computeWAET(EdgeTableEntry *AET)
{
register EdgeTableEntry *pWETE;
register int inside = 1;
@@ -2814,7 +2829,8 @@
* Edge Table.
*
*/
-static BOOL FASTCALL REGION_InsertionSort(EdgeTableEntry *AET)
+static BOOL INTERNAL_CALL
+REGION_InsertionSort(EdgeTableEntry *AET)
{
EdgeTableEntry *pETEchase;
EdgeTableEntry *pETEinsert;
@@ -2851,7 +2867,8 @@
*
* Clean up our act.
*/
-static void FASTCALL REGION_FreeStorage(ScanLineListBlock *pSLLBlock)
+static void INTERNAL_CALL
+REGION_FreeStorage(ScanLineListBlock *pSLLBlock)
{
ScanLineListBlock *tmpSLLBlock;
@@ -2869,8 +2886,9 @@
*
* Create an array of rectangles from a list of points.
*/
-static int FASTCALL REGION_PtsToRegion(int numFullPtBlocks, int iCurPtBlock,
- POINTBLOCK *FirstPtBlock, ROSRGNDATA *reg)
+static int INTERNAL_CALL
+REGION_PtsToRegion(int numFullPtBlocks, int iCurPtBlock,
+ POINTBLOCK *FirstPtBlock, ROSRGNDATA *reg)
{
RECT *rects;
POINT *pts;
@@ -2966,7 +2984,8 @@
* which an edge is initially entered.
*
*/
-static void FASTCALL REGION_CreateETandAET(const INT *Count, INT nbpolygons,
+static void INTERNAL_CALL
+REGION_CreateETandAET(const INT *Count, INT nbpolygons,
const POINT *pts, EdgeTable *ET, EdgeTableEntry *AET,
EdgeTableEntry *pETEs, ScanLineListBlock *pSLLBlock)
{
@@ -3055,7 +3074,7 @@
}
}
-HRGN FASTCALL
+HRGN INTERNAL_CALL
IntCreatePolyPolgonRgn(POINT *Pts,
INT *Count,
INT nbpolygons,
reactos/subsys/win32k/objects
diff -u -r1.1.2.1 -r1.1.2.2
--- stockobj.c 12 Sep 2004 19:21:08 -0000 1.1.2.1
+++ stockobj.c 14 Sep 2004 01:00:45 -0000 1.1.2.2
@@ -19,7 +19,7 @@
/*
* STOCKOBJ.C - GDI Stock Objects
*
- * $Id: stockobj.c,v 1.1.2.1 2004/09/12 19:21:08 weiden Exp $
+ * $Id: stockobj.c,v 1.1.2.2 2004/09/14 01:00:45 weiden Exp $
*
*/
#include <w32k.h>
@@ -135,7 +135,7 @@
/*!
* Creates a bunch of stock objects: brushes, pens, fonts.
*/
-VOID FASTCALL
+VOID INTERNAL_CALL
CreateStockObjects(void)
{
UINT Object;
@@ -188,7 +188,7 @@
return ((Object < 0) || (NB_STOCK_OBJECTS <= Object)) ? NULL : StockObjects[Object];
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntSetSysColors(UINT nColors, INT *Elements, COLORREF *Colors)
{
UINT i;
@@ -210,7 +210,7 @@
return nColors > 0;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetSysColorBrushes(HBRUSH *Brushes, UINT nBrushes)
{
UINT i;
@@ -231,7 +231,7 @@
return nBrushes > 0;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetSysColorPens(HPEN *Pens, UINT nPens)
{
UINT i;
@@ -252,7 +252,7 @@
return nPens > 0;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntGetSysColors(COLORREF *Colors, UINT nColors)
{
UINT i;
@@ -275,7 +275,7 @@
return nColors > 0;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
CreateSysColorObjects(VOID)
{
UINT i;
reactos/subsys/win32k/objects
diff -u -r1.105.2.2 -r1.105.2.3
--- text.c 12 Sep 2004 19:21:08 -0000 1.105.2.2
+++ text.c 14 Sep 2004 01:00:45 -0000 1.105.2.3
@@ -22,7 +22,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: text.c,v 1.105.2.2 2004/09/12 19:21:08 weiden Exp $ */
+/* $Id: text.c,v 1.105.2.3 2004/09/14 01:00:45 weiden Exp $ */
#include <w32k.h>
#include <ft2build.h>
@@ -113,13 +113,13 @@
{ SYMBOL_CHARSET, CP_SYMBOL, FS(31)},
};
-VOID FASTCALL
+VOID INTERNAL_CALL
IntLoadSystemFonts(VOID);
-INT FASTCALL
+INT INTERNAL_CALL
IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics);
-BOOL FASTCALL
+BOOL INTERNAL_CALL
InitFontSupport(VOID)
{
ULONG ulError;
@@ -143,7 +143,7 @@
* Search the system font directory and adds each font found.
*/
-VOID FASTCALL
+VOID INTERNAL_CALL
IntLoadSystemFonts(VOID)
{
OBJECT_ATTRIBUTES ObjectAttributes;
@@ -242,7 +242,7 @@
* Adds the font resource from the specified file to the system.
*/
-INT FASTCALL
+INT INTERNAL_CALL
IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics)
{
FONTGDI *FontGDI;
@@ -401,7 +401,7 @@
return 1;
}
-BOOL FASTCALL
+BOOL INTERNAL_CALL
IntIsFontRenderingEnabled(VOID)
{
BOOL Ret = RenderingEnabled;
@@ -414,13 +414,13 @@
return Ret;
}
-VOID FASTCALL
+VOID INTERNAL_CALL
IntEnableFontRendering(BOOL Enable)
{
RenderingEnabled = Enable;
}
-FT_Render_Mode FASTCALL
+FT_Render_Mode INTERNAL_CALL
IntGetFontRenderMode(LOGFONTW *logfont)
{
switch(logfont->lfQuality)
@@ -485,7 +485,7 @@
return Ret;
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont)
{
PTEXTOBJ TextObj;
@@ -625,7 +625,7 @@
* TRUE on success, FALSE on failure.
*
*/
-static BOOLEAN STDCALL
+static BOOLEAN INTERNAL_CALL
IntTranslateCharsetInfo(PDWORD Src, /* [in]
if flags == TCI_SRCFONTSIG: pointer to fsCsb of a FONTSIGNATURE
if flags == TCI_SRCCHARSET: a character set value
@@ -697,7 +697,7 @@
* IntGetOutlineTextMetrics
*
*/
-static unsigned FASTCALL
+static unsigned INTERNAL_CALL
IntGetOutlineTextMetrics(PFONTGDI FontGDI, UINT Size,
OUTLINETEXTMETRICW *Otm)
{
@@ -954,7 +954,7 @@
return Needed;
}
-static PFONTGDI FASTCALL
+static PFONTGDI INTERNAL_CALL
FindFaceNameInList(PUNICODE_STRING FaceName, PLIST_ENTRY Head)
{
PLIST_ENTRY Entry;
@@ -992,7 +992,7 @@
return NULL;
}
-static PFONTGDI FASTCALL
+static PFONTGDI INTERNAL_CALL
FindFaceNameInLists(PUNICODE_STRING FaceName)
{
PW32PROCESS Win32Process;
@@ -1016,7 +1016,7 @@
return Font;
}
-static void FASTCALL
+static void INTERNAL_CALL
FontFamilyFillInfo(PFONTFAMILYINFO Info, PCWSTR FaceName, PFONTGDI FontGDI)
{
ANSI_STRING StyleA;
@@ -1182,7 +1182,7 @@
}
}
-static int FASTCALL
+static int INTERNAL_CALL
FindFaceNameInInfo(PUNICODE_STRING FaceName, PFONTFAMILYINFO Info, DWORD InfoEntries)
{
DWORD i;
@@ -1200,7 +1200,7 @@
return -1;
}
-static BOOLEAN FASTCALL
+static BOOLEAN INTERNAL_CALL
FontFamilyInclude(LPLOGFONTW LogFont, PUNICODE_STRING FaceName,
PFONTFAMILYINFO Info, DWORD InfoEntries)
{
@@ -1216,7 +1216,7 @@
return FindFaceNameInInfo(FaceName, Info, InfoEntries) < 0;
}
-static BOOLEAN FASTCALL
+static BOOLEAN INTERNAL_CALL
GetFontFamilyInfoForList(LPLOGFONTW LogFont,
PFONTFAMILYINFO Info,
DWORD *Count,
@@ -1326,7 +1326,7 @@
return STATUS_SUCCESS;
}
-static BOOLEAN FASTCALL
+static BOOLEAN INTERNAL_CALL
GetFontFamilyInfoForSubstitutes(LPLOGFONTW LogFont,
PFONTFAMILYINFO Info,
DWORD *Count,
@@ -2127,8 +2127,7 @@
return 0;
}
-static BOOL
-FASTCALL
+static BOOL INTERNAL_CALL
TextIntGetTextExtentPoint(HDC hDC,
PTEXTOBJ TextObj,
LPCWSTR String,
@@ -2735,7 +2734,7 @@
return Result;
}
-static UINT FASTCALL
+static UINT INTERNAL_CALL
GetFontScore(LOGFONTW *LogFont, PUNICODE_STRING FaceName, PFONTGDI FontGDI)
{
ANSI_STRING EntryFaceNameA;
@@ -2868,7 +2867,7 @@
}
}
-NTSTATUS FASTCALL
+NTSTATUS INTERNAL_CALL
TextIntRealizeFont(HFONT FontHandle)
{
NTSTATUS Status = STATUS_SUCCESS;
@@ -2926,7 +2925,7 @@
return Status;
}
-INT FASTCALL
+INT INTERNAL_CALL
FontGetObject(PTEXTOBJ Font, INT Count, PVOID Buffer)
{
if (Count < sizeof(LOGFONTW))
reactos/subsys/win32k/stubs
diff -u -r1.30 -r1.30.12.1
--- stubs.c 11 Apr 2004 09:09:38 -0000 1.30
+++ stubs.c 14 Sep 2004 01:00:46 -0000 1.30.12.1
@@ -5,8 +5,8 @@
#undef WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <stdlib.h>
-#include <win32k/bitmaps.h>
#include <win32k/debug.h>
+#include <win32k/bitmaps.h>
#include <debug.h>
#include <ddk/winddi.h>
#include "../eng/objects.h"
reactos/subsys/win32k/stubs
diff -u -r1.5 -r1.5.14.1
--- xpstubs.c 8 Mar 2004 07:04:57 -0000 1.5
+++ xpstubs.c 14 Sep 2004 01:00:46 -0000 1.5.14.1
@@ -6,8 +6,8 @@
#undef WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <stdlib.h>
-#include <win32k/bitmaps.h>
#include <win32k/debug.h>
+#include <win32k/bitmaps.h>
#include <debug.h>
#include <ddk/winddi.h>
#include "../eng/objects.h"
CVSspam 0.2.8