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

Author: akhaldi
Date: Sat Sep 21 19:48:33 2013
New Revision: 60290

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

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

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

Modified: trunk/reactos/dll/win32/msadp32.acm/msadp32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msadp32.acm/msad…
==============================================================================
--- trunk/reactos/dll/win32/msadp32.acm/msadp32.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msadp32.acm/msadp32.c	[iso-8859-1] Sat Sep 21 19:48:33 2013
@@ -380,7 +380,7 @@
             aftd->dwFormatTagIndex = 1; /* WAVE_FORMAT_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] Sat Sep 21 19:48:33 2013
@@ -106,7 +106,7 @@
 reactos/dll/win32/mpr             # Synced to Wine-1.7.1
 reactos/dll/win32/mprapi          # Synced to Wine-1.5.19
 reactos/dll/win32/msacm32         # Synced to Wine-1.7.1
-reactos/dll/win32/msadp32.acm     # Synced to Wine-1.5.19
+reactos/dll/win32/msadp32.acm     # Synced to Wine-1.7.1
 reactos/dll/win32/mscat32         # Synced to Wine-1.5.19
 reactos/dll/win32/mscms           # Synced to Wine-1.5.4
 reactos/dll/win32/mscoree         # Synced to Wine-1.5.4