X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FSystem.IO%2FBinaryWriter.cs;h=be47858d4800486f5ea80d6a12e7f960196f0190;hb=e2812813f9cd0a9342982f42f8b8b9818132a7fb;hp=bee0c25581d4bc0db1cb4dc6bdda73f47cf2301e;hpb=5bbfa8860b090e465a3aa45edeb9c94481ef1a22;p=mono.git

diff --git a/mcs/class/corlib/System.IO/BinaryWriter.cs b/mcs/class/corlib/System.IO/BinaryWriter.cs
index bee0c25581d..be47858d480 100644
--- a/mcs/class/corlib/System.IO/BinaryWriter.cs
+++ b/mcs/class/corlib/System.IO/BinaryWriter.cs
@@ -1,12 +1,14 @@
 //
 // System.IO.BinaryWriter
 //
-// Author:
+// Authors:
 //   Matt Kimball (matt@kimball.net)
+//   Marek Safar (marek.safar@gmail.com)
 //
 
 //
 // Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright 2011 Xamarin Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -32,9 +34,11 @@ using System;
 using System.Text;
 using System.Globalization;
 using Mono.Security;
+using System.Runtime.InteropServices;
 
 namespace System.IO {
 	[Serializable]
+	[ComVisible (true)]
 	public class BinaryWriter : IDisposable {
 
 		// Null is a BinaryWriter with no backing store.
@@ -43,20 +47,43 @@ namespace System.IO {
 		protected Stream OutStream;
 		private Encoding m_encoding;
 		private byte [] buffer;
-		private bool disposed = false;
+		byte [] stringBuffer;
+		int maxCharsPerRound;
+		bool disposed;
 
-		protected BinaryWriter() : this (Stream.Null, Encoding.UTF8Unmarked) {
+		protected BinaryWriter() : this (Stream.Null, Encoding.UTF8UnmarkedUnsafe)
+		{
 		}
 
-		public BinaryWriter(Stream output) : this(output, Encoding.UTF8Unmarked) {
+		public BinaryWriter(Stream output) : this(output, Encoding.UTF8UnmarkedUnsafe)
+		{
 		}
-
-		public BinaryWriter(Stream output, Encoding encoding) {
-			if (output == null || encoding == null) 
-				throw new ArgumentNullException(Locale.GetText ("Output or Encoding is a null reference."));
+		
+#if NET_4_5
+		readonly bool leave_open;
+		
+		public BinaryWriter(Stream output, Encoding encoding)
+			: this (output, encoding, false)
+		{
+		}
+		
+		public BinaryWriter(Stream output, Encoding encoding, bool leaveOpen)
+#else
+		const bool leave_open = false;
+		
+		public BinaryWriter(Stream output, Encoding encoding)
+#endif
+		{
+			if (output == null) 
+				throw new ArgumentNullException("output");
+			if (encoding == null) 
+				throw new ArgumentNullException("encoding");
 			if (!output.CanWrite)
 				throw new ArgumentException(Locale.GetText ("Stream does not support writing or already closed."));
 
+#if NET_4_5
+			leave_open = leaveOpen;
+#endif
 			OutStream = output;
 			m_encoding = encoding;
 			buffer = new byte [16];
@@ -64,6 +91,7 @@ namespace System.IO {
 
 		public virtual Stream BaseStream {
 			get {
+				Flush ();
 				return OutStream;
 			}
 		}
@@ -72,13 +100,18 @@ namespace System.IO {
 			Dispose (true);
 		}
 
-		void IDisposable.Dispose() {
+#if NET_4_0
+		public void Dispose ()
+#else
+		void IDisposable.Dispose() 
+#endif
+		{
 			Dispose (true);
 		}
 
 		protected virtual void Dispose (bool disposing)
 		{
-			if (disposing && OutStream != null)
+			if (disposing && OutStream != null && !leave_open)
 				OutStream.Close();
 			
 			buffer = null;
@@ -112,56 +145,56 @@ namespace System.IO {
 			OutStream.WriteByte(value);
 		}
 
-		public virtual void Write(byte[] value) {
+		public virtual void Write(byte[] buffer) {
 
 			if (disposed)
 				throw new ObjectDisposedException ("BinaryWriter", "Cannot write to a closed BinaryWriter");
 
-			if (value == null)
-				throw new ArgumentNullException(Locale.GetText ("Byte buffer is a null reference."));
-			OutStream.Write(value, 0, value.Length);
+			if (buffer == null)
+				throw new ArgumentNullException("buffer");
+			OutStream.Write(buffer, 0, buffer.Length);
 		}
 
-		public virtual void Write(byte[] value, int offset, int length) {
+		public virtual void Write(byte[] buffer, int index, int count) {
 
 			if (disposed)
 				throw new ObjectDisposedException ("BinaryWriter", "Cannot write to a closed BinaryWriter");
 
-			if (value == null)
-				throw new ArgumentNullException(Locale.GetText ("Byte buffer is a null reference."));
-			OutStream.Write(value, offset, length);
+			if (buffer == null)
+				throw new ArgumentNullException("buffer");
+			OutStream.Write(buffer, index, count);
 		}
 
-		public virtual void Write(char value) {
+		public virtual void Write(char ch) {
 
 			if (disposed)
 				throw new ObjectDisposedException ("BinaryWriter", "Cannot write to a closed BinaryWriter");
 
 			char[] dec = new char[1];
-			dec[0] = value;
+			dec[0] = ch;
 			byte[] enc = m_encoding.GetBytes(dec, 0, 1);
 			OutStream.Write(enc, 0, enc.Length);
 		}
 		
-		public virtual void Write(char[] value) {
+		public virtual void Write(char[] chars) {
 
 			if (disposed)
 				throw new ObjectDisposedException ("BinaryWriter", "Cannot write to a closed BinaryWriter");
 
-			if (value == null)
-				throw new ArgumentNullException(Locale.GetText ("Chars is a null reference."));
-			byte[] enc = m_encoding.GetBytes(value, 0, value.Length);
+			if (chars == null)
+				throw new ArgumentNullException("chars");
+			byte[] enc = m_encoding.GetBytes(chars, 0, chars.Length);
 			OutStream.Write(enc, 0, enc.Length);
 		}
 
-		public virtual void Write(char[] value, int offset, int length) {
+		public virtual void Write(char[] chars, int index, int count) {
 
 			if (disposed)
 				throw new ObjectDisposedException ("BinaryWriter", "Cannot write to a closed BinaryWriter");
 
-			if (value == null)
-				throw new ArgumentNullException(Locale.GetText ("Chars is a null reference."));
-			byte[] enc = m_encoding.GetBytes(value, offset, length);
+			if (chars == null)
+				throw new ArgumentNullException("chars");
+			byte[] enc = m_encoding.GetBytes(chars, index, count);
 			OutStream.Write(enc, 0, enc.Length);
 		}
 
@@ -261,9 +294,6 @@ namespace System.IO {
 
 			OutStream.Write(BitConverterLE.GetBytes(value), 0, 4);
 		}
-
-		byte [] stringBuffer;
-		int maxCharsPerRound;
 		
 		public virtual void Write(string value) {