From 1c077fceb59f2f95aa87767178b6079cad35e085 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 25 Dec 2013 10:39:58 +0000 Subject: [PATCH] [MMDRV] * Move some inclusions to the main header. * Do not include debug.h into the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 svn path=/trunk/; revision=61395 --- reactos/dll/win32/mmdrv/common.c | 3 +++ reactos/dll/win32/mmdrv/entry.c | 2 ++ reactos/dll/win32/mmdrv/kernel.c | 5 +++++ reactos/dll/win32/mmdrv/mmddk.h | 1 - reactos/dll/win32/mmdrv/mmdef.h | 9 --------- reactos/dll/win32/mmdrv/mmdrv.h | 10 ++++++---- reactos/dll/win32/mmdrv/mme.c | 3 +++ reactos/dll/win32/mmdrv/mmioctl.h | 6 ------ reactos/dll/win32/mmdrv/session.c | 3 +++ reactos/dll/win32/mmdrv/utils.c | 2 +- reactos/dll/win32/mmdrv/wave.c | 2 ++ reactos/dll/win32/mmdrv/wave.h | 1 + reactos/dll/win32/mmdrv/wave_io.c | 3 +++ 13 files changed, 29 insertions(+), 21 deletions(-) diff --git a/reactos/dll/win32/mmdrv/common.c b/reactos/dll/win32/mmdrv/common.c index 0ca7e501b50..7d17757acca 100644 --- a/reactos/dll/win32/mmdrv/common.c +++ b/reactos/dll/win32/mmdrv/common.c @@ -11,6 +11,9 @@ #include "mmdrv.h" +#define NDEBUG +#include + /* Translates errors to MMRESULT codes. */ diff --git a/reactos/dll/win32/mmdrv/entry.c b/reactos/dll/win32/mmdrv/entry.c index 6285652e9b1..4a2f0c0bda8 100644 --- a/reactos/dll/win32/mmdrv/entry.c +++ b/reactos/dll/win32/mmdrv/entry.c @@ -11,6 +11,8 @@ #include "mmdrv.h" +#define NDEBUG +#include /* Nothing particularly special happens here. diff --git a/reactos/dll/win32/mmdrv/kernel.c b/reactos/dll/win32/mmdrv/kernel.c index 7436e66a653..dc107273a29 100644 --- a/reactos/dll/win32/mmdrv/kernel.c +++ b/reactos/dll/win32/mmdrv/kernel.c @@ -11,6 +11,11 @@ #include "mmdrv.h" +#include + +#define NDEBUG +#include + /* Devices that we provide access to follow a standard naming convention. The first wave output, for example, appears as \Device\WaveOut0 diff --git a/reactos/dll/win32/mmdrv/mmddk.h b/reactos/dll/win32/mmdrv/mmddk.h index 80317f4d7cb..6377b609282 100644 --- a/reactos/dll/win32/mmdrv/mmddk.h +++ b/reactos/dll/win32/mmdrv/mmddk.h @@ -27,7 +27,6 @@ #define __MMDDK_H #include -//#include typedef VOID (TASKCALLBACK) (DWORD dwInst); diff --git a/reactos/dll/win32/mmdrv/mmdef.h b/reactos/dll/win32/mmdrv/mmdef.h index acc842ed0b2..2dff84c62bf 100644 --- a/reactos/dll/win32/mmdrv/mmdef.h +++ b/reactos/dll/win32/mmdrv/mmdef.h @@ -16,18 +16,9 @@ #define EXPORT __declspec(dllexport) -//#include -//#include -//#include -//#include - // This needs to be done to get winioctl.h to work: //typedef unsigned __int64 DWORD64, *PDWORD64; -//#include -//#include "mmddk.h" - - #define SOUND_MAX_DEVICE_NAME 1024 // GUESSWORK #define SOUND_MAX_DEVICES 256 // GUESSWORK diff --git a/reactos/dll/win32/mmdrv/mmdrv.h b/reactos/dll/win32/mmdrv/mmdrv.h index 7cf6aa60d8d..d88a8f54d94 100644 --- a/reactos/dll/win32/mmdrv/mmdrv.h +++ b/reactos/dll/win32/mmdrv/mmdrv.h @@ -14,15 +14,17 @@ #ifndef MMDRV_H #define MMDRV_H +#include + #define WIN32_NO_STATUS -#define WIN32_LEAN_AND_MEAN + +#include +#include +#include #include "mmioctl.h" #include "mmddk.h" -//#include -#include - /* Need to check these */ #define MAX_DEVICES 256 #define MAX_DEVICE_NAME_LENGTH 256 diff --git a/reactos/dll/win32/mmdrv/mme.c b/reactos/dll/win32/mmdrv/mme.c index 23639ababcd..e66214d4e77 100644 --- a/reactos/dll/win32/mmdrv/mme.c +++ b/reactos/dll/win32/mmdrv/mme.c @@ -12,6 +12,9 @@ #include "mmdrv.h" +#define NDEBUG +#include + /* Sends a message to the client (application), such as WOM_DONE. This is just a wrapper around DriverCallback which translates the diff --git a/reactos/dll/win32/mmdrv/mmioctl.h b/reactos/dll/win32/mmdrv/mmioctl.h index 4b7b93fa35c..13378666046 100644 --- a/reactos/dll/win32/mmdrv/mmioctl.h +++ b/reactos/dll/win32/mmdrv/mmioctl.h @@ -12,12 +12,6 @@ #ifndef MMDRV_IOCTLS #define MMDRV_IOCTLS -#include -//#include -//#include -#include - - /* Base names of the supported devices, as provided by drivers running in kernel mode. diff --git a/reactos/dll/win32/mmdrv/session.c b/reactos/dll/win32/mmdrv/session.c index edb36d117e5..9245092d28c 100644 --- a/reactos/dll/win32/mmdrv/session.c +++ b/reactos/dll/win32/mmdrv/session.c @@ -11,6 +11,9 @@ #include "mmdrv.h" +#define NDEBUG +#include + /* Each session is tracked, but the list must be locked when in use */ SessionInfo* session_list = NULL; diff --git a/reactos/dll/win32/mmdrv/utils.c b/reactos/dll/win32/mmdrv/utils.c index 943191ad4be..fbe81061389 100644 --- a/reactos/dll/win32/mmdrv/utils.c +++ b/reactos/dll/win32/mmdrv/utils.c @@ -9,7 +9,7 @@ * Jan 30, 2004: Imported into ReactOS tree */ -//#include "mmdrv.h" +#include "mmdrv.h" #define NDEBUG #include diff --git a/reactos/dll/win32/mmdrv/wave.c b/reactos/dll/win32/mmdrv/wave.c index 011aad1c93b..ae5b0831e3a 100644 --- a/reactos/dll/win32/mmdrv/wave.c +++ b/reactos/dll/win32/mmdrv/wave.c @@ -12,6 +12,8 @@ #include "mmdrv.h" +#define NDEBUG +#include #define MAX_WAVE_BUFFER_SIZE 65536 diff --git a/reactos/dll/win32/mmdrv/wave.h b/reactos/dll/win32/mmdrv/wave.h index 42daed25a26..0a11feb9628 100644 --- a/reactos/dll/win32/mmdrv/wave.h +++ b/reactos/dll/win32/mmdrv/wave.h @@ -1,3 +1,4 @@ +#pragma once // FIXME: Should be moved somewhere else? typedef struct _WAVE_DD_VOLUME { diff --git a/reactos/dll/win32/mmdrv/wave_io.c b/reactos/dll/win32/mmdrv/wave_io.c index 9773f7ab880..a21247b489d 100644 --- a/reactos/dll/win32/mmdrv/wave_io.c +++ b/reactos/dll/win32/mmdrv/wave_io.c @@ -4,6 +4,9 @@ #include "mmdrv.h" +#define NDEBUG +#include + /* Complete a partial wave buffer transaction */