Changeset 10005 for trunk/src/msvcrt/console.c

Timestamp:

Apr 10, 2003, 12:28:07 PM (22 years ago)

Author:

sandervl

Message:

PF: MSVCRT update

File:

• trunk/src/msvcrt/console.c (modified) (10 diffs)

trunk/src/msvcrt/console.c

@@ -29 +29 @@
 #include "mtdll.h"
 
+#include <stdio.h>
+#include <string.h>
+
 #include "wine/debug.h"
 
+
 WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
-
 
 
@@ -74 +77 @@
  *              _cputs (MSVCRT.@)
  */
-int _cputs(const char* str)
+int MSVCRT__cputs(const char* str)
 {
   DWORD count;
@@ -90 +93 @@
  *              _getch (MSVCRT.@)
  */
-int _getch(void)
+int MSVCRT__getch(void)
 {
   int retval = MSVCRT_EOF;
@@ -135 +138 @@
  *              _putch (MSVCRT.@)
  */
-int _putch(int c)
+int MSVCRT__putch(int c)
 {
   int retval = MSVCRT_EOF;
@@ -149 +152 @@
  *              _getche (MSVCRT.@)
  */
-int _getche(void)
+int MSVCRT__getche(void)
 {
   int retval;
   LOCK_CONSOLE;
-  retval = _getch();
+  retval = MSVCRT__getch();
   if (retval != MSVCRT_EOF)
-    retval = _putch(retval);
+    retval = MSVCRT__putch(retval);
   UNLOCK_CONSOLE;
   return retval;
@@ -163 +166 @@
  *              _cgets (MSVCRT.@)
  */
-char* _cgets(char* str)
+char* MSVCRT__cgets(char* str)
 {
   char *buf = str + 2;
   int c;
   str[1] = 0; /* Length */
+  dprintf(("MSVCRT: _cgets"));  
   /* FIXME: No editing of string supported */
   LOCK_CONSOLE;
   do
   {
-    if (str[1] >= str[0] || (str[1]++, c = _getche()) == MSVCRT_EOF || c == '\n')
+    if (str[1] >= str[0] || (str[1]++, c = MSVCRT__getche()) == MSVCRT_EOF || c == '\n')
       break;
     *buf++ = c & 0xff;
@@ -184 +188 @@
  *              _ungetch (MSVCRT.@)
  */
-int _ungetch(int c)
+int MSVCRT__ungetch(int c)
 {
   int retval = MSVCRT_EOF;
@@ -197 +201 @@
  *              _kbhit (MSVCRT.@)
  */
-int _kbhit(void)
+int MSVCRT__kbhit(void)
 {
   int retval = 0;
-
+  dprintf(("MSVCRT: kbhit()"));
   LOCK_CONSOLE;
   if (__MSVCRT_console_buffer != MSVCRT_EOF)
@@ -235 +239 @@
  *              _cprintf (MSVCRT.@)
  */
-int _cprintf(const char* format, ...)
+int MSVCRT__cprintf(const char* format, ...)
 {
   char buf[2048], *mem = buf;
   int written, resize = sizeof(buf), retval;
   va_list valist;
-
+  dprintf(("MSVCRT: _cprintf %s",format));
   va_start( valist, format );
   /* There are two conventions for snprintf failing:
@@ -259 +263 @@
   va_end(valist);
   LOCK_CONSOLE;
-  retval = _cputs( mem );
+  retval = MSVCRT__cputs( mem );
   UNLOCK_CONSOLE;
   if (mem != buf)