From 8a787e61538a80afefddaaf4049fb39b65b2bc30 Mon Sep 17 00:00:00 2001
From: David Wendt <dcrkid@yahoo.com>
Date: Wed, 9 Dec 2020 18:50:10 -0500
Subject: [PATCH] avm2: Implement `Event.toString` (which matches it's valueof
 behavior)

---
 core/src/avm2/globals/flash/events/event.rs    |  17 +++++++++++++++++
 .../swfs/avm2/event_valueof_tostring/Test.as   |  14 ++++++++++++++
 .../avm2/event_valueof_tostring/output.txt     |  10 ++++++++++
 .../swfs/avm2/event_valueof_tostring/test.swf  | Bin 721 -> 837 bytes
 4 files changed, 41 insertions(+)

diff --git a/core/src/avm2/globals/flash/events/event.rs b/core/src/avm2/globals/flash/events/event.rs
index fbadff6bc..0a0471b66 100644
--- a/core/src/avm2/globals/flash/events/event.rs
+++ b/core/src/avm2/globals/flash/events/event.rs
@@ -243,6 +243,19 @@ pub fn stop_immediate_propagation<'gc>(
     Ok(Value::Undefined)
 }
 
+/// Implements `toString`
+pub fn to_string<'gc>(
+    activation: &mut Activation<'_, 'gc, '_>,
+    this: Option<Object<'gc>>,
+    _args: &[Value<'gc>],
+) -> Result<Value<'gc>, Error> {
+    if let Some(this) = this {
+        return this.value_of(activation.context.gc_context);
+    }
+
+    Ok(Value::Undefined)
+}
+
 /// Construct `Event`'s class.
 pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
     let class = Class::new(
@@ -303,6 +316,10 @@ pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>
         QName::new(Namespace::public_namespace(), "stopImmediatePropagation"),
         Method::from_builtin(stop_immediate_propagation),
     ));
+    write.define_instance_trait(Trait::from_method(
+        QName::new(Namespace::public_namespace(), "toString"),
+        Method::from_builtin(to_string),
+    ));
 
     class
 }
diff --git a/core/tests/swfs/avm2/event_valueof_tostring/Test.as b/core/tests/swfs/avm2/event_valueof_tostring/Test.as
index 5d0b67b14..02a6b801f 100644
--- a/core/tests/swfs/avm2/event_valueof_tostring/Test.as
+++ b/core/tests/swfs/avm2/event_valueof_tostring/Test.as
@@ -5,12 +5,26 @@
 
 import flash.events.Event;
 
+trace("//e = new Event(\"test_event\");");
 var e = new Event("test_event");
 
+trace("//e.toString()");
+trace(e.toString());
+
+trace("//Object.prototype.valueOf.call(e)");
 trace(Object.prototype.valueOf.call(e));
+
+trace("//Object.prototype.toString.call(e)");
 trace(Object.prototype.toString.call(e));
 
+trace("//e = new Event(\"test_event\", true, true);");
 e = new Event("test_event", true, true);
 
+trace("//e.toString()");
+trace(e.toString());
+
+trace("//Object.prototype.valueOf.call(e)");
 trace(Object.prototype.valueOf.call(e));
+
+trace("//Object.prototype.toString.call(e)");
 trace(Object.prototype.toString.call(e));
\ No newline at end of file
diff --git a/core/tests/swfs/avm2/event_valueof_tostring/output.txt b/core/tests/swfs/avm2/event_valueof_tostring/output.txt
index fb268c343..bb1808b2a 100644
--- a/core/tests/swfs/avm2/event_valueof_tostring/output.txt
+++ b/core/tests/swfs/avm2/event_valueof_tostring/output.txt
@@ -1,4 +1,14 @@
+//e = new Event("test_event");
+//e.toString()
 [Event type="test_event" bubbles=false cancelable=false eventPhase=2]
+//Object.prototype.valueOf.call(e)
+[Event type="test_event" bubbles=false cancelable=false eventPhase=2]
+//Object.prototype.toString.call(e)
 [object Event]
+//e = new Event("test_event", true, true);
+//e.toString()
 [Event type="test_event" bubbles=true cancelable=true eventPhase=2]
+//Object.prototype.valueOf.call(e)
+[Event type="test_event" bubbles=true cancelable=true eventPhase=2]
+//Object.prototype.toString.call(e)
 [object Event]
diff --git a/core/tests/swfs/avm2/event_valueof_tostring/test.swf b/core/tests/swfs/avm2/event_valueof_tostring/test.swf
index 5113bb582c9d85bc0df721222e42a6e8abc22447..92c3d13da5b1d624651c62ad8b2eb125c65f3405 100644
GIT binary patch
literal 837
zcmV-L1G@Y}S5qsA1pokeoSjo$Zrer>-d+AINy(CBTe9L*wqh%;)fgn@6h&d7XcIZE
z?I!Sp5+DU6ShTc^XwalUu9W7rC+SUc1@)nCJ%oG$cUF{K1$A1W1i3r=eKYe7XUJcW
za)D6xH-w599pyBHP=nmw-acPPXlr@+pi-;6dr`4#?Agi7@ax9UR|i)=z3IPs$xfcv
z(8qiV{4r{FS-{FQgg&n6iU8nRMyA-lMEYwMb4x6bIV=~h?;O5zyx_HW&3rFl)*b3b
z&NZt&`46u}R2FH~^UEvN<=WgMz38z7K-@QbUOe!f5BjTc<gteD4f6NqQ<D-5k=AtL
z%F}N#Yn&do8exyMqM_^htkn%8))LWiD}L|BEoXFn&|)JN@Qab-4_WA5@G$0)7rd+2
zXNeRZIbF7CS*-kBIbiS0FNFWz_Oys;>~^)DPD-5~V`b`L{Oyo|V3UW<Y2v-AHa8#j
zIUgKameUI_nb{4mt!K@r)`4w*V_gnCpL@Z!WhEUl2T{mF{$aq(X{G0`*>!w>k5%<M
zhRzsSFgy1|&UNRZU;W!l?U#8pWXW2sm*zb;7khp<n|sFT^^S$r>_*;z?|jC2@syn^
z9>HuK-tDt!=_na<QgrS#;0*fCy%9^0!Y6zq3^*iXk=h(Y9%uFcKj@ZGz(u7%3wklN
zPL-v?incCejH!gFo~Kx$Sf!FiWrM0|N;A5GDPGnyglemLL8AD9z9H!k!PuhOBPwrG
zd56jsDnF*l??h0ti${V-PHcjSPQZ|4O+gA)uplHv2*F^e;s;c*1eH*PVVB1Cj}V8k
ztQcc^e2Q+elPy4qLa_8F9@}sxZQ3DrhrC6lK8CZ_*7kGf8lLEFy>0BTof+6sCn-Sl
z0!_EIj(VIz!p;C#6h;<6;-=jtpfXq>IiS7}#>$LJ-BD{mm4uN`1a^1N3<)IG=Mu#Q
ziH*6$!+%JW<`SEqNE~bU*FSzgfwo|*8%YPCAx0_-ue&*s+V~8k>O=-ukpM1C8`I9-
zlqa}?#;$UnB@+UyN+7|LvCWX^&$8Xg*_{=;vubzN?2ZigTU<)6zI3xYDMHBis~fYK
P-TN`4AAtD_McRN}v}dG5

literal 721
zcmV;?0xtbSS5qs91ONbdoSjnJPTN2b-C1AOb_hv;gg~1DZHiP;B?hFn3J<*mXcGzL
zAyI{@MA#(j#+747_9iV=pZX>J6Mi9m=zo|mpzAmwP^l_)<=vS*GiQ8uG+&T(f>7!Q
zLU};@83iF!#g~_tZ<Y~SOOIBH+eIrV9{Bo)v0Z=up4#>D@z++fcHG+6(Rnt(^8q!x
z)TQg&2%Rq}Vg&G&My1F+L~4r$tQ;MW89z=e$E+Ngw%f7?)UjP!zD6zI9MJ8pe`MW6
z#i*>@IQ>MsOu5RKyP1*XK+rGs>|p4aXX=qRwrSO|huJ&p$*}}2DqAvx;_eHe)mo)p
z^?J1Jk1Wff?XKt3cEk?a!DlOIo8!Swn~tf=PR6D)qMmiayny+(`*Ck?R%k9(G0h63
zgUD!80aHX`zS*Vf(D#_f&W4ms>oly5K4Zg5xoq~lQ(EeJgYxU<Zh1%7pOsHXw!>^!
z?3#|FFt0iNUE%6YrJHZ6%=$WS_Iihr*X;WCkUjcK^37Xns&t?C&Sc#_^^^N?8{>v&
zYA&N(IkU$!Msl~}RnKL-81?1m(6<@g`~OC^wH)N79LcHq#4?eRxwMiK0e}cV)GPss
zfJ_91h#HaS2$@$UQ0FmGG6WV0EU8&RT^7{5Kwy<9_lZ~_;sYYC5pkWw<BCyiqb=|)
z#y$qDV(ti{A|VMRhynt_7z20YXuxF<xDtYZTVbNV<vajU(kA+(hAvWJh9g+QAbgwX
z{E9ooz`B8tQK1j~u5^@+`gEbLf+>euM>DXMu;vW;FbNF}!o&=jzebWVVRN&t3Y?Pq
zgOa{QIn?0$ub=O@Y5-M>1#-PwBE{vbghB`EfS!aRhb4i-xvB0>>f&AqMKrObMhb_R
zM`g?lY)y2EBK>LI$mqs`ZY=7?l5U9nJBC8M`ohIVnCFz2i>tGi-Z^XN6_5M|5p6XX
D@lkN4