ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comdlg32: Use the available ARRAY_SIZE() macro. 

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2018-03-29 17:14:12 +02:00 committed by Alexandre Julliard
parent 250e8437d7
commit e2dae70fe0
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/comdlg32/filedlg.c
View File

@ -1641,7 +1641,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
else if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) else if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
{ {
WCHAR buf[64]; WCHAR buf[64];
LoadStringW(COMDLG32_hInstance, IDS_SAVE_AS, buf, sizeof(buf)/sizeof(WCHAR)); LoadStringW(COMDLG32_hInstance, IDS_SAVE_AS, buf, ARRAY_SIZE(buf));
SetWindowTextW(hwnd, buf); SetWindowTextW(hwnd, buf);
} }
@ -1860,9 +1860,9 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
{ {
WCHAR buf[16]; WCHAR buf[16];
LoadStringW(COMDLG32_hInstance, IDS_SAVE_BUTTON, buf, sizeof(buf)/sizeof(WCHAR)); LoadStringW(COMDLG32_hInstance, IDS_SAVE_BUTTON, buf, ARRAY_SIZE(buf));
SetDlgItemTextW(hwnd, IDOK, buf); SetDlgItemTextW(hwnd, IDOK, buf);
LoadStringW(COMDLG32_hInstance, IDS_SAVE_IN, buf, sizeof(buf)/sizeof(WCHAR)); LoadStringW(COMDLG32_hInstance, IDS_SAVE_IN, buf, ARRAY_SIZE(buf));
SetDlgItemTextW(hwnd, IDC_LOOKINSTATIC, buf); SetDlgItemTextW(hwnd, IDC_LOOKINSTATIC, buf);
} }
@ -2322,7 +2322,8 @@ static void FILEDLG95_MRU_save_filename(LPCWSTR filename)
HKEY hkey; HKEY hkey;
/* get the current executable's name */ /* get the current executable's name */
if(!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, sizeof(module_path)/sizeof(module_path[0]))) { if (!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, ARRAY_SIZE(module_path)))
{
WARN("GotModuleFileName failed: %d\n", GetLastError()); WARN("GotModuleFileName failed: %d\n", GetLastError());
return; return;
} }
@ -2409,7 +2410,8 @@ static void FILEDLG95_MRU_load_filename(LPWSTR stored_path)
WCHAR module_path[MAX_PATH], *module_name; WCHAR module_path[MAX_PATH], *module_name;
/* get the current executable's name */ /* get the current executable's name */
if(!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, sizeof(module_path)/sizeof(module_path[0]))) { if (!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, ARRAY_SIZE(module_path)))
{
WARN("GotModuleFileName failed: %d\n", GetLastError()); WARN("GotModuleFileName failed: %d\n", GetLastError());
return; return;
} }
@ -2428,10 +2430,10 @@ void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText)
WCHAR strMsgTitle[MAX_PATH]; WCHAR strMsgTitle[MAX_PATH];
WCHAR strMsgText [MAX_PATH]; WCHAR strMsgText [MAX_PATH];
if (idCaption) if (idCaption)
LoadStringW(COMDLG32_hInstance, idCaption, strMsgTitle, sizeof(strMsgTitle)/sizeof(WCHAR)); LoadStringW(COMDLG32_hInstance, idCaption, strMsgTitle, ARRAY_SIZE(strMsgTitle));
else else
strMsgTitle[0] = '\0'; strMsgTitle[0] = '\0';
LoadStringW(COMDLG32_hInstance, idText, strMsgText, sizeof(strMsgText)/sizeof(WCHAR)); LoadStringW(COMDLG32_hInstance, idText, strMsgText, ARRAY_SIZE(strMsgText));
MessageBoxW(hwnd,strMsgText, strMsgTitle, MB_OK | MB_ICONHAND); MessageBoxW(hwnd,strMsgText, strMsgTitle, MB_OK | MB_ICONHAND);
} }
@ -4128,7 +4130,7 @@ static BOOL BrowseSelectedFolder(HWND hwnd)
pidlSelection, SBSP_RELATIVE ) ) ) pidlSelection, SBSP_RELATIVE ) ) )
{ {
WCHAR buf[64]; WCHAR buf[64];
LoadStringW( COMDLG32_hInstance, IDS_PATHNOTEXISTING, buf, sizeof(buf)/sizeof(WCHAR) ); LoadStringW( COMDLG32_hInstance, IDS_PATHNOTEXISTING, buf, ARRAY_SIZE(buf));
MessageBoxW( hwnd, buf, fodInfos->title, MB_OK | MB_ICONEXCLAMATION ); MessageBoxW( hwnd, buf, fodInfos->title, MB_OK | MB_ICONEXCLAMATION );
} }
bBrowseSelFolder = TRUE; bBrowseSelFolder = TRUE;