Replace Hashtable with Dictionary<> in AxContainer (dotnet#6899)

kant2002 · web-flow · commit fa0d9760eb15 · 2022-03-30T00:26:02.000Z
More strict about types used in the app.
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.AxContainer.cs b/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.AxContainer.cs
@@ -29,10 +29,10 @@ internal class AxContainer : IOleContainer, IOleInPlaceFrame, IReflect
             private AxHost _siteUIActive;
             private AxHost _siteActive;
             private bool _formAlreadyCreated;
-            private readonly Hashtable _containerCache = new();  // name -> Control
+            private readonly Dictionary<Control, Control> _containerCache = new();  // name -> Control
             private int _lockCount;
-            private Hashtable _components;  // Control -> any
-            private Hashtable _proxyCache;
+            private Dictionary<Control, Control> _components;  // Control -> any
+            private Dictionary<Control, Oleaut32.IExtender> _proxyCache;
             private AxHost _controlInEditMode;
 
             internal AxContainer(ContainerControl parent)
@@ -107,12 +107,12 @@ object IReflect.InvokeMember(
                 CultureInfo culture,
                 string[] namedParameters)
             {
-                foreach (DictionaryEntry e in _containerCache)
+                foreach (var (keyControl, valueControl) in _containerCache)
                 {
-                    string ctlName = GetNameForControl((Control)e.Key);
+                    string ctlName = GetNameForControl(keyControl);
                     if (ctlName.Equals(name))
                     {
-                        return GetProxyForControl((Control)e.Value);
+                        return GetProxyForControl(valueControl);
                     }
                 }
 
@@ -132,11 +132,11 @@ internal Oleaut32.IExtender GetProxyForControl(Control ctl)
                 Oleaut32.IExtender rval = null;
                 if (_proxyCache is null)
                 {
-                    _proxyCache = new Hashtable();
+                    _proxyCache = new();
                 }
                 else
                 {
-                    rval = (Oleaut32.IExtender)_proxyCache[ctl];
+                    _proxyCache.TryGetValue(ctl, out rval);
                 }
 
                 if (rval is null)
@@ -177,7 +177,7 @@ internal void AddControl(Control ctl)
             {
                 lock (this)
                 {
-                    if (_containerCache.Contains(ctl))
+                    if (_containerCache.ContainsKey(ctl))
                     {
                         throw new ArgumentException(string.Format(SR.AXDuplicateControl, GetNameForControl(ctl)), nameof(ctl));
                     }
@@ -214,7 +214,7 @@ internal void RemoveControl(Control ctl)
             {
                 lock (this)
                 {
-                    if (_containerCache.Contains(ctl))
+                    if (_containerCache.ContainsKey(ctl))
                     {
                         _containerCache.Remove(ctl);
                     }
@@ -317,7 +317,7 @@ internal IEnumUnknown EnumControls(Control ctl, OLECONTF dwOleContF, GC_WCH dwWh
 
                             break;
                         case GC_WCH.ALL:
-                            Hashtable htbl = GetComponents();
+                            Dictionary<Control, Control> htbl = GetComponents();
                             ctls = new Control[htbl.Keys.Count];
                             htbl.Keys.CopyTo(ctls, 0);
                             ctl = _parent;
@@ -400,12 +400,12 @@ private void FillComponentsTable(IContainer container)
                     ComponentCollection comps = container.Components;
                     if (comps is not null)
                     {
-                        _components = new Hashtable();
+                        _components = new();
                         foreach (IComponent comp in comps)
                         {
-                            if (comp is Control && comp != _parent && comp.Site is not null)
+                            if (comp is Control control && comp != _parent && comp.Site is not null)
                             {
-                                _components.Add(comp, comp);
+                                _components.Add(control, control);
                             }
                         }
 
@@ -423,13 +423,13 @@ private void FillComponentsTable(IContainer container)
                 {
                     if (ctls.Length > 0 && _components is null)
                     {
-                        _components = new Hashtable();
+                        _components = new();
                         checkHashTable = false;
                     }
 
                     for (int i = 0; i < ctls.Length; i++)
                     {
-                        if (checkHashTable && !_components.Contains(ctls[i]))
+                        if (checkHashTable && !_components.ContainsKey(ctls[i]))
                         {
                             _components.Add(ctls[i], ctls[i]);
                         }
@@ -448,10 +448,10 @@ private void GetAllChildren(Control ctl)
 
                 if (_components is null)
                 {
-                    _components = new Hashtable();
+                    _components = new();
                 }
 
-                if (ctl != _parent && !_components.Contains(ctl))
+                if (ctl != _parent && !_components.ContainsKey(ctl))
                 {
                     _components.Add(ctl, ctl);
                 }
@@ -462,12 +462,12 @@ private void GetAllChildren(Control ctl)
                 }
             }
 
-            private Hashtable GetComponents()
+            private Dictionary<Control, Control> GetComponents()
             {
                 return GetComponents(GetParentsContainer());
             }
 
-            private Hashtable GetComponents(IContainer cont)
+            private Dictionary<Control, Control> GetComponents(IContainer cont)
             {
                 if (_lockCount == 0)
                 {
@@ -479,8 +479,8 @@ private Hashtable GetComponents(IContainer cont)
 
             private bool GetControlBelongs(Control ctl)
             {
-                Hashtable comps = GetComponents();
-                return comps[ctl] is not null;
+                Dictionary<Control, Control> comps = GetComponents();
+                return comps.ContainsKey(ctl);
             }
 
             private IContainer GetParentIsDesigned()
@@ -628,7 +628,7 @@ internal void OnUIActivate(AxHost site)
 
             private void ListAxControls(ArrayList list, bool fuseOcx)
             {
-                Hashtable components = GetComponents();
+                var components = GetComponents();
                 if (components is null)
                 {
                     return;

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,10 @@ internal class AxContainer : IOleContainer, IOleInPlaceFrame, IReflect`
`29`	`29`	`private AxHost _siteUIActive;`
`30`	`30`	`private AxHost _siteActive;`
`31`	`31`	`private bool _formAlreadyCreated;`
`32`		`- private readonly Hashtable _containerCache = new(); // name -> Control`
	`32`	`+ private readonly Dictionary<Control, Control> _containerCache = new(); // name -> Control`
`33`	`33`	`private int _lockCount;`
`34`		`- private Hashtable _components; // Control -> any`
`35`		`- private Hashtable _proxyCache;`
	`34`	`+ private Dictionary<Control, Control> _components; // Control -> any`
	`35`	`+ private Dictionary<Control, Oleaut32.IExtender> _proxyCache;`
`36`	`36`	`private AxHost _controlInEditMode;`
`37`	`37`
`38`	`38`	`internal AxContainer(ContainerControl parent)`
`@@ -107,12 +107,12 @@ object IReflect.InvokeMember(`
`107`	`107`	`CultureInfo culture,`
`108`	`108`	`string[] namedParameters)`
`109`	`109`	`{`
`110`		`- foreach (DictionaryEntry e in _containerCache)`
	`110`	`+ foreach (var (keyControl, valueControl) in _containerCache)`
`111`	`111`	`{`
`112`		`- string ctlName = GetNameForControl((Control)e.Key);`
	`112`	`+ string ctlName = GetNameForControl(keyControl);`
`113`	`113`	`if (ctlName.Equals(name))`
`114`	`114`	`{`
`115`		`- return GetProxyForControl((Control)e.Value);`
	`115`	`+ return GetProxyForControl(valueControl);`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
`@@ -132,11 +132,11 @@ internal Oleaut32.IExtender GetProxyForControl(Control ctl)`
`132`	`132`	`Oleaut32.IExtender rval = null;`
`133`	`133`	`if (_proxyCache is null)`
`134`	`134`	`{`
`135`		`- _proxyCache = new Hashtable();`
	`135`	`+ _proxyCache = new();`
`136`	`136`	`}`
`137`	`137`	`else`
`138`	`138`	`{`
`139`		`- rval = (Oleaut32.IExtender)_proxyCache[ctl];`
	`139`	`+ _proxyCache.TryGetValue(ctl, out rval);`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`if (rval is null)`
`@@ -177,7 +177,7 @@ internal void AddControl(Control ctl)`
`177`	`177`	`{`
`178`	`178`	`lock (this)`
`179`	`179`	`{`
`180`		`- if (_containerCache.Contains(ctl))`
	`180`	`+ if (_containerCache.ContainsKey(ctl))`
`181`	`181`	`{`
`182`	`182`	`throw new ArgumentException(string.Format(SR.AXDuplicateControl, GetNameForControl(ctl)), nameof(ctl));`
`183`	`183`	`}`
`@@ -214,7 +214,7 @@ internal void RemoveControl(Control ctl)`
`214`	`214`	`{`
`215`	`215`	`lock (this)`
`216`	`216`	`{`
`217`		`- if (_containerCache.Contains(ctl))`
	`217`	`+ if (_containerCache.ContainsKey(ctl))`
`218`	`218`	`{`
`219`	`219`	`_containerCache.Remove(ctl);`
`220`	`220`	`}`
`@@ -317,7 +317,7 @@ internal IEnumUnknown EnumControls(Control ctl, OLECONTF dwOleContF, GC_WCH dwWh`
`317`	`317`
`318`	`318`	`break;`
`319`	`319`	`case GC_WCH.ALL:`
`320`		`- Hashtable htbl = GetComponents();`
	`320`	`+ Dictionary<Control, Control> htbl = GetComponents();`
`321`	`321`	`ctls = new Control[htbl.Keys.Count];`
`322`	`322`	`htbl.Keys.CopyTo(ctls, 0);`
`323`	`323`	`ctl = _parent;`
`@@ -400,12 +400,12 @@ private void FillComponentsTable(IContainer container)`
`400`	`400`	`ComponentCollection comps = container.Components;`
`401`	`401`	`if (comps is not null)`
`402`	`402`	`{`
`403`		`- _components = new Hashtable();`
	`403`	`+ _components = new();`
`404`	`404`	`foreach (IComponent comp in comps)`
`405`	`405`	`{`
`406`		`- if (comp is Control && comp != _parent && comp.Site is not null)`
	`406`	`+ if (comp is Control control && comp != _parent && comp.Site is not null)`
`407`	`407`	`{`
`408`		`- _components.Add(comp, comp);`
	`408`	`+ _components.Add(control, control);`
`409`	`409`	`}`
`410`	`410`	`}`
`411`	`411`
`@@ -423,13 +423,13 @@ private void FillComponentsTable(IContainer container)`
`423`	`423`	`{`
`424`	`424`	`if (ctls.Length > 0 && _components is null)`
`425`	`425`	`{`
`426`		`- _components = new Hashtable();`
	`426`	`+ _components = new();`
`427`	`427`	`checkHashTable = false;`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`for (int i = 0; i < ctls.Length; i++)`
`431`	`431`	`{`
`432`		`- if (checkHashTable && !_components.Contains(ctls[i]))`
	`432`	`+ if (checkHashTable && !_components.ContainsKey(ctls[i]))`
`433`	`433`	`{`
`434`	`434`	`_components.Add(ctls[i], ctls[i]);`
`435`	`435`	`}`
`@@ -448,10 +448,10 @@ private void GetAllChildren(Control ctl)`
`448`	`448`
`449`	`449`	`if (_components is null)`
`450`	`450`	`{`
`451`		`- _components = new Hashtable();`
	`451`	`+ _components = new();`
`452`	`452`	`}`
`453`	`453`
`454`		`- if (ctl != _parent && !_components.Contains(ctl))`
	`454`	`+ if (ctl != _parent && !_components.ContainsKey(ctl))`
`455`	`455`	`{`
`456`	`456`	`_components.Add(ctl, ctl);`
`457`	`457`	`}`
`@@ -462,12 +462,12 @@ private void GetAllChildren(Control ctl)`
`462`	`462`	`}`
`463`	`463`	`}`
`464`	`464`
`465`		`- private Hashtable GetComponents()`
	`465`	`+ private Dictionary<Control, Control> GetComponents()`
`466`	`466`	`{`
`467`	`467`	`return GetComponents(GetParentsContainer());`
`468`	`468`	`}`
`469`	`469`
`470`		`- private Hashtable GetComponents(IContainer cont)`
	`470`	`+ private Dictionary<Control, Control> GetComponents(IContainer cont)`
`471`	`471`	`{`
`472`	`472`	`if (_lockCount == 0)`
`473`	`473`	`{`
`@@ -479,8 +479,8 @@ private Hashtable GetComponents(IContainer cont)`
`479`	`479`
`480`	`480`	`private bool GetControlBelongs(Control ctl)`
`481`	`481`	`{`
`482`		`- Hashtable comps = GetComponents();`
`483`		`- return comps[ctl] is not null;`
	`482`	`+ Dictionary<Control, Control> comps = GetComponents();`
	`483`	`+ return comps.ContainsKey(ctl);`
`484`	`484`	`}`
`485`	`485`
`486`	`486`	`private IContainer GetParentIsDesigned()`
`@@ -628,7 +628,7 @@ internal void OnUIActivate(AxHost site)`
`628`	`628`
`629`	`629`	`private void ListAxControls(ArrayList list, bool fuseOcx)`
`630`	`630`	`{`
`631`		`- Hashtable components = GetComponents();`
	`631`	`+ var components = GetComponents();`
`632`	`632`	`if (components is null)`
`633`	`633`	`{`
`634`	`634`	`return;`