fix(chat): CH2 rework — SpewBox tick-driven visibility + binary-derived error table
Reworks Campaign CH slice CH2 per the REJECT-review findings doc (docs/research/2026-08-09-ch2-review-findings.md). BLOCKER 1 — SpewBoxController never rendered a line and leaked its pending queue. LinesProvider only ran through UiText.OnDraw, which gates on Visible — and the box started invisible, so the provider (the sole caller of SpewBoxState.Tick) never ran. Gave the controller an explicit per-frame Tick(now) driven by UiRoot's global-message-3 broadcast (a zero-size GlobalTimeSink child, the same pattern VendorUiController.DragOverGlobalTimeSink already uses), matching retail's gmSpewBoxUI::Update. LinesProvider now only returns the cache. Tests rewritten to drive root.Tick(...) instead of calling the provider directly, plus new coverage for visibility-without-a-draw, queue-drain-without-a-draw, and bounded-queue-across-many-ticks. BLOCKER 2 — re-derived the HandleFailureEvent routing table from the PDB-paired binary instead of the pseudo-C's ~33-char string previews. tools/pdb-extract/sweep_weenie_strings.py sweeps every push imm32 in VA 0x571990-0x575480, dereferences into .rdata/.data, and decodes the full UTF-16LE literal. Added the 5 ids dispatched via else-if (missed by case-label enumeration), resolved 0x4F8 (previously excluded), fixed 18 wrong strings (16 the review flagged + 2 more — 0x4E9 and 0x518 — an automated diff between every swept literal and the landed table found). Every changed row cross-checked against ACE's WeenieError/WeenieErrorWithString enum doc comments; both oracles agreed on every row, including a case where the review's own proposed text for the new 0x4E8 row was itself wrong (it was 0x4E9's text) — corrected via the else-if block's own instruction address plus the ACE cross-check. Pinned table count: 344 (338 + 5 + 0x4F8). SHOULD-FIX 1 — RuntimeCommunicationState.ResetSpewBox was dead code; folded into the ChatIdentity generation-reset stage (same lifetime boundary), with a reset assertion added to the existing populated-reset test. SHOULD-FIX 2 — AddText trimmed only the trailing end and invented an empty-string early return; retail's AddTextToScroll trims both ends (trim(&str, 1, 1, ws)) and has no empty guard. Both retired. SHOULD-FIX 3 — ShowWeenieError bypassed the AddText chokepoint via ChatLog.OnWeenieError (hardcoded LogTextType 0x00); routed through Communication.AddText(Resolve(code, param)) instead, and ChatLog.OnWeenieError is deleted — GameEventWiring's legacy no-router fallback now resolves + calls OnSystemMessage directly. SHOULD-FIX 4 — retail's HandleFailureEvent switch has no default case; an unmapped id now resolves to a null Text (silence toward the player) instead of the invented "WeenieError 0xNNNN" hex fallback, with a diagnostics-only console log line for the id. NITs — AP-TBD placeholders corrected to their real register rows (AP-178, not the unrelated AP-177 lifetime row); filed AP-180 for the windowId dual-destination gap and corrected three stale "lands with CH2" comments; extended SpewBoxLayoutDumpDiagnostic from dats.Portal to dats.Local and found the SpewBox element for real — LayoutDesc 0x21000011, element 0x10000048, size 450x72, MaxConcurrentItems (ListBox property 0x10000028) = 4, not retail's code default of 1. AP-178 narrowed accordingly; SpewBoxState.MaxConcurrentItems and SpewBoxController's extent/anchor/OneLine are now authored rather than placeholder (absolute screen position and colour remain open); fixed the "19 ids... lists 18" miscount by retiring the stale paragraph in the class doc rewrite; aligned the UseDone handler's silent-status check with the other two WeenieError handlers. Full Release suite: 11,914 passed / 4 skipped / 0 failed (build 0 errors). Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
parent
b3ba4c6663
commit
e0e7888308
22 changed files with 1164 additions and 336 deletions
|
|
@ -704,11 +704,15 @@ public sealed class GameEventWiringTests
|
|||
// Phase I.5: 0x028A previously had a parser
|
||||
// (GameEvents.ParseWeenieError) but no dispatcher registration. The
|
||||
// server fires this for plain game-logic failures (e.g. "you can't
|
||||
// pick that up"). Now wired → ChatLog.OnWeenieError.
|
||||
// pick that up"). Now wired → WeenieErrorMessages.Resolve +
|
||||
// ChatLog.OnSystemMessage (the legacy no-router fallback;
|
||||
// REJECT-review rework SHOULD-FIX 3 deleted the dedicated
|
||||
// ChatLog.OnWeenieError chokepoint-bypass — see
|
||||
// docs/research/2026-08-09-ch2-review-findings.md).
|
||||
var (d, _, _, _, chat) = MakeAll();
|
||||
|
||||
byte[] payload = new byte[4];
|
||||
BinaryPrimitives.WriteUInt32LittleEndian(payload, 0x9C); // arbitrary error code
|
||||
BinaryPrimitives.WriteUInt32LittleEndian(payload, 0x04Au); // Ack! You killed yourself! (Default)
|
||||
|
||||
var env = GameEventEnvelope.TryParse(WrapEnvelope(GameEventType.WeenieError, payload));
|
||||
d.Dispatch(env!.Value);
|
||||
|
|
@ -716,8 +720,29 @@ public sealed class GameEventWiringTests
|
|||
Assert.Equal(1, chat.Count);
|
||||
var e = chat.Snapshot()[0];
|
||||
Assert.Equal(ChatKind.System, e.Kind);
|
||||
Assert.Equal(0x9Cu, e.ChannelId);
|
||||
Assert.Contains("0x009C", e.Text);
|
||||
Assert.Equal("Ack! You killed yourself!", e.Text);
|
||||
Assert.Equal(0x00u, e.LogTextType);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void WireAll_WeenieError_UnmappedCode_DoesNotReachChat()
|
||||
{
|
||||
// REJECT-review rework (SHOULD-FIX 4,
|
||||
// docs/research/2026-08-09-ch2-review-findings.md): retail's
|
||||
// HandleFailureEvent switch has no default case — an id it does not
|
||||
// recognize produces NO text at all, silently, toward the player.
|
||||
// The prior "WeenieError 0xNNNN" hex-fallback framing this test
|
||||
// used to pin was acdream's own invention with no retail
|
||||
// counterpart — an unregistered divergence, now retired.
|
||||
var (d, _, _, _, chat) = MakeAll();
|
||||
|
||||
byte[] payload = new byte[4];
|
||||
BinaryPrimitives.WriteUInt32LittleEndian(payload, 0x9C); // arbitrary unmapped error code
|
||||
|
||||
var env = GameEventEnvelope.TryParse(WrapEnvelope(GameEventType.WeenieError, payload));
|
||||
d.Dispatch(env!.Value);
|
||||
|
||||
Assert.Equal(0, chat.Count);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
|
|
@ -739,8 +764,29 @@ public sealed class GameEventWiringTests
|
|||
public void WireAll_WeenieErrorWithString_RoutesToChatLogWithInterpolation()
|
||||
{
|
||||
// Phase I.5: 0x028B carries an interpolated substring (e.g. the
|
||||
// target's name in "you can't pick up the {Mana Stone}"). Now
|
||||
// wired → ChatLog.OnWeenieError with the param.
|
||||
// target's name). Now wired → WeenieErrorMessages.Resolve +
|
||||
// ChatLog.OnSystemMessage (the legacy no-router fallback).
|
||||
var (d, _, _, _, chat) = MakeAll();
|
||||
|
||||
byte[] interpBytes = MakeString16L("Caith");
|
||||
byte[] payload = new byte[4 + interpBytes.Length];
|
||||
BinaryPrimitives.WriteUInt32LittleEndian(payload, 0x0521u); // "%s has been added to the list of people you can hear."
|
||||
Array.Copy(interpBytes, 0, payload, 4, interpBytes.Length);
|
||||
|
||||
var env = GameEventEnvelope.TryParse(WrapEnvelope(GameEventType.WeenieErrorWithString, payload));
|
||||
d.Dispatch(env!.Value);
|
||||
|
||||
Assert.Equal(1, chat.Count);
|
||||
var e = chat.Snapshot()[0];
|
||||
Assert.Equal(ChatKind.System, e.Kind);
|
||||
Assert.Equal("Caith has been added to the list of people you can hear.", e.Text);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void WireAll_WeenieErrorWithString_UnmappedCode_DoesNotReachChat()
|
||||
{
|
||||
// REJECT-review rework (SHOULD-FIX 4): same retail-faithful silence
|
||||
// as the plain WeenieError case above.
|
||||
var (d, _, _, _, chat) = MakeAll();
|
||||
|
||||
byte[] interpBytes = MakeString16L("Mana Stone");
|
||||
|
|
@ -751,11 +797,7 @@ public sealed class GameEventWiringTests
|
|||
var env = GameEventEnvelope.TryParse(WrapEnvelope(GameEventType.WeenieErrorWithString, payload));
|
||||
d.Dispatch(env!.Value);
|
||||
|
||||
Assert.Equal(1, chat.Count);
|
||||
var e = chat.Snapshot()[0];
|
||||
Assert.Equal(ChatKind.System, e.Kind);
|
||||
Assert.Equal(0x42u, e.ChannelId);
|
||||
Assert.Contains("Mana Stone", e.Text);
|
||||
Assert.Equal(0, chat.Count);
|
||||
}
|
||||
|
||||
// ── Campaign CH slice CH2: onInterfaceText routing ───────────────────
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue