[akhaldi] 61328: [DMUSIC] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions that already exist in the main header....

Author: akhaldi
Date: Sat Dec 21 18:59:44 2013
New Revision: 61328

URL: http://svn.reactos.org/svn/reactos?rev=61328&view=rev
Log:
[DMUSIC]
* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions that already exist in the main header.
CORE-7716

Modified:
    trunk/reactos/dll/directx/wine/dmusic/buffer.c
    trunk/reactos/dll/directx/wine/dmusic/clock.c
    trunk/reactos/dll/directx/wine/dmusic/collection.c
    trunk/reactos/dll/directx/wine/dmusic/dmusic.c
    trunk/reactos/dll/directx/wine/dmusic/dmusic_main.c
    trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h
    trunk/reactos/dll/directx/wine/dmusic/download.c
    trunk/reactos/dll/directx/wine/dmusic/instrument.c
    trunk/reactos/dll/directx/wine/dmusic/port.c
    trunk/reactos/dll/directx/wine/dmusic/regsvr.c

Modified: trunk/reactos/dll/directx/wine/dmusic/buffer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/bu…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/buffer.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/buffer.c	[iso-8859-1] Sat Dec 21 18:59:44 2013
@@ -20,10 +20,7 @@
  */
 
 #include "dmusic_private.h"
-//#include "initguid.h"
 #include <dmksctrl.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
 
 static inline IDirectMusicBufferImpl *impl_from_IDirectMusicBuffer(IDirectMusicBuffer
*iface)
 {

Modified: trunk/reactos/dll/directx/wine/dmusic/clock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/cl…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/clock.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/clock.c	[iso-8859-1] Sat Dec 21 18:59:44 2013
@@ -19,8 +19,6 @@
  */
 
 #include "dmusic_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
 
 static inline IReferenceClockImpl *impl_from_IReferenceClock(IReferenceClock *iface)
 {

Modified: trunk/reactos/dll/directx/wine/dmusic/collection.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/co…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/collection.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/collection.c	[iso-8859-1] Sat Dec 21 18:59:44
2013
@@ -20,7 +20,6 @@
 
 #include "dmusic_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
 WINE_DECLARE_DEBUG_CHANNEL(dmfile);
 
 static inline IDirectMusicCollectionImpl
*impl_from_IDirectMusicCollection(IDirectMusicCollection *iface)

Modified: trunk/reactos/dll/directx/wine/dmusic/dmusic.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/dmusic.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/dmusic.c	[iso-8859-1] Sat Dec 21 18:59:44 2013
@@ -19,11 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <stdio.h>
-
 #include "dmusic_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
 
 static inline IDirectMusic8Impl *impl_from_IDirectMusic8(IDirectMusic8 *iface)
 {

Modified: trunk/reactos/dll/directx/wine/dmusic/dmusic_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/dmusic_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/dmusic_main.c	[iso-8859-1] Sat Dec 21 18:59:44
2013
@@ -17,15 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
+#include "dmusic_private.h"
 #include <stdio.h>
-
-#include "dmusic_private.h"
 #include "rpcproxy.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
 
 static HINSTANCE instance;
 LONG DMUSIC_refCount = 0;

Modified: trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h	[iso-8859-1] Sat Dec 21
18:59:44 2013
@@ -22,20 +22,16 @@
 #ifndef __WINE_DMUSIC_PRIVATE_H
 #define __WINE_DMUSIC_PRIVATE_H
 
-//#include <stdarg.h>
+#include <config.h>
 
 #define COBJMACROS
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnt.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-
 #include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+
 #include <wine/list.h>
 #include <wine/unicode.h>
 #include <winreg.h>

Modified: trunk/reactos/dll/directx/wine/dmusic/download.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/do…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/download.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/download.c	[iso-8859-1] Sat Dec 21 18:59:44
2013
@@ -19,8 +19,6 @@
  */
 
 #include "dmusic_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
 
 static inline IDirectMusicDownloadImpl*
impl_from_IDirectMusicDownload(IDirectMusicDownload *iface)
 {

Modified: trunk/reactos/dll/directx/wine/dmusic/instrument.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/in…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/instrument.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/instrument.c	[iso-8859-1] Sat Dec 21 18:59:44
2013
@@ -20,8 +20,6 @@
 
 #include "dmusic_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
-
 static const GUID IID_IDirectMusicInstrumentPRIVATE = { 0xbcb20080, 0xa40c, 0x11d1, {
0x86, 0xbc, 0x00, 0xc0, 0x4f, 0xbf, 0x8f, 0xef } };
 
 /* IDirectMusicInstrument IUnknown part: */

Modified: trunk/reactos/dll/directx/wine/dmusic/port.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/po…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/port.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/port.c	[iso-8859-1] Sat Dec 21 18:59:44 2013
@@ -19,10 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "dmusic_private.h"
 #include <assert.h>
-#include "dmusic_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
 
 static inline IDirectMusicDownloadedInstrumentImpl*
impl_from_IDirectMusicDownloadedInstrument(IDirectMusicDownloadedInstrument *iface)
 {

Modified: trunk/reactos/dll/directx/wine/dmusic/regsvr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/re…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/regsvr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/regsvr.c	[iso-8859-1] Sat Dec 21 18:59:44 2013
@@ -19,9 +19,6 @@
  */
 
 #include "dmusic_private.h"
-//#include "wine/unicode.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
 
 /*
  * Near the bottom of this file are the exported DllRegisterServer and