[MSADP32.ACM]

* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60290
This commit is contained in:
Amine Khaldi 2013-09-21 19:48:33 +00:00
parent 8ea614d505
commit 7ae750c1d9
3 changed files with 2 additions and 4 deletions

View file

@ -9,10 +9,8 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/msadp32.def) ${CMAKE_CURRENT_BINARY_DIR}/msadp32.def)
add_library(msadp32.acm SHARED ${SOURCE}) add_library(msadp32.acm SHARED ${SOURCE})
set_module_type(msadp32.acm win32dll) set_module_type(msadp32.acm win32dll)
set_target_properties(msadp32.acm PROPERTIES SUFFIX "") set_target_properties(msadp32.acm PROPERTIES SUFFIX "")
target_link_libraries(msadp32.acm wine) target_link_libraries(msadp32.acm wine)
add_importlibs(msadp32.acm winmm user32 msvcrt kernel32 ntdll) 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) add_cd_file(TARGET msadp32.acm DESTINATION reactos/system32 FOR all)

View file

@ -380,7 +380,7 @@ static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
aftd->dwFormatTagIndex = 1; /* WAVE_FORMAT_ADPCM is bigger than PCM */ aftd->dwFormatTagIndex = 1; /* WAVE_FORMAT_ADPCM is bigger than PCM */
break; break;
} }
/* fall thru */ /* fall through */
case ACM_FORMATTAGDETAILSF_FORMATTAG: case ACM_FORMATTAGDETAILSF_FORMATTAG:
switch (aftd->dwFormatTag) switch (aftd->dwFormatTag)
{ {

View file

@ -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/mpr # Synced to Wine-1.7.1
reactos/dll/win32/mprapi # Synced to Wine-1.5.19 reactos/dll/win32/mprapi # Synced to Wine-1.5.19
reactos/dll/win32/msacm32 # Synced to Wine-1.7.1 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/mscat32 # Synced to Wine-1.5.19
reactos/dll/win32/mscms # Synced to Wine-1.5.4 reactos/dll/win32/mscms # Synced to Wine-1.5.4
reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/mscoree # Synced to Wine-1.5.4