Encoding fixes (DNET-763, DNET-747)

cincuranet · cincuranet · commit b9c7eb5b4614 · 2017-07-16T08:30:52.000+02:00
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsDatabase.cs
@@ -194,7 +194,7 @@ protected virtual void SendAttachToBuffer(DatabaseParameterBuffer dpb, string da
 			{
 				dpb.Append(IscCodes.isc_dpb_password, Password);
 			}
-			XdrStream.WriteBuffer(Encoding.UTF8.GetBytes(database));
+			XdrStream.WriteBuffer(Encoding2.Default.GetBytes(database));
 			XdrStream.WriteBuffer(dpb.ToArray());
 		}
 
@@ -312,7 +312,7 @@ protected virtual void SendCreateToBuffer(DatabaseParameterBuffer dpb, string da
 			{
 				dpb.Append(IscCodes.isc_dpb_password, Password);
 			}
-			XdrStream.WriteBuffer(Encoding.UTF8.GetBytes(database));
+			XdrStream.WriteBuffer(Encoding2.Default.GetBytes(database));
 			XdrStream.WriteBuffer(dpb.ToArray());
 		}
 
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesConnection.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesConnection.cs
@@ -65,7 +65,7 @@ public static IscException ParseStatusVector(IntPtr[] statusVector, Charset char
 						{
 							IntPtr ptr = statusVector[i++];
 							string s = Marshal.PtrToStringAnsi(ptr);
-							string arg_value = charset.GetString(Encoding.UTF8.GetBytes(s));
+							string arg_value = charset.GetString(Encoding2.Default.GetBytes(s));
 							exception.Errors.Add(new IscError(arg.AsInt(), arg_value));
 						}
 						break;
@@ -76,7 +76,7 @@ public static IscException ParseStatusVector(IntPtr[] statusVector, Charset char
 
 							IntPtr ptr = statusVector[i++];
 							string s = Marshal.PtrToStringAnsi(ptr);
-							string arg_value = charset.GetString(Encoding.UTF8.GetBytes(s));
+							string arg_value = charset.GetString(Encoding2.Default.GetBytes(s));
 							exception.Errors.Add(new IscError(arg.AsInt(), arg_value));
 						}
 						break;
@@ -89,7 +89,7 @@ public static IscException ParseStatusVector(IntPtr[] statusVector, Charset char
 						{
 							IntPtr ptr = statusVector[i++];
 							string s = Marshal.PtrToStringAnsi(ptr);
-							string arg_value = charset.GetString(Encoding.UTF8.GetBytes(s));
+							string arg_value = charset.GetString(Encoding2.Default.GetBytes(s));
 							exception.Errors.Add(new IscError(arg.AsInt(), arg_value));
 						}
 						break;
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesDatabase.cs
@@ -150,7 +150,7 @@ public void Dispose()
 
 		public void CreateDatabase(DatabaseParameterBuffer dpb, string dataSource, int port, string database)
 		{
-			byte[] databaseBuffer = Encoding.UTF8.GetBytes(database);
+			byte[] databaseBuffer = Encoding2.Default.GetBytes(database);
 
 			ClearStatusVector();
 
@@ -204,7 +204,7 @@ public void CancelEvents(RemoteEvent events)
 
 		public void Attach(DatabaseParameterBuffer dpb, string dataSource, int port, string database)
 		{
-			byte[] databaseBuffer = Encoding.UTF8.GetBytes(database);
+			byte[] databaseBuffer = Encoding2.Default.GetBytes(database);
 
 			ClearStatusVector();
 
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Common/Charset.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Common/Charset.cs
@@ -157,14 +157,14 @@ private static void TryAddCharset(List<Charset> charsets, Func<Charset> charsetC
 		private string _name;
 		private string _systemName;
 		private Encoding _encoding;
-        private bool _isNone;
-        private bool _isOctets;
+		private bool _isNone;
+		private bool _isOctets;
 
-        #endregion
+		#endregion
 
-        #region Properties
+		#region Properties
 
-        public int Identifier
+		public int Identifier
 		{
 			get { return _id; }
 		}
@@ -199,17 +199,17 @@ public Charset(int id, string name, int bytesPerCharacter, string systemName)
 			_name = name;
 			_bytesPerCharacter = bytesPerCharacter;
 			_systemName = systemName;
-            _isNone = false;
-            _isOctets = false;
-            switch (_systemName)
+			_isNone = false;
+			_isOctets = false;
+			switch (_systemName)
 			{
 				case None:
-					_encoding = Encoding.GetEncoding(0);
-                    _isNone = true;
-                    break;
+					_encoding = Encoding2.Default;
+					_isNone = true;
+					break;
 				case Octets:
 					_encoding = new BinaryEncoding();
-                    _isOctets = true;
+					_isOctets = true;
 					break;
 				default:
 					_encoding = Encoding.GetEncoding(_systemName);
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Common/DatabaseParameterBuffer.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Common/DatabaseParameterBuffer.cs
@@ -55,7 +55,7 @@ public void Append(int type, int value)
 
 		public void Append(int type, string content)
 		{
-			Append(type, Encoding.UTF8.GetBytes(content));
+			Append(type, Encoding2.Default.GetBytes(content));
 		}
 
 		public void Append(int type, byte[] buffer)
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Common/Encoding2.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Common/Encoding2.cs
@@ -0,0 +1,32 @@
+﻿/*
+ *	Firebird ADO.NET Data provider for .NET and Mono
+ *
+ *	   The contents of this file are subject to the Initial
+ *	   Developer's Public License Version 1.0 (the "License");
+ *	   you may not use this file except in compliance with the
+ *	   License. You may obtain a copy of the License at
+ *	   http://www.firebirdsql.org/index.php?op=doc&id=idpl
+ *
+ *	   Software distributed under the License is distributed on
+ *	   an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
+ *	   express or implied. See the License for the specific
+ *	   language governing rights and limitations under the License.
+ *
+ *	Copyright (c) 2017 Jiri Cincura (jiri@cincura.net)
+ *	All Rights Reserved.
+ */
+
+using System.Text;
+
+namespace FirebirdSql.Data.Common
+{
+	static class Encoding2
+    {
+		public static Encoding Default
+#if NETSTANDARD1_6
+			=> Encoding.UTF8;
+#else
+			=> Encoding.Default;
+#endif
+	}
+}
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Common/EventParameterBuffer.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Common/EventParameterBuffer.cs
@@ -33,7 +33,7 @@ public EventParameterBuffer()
 
 		public void Append(string content, int actualCount)
 		{
-			Append(Encoding.UTF8.GetBytes(content), actualCount);
+			Append(Encoding2.Default.GetBytes(content), actualCount);
 		}
 
 		public void Append(byte[] content, int actualCount)
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Common/IscHelper.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Common/IscHelper.cs
@@ -68,14 +68,14 @@ public static ArrayList ParseDatabaseInfo(byte[] buffer)
 						 * - 1 byte containing the length, l, of the site name in bytes
 						 * - A string of l bytes, containing the site name
 						 */
-						string dbFile = Encoding.UTF8.GetString(buffer, pos + 2, buffer[pos + 1]);
+						string dbFile = Encoding2.Default.GetString(buffer, pos + 2, buffer[pos + 1]);
 						int sitePos = pos + 2 + buffer[pos + 1];
 						int siteLength = buffer[sitePos];
-						string siteName = Encoding.UTF8.GetString(buffer, sitePos + 1, siteLength);
+						string siteName = Encoding2.Default.GetString(buffer, sitePos + 1, siteLength);
 
 						sitePos += siteLength + 1;
 						siteLength = buffer[sitePos];
-						siteName += "." + Encoding.UTF8.GetString(buffer, sitePos + 1, siteLength);
+						siteName += "." + Encoding2.Default.GetString(buffer, sitePos + 1, siteLength);
 
 						info.Add(siteName + ":" + dbFile);
 						break;
@@ -138,7 +138,7 @@ public static ArrayList ParseDatabaseInfo(byte[] buffer)
 						for (int i = 0; i < count; i++)
 						{
 							var messageLength = buffer[messagePosition + 1];
-							info.Add(Encoding.UTF8.GetString(buffer, messagePosition + 2, messageLength));
+							info.Add(Encoding2.Default.GetString(buffer, messagePosition + 2, messageLength));
 							messagePosition += 1 + messageLength;
 						}
 						break;
@@ -302,7 +302,7 @@ public static ArrayList ParseDatabaseInfo(byte[] buffer)
 
 					case IscCodes.isc_info_user_names:
 						// Active user name
-						info.Add(Encoding.UTF8.GetString(buffer, pos + 1, buffer[pos]));
+						info.Add(Encoding2.Default.GetString(buffer, pos + 1, buffer[pos]));
 						break;
 				}
 
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Common/ServiceParameterBuffer.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Common/ServiceParameterBuffer.cs
@@ -45,12 +45,12 @@ public void Append(int type, int value)
 
 		public void Append(int type, string value)
 		{
-			Append(type, Encoding.UTF8.GetBytes(value));
+			Append(type, Encoding2.Default.GetBytes(value));
 		}
 
 		public void Append(byte type, string value)
 		{
-			Append(type, Encoding.UTF8.GetBytes(value));
+			Append(type, Encoding2.Default.GetBytes(value));
 		}
 
 		public void Append(int type, byte[] value)
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Common/TransactionParameterBuffer.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Common/TransactionParameterBuffer.cs
@@ -39,7 +39,7 @@ public void Append(int type, short value)
 
 		public void Append(int type, string content)
 		{
-			Append(type, Encoding.UTF8.GetBytes(content));
+			Append(type, Encoding2.Default.GetBytes(content));
 		}
 
 		public void Append(int type, byte[] buffer)
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Services/FbService.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Services/FbService.cs
@@ -271,7 +271,7 @@ private void ProcessQuery(byte[] items, Action<bool, object> queryResponseAction
 							var length = GetLength(buffer, 2, ref pos);
 							if (length == 0)
 								continue;
-							queryResponseAction(truncated, Encoding.UTF8.GetString(buffer, pos, length));
+							queryResponseAction(truncated, Encoding2.Default.GetString(buffer, pos, length));
 							pos += length;
 							truncated = false;
 							break;
@@ -487,7 +487,7 @@ private static FbDatabasesInfo ParseDatabasesInfo(byte[] buffer, ref int pos)
 					case IscCodes.isc_spb_dbname:
 						length = IscHelper.VaxInteger(buffer, pos, 2);
 						pos += 2;
-						dbInfo.AddDatabase(Encoding.UTF8.GetString(buffer, pos, length));
+						dbInfo.AddDatabase(Encoding2.Default.GetString(buffer, pos, length));
 						pos += length;
 						break;
 				}
@@ -514,7 +514,7 @@ private static FbUserData[] ParseUserData(byte[] buffer, ref int pos)
 							length = IscHelper.VaxInteger(buffer, pos, 2);
 							pos += 2;
 							currentUser = new FbUserData();
-							currentUser.UserName = Encoding.UTF8.GetString(buffer, pos, length);
+							currentUser.UserName = Encoding2.Default.GetString(buffer, pos, length);
 							pos += length;
 
 							users.Add(currentUser);
@@ -524,21 +524,21 @@ private static FbUserData[] ParseUserData(byte[] buffer, ref int pos)
 					case IscCodes.isc_spb_sec_firstname:
 						length = IscHelper.VaxInteger(buffer, pos, 2);
 						pos += 2;
-						currentUser.FirstName = Encoding.UTF8.GetString(buffer, pos, length);
+						currentUser.FirstName = Encoding2.Default.GetString(buffer, pos, length);
 						pos += length;
 						break;
 
 					case IscCodes.isc_spb_sec_middlename:
 						length = IscHelper.VaxInteger(buffer, pos, 2);
 						pos += 2;
-						currentUser.MiddleName = Encoding.UTF8.GetString(buffer, pos, length);
+						currentUser.MiddleName = Encoding2.Default.GetString(buffer, pos, length);
 						pos += length;
 						break;
 
 					case IscCodes.isc_spb_sec_lastname:
 						length = IscHelper.VaxInteger(buffer, pos, 2);
 						pos += 2;
-						currentUser.LastName = Encoding.UTF8.GetString(buffer, pos, length);
+						currentUser.LastName = Encoding2.Default.GetString(buffer, pos, length);
 						pos += length;
 						break;
 

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ protected virtual void SendAttachToBuffer(DatabaseParameterBuffer dpb, string da`
`194`	`194`	`{`
`195`	`195`	`dpb.Append(IscCodes.isc_dpb_password, Password);`
`196`	`196`	`}`
`197`		`- XdrStream.WriteBuffer(Encoding.UTF8.GetBytes(database));`
	`197`	`+ XdrStream.WriteBuffer(Encoding2.Default.GetBytes(database));`
`198`	`198`	`XdrStream.WriteBuffer(dpb.ToArray());`
`199`	`199`	`}`
`200`	`200`
`@@ -312,7 +312,7 @@ protected virtual void SendCreateToBuffer(DatabaseParameterBuffer dpb, string da`
`312`	`312`	`{`
`313`	`313`	`dpb.Append(IscCodes.isc_dpb_password, Password);`
`314`	`314`	`}`
`315`		`- XdrStream.WriteBuffer(Encoding.UTF8.GetBytes(database));`
	`315`	`+ XdrStream.WriteBuffer(Encoding2.Default.GetBytes(database));`
`316`	`316`	`XdrStream.WriteBuffer(dpb.ToArray());`
`317`	`317`	`}`
`318`	`318`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public static IscException ParseStatusVector(IntPtr[] statusVector, Charset char`
`65`	`65`	`{`
`66`	`66`	`IntPtr ptr = statusVector[i++];`
`67`	`67`	`string s = Marshal.PtrToStringAnsi(ptr);`
`68`		`- string arg_value = charset.GetString(Encoding.UTF8.GetBytes(s));`
	`68`	`+ string arg_value = charset.GetString(Encoding2.Default.GetBytes(s));`
`69`	`69`	`exception.Errors.Add(new IscError(arg.AsInt(), arg_value));`
`70`	`70`	`}`
`71`	`71`	`break;`
`@@ -76,7 +76,7 @@ public static IscException ParseStatusVector(IntPtr[] statusVector, Charset char`
`76`	`76`
`77`	`77`	`IntPtr ptr = statusVector[i++];`
`78`	`78`	`string s = Marshal.PtrToStringAnsi(ptr);`
`79`		`- string arg_value = charset.GetString(Encoding.UTF8.GetBytes(s));`
	`79`	`+ string arg_value = charset.GetString(Encoding2.Default.GetBytes(s));`
`80`	`80`	`exception.Errors.Add(new IscError(arg.AsInt(), arg_value));`
`81`	`81`	`}`
`82`	`82`	`break;`
`@@ -89,7 +89,7 @@ public static IscException ParseStatusVector(IntPtr[] statusVector, Charset char`
`89`	`89`	`{`
`90`	`90`	`IntPtr ptr = statusVector[i++];`
`91`	`91`	`string s = Marshal.PtrToStringAnsi(ptr);`
`92`		`- string arg_value = charset.GetString(Encoding.UTF8.GetBytes(s));`
	`92`	`+ string arg_value = charset.GetString(Encoding2.Default.GetBytes(s));`
`93`	`93`	`exception.Errors.Add(new IscError(arg.AsInt(), arg_value));`
`94`	`94`	`}`
`95`	`95`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public void Dispose()`
`150`	`150`
`151`	`151`	`public void CreateDatabase(DatabaseParameterBuffer dpb, string dataSource, int port, string database)`
`152`	`152`	`{`
`153`		`- byte[] databaseBuffer = Encoding.UTF8.GetBytes(database);`
	`153`	`+ byte[] databaseBuffer = Encoding2.Default.GetBytes(database);`
`154`	`154`
`155`	`155`	`ClearStatusVector();`
`156`	`156`
`@@ -204,7 +204,7 @@ public void CancelEvents(RemoteEvent events)`
`204`	`204`
`205`	`205`	`public void Attach(DatabaseParameterBuffer dpb, string dataSource, int port, string database)`
`206`	`206`	`{`
`207`		`- byte[] databaseBuffer = Encoding.UTF8.GetBytes(database);`
	`207`	`+ byte[] databaseBuffer = Encoding2.Default.GetBytes(database);`
`208`	`208`
`209`	`209`	`ClearStatusVector();`
`210`	`210`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public void Append(int type, int value)`
`55`	`55`
`56`	`56`	`public void Append(int type, string content)`
`57`	`57`	`{`
`58`		`- Append(type, Encoding.UTF8.GetBytes(content));`
	`58`	`+ Append(type, Encoding2.Default.GetBytes(content));`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public void Append(int type, byte[] buffer)`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public EventParameterBuffer()`
`33`	`33`
`34`	`34`	`public void Append(string content, int actualCount)`
`35`	`35`	`{`
`36`		`- Append(Encoding.UTF8.GetBytes(content), actualCount);`
	`36`	`+ Append(Encoding2.Default.GetBytes(content), actualCount);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public void Append(byte[] content, int actualCount)`
Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,12 @@ public void Append(int type, int value)`
`45`	`45`
`46`	`46`	`public void Append(int type, string value)`
`47`	`47`	`{`
`48`		`- Append(type, Encoding.UTF8.GetBytes(value));`
	`48`	`+ Append(type, Encoding2.Default.GetBytes(value));`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public void Append(byte type, string value)`
`52`	`52`	`{`
`53`		`- Append(type, Encoding.UTF8.GetBytes(value));`
	`53`	`+ Append(type, Encoding2.Default.GetBytes(value));`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public void Append(int type, byte[] value)`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public void Append(int type, short value)`
`39`	`39`
`40`	`40`	`public void Append(int type, string content)`
`41`	`41`	`{`
`42`		`- Append(type, Encoding.UTF8.GetBytes(content));`
	`42`	`+ Append(type, Encoding2.Default.GetBytes(content));`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`public void Append(int type, byte[] buffer)`