[WINMM]
authorAmine Khaldi <amine.khaldi@reactos.org>
Wed, 1 Jan 2014 21:54:58 +0000 (21:54 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Wed, 1 Jan 2014 21:54:58 +0000 (21:54 +0000)
* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

svn path=/trunk/; revision=61480

reactos/dll/win32/winmm/driver.c
reactos/dll/win32/winmm/joystick.c
reactos/dll/win32/winmm/lolvldrv.c
reactos/dll/win32/winmm/mci.c
reactos/dll/win32/winmm/mmio.c
reactos/dll/win32/winmm/playsound.c
reactos/dll/win32/winmm/registry.c
reactos/dll/win32/winmm/time.c
reactos/dll/win32/winmm/winemm.h
reactos/dll/win32/winmm/winmm.c
reactos/dll/win32/winmm/winmm_res.rc

index f9771d1..9571787 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <string.h>
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-//#include "wingdi.h"
-#include <winuser.h>
-//#include "winnls.h"
-#include <winreg.h>
-//#include "mmddk.h"
 #include "winemm.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "excpt.h"
-#include <wine/exception.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(driver);
 
index 4c0fa25..e8232ce 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
+#include "winemm.h"
 
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-//#include <stdarg.h>
-//#include <stdio.h>
+
 #include <stdlib.h>
-//#include <string.h>
-//#include <fcntl.h>
+
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
 
-#include "winemm.h"
-//#include "windef.h"
-//#include "winbase.h"
-//#include "mmsystem.h"
-//#include "wingdi.h"
-#include <winuser.h>
-#include <winnls.h>
-
-//#include "mmddk.h"
-
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(winmm);
 
 #define MAXJOYSTICK (JOYSTICKID2 + 30)
index 75a015b..e500665 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <string.h>
-//#include <stdarg.h>
-//#include <stdio.h>
-#include <assert.h>
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winreg.h"
 #include "winemm.h"
-#include <wine/debug.h>
-#include <wine/exception.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(winmm);
 
index d2ac74e..eda26b0 100644 (file)
  * - size of string in WCHAR or bytes? (#chars for MCI_INFO, #bytes for MCI_SYSINFO)
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <stdlib.h>
-//#include <stdarg.h>
-#include <stdio.h>
-//#include <string.h>
+#include "winemm.h"
 
-#include <windef.h>
-//#include "winbase.h"
-//#include "wingdi.h"
 #include <mmsystem.h>
-#include <winuser.h>
-//#include "winnls.h"
-#include <winreg.h>
 #include <wownt32.h>
-
 #include <digitalv.h>
-#include "winemm.h"
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(mci);
 
index 8b1e6c3..cd8b1da 100644 (file)
  *      + 32 A <=> W message mapping
  */
 
-
-//#include <ctype.h>
-#include <stdarg.h>
-//#include <stdlib.h>
-//#include <string.h>
-//#include <errno.h>
-#include <assert.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
-//#include "mmsystem.h"
 #include "winemm.h"
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(mmio);
 
 static WINE_MMIO *MMIOList;
index 6196e9f..b3eaa7a 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <stdarg.h>
-//#include <string.h>
-
-#include <windef.h>
-//#include "winbase.h"
-//#include "mmsystem.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-#include <winreg.h>
 #include "winemm.h"
-#include <winternl.h>
 
-#include <wine/debug.h>
+#include <winternl.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(winmm);
 
index 9ac94a3..57f6605 100644 (file)
     TODO: Handle system.ini
 */
 
-#include <windef.h>
-#include <winreg.h>
 #include "winemm.h"
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(winmm);
 
index 1c4dbc4..5da3f2f 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
+#include "winemm.h"
 
-//#include <stdarg.h>
-//#include <time.h>
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
 # include <unistd.h>
 #endif
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "mmsystem.h"
-
-#include "winemm.h"
-
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(mmtime);
 
 typedef struct tagWINE_TIMERENTRY {
index 1dd7353..1da6c68 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <config.h>
+
+#include <assert.h>
 #include <stdarg.h>
+#include <stdio.h>
+
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 
 #include <windef.h>
-//#include "winbase.h"
+#include <winbase.h>
+#include <winuser.h>
+#include <winreg.h>
 #include <mmddk.h>
 
+#include <wine/debug.h>
+#include <wine/exception.h>
+#include <wine/unicode.h>
+
 #define WINE_DEFAULT_WINMM_DRIVER     "alsa,oss,coreaudio,esd"
 #define WINE_DEFAULT_WINMM_MAPPER     "msacm32.drv"
 #define WINE_DEFAULT_WINMM_MIDI       "midimap.dll"
index 2c76444..fc63b09 100644 (file)
  *        midi, mixer and aux
  */
 
-#include <stdio.h>
-//#include <stdarg.h>
-//#include <string.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#include <windef.h>
-#include <winbase.h>
-//#include "mmsystem.h"
-#include <winuser.h>
-#include <winnls.h>
-//#include "winternl.h"
 #include "winemm.h"
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(winmm);
 
 /* ========================================================================
index 65817bd..23da1b6 100644 (file)
  *       MMSYSTEM...)
  */
 
-#include "windef.h"
-#include "winbase.h"
-#include "mmddk.h"
-#include "winnls.h"
+#include <windef.h>
+#include <mmddk.h>
 
 /* Add your language specific defines here */
 #ifdef LANGUAGE_PT_BR