Don't add retroactive conformances to GUID

Author: grynspan

Sources/Overlays/_Testing_WinSDK/Attachments/AttachableImageFormat+CLSID.swift

@@ -13,7 +13,7 @@ public import WinSDK
 
 extension AttachableImageFormat {
   private static let _encoderPathExtensionsByCLSID = Result {
-    var result = [GUID: [String]]()
+    var result = [CLSID.Wrapper: [String]]()
 
     // Create an imaging factory.
     let factory = try IWICImagingFactory.create()
@@ -66,7 +66,7 @@ extension AttachableImageFormat {
         continue
       }
       let extensions = _pathExtensions(for: info)
-      result[clsid] = extensions
+      result[CLSID.Wrapper(clsid)] = extensions
     }
 
     return result
@@ -133,7 +133,7 @@ extension AttachableImageFormat {
             0 == _wcsicmp(pathExtension, encoderExt)
           }
         }
-      }.map { $0.key }
+      }.map { $0.key.rawValue }
   }
 
   /// Get the `CLSID` value of the WIC image encoder corresponding to the same
@@ -169,13 +169,13 @@ extension AttachableImageFormat {
   static func appendPathExtension(for clsid: CLSID, to preferredName: String) -> String {
     // If there's already a CLSID associated with the filename, and it matches
     // the one passed to us, no changes are needed.
-    if let existingCLSID = computeEncoderCLSID(forPreferredName: preferredName), clsid == existingCLSID {
+    if let existingCLSID = computeEncoderCLSID(forPreferredName: preferredName), CLSID.Wrapper(clsid) == CLSID.Wrapper(existingCLSID) {
       return preferredName
     }
 
     // Find the preferred path extension for the encoder with the given CLSID.
     let encoderPathExtensionsByCLSID = (try? _encoderPathExtensionsByCLSID.get()) ?? [:]
-    if let ext = encoderPathExtensionsByCLSID[clsid]?.first {
+    if let ext = encoderPathExtensionsByCLSID[CLSID.Wrapper(clsid)]?.first {
       return "\(preferredName).\(ext)"
     }
 
@@ -202,7 +202,7 @@ extension AttachableImageFormat {
     case .jpeg:
       CLSID_WICJpegEncoder
     case let .systemValue(clsid):
-      clsid as! GUID
+      (clsid as! CLSID.Wrapper).rawValue
     }
   }
 
@@ -231,11 +231,12 @@ extension AttachableImageFormat {
   @_spi(_)
 #endif
   public init(encoderCLSID: CLSID, encodingQuality: Float = 1.0) {
-    if encoderCLSID == CLSID_WICPngEncoder {
+    switch CLSID.Wrapper(encoderCLSID) {
+    case CLSID.Wrapper(CLSID_WICPngEncoder):
       self = .png
-    } else if encoderCLSID == CLSID_WICJpegEncoder {
+    case CLSID.Wrapper(CLSID_WICJpegEncoder):
       self = .jpeg
-    } else {
+    case let encoderCLSID:
       self.init(kind: .systemValue(encoderCLSID), encodingQuality: encodingQuality)
     }
   }

Sources/Overlays/_Testing_WinSDK/Support/Additions/GUIDAdditions.swift

@@ -8,28 +8,42 @@
 // See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 //
 
-#if os(Windows) && compiler(<6.4)
-public import WinSDK
+#if os(Windows)
+internal import WinSDK
 
-// Retroactively add conformance to `Equatable` and `Hashable` until
-// https://github.com/swiftlang/swift/pull/84792 is merged into the WinSDK Swift
-// overlay.
+extension GUID {
+  /// A type that wraps `GUID` instances and conforms to various Swift
+  /// protocols.
+  ///
+  /// - Bug: This type will become obsolete once we can use the `Equatable` and
+  ///   `Hashable` conformances added to the WinSDK module in Swift 6.3.
+#if compiler(>=6.3.1) && DEBUG
+  @available(*, deprecated, message: "GUID.Wrapper is no longer needed and can be removed.")
+#endif
+  struct Wrapper: Sendable, RawRepresentable {
+    var rawValue: GUID
+  }
+}
 
-@_spi(_)
-extension GUID: @retroactive Equatable, @retroactive Hashable {
-  /// This GUID as an integer.
+extension GUID.Wrapper: Equatable, Hashable {
+  init(_ rawValue: GUID) {
+    self.init(rawValue: rawValue)
+  }
+
+#if compiler(<6.3.1)
   private var _uint128Value: UInt128 {
-    withUnsafeBytes(of: self) { buffer in
+    withUnsafeBytes(of: rawValue) { buffer in
       buffer.baseAddress!.loadUnaligned(as: UInt128.self)
     }
   }
 
-  public static func ==(lhs: Self, rhs: Self) -> Bool {
+  static func ==(lhs: Self, rhs: Self) -> Bool {
     lhs._uint128Value == rhs._uint128Value
   }
 
-  public func hash(into hasher: inout Hasher) {
+  func hash(into hasher: inout Hasher) {
     hasher.combine(_uint128Value)
   }
+#endif
 }
 #endif