From 8644532ed7c7ffbf7b51a3c52ef583cfe0320a3b Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 00:05:09 -0500 Subject: [PATCH] fix(metafile): preserve viewport scaling before inferred target --- crates/metafile/src/tests.rs | 14 ++++++++++++++ crates/metafile/src/wmf.rs | 5 ++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/crates/metafile/src/tests.rs b/crates/metafile/src/tests.rs index 5befb8818..661f319d6 100644 --- a/crates/metafile/src/tests.rs +++ b/crates/metafile/src/tests.rs @@ -2744,3 +2744,17 @@ fn wmf_viewport_scaling_does_not_resize_the_player_frame() { assert_eq!(rect_extent(&p.items[0]), (0.0, 0.0, 100.0, 100.0)); } } + +#[test] +fn wmf_viewport_scaling_before_first_window_is_retained() { + let recs = [ + wrec(0x0103, &h16(8)), + wrec(0x0412, &cat(vec![h16(1), h16(1), h16(2), h16(1)])), + wrec(0x020C, &cat(vec![h16(100), h16(100)])), + wrec(0x041B, &cat(vec![h16(100), h16(100), h16(0), h16(0)])), + ]; + let p = parse(&wmf(&recs, None)).unwrap(); + assert_eq!((p.width, p.height), (100.0, 100.0)); + assert_eq!(p.skipped_records, 0); + assert_eq!(rect_extent(&p.items[0]), (0.0, 0.0, 50.0, 100.0)); +} diff --git a/crates/metafile/src/wmf.rs b/crates/metafile/src/wmf.rs index 3900de482..c93f823c6 100644 --- a/crates/metafile/src/wmf.rs +++ b/crates/metafile/src/wmf.rs @@ -64,7 +64,10 @@ pub(crate) fn parse(input: Bytes) -> Result<(Canvas, Option), Error> { if func == 0x020C && cv.window_set && player_target.is_none() && !cv.viewport_set { let we = cv.map.window_ext(); let target = (we.0.abs(), we.1.abs()); - cv.play_into(None, target); + // Before an explicit viewport, its default (1, 1) retains any + // SCALEVIEWPORTEXT factors already applied by the file. + let scale = cv.map.viewport_ext(); + cv.play_into(None, (target.0 * scale.0, target.1 * scale.1)); player_target = Some(target); } parsed += 1;