https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd1e79912325bc21ffd5bf7b6761ed8fea020154
commit fd1e79912325bc21ffd5bf7b6761ed8fea020154 Author: Katayama Hirofumi MZ <[email protected]> AuthorDate: Wed Aug 17 08:04:11 2022 +0900 Commit: Katayama Hirofumi MZ <[email protected]> CommitDate: Wed Aug 17 08:04:11 2022 +0900 [USER32] Insert curly-brackts for switch-case Follow-up of #4607 (60be15f). CORE-11700 --- win32ss/user/user32/windows/defwnd.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/win32ss/user/user32/windows/defwnd.c b/win32ss/user/user32/windows/defwnd.c index 688f2d48421..2433178a49f 100644 --- a/win32ss/user/user32/windows/defwnd.c +++ b/win32ss/user/user32/windows/defwnd.c @@ -831,6 +831,7 @@ RealDefWindowProcA(HWND hWnd, switch (Msg) { case WM_NCCREATE: + { if ( Wnd && Wnd->style & (WS_HSCROLL | WS_VSCROLL) ) { @@ -854,6 +855,7 @@ RealDefWindowProcA(HWND hWnd, Result = 1; } break; + } case WM_GETTEXTLENGTH: { @@ -925,18 +927,24 @@ RealDefWindowProcA(HWND hWnd, } case WM_IME_KEYDOWN: + { Result = PostMessageA(hWnd, WM_KEYDOWN, wParam, lParam); break; + } case WM_IME_KEYUP: + { Result = PostMessageA(hWnd, WM_KEYUP, wParam, lParam); break; + } case WM_IME_CHAR: + { if (HIBYTE(wParam)) PostMessageA(hWnd, WM_CHAR, HIBYTE(wParam), lParam); PostMessageA(hWnd, WM_CHAR, LOBYTE(wParam), lParam); break; + } case WM_IME_COMPOSITION: if (lParam & GCS_RESULTSTR) @@ -1009,10 +1017,12 @@ NormalImeMsgHandling: } case WM_IME_SYSTEM: + { if (wParam == 4) break; goto NormalImeMsgHandling; + } default: Result = User32DefWindowProc(hWnd, Msg, wParam, lParam, FALSE); @@ -1045,6 +1055,7 @@ RealDefWindowProcW(HWND hWnd, switch (Msg) { case WM_NCCREATE: + { if ( Wnd && Wnd->style & (WS_HSCROLL | WS_VSCROLL) ) { @@ -1070,6 +1081,7 @@ RealDefWindowProcW(HWND hWnd, Result = 1; } break; + } case WM_GETTEXTLENGTH: { @@ -1122,25 +1134,33 @@ RealDefWindowProcW(HWND hWnd, } case WM_SETTEXT: + { DefSetText(hWnd, (PCWSTR)lParam, FALSE); if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) UserPaintCaption(Wnd, DC_TEXT); Result = 1; break; + } case WM_IME_CHAR: + { PostMessageW(hWnd, WM_CHAR, wParam, lParam); Result = 0; break; + } case WM_IME_KEYDOWN: + { Result = PostMessageW(hWnd, WM_KEYDOWN, wParam, lParam); break; + } case WM_IME_KEYUP: + { Result = PostMessageW(hWnd, WM_KEYUP, wParam, lParam); break; + } case WM_IME_COMPOSITION: if (lParam & GCS_RESULTSTR) @@ -1198,10 +1218,12 @@ NormalImeMsgHandling: } case WM_IME_SYSTEM: + { if (wParam == 4) break; goto NormalImeMsgHandling; + } default: Result = User32DefWindowProc(hWnd, Msg, wParam, lParam, TRUE);
