In JsRT modes, JsVariantToValue and JsValueToVariant native methods are no longer used for embedding objects and types

Author: Taritsyn

src/MsieJavaScriptEngine/HostItemBase.cs renamed to src/MsieJavaScriptEngine/ActiveScript/HostItemBase.cs

@@ -5,7 +5,7 @@
 
 using MsieJavaScriptEngine.Helpers;
 
-namespace MsieJavaScriptEngine
+namespace MsieJavaScriptEngine.ActiveScript
 {
 	/// <summary>
 	/// Base class of item, that implements <see cref="IReflect"/> interface

src/MsieJavaScriptEngine/HostObject.cs renamed to src/MsieJavaScriptEngine/ActiveScript/HostObject.cs

@@ -7,7 +7,7 @@
 using MsieJavaScriptEngine.Constants;
 using MsieJavaScriptEngine.Helpers;
 
-namespace MsieJavaScriptEngine
+namespace MsieJavaScriptEngine.ActiveScript
 {
 	/// <summary>
 	/// Wrapper for object, that implements <see cref="IReflect"/> interface

src/MsieJavaScriptEngine/HostType.cs renamed to src/MsieJavaScriptEngine/ActiveScript/HostType.cs

@@ -7,7 +7,7 @@
 using MsieJavaScriptEngine.Constants;
 using MsieJavaScriptEngine.Helpers;
 
-namespace MsieJavaScriptEngine
+namespace MsieJavaScriptEngine.ActiveScript
 {
 	/// <summary>
 	/// Wrapper for type, that implements <see cref="IReflect"/> interface

src/MsieJavaScriptEngine/Extensions/StringExtensions.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 
 namespace MsieJavaScriptEngine.Extensions
 {
@@ -63,6 +62,7 @@ public static string TrimStart(this string source, string trimString)
 
 			return result;
 		}
+#if NETFRAMEWORK
 
 		/// <summary>
 		/// Converts a first letter of string to capital
@@ -83,7 +83,7 @@ public static string CapitalizeFirstLetter(this string source)
 			}
 
 			string result;
-			char firstCharacter = source.First();
+			char firstCharacter = source[0];
 
 			if (char.IsLower(firstCharacter))
 			{
@@ -100,6 +100,7 @@ public static string CapitalizeFirstLetter(this string source)
 
 			return result;
 		}
+#endif
 
 		/// <summary>
 		/// Splits a string into lines

src/MsieJavaScriptEngine/Helpers/ComHelpers.cs

@@ -27,26 +27,6 @@ public static IntPtr CreateInstanceByClsid<T>(Guid clsid)
 			return pInterface;
 		}
 
-		public static IntPtr CreateInstanceByProgId<T>(string progId)
-		{
-			Guid clsid = ClsidFromProgId(progId);
-			IntPtr pInterface = CreateInstanceByClsid<T>(clsid);
-
-			return pInterface;
-		}
-
-		private static Guid ClsidFromProgId(string progId)
-		{
-			Guid clsid;
-
-			if (!Guid.TryParseExact(progId, "B", out clsid))
-			{
-				HResult.Check(NativeMethods.CLSIDFromProgID(progId, out clsid));
-			}
-
-			return clsid;
-		}
-
 		public static bool TryCreateComObject<T>(string progId, string serverName, out T obj) where T : class
 		{
 			Type type;
@@ -92,14 +72,6 @@ public static IntPtr QueryInterfaceNoThrow<T>(IntPtr pUnknown)
 			return result == ComErrorCode.S_OK ? pInterface : IntPtr.Zero;
 		}
 
-		public static T GetMethodDelegate<T>(IntPtr pInterface, int methodIndex) where T : class
-		{
-			var pVTable = Marshal.ReadIntPtr(pInterface);
-			var pMethod = Marshal.ReadIntPtr(pVTable + methodIndex * IntPtr.Size);
-
-			return Marshal.GetDelegateForFunctionPointer(pMethod, typeof(T)) as T;
-		}
-
 		public static void ReleaseAndEmpty(ref IntPtr pUnk)
 		{
 			if (pUnk != IntPtr.Zero)
@@ -121,12 +93,6 @@ public static extern uint CoCreateInstance(
 				[In] ref Guid iid,
 				[Out] out IntPtr pInterface
 			);
-
-			[DllImport("ole32.dll", ExactSpelling = true)]
-			public static extern uint CLSIDFromProgID(
-				[In] [MarshalAs(UnmanagedType.LPWStr)] string progId,
-				[Out] out Guid clsid
-			);
 		}
 
 		#endregion

src/MsieJavaScriptEngine/Helpers/NumericHelpers.cs

@@ -12,34 +12,6 @@ internal static class NumericHelpers
 		private const double MAX_INTEGER_IN_DOUBLE = (1L << 53) - 1;
 
 
-		/// <summary>
-		/// Gets a value indicating whether the specified type is one of the numeric types
-		/// </summary>
-		/// <param name="type">The type</param>
-		/// <returns>true if the specified type is one of the numeric types; otherwise, false</returns>
-		public static bool IsNumericType(Type type)
-		{
-			TypeCode typeCode = type.GetTypeCode();
-
-			switch (typeCode)
-			{
-				case TypeCode.SByte:
-				case TypeCode.Byte:
-				case TypeCode.Int16:
-				case TypeCode.UInt16:
-				case TypeCode.Int32:
-				case TypeCode.UInt32:
-				case TypeCode.Int64:
-				case TypeCode.UInt64:
-				case TypeCode.Single:
-				case TypeCode.Double:
-				case TypeCode.Decimal:
-					return true;
-				default:
-					return false;
-			}
-		}
-
 		/// <summary>
 		/// Casts a double value to the correct type
 		/// </summary>

src/MsieJavaScriptEngine/Helpers/ReflectionHelpers.cs

@@ -1,13 +1,9 @@
 using System;
-#if !NETFRAMEWORK
 using System.Collections.Generic;
 using System.Linq;
-#endif
 using System.Reflection;
-#if !NETFRAMEWORK
 
 using MsieJavaScriptEngine.Utilities;
-#endif
 
 namespace MsieJavaScriptEngine.Helpers
 {
@@ -66,7 +62,7 @@ public static MethodInfo[] GetFullyFledgedMethods(MethodInfo[] methods)
 
 			return fullyFledgedMethods;
 		}
-#else
+#endif
 
 		public static void FixFieldValueType(ref object value, FieldInfo field)
 		{
@@ -269,6 +265,5 @@ public ushort CompatibilityScore
 				set;
 			}
 		}
-#endif
 	}
 }

src/MsieJavaScriptEngine/Helpers/TypeMappingHelpers.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Linq;
 
+using MsieJavaScriptEngine.ActiveScript;
 using MsieJavaScriptEngine.Utilities;
 
 namespace MsieJavaScriptEngine.Helpers

src/MsieJavaScriptEngine/JsRt/Edge/EdgeJsValue.cs

@@ -304,24 +304,6 @@ public static EdgeJsValue FromString(string value)
 
 			return reference;
 		}
-#if NETFRAMEWORK
-
-		/// <summary>
-		/// Creates a JavaScript value that is a projection of the passed in object
-		/// </summary>
-		/// <remarks>
-		/// Requires an active script context.
-		/// </remarks>
-		/// <param name="value">The object to be projected</param>
-		/// <returns>The JavaScript value that is a projection of the object</returns>
-		public static EdgeJsValue FromObject(object value)
-		{
-			EdgeJsValue reference;
-			EdgeJsErrorHelpers.ThrowIfError(EdgeNativeMethods.JsVariantToValue(ref value, out reference));
-
-			return reference;
-		}
-#endif
 
 		/// <summary>
 		/// Creates a new <c>Object</c>
@@ -611,23 +593,6 @@ public int ToInt32()
 
 			return Marshal.PtrToStringUni(buffer, (int)length);
 		}
-#if NETFRAMEWORK
-
-		/// <summary>
-		/// Retrieves a object representation of an <c>Object</c> value
-		/// </summary>
-		/// <remarks>
-		/// Requires an active script context.
-		/// </remarks>
-		/// <returns>The object representation of the value</returns>
-		public object ToObject()
-		{
-			object value;
-			EdgeJsErrorHelpers.ThrowIfError(EdgeNativeMethods.JsValueToVariant(this, out value));
-
-			return value;
-		}
-#endif
 
 		/// <summary>
 		/// Converts a value to <c>Boolean</c> using regular JavaScript semantics

src/MsieJavaScriptEngine/JsRt/Edge/EdgeNativeMethods.cs

@@ -148,16 +148,6 @@ internal static extern JsErrorCode JsSetRuntimeBeforeCollectCallback(EdgeJsRunti
 
 		[DllImport(DllName.Chakra)]
 		internal static extern JsErrorCode JsConvertValueToString(EdgeJsValue value, out EdgeJsValue stringValue);
-#if NETFRAMEWORK
-
-		[DllImport(DllName.Chakra)]
-		internal static extern JsErrorCode JsVariantToValue([MarshalAs(UnmanagedType.Struct)] ref object var,
-			out EdgeJsValue value);
-
-		[DllImport(DllName.Chakra)]
-		internal static extern JsErrorCode JsValueToVariant(EdgeJsValue obj,
-			[MarshalAs(UnmanagedType.Struct)] out object var);
-#endif
 
 		[DllImport(DllName.Chakra)]
 		internal static extern JsErrorCode JsGetGlobalObject(out EdgeJsValue globalObject);