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

---
 dll/win32/mciavi32/CMakeLists.txt   |  4 ++--
 dll/win32/mciavi32/info.c           |  5 +++++
 dll/win32/mciavi32/mciavi.c         |  6 ++++--
 dll/win32/mciavi32/mciavi_res.rc    |  8 ++++----
 dll/win32/mciavi32/mmoutput.c       |  3 +++
 dll/win32/mciavi32/precomp.h        | 13 +++++++++++++
 dll/win32/mciavi32/private_mciavi.h | 23 +++++++++--------------
 dll/win32/mciavi32/wnd.c            |  4 ++++
 media/doc/README.WINE               |  2 +-
 9 files changed, 45 insertions(+), 23 deletions(-)
 create mode 100644 dll/win32/mciavi32/precomp.h

diff --git a/dll/win32/mciavi32/CMakeLists.txt b/dll/win32/mciavi32/CMakeLists.txt
index 64b80faca6c..bc6251076b9 100644
--- a/dll/win32/mciavi32/CMakeLists.txt
+++ b/dll/win32/mciavi32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     mciavi.c
     mmoutput.c
     wnd.c
-    private_mciavi.h)
+    precomp.h)
 
 add_library(mciavi32 SHARED
     ${SOURCE}
@@ -18,5 +18,5 @@ add_library(mciavi32 SHARED
 set_module_type(mciavi32 win32dll)
 target_link_libraries(mciavi32 wine)
 add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 msvcrt kernel32 ntdll)
-add_pch(mciavi32 private_mciavi.h SOURCE)
+add_pch(mciavi32 precomp.h SOURCE)
 add_cd_file(TARGET mciavi32 DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/mciavi32/info.c b/dll/win32/mciavi32/info.c
index cc6abdcabb3..3d138b1dddd 100644
--- a/dll/win32/mciavi32/info.c
+++ b/dll/win32/mciavi32/info.c
@@ -18,7 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <string.h>
 #include "private_mciavi.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
 
 /**************************************************************************
  * 				MCIAVI_ConvertFrameToTimeFormat	[internal]
diff --git a/dll/win32/mciavi32/mciavi.c b/dll/win32/mciavi32/mciavi.c
index e083b4e4c0f..b32accb6455 100644
--- a/dll/win32/mciavi32/mciavi.c
+++ b/dll/win32/mciavi32/mciavi.c
@@ -37,10 +37,12 @@
  *        audio is played... still should be stopped ASAP
  */
 
+#include <string.h>
 #include "private_mciavi.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
 
-#include <mciavi.h>
-#include <wine/unicode.h>
+WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
 
 static DWORD MCIAVI_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS);
 
diff --git a/dll/win32/mciavi32/mciavi_res.rc b/dll/win32/mciavi32/mciavi_res.rc
index 8290f14b581..e2e4caa805c 100644
--- a/dll/win32/mciavi32/mciavi_res.rc
+++ b/dll/win32/mciavi32/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/mciavi32/mmoutput.c b/dll/win32/mciavi32/mmoutput.c
index 65418002aaf..ee0481c59c7 100644
--- a/dll/win32/mciavi32/mmoutput.c
+++ b/dll/win32/mciavi32/mmoutput.c
@@ -20,6 +20,9 @@
  */
 
 #include "private_mciavi.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
 
 static BOOL MCIAVI_GetInfoAudio(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCKINFO *mmckStream)
 {
diff --git a/dll/win32/mciavi32/precomp.h b/dll/win32/mciavi32/precomp.h
new file mode 100644
index 00000000000..a8204b4bff5
--- /dev/null
+++ b/dll/win32/mciavi32/precomp.h
@@ -0,0 +1,13 @@
+
+#ifndef _MCIAVI_PRECOMP_H
+#define _MCIAVI_PRECOMP_H
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include "private_mciavi.h"
+
+#include <wine/debug.h>
+
+#endif /* !_MCIAVI_PRECOMP_H */
diff --git a/dll/win32/mciavi32/private_mciavi.h b/dll/win32/mciavi32/private_mciavi.h
index dbaf30f50d0..1b53ab8d247 100644
--- a/dll/win32/mciavi32/private_mciavi.h
+++ b/dll/win32/mciavi32/private_mciavi.h
@@ -22,20 +22,15 @@
 #define __WINE_PRIVATE_MCIAVI_H
 
 #include <stdarg.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <windef.h>
-#include <wingdi.h>
-#include <mmddk.h>
-#include <digitalv.h>
-#include <vfw.h>
-#include <wownt32.h>
-
-#include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "mmddk.h"
+#include "digitalv.h"
+#include "vfw.h"
+#include "wownt32.h"
+#include "mciavi.h"
 
 struct MMIOPos {
     DWORD	dwOffset;
diff --git a/dll/win32/mciavi32/wnd.c b/dll/win32/mciavi32/wnd.c
index 94b9b6b9a83..c9da9ec5c47 100644
--- a/dll/win32/mciavi32/wnd.c
+++ b/dll/win32/mciavi32/wnd.c
@@ -19,7 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <string.h>
 #include "private_mciavi.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
 
 static const WCHAR mciaviW[] = {'M','C','I','A','V','I',0};
 
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index a07c99f4235..e7ce120e718 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -90,7 +90,7 @@ reactos/dll/win32/jsproxy             # Synced to WineStaging-3.3
 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-2.9
+reactos/dll/win32/mciavi32            # Synced to WineStaging-3.3
 reactos/dll/win32/mcicda              # Synced to WineStaging-2.9
 reactos/dll/win32/mciqtz32            # Synced to WineStaging-2.9
 reactos/dll/win32/mciseq              # Synced to WineStaging-2.9