Removed a redundant code

Author: Taritsyn

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptWrapper32.cs

@@ -4,7 +4,6 @@
 using EXCEPINFO = System.Runtime.InteropServices.ComTypes.EXCEPINFO;
 
 using MsieJavaScriptEngine.ActiveScript.Debugging;
-using MsieJavaScriptEngine.Helpers;
 
 namespace MsieJavaScriptEngine.ActiveScript
 {
@@ -14,24 +13,14 @@ namespace MsieJavaScriptEngine.ActiveScript
 	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
+		/// Instance of 32-bit Active Script parser
 		/// </summary>
-		private IntPtr _pDebugStackFrameSniffer32;
+		private IActiveScriptParse32 _activeScriptParse32;
 
 		/// <summary>
-		/// Instance of 32-bit Active Script parser
+		/// Instance of 32-bit Active Script debugger
 		/// </summary>
-		private IActiveScriptParse32 _activeScriptParse32;
+		private IActiveScriptDebug32 _activeScriptDebug32;
 
 		/// <summary>
 		/// Instance of 32-bit debug stack frame sniffer
@@ -49,18 +38,11 @@ public ActiveScriptWrapper32(string clsid, ScriptLanguageVersion languageVersion
 			bool enableDebugging)
 			: base(clsid, languageVersion, enableDebugging)
 		{
-			_pActiveScriptParse32 = ComHelpers.QueryInterface<IActiveScriptParse32>(_pActiveScript);
 			_activeScriptParse32 = (IActiveScriptParse32)_activeScript;
-
 			if (_enableDebugging)
 			{
-				_pActiveScriptDebug32 = ComHelpers.QueryInterface<IActiveScriptDebug32>(_pActiveScript);
-				_pDebugStackFrameSniffer32 = ComHelpers.QueryInterfaceNoThrow<IDebugStackFrameSnifferEx32>(
-					_pActiveScript);
-				if (_pDebugStackFrameSniffer32 != IntPtr.Zero)
-				{
-					_debugStackFrameSniffer32 = _activeScript as IDebugStackFrameSnifferEx32;
-				}
+				_activeScriptDebug32 = (IActiveScriptDebug32)_activeScript;
+				_debugStackFrameSniffer32 = _activeScript as IDebugStackFrameSnifferEx32;
 			}
 		}
 
@@ -70,9 +52,8 @@ public ActiveScriptWrapper32(string clsid, ScriptLanguageVersion languageVersion
 		protected override uint InnerEnumCodeContextsOfPosition(UIntPtr sourceContext, uint offset,
 			uint length, out IEnumDebugCodeContexts enumContexts)
 		{
-			var del = ComHelpers.GetMethodDelegate<RawEnumCodeContextsOfPosition32>(_pActiveScriptDebug32, 5);
-			uint result = del(_pActiveScriptDebug32, sourceContext.ToUInt32(), offset, length,
-				out enumContexts);
+			uint result = _activeScriptDebug32.EnumCodeContextsOfPosition(sourceContext.ToUInt32(),
+				offset, length, out enumContexts);
 
 			return result;
 		}
@@ -125,12 +106,9 @@ public override void Dispose()
 			if (_disposedFlag.Set())
 			{
 				_debugStackFrameSniffer32 = null;
+				_activeScriptDebug32 = null;
 				_activeScriptParse32 = null;
 
-				ComHelpers.ReleaseAndEmpty(ref _pDebugStackFrameSniffer32);
-				ComHelpers.ReleaseAndEmpty(ref _pActiveScriptDebug32);
-				ComHelpers.ReleaseAndEmpty(ref _pActiveScriptParse32);
-
 				base.Dispose();
 			}
 		}

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptWrapper64.cs

@@ -4,7 +4,6 @@
 using EXCEPINFO = System.Runtime.InteropServices.ComTypes.EXCEPINFO;
 
 using MsieJavaScriptEngine.ActiveScript.Debugging;
-using MsieJavaScriptEngine.Helpers;
 
 namespace MsieJavaScriptEngine.ActiveScript
 {
@@ -14,24 +13,14 @@ namespace MsieJavaScriptEngine.ActiveScript
 	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
+		/// Instance of 64-bit Active Script parser
 		/// </summary>
-		private IntPtr _pDebugStackFrameSniffer64;
+		private IActiveScriptParse64 _activeScriptParse64;
 
 		/// <summary>
-		/// Instance of 64-bit Active Script parser
+		/// Instance of 64-bit Active Script debugger
 		/// </summary>
-		private IActiveScriptParse64 _activeScriptParse64;
+		private IActiveScriptDebug64 _activeScriptDebug64;
 
 		/// <summary>
 		/// Instance of 64-bit debug stack frame sniffer
@@ -49,18 +38,11 @@ public ActiveScriptWrapper64(string clsid, ScriptLanguageVersion languageVersion
 			bool enableDebugging)
 			: base(clsid, languageVersion, enableDebugging)
 		{
-			_pActiveScriptParse64 = ComHelpers.QueryInterface<IActiveScriptParse64>(_pActiveScript);
 			_activeScriptParse64 = (IActiveScriptParse64)_activeScript;
-
 			if (_enableDebugging)
 			{
-				_pActiveScriptDebug64 = ComHelpers.QueryInterface<IActiveScriptDebug64>(_pActiveScript);
-				_pDebugStackFrameSniffer64 = ComHelpers.QueryInterfaceNoThrow<IDebugStackFrameSnifferEx64>(
-					_pActiveScript);
-				if (_pDebugStackFrameSniffer64 != IntPtr.Zero)
-				{
-					_debugStackFrameSniffer64 = _activeScript as IDebugStackFrameSnifferEx64;
-				}
+				_activeScriptDebug64 = (IActiveScriptDebug64)_activeScript;
+				_debugStackFrameSniffer64 = _activeScript as IDebugStackFrameSnifferEx64;
 			}
 		}
 
@@ -70,9 +52,8 @@ public ActiveScriptWrapper64(string clsid, ScriptLanguageVersion languageVersion
 		protected override uint InnerEnumCodeContextsOfPosition(UIntPtr sourceContext, uint offset,
 			uint length, out IEnumDebugCodeContexts enumContexts)
 		{
-			var del = ComHelpers.GetMethodDelegate<RawEnumCodeContextsOfPosition64>(_pActiveScriptDebug64,5);
-			uint result = del(_pActiveScriptDebug64, sourceContext.ToUInt64(), offset, length,
-				out enumContexts);
+			uint result = _activeScriptDebug64.EnumCodeContextsOfPosition(sourceContext.ToUInt64(),
+				offset, length, out enumContexts);
 
 			return result;
 		}
@@ -125,12 +106,9 @@ public override void Dispose()
 			if (_disposedFlag.Set())
 			{
 				_debugStackFrameSniffer64 = null;
+				_activeScriptDebug64 = null;
 				_activeScriptParse64 = null;
 
-				ComHelpers.ReleaseAndEmpty(ref _pDebugStackFrameSniffer64);
-				ComHelpers.ReleaseAndEmpty(ref _pActiveScriptDebug64);
-				ComHelpers.ReleaseAndEmpty(ref _pActiveScriptParse64);
-
 				base.Dispose();
 			}
 		}

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptWrapperBase.cs

@@ -25,12 +25,7 @@ internal abstract class ActiveScriptWrapperBase : IActiveScriptWrapper
 		/// <summary>
 		/// Pointer to an instance of Active Script engine
 		/// </summary>
-		protected IntPtr _pActiveScript;
-
-		/// <summary>
-		/// Pointer to an instance of Active Script garbage collector
-		/// </summary>
-		private IntPtr _pActiveScriptGarbageCollector;
+		private IntPtr _pActiveScript;
 
 		/// <summary>
 		/// Instance of Active Script engine
@@ -60,9 +55,6 @@ protected ActiveScriptWrapperBase(string clsid, ScriptLanguageVersion languageVe
 			_enableDebugging = enableDebugging;
 
 			_pActiveScript = ComHelpers.CreateInstanceByClsid<IActiveScript>(clsid);
-			_pActiveScriptGarbageCollector = ComHelpers.QueryInterfaceNoThrow<IActiveScriptGarbageCollector>(
-				_pActiveScript);
-
 			_activeScript = (IActiveScript)Marshal.GetObjectForIUnknown(_pActiveScript);
 			_activeScriptGarbageCollector = _activeScript as IActiveScriptGarbageCollector;
 
@@ -241,7 +233,6 @@ public virtual void Dispose()
 		{
 			_activeScriptGarbageCollector = null;
 
-			ComHelpers.ReleaseAndEmpty(ref _pActiveScriptGarbageCollector);
 			ComHelpers.ReleaseAndEmpty(ref _pActiveScript);
 
 			if (_activeScript != null)

src/MsieJavaScriptEngine/ActiveScript/Debugging/IActiveScriptDebug32.cs

@@ -53,7 +53,9 @@ [In] [Out] ref IntPtr pAttrs
 		/// <param name="offset">Character offset relative to start of script text</param>
 		/// <param name="length">Number of characters in this context</param>
 		/// <param name="enumContexts">An enumerator of the code contexts in the specified range</param>
-		void EnumCodeContextsOfPosition(
+		/// <returns>The method returns an HRESULT</returns>
+		[PreserveSig]
+		uint EnumCodeContextsOfPosition(
 			[In] uint sourceContext,
 			[In] uint offset,
 			[In] uint length,

src/MsieJavaScriptEngine/ActiveScript/Debugging/IActiveScriptDebug64.cs

@@ -53,7 +53,9 @@ [In] [Out] ref IntPtr pAttrs
 		/// <param name="offset">Character offset relative to start of script text</param>
 		/// <param name="length">Number of characters in this context</param>
 		/// <param name="enumContexts">An enumerator of the code contexts in the specified range</param>
-		void EnumCodeContextsOfPosition(
+		/// <returns>The method returns an HRESULT</returns>
+		[PreserveSig]
+		uint EnumCodeContextsOfPosition(
 			[In] ulong sourceContext,
 			[In] uint offset,
 			[In] uint length,