[[ Bug 14259 ]] Implements MCStringCreateWithWStringAndRelease

livecodesebastien · livecodesebastien · commit be63b0f7d484 · 2015-01-12T12:21:41.000Z
diff --git a/engine/src/dskw32.cpp b/engine/src/dskw32.cpp
@@ -3491,8 +3491,8 @@ struct MCWindowsDesktop: public MCSystemInterface, public MCWindowsSystemService
 		DWORD dwFileNameLen = GetModuleFileNameW(NULL, wcFileNameBuf, MAX_PATH+1);
 		
 		MCAutoStringRef t_path;
-		MCStringCreateWithWStringAndRelease(wcFileNameBuf, &t_path);
-		return PathFromNative(*t_path, r_path);
+		MCStringCreateWithWStringAndRelease((unichar_t*)wcFileNameBuf, &t_path);
+		return PathFromNative(*t_path, r_path); 
 	}
 
 	virtual bool PathToNative(MCStringRef p_path, MCStringRef& r_native)
diff --git a/libfoundation/src/foundation-string.cpp b/libfoundation/src/foundation-string.cpp
@@ -380,6 +380,17 @@ bool MCStringCreateWithWString(const unichar_t *p_wstring, MCStringRef& r_string
 	return MCStringCreateWithChars(p_wstring, t_length, r_string);
 }
 
+bool MCStringCreateWithWStringAndRelease(unichar_t* p_wstring, MCStringRef& r_string)
+{
+	if (MCStringCreateWithWString(p_wstring, r_string))
+	{
+		free(p_wstring);
+		return true;
+	}
+
+	return false;
+}
+
 bool MCStringCreateWithNativeChars(const char_t *p_chars, uindex_t p_char_count, MCStringRef& r_string)
 {
 	bool t_success;

Original file line number	Diff line number	Diff line change
`@@ -3491,8 +3491,8 @@ struct MCWindowsDesktop: public MCSystemInterface, public MCWindowsSystemService`
`3491`	`3491`	`DWORD dwFileNameLen = GetModuleFileNameW(NULL, wcFileNameBuf, MAX_PATH+1);`
`3492`	`3492`
`3493`	`3493`	`MCAutoStringRef t_path;`
`3494`		`- MCStringCreateWithWStringAndRelease(wcFileNameBuf, &t_path);`
`3495`		`- return PathFromNative(*t_path, r_path);`
	`3494`	`+ MCStringCreateWithWStringAndRelease((unichar_t*)wcFileNameBuf, &t_path);`
	`3495`	`+ return PathFromNative(*t_path, r_path);`
`3496`	`3496`	`}`
`3497`	`3497`
`3498`	`3498`	`virtual bool PathToNative(MCStringRef p_path, MCStringRef& r_native)`