mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2025-02-12 19:38:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed trying to truncate registry key names that did not need truncating. (#701)

Browse Source
This commit is contained in:
binary1248 2014-09-24 02:57:24 +02:00 committed by Lukas Dürrenberger
parent 6d122f428a
commit 330ea0bbe3
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,9 @@ namespace
subkey += caps.szRegKey; subkey += caps.szRegKey;
subkey += TEXT("\\"); subkey += TEXT("\\");
subkey += REGSTR_KEY_JOYCURR; subkey += REGSTR_KEY_JOYCURR;
subkey.erase(256);
if (subkey.size() > 255)
subkey.erase(255);
rootKey = HKEY_LOCAL_MACHINE; rootKey = HKEY_LOCAL_MACHINE;
result = RegOpenKeyEx(rootKey, subkey.c_str(), 0, KEY_READ, &currentKey); result = RegOpenKeyEx(rootKey, subkey.c_str(), 0, KEY_READ, &currentKey);
@ -96,7 +98,9 @@ namespace
subkey = TEXT("Joystick"); subkey = TEXT("Joystick");
subkey += indexString.str(); subkey += indexString.str();
subkey += REGSTR_VAL_JOYOEMNAME; subkey += REGSTR_VAL_JOYOEMNAME;
subkey.erase(256);
if (subkey.size() > 255)
subkey.erase(255);
TCHAR keyData[256]; TCHAR keyData[256];
DWORD keyDataSize = sizeof(keyData); DWORD keyDataSize = sizeof(keyData);
@ -113,7 +117,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));
subkey.erase(256);
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);