01/01: [MSADP32.ACM] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99cd8173f2469e27a1c5e5...

commit 99cd8173f2469e27a1c5e5354e90f5ae82f49f12
Author:     Amine Khaldi [e-mail]
AuthorDate: Sun Mar 18 12:25:31 2018 +0100
Commit:     Amine Khaldi [e-mail]
CommitDate: Sun Mar 18 12:25:31 2018 +0100

[MSADP32.ACM] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/msadp32.acm/msadp32.c | 24 +++++++++++-------------
 media/doc/README.WINE           |  2 +-
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/dll/win32/msadp32.acm/msadp32.c b/dll/win32/msadp32.acm/msadp32.c
index 33707ab19a..24e0c6a72b 100644
--- a/dll/win32/msadp32.acm/msadp32.c
+++ b/dll/win32/msadp32.acm/msadp32.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"

/* see http://www.pcisys.net/~melanson/codecs/adpcm.txt for the details */

diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 83e1f4cd6c..c69306ac2c 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -102,7 +102,7 @@ reactos/dll/win32/mpr                 # Synced to WineStaging-3.3
 reactos/dll/win32/mprapi              # Synced to WineStaging-3.3
 reactos/dll/win32/msacm32             # Synced to WineStaging-3.3
 reactos/dll/win32/msacm32.drv         # Synced to WineStaging-3.3
-reactos/dll/win32/msadp32.acm         # Synced to WineStaging-2.9
+reactos/dll/win32/msadp32.acm         # Synced to WineStaging-3.3
 reactos/dll/win32/mscat32             # Synced to WineStaging-2.9
 reactos/dll/win32/mscms               # Synced to WineStaging-2.9
 reactos/dll/win32/mscoree             # Synced to Wine-1.5.4