Merge pull request #20940 from compnerd/threading-cleanup

SwiftPrivateThreadExtras: clean up using WinSDK SDK overlay

Author: compnerd

stdlib/private/SwiftPrivateThreadExtras/CMakeLists.txt

@@ -12,7 +12,7 @@ add_swift_target_library(swiftSwiftPrivateThreadExtras ${SWIFT_STDLIB_LIBRARY_BU
   SWIFT_MODULE_DEPENDS_FREEBSD Glibc
   SWIFT_MODULE_DEPENDS_CYGWIN Glibc
   SWIFT_MODULE_DEPENDS_HAIKU Glibc
-  SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT
+  SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT WinSDK
   SWIFT_COMPILE_FLAGS
   INSTALL_IN_COMPONENT stdlib-experimental)
 

stdlib/private/SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift

@@ -116,10 +116,8 @@ public func _stdlib_thread_join<Result>(
   _ resultType: Result.Type
 ) -> (CInt, Result?) {
 #if os(Windows)
-  // TODO(compnerd) modularize rpc.h for INFINITE (0xffffffff)
-  let result = WaitForSingleObject(thread, 0xffffffff);
-  // TODO(compnerd) modularize WinBase.h for WAIT_OBJECT_0 (0)
-  if result == 0 {
+  let result = WaitForSingleObject(thread, INFINITE)
+  if result == WAIT_OBJECT_0 {
     var threadResult: DWORD = 0
     GetExitCodeThread(thread, &threadResult)
     CloseHandle(thread)

stdlib/private/SwiftPrivateThreadExtras/ThreadBarriers.swift

@@ -122,9 +122,8 @@ public func _stdlib_thread_barrier_wait(
   if barrier.pointee.numThreadsWaiting < barrier.pointee.count {
     // Put the thread to sleep.
 #if os(Windows)
-    // TODO(compnerd) modularize rpc.h to get INFIITE (0xffffffff)
     if SleepConditionVariableSRW(barrier.pointee.cond!, barrier.pointee.mutex!,
-                                 0xffffffff, 0) == 0 {
+                                 INFINITE, 0) == 0 {
       return -1
     }
     ReleaseSRWLockExclusive(barrier.pointee.mutex!)