Remove some warnings for Windows builds

Author: parkera

Sources/CoreFoundation/include/ForSwiftFoundationOnly.h

@@ -35,6 +35,7 @@
 #define NOMINMAX
 #define VC_EXTRALEAN
 #define WIN32_LEAN_AND_MEAN
+#define _CRT_NONSTDC_NO_DEPRECATE
 #include <Windows.h>
 #elif !TARGET_OS_WASI
 #include <fts.h>

Sources/Foundation/FileManager+Win32.swift

@@ -108,7 +108,7 @@ extension FileManager {
 
         var wszVolumeName: [WCHAR] = Array<WCHAR>(repeating: 0, count: Int(MAX_PATH))
 
-        var hVolumes: HANDLE = FindFirstVolumeW(&wszVolumeName, DWORD(wszVolumeName.count))
+        let hVolumes: HANDLE = FindFirstVolumeW(&wszVolumeName, DWORD(wszVolumeName.count))
         guard hVolumes != INVALID_HANDLE_VALUE else { return nil }
         defer { FindVolumeClose(hVolumes) }
 
@@ -350,7 +350,7 @@ extension FileManager {
             guard let _lastReturned else { return firstValidItem() }
 
             if _lastReturned.hasDirectoryPath && (level == 0 || !_options.contains(.skipsSubdirectoryDescendants)) {
-                try walk(directory: _lastReturned) { entry, attributes in
+                walk(directory: _lastReturned) { entry, attributes in
                     if entry == "." || entry == ".." { return }
                     if _options.contains(.skipsHiddenFiles) && attributes & FILE_ATTRIBUTE_HIDDEN == FILE_ATTRIBUTE_HIDDEN {
                         return
@@ -386,7 +386,7 @@ extension FileManager.NSPathDirectoryEnumerator {
     internal func _nextObject() -> Any? {
         guard let url = innerEnumerator.nextObject() as? URL else { return nil }
 
-        let path: String? = try? baseURL.withUnsafeNTPath { pwszBasePath in
+        let path: String? = baseURL.withUnsafeNTPath { pwszBasePath in
             let dwBaseAttrs = GetFileAttributesW(pwszBasePath)
             if dwBaseAttrs == INVALID_FILE_ATTRIBUTES { return nil }
 

Sources/Foundation/Host.swift

@@ -135,7 +135,7 @@ open class Host: NSObject {
         var ulResult: ULONG =
             GetAdaptersAddresses(ULONG(AF_UNSPEC), 0, nil, nil, &ulSize)
 
-        var arAdapters: UnsafeMutableRawPointer =
+        let arAdapters: UnsafeMutableRawPointer =
             UnsafeMutableRawPointer.allocate(byteCount: Int(ulSize),
                                              alignment: 1)
         defer { arAdapters.deallocate() }
@@ -150,7 +150,7 @@ open class Host: NSObject {
         while pAdapter != nil {
           // print("Adapter: \(String(cString: pAdapter!.pointee.AdapterName))")
 
-          var arAddresses: UnsafeMutablePointer<IP_ADAPTER_UNICAST_ADDRESS> =
+          let arAddresses: UnsafeMutablePointer<IP_ADAPTER_UNICAST_ADDRESS> =
               pAdapter!.pointee.FirstUnicastAddress
 
           var pAddress: UnsafeMutablePointer<IP_ADAPTER_UNICAST_ADDRESS>? =

Sources/Foundation/Thread.swift

@@ -128,7 +128,7 @@ open class Thread : NSObject {
     @available(*, noasync)
     open class func sleep(until date: Date) {
 #if os(Windows)
-        var hTimer: HANDLE = CreateWaitableTimerW(nil, true, nil)
+        let hTimer: HANDLE = CreateWaitableTimerW(nil, true, nil)
         if hTimer == HANDLE(bitPattern: 0) { fatalError("unable to create timer: \(GetLastError())") }
         defer { CloseHandle(hTimer) }
 
@@ -166,7 +166,7 @@ open class Thread : NSObject {
     @available(*, noasync)
     open class func sleep(forTimeInterval interval: TimeInterval) {
 #if os(Windows)
-        var hTimer: HANDLE = CreateWaitableTimerW(nil, true, nil)
+        let hTimer: HANDLE = CreateWaitableTimerW(nil, true, nil)
         // FIXME(compnerd) how to check that hTimer is not NULL?
         defer { CloseHandle(hTimer) }
 
@@ -410,37 +410,41 @@ open class Thread : NSObject {
         let hProcess: HANDLE = GetCurrentProcess()
         SymSetOptions(DWORD(SYMOPT_UNDNAME | SYMOPT_DEFERRED_LOADS))
         if !SymInitializeW(hProcess, nil, true) {
-          return []
+            return []
         }
         return backtraceAddresses { (addresses, count) in
-          var symbols: [String] = []
-
-          let addresses: UnsafeMutableBufferPointer<PVOID?> =
-              UnsafeMutableBufferPointer<PVOID?>(start: addresses, count: count)
-          withUnsafeTemporaryAllocation(byteCount: MemoryLayout<SYMBOL_INFO>.size + 127,
-                                        alignment: 8) { buffer in
-            let pSymbolInfo: UnsafeMutablePointer<SYMBOL_INFO> =
+            var symbols: [String] = []
+            
+            let addresses: UnsafeMutableBufferPointer<PVOID?> =
+            UnsafeMutableBufferPointer<PVOID?>(start: addresses, count: count)
+            withUnsafeTemporaryAllocation(byteCount: MemoryLayout<SYMBOL_INFO>.size + 127,
+                                          alignment: 8) { buffer in
+                let pSymbolInfo: UnsafeMutablePointer<SYMBOL_INFO> =
                 buffer.baseAddress!.assumingMemoryBound(to: SYMBOL_INFO.self)
-
-            for address in addresses {
-              pSymbolInfo.pointee.SizeOfStruct =
+                
+                for address in addresses {
+                    pSymbolInfo.pointee.SizeOfStruct =
                     ULONG(MemoryLayout<SYMBOL_INFO>.size)
-              pSymbolInfo.pointee.MaxNameLen = 128
-
-              var dwDisplacement: DWORD64 = 0
-              if SymFromAddr(hProcess, DWORD64(UInt(bitPattern: address)),
-                             &dwDisplacement, &pSymbolInfo.pointee) {
-                symbols.append(String(unsafeUninitializedCapacity: Int(pSymbolInfo.pointee.NameLen) + 1) {
-                  strncpy($0.baseAddress, &pSymbolInfo.pointee.Name, $0.count)
-                  return $0.count
-                })
-              } else {
-                symbols.append("\(address)")
-              }
+                    pSymbolInfo.pointee.MaxNameLen = 128
+                    
+                    var dwDisplacement: DWORD64 = 0
+                    if SymFromAddr(hProcess, DWORD64(UInt(bitPattern: address)),
+                                   &dwDisplacement, &pSymbolInfo.pointee) {
+                        symbols.append(String(unsafeUninitializedCapacity: Int(pSymbolInfo.pointee.NameLen) + 1) {
+                            strncpy_s($0.baseAddress, $0.count, &pSymbolInfo.pointee.Name, $0.count)
+                            return $0.count
+                        })
+                    } else {
+                        if let address {
+                            symbols.append("\(address)")
+                        } else {
+                            symbols.append("<unknown address>")
+                        }
+                    }
+                }
             }
-          }
-
-          return symbols
+            
+            return symbols
         }
 #else
         return backtraceAddresses({ (addrs, count) in