mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-05 23:50:44 +00:00
avifil32: 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
f92cfb31d2
commit
143ce73c7a
|
@ -1119,10 +1119,10 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving)
|
||||||
HeapFree(GetProcessHeap(), 0, lp);
|
HeapFree(GetProcessHeap(), 0, lp);
|
||||||
|
|
||||||
/* add "All files" "*.*" filter if enough space left */
|
/* add "All files" "*.*" filter if enough space left */
|
||||||
size = LoadStringW(AVIFILE_hModule, IDS_ALLFILES,
|
size = LoadStringW(AVIFILE_hModule, IDS_ALLFILES, szAllFiles,
|
||||||
szAllFiles, (sizeof(szAllFiles) - sizeof(all_files))/sizeof(WCHAR)) + 1;
|
ARRAY_SIZE(szAllFiles) - ARRAY_SIZE(all_files)) + 1;
|
||||||
memcpy( szAllFiles + size, all_files, sizeof(all_files) );
|
memcpy( szAllFiles + size, all_files, sizeof(all_files) );
|
||||||
size += sizeof(all_files) / sizeof(WCHAR);
|
size += ARRAY_SIZE(all_files);
|
||||||
|
|
||||||
if (cbFilter > size) {
|
if (cbFilter > size) {
|
||||||
memcpy(szFilter, szAllFiles, size * sizeof(szAllFiles[0]));
|
memcpy(szFilter, szAllFiles, size * sizeof(szAllFiles[0]));
|
||||||
|
@ -2109,8 +2109,7 @@ HRESULT WINAPI EditStreamSetInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi,
|
||||||
return AVIERR_BADSIZE;
|
return AVIERR_BADSIZE;
|
||||||
|
|
||||||
memcpy(&asiw, asi, sizeof(asiw) - sizeof(asiw.szName));
|
memcpy(&asiw, asi, sizeof(asiw) - sizeof(asiw.szName));
|
||||||
MultiByteToWideChar(CP_ACP, 0, asi->szName, -1,
|
MultiByteToWideChar(CP_ACP, 0, asi->szName, -1, asiw.szName, ARRAY_SIZE(asiw.szName));
|
||||||
asiw.szName, sizeof(asiw.szName)/sizeof(WCHAR));
|
|
||||||
|
|
||||||
return EditStreamSetInfoW(pstream, &asiw, sizeof(asiw));
|
return EditStreamSetInfoW(pstream, &asiw, sizeof(asiw));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue