Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-02 21:00:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix C89 forbidden mixed declarations

Browse Source
This commit is contained in:
Bayemite 2021-06-03 22:02:24 +10:00
parent 5ddb905a6a
commit 3c44229af8
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/win32_window.c
View File

@ -1464,11 +1464,14 @@ void _glfwPlatformDestroyWindow(_GLFWwindow* window)
char* _glfwPlatformGetWindowTitle(_GLFWwindow* window) char* _glfwPlatformGetWindowTitle(_GLFWwindow* window)
{ {
int count = GetWindowTextLengthW(window->win32.handle); int count;
SetLastError(0);
count = GetWindowTextLengthW(window->win32.handle);
if(count == 0) if(count == 0)
{ {
SetLastError(0); int error;
int error = GetLastError(); error = GetLastError();
if(error != 0) if(error != 0)
{ {
@ -1481,11 +1484,14 @@ char* _glfwPlatformGetWindowTitle(_GLFWwindow* window)
} }
else else
{ {
WCHAR* wideTitle;
char* title;
count += 1; // the \0 count += 1; // the \0
WCHAR* wideTitle = calloc(count, sizeof(WCHAR));
wideTitle = calloc(count, sizeof(WCHAR));
GetWindowTextW(window->win32.handle, wideTitle, count); GetWindowTextW(window->win32.handle, wideTitle, count);
char* title = _glfwCreateUTF8FromWideStringWin32(wideTitle); title = _glfwCreateUTF8FromWideStringWin32(wideTitle);
if(!title) if(!title)
return calloc(1, sizeof(char)); // single \0 return calloc(1, sizeof(char)); // single \0