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

Author: akhaldi
Date: Sun Sep 22 16:28:18 2013
New Revision: 60306

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

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

Modified: trunk/reactos/dll/win32/msgsm32.acm/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgsm32.acm/CMak…
==============================================================================
--- trunk/reactos/dll/win32/msgsm32.acm/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msgsm32.acm/CMakeLists.txt	[iso-8859-1] Sun Sep 22 16:28:18
2013
@@ -1,7 +1,6 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(msgsm32.acm msgsm32.acm.spec)
 
 list(APPEND SOURCE
@@ -9,10 +8,8 @@
     ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.def)
 
 add_library(msgsm32.acm SHARED ${SOURCE})
-
 set_module_type(msgsm32.acm win32dll)
 set_target_properties(msgsm32.acm PROPERTIES SUFFIX "")
 target_link_libraries(msgsm32.acm wine)
 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)

Modified: trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgsm32.acm/msgs…
==============================================================================
--- trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c	[iso-8859-1] Sun Sep 22 16:28:18 2013
@@ -223,7 +223,7 @@
             aftd->dwFormatTagIndex = 1;
 	    break;
 	}
-	/* fall thru */
+	/* fall through */
     case ACM_FORMATTAGDETAILSF_FORMATTAG:
 	switch (aftd->dwFormatTag)
         {
@@ -620,7 +620,7 @@
     case ACMDM_STREAM_CONVERT:
 	return GSM_StreamConvert((PACMDRVSTREAMINSTANCE)dwParam1,
(PACMDRVSTREAMHEADER)dwParam2);
 #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_SIZE:
     case ACMDM_STREAM_CONVERT:

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:28:18 2013
@@ -113,7 +113,7 @@
 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.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.tlb      # Synced to Wine-1.5.26
 reactos/dll/win32/msi             # Synced to Wine-1.5.26