[ros-diffs] [akhaldi] 60305: [MSG711.ACM] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Sun Sep 22 16:25:27 2013
New Revision: 60305

URL: http://svn.reactos.org/svn/reactos?rev=60305&view=rev
Log:
[MSG711.ACM]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/reactos/dll/win32/msg711.acm/CMakeLists.txt
    trunk/reactos/dll/win32/msg711.acm/msg711.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/msg711.acm/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msg711.acm/CMake…
==============================================================================
--- trunk/reactos/dll/win32/msg711.acm/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msg711.acm/CMakeLists.txt	[iso-8859-1] Sun Sep 22 16:25:27
2013
@@ -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 @@
     ${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)

Modified: trunk/reactos/dll/win32/msg711.acm/msg711.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msg711.acm/msg71…
==============================================================================
--- trunk/reactos/dll/win32/msg711.acm/msg711.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msg711.acm/msg711.c	[iso-8859-1] Sun Sep 22 16:25:27 2013
@@ -697,7 +697,7 @@
             aftd->dwFormatTagIndex = 1;
 	    break;
 	}
-	/* fall thru */
+	/* fall through */
     case ACM_FORMATTAGDETAILSF_FORMATTAG:
 	switch (aftd->dwFormatTag)
         {

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Sep 22 16:25:27 2013
@@ -112,7 +112,7 @@
 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