[ros-diffs] [akhaldi] 71560: [MCIAVI32] Sync with Wine Staging 1.9.11. CORE-11368

Author: akhaldi
Date: Sun Jun  5 19:29:11 2016
New Revision: 71560

URL: http://svn.reactos.org/svn/reactos?rev=71560&view=rev
Log:
[MCIAVI32] Sync with Wine Staging 1.9.11. CORE-11368

Modified:
    trunk/reactos/dll/win32/mciavi32/mmoutput.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/mciavi32/mmoutput.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mmoutpu…
==============================================================================
--- trunk/reactos/dll/win32/mciavi32/mmoutput.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mciavi32/mmoutput.c	[iso-8859-1] Sun Jun  5 19:29:11 2016
@@ -226,14 +226,16 @@
 	      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;

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Jun  5 19:29:11 2016
@@ -92,7 +92,7 @@
 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