Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 07:15:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSGSM32.ACM]

Browse source 
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60306
This commit is contained in:
Amine Khaldi 2013-09-22 16:28:18 +00:00
parent ef5fd265dc
commit b44def699b
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/dll/win32/msgsm32.acm/CMakeLists.txt
View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__) add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(msgsm32.acm msgsm32.acm.spec) spec2def(msgsm32.acm msgsm32.acm.spec)
list(APPEND SOURCE list(APPEND SOURCE
@ -9,10 +8,8 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/msgsm32.def) ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.def)
add_library(msgsm32.acm SHARED ${SOURCE}) add_library(msgsm32.acm SHARED ${SOURCE})
set_module_type(msgsm32.acm win32dll) set_module_type(msgsm32.acm win32dll)
set_target_properties(msgsm32.acm PROPERTIES SUFFIX "") set_target_properties(msgsm32.acm PROPERTIES SUFFIX "")
target_link_libraries(msgsm32.acm wine) target_link_libraries(msgsm32.acm wine)
add_importlibs(msgsm32.acm winmm user32 msvcrt kernel32 ntdll) add_importlibs(msgsm32.acm winmm user32 msvcrt kernel32 ntdll)
add_dependencies(msgsm32.acm psdk)
add_cd_file(TARGET msgsm32.acm DESTINATION reactos/system32 FOR all) add_cd_file(TARGET msgsm32.acm DESTINATION reactos/system32 FOR all)

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

@ -223,7 +223,7 @@ static LRESULT GSM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
aftd->dwFormatTagIndex = 1; aftd->dwFormatTagIndex = 1;
break; break;
} }
/* fall thru */ /* fall through */
case ACM_FORMATTAGDETAILSF_FORMATTAG: case ACM_FORMATTAGDETAILSF_FORMATTAG:
switch (aftd->dwFormatTag) switch (aftd->dwFormatTag)
{ {
@ -620,7 +620,7 @@ LRESULT CALLBACK GSM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
case ACMDM_STREAM_CONVERT: case ACMDM_STREAM_CONVERT:
return GSM_StreamConvert((PACMDRVSTREAMINSTANCE)dwParam1, (PACMDRVSTREAMHEADER)dwParam2); return GSM_StreamConvert((PACMDRVSTREAMINSTANCE)dwParam1, (PACMDRVSTREAMHEADER)dwParam2);
#else #else
case ACMDM_STREAM_OPEN: ERR("libgsm support not compiled in!\n"); case ACMDM_STREAM_OPEN: WARN("libgsm support not compiled in!\n");
case ACMDM_STREAM_CLOSE: case ACMDM_STREAM_CLOSE:
case ACMDM_STREAM_SIZE: case ACMDM_STREAM_SIZE:
case ACMDM_STREAM_CONVERT: case ACMDM_STREAM_CONVERT:

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

@ -113,7 +113,7 @@ reactos/dll/win32/mscoree # Synced to Wine-1.5.4
reactos/dll/win32/msctf # Synced to Wine-1.7.1 reactos/dll/win32/msctf # Synced to Wine-1.7.1
reactos/dll/win32/msftedit # Synced to Wine-1.5.19 reactos/dll/win32/msftedit # Synced to Wine-1.5.19
reactos/dll/win32/msg711.acm # Synced to Wine-1.7.1 reactos/dll/win32/msg711.acm # Synced to Wine-1.7.1
reactos/dll/win32/msgsm32.acm # Synced to Wine-1.5.4 reactos/dll/win32/msgsm32.acm # Synced to Wine-1.7.1
reactos/dll/win32/mshtml # Synced to Wine-1.5.26 reactos/dll/win32/mshtml # Synced to Wine-1.5.26
reactos/dll/win32/mshtml.tlb # Synced to Wine-1.5.26 reactos/dll/win32/mshtml.tlb # Synced to Wine-1.5.26
reactos/dll/win32/msi # Synced to Wine-1.5.26 reactos/dll/win32/msi # Synced to Wine-1.5.26