[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit 47e8c73ee66d8f9ce235ef633af5e17bad4f0bad
Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Mon Mar 12 21:14:06 2012 +0900

    msvcrt: Add a helper function to flush all buffers.
    (cherry picked from commit 58d6a9a331811312968077c77a9805ab85c35afe)

diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index 7fbe07e..b057f9e 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -748,13 +748,11 @@ int CDECL MSVCRT__wunlink(const MSVCRT_wchar_t *path)
   return -1;
 }
 
-/* _flushall calls MSVCRT_fflush which calls _flushall */
+/* flush_all_buffers calls MSVCRT_fflush which calls flush_all_buffers */
 int CDECL MSVCRT_fflush(MSVCRT_FILE* file);
 
-/*********************************************************************
- *		_flushall (MSVCRT.@)
- */
-int CDECL MSVCRT__flushall(void)
+/* INTERNAL: Flush all stream buffer */
+static int msvcrt_flush_all_buffers(int mask)
 {
   int i, num_flushed = 0;
   MSVCRT_FILE *file;
@@ -765,7 +763,7 @@ int CDECL MSVCRT__flushall(void)
 
     if (file->_flag)
     {
-      if(file->_flag & MSVCRT__IOWRT) {
+      if(file->_flag & mask) {
 	MSVCRT_fflush(file);
         num_flushed++;
       }
@@ -778,6 +776,14 @@ int CDECL MSVCRT__flushall(void)
 }
 
 /*********************************************************************
+ *		_flushall (MSVCRT.@)
+ */
+int CDECL MSVCRT__flushall(void)
+{
+    return msvcrt_flush_all_buffers(MSVCRT__IOWRT);
+}
+
+/*********************************************************************
  *		fflush (MSVCRT.@)
  */
 int CDECL MSVCRT_fflush(MSVCRT_FILE* file)

-- 
Debian Wine packaging