Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c
Modified: trunk/reactos/drivers/video/displays/vga/objects/transblt.c
Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h
Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
--- trunk/reactos/drivers/video/displays/vga/objects/bitblt.c 2005-11-28 23:58:49 UTC (rev 19737)
+++ trunk/reactos/drivers/video/displays/vga/objects/bitblt.c 2005-11-29 00:33:22 UTC (rev 19738)
@@ -1,11 +1,11 @@
-#include <ntddk.h>
-#define NDEBUG
-#include <debug.h>
#include "../vgaddi.h"
#include "../vgavideo/vgavideo.h"
#include "brush.h"
#include "bitblt.h"
+#define NDEBUG
+#include <debug.h>
+
typedef BOOL (*PFN_VGABlt)(SURFOBJ*, SURFOBJ*, XLATEOBJ*, RECTL*, POINTL*);
typedef BOOL STDCALL (*PBLTRECTFUNC)(SURFOBJ* OutputObj,
SURFOBJ* InputObj,
--- trunk/reactos/drivers/video/displays/vga/objects/transblt.c 2005-11-28 23:58:49 UTC (rev 19737)
+++ trunk/reactos/drivers/video/displays/vga/objects/transblt.c 2005-11-29 00:33:22 UTC (rev 19738)
@@ -1,11 +1,11 @@
-#include <ntddk.h>
-#define NDEBUG
-#include <debug.h>
#include "../vgaddi.h"
#include "../vgavideo/vgavideo.h"
#include "brush.h"
#include "bitblt.h"
+#define NDEBUG
+#include <debug.h>
+
BOOL STDCALL
DrvTransparentBlt(SURFOBJ* Dest,
SURFOBJ* Source,
--- trunk/reactos/drivers/video/displays/vga/vgaddi.h 2005-11-28 23:58:49 UTC (rev 19737)
+++ trunk/reactos/drivers/video/displays/vga/vgaddi.h 2005-11-29 00:33:22 UTC (rev 19738)
@@ -1,11 +1,62 @@
#define _WINBASE_
#define _WINDOWS_H
+#include <stdarg.h>
#include <windef.h>
+#include <guiddef.h>
#include <wingdi.h>
-#include <ddk/ntddk.h>
#include <ddk/winddi.h>
+#include <winioctl.h>
#include <ddk/ntddvdeo.h>
+/* FIXME - what a headers mess.... */
+
+#define DDKAPI __stdcall
+#define DDKFASTAPI __fastcall
+#define FASTCALL __fastcall
+#define DDKCDECLAPI __cdecl
+
+ULONG DbgPrint(PCH 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);
+
+static __inline BOOLEAN
+RemoveEntryList(
+ IN PLIST_ENTRY Entry)
+{
+ PLIST_ENTRY OldFlink;
+ PLIST_ENTRY OldBlink;
+
+ OldFlink = Entry->Flink;
+ OldBlink = Entry->Blink;
+ OldFlink->Blink = OldBlink;
+ OldBlink->Flink = OldFlink;
+ return (OldFlink == OldBlink);
+}
+
+static __inline VOID
+InsertHeadList(
+ IN PLIST_ENTRY ListHead,
+ IN PLIST_ENTRY Entry)
+{
+ PLIST_ENTRY OldFlink;
+ OldFlink = ListHead->Flink;
+ Entry->Flink = OldFlink;
+ Entry->Blink = ListHead;
+ OldFlink->Blink = Entry;
+ ListHead->Flink = Entry;
+}
+
+static __inline VOID
+InitializeListHead(
+ IN PLIST_ENTRY ListHead)
+{
+ ListHead->Flink = ListHead->Blink = ListHead;
+}
+
+/***********************************************************/
+
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#define DS_SOLIDBRUSH 0x00000001
--- trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2005-11-28 23:58:49 UTC (rev 19737)
+++ trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2005-11-29 00:33:22 UTC (rev 19738)
@@ -1,11 +1,23 @@
+#define _WINBASE_
+#define _WINDOWS_H
+#include <stdarg.h>
#include <windef.h>
+#include <guiddef.h>
#include <wingdi.h>
-#include <ddk/ntddk.h>
+#include <ddk/winddi.h>
+#include <winioctl.h>
#include <ddk/ntddvdeo.h>
-#include <ddk/winddi.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);
+
UCHAR PreCalcReverseByte[256];
int maskbit[640];
int y80[480];