Implemented IOCTL to draw screen buffer

Changed screen buffer from array of bytes to array of CHAR_INFO svn path=/trunk/; revision=1145
2024-07-08 05:35:06 +00:00 · 2000-05-08 23:27:52 +00:00 · 2000-05-08 23:27:52 +00:00 · a3160d79cd
parent 34010a1fcb
commit a3160d79cd
6 changed files with 163 additions and 84 deletions
--- a/reactos/drivers/dd/blue/blue.c
+++ b/reactos/drivers/dd/blue/blue.c
@ -1,4 +1,4 @@
-/* $Id: blue.c,v 1.21 2000/04/23 17:42:57 phreak Exp $
+/* $Id: blue.c,v 1.22 2000/05/08 23:25:36 ekohl Exp $
 *
 * COPYRIGHT:            See COPYING in the top level directory
 * PROJECT:              ReactOS kernel
@ -64,6 +64,13 @@ typedef struct _DEVICE_EXTENSION
    WORD  Columns;        /* Number of columns     */
 } DEVICE_EXTENSION, *PDEVICE_EXTENSION;

+#pragma pack(push,1)
+typedef struct _CHAR_CELL
+{
+	UCHAR Character;
+	UCHAR Attribute;
+} CHAR_CELL, *PCHAR_CELL;
+#pragma pack(pop)

 /* FUNCTIONS **************************************************************/

@ -277,6 +284,47 @@ ScrWrite (PDEVICE_OBJECT DeviceObject, PIRP Irp)
 }


+static
+NTSTATUS
+BlueDraw (
+	PDEVICE_EXTENSION	DeviceExtension,
+	PIRP			Irp,
+	PIO_STACK_LOCATION	Stack
+	)
+{
+	PCONSOLE_DRAW DrawInfo;
+	PCHAR_INFO CharBuffer;
+	PCHAR_CELL VideoMemory;
+	ULONG ScreenIndex;
+	ULONG BufferIndex;
+	ULONG x;
+	ULONG y;
+
+	DrawInfo = (PCONSOLE_DRAW)Irp->AssociatedIrp.SystemBuffer;
+	CharBuffer = (PCHAR_INFO)MmGetSystemAddressForMdl(Irp->MdlAddress);
+	VideoMemory = (PCHAR_CELL)DeviceExtension->VideoMemory;
+
+	for (y = 0; y < DeviceExtension->Rows; y++)
+	{
+		for (x = 0; x < DeviceExtension->Columns; x++)
+		{
+			ScreenIndex = y *DeviceExtension->Columns + x;
+			BufferIndex = (DrawInfo->Y + y) * DrawInfo->SizeX
+			              + DrawInfo->X + x;
+
+			VideoMemory[ScreenIndex].Character =
+				(CHAR)CharBuffer[BufferIndex].Char.UnicodeChar;
+			VideoMemory[ScreenIndex].Attribute =
+				(CHAR)CharBuffer[BufferIndex].Attributes;
+		}
+	}
+
+	Irp->IoStatus.Information = 0;
+
+	return STATUS_SUCCESS;
+}
+
+
 NTSTATUS
 ScrIoControl (PDEVICE_OBJECT DeviceObject, PIRP Irp)
 {
@ -563,6 +611,10 @@ ScrIoControl (PDEVICE_OBJECT DeviceObject, PIRP Irp)
            break;


+	case IOCTL_CONSOLE_DRAW:
+		Status = BlueDraw (DeviceExtension, Irp, stk);
+		break;
+
        default:
            Status = STATUS_NOT_IMPLEMENTED;
    }
--- a/reactos/drivers/dd/blue/makefile
+++ b/reactos/drivers/dd/blue/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.10 1999/12/18 10:17:41 ea Exp $
+# $Id: makefile,v 1.11 2000/05/08 23:25:36 ekohl Exp $
 #
 #
 TARGET = blue
@ -47,7 +47,8 @@ $(TARGET).sys: $(OBJECTS)
 		-Wl,--defsym,_end=end \
 		-Wl,--defsym,_edata=__data_end__ \
 		-Wl,--defsym,_etext=etext \
-		-Wl,--base-file,base.tmp $(OBJECTS)
+		-Wl,--base-file,base.tmp \
+		$(OBJECTS)
 	- $(RM) junk.tmp
 	$(DLLTOOL) \
 		--dllname $(TARGET).sys \
--- a/reactos/include/ddk/ntddblue.h
+++ b/reactos/include/ddk/ntddblue.h
@ -21,6 +21,8 @@
 #define IOCTL_CONSOLE_WRITE_OUTPUT_CHARACTER    CTL_CODE(FILE_DEVICE_SCREEN, 0x822, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)


+#define IOCTL_CONSOLE_DRAW                      CTL_CODE(FILE_DEVICE_SCREEN, 0x830, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
+

 /* TYPEDEFS **************************************************************/

@ -49,5 +51,13 @@ typedef struct _OUTPUT_CHARACTER
 } OUTPUT_CHARACTER, *POUTPUT_CHARACTER;


+typedef struct _CONSOLE_DRAW
+{
+	SHORT	X;		// Origin
+	SHORT	Y;
+	SHORT	SizeX;		// Size of the screen buffer
+	SHORT	SizeY;
+} CONSOLE_DRAW, *PCONSOLE_DRAW;
+

 #endif /* _NTDDBLUE_H_INCLUDED_ */
--- a/reactos/lib/kernel32/misc/console.c
+++ b/reactos/lib/kernel32/misc/console.c
@ -120,31 +120,34 @@ WINBOOL STDCALL WriteConsoleA(HANDLE hConsoleOutput,
     {
 	return(FALSE);
     }
-   
+
   Request->Type = CSRSS_WRITE_CONSOLE;
   Request->Data.WriteConsoleRequest.ConsoleHandle = hConsoleOutput;
   Request->Data.WriteConsoleRequest.NrCharactersToWrite =
     nNumberOfCharsToWrite;
+
 //   DbgPrint("nNumberOfCharsToWrite %d\n", nNumberOfCharsToWrite);
 //   DbgPrint("Buffer %s\n", Request->Data.WriteConsoleRequest.Buffer);
+
   memcpy(Request->Data.WriteConsoleRequest.Buffer,
 	  lpBuffer,
 	  nNumberOfCharsToWrite);
   
-   Status = CsrClientCallServer(Request, 
+   Status = CsrClientCallServer(Request,
 				&Reply,
 				sizeof(CSRSS_API_REQUEST) + 
 				nNumberOfCharsToWrite,
 				sizeof(CSRSS_API_REPLY));
+
+   HeapFree(GetProcessHeap(),
+	    0,
+	    Request);
+
   if (!NT_SUCCESS(Status))
     {
 	return(FALSE);
     }
-   
-   HeapFree(GetProcessHeap(),
-	    0,
-	    Request);
-	    
+
   if (lpNumberOfCharsWritten != NULL)
     {
 	*lpNumberOfCharsWritten = 
@ -1292,8 +1295,53 @@ WriteConsoleW(
 	LPVOID		 lpReserved
 	)
 {
-/* --- TO DO --- */
-	return FALSE;
+#if 0
+   PCSRSS_API_REQUEST Request;
+   CSRSS_API_REPLY Reply;
+   NTSTATUS Status;
+   
+   Request = HeapAlloc(GetProcessHeap(),
+		       HEAP_ZERO_MEMORY,
+		       sizeof(CSRSS_API_REQUEST) + nNumberOfCharsToWrite * sizeof(WCHAR));
+   if (Request == NULL)
+     {
+	return(FALSE);
+     }
+
+   Request->Type = CSRSS_WRITE_CONSOLE;
+   Request->Data.WriteConsoleRequest.ConsoleHandle = hConsoleOutput;
+   Request->Data.WriteConsoleRequest.NrCharactersToWrite =
+     nNumberOfCharsToWrite;
+//   DbgPrint("nNumberOfCharsToWrite %d\n", nNumberOfCharsToWrite);
+//   DbgPrint("Buffer %s\n", Request->Data.WriteConsoleRequest.Buffer);
+   memcpy(Request->Data.WriteConsoleRequest.Buffer,
+	  lpBuffer,
+	  nNumberOfCharsToWrite * sizeof(WCHAR));
+
+   Status = CsrClientCallServer(Request,
+				&Reply,
+				sizeof(CSRSS_API_REQUEST) +
+				nNumberOfCharsToWrite,
+				sizeof(CSRSS_API_REPLY));
+
+   HeapFree(GetProcessHeap(),
+	    0,
+	    Request);
+
+   if (!NT_SUCCESS(Status))
+     {
+	return(FALSE);
+     }
+
+   if (lpNumberOfCharsWritten != NULL)
+     {
+	*lpNumberOfCharsWritten = 
+	  Reply.Data.WriteConsoleReply.NrCharactersWritten;
+     }
+
+   return(TRUE);
+#endif
+   return FALSE;
 }


--- a/reactos/subsys/csrss/api.h
+++ b/reactos/subsys/csrss/api.h
@ -28,12 +28,12 @@ typedef struct CSRSS_CONSOLE_t
   CRITICAL_SECTION Lock;
   struct CSRSS_CONSOLE_t *Prev, *Next; /* Next and Prev consoles in console wheel */
   HANDLE ActiveEvent;
-   BYTE *Buffer;
+   PCHAR_INFO Buffer;
   USHORT MaxX, MaxY;          /* size of the entire scrollback buffer */
   USHORT ShowX, ShowY;        /* beginning offset for the actual display area */
   ULONG CurrentX;
   ULONG CurrentY;
-   BYTE DefaultAttrib;        /* default char attribute */
+   WORD DefaultAttrib;        /* default char attribute */
   LIST_ENTRY InputEvents;    /* List head for input event queue */
 } CSRSS_CONSOLE, *PCSRSS_CONSOLE;

--- a/reactos/subsys/csrss/api/conio.c
+++ b/reactos/subsys/csrss/api/conio.c
@ -1,4 +1,4 @@
-/* $Id: conio.c,v 1.5 2000/04/23 17:44:53 phreak Exp $
+/* $Id: conio.c,v 1.6 2000/05/08 23:27:03 ekohl Exp $
 *
 * reactos/subsys/csrss/api/conio.c
 *
@ -147,11 +147,9 @@ NTSTATUS CsrWriteConsole(PCSRSS_PROCESS_DATA ProcessData,
 			 PCSRSS_API_REQUEST Message,
 			 PCSRSS_API_REPLY LpcReply)
 {
-   IO_STATUS_BLOCK Iosb;
-   NTSTATUS Status;
-   int i;
   BYTE *Buffer = Message->Data.WriteConsoleRequest.Buffer;
   PCSRSS_CONSOLE Console;
+   int i;
   
   LpcReply->Header.MessageSize = sizeof(CSRSS_API_REPLY);
   LpcReply->Header.DataSize = sizeof(CSRSS_API_REPLY) -
@ -163,7 +161,7 @@ NTSTATUS CsrWriteConsole(PCSRSS_PROCESS_DATA ProcessData,
      {
 	 switch( Buffer[ i ] )
 	    {
-	    case '\n': {
+	    case L'\n': {
 	       int c;
 	       Console->CurrentX = 0;
 	       /* slide the viewable screen */
@ -176,26 +174,28 @@ NTSTATUS CsrWriteConsole(PCSRSS_PROCESS_DATA ProcessData,
 		     for( c = 0; c < Console->MaxX; c++ )
 			{
 			   /* clear new line */
-			   Console->Buffer[ c * 2 ] = ' ';
-			   Console->Buffer[ (c * 2) + 1 ] = Console->DefaultAttrib;
+			   Console->Buffer[ c ].Char.UnicodeChar = L' ';
+			   Console->Buffer[ c ].Attributes = Console->DefaultAttrib;
 			}
 		  }
 	       else for( c = 0; c < Console->MaxX; c++ )
 		  {
 		     /* clear new line */
-		     Console->Buffer[ 2 * ((Console->CurrentY * Console->MaxX) + c) ] = ' ';
-		     Console->Buffer[ (2 * ((Console->CurrentY * Console->MaxX) + c)) + 1 ] = Console->DefaultAttrib;
+		     Console->Buffer[ (Console->CurrentY * Console->MaxX) + c ].Char.UnicodeChar = L' ';
+		     Console->Buffer[ (Console->CurrentY * Console->MaxX) + c ].Attributes = Console->DefaultAttrib;
 		  }
 	       break;
 	    }
-	    case '\b': {
+	    case L'\b': {
 	      if( Console->CurrentX == 0 )
 		{
 		  /* slide viewable screen up */
 		  if( Console->ShowY == Console->CurrentY )
+		  {
 		    if( Console->ShowY == 0 )
 		      Console->ShowY = Console->MaxY;
 		    else Console->ShowY--;
+		  }
 		  /* slide virtual position up */
 		  Console->CurrentX = Console->MaxX;
 		  if( Console->CurrentY == 0 )
@ -203,14 +203,14 @@ NTSTATUS CsrWriteConsole(PCSRSS_PROCESS_DATA ProcessData,
 		  else Console->CurrentY--;
 		}
 	      else Console->CurrentX--;
-	      Console->Buffer[ 2 * ((Console->CurrentY * Console->MaxX) + Console->CurrentX) ] = ' ';
-	      Console->Buffer[ (2 * ((Console->CurrentY * Console->MaxX) + Console->CurrentX)) + 1 ] = Console->DefaultAttrib;
+	      Console->Buffer[ (Console->CurrentY * Console->MaxX) + Console->CurrentX ].Char.UnicodeChar = L' ';
+	      Console->Buffer[ (Console->CurrentY * Console->MaxX) + Console->CurrentX ].Attributes = Console->DefaultAttrib;
 	      break;
 	    }
 	    default: {
 	       int c;
-	       Console->Buffer[ 2 * (((Console->CurrentY * Console->MaxX)) + Console->CurrentX) ] = Buffer[ i ];
-	       Console->Buffer[ (2 * ((Console->CurrentY * Console->MaxX) + Console->CurrentX)) + 1 ] = Console->DefaultAttrib;
+	       Console->Buffer[ (Console->CurrentY * Console->MaxX) + Console->CurrentX ].Char.UnicodeChar = (WCHAR)Buffer[ i ];
+	       Console->Buffer[ (Console->CurrentY * Console->MaxX) + Console->CurrentX ].Attributes = Console->DefaultAttrib;
 	       Console->CurrentX++;
 	       if( Console->CurrentX == Console->MaxX )
 		  {
@ -223,16 +223,16 @@ NTSTATUS CsrWriteConsole(PCSRSS_PROCESS_DATA ProcessData,
 			   /* clear new line */
 			   for( c = 0; c < Console->MaxX; c++ )
 			      {
-				 Console->Buffer[ 2 * ((Console->CurrentY * Console->MaxX) + c) ] = ' ';
-				 Console->Buffer[ (2 * ((Console->CurrentY * Console->MaxX) + c)) + 1 ] = Console->DefaultAttrib;
+				 Console->Buffer[ (Console->CurrentY * Console->MaxX) + c ].Char.UnicodeChar = L' ';
+				 Console->Buffer[ (Console->CurrentY * Console->MaxX) + c ].Attributes = Console->DefaultAttrib;
 			      }
 			}
 		     else {
 			/* clear new line */
 			for( c = 0; c < Console->MaxX; c += 2 )
 			   {
-			      Console->Buffer[ 2 * ((Console->CurrentY * Console->MaxX) + c) ] = ' ';
-			      Console->Buffer[ (2 * ((Console->CurrentY * Console->MaxX) + c)) + 1 ] = Console->DefaultAttrib;
+			      Console->Buffer[ (Console->CurrentY * Console->MaxX) + c ].Char.UnicodeChar = L' ';
+			      Console->Buffer[ (Console->CurrentY * Console->MaxX) + c ].Attributes = Console->DefaultAttrib;
 			   }
 		     }
 		     /* slide the viewable screen */
@ -246,19 +246,9 @@ NTSTATUS CsrWriteConsole(PCSRSS_PROCESS_DATA ProcessData,
   CsrUnlockObject( (Object_t *)Console );
   RtlEnterCriticalSection( &ActiveConsoleLock );
   if( Console == ActiveConsole )
-     {    /* only write to screen if Console is Active, and not scrolled up */
-	 Status = NtWriteFile(ConsoleDeviceHandle,
-			      NULL,
-			      NULL,
-			      NULL,
-			      &Iosb,
-			      Message->Data.WriteConsoleRequest.Buffer,
-			      Message->Data.WriteConsoleRequest.NrCharactersToWrite,
-			      NULL,
-			      0);
-	 if (!NT_SUCCESS(Status))
-	       DbgPrint("CSR: Write failed\n");
-      }
+     {   /* only write to screen if Console is Active, and not scrolled up */
+	 CsrDrawConsole ( Console );
+     }
   RtlLeaveCriticalSection( &ActiveConsoleLock );
   LpcReply->Data.WriteConsoleReply.NrCharactersWritten = i;
   LpcReply->Status = STATUS_SUCCESS;
@ -279,7 +269,7 @@ NTSTATUS CsrInitConsole(PCSRSS_PROCESS_DATA ProcessData,
  Console->ReferenceCount = 0;
  Console->Type = CSRSS_CONSOLE_MAGIC;
  RtlInitializeCriticalSection( &Console->Lock );
-  Console->Buffer = RtlAllocateHeap( CsrssApiHeap, 0, Console->MaxX * Console->MaxY * 2 );
+  Console->Buffer = RtlAllocateHeap( CsrssApiHeap, 0, Console->MaxX * Console->MaxY * sizeof(CHAR_INFO) );
  if( Console->Buffer == 0 )
    return STATUS_INSUFFICIENT_RESOURCES;
  Console->InputEvents.Flink = Console->InputEvents.Blink = &Console->InputEvents;
@ -295,8 +285,8 @@ NTSTATUS CsrInitConsole(PCSRSS_PROCESS_DATA ProcessData,
    {
      for( ; Console->CurrentX < Console->MaxX; Console->CurrentX++ )
 	{
-	  Console->Buffer[ (Console->CurrentX * 2) + (Console->CurrentY * Console->MaxX * 2) ] = ' ';
-	  Console->Buffer[ (Console->CurrentX * 2) + (Console->CurrentY * Console->MaxX * 2)+ 1 ] = Console->DefaultAttrib;
+	  Console->Buffer[ Console->CurrentX + (Console->CurrentY * Console->MaxX) ].Char.UnicodeChar = L' ';
+	  Console->Buffer[ Console->CurrentX + (Console->CurrentY * Console->MaxX) ].Attributes = Console->DefaultAttrib;
 	}
      Console->CurrentX = 0;
    }
@ -328,51 +318,29 @@ NTSTATUS CsrInitConsole(PCSRSS_PROCESS_DATA ProcessData,
 **************************************************************/
 VOID CsrDrawConsole( PCSRSS_CONSOLE Console )
 {
-   IO_STATUS_BLOCK Iosb;
   NTSTATUS Status;
+   IO_STATUS_BLOCK Iosb;
+   CONSOLE_DRAW DrawInfo;
+   ULONG BufferSize;
   CONSOLE_SCREEN_BUFFER_INFO ScrInfo;
-   CONSOLE_MODE Mode;
-   int i, y;

-   /* first set position to 0,0 */
-   ScrInfo.dwCursorPosition.X = 0;
-   ScrInfo.dwCursorPosition.Y = 0;
-   ScrInfo.wAttributes = Console->DefaultAttrib;
-   Status = NtDeviceIoControlFile( ConsoleDeviceHandle, NULL, NULL, NULL, &Iosb, IOCTL_CONSOLE_SET_SCREEN_BUFFER_INFO, &ScrInfo, sizeof( ScrInfo ), 0, 0 );
+   DrawInfo.X = Console->ShowX;
+   DrawInfo.Y = Console->ShowY;
+   DrawInfo.SizeX = Console->MaxX;
+   DrawInfo.SizeY = Console->MaxY;
+
+   BufferSize = Console->MaxX * Console->MaxY * sizeof(CHAR_INFO);
+
+   Status = NtDeviceIoControlFile( ConsoleDeviceHandle, NULL, NULL, NULL, &Iosb, IOCTL_CONSOLE_DRAW, &DrawInfo, sizeof( CONSOLE_DRAW ), Console->Buffer, BufferSize);
   if( !NT_SUCCESS( Status ) )
     {
       DbgPrint( "CSR: Failed to set console info\n" );
       return;
     }
-   Mode.dwMode = 0; /* clear ENABLE_PROCESSED_OUTPUT mode */
-   Status = NtDeviceIoControlFile( ConsoleDeviceHandle, NULL, NULL, NULL, &Iosb, IOCTL_CONSOLE_SET_MODE, &Mode, sizeof( Mode ), 0, 0 );
-   if( !NT_SUCCESS( Status ) )
-     {
-       DbgPrint( "CSR: Failed to set console mode\n" );
-       return;
-     }
-   /* blast out buffer */
-   for( i = 0, y = Console->ShowY; i < PhysicalConsoleSize.Y; i++ )
-     {
-       Status = NtWriteFile( ConsoleDeviceHandle, NULL, NULL, NULL, &Iosb, &Console->Buffer[ (Console->ShowX * 2) + (y * Console->MaxX * 2) ], PhysicalConsoleSize.X * 2, 0, 0 );
-       if( !NT_SUCCESS( Status ) )
-	 {
-	   DbgPrint( "CSR: Write to console failed\n" );
-	   return;
-	 }
-       /* wrap back around the end of the buffer */
-       if( ++y == Console->MaxY )
-	 y = 0;
-     }
-   Mode.dwMode = ENABLE_PROCESSED_OUTPUT;
-   Status = NtDeviceIoControlFile( ConsoleDeviceHandle, NULL, NULL, NULL, &Iosb, IOCTL_CONSOLE_SET_MODE, &Mode, sizeof( Mode ), 0, 0 );
-   if( !NT_SUCCESS( Status ) )
-     {
-       DbgPrint( "CSR: Failed to set console mode\n" );
-       return;
-     }
+
   ScrInfo.dwCursorPosition.X = Console->CurrentX - Console->ShowX;
   ScrInfo.dwCursorPosition.Y = ((Console->CurrentY + Console->MaxY) - Console->ShowY) % Console->MaxY;
+   ScrInfo.wAttributes = Console->DefaultAttrib;
   Status = NtDeviceIoControlFile( ConsoleDeviceHandle, NULL, NULL, NULL, &Iosb, IOCTL_CONSOLE_SET_SCREEN_BUFFER_INFO, &ScrInfo, sizeof( ScrInfo ), 0, 0 );
   if( !NT_SUCCESS( Status ) )
     {
@ -381,7 +349,7 @@ VOID CsrDrawConsole( PCSRSS_CONSOLE Console )
     }
 }

-       
+
 VOID CsrDeleteConsole( PCSRSS_PROCESS_DATA ProcessData, PCSRSS_CONSOLE Console )
 {
   ConsoleInput *Event;