From fd5226dd32a36faed8fb4037d022df72fe0c7601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Wed, 29 Oct 2003 08:38:55 +0000 Subject: [PATCH] Changes for W32API svn path=/trunk/; revision=6453 --- reactos/include/ddk/pnptypes.h | 4 +- reactos/include/ddk/winddi.h | 8 ++ reactos/include/messages.h | 8 ++ reactos/include/net/ndis.h | 4 +- reactos/include/ntos/zwtypes.h | 7 ++ reactos/include/ole32/guiddef.h | 17 +++- reactos/include/structs.h | 4 +- reactos/include/win32k/dc.h | 2 + reactos/include/win32k/debug1.h | 8 ++ reactos/include/win32k/driver.h | 94 ++++++++++----------- reactos/subsys/win32k/dib/dib.h | 72 ++++++++-------- reactos/subsys/win32k/eng/bitblt.c | 105 ++++++++++++------------ reactos/subsys/win32k/eng/brush.c | 6 +- reactos/subsys/win32k/eng/lineto.c | 11 ++- reactos/subsys/win32k/eng/mem.c | 6 +- reactos/subsys/win32k/eng/objects.h | 68 +++++++-------- reactos/subsys/win32k/include/mouse.h | 4 +- reactos/subsys/win32k/objects/bitmaps.c | 6 +- 18 files changed, 245 insertions(+), 189 deletions(-) diff --git a/reactos/include/ddk/pnptypes.h b/reactos/include/ddk/pnptypes.h index 3de24d76c3d..a6a4489b9e2 100644 --- a/reactos/include/ddk/pnptypes.h +++ b/reactos/include/ddk/pnptypes.h @@ -5,8 +5,8 @@ struct _DEVICE_OBJECT; struct _FILE_OBJECT; /* windows.h may be included before */ -#ifndef _GUID_DEFINED -#define _GUID_DEFINED +#ifndef GUID_DEFINED +#define GUID_DEFINED typedef struct _GUID { ULONG Data1; diff --git a/reactos/include/ddk/winddi.h b/reactos/include/ddk/winddi.h index ef7d3bcf6b7..c1472313c61 100644 --- a/reactos/include/ddk/winddi.h +++ b/reactos/include/ddk/winddi.h @@ -5,6 +5,12 @@ #ifndef __DDK_WINDDI_H #define __DDK_WINDDI_H +#ifdef __USE_W32API + +#include_next + +#else /* __USE_W32API */ + #if defined(WIN32_LEAN_AND_MEAN) && defined(_GNU_H_WINDOWS32_STRUCTURES) #error "windows.h cannot be included before winddi.h if WIN32_LEAN_AND_MEAN is defined" #endif @@ -1721,4 +1727,6 @@ XFORMOBJ_bApplyXform(XFORMOBJ *pxo,ULONG iMode,ULONG cPoints,PVOID pvIn,PVOID pv HANDLE STDCALL XLATEOBJ_hGetColorTransform(XLATEOBJ *pxlo); +#endif /* __USE_W32API */ + #endif diff --git a/reactos/include/messages.h b/reactos/include/messages.h index 8283924fb20..77eb4196d6e 100644 --- a/reactos/include/messages.h +++ b/reactos/include/messages.h @@ -32,6 +32,12 @@ #ifndef _GNU_H_WINDOWS32_MESSAGES #define _GNU_H_WINDOWS32_MESSAGES +#ifdef __USE_W32API + +#include + +#else /* __USE_W32API */ + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -1129,4 +1135,6 @@ extern "C" { } #endif /* __cplusplus */ +#endif /* __USE_W32API */ + #endif /* _GNU_H_WINDOWS32_MESSAGES */ diff --git a/reactos/include/net/ndis.h b/reactos/include/net/ndis.h index 085d2a2c0df..67069a21620 100644 --- a/reactos/include/net/ndis.h +++ b/reactos/include/net/ndis.h @@ -244,8 +244,8 @@ KeStallExecutionProcessor( #if !defined(_MSC_VER) -#ifndef _GUID_DEFINED -#define _GUID_DEFINED +#ifndef GUID_DEFINED +#define GUID_DEFINED typedef struct _GUID { ULONG Data1; USHORT Data2; diff --git a/reactos/include/ntos/zwtypes.h b/reactos/include/ntos/zwtypes.h index bd977138e82..b7bd0635d3a 100755 --- a/reactos/include/ntos/zwtypes.h +++ b/reactos/include/ntos/zwtypes.h @@ -1115,8 +1115,15 @@ typedef struct _IO_COMPLETION_BASIC_INFORMATION { #endif /* __USE_W32API */ +#ifdef __USE_W32API +#include +#endif /* __USE_W32API */ +#ifndef NtCurrentProcess #define NtCurrentProcess() ( (HANDLE) 0xFFFFFFFF ) +#endif /* NtCurrentProcess */ +#ifndef NtCurrentThread #define NtCurrentThread() ( (HANDLE) 0xFFFFFFFE ) +#endif /* NtCurrentThread */ #if 1 extern ULONG NtBuildNumber; #else diff --git a/reactos/include/ole32/guiddef.h b/reactos/include/ole32/guiddef.h index ae24dc909cf..0e78b83c68e 100644 --- a/reactos/include/ole32/guiddef.h +++ b/reactos/include/ole32/guiddef.h @@ -32,6 +32,9 @@ Cambridge, MA 02139, USA. #include +#ifdef __USE_W32API +#include +#endif /* __USE_W32API */ #ifndef EXTERN_C #ifdef __cplusplus @@ -41,10 +44,11 @@ Cambridge, MA 02139, USA. #endif #endif +#ifndef __USE_W32API /* guid definition */ -#ifndef _GUID_DEFINED - #define _GUID_DEFINED +#ifndef GUID_DEFINED + #define GUID_DEFINED typedef struct _GUID { unsigned long Data1; unsigned short Data2; @@ -55,6 +59,8 @@ Cambridge, MA 02139, USA. typedef const GUID* LPCGUID; #endif +#endif /* __USE_W32API */ + /* guid definition macro */ #ifdef DEFINE_GUID @@ -74,24 +80,31 @@ Cambridge, MA 02139, USA. #endif + /* IID section */ +#ifndef __USE_W32API typedef GUID IID; typedef IID* LPIID; +#endif /* __USE_W32API */ #ifndef IsEqualIID #define IsEqualIID(riid1, riid2) IsEqualGUID(riid1, riid2) #endif /* CLSID section */ +#ifndef __USE_W32API typedef GUID CLSID; typedef CLSID* LPCLSID; +#endif /* __USE_W32API */ #ifndef IsEqualCLSID #define IsEqualCLSID(rclsid1, rclsid2) IsEqualGUID(rclsid1, rclsid2) #endif /* FMTID */ +#ifndef __USE_W32API typedef GUID FMTID; typedef FMTID* LPFMTID; +#endif /* __USE_W32API */ #define IsEqualFMTID(rfmtid1, rfmtid2) IsEqualGUID(rfmtid1, rfmtid2) diff --git a/reactos/include/structs.h b/reactos/include/structs.h index 9c1b1dc99e2..f3ec91c4fb5 100644 --- a/reactos/include/structs.h +++ b/reactos/include/structs.h @@ -3781,8 +3781,8 @@ typedef struct _SERVICE_ADDRESSES { SERVICE_ADDRESS Addresses[1]; } SERVICE_ADDRESSES, *LPSERVICE_ADDRESSES; -#ifndef _GUID_DEFINED -#define _GUID_DEFINED +#ifndef GUID_DEFINED +#define GUID_DEFINED typedef struct _GUID { unsigned long Data1; diff --git a/reactos/include/win32k/dc.h b/reactos/include/win32k/dc.h index 5b1ac5c4ef5..34593343198 100644 --- a/reactos/include/win32k/dc.h +++ b/reactos/include/win32k/dc.h @@ -155,8 +155,10 @@ INT STDCALL NtGdiDrawEscape(HDC hDC, INT cbInput, LPCSTR lpszInData); +#ifndef __USE_W32API /* FIXME: this typedef should go somewhere else... */ typedef VOID (*GOBJENUMPROC)(PVOID, LPARAM); +#endif INT STDCALL NtGdiEnumObjects(HDC hDC, INT ObjectType, diff --git a/reactos/include/win32k/debug1.h b/reactos/include/win32k/debug1.h index c1a75a6bea2..c3dd4dbb5b9 100644 --- a/reactos/include/win32k/debug1.h +++ b/reactos/include/win32k/debug1.h @@ -24,12 +24,20 @@ #endif #ifndef NASSERT +#ifndef assert #define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d\n", __FILE__,__LINE__); KeBugCheck(0); } +#endif +#ifndef ASSERT #define ASSERT(x) assert(x) +#endif #else +#ifndef assert #define assert(x) +#endif +#ifndef ASSERT #define ASSERT(x) #endif +#endif #define DPRINT1(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); ExAllocatePool(NonPagedPool,0); } while(0); #define CHECKPOINT1 do { DbgPrint("%s:%d\n",__FILE__,__LINE__); ExAllocatePool(NonPagedPool,0); } while(0); diff --git a/reactos/include/win32k/driver.h b/reactos/include/win32k/driver.h index f3eb49b4617..c3a800c9504 100644 --- a/reactos/include/win32k/driver.h +++ b/reactos/include/win32k/driver.h @@ -24,72 +24,72 @@ typedef BOOL STDCALL (*PGD_ASSERTMODE)(DHPDEV, BOOL); typedef BOOL STDCALL (*PGD_RESETPDEV)(DHPDEV, DHPDEV); typedef HBITMAP STDCALL (*PGD_CREATEDEVICEBITMAP)(DHPDEV, SIZEL, ULONG); typedef VOID STDCALL (*PGD_DELETEDEVICEBITMAP)(DHSURF); -typedef BOOL STDCALL (*PGD_REALIZEBRUSH)(PBRUSHOBJ, PSURFOBJ, PSURFOBJ, PSURFOBJ, - PXLATEOBJ, ULONG); +typedef BOOL STDCALL (*PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURFOBJ*, + XLATEOBJ*, ULONG); typedef ULONG STDCALL (*PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); -typedef BOOL STDCALL (*PGD_STROKEPATH)(PSURFOBJ, PPATHOBJ, PCLIPOBJ, PXFORMOBJ, - PBRUSHOBJ, PPOINTL, PLINEATTRS, MIX); -typedef BOOL STDCALL (*PGD_FILLPATH)(PSURFOBJ, PPATHOBJ, PCLIPOBJ, PBRUSHOBJ, - PPOINTL, MIX, ULONG); -typedef BOOL STDCALL (*PGD_STROKEANDFILLPATH)(PSURFOBJ, PPATHOBJ, PCLIPOBJ, - PXFORMOBJ, PBRUSHOBJ, PLINEATTRS, - PBRUSHOBJ, PPOINTL, MIX, ULONG); -typedef BOOL STDCALL (*PGD_PAINT)(PSURFOBJ, PCLIPOBJ, PBRUSHOBJ, PPOINTL, MIX); -typedef BOOL STDCALL (*PGD_BITBLT)(PSURFOBJ, PSURFOBJ, PSURFOBJ, PCLIPOBJ, - PXLATEOBJ, PRECTL, PPOINTL, PPOINTL, PBRUSHOBJ, - PPOINTL, ROP4); -typedef BOOL STDCALL (*PGD_TRANSPARENTBLT)(PSURFOBJ, PSURFOBJ, PCLIPOBJ, PXLATEOBJ, PRECTL, PRECTL, ULONG, ULONG); -typedef BOOL STDCALL (*PGD_COPYBITS)(PSURFOBJ, PSURFOBJ, PCLIPOBJ, PXLATEOBJ, - PRECTL, PPOINTL); -typedef BOOL STDCALL (*PGD_STRETCHBLT)(PSURFOBJ, PSURFOBJ, PSURFOBJ, PCLIPOBJ, - PXLATEOBJ, PCOLORADJUSTMENT, PPOINTL, - PRECTL, PRECTL, PPOINTL, ULONG); -typedef BOOL STDCALL (*PGD_SETPALETTE)(DHPDEV, PPALOBJ, ULONG, ULONG, ULONG); -typedef BOOL STDCALL (*PGD_TEXTOUT)(PSURFOBJ, PSTROBJ, PFONTOBJ, PCLIPOBJ, PRECTL, - PRECTL, PBRUSHOBJ, PBRUSHOBJ, PPOINTL, MIX); -typedef ULONG STDCALL (*PGD_ESCAPE)(PSURFOBJ, ULONG, ULONG, PVOID *, ULONG, PVOID *); -typedef ULONG STDCALL (*PGD_DRAWESCAPE)(PSURFOBJ, ULONG, PCLIPOBJ, PRECTL, ULONG, +typedef BOOL STDCALL (*PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, + BRUSHOBJ*, POINTL*, PLINEATTRS, MIX); +typedef BOOL STDCALL (*PGD_FILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, BRUSHOBJ*, + POINTL*, MIX, ULONG); +typedef BOOL STDCALL (*PGD_STROKEANDFILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, + XFORMOBJ*, BRUSHOBJ*, PLINEATTRS, + BRUSHOBJ*, POINTL*, MIX, ULONG); +typedef BOOL STDCALL (*PGD_PAINT)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX); +typedef BOOL STDCALL (*PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, + XLATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, + POINTL*, ROP4); +typedef BOOL STDCALL (*PGD_TRANSPARENTBLT)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, ULONG, ULONG); +typedef BOOL STDCALL (*PGD_COPYBITS)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, + RECTL*, POINTL*); +typedef BOOL STDCALL (*PGD_STRETCHBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, + XLATEOBJ*, COLORADJUSTMENT*, POINTL*, + RECTL*, RECTL*, POINTL*, ULONG); +typedef BOOL STDCALL (*PGD_SETPALETTE)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG); +typedef BOOL STDCALL (*PGD_TEXTOUT)(SURFOBJ*, STROBJ*, FONTOBJ*, CLIPOBJ*, RECTL*, + RECTL*, BRUSHOBJ*, BRUSHOBJ*, POINTL*, MIX); +typedef ULONG STDCALL (*PGD_ESCAPE)(SURFOBJ*, ULONG, ULONG, PVOID *, ULONG, PVOID *); +typedef ULONG STDCALL (*PGD_DRAWESCAPE)(SURFOBJ*, ULONG, CLIPOBJ*, RECTL*, ULONG, PVOID *); typedef PIFIMETRICS STDCALL (*PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); typedef PVOID STDCALL (*PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULONG); -typedef LONG STDCALL (*PGD_QUERYFONTDATA)(DHPDEV, PFONTOBJ, ULONG, HGLYPH, PGLYPHDATA, +typedef LONG STDCALL (*PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, GLYPHDATA*, PVOID, ULONG); -typedef ULONG STDCALL (*PGD_SETPOINTERSHAPE)(PSURFOBJ, PSURFOBJ, PSURFOBJ, PXLATEOBJ, - LONG, LONG, LONG, LONG, PRECTL, ULONG); -typedef VOID STDCALL (*PGD_MOVEPOINTER)(PSURFOBJ, LONG, LONG, PRECTL); -typedef BOOL STDCALL (*PGD_LINETO)(PSURFOBJ, PCLIPOBJ, PBRUSHOBJ, LONG, LONG, LONG, - LONG, PRECTL, MIX); -typedef BOOL STDCALL (*PGD_SENDPAGE)(PSURFOBJ); -typedef BOOL STDCALL (*PGD_STARTPAGE)(PSURFOBJ); -typedef BOOL STDCALL (*PGD_ENDDOC)(PSURFOBJ, ULONG); -typedef BOOL STDCALL (*PGD_STARTDOC)(PSURFOBJ, PWSTR, DWORD); -typedef ULONG STDCALL (*PGD_GETGLYPHMODE)(DHPDEV, PFONTOBJ); -typedef VOID STDCALL (*PGD_SYNCHRONIZE)(DHPDEV, PRECTL); -typedef ULONG STDCALL (*PGD_SAVESCREENBITS)(PSURFOBJ, ULONG, ULONG, PRECTL); +typedef ULONG STDCALL (*PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, + LONG, LONG, LONG, LONG, RECTL*, ULONG); +typedef VOID STDCALL (*PGD_MOVEPOINTER)(SURFOBJ*, LONG, LONG, RECTL*); +typedef BOOL STDCALL (*PGD_LINETO)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, LONG, LONG, LONG, + LONG, RECTL*, MIX); +typedef BOOL STDCALL (*PGD_SENDPAGE)(SURFOBJ*); +typedef BOOL STDCALL (*PGD_STARTPAGE)(SURFOBJ*); +typedef BOOL STDCALL (*PGD_ENDDOC)(SURFOBJ*, ULONG); +typedef BOOL STDCALL (*PGD_STARTDOC)(SURFOBJ*, PWSTR, DWORD); +typedef ULONG STDCALL (*PGD_GETGLYPHMODE)(DHPDEV, FONTOBJ*); +typedef VOID STDCALL (*PGD_SYNCHRONIZE)(DHPDEV, RECTL*); +typedef ULONG STDCALL (*PGD_SAVESCREENBITS)(SURFOBJ*, ULONG, ULONG, RECTL*); typedef ULONG STDCALL (*PGD_GETMODES)(HANDLE, ULONG, PDEVMODEW); typedef VOID STDCALL (*PGD_FREE)(PVOID, ULONG); -typedef VOID STDCALL (*PGD_DESTROYFONT)(PFONTOBJ); +typedef VOID STDCALL (*PGD_DESTROYFONT)(FONTOBJ*); typedef LONG STDCALL (*PGD_QUERYFONTCAPS)(ULONG, PULONG); typedef ULONG STDCALL (*PGD_LOADFONTFILE)(ULONG, PVOID, ULONG, ULONG); typedef BOOL STDCALL (*PGD_UNLOADFONTFILE)(ULONG); -typedef ULONG STDCALL (*PGD_FONTMANAGEMENT)(PSURFOBJ, PFONTOBJ, ULONG, ULONG, PVOID, +typedef ULONG STDCALL (*PGD_FONTMANAGEMENT)(SURFOBJ*, FONTOBJ*, ULONG, ULONG, PVOID, ULONG, PVOID); typedef LONG STDCALL (*PGD_QUERYTRUETYPETABLE)(ULONG, ULONG, ULONG, PTRDIFF, ULONG, PBYTE); -typedef LONG STDCALL (*PGD_QUERYTRUETYPEOUTLINE)(DHPDEV, PFONTOBJ, HGLYPH, BOOL, - PGLYPHDATA, ULONG, PTTPOLYGONHEADER); +typedef LONG STDCALL (*PGD_QUERYTRUETYPEOUTLINE)(DHPDEV, FONTOBJ*, HGLYPH, BOOL, + GLYPHDATA*, ULONG, TTPOLYGONHEADER*); typedef PVOID STDCALL (*PGD_GETTRUETYPEFILE)(ULONG, PULONG); typedef LONG STDCALL (*PGD_QUERYFONTFILE)(ULONG, ULONG, ULONG, PULONG); -typedef BOOL STDCALL (*PGD_QUERYADVANCEWIDTHS)(DHPDEV, PFONTOBJ, ULONG, HGLYPH *, +typedef BOOL STDCALL (*PGD_QUERYADVANCEWIDTHS)(DHPDEV, FONTOBJ*, ULONG, HGLYPH *, PVOID *, ULONG); -typedef BOOL STDCALL (*PGD_SETPIXELFORMAT)(PSURFOBJ, LONG, ULONG); +typedef BOOL STDCALL (*PGD_SETPIXELFORMAT)(SURFOBJ*, LONG, ULONG); typedef LONG STDCALL (*PGD_DESCRIBEPIXELFORMAT)(DHPDEV, LONG, ULONG, PPIXELFORMATDESCRIPTOR); -typedef BOOL STDCALL (*PGD_SWAPBUFFERS)(PSURFOBJ, PWNDOBJ); -typedef BOOL STDCALL (*PGD_STARTBANDING)(PSURFOBJ, PPOINTL); -typedef BOOL STDCALL (*PGD_NEXTBAND)(PSURFOBJ, PPOINTL); +typedef BOOL STDCALL (*PGD_SWAPBUFFERS)(SURFOBJ*, PWNDOBJ); +typedef BOOL STDCALL (*PGD_STARTBANDING)(SURFOBJ*, POINTL*); +typedef BOOL STDCALL (*PGD_NEXTBAND)(SURFOBJ*, POINTL*); -typedef BOOL STDCALL (*PGD_GETDIRECTDRAWINFO)(DHPDEV, PDD_HALINFO, PDWORD, PVIDEOMEMORY, PDWORD, PDWORD); +typedef BOOL STDCALL (*PGD_GETDIRECTDRAWINFO)(DHPDEV, PDD_HALINFO, PDWORD, VIDEOMEMORY*, PDWORD, PDWORD); typedef BOOL STDCALL (*PGD_ENABLEDIRECTDRAW)(DHPDEV, PDD_CALLBACKS, PDD_SURFACECALLBACKS, PDD_PALETTECALLBACKS); typedef VOID STDCALL (*PGD_DISABLEDIRECTDRAW)(DHPDEV); diff --git a/reactos/subsys/win32k/dib/dib.h b/reactos/subsys/win32k/dib/dib.h index e618b89b702..0d099e08a74 100644 --- a/reactos/subsys/win32k/dib/dib.h +++ b/reactos/subsys/win32k/dib/dib.h @@ -4,62 +4,62 @@ extern unsigned char mask1Bpp[8]; ULONG DIB_DoRop(ULONG Rop, ULONG Dest, ULONG Source, ULONG Pattern); ULONG DIB_GetSource(SURFOBJ* SourceSurf, SURFGDI* SourceGDI, ULONG sx, ULONG sy, XLATEOBJ* ColorTranslation); -VOID DIB_1BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, ULONG c); -ULONG DIB_1BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y); -VOID DIB_1BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c); -VOID DIB_1BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, ULONG c); +VOID DIB_1BPP_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c); +ULONG DIB_1BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y); +VOID DIB_1BPP_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c); +VOID DIB_1BPP_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c); BOOLEAN DIB_1BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, SURFGDI *DestGDI, SURFGDI *SourceGDI, - PRECTL DestRect, POINTL *SourcePoint, - PBRUSHOBJ Brush, PPOINTL BrushOrigin, + RECTL* DestRect, POINTL *SourcePoint, + BRUSHOBJ* Brush, POINTL* BrushOrigin, XLATEOBJ *ColorTranslation, ULONG Rop4); -VOID DIB_4BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, ULONG c); -ULONG DIB_4BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y); -VOID DIB_4BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c); -VOID DIB_4BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, ULONG c); +VOID DIB_4BPP_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c); +ULONG DIB_4BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y); +VOID DIB_4BPP_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c); +VOID DIB_4BPP_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c); BOOLEAN DIB_4BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, SURFGDI *DestGDI, SURFGDI *SourceGDI, - PRECTL DestRect, POINTL *SourcePoint, - PBRUSHOBJ Brush, PPOINTL BrushOrigin, + RECTL* DestRect, POINTL *SourcePoint, + BRUSHOBJ* Brush, POINTL* BrushOrigin, XLATEOBJ *ColorTranslation, ULONG Rop4); -VOID DIB_8BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, ULONG c); -ULONG DIB_8BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y); -VOID DIB_8BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c); -VOID DIB_8BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, ULONG c); +VOID DIB_8BPP_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c); +ULONG DIB_8BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y); +VOID DIB_8BPP_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c); +VOID DIB_8BPP_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c); BOOLEAN DIB_8BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, SURFGDI *DestGDI, SURFGDI *SourceGDI, - PRECTL DestRect, POINTL *SourcePoint, - PBRUSHOBJ Brush, PPOINTL BrushOrigin, + RECTL* DestRect, POINTL *SourcePoint, + BRUSHOBJ* Brush, POINTL* BrushOrigin, XLATEOBJ *ColorTranslation, ULONG Rop4); -VOID DIB_16BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, ULONG c); -ULONG DIB_16BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y); -VOID DIB_16BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c); -VOID DIB_16BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, ULONG c); +VOID DIB_16BPP_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c); +ULONG DIB_16BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y); +VOID DIB_16BPP_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c); +VOID DIB_16BPP_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c); BOOLEAN DIB_16BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, SURFGDI *DestGDI, SURFGDI *SourceGDI, - PRECTL DestRect, POINTL *SourcePoint, - PBRUSHOBJ Brush, PPOINTL BrushOrigin, + RECTL* DestRect, POINTL *SourcePoint, + BRUSHOBJ* Brush, POINTL* BrushOrigin, XLATEOBJ *ColorTranslation, ULONG Rop4); -VOID DIB_24BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, ULONG c); -ULONG DIB_24BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y); -VOID DIB_24BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c); -VOID DIB_24BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, ULONG c); +VOID DIB_24BPP_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c); +ULONG DIB_24BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y); +VOID DIB_24BPP_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c); +VOID DIB_24BPP_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c); BOOLEAN DIB_24BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, SURFGDI *DestGDI, SURFGDI *SourceGDI, - PRECTL DestRect, POINTL *SourcePoint, - PBRUSHOBJ Brush, PPOINTL BrushOrigin, + RECTL* DestRect, POINTL *SourcePoint, + BRUSHOBJ* Brush, POINTL* BrushOrigin, XLATEOBJ *ColorTranslation, ULONG Rop4); -VOID DIB_32BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, ULONG c); -ULONG DIB_32BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y); -VOID DIB_32BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c); -VOID DIB_32BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, ULONG c); +VOID DIB_32BPP_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c); +ULONG DIB_32BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y); +VOID DIB_32BPP_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c); +VOID DIB_32BPP_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c); BOOLEAN DIB_32BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, SURFGDI *DestGDI, SURFGDI *SourceGDI, - PRECTL DestRect, POINTL *SourcePoint, - PBRUSHOBJ Brush, PPOINTL BrushOrigin, + RECTL* DestRect, POINTL *SourcePoint, + BRUSHOBJ* Brush, POINTL* BrushOrigin, XLATEOBJ *ColorTranslation, ULONG Rop4); diff --git a/reactos/subsys/win32k/eng/bitblt.c b/reactos/subsys/win32k/eng/bitblt.c index 677c246f3c1..317b11e7dd2 100644 --- a/reactos/subsys/win32k/eng/bitblt.c +++ b/reactos/subsys/win32k/eng/bitblt.c @@ -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.27 2003/09/09 09:39:21 gvg Exp $ +/* $Id: bitblt.c,v 1.28 2003/10/29 08:38:55 gvg Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -46,20 +46,20 @@ //#define NDEBUG #include -typedef BOOLEAN STDCALL (*PBLTRECTFUNC)(PSURFOBJ OutputObj, - PSURFGDI OutputGDI, - PSURFOBJ InputObj, - PSURFGDI InputGDI, - PSURFOBJ Mask, - PXLATEOBJ ColorTranslation, - PRECTL OutputRect, - PPOINTL InputPoint, - PPOINTL MaskOrigin, - PBRUSHOBJ Brush, - PPOINTL BrushOrigin, +typedef BOOLEAN STDCALL (*PBLTRECTFUNC)(SURFOBJ* OutputObj, + SURFGDI* OutputGDI, + SURFOBJ* InputObj, + SURFGDI* InputGDI, + SURFOBJ* Mask, + XLATEOBJ* ColorTranslation, + RECTL* OutputRect, + POINTL* InputPoint, + POINTL* MaskOrigin, + BRUSHOBJ* Brush, + POINTL* BrushOrigin, ROP4 Rop4); -BOOL STDCALL EngIntersectRect(PRECTL prcDst, PRECTL prcSrc1, PRECTL prcSrc2) +BOOL STDCALL EngIntersectRect(RECTL* prcDst, RECTL* prcSrc1, RECTL* prcSrc2) { static const RECTL rclEmpty = { 0, 0, 0, 0 }; @@ -83,17 +83,17 @@ BOOL STDCALL EngIntersectRect(PRECTL prcDst, PRECTL prcSrc1, PRECTL prcSrc2) } static BOOLEAN STDCALL -BltMask(PSURFOBJ Dest, - PSURFGDI DestGDI, - PSURFOBJ Source, - PSURFGDI SourceGDI, - PSURFOBJ Mask, - PXLATEOBJ ColorTranslation, - PRECTL DestRect, - PPOINTL SourcePoint, - PPOINTL MaskPoint, - PBRUSHOBJ Brush, - PPOINTL BrushPoint, +BltMask(SURFOBJ* Dest, + SURFGDI* DestGDI, + SURFOBJ* Source, + SURFGDI* SourceGDI, + SURFOBJ* Mask, + XLATEOBJ* ColorTranslation, + RECTL* DestRect, + POINTL* SourcePoint, + POINTL* MaskPoint, + BRUSHOBJ* Brush, + POINTL* BrushPoint, ROP4 Rop4) { LONG i, j, dx, dy, c8; @@ -134,17 +134,17 @@ BltMask(PSURFOBJ Dest, } static BOOLEAN STDCALL -BltPatCopy(PSURFOBJ Dest, - PSURFGDI DestGDI, - PSURFOBJ Source, - PSURFGDI SourceGDI, - PSURFOBJ Mask, - PXLATEOBJ ColorTranslation, - PRECTL DestRect, - PPOINTL SourcePoint, - PPOINTL MaskPoint, - PBRUSHOBJ Brush, - PPOINTL BrushPoint, +BltPatCopy(SURFOBJ* Dest, + SURFGDI* DestGDI, + SURFOBJ* Source, + SURFGDI* SourceGDI, + SURFOBJ* Mask, + XLATEOBJ* ColorTranslation, + RECTL* DestRect, + POINTL* SourcePoint, + POINTL* MaskPoint, + BRUSHOBJ* Brush, + POINTL* BrushPoint, ROP4 Rop4) { // These functions are assigned if we're working with a DIB @@ -162,17 +162,17 @@ BltPatCopy(PSURFOBJ Dest, } static BOOLEAN STDCALL -CallDibBitBlt(PSURFOBJ OutputObj, - PSURFGDI OutputGDI, - PSURFOBJ InputObj, - PSURFGDI InputGDI, - PSURFOBJ Mask, - PXLATEOBJ ColorTranslation, - PRECTL OutputRect, - PPOINTL InputPoint, - PPOINTL MaskOrigin, - PBRUSHOBJ Brush, - PPOINTL BrushOrigin, +CallDibBitBlt(SURFOBJ* OutputObj, + SURFGDI* OutputGDI, + SURFOBJ* InputObj, + SURFGDI* InputGDI, + SURFOBJ* Mask, + XLATEOBJ* ColorTranslation, + RECTL* OutputRect, + POINTL* InputPoint, + POINTL* MaskOrigin, + BRUSHOBJ* Brush, + POINTL* BrushOrigin, ROP4 Rop4) { return OutputGDI->DIB_BitBlt(OutputObj, InputObj, OutputGDI, InputGDI, OutputRect, InputPoint, Brush, BrushOrigin, ColorTranslation, Rop4); @@ -200,15 +200,16 @@ EngBitBlt(SURFOBJ *DestObj, RECTL CombinedRect; RECT_ENUM RectEnum; BOOL EnumMore; - PSURFGDI OutputGDI, InputGDI; + SURFGDI* OutputGDI; + SURFGDI* InputGDI; POINTL InputPoint; RECTL InputRect; RECTL OutputRect; POINTL Translate; INTENG_ENTER_LEAVE EnterLeaveSource; INTENG_ENTER_LEAVE EnterLeaveDest; - PSURFOBJ InputObj; - PSURFOBJ OutputObj; + SURFOBJ* InputObj; + SURFOBJ* OutputObj; PBLTRECTFUNC BltRectFunc; BOOLEAN Ret; RECTL ClipRect; @@ -249,7 +250,7 @@ EngBitBlt(SURFOBJ *DestObj, if (NULL != InputObj) { - InputGDI = (PSURFGDI) AccessInternalObjectFromUserObject(InputObj); + InputGDI = (SURFGDI*) AccessInternalObjectFromUserObject(InputObj); } else { @@ -304,7 +305,7 @@ EngBitBlt(SURFOBJ *DestObj, if (NULL != OutputObj) { - OutputGDI = (PSURFGDI)AccessInternalObjectFromUserObject(OutputObj); + OutputGDI = (SURFGDI*)AccessInternalObjectFromUserObject(OutputObj); } // Determine clipping type @@ -436,7 +437,7 @@ IntEngBitBlt(SURFOBJ *DestObj, if (NULL != SourceObj) { - SourceGDI = (PSURFGDI) AccessInternalObjectFromUserObject(SourceObj); + SourceGDI = (SURFGDI*) AccessInternalObjectFromUserObject(SourceObj); MouseSafetyOnDrawStart(SourceObj, SourceGDI, InputPoint.x, InputPoint.y, (InputPoint.x + abs(DestRect->right - DestRect->left)), (InputPoint.y + abs(DestRect->bottom - DestRect->top))); diff --git a/reactos/subsys/win32k/eng/brush.c b/reactos/subsys/win32k/eng/brush.c index cb0a1eea77a..cd457e00502 100644 --- a/reactos/subsys/win32k/eng/brush.c +++ b/reactos/subsys/win32k/eng/brush.c @@ -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: brush.c,v 1.8 2003/07/11 15:59:37 royce Exp $ +/* $Id: brush.c,v 1.9 2003/10/29 08:38:55 gvg Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -33,7 +33,7 @@ * @implemented */ PVOID STDCALL -BRUSHOBJ_pvAllocRbrush(IN PBRUSHOBJ BrushObj, +BRUSHOBJ_pvAllocRbrush(IN BRUSHOBJ *BrushObj, IN ULONG ObjSize) { BrushObj->pvRbrush=EngAllocMem(0, ObjSize, 0); @@ -44,7 +44,7 @@ BRUSHOBJ_pvAllocRbrush(IN PBRUSHOBJ BrushObj, * @implemented */ PVOID STDCALL -BRUSHOBJ_pvGetRbrush(IN PBRUSHOBJ BrushObj) +BRUSHOBJ_pvGetRbrush(IN BRUSHOBJ *BrushObj) { return(BrushObj->pvRbrush); } diff --git a/reactos/subsys/win32k/eng/lineto.c b/reactos/subsys/win32k/eng/lineto.c index c6a2e12d015..663bde3c421 100644 --- a/reactos/subsys/win32k/eng/lineto.c +++ b/reactos/subsys/win32k/eng/lineto.c @@ -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: lineto.c,v 1.24 2003/10/02 21:32:45 gvg Exp $ + * $Id: lineto.c,v 1.25 2003/10/29 08:38:55 gvg Exp $ */ #include @@ -501,17 +501,24 @@ IntEngLineTo(SURFOBJ *DestSurf, { BOOLEAN ret; SURFGDI *SurfGDI; +RECTL b; /* No success yet */ ret = FALSE; SurfGDI = (SURFGDI*)AccessInternalObjectFromUserObject(DestSurf); +b.left = min(x1, x2); +b.right = max(x1, x2); +b.top = min(y1, y2); +b.bottom = max(y1, y2); +if (b.left == b.right) b.right++; +if (b.top == b.bottom) b.bottom++; MouseSafetyOnDrawStart(DestSurf, SurfGDI, x1, y1, x2, y2); if (NULL != SurfGDI->LineTo) { /* Call the driver's DrvLineTo */ - ret = SurfGDI->LineTo(DestSurf, Clip, Brush, x1, y1, x2, y2, RectBounds, mix); + ret = SurfGDI->LineTo(DestSurf, Clip, Brush, x1, y1, x2, y2, /*RectBounds*/&b, mix); } #if 0 diff --git a/reactos/subsys/win32k/eng/mem.c b/reactos/subsys/win32k/eng/mem.c index f2596d04a20..c27ecc68db2 100644 --- a/reactos/subsys/win32k/eng/mem.c +++ b/reactos/subsys/win32k/eng/mem.c @@ -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: mem.c,v 1.13 2003/10/09 06:13:04 gvg Exp $ +/* $Id: mem.c,v 1.14 2003/10/29 08:38:55 gvg Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -27,6 +27,10 @@ * 3/7/1999: Created */ +#ifdef __USE_W32API +#include +#include +#endif #include #include diff --git a/reactos/subsys/win32k/eng/objects.h b/reactos/subsys/win32k/eng/objects.h index 9d994d92411..36786db0a12 100644 --- a/reactos/subsys/win32k/eng/objects.h +++ b/reactos/subsys/win32k/eng/objects.h @@ -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: objects.h,v 1.18 2003/08/28 12:35:59 gvg Exp $ +/* $Id: objects.h,v 1.19 2003/10/29 08:38:55 gvg Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -101,44 +101,44 @@ typedef struct _STRGDI { STROBJ StrObj; } STRGDI; -typedef BOOL STDCALL (*PFN_BitBlt)(PSURFOBJ, PSURFOBJ, PSURFOBJ, PCLIPOBJ, - PXLATEOBJ, PRECTL, PPOINTL, PPOINTL, - PBRUSHOBJ, PPOINTL, ROP4); +typedef BOOL STDCALL (*PFN_BitBlt)(SURFOBJ *, SURFOBJ *, SURFOBJ *, CLIPOBJ *, + XLATEOBJ *, RECTL *, POINTL *, POINTL *, + BRUSHOBJ *, POINTL *, ROP4); -typedef BOOL STDCALL (*PFN_TransparentBlt)(PSURFOBJ, PSURFOBJ, PCLIPOBJ, PXLATEOBJ, PRECTL, PRECTL, ULONG, ULONG); +typedef BOOL STDCALL (*PFN_TransparentBlt)(SURFOBJ *, SURFOBJ *, CLIPOBJ *, XLATEOBJ *, RECTL *, RECTL *, ULONG, ULONG); -typedef BOOL STDCALL (*PFN_StretchBlt)(PSURFOBJ, PSURFOBJ, PSURFOBJ, PCLIPOBJ, - PXLATEOBJ, PCOLORADJUSTMENT, PPOINTL, - PRECTL, PRECTL, PPOINT, ULONG); +typedef BOOL STDCALL (*PFN_StretchBlt)(SURFOBJ *, SURFOBJ *, SURFOBJ *, CLIPOBJ *, + XLATEOBJ *, COLORADJUSTMENT *, POINTL *, + RECTL *, RECTL *, PPOINT, ULONG); -typedef BOOL STDCALL (*PFN_TextOut)(PSURFOBJ, PSTROBJ, PFONTOBJ, PCLIPOBJ, - PRECTL, PRECTL, PBRUSHOBJ, PBRUSHOBJ, - PPOINTL, MIX); +typedef BOOL STDCALL (*PFN_TextOut)(SURFOBJ *, STROBJ *, FONTOBJ *, CLIPOBJ *, + RECTL *, RECTL *, BRUSHOBJ *, BRUSHOBJ *, + POINTL *, MIX); -typedef BOOL STDCALL (*PFN_Paint)(PSURFOBJ, PCLIPOBJ, PBRUSHOBJ, PPOINTL, MIX); +typedef BOOL STDCALL (*PFN_Paint)(SURFOBJ *, CLIPOBJ *, BRUSHOBJ *, POINTL *, MIX); -typedef BOOL STDCALL (*PFN_StrokePath)(PSURFOBJ, PPATHOBJ, PCLIPOBJ, PXFORMOBJ, - PBRUSHOBJ, PPOINTL, PLINEATTRS, MIX); +typedef BOOL STDCALL (*PFN_StrokePath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *, XFORMOBJ *, + BRUSHOBJ *, POINTL *, LINEATTRS *, MIX); -typedef BOOL STDCALL (*PFN_FillPath)(PSURFOBJ, PPATHOBJ, PCLIPOBJ, PBRUSHOBJ, - PPOINTL, MIX, ULONG); +typedef BOOL STDCALL (*PFN_FillPath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *, BRUSHOBJ *, + POINTL *, MIX, ULONG); -typedef BOOL STDCALL (*PFN_StrokeAndFillPath)(PSURFOBJ, PPATHOBJ, PCLIPOBJ, - PXFORMOBJ, PBRUSHOBJ, PLINEATTRS, PBRUSHOBJ, - PPOINTL, MIX, ULONG); +typedef BOOL STDCALL (*PFN_StrokeAndFillPath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *, + XFORMOBJ *, BRUSHOBJ *, LINEATTRS *, BRUSHOBJ *, + POINTL *, MIX, ULONG); -typedef BOOL STDCALL (*PFN_LineTo)(PSURFOBJ, PCLIPOBJ, PBRUSHOBJ, - LONG, LONG, LONG, LONG, PRECTL, MIX); +typedef BOOL STDCALL (*PFN_LineTo)(SURFOBJ *, CLIPOBJ *, BRUSHOBJ *, + LONG, LONG, LONG, LONG, RECTL *, MIX); -typedef BOOL STDCALL (*PFN_CopyBits)(PSURFOBJ, PSURFOBJ, PCLIPOBJ, - PXLATEOBJ, PRECTL, PPOINTL); +typedef BOOL STDCALL (*PFN_CopyBits)(SURFOBJ *, SURFOBJ *, CLIPOBJ *, + XLATEOBJ *, RECTL *, POINTL *); -typedef VOID STDCALL (*PFN_Synchronize)(DHPDEV, PRECTL); +typedef VOID STDCALL (*PFN_Synchronize)(DHPDEV, RECTL *); -typedef VOID STDCALL (*PFN_MovePointer)(PSURFOBJ, LONG, LONG, PRECTL); +typedef VOID STDCALL (*PFN_MovePointer)(SURFOBJ *, LONG, LONG, RECTL *); -typedef ULONG STDCALL (*PFN_SetPointerShape)(PSURFOBJ, PSURFOBJ, PSURFOBJ, PXLATEOBJ, - LONG, LONG, LONG, LONG, PRECTL, ULONG); +typedef ULONG STDCALL (*PFN_SetPointerShape)(SURFOBJ *, SURFOBJ *, SURFOBJ *, XLATEOBJ *, + LONG, LONG, LONG, LONG, RECTL *, ULONG); typedef HBITMAP STDCALL (*PFN_CreateDeviceBitmap)(DHPDEV, SIZEL, ULONG); @@ -147,14 +147,14 @@ typedef BOOL STDCALL (*PFN_SetPalette)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG); /* Forward declare (circular reference) */ typedef struct _SURFGDI *PSURFGDI; -typedef VOID (*PFN_DIB_PutPixel)(PSURFOBJ, LONG, LONG, ULONG); -typedef ULONG (*PFN_DIB_GetPixel)(PSURFOBJ, LONG, LONG); -typedef VOID (*PFN_DIB_HLine) (PSURFOBJ, LONG, LONG, LONG, ULONG); -typedef VOID (*PFN_DIB_VLine) (PSURFOBJ, LONG, LONG, LONG, ULONG); -typedef BOOLEAN (*PFN_DIB_BitBlt) (PSURFOBJ DestSurf, PSURFOBJ SourceSurf, +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) (SURFOBJ * DestSurf, SURFOBJ * SourceSurf, PSURFGDI DestGDI, PSURFGDI SourceGDI, - PRECTL DestRect, PPOINTL SourcePoint, - PBRUSHOBJ BrushObj, PPOINTL BrushOrigin, + RECTL * DestRect, POINTL * SourcePoint, + BRUSHOBJ *BrushObj, POINTL * BrushOrigin, XLATEOBJ *ColorTranslation, ULONG Rop4); typedef struct _SURFGDI { diff --git a/reactos/subsys/win32k/include/mouse.h b/reactos/subsys/win32k/include/mouse.h index ea4ca57982c..98bb9c097cd 100644 --- a/reactos/subsys/win32k/include/mouse.h +++ b/reactos/subsys/win32k/include/mouse.h @@ -7,8 +7,8 @@ BOOL FASTCALL IntCheckClipCursor(LONG *x, LONG *y, PSYSTEM_CURSORINFO CurInfo); BOOL FASTCALL IntSwapMouseButton(PWINSTATION_OBJECT WinStaObject, BOOL Swap); -INT STDCALL MouseSafetyOnDrawStart(PSURFOBJ SurfObj, PSURFGDI SurfGDI, LONG HazardX1, LONG HazardY1, LONG HazardX2, LONG HazardY2); -INT FASTCALL MouseSafetyOnDrawEnd(PSURFOBJ SurfObj, PSURFGDI SurfGDI); +INT STDCALL MouseSafetyOnDrawStart(SURFOBJ *SurfObj, SURFGDI *SurfGDI, LONG HazardX1, LONG HazardY1, LONG HazardX2, LONG HazardY2); +INT FASTCALL MouseSafetyOnDrawEnd(SURFOBJ *SurfObj, SURFGDI *SurfGDI); BOOL FASTCALL MouseMoveCursor(LONG X, LONG Y); VOID FASTCALL EnableMouse(HDC hDisplayDC); VOID MouseGDICallBack(PMOUSE_INPUT_DATA Data, ULONG InputCount); diff --git a/reactos/subsys/win32k/objects/bitmaps.c b/reactos/subsys/win32k/objects/bitmaps.c index 001bd662bf4..46d26d314d6 100644 --- a/reactos/subsys/win32k/objects/bitmaps.c +++ b/reactos/subsys/win32k/objects/bitmaps.c @@ -16,10 +16,11 @@ * 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.42 2003/10/28 17:43:42 navaraf Exp $ */ +/* $Id: bitmaps.c,v 1.43 2003/10/29 08:38:55 gvg Exp $ */ #undef WIN32_LEAN_AND_MEAN #include #include +#include #include #include #include @@ -34,9 +35,6 @@ #define NDEBUG #include -//FIXME: where should CLR_INVALID be defined? -#define CLR_INVALID 0xffffffff - BOOL STDCALL NtGdiBitBlt(HDC hDCDest, INT XDest, INT YDest,