[ros-diffs] [akhaldi] 60216: [IMAADP32.ACM] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Thu Sep 19 18:57:58 2013
New Revision: 60216

URL: http://svn.reactos.org/svn/reactos?rev=60216&view=rev
Log:
[IMAADP32.ACM]
* Sync with Wine 1.7.1.
CORE-7469

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

Modified: trunk/reactos/dll/win32/imaadp32.acm/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imaadp32.acm/CMa…
==============================================================================
--- trunk/reactos/dll/win32/imaadp32.acm/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/imaadp32.acm/CMakeLists.txt	[iso-8859-1] Thu Sep 19 18:57:58
2013
@@ -9,10 +9,8 @@
     ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.def)
 
 add_library(imaadp32.acm SHARED ${SOURCE})
-
 set_module_type(imaadp32.acm win32dll)
 set_target_properties(imaadp32.acm PROPERTIES SUFFIX "")
 target_link_libraries(imaadp32.acm wine)
 add_importlibs(imaadp32.acm winmm user32 msvcrt kernel32 ntdll)
-add_dependencies(imaadp32.acm psdk)
 add_cd_file(TARGET imaadp32.acm DESTINATION reactos/system32 FOR all)

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] Thu Sep 19 18:57:58 2013
@@ -138,7 +138,7 @@
 
 static void     init_wfx_ima_adpcm(IMAADPCMWAVEFORMAT* awfx/*, DWORD nba*/)
 {
-    register WAVEFORMATEX*      pwfx = &awfx->wfx;
+    WAVEFORMATEX* pwfx = &awfx->wfx;
 
     /* we assume wFormatTag, nChannels, nSamplesPerSec and wBitsPerSample
      * have been initialized... */
@@ -550,7 +550,7 @@
             aftd->dwFormatTagIndex = 1; /* WAVE_FORMAT_IMA_ADPCM is bigger than PCM
*/
 	    break;
 	}
-	/* fall thru */
+	/* fall through */
     case ACM_FORMATTAGDETAILSF_FORMATTAG:
 	switch (aftd->dwFormatTag)
         {

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] Thu Sep 19 18:57:58 2013
@@ -81,7 +81,7 @@
 reactos/dll/win32/iccvid          # Synced to Wine-1.7.1
 reactos/dll/win32/icmp            # Synced to Wine-0_9_10
 reactos/dll/win32/ieframe         # Synced to Wine-1.7.1
-reactos/dll/win32/imaadp32.acm    # Synced to Wine-1.5.4
+reactos/dll/win32/imaadp32.acm    # Synced to Wine-1.7.1
 reactos/dll/win32/imagehlp        # Synced to Wine-1.5.4
 reactos/dll/win32/imm32           # Synced to Wine-1.5.19
 reactos/dll/win32/inetcomm        # Synced to Wine-1.5.4