From 15f7619166050a130e9a44dddc409b803c60a18e Mon Sep 17 00:00:00 2001
From: Marty Dill <mdill@uvic.ca>
Date: Sun, 2 Mar 2003 01:24:37 +0000
Subject: [PATCH] Minor fixes to CsrGetTitle and Console_Api to get titles
 working properly.

svn path=/trunk/; revision=4226
---
 reactos/subsys/csrss/api/conio.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/reactos/subsys/csrss/api/conio.c b/reactos/subsys/csrss/api/conio.c
index 28eeb7dac6c..e7857958646 100644
--- a/reactos/subsys/csrss/api/conio.c
+++ b/reactos/subsys/csrss/api/conio.c
@@ -1,4 +1,4 @@
-/* $Id: conio.c,v 1.41 2003/02/24 23:17:32 hbirr Exp $
+/* $Id: conio.c,v 1.42 2003/03/02 01:24:37 mdill Exp $
  *
  * reactos/subsys/csrss/api/conio.c
  *
@@ -926,7 +926,7 @@ VOID Console_Api( DWORD RefreshEvent )
 	      /* this does not seem to work
 		 RtlUnicodeStringToAnsiString( &Title, &SwapConsole->Title, FALSE ); */
 	      // temp hack
-	      for( src = 0, dst = 0; src < SwapConsole->Title.Length; src++, dst++ )
+	      for( src = 0, dst = 0; src <= SwapConsole->Title.Length; src += sizeof(WCHAR), dst++ )
 		Title.Buffer[dst] = (char)SwapConsole->Title.Buffer[dst];
 	      
 	      pos->Y = PhysicalConsoleSize.Y / 2;
@@ -1694,10 +1694,10 @@ CSR_API(CsrGetTitle)
 			Request->Data.GetTitleRequest.ConsoleHandle,
 			(Object_t **) & Console
 			);
-	if ( !NT_SUCCESS( Status ) )
-	{
-		Reply->Status = Status;
-	}
+   if ( !NT_SUCCESS( Status ) )
+   {
+      Reply->Status = Status;
+   }
 	else
 	{
 		HANDLE ConsoleHandle = Request->Data.GetTitleRequest.ConsoleHandle;
@@ -1710,6 +1710,8 @@ CSR_API(CsrGetTitle)
 		Reply->Data.GetTitleReply.ConsoleHandle = ConsoleHandle;
 		Reply->Data.GetTitleReply.Length = Console->Title.Length;
 		wcscpy (Reply->Data.GetTitleReply.Title, Console->Title.Buffer);
+		Reply->Header.MessageSize += Console->Title.Length;
+		Reply->Header.DataSize += Console->Title.Length;
 		Reply->Status = STATUS_SUCCESS;
 	}
 	UNLOCK;