[WinRT] Start exposing Windows Runtime headers to Swift

This adds an initial Clang modulemap for the WinRT module. The modulemap is injected into the `winrt/` include search path using VFS.

For now, the modulemap only exposes a small number of utility headers from WinRT. It will be extended in the future to cover more of the WinRT API surface.

Author: egorzhdan

Runtimes/Overlay/Windows/clang/CMakeLists.txt

@@ -25,6 +25,12 @@ roots:
       - name: module.modulemap
         type: file
         external-contents: "@CMAKE_CURRENT_SOURCE_DIR@/winsdk_shared.modulemap"
+  - name: "@WindowsSdkDir@/Include/@WindowsSDKVersion@/winrt"
+    type: directory
+    contents:
+      - name: module.modulemap
+        type: file
+        external-contents: "@CMAKE_CURRENT_SOURCE_DIR@/WinRT.modulemap"
   - name: "@UniversalCRTSdkDir@/Include/@UCRTVersion@/ucrt"
     type: directory
     contents:
@@ -55,4 +61,5 @@ install(FILES
   vcruntime.modulemap
   winsdk_um.modulemap
   winsdk_shared.modulemap
+  WinRT.modulemap
   DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})

Runtimes/Resync.cmake

@@ -160,6 +160,7 @@ copy_files(public/Platform Overlay/Windows/clang
     ucrt.modulemap
     winsdk_um.modulemap
     winsdk_shared.modulemap
+    WinRT.modulemap
     vcruntime.modulemap
     vcruntime.apinotes)
 

lib/ClangImporter/ClangIncludePaths.cpp

@@ -506,6 +506,15 @@ void GetWindowsFileMappings(
     if (!AuxiliaryFile.empty())
       fileMapping.redirectedFiles.emplace_back(std::string(WinSDKInjection),
                                                AuxiliaryFile);
+
+    llvm::sys::path::remove_filename(WinSDKInjection);
+    llvm::sys::path::remove_filename(WinSDKInjection);
+    llvm::sys::path::append(WinSDKInjection, "winrt", "module.modulemap");
+    AuxiliaryFile =
+        GetPlatformAuxiliaryFile("windows", "WinRT.modulemap", SearchPathOpts);
+    if (!AuxiliaryFile.empty())
+      fileMapping.redirectedFiles.emplace_back(std::string(WinSDKInjection),
+                                               AuxiliaryFile);
   }
 
   struct {

stdlib/cmake/WindowsVFS.yaml.in

@@ -15,6 +15,12 @@ roots:
       - name: module.modulemap
         type: file
         external-contents: "@PROJECT_SOURCE_DIR@\\public\\Platform\\winsdk_shared.modulemap"
+  - name: "@UniversalCRTSdkDir@\\Include\\@UCRTVersion@\\winrt"
+    type: directory
+    contents:
+      - name: module.modulemap
+        type: file
+        external-contents: "@PROJECT_SOURCE_DIR@\\public\\Platform\\WinRT.modulemap"
   - name: "@UniversalCRTSdkDir@\\Include\\@UCRTVersion@\\ucrt"
     type: directory
     contents:

stdlib/public/Platform/CMakeLists.txt

@@ -469,6 +469,7 @@ if(WINDOWS IN_LIST SWIFT_SDKS)
       vcruntime.modulemap
       winsdk_um.modulemap
       winsdk_shared.modulemap
+      WinRT.modulemap
     DESTINATION "share"
     COMPONENT sdk-overlay)
 endif()

stdlib/public/Platform/WinRT.modulemap

@@ -0,0 +1,19 @@
+module WinRT [system] {
+  link "WindowsApp.lib"
+  export *
+
+  module Base {
+    header "WinRTBase.h"
+    export *
+  }
+
+  module _HSTRING {
+    header "hstring.h"
+    export *
+  }
+
+  module RoAPI {
+    header "roapi.h"
+    export *
+  }
+}

test/stdlib/WinRT_HSTRING.swift

@@ -0,0 +1,8 @@
+// RUN: %target-build-swift %s
+// REQUIRES: OS=windows-msvc
+
+// Make sure that importing WinRT brings in the HSTRING type.
+
+import WinRT
+
+public func usesHSTRING(_ x: HSTRING) {}