Updates on MCWindowsVersionInfoParseVersion() method

livecodepanos · livecodepanos · commit 55a747479d5b · 2013-09-30T11:24:44.000+01:00
diff --git a/engine/src/deploy_windows.cpp b/engine/src/deploy_windows.cpp
@@ -1071,10 +1071,10 @@ static void MCWindowsVersionInfoDestroy(MCWindowsVersionInfo *self)
 	delete self;
 }
 
-static uint64_t MCWindowsVersionInfoParseVersion(const char *p_string)
+static uint64_t MCWindowsVersionInfoParseVersion(MCStringRef p_string)
 {
 	uint32_t a, b, c, d;
-	if (sscanf(p_string, "%u.%u.%u.%u", &a, &b, &c, &d) != 4)
+	if (sscanf(MCStringGetCString(p_string), "%u.%u.%u.%u", &a, &b, &c, &d) != 4)
 		return 0;
 	return 0ULL | ((uint64_t)a << 48) | ((uint64_t)b << 32) | (c << 16) | d;
 }
@@ -1116,15 +1116,15 @@ static bool MCWindowsResourcesAddVersionInfo(MCWindowsResources& self, MCArrayRe
 	if (t_success)
 	{
 		MCNewAutoNameRef t_key1, t_key2;
-        MCNameCreateWithCString("FileVersion", &t_key1);
-		MCNameCreateWithCString("ProductVersion", &t_key2);
+        /* UNCHECKED */ MCNameCreateWithCString("FileVersion", &t_key1);
+		/* UNCHECKED */ MCNameCreateWithCString("ProductVersion", &t_key2);
             
         MCValueRef t_value1, t_value2;
             
         if (MCArrayFetchValue(p_info, false, *t_key1, t_value1))
-            t_file_version = MCWindowsVersionInfoParseVersion(MCStringGetCString((MCStringRef)t_value1));   
+            t_file_version = MCWindowsVersionInfoParseVersion((MCStringRef)t_value1);   
 		if (MCArrayFetchValue(p_info, false, *t_key2, t_value2))
-            t_product_version = MCWindowsVersionInfoParseVersion(MCStringGetCString((MCStringRef)t_value2));
+            t_product_version = MCWindowsVersionInfoParseVersion((MCStringRef)t_value2);
 		MCValueRelease(t_value1);
 		MCValueRelease(t_value2);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1071,10 +1071,10 @@ static void MCWindowsVersionInfoDestroy(MCWindowsVersionInfo *self)`
`1071`	`1071`	`delete self;`
`1072`	`1072`	`}`
`1073`	`1073`
`1074`		`-static uint64_t MCWindowsVersionInfoParseVersion(const char *p_string)`
	`1074`	`+static uint64_t MCWindowsVersionInfoParseVersion(MCStringRef p_string)`
`1075`	`1075`	`{`
`1076`	`1076`	`uint32_t a, b, c, d;`
`1077`		`- if (sscanf(p_string, "%u.%u.%u.%u", &a, &b, &c, &d) != 4)`
	`1077`	`+ if (sscanf(MCStringGetCString(p_string), "%u.%u.%u.%u", &a, &b, &c, &d) != 4)`
`1078`	`1078`	`return 0;`
`1079`	`1079`	`return 0ULL \| ((uint64_t)a << 48) \| ((uint64_t)b << 32) \| (c << 16) \| d;`
`1080`	`1080`	`}`
`@@ -1116,15 +1116,15 @@ static bool MCWindowsResourcesAddVersionInfo(MCWindowsResources& self, MCArrayRe`
`1116`	`1116`	`if (t_success)`
`1117`	`1117`	`{`
`1118`	`1118`	`MCNewAutoNameRef t_key1, t_key2;`
`1119`		`- MCNameCreateWithCString("FileVersion", &t_key1);`
`1120`		`- MCNameCreateWithCString("ProductVersion", &t_key2);`
	`1119`	`+ /* UNCHECKED */ MCNameCreateWithCString("FileVersion", &t_key1);`
	`1120`	`+ /* UNCHECKED */ MCNameCreateWithCString("ProductVersion", &t_key2);`
`1121`	`1121`
`1122`	`1122`	`MCValueRef t_value1, t_value2;`
`1123`	`1123`
`1124`	`1124`	`if (MCArrayFetchValue(p_info, false, *t_key1, t_value1))`
`1125`		`- t_file_version = MCWindowsVersionInfoParseVersion(MCStringGetCString((MCStringRef)t_value1));`
	`1125`	`+ t_file_version = MCWindowsVersionInfoParseVersion((MCStringRef)t_value1);`
`1126`	`1126`	`if (MCArrayFetchValue(p_info, false, *t_key2, t_value2))`
`1127`		`- t_product_version = MCWindowsVersionInfoParseVersion(MCStringGetCString((MCStringRef)t_value2));`
	`1127`	`+ t_product_version = MCWindowsVersionInfoParseVersion((MCStringRef)t_value2);`
`1128`	`1128`	`MCValueRelease(t_value1);`
`1129`	`1129`	`MCValueRelease(t_value2);`
`1130`	`1130`	`}`