Skip to content

Commit f294087

Browse files
committed
Version 1.4.4 (Source code of the ChakraJsRtJsEngine was synchronized with the Chakra Sample Hosts version of July 22, 2014)
1 parent 0dd983b commit f294087

File tree

6 files changed

+15
-13
lines changed

6 files changed

+15
-13
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
Change log
22
==========
33

4+
## July 22, 2014 - v1.4.4
5+
* Source code of the `ChakraJsRtJsEngine` was synchronized with the Chakra Sample Hosts version of July 22, 2014
6+
47
## April 27, 2014 - v1.4.3
58
* In solution was enabled NuGet package restore
69
* Fixed [JavaScriptEngineSwitcher.Msie's bug #7](https://github.com/Taritsyn/JavaScriptEngineSwitcher/issues/7) "MsieJavaScriptEngine.ActiveScript.ActiveScriptException not wrapped"

MsieJavaScriptEngine/JsRt/JavaScriptPropertyId.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace MsieJavaScriptEngine.JsRt
22
{
33
using System;
4+
using System.Runtime.InteropServices;
45

56
/// <summary>
67
/// A property identifier.
@@ -45,9 +46,9 @@ public string Name
4546
{
4647
get
4748
{
48-
string name;
49-
Native.ThrowIfError(Native.JsGetPropertyNameFromId(this, out name));
50-
return name;
49+
IntPtr buffer;
50+
Native.ThrowIfError(Native.JsGetPropertyNameFromId(this, out buffer));
51+
return Marshal.PtrToStringAuto(buffer);
5152
}
5253
}
5354

MsieJavaScriptEngine/JsRt/Native.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ internal static void ThrowIfError(JavaScriptErrorCode error)
447447
internal static extern JavaScriptErrorCode JsGetPropertyIdFromName(string name, out JavaScriptPropertyId propertyId);
448448

449449
[DllImport("jscript9.dll")]
450-
internal static extern JavaScriptErrorCode JsGetPropertyNameFromId(JavaScriptPropertyId propertyId, out string name);
450+
internal static extern JavaScriptErrorCode JsGetPropertyNameFromId(JavaScriptPropertyId propertyId, out IntPtr buffer);
451451

452452
[DllImport("jscript9.dll")]
453453
internal static extern JavaScriptErrorCode JsGetUndefinedValue(out JavaScriptValue undefinedValue);

MsieJavaScriptEngine/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
[assembly: ComVisible(false)]
1414
[assembly: Guid("ae6911c9-e2a9-4386-ab90-3722a9166564")]
1515

16-
[assembly: AssemblyVersion("1.4.3.0")]
17-
[assembly: AssemblyFileVersion("1.4.3.0")]
16+
[assembly: AssemblyVersion("1.4.4.0")]
17+
[assembly: AssemblyFileVersion("1.4.4.0")]
1818

1919
[module: DefaultCharSet(CharSet.Unicode)]

NuGet/MsieJavaScriptEngine.nuspec

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>MsieJavaScriptEngine</id>
5-
<version>1.4.3</version>
5+
<version>1.4.4</version>
66
<title>MSIE JavaScript Engine for .NET</title>
77
<authors>Andrey Taritsyn</authors>
88
<owners>Andrey Taritsyn</owners>
@@ -12,8 +12,7 @@
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<description>This project is a .NET wrapper for working with the Internet Explorer's JavaScript engines (JsRT version of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine). Project was based on the code of SassAndCoffee.JavaScript (http://github.com/paulcbetts/SassAndCoffee) and Chakra Sample Hosts (http://github.com/panopticoncentral/chakra-host).</description>
1414
<summary>This project is a .NET wrapper for working with the Internet Explorer's JavaScript engines (JsRT version of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine).</summary>
15-
<releaseNotes>1. In solution was enabled NuGet package restore;
16-
2. Fixed JavaScriptEngineSwitcher.Msie's bug #7 "MsieJavaScriptEngine.ActiveScript.ActiveScriptException not wrapped".</releaseNotes>
15+
<releaseNotes>Source code of the `ChakraJsRtJsEngine` was synchronized with the Chakra Sample Hosts version of July 22, 2014.</releaseNotes>
1716
<copyright>Copyright 2014 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
1817
<language>en-US</language>
1918
<tags>JavaScript ECMAScript MSIE IE Chakra</tags>

NuGet/readme.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22

33
----------------------------------------------------------------------
4-
README file for MSIE JavaScript Engine for .NET 1.4.3
4+
README file for MSIE JavaScript Engine for .NET 1.4.4
55

66
----------------------------------------------------------------------
77

@@ -21,9 +21,8 @@
2121
=============
2222
RELEASE NOTES
2323
=============
24-
1. In solution was enabled NuGet package restore;
25-
2. Fixed JavaScriptEngineSwitcher.Msie's bug #7
26-
"MsieJavaScriptEngine.ActiveScript.ActiveScriptException not wrapped".
24+
Source code of the `ChakraJsRtJsEngine` was synchronized with the
25+
Chakra Sample Hosts version of July 22, 2014.
2726

2827
============
2928
PROJECT SITE

0 commit comments

Comments
 (0)