Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle %lu format #260

Merged
merged 3 commits into from Nov 6, 2020
+34 −41
Merged

Handle %lu format #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb93994
Handle %lu in FormatPrintf
paladine Nov 6, 2020
a143298
Merge remote-tracking branch 'origin/master' into numbers
paladine Nov 6, 2020
7c3185b
Cleanup of FormatPrintf method
paladine Nov 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions MBBSEmu.Tests/ExportedModules/Majorbbs/prf_Tests.cs
View file
Open in desktop
Expand Up @@ -15,9 +15,17 @@ public class prf_Tests : ExportedModuleTestBase

[Theory]
[InlineData("%d", "1", (ushort)1)]
[InlineData("%d", "0", (ushort)0)]
[InlineData("%d", "-1", (ushort)0xFFFF)]
[InlineData("%u", "1", (ushort)1)]
[InlineData("%u", "0", (ushort)0)]
[InlineData("%u", "65535", (ushort)0xFFFF)]
[InlineData("%s-%d", "TEST-1", "TEST", (ushort)1)]
[InlineData("%s-%ld", "TEST-2147483647", "TEST", 2147483647)]
[InlineData("%s-%ld-%d-%s", "TEST-2147483647-1-FOO", "TEST", 2147483647, (ushort)1, "FOO")]
[InlineData("%s-%ld-%d-%s", "TEST--1-1-FOO", "TEST", (uint)0xFFFFFFFF, (ushort)1, "FOO")]
[InlineData("%s-%lu-%d-%s", "TEST-2147483647-1-FOO", "TEST", 2147483647u, (ushort)1, "FOO")]
[InlineData("%s-%lu-%d-%s", "TEST-3147483647-1-FOO", "TEST", 3147483647u, (ushort)1, "FOO")]
public void prf_Test(string inputString, string expectedString, params object[] values)
{
Reset();
Expand All @@ -39,6 +47,13 @@ public void prf_Test(string inputString, string expectedString, params object[]
parameters.Add(stringParameterPointer.Segment);
break;
}
case uint @parameterULong:
{
var longBytes = BitConverter.GetBytes(@parameterULong);
parameters.Add(BitConverter.ToUInt16(longBytes, 0));
parameters.Add(BitConverter.ToUInt16(longBytes, 2));
break;
}
case int @parameterLong:
{
var longBytes = BitConverter.GetBytes(@parameterLong);
Expand Down
11 changes: 4 additions & 7 deletions MBBSEmu/Configuration.cs
View file
Open in desktop
@@ -1,15 +1,12 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Linq;
using System.Net;
using Microsoft.Extensions.Configuration;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Linq;

namespace MBBSEmu
{
Expand Down Expand Up @@ -150,13 +147,13 @@ private string GetRemoteIPAppSettings(string key)
{
return result.ToString();
}

Console.WriteLine($"RLogin.RemoteIP not specified in {Program._settingsFileName ?? Program.DefaultEmuSettingsFilename} -- setting default value: 127.0.0.1");
return "127.0.0.1";
}

/// <summary>
/// Sets a default BBS Title with \0 termination
/// Sets a default BBS Title with \0 termination
/// </summary>
/// <param name="key">BBS.Title</param>
/// <returns></returns>
Expand Down
47 changes: 15 additions & 32 deletions MBBSEmu/HostProcess/ExportedModules/ExportedModuleBase.cs
View file
Open in desktop
Expand Up @@ -444,7 +444,9 @@ private protected ReadOnlySpan<byte> FormatPrintf(ReadOnlySpan<byte> stringToPar
//Signed decimal integer
case 'i':
case 'd':
case 'u':
{
long value;
if (isVsPrintf)
{
switch (variableLength)
Expand All @@ -455,22 +457,21 @@ private protected ReadOnlySpan<byte> FormatPrintf(ReadOnlySpan<byte> stringToPar
vsPrintfBase.Offset += 2;
var longHigh = Module.Memory.GetWord(vsPrintfBase);
vsPrintfBase.Offset += 2;
var longIntParameter = longHigh << 16 | longLow;
msFormattedValue.Write(
Encoding.ASCII.GetBytes(longIntParameter.ToString()));
value = (uint)longHigh << 16 | (uint)longLow;
if (stringToParse[i] != 'u')
value = (int)value;
break;
}
case 0:
default:
{
var parameterString =
((short)Module.Memory.GetWord(vsPrintfBase)).ToString();
msFormattedValue.Write(Encoding.ASCII.GetBytes(parameterString));
value = Module.Memory.GetWord(vsPrintfBase);
if (stringToParse[i] != 'u')
value = (short)value;
vsPrintfBase.Offset += 2;
break;
}
}

}
else
{
Expand All @@ -481,39 +482,21 @@ private protected ReadOnlySpan<byte> FormatPrintf(ReadOnlySpan<byte> stringToPar
{
var longLow = GetParameter(currentParameter++);
var longHigh = GetParameter(currentParameter++);
var longIntParameter = longHigh << 16 | longLow;
msFormattedValue.Write(
Encoding.ASCII.GetBytes(longIntParameter.ToString()));
value = (uint)longHigh << 16 | (uint)longLow;
if (stringToParse[i] != 'u')
value = (int)value;
break;
}
case 0:
default:
var parameter = (short)GetParameter(currentParameter++);
msFormattedValue.Write(Encoding.ASCII.GetBytes(parameter.ToString()));
value = GetParameter(currentParameter++);
if (stringToParse[i] != 'u')
value = (short)value;
break;
}


}

break;
}
//Unsigned decimal integer
case 'u':
{
if (isVsPrintf)
{
var parameterString = Module.Memory.GetWord(vsPrintfBase)
.ToString();
msFormattedValue.Write(Encoding.ASCII.GetBytes(parameterString));
vsPrintfBase.Offset += 2;
}
else
{
var parameter = GetParameter(currentParameter++);
msFormattedValue.Write(Encoding.ASCII.GetBytes(parameter.ToString()));
}

msFormattedValue.Write(Encoding.ASCII.GetBytes(value.ToString()));
break;
}
case 'f':
Expand Down
2 changes: 0 additions & 2 deletions MBBSEmu/HostProcess/ExportedModules/Majorbbs.cs
View file
Open in desktop
Expand Up @@ -47,7 +47,6 @@ private IntPtr16 _currentMcvFile

private readonly Stack<IntPtr16> _previousBtrieveFile;

private readonly AppSettings _configuration;
private readonly List<IntPtr16> _margvPointers;
private readonly List<IntPtr16> _margnPointers;

Expand Down Expand Up @@ -92,7 +91,6 @@ public void Dispose()
{
_accountKeyRepository = accountKeyRepository;
_accountRepository = accountRepository;
_configuration = configuration;
_margvPointers = new List<IntPtr16>();
_margnPointers = new List<IntPtr16>();
_previousMcvFile = new Stack<IntPtr16>(10);
Expand Down