feat: improve utf82cs function

weileifrank · weileifrank · commit 78ca6b0d2dd7 · 2024-10-24T18:39:18.000+08:00
diff --git a/windows/APIExample/APIExample/stdafx.cpp b/windows/APIExample/APIExample/stdafx.cpp
@@ -352,9 +352,17 @@ std::string cs2ANSI(CString str)
 }
 CString utf82cs(std::string utf8)
 {
-    TCHAR szBuf[2048] = { 0 };
+   /* TCHAR szBuf[2048] = { 0 };
     MultiByteToWideChar(CP_UTF8, 0, utf8.c_str(), 2048, szBuf, 2048);
-    return szBuf;
+    return szBuf;*/
+	int len = MultiByteToWideChar(CP_UTF8, 0, utf8.c_str(), -1, NULL, 0);
+	if (len == 0)
+	{
+		return CString();
+	}
+	std::vector<wchar_t> buffer(len);
+	MultiByteToWideChar(CP_UTF8, 0, utf8.c_str(), -1, buffer.data(), len);
+	return CString(buffer.data());
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -352,9 +352,17 @@ std::string cs2ANSI(CString str)`
`352`	`352`	`}`
`353`	`353`	`CString utf82cs(std::string utf8)`
`354`	`354`	`{`
`355`		`- TCHAR szBuf[2048] = { 0 };`
	`355`	`+ /* TCHAR szBuf[2048] = { 0 };`
`356`	`356`	`MultiByteToWideChar(CP_UTF8, 0, utf8.c_str(), 2048, szBuf, 2048);`
`357`		`- return szBuf;`
	`357`	`+ return szBuf;*/`
	`358`	`+ int len = MultiByteToWideChar(CP_UTF8, 0, utf8.c_str(), -1, NULL, 0);`
	`359`	`+ if (len == 0)`
	`360`	`+ {`
	`361`	`+ return CString();`
	`362`	`+ }`
	`363`	`+ std::vector<wchar_t> buffer(len);`
	`364`	`+ MultiByteToWideChar(CP_UTF8, 0, utf8.c_str(), -1, buffer.data(), len);`
	`365`	`+ return CString(buffer.data());`
`358`	`366`	`}`
`359`	`367`
`360`	`368`