Merge pull request #31 from dmcgowan/windows-strip-features

estesp · web-flow · commit 3a284c1f5921 · 2026-03-31T10:42:33.000+02:00
Strip the win32k when comparing windows platforms
diff --git a/platform_windows_compat.go b/platform_windows_compat.go
@@ -17,6 +17,7 @@
 package platforms
 
 import (
+	"slices"
 	"strconv"
 	"strings"
 
@@ -162,3 +163,14 @@ func (c *windowsMatchComparer) Less(p1, p2 specs.Platform) bool {
 	}
 	return m1 && !m2
 }
+
+type windowsStripFeaturesMatcher struct {
+	Matcher
+}
+
+func (m windowsStripFeaturesMatcher) Match(p specs.Platform) bool {
+	if i := slices.Index(p.OSFeatures, "win32k"); i >= 0 {
+		p.OSFeatures = slices.Delete(slices.Clone(p.OSFeatures), i, i+1)
+	}
+	return m.Matcher.Match(p)
+}
diff --git a/platforms.go b/platforms.go
@@ -156,6 +156,11 @@ func NewMatcher(platform specs.Platform) Matcher {
 		m.osvM = &windowsVersionMatcher{
 			windowsOSVersion: getWindowsOSVersion(platform.OSVersion),
 		}
+
+		// In prior versions, the win32k os feature was not considered for matching,
+		// strip out the win32k feature for comparison
+		var stripped Matcher = windowsStripFeaturesMatcher{m}
+
 		// In prior versions, on windows, the returned matcher implements a
 		// MatchComprarer interface.
 		// This preserves that behavior for backwards compatibility.
@@ -165,8 +170,9 @@ func NewMatcher(platform specs.Platform) Matcher {
 		// It was likely intended to be used in `Ordered` but it is not since
 		// `Less` that is implemented here ends up getting masked due to wrapping.
 		if runtime.GOOS == "windows" {
-			return &windowsMatchComparer{m}
+			return &windowsMatchComparer{stripped}
 		}
+		return stripped
 	}
 	return m
 }

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,11 @@ func NewMatcher(platform specs.Platform) Matcher {`
`156`	`156`	`m.osvM = &windowsVersionMatcher{`
`157`	`157`	`windowsOSVersion: getWindowsOSVersion(platform.OSVersion),`
`158`	`158`	`}`
	`159`	`+`
	`160`	`+ // In prior versions, the win32k os feature was not considered for matching,`
	`161`	`+ // strip out the win32k feature for comparison`
	`162`	`+ var stripped Matcher = windowsStripFeaturesMatcher{m}`
	`163`	`+`
`159`	`164`	`// In prior versions, on windows, the returned matcher implements a`
`160`	`165`	`// MatchComprarer interface.`
`161`	`166`	`// This preserves that behavior for backwards compatibility.`
`@@ -165,8 +170,9 @@ func NewMatcher(platform specs.Platform) Matcher {`
`165`	`170`	// It was likely intended to be used in `Ordered` but it is not since
`166`	`171`	// `Less` that is implemented here ends up getting masked due to wrapping.
`167`	`172`	`if runtime.GOOS == "windows" {`
`168`		`- return &windowsMatchComparer{m}`
	`173`	`+ return &windowsMatchComparer{stripped}`
`169`	`174`	`}`
	`175`	`+ return stripped`
`170`	`176`	`}`
`171`	`177`	`return m`
`172`	`178`	`}`