Skip to content

Enhance variant use in firewall #1477

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
SteveL-MSFT merged 2 commits into from
Apr 10, 2026
+3 −4
Merged

Enhance variant use in firewall #1477

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b2ff8d
Enhance variant use in firewall
SteveL-MSFT Apr 10, 2026
9fff498
remove unused code
SteveL-MSFT Apr 10, 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
7 changes: 3 additions & 4 deletions resources/windows_firewall/src/firewall.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ impl SafeVariant {
Self(VARIANT::default())
}

fn as_mut_ptr(&mut self) -> *mut VARIANT {
fn as_mut(&mut self) -> &mut VARIANT {
&mut self.0
}

Expand All @@ -33,7 +33,7 @@ impl SafeVariant {
impl Drop for SafeVariant {
fn drop(&mut self) {
if let Err(e) = unsafe { VariantClear(&mut self.0) } {
crate::write_error(&format!("Warning: VariantClear failed with HRESULT: {:#010x}", e.code().0));
crate::write_error(&format!("Warning: VariantClear failed with HRESULT: {:#010x}", e.code().0 as u32));
}
}
}
Expand Down Expand Up @@ -81,8 +81,7 @@ impl FirewallStore {
loop {
let mut fetched = 0u32;
let mut safe_variant = SafeVariant::new();
let variant_slice = unsafe { std::slice::from_raw_parts_mut(safe_variant.as_mut_ptr(), 1) };
let hr = unsafe { enum_variant.Next(variant_slice, &mut fetched) };
let hr = unsafe { enum_variant.Next(std::slice::from_mut(safe_variant.as_mut()), &mut fetched) };
if hr == S_FALSE || fetched == 0 {
break;
}
Expand Down
Loading