Foundation: remove overlay for testing unresovled failure

This allows working around an diagnosed failure in the compiler with
canonically typed imports.

Author: compnerd

Sources/Foundation/FileManager+Win32.swift

@@ -183,8 +183,8 @@ extension FileManager {
           // BACKUP_SEMANTICS are (confusingly) required in order to receive a
           // handle to a directory
           CreateFileW($0, 0,
-                      FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-                      nil, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, nil)
+                      DWORD(FILE_SHARE_READ) | DWORD(FILE_SHARE_WRITE) | DWORD(FILE_SHARE_DELETE),
+                      nil, DWORD(OPEN_EXISTING), DWORD(FILE_FLAG_BACKUP_SEMANTICS), nil)
         }
         if hFile == INVALID_HANDLE_VALUE {
           return try FileManager.default._fileSystemRepresentation(withPath: path) {
@@ -228,8 +228,8 @@ extension FileManager {
 
         var statInfo = stat()
         let handle =
-            CreateFileW(_fsRep, 0, FILE_SHARE_READ, nil, OPEN_EXISTING,
-                        FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS,
+            CreateFileW(_fsRep, 0, FILE_SHARE_READ, nil, DWORD(OPEN_EXISTING),
+                        FILE_FLAG_OPEN_REPARSE_POINT | DWORD(FILE_FLAG_BACKUP_SEMANTICS),
                         nil)
         if handle == INVALID_HANDLE_VALUE {
             throw _NSErrorWithWindowsError(GetLastError(), reading: false, paths: [path])
@@ -292,7 +292,7 @@ extension FileManager {
           FILETIME(from: time_t((modificationTime ?? stat.lastModificationDate).timeIntervalSince1970))
 
       let hFile: HANDLE =
-        CreateFileW(fsr, GENERIC_WRITE, FILE_SHARE_WRITE, nil, OPEN_EXISTING, 0,
+        CreateFileW(fsr, GENERIC_WRITE, FILE_SHARE_WRITE, nil, DWORD(OPEN_EXISTING), 0,
                     nil)
       if hFile == INVALID_HANDLE_VALUE {
           throw _NSErrorWithWindowsError(GetLastError(), reading: true, paths: [path])

Sources/Foundation/NSPathUtilities.swift

@@ -653,8 +653,8 @@ internal func _NSCreateTemporaryFile(_ filePath: String) throws -> (Int32, Strin
     }
     let pathResult = FileManager.default.string(withFileSystemRepresentation: String(decoding: buf, as: UTF16.self), length: wcslen(buf))
     guard let h = CreateFileW(buf, GENERIC_READ | GENERIC_WRITE,
-                              FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-                              nil, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nil),
+                              DWORD(FILE_SHARE_READ) | DWORD(FILE_SHARE_WRITE) | DWORD(FILE_SHARE_DELETE),
+                              nil, DWORD(OPEN_EXISTING), DWORD(FILE_ATTRIBUTE_NORMAL), nil),
           h != INVALID_HANDLE_VALUE else {
       throw _NSErrorWithWindowsError(GetLastError(), reading: false)
     }

Sources/Foundation/NSURL.swift

@@ -926,8 +926,8 @@ extension NSURL {
 #if os(Windows)
         let hFile: HANDLE = absolutePath.withCString(encodedAs: UTF16.self) {
           CreateFileW($0, GENERIC_READ,
-                      FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-                      nil, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, nil)
+                      DWORD(FILE_SHARE_READ) | DWORD(FILE_SHARE_WRITE) | DWORD(FILE_SHARE_DELETE),
+                      nil, DWORD(OPEN_EXISTING), DWORD(FILE_FLAG_BACKUP_SEMANTICS), nil)
         }
         guard hFile == INVALID_HANDLE_VALUE else {
           defer { CloseHandle(hFile) }

Sources/Foundation/WinSDK+Extensions.swift

@@ -17,10 +17,6 @@ internal var FILE_ATTRIBUTE_DIRECTORY: DWORD {
     DWORD(WinSDK.FILE_ATTRIBUTE_DIRECTORY)
 }
 
-internal var FILE_ATTRIBUTE_NORMAL: DWORD {
-    DWORD(WinSDK.FILE_ATTRIBUTE_NORMAL)
-}
-
 internal var FILE_ATTRIBUTE_HIDDEN: DWORD {
     DWORD(WinSDK.FILE_ATTRIBUTE_HIDDEN)
 }
@@ -33,26 +29,10 @@ internal var FILE_ATTRIBUTE_REPARSE_POINT: DWORD {
     DWORD(WinSDK.FILE_ATTRIBUTE_REPARSE_POINT)
 }
 
-internal var FILE_FLAG_BACKUP_SEMANTICS: DWORD {
-    DWORD(WinSDK.FILE_FLAG_BACKUP_SEMANTICS)
-}
-
 internal var FILE_FLAG_OPEN_REPARSE_POINT: DWORD {
     DWORD(WinSDK.FILE_FLAG_OPEN_REPARSE_POINT)
 }
 
-internal var FILE_SHARE_DELETE: DWORD {
-    DWORD(WinSDK.FILE_SHARE_DELETE)
-}
-
-internal var FILE_SHARE_READ: DWORD {
-    DWORD(WinSDK.FILE_SHARE_READ)
-}
-
-internal var FILE_SHARE_WRITE: DWORD {
-    DWORD(WinSDK.FILE_SHARE_WRITE)
-}
-
 internal var GENERIC_WRITE: DWORD {
     DWORD(WinSDK.GENERIC_WRITE)
 }
@@ -68,8 +48,4 @@ internal var MOVEFILE_REPLACE_EXISTING: DWORD {
 internal var MOVEFILE_WRITE_THROUGH: DWORD {
     DWORD(WinSDK.MOVEFILE_WRITE_THROUGH)
 }
-
-internal var OPEN_EXISTING: DWORD {
-    DWORD(WinSDK.OPEN_EXISTING)
-}
 #endif

Tests/Foundation/TestFileHandle.swift

@@ -135,9 +135,9 @@ class TestFileHandle : XCTestCase {
             // NOTE(compnerd) we need the FILE_FLAG_BACKUP_SEMANTICS so that we
             // can create the handle to the directory.
             CreateFileW($0, GENERIC_READ,
-                        FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE,
-                        nil, OPEN_EXISTING,
-                        FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS, nil)
+                        DWORD(FILE_SHARE_DELETE) | DWORD(FILE_SHARE_READ) | DWORD(FILE_SHARE_WRITE),
+                        nil, DWORD(OPEN_EXISTING),
+                        DWORD(FILE_ATTRIBUTE_NORMAL) | DWORD(FILE_FLAG_BACKUP_SEMANTICS), nil)
         }
         if hDirectory == INVALID_HANDLE_VALUE {
           fatalError("unable to create handle to current directory")