From 90b1d4722c37d325e987e13e5f5da6c3b21ad5ba Mon Sep 17 00:00:00 2001 From: Adrian Wielgosik Date: Sun, 20 Feb 2022 13:16:24 +0100 Subject: [PATCH] avm2: Add ContextMenuItem stub --- core/src/avm2/globals.rs | 6 +++ core/src/avm2/globals/flash/display.rs | 1 + .../globals/flash/display/nativemenuitem.rs | 46 ++++++++++++++++++ core/src/avm2/globals/flash/ui.rs | 1 + .../avm2/globals/flash/ui/contextmenuitem.rs | 48 +++++++++++++++++++ 5 files changed, 102 insertions(+) create mode 100644 core/src/avm2/globals/flash/display/nativemenuitem.rs create mode 100644 core/src/avm2/globals/flash/ui/contextmenuitem.rs diff --git a/core/src/avm2/globals.rs b/core/src/avm2/globals.rs index 82b8c7b12..bd1a69ca0 100644 --- a/core/src/avm2/globals.rs +++ b/core/src/avm2/globals.rs @@ -817,6 +817,11 @@ pub fn load_player_globals<'gc>( flash::display::nativemenu::create_class(mc), script ); + class( + activation, + flash::display::nativemenuitem::create_class(mc), + script + )?; // package `flash.geom` class(activation, flash::geom::matrix::create_class(mc), script)?; @@ -866,6 +871,7 @@ pub fn load_player_globals<'gc>( flash::ui::contextmenu::create_class(mc), script ); + class(activation, flash::ui::contextmenuitem::create_class(mc), script)?; class(activation, flash::ui::mouse::create_class(mc), script)?; class(activation, flash::ui::keyboard::create_class(mc), script)?; diff --git a/core/src/avm2/globals/flash/display.rs b/core/src/avm2/globals/flash/display.rs index abaf6ec64..63294edf6 100644 --- a/core/src/avm2/globals/flash/display.rs +++ b/core/src/avm2/globals/flash/display.rs @@ -16,6 +16,7 @@ pub mod loader; pub mod loaderinfo; pub mod movieclip; pub mod nativemenu; +pub mod nativemenuitem; pub mod pixelsnapping; pub mod scene; pub mod shape; diff --git a/core/src/avm2/globals/flash/display/nativemenuitem.rs b/core/src/avm2/globals/flash/display/nativemenuitem.rs new file mode 100644 index 000000000..ba1dc7afd --- /dev/null +++ b/core/src/avm2/globals/flash/display/nativemenuitem.rs @@ -0,0 +1,46 @@ +//! `flash.display.NativeMenuItem` builtin/prototype + +use crate::avm2::activation::Activation; +use crate::avm2::class::{Class, ClassAttributes}; +use crate::avm2::method::Method; +use crate::avm2::names::{Namespace, QName}; +use crate::avm2::object::Object; +use crate::avm2::value::Value; +use crate::avm2::Error; +use gc_arena::{GcCell, MutationContext}; + +fn instance_init<'gc>( + activation: &mut Activation<'_, 'gc, '_>, + this: Option>, + _args: &[Value<'gc>], +) -> Result, Error> { + if let Some(this) = this { + activation.super_init(this, &[])?; + } + + Ok(Value::Undefined) +} + +fn class_init<'gc>( + _activation: &mut Activation<'_, 'gc, '_>, + _this: Option>, + _args: &[Value<'gc>], +) -> Result, Error> { + Ok(Value::Undefined) +} + +/// Construct `NativeMenuItem`'s class. +pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> { + let class = Class::new( + QName::new(Namespace::package("flash.display"), "NativeMenuItem"), + Some(QName::new(Namespace::package("flash.events"), "EventDispatcher").into()), + Method::from_builtin(instance_init, "", mc), + Method::from_builtin(class_init, "", mc), + mc, + ); + + let mut write = class.write(mc); + write.set_attributes(ClassAttributes::SEALED); + + class +} diff --git a/core/src/avm2/globals/flash/ui.rs b/core/src/avm2/globals/flash/ui.rs index affa1dffc..d68b42e5a 100644 --- a/core/src/avm2/globals/flash/ui.rs +++ b/core/src/avm2/globals/flash/ui.rs @@ -1,5 +1,6 @@ //! `flash.ui` namespace pub mod contextmenu; +pub mod contextmenuitem; pub mod keyboard; pub mod mouse; diff --git a/core/src/avm2/globals/flash/ui/contextmenuitem.rs b/core/src/avm2/globals/flash/ui/contextmenuitem.rs new file mode 100644 index 000000000..3c9796139 --- /dev/null +++ b/core/src/avm2/globals/flash/ui/contextmenuitem.rs @@ -0,0 +1,48 @@ +//! `flash.ui.ContextMenuItem` builtin/prototype + +use crate::avm2::activation::Activation; +use crate::avm2::class::{Class, ClassAttributes}; +use crate::avm2::method::Method; +use crate::avm2::names::{Namespace, QName}; +use crate::avm2::object::Object; +use crate::avm2::value::Value; +use crate::avm2::Error; +use gc_arena::{GcCell, MutationContext}; + +fn instance_init<'gc>( + activation: &mut Activation<'_, 'gc, '_>, + this: Option>, + _args: &[Value<'gc>], +) -> Result, Error> { + if let Some(this) = this { + log::warn!("flash.ui.ContextMenuItem is a stub"); + activation.super_init(this, &[])?; + } + + Ok(Value::Undefined) +} + +fn class_init<'gc>( + _activation: &mut Activation<'_, 'gc, '_>, + _this: Option>, + _args: &[Value<'gc>], +) -> Result, Error> { + Ok(Value::Undefined) +} + +/// Construct `ContextMenuItem`'s class. +pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> { + let class = Class::new( + QName::new(Namespace::package("flash.ui"), "ContextMenuItem"), + Some(QName::new(Namespace::package("flash.display"), "NativeMenuItem").into()), + Method::from_builtin(instance_init, "", mc), + Method::from_builtin(class_init, "", mc), + mc, + ); + + let mut write = class.write(mc); + + write.set_attributes(ClassAttributes::SEALED | ClassAttributes::FINAL); + + class +}