sync to trunk head (37853) (except rbuild changes)

[reactos.git] / reactos / drivers / setup / blue / font.c

diff --git a/reactos/drivers/setup/blue/font.c b/reactos/drivers/setup/blue/font.c
index 70737ca..19e7e9c 100644 (file)
--- 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;
@@ -68,7 +68,7 @@ NTSTATUS ExtractFont(UINT CodePage, PUCHAR FontBitField)
     CFFILE             CabFile;
     ULONG              CabFileOffset = 0;
     LARGE_INTEGER      ByteOffset;
-    WCHAR              SourceBuffer[MAX_PATH] = {L'\0'};
+    WCHAR              SourceBuffer[_MAX_PATH] = {L'\0'};
 
     if(KeGetCurrentIrql() != PASSIVE_LEVEL)
         return STATUS_INVALID_DEVICE_STATE;
@@ -90,7 +90,7 @@ NTSTATUS ExtractFont(UINT CodePage, PUCHAR FontBitField)
         return(Status);
 
     SourceName.Length = 0;
-    SourceName.MaximumLength = MAX_PATH * sizeof(WCHAR);
+    SourceName.MaximumLength = _MAX_PATH * sizeof(WCHAR);
     SourceName.Buffer = SourceBuffer;
 
     Status = ZwQuerySymbolicLinkObject(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++)
     {