diff options
| author | George Hazan <ghazan@miranda.im> | 2018-05-08 20:40:49 +0200 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-05-08 20:47:39 +0200 |
| commit | 6a6f2b9e3b2749f16b513dfc98d5d5038b5628fb (patch) | |
| tree | f0bc709157a49e0cff4ac436e60c0e098739b00c /plugins/Scriver | |
| parent | c575dc94be9630240b7377a2e05011630bb8eb1e (diff) | |
merge from master
Diffstat (limited to 'plugins/Scriver')
| -rw-r--r-- | plugins/Scriver/src/chat_window.cpp | 4 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgdialog.cpp | 2 | ||||
| -rw-r--r-- | plugins/Scriver/src/msglog.cpp | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/plugins/Scriver/src/chat_window.cpp b/plugins/Scriver/src/chat_window.cpp index 5021e20fb0..7331033f84 100644 --- a/plugins/Scriver/src/chat_window.cpp +++ b/plugins/Scriver/src/chat_window.cpp @@ -915,7 +915,7 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) tcd.iFlags = TCDF_TEXT;
tcd.pszText = m_si->ptszName;
SendMessage(m_hwndParent, CM_UPDATETABCONTROL, (WPARAM)&tcd, (LPARAM)m_hwnd);
- // fall through
+ __fallthrough;
case DM_ACTIVATE:
if (m_si->wState & STATE_TALK) {
@@ -1012,7 +1012,7 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) if (LOWORD(wParam) != WA_ACTIVE)
break;
- // fall through
+ __fallthrough;
case WM_MOUSEACTIVATE:
if (uMsg != WM_ACTIVATE)
SetFocus(m_message.GetHwnd());
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 214c915608..faddf76067 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -1302,7 +1302,7 @@ INT_PTR CSrmmWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) if (LOWORD(wParam) != WA_ACTIVE)
break;
- //fall through
+ __fallthrough;
case WM_MOUSEACTIVATE:
if (m_hDbUnreadEventFirst != 0) {
MEVENT hDbEvent = m_hDbUnreadEventFirst;
diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp index f388f9eae8..f594b637c1 100644 --- a/plugins/Scriver/src/msglog.cpp +++ b/plugins/Scriver/src/msglog.cpp @@ -695,7 +695,8 @@ static DWORD CALLBACK LogStreamInEvents(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG break;
dat->stage = STREAMSTAGE_TAIL;
- //fall through
+ __fallthrough;
+
case STREAMSTAGE_TAIL:
dat->buffer = CreateRTFTail();
dat->stage = STREAMSTAGE_STOP;
|