Skip to content

Fix dism resources to work on Windows arm64 #1468

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 9, 2026
Merged

Fix dism resources to work on Windows arm64 #1468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c140616
Fix dism resources to work on Windows arm64
Apr 7, 2026
4dfc7e0
move build tools up above tree-sitter
Apr 7, 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
9 changes: 5 additions & 4 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,11 @@ process {
Install-Clippy -UseCFS:$UseCFS -Architecture $Architecture @VerboseParam
}

if (!$SkipBuild -and !$SkipLinkCheck -and $IsWindows) {
Write-BuildProgress @progressParams -Status "Ensuring Windows C++ build tools are available"
Install-WindowsCPlusPlusBuildTools @VerboseParam
}

if (-not ($SkipBuild -and $Test -and $ExcludeRustTests)) {
Write-BuildProgress @progressParams -Status 'Ensuring Protobuf is available'
Install-Protobuf @VerboseParam
Expand All @@ -212,10 +217,6 @@ process {
}
}

if (!$SkipBuild -and !$SkipLinkCheck -and $IsWindows) {
Write-BuildProgress @progressParams -Status "Ensuring Windows C++ build tools are available"
Install-WindowsCPlusPlusBuildTools @VerboseParam
}
#endregion Setup

if (!$SkipBuild) {
Expand Down
8 changes: 4 additions & 4 deletions resources/dism_dsc/src/dism.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ unsafe extern "system" {
) -> *mut c_void;
}

#[repr(C, packed(4))]
#[repr(C, packed)]
struct DismFeature {
feature_name: *const u16,
state: i32,
}

#[repr(C, packed(4))]
#[repr(C, packed)]
struct DismFeatureInfo {
feature_name: *const u16,
state: i32,
Expand All @@ -42,13 +42,13 @@ struct DismFeatureInfo {
custom_property_count: u32,
}

#[repr(C, packed(4))]
#[repr(C, packed)]
struct DismCapability {
name: *const u16,
state: i32,
}

#[repr(C, packed(4))]
#[repr(C, packed)]
struct DismCapabilityDetail {
name: *const u16,
state: i32,
Expand Down
Loading