Author: akhaldi Date: Wed Jan 1 21:54:58 2014 New Revision: 61480
URL: http://svn.reactos.org/svn/reactos?rev=61480&view=rev Log: [WINMM] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716
Modified: trunk/reactos/dll/win32/winmm/driver.c trunk/reactos/dll/win32/winmm/joystick.c trunk/reactos/dll/win32/winmm/lolvldrv.c trunk/reactos/dll/win32/winmm/mci.c trunk/reactos/dll/win32/winmm/mmio.c trunk/reactos/dll/win32/winmm/playsound.c trunk/reactos/dll/win32/winmm/registry.c trunk/reactos/dll/win32/winmm/time.c trunk/reactos/dll/win32/winmm/winemm.h trunk/reactos/dll/win32/winmm/winmm.c trunk/reactos/dll/win32/winmm/winmm_res.rc
Modified: trunk/reactos/dll/win32/winmm/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/driver.c?re... ============================================================================== --- trunk/reactos/dll/win32/winmm/driver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/driver.c [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -20,23 +20,7 @@ * 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);
Modified: trunk/reactos/dll/win32/winmm/joystick.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/joystick.c?... ============================================================================== --- trunk/reactos/dll/win32/winmm/joystick.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/joystick.c [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -21,31 +21,17 @@ * 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);
Modified: trunk/reactos/dll/win32/winmm/lolvldrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/lolvldrv.c?... ============================================================================== --- trunk/reactos/dll/win32/winmm/lolvldrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/lolvldrv.c [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -21,19 +21,7 @@ * 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);
Modified: trunk/reactos/dll/win32/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mci.c?rev=6... ============================================================================== --- trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -42,28 +42,11 @@ * - 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 <windef.h> -//#include "winbase.h" -//#include "wingdi.h" +#include "winemm.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);
Modified: trunk/reactos/dll/win32/winmm/mmio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mmio.c?rev=... ============================================================================== --- trunk/reactos/dll/win32/winmm/mmio.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/mmio.c [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -27,21 +27,7 @@ * + 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);
Modified: trunk/reactos/dll/win32/winmm/playsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/playsound.c... ============================================================================== --- trunk/reactos/dll/win32/winmm/playsound.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/playsound.c [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -21,19 +21,9 @@ * 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>
WINE_DEFAULT_DEBUG_CHANNEL(winmm);
Modified: trunk/reactos/dll/win32/winmm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/registry.c?... ============================================================================== --- trunk/reactos/dll/win32/winmm/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/registry.c [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -16,10 +16,7 @@ TODO: Handle system.ini */
-#include <windef.h> -#include <winreg.h> #include "winemm.h" -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(winmm);
Modified: trunk/reactos/dll/win32/winmm/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/time.c?rev=... ============================================================================== --- trunk/reactos/dll/win32/winmm/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/time.c [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -20,25 +20,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#include <config.h> -//#include "wine/port.h" - -//#include <stdarg.h> -//#include <time.h> +#include "winemm.h" + #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif #ifdef HAVE_UNISTD_H # 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);
Modified: trunk/reactos/dll/win32/winmm/winemm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winemm.h?re... ============================================================================== --- trunk/reactos/dll/win32/winmm/winemm.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winemm.h [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -19,11 +19,27 @@ * 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"
Modified: trunk/reactos/dll/win32/winmm/winmm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.c?rev... ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm.c [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -39,21 +39,7 @@ * 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);
Modified: trunk/reactos/dll/win32/winmm/winmm_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm_res.r... ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm_res.rc [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -22,10 +22,8 @@ * 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