Update conv.cpp

livilivi · web-flow · commit f88629c04171 · 2020-03-11T18:54:36.000+08:00
932-&gt;936
diff --git a/src/conv.cpp b/src/conv.cpp
@@ -17,12 +17,12 @@ wchar_t* _conv_from_utf8(const char* s) {
 }
 
 wchar_t* _conv_from_932(const char* s) {
-	auto count = MultiByteToWideChar(932, MB_ERR_INVALID_CHARS, s, strlen(s), NULL, 0);
+	auto count = MultiByteToWideChar(936, MB_ERR_INVALID_CHARS, s, strlen(s), NULL, 0);
 	if (count == 0) {
 		return NULL;
 	}
 	auto dest = new wchar_t[count + 1];
-	auto err = MultiByteToWideChar(932, MB_ERR_INVALID_CHARS, s, strlen(s), dest, count);
+	auto err = MultiByteToWideChar(936, MB_ERR_INVALID_CHARS, s, strlen(s), dest, count);
 	if (err == 0) {
 		return NULL;
 	}
@@ -31,12 +31,12 @@ wchar_t* _conv_from_932(const char* s) {
 }
 
 char* _conv_to_932(const wchar_t* s) {
-	auto count = WideCharToMultiByte(932, 0, s, wcslen(s), NULL, 0, NULL, NULL);
+	auto count = WideCharToMultiByte(936, 0, s, wcslen(s), NULL, 0, NULL, NULL);
 	if (count == 0) {
 		return NULL;
 	}
 	auto dest = new char[count + 1];
-	auto err = WideCharToMultiByte(932, 0, s, wcslen(s), dest, count, NULL, NULL);
+	auto err = WideCharToMultiByte(936, 0, s, wcslen(s), dest, count, NULL, NULL);
 	if (err == 0) {
 		return NULL;
 	}

Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,12 @@ wchar_t* _conv_from_utf8(const char* s) {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`wchar_t* _conv_from_932(const char* s) {`
`20`		`- auto count = MultiByteToWideChar(932, MB_ERR_INVALID_CHARS, s, strlen(s), NULL, 0);`
	`20`	`+ auto count = MultiByteToWideChar(936, MB_ERR_INVALID_CHARS, s, strlen(s), NULL, 0);`
`21`	`21`	`if (count == 0) {`
`22`	`22`	`return NULL;`
`23`	`23`	`}`
`24`	`24`	`auto dest = new wchar_t[count + 1];`
`25`		`- auto err = MultiByteToWideChar(932, MB_ERR_INVALID_CHARS, s, strlen(s), dest, count);`
	`25`	`+ auto err = MultiByteToWideChar(936, MB_ERR_INVALID_CHARS, s, strlen(s), dest, count);`
`26`	`26`	`if (err == 0) {`
`27`	`27`	`return NULL;`
`28`	`28`	`}`
`@@ -31,12 +31,12 @@ wchar_t* _conv_from_932(const char* s) {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`char* _conv_to_932(const wchar_t* s) {`
`34`		`- auto count = WideCharToMultiByte(932, 0, s, wcslen(s), NULL, 0, NULL, NULL);`
	`34`	`+ auto count = WideCharToMultiByte(936, 0, s, wcslen(s), NULL, 0, NULL, NULL);`
`35`	`35`	`if (count == 0) {`
`36`	`36`	`return NULL;`
`37`	`37`	`}`
`38`	`38`	`auto dest = new char[count + 1];`
`39`		`- auto err = WideCharToMultiByte(932, 0, s, wcslen(s), dest, count, NULL, NULL);`
	`39`	`+ auto err = WideCharToMultiByte(936, 0, s, wcslen(s), dest, count, NULL, NULL);`
`40`	`40`	`if (err == 0) {`
`41`	`41`	`return NULL;`
`42`	`42`	`}`