HRESULT and DWORD vary on 32-bit Windows

Author: grynspan

Sources/Overlays/_Testing_WinSDK/Attachments/_AttachableImageWrapper+AttachableWrapper.swift

@@ -93,7 +93,7 @@ extension _AttachableImageWrapper: Attachable, AttachableWrapper where Image: At
     guard rCommit == S_OK else {
       throw ImageAttachmentError.imageWritingFailed(rCommit)
     }
-    rCommit = stream.pointee.lpVtbl.pointee.Commit(stream, DWORD(bitPattern: STGC_DEFAULT.rawValue))
+    rCommit = stream.pointee.lpVtbl.pointee.Commit(stream, DWORD(STGC_DEFAULT.rawValue))
     guard rCommit == S_OK else {
       throw ImageAttachmentError.imageWritingFailed(rCommit)
     }

Sources/Testing/Attachments/Images/ImageAttachmentError.swift

@@ -8,7 +8,9 @@
 // See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 //
 
-private import _TestingInternals
+#if os(Windows)
+package import _TestingInternals // for HRESULT
+#endif
 
 /// A type representing an error that can occur when attaching an image.
 package enum ImageAttachmentError: Error {
@@ -23,19 +25,19 @@ package enum ImageAttachmentError: Error {
   case couldNotConvertImage
 #elseif os(Windows)
   /// A call to `QueryInterface()` failed.
-  case queryInterfaceFailed(Any.Type, Int32)
+  case queryInterfaceFailed(Any.Type, HRESULT)
 
   /// The testing library failed to create a COM object.
-  case comObjectCreationFailed(Any.Type, Int32)
+  case comObjectCreationFailed(Any.Type, HRESULT)
 
   /// An image could not be written.
-  case imageWritingFailed(Int32)
+  case imageWritingFailed(HRESULT)
 
   /// The testing library failed to get an in-memory stream's underlying buffer.
-  case globalFromStreamFailed(Int32)
+  case globalFromStreamFailed(HRESULT)
 
   /// A property could not be written to a property bag.
-  case propertyBagWritingFailed(String, Int32)
+  case propertyBagWritingFailed(String, HRESULT)
 #endif
 }
 

Sources/Testing/Support/CError.swift

@@ -8,7 +8,11 @@
 // See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 //
 
+#if os(Windows)
+package import _TestingInternals // for DWORD
+#else
 internal import _TestingInternals
+#endif
 
 /// A type representing an error from a C function such as `fopen()`.
 ///
@@ -28,9 +32,9 @@ struct CError: Error, RawRepresentable {
 ///
 /// This type is not part of the public interface of the testing library.
 package struct Win32Error: Error, RawRepresentable {
-  package var rawValue: CUnsignedLong
+  package var rawValue: DWORD
 
-  package init(rawValue: CUnsignedLong) {
+  package init(rawValue: DWORD) {
     self.rawValue = rawValue
   }
 }