From: Amine Khaldi Date: Sun, 10 Nov 2019 13:02:55 +0000 (+0100) Subject: [MSG711.ACM] Sync with Wine Staging 4.18. CORE-16441 X-Git-Tag: 0.4.14-RC~1294 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=9914d8b124d8cfb81061c31fd684dabecfaffa12;hp=5225a606cb957c6ff7a053bd5107d330b96ee724 [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 d20c89bfaff..6909494e29f 100644 --- 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 df8a8c6fd59..2cda2743636 100644 --- 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