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

---
 dll/win32/mciqtz32/mciavi_res.rc    |  8 ++++----
 dll/win32/mciqtz32/mciqtz.c         | 17 +++++++----------
 dll/win32/mciqtz32/mciqtz_private.h |  2 +-
 dll/win32/mciqtz32/version.rc       |  2 +-
 media/doc/README.WINE               |  2 +-
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/dll/win32/mciqtz32/mciavi_res.rc b/dll/win32/mciqtz32/mciavi_res.rc
index 8db52cf9922..57436049ea2 100644
--- a/dll/win32/mciqtz32/mciavi_res.rc
+++ b/dll/win32/mciqtz32/mciavi_res.rc
@@ -17,10 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include "windef.h"
-//#include "winbase.h"
-#include <mmddk.h>
-#include <digitalv.h>
+#include "windef.h"
+#include "winbase.h"
+#include "mmddk.h"
+#include "digitalv.h"
 
 #ifdef MCI_INTEGER64
 #define MCI_DWORD_PTR MCI_INTEGER64
diff --git a/dll/win32/mciqtz32/mciqtz.c b/dll/win32/mciqtz32/mciqtz.c
index 0e0aa6339e4..1aec32635b2 100644
--- a/dll/win32/mciqtz32/mciqtz.c
+++ b/dll/win32/mciqtz32/mciqtz.c
@@ -18,19 +18,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define WIN32_LEAN_AND_MEAN
-
 #include <stdarg.h>
 #include <math.h>
-
-#include <windef.h>
-#include <mmddk.h>
-#include <wine/debug.h>
-
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "mmddk.h"
+#include "wine/debug.h"
 #include "mciqtz_private.h"
-#include <digitalv.h>
-#include <wownt32.h>
+#include "digitalv.h"
+#include "wownt32.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(mciqtz);
 
diff --git a/dll/win32/mciqtz32/mciqtz_private.h b/dll/win32/mciqtz32/mciqtz_private.h
index fcdfdb8ca21..aa6fad99326 100644
--- a/dll/win32/mciqtz32/mciqtz_private.h
+++ b/dll/win32/mciqtz32/mciqtz_private.h
@@ -23,7 +23,7 @@
 
 #define COBJMACROS
 
-#include <dshow.h>
+#include "dshow.h"
 
 typedef struct {
     MCIDEVICEID    wDevID;
diff --git a/dll/win32/mciqtz32/version.rc b/dll/win32/mciqtz32/version.rc
index a0de28b0f60..b27e76bcedc 100644
--- a/dll/win32/mciqtz32/version.rc
+++ b/dll/win32/mciqtz32/version.rc
@@ -24,4 +24,4 @@
 #define WINE_PRODUCTVERSION_STR "6.5"
 #define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
-#include <wine/wine_common_ver.rc>
+#include "wine/wine_common_ver.rc"
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index e2b6d60598b..bc9f80f4422 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -92,7 +92,7 @@ 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-3.3
-reactos/dll/win32/mciqtz32            # Synced to WineStaging-2.9
+reactos/dll/win32/mciqtz32            # Synced to WineStaging-3.3
 reactos/dll/win32/mciseq              # Synced to WineStaging-2.9
 reactos/dll/win32/mciwave             # Synced to WineStaging-2.9
 reactos/dll/win32/mgmtapi             # Synced to WineStaging-2.9