[ros-diffs] [akhaldi] 61719: [DMUSIC] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

Author: akhaldi
Date: Mon Jan 20 11:27:12 2014
New Revision: 61719

URL: http://svn.reactos.org/svn/reactos?rev=61719&view=rev
Log:
[DMUSIC]
* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

Modified:
    trunk/reactos/dll/directx/wine/dmusic/buffer.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/port.c

Modified: trunk/reactos/dll/directx/wine/dmusic/buffer.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/buf...
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/buffer.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/buffer.c	[iso-8859-1] Mon Jan 20 11:27:12 2014
@@ -20,6 +20,7 @@
  */

#include "dmusic_private.h"
+
 #include <dmksctrl.h>

static inline IDirectMusicBufferImpl *impl_from_IDirectMusicBuffer(IDirectMusicBuffer *iface)

Modified: trunk/reactos/dll/directx/wine/dmusic/collection.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/col...
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/collection.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/collection.c	[iso-8859-1] Mon Jan 20 11:27:12 2014
@@ -19,6 +19,8 @@
  */

#include "dmusic_private.h"
+
+#include <dmusicf.h>

WINE_DECLARE_DEBUG_CHANNEL(dmfile);

Modified: trunk/reactos/dll/directx/wine/dmusic/dmusic.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dmu...
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/dmusic.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/dmusic.c	[iso-8859-1] Mon Jan 20 11:27:12 2014
@@ -21,6 +21,8 @@

#include "dmusic_private.h"

+#include <winreg.h>
+
 static inline IDirectMusic8Impl *impl_from_IDirectMusic8(IDirectMusic8 *iface)
 {
     return CONTAINING_RECORD(iface, IDirectMusic8Impl, 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/dmu...
==============================================================================
--- 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] Mon Jan 20 11:27:12 2014
@@ -18,8 +18,9 @@
  */

#include "dmusic_private.h"
+
 #include <stdio.h>
-#include "rpcproxy.h"
+#include <rpcproxy.h>

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/dmu...
==============================================================================
--- 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] Mon Jan 20 11:27:12 2014
@@ -24,22 +24,25 @@

#include <config.h>

-#define COBJMACROS
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H

+#define COBJMACROS
+
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
+#include <dmusici.h>
+#include <dmusics.h>
+
 #include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
-
 #include <wine/list.h>
 #include <wine/unicode.h>
-#include <winreg.h>
-#include <objbase.h>
-
-#include <dmusici.h>
-#include <dmusicf.h>
-#include <dmusics.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);

/*****************************************************************************
  * Interfaces

Modified: trunk/reactos/dll/directx/wine/dmusic/port.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/por...
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/port.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/port.c	[iso-8859-1] Mon Jan 20 11:27:12 2014
@@ -20,6 +20,7 @@
  */

#include "dmusic_private.h"
+
 #include <assert.h>

static inline IDirectMusicDownloadedInstrumentImpl* impl_from_IDirectMusicDownloadedInstrument(IDirectMusicDownloadedInstrument *iface)