Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-25 11:39:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NOTEPAD] Use _countof macro from <stdlib.h> (#5170)

Browse source 
- Remove the definition of ARRAY_SIZE macro.
- Replace ARRAY_SIZE and ARRAYSIZE with _countof.
CORE-18837
This commit is contained in:
Katayama Hirofumi MZ 2023-03-21 08:59:40 +09:00 • committed by GitHub
parent 49d8c1af21
commit d28e39e409
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 64 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

18
base/applications/notepad/main.c
View file

@ -33,9 +33,9 @@ VOID NOTEPAD_EnableSearchMenu()
*/
VOID SetFileName(LPCTSTR szFileName)
{
StringCchCopy(Globals.szFileName, ARRAY_SIZE(Globals.szFileName), szFileName);
StringCchCopy(Globals.szFileName, _countof(Globals.szFileName), szFileName);
Globals.szFileTitle[0] = 0;
GetFileTitle(szFileName, Globals.szFileTitle, ARRAY_SIZE(Globals.szFileTitle));
GetFileTitle(szFileName, Globals.szFileTitle, _countof(Globals.szFileTitle));
if (szFileName && szFileName[0])
SHAddToRecentDocs(SHARD_PATHW, szFileName);
@ -201,9 +201,9 @@ BOOL NOTEPAD_FindNext(FINDREPLACE *pFindReplace, BOOL bReplace, BOOL bShowAlert)
/* Can't find target */
if (bShowAlert)
{
LoadString(Globals.hInstance, STRING_CANNOTFIND, szResource, ARRAY_SIZE(szResource));
_sntprintf(szText, ARRAY_SIZE(szText), szResource, pFindReplace->lpstrFindWhat);
LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, ARRAY_SIZE(szResource));
LoadString(Globals.hInstance, STRING_CANNOTFIND, szResource, _countof(szResource));
_sntprintf(szText, _countof(szText), szResource, pFindReplace->lpstrFindWhat);
LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, _countof(szResource));
MessageBox(Globals.hFindReplaceDlg, szText, szResource, MB_OK);
}
bSuccess = FALSE;
@ -253,11 +253,11 @@ static VOID NOTEPAD_InitData(HINSTANCE hInstance)
p = Globals.szFilter;
p += LoadString(Globals.hInstance, STRING_TEXT_FILES_TXT, p, MAX_STRING_LEN) + 1;
_tcscpy(p, txt_files);
p += ARRAY_SIZE(txt_files);
p += _countof(txt_files);
p += LoadString(Globals.hInstance, STRING_ALL_FILES, p, MAX_STRING_LEN) + 1;
_tcscpy(p, all_files);
p += ARRAY_SIZE(all_files);
p += _countof(all_files);
*p = '\0';
Globals.find.lpstrFindWhat = NULL;
@ -416,7 +416,7 @@ NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
TCHAR szFileName[MAX_PATH];
HDROP hDrop = (HDROP) wParam;
DragQueryFile(hDrop, 0, szFileName, ARRAY_SIZE(szFileName));
DragQueryFile(hDrop, 0, szFileName, _countof(szFileName));
DragFinish(hDrop);
DoOpenFile(szFileName);
break;
@ -515,7 +515,7 @@ static BOOL HandleCommandLine(LPTSTR cmdline)
}
}
GetFullPathName(file_name, ARRAY_SIZE(szPath), szPath, NULL);
GetFullPathName(file_name, _countof(szPath), szPath, NULL);
if (file_exists)
{