Changeset 1678 for trunk/src/win32k/misc/vprintf.c

Timestamp:

Nov 10, 1999, 2:45:38 AM (26 years ago)

Author:

bird

Message:

Some bugsfixes - Yield is disabled.
Added parameters.
Correcte moduleheaders.
Introduced a new base class for virtual lx modules + some elf sketches.

File:

• trunk/src/win32k/misc/vprintf.c (modified) (7 diffs)

trunk/src/win32k/misc/vprintf.c

@@ -1 @@
-/* $Id: vprintf.c,v 1.4 1999-11-01 09:28:59 bird Exp $
+/* $Id: vprintf.c,v 1.5 1999-11-10 01:45:37 bird Exp $
  *
  * vprintf and printf
  *
  * Copyright (c) 1999 knut st. osmundsen
+ *
+ * Project Odin Software License can be found in LICENSE.TXT
  *
  */
@@ -22 +24 @@
 #define NTSF_BLANK      0x0040
 
-#define INCL_NOAPI
+
+#ifdef RING0
+    #define INCL_NOAPI
+#else
+    #define INCL_DOSPROCESS
+    #define INCL_DOSERRORS
+#endif
 
 /*******************************************************************************
@@ -205 +213 @@
 
 
-#pragma info(notrd)
 /**
  * Partial vprintf implementation.
+ * This function checks the fLogging flag, and will therefore only write if logging is enabled.
  * @returns   number of
- * @param     pszBuffer   Output buffer.
  * @param     pszFormat   Format string.
  * @param     args        Argument list.
@@ -215 +222 @@
 int vprintf(const char *pszFormat, va_list args)
 {
-    #ifdef RING0
-        if (!options.fLogging)
-            return 0;
-    #else
+    if (!options.fLogging)
+        return 0;
+    return vprintf2(pszFormat, args);
+}
+
+#pragma info(notrd)
+/**
+ * Partial vprintf implementation.
+ * This function don't check the fLogging flag, and will therefore allways write.
+ * @returns   number of
+ * @param     pszFormat   Format string.
+ * @param     args        Argument list.
+ */
+int vprintf2(const char *pszFormat, va_list args)
+{
+    #ifndef RING0
         int cch = 0;
     #endif
@@ -413 +432 @@
     va_list arguments;
 
-    #ifdef RING0
-        if (!options.fLogging)
-            return 0;
-    #endif
-
     va_start(arguments, pszFormat);
     cch = vprintf(pszFormat, arguments);
@@ -432 +446 @@
     va_list arguments;
 
-    #ifdef RING0
-        if (!options.fLogging)
-            return 0;
-    #endif
-
     va_start(arguments, pszFormat);
     cch = vprintf(pszFormat, arguments);
@@ -449 +458 @@
     int     cch;
     va_list arguments;
-
-    #ifdef RING0
-        if (!options.fLogging)
-            return 0;
-    #endif
 
     va_start(arguments, pszFormat);