Changeset 4164 for trunk/src/win32k/dev16/vprntf16.c

Timestamp:

Sep 2, 2000, 11:08:23 PM (25 years ago)

Author:

bird

Message:

Merged in the Grace branch. New Win32k!

File:

• trunk/src/win32k/dev16/vprntf16.c (modified) (11 diffs)

trunk/src/win32k/dev16/vprntf16.c

@@ -1 @@
-/* $Id: vprntf16.c,v 1.2 2000-02-26 17:49:28 bird Exp $
+/* $Id: vprntf16.c,v 1.3 2000-09-02 21:07:56 bird Exp $
  *
  * vprintf and printf - 16-bit.
@@ -36 +36 @@
 #include <os2.h>
 
+#include "devSegDf.h"                   /* Win32k segment definitions. */
+#include "dev16.h"
 #include "vprntf16.h"
 #ifdef RING0
@@ -41 +43 @@
 #include "conio.h"
 #endif
-#include "dev16.h"
 
 /*******************************************************************************
 *   Global Variables                                                           *
 *******************************************************************************/
+static char chReturn  = '\r';
 static char chNewLine = '\n';
-static char chReturn  = '\r';
+static char chReturnWithNewLine[2] = "\r\n";
 
 /*******************************************************************************
@@ -217 +219 @@
  * @param     args        Argument list.
  */
-int vprintf16(const char *pszFormat, va_list args)
+int FAR vprintf16(const char *pszFormat, va_list args)
 {
     int cch = 0;
@@ -327 +329 @@
                         char *pszStr = va_arg(args, char*);
 
-                        if (pszStr < (char*)0x10000)
+                        if (pszStr == NULL)
                             pszStr = "<NULL>";
                         cchStr = _strnlen(pszStr, (unsigned)cchPrecision);
@@ -391 +393 @@
  * @param     ...        Optional parameters.
  */
-int printf16(const char *pszFormat, ...)
+int FAR printf16(const char *pszFormat, ...)
 {
     int     cch;
@@ -413 +415 @@
 static void choutconsole(int ch)
 {
-    USHORT usWrote;
-
     if (ch != '\r')
     {
+        USHORT  usWrote;                /* Bytes written (ignored). */
         if (ch == '\n')
-        {
-            usWrote = 1;
-            DosWrite(1, (PVOID)&chReturn, 1, &usWrote);
-        }
-        usWrote = 1;
-        DosWrite(1, (PVOID)&ch, 1, &usWrote);
+            DosWrite(1, (PVOID)&chReturnWithNewLine, 2, &usWrote);
+        else
+            DosWrite(1, (PVOID)&ch, 1, &usWrote);
     }
 }
@@ -438 +436 @@
  *            At runtime the text is only sendt to com-port.
  */
-static char *stroutconsole(char *psz, signed cchMax)
-{
+static char *stroutconsole(register char *psz, signed cchMax)
+{
+    register CHAR   ch;
+
     while (cchMax > 0 && *psz != '\0')
     {
-        USHORT cch = 0;
-        USHORT us;
-
-        while (cchMax - cch > 0 && psz[cch] != '\0' && psz[cch] != '\r' && psz[cch] != '\n')
+        register signed cch = 0;
+        USHORT          us;             /* Bytes written (ignored). */
+
+        while (cchMax > cch && (ch = psz[cch]) != '\0' && ch != '\r' && ch != '\n')
             cch++;
 
         /* write string part */
-        us = cch;
         DosWrite(1, (PVOID)psz, cch, &us);
 
-        /* cr and lf check + skip */
-        if (psz[cch] == '\n' || psz[cch] == '\r')
-        {
-            if (psz[cch] == '\n')
-            {
-                DosWrite(1, (PVOID)&chReturn, 1, &us);
-                DosWrite(1, (PVOID)&chNewLine, 1, &us);
-            }
-
-            while (cchMax - cch > 0 && (psz[cch] == '\r' || psz[cch] == '\n'))
-                cch++;
+        /* cr and lf: expand lf to cr+lf and ignore cr. */
+        while (cchMax > cch)
+        {
+            if ((ch = psz[cch]) == '\n')
+                DosWrite(1, (PVOID)&chReturnWithNewLine, 2, &us);
+            else
+                if (ch != '\r')
+                    break;
+            cch++;
         }
 
@@ -481 +478 @@
 static void chout(int ch)
 {
-    #ifdef RING0
+    #if defined(RING0) && !defined(R3TST)
         if (fInitTime)
             choutconsole(ch);
@@ -514 +511 @@
 static char *strout(char *psz, signed cchMax)
 {
-    #ifdef RING0
+    #if defined(RING0) && !defined(R3TST)
         int cchYield = 0;
 
@@ -539 +536 @@
 
             /* cr and lf check + skip */
-            if (psz[cch] == '\n' || psz[cch] == '\r')
+            if (cch < cchMax && (psz[cch] == '\n' || psz[cch] == '\r'))
             {
                 if (psz[cch] == '\n')