Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Joystick fixes/update for non-MSVC compilers

Browse Source 
* This fixes building on non-MSVC compilers for Windows since they don't
know `_tcsnlen()`.
* Changed logic so SFML tries to retrieve the paths from the user key
first, machine key second (typical behavior for most registry settings).
* Removed the registry key length checks since that check is performed
inside`RegOpenKeyEx()` anyway and cut-off keys might point to the wrong
keys.
* Updated the error string retrieval to properly handle errors.
This commit is contained in:
Mario Liebisch 2014-09-25 13:02:29 +02:00
parent 7159e4ba43
commit c36ea074d8
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/SFML/Window/Win32/JoystickImpl.cpp
View File

@ -51,10 +51,14 @@ namespace
// Get a system error string from an error code // Get a system error string from an error code
std::string getErrorString(DWORD error) std::string getErrorString(DWORD error)
{ {
TCHAR errorMessage[256]; PTCHAR buffer;
DWORD messageLength = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, errorMessage, 256, NULL);
errorMessage[std::min<DWORD>(messageLength, 255)] = 0; if (FormatMessage(FORMAT_MESSAGE_MAX_WIDTH_MASK | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, reinterpret_cast<PTCHAR>(&buffer), 0, NULL) == 0)
return sf::String(errorMessage).toAnsiString(); return "Unknown error.";
sf::String message = buffer;
LocalFree(buffer);
return message.toAnsiString();
} }
// Get the joystick's name // Get the joystick's name
@ -69,20 +73,17 @@ namespace
std::basic_string<TCHAR> subkey; std::basic_string<TCHAR> subkey;
subkey = REGSTR_PATH_JOYCONFIG; subkey = REGSTR_PATH_JOYCONFIG;
subkey += TEXT("\\"); subkey += TEXT('\\');
subkey += caps.szRegKey; subkey += caps.szRegKey;
subkey += TEXT("\\"); subkey += TEXT('\\');
subkey += REGSTR_KEY_JOYCURR; subkey += REGSTR_KEY_JOYCURR;
if (subkey.size() > 255) rootKey = HKEY_CURRENT_USER;
subkey.erase(255);
rootKey = HKEY_LOCAL_MACHINE;
result = RegOpenKeyEx(rootKey, subkey.c_str(), 0, KEY_READ, &currentKey); result = RegOpenKeyEx(rootKey, subkey.c_str(), 0, KEY_READ, &currentKey);
if (result != ERROR_SUCCESS) if (result != ERROR_SUCCESS)
{ {
rootKey = HKEY_CURRENT_USER; rootKey = HKEY_LOCAL_MACHINE;
result = RegOpenKeyEx(rootKey, subkey.c_str(), 0, KEY_READ, &currentKey); result = RegOpenKeyEx(rootKey, subkey.c_str(), 0, KEY_READ, &currentKey);
if (result != ERROR_SUCCESS) if (result != ERROR_SUCCESS)
@ -99,9 +100,6 @@ namespace
subkey += indexString.str(); subkey += indexString.str();
subkey += REGSTR_VAL_JOYOEMNAME; subkey += REGSTR_VAL_JOYOEMNAME;
if (subkey.size() > 255)
subkey.erase(255);
TCHAR keyData[256]; TCHAR keyData[256];
DWORD keyDataSize = sizeof(keyData); DWORD keyDataSize = sizeof(keyData);
@ -115,12 +113,9 @@ namespace
} }
subkey = REGSTR_PATH_JOYOEM; subkey = REGSTR_PATH_JOYOEM;
subkey += TEXT("\\"); subkey += TEXT('\\');
subkey.append(keyData, keyDataSize / sizeof(TCHAR)); subkey.append(keyData, keyDataSize / sizeof(TCHAR));
if (subkey.size() > 255)
subkey.erase(255);
result = RegOpenKeyEx(rootKey, subkey.c_str(), 0, KEY_READ, &currentKey); result = RegOpenKeyEx(rootKey, subkey.c_str(), 0, KEY_READ, &currentKey);
if (result != ERROR_SUCCESS) if (result != ERROR_SUCCESS)
@ -140,7 +135,7 @@ namespace
return joystickDescription; return joystickDescription;
} }
keyData[_tcsnlen(keyData, 255)] = 0; keyData[255] = TEXT('\0'); // Ensure null terminator in case the data is too long.
joystickDescription = keyData; joystickDescription = keyData;
return joystickDescription; return joystickDescription;