[ros-diffs] 01/01: [MSACM32.DRV] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a51fd57df1b13cf85434f…

commit a51fd57df1b13cf85434fab4490c9a69889aa13b
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sun Mar 18 12:24:36 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sun Mar 18 12:24:36 2018 +0100

    [MSACM32.DRV] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/msacm32.drv/wavemap.c | 22 ++++++++++------------
 media/doc/README.WINE           |  2 +-
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/dll/win32/msacm32.drv/wavemap.c b/dll/win32/msacm32.drv/wavemap.c
index bf9e37cac0..4c8cb6c257 100644
--- a/dll/win32/msacm32.drv/wavemap.c
+++ b/dll/win32/msacm32.drv/wavemap.c
@@ -28,19 +28,17 @@
  *		those should be taken care of...
  */
 
-#define WIN32_NO_STATUS
-
 #include <stdarg.h>
-//#include <string.h>
-#include <windef.h>
-//#include "winbase.h"
-#include <wingdi.h>
-#include <winuser.h>
-#include <mmddk.h>
-#include <mmreg.h>
-#include <msacm.h>
-#include <wine/unicode.h>
-#include <wine/debug.h>
+#include <string.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "mmddk.h"
+#include "mmreg.h"
+#include "msacm.h"
+#include "wine/unicode.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wavemap);
 
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 92d7b248dc..83e1f4cd6c 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -101,7 +101,7 @@ reactos/dll/win32/mmdevapi            # Synced to WineStaging-3.3
 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-2.9
+reactos/dll/win32/msacm32.drv         # Synced to WineStaging-3.3
 reactos/dll/win32/msadp32.acm         # Synced to WineStaging-2.9
 reactos/dll/win32/mscat32             # Synced to WineStaging-2.9
 reactos/dll/win32/mscms               # Synced to WineStaging-2.9