Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 17:44:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ignore '\r' in HalDisplayString().

Browse source 
svn path=/trunk/; revision=2499
This commit is contained in:
Eric Kohl 2002-01-10 01:01:27 +00:00
parent 25c85c7dfe
commit fd4d47ccfc
1 changed files with 108 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
reactos/hal/halx86/display.c
View file

@ -1,10 +1,28 @@
/* $Id: display.c,v 1.1 2001/08/21 20:18:26 chorns Exp $
/*
* ReactOS kernel
* Copyright (C) 1998, 1999, 2000, 2001, 2002 ReactOS Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id: display.c,v 1.2 2002/01/10 01:01:27 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* FILE: ntoskrnl/hal/x86/display.c
* PURPOSE: Blue screen display
* PROGRAMMER: Eric Kohl (ekohl@abo.rhein-zeitung.de)
* PROGRAMMER: Eric Kohl (ekohl@rz-online.de)
* UPDATE HISTORY:
* Created 08/10/99
*/
@ -68,7 +86,7 @@ HalScrollDisplay (VOID)
int i;
ptr = VideoBuffer + SizeX;
RtlMoveMemory (VideoBuffer,
RtlMoveMemory(VideoBuffer,
ptr,
SizeX * (SizeY - 1) * 2);
@ -129,9 +147,9 @@ HalInitializeDisplay (PLOADER_PARAMETER_BLOCK LoaderBlock)
SizeY = SizeY / ScanLines;
#ifdef BOCHS_30ROWS
SizeY=30;
SizeY=30;
#endif
HalClearDisplay ();
HalClearDisplay();
DisplayInitialized = TRUE;
}
@ -139,7 +157,7 @@ SizeY=30;
VOID
HalResetDisplay (VOID)
HalResetDisplay(VOID)
/*
* FUNCTION: Reset the display
* ARGUMENTS:
@ -155,18 +173,15 @@ HalResetDisplay (VOID)
if (HalResetDisplayParameters(SizeX, SizeY) == TRUE)
{
HalOwnsDisplay = TRUE;
HalClearDisplay ();
HalClearDisplay();
}
}
/* PUBLIC FUNCTIONS *********************************************************/
VOID
STDCALL
HalAcquireDisplayOwnership (
IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters
)
VOID STDCALL
HalAcquireDisplayOwnership(IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters)
/*
* FUNCTION:
* ARGUMENTS:
@ -180,7 +195,7 @@ HalAcquireDisplayOwnership (
VOID STDCALL
HalDisplayString (IN PCH String)
HalDisplayString(IN PCH String)
/*
* FUNCTION: Switches the screen to HAL console mode (BSOD) if not there
* already and displays a string
@ -225,7 +240,7 @@ HalDisplayString (IN PCH String)
CursorY++;
CursorX = 0;
}
else
else if (*pch != '\r')
{
HalPutCharacter (*pch);
CursorX++;
@ -259,14 +274,11 @@ HalDisplayString (IN PCH String)
}
VOID
STDCALL
HalQueryDisplayParameters (
PULONG DispSizeX,
PULONG DispSizeY,
PULONG CursorPosX,
PULONG CursorPosY
)
VOID STDCALL
HalQueryDisplayParameters(OUT PULONG DispSizeX,
OUT PULONG DispSizeY,
OUT PULONG CursorPosX,
OUT PULONG CursorPosY)
{
if (DispSizeX)
*DispSizeX = SizeX;
@ -279,12 +291,9 @@ HalQueryDisplayParameters (
}
VOID
STDCALL
HalSetDisplayParameters (
ULONG CursorPosX,
ULONG CursorPosY
)
VOID STDCALL
HalSetDisplayParameters(IN ULONG CursorPosX,
IN ULONG CursorPosY)
{
CursorX = (CursorPosX < SizeX) ? CursorPosX : SizeX - 1;
CursorY = (CursorPosY < SizeY) ? CursorPosY : SizeY - 1;