From ef5fd265dc66bf07702701ff515371e0ece0b123 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 22 Sep 2013 16:25:27 +0000 Subject: [PATCH] [MSG711.ACM] * Sync with Wine 1.7.1. CORE-7469 svn path=/trunk/; revision=60305 --- reactos/dll/win32/msg711.acm/CMakeLists.txt | 3 --- reactos/dll/win32/msg711.acm/msg711.c | 2 +- reactos/media/doc/README.WINE | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/reactos/dll/win32/msg711.acm/CMakeLists.txt b/reactos/dll/win32/msg711.acm/CMakeLists.txt index 619a2988bf6..725c30c28a8 100644 --- a/reactos/dll/win32/msg711.acm/CMakeLists.txt +++ b/reactos/dll/win32/msg711.acm/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msg711.acm msg711.acm.spec) list(APPEND SOURCE @@ -9,10 +8,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/msg711.def) add_library(msg711.acm SHARED ${SOURCE}) - set_module_type(msg711.acm win32dll) set_target_properties(msg711.acm PROPERTIES SUFFIX "") target_link_libraries(msg711.acm wine) add_importlibs(msg711.acm winmm user32 msvcrt kernel32 ntdll) -add_dependencies(msg711.acm psdk) add_cd_file(TARGET msg711.acm DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/msg711.acm/msg711.c b/reactos/dll/win32/msg711.acm/msg711.c index b091881a17c..0ef7ff80fc8 100644 --- a/reactos/dll/win32/msg711.acm/msg711.c +++ b/reactos/dll/win32/msg711.acm/msg711.c @@ -697,7 +697,7 @@ static LRESULT G711_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) aftd->dwFormatTagIndex = 1; 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 e80de6e1773..549c3dc8326 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -112,7 +112,7 @@ reactos/dll/win32/mscms # Synced to Wine-1.7.1 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to Wine-1.7.1 reactos/dll/win32/msftedit # Synced to Wine-1.5.19 -reactos/dll/win32/msg711.acm # Synced to Wine-1.5.19 +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/mshtml # Synced to Wine-1.5.26 reactos/dll/win32/mshtml.tlb # Synced to Wine-1.5.26