Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-18 22:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Win32 joystick name memory leak.

Browse Source
This commit is contained in:
Camilla Berglund
2013-01-02 01:52:28 +01:00
parent b72a97d531
commit d1132cb3d1
3 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/win32_joystick.c
+29 -3
View File
@@ -71,6 +71,32 @@ static float calcJoystickPos(DWORD pos, DWORD min, DWORD max)
}
//////////////////////////////////////////////////////////////////////////
////// GLFW internal API //////
//////////////////////////////////////////////////////////////////////////
//========================================================================
// Initialize joystick interface
//========================================================================
void _glfwInitJoysticks(void)
{
}
//========================================================================
// Close all opened joystick handles
//========================================================================
void _glfwTerminateJoysticks(void)
{
int i;
for (i = 0; i < GLFW_JOYSTICK_LAST; i++)
free(_glfw.win32.joystick[i].name);
}
//////////////////////////////////////////////////////////////////////////
////// GLFW platform API //////
//////////////////////////////////////////////////////////////////////////
@@ -235,9 +261,9 @@ const char* _glfwPlatformGetJoystickName(int joy)
_glfw_joyGetDevCaps(i, &jc, sizeof(JOYCAPS));
free(_glfw.win32.joyNames[i]);
_glfw.win32.joyNames[i] = _glfwCreateUTF8FromWideString(jc.szPname);
free(_glfw.win32.joystick[i].name);
_glfw.win32.joystick[i].name = _glfwCreateUTF8FromWideString(jc.szPname);
return _glfw.win32.joyNames[i];
return _glfw.win32.joystick[i].name;
}