[ros-diffs] [akhaldi] 70452: [0.4.0] * Merge the streamout NULL buffer handling fix by Timo in r70443.

Author: akhaldi
Date: Mon Dec 28 10:16:01 2015
New Revision: 70452

URL: http://svn.reactos.org/svn/reactos?rev=70452&view=rev
Log:
[0.4.0] * Merge the streamout NULL buffer handling fix by Timo in r70443.

Modified:
    branches/ros-branch-0_4_0/   (props changed)
    branches/ros-branch-0_4_0/reactos/   (props changed)
    branches/ros-branch-0_4_0/reactos/lib/sdk/crt/printf/streamout.c

Propchange: branches/ros-branch-0_4_0/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Mon Dec 28 10:16:01 2015
@@ -1 +1 @@
-/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437
+/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443

Propchange: branches/ros-branch-0_4_0/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Mon Dec 28 10:16:01 2015
@@ -20,4 +20,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437
+/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443

Modified: branches/ros-branch-0_4_0/reactos/lib/sdk/crt/printf/streamout.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/lib/sd…
==============================================================================
--- branches/ros-branch-0_4_0/reactos/lib/sdk/crt/printf/streamout.c	[iso-8859-1]
(original)
+++ branches/ros-branch-0_4_0/reactos/lib/sdk/crt/printf/streamout.c	[iso-8859-1] Mon Dec
28 10:16:01 2015
@@ -227,11 +227,10 @@
 int
 streamout_char(FILE *stream, int chr)
 {
-#ifdef _LIBCNT_
-     if ((stream->_flag & _IOSTRG) && (!stream->_ptr))
+#if !defined(_USER32_WSPRINTF)
+     if ((stream->_flag & _IOSTRG) && (stream->_base == NULL))
         return 1;
-#endif 
- 
+#endif
 #if defined(_USER32_WSPRINTF) || defined(_LIBCNT_)
     /* Check if the buffer is full */
     if (stream->_cnt < sizeof(TCHAR))
@@ -254,6 +253,11 @@
     TCHAR chr;
     int written = 0;
 
+#if !defined(_USER32_WSPRINTF)
+     if ((stream->_flag & _IOSTRG) && (stream->_base == NULL))
+        return count;
+#endif
+
     while (count--)
     {
 #ifdef _UNICODE
@@ -276,6 +280,11 @@
 {
     wchar_t chr;
     int written = 0;
+
+#if defined(_UNICODE) && !defined(_USER32_WSPRINTF)
+     if ((stream->_flag & _IOSTRG) && (stream->_base == NULL))
+        return count;
+#endif
 
     while (count--)
     {