From 122f1078cd28ec0c9a42e84fa264931a5255606e Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 17 Mar 2018 13:18:10 +0100
Subject: [PATCH] [MCICDA] Sync with Wine Staging 3.3. CORE-14434

---
 dll/win32/mcicda/mcicda.c | 32 +++++++++++++++-----------------
 media/doc/README.WINE     |  2 +-
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/dll/win32/mcicda/mcicda.c b/dll/win32/mcicda/mcicda.c
index 1a1a52485be..ab4c1cd2057 100644
--- a/dll/win32/mcicda/mcicda.c
+++ b/dll/win32/mcicda/mcicda.c
@@ -20,26 +20,24 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <config.h>
+#include "config.h"
 #include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
+#include <stdio.h>
+#include <string.h>
 
 #define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-#include <windef.h>
-//#include "winbase.h"
-//#include "wingdi.h"
-#include <winuser.h>
-#include <wownt32.h>
-#include <mmddk.h>
-#include <winioctl.h>
-#include <ntddcdrm.h>
-//#include "winternl.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-#include <dsound.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "wownt32.h"
+#include "mmddk.h"
+#include "winioctl.h"
+#include "ntddcdrm.h"
+#include "wine/winternl.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+#include "dsound.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(mcicda);
 
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index e7ce120e718..e2b6d60598b 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -91,7 +91,7 @@ reactos/dll/win32/loadperf            # Synced to WineStaging-3.3
 reactos/dll/win32/lz32                # Synced to WineStaging-3.3
 reactos/dll/win32/mapi32              # Synced to WineStaging-3.3
 reactos/dll/win32/mciavi32            # Synced to WineStaging-3.3
-reactos/dll/win32/mcicda              # Synced to WineStaging-2.9
+reactos/dll/win32/mcicda              # Synced to WineStaging-3.3
 reactos/dll/win32/mciqtz32            # Synced to WineStaging-2.9
 reactos/dll/win32/mciseq              # Synced to WineStaging-2.9
 reactos/dll/win32/mciwave             # Synced to WineStaging-2.9