Merge branch 'master' of github.com:tyranid/DotNetToJScript

tyranid · Oct 7, 2017 · 69d1ddb · 69d1ddb
2 parents f043d0d + 62dea69
commit 69d1ddb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/DotNetToJScript/Resources/jscript_template.txt b/DotNetToJScript/Resources/jscript_template.txt
@@ -18,9 +18,8 @@ try {
 	var stm = base64ToStream(serialized_obj);
 	var fmt = new ActiveXObject('System.Runtime.Serialization.Formatters.Binary.BinaryFormatter');
 	var al = new ActiveXObject('System.Collections.ArrayList');
-	var n = fmt.SurrogateSelector;
 	var d = fmt.Deserialize_2(stm);
-	al.Add(n);
+	al.Add(undefined);
 	var o = d.DynamicInvoke(al.ToArray()).CreateInstance(entry_class);
 	%ADDEDSCRIPT%
 } catch (e) {

diff --git a/DotNetToJScript/Resources/vbs_template.txt b/DotNetToJScript/Resources/vbs_template.txt
@@ -17,7 +17,7 @@ entry_class = "%CLASS%"
 Dim fmt, al, d, o
 Set fmt = CreateObject("System.Runtime.Serialization.Formatters.Binary.BinaryFormatter")
 Set al = CreateObject("System.Collections.ArrayList")
-al.Add fmt.SurrogateSelector
+al.Add Empty
 
 Set d = fmt.Deserialize_2(Base64ToStream(s))
 Set o = d.DynamicInvoke(al.ToArray()).CreateInstance(entry_class)

diff --git a/DotNetToJScript/VBScriptGenerator.cs b/DotNetToJScript/VBScriptGenerator.cs
@@ -28,7 +28,7 @@ public static string GetScriptHeader(RuntimeVersion version, string debug_statem
             builder.AppendLine("Sub DebugPrint(s)");
             if (!String.IsNullOrEmpty(debug_statement))
             {
-                builder.AppendLine("{0} s");
+                builder.AppendFormat("{0} s", debug_statement).AppendLine();
             }
             builder.AppendLine("End Sub");
             builder.AppendLine();