Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-11 07:05:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Remove blue's implicit dependency on windef.h

Browse source 
svn path=/trunk/; revision=37643
This commit is contained in:
Stefan Ginsberg 2008-11-25 17:11:42 +00:00
parent ecff3e72ed
commit 07621c2a9f
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reactos/drivers/setup/blue/blue.c
View file

@ -1,5 +1,4 @@
/* $Id$ /*
*
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
* FILE: services/dd/blue/blue.c * FILE: services/dd/blue/blue.c
@ -103,7 +102,7 @@ static const UCHAR DefaultPalette[] =
static VOID FASTCALL static VOID FASTCALL
ScrSetRegisters(const VGA_REGISTERS *Registers) ScrSetRegisters(const VGA_REGISTERS *Registers)
{ {
UINT i; UINT32 i;
/* Update misc output register */ /* Update misc output register */
WRITE_PORT_UCHAR(MISC, Registers->Misc); WRITE_PORT_UCHAR(MISC, Registers->Misc);
@ -692,7 +691,7 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject,
{ {
PCONSOLE_DRAW ConsoleDraw; PCONSOLE_DRAW ConsoleDraw;
PUCHAR Src, Dest; PUCHAR Src, Dest;
UINT SrcDelta, DestDelta, i, Offset; UINT32 SrcDelta, DestDelta, i, Offset;
ConsoleDraw = (PCONSOLE_DRAW) MmGetSystemAddressForMdl(Irp->MdlAddress); ConsoleDraw = (PCONSOLE_DRAW) MmGetSystemAddressForMdl(Irp->MdlAddress);
Src = (PUCHAR) (ConsoleDraw + 1); Src = (PUCHAR) (ConsoleDraw + 1);
@ -725,7 +724,7 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject,
case IOCTL_CONSOLE_LOADFONT: 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 // Upload a font for the codepage if needed
ScrLoadFontTable(CodePage); ScrLoadFontTable(CodePage);

4
reactos/drivers/setup/blue/blue.h
View file

@ -97,5 +97,5 @@ typedef struct _CFFILE
#define PELINDEX (PUCHAR)0x3c8 #define PELINDEX (PUCHAR)0x3c8
#define PELDATA (PUCHAR)0x3c9 #define PELDATA (PUCHAR)0x3c9
void ScrLoadFontTable(UINT CodePage); void ScrLoadFontTable(UINT32 CodePage);
NTSTATUS ExtractFont(UINT CodePage, PUCHAR FontBitField); NTSTATUS ExtractFont(UINT32 CodePage, PUCHAR FontBitField);

14
reactos/drivers/setup/blue/font.c
View file

@ -18,15 +18,15 @@
VOID OpenBitPlane(); VOID OpenBitPlane();
VOID CloseBitPlane(); VOID CloseBitPlane();
VOID LoadFont(PBYTE Bitplane, PUCHAR FontBitfield); VOID LoadFont(PUCHAR Bitplane, PUCHAR FontBitfield);
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
VOID VOID
ScrLoadFontTable(UINT CodePage) ScrLoadFontTable(UINT32 CodePage)
{ {
PHYSICAL_ADDRESS BaseAddress; PHYSICAL_ADDRESS BaseAddress;
PBYTE Bitplane; PUCHAR Bitplane;
PUCHAR FontBitfield = NULL; PUCHAR FontBitfield = NULL;
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
@ -38,7 +38,7 @@ ScrLoadFontTable(UINT CodePage)
/* get pointer to video memory */ /* get pointer to video memory */
BaseAddress.QuadPart = BITPLANE_BASE; BaseAddress.QuadPart = BITPLANE_BASE;
Bitplane = (PBYTE)MmMapIoSpace (BaseAddress, 0xFFFF, MmNonCached); Bitplane = (PUCHAR)MmMapIoSpace (BaseAddress, 0xFFFF, MmNonCached);
Status = ExtractFont(CodePage, FontBitfield); Status = ExtractFont(CodePage, FontBitfield);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
@ -54,7 +54,7 @@ ScrLoadFontTable(UINT CodePage)
/* PRIVATE FUNCTIONS *********************************************************/ /* PRIVATE FUNCTIONS *********************************************************/
NTSTATUS ExtractFont(UINT CodePage, PUCHAR FontBitField) NTSTATUS ExtractFont(UINT32 CodePage, PUCHAR FontBitField)
{ {
BOOLEAN bFoundFile = FALSE; BOOLEAN bFoundFile = FALSE;
HANDLE Handle; HANDLE Handle;
@ -231,9 +231,9 @@ CloseBitPlane()
} }
VOID VOID
LoadFont(PBYTE Bitplane, PUCHAR FontBitfield) LoadFont(PUCHAR Bitplane, PUCHAR FontBitfield)
{ {
UINT i,j; UINT32 i,j;
for (i=0; i<256; i++) for (i=0; i<256; i++)
{ {