* PROGRAMMERS:
*/
-#include "../vgaddi.h"
-#include "../vgavideo/vgavideo.h"
-#define NDEBUG
-#include <debug.h>
-
-#define DBG_PREFIX "VGADDI: "
+#include <vgaddi.h>
static BOOL VGAInitialized = FALSE;
IN ULONG SizeOfDED,
OUT PDRVENABLEDATA DriveEnableData)
{
- /* EngDebugPrint("VGADDI", "DrvEnableDriver called...\n", 0); */
+ DPRINT("DrvEnableDriver called...\n");
vgaPreCalc();
PDev = EngAllocMem(FL_ZERO_MEMORY, sizeof(PDEV), ALLOC_TAG);
if (PDev == NULL)
{
- EngDebugPrint(DBG_PREFIX, "EngAllocMem failed for PDEV\n", 0);
+ DPRINT1("EngAllocMem failed for PDEV\n");
return NULL;
}
PDev->KMDriver = Driver;
return OutputSize;
}
+ULONG DbgPrint(PCCH Format,...)
+{
+ va_list ap;
+ va_start(ap, Format);
+ EngDebugPrint("VGADDI", (PCHAR)Format, ap);
+ va_end(ap);
+ return 0;
+}
+
/* EOF */
* PROGRAMMERS:
*/
-#include "../vgaddi.h"
-#include "../vgavideo/vgavideo.h"
-#include "brush.h"
-#include "bitblt.h"
-
-#define NDEBUG
-#include <debug.h>
+#include <vgaddi.h>
typedef BOOL (*PFN_VGABlt)(SURFOBJ*, SURFOBJ*, XLATEOBJ*, RECTL*, POINTL*);
typedef BOOL (APIENTRY *PBLTRECTFUNC)(SURFOBJ* OutputObj,
* PROGRAMMERS:
*/
-#include "../vgaddi.h"
-#include "../vgavideo/vgavideo.h"
-#include <debug.h>
+#include <vgaddi.h>
BOOL APIENTRY
DrvCopyBits(
* PROGRAMMERS: Copyright (C) 1998-2003 ReactOS Team
*/
-#include "../vgaddi.h"
-#include "../vgavideo/vgavideo.h"
+#include <vgaddi.h>
/*
* Draw a line from top-left to bottom-right
/* INCLUDES ******************************************************************/
-#include "../vgaddi.h"
-#include "../vgavideo/vgavideo.h"
-#include <debug.h>
+#include <vgaddi.h>
/* GLOBALS *******************************************************************/
* PROGRAMMERS:
*/
-#include "../vgaddi.h"
-#include "../vgavideo/vgavideo.h"
-#include "brush.h"
-
-#include <debug.h>
+#include <vgaddi.h>
BOOL VGADDIFillSolid(SURFOBJ *Surface, RECTL Dimensions, ULONG iColor)
{
/* INCLUDES ******************************************************************/
-#include "../vgaddi.h"
-#include "../vgavideo/vgavideo.h"
-
-#define NDEBUG
-#include <debug.h>
+#include <vgaddi.h>
/* GLOBALS *******************************************************************/
* PROGRAMMERS:
*/
-#include "../vgaddi.h"
-#include "../vgavideo/vgavideo.h"
+#include <vgaddi.h>
static WORD PaletteBuffer[] = {
16, 0, // 16 entries, start with 0
0,
&ReturnedDataLength))
{
- //DPRINT1("Failed to unmap video memory.\n");
- DbgBreakPoint();
+ DPRINT1("Failed to unmap video memory.\n");
+ EngDebugBreak();
return FALSE;
}
return TRUE;
* PROGRAMMERS:
*/
-#include "../vgaddi.h"
-#include "../vgavideo/vgavideo.h"
-#include "brush.h"
-#include "bitblt.h"
-
-#define NDEBUG
-#include <debug.h>
+#include <vgaddi.h>
BOOL APIENTRY
DrvTransparentBlt(
#include <winioctl.h>
#include <ntddvdeo.h>
+#include "vgavideo/vgavideo.h"
+#include "objects/brush.h"
+#include "objects/bitblt.h"
+
+#ifndef NDEBUG
+#define DPRINT DbgPrint
+#else
+#define DPRINT
+#endif
+#define DPRINT1 DbgPrint
+
/* FIXME - what a headers mess.... */
#define DDKAPI __stdcall
#define DDKCDECLAPI __cdecl
ULONG DbgPrint(PCCH Format,...);
-VOID DDKAPI DbgBreakPoint(VOID);
-VOID DDKAPI WRITE_PORT_UCHAR(IN PUCHAR Port, IN UCHAR Value);
-VOID DDKAPI WRITE_REGISTER_UCHAR(IN PUCHAR Register, IN UCHAR Value);
-UCHAR DDKAPI READ_REGISTER_UCHAR(IN PUCHAR Register);
+VOID DDKAPI WRITE_PORT_UCHAR(IN PUCHAR Port, IN UCHAR Value);
+VOID DDKAPI WRITE_PORT_USHORT(IN PUSHORT Port, IN USHORT Value);
+VOID DDKAPI WRITE_REGISTER_UCHAR(IN PUCHAR Register, IN UCHAR Value);
+UCHAR DDKAPI READ_REGISTER_UCHAR(IN PUCHAR Register);
static __inline BOOLEAN
RemoveEntryList(
* PROGRAMMERS:
*/
-#define _WINBASE_
-#define _WINDOWS_H
-#include <stdarg.h>
-#include <windef.h>
-#include <guiddef.h>
-#include <wingdi.h>
-#include <winddi.h>
-#include <winioctl.h>
-#include <ntddvdeo.h>
-#include <stdlib.h>
-#include "vgavideo.h"
-
-#define DDKAPI __stdcall
-#define DDKFASTAPI __fastcall
-#define FASTCALL __fastcall
-#define DDKCDECLAPI __cdecl
-
-VOID DDKAPI WRITE_PORT_UCHAR(IN PUCHAR Port, IN UCHAR Value);
-VOID DDKAPI WRITE_PORT_USHORT(IN PUSHORT Port, IN USHORT Value);
+#include <vgaddi.h>
UCHAR PreCalcReverseByte[256];
int maskbit[640];
static int byteCounter;
static unsigned char rightMask;
-#define READ_REGISTER_UCHAR(p) (*((volatile UCHAR *)(p)))
-#define WRITE_REGISTER_UCHAR(p,c) (*((volatile CHAR *)(p))) = (c)
-
UCHAR bytesPerPixel(ULONG Format)
{
/* This function is taken from /subsys/win32k/eng/surface.c
c1 = (vgaGetPixel(x + i, y + j) << 4) | (vgaGetPixel(x + i + 1, y + j));
c2 = ((PUCHAR)b)[(j * Dest_lDelta) + (i >> 1)];
if ((c1 & mask) != (c2 & mask))
- DbgBreakPoint();
+ EngDebugBreak();
}
}
#endif /* VGA_VERIFY */