From fc9f33acdafa20139854da6af8e9351694c92eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pedro?= Date: Sun, 18 Jun 2017 02:04:59 +0100 Subject: [PATCH 01/18] Improved the NullReferenceException message. --- source/Cosmos.Debug.Symbols/DebugInfo.cs | 5 ++++ .../AD7.Impl/AD7Process.cs | 25 +++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/source/Cosmos.Debug.Symbols/DebugInfo.cs b/source/Cosmos.Debug.Symbols/DebugInfo.cs index d50db1a1c..8b664201d 100644 --- a/source/Cosmos.Debug.Symbols/DebugInfo.cs +++ b/source/Cosmos.Debug.Symbols/DebugInfo.cs @@ -772,6 +772,11 @@ namespace Cosmos.Debug.Symbols return address; } + public Document GetDocumentById(long aDocumentId) + { + return mConnection.Get(aDocumentId); + } + public MethodIlOp GetFirstMethodIlOpByMethodIdAndILOffset(long aMethodId, long aILOffset) { //Debug("GetFirstMethodIlOpByMethodIdAndILOffset. MethodID = {0}, ILOffset = 0x{1}", aMethodId, aILOffset.ToString("X4")); diff --git a/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7Process.cs b/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7Process.cs index 0d8e74a21..4255c7a59 100644 --- a/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7Process.cs +++ b/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7Process.cs @@ -381,6 +381,27 @@ namespace Cosmos.VS.DebugEngine.AD7.Impl private void DbgCmdNullReferenceOccurred(uint lastEIPAddress) { + if (mDebugInfo.TryGetValue(BuildPropertyNames.DebugModeString, out var xDebugMode)) + { + if (xDebugMode == "Source") + { + try + { + var xMethod = mDebugInfoDb.GetMethod(lastEIPAddress); + var xLabel = mDebugInfoDb.GetLabels(lastEIPAddress)[0]; + var xMethodIlOp = mDebugInfoDb.TryGetFirstMethodIlOpByLabelName(xLabel.Remove(xLabel.LastIndexOf('.'))).IlOffset; + var xSequencePoints = mDebugInfoDb.GetSequencePoints(mDebugInfoDb.GetAssemblyFileById(xMethod.AssemblyFileID).Pathname, xMethod.MethodToken); + var xLine = xSequencePoints.Where(q => q.Offset <= xMethodIlOp).Last().LineStart; + + AD7Util.MessageBox($"NullReferenceException occurred in '{xMethod.LabelCall}'{Environment.NewLine}Document: {mDebugInfoDb.GetDocumentById(xMethod.DocumentID)}{Environment.NewLine}Line: {xLine}{Environment.NewLine}Address: 0x{lastEIPAddress.ToString("X8")}"); + return; + } + catch (InvalidOperationException) + { + } + } + } + AD7Util.MessageBox(String.Format("NullReferenceException occurred at address 0x{0:X8}! Halting now.", lastEIPAddress)); } @@ -427,7 +448,7 @@ namespace Cosmos.VS.DebugEngine.AD7.Impl switch (mLaunch) { case LaunchType.VMware: -#region CheckIfHyperVServiceIsRunning + #region CheckIfHyperVServiceIsRunning using (System.ServiceProcess.ServiceController sc = new System.ServiceProcess.ServiceController("vmms")) { @@ -447,7 +468,7 @@ namespace Cosmos.VS.DebugEngine.AD7.Impl } } -#endregion CheckIfHyperVServiceIsRunning + #endregion CheckIfHyperVServiceIsRunning mHost = new VMware(mDebugInfo, xUseGDB); break; From 97282c59c9e281bbde2e479baf984d6cae125e9c Mon Sep 17 00:00:00 2001 From: zarlo Date: Thu, 27 Jul 2017 20:32:47 +1000 Subject: [PATCH 02/18] might be faster --- source/Cosmos.System/Console.cs | 281 +++++++++++++++++--------------- 1 file changed, 148 insertions(+), 133 deletions(-) diff --git a/source/Cosmos.System/Console.cs b/source/Cosmos.System/Console.cs index 4c47c77b6..1af6d42d1 100644 --- a/source/Cosmos.System/Console.cs +++ b/source/Cosmos.System/Console.cs @@ -77,6 +77,16 @@ namespace Cosmos.System { UpdateCursor(); } + internal void iWriteChar(char aChar) + { + mText[mX, mY] = aChar; + mX++; + if (mX == mText.Cols) + { + NewLine(); + } + } + public void WriteLine(string aText) { Write(aText); NewLine(); @@ -96,529 +106,534 @@ namespace Cosmos.System { UpdateCursor(); } else if (aText[i] == '\t') { //Write(" "); - WriteChar(' '); - WriteChar(' '); - WriteChar(' '); - WriteChar(' '); + iWriteChar(' '); + iWriteChar(' '); + iWriteChar(' '); + iWriteChar(' '); } //Extended ASCII Support else if (aText[i] == 'Ç') { - WriteChar((char)128); + iWriteChar((char)128); } else if (aText[i] == 'ü') { - WriteChar((char)129); + iWriteChar((char)129); } else if (aText[i] == 'é') { - WriteChar((char)130); + iWriteChar((char)130); } else if (aText[i] == 'â') { - WriteChar((char)131); + iWriteChar((char)131); } else if (aText[i] == 'ä') { - WriteChar((char)132); + iWriteChar((char)132); } else if (aText[i] == 'à') { - WriteChar((char)133); + iWriteChar((char)133); } else if (aText[i] == 'å') { - WriteChar((char)134); + iWriteChar((char)134); } else if (aText[i] == 'ç') { - WriteChar((char)135); + iWriteChar((char)135); } else if (aText[i] == 'ê') { - WriteChar((char)136); + iWriteChar((char)136); } else if (aText[i] == 'ë') { - WriteChar((char)137); + iWriteChar((char)137); } else if (aText[i] == 'è') { - WriteChar((char)138); + iWriteChar((char)138); } else if (aText[i] == 'ï') { - WriteChar((char)139); + iWriteChar((char)139); } else if (aText[i] == 'î') { - WriteChar((char)140); + iWriteChar((char)140); } else if (aText[i] == 'ì') { - WriteChar((char)141); + iWriteChar((char)141); } else if (aText[i] == 'Ä') { - WriteChar((char)142); + iWriteChar((char)142); } else if (aText[i] == 'Å') { - WriteChar((char)143); + iWriteChar((char)143); } else if (aText[i] == 'É') { - WriteChar((char)144); + iWriteChar((char)144); } else if (aText[i] == 'æ') { - WriteChar((char)145); + iWriteChar((char)145); } else if (aText[i] == 'Æ') { - WriteChar((char)146); + iWriteChar((char)146); } else if (aText[i] == 'ô') { - WriteChar((char)147); + iWriteChar((char)147); } else if (aText[i] == 'ö') { - WriteChar((char)148); + iWriteChar((char)148); } else if (aText[i] == 'ò') { - WriteChar((char)149); + iWriteChar((char)149); } else if (aText[i] == 'û') { - WriteChar((char)150); + iWriteChar((char)150); } else if (aText[i] == 'ù') { - WriteChar((char)151); + iWriteChar((char)151); } else if (aText[i] == 'ÿ') { - WriteChar((char)152); + iWriteChar((char)152); } else if (aText[i] == 'Ö') { - WriteChar((char)153); + iWriteChar((char)153); } else if (aText[i] == 'Ü') { - WriteChar((char)154); + iWriteChar((char)154); } else if (aText[i] == 'ø') { - WriteChar((char)155); + iWriteChar((char)155); } else if (aText[i] == '£') { - WriteChar((char)156); + iWriteChar((char)156); } else if (aText[i] == 'Ø') { - WriteChar((char)157); + iWriteChar((char)157); } else if (aText[i] == '×') { - WriteChar((char)158); + iWriteChar((char)158); } else if (aText[i] == 'ƒ') { - WriteChar((char)159); + iWriteChar((char)159); } else if (aText[i] == 'á') { - WriteChar((char)160); + iWriteChar((char)160); } else if (aText[i] == 'í') { - WriteChar((char)161); + iWriteChar((char)161); } else if (aText[i] == 'ó') { - WriteChar((char)162); + iWriteChar((char)162); } else if (aText[i] == 'ú') { - WriteChar((char)163); + iWriteChar((char)163); } else if (aText[i] == 'ñ') { - WriteChar((char)164); + iWriteChar((char)164); } else if (aText[i] == 'Ñ') { - WriteChar((char)165); + iWriteChar((char)165); } else if (aText[i] == 'ª') { - WriteChar((char)166); + iWriteChar((char)166); } else if (aText[i] == 'º') { - WriteChar((char)167); + iWriteChar((char)167); } else if (aText[i] == '¿') { - WriteChar((char)168); + iWriteChar((char)168); } else if (aText[i] == '®') { - WriteChar((char)169); + iWriteChar((char)169); } else if (aText[i] == '¬') { - WriteChar((char)170); + iWriteChar((char)170); } else if (aText[i] == '½') { - WriteChar((char)171); + iWriteChar((char)171); } else if (aText[i] == '¼') { - WriteChar((char)172); + iWriteChar((char)172); } else if (aText[i] == '¡') { - WriteChar((char)173); + iWriteChar((char)173); } else if (aText[i] == '«') { - WriteChar((char)174); + iWriteChar((char)174); } else if (aText[i] == '»') { - WriteChar((char)175); + iWriteChar((char)175); } else if (aText[i] == '░') { - WriteChar((char)176); + iWriteChar((char)176); } else if (aText[i] == '▒') { - WriteChar((char)177); + iWriteChar((char)177); } else if (aText[i] == '▓') { - WriteChar((char)178); + iWriteChar((char)178); } else if (aText[i] == '│') { - WriteChar((char)179); + iWriteChar((char)179); } else if (aText[i] == '┤') { - WriteChar((char)180); + iWriteChar((char)180); } else if (aText[i] == 'Á') { - WriteChar((char)181); + iWriteChar((char)181); } else if (aText[i] == 'Â') { - WriteChar((char)182); + iWriteChar((char)182); } else if (aText[i] == 'À') { - WriteChar((char)183); + iWriteChar((char)183); } else if (aText[i] == '©') { - WriteChar((char)184); + iWriteChar((char)184); } else if (aText[i] == '╣') { - WriteChar((char)185); + iWriteChar((char)185); } else if (aText[i] == '║') { - WriteChar((char)186); + iWriteChar((char)186); } else if (aText[i] == '╗') { - WriteChar((char)187); + iWriteChar((char)187); } else if (aText[i] == '╝') { - WriteChar((char)188); + iWriteChar((char)188); } else if (aText[i] == '¢') { - WriteChar((char)189); + iWriteChar((char)189); } else if (aText[i] == '¥') { - WriteChar((char)190); + iWriteChar((char)190); } else if (aText[i] == '┐') { - WriteChar((char)191); + iWriteChar((char)191); } else if (aText[i] == '└') { - WriteChar((char)192); + iWriteChar((char)192); } else if (aText[i] == '┴') { - WriteChar((char)193); + iWriteChar((char)193); } else if (aText[i] == '┬') { - WriteChar((char)194); + iWriteChar((char)194); } else if (aText[i] == '├') { - WriteChar((char)195); + iWriteChar((char)195); } else if (aText[i] == '─') { - WriteChar((char)196); + iWriteChar((char)196); } else if (aText[i] == '┼') { - WriteChar((char)197); + iWriteChar((char)197); } else if (aText[i] == 'ã') { - WriteChar((char)198); + iWriteChar((char)198); } else if (aText[i] == 'Ã') { - WriteChar((char)199); + iWriteChar((char)199); } else if (aText[i] == '╚') { - WriteChar((char)200); + iWriteChar((char)200); } else if (aText[i] == '╔') { - WriteChar((char)201); + iWriteChar((char)201); } else if (aText[i] == '╩') { - WriteChar((char)202); + iWriteChar((char)202); } else if (aText[i] == '╦') { - WriteChar((char)203); + iWriteChar((char)203); } else if (aText[i] == '╠') { - WriteChar((char)204); + iWriteChar((char)204); } else if (aText[i] == '═') { - WriteChar((char)205); + iWriteChar((char)205); } else if (aText[i] == '╬') { - WriteChar((char)206); + iWriteChar((char)206); } else if (aText[i] == '¤') { - WriteChar((char)207); + iWriteChar((char)207); } else if (aText[i] == 'ð') { - WriteChar((char)208); + iWriteChar((char)208); } else if (aText[i] == 'Ð') { - WriteChar((char)209); + iWriteChar((char)209); } else if (aText[i] == 'Ê') { - WriteChar((char)210); + iWriteChar((char)210); } else if (aText[i] == 'Ë') { - WriteChar((char)211); + iWriteChar((char)211); } else if (aText[i] == 'È') { - WriteChar((char)212); + iWriteChar((char)212); } else if (aText[i] == 'ı') { - WriteChar((char)213); + iWriteChar((char)213); } else if (aText[i] == 'Í') { - WriteChar((char)214); + iWriteChar((char)214); } else if (aText[i] == 'Î') { - WriteChar((char)215); + iWriteChar((char)215); } else if (aText[i] == 'Ï') { - WriteChar((char)216); + iWriteChar((char)216); } else if (aText[i] == '┘') { - WriteChar((char)217); + iWriteChar((char)217); } else if (aText[i] == '┌') { - WriteChar((char)218); + iWriteChar((char)218); } else if (aText[i] == '█') { - WriteChar((char)219); + iWriteChar((char)219); } else if (aText[i] == '▄') { - WriteChar((char)220); + iWriteChar((char)220); } else if (aText[i] == '¦') { - WriteChar((char)221); + iWriteChar((char)221); } else if (aText[i] == 'Ì') { - WriteChar((char)222); + iWriteChar((char)222); } else if (aText[i] == '▀') { - WriteChar((char)223); + iWriteChar((char)223); } else if (aText[i] == 'Ó') { - WriteChar((char)224); + iWriteChar((char)224); } else if (aText[i] == 'ß') { - WriteChar((char)225); + iWriteChar((char)225); } else if (aText[i] == 'Ô') { - WriteChar((char)226); + iWriteChar((char)226); } else if (aText[i] == 'Ò') { - WriteChar((char)227); + iWriteChar((char)227); } else if (aText[i] == 'õ') { - WriteChar((char)228); + iWriteChar((char)228); } else if (aText[i] == 'Õ') { - WriteChar((char)229); + iWriteChar((char)229); } else if (aText[i] == 'µ') { - WriteChar((char)230); + iWriteChar((char)230); } else if (aText[i] == 'þ') { - WriteChar((char)231); + iWriteChar((char)231); } else if (aText[i] == 'Þ') { - WriteChar((char)232); + iWriteChar((char)232); } else if (aText[i] == 'Ú') { - WriteChar((char)233); + iWriteChar((char)233); } else if (aText[i] == 'Û') { - WriteChar((char)234); + iWriteChar((char)234); } else if (aText[i] == 'Ù') { - WriteChar((char)235); + iWriteChar((char)235); } else if (aText[i] == 'ý') { - WriteChar((char)236); + iWriteChar((char)236); } else if (aText[i] == 'Ý') { - WriteChar((char)237); + iWriteChar((char)237); } else if (aText[i] == '¯') { - WriteChar((char)238); + iWriteChar((char)238); } else if (aText[i] == '´') { - WriteChar((char)239); + iWriteChar((char)239); } else if (aText[i] == '≡') { - WriteChar((char)240); + iWriteChar((char)240); } else if (aText[i] == '±') { - WriteChar((char)241); + iWriteChar((char)241); } else if (aText[i] == '‗') { - WriteChar((char)242); + iWriteChar((char)242); } else if (aText[i] == '¾') { - WriteChar((char)243); + iWriteChar((char)243); } else if (aText[i] == '¶') { - WriteChar((char)244); + iWriteChar((char)244); } else if (aText[i] == '§') { - WriteChar((char)245); + iWriteChar((char)245); } else if (aText[i] == '÷') { - WriteChar((char)246); + iWriteChar((char)246); } else if (aText[i] == '¸') { - WriteChar((char)247); + iWriteChar((char)247); } else if (aText[i] == '°') { - WriteChar((char)248); + iWriteChar((char)248); } else if (aText[i] == '¨') { - WriteChar((char)249); + iWriteChar((char)249); } else if (aText[i] == '·') { - WriteChar((char)250); + iWriteChar((char)250); } else if (aText[i] == '¹') { - WriteChar((char)251); + iWriteChar((char)251); } else if (aText[i] == '³') { - WriteChar((char)252); + iWriteChar((char)252); } else if (aText[i] == '²') { - WriteChar((char)253); + iWriteChar((char)253); } else if (aText[i] == '■') { - WriteChar((char)254); + iWriteChar((char)254); } else if (aText[i] == ' ') { - WriteChar((char)255); + iWriteChar((char)255); } else { - WriteChar(aText[i]); + iWriteChar(aText[i]); } + + } + + UpdateCursor(); + } public ConsoleColor Foreground From 136ab7c8a5228c0260d86606f3e05a3726c95e00 Mon Sep 17 00:00:00 2001 From: zarlo Date: Mon, 31 Jul 2017 14:31:45 +1000 Subject: [PATCH 03/18] renamed iWriteChar --- source/Cosmos.System/Console.cs | 277 ++++++++++++++++---------------- 1 file changed, 135 insertions(+), 142 deletions(-) diff --git a/source/Cosmos.System/Console.cs b/source/Cosmos.System/Console.cs index 1af6d42d1..1ae4890e1 100644 --- a/source/Cosmos.System/Console.cs +++ b/source/Cosmos.System/Console.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Cosmos.HAL; namespace Cosmos.System { @@ -69,15 +66,11 @@ namespace Cosmos.System { } public void WriteChar(char aChar) { - mText[mX, mY] = aChar; - mX++; - if (mX == mText.Cols) { - NewLine(); - } + InternalWriteChar(aChar); UpdateCursor(); } - internal void iWriteChar(char aChar) + internal void InternalWriteChar(char aChar) { mText[mX, mY] = aChar; mX++; @@ -106,527 +99,527 @@ namespace Cosmos.System { UpdateCursor(); } else if (aText[i] == '\t') { //Write(" "); - iWriteChar(' '); - iWriteChar(' '); - iWriteChar(' '); - iWriteChar(' '); + InternalWriteChar(' '); + InternalWriteChar(' '); + InternalWriteChar(' '); + InternalWriteChar(' '); } //Extended ASCII Support else if (aText[i] == 'Ç') { - iWriteChar((char)128); + InternalWriteChar((char)128); } else if (aText[i] == 'ü') { - iWriteChar((char)129); + InternalWriteChar((char)129); } else if (aText[i] == 'é') { - iWriteChar((char)130); + InternalWriteChar((char)130); } else if (aText[i] == 'â') { - iWriteChar((char)131); + InternalWriteChar((char)131); } else if (aText[i] == 'ä') { - iWriteChar((char)132); + InternalWriteChar((char)132); } else if (aText[i] == 'à') { - iWriteChar((char)133); + InternalWriteChar((char)133); } else if (aText[i] == 'å') { - iWriteChar((char)134); + InternalWriteChar((char)134); } else if (aText[i] == 'ç') { - iWriteChar((char)135); + InternalWriteChar((char)135); } else if (aText[i] == 'ê') { - iWriteChar((char)136); + InternalWriteChar((char)136); } else if (aText[i] == 'ë') { - iWriteChar((char)137); + InternalWriteChar((char)137); } else if (aText[i] == 'è') { - iWriteChar((char)138); + InternalWriteChar((char)138); } else if (aText[i] == 'ï') { - iWriteChar((char)139); + InternalWriteChar((char)139); } else if (aText[i] == 'î') { - iWriteChar((char)140); + InternalWriteChar((char)140); } else if (aText[i] == 'ì') { - iWriteChar((char)141); + InternalWriteChar((char)141); } else if (aText[i] == 'Ä') { - iWriteChar((char)142); + InternalWriteChar((char)142); } else if (aText[i] == 'Å') { - iWriteChar((char)143); + InternalWriteChar((char)143); } else if (aText[i] == 'É') { - iWriteChar((char)144); + InternalWriteChar((char)144); } else if (aText[i] == 'æ') { - iWriteChar((char)145); + InternalWriteChar((char)145); } else if (aText[i] == 'Æ') { - iWriteChar((char)146); + InternalWriteChar((char)146); } else if (aText[i] == 'ô') { - iWriteChar((char)147); + InternalWriteChar((char)147); } else if (aText[i] == 'ö') { - iWriteChar((char)148); + InternalWriteChar((char)148); } else if (aText[i] == 'ò') { - iWriteChar((char)149); + InternalWriteChar((char)149); } else if (aText[i] == 'û') { - iWriteChar((char)150); + InternalWriteChar((char)150); } else if (aText[i] == 'ù') { - iWriteChar((char)151); + InternalWriteChar((char)151); } else if (aText[i] == 'ÿ') { - iWriteChar((char)152); + InternalWriteChar((char)152); } else if (aText[i] == 'Ö') { - iWriteChar((char)153); + InternalWriteChar((char)153); } else if (aText[i] == 'Ü') { - iWriteChar((char)154); + InternalWriteChar((char)154); } else if (aText[i] == 'ø') { - iWriteChar((char)155); + InternalWriteChar((char)155); } else if (aText[i] == '£') { - iWriteChar((char)156); + InternalWriteChar((char)156); } else if (aText[i] == 'Ø') { - iWriteChar((char)157); + InternalWriteChar((char)157); } else if (aText[i] == '×') { - iWriteChar((char)158); + InternalWriteChar((char)158); } else if (aText[i] == 'ƒ') { - iWriteChar((char)159); + InternalWriteChar((char)159); } else if (aText[i] == 'á') { - iWriteChar((char)160); + InternalWriteChar((char)160); } else if (aText[i] == 'í') { - iWriteChar((char)161); + InternalWriteChar((char)161); } else if (aText[i] == 'ó') { - iWriteChar((char)162); + InternalWriteChar((char)162); } else if (aText[i] == 'ú') { - iWriteChar((char)163); + InternalWriteChar((char)163); } else if (aText[i] == 'ñ') { - iWriteChar((char)164); + InternalWriteChar((char)164); } else if (aText[i] == 'Ñ') { - iWriteChar((char)165); + InternalWriteChar((char)165); } else if (aText[i] == 'ª') { - iWriteChar((char)166); + InternalWriteChar((char)166); } else if (aText[i] == 'º') { - iWriteChar((char)167); + InternalWriteChar((char)167); } else if (aText[i] == '¿') { - iWriteChar((char)168); + InternalWriteChar((char)168); } else if (aText[i] == '®') { - iWriteChar((char)169); + InternalWriteChar((char)169); } else if (aText[i] == '¬') { - iWriteChar((char)170); + InternalWriteChar((char)170); } else if (aText[i] == '½') { - iWriteChar((char)171); + InternalWriteChar((char)171); } else if (aText[i] == '¼') { - iWriteChar((char)172); + InternalWriteChar((char)172); } else if (aText[i] == '¡') { - iWriteChar((char)173); + InternalWriteChar((char)173); } else if (aText[i] == '«') { - iWriteChar((char)174); + InternalWriteChar((char)174); } else if (aText[i] == '»') { - iWriteChar((char)175); + InternalWriteChar((char)175); } else if (aText[i] == '░') { - iWriteChar((char)176); + InternalWriteChar((char)176); } else if (aText[i] == '▒') { - iWriteChar((char)177); + InternalWriteChar((char)177); } else if (aText[i] == '▓') { - iWriteChar((char)178); + InternalWriteChar((char)178); } else if (aText[i] == '│') { - iWriteChar((char)179); + InternalWriteChar((char)179); } else if (aText[i] == '┤') { - iWriteChar((char)180); + InternalWriteChar((char)180); } else if (aText[i] == 'Á') { - iWriteChar((char)181); + InternalWriteChar((char)181); } else if (aText[i] == 'Â') { - iWriteChar((char)182); + InternalWriteChar((char)182); } else if (aText[i] == 'À') { - iWriteChar((char)183); + InternalWriteChar((char)183); } else if (aText[i] == '©') { - iWriteChar((char)184); + InternalWriteChar((char)184); } else if (aText[i] == '╣') { - iWriteChar((char)185); + InternalWriteChar((char)185); } else if (aText[i] == '║') { - iWriteChar((char)186); + InternalWriteChar((char)186); } else if (aText[i] == '╗') { - iWriteChar((char)187); + InternalWriteChar((char)187); } else if (aText[i] == '╝') { - iWriteChar((char)188); + InternalWriteChar((char)188); } else if (aText[i] == '¢') { - iWriteChar((char)189); + InternalWriteChar((char)189); } else if (aText[i] == '¥') { - iWriteChar((char)190); + InternalWriteChar((char)190); } else if (aText[i] == '┐') { - iWriteChar((char)191); + InternalWriteChar((char)191); } else if (aText[i] == '└') { - iWriteChar((char)192); + InternalWriteChar((char)192); } else if (aText[i] == '┴') { - iWriteChar((char)193); + InternalWriteChar((char)193); } else if (aText[i] == '┬') { - iWriteChar((char)194); + InternalWriteChar((char)194); } else if (aText[i] == '├') { - iWriteChar((char)195); + InternalWriteChar((char)195); } else if (aText[i] == '─') { - iWriteChar((char)196); + InternalWriteChar((char)196); } else if (aText[i] == '┼') { - iWriteChar((char)197); + InternalWriteChar((char)197); } else if (aText[i] == 'ã') { - iWriteChar((char)198); + InternalWriteChar((char)198); } else if (aText[i] == 'Ã') { - iWriteChar((char)199); + InternalWriteChar((char)199); } else if (aText[i] == '╚') { - iWriteChar((char)200); + InternalWriteChar((char)200); } else if (aText[i] == '╔') { - iWriteChar((char)201); + InternalWriteChar((char)201); } else if (aText[i] == '╩') { - iWriteChar((char)202); + InternalWriteChar((char)202); } else if (aText[i] == '╦') { - iWriteChar((char)203); + InternalWriteChar((char)203); } else if (aText[i] == '╠') { - iWriteChar((char)204); + InternalWriteChar((char)204); } else if (aText[i] == '═') { - iWriteChar((char)205); + InternalWriteChar((char)205); } else if (aText[i] == '╬') { - iWriteChar((char)206); + InternalWriteChar((char)206); } else if (aText[i] == '¤') { - iWriteChar((char)207); + InternalWriteChar((char)207); } else if (aText[i] == 'ð') { - iWriteChar((char)208); + InternalWriteChar((char)208); } else if (aText[i] == 'Ð') { - iWriteChar((char)209); + InternalWriteChar((char)209); } else if (aText[i] == 'Ê') { - iWriteChar((char)210); + InternalWriteChar((char)210); } else if (aText[i] == 'Ë') { - iWriteChar((char)211); + InternalWriteChar((char)211); } else if (aText[i] == 'È') { - iWriteChar((char)212); + InternalWriteChar((char)212); } else if (aText[i] == 'ı') { - iWriteChar((char)213); + InternalWriteChar((char)213); } else if (aText[i] == 'Í') { - iWriteChar((char)214); + InternalWriteChar((char)214); } else if (aText[i] == 'Î') { - iWriteChar((char)215); + InternalWriteChar((char)215); } else if (aText[i] == 'Ï') { - iWriteChar((char)216); + InternalWriteChar((char)216); } else if (aText[i] == '┘') { - iWriteChar((char)217); + InternalWriteChar((char)217); } else if (aText[i] == '┌') { - iWriteChar((char)218); + InternalWriteChar((char)218); } else if (aText[i] == '█') { - iWriteChar((char)219); + InternalWriteChar((char)219); } else if (aText[i] == '▄') { - iWriteChar((char)220); + InternalWriteChar((char)220); } else if (aText[i] == '¦') { - iWriteChar((char)221); + InternalWriteChar((char)221); } else if (aText[i] == 'Ì') { - iWriteChar((char)222); + InternalWriteChar((char)222); } else if (aText[i] == '▀') { - iWriteChar((char)223); + InternalWriteChar((char)223); } else if (aText[i] == 'Ó') { - iWriteChar((char)224); + InternalWriteChar((char)224); } else if (aText[i] == 'ß') { - iWriteChar((char)225); + InternalWriteChar((char)225); } else if (aText[i] == 'Ô') { - iWriteChar((char)226); + InternalWriteChar((char)226); } else if (aText[i] == 'Ò') { - iWriteChar((char)227); + InternalWriteChar((char)227); } else if (aText[i] == 'õ') { - iWriteChar((char)228); + InternalWriteChar((char)228); } else if (aText[i] == 'Õ') { - iWriteChar((char)229); + InternalWriteChar((char)229); } else if (aText[i] == 'µ') { - iWriteChar((char)230); + InternalWriteChar((char)230); } else if (aText[i] == 'þ') { - iWriteChar((char)231); + InternalWriteChar((char)231); } else if (aText[i] == 'Þ') { - iWriteChar((char)232); + InternalWriteChar((char)232); } else if (aText[i] == 'Ú') { - iWriteChar((char)233); + InternalWriteChar((char)233); } else if (aText[i] == 'Û') { - iWriteChar((char)234); + InternalWriteChar((char)234); } else if (aText[i] == 'Ù') { - iWriteChar((char)235); + InternalWriteChar((char)235); } else if (aText[i] == 'ý') { - iWriteChar((char)236); + InternalWriteChar((char)236); } else if (aText[i] == 'Ý') { - iWriteChar((char)237); + InternalWriteChar((char)237); } else if (aText[i] == '¯') { - iWriteChar((char)238); + InternalWriteChar((char)238); } else if (aText[i] == '´') { - iWriteChar((char)239); + InternalWriteChar((char)239); } else if (aText[i] == '≡') { - iWriteChar((char)240); + InternalWriteChar((char)240); } else if (aText[i] == '±') { - iWriteChar((char)241); + InternalWriteChar((char)241); } else if (aText[i] == '‗') { - iWriteChar((char)242); + InternalWriteChar((char)242); } else if (aText[i] == '¾') { - iWriteChar((char)243); + InternalWriteChar((char)243); } else if (aText[i] == '¶') { - iWriteChar((char)244); + InternalWriteChar((char)244); } else if (aText[i] == '§') { - iWriteChar((char)245); + InternalWriteChar((char)245); } else if (aText[i] == '÷') { - iWriteChar((char)246); + InternalWriteChar((char)246); } else if (aText[i] == '¸') { - iWriteChar((char)247); + InternalWriteChar((char)247); } else if (aText[i] == '°') { - iWriteChar((char)248); + InternalWriteChar((char)248); } else if (aText[i] == '¨') { - iWriteChar((char)249); + InternalWriteChar((char)249); } else if (aText[i] == '·') { - iWriteChar((char)250); + InternalWriteChar((char)250); } else if (aText[i] == '¹') { - iWriteChar((char)251); + InternalWriteChar((char)251); } else if (aText[i] == '³') { - iWriteChar((char)252); + InternalWriteChar((char)252); } else if (aText[i] == '²') { - iWriteChar((char)253); + InternalWriteChar((char)253); } else if (aText[i] == '■') { - iWriteChar((char)254); + InternalWriteChar((char)254); } else if (aText[i] == ' ') { - iWriteChar((char)255); + InternalWriteChar((char)255); } else { - iWriteChar(aText[i]); + InternalWriteChar(aText[i]); } From c8ca3b51bb5dcbbfc64d1f10eb70e8599dfdd58b Mon Sep 17 00:00:00 2001 From: zarlo Date: Mon, 4 Sep 2017 16:30:51 +1000 Subject: [PATCH 04/18] moved things --- source/Cosmos.System2/Console.cs | 1033 +++++++++++++++--------------- 1 file changed, 517 insertions(+), 516 deletions(-) diff --git a/source/Cosmos.System2/Console.cs b/source/Cosmos.System2/Console.cs index 1ae4890e1..a71c18d56 100644 --- a/source/Cosmos.System2/Console.cs +++ b/source/Cosmos.System2/Console.cs @@ -72,6 +72,523 @@ namespace Cosmos.System { internal void InternalWriteChar(char aChar) { + char Output = aChar; + + //Extended ASCII Support + if (aChar == 'Ç') + { + Output = ((char) 128); + } + else if (aChar == 'ü') + { + Output = ((char) 129); + } + else if (aChar == 'é') + { + Output = ((char) 130); + } + else if (aChar == 'â') + { + Output = ((char) 131); + } + else if (aChar == 'ä') + { + Output = ((char) 132); + } + else if (aChar == 'à') + { + Output = ((char) 133); + } + else if (aChar == 'å') + { + Output = ((char) 134); + } + else if (aChar == 'ç') + { + Output = ((char) 135); + } + else if (aChar == 'ê') + { + Output = ((char) 136); + } + else if (aChar == 'ë') + { + Output = ((char) 137); + } + else if (aChar == 'è') + { + Output = ((char) 138); + } + else if (aChar == 'ï') + { + Output = ((char) 139); + } + else if (aChar == 'î') + { + Output = ((char) 140); + } + else if (aChar == 'ì') + { + Output = ((char) 141); + } + else if (aChar == 'Ä') + { + Output = ((char) 142); + } + else if (aChar == 'Å') + { + Output = ((char) 143); + } + else if (aChar == 'É') + { + Output = ((char) 144); + } + else if (aChar == 'æ') + { + Output = ((char) 145); + } + else if (aChar == 'Æ') + { + Output = ((char) 146); + } + else if (aChar == 'ô') + { + Output = ((char) 147); + } + else if (aChar == 'ö') + { + Output = ((char) 148); + } + else if (aChar == 'ò') + { + Output = ((char) 149); + } + else if (aChar == 'û') + { + Output = ((char) 150); + } + else if (aChar == 'ù') + { + Output = ((char) 151); + } + else if (aChar == 'ÿ') + { + Output = ((char) 152); + } + else if (aChar == 'Ö') + { + Output = ((char) 153); + } + else if (aChar == 'Ü') + { + Output = ((char) 154); + } + else if (aChar == 'ø') + { + Output = ((char) 155); + } + else if (aChar == '£') + { + Output = ((char) 156); + } + else if (aChar == 'Ø') + { + Output = ((char) 157); + } + else if (aChar == '×') + { + Output = ((char) 158); + } + else if (aChar == 'ƒ') + { + Output = ((char) 159); + } + else if (aChar == 'á') + { + Output = ((char) 160); + } + else if (aChar == 'í') + { + Output = ((char) 161); + } + else if (aChar == 'ó') + { + Output = ((char) 162); + } + else if (aChar == 'ú') + { + Output = ((char) 163); + } + else if (aChar == 'ñ') + { + Output = ((char) 164); + } + else if (aChar == 'Ñ') + { + Output = ((char) 165); + } + else if (aChar == 'ª') + { + Output = ((char) 166); + } + else if (aChar == 'º') + { + Output = ((char) 167); + } + else if (aChar == '¿') + { + Output = ((char) 168); + } + else if (aChar == '®') + { + Output = ((char) 169); + } + else if (aChar == '¬') + { + Output = ((char) 170); + } + else if (aChar == '½') + { + Output = ((char) 171); + } + else if (aChar == '¼') + { + Output = ((char) 172); + } + else if (aChar == '¡') + { + Output = ((char) 173); + } + else if (aChar == '«') + { + Output = ((char) 174); + } + else if (aChar == '»') + { + Output = ((char) 175); + } + else if (aChar == '░') + { + Output = ((char) 176); + } + else if (aChar == '▒') + { + Output = ((char) 177); + } + else if (aChar == '▓') + { + Output = ((char) 178); + } + else if (aChar == '│') + { + Output = ((char) 179); + } + else if (aChar == '┤') + { + Output = ((char) 180); + } + else if (aChar == 'Á') + { + Output = ((char) 181); + } + else if (aChar == 'Â') + { + Output = ((char) 182); + } + else if (aChar == 'À') + { + Output = ((char) 183); + } + else if (aChar == '©') + { + Output = ((char) 184); + } + else if (aChar == '╣') + { + Output = ((char) 185); + } + else if (aChar == '║') + { + Output = ((char) 186); + } + else if (aChar == '╗') + { + Output = ((char) 187); + } + else if (aChar == '╝') + { + Output = ((char) 188); + } + else if (aChar == '¢') + { + Output = ((char) 189); + } + else if (aChar == '¥') + { + Output = ((char) 190); + } + else if (aChar == '┐') + { + Output = ((char) 191); + } + else if (aChar == '└') + { + Output = ((char) 192); + } + else if (aChar == '┴') + { + Output = ((char) 193); + } + else if (aChar == '┬') + { + Output = ((char) 194); + } + else if (aChar == '├') + { + Output = ((char) 195); + } + else if (aChar == '─') + { + Output = ((char) 196); + } + else if (aChar == '┼') + { + Output = ((char) 197); + } + else if (aChar == 'ã') + { + Output = ((char) 198); + } + else if (aChar == 'Ã') + { + Output = ((char) 199); + } + else if (aChar == '╚') + { + Output = ((char) 200); + } + else if (aChar == '╔') + { + Output = ((char) 201); + } + else if (aChar == '╩') + { + Output = ((char) 202); + } + else if (aChar == '╦') + { + Output = ((char) 203); + } + else if (aChar == '╠') + { + Output = ((char) 204); + } + else if (aChar == '═') + { + Output = ((char) 205); + } + else if (aChar == '╬') + { + Output = ((char) 206); + } + else if (aChar == '¤') + { + Output = ((char) 207); + } + else if (aChar == 'ð') + { + Output = ((char) 208); + } + else if (aChar == 'Ð') + { + Output = ((char) 209); + } + else if (aChar == 'Ê') + { + Output = ((char) 210); + } + else if (aChar == 'Ë') + { + Output = ((char) 211); + } + else if (aChar == 'È') + { + Output = ((char) 212); + } + else if (aChar == 'ı') + { + Output = ((char) 213); + } + else if (aChar == 'Í') + { + Output = ((char) 214); + } + else if (aChar == 'Î') + { + Output = ((char) 215); + } + else if (aChar == 'Ï') + { + Output = ((char) 216); + } + else if (aChar == '┘') + { + Output = ((char) 217); + } + else if (aChar == '┌') + { + Output = ((char) 218); + } + else if (aChar == '█') + { + Output = ((char) 219); + } + else if (aChar == '▄') + { + Output = ((char) 220); + } + else if (aChar == '¦') + { + Output = ((char) 221); + } + else if (aChar == 'Ì') + { + Output = ((char) 222); + } + else if (aChar == '▀') + { + Output = ((char) 223); + } + else if (aChar == 'Ó') + { + Output = ((char) 224); + } + else if (aChar == 'ß') + { + Output = ((char) 225); + } + else if (aChar == 'Ô') + { + Output = ((char) 226); + } + else if (aChar == 'Ò') + { + Output = ((char) 227); + } + else if (aChar == 'õ') + { + Output = ((char) 228); + } + else if (aChar == 'Õ') + { + Output = ((char) 229); + } + else if (aChar == 'µ') + { + Output = ((char) 230); + } + else if (aChar == 'þ') + { + Output = ((char) 231); + } + else if (aChar == 'Þ') + { + Output = ((char) 232); + } + else if (aChar == 'Ú') + { + Output = ((char) 233); + } + else if (aChar == 'Û') + { + Output = ((char) 234); + } + else if (aChar == 'Ù') + { + Output = ((char) 235); + } + else if (aChar == 'ý') + { + Output = ((char) 236); + } + else if (aChar == 'Ý') + { + Output = ((char) 237); + } + else if (aChar == '¯') + { + Output = ((char) 238); + } + else if (aChar == '´') + { + Output = ((char) 239); + } + else if (aChar == '≡') + { + Output = ((char) 240); + } + else if (aChar == '±') + { + Output = ((char) 241); + } + else if (aChar == '‗') + { + Output = ((char) 242); + } + else if (aChar == '¾') + { + Output = ((char) 243); + } + else if (aChar == '¶') + { + Output = ((char) 244); + } + else if (aChar == '§') + { + Output = ((char) 245); + } + else if (aChar == '÷') + { + Output = ((char) 246); + } + else if (aChar == '¸') + { + Output = ((char) 247); + } + else if (aChar == '°') + { + Output = ((char) 248); + } + else if (aChar == '¨') + { + Output = ((char) 249); + } + else if (aChar == '·') + { + Output = ((char) 250); + } + else if (aChar == '¹') + { + Output = ((char) 251); + } + else if (aChar == '³') + { + Output = ((char) 252); + } + else if (aChar == '²') + { + Output = ((char) 253); + } + else if (aChar == '■') + { + Output = ((char) 254); + } + else if (aChar == ' ') + { + Output = ((char) 255); + } + + mText[mX, mY] = aChar; mX++; if (mX == mText.Cols) @@ -105,522 +622,6 @@ namespace Cosmos.System { InternalWriteChar(' '); } - //Extended ASCII Support - else if (aText[i] == 'Ç') - { - InternalWriteChar((char)128); - } - else if (aText[i] == 'ü') - { - InternalWriteChar((char)129); - } - else if (aText[i] == 'é') - { - InternalWriteChar((char)130); - } - else if (aText[i] == 'â') - { - InternalWriteChar((char)131); - } - else if (aText[i] == 'ä') - { - InternalWriteChar((char)132); - } - else if (aText[i] == 'à') - { - InternalWriteChar((char)133); - } - else if (aText[i] == 'å') - { - InternalWriteChar((char)134); - } - else if (aText[i] == 'ç') - { - InternalWriteChar((char)135); - } - else if (aText[i] == 'ê') - { - InternalWriteChar((char)136); - } - else if (aText[i] == 'ë') - { - InternalWriteChar((char)137); - } - else if (aText[i] == 'è') - { - InternalWriteChar((char)138); - } - else if (aText[i] == 'ï') - { - InternalWriteChar((char)139); - } - else if (aText[i] == 'î') - { - InternalWriteChar((char)140); - } - else if (aText[i] == 'ì') - { - InternalWriteChar((char)141); - } - else if (aText[i] == 'Ä') - { - InternalWriteChar((char)142); - } - else if (aText[i] == 'Å') - { - InternalWriteChar((char)143); - } - else if (aText[i] == 'É') - { - InternalWriteChar((char)144); - } - else if (aText[i] == 'æ') - { - InternalWriteChar((char)145); - } - else if (aText[i] == 'Æ') - { - InternalWriteChar((char)146); - } - else if (aText[i] == 'ô') - { - InternalWriteChar((char)147); - } - else if (aText[i] == 'ö') - { - InternalWriteChar((char)148); - } - else if (aText[i] == 'ò') - { - InternalWriteChar((char)149); - } - else if (aText[i] == 'û') - { - InternalWriteChar((char)150); - } - else if (aText[i] == 'ù') - { - InternalWriteChar((char)151); - } - else if (aText[i] == 'ÿ') - { - InternalWriteChar((char)152); - } - else if (aText[i] == 'Ö') - { - InternalWriteChar((char)153); - } - else if (aText[i] == 'Ü') - { - InternalWriteChar((char)154); - } - else if (aText[i] == 'ø') - { - InternalWriteChar((char)155); - } - else if (aText[i] == '£') - { - InternalWriteChar((char)156); - } - else if (aText[i] == 'Ø') - { - InternalWriteChar((char)157); - } - else if (aText[i] == '×') - { - InternalWriteChar((char)158); - } - else if (aText[i] == 'ƒ') - { - InternalWriteChar((char)159); - } - else if (aText[i] == 'á') - { - InternalWriteChar((char)160); - } - else if (aText[i] == 'í') - { - InternalWriteChar((char)161); - } - else if (aText[i] == 'ó') - { - InternalWriteChar((char)162); - } - else if (aText[i] == 'ú') - { - InternalWriteChar((char)163); - } - else if (aText[i] == 'ñ') - { - InternalWriteChar((char)164); - } - else if (aText[i] == 'Ñ') - { - InternalWriteChar((char)165); - } - else if (aText[i] == 'ª') - { - InternalWriteChar((char)166); - } - else if (aText[i] == 'º') - { - InternalWriteChar((char)167); - } - else if (aText[i] == '¿') - { - InternalWriteChar((char)168); - } - else if (aText[i] == '®') - { - InternalWriteChar((char)169); - } - else if (aText[i] == '¬') - { - InternalWriteChar((char)170); - } - else if (aText[i] == '½') - { - InternalWriteChar((char)171); - } - else if (aText[i] == '¼') - { - InternalWriteChar((char)172); - } - else if (aText[i] == '¡') - { - InternalWriteChar((char)173); - } - else if (aText[i] == '«') - { - InternalWriteChar((char)174); - } - else if (aText[i] == '»') - { - InternalWriteChar((char)175); - } - else if (aText[i] == '░') - { - InternalWriteChar((char)176); - } - else if (aText[i] == '▒') - { - InternalWriteChar((char)177); - } - else if (aText[i] == '▓') - { - InternalWriteChar((char)178); - } - else if (aText[i] == '│') - { - InternalWriteChar((char)179); - } - else if (aText[i] == '┤') - { - InternalWriteChar((char)180); - } - else if (aText[i] == 'Á') - { - InternalWriteChar((char)181); - } - else if (aText[i] == 'Â') - { - InternalWriteChar((char)182); - } - else if (aText[i] == 'À') - { - InternalWriteChar((char)183); - } - else if (aText[i] == '©') - { - InternalWriteChar((char)184); - } - else if (aText[i] == '╣') - { - InternalWriteChar((char)185); - } - else if (aText[i] == '║') - { - InternalWriteChar((char)186); - } - else if (aText[i] == '╗') - { - InternalWriteChar((char)187); - } - else if (aText[i] == '╝') - { - InternalWriteChar((char)188); - } - else if (aText[i] == '¢') - { - InternalWriteChar((char)189); - } - else if (aText[i] == '¥') - { - InternalWriteChar((char)190); - } - else if (aText[i] == '┐') - { - InternalWriteChar((char)191); - } - else if (aText[i] == '└') - { - InternalWriteChar((char)192); - } - else if (aText[i] == '┴') - { - InternalWriteChar((char)193); - } - else if (aText[i] == '┬') - { - InternalWriteChar((char)194); - } - else if (aText[i] == '├') - { - InternalWriteChar((char)195); - } - else if (aText[i] == '─') - { - InternalWriteChar((char)196); - } - else if (aText[i] == '┼') - { - InternalWriteChar((char)197); - } - else if (aText[i] == 'ã') - { - InternalWriteChar((char)198); - } - else if (aText[i] == 'Ã') - { - InternalWriteChar((char)199); - } - else if (aText[i] == '╚') - { - InternalWriteChar((char)200); - } - else if (aText[i] == '╔') - { - InternalWriteChar((char)201); - } - else if (aText[i] == '╩') - { - InternalWriteChar((char)202); - } - else if (aText[i] == '╦') - { - InternalWriteChar((char)203); - } - else if (aText[i] == '╠') - { - InternalWriteChar((char)204); - } - else if (aText[i] == '═') - { - InternalWriteChar((char)205); - } - else if (aText[i] == '╬') - { - InternalWriteChar((char)206); - } - else if (aText[i] == '¤') - { - InternalWriteChar((char)207); - } - else if (aText[i] == 'ð') - { - InternalWriteChar((char)208); - } - else if (aText[i] == 'Ð') - { - InternalWriteChar((char)209); - } - else if (aText[i] == 'Ê') - { - InternalWriteChar((char)210); - } - else if (aText[i] == 'Ë') - { - InternalWriteChar((char)211); - } - else if (aText[i] == 'È') - { - InternalWriteChar((char)212); - } - else if (aText[i] == 'ı') - { - InternalWriteChar((char)213); - } - else if (aText[i] == 'Í') - { - InternalWriteChar((char)214); - } - else if (aText[i] == 'Î') - { - InternalWriteChar((char)215); - } - else if (aText[i] == 'Ï') - { - InternalWriteChar((char)216); - } - else if (aText[i] == '┘') - { - InternalWriteChar((char)217); - } - else if (aText[i] == '┌') - { - InternalWriteChar((char)218); - } - else if (aText[i] == '█') - { - InternalWriteChar((char)219); - } - else if (aText[i] == '▄') - { - InternalWriteChar((char)220); - } - else if (aText[i] == '¦') - { - InternalWriteChar((char)221); - } - else if (aText[i] == 'Ì') - { - InternalWriteChar((char)222); - } - else if (aText[i] == '▀') - { - InternalWriteChar((char)223); - } - else if (aText[i] == 'Ó') - { - InternalWriteChar((char)224); - } - else if (aText[i] == 'ß') - { - InternalWriteChar((char)225); - } - else if (aText[i] == 'Ô') - { - InternalWriteChar((char)226); - } - else if (aText[i] == 'Ò') - { - InternalWriteChar((char)227); - } - else if (aText[i] == 'õ') - { - InternalWriteChar((char)228); - } - else if (aText[i] == 'Õ') - { - InternalWriteChar((char)229); - } - else if (aText[i] == 'µ') - { - InternalWriteChar((char)230); - } - else if (aText[i] == 'þ') - { - InternalWriteChar((char)231); - } - else if (aText[i] == 'Þ') - { - InternalWriteChar((char)232); - } - else if (aText[i] == 'Ú') - { - InternalWriteChar((char)233); - } - else if (aText[i] == 'Û') - { - InternalWriteChar((char)234); - } - else if (aText[i] == 'Ù') - { - InternalWriteChar((char)235); - } - else if (aText[i] == 'ý') - { - InternalWriteChar((char)236); - } - else if (aText[i] == 'Ý') - { - InternalWriteChar((char)237); - } - else if (aText[i] == '¯') - { - InternalWriteChar((char)238); - } - else if (aText[i] == '´') - { - InternalWriteChar((char)239); - } - else if (aText[i] == '≡') - { - InternalWriteChar((char)240); - } - else if (aText[i] == '±') - { - InternalWriteChar((char)241); - } - else if (aText[i] == '‗') - { - InternalWriteChar((char)242); - } - else if (aText[i] == '¾') - { - InternalWriteChar((char)243); - } - else if (aText[i] == '¶') - { - InternalWriteChar((char)244); - } - else if (aText[i] == '§') - { - InternalWriteChar((char)245); - } - else if (aText[i] == '÷') - { - InternalWriteChar((char)246); - } - else if (aText[i] == '¸') - { - InternalWriteChar((char)247); - } - else if (aText[i] == '°') - { - InternalWriteChar((char)248); - } - else if (aText[i] == '¨') - { - InternalWriteChar((char)249); - } - else if (aText[i] == '·') - { - InternalWriteChar((char)250); - } - else if (aText[i] == '¹') - { - InternalWriteChar((char)251); - } - else if (aText[i] == '³') - { - InternalWriteChar((char)252); - } - else if (aText[i] == '²') - { - InternalWriteChar((char)253); - } - else if (aText[i] == '■') - { - InternalWriteChar((char)254); - } - else if (aText[i] == ' ') - { - InternalWriteChar((char)255); - } - else { - InternalWriteChar(aText[i]); - } } From 3dbb8678c49e14934ec9525d53b716ca4231534a Mon Sep 17 00:00:00 2001 From: Arawn Davies Date: Sat, 30 Sep 2017 00:32:31 +0100 Subject: [PATCH 05/18] Fixes issues regarding project creation as some VS installations have the 'Save new projects on creation' option disabled, resulting in Cosmos projects not saving and nuget packages failing to restore. Noticed in issue #758. --- .../ProjectTemplates/Cosmos/Cosmos.vstemplate | 1 + .../ProjectTemplates/CosmosKernel (CSharp)/CSharpProj.vstemplate | 1 + .../ProjectTemplates/CosmosKernel (VB)/VBProj.vstemplate | 1 + .../CosmosProject (CSharp)/CSharpProj.vstemplate | 1 + .../CosmosProject (FSharp)/FSharpProj.vstemplate | 1 + .../ProjectTemplates/CosmosProject (VB)/VBProj.vstemplate | 1 + 6 files changed, 6 insertions(+) diff --git a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/Cosmos/Cosmos.vstemplate b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/Cosmos/Cosmos.vstemplate index 3c3679338..ce3d8d1e0 100644 --- a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/Cosmos/Cosmos.vstemplate +++ b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/Cosmos/Cosmos.vstemplate @@ -7,6 +7,7 @@ true Cosmos true + true diff --git a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosKernel (CSharp)/CSharpProj.vstemplate b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosKernel (CSharp)/CSharpProj.vstemplate index 8838d3e58..4e879b04f 100644 --- a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosKernel (CSharp)/CSharpProj.vstemplate +++ b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosKernel (CSharp)/CSharpProj.vstemplate @@ -8,6 +8,7 @@ CSharpKernel true true + true diff --git a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosKernel (VB)/VBProj.vstemplate b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosKernel (VB)/VBProj.vstemplate index a68215722..5ddd2f561 100644 --- a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosKernel (VB)/VBProj.vstemplate +++ b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosKernel (VB)/VBProj.vstemplate @@ -8,6 +8,7 @@ VBKernel true true + true diff --git a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (CSharp)/CSharpProj.vstemplate b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (CSharp)/CSharpProj.vstemplate index 7e3e83976..4c64112df 100644 --- a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (CSharp)/CSharpProj.vstemplate +++ b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (CSharp)/CSharpProj.vstemplate @@ -8,6 +8,7 @@ CosmosKernel true true + true diff --git a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (FSharp)/FSharpProj.vstemplate b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (FSharp)/FSharpProj.vstemplate index aca7db743..6f5a79c47 100644 --- a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (FSharp)/FSharpProj.vstemplate +++ b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (FSharp)/FSharpProj.vstemplate @@ -8,6 +8,7 @@ CosmosKernel true true + true diff --git a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (VB)/VBProj.vstemplate b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (VB)/VBProj.vstemplate index e2106fff8..151c2d9f5 100644 --- a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (VB)/VBProj.vstemplate +++ b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (VB)/VBProj.vstemplate @@ -8,6 +8,7 @@ CosmosKernel true true + true From 9a76f82018b83d5c90cf7e190931c228a454f986 Mon Sep 17 00:00:00 2001 From: Arawn Davies Date: Sat, 30 Sep 2017 00:40:32 +0100 Subject: [PATCH 06/18] Update SUPPORT.md --- SUPPORT.md | 1 + 1 file changed, 1 insertion(+) diff --git a/SUPPORT.md b/SUPPORT.md index 454c86c20..378d10377 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -6,3 +6,4 @@ True NULL ``` +^This issue is fixed in Userkit 20170928 https://github.com/CosmosOS/Cosmos/releases/tag/Userkit_20170928 From 02739e0ddfede3e9fb295c414338d044b6aefa58 Mon Sep 17 00:00:00 2001 From: Kudzu Date: Sat, 30 Sep 2017 10:15:02 -0400 Subject: [PATCH 07/18] Update README.md --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 104401fd2..854d3a013 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,13 @@ For instructions on how to install and use Cosmos, please visit [www.goCosmos.or Build status for master branch: [![Build status](https://ci.appveyor.com/api/projects/status/kust7g5dlnykhkaf/branch/master?svg=true)](https://ci.appveyor.com/project/CosmosOS/cosmos/branch/master) + +#Urgent Notice + +###Updated Sep 29, 2017 + +The hosting service which hosts our website has a technical issue which has taken our website offline. We are urgently working to resolve this issue. We hope that our primary website will be restored today. + +##Hurricane Harvey + +The issue is being impacted by lasting impacts to a center in Houston affected by Harvey and the impacts of moving resources out of the affected location. From b6023694325b9dd976181936a18c2e20e5124d01 Mon Sep 17 00:00:00 2001 From: Kudzu Date: Sat, 30 Sep 2017 10:15:28 -0400 Subject: [PATCH 08/18] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 854d3a013..e6705d5f5 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,12 @@ For instructions on how to install and use Cosmos, please visit [www.goCosmos.or Build status for master branch: [![Build status](https://ci.appveyor.com/api/projects/status/kust7g5dlnykhkaf/branch/master?svg=true)](https://ci.appveyor.com/project/CosmosOS/cosmos/branch/master) -#Urgent Notice +# Urgent Notice -###Updated Sep 29, 2017 +## Updated Sep 29, 2017 The hosting service which hosts our website has a technical issue which has taken our website offline. We are urgently working to resolve this issue. We hope that our primary website will be restored today. -##Hurricane Harvey +## Hurricane Harvey The issue is being impacted by lasting impacts to a center in Houston affected by Harvey and the impacts of moving resources out of the affected location. From b16521fa53ebc60a8df1bc6c89951c5717204834 Mon Sep 17 00:00:00 2001 From: Kudzu Date: Sat, 30 Sep 2017 10:15:47 -0400 Subject: [PATCH 09/18] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e6705d5f5..bbd3020f4 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Build status for master branch: ## Updated Sep 29, 2017 -The hosting service which hosts our website has a technical issue which has taken our website offline. We are urgently working to resolve this issue. We hope that our primary website will be restored today. +The hosting service which hosts our website has a technical issue which has taken our website offline. We are urgently working to resolve this issue. ## Hurricane Harvey From 7c85d156cae6838dbf61d7e70ef3281176117b19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pedro?= Date: Tue, 3 Oct 2017 00:45:45 +0100 Subject: [PATCH 10/18] Remove e_sqlite3.dll from publish directory. --- .../Cosmos.Build.MSBuild.csproj | 60 ++++++++++--------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj index 3bedcd930..20db80ac6 100644 --- a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj +++ b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj @@ -1,35 +1,39 @@  - - net462 - win7-x86 - True - ..\..\Cosmos.snk - + + net462 + win7-x86 + True + ..\..\Cosmos.snk + - - - PreserveNewest - - - - - - - - - - - - - - - - - - + + PreserveNewest + - + + + + + + + + + + + + + + + + + + + + + + + From 2ff37ddea204220ef140cc5b6b3a00eca19afc0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pedro?= Date: Tue, 3 Oct 2017 20:07:09 +0100 Subject: [PATCH 11/18] Updated SQLitePCLRaw.bundle_green version. --- source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj index 20db80ac6..4a0fe3a30 100644 --- a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj +++ b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj @@ -18,6 +18,7 @@ + From 3edc13ba7b6656368c70a13ab08d78e923195210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pedro?= Date: Tue, 3 Oct 2017 22:16:14 +0100 Subject: [PATCH 12/18] Removed SQLite package references from Cosmos.Build.MSBuild. --- source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj | 6 ------ 1 file changed, 6 deletions(-) diff --git a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj index 4a0fe3a30..cb72d8e6e 100644 --- a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj +++ b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj @@ -17,8 +17,6 @@ - - @@ -33,8 +31,4 @@ - - - - From 0a3da1d6b98cf35a2e4cd8615707bf7c678fe59c Mon Sep 17 00:00:00 2001 From: Arawn Davies Date: Thu, 5 Oct 2017 23:19:03 +0100 Subject: [PATCH 13/18] Revert "might make console faster" --- source/Cosmos.System2/Console.cs | 1059 +++++++++++++++--------------- 1 file changed, 525 insertions(+), 534 deletions(-) diff --git a/source/Cosmos.System2/Console.cs b/source/Cosmos.System2/Console.cs index a71c18d56..4c47c77b6 100644 --- a/source/Cosmos.System2/Console.cs +++ b/source/Cosmos.System2/Console.cs @@ -1,4 +1,7 @@ using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; using Cosmos.HAL; namespace Cosmos.System { @@ -66,535 +69,12 @@ namespace Cosmos.System { } public void WriteChar(char aChar) { - InternalWriteChar(aChar); - UpdateCursor(); - } - - internal void InternalWriteChar(char aChar) - { - char Output = aChar; - - //Extended ASCII Support - if (aChar == 'Ç') - { - Output = ((char) 128); - } - else if (aChar == 'ü') - { - Output = ((char) 129); - } - else if (aChar == 'é') - { - Output = ((char) 130); - } - else if (aChar == 'â') - { - Output = ((char) 131); - } - else if (aChar == 'ä') - { - Output = ((char) 132); - } - else if (aChar == 'à') - { - Output = ((char) 133); - } - else if (aChar == 'å') - { - Output = ((char) 134); - } - else if (aChar == 'ç') - { - Output = ((char) 135); - } - else if (aChar == 'ê') - { - Output = ((char) 136); - } - else if (aChar == 'ë') - { - Output = ((char) 137); - } - else if (aChar == 'è') - { - Output = ((char) 138); - } - else if (aChar == 'ï') - { - Output = ((char) 139); - } - else if (aChar == 'î') - { - Output = ((char) 140); - } - else if (aChar == 'ì') - { - Output = ((char) 141); - } - else if (aChar == 'Ä') - { - Output = ((char) 142); - } - else if (aChar == 'Å') - { - Output = ((char) 143); - } - else if (aChar == 'É') - { - Output = ((char) 144); - } - else if (aChar == 'æ') - { - Output = ((char) 145); - } - else if (aChar == 'Æ') - { - Output = ((char) 146); - } - else if (aChar == 'ô') - { - Output = ((char) 147); - } - else if (aChar == 'ö') - { - Output = ((char) 148); - } - else if (aChar == 'ò') - { - Output = ((char) 149); - } - else if (aChar == 'û') - { - Output = ((char) 150); - } - else if (aChar == 'ù') - { - Output = ((char) 151); - } - else if (aChar == 'ÿ') - { - Output = ((char) 152); - } - else if (aChar == 'Ö') - { - Output = ((char) 153); - } - else if (aChar == 'Ü') - { - Output = ((char) 154); - } - else if (aChar == 'ø') - { - Output = ((char) 155); - } - else if (aChar == '£') - { - Output = ((char) 156); - } - else if (aChar == 'Ø') - { - Output = ((char) 157); - } - else if (aChar == '×') - { - Output = ((char) 158); - } - else if (aChar == 'ƒ') - { - Output = ((char) 159); - } - else if (aChar == 'á') - { - Output = ((char) 160); - } - else if (aChar == 'í') - { - Output = ((char) 161); - } - else if (aChar == 'ó') - { - Output = ((char) 162); - } - else if (aChar == 'ú') - { - Output = ((char) 163); - } - else if (aChar == 'ñ') - { - Output = ((char) 164); - } - else if (aChar == 'Ñ') - { - Output = ((char) 165); - } - else if (aChar == 'ª') - { - Output = ((char) 166); - } - else if (aChar == 'º') - { - Output = ((char) 167); - } - else if (aChar == '¿') - { - Output = ((char) 168); - } - else if (aChar == '®') - { - Output = ((char) 169); - } - else if (aChar == '¬') - { - Output = ((char) 170); - } - else if (aChar == '½') - { - Output = ((char) 171); - } - else if (aChar == '¼') - { - Output = ((char) 172); - } - else if (aChar == '¡') - { - Output = ((char) 173); - } - else if (aChar == '«') - { - Output = ((char) 174); - } - else if (aChar == '»') - { - Output = ((char) 175); - } - else if (aChar == '░') - { - Output = ((char) 176); - } - else if (aChar == '▒') - { - Output = ((char) 177); - } - else if (aChar == '▓') - { - Output = ((char) 178); - } - else if (aChar == '│') - { - Output = ((char) 179); - } - else if (aChar == '┤') - { - Output = ((char) 180); - } - else if (aChar == 'Á') - { - Output = ((char) 181); - } - else if (aChar == 'Â') - { - Output = ((char) 182); - } - else if (aChar == 'À') - { - Output = ((char) 183); - } - else if (aChar == '©') - { - Output = ((char) 184); - } - else if (aChar == '╣') - { - Output = ((char) 185); - } - else if (aChar == '║') - { - Output = ((char) 186); - } - else if (aChar == '╗') - { - Output = ((char) 187); - } - else if (aChar == '╝') - { - Output = ((char) 188); - } - else if (aChar == '¢') - { - Output = ((char) 189); - } - else if (aChar == '¥') - { - Output = ((char) 190); - } - else if (aChar == '┐') - { - Output = ((char) 191); - } - else if (aChar == '└') - { - Output = ((char) 192); - } - else if (aChar == '┴') - { - Output = ((char) 193); - } - else if (aChar == '┬') - { - Output = ((char) 194); - } - else if (aChar == '├') - { - Output = ((char) 195); - } - else if (aChar == '─') - { - Output = ((char) 196); - } - else if (aChar == '┼') - { - Output = ((char) 197); - } - else if (aChar == 'ã') - { - Output = ((char) 198); - } - else if (aChar == 'Ã') - { - Output = ((char) 199); - } - else if (aChar == '╚') - { - Output = ((char) 200); - } - else if (aChar == '╔') - { - Output = ((char) 201); - } - else if (aChar == '╩') - { - Output = ((char) 202); - } - else if (aChar == '╦') - { - Output = ((char) 203); - } - else if (aChar == '╠') - { - Output = ((char) 204); - } - else if (aChar == '═') - { - Output = ((char) 205); - } - else if (aChar == '╬') - { - Output = ((char) 206); - } - else if (aChar == '¤') - { - Output = ((char) 207); - } - else if (aChar == 'ð') - { - Output = ((char) 208); - } - else if (aChar == 'Ð') - { - Output = ((char) 209); - } - else if (aChar == 'Ê') - { - Output = ((char) 210); - } - else if (aChar == 'Ë') - { - Output = ((char) 211); - } - else if (aChar == 'È') - { - Output = ((char) 212); - } - else if (aChar == 'ı') - { - Output = ((char) 213); - } - else if (aChar == 'Í') - { - Output = ((char) 214); - } - else if (aChar == 'Î') - { - Output = ((char) 215); - } - else if (aChar == 'Ï') - { - Output = ((char) 216); - } - else if (aChar == '┘') - { - Output = ((char) 217); - } - else if (aChar == '┌') - { - Output = ((char) 218); - } - else if (aChar == '█') - { - Output = ((char) 219); - } - else if (aChar == '▄') - { - Output = ((char) 220); - } - else if (aChar == '¦') - { - Output = ((char) 221); - } - else if (aChar == 'Ì') - { - Output = ((char) 222); - } - else if (aChar == '▀') - { - Output = ((char) 223); - } - else if (aChar == 'Ó') - { - Output = ((char) 224); - } - else if (aChar == 'ß') - { - Output = ((char) 225); - } - else if (aChar == 'Ô') - { - Output = ((char) 226); - } - else if (aChar == 'Ò') - { - Output = ((char) 227); - } - else if (aChar == 'õ') - { - Output = ((char) 228); - } - else if (aChar == 'Õ') - { - Output = ((char) 229); - } - else if (aChar == 'µ') - { - Output = ((char) 230); - } - else if (aChar == 'þ') - { - Output = ((char) 231); - } - else if (aChar == 'Þ') - { - Output = ((char) 232); - } - else if (aChar == 'Ú') - { - Output = ((char) 233); - } - else if (aChar == 'Û') - { - Output = ((char) 234); - } - else if (aChar == 'Ù') - { - Output = ((char) 235); - } - else if (aChar == 'ý') - { - Output = ((char) 236); - } - else if (aChar == 'Ý') - { - Output = ((char) 237); - } - else if (aChar == '¯') - { - Output = ((char) 238); - } - else if (aChar == '´') - { - Output = ((char) 239); - } - else if (aChar == '≡') - { - Output = ((char) 240); - } - else if (aChar == '±') - { - Output = ((char) 241); - } - else if (aChar == '‗') - { - Output = ((char) 242); - } - else if (aChar == '¾') - { - Output = ((char) 243); - } - else if (aChar == '¶') - { - Output = ((char) 244); - } - else if (aChar == '§') - { - Output = ((char) 245); - } - else if (aChar == '÷') - { - Output = ((char) 246); - } - else if (aChar == '¸') - { - Output = ((char) 247); - } - else if (aChar == '°') - { - Output = ((char) 248); - } - else if (aChar == '¨') - { - Output = ((char) 249); - } - else if (aChar == '·') - { - Output = ((char) 250); - } - else if (aChar == '¹') - { - Output = ((char) 251); - } - else if (aChar == '³') - { - Output = ((char) 252); - } - else if (aChar == '²') - { - Output = ((char) 253); - } - else if (aChar == '■') - { - Output = ((char) 254); - } - else if (aChar == ' ') - { - Output = ((char) 255); - } - - mText[mX, mY] = aChar; mX++; - if (mX == mText.Cols) - { + if (mX == mText.Cols) { NewLine(); } + UpdateCursor(); } public void WriteLine(string aText) { @@ -616,18 +96,529 @@ namespace Cosmos.System { UpdateCursor(); } else if (aText[i] == '\t') { //Write(" "); - InternalWriteChar(' '); - InternalWriteChar(' '); - InternalWriteChar(' '); - InternalWriteChar(' '); + WriteChar(' '); + WriteChar(' '); + WriteChar(' '); + WriteChar(' '); } - - + //Extended ASCII Support + else if (aText[i] == 'Ç') + { + WriteChar((char)128); + } + else if (aText[i] == 'ü') + { + WriteChar((char)129); + } + else if (aText[i] == 'é') + { + WriteChar((char)130); + } + else if (aText[i] == 'â') + { + WriteChar((char)131); + } + else if (aText[i] == 'ä') + { + WriteChar((char)132); + } + else if (aText[i] == 'à') + { + WriteChar((char)133); + } + else if (aText[i] == 'å') + { + WriteChar((char)134); + } + else if (aText[i] == 'ç') + { + WriteChar((char)135); + } + else if (aText[i] == 'ê') + { + WriteChar((char)136); + } + else if (aText[i] == 'ë') + { + WriteChar((char)137); + } + else if (aText[i] == 'è') + { + WriteChar((char)138); + } + else if (aText[i] == 'ï') + { + WriteChar((char)139); + } + else if (aText[i] == 'î') + { + WriteChar((char)140); + } + else if (aText[i] == 'ì') + { + WriteChar((char)141); + } + else if (aText[i] == 'Ä') + { + WriteChar((char)142); + } + else if (aText[i] == 'Å') + { + WriteChar((char)143); + } + else if (aText[i] == 'É') + { + WriteChar((char)144); + } + else if (aText[i] == 'æ') + { + WriteChar((char)145); + } + else if (aText[i] == 'Æ') + { + WriteChar((char)146); + } + else if (aText[i] == 'ô') + { + WriteChar((char)147); + } + else if (aText[i] == 'ö') + { + WriteChar((char)148); + } + else if (aText[i] == 'ò') + { + WriteChar((char)149); + } + else if (aText[i] == 'û') + { + WriteChar((char)150); + } + else if (aText[i] == 'ù') + { + WriteChar((char)151); + } + else if (aText[i] == 'ÿ') + { + WriteChar((char)152); + } + else if (aText[i] == 'Ö') + { + WriteChar((char)153); + } + else if (aText[i] == 'Ü') + { + WriteChar((char)154); + } + else if (aText[i] == 'ø') + { + WriteChar((char)155); + } + else if (aText[i] == '£') + { + WriteChar((char)156); + } + else if (aText[i] == 'Ø') + { + WriteChar((char)157); + } + else if (aText[i] == '×') + { + WriteChar((char)158); + } + else if (aText[i] == 'ƒ') + { + WriteChar((char)159); + } + else if (aText[i] == 'á') + { + WriteChar((char)160); + } + else if (aText[i] == 'í') + { + WriteChar((char)161); + } + else if (aText[i] == 'ó') + { + WriteChar((char)162); + } + else if (aText[i] == 'ú') + { + WriteChar((char)163); + } + else if (aText[i] == 'ñ') + { + WriteChar((char)164); + } + else if (aText[i] == 'Ñ') + { + WriteChar((char)165); + } + else if (aText[i] == 'ª') + { + WriteChar((char)166); + } + else if (aText[i] == 'º') + { + WriteChar((char)167); + } + else if (aText[i] == '¿') + { + WriteChar((char)168); + } + else if (aText[i] == '®') + { + WriteChar((char)169); + } + else if (aText[i] == '¬') + { + WriteChar((char)170); + } + else if (aText[i] == '½') + { + WriteChar((char)171); + } + else if (aText[i] == '¼') + { + WriteChar((char)172); + } + else if (aText[i] == '¡') + { + WriteChar((char)173); + } + else if (aText[i] == '«') + { + WriteChar((char)174); + } + else if (aText[i] == '»') + { + WriteChar((char)175); + } + else if (aText[i] == '░') + { + WriteChar((char)176); + } + else if (aText[i] == '▒') + { + WriteChar((char)177); + } + else if (aText[i] == '▓') + { + WriteChar((char)178); + } + else if (aText[i] == '│') + { + WriteChar((char)179); + } + else if (aText[i] == '┤') + { + WriteChar((char)180); + } + else if (aText[i] == 'Á') + { + WriteChar((char)181); + } + else if (aText[i] == 'Â') + { + WriteChar((char)182); + } + else if (aText[i] == 'À') + { + WriteChar((char)183); + } + else if (aText[i] == '©') + { + WriteChar((char)184); + } + else if (aText[i] == '╣') + { + WriteChar((char)185); + } + else if (aText[i] == '║') + { + WriteChar((char)186); + } + else if (aText[i] == '╗') + { + WriteChar((char)187); + } + else if (aText[i] == '╝') + { + WriteChar((char)188); + } + else if (aText[i] == '¢') + { + WriteChar((char)189); + } + else if (aText[i] == '¥') + { + WriteChar((char)190); + } + else if (aText[i] == '┐') + { + WriteChar((char)191); + } + else if (aText[i] == '└') + { + WriteChar((char)192); + } + else if (aText[i] == '┴') + { + WriteChar((char)193); + } + else if (aText[i] == '┬') + { + WriteChar((char)194); + } + else if (aText[i] == '├') + { + WriteChar((char)195); + } + else if (aText[i] == '─') + { + WriteChar((char)196); + } + else if (aText[i] == '┼') + { + WriteChar((char)197); + } + else if (aText[i] == 'ã') + { + WriteChar((char)198); + } + else if (aText[i] == 'Ã') + { + WriteChar((char)199); + } + else if (aText[i] == '╚') + { + WriteChar((char)200); + } + else if (aText[i] == '╔') + { + WriteChar((char)201); + } + else if (aText[i] == '╩') + { + WriteChar((char)202); + } + else if (aText[i] == '╦') + { + WriteChar((char)203); + } + else if (aText[i] == '╠') + { + WriteChar((char)204); + } + else if (aText[i] == '═') + { + WriteChar((char)205); + } + else if (aText[i] == '╬') + { + WriteChar((char)206); + } + else if (aText[i] == '¤') + { + WriteChar((char)207); + } + else if (aText[i] == 'ð') + { + WriteChar((char)208); + } + else if (aText[i] == 'Ð') + { + WriteChar((char)209); + } + else if (aText[i] == 'Ê') + { + WriteChar((char)210); + } + else if (aText[i] == 'Ë') + { + WriteChar((char)211); + } + else if (aText[i] == 'È') + { + WriteChar((char)212); + } + else if (aText[i] == 'ı') + { + WriteChar((char)213); + } + else if (aText[i] == 'Í') + { + WriteChar((char)214); + } + else if (aText[i] == 'Î') + { + WriteChar((char)215); + } + else if (aText[i] == 'Ï') + { + WriteChar((char)216); + } + else if (aText[i] == '┘') + { + WriteChar((char)217); + } + else if (aText[i] == '┌') + { + WriteChar((char)218); + } + else if (aText[i] == '█') + { + WriteChar((char)219); + } + else if (aText[i] == '▄') + { + WriteChar((char)220); + } + else if (aText[i] == '¦') + { + WriteChar((char)221); + } + else if (aText[i] == 'Ì') + { + WriteChar((char)222); + } + else if (aText[i] == '▀') + { + WriteChar((char)223); + } + else if (aText[i] == 'Ó') + { + WriteChar((char)224); + } + else if (aText[i] == 'ß') + { + WriteChar((char)225); + } + else if (aText[i] == 'Ô') + { + WriteChar((char)226); + } + else if (aText[i] == 'Ò') + { + WriteChar((char)227); + } + else if (aText[i] == 'õ') + { + WriteChar((char)228); + } + else if (aText[i] == 'Õ') + { + WriteChar((char)229); + } + else if (aText[i] == 'µ') + { + WriteChar((char)230); + } + else if (aText[i] == 'þ') + { + WriteChar((char)231); + } + else if (aText[i] == 'Þ') + { + WriteChar((char)232); + } + else if (aText[i] == 'Ú') + { + WriteChar((char)233); + } + else if (aText[i] == 'Û') + { + WriteChar((char)234); + } + else if (aText[i] == 'Ù') + { + WriteChar((char)235); + } + else if (aText[i] == 'ý') + { + WriteChar((char)236); + } + else if (aText[i] == 'Ý') + { + WriteChar((char)237); + } + else if (aText[i] == '¯') + { + WriteChar((char)238); + } + else if (aText[i] == '´') + { + WriteChar((char)239); + } + else if (aText[i] == '≡') + { + WriteChar((char)240); + } + else if (aText[i] == '±') + { + WriteChar((char)241); + } + else if (aText[i] == '‗') + { + WriteChar((char)242); + } + else if (aText[i] == '¾') + { + WriteChar((char)243); + } + else if (aText[i] == '¶') + { + WriteChar((char)244); + } + else if (aText[i] == '§') + { + WriteChar((char)245); + } + else if (aText[i] == '÷') + { + WriteChar((char)246); + } + else if (aText[i] == '¸') + { + WriteChar((char)247); + } + else if (aText[i] == '°') + { + WriteChar((char)248); + } + else if (aText[i] == '¨') + { + WriteChar((char)249); + } + else if (aText[i] == '·') + { + WriteChar((char)250); + } + else if (aText[i] == '¹') + { + WriteChar((char)251); + } + else if (aText[i] == '³') + { + WriteChar((char)252); + } + else if (aText[i] == '²') + { + WriteChar((char)253); + } + else if (aText[i] == '■') + { + WriteChar((char)254); + } + else if (aText[i] == ' ') + { + WriteChar((char)255); + } + else { + WriteChar(aText[i]); + } } - - UpdateCursor(); - } public ConsoleColor Foreground From b3fff7e1554c4d102a401cb8978b52779ae376bf Mon Sep 17 00:00:00 2001 From: Arawn Davies Date: Fri, 6 Oct 2017 00:15:46 +0100 Subject: [PATCH 14/18] Create issue_template.md A template that provides preformatting to issues for when they are made. --- .github/issue_template.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/issue_template.md diff --git a/.github/issue_template.md b/.github/issue_template.md new file mode 100644 index 000000000..b68592709 --- /dev/null +++ b/.github/issue_template.md @@ -0,0 +1,13 @@ +### Area of Cosmos - What area of Cosmos are we dealing with? + + +### Expected Behaviour - What do you want to happen? + + +### Actual behaviour - What unexpectedly happens? + + +### Reproduction - How did you get this error to appear? + + +### Version information - Where you using the userkit or Devkit? And what userkit version or devkit commit? From 9a2e146b611e7822157d99ebf164b70b819eda2d Mon Sep 17 00:00:00 2001 From: Arawn Davies Date: Fri, 6 Oct 2017 00:22:54 +0100 Subject: [PATCH 15/18] Update CONTRIBUTING.md Added a link to the FAQ on gocosmos.org --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e676146c9..13e7bccdb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,6 +2,7 @@ CosmosOS is a volunteer effort. We encourage you to pitch in. Join the team! - Before you begin work, make sure to clear it with the project owners. It will save a lot of time down the road. - Fork the project over to your account, do not request repository access. +- Please be sure to check out the FAQ to see if any questions you have are already answered. [FAQ on GoCosmos.org](https://www.gocosmos.org/faq/) - Please don't "bump" your issue(s). If you've filed it, we have seen it. - Please be sure to install the [EditorConfig](https://visualstudiogallery.msdn.microsoft.com/c8bccfe2-650c-4b42-bc5c-845e21f96328). This ensures your pull requests meet the required formatting and conventions. [See here](https://github.com/CosmosOS/Cosmos/wiki/FAQ#what-is-this-editorconfig-file-and-how-do-i-use-it) for more info. From 6187a4e6e1c07065fc92e260522f6fe58e8029cc Mon Sep 17 00:00:00 2001 From: Arawn Davies Date: Fri, 6 Oct 2017 12:00:47 +0100 Subject: [PATCH 16/18] Fixed typo - Where to Were --- .github/issue_template.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/issue_template.md b/.github/issue_template.md index b68592709..f0f01ab1b 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -1,13 +1,13 @@ -### Area of Cosmos - What area of Cosmos are we dealing with? +#### Area of Cosmos - What area of Cosmos are we dealing with? -### Expected Behaviour - What do you want to happen? +#### Expected Behaviour - What do you want to happen? -### Actual behaviour - What unexpectedly happens? +#### Actual behaviour - What unexpectedly happens? -### Reproduction - How did you get this error to appear? +#### Reproduction - How did you get this error to appear? -### Version information - Where you using the userkit or Devkit? And what userkit version or devkit commit? +#### Version information - Were you using the Userkit or Devkit? And what userkit version or devkit commit? From 7dcc263df2f9e1eaa149352a0139f106f1bb8d17 Mon Sep 17 00:00:00 2001 From: Arawn Davies Date: Fri, 6 Oct 2017 14:21:02 +0100 Subject: [PATCH 17/18] Fixed SQL issue due to revert --- source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj index cb72d8e6e..16be68fbb 100644 --- a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj +++ b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj @@ -13,12 +13,11 @@ - + - @@ -31,4 +30,7 @@ + + + From 90c0fe4c06dacdc64dd5e8aa3366737e0ae94d24 Mon Sep 17 00:00:00 2001 From: Arawn Davies Date: Fri, 6 Oct 2017 14:30:32 +0100 Subject: [PATCH 18/18] Forgot to add closing --- source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj index 16be68fbb..2b8667629 100644 --- a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj +++ b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj @@ -18,7 +18,7 @@ - +