## 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
123 lines
3.6 KiB
C#
123 lines
3.6 KiB
C#
/*************************************************************************
|
|
* ModernUO *
|
|
* Copyright 2019-2023 - ModernUO Development Team *
|
|
* Email: hi@modernuo.com *
|
|
* File: OutgoingEquipmentPackets.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;
|
|
using System.Buffers;
|
|
using System.Collections.Generic;
|
|
|
|
namespace Server.Network;
|
|
|
|
public class EquipInfoAttribute
|
|
{
|
|
public EquipInfoAttribute(int number, int charges = -1)
|
|
{
|
|
Number = number;
|
|
Charges = charges;
|
|
}
|
|
|
|
public int Number { get; }
|
|
|
|
public int Charges { get; }
|
|
}
|
|
|
|
public static class OutgoingEquipmentPackets
|
|
{
|
|
public static void SendDisplayEquipmentInfo(
|
|
this NetState ns,
|
|
Serial serial, int number, string crafterName, bool unidentified, List<EquipInfoAttribute> attrs
|
|
)
|
|
{
|
|
if (ns.CannotSendPackets())
|
|
{
|
|
return;
|
|
}
|
|
|
|
crafterName = crafterName.DefaultIfNullOrEmpty("");
|
|
|
|
var length = 17 +
|
|
(crafterName.Length > 0 ? 6 + crafterName.Length : 0) +
|
|
(unidentified ? 4 : 0) +
|
|
attrs.Count * 6;
|
|
|
|
var writer = new SpanWriter(stackalloc byte[length]);
|
|
writer.Write((byte)0xBF); // Packet ID
|
|
writer.Write((ushort)length);
|
|
writer.Write((ushort)0x10); // Subpacket
|
|
writer.Write(serial);
|
|
writer.Write(number);
|
|
|
|
if (crafterName.Length > 0)
|
|
{
|
|
writer.Write(-3); // crafted by
|
|
|
|
writer.Write((ushort)crafterName.Length);
|
|
writer.WriteLatin1(crafterName);
|
|
}
|
|
|
|
if (unidentified)
|
|
{
|
|
writer.Write(-4);
|
|
}
|
|
|
|
for (var i = 0; i < attrs.Count; ++i)
|
|
{
|
|
var attr = attrs[i];
|
|
writer.Write(attr.Number);
|
|
writer.Write((short)attr.Charges);
|
|
}
|
|
|
|
writer.Write(-1);
|
|
|
|
ns.Send(writer.Span);
|
|
}
|
|
|
|
public static void SendEquipUpdate(this NetState ns, Item item)
|
|
{
|
|
if (ns.CannotSendPackets())
|
|
{
|
|
return;
|
|
}
|
|
|
|
Serial parentSerial;
|
|
|
|
var parent = item.Parent as Mobile;
|
|
var hue = item.Hue;
|
|
|
|
if (parent != null)
|
|
{
|
|
parentSerial = parent.Serial;
|
|
|
|
if (parent.SolidHueOverride >= 0)
|
|
{
|
|
hue = parent.SolidHueOverride;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
Console.WriteLine("Warning: EquipUpdate on item with !(parent is Mobile)");
|
|
parentSerial = Serial.Zero;
|
|
}
|
|
|
|
var writer = new SpanWriter(stackalloc byte[15]);
|
|
writer.Write((byte)0x2E); // Packet ID
|
|
writer.Write(item.Serial);
|
|
writer.Write((short)item.ItemID);
|
|
writer.Write((ushort)item.Layer);
|
|
writer.Write(parentSerial);
|
|
writer.Write((short)hue);
|
|
|
|
ns.Send(writer.Span);
|
|
}
|
|
}
|