Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ num-traits = "0.2.19"
serde = "1.0.228"
thiserror = "2.0.17"
url = "2.5.7"
quick-xml = "0.37.5"
quick-xml = { git = "https://github.com/SuchAFuriousDeath/quick-xml", branch = "unclosed-xml-decl-pi-split" }
regress = { git = "https://github.com/ruffle-rs/regras3", rev = "5fcb02513c5ab4e00df4346459f5a8d0521d8fed" }
# Make sure to match wasm-bindgen-cli version to this everywhere.
wasm-bindgen = "=0.2.101"
Expand Down
6 changes: 3 additions & 3 deletions core/src/avm2/e4x.rs
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ impl<'gc> E4XNode<'gc> {
push_childless_node(node, &mut open_tags, &mut top_level, activation);
}
// These are completely ignored by AVM2
Event::Decl(_) | Event::DocType(_) => {}
Event::Decl(_) | Event::DocType(_) | Event::GeneralRef(_) => {}
Event::Eof => break,
}
}
Expand Down Expand Up @@ -923,7 +923,7 @@ impl<'gc> E4XNode<'gc> {
.map_err(|e| make_xml_error(activation, e))?;
let value = AvmString::new_utf8_bytes(activation.gc(), value_str.as_bytes());

let (ns, local_name) = parser.resolve_attribute(attribute.key);
let (ns, local_name) = parser.resolver().resolve_attribute(attribute.key);

let local_name = ruffle_wstr::from_utf8_bytes(local_name.into_inner());
let name = activation.strings().intern_wstr(local_name).into();
Expand Down Expand Up @@ -972,7 +972,7 @@ impl<'gc> E4XNode<'gc> {
attribute_nodes.push(attribute);
}

let (ns, local_name) = parser.resolve_element(bs.name());
let (ns, local_name) = parser.resolver().resolve_attribute(bs.name());

let local_name = ruffle_wstr::from_utf8_bytes(local_name.into_inner());
let name = activation.strings().intern_wstr(local_name).into();
Expand Down
7 changes: 6 additions & 1 deletion core/src/avm2/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,16 @@ pub fn make_xml_error<'gc>(activation: &mut Activation<'_, 'gc>, err: XmlError)
"Error #1094: XML parser failure: Unterminated comment.",
1094,
),
XmlSyntaxError::UnclosedPIOrXmlDecl => type_error(
XmlSyntaxError::UnclosedPI => type_error(
activation,
"Error #1097: XML parser failure: Unterminated processing instruction.",
1097,
),
XmlSyntaxError::UnclosedXmlDecl => type_error(
activation,
"Error #1092: XML parser failure: Unterminated XML declaration.",
1092,
),
_ => type_error(
activation,
"Error #1090: XML parser failure: element is malformed.",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
num_ticks = 1
known_failure = true
Loading