https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff71b0673f7e4247ff630d...
commit ff71b0673f7e4247ff630d3cb419e4b89780ac21 Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Sun Mar 18 12:30:33 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Sun Mar 18 12:30:33 2018 +0100
[MSG711.ACM] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/msg711.acm/msg711.c | 24 +++++++++++------------- media/doc/README.WINE | 2 +- 2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/dll/win32/msg711.acm/msg711.c b/dll/win32/msg711.acm/msg711.c index a12bd09965..dc1661c7db 100644 --- a/dll/win32/msg711.acm/msg711.c +++ b/dll/win32/msg711.acm/msg711.c @@ -19,21 +19,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS - #include <assert.h> #include <stdarg.h> -//#include <string.h> -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <winnls.h> -//#include "mmsystem.h" -//#include "mmreg.h" -//#include "msacm.h" -#include <msacmdrv.h> -#include <wine/debug.h> +#include <string.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winnls.h" +#include "mmsystem.h" +#include "mmreg.h" +#include "msacm.h" +#include "msacmdrv.h" +#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(g711);
diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 60b2a875a1..b05e2f67ad 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -108,7 +108,7 @@ reactos/dll/win32/mscms # Synced to WineStaging-3.3 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to WineStaging-3.3 reactos/dll/win32/msftedit # Synced to WineStaging-3.3 -reactos/dll/win32/msg711.acm # Synced to WineStaging-2.9 +reactos/dll/win32/msg711.acm # Synced to WineStaging-3.3 reactos/dll/win32/msgsm32.acm # Synced to WineStaging-2.9 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55