Added the EmbedHostObject method (embeds a instance of simple class, structure or delegate to script code)

Author: Taritsyn

MsieJavaScriptEngine.sln

@@ -26,6 +26,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsieJavaScriptEngine.Test.C
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsieJavaScriptEngine.Test.Classic", "test\MsieJavaScriptEngine.Test.Classic\MsieJavaScriptEngine.Test.Classic.csproj", "{50453B82-ACBF-4E25-9582-1113F274D53E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsieJavaScriptEngine.ConsoleTests", "test\MsieJavaScriptEngine.ConsoleTests\MsieJavaScriptEngine.ConsoleTests.csproj", "{AFB5ABDF-4F9B-455B-BDA0-CC03D5597FE5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharedFiles", "SharedFiles", "{76F4C14E-54ED-42AC-84F7-2072B14ED59E}"
+	ProjectSection(SolutionItems) = preProject
+		test\SharedFiles\link.txt = test\SharedFiles\link.txt
+		test\SharedFiles\square.js = test\SharedFiles\square.js
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -60,6 +68,10 @@ Global
 		{50453B82-ACBF-4E25-9582-1113F274D53E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{50453B82-ACBF-4E25-9582-1113F274D53E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50453B82-ACBF-4E25-9582-1113F274D53E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFB5ABDF-4F9B-455B-BDA0-CC03D5597FE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFB5ABDF-4F9B-455B-BDA0-CC03D5597FE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFB5ABDF-4F9B-455B-BDA0-CC03D5597FE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFB5ABDF-4F9B-455B-BDA0-CC03D5597FE5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -72,5 +84,7 @@ Global
 		{7064E0DB-0B73-4534-84D0-1C96DA7E5AD1} = {2A0DC227-73C5-4E3A-853A-83007AD56B85}
 		{21EA96CC-71E2-4CDD-B95A-C75EBD4AF2FA} = {2A0DC227-73C5-4E3A-853A-83007AD56B85}
 		{50453B82-ACBF-4E25-9582-1113F274D53E} = {2A0DC227-73C5-4E3A-853A-83007AD56B85}
+		{AFB5ABDF-4F9B-455B-BDA0-CC03D5597FE5} = {2A0DC227-73C5-4E3A-853A-83007AD56B85}
+		{76F4C14E-54ED-42AC-84F7-2072B14ED59E} = {2A0DC227-73C5-4E3A-853A-83007AD56B85}
 	EndGlobalSection
 EndGlobal

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.cs

@@ -41,6 +41,11 @@ internal abstract class ActiveScriptJsEngineBase : IInnerJsEngine
 		/// </summary>
 		private ActiveScriptSiteWrapper _activeScriptSite;
 
+		/// <summary>
+		/// JavaScript engine mode
+		/// </summary>
+		private readonly JsEngineMode _engineMode;
+
 		/// <summary>
 		/// Name of JavaScript engine mode
 		/// </summary>
@@ -61,15 +66,16 @@ internal abstract class ActiveScriptJsEngineBase : IInnerJsEngine
 		/// Constructs instance of the ActiveScript JavaScript engine
 		/// </summary>
 		/// <param name="clsid">CLSID of JavaScript engine</param>
-		/// <param name="engineModeName">Name of JavaScript engine mode</param>
+		/// <param name="engineMode">JavaScript engine mode</param>
 		/// <param name="lowerIeVersion">Lowest supported version of Internet Explorer</param>
 		/// <param name="languageVersion">Version of script language</param>
 		/// <param name="useEcmaScript5Polyfill">Flag for whether to use the ECMAScript 5 Polyfill</param>
 		/// <param name="useJson2Library">Flag for whether to use the JSON2 library</param>
-		protected ActiveScriptJsEngineBase(string clsid, string engineModeName, string lowerIeVersion,
+		protected ActiveScriptJsEngineBase(string clsid, JsEngineMode engineMode, string lowerIeVersion,
 			ScriptLanguageVersion languageVersion, bool useEcmaScript5Polyfill, bool useJson2Library)
 		{
-			_engineModeName = engineModeName;
+			_engineMode = engineMode;
+			_engineModeName = JsEngineModeHelpers.GetModeName(engineMode);
 			_pActiveScript = IntPtr.Zero;
 
 			try
@@ -167,43 +173,43 @@ protected static bool IsSupported(string clsid, ref bool? isSupported, ref objec
 		}
 
 		/// <summary>
-		/// Executes a mapping from the host type to a script type
+		/// Makes a mapping of value from the host type to a script type
 		/// </summary>
 		/// <param name="value">The source value</param>
 		/// <returns>The mapped value</returns>
-		private static object MapToScriptType(object value)
+		private object MapToScriptType(object value)
 		{
-			if (value == null)
-			{
-				return DBNull.Value;
-			}
-
-			if (value is Undefined)
-			{
-				return null;
-			}
+			return TypeMappingHelpers.MapToScriptType(value, _engineMode);
+		}
 
-			return value;
+		/// <summary>
+		/// Makes a mapping of array items from the host type to a script type
+		/// </summary>
+		/// <param name="args">The source array</param>
+		/// <returns>The mapped array</returns>
+		private object[] MapToScriptType(object[] args)
+		{
+			return TypeMappingHelpers.MapToScriptType(args, _engineMode);
 		}
 
 		/// <summary>
-		/// Executes a mapping from the script type to a host type
+		/// Makes a mapping of value from the script type to a host type
 		/// </summary>
 		/// <param name="value">The source value</param>
 		/// <returns>The mapped value</returns>
-		private static object MapToHostType(object value)
+		private object MapToHostType(object value)
 		{
-			if (value == null)
-			{
-				return Undefined.Value;
-			}
-
-			if (value is DBNull)
-			{
-				return null;
-			}
+			return TypeMappingHelpers.MapToHostType(value);
+		}
 
-			return value;
+		/// <summary>
+		/// Makes a mapping of array itemp from the script type to a host type
+		/// </summary>
+		/// <param name="args">The source array</param>
+		/// <returns>The mapped array</returns>
+		private object[] MapToHostType(object[] args)
+		{
+			return TypeMappingHelpers.MapToHostType(args);
 		}
 
 		private JsRuntimeException ConvertActiveScriptExceptionToJsRuntimeException(
@@ -367,16 +373,7 @@ public void Execute(string code)
 
 		public object CallFunction(string functionName, params object[] args)
 		{
-			int argumentCount = args.Length;
-			var processedArgs = new object[argumentCount];
-
-			if (argumentCount > 0)
-			{
-				for (int argumentIndex = 0; argumentIndex < argumentCount; argumentIndex++)
-				{
-					processedArgs[argumentIndex] = MapToScriptType(args[argumentIndex]);
-				}
-			}
+			var processedArgs = MapToScriptType(args);
 
 			object result = InvokeScript(() =>
 			{
@@ -435,6 +432,34 @@ public void RemoveVariable(string variableName)
 			InvokeScript(() => _activeScriptSite.DeleteProperty(variableName));
 		}
 
+		public void EmbedHostObject(string itemName, object value)
+		{
+			InvokeScript(() =>
+			{
+				var processedValue = MapToScriptType(value);
+				object oldValue = _activeScriptSite.GetItem(itemName);
+				_activeScriptSite.SetItem(itemName, processedValue);
+
+				try
+				{
+					_activeScript.AddNamedItem(itemName, ScriptItemFlags.IsVisible | ScriptItemFlags.GlobalMembers);
+				}
+				catch (Exception)
+				{
+					if (oldValue != null)
+					{
+						_activeScriptSite.SetItem(itemName, oldValue);
+					}
+					else
+					{
+						_activeScriptSite.RemoveItem(itemName);
+					}
+
+					throw;
+				}
+			});
+		}
+
 		#endregion
 
 		#region IDisposable implementation

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptSiteWrapper.cs

@@ -35,6 +35,11 @@ internal class ActiveScriptSiteWrapper : IActiveScriptSite, IDisposable
 		/// </summary>
 		private Dictionary<string, object> _siteItems = new Dictionary<string, object>();
 
+		/// <summary>
+		/// Synchronizer
+		/// </summary>
+		private readonly object _synchronizer = new object();
+
 		/// <summary>
 		/// Last ActiveScript exception
 		/// </summary>
@@ -124,32 +129,29 @@ private void InitScriptDispatch()
 		/// </summary>
 		/// <param name="name">The name associated with the item, as specified in the
 		/// IActiveScript.AddNamedItem method</param>
-		private object GetItem(string name)
+		public object GetItem(string name)
 		{
-			lock (_siteItems)
+			lock (_synchronizer)
 			{
 				object result;
 
 				return _siteItems.TryGetValue(name, out result) ? result : null;
 			}
 		}
 
-		/// <summary>
-		/// Allows the scripting engine to obtain information about an item added with the
-		/// IActiveScript.AddNamedItem method. Gets the COM ITypeInfo
-		/// </summary>
-		/// <param name="name">The name associated with the item, as specified in the
-		/// IActiveScript.AddNamedItem method</param>
-		private IntPtr GetTypeInfo(string name)
+		public void SetItem(string name, object value)
 		{
-			lock (_siteItems)
+			lock (_synchronizer)
 			{
-				if (!_siteItems.ContainsKey(name))
-				{
-					return IntPtr.Zero;
-				}
+				_siteItems[name] = value;
+			}
+		}
 
-				return Marshal.GetITypeInfoForType(_siteItems[name].GetType());
+		public void RemoveItem(string name)
+		{
+			lock (_synchronizer)
+			{
+				_siteItems.Remove(name);
 			}
 		}
 
@@ -330,10 +332,13 @@ private void Dispose(bool disposing)
 
 				_lastException = null;
 
-				if (_siteItems != null)
+				lock (_synchronizer)
 				{
-					_siteItems.Clear();
-					_siteItems = null;
+					if (_siteItems != null)
+					{
+						_siteItems.Clear();
+						_siteItems = null;
+					}
 				}
 
 				if (_dispatch != null)
@@ -372,48 +377,43 @@ public void GetLcid(out int lcid)
 		/// </summary>
 		/// <param name="name">The name associated with the item, as specified in the
 		/// IActiveScript.AddNamedItem method</param>
-		/// <param name="returnMask">A bit mask specifying what information about the item should be
+		/// <param name="mask">A bit mask specifying what information about the item should be
 		/// returned. The scripting engine should request the minimum amount of information possible
 		/// because some of the return parameters (for example, ITypeInfo) can take considerable
 		/// time to load or generate</param>
-		/// <param name="item">A variable that receives a pointer to the IUnknown interface associated
+		/// <param name="pUnkItem">A variable that receives a pointer to the IUnknown interface associated
 		/// with the given item. The scripting engine can use the IUnknown.QueryInterface method to
-		/// obtain the IDispatch interface for the item. This parameter receives null if returnMask
+		/// obtain the IDispatch interface for the item. This parameter receives null if mask
 		/// does not include the ScriptInfo.IUnknown value. Also, it receives null if there is no
 		/// object associated with the item name; this mechanism is used to create a simple class when
 		/// the named item was added with the ScriptItem.CodeOnly flag set in the
 		/// IActiveScript.AddNamedItem method.</param>
 		/// <param name="pTypeInfo">A variable that receives a pointer to the ITypeInfo interface
-		/// associated with the item. This parameter receives null if returnMask does not include the
+		/// associated with the item. This parameter receives null if mask does not include the
 		/// ScriptInfo.ITypeInfo value, or if type information is not available for this item. If type
 		/// information is not available, the object cannot source events, and name binding must be
 		/// realized with the IDispatch.GetIDsOfNames method. Note that the ITypeInfo interface
 		/// retrieved describes the item's coclass (TKIND_COCLASS) because the object may support
 		/// multiple interfaces and event interfaces. If the item supports the IProvideMultipleTypeInfo
 		/// interface, the ITypeInfo interface retrieved is the same as the index zero ITypeInfo that
 		/// would be obtained using the IProvideMultipleTypeInfo.GetInfoOfIndex method.</param>
-		public void GetItemInfo(string name, ScriptInfoFlags returnMask, out object item, out IntPtr pTypeInfo)
+		public void GetItemInfo(string name, ScriptInfoFlags mask, ref IntPtr pUnkItem, ref IntPtr pTypeInfo)
 		{
-			if ((returnMask & ScriptInfoFlags.IUnknown) > 0)
+			object item = GetItem(name);
+			if (item == null)
 			{
-				item = GetItem(name);
-				if (item == null)
-				{
-					throw new COMException(string.Format(Strings.Runtime_ItemNotFound, name), ComErrorCode.ElementNotFound);
-				}
-			}
-			else
-			{
-				item = null;
+				throw new COMException(
+					string.Format(Strings.Runtime_ItemNotFound, name), ComErrorCode.ElementNotFound);
 			}
 
-			if ((returnMask & ScriptInfoFlags.ITypeInfo) > 0)
+			if (mask.HasFlag(ScriptInfoFlags.IUnknown))
 			{
-				pTypeInfo = GetTypeInfo(name);
+				pUnkItem = Marshal.GetIDispatchForObject(item);
 			}
-			else
+
+			if (mask.HasFlag(ScriptInfoFlags.ITypeInfo))
 			{
-				pTypeInfo = IntPtr.Zero;
+				pTypeInfo = Marshal.GetITypeInfoForType(item.GetType());
 			}
 		}
 

src/MsieJavaScriptEngine/ActiveScript/ChakraActiveScriptJsEngine.cs

@@ -24,7 +24,7 @@ internal sealed class ChakraActiveScriptJsEngine : ActiveScriptJsEngineBase
 		/// Constructs instance of the Chakra ActiveScript JavaScript engine
 		/// </summary>
 		public ChakraActiveScriptJsEngine()
-			: base(CHAKRA_CLSID, JsEngineModeName.ChakraActiveScript, "9",
+			: base(CHAKRA_CLSID, JsEngineMode.ChakraActiveScript, "9",
 				ScriptLanguageVersion.EcmaScript5, false, false)
 		{ }
 

src/MsieJavaScriptEngine/ActiveScript/ClassicActiveScriptJsEngine.cs

@@ -26,7 +26,7 @@ internal sealed class ClassicActiveScriptJsEngine : ActiveScriptJsEngineBase
 		/// <param name="useEcmaScript5Polyfill">Flag for whether to use the ECMAScript 5 Polyfill</param>
 		/// <param name="useJson2Library">Flag for whether to use the JSON2 library</param>
 		public ClassicActiveScriptJsEngine(bool useEcmaScript5Polyfill, bool useJson2Library)
-			: base(CLASSIC_CLSID, JsEngineModeName.Classic, "6",
+			: base(CLASSIC_CLSID, JsEngineMode.Classic, "6",
 				ScriptLanguageVersion.None, useEcmaScript5Polyfill, useJson2Library)
 		{ }
 

src/MsieJavaScriptEngine/ActiveScript/IActiveScriptSite.cs

@@ -34,19 +34,19 @@ void GetLcid(
 		/// </summary>
 		/// <param name="name">The name associated with the item, as specified in the
 		/// IActiveScript.AddNamedItem method</param>
-		/// <param name="returnMask">A bit mask specifying what information about the item should be
+		/// <param name="mask">A bit mask specifying what information about the item should be
 		/// returned. The scripting engine should request the minimum amount of information possible
 		/// because some of the return parameters (for example, ITypeInfo) can take considerable
 		/// time to load or generate.</param>
-		/// <param name="item">A variable that receives a pointer to the IUnknown interface associated
+		/// <param name="pUnkItem">A variable that receives a pointer to the IUnknown interface associated
 		/// with the given item. The scripting engine can use the IUnknown.QueryInterface method to
-		/// obtain the IDispatch interface for the item. This parameter receives null if returnMask
+		/// obtain the IDispatch interface for the item. This parameter receives null if mask
 		/// does not include the ScriptInfo.IUnknown value. Also, it receives null if there is no
 		/// object associated with the item name; this mechanism is used to create a simple class when
 		/// the named item was added with the ScriptItem.CodeOnly flag set in the
 		/// IActiveScript.AddNamedItem method.</param>
 		/// <param name="pTypeInfo">A variable that receives a pointer to the ITypeInfo interface
-		/// associated with the item. This parameter receives null if returnMask does not include the
+		/// associated with the item. This parameter receives null if mask does not include the
 		/// ScriptInfo.ITypeInfo value, or if type information is not available for this item. If type
 		/// information is not available, the object cannot source events, and name binding must be
 		/// realized with the IDispatch.GetIDsOfNames method. Note that the ITypeInfo interface
@@ -56,9 +56,9 @@ void GetLcid(
 		/// would be obtained using the IProvideMultipleTypeInfo.GetInfoOfIndex method.</param>
 		void GetItemInfo(
 			[In] [MarshalAs(UnmanagedType.LPWStr)] string name,
-			[In] ScriptInfoFlags returnMask,
-			[Out] [MarshalAs(UnmanagedType.IUnknown)] out object item,
-			[Out] out IntPtr pTypeInfo);
+			[In] ScriptInfoFlags mask,
+			[In] [Out] ref IntPtr pUnkItem,
+			[In] [Out] ref IntPtr pTypeInfo);
 
 		/// <summary>
 		/// Retrieves a host-defined string that uniquely identifies the current document version. If