[MSADP32.ACM]

* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60290

diff --git a/reactos/dll/win32/msadp32.acm/CMakeLists.txt b/reactos/dll/win32/msadp32.acm/CMakeLists.txt
index 6625923..702cefd 100644 (file)
--- a/reactos/dll/win32/msadp32.acm/CMakeLists.txt
+++ b/reactos/dll/win32/msadp32.acm/CMakeLists.txt
@@ -9,10 +9,8 @@ list(APPEND SOURCE
     ${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)

diff --git a/reactos/dll/win32/msadp32.acm/msadp32.c b/reactos/dll/win32/msadp32.acm/msadp32.c
index dbb6d20..dcf3652 100644 (file)
--- a/reactos/dll/win32/msadp32.acm/msadp32.c
+++ b/reactos/dll/win32/msadp32.acm/msadp32.c
@@ -380,7 +380,7 @@ static      LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
             aftd->dwFormatTagIndex = 1; /* WAVE_FORMAT_ADPCM is bigger than PCM */
            break;
        }
-       /* fall thru */
+       /* fall through */
     case ACM_FORMATTAGDETAILSF_FORMATTAG:
        switch (aftd->dwFormatTag)
         {

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 4a1fff0..45239b9 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -106,7 +106,7 @@ reactos/dll/win32/mlang           # Synced to Wine-1.7.1
 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