X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FI18N%2FWest%2FCP865.cs;h=e56b6472ec501c53b0acf9f0ed3a4413122b5180;hb=2f84b362abcce99427a6ff1926a1b56eb6454036;hp=c438b1f462aa082c0a11ed34bdfad0b9a7d738a6;hpb=da4f9e9b2afb23791029d0bb09d78b868aabd870;p=mono.git

diff --git a/mcs/class/I18N/West/CP865.cs b/mcs/class/I18N/West/CP865.cs
index c438b1f462a..e56b6472ec5 100644
--- a/mcs/class/I18N/West/CP865.cs
+++ b/mcs/class/I18N/West/CP865.cs
@@ -24,6 +24,9 @@
 
 // Generated from "ibm-865.ucm".
 
+// WARNING: Modifying this file directly might be a bad idea.
+// You should edit the code generator tools/ucm2cp.c instead for your changes
+// to appear in all relevant classes.
 namespace I18N.West
 {
 
@@ -86,8 +89,53 @@ public class CP865 : ByteEncoding
 		'\u207F', '\u00B2', '\u25A0', '\u00A0', 
 	};
 
+	// Get the number of bytes needed to encode a character buffer.
+	public unsafe override int GetByteCountImpl (char* chars, int count)
+	{
+		if (this.EncoderFallback != null)		{
+			//Calculate byte count by actually doing encoding and discarding the data.
+			return GetBytesImpl(chars, count, null, 0);
+		}
+		else
+		
+		{
+			return count;
+		}
+	}
+	
+	// Get the number of bytes needed to encode a character buffer.
+	public override int GetByteCount (String s)
+	{
+		if (this.EncoderFallback != null)
+		{
+			//Calculate byte count by actually doing encoding and discarding the data.
+			unsafe
+			{
+				fixed (char *s_ptr = s)
+				{
+					return GetBytesImpl(s_ptr, s.Length, null, 0);
+				}
+			}
+		}
+		else
+		{
+			//byte count equals character count because no EncoderFallback set
+			return s.Length;
+		}
+	}
+	
+	//ToBytes is just an alias for GetBytesImpl, but doesn't return byte count
 	protected unsafe override void ToBytes(char* chars, int charCount,
 	                                byte* bytes, int byteCount)
+	{
+		//Calling ToBytes with null destination buffer doesn't make any sense
+		if (bytes == null)
+			throw new ArgumentNullException("bytes");
+		GetBytesImpl(chars, charCount, bytes, byteCount);
+	}
+	
+	public unsafe override int GetBytesImpl (char* chars, int charCount,
+	                                         byte* bytes, int byteCount)
 	{
 		int ch;
 		int charIndex = 0;
@@ -95,9 +143,11 @@ public class CP865 : ByteEncoding
 #if NET_2_0
 		EncoderFallbackBuffer buffer = null;
 #endif
-		while(charCount > 0)
+		while (charCount > 0)
 		{
-			ch = (int)(chars[charIndex++]);
+			ch = (int)(chars[charIndex]);
+			charIndex++;
+			charCount--;
 			if(ch >= 26) switch(ch)
 			{
 				case 0x001B:
@@ -373,20 +423,24 @@ public class CP865 : ByteEncoding
 				default:
 				{
 					if(ch >= 0xFF01 && ch <= 0xFF5E)
+					{
 						ch -= 0xFEE0;
+					}
 					else
-#if NET_2_0
+					{
 						HandleFallback (ref buffer, chars, ref charIndex, ref charCount, bytes, ref byteIndex, ref byteCount);
-#else
-						ch = 0x3F;
-#endif
+						continue;
+					}
 				}
 				break;
 			}
-			bytes[byteIndex++] = (byte)ch;
-			--charCount;
-			--byteCount;
+			//Write encoded byte to buffer, if buffer is defined and fallback was not used
+			if (bytes != null)
+				bytes[byteIndex] = (byte)ch;
+			byteIndex++;
+			byteCount--;
 		}
+		return byteIndex;
 	}
 
 	/*
@@ -672,9 +726,13 @@ public class CP865 : ByteEncoding
 				default:
 				{
 					if(ch >= 0xFF01 && ch <= 0xFF5E)
+					{
 						ch -= 0xFEE0;
+					}
 					else
+					{
 						ch = 0x3F;
+					}
 				}
 				break;
 			}