Version 1.0.1

Author: Taritsyn

MsieJavaScriptEngine/ActiveScript/ActiveScriptSite.cs

@@ -103,7 +103,7 @@ public ActiveScriptSite(string documentVersion)
 
 			if (_jsEngine == null)
 			{
-				throw new NullReferenceException(Strings.Runtime_JsEngineInitializationFailed);
+				throw new JsEngineLoadException(Strings.Runtime_JsEngineNotLoaded);
 			}
 		}
 

MsieJavaScriptEngine/JsEngineLoadException.cs

@@ -0,0 +1,29 @@
+namespace MsieJavaScriptEngine
+{
+	using System;
+
+	/// <summary>
+	/// The exception that is thrown when a loading of JavaScript engine is failed
+	/// </summary>
+	internal sealed class JsEngineLoadException : Exception
+	{
+		/// <summary>
+		/// Initializes a new instance of the MsieJavaScriptEngine.JsEngineLoadException class 
+		/// with a specified error message
+		/// </summary>
+		/// <param name="message">The message that describes the error</param>
+		public JsEngineLoadException(string message)
+			: base(message)
+		{ }
+
+		/// <summary>
+		/// Initializes a new instance of the MsieJavaScriptEngine.JsEngineLoadException class 
+		/// with a specified error message and a reference to the inner exception that is the cause of this exception
+		/// </summary>
+		/// <param name="message">The error message that explains the reason for the exception</param>
+		/// <param name="innerException">The exception that is the cause of the current exception</param>
+		public JsEngineLoadException(string message, Exception innerException)
+			: base(message, innerException)
+		{ }
+	}
+}

MsieJavaScriptEngine/MsieJavaScriptEngine.csproj

@@ -57,6 +57,7 @@
     <Compile Include="ActiveScript\ScriptTextFlags.cs" />
     <Compile Include="ActiveScript\ScriptThreadState.cs" />
     <Compile Include="ActiveScript\ScriptTypeLibFlags.cs" />
+    <Compile Include="JsEngineLoadException.cs" />
     <Compile Include="JsEngines\ChakraJsEngine.cs" />
     <Compile Include="JsEngines\JsEngine.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -71,6 +72,7 @@
       <DependentUpon>Strings.resx</DependentUpon>
     </Compile>
     <Compile Include="MsieJsEngine.cs" />
+    <Compile Include="UndefinedValueException.cs" />
     <Compile Include="Utils.cs" />
   </ItemGroup>
   <ItemGroup>

MsieJavaScriptEngine/MsieJsEngine.cs

@@ -26,11 +26,6 @@ public sealed class MsieJsEngine : IDisposable
 		/// </summary>
 		const string MSIE_JAVASCRIPT_LIBRARY_RESOURCE_NAME = "MsieJavaScriptEngine.Resources.msieJavaScriptEngine.min.js";
 
-		/// <summary>
-		/// The error code is encountered in accessing to the undefined value
-		/// </summary>
-		const int VALUE_UNDEFINED_ERROR_CODE = -2146823279;
-
 		/// <summary>
 		/// Regular expression for working with JS-names
 		/// </summary>
@@ -247,26 +242,11 @@ public T Evaluate<T>(string expression)
 
 		private object EvaluateInner(string expression)
 		{
-			object result;
-			try
-			{
-				result = _activeScriptSite.ExecuteScriptText(expression, true);
-			}
-			catch (ActiveScriptException e)
-			{
-				if (e.ErrorCode == VALUE_UNDEFINED_ERROR_CODE)
-				{
-					result = null;
-				}
-				else
-				{
-					throw;
-				}
-			}
+			object result = _activeScriptSite.ExecuteScriptText(expression, true);
 
 			if (result == null)
 			{
-				throw new NullReferenceException(
+				throw new UndefinedValueException(
 					string.Format(Strings.Runtime_ExpressionResultIsUndefined, expression));
 			}
 
@@ -515,7 +495,7 @@ public bool HasProperty(string variableName, string propertyName)
 
 			if (!HasVariableInner(variableName))
 			{
-				throw new NullReferenceException(
+				throw new UndefinedValueException(
 					string.Format(Strings.Runtime_VariableNotExist, variableName));
 			}
 
@@ -550,7 +530,7 @@ public object GetPropertyValue(string variableName, string propertyName)
 
 			if (!HasVariableInner(variableName))
 			{
-				throw new NullReferenceException(
+				throw new UndefinedValueException(
 					string.Format(Strings.Runtime_VariableNotExist, variableName));
 			}
 
@@ -583,7 +563,7 @@ public T GetPropertyValue<T>(string variableName, string propertyName)
 
 			if (!HasVariableInner(variableName))
 			{
-				throw new NullReferenceException(
+				throw new UndefinedValueException(
 					string.Format(Strings.Runtime_VariableNotExist, variableName));
 			}
 

MsieJavaScriptEngine/Resources/Strings.Designer.cs

@@ -156,8 +156,8 @@
   <data name="Runtime_ItemNotFound" xml:space="preserve">
     <value>Item with name '{0}' not found.</value>
   </data>
-  <data name="Runtime_JsEngineInitializationFailed" xml:space="preserve">
-    <value>During initialization of JavaScript engine error has occurred.</value>
+  <data name="Runtime_JsEngineNotLoaded" xml:space="preserve">
+    <value>Could not load none of the JavaScript engines. Perhaps you have not installed the Internet Explorer browser.</value>
   </data>
   <data name="Runtime_PropertyNameIsForbidden" xml:space="preserve">
     <value>Property name '{0}' is forbidden, as one of its parts matches with the reserved word of JavaScript language.</value>

MsieJavaScriptEngine/Resources/Strings.resx

@@ -156,8 +156,8 @@
   <data name="Runtime_ItemNotFound" xml:space="preserve">
     <value>Элемент с именем "{0}" не найден!</value>
   </data>
-  <data name="Runtime_JsEngineInitializationFailed" xml:space="preserve">
-    <value>При инициализации JavaScript-движка произошла ошибка!</value>
+  <data name="Runtime_JsEngineNotLoaded" xml:space="preserve">
+    <value>Не удалось загрузить ни один из JavaScript-движков! Возможно, на вашем компьютере не установлен браузер Internet Explorer.</value>
   </data>
   <data name="Runtime_PropertyNameIsForbidden" xml:space="preserve">
     <value>Имя свойства "{0}" запрещено, т.к. одна из его частей совпадает с зарезервированным словом JavaScript!</value>

MsieJavaScriptEngine/Resources/Strings.ru-ru.resx

@@ -0,0 +1,29 @@
+namespace MsieJavaScriptEngine
+{
+	using System;
+
+	/// <summary>
+	/// The exception that is thrown when a specified value is undefined
+	/// </summary>
+	public sealed class UndefinedValueException : Exception
+	{
+		/// <summary>
+		/// Initializes a new instance of the MsieJavaScriptEngine.UndefinedValueException class 
+		/// with a specified error message
+		/// </summary>
+		/// <param name="message">The message that describes the error</param>
+		public UndefinedValueException(string message)
+			: base(message)
+		{ }
+
+		/// <summary>
+		/// Initializes a new instance of the MsieJavaScriptEngine.UndefinedValueException class 
+		/// with a specified error message and a reference to the inner exception that is the cause of this exception
+		/// </summary>
+		/// <param name="message">The error message that explains the reason for the exception</param>
+		/// <param name="innerException">The exception that is the cause of the current exception</param>
+		public UndefinedValueException(string message, Exception innerException)
+			: base(message, innerException)
+		{ }
+	}
+}

MsieJavaScriptEngine/UndefinedValueException.cs

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>MsieJavaScriptEngine</id>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
 	<title>MSIE JavaScript Engine for .NET</title>
     <authors>Andrey Taritsyn</authors>
     <owners>Andrey Taritsyn</owners>