From 6f9876a5658951e8db6143505784972043b08017 Mon Sep 17 00:00:00 2001
From: Fabrice de Gans <fabrice@thebrowser.company>
Date: Wed, 28 May 2025 18:11:16 -0700
Subject: [PATCH 1/2] Platform: Update module maps for the static SDK

Building with the Windows static SDK uncovered issues in the Windows
module maps. Some of the headers were missing and others had incorrect
layering. This updates the module maps to build with the static Windows
SDK.
---
 stdlib/public/Platform/ucrt.modulemap      | 71 ++++++++++++++++++++--
 stdlib/public/Platform/vcruntime.modulemap | 30 +++++++++
 2 files changed, 96 insertions(+), 5 deletions(-)

diff --git a/stdlib/public/Platform/ucrt.modulemap b/stdlib/public/Platform/ucrt.modulemap
index f57d9e62b3131..5aec5896b35ce 100644
--- a/stdlib/public/Platform/ucrt.modulemap
+++ b/stdlib/public/Platform/ucrt.modulemap
@@ -26,31 +26,48 @@ module _complex [system] [no_undeclared_includes] {
 }
 
 module _stddef [system] [no_undeclared_includes] {
-  header "stddef.h"
-  export *
+  use corecrt
+  textual header "stddef.h"
 }
 
 module _stdlib [system] [no_undeclared_includes] {
   use corecrt
+  use vcruntime
   header "stdlib.h"
   export *
 }
 
+module _ctype [system] [no_undeclared_includes] {
+  use corecrt
+  textual header "ctype.h"
+}
+
+module _errno [system] [no_undeclared_includes] {
+  use corecrt
+  textual header "errno.h"
+}
+
+module _stdnoreturn [system] [no_undeclared_includes] {
+  use corecrt
+  textual header "stdnoreturn.h"
+}
+
+
 module ucrt [system] {
   export _malloc
 
   module C {
     export _complex
-    export _stddef
     export _stdlib
 
+
     module ctype {
       header "ctype.h"
       export *
     }
 
     module errno {
-      header "errno.h"
+      textual header "errno.h"
       export *
     }
 
@@ -84,6 +101,11 @@ module ucrt [system] {
       export *
     }
 
+    module stdalign {
+      header "stdalign.h"
+      export  *
+    }
+
     module stdio {
       header "stdio.h"
       export *
@@ -101,6 +123,11 @@ module ucrt [system] {
       export *
     }
 
+    module stdnoreturn {
+      textual header "stdnoreturn.h"
+      export *
+    }
+
     module string {
       header "string.h"
       export *
@@ -175,6 +202,11 @@ module ucrt [system] {
   }
 }
 
+module _corecrt_memcpy_s [system] [no_undeclared_includes] {
+  textual header "corecrt_memcpy_s.h"
+  export *
+}
+
 module corecrt [system] {
   use vcruntime
 
@@ -187,8 +219,14 @@ module corecrt [system] {
     export *
   }
 
+  module direct {
+    header "corecrt_wdirect.h"
+    export *
+  }
+
   module io {
     header "corecrt_io.h"
+    header "corecrt_wio.h"
     export *
   }
 
@@ -202,11 +240,35 @@ module corecrt [system] {
     export *
   }
 
+  module memory {
+    header "corecrt_memory.h"
+    export *
+  }
+
+  module memcpy {
+    textual header "corecrt_memcpy_s.h"
+  }
+
+  module process {
+    header "corecrt_wprocess.h"
+    export *
+  }
+
+  module search {
+    header "corecrt_search.h"
+    export *
+  }
+
   module share {
     header "corecrt_share.h"
     export *
   }
 
+  module ctype {
+    header "corecrt_wctype.h"
+    export *
+  }
+
   module stdio {
     header "corecrt_wstdio.h"
     export *
@@ -227,4 +289,3 @@ module corecrt [system] {
     export *
   }
 }
-
diff --git a/stdlib/public/Platform/vcruntime.modulemap b/stdlib/public/Platform/vcruntime.modulemap
index 564c832dcc12b..0ee59dfc63e82 100644
--- a/stdlib/public/Platform/vcruntime.modulemap
+++ b/stdlib/public/Platform/vcruntime.modulemap
@@ -100,15 +100,45 @@ module vcruntime [system] {
 
   header "vcruntime.h"
 
+  module iso646 {
+    header "iso646.h"
+    export *
+  }
+
+  module limits {
+    header "limits.h"
+    export *
+  }
+
   module setjmp {
     header "setjmp.h"
     export *
   }
 
+  module stdarg {
+    header "stdarg.h"
+    export *
+  }
+
+  module stdbool {
+    header "stdbool.h"
+    export  *
+  }
+
   module stdint {
     header "stdint.h"
     export *
   }
+
+  module string {
+    header "vcruntime_string.h"
+    export *
+  }
+
+  module vadefs {
+    header "vadefs.h"
+    export *
+  }
 }
 
 module std_config [system] {

From 72dad03924c4babc52f1a22da931403ade5d31ea Mon Sep 17 00:00:00 2001
From: Fabrice de Gans <fabrice@thebrowser.company>
Date: Mon, 2 Jun 2025 15:24:43 -0700
Subject: [PATCH 2/2] Simplify ucrt.modulemap

---
 stdlib/public/Platform/ucrt.modulemap | 55 ++++++---------------------
 1 file changed, 12 insertions(+), 43 deletions(-)

diff --git a/stdlib/public/Platform/ucrt.modulemap b/stdlib/public/Platform/ucrt.modulemap
index 5aec5896b35ce..b7b8fb02c29e4 100644
--- a/stdlib/public/Platform/ucrt.modulemap
+++ b/stdlib/public/Platform/ucrt.modulemap
@@ -12,12 +12,6 @@
 
 // The following modules have to be standalone top-level modules to deal with
 // version 10.0.26100 of the Windows SDK.
-module _malloc [system] [no_undeclared_includes] {
-  use corecrt
-  header "malloc.h"
-  export *
-}
-
 module _complex [system] [no_undeclared_includes] {
   use corecrt
   use std
@@ -25,41 +19,10 @@ module _complex [system] [no_undeclared_includes] {
   export *
 }
 
-module _stddef [system] [no_undeclared_includes] {
-  use corecrt
-  textual header "stddef.h"
-}
-
-module _stdlib [system] [no_undeclared_includes] {
-  use corecrt
-  use vcruntime
-  header "stdlib.h"
-  export *
-}
-
-module _ctype [system] [no_undeclared_includes] {
-  use corecrt
-  textual header "ctype.h"
-}
-
-module _errno [system] [no_undeclared_includes] {
-  use corecrt
-  textual header "errno.h"
-}
-
-module _stdnoreturn [system] [no_undeclared_includes] {
-  use corecrt
-  textual header "stdnoreturn.h"
-}
-
-
 module ucrt [system] {
-  export _malloc
 
   module C {
     export _complex
-    export _stdlib
-
 
     module ctype {
       header "ctype.h"
@@ -91,6 +54,11 @@ module ucrt [system] {
       export *
     }
 
+    module malloc {
+      header "malloc.h"
+      export *
+    }
+
     module math {
       header "math.h"
       export *
@@ -106,6 +74,11 @@ module ucrt [system] {
       export  *
     }
 
+    module stddef {
+      textual header "stddef.h"
+      export *
+    }
+
     module stdio {
       header "stdio.h"
       export *
@@ -202,11 +175,6 @@ module ucrt [system] {
   }
 }
 
-module _corecrt_memcpy_s [system] [no_undeclared_includes] {
-  textual header "corecrt_memcpy_s.h"
-  export *
-}
-
 module corecrt [system] {
   use vcruntime
 
@@ -246,7 +214,8 @@ module corecrt [system] {
   }
 
   module memcpy {
-    textual header "corecrt_memcpy_s.h"
+    header "corecrt_memcpy_s.h"
+    export *
   }
 
   module process {