From 07621c2a9ff29318c470e37042cf45f433baa68b Mon Sep 17 00:00:00 2001
From: Stefan Ginsberg <stefanginsberg@gmail.com>
Date: Tue, 25 Nov 2008 17:11:42 +0000
Subject: [PATCH] - Remove blue's implicit dependency on windef.h

svn path=/trunk/; revision=37643
---
 reactos/drivers/setup/blue/blue.c |  9 ++++-----
 reactos/drivers/setup/blue/blue.h |  4 ++--
 reactos/drivers/setup/blue/font.c | 14 +++++++-------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/reactos/drivers/setup/blue/blue.c b/reactos/drivers/setup/blue/blue.c
index 7e4f6e8984e..3704af8c53b 100644
--- a/reactos/drivers/setup/blue/blue.c
+++ b/reactos/drivers/setup/blue/blue.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
  * FILE:                 services/dd/blue/blue.c
@@ -103,7 +102,7 @@ static const UCHAR DefaultPalette[] =
 static VOID FASTCALL
 ScrSetRegisters(const VGA_REGISTERS *Registers)
 {
-    UINT i;
+    UINT32 i;
 
     /* Update misc output register */
     WRITE_PORT_UCHAR(MISC, Registers->Misc);
@@ -692,7 +691,7 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject,
         {
           PCONSOLE_DRAW ConsoleDraw;
           PUCHAR Src, Dest;
-          UINT SrcDelta, DestDelta, i, Offset;
+          UINT32 SrcDelta, DestDelta, i, Offset;
 
           ConsoleDraw = (PCONSOLE_DRAW) MmGetSystemAddressForMdl(Irp->MdlAddress);
           Src = (PUCHAR) (ConsoleDraw + 1);
@@ -725,7 +724,7 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject,
 
       case IOCTL_CONSOLE_LOADFONT:
           {
-              UINT CodePage = (UINT)*(PULONG)Irp->AssociatedIrp.SystemBuffer;
+              UINT32 CodePage = (UINT32)*(PULONG)Irp->AssociatedIrp.SystemBuffer;
 
               // Upload a font for the codepage if needed
               ScrLoadFontTable(CodePage);
diff --git a/reactos/drivers/setup/blue/blue.h b/reactos/drivers/setup/blue/blue.h
index cdcbc930f1d..a5bdf7b224e 100644
--- a/reactos/drivers/setup/blue/blue.h
+++ b/reactos/drivers/setup/blue/blue.h
@@ -97,5 +97,5 @@ typedef struct _CFFILE
 #define PELINDEX     (PUCHAR)0x3c8
 #define PELDATA      (PUCHAR)0x3c9
 
-void ScrLoadFontTable(UINT CodePage);
-NTSTATUS ExtractFont(UINT CodePage, PUCHAR FontBitField);
+void ScrLoadFontTable(UINT32 CodePage);
+NTSTATUS ExtractFont(UINT32 CodePage, PUCHAR FontBitField);
diff --git a/reactos/drivers/setup/blue/font.c b/reactos/drivers/setup/blue/font.c
index 70737caa449..b310685f044 100644
--- a/reactos/drivers/setup/blue/font.c
+++ b/reactos/drivers/setup/blue/font.c
@@ -18,15 +18,15 @@
 
 VOID OpenBitPlane();
 VOID CloseBitPlane();
-VOID LoadFont(PBYTE Bitplane, PUCHAR FontBitfield);
+VOID LoadFont(PUCHAR Bitplane, PUCHAR FontBitfield);
 
 /* FUNCTIONS ****************************************************************/
 
 VOID
-ScrLoadFontTable(UINT CodePage)
+ScrLoadFontTable(UINT32 CodePage)
 {
     PHYSICAL_ADDRESS BaseAddress;
-    PBYTE Bitplane;
+    PUCHAR Bitplane;
     PUCHAR FontBitfield = NULL;
     NTSTATUS Status = STATUS_SUCCESS;
 
@@ -38,7 +38,7 @@ ScrLoadFontTable(UINT CodePage)
 
         /* get pointer to video memory */
         BaseAddress.QuadPart = BITPLANE_BASE;
-        Bitplane = (PBYTE)MmMapIoSpace (BaseAddress, 0xFFFF, MmNonCached);
+        Bitplane = (PUCHAR)MmMapIoSpace (BaseAddress, 0xFFFF, MmNonCached);
 
         Status = ExtractFont(CodePage, FontBitfield);
         if (NT_SUCCESS(Status))
@@ -54,7 +54,7 @@ ScrLoadFontTable(UINT CodePage)
 
 /* PRIVATE FUNCTIONS *********************************************************/
 
-NTSTATUS ExtractFont(UINT CodePage, PUCHAR FontBitField)
+NTSTATUS ExtractFont(UINT32 CodePage, PUCHAR FontBitField)
 {
     BOOLEAN            bFoundFile = FALSE;
     HANDLE             Handle;
@@ -231,9 +231,9 @@ CloseBitPlane()
 }
 
 VOID
-LoadFont(PBYTE Bitplane, PUCHAR FontBitfield)
+LoadFont(PUCHAR Bitplane, PUCHAR FontBitfield)
 {
-    UINT i,j;
+    UINT32 i,j;
 
     for (i=0; i<256; i++)
     {