From ef66e9258b4530d451f6a579b4ad68892c6d8f0c Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Tue, 14 Apr 2026 15:50:07 -0700 Subject: [PATCH 1/3] Add newer PS Adapters to pkg --- data.build.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data.build.json b/data.build.json index bd36e3f5d..ea3ada62e 100644 --- a/data.build.json +++ b/data.build.json @@ -22,6 +22,7 @@ "powershell.dsc.extension.json", "powershell.discover.ps1", "powershell.dsc.resource.json", + "PowerShell_adapter.dsc.resource.json", "psDscAdapter/", "psscript.ps1", "psscript.dsc.resource.json", @@ -51,6 +52,7 @@ "powershell.dsc.extension.json", "powershell.discover.ps1", "powershell.dsc.resource.json", + "PowerShell_adapter.dsc.resource.json", "psDscAdapter/", "psscript.ps1", "psscript.dsc.resource.json", @@ -83,6 +85,7 @@ "powershell.dsc.extension.json", "powershell.discover.ps1", "powershell.dsc.resource.json", + "PowerShell_adapter.dsc.resource.json", "psDscAdapter/", "psscript.ps1", "psscript.dsc.resource.json", @@ -99,6 +102,7 @@ "sshd-subsystem.dsc.resource.json", "sshd-subsystemList.dsc.resource.json", "windowspowershell.dsc.resource.json", + "WindowsPowerShell_adapter.dsc.resource.json", "windowsupdate.dsc.resource.json", "wu_dsc.exe", "windows_firewall.dsc.resource.json", From 3d341d3ca31f8ae5c383596237d02f2ad0941656 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Fri, 10 Apr 2026 07:50:35 -0700 Subject: [PATCH 2/3] Enhance variant use in firewall --- resources/windows_firewall/src/firewall.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/windows_firewall/src/firewall.rs b/resources/windows_firewall/src/firewall.rs index 8c570e550..0a8afcb84 100644 --- a/resources/windows_firewall/src/firewall.rs +++ b/resources/windows_firewall/src/firewall.rs @@ -21,6 +21,10 @@ impl SafeVariant { Self(VARIANT::default()) } + fn as_mut(&mut self) -> &mut VARIANT { + &mut self.0 + } + fn as_mut_ptr(&mut self) -> *mut VARIANT { &mut self.0 } @@ -33,7 +37,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)); } } } @@ -81,8 +85,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; } From 90a22c5bcf02bc7243e8f4b5bad8397cd6734268 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Fri, 10 Apr 2026 10:01:23 -0700 Subject: [PATCH 3/3] remove unused code --- resources/windows_firewall/src/firewall.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/resources/windows_firewall/src/firewall.rs b/resources/windows_firewall/src/firewall.rs index 0a8afcb84..468ca3284 100644 --- a/resources/windows_firewall/src/firewall.rs +++ b/resources/windows_firewall/src/firewall.rs @@ -25,10 +25,6 @@ impl SafeVariant { &mut self.0 } - fn as_mut_ptr(&mut self) -> *mut VARIANT { - &mut self.0 - } - fn as_ref(&self) -> &VARIANT { &self.0 }