[MSGSM32.ACM]

* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60306

diff --git a/reactos/dll/win32/msgsm32.acm/CMakeLists.txt b/reactos/dll/win32/msgsm32.acm/CMakeLists.txt
index 7ef640c..ba03b18 100644 (file)
--- a/reactos/dll/win32/msgsm32.acm/CMakeLists.txt
+++ b/reactos/dll/win32/msgsm32.acm/CMakeLists.txt
@@ -1,7 +1,6 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-

 spec2def(msgsm32.acm msgsm32.acm.spec)
 
 list(APPEND SOURCE
 spec2def(msgsm32.acm msgsm32.acm.spec)
 
 list(APPEND SOURCE


@@ -9,10 +8,8 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.def)
 
 add_library(msgsm32.acm SHARED ${SOURCE})
     ${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)
 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)
 add_cd_file(TARGET msgsm32.acm DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/msgsm32.acm/msgsm32.c b/reactos/dll/win32/msgsm32.acm/msgsm32.c
index 643664e..358ed13 100644 (file)
--- a/reactos/dll/win32/msgsm32.acm/msgsm32.c
+++ b/reactos/dll/win32/msgsm32.acm/msgsm32.c
@@ -223,7 +223,7 @@ static      LRESULT GSM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
             aftd->dwFormatTagIndex = 1;
            break;
        }
             aftd->dwFormatTagIndex = 1;
            break;
        }

-       /* fall thru */
+       /* fall through */

     case ACM_FORMATTAGDETAILSF_FORMATTAG:
        switch (aftd->dwFormatTag)
         {
     case ACM_FORMATTAGDETAILSF_FORMATTAG:
        switch (aftd->dwFormatTag)
         {


@@ -620,7 +620,7 @@ LRESULT CALLBACK GSM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
     case ACMDM_STREAM_CONVERT:
        return GSM_StreamConvert((PACMDRVSTREAMINSTANCE)dwParam1, (PACMDRVSTREAMHEADER)dwParam2);
 #else
     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:
     case ACMDM_STREAM_CLOSE:
     case ACMDM_STREAM_SIZE:
     case ACMDM_STREAM_CONVERT:

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 549c3dc..94c5666 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -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/msftedit        # Synced to Wine-1.5.19
 reactos/dll/win32/msg711.acm      # 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/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
 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