Changeset 22059 for trunk/src/kernel32/conbuffervio.cpp

Timestamp:

Jan 10, 2013, 10:47:04 PM (13 years ago)

Author:

dmik

Message:

kernel32: Fix long string output to stdout in console I/O mode.

Kind of a regression of changes made for #90. See Java ticket 201 for details.

File:

• trunk/src/kernel32/conbuffervio.cpp (modified) (1 diff)

trunk/src/kernel32/conbuffervio.cpp

@@ -265 +265 @@
         numchar = numchar - ulCounter;
 
-        if(pConsoleBuffer->coordCursorPosition.X + numchar > pConsoleBuffer->coordWindowSize.X)
+        while (numchar)
         {
-            int tmp = pConsoleBuffer->coordWindowSize.X - pConsoleBuffer->coordCursorPosition.X;
-
-            VioWrtCharStr(&pszBuffer[ulCounter], tmp, pConsoleBuffer->coordCursorPosition.Y, pConsoleBuffer->coordCursorPosition.X, 0);
-            ulCounter += tmp;
-            numchar   -= tmp;
-
-            pConsoleBuffer->coordCursorPosition.X = 0;
-            pConsoleBuffer->coordCursorPosition.Y++;
-            if(pConsoleBuffer->coordCursorPosition.Y >= pConsoleBuffer->coordWindowSize.Y) {
-                dprintf(("scrollup"));
-                VioScrollUp(0, 0, pConsoleBuffer->coordWindowSize.Y-1, pConsoleBuffer->coordWindowSize.X-1,
-                            1, &filler[0], 0);
-                pConsoleBuffer->coordCursorPosition.Y = pConsoleBuffer->coordWindowSize.Y-1;
-            }
-            VioWrtCharStr(&pszBuffer[ulCounter], numchar, pConsoleBuffer->coordCursorPosition.Y, pConsoleBuffer->coordCursorPosition.X, 0);
-            pConsoleBuffer->coordCursorPosition.X += numchar;
-            VioSetCurPos(pConsoleBuffer->coordCursorPosition.Y, pConsoleBuffer->coordCursorPosition.X, 0);
+          if(pConsoleBuffer->coordCursorPosition.X + numchar > pConsoleBuffer->coordWindowSize.X)
+          {
+              int tmp = pConsoleBuffer->coordWindowSize.X - pConsoleBuffer->coordCursorPosition.X;
+
+              VioWrtCharStr(&pszBuffer[ulCounter], tmp, pConsoleBuffer->coordCursorPosition.Y, pConsoleBuffer->coordCursorPosition.X, 0);
+              ulCounter += tmp;
+              numchar   -= tmp;
+
+              pConsoleBuffer->coordCursorPosition.X = 0;
+              pConsoleBuffer->coordCursorPosition.Y++;
+              if(pConsoleBuffer->coordCursorPosition.Y >= pConsoleBuffer->coordWindowSize.Y) {
+                  dprintf(("scrollup"));
+                  VioScrollUp(0, 0, pConsoleBuffer->coordWindowSize.Y-1, pConsoleBuffer->coordWindowSize.X-1,
+                              1, &filler[0], 0);
+                  pConsoleBuffer->coordCursorPosition.Y = pConsoleBuffer->coordWindowSize.Y-1;
+              }
+              VioSetCurPos(pConsoleBuffer->coordCursorPosition.Y, pConsoleBuffer->coordCursorPosition.X, 0);
+          }
+          else {
+              VioWrtCharStr(&pszBuffer[ulCounter], numchar, pConsoleBuffer->coordCursorPosition.Y, pConsoleBuffer->coordCursorPosition.X, 0);
+              ulCounter += numchar;
+              pConsoleBuffer->coordCursorPosition.X += numchar;
+              VioSetCurPos(pConsoleBuffer->coordCursorPosition.Y, pConsoleBuffer->coordCursorPosition.X, 0);
+              numchar = 0;
+          }
         }
-        else {
-            VioWrtCharStr(&pszBuffer[ulCounter], numchar, pConsoleBuffer->coordCursorPosition.Y, pConsoleBuffer->coordCursorPosition.X, 0);
-            pConsoleBuffer->coordCursorPosition.X += numchar;
-            VioSetCurPos(pConsoleBuffer->coordCursorPosition.Y, pConsoleBuffer->coordCursorPosition.X, 0);
-        }
-        ulCounter += numchar;
     }
   }