caiyu/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Win32: Remove sscheck on IsWindowVisible and ShowWindow

Browse Source 
The return value of these functions is not an error code and according to
the Win32 API documentation they can not affect `GetLastError`.

Calling sscheck on them normally does not fail since it does
SetLastError(0) before running the checked expression and only then
GetLastError(). However in issue 817 a user discovered that when running
"DisplayFusion" software GetLastError does return an error and SolveSpace
closes.

So while not a strict bug-fix this is a "correctness improvement" for
SolveSpace and works around a possible bug in DisplayFusion.

Similarly the return value of Reg*** functions is now compared to
ERROR_SUCCESS which is zero. Before the sschecks were strictly wrong but
did not cause problems for the same reason as above.
This commit is contained in:
ruevs 2020-11-25 15:51:28 +02:00 committed by phkahler
parent 22dea59077
commit a2b5d0d45c
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/platform/guiwin.cpp
View File

@ -183,7 +183,7 @@ public:
HKEY GetKey() { HKEY GetKey() {
if(hKey == NULL) { if(hKey == NULL) {
sscheck(RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\SolveSpace", 0, NULL, 0, sscheck(ERROR_SUCCESS == RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\SolveSpace", 0, NULL, 0,
KEY_ALL_ACCESS, NULL, &hKey, NULL)); KEY_ALL_ACCESS, NULL, &hKey, NULL));
} }
return hKey; return hKey;
@ -191,12 +191,12 @@ public:
~SettingsImplWin32() { ~SettingsImplWin32() {
if(hKey != NULL) { if(hKey != NULL) {
sscheck(RegCloseKey(hKey)); sscheck(ERROR_SUCCESS == RegCloseKey(hKey));
} }
} }
void FreezeInt(const std::string &key, uint32_t value) { void FreezeInt(const std::string &key, uint32_t value) {
sscheck(RegSetValueExW(GetKey(), &Widen(key)[0], 0, sscheck(ERROR_SUCCESS == RegSetValueExW(GetKey(), &Widen(key)[0], 0,
REG_DWORD, (const BYTE *)&value, sizeof(value))); REG_DWORD, (const BYTE *)&value, sizeof(value)));
} }
@ -212,7 +212,7 @@ public:
} }
void FreezeFloat(const std::string &key, double value) { void FreezeFloat(const std::string &key, double value) {
sscheck(RegSetValueExW(GetKey(), &Widen(key)[0], 0, sscheck(ERROR_SUCCESS == RegSetValueExW(GetKey(), &Widen(key)[0], 0,
REG_QWORD, (const BYTE *)&value, sizeof(value))); REG_QWORD, (const BYTE *)&value, sizeof(value)));
} }
@ -231,7 +231,7 @@ public:
ssassert(value.length() == strlen(value.c_str()), ssassert(value.length() == strlen(value.c_str()),
"illegal null byte in middle of a string setting"); "illegal null byte in middle of a string setting");
std::wstring valueW = Widen(value); std::wstring valueW = Widen(value);
sscheck(RegSetValueExW(GetKey(), &Widen(key)[0], 0, sscheck(ERROR_SUCCESS == RegSetValueExW(GetKey(), &Widen(key)[0], 0,
REG_SZ, (const BYTE *)&valueW[0], (valueW.length() + 1) * 2)); REG_SZ, (const BYTE *)&valueW[0], (valueW.length() + 1) * 2));
} }
@ -242,7 +242,7 @@ public:
if(result == ERROR_SUCCESS && type == REG_SZ) { if(result == ERROR_SUCCESS && type == REG_SZ) {
std::wstring valueW; std::wstring valueW;
valueW.resize(length / 2 - 1); valueW.resize(length / 2 - 1);
sscheck(RegQueryValueExW(GetKey(), &Widen(key)[0], 0, sscheck(ERROR_SUCCESS == RegQueryValueExW(GetKey(), &Widen(key)[0], 0,
&type, (BYTE *)&valueW[0], &length)); &type, (BYTE *)&valueW[0], &length));
return Narrow(valueW); return Narrow(valueW);
} }
@ -1101,12 +1101,12 @@ public:
bool IsVisible() override { bool IsVisible() override {
BOOL isVisible; BOOL isVisible;
sscheck(isVisible = IsWindowVisible(hWindow)); isVisible = IsWindowVisible(hWindow);
return isVisible == TRUE; return isVisible == TRUE;
} }
void SetVisible(bool visible) override { void SetVisible(bool visible) override {
sscheck(ShowWindow(hWindow, visible ? SW_SHOW : SW_HIDE)); ShowWindow(hWindow, visible ? SW_SHOW : SW_HIDE);
} }
void Focus() override { void Focus() override {
@ -1274,7 +1274,7 @@ public:
bool IsEditorVisible() override { bool IsEditorVisible() override {
BOOL visible; BOOL visible;
sscheck(visible = IsWindowVisible(hEditor)); visible = IsWindowVisible(hEditor);
return visible == TRUE; return visible == TRUE;
} }
@ -1316,7 +1316,7 @@ public:
sscheck(MoveWindow(hEditor, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, sscheck(MoveWindow(hEditor, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top,
/*bRepaint=*/true)); /*bRepaint=*/true));
sscheck(ShowWindow(hEditor, SW_SHOW)); ShowWindow(hEditor, SW_SHOW);
if(!textW.empty()) { if(!textW.empty()) {
sscheck(SendMessageW(hEditor, WM_SETTEXT, 0, (LPARAM)textW.c_str())); sscheck(SendMessageW(hEditor, WM_SETTEXT, 0, (LPARAM)textW.c_str()));
sscheck(SendMessageW(hEditor, EM_SETSEL, 0, textW.length())); sscheck(SendMessageW(hEditor, EM_SETSEL, 0, textW.length()));
@ -1327,7 +1327,7 @@ public:
void HideEditor() override { void HideEditor() override {
if(!IsEditorVisible()) return; if(!IsEditorVisible()) return;
sscheck(ShowWindow(hEditor, SW_HIDE)); ShowWindow(hEditor, SW_HIDE);
} }
void SetScrollbarVisible(bool visible) override { void SetScrollbarVisible(bool visible) override {