Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-04 17:00:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINMM]

Browse source 
* 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
This commit is contained in:
Amine Khaldi 2014-01-01 21:54:58 +00:00
parent 1e7dbd47e7
commit 1276658964
11 changed files with 27 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/dll/win32/winmm/driver.c
View file

@ -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);

20
reactos/dll/win32/winmm/joystick.c
View file

@ -21,32 +21,18 @@
* 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)

12
reactos/dll/win32/winmm/lolvldrv.c
View file

@ -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);

23
reactos/dll/win32/winmm/mci.c
View file

@ -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 <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>
#include <mmsystem.h>
#include <wownt32.h>
#include <digitalv.h>
WINE_DEFAULT_DEBUG_CHANNEL(mci);

14
reactos/dll/win32/winmm/mmio.c
View file

@ -27,22 +27,8 @@
* + 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;

12
reactos/dll/win32/winmm/playsound.c
View file

@ -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>
#include <winternl.h>
WINE_DEFAULT_DEBUG_CHANNEL(winmm);

3
reactos/dll/win32/winmm/registry.c
View file

@ -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);

13
reactos/dll/win32/winmm/time.c
View file

@ -20,11 +20,8 @@
* 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
@ -32,14 +29,6 @@
# 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 {

18
reactos/dll/win32/winmm/winemm.h
View file

@ -19,12 +19,28 @@
* 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"

14
reactos/dll/win32/winmm/winmm.c
View file

@ -39,22 +39,8 @@
* 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);
/* ========================================================================

6
reactos/dll/win32/winmm/winmm_res.rc
View file

@ -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