[MSG711.ACM] Sync with Wine Staging 4.18. CORE-16441

diff --git a/dll/win32/msg711.acm/msg711.c b/dll/win32/msg711.acm/msg711.c
index d20c89b..6909494 100644 (file)
--- a/dll/win32/msg711.acm/msg711.c
+++ b/dll/win32/msg711.acm/msg711.c
@@ -161,7 +161,7 @@ static inline void  W16(unsigned char* dst, short s)
  * charge.
  *
  * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ * THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
  *
  * Sun source code is provided with no support and without any obligation on
@@ -542,8 +542,7 @@ static inline unsigned char
 ulaw2alaw(unsigned char uval)
 {
     uval &= 0xff;
-    return (unsigned char) ((uval & 0x80) ? (0xD5 ^ (_u2a[0xFF ^ uval] - 1)) :
-                            (unsigned char) (0x55 ^ (_u2a[0x7F ^ uval] - 1)));
+    return (uval & 0x80) ? (0xD5 ^ (_u2a[0xFF ^ uval] - 1)) : (0x55 ^ (_u2a[0x7F ^ uval] - 1));
 }
 
 /* -------------------------------------------------------------------------------*/

diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index df8a8c6..2cda274 100644 (file)
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -109,7 +109,7 @@ dll/win32/mscms               # Synced to WineStaging-4.18
 dll/win32/mscoree             # Synced to Wine-1.5.4
 dll/win32/msctf               # Synced to WineStaging-4.18
 dll/win32/msftedit            # Synced to WineStaging-4.18
-dll/win32/msg711.acm          # Synced to WineStaging-4.0
+dll/win32/msg711.acm          # Synced to WineStaging-4.18
 dll/win32/msgsm32.acm         # Synced to WineStaging-4.0
 dll/win32/mshtml              # Synced to WineStaging-1.7.55
 dll/win32/mshtml.tlb          # Synced to WineStaging-1.7.55