[akhaldi] 61702: [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 i...

Author: akhaldi
Date: Sun Jan 19 10:43:28 2014
New Revision: 61702

URL: http://svn.reactos.org/svn/reactos?rev=61702&view=rev
Log:
[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

Modified:
    trunk/reactos/dll/directx/wine/amstream/amstream.c
    trunk/reactos/dll/directx/wine/amstream/amstream_private.h
    trunk/reactos/dll/directx/wine/amstream/audiodata.c
    trunk/reactos/dll/directx/wine/amstream/main.c
    trunk/reactos/dll/directx/wine/amstream/mediastream.c
    trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c

Modified: trunk/reactos/dll/directx/wine/amstream/amstream.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/a...
==============================================================================
--- trunk/reactos/dll/directx/wine/amstream/amstream.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/amstream/amstream.c	[iso-8859-1] Sun Jan 19 10:43:28 2014
@@ -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;

Modified: trunk/reactos/dll/directx/wine/amstream/amstream_private.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/a...
==============================================================================
--- trunk/reactos/dll/directx/wine/amstream/amstream_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/amstream/amstream_private.h	[iso-8859-1] Sun Jan 19 10:43:28 2014
@@ -23,17 +23,13 @@

#define WIN32_NO_STATUS
 #define WIN32_LEAN_AND_MEAN
+#define COBJMACROS

-//#include <stdarg.h>
+#include <dshow.h>
+#include <amstream.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 <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;

Modified: trunk/reactos/dll/directx/wine/amstream/audiodata.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/a...
==============================================================================
--- trunk/reactos/dll/directx/wine/amstream/audiodata.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/amstream/audiodata.c	[iso-8859-1] Sun Jan 19 10:43:28 2014
@@ -18,16 +18,7 @@
  * 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;

Modified: trunk/reactos/dll/directx/wine/amstream/main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/m...
==============================================================================
--- trunk/reactos/dll/directx/wine/amstream/main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/amstream/main.c	[iso-8859-1] Sun Jan 19 10:43:28 2014
@@ -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 "amstream_private.h"
+
 #include <rpcproxy.h>
-
-#include "amstream_private.h"
-#include <amstream.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(amstream);

static HINSTANCE instance;
 static DWORD dll_ref = 0;

Modified: trunk/reactos/dll/directx/wine/amstream/mediastream.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/m...
==============================================================================
--- trunk/reactos/dll/directx/wine/amstream/mediastream.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/amstream/mediastream.c	[iso-8859-1] Sun Jan 19 10:43:28 2014
@@ -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);

Modified: trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/m...
==============================================================================
--- trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c	[iso-8859-1] Sun Jan 19 10:43:28 2014
@@ -18,22 +18,9 @@
  * 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
 {