[ros-diffs] [akhaldi] 75943: [WINEMP3.ACM] Sync with Wine Staging 2.16. CORE-13762 ffebb91 winemp3.acm: Fix error in acmStreamSize().

Author: akhaldi
Date: Sun Sep 24 11:17:34 2017
New Revision: 75943

URL: http://svn.reactos.org/svn/reactos?rev=75943&view=rev
Log:
[WINEMP3.ACM] Sync with Wine Staging 2.16. CORE-13762

ffebb91 winemp3.acm: Fix error in acmStreamSize().

Modified:
    trunk/reactos/dll/win32/winemp3.acm/mpegl3.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/winemp3.acm/mpegl3.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/mpeg…
==============================================================================
--- trunk/reactos/dll/win32/winemp3.acm/mpegl3.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/winemp3.acm/mpegl3.c	[iso-8859-1] Sun Sep 24 11:17:34 2017
@@ -953,11 +953,11 @@
              adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEG))
         {
             nblocks = adss->cbSrcLength / (adsi->pwfxSrc->nBlockAlign * 1152);
-            if (nblocks == 0)
-                return ACMERR_NOTPOSSIBLE;
             if (adss->cbSrcLength % (DWORD)(adsi->pwfxSrc->nBlockAlign * 1152))
                 /* Round block count up. */
                 nblocks++;
+            if (nblocks == 0)
+                return ACMERR_NOTPOSSIBLE;
             adss->cbDstLength = 3000 + nblocks *
(DWORD)(adsi->pwfxDst->nAvgBytesPerSec * 1152 / adsi->pwfxDst->nSamplesPerSec
+ 0.5);
 	}
         else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 ||
@@ -965,11 +965,11 @@
                  adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM)
         {
             nblocks = adss->cbSrcLength / (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec
* 1152 / adsi->pwfxSrc->nSamplesPerSec);
-            if (nblocks == 0)
-                return ACMERR_NOTPOSSIBLE;
             if (adss->cbSrcLength % (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec *
1152 / adsi->pwfxSrc->nSamplesPerSec))
                 /* Round block count up. */
                 nblocks++;
+            if (nblocks == 0)
+                return ACMERR_NOTPOSSIBLE;
             adss->cbDstLength = nblocks * 1152 * adsi->pwfxDst->nBlockAlign;
 	}
         else

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 Sep 24 11:17:34 2017
@@ -198,7 +198,7 @@
 reactos/dll/win32/wbemprox            # Synced to WineStaging-2.16
 reactos/dll/win32/windowscodecs       # Synced to WineStaging-2.9
 reactos/dll/win32/windowscodecsext    # Synced to WineStaging-2.9
-reactos/dll/win32/winemp3.acm         # Synced to WineStaging-2.9
+reactos/dll/win32/winemp3.acm         # Synced to WineStaging-2.16
 reactos/dll/win32/wing32              # Synced to WineStaging-2.9
 reactos/dll/win32/winhttp             # Synced to WineStaging-2.9
 reactos/dll/win32/wininet             # Synced to WineStaging-2.9