## Summary - Adds proper Latin1 encoding support, replacing CP1252 usage throughout the codebase - Adds specialized, optimized string decoding methods with safe string filtering for each encoding type - Filters invalid Unicode characters (C0/C1 control codes, non-characters) by removal rather than replacement since the UO client renders nothing for these characters - Fixes UTF-16 null terminator position handling to correctly advance by 2 bytes ## Changes TextEncoding.cs - Added SearchValues-based invalid byte/char detection for efficient filtering - Added encoding-specific GetString methods: GetStringAscii, GetStringLatin1, GetStringUtf8, GetStringBigUni, GetStringLittleUni - Each method supports a safeString parameter for filtering invalid characters - Little-endian UTF-16 uses direct memory cast for zero-copy decoding on LE systems - Invalid characters are removed (not replaced with U+FFFD) since the client renders nothing for them SpanReader.cs - Added ReadLatin1() and ReadLatin1Safe() methods - Rewrote encoding-specific read methods to use optimized TextEncoding.GetString* methods - Fixed UTF-16 null terminator handling: position now correctly advances by byteLength (2) instead of 1 SpanWriter.cs - Added WriteLatin1 and WriteLatin1Null methods ## Packet Updates - Updated all packet code to use Latin1 encoding instead of CP1252 - Affected: account packets, equipment packets, menu packets, message packets, mobile packets, player packets, secure trade packets, vendor packets, gump packets, book packets, mahjong packets ## Filtering Behavior Invalid characters filtered in safe mode: ``` ┌───────────────┬────────────────────────┐ │ Range │ Description │ ├───────────────┼────────────────────────┤ │ 0x00-0x1F │ C0 control codes │ ├───────────────┼────────────────────────┤ │ 0x7F │ DEL │ ├───────────────┼────────────────────────┤ │ 0x80-0x9F │ C1 control codes │ ├───────────────┼────────────────────────┤ │ 0xFFFE-0xFFFF │ Unicode non-characters │ └───────────────┴────────────────────────┘ ``` Note: Surrogate pairs (0xD800-0xDFFF) are not filtered because proper validation requires context checking for paired vs unpaired surrogates. The UO client renders nothing for these anyway. ## Test Plan - All 631 Server.Tests pass - Verified client rendering behavior using TestUnicodeGump command (pages 1-5) - Confirmed U+FFFD, unpaired surrogates, and non-characters all render as blank in client - Verified Latin1 characters (0xA0-0xFF) display correctly - Verified C1 control codes (0x80-0x9F) are filtered and don't display
169 lines
5.7 KiB
C#
169 lines
5.7 KiB
C#
/*************************************************************************
|
|
* ModernUO *
|
|
* Copyright 2019-2023 - ModernUO Development Team *
|
|
* Email: hi@modernuo.com *
|
|
* File: IncomingMobilePackets.cs *
|
|
* *
|
|
* This program is free software: you can redistribute it and/or modify *
|
|
* it under the terms of the GNU General Public License as published by *
|
|
* the Free Software Foundation, either version 3 of the License, or *
|
|
* (at your option) any later version. *
|
|
* *
|
|
* You should have received a copy of the GNU General Public License *
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
|
*************************************************************************/
|
|
|
|
using System.Buffers;
|
|
using Server.Items;
|
|
using Server.Misc;
|
|
|
|
namespace Server.Network;
|
|
|
|
public static class IncomingMobilePackets
|
|
{
|
|
public static unsafe void Configure()
|
|
{
|
|
IncomingPackets.Register(0x75, 35, true, &RenameRequest);
|
|
IncomingPackets.Register(0x98, 0, true, &MobileNameRequest);
|
|
IncomingPackets.Register(0xB8, 0, true, &ProfileReq);
|
|
IncomingPackets.Register(0x6F, 0, true, &SecureTrade);
|
|
}
|
|
|
|
public static void RenameRequest(NetState state, SpanReader reader)
|
|
{
|
|
var from = state.Mobile;
|
|
var targ = World.FindMobile((Serial)reader.ReadUInt32());
|
|
|
|
if (targ != null)
|
|
{
|
|
RenameRequests.RenameRequest(from, targ, reader.ReadLatin1Safe());
|
|
}
|
|
}
|
|
|
|
public static void MobileNameRequest(NetState state, SpanReader reader)
|
|
{
|
|
var m = World.FindMobile((Serial)reader.ReadUInt32());
|
|
|
|
if (m != null && Utility.InUpdateRange(state.Mobile.Location, m.Location) && state.Mobile.CanSee(m))
|
|
{
|
|
state.SendMobileName(m);
|
|
}
|
|
}
|
|
|
|
public static void ProfileReq(NetState state, SpanReader reader)
|
|
{
|
|
int type = reader.ReadByte();
|
|
var serial = (Serial)reader.ReadUInt32();
|
|
|
|
var beholder = state.Mobile;
|
|
var beheld = World.FindMobile(serial);
|
|
|
|
if (beheld == null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
switch (type)
|
|
{
|
|
case 0x00: // display request
|
|
{
|
|
Profile.ProfileRequest(beholder, beheld);
|
|
|
|
break;
|
|
}
|
|
case 0x01: // edit request
|
|
{
|
|
reader.ReadInt16(); // Skip
|
|
int length = reader.ReadUInt16();
|
|
|
|
if (length > 511)
|
|
{
|
|
return;
|
|
}
|
|
|
|
var text = reader.ReadBigUni(length);
|
|
|
|
Profile.ChangeProfileRequest(beholder, beheld, text);
|
|
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
public static void SecureTrade(NetState state, SpanReader reader)
|
|
{
|
|
switch (reader.ReadByte())
|
|
{
|
|
case 1: // Cancel
|
|
{
|
|
var serial = (Serial)reader.ReadUInt32();
|
|
|
|
if (World.FindItem(serial) is SecureTradeContainer cont && cont.Trade != null &&
|
|
(cont.Trade.From.Mobile == state.Mobile || cont.Trade.To.Mobile == state.Mobile))
|
|
{
|
|
cont.Trade.Cancel();
|
|
}
|
|
|
|
break;
|
|
}
|
|
case 2: // Check
|
|
{
|
|
var serial = (Serial)reader.ReadUInt32();
|
|
|
|
if (World.FindItem(serial) is SecureTradeContainer cont)
|
|
{
|
|
var trade = cont.Trade;
|
|
|
|
var value = reader.ReadInt32() != 0;
|
|
|
|
if (trade != null)
|
|
{
|
|
if (trade.From.Mobile == state.Mobile)
|
|
{
|
|
trade.From.Accepted = value;
|
|
trade.Update();
|
|
}
|
|
else if (trade.To.Mobile == state.Mobile)
|
|
{
|
|
trade.To.Accepted = value;
|
|
trade.Update();
|
|
}
|
|
}
|
|
}
|
|
|
|
break;
|
|
}
|
|
case 3: // Update Gold
|
|
{
|
|
var serial = (Serial)reader.ReadUInt32();
|
|
|
|
if (World.FindItem(serial) is SecureTradeContainer cont)
|
|
{
|
|
var gold = reader.ReadInt32();
|
|
var plat = reader.ReadInt32();
|
|
|
|
var trade = cont.Trade;
|
|
|
|
if (trade != null)
|
|
{
|
|
if (trade.From.Mobile == state.Mobile)
|
|
{
|
|
trade.From.Gold = gold;
|
|
trade.From.Plat = plat;
|
|
trade.UpdateFromCurrency();
|
|
}
|
|
else if (trade.To.Mobile == state.Mobile)
|
|
{
|
|
trade.To.Gold = gold;
|
|
trade.To.Plat = plat;
|
|
trade.UpdateToCurrency();
|
|
}
|
|
|
|
cont.ClearChecks();
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|