Reactos

[KBDLAYOUT] Avoid (DLGPROC) cast (#5698)


- Avoid DLGPROC-cast
- Bring header-section closer to our coding guidelines
- Strip inconsistent empty-lines
- Strip useless return at the end of void func

Co-authored-by: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>

authored by

Joachim Henze
Katayama Hirofumi MZ
and committed by
GitHub
0eecebb1 1da71e25

+9 -31
+9 -31
modules/rostests/win32/user32/kbdlayout/kbdlayout.c
··· 1 1 /* 2 - * PROJECT: ReactOS 3 - * LICENSE: GPL - See COPYING in the top level directory 4 - * FILE: base/applications/testset/user32/kbdlayout/kbdlayout.c 5 - * PURPOSE: Keyboard layout testapp 6 - * COPYRIGHT: Copyright 2007 Saveliy Tretiakov 2 + * PROJECT: ReactOS 3 + * LICENSE: GPL - See COPYING in the top level directory 4 + * PURPOSE: Keyboard layout testapp 5 + * COPYRIGHT: Copyright 2007 Saveliy Tretiakov 7 6 */ 8 7 9 8 #define UNICODE ··· 13 12 14 13 15 14 16 - LRESULT MainDialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); 15 + INT_PTR CALLBACK MainDialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); 17 16 18 17 19 18 HINSTANCE hInst; ··· 27 26 28 27 DWORD WINAPI ThreadProc(LPVOID lpParam) 29 28 { 30 - 31 29 DialogBoxParam(hInst, 32 30 MAKEINTRESOURCE(IDD_MAINDIALOG), 33 31 NULL, 34 - (DLGPROC)MainDialogProc, 32 + MainDialogProc, 35 33 (LPARAM)NULL); 36 34 37 35 return 0; ··· 42 40 LPSTR lpCmdLine, 43 41 int nCmdShow) 44 42 { 45 - 46 - 47 43 hInst = hInstance; 48 44 49 45 ThreadProc(0); 50 46 51 47 return 0; 52 48 } 53 - 54 49 55 50 int GetKlList(HKL **list) 56 51 { ··· 68 63 { 69 64 HeapFree(GetProcessHeap(), 0, list); 70 65 } 71 - 72 66 73 67 void UpdateData(HWND hDlg) 74 68 { ··· 119 113 va_end(argptr); 120 114 } 121 115 122 - 123 - LRESULT CALLBACK WndSubclassProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) 116 + LRESULT CALLBACK WndSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) 124 117 { 125 118 WND_DATA *data = (WND_DATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); 126 119 ··· 137 130 //Pass message to defwindowproc 138 131 } 139 132 140 - return ( CallWindowProc( data->OrigProc, hwnd, uMsg, wParam, lParam) ); 133 + return CallWindowProc(data->OrigProc, hwnd, uMsg, wParam, lParam); 141 134 } 142 135 143 136 void SubclassWnd(HWND hWnd, WCHAR* Name) ··· 146 139 data->OrigProc = (WNDPROC)SetWindowLongPtr( hWnd, GWLP_WNDPROC, (LONG_PTR)WndSubclassProc); 147 140 wcsncpy(data->WndName, Name, 25); 148 141 SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR)data); 149 - return; 150 142 } 151 143 152 144 DWORD GetActivateFlags(HWND hDlg) ··· 166 158 ret |= KLF_SETFORPROCESS; 167 159 168 160 return ret; 169 - 170 161 } 171 162 172 163 DWORD GetLoadFlags(HWND hDlg) ··· 218 209 219 210 HKL GetActivateHandle(HWND hDlg) 220 211 { 221 - 222 212 if(IsDlgButtonChecked(hDlg, IDC_FROMLIST)) 223 213 return GetSelectedLayout(hDlg); 224 214 else if(IsDlgButtonChecked(hDlg, IDC_HKL_NEXT)) 225 215 return (HKL)HKL_NEXT; 226 216 227 217 return (HKL)HKL_PREV; 228 - 229 218 } 230 219 231 - 232 - /*************************************************** 233 - * MainDialogProc * 234 - ***************************************************/ 235 - 236 - LRESULT MainDialogProc(HWND hDlg, 220 + INT_PTR CALLBACK MainDialogProc(HWND hDlg, 237 221 UINT Msg, 238 222 WPARAM wParam, 239 223 LPARAM lParam) ··· 350 334 } 351 335 break; 352 336 } 353 - 354 337 } 355 338 356 339 return TRUE; 357 340 } /* WM_COMMAND */ 358 - 359 341 360 342 case WM_INPUTLANGCHANGE: 361 343 { ··· 379 361 default: 380 362 return FALSE; 381 363 } 382 - 383 364 } 384 365 385 - 386 - 387 -