Changeset 39384 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Nov 21, 2011 2:51:02 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

74983

Message:

IPRT/stream-r3: Bugfixes for re-checking/applying stream modes.

File:

• trunk/src/VBox/Runtime/r3/stream.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/stream.cpp

@@ -447 +447 @@
         pStream->fCurrentCodeSet = RT_BOOL(fCurrentCodeSet);
 
+    /* Re-check mode on next operation. */
+    if (   fBinary         != -1
+        || fCurrentCodeSet != -1)
+    {
+        pStream->fRecheckMode = true;
+    }
+
     rtStrmUnlock(pStream);
 
@@ -503 +510 @@
         if (fActual != -1 && fExpected != (fActual & (_O_BINARY | _O_TEXT)))
         {
-            _setmode(fh, fActual & (_O_BINARY | _O_TEXT));
+            fActual = _setmode(fh, fActual & (_O_BINARY | _O_TEXT));
             pStream->fBinary = !(fActual & _O_TEXT);
         }