From 28ad1238095b09dc3bb912ca4f96c2e20f978ea8 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 5 Jun 2016 19:29:11 +0000 Subject: [PATCH] [MCIAVI32] Sync with Wine Staging 1.9.11. CORE-11368 svn path=/trunk/; revision=71560 --- reactos/dll/win32/mciavi32/mmoutput.c | 18 ++++++++++-------- reactos/media/doc/README.WINE | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/reactos/dll/win32/mciavi32/mmoutput.c b/reactos/dll/win32/mciavi32/mmoutput.c index db3156012f0..e834f769e2b 100644 --- a/reactos/dll/win32/mciavi32/mmoutput.c +++ b/reactos/dll/win32/mciavi32/mmoutput.c @@ -226,14 +226,16 @@ static BOOL MCIAVI_AddFrame(WINE_MCIAVI* wma, LPMMCKINFO mmck, alb->numAudioBlocks, mmck->cksize); if (wma->lpWaveFormat) { if (alb->numAudioBlocks >= alb->numAudioAllocated) { - alb->numAudioAllocated += 32; - if (!wma->lpAudioIndex) - wma->lpAudioIndex = HeapAlloc(GetProcessHeap(), 0, - alb->numAudioAllocated * sizeof(struct MMIOPos)); - else - wma->lpAudioIndex = HeapReAlloc(GetProcessHeap(), 0, wma->lpAudioIndex, - alb->numAudioAllocated * sizeof(struct MMIOPos)); - if (!wma->lpAudioIndex) return FALSE; + DWORD newsize = alb->numAudioAllocated + 32; + struct MMIOPos* newindex; + + if (!wma->lpAudioIndex) + newindex = HeapAlloc(GetProcessHeap(), 0, newsize * sizeof(struct MMIOPos)); + else + newindex = HeapReAlloc(GetProcessHeap(), 0, wma->lpAudioIndex, newsize * sizeof(struct MMIOPos)); + if (!newindex) return FALSE; + alb->numAudioAllocated = newsize; + wma->lpAudioIndex = newindex; } wma->lpAudioIndex[alb->numAudioBlocks].dwOffset = mmck->dwDataOffset; wma->lpAudioIndex[alb->numAudioBlocks].dwSize = mmck->cksize; diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index a6e5563a6a2..98d436defa2 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -92,7 +92,7 @@ reactos/dll/win32/localspl # Synced to WineStaging-1.9.4 reactos/dll/win32/localui # Synced to WineStaging-1.9.4 reactos/dll/win32/lz32 # Synced to WineStaging-1.9.4 reactos/dll/win32/mapi32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/mciavi32 # Synced to WineStaging-1.9.4 +reactos/dll/win32/mciavi32 # Synced to WineStaging-1.9.11 reactos/dll/win32/mcicda # Synced to WineStaging-1.9.4 reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.9.4 reactos/dll/win32/mciseq # Synced to WineStaging-1.9.4