sync with trunk head (34904)

[reactos.git] / reactos / lib / sdk / crt / stdio / file.c

diff --git a/reactos/lib/sdk/crt/stdio/file.c b/reactos/lib/sdk/crt/stdio/file.c
index 2429a5c..e0ded79 100644 (file)
--- a/reactos/lib/sdk/crt/stdio/file.c
+++ b/reactos/lib/sdk/crt/stdio/file.c
@@ -96,7 +96,7 @@ typedef struct {
 
 /*static */ioinfo fdesc[MAX_FILES];
 
-FILE _iob[3];
+FILE _iob[3] = { { 0 } };
 
 static int fdstart = 3; /* first unallocated fd */
 static int fdend = 3; /* highest allocated fd */
@@ -182,7 +182,7 @@ static HANDLE fdtoh(int fd)
     *_errno() = EBADF;
     return INVALID_HANDLE_VALUE;
   }
-  if (fdesc[fd].handle == INVALID_HANDLE_VALUE) FIXME("wtf\n");
+  //if (fdesc[fd].handle == INVALID_HANDLE_VALUE) FIXME("wtf\n");
   return fdesc[fd].handle;
 }
 
@@ -1291,7 +1291,7 @@ long CDECL _get_osfhandle(int fd)
   HANDLE hand = fdtoh(fd);
   TRACE(":fd (%d) handle (%p)\n",fd,hand);
 
-  return (long)hand;
+  return (long)(LONG_PTR)hand;
 }
 
 /*********************************************************************
@@ -1654,7 +1654,7 @@ int CDECL _open_osfhandle(long handle, int oflags)
   if (!(oflags & (_O_BINARY | _O_TEXT)))
       oflags |= _O_BINARY;
 
-  fd = alloc_fd((HANDLE)handle, split_oflags(oflags));
+  fd = alloc_fd((HANDLE)(LONG_PTR)handle, split_oflags(oflags));
   TRACE(":handle (%ld) fd (%d) flags 0x%08x\n", handle, fd, oflags);
   return fd;
 }
@@ -2475,27 +2475,28 @@ size_t CDECL fwrite(const void *ptr, size_t size, size_t nmemb, FILE* file)
  */
 wint_t CDECL fputwc(wint_t wc, FILE* file)
 {
-  wchar_t mwc=wc;
-  char mbchar[10]; // MB_CUR_MAX_CONST
-  int mb_return;
+    if (file->_flag & _IOBINARY)
+    {
+        if (fwrite(&wc, sizeof(wc), 1, file) != 1)
+            return WEOF;
+    }
+    else
+    {
+        /* Convert to multibyte in text mode */
+        char mbc[MB_LEN_MAX];
+        int mb_return;
 
-  if (file->_flag & _IOBINARY)
-  {
-    if (fwrite( &mwc, sizeof(mwc), 1, file) != 1)
-      return WEOF;
-  }
-  else
-  {
-    /* Convert to multibyte in text mode */
-    mb_return = wctomb(mbchar, mwc);
-    if (mb_return == -1) return WEOF;
+        mb_return = wctomb(mbc, wc);
 
-    /* Output all characters */
-    if (fwrite( mbchar, 1, mb_return, file) != 1)
-        return WEOF;
-  }
+        if(mb_return == -1)
+            return WEOF;
+
+        /* Output all characters */
+        if (fwrite(mbc, mb_return, 1, file) != 1)
+            return WEOF;
+    }
 
-  return wc;
+    return wc;
 }
 
 /*********************************************************************
@@ -3125,7 +3126,6 @@ int CDECL vfprintf(FILE* file, const char *format, va_list valist)
 int CDECL vfwprintf(FILE* file, const wchar_t *format, va_list valist)
 {
   wchar_t buf[2048], *mem = buf;
-  char mbbuf[2048], *mbmem = mbbuf;
   int written, resize = sizeof(buf) / sizeof(wchar_t), retval;
   /* See vfprintf comments */
   while ((written = _vsnwprintf(mem, resize, format, valist)) == -1 ||
@@ -3141,17 +3141,22 @@ int CDECL vfwprintf(FILE* file, const wchar_t *format, va_list valist)
   /* Check if outputting to a text-file */
   if (fdesc[file->_file].wxflag & WX_TEXT)
   {
-      /* Convert to multibyte then */
-      written = wcstombs(NULL, mem, 0);
+      /* Convert each character and stop at the first invalid character. Behavior verified by tests under WinXP SP2 */
+      char chMultiByte[MB_LEN_MAX];
+      int nReturn;
+      wchar_t *p;
+
+      retval = 0;
 
-      if (written >= sizeof(mbbuf) && (written != (int)-1))
-          mbmem = malloc(written + 1);
+      for (p = mem; *p; p++)
+      {
+          nReturn = wctomb(chMultiByte, *p);
 
-      wcstombs(mbmem, mem, written);
-      retval = fwrite(mbmem, 1, written, file);
+          if(nReturn == -1)
+              break;
 
-      if (mbmem != mbbuf)
-        free(mbmem);
+          retval += fwrite(chMultiByte, 1, nReturn, file);
+      }
   }
   else
   {