[ros-diffs] [sginsberg] 37643: - Remove blue's implicit dependency on windef.h

[sginsberg at svn.reactos.org]

Author: sginsberg
Date: Tue Nov 25 11:11:42 2008
New Revision: 37643

URL: http://svn.reactos.org/svn/reactos?rev=37643&view=rev
Log:
- Remove blue's implicit dependency on windef.h

Modified:
    trunk/reactos/drivers/setup/blue/blue.c
    trunk/reactos/drivers/setup/blue/blue.h
    trunk/reactos/drivers/setup/blue/font.c

Modified: trunk/reactos/drivers/setup/blue/blue.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.c?rev=37643&r1=37642&r2=37643&view=diff
==============================================================================
--- trunk/reactos/drivers/setup/blue/blue.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/setup/blue/blue.c [iso-8859-1] Tue Nov 25 11:11:42 2008
@@ -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 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 @@
         {
           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 @@
 
       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);

Modified: trunk/reactos/drivers/setup/blue/blue.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.h?rev=37643&r1=37642&r2=37643&view=diff
==============================================================================
--- trunk/reactos/drivers/setup/blue/blue.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/setup/blue/blue.h [iso-8859-1] Tue Nov 25 11:11:42 2008
@@ -97,5 +97,5 @@
 #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);

Modified: trunk/reactos/drivers/setup/blue/font.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/font.c?rev=37643&r1=37642&r2=37643&view=diff
==============================================================================
--- trunk/reactos/drivers/setup/blue/font.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/setup/blue/font.c [iso-8859-1] Tue Nov 25 11:11:42 2008
@@ -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 @@
 
         /* 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 @@
 
 /* PRIVATE FUNCTIONS *********************************************************/
 
-NTSTATUS ExtractFont(UINT CodePage, PUCHAR FontBitField)
+NTSTATUS ExtractFont(UINT32 CodePage, PUCHAR FontBitField)
 {
     BOOLEAN            bFoundFile = FALSE;
     HANDLE             Handle;
@@ -231,9 +231,9 @@
 }
 
 VOID
-LoadFont(PBYTE Bitplane, PUCHAR FontBitfield)
-{
-    UINT i,j;
+LoadFont(PUCHAR Bitplane, PUCHAR FontBitfield)
+{
+    UINT32 i,j;
 
     for (i=0; i<256; i++)
     {