avm2: Handle explicitly imported/used namespace for XML lookup

core/src/avm2/multiname.rs

@@ -23,6 +23,14 @@ pub enum NamespaceSet<'gc> {
 }
 
 impl<'gc> NamespaceSet<'gc> {
+    pub fn new(set: Vec<Namespace<'gc>>, mc: &Mutation<'gc>) -> Self {
+        if set.len() == 1 {
+            NamespaceSet::single(set[0])
+        } else {
+            NamespaceSet::multiple(set, mc)
+        }
+    }
+
     pub fn multiple(set: Vec<Namespace<'gc>>, mc: &Mutation<'gc>) -> Self {
         Self::Multiple(Gc::new(mc, set))
     }
@@ -469,6 +477,10 @@ impl<'gc> Multiname<'gc> {
         AvmString::new(mc, uri)
     }
 
+    pub fn set_ns(&mut self, ns: NamespaceSet<'gc>) {
+        self.ns = ns;
+    }
+
     pub fn set_single_namespace(&mut self, namespace: Namespace<'gc>) {
         self.ns = NamespaceSet::Single(namespace);
     }

core/src/avm2/object/xml_object.rs

@@ -4,6 +4,7 @@ use crate::avm2::activation::Activation;
 use crate::avm2::api_version::ApiVersion;
 use crate::avm2::e4x::{string_to_multiname, E4XNode, E4XNodeKind};
 use crate::avm2::error::make_error_1087;
+use crate::avm2::multiname::NamespaceSet;
 use crate::avm2::object::script_object::ScriptObjectData;
 use crate::avm2::object::{ClassObject, Object, ObjectPtr, TObject, XmlListObject};
 use crate::avm2::string::AvmString;
@@ -647,10 +648,24 @@ fn handle_input_multiname<'gc>(
         && !name.is_any_name()
         && !name.is_any_namespace()
     {
-        name.local_name()
+        if let Some(mut new_name) = name
+            .local_name()
             .map(|name| string_to_multiname(activation, name))
-            .unwrap_or(name)
-    } else {
-        name
+        {
+            // Copy the namespaces from the previous name,
+            // but make sure to definitely include the public namespace.
+            if !new_name.is_any_namespace() {
+                let mut ns = Vec::new();
+                ns.extend(name.namespace_set());
+                if !name.contains_public_namespace() {
+                    ns.push(activation.avm2().public_namespace_base_version);
+                }
+                new_name.set_ns(NamespaceSet::new(ns, activation.gc()));
+            }
+
+            return new_name;
+        }
     }
+
+    name
 }

tests/tests/swfs/avm2/xml_explicit_use_namespace/org/ruffle/namespaces/example.as

@@ -0,0 +1,4 @@
+package org.ruffle.namespaces
+{
+  public namespace example = "http://example.org/";
+}

tests/tests/swfs/avm2/xml_explicit_use_namespace/org/ruffle/test/Test.as

@@ -0,0 +1,17 @@
+package org.ruffle.test {
+    import flash.display.Sprite;
+
+    import org.ruffle.namespaces.*;
+
+    use namespace example;
+
+    public class Test extends Sprite {
+        public var xml: XML = <root xmlns="http://example.org/"><hello>world</hello></root>
+
+        public function Test() {
+            trace(xml.toXMLString());
+            trace("xml.hello: " + xml.hello);
+            trace('xml["hello"]: ' + xml["hello"]);
+        }
+    }
+}

tests/tests/swfs/avm2/xml_explicit_use_namespace/output.txt

@@ -0,0 +1,5 @@
+<root xmlns="http://example.org/">
+  <hello>world</hello>
+</root>
+xml.hello: world
+xml["hello"]: world

tests/tests/swfs/avm2/xml_explicit_use_namespace/test.toml

@@ -0,0 +1 @@
+num_frames = 1