Author: cwittich
Date: Fri Feb 14 20:19:12 2014
New Revision: 62169
URL:
http://svn.reactos.org/svn/reactos?rev=62169&view=rev
Log:
[crt]
sync _fflush and _flushall with wine 1.7.11
Modified:
trunk/reactos/lib/sdk/crt/stdio/file.c
Modified: trunk/reactos/lib/sdk/crt/stdio/file.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r…
==============================================================================
--- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Fri Feb 14 20:19:12 2014
@@ -734,10 +734,8 @@
/* _flushall calls fflush which calls _flushall */
int CDECL fflush(FILE* file);
-/*********************************************************************
- * _flushall (MSVCRT.@)
- */
-int CDECL _flushall(void)
+/* INTERNAL: Flush all stream buffer */
+static int flush_all_buffers(int mask)
{
int i, num_flushed = 0;
FILE *file;
@@ -748,8 +746,8 @@
if (file->_flag)
{
- if(file->_flag & _IOWRT) {
- fflush(file);
+ if(file->_flag & mask) {
+ fflush(file);
num_flushed++;
}
}
@@ -761,21 +759,40 @@
}
/*********************************************************************
+ * _flushall (MSVCRT.@)
+ */
+int CDECL _flushall(void)
+{
+ return flush_all_buffers(_IOWRT | _IOREAD);
+}
+
+/*********************************************************************
* fflush (MSVCRT.@)
*/
int CDECL fflush(FILE* file)
{
if(!file) {
- _flushall();
+ flush_all_buffers(_IOWRT);
} else if(file->_flag & _IOWRT) {
int res;
_lock_file(file);
res = flush_buffer(file);
+ /* FIXME
+ if(!res && (file->_flag & _IOCOMMIT))
+ res = _commit(file->_file) ? EOF : 0;
+ */
_unlock_file(file);
return res;
- }
+ } else if(file->_flag & _IOREAD) {
+ _lock_file(file);
+ file->_cnt = 0;
+ file->_ptr = file->_base;
+ _unlock_file(file);
+
+ return 0;
+ }
return 0;
}