From b5e17ae32f7a100a1947cf21d636fe409a24fe8b Mon Sep 17 00:00:00 2001
From: Kody Stribrny <89810515+kstribrnAmzn@users.noreply.github.com>
Date: Mon, 16 Mar 2026 13:47:01 -0700
Subject: [PATCH] Update the Kernel and TCP submodule, fix build failures
 (#1395)

* Update kernel submodule to latest
* Update TCP to v4.4.0+build fix
* Add windows header to fix winsim logger, win trace simulator, reliance edge + CLI win sim demo
* Fix TCP-UDP mode win sim demo
---
 FreeRTOS-Plus/Demo/Common/Logging/windows/Logging_WinSim.c    | 3 +++
 .../Run-time-stats-utils.c                                    | 3 +++
 .../Run-time-stats-utils.c                                    | 3 +++
 .../Sample-CLI-commands.c                                     | 1 +
 .../main.c                                                    | 3 +++
 .../FreeRTOS_Plus_TCP_Minimal.vcxproj                         | 2 +-
 .../Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/main.c   | 3 +++
 .../Run-time-stats-utils.c                                    | 3 +++
 .../FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/main.c   | 3 +++
 .../Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/main.c       | 3 +++
 FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP                        | 2 +-
 FreeRTOS/Source                                               | 2 +-
 manifest.yml                                                  | 4 ++--
 13 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/FreeRTOS-Plus/Demo/Common/Logging/windows/Logging_WinSim.c b/FreeRTOS-Plus/Demo/Common/Logging/windows/Logging_WinSim.c
index c2e2881ccd..1892933911 100644
--- a/FreeRTOS-Plus/Demo/Common/Logging/windows/Logging_WinSim.c
+++ b/FreeRTOS-Plus/Demo/Common/Logging/windows/Logging_WinSim.c
@@ -42,6 +42,9 @@
 #include <io.h>
 #include <ctype.h>
 
+/* Windows includes. */
+#include <windows.h>
+
 /* FreeRTOS includes. */
 #include "FreeRTOS.h"
 #include "task.h"
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/Run-time-stats-utils.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/Run-time-stats-utils.c
index f4af004b18..8f605d3d4e 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/Run-time-stats-utils.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/Run-time-stats-utils.c
@@ -39,6 +39,9 @@
 /* FreeRTOS includes. */
 #include <FreeRTOS.h>
 
+/* Windows includes for performance counter APIs. */
+#include <windows.h>
+
 /* Variables used in the creation of the run time stats time base.  Run time
  * stats record how much time each task spends in the Running state. */
 static long long llInitialRunTimeCounterValue = 0LL, llTicksPerHundredthMillisecond = 0LL;
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/Run-time-stats-utils.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/Run-time-stats-utils.c
index 79fef9b05c..fba8f8bf2e 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/Run-time-stats-utils.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/Run-time-stats-utils.c
@@ -39,6 +39,9 @@
 /* FreeRTOS includes. */
 #include <FreeRTOS.h>
 
+/* Windows includes for performance counter APIs. */
+#include <windows.h>
+
 /* Variables used in the creation of the run time stats time base.  Run time
  * stats record how much time each task spends in the Running state. */
 static long long llInitialRunTimeCounterValue = 0LL, llTicksPerHundredthMillisecond = 0LL;
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/Sample-CLI-commands.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/Sample-CLI-commands.c
index 1006350b43..e1d2275a2c 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/Sample-CLI-commands.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/Sample-CLI-commands.c
@@ -40,6 +40,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 /* FreeRTOS+CLI includes. */
 #include "FreeRTOS_CLI.h"
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/main.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/main.c
index 551b3d69ab..ae7a9a7af3 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/main.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/main.c
@@ -36,6 +36,9 @@
 #include <stdio.h>
 #include <stdint.h>
 
+/* Windows includes. */
+#include <windows.h>
+
 /* FreeRTOS includes. */
 #include <FreeRTOS.h>
 #include "task.h"
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/FreeRTOS_Plus_TCP_Minimal.vcxproj b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/FreeRTOS_Plus_TCP_Minimal.vcxproj
index 9439a6db6a..984faf6640 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/FreeRTOS_Plus_TCP_Minimal.vcxproj
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/FreeRTOS_Plus_TCP_Minimal.vcxproj
@@ -56,7 +56,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_with_Libslirp|Win32'">
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/main.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/main.c
index c0717e10ac..34c58767c0 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/main.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/main.c
@@ -35,6 +35,9 @@
 #include <stdio.h>
 #include <time.h>
 
+/* Windows includes. */
+#include <windows.h>
+
 /* FreeRTOS includes. */
 #include <FreeRTOS.h>
 #include "task.h"
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/Run-time-stats-utils.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/Run-time-stats-utils.c
index 79fef9b05c..fba8f8bf2e 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/Run-time-stats-utils.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/Run-time-stats-utils.c
@@ -39,6 +39,9 @@
 /* FreeRTOS includes. */
 #include <FreeRTOS.h>
 
+/* Windows includes for performance counter APIs. */
+#include <windows.h>
+
 /* Variables used in the creation of the run time stats time base.  Run time
  * stats record how much time each task spends in the Running state. */
 static long long llInitialRunTimeCounterValue = 0LL, llTicksPerHundredthMillisecond = 0LL;
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/main.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/main.c
index 1626361c4a..b072a3e835 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/main.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/main.c
@@ -28,6 +28,9 @@
 #include <stdio.h>
 #include <stdint.h>
 
+/* Windows includes. */
+#include <windows.h>
+
 /* FreeRTOS includes. */
 #include <FreeRTOS.h>
 #include "task.h"
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/main.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/main.c
index 8856c6e73b..81569ccd28 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/main.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/main.c
@@ -28,6 +28,9 @@
 #include <stdio.h>
 #include <stdint.h>
 
+/* Windows includes. */
+#include <windows.h>
+
 /* FreeRTOS includes. */
 #include <FreeRTOS.h>
 #include "task.h"
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP
index fbb668ac77..1f1ffec6d7 160000
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP
@@ -1 +1 @@
-Subproject commit fbb668ac7786c6f4ea8f2a60bfa2ae63c0b43863
+Subproject commit 1f1ffec6d746be15cb9b54b1d2bfbc9446b8607b
diff --git a/FreeRTOS/Source b/FreeRTOS/Source
index 1dbc77697f..fcc665325c 160000
--- a/FreeRTOS/Source
+++ b/FreeRTOS/Source
@@ -1 +1 @@
-Subproject commit 1dbc77697f4c63e1b18a2c7f7a15aad4ae14af7e
+Subproject commit fcc665325c033065cb6fd89d18a92f2ca611495e
diff --git a/manifest.yml b/manifest.yml
index 004f88c271..5373f2b5d0 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -5,14 +5,14 @@ license: "MIT"
 
 dependencies:
   - name: "FreeRTOS-Kernel"
-    version: "1dbc776"
+    version: "fcc6653"
     repository:
       type: "git"
       url: "https://github.com/FreeRTOS/FreeRTOS-Kernel.git"
       path: "FreeRTOS/Source"
 
   - name: "FreeRTOS-Plus-TCP"
-    version: "fbb668ac"
+    version: "1f1ffec"
     repository:
       type: "git"
       url: "https://github.com/FreeRTOS/FreeRTOS-Plus-TCP.git"