Author: akhaldi
Date: Sun Feb 26 18:36:43 2017
New Revision: 73965
URL:
http://svn.reactos.org/svn/reactos?rev=73965&view=rev
Log:
[MSG711.ACM] Sync with Wine Staging 2.2. CORE-12823
d132488 msg711.acm: Remove an empty fixme.
5bdc868 msg711.acm: Remove dead code in G711_FormatSuggest.
Modified:
trunk/reactos/dll/win32/msg711.acm/msg711.c
trunk/reactos/media/doc/README.WINE
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 Feb 26 18:36:43 2017
@@ -844,9 +844,6 @@
case WAVE_FORMAT_MULAW:
adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels;
adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec *
adfs->pwfxSrc->nChannels;
- break;
- default:
- FIXME("\n");
break;
}
@@ -1045,7 +1042,6 @@
WARN("Unsupported query %08x\n", adss->fdwSize);
return MMSYSERR_NOTSUPPORTED;
}
- FIXME("\n");
return MMSYSERR_NOERROR;
}
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 Feb 26 18:36:43 2017
@@ -108,7 +108,7 @@
reactos/dll/win32/mscoree # Synced to Wine-1.5.4
reactos/dll/win32/msctf # Synced to WineStaging-2.2
reactos/dll/win32/msftedit # Synced to WineStaging-1.9.11
-reactos/dll/win32/msg711.acm # Synced to WineStaging-1.9.11
+reactos/dll/win32/msg711.acm # Synced to WineStaging-2.2
reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.9.11
reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55
reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55