[DMUSIC]
authorAmine Khaldi <amine.khaldi@reactos.org>
Sat, 21 Dec 2013 18:59:44 +0000 (18:59 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sat, 21 Dec 2013 18:59:44 +0000 (18:59 +0000)
* 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

svn path=/trunk/; revision=61328

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

index 221100d..c609c7f 100644 (file)
  */
 
 #include "dmusic_private.h"
-//#include "initguid.h"
 #include <dmksctrl.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
-
 static inline IDirectMusicBufferImpl *impl_from_IDirectMusicBuffer(IDirectMusicBuffer *iface)
 {
     return CONTAINING_RECORD(iface, IDirectMusicBufferImpl, IDirectMusicBuffer_iface);
index 2a8cd09..aa2da54 100644 (file)
@@ -20,8 +20,6 @@
 
 #include "dmusic_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
-
 static inline IReferenceClockImpl *impl_from_IReferenceClock(IReferenceClock *iface)
 {
     return CONTAINING_RECORD(iface, IReferenceClockImpl, IReferenceClock_iface);
index e30f89d..e0596ab 100644 (file)
@@ -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)
index e5efcb5..f9f866e 100644 (file)
  * 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)
 {
     return CONTAINING_RECORD(iface, IDirectMusic8Impl, IDirectMusic8_iface);
index 80e4a2d..cae3a57 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-#include <stdio.h>
-
 #include "dmusic_private.h"
+#include <stdio.h>
 #include "rpcproxy.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
-
 static HINSTANCE instance;
 LONG DMUSIC_refCount = 0;
 
index efb70c6..5692084 100644 (file)
 #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>
index cc2b024..2a6831a 100644 (file)
@@ -20,8 +20,6 @@
 
 #include "dmusic_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
-
 static inline IDirectMusicDownloadImpl* impl_from_IDirectMusicDownload(IDirectMusicDownload *iface)
 {
     return CONTAINING_RECORD(iface, IDirectMusicDownloadImpl, IDirectMusicDownload_iface);
index 9df3e0c..b787705 100644 (file)
@@ -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: */
index 2e60828..755019c 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
 #include "dmusic_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+#include <assert.h>
 
 static inline IDirectMusicDownloadedInstrumentImpl* impl_from_IDirectMusicDownloadedInstrument(IDirectMusicDownloadedInstrument *iface)
 {
index d0d9a2a..dc82e86 100644 (file)
@@ -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