Changed a implementation of the Dispose method

Author: Taritsyn

NuGet/MsieJavaScriptEngine.nuspec

@@ -12,7 +12,7 @@
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<description>This library is a .NET wrapper for working with the JavaScript engines of Internet Explorer and Edge (JsRT versions of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine). Project was based on the code of SassAndCoffee.JavaScript (http://github.com/paulcbetts/SassAndCoffee), Chakra Sample Hosts (http://github.com/panopticoncentral/chakra-host) and jsrt-dotnet (http://github.com/robpaveza/jsrt-dotnet).</description>
 		<summary>This library is a .NET wrapper for working with the JavaScript engines of Internet Explorer and Edge (JsRT versions of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine).</summary>
-		<releaseNotes>Fixed a error #18 “Block finalizer solved?”.</releaseNotes>
+		<releaseNotes>Changed a implementation of the `Dispose` method.</releaseNotes>
 		<copyright>Copyright (c) 2012-2018 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScript ECMAScript MSIE IE Edge Chakra</tags>

NuGet/readme.txt

@@ -21,7 +21,7 @@
    =============
    RELEASE NOTES
    =============
-   Fixed a error #18 “Block finalizer solved?”.
+   Changed a implementation of the `Dispose` method.
 
    ============
    PROJECT SITE

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.cs

@@ -32,7 +32,7 @@ internal abstract partial class ActiveScriptJsEngineBase : InnerJsEngineBase
 		/// <summary>
 		/// List of host items
 		/// </summary>
-		private readonly Dictionary<string, object> _hostItems = new Dictionary<string, object>();
+		private Dictionary<string, object> _hostItems = new Dictionary<string, object>();
 
 		/// <summary>
 		/// Last Active Script exception
@@ -67,8 +67,7 @@ internal abstract partial class ActiveScriptJsEngineBase : InnerJsEngineBase
 		/// <summary>
 		/// List of debug documents
 		/// </summary>
-		private readonly Dictionary<UIntPtr, DebugDocument> _debugDocuments =
-			new Dictionary<UIntPtr, DebugDocument>();
+		private Dictionary<UIntPtr, DebugDocument> _debugDocuments = new Dictionary<UIntPtr, DebugDocument>();
 
 		/// <summary>
 		/// Next source context
@@ -143,14 +142,6 @@ protected ActiveScriptJsEngineBase(JsEngineMode engineMode, bool enableDebugging
 			}
 		}
 
-		/// <summary>
-		/// Destructs an instance of the Active Script engine
-		/// </summary>
-		~ActiveScriptJsEngineBase()
-		{
-			Dispose(false);
-		}
-
 
 		/// <summary>
 		/// Checks a support of the JS engine on the machine
@@ -720,61 +711,56 @@ public override void CollectGarbage()
 		/// Destroys object
 		/// </summary>
 		public override void Dispose()
-		{
-			Dispose(true /* disposing */);
-			GC.SuppressFinalize(this);
-		}
-
-		/// <summary>
-		/// Destroys object
-		/// </summary>
-		/// <param name="disposing">Flag, allowing destruction of
-		/// managed objects contained in fields of class</param>
-		private void Dispose(bool disposing)
 		{
 			if (_disposedFlag.Set())
 			{
-				_dispatcher.Invoke(() =>
+				if (_debuggingStarted && _debugDocuments != null)
 				{
-					if (_dispatch != null)
+					foreach (UIntPtr debugDocumentKey in _debugDocuments.Keys)
 					{
-						ComHelpers.ReleaseComObject(ref _dispatch, !disposing);
-						_dispatch = null;
+						var debugDocumentValue = _debugDocuments[debugDocumentKey];
+						debugDocumentValue.Close();
 					}
 
-					if (_activeScriptWrapper != null)
-					{
-						_activeScriptWrapper.Dispose();
-						_activeScriptWrapper = null;
-					}
-				});
+					_debugDocuments.Clear();
+					_debugDocuments = null;
+				}
 
-				if (disposing)
+				if (_processDebugManagerWrapper != null)
 				{
-					if (_debuggingStarted && _debugDocuments != null)
-					{
-						foreach (UIntPtr debugDocumentKey in _debugDocuments.Keys)
-						{
-							var debugDocumentValue = _debugDocuments[debugDocumentKey];
-							debugDocumentValue.Close();
-						}
+					_processDebugManagerWrapper.RemoveApplication(_debugApplicationCookie);
 
-						_debugDocuments.Clear();
+					if (_debugApplicationWrapper != null)
+					{
+						_debugApplicationWrapper.Close();
+						_debugApplicationWrapper = null;
 					}
 
-					if (_processDebugManagerWrapper != null)
+					_processDebugManagerWrapper = null;
+				}
+
+				_dispatcher.Invoke(() =>
+				{
+					if (_dispatch != null)
 					{
-						_processDebugManagerWrapper.RemoveApplication(_debugApplicationCookie);
-						_debugApplicationWrapper.Close();
+						Marshal.ReleaseComObject(_dispatch);
+						_dispatch = null;
 					}
 
-					if (_hostItems != null)
+					if (_activeScriptWrapper != null)
 					{
-						_hostItems.Clear();
+						_activeScriptWrapper.Dispose();
+						_activeScriptWrapper = null;
 					}
+				});
 
-					_lastException = null;
+				if (_hostItems != null)
+				{
+					_hostItems.Clear();
+					_hostItems = null;
 				}
+
+				_lastException = null;
 			}
 		}
 

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptWrapper32.cs

@@ -4,6 +4,7 @@
 using EXCEPINFO = System.Runtime.InteropServices.ComTypes.EXCEPINFO;
 
 using MsieJavaScriptEngine.ActiveScript.Debugging;
+using MsieJavaScriptEngine.Helpers;
 
 namespace MsieJavaScriptEngine.ActiveScript
 {
@@ -12,6 +13,21 @@ namespace MsieJavaScriptEngine.ActiveScript
 	/// </summary>
 	internal sealed class ActiveScriptWrapper32 : ActiveScriptWrapperBase
 	{
+		/// <summary>
+		/// Pointer to an instance of 32-bit Active Script parser
+		/// </summary>
+		private IntPtr _pActiveScriptParse32;
+
+		/// <summary>
+		/// Pointer to an instance of 32-bit Active Script debugger
+		/// </summary>
+		private IntPtr _pActiveScriptDebug32;
+
+		/// <summary>
+		/// Pointer to an instance of 32-bit debug stack frame sniffer
+		/// </summary>
+		private IntPtr _pDebugStackFrameSniffer32;
+
 		/// <summary>
 		/// Instance of 32-bit Active Script parser
 		/// </summary>
@@ -36,17 +52,31 @@ internal sealed class ActiveScriptWrapper32 : ActiveScriptWrapperBase
 		public ActiveScriptWrapper32(JsEngineMode engineMode, bool enableDebugging)
 			: base(engineMode, enableDebugging)
 		{
+			_pActiveScriptParse32 = ComHelpers.QueryInterface<IActiveScriptParse32>(_pActiveScript);
 			_activeScriptParse32 = (IActiveScriptParse32)_activeScript;
+
 			if (_enableDebugging)
 			{
+				_pActiveScriptDebug32 = ComHelpers.QueryInterface<IActiveScriptDebug32>(_pActiveScript);
 				_activeScriptDebug32 = (IActiveScriptDebug32)_activeScript;
+
 				if (engineMode == JsEngineMode.Classic)
 				{
+					_pDebugStackFrameSniffer32 = ComHelpers.QueryInterfaceNoThrow<IDebugStackFrameSnifferEx32>(
+						_pActiveScript);
 					_debugStackFrameSniffer32 = _activeScript as IDebugStackFrameSnifferEx32;
 				}
 			}
 		}
 
+		/// <summary>
+		/// Destructs an instance of the 32-bit Active Script wrapper
+		/// </summary>
+		~ActiveScriptWrapper32()
+		{
+			Dispose(false);
+		}
+
 
 		#region ActiveScriptWrapperBase overrides
 
@@ -102,15 +132,36 @@ public override void EnumStackFrames(out IEnumDebugStackFrames enumFrames)
 
 		#region IDisposable implementation
 
+		/// <summary>
+		/// Destroys object
+		/// </summary>
 		public override void Dispose()
+		{
+			Dispose(true /* disposing */);
+			GC.SuppressFinalize(this);
+		}
+
+		/// <summary>
+		/// Destroys object
+		/// </summary>
+		/// <param name="disposing">Flag, allowing destruction of
+		/// managed objects contained in fields of class</param>
+		protected override void Dispose(bool disposing)
 		{
 			if (_disposedFlag.Set())
 			{
-				_debugStackFrameSniffer32 = null;
-				_activeScriptDebug32 = null;
-				_activeScriptParse32 = null;
+				if (disposing)
+				{
+					_debugStackFrameSniffer32 = null;
+					_activeScriptDebug32 = null;
+					_activeScriptParse32 = null;
+				}
+
+				ComHelpers.ReleaseAndEmpty(ref _pDebugStackFrameSniffer32);
+				ComHelpers.ReleaseAndEmpty(ref _pActiveScriptDebug32);
+				ComHelpers.ReleaseAndEmpty(ref _pActiveScriptParse32);
 
-				base.Dispose();
+				base.Dispose(disposing);
 			}
 		}
 

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptWrapper64.cs

@@ -4,6 +4,7 @@
 using EXCEPINFO = System.Runtime.InteropServices.ComTypes.EXCEPINFO;
 
 using MsieJavaScriptEngine.ActiveScript.Debugging;
+using MsieJavaScriptEngine.Helpers;
 
 namespace MsieJavaScriptEngine.ActiveScript
 {
@@ -12,6 +13,21 @@ namespace MsieJavaScriptEngine.ActiveScript
 	/// </summary>
 	internal sealed class ActiveScriptWrapper64 : ActiveScriptWrapperBase
 	{
+		/// <summary>
+		/// Pointer to an instance of 64-bit Active Script parser
+		/// </summary>
+		private IntPtr _pActiveScriptParse64;
+
+		/// <summary>
+		/// Pointer to an instance of 64-bit Active Script debugger
+		/// </summary>
+		private IntPtr _pActiveScriptDebug64;
+
+		/// <summary>
+		/// Pointer to an instance of 64-bit debug stack frame sniffer
+		/// </summary>
+		private IntPtr _pDebugStackFrameSniffer64;
+
 		/// <summary>
 		/// Instance of 64-bit Active Script parser
 		/// </summary>
@@ -36,17 +52,31 @@ internal sealed class ActiveScriptWrapper64 : ActiveScriptWrapperBase
 		public ActiveScriptWrapper64(JsEngineMode engineMode, bool enableDebugging)
 			: base(engineMode, enableDebugging)
 		{
+			_pActiveScriptParse64 = ComHelpers.QueryInterface<IActiveScriptParse64>(_pActiveScript);
 			_activeScriptParse64 = (IActiveScriptParse64)_activeScript;
+
 			if (_enableDebugging)
 			{
+				_pActiveScriptDebug64 = ComHelpers.QueryInterface<IActiveScriptDebug64>(_pActiveScript);
 				_activeScriptDebug64 = (IActiveScriptDebug64)_activeScript;
+
 				if (engineMode == JsEngineMode.Classic)
 				{
+					_pDebugStackFrameSniffer64 = ComHelpers.QueryInterfaceNoThrow<IDebugStackFrameSnifferEx64>(
+						_pActiveScript);
 					_debugStackFrameSniffer64 = _activeScript as IDebugStackFrameSnifferEx64;
 				}
 			}
 		}
 
+		/// <summary>
+		/// Destructs an instance of the 64-bit Active Script wrapper
+		/// </summary>
+		~ActiveScriptWrapper64()
+		{
+			Dispose(false);
+		}
+
 
 		#region ActiveScriptWrapperBase overrides
 
@@ -102,15 +132,36 @@ public override void EnumStackFrames(out IEnumDebugStackFrames enumFrames)
 
 		#region IDisposable implementation
 
+		/// <summary>
+		/// Destroys object
+		/// </summary>
 		public override void Dispose()
+		{
+			Dispose(true /* disposing */);
+			GC.SuppressFinalize(this);
+		}
+
+		/// <summary>
+		/// Destroys object
+		/// </summary>
+		/// <param name="disposing">Flag, allowing destruction of
+		/// managed objects contained in fields of class</param>
+		protected override void Dispose(bool disposing)
 		{
 			if (_disposedFlag.Set())
 			{
-				_debugStackFrameSniffer64 = null;
-				_activeScriptDebug64 = null;
-				_activeScriptParse64 = null;
+				if (disposing)
+				{
+					_debugStackFrameSniffer64 = null;
+					_activeScriptDebug64 = null;
+					_activeScriptParse64 = null;
+				}
+
+				ComHelpers.ReleaseAndEmpty(ref _pDebugStackFrameSniffer64);
+				ComHelpers.ReleaseAndEmpty(ref _pActiveScriptDebug64);
+				ComHelpers.ReleaseAndEmpty(ref _pActiveScriptParse64);
 
-				base.Dispose();
+				base.Dispose(disposing);
 			}
 		}