Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-10-11 18:08:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[idd] driver: CSettings minor refactor

Browse Source
This commit is contained in:
Geoffrey McRae
2025-09-15 02:21:40 +10:00
parent 118e300f2f
commit 9ac3c945fe
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
idd/LGIdd/CSettings.cpp
View File

@@ -98,7 +98,7 @@ void CSettings::SetExtraMode(const DisplayMode& mode)
RegCloseKey(hKey); RegCloseKey(hKey);
} }
bool CSettings::GetExtraMode(DisplayMode& mode) std::wstring CSettings::ReadStringValue(const wchar_t* name, const wchar_t* default)
{ {
HKEY hKey = nullptr; HKEY hKey = nullptr;
LONG ec = RegOpenKeyExW( LONG ec = RegOpenKeyExW(
@@ -110,29 +110,38 @@ bool CSettings::GetExtraMode(DisplayMode& mode)
); );
if (ec != ERROR_SUCCESS) if (ec != ERROR_SUCCESS)
return false; return std::wstring(default);
DWORD type = 0; DWORD type = 0;
DWORD cb = 0; DWORD cb = 0;
ec = RegQueryValueExW(hKey, L"ExtraMode", nullptr, &type, nullptr, &cb); ec = RegQueryValueExW(hKey, name, nullptr, &type, nullptr, &cb);
if (ec != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ) || cb == 0) if (ec != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ) || cb == 0)
{ {
RegCloseKey(hKey); RegCloseKey(hKey);
return false; return std::wstring(default);
} }
std::vector<wchar_t> buf(cb / sizeof(wchar_t) + 1); std::vector<wchar_t> buf(cb / sizeof(wchar_t) + 1);
ec = RegQueryValueExW(hKey, L"ExtraMode", nullptr, &type, ec = RegQueryValueExW(hKey, name, nullptr, &type,
reinterpret_cast<LPBYTE>(buf.data()), &cb); reinterpret_cast<LPBYTE>(buf.data()), &cb);
RegCloseKey(hKey); RegCloseKey(hKey);
if (ec != ERROR_SUCCESS) if (ec != ERROR_SUCCESS)
return false; return std::wstring(default);
buf.back() = L'\0'; buf.back() = L'\0';
std::wstring s(buf.data()); std::wstring s(buf.data());
return ParseModeString(s, mode); return s;
}
bool CSettings::GetExtraMode(DisplayMode& mode)
{
std::wstring extraMode = ReadStringValue(L"ExtraMode", NULL);
if (extraMode.empty())
return false;
return ParseModeString(extraMode, mode);
} }
bool CSettings::ReadModesValue(std::vector<std::wstring> &out) const bool CSettings::ReadModesValue(std::vector<std::wstring> &out) const

1
idd/LGIdd/CSettings.h
View File

@@ -24,6 +24,7 @@ class CSettings
private: private:
DisplayModes m_displayModes; DisplayModes m_displayModes;
std::wstring ReadStringValue(const wchar_t* name, const wchar_t* default);
bool ReadModesValue(std::vector<std::wstring> &out) const; bool ReadModesValue(std::vector<std::wstring> &out) const;
bool ParseModeString(const std::wstring& in, DisplayMode& out); bool ParseModeString(const std::wstring& in, DisplayMode& out);