mirror of
https://github.com/reactos/reactos.git
synced 2024-09-28 13:34:53 +00:00
[AVIFIL32] Sync with Wine Staging 4.0. CORE-15682
This commit is contained in:
parent
0d35c5159b
commit
379c53db18
|
@ -1119,10 +1119,10 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving)
|
|||
HeapFree(GetProcessHeap(), 0, lp);
|
||||
|
||||
/* add "All files" "*.*" filter if enough space left */
|
||||
size = LoadStringW(AVIFILE_hModule, IDS_ALLFILES,
|
||||
szAllFiles, (sizeof(szAllFiles) - sizeof(all_files))/sizeof(WCHAR)) + 1;
|
||||
size = LoadStringW(AVIFILE_hModule, IDS_ALLFILES, szAllFiles,
|
||||
ARRAY_SIZE(szAllFiles) - ARRAY_SIZE(all_files)) + 1;
|
||||
memcpy( szAllFiles + size, all_files, sizeof(all_files) );
|
||||
size += sizeof(all_files) / sizeof(WCHAR);
|
||||
size += ARRAY_SIZE(all_files);
|
||||
|
||||
if (cbFilter > size) {
|
||||
memcpy(szFilter, szAllFiles, size * sizeof(szAllFiles[0]));
|
||||
|
@ -2109,8 +2109,7 @@ HRESULT WINAPI EditStreamSetInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi,
|
|||
return AVIERR_BADSIZE;
|
||||
|
||||
memcpy(&asiw, asi, sizeof(asiw) - sizeof(asiw.szName));
|
||||
MultiByteToWideChar(CP_ACP, 0, asi->szName, -1,
|
||||
asiw.szName, sizeof(asiw.szName)/sizeof(WCHAR));
|
||||
MultiByteToWideChar(CP_ACP, 0, asi->szName, -1, asiw.szName, ARRAY_SIZE(asiw.szName));
|
||||
|
||||
return EditStreamSetInfoW(pstream, &asiw, sizeof(asiw));
|
||||
}
|
||||
|
|
|
@ -48,7 +48,7 @@ reactos/dll/win32/advpack # Synced to WineStaging-4.0
|
|||
reactos/dll/win32/atl # Synced to WineStaging-4.0
|
||||
reactos/dll/win32/atl80 # Synced to WineStaging-3.3
|
||||
reactos/dll/win32/atl100 # Synced to WineStaging-3.3
|
||||
reactos/dll/win32/avifil32 # Synced to WineStaging-3.9
|
||||
reactos/dll/win32/avifil32 # Synced to WineStaging-4.0
|
||||
reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.23
|
||||
reactos/dll/win32/browseui # Out of sync
|
||||
reactos/dll/win32/cabinet # Synced to WineStaging-3.3
|
||||
|
|
Loading…
Reference in a new issue