Skip to content

Align REG_MULTI_SZ input encoding with CPython #9604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 3 commits into from
Nov 5, 2026
Merged

Align REG_MULTI_SZ input encoding with CPython #9604

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6957101
Align REG_MULTI_SZ input encoding with CPython
youknowdot Nov 3, 2026
729c8a3
Remove unused winreg wide-string trait import
youknowdot Nov 3, 2026
98a6c86
Import Windows string conversion for registry names
youknowdot Nov 4, 2026
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
35 changes: 15 additions & 20 deletions crates/vm/src/stdlib/winreg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,34 +822,29 @@ mod winreg {
}
REG_MULTI_SZ => {
if vm.is_none(&value) {
// Empty list = double null terminator
return Ok(Some(vec![0u8, 0u8, 0u8, 0u8]));
return Ok(Some(vec![0u8, 0u8]));
}
let list = value
.downcast::<crate::builtins::PyList>()
.map_err(|_| vm.new_type_error("value must be a list of strings"))?;

let mut encoded = Vec::new();
for item in list.borrow_vec().iter() {
// The final vector is a list of NUL terminated strings. The list itself is
// NUL terminated as well. Unlike REG_SZ, interior NULs are forbidden because
// it would truncate the list.
// https://learn.microsoft.com/en-us/windows/win32/sysinfo/registry-value-types
let items = list.borrow_vec();
for item in items.iter() {
if !item.downcastable::<PyStr>() {
return Err(vm.new_type_error("list items must be strings"));
}
}
let mut encoded = Vec::<u8>::new();
for item in items.iter() {
let s = item
.downcast_ref::<PyStr>()
.ok_or_else(|| vm.new_type_error("list items must be strings"))?
.as_wtf8()
.to_wide_cstring()
.map(WideCString::into_vec_with_nul)
.map_err(|e| e.to_pyexception(vm))?;
encoded.extend(s);
.expect("all list items were checked above");
for unit in s.as_wtf8().encode_wide().chain([0u16]) {
encoded.extend_from_slice(&unit.to_le_bytes());
}
}
let bytes = encoded
.into_iter()
.flat_map(u16::to_le_bytes)
.chain(0u16.to_le_bytes())
.collect();
Ok(Some(bytes))
encoded.extend_from_slice(&0u16.to_le_bytes());
Ok(Some(encoded))
}
// REG_BINARY and other types
_ => {
Expand Down
Loading