Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IMAADP32.ACM]

Browse source 
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60216
This commit is contained in:
Amine Khaldi 2013-09-19 18:57:58 +00:00
parent 5ae8798e5b
commit 38685919f0
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/imaadp32.acm/CMakeLists.txt
View file

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

4
reactos/dll/win32/imaadp32.acm/imaadp32.c
View file

@ -138,7 +138,7 @@ static DWORD ADPCM_GetFormatIndex(const WAVEFORMATEX *wfx)
static void init_wfx_ima_adpcm(IMAADPCMWAVEFORMAT* awfx/*, DWORD nba*/) 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 /* we assume wFormatTag, nChannels, nSamplesPerSec and wBitsPerSample
* have been initialized... */ * have been initialized... */
@ -550,7 +550,7 @@ static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
aftd->dwFormatTagIndex = 1; /* WAVE_FORMAT_IMA_ADPCM is bigger than PCM */ aftd->dwFormatTagIndex = 1; /* WAVE_FORMAT_IMA_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)
{ {

2
reactos/media/doc/README.WINE
View file

@ -81,7 +81,7 @@ reactos/dll/win32/httpapi # Synced to Wine-1.7.1
reactos/dll/win32/iccvid # Synced to Wine-1.7.1 reactos/dll/win32/iccvid # Synced to Wine-1.7.1
reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/icmp # Synced to Wine-0_9_10
reactos/dll/win32/ieframe # Synced to Wine-1.7.1 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/imagehlp # Synced to Wine-1.5.4
reactos/dll/win32/imm32 # Synced to Wine-1.5.19 reactos/dll/win32/imm32 # Synced to Wine-1.5.19
reactos/dll/win32/inetcomm # Synced to Wine-1.5.4 reactos/dll/win32/inetcomm # Synced to Wine-1.5.4