Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-07 14:51:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[AVIFIL32] Sync with Wine Staging 1.7.37. CORE-9246

Browse source 
svn path=/trunk/; revision=66787
This commit is contained in:
Amine Khaldi 2015-03-18 15:39:32 +00:00
parent 73cc7d24ae
commit c15779228c
3 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
reactos/dll/win32/avifil32/avifile.c
View file

@ -446,13 +446,12 @@ static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, LO
This->ppStreams[nStream] != NULL) {
/* ... so delete it now */
HeapFree(GetProcessHeap(), 0, This->ppStreams[nStream]);
if (This->fInfo.dwStreams - nStream > 0)
memcpy(This->ppStreams + nStream, This->ppStreams + nStream + 1,
(This->fInfo.dwStreams - nStream) * sizeof(IAVIStreamImpl*));
This->fInfo.dwStreams--;
if (nStream < This->fInfo.dwStreams)
memmove(&This->ppStreams[nStream], &This->ppStreams[nStream + 1],
(This->fInfo.dwStreams - nStream) * sizeof(This->ppStreams[0]));
This->ppStreams[This->fInfo.dwStreams] = NULL;
This->fInfo.dwStreams--;
This->fDirty = TRUE;
/* This->fInfo will be updated further when asked for */
@ -1406,11 +1405,21 @@ static HRESULT AVIFILE_AddRecord(IAVIFileImpl *This)
/* pre-conditions */
assert(This != NULL && This->ppStreams[0] != NULL);
if (This->idxRecords == NULL || This->cbIdxRecords == 0) {
This->cbIdxRecords += 1024 * sizeof(AVIINDEXENTRY);
This->idxRecords = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->cbIdxRecords);
if (This->idxRecords == NULL)
if (This->idxRecords == NULL || This->cbIdxRecords / sizeof(AVIINDEXENTRY) <= This->nIdxRecords) {
DWORD new_count = This->cbIdxRecords + 1024 * sizeof(AVIINDEXENTRY);
void *mem;
if (!This->idxRecords)
mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, new_count);
else
mem = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->idxRecords, new_count);
if (mem) {
This->cbIdxRecords = new_count;
This->idxRecords = mem;
} else {
HeapFree(GetProcessHeap(), 0, This->idxRecords);
This->idxRecords = NULL;
return AVIERR_MEMORY;
}
}
assert(This->nIdxRecords < This->cbIdxRecords/sizeof(AVIINDEXENTRY));
@ -1442,7 +1451,7 @@ static DWORD AVIFILE_ComputeMoviStart(IAVIFileImpl *This)
dwPos += ((pStream->cbFormat + 1) & ~1U);
if (pStream->lpHandlerData != NULL && pStream->cbHandlerData > 0)
dwPos += 2 * sizeof(DWORD) + ((pStream->cbHandlerData + 1) & ~1U);
if (lstrlenW(pStream->sInfo.szName) > 0)
if (pStream->sInfo.szName[0])
dwPos += 2 * sizeof(DWORD) + ((lstrlenW(pStream->sInfo.szName) + 1) & ~1U);
}
@ -2201,7 +2210,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This)
}
/* ... an optional name for this stream ... */
if (lstrlenW(pStream->sInfo.szName) > 0) {
if (pStream->sInfo.szName[0]) {
LPSTR str;
ck.ckid = ckidSTREAMNAME;

7
reactos/dll/win32/avifil32/editstream.c
View file

@ -152,10 +152,9 @@ static HRESULT AVIFILE_RemoveStream(IAVIEditStreamImpl* const This, DWORD nr)
/* remove part nr */
IAVIStream_Release(This->pStreams[nr].pStream);
This->nStreams--;
if (This->nStreams - nr > 0) {
memmove(This->pStreams + nr, This->pStreams + nr + 1,
(This->nStreams - nr) * sizeof(EditStreamTable));
}
if (nr < This->nStreams)
memmove(&This->pStreams[nr], &This->pStreams[nr + 1],
(This->nStreams - nr) * sizeof(This->pStreams[0]));
This->pStreams[This->nStreams].pStream = NULL;
This->pStreams[This->nStreams].dwStart = 0;
This->pStreams[This->nStreams].dwLength = 0;

2
reactos/media/doc/README.WINE
View file

@ -55,7 +55,7 @@ reactos/dll/win32/advpack # Synced to WineStaging-1.7.37
reactos/dll/win32/atl # Synced to WineStaging-1.7.37
reactos/dll/win32/atl80 # Synced to WineStaging-1.7.37
reactos/dll/win32/atl100 # Synced to WineStaging-1.7.37
reactos/dll/win32/avifil32 # Synced to Wine-1.7.27
reactos/dll/win32/avifil32 # Synced to WineStaging-1.7.37
reactos/dll/win32/bcrypt # Synced to Wine-1.7.27
reactos/dll/win32/browseui # Out of sync
reactos/dll/win32/cabinet # Synced to Wine-1.7.27