summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnsariel <ansariel.hiller@phoenixviewer.com>2024-02-18 13:03:24 +0100
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-02-18 15:51:54 +0200
commit238d0b27375c5293702925142f55f8575f630ae0 (patch)
tree42b2d1489aed7e7d7f10a98d56e52102905a6817
parentc285f59ce2a05703e3a1232fcaf3ee3aea714b3f (diff)
Fixed incorrect return value and missing fallthrough annotations LLWindowWin32
-rw-r--r--indra/llwindow/llwindowwin32.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 35e52a8969..7ca825ee65 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -2343,7 +2343,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
{
WINDOW_IMP_POST(window_imp->mCallbacks->handleDeviceChange(window_imp));
- return true;
+ return 1;
}
break;
}
@@ -2502,6 +2502,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
// allow system keys, such as ALT-F4 to be processed by Windows
eat_keystroke = false;
// intentional fall-through here
+ [[fallthrough]];
}
case WM_KEYDOWN:
{
@@ -2523,6 +2524,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
case WM_SYSKEYUP:
eat_keystroke = false;
// intentional fall-through here
+ [[fallthrough]];
case WM_KEYUP:
{
LL_PROFILE_ZONE_NAMED_CATEGORY_WIN32("mwp - WM_KEYUP");
@@ -3029,8 +3031,6 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
});
};
return 0;
-
- break;
}
case WM_SETTINGCHANGE:
{
@@ -3115,6 +3115,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
}
}
}
+ break;
//list of messages we get often that we don't care to log about
case WM_NCHITTEST: