scrrun: Use ARRAY_SIZE() macro.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
7d9cf7f4b5
commit
7162725133
|
@ -3441,13 +3441,13 @@ static HRESULT WINAPI filesys_GetSpecialFolder(IFileSystem3 *iface,
|
||||||
switch (SpecialFolder)
|
switch (SpecialFolder)
|
||||||
{
|
{
|
||||||
case WindowsFolder:
|
case WindowsFolder:
|
||||||
ret = GetWindowsDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR));
|
ret = GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW));
|
||||||
break;
|
break;
|
||||||
case SystemFolder:
|
case SystemFolder:
|
||||||
ret = GetSystemDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR));
|
ret = GetSystemDirectoryW(pathW, ARRAY_SIZE(pathW));
|
||||||
break;
|
break;
|
||||||
case TemporaryFolder:
|
case TemporaryFolder:
|
||||||
ret = GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW);
|
ret = GetTempPathW(ARRAY_SIZE(pathW), pathW);
|
||||||
/* we don't want trailing backslash */
|
/* we don't want trailing backslash */
|
||||||
if (ret && pathW[ret-1] == '\\')
|
if (ret && pathW[ret-1] == '\\')
|
||||||
pathW[ret-1] = 0;
|
pathW[ret-1] = 0;
|
||||||
|
|
|
@ -180,7 +180,7 @@ static void release_typelib(void)
|
||||||
if(!typelib)
|
if(!typelib)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++)
|
for (i = 0; i < ARRAY_SIZE(typeinfos); i++)
|
||||||
if(typeinfos[i])
|
if(typeinfos[i])
|
||||||
ITypeInfo_Release(typeinfos[i]);
|
ITypeInfo_Release(typeinfos[i]);
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,8 @@
|
||||||
#ifndef _SCRRUN_PRIVATE_H_
|
#ifndef _SCRRUN_PRIVATE_H_
|
||||||
#define _SCRRUN_PRIVATE_H_
|
#define _SCRRUN_PRIVATE_H_
|
||||||
|
|
||||||
|
#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
|
||||||
|
|
||||||
extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
|
extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
|
||||||
extern HRESULT WINAPI Dictionary_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
|
extern HRESULT WINAPI Dictionary_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue