From 1f61d782690ed37e0ea0d3cf50c5396cf219dbe2 Mon Sep 17 00:00:00 2001
From: Jeremy Kuhne <jeremy.kuhne@microsoft.com>
Date: Tue, 27 May 2025 10:27:03 -0700
Subject: [PATCH] Handle ThreadContext cache more cleanly

Switch to a concurrent backing collection. Note that we only ever create them if you ask for them on the current thread.
---
 .../Forms/Application.ThreadContext.cs        | 52 +++++--------------
 1 file changed, 14 insertions(+), 38 deletions(-)

diff --git a/src/System.Windows.Forms/System/Windows/Forms/Application.ThreadContext.cs b/src/System.Windows.Forms/System/Windows/Forms/Application.ThreadContext.cs
index 418fffb64c8..45d2a615bd5 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Application.ThreadContext.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Application.ThreadContext.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Collections.Concurrent;
 using System.ComponentModel;
 using System.Runtime.ExceptionServices;
 using Microsoft.Office;
@@ -22,9 +23,7 @@ internal abstract unsafe partial class ThreadContext : MarshalByRefObject, IHand
         private bool _inThreadException;
         private bool _filterSnapshotValid;
 
-        private static readonly Dictionary<uint, ThreadContext> s_contextHash = [];
-
-        private static readonly Lock s_lock = new();
+        private static readonly ConcurrentDictionary<uint, ThreadContext> s_contextHash = [];
         private readonly Lock _marshallingControlLock = new();
 
         private static int s_totalMessageLoopCount;
@@ -87,11 +86,7 @@ protected ThreadContext()
             _id = PInvokeCore.GetCurrentThreadId();
             _messageLoopCount = 0;
             t_currentThreadContext = this;
-
-            lock (s_lock)
-            {
-                s_contextHash[_id] = this;
-            }
+            s_contextHash[_id] = this;
         }
 
         public ApplicationContext? ApplicationContext { get; private set; }
@@ -316,10 +311,7 @@ private void DisposeInternal(bool disposing)
                 }
                 finally
                 {
-                    lock (s_lock)
-                    {
-                        s_contextHash.Remove(_id);
-                    }
+                    s_contextHash.Remove(_id, out _);
 
                     if (t_currentThreadContext == this)
                     {
@@ -439,27 +431,17 @@ protected virtual void EndModalMessageLoop() { }
         /// <summary>
         ///  Exits the program by disposing of all thread contexts and message loops.
         /// </summary>
-        internal static void ExitApplication() => ExitCommon(disposing: true);
-
-        private static void ExitCommon(bool disposing)
+        internal static void ExitApplication()
         {
-            lock (s_lock)
+            foreach ((_, var threadContext) in s_contextHash)
             {
-                if (s_contextHash is not null)
+                if (threadContext.ApplicationContext is ApplicationContext applicationContext)
                 {
-                    ThreadContext[] contexts = new ThreadContext[s_contextHash.Values.Count];
-                    s_contextHash.Values.CopyTo(contexts, 0);
-                    for (int i = 0; i < contexts.Length; ++i)
-                    {
-                        if (contexts[i].ApplicationContext is ApplicationContext context)
-                        {
-                            context.ExitThread();
-                        }
-                        else
-                        {
-                            contexts[i].Dispose(disposing);
-                        }
-                    }
+                    applicationContext.ExitThread();
+                }
+                else
+                {
+                    threadContext.Dispose(disposing: true);
                 }
             }
         }
@@ -517,14 +499,8 @@ private static ThreadContext Create()
 
             if (id == PInvokeCore.GetCurrentThreadId())
             {
-                lock (s_lock)
-                {
-                    // Check again inside the lock as another thread may have added it
-                    if (!s_contextHash.TryGetValue(id, out context))
-                    {
-                        context = Create();
-                    }
-                }
+                context = Create();
+                Debug.Assert(context._id == id);
             }
 
             return context;