[ros-diffs] [akhaldi] 73950: [IMAADP32.ACM] Sync with Wine Staging 2.2. CORE-12823 1a6d3c1 imaadpcm32: Fix source offsets when converting stereo PCM to IMAADPCM.

Author: akhaldi
Date: Sun Feb 26 17:32:01 2017
New Revision: 73950

URL: http://svn.reactos.org/svn/reactos?rev=73950&view=rev
Log:
[IMAADP32.ACM] Sync with Wine Staging 2.2. CORE-12823

1a6d3c1 imaadpcm32: Fix source offsets when converting stereo PCM to IMAADPCM.

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

Modified: trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imaadp32.acm/ima…
==============================================================================
--- trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c	[iso-8859-1] Sun Feb 26 17:32:01 2017
@@ -433,29 +433,27 @@
         /* generate header */
     	sampleL = R16(src);  src += 2;
 	W16(dst, sampleL); dst += 2;
-	*dst = (unsigned char)(unsigned)stepIndexL;
-	dst += 2;
+	W16(dst, stepIndexL); dst += 2;
 
     	sampleR = R16(src); src += 2;
 	W16(dst, sampleR); dst += 2;
-	*dst = (unsigned char)(unsigned)stepIndexR;
-	dst += 2;
+	W16(dst, stepIndexR); dst += 2;
 
 	for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 8)
         {
             for (i = 0; i < 4; i++)
             {
-                code1 = generate_nibble(R16(src + (2 * i + 0) * 2 + 0),
+                code1 = generate_nibble(R16(src + (4 * i + 0) * 2),
                                         &stepIndexL, &sampleL);
-                code2 = generate_nibble(R16(src + (2 * i + 1) * 2 + 0),
+                code2 = generate_nibble(R16(src + (4 * i + 2) * 2),
                                         &stepIndexL, &sampleL);
                 *dst++ = (code1 << 4) | code2;
             }
             for (i = 0; i < 4; i++)
             {
-                code1 = generate_nibble(R16(src + (2 * i + 0) * 2 + 1),
+                code1 = generate_nibble(R16(src + (4 * i + 1) * 2),
                                         &stepIndexR, &sampleR);
-                code2 = generate_nibble(R16(src + (2 * i + 1) * 2 + 1),
+                code2 = generate_nibble(R16(src + (4 * i + 3) * 2),
                                         &stepIndexR, &sampleR);
                 *dst++ = (code1 << 4) | code2;
             }

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 Feb 26 17:32:01 2017
@@ -75,7 +75,7 @@
 reactos/dll/win32/httpapi             # Synced to WineStaging-1.9.11
 reactos/dll/win32/iccvid              # Synced to WineStaging-2.2
 reactos/dll/win32/ieframe             # Synced to WineStaging-2.2
-reactos/dll/win32/imaadp32.acm        # Synced to WineStaging-1.9.11
+reactos/dll/win32/imaadp32.acm        # Synced to WineStaging-2.2
 reactos/dll/win32/imagehlp            # Synced to WineStaging-1.9.11
 reactos/dll/win32/imm32               # Synced to Wine-1.7.27
 reactos/dll/win32/inetcomm            # Synced to WineStaging-1.9.23