Commit old fixes

Author: LB--

Ext.json

@@ -45,12 +45,12 @@
 		"Separator",
 		[0, "Get Error"],
 		[1, "Get String"],
-		[1, "Get Integer"],
-		[1, "Get Long (64-bit as string)"],
-		[1, "Get Float"],
-		[1, "Get Double (64-bit as string)"],
-		[1, "Get Number of Values"],
-		[1, "Get Boolean (1|0)"],
+		[2, "Get Integer"],
+		[3, "Get Long (64-bit as string)"],
+		[4, "Get Float"],
+		[5, "Get Double (64-bit as string)"],
+		[6, "Get Number of Values"],
+		[7, "Get Boolean (1|0)"],
 		"Separator"
 	],
 

Extension.cpp

@@ -49,12 +49,13 @@ Extension::Extension(RD *rd, SerializedED *SED, createObjectInfo *COB) : rd(rd),
 	LinkCondition(8, IsTrue);
 
 	LinkExpression(0, GetError);
-	LinkExpression(1, GetInteger);
-	LinkExpression(2, GetLong);
-	LinkExpression(3, GetFloat);
-	LinkExpression(4, GetDouble);
-	LinkExpression(5, GetNumValues);
-	LinkExpression(6, GetBoolNum);
+	LinkExpression(1, GetString);
+	LinkExpression(2, GetInteger);
+	LinkExpression(3, GetLong);
+	LinkExpression(4, GetFloat);
+	LinkExpression(5, GetDouble);
+	LinkExpression(6, GetNumValues);
+	LinkExpression(7, GetBoolNum);
 
 	current = root = json_parse("null", 4);
 }

Extension.hpp

@@ -205,9 +205,9 @@ class Extension
 	TCHAR const*GetString()
 	{
 		if(!IsString()) return _T("");
-		TCHAR const*t = Edif::ConvertString(current->u.string.ptr);
+		TCHAR *t = Edif::ConvertString(current->u.string.ptr);
 		TCHAR *c = Runtime.CopyString(t);
-		Edif::FreeString(c);
+		Edif::FreeString(t);
 		return c;
 	}
 	int GetInteger()

Template.vcproj

@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="Template"
+	Name="JSON_Object"
 	ProjectGUID="{3BCB4C73-71F6-43B6-803D-41411F92652A}"
 	RootNamespace="Template"
 	TargetFrameworkVersion="131072"