Author: hpoussin Date: Sun Oct 21 11:14:55 2007 New Revision: 29726
URL: http://svn.reactos.org/svn/reactos?rev=29726&view=rev Log: Replace DDKAPI call convention by APIENTRY, as specified in winddi.h for driver function pointers
Modified: trunk/reactos/drivers/video/displays/framebuf/enable.c trunk/reactos/drivers/video/displays/framebuf/framebuf.h trunk/reactos/drivers/video/displays/framebuf/palette.c trunk/reactos/drivers/video/displays/framebuf/pointer.c trunk/reactos/drivers/video/displays/framebuf/screen.c trunk/reactos/drivers/video/displays/framebuf/surface.c
Modified: trunk/reactos/drivers/video/displays/framebuf/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fram... ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/enable.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/enable.c Sun Oct 21 11:14:55 2007 @@ -46,7 +46,7 @@ * @implemented */
-BOOL DDKAPI +BOOL APIENTRY DrvEnableDriver( ULONG iEngineVersion, ULONG cj, @@ -74,7 +74,7 @@ * @implemented */
-DHPDEV DDKAPI +DHPDEV APIENTRY DrvEnablePDEV( IN DEVMODEW *pdm, IN LPWSTR pwszLogAddress, @@ -128,7 +128,7 @@ * @implemented */
-VOID DDKAPI +VOID APIENTRY DrvCompletePDEV( IN DHPDEV dhpdev, IN HDEV hdev) @@ -146,7 +146,7 @@ * @implemented */
-VOID DDKAPI +VOID APIENTRY DrvDisablePDEV( IN DHPDEV dhpdev) {
Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fram... ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/framebuf.h (original) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h Sun Oct 21 11:14:55 2007 @@ -29,10 +29,6 @@ #include <winioctl.h> #include <ntddvdeo.h>
-#define DDKAPI __stdcall -#define DDKFASTAPI __fastcall -#define FASTCALL __fastcall -#define DDKCDECLAPI __cdecl //#define EXPERIMENTAL_MOUSE_CURSOR_SUPPORT
typedef struct _PDEV @@ -78,7 +74,7 @@ #define ALLOC_TAG TAG('F','B','U','F')
-DHPDEV STDCALL +DHPDEV APIENTRY DrvEnablePDEV( IN DEVMODEW *pdm, IN LPWSTR pwszLogAddress, @@ -92,35 +88,35 @@ IN LPWSTR pwszDeviceName, IN HANDLE hDriver);
-VOID STDCALL +VOID APIENTRY DrvCompletePDEV( IN DHPDEV dhpdev, IN HDEV hdev);
-VOID STDCALL +VOID APIENTRY DrvDisablePDEV( IN DHPDEV dhpdev);
-HSURF STDCALL +HSURF APIENTRY DrvEnableSurface( IN DHPDEV dhpdev);
-VOID STDCALL +VOID APIENTRY DrvDisableSurface( IN DHPDEV dhpdev);
-BOOL STDCALL +BOOL APIENTRY DrvAssertMode( IN DHPDEV dhpdev, IN BOOL bEnable);
-ULONG STDCALL +ULONG APIENTRY DrvGetModes( IN HANDLE hDriver, IN ULONG cjSize, OUT DEVMODEW *pdm);
-BOOL STDCALL +BOOL APIENTRY DrvSetPalette( IN DHPDEV dhpdev, IN PALOBJ *ppalo, @@ -128,7 +124,7 @@ IN ULONG iStart, IN ULONG cColors);
-ULONG STDCALL +ULONG APIENTRY DrvSetPointerShape( IN SURFOBJ *pso, IN SURFOBJ *psoMask, @@ -141,33 +137,30 @@ IN RECTL *prcl, IN FLONG fl);
-VOID STDCALL +VOID APIENTRY DrvMovePointer( IN SURFOBJ *pso, IN LONG x, IN LONG y, IN RECTL *prcl);
-BOOL FASTCALL +BOOL IntInitScreenInfo( PPDEV ppdev, LPDEVMODEW pDevMode, PGDIINFO pGdiInfo, PDEVINFO pDevInfo);
-BOOL FASTCALL +BOOL IntInitDefaultPalette( PPDEV ppdev, PDEVINFO pDevInfo);
-BOOL DDKAPI +BOOL APIENTRY IntSetPalette( IN DHPDEV dhpdev, IN PPALETTEENTRY ppalent, IN ULONG iStart, IN ULONG cColors);
- - #endif /* FRAMEBUF_H */ -
Modified: trunk/reactos/drivers/video/displays/framebuf/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fram... ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/palette.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/palette.c Sun Oct 21 11:14:55 2007 @@ -56,7 +56,7 @@ * by the GDI standard. */
-BOOL FASTCALL +BOOL IntInitDefaultPalette( PPDEV ppdev, PDEVINFO pDevInfo) @@ -106,7 +106,7 @@ * as closely as possible. */
-BOOL DDKAPI +BOOL APIENTRY IntSetPalette( IN DHPDEV dhpdev, IN PPALETTEENTRY ppalent, @@ -166,7 +166,7 @@ * @implemented */
-BOOL DDKAPI +BOOL APIENTRY DrvSetPalette( IN DHPDEV dhpdev, IN PALOBJ *ppalo,
Modified: trunk/reactos/drivers/video/displays/framebuf/pointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fram... ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/pointer.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/pointer.c Sun Oct 21 11:14:55 2007 @@ -31,7 +31,7 @@ * @unimplemented */
-ULONG DDKAPI +ULONG APIENTRY DrvSetPointerShape( IN SURFOBJ *pso, IN SURFOBJ *psoMask, @@ -58,7 +58,7 @@ * @unimplemented */
-VOID DDKAPI +VOID APIENTRY DrvMovePointer( IN SURFOBJ *pso, IN LONG x, @@ -197,7 +197,7 @@ * @implemented */
-ULONG DDKAPI +ULONG APIENTRY DrvSetPointerShape( IN SURFOBJ *pso, IN SURFOBJ *psoMask, @@ -337,7 +337,7 @@ * @implemented */
-VOID DDKAPI +VOID APIENTRY DrvMovePointer( IN SURFOBJ *pso, IN LONG x,
Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fram... ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/screen.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/screen.c Sun Oct 21 11:14:55 2007 @@ -27,7 +27,7 @@ * and returns the list of modes supported by the display driver. */
-DWORD FASTCALL +DWORD GetAvailableModes( HANDLE hDriver, PVIDEO_MODE_INFORMATION *ModeInfo, @@ -107,7 +107,7 @@ return Modes.NumModes; }
-BOOL FASTCALL +BOOL IntInitScreenInfo( PPDEV ppdev, LPDEVMODEW pDevMode, @@ -352,7 +352,7 @@ * @implemented */
-ULONG DDKAPI +ULONG APIENTRY DrvGetModes( IN HANDLE hDriver, IN ULONG cjSize,
Modified: trunk/reactos/drivers/video/displays/framebuf/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fram... ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/surface.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/surface.c Sun Oct 21 11:14:55 2007 @@ -30,7 +30,7 @@ * @implemented */
-HSURF DDKAPI +HSURF APIENTRY DrvEnableSurface( IN DHPDEV dhpdev) { @@ -129,7 +129,7 @@ * @implemented */
-VOID DDKAPI +VOID APIENTRY DrvDisableSurface( IN DHPDEV dhpdev) { @@ -164,7 +164,7 @@ * @implemented */
-BOOL DDKAPI +BOOL APIENTRY DrvAssertMode( IN DHPDEV dhpdev, IN BOOL bEnable)