Changeset 4164 for trunk/src/win32k/misc/vprintf.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/misc/vprintf.c (modified) (11 diffs)

trunk/src/win32k/misc/vprintf.c

@@ -1 @@
-/* $Id: vprintf.c,v 1.7 2000-01-22 18:21:03 bird Exp $
+/* $Id: vprintf.c,v 1.8 2000-09-02 21:08:15 bird Exp $
  *
  * vprintf and printf
@@ -25 +25 @@
 
 
-#ifdef RING0
+
+#if defined(RING0) && !defined(R3TST)
+    #define COMOUTPUT
+#endif
+#if !defined(RING0) || defined(R3TST)
+    #define DOSWRITEOUTPUT
+#endif
+
+#ifndef DOSWRITEOUTPUT
     #define INCL_NOAPI
 #else
@@ -39 +47 @@
 #include <stdarg.h>
 
+#include "devSegDf.h"                   /* Win32k segment definitions. */
 #include "dev32.h"
 #include "vprintf.h"
+#ifdef COMOUTPUT
+    #include <builtin.h>
+#endif
 #ifdef RING0
-    #include <builtin.h>
     #include "options.h"
 #endif
@@ -222 +233 @@
 int vprintf(const char *pszFormat, va_list args)
 {
-    #ifdef RING0
+    #if defined(RING0) && !defined(R3TST)
     if (!options.fLogging)
         return 0;
@@ -239 +250 @@
 int vprintf2(const char *pszFormat, va_list args)
 {
-    #ifndef RING0
-        int cch = 0;
-    #endif
+    int cch = 0;
 
     while (*pszFormat != '\0')
@@ -247 +256 @@
         if (*pszFormat == '%')
         {
-            #ifndef RING0
-                if (cch > 0)
-                {
-                    strout((char*)(pszFormat - cch), cch);
-                    cch = 0;
-                }
-            #endif
+            if (cch > 0)
+            {
+                strout((char*)(pszFormat - cch), cch);
+                cch = 0;
+            }
 
             pszFormat++;  /* skip '%' */
@@ -396 +403 @@
         else
         {
-            #ifdef RING0
-                chout(*pszFormat++);
-            #else
-                cch++;
-                pszFormat++;
-            #endif
-        }
-    }
-
-    #ifndef RING0
-        if (cch > 0)
-        {
-            strout((char*)(pszFormat - cch), cch);
-            cch = 0;
-        }
-    #endif
+            cch++;
+            pszFormat++;
+        }
+    }
+
+    if (cch > 0)
+    {
+        strout((char*)(pszFormat - cch), cch);
+        cch = 0;
+    }
 
     return 0UL;
@@ -479 +480 @@
 static void chout(int ch)
 {
-    #ifndef RING0
-        ULONG ulWrote;
-    #endif
+#ifdef DOSWRITEOUTPUT
+    ULONG ulWrote;
+#endif
 
     if (ch != '\r')
@@ -487 +488 @@
         if (ch == '\n')
         {
-            #ifdef RING0
-                #pragma info(noeff)
-                while (!(_inp(options.usCom + 5) & 0x20));  /* Waits for the port to be ready. */
-                _outp(options.usCom, chReturn);             /* Put the char. */
-                #pragma info(restore)
-            #else
-                DosWrite(1, (void*)&chReturn, 1, &ulWrote);
-            #endif
-        }
-        #ifdef RING0
+        #ifdef COMOUTPUT
             #pragma info(noeff)
             while (!(_inp(options.usCom + 5) & 0x20));  /* Waits for the port to be ready. */
-            _outp(options.usCom, ch);                   /* Put the char. */
+            _outp(options.usCom, chReturn);             /* Put the char. */
             #pragma info(restore)
-            Yield();
-        #else
-            DosWrite(1, (void*)&ch, 1, &ulWrote);
         #endif
+        #ifdef DOSWRITEOUTPUT
+            DosWrite(1, (void*)&chReturn, 1, SSToDS(&ulWrote));
+        #endif
+        }
+    #ifdef COMOUTPUT
+        #pragma info(noeff)
+        while (!(_inp(options.usCom + 5) & 0x20));  /* Waits for the port to be ready. */
+        _outp(options.usCom, ch);                   /* Put the char. */
+        #pragma info(restore)
+        Yield();
+    #endif
+    #ifdef DOSWRITEOUTPUT
+        DosWrite(1, SSToDS(&ch), 1, SSToDS(&ulWrote));
+    #endif
     }
 }
@@ -529 +532 @@
 
         /* write string part */
-        #ifdef RING0
-            for (ul = 0; ul < cch; ul++)
-            {
-                #pragma info(noeff)
-                while (!(_inp(options.usCom + 5) & 0x20));  /* Waits for the port to be ready. */
-                _outp(options.usCom, psz[ul]);              /* Put the char. */
-                #pragma info(restore)
-            }
-        #else
-            DosWrite(1, (void*)psz, cch, &ul);
-        #endif
+    #ifdef COMOUTPUT
+        for (ul = 0; ul < cch; ul++)
+        {
+            #pragma info(noeff)
+            while (!(_inp(options.usCom + 5) & 0x20));  /* Waits for the port to be ready. */
+            _outp(options.usCom, psz[ul]);              /* Put the char. */
+            #pragma info(restore)
+        }
+    #endif
+    #ifdef DOSWRITEOUTPUT
+        DosWrite(1, psz, cch, SSToDS(&ul));
+    #endif
 
         /* 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')
             {
-            #ifdef RING0
+            #ifdef COMOUTPUT
                 #pragma info(noeff)
                 while (!(_inp(options.usCom + 5) & 0x20));  /* Waits for the port to be ready. */
@@ -552 +556 @@
                 while (!(_inp(options.usCom + 5) & 0x20));  /* Waits for the port to be ready. */
                 _outp(options.usCom, chNewLine);            /* Put the char. */
-                cchYield ++;
+                cchYield++;
                 #pragma info(restore)
-            #else
-                DosWrite(1, (void*)&chReturn, 1, &ul);
-                DosWrite(1, (void*)&chNewLine, 1, &ul);
+            #endif
+            #ifdef DOSWRITEOUTPUT
+                DosWrite(1, (void*)&chReturn, 1, SSToDS(&ul));
+                DosWrite(1, (void*)&chNewLine, 1, SSToDS(&ul));
             #endif