[akhaldi] 61697: [MMSYS] * Remove one time inclusions from the main header and put them back where they belong. * Improve the GUIDs situation. * Improve the main header. CORE-7716

Author: akhaldi
Date: Sun Jan 19 10:35:30 2014
New Revision: 61697

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

Modified:
    trunk/reactos/dll/cpl/mmsys/mmsys.c
    trunk/reactos/dll/cpl/mmsys/mmsys.h
    trunk/reactos/dll/cpl/mmsys/sounds.c
    trunk/reactos/dll/cpl/mmsys/volume.c

Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=6...
==============================================================================
--- trunk/reactos/dll/cpl/mmsys/mmsys.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/mmsys/mmsys.c	[iso-8859-1] Sun Jan 19 10:35:30 2014
@@ -10,6 +10,13 @@
  */

#include "mmsys.h"
+
+#include <winsvc.h>
+#include <shlwapi.h>
+#include <debug.h>
+
+#include <initguid.h>
+#include <devguid.h>

typedef enum
 {

Modified: trunk/reactos/dll/cpl/mmsys/mmsys.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.h?rev=6...
==============================================================================
--- trunk/reactos/dll/cpl/mmsys/mmsys.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/mmsys/mmsys.h	[iso-8859-1] Sun Jan 19 10:35:30 2014
@@ -1,23 +1,19 @@
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
-#include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
 #include <wingdi.h>
-#include <winsvc.h>
 #include <winuser.h>
-#include <shellapi.h>
 #include <mmsystem.h>
 #include <cpl.h>
 #include <tchar.h>
-#include <initguid.h>
 #include <setupapi.h>
-#include <devguid.h>
-#include <debug.h>
-#include <shlwapi.h>
-#include <commdlg.h>
+
 #include "resource.h"

//typedef LONG (CALLBACK *APPLET_PROC)(VOID);

Modified: trunk/reactos/dll/cpl/mmsys/sounds.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev=...
==============================================================================
--- trunk/reactos/dll/cpl/mmsys/sounds.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/mmsys/sounds.c	[iso-8859-1] Sun Jan 19 10:35:30 2014
@@ -8,6 +8,9 @@
  */

#include "mmsys.h"
+
+#include <commdlg.h>
+#include <debug.h>

struct __APP_MAP__;

Modified: trunk/reactos/dll/cpl/mmsys/volume.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/volume.c?rev=...
==============================================================================
--- trunk/reactos/dll/cpl/mmsys/volume.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/mmsys/volume.c	[iso-8859-1] Sun Jan 19 10:35:30 2014
@@ -8,6 +8,8 @@
  */

#include "mmsys.h"
+
+#include <shellapi.h>

#define VOLUME_DIVIDER 0xFFF