mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-10 09:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Win32 string conversion.

Browse Source 
Specifying -1 as the source string size makes the returned size include
the null terminator.

Closes #364.
This commit is contained in:
Stef Velzel 2014-10-11 21:02:57 +02:00 committed by Camilla Berglund
parent a6c57dc6f1
commit 653079b792
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/win32_init.c
View File

@ -151,9 +151,9 @@ WCHAR* _glfwCreateWideStringFromUTF8(const char* source)
if (!length) if (!length)
return NULL; return NULL;
target = calloc(length + 1, sizeof(WCHAR)); target = calloc(length, sizeof(WCHAR));
if (!MultiByteToWideChar(CP_UTF8, 0, source, -1, target, length + 1)) if (!MultiByteToWideChar(CP_UTF8, 0, source, -1, target, length))
{ {
free(target); free(target);
return NULL; return NULL;
@ -173,9 +173,9 @@ char* _glfwCreateUTF8FromWideString(const WCHAR* source)
if (!length) if (!length)
return NULL; return NULL;
target = calloc(length + 1, sizeof(char)); target = calloc(length, sizeof(char));
if (!WideCharToMultiByte(CP_UTF8, 0, source, -1, target, length + 1, NULL, NULL)) if (!WideCharToMultiByte(CP_UTF8, 0, source, -1, target, length, NULL, NULL))
{ {
free(target); free(target);
return NULL; return NULL;