atl: Use the ARRAY_SIZE() macro.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
47df11ab6e
commit
f55c5f3758
|
@ -374,7 +374,7 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW
|
|||
if (!wci->m_wc.lpszClassName)
|
||||
{
|
||||
static const WCHAR szFormat[] = {'A','T','L','%','0','8','l','x',0};
|
||||
snprintfW(wci->m_szAutoName, sizeof(wci->m_szAutoName)/sizeof(WCHAR), szFormat, (UINT_PTR)wci);
|
||||
snprintfW(wci->m_szAutoName, ARRAY_SIZE(wci->m_szAutoName), szFormat, (UINT_PTR)wci);
|
||||
TRACE("auto-generated class name %s\n", debugstr_w(wci->m_szAutoName));
|
||||
wci->m_wc.lpszClassName = wci->m_szAutoName;
|
||||
}
|
||||
|
|
|
@ -1268,7 +1268,7 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl)
|
|||
if ( GET_WORD(tmp) == '{' ) /* all this mess created because of this line */
|
||||
{
|
||||
static const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n', 0};
|
||||
PUT_BLOCK(AtlAxWin, sizeof(AtlAxWin)/sizeof(WCHAR));
|
||||
PUT_BLOCK(AtlAxWin, ARRAY_SIZE(AtlAxWin));
|
||||
PUT_BLOCK(tmp, strlenW(tmp)+1);
|
||||
} else
|
||||
PUT_BLOCK(tmp, src-tmp);
|
||||
|
|
|
@ -394,11 +394,11 @@ static HRESULT do_process_root_key(LPCOLESTR data, BOOL do_register)
|
|||
hres = DISP_E_EXCEPTION;
|
||||
break;
|
||||
}
|
||||
for(i=0; i<sizeof(root_keys)/sizeof(root_keys[0]); i++) {
|
||||
for(i=0; i<ARRAY_SIZE(root_keys); i++) {
|
||||
if(!lstrcmpiW(buf.str, root_keys[i].name))
|
||||
break;
|
||||
}
|
||||
if(i == sizeof(root_keys)/sizeof(root_keys[0])) {
|
||||
if(i == ARRAY_SIZE(root_keys)) {
|
||||
WARN("Wrong root key name: %s\n", debugstr_w(buf.str));
|
||||
hres = DISP_E_EXCEPTION;
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue