[hbelusca] 60651: Use \r\n instead of \n only in Hal/InbvDisplayString. This is needed because, when displayed by the EMS console, only \n would be displayed otherwise, leading to misaligned text. ...
Author: hbelusca Date: Sun Oct 13 23:04:13 2013 New Revision: 60651
URL: http://svn.reactos.org/svn/reactos?rev=60651&view=rev Log: Use \r\n instead of \n only in Hal/InbvDisplayString. This is needed because, when displayed by the EMS console, only \n would be displayed otherwise, leading to misaligned text. Part 1/X
Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/kd/i386/kdbg.c trunk/reactos/ntoskrnl/kd/kdio.c trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kd/wrappers/bochs.c trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/po/poshtdwn.c
Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=6065... ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sun Oct 13 23:04:13 2013 @@ -1483,7 +1483,7 @@ else { /* Use hard-coded banner message */ - Status = RtlStringCbCopyA(EndBuffer, Remaining, "REACTOS (R)\n"); + Status = RtlStringCbCopyA(EndBuffer, Remaining, "REACTOS (R)\r\n"); if (!NT_SUCCESS(Status)) { /* Bugcheck */ @@ -1586,7 +1586,7 @@ sizeof(InitBuffer->VersionBuffer), NT_SUCCESS(MsgStatus) ? (PCHAR)MsgEntry->Text : - "%u System Processor [%u MB Memory] %Z\n", + "%u System Processor [%u MB Memory] %Z\r\n", KeNumberProcessors, Size, &TempString);
Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c?... ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sun Oct 13 23:04:13 2013 @@ -208,7 +208,7 @@ if (!KeLoaderBlock) return; RtlUpcaseUnicodeString(ServiceName, ServiceName, FALSE); snprintf(TextBuffer, sizeof(TextBuffer), - "%s%sSystem32\Drivers\%wZ%s\n", + "%s%sSystem32\Drivers\%wZ%s\r\n", KeLoaderBlock->ArcBootDeviceName, KeLoaderBlock->NtBootPathName, ServiceName,
Modified: trunk/reactos/ntoskrnl/kd/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/i386/kdbg.c?rev... ============================================================================== --- trunk/reactos/ntoskrnl/kd/i386/kdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/i386/kdbg.c [iso-8859-1] Sun Oct 13 23:04:13 2013 @@ -84,9 +84,7 @@ } if (ComPortNumber == 0) { - sprintf(buffer, - "\nKernel Debugger: No COM port found!\n\n"); - HalDisplayString(buffer); + HalDisplayString("\r\nKernel Debugger: No COM port found!\r\n\r\n"); return FALSE; } } @@ -105,9 +103,7 @@ : PortInformation->BaudRate)); if (!NT_SUCCESS(Status)) { - sprintf(buffer, - "\nKernel Debugger: Serial port not found!\n\n"); - HalDisplayString(buffer); + HalDisplayString("\r\nKernel Debugger: Serial port not found!\r\n\r\n"); return FALSE; } else @@ -115,7 +111,7 @@ #ifndef NDEBUG /* Print message to blue screen */ sprintf(buffer, - "\nKernel Debugger: Serial port found: COM%ld (Port 0x%lx) BaudRate %ld\n\n", + "\r\nKernel Debugger: Serial port found: COM%ld (Port 0x%lx) BaudRate %ld\r\n\r\n", ComPortNumber, PortInformation->Address, PortInformation->BaudRate);
Modified: trunk/reactos/ntoskrnl/kd/kdio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=6065... ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Sun Oct 13 23:04:13 2013 @@ -247,7 +247,7 @@ } else if (BootPhase == 2) { - HalDisplayString("\n File log debugging enabled\n\n"); + HalDisplayString("\r\n File log debugging enabled\r\n\r\n"); } else if (BootPhase == 3) { @@ -385,7 +385,7 @@ } else if (BootPhase == 2) { - HalDisplayString("\n Serial debugging enabled\n\n"); + HalDisplayString("\r\n Serial debugging enabled\r\n\r\n"); } }
@@ -560,7 +560,7 @@ } else if (BootPhase == 2) { - HalDisplayString("\n Screen debugging enabled\n\n"); + HalDisplayString("\r\n Screen debugging enabled\r\n\r\n"); } }
Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=60... ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Sun Oct 13 23:04:13 2013 @@ -109,7 +109,7 @@ #endif /* DBG */ default: DPRINT1("Invalid debug service call!\n"); - HalDisplayString("Invalid debug service call!\n"); + HalDisplayString("Invalid debug service call!\r\n"); break; }
Modified: trunk/reactos/ntoskrnl/kd/wrappers/bochs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/bochs.... ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/bochs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/bochs.c [iso-8859-1] Sun Oct 13 23:04:13 2013 @@ -60,7 +60,7 @@ } else if (BootPhase == 2) { - HalDisplayString("\n Bochs debugging enabled\n\n"); + HalDisplayString("\r\n Bochs debugging enabled\r\n\r\n"); } }
Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbstu... ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] Sun Oct 13 23:04:13 2013 @@ -1578,12 +1578,12 @@ GspDbgThread = NULL; GspEnumThread = NULL;
- HalDisplayString("Waiting for GDB to attach\n"); + HalDisplayString("Waiting for GDB to attach\r\n"); DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); } else if (BootPhase == 2) { - HalDisplayString("\n GDB debugging enabled\n\n"); + HalDisplayString("\r\n GDB debugging enabled\r\n\r\n"); } }
Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbstu... ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c [iso-8859-1] Sun Oct 13 23:04:13 2013 @@ -1685,12 +1685,12 @@ GspDbgThread = NULL; GspEnumThread = NULL;
- HalDisplayString("Waiting for GDB to attach\n"); + HalDisplayString("Waiting for GDB to attach\r\n"); DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); } else if (BootPhase == 2) { - HalDisplayString("\n GDB debugging enabled\n\n"); + HalDisplayString("\r\n GDB debugging enabled\r\n\r\n"); } }
Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=60651... ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sun Oct 13 23:04:13 2013 @@ -614,7 +614,7 @@
/* Format driver name */ sprintf(Message, - "%s** %12s - Address %p base at %p, DateStamp %08lx\n", + "%s** %12s - Address %p base at %p, DateStamp %08lx\r\n", FirstRun ? "\r\n*":"*", AnsiName, (PVOID)Parameters[i],
Modified: trunk/reactos/ntoskrnl/po/poshtdwn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/poshtdwn.c?rev=... ============================================================================== --- trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] Sun Oct 13 23:04:13 2013 @@ -54,9 +54,9 @@ else { /* Do it in text-mode */ - for (i = 0; i < 25; i++) InbvDisplayString("\n"); + for (i = 0; i < 25; i++) InbvDisplayString("\r\n"); InbvDisplayString(" "); - InbvDisplayString("The system may be powered off now.\n"); + InbvDisplayString("The system may be powered off now.\r\n"); }
/* Hang the system */
-
hbelusca＠svn.reactos.org