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

[Amine Khaldi]

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

commit d3e7f8dd2d12407ae4a94d53def6f25f238a4d9a
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Thu Mar 8 13:43:36 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Thu Mar 8 13:43:36 2018 +0100

    [QEDIT] Sync with Wine Staging 3.3. CORE-14434
---
 dll/directx/wine/qedit/CMakeLists.txt  |  4 ++--
 dll/directx/wine/qedit/main.c          |  4 +++-
 dll/directx/wine/qedit/mediadet.c      | 14 ++++++++++++--
 dll/directx/wine/qedit/precomp.h       | 13 +++++++++++++
 dll/directx/wine/qedit/qedit_private.h | 21 +++++++--------------
 dll/directx/wine/qedit/samplegrabber.c | 14 +++++++++++++-
 dll/directx/wine/qedit/timeline.c      | 13 +++++++++++++
 media/doc/README.WINE                  |  2 +-
 8 files changed, 64 insertions(+), 21 deletions(-)

diff --git a/dll/directx/wine/qedit/CMakeLists.txt
b/dll/directx/wine/qedit/CMakeLists.txt
index e1ec65794f..7ee22ff31b 100644
--- a/dll/directx/wine/qedit/CMakeLists.txt
+++ b/dll/directx/wine/qedit/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
     mediadet.c
     samplegrabber.c
     timeline.c
-    qedit_private.h)
+    precomp.h)
 
 add_library(qedit SHARED
     ${SOURCE}
@@ -18,5 +18,5 @@ add_library(qedit SHARED
 set_module_type(qedit win32dll)
 target_link_libraries(qedit strmbase strmiids uuid wine)
 add_importlibs(qedit ole32 oleaut32 msvcrt kernel32 ntdll)
-add_pch(qedit qedit_private.h SOURCE)
+add_pch(qedit precomp.h SOURCE)
 add_cd_file(TARGET qedit DESTINATION reactos/system32 FOR all)
diff --git a/dll/directx/wine/qedit/main.c b/dll/directx/wine/qedit/main.c
index 5455a3bc94..a012ff210c 100644
--- a/dll/directx/wine/qedit/main.c
+++ b/dll/directx/wine/qedit/main.c
@@ -18,8 +18,10 @@
  */
 
 #include "qedit_private.h"
+#include "rpcproxy.h"
+#include "wine/debug.h"
 
-#include <rpcproxy.h>
+WINE_DEFAULT_DEBUG_CHANNEL(qedit);
 
 static HINSTANCE instance;
 
diff --git a/dll/directx/wine/qedit/mediadet.c b/dll/directx/wine/qedit/mediadet.c
index 912e752225..b7a5abb80c 100644
--- a/dll/directx/wine/qedit/mediadet.c
+++ b/dll/directx/wine/qedit/mediadet.c
@@ -17,10 +17,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <assert.h>
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "ole2.h"
+
 #include "qedit_private.h"
+#include "wine/debug.h"
 
-#include <assert.h>
-#include <oleauto.h>
+WINE_DEFAULT_DEBUG_CHANNEL(qedit);
 
 typedef struct MediaDetImpl {
     IUnknown IUnknown_inner;
diff --git a/dll/directx/wine/qedit/precomp.h b/dll/directx/wine/qedit/precomp.h
new file mode 100644
index 0000000000..292ddb2479
--- /dev/null
+++ b/dll/directx/wine/qedit/precomp.h
@@ -0,0 +1,13 @@
+
+#ifndef _QEDIT_PRECOMP_H_
+#define _QEDIT_PRECOMP_H_
+
+#define WIN32_LEAN_AND_MEAN
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+
+#include "qedit_private.h"
+
+#include <wine/debug.h>
+
+#endif /* !_QEDIT_PRECOMP_H_ */
diff --git a/dll/directx/wine/qedit/qedit_private.h
b/dll/directx/wine/qedit/qedit_private.h
index e107227daa..708c53d7de 100644
--- a/dll/directx/wine/qedit/qedit_private.h
+++ b/dll/directx/wine/qedit/qedit_private.h
@@ -22,22 +22,15 @@
 
 #include <stdarg.h>
 
-#define WIN32_LEAN_AND_MEAN
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #define COBJMACROS
 
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <dshow.h>
-#define __WINE_DDRAW_H /* ROS HACK */
-#include <qedit.h>
-
-#include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(qedit);
+#include "windef.h"
+#include "winbase.h"
+#include "wtypes.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "dshow.h"
+#include "qedit.h"
 
 HRESULT AMTimeline_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
 HRESULT MediaDet_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
diff --git a/dll/directx/wine/qedit/samplegrabber.c
b/dll/directx/wine/qedit/samplegrabber.c
index 3f4cd133ec..cd35740595 100644
--- a/dll/directx/wine/qedit/samplegrabber.c
+++ b/dll/directx/wine/qedit/samplegrabber.c
@@ -17,9 +17,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <assert.h>
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "ole2.h"
+
 #include "qedit_private.h"
+#include "wine/debug.h"
+#include "wine/strmbase.h"
 
-#include <wine/strmbase.h>
+WINE_DEFAULT_DEBUG_CHANNEL(qedit);
 
 static const WCHAR vendor_name[] = { 'W', 'i', 'n', 'e',
0 };
 static const WCHAR pin_in_name[] = { 'I', 'n', 0 };
diff --git a/dll/directx/wine/qedit/timeline.c b/dll/directx/wine/qedit/timeline.c
index 52ef234f41..5d3fb461ff 100644
--- a/dll/directx/wine/qedit/timeline.c
+++ b/dll/directx/wine/qedit/timeline.c
@@ -17,7 +17,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <assert.h>
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "ole2.h"
+
 #include "qedit_private.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(qedit);
 
 typedef struct {
     IUnknown IUnknown_inner;
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 44c167c454..f702a41581 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -38,7 +38,7 @@ reactos/dll/directx/wine/dplayx         # Synced to WineStaging-3.3
 reactos/dll/directx/wine/dsound         # Synced to Wine-1.3.29
 reactos/dll/directx/wine/dxdiagn        # Synced to WineStaging-3.3
 reactos/dll/directx/wine/msdmo          # Synced to WineStaging-3.3
-reactos/dll/directx/wine/qedit          # Synced to Wine-3.0
+reactos/dll/directx/wine/qedit          # Synced to WineStaging-3.3
 reactos/dll/directx/wine/quartz         # Synced to Wine-3.0
 reactos/dll/directx/wine/wined3d        # Synced to WineStaging-3.3