[ros-diffs] [greatlrd] 16481: Fix minior bug in ConPrintfPaging so it count line right and do pause on the screen before it getting full. Fix the row size calc code. Move in page break code to the for. Write one char at time. Need to be fixed so it can write more that one char at time.

Fix minior bug in ConPrintfPaging so it count line right and do pause on
the screen before it getting full. Fix the row size calc code. Move in
page break code to the for. Write one char at time. Need to be fixed so
it can write more that one char at time.
Modified: trunk/reactos/subsys/system/cmd/console.c
  _____  

Modified: trunk/reactos/subsys/system/cmd/console.c
--- trunk/reactos/subsys/system/cmd/console.c	2005-07-07 09:56:47 UTC
(rev 16480)
+++ trunk/reactos/subsys/system/cmd/console.c	2005-07-07 11:26:38 UTC
(rev 16481)
@@ -222,11 +222,14 @@

 #else
 	pBuf = szOut;
 #endif
+
 	WriteFile (GetStdHandle (nStdHandle),
 	           pBuf,
 	           len,
 	           &dwWritten,
 	           NULL);
+
+
 #ifdef UNICODE
 	free(pBuf);
 #endif
@@ -239,35 +242,42 @@
 	CONSOLE_SCREEN_BUFFER_INFO csbi;
 	TCHAR szOut[OUTPUT_BUFFER_SIZE];
 	DWORD dwWritten;
-	static int LineCount = 0; //used to count number of lines since
last pause
-	int ScreenLines = 0;  //used to see how big the screen is
-	int ScreenCol = 0;  //the number of chars in a roow
-	int CharEL = 0; //chars since end of line
+  
+  /* used to count number of lines since last pause */
+	static int LineCount = 0;
+
+  /* used to see how big the screen is */
+	int ScreenLines = 0;  
+
+  /* the number of chars in a roow */
+	int ScreenCol = 0;  
+
+  /* chars since end of line */
+	int CharEL = 0; 
+  
 	int i = 0;
 
 	if(NewPage == TRUE)
 		LineCount = 0;
 
+  /* rest LineCount and return if no string have been given */
+  if (szFormat == NULL)
+     return;
+
+
 	//get the size of the visual screen that can be printed too
 	GetConsoleScreenBufferInfo(hConsole, &csbi);
 	//subtract 2 to account for "press any key..." and for the blank
line at the end of PagePrompt()
-	ScreenLines = csbi.srWindow.Bottom  - csbi.srWindow.Top - 2;
-	ScreenCol = csbi.srWindow.Right + 1;
+	ScreenLines = (csbi.srWindow.Bottom  - csbi.srWindow.Top) - 4;
+	ScreenCol = (csbi.srWindow.Right - csbi.srWindow.Left) + 1;
 
 	//make sure they didnt make the screen to small
-	if(ScreenLines<2)
+	if(ScreenLines<4)
+  {
 	   ConPrintf(szFormat, arg_ptr, nStdHandle);
-	//if more lines have been printed then screen size it is time to
stop
-	if(LineCount >= ScreenLines)
-	{
-		if(PagePrompt() != PROMPT_YES)
-		{
-			return;
-		}
-		//reset the number of lines being printed
-		LineCount = 0;
-	}
-
+     return ;
+  }
+	   
 	len = _vstprintf (szOut, szFormat, arg_ptr);
 #ifdef _UNICODE
 	pBuf = malloc(len + 1);
@@ -275,43 +285,45 @@
 #else
 	pBuf = szOut;
 #endif
-	WriteFile (GetStdHandle (nStdHandle),
-		pBuf,
-		len,
-		&dwWritten,
-		NULL);
+	      
+		for(i = 0; i < len; i++)
+		{ 
+      
+      if(szOut[i] == _T('\n'))
+			{			        
+				LineCount++; 
+        CharEL=0;
+			}      
+      else
+      {      
+        CharEL++;           
+        if (CharEL>=ScreenCol)
+        {        
+          if (i+1<len)
+          {
+             if(szOut[i+1] != _T('\n')) LineCount++;          
+          }
+          CharEL=0;
+        }
+       }
 
+      /* FIXME : write more that one char at time */
+      WriteFile (GetStdHandle
(nStdHandle),&pBuf[i],sizeof(TCHAR),&dwWritten,NULL);
+	    if(LineCount >= ScreenLines)
+	      {
+         if(_tcsncicmp(&szOut[i],_T("\n"),2)!=0)
+           WriteFile (GetStdHandle
(nStdHandle),_T("\n"),sizeof(TCHAR),&dwWritten,NULL); 
 
-
-	if(len < ScreenCol)
-	{
-		//if it is smaller then a row then just check for \n
-		for(i = 0; i < len; i++)
-			if(szOut[i] == '\n')
-				LineCount++;
-
-	}
-	else
-	{
-		//if it is bigger then a row check for \n and a string
longer then a row can handle
-		for(i = 0; i < len; i++)
-		{
-			if(szOut[i] == '\n')
-			{
-				CharEL = 0;
-				LineCount++;
-			}
-			else
-			{
-				CharEL++;
-				if(CharEL > ScreenCol)
-				{
-					CharEL = 0;
-					LineCount++;
-				}
-			}
+		     if(PagePrompt() != PROMPT_YES)
+		     {
+			    return;
+		     }
+		     //reset the number of lines being printed         
+		     LineCount = 0;
+         CharEL=0;
+	       }
+      
 		}
-	}
 
 #ifdef UNICODE
 	free(pBuf);