Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-06-15 12:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed glfwGetJoystickName for windows (My PS2/PS3 controllers were wrongly being detected as "Microsoft PC-joystick Driver")

Browse Source
This commit is contained in:
salvy 2013-07-18 23:41:50 -07:00
parent 0463e196b4
commit b9975cafd4
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/win32_joystick.c
View File

@ -30,6 +30,7 @@
#include "internal.h" #include "internal.h"
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -48,6 +49,56 @@ static float calcJoystickPos(DWORD pos, DWORD min, DWORD max)
return (2.f * (fpos - fmin) / (fmax - fmin)) - 1.f; return (2.f * (fpos - fmin) / (fmax - fmin)) - 1.f;
} }
static int calcJoystickName( int joy, char * dest, const char *szRegKey )
{
HKEY hKey, hLoc;
char temp[256];
char key[256];
DWORD size;
int result;
// FIXME
char* joyconfig = _glfwCreateUTF8FromWideString( REGSTR_PATH_JOYCONFIG );
char* joycurr = _glfwCreateUTF8FromWideString( REGSTR_KEY_JOYCURR );
char* joyovalname = _glfwCreateUTF8FromWideString( REGSTR_VAL_JOYOEMNAME );
char* joypathname = _glfwCreateUTF8FromWideString( REGSTR_PATH_JOYOEM );
size = sizeof(temp);
_snprintf ( temp, size, "%s\\%s\\%s", joyconfig, szRegKey, joycurr );
hLoc = HKEY_LOCAL_MACHINE;
result = RegOpenKeyExA( hLoc, temp, 0, KEY_READ, &hKey);
if ( result != ERROR_SUCCESS )
{
hLoc = HKEY_CURRENT_USER;
result = RegOpenKeyExA( hLoc, temp, 0, KEY_READ, &hKey);
if( result != ERROR_SUCCESS)
return 0;
}
_snprintf ( temp, size, "Joystick%d%s", joy + 1, joyovalname );
size = sizeof(key);
result = RegQueryValueExA(hKey, temp, 0, 0, (LPBYTE)key, (LPDWORD)&size);
RegCloseKey ( hKey );
if ( result != ERROR_SUCCESS )
return 0;
size = sizeof(temp);
_snprintf ( temp, size, "%s\\%s", joypathname, key );
result = RegOpenKeyExA ( hLoc, temp, 0, KEY_QUERY_VALUE, &hKey );
if ( result != ERROR_SUCCESS )
return 0;
size = sizeof(temp);
result = RegQueryValueExA ( hKey, joyovalname, 0, 0, (LPBYTE)dest, (LPDWORD)&size );
RegCloseKey ( hKey );
if ( result != ERROR_SUCCESS )
return 0;
return 1;
}
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
////// GLFW internal API ////// ////// GLFW internal API //////
@ -167,14 +218,18 @@ const unsigned char* _glfwPlatformGetJoystickButtons(int joy, int* count)
const char* _glfwPlatformGetJoystickName(int joy) const char* _glfwPlatformGetJoystickName(int joy)
{ {
char name[256];
JOYCAPS jc; JOYCAPS jc;
if (_glfw_joyGetDevCaps(joy, &jc, sizeof(JOYCAPS)) != JOYERR_NOERROR) if (_glfw_joyGetDevCaps(joy, &jc, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return NULL; return NULL;
free(_glfw.win32.joystick[joy].name); free(_glfw.win32.joystick[joy].name);
_glfw.win32.joystick[joy].name = _glfwCreateUTF8FromWideString(jc.szPname);
if(calcJoystickName(joy, name, _glfwCreateUTF8FromWideString(jc.szRegKey)) == 0)
return NULL;
_glfw.win32.joystick[joy].name = name;
return _glfw.win32.joystick[joy].name; return _glfw.win32.joystick[joy].name;
} }

1
src/win32_platform.h
View File

@ -62,6 +62,7 @@
#include <windows.h> #include <windows.h>
#include <mmsystem.h> #include <mmsystem.h>
#include <regstr.h>
#include <dbt.h> #include <dbt.h>