From eba2e22634dbbb229eb6687cb4e30dfcbcaf66eb Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 19 Jan 2014 10:43:28 +0000
Subject: [PATCH] [AMSTREAM] * Move some inclusions to the main header. * Set
 the default debugging channel globally through the main header. * Remove
 inclusions and definitions that already exist in the main header. CORE-7716

svn path=/trunk/; revision=61702
---
 reactos/dll/directx/wine/amstream/amstream.c  | 10 ---------
 .../directx/wine/amstream/amstream_private.h  | 14 +++++-------
 reactos/dll/directx/wine/amstream/audiodata.c |  9 --------
 reactos/dll/directx/wine/amstream/main.c      | 22 +------------------
 .../dll/directx/wine/amstream/mediastream.c   | 14 +-----------
 .../directx/wine/amstream/mediastreamfilter.c | 15 +------------
 6 files changed, 8 insertions(+), 76 deletions(-)

diff --git a/reactos/dll/directx/wine/amstream/amstream.c b/reactos/dll/directx/wine/amstream/amstream.c
index dbf781f0487..7abc8152442 100644
--- a/reactos/dll/directx/wine/amstream/amstream.c
+++ b/reactos/dll/directx/wine/amstream/amstream.c
@@ -19,17 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <wine/debug.h>
-
-#define COBJMACROS
-
-//#include "winbase.h"
-//#include "wingdi.h"
-
 #include "amstream_private.h"
-#include <amstream.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
 
 typedef struct {
     IAMMultiMediaStream IAMMultiMediaStream_iface;
diff --git a/reactos/dll/directx/wine/amstream/amstream_private.h b/reactos/dll/directx/wine/amstream/amstream_private.h
index 479246f8a6d..83218ce064a 100644
--- a/reactos/dll/directx/wine/amstream/amstream_private.h
+++ b/reactos/dll/directx/wine/amstream/amstream_private.h
@@ -23,17 +23,13 @@
 
 #define WIN32_NO_STATUS
 #define WIN32_LEAN_AND_MEAN
+#define COBJMACROS
 
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wtypes.h"
-//#include "wingdi.h"
-//#include "winuser.h"
 #include <dshow.h>
-#include <mmstream.h>
-#include <austream.h>
+#include <amstream.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(amstream);
 
 HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
 HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
diff --git a/reactos/dll/directx/wine/amstream/audiodata.c b/reactos/dll/directx/wine/amstream/audiodata.c
index 3a62a9f898f..c4f9b74e4f7 100644
--- a/reactos/dll/directx/wine/amstream/audiodata.c
+++ b/reactos/dll/directx/wine/amstream/audiodata.c
@@ -18,17 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wine/debug.h"
-
-#define COBJMACROS
-
-#include "winbase.h"
 #include "amstream_private.h"
 
-#include "amstream.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
-
 typedef struct {
     IAudioData IAudioData_iface;
     LONG ref;
diff --git a/reactos/dll/directx/wine/amstream/main.c b/reactos/dll/directx/wine/amstream/main.c
index fbe472b886f..edba626e0c9 100644
--- a/reactos/dll/directx/wine/amstream/main.c
+++ b/reactos/dll/directx/wine/amstream/main.c
@@ -18,29 +18,9 @@
  * 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 <string.h>
-
-#define COBJMACROS
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winuser.h"
-//#include "winerror.h"
-
-//#include <ole2.h>
-#include <objbase.h>
-#include <rpcproxy.h>
-
 #include "amstream_private.h"
-#include <amstream.h>
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
+#include <rpcproxy.h>
 
 static HINSTANCE instance;
 static DWORD dll_ref = 0;
diff --git a/reactos/dll/directx/wine/amstream/mediastream.c b/reactos/dll/directx/wine/amstream/mediastream.c
index ef8b6f8f7c5..8b9fe3bf453 100644
--- a/reactos/dll/directx/wine/amstream/mediastream.c
+++ b/reactos/dll/directx/wine/amstream/mediastream.c
@@ -18,19 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <wine/debug.h>
-
-#define COBJMACROS
-
-//#include "winbase.h"
-//#include "wingdi.h"
-
-//#include "amstream_private.h"
-#include <amstream.h>
-
-//#include "ddstream.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
+#include "amstream_private.h"
 
 static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawStreamSample **ddraw_stream_sample);
 static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *audio_data, IAudioStreamSample **audio_stream_sample);
diff --git a/reactos/dll/directx/wine/amstream/mediastreamfilter.c b/reactos/dll/directx/wine/amstream/mediastreamfilter.c
index 8e89488638d..3ec6fcf62cd 100644
--- a/reactos/dll/directx/wine/amstream/mediastreamfilter.c
+++ b/reactos/dll/directx/wine/amstream/mediastreamfilter.c
@@ -18,23 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <wine/debug.h>
-
-#define COBJMACROS
-
-//#include "winbase.h"
-//#include "wingdi.h"
-#include <dshow.h>
+#include "amstream_private.h"
 
 #include <wine/strmbase.h>
 
-//#include "amstream_private.h"
-#include <amstream.h>
-
-//#include "ddstream.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
-
 typedef struct MediaStreamFilter_InputPin
 {
     BaseInputPin pin;