Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-22 22:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AVIFIL32] Sync with Wine Staging 4.0. CORE-15682

Browse source
This commit is contained in:
Amine Khaldi 2019-01-25 13:14:32 +01:00
parent 0d35c5159b
commit 379c53db18
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dll/win32/avifil32/api.c
View file

@ -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));
}

2
media/doc/README.WINE
View file

@ -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