Author: akhaldi Date: Mon Jan 20 11:30:39 2014 New Revision: 61721
URL: http://svn.reactos.org/svn/reactos?rev=61721&view=rev Log: [DSOUND] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. * Improve header inclusions. * Improve the GUIDs situation. CORE-7716
Added: trunk/reactos/dll/directx/wine/dsound/guid.c (with props) Modified: trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt trunk/reactos/dll/directx/wine/dsound/buffer.c trunk/reactos/dll/directx/wine/dsound/capture.c trunk/reactos/dll/directx/wine/dsound/dsound.c trunk/reactos/dll/directx/wine/dsound/dsound_convert.c trunk/reactos/dll/directx/wine/dsound/dsound_main.c trunk/reactos/dll/directx/wine/dsound/dsound_private.h trunk/reactos/dll/directx/wine/dsound/duplex.c trunk/reactos/dll/directx/wine/dsound/mixer.c trunk/reactos/dll/directx/wine/dsound/primary.c trunk/reactos/dll/directx/wine/dsound/propset.c trunk/reactos/dll/directx/wine/dsound/sound3d.c
Modified: trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/CMa... ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -18,6 +18,7 @@ primary.c propset.c sound3d.c + guid.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/dsound.def)
Modified: trunk/reactos/dll/directx/wine/dsound/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/buf... ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/buffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/buffer.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -19,26 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <mmsystem.h> -#include <winternl.h> -#include <vfwmsgs.h> -#include <wine/debug.h> -#include <dsound.h> #include "dsound_private.h" -//#include <dsconf.h> - -WINE_DEFAULT_DEBUG_CHANNEL(dsound);
/******************************************************************************* * IDirectSoundNotify
Modified: trunk/reactos/dll/directx/wine/dsound/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/cap... ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/capture.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/capture.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -25,26 +25,7 @@ * Make DirectSoundCaptureCreate and DirectSoundCaptureCreate8 behave differently */
-#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#include <windef.h> -//#include "winbase.h" -//#include "winuser.h" -//#include "mmsystem.h" -#include <mmddk.h> -#include <winternl.h> -//#include "winnls.h" -#include <wine/debug.h> -#include <dsound.h> #include "dsound_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dsound);
typedef struct DirectSoundCaptureDevice DirectSoundCaptureDevice;
Modified: trunk/reactos/dll/directx/wine/dsound/dsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/dso... ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/dsound.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/dsound.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -20,30 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <assert.h> -#include <stdarg.h> -//#include <stdio.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -#include <winternl.h> -#include "mmddk.h" -//#include "wingdi.h" -//#include "mmreg.h" -//#include "ks.h" -//#include "ksmedia.h" -#include <wine/debug.h> -#include <dsound.h> #include "dsound_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dsound);
typedef struct IDirectSoundImpl { IUnknown IUnknown_inner;
Modified: trunk/reactos/dll/directx/wine/dsound/dsound_convert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/dso... ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/dsound_convert.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/dsound_convert.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -34,26 +34,7 @@ * Sound is LITTLE endian */
-#include <config.h> - -#include <stdarg.h> -#include <math.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#include <windef.h> -#include <winbase.h> -#include <mmsystem.h> -#include <winternl.h> -#include <wine/debug.h> -#include <dsound.h> #include "dsound_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dsound);
#ifdef WORDS_BIGENDIAN #define le16(x) RtlUshortByteSwap((x))
Modified: trunk/reactos/dll/directx/wine/dsound/dsound_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/dso... ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/dsound_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/dsound_main.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -32,42 +32,10 @@ * Remove DS_HEL_FRAGS and use mixer fragment length for it */
-#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <winnls.h> +#include "dsound_private.h" + #include <winreg.h> -//#include "mmsystem.h" -#include <winternl.h> -#include <mmddk.h> -#include <wine/debug.h> -#include <dsound.h> -#include <dsconf.h> -//#include "ks.h" #include <rpcproxy.h> -//#include "rpc.h" -//#include "rpcndr.h" -//#include "unknwn.h" -//#include "oleidl.h" -//#include "shobjidl.h" - -#include <initguid.h> -//#include "ksmedia.h" -//#include "propkey.h" -#include <devpkey.h> - -#include "dsound_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dsound);
struct list DSOUND_renderers = LIST_INIT(DSOUND_renderers); CRITICAL_SECTION DSOUND_renderers_lock;
Modified: trunk/reactos/dll/directx/wine/dsound/dsound_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/dso... ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/dsound_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/dsound_private.h [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -19,16 +19,42 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include <wine/config.h> + +#include <assert.h> +#include <math.h> +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSSTRUCT +#define NONAMELESSUNION + +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include <wingdi.h> +#include <winternl.h> +#include <objbase.h> +#include <mmdeviceapi.h> +#include <audioclient.h> +#include <mmsystem.h> +#include <dsound.h> +#include <dsconf.h> +#include <vfwmsgs.h> +#include <devpkey.h> + +#include <wine/debug.h> +#include <wine/list.h> + +WINE_DEFAULT_DEBUG_CHANNEL(dsound); + /* Linux does not support better timing than 10ms */ #define DS_TIME_RES 2 /* Resolution of multimedia timer */ #define DS_TIME_DEL 10 /* Delay of multimedia timer callback, and duration of HEL fragment */ - -#include "wingdi.h" -#include "mmdeviceapi.h" -#include "audioclient.h" -#include "mmsystem.h" - -#include "wine/list.h"
extern int ds_hel_buflen DECLSPEC_HIDDEN; extern int ds_snd_queue_max DECLSPEC_HIDDEN;
Modified: trunk/reactos/dll/directx/wine/dsound/duplex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/dup... ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/duplex.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/duplex.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -20,26 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#define COBJMACROS -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <mmsystem.h> -//#include "mmddk.h" -#include <winternl.h> -#include <wine/debug.h> -#include <dsound.h> #include "dsound_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dsound);
/***************************************************************************** * IDirectSoundFullDuplex implementation structure
Added: trunk/reactos/dll/directx/wine/dsound/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/gui... ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/guid.c (added) +++ trunk/reactos/dll/directx/wine/dsound/guid.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -0,0 +1,18 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <objbase.h> +#include <initguid.h> +#include <mmdeviceapi.h> +#include <audioclient.h> +#include <devpkey.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
Propchange: trunk/reactos/dll/directx/wine/dsound/guid.c ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/dll/directx/wine/dsound/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/mix... ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/mixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/mixer.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -22,30 +22,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <assert.h> -#include <stdarg.h> -#include <math.h> /* Insomnia - pow() function */ - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#include <windef.h> -#include <winbase.h> -#include <mmsystem.h> -//#include "wingdi.h" -//#include "mmreg.h" -#include <winternl.h> -#include <wine/debug.h> -#include <dsound.h> -//#include "ks.h" -//#include "ksmedia.h" #include "dsound_private.h" + #include "fir.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dsound);
void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) {
Modified: trunk/reactos/dll/directx/wine/dsound/primary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/pri... ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/primary.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/primary.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -23,25 +23,7 @@ * it leaves dsound in unusable (not really open) state. */
-#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "mmsystem.h" -#include <winternl.h> -#include <mmddk.h> -#include <wine/debug.h> -#include <dsound.h> #include "dsound_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dsound);
static DWORD DSOUND_fraglen(DirectSoundDevice *device) {
Modified: trunk/reactos/dll/directx/wine/dsound/propset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/pro... ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/propset.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/propset.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -19,35 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <mmsystem.h> -#include <winternl.h> -#include <winnls.h> -#include <vfwmsgs.h> -#include <initguid.h> -//#include <mmddk.h> -#include <wine/debug.h> -#include <dsound.h> #include "dsound_private.h" -#include <dsconf.h> - -//#include "ksmedia.h" -//#include "propkey.h" -#include <devpkey.h> - -WINE_DEFAULT_DEBUG_CHANNEL(dsound);
static WCHAR wInterface[] = { 'I','n','t','e','r','f','a','c','e',0 };
Modified: trunk/reactos/dll/directx/wine/dsound/sound3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/sou... ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/sound3d.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/sound3d.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -37,29 +37,10 @@ * Optimize WINMM and negotiate fragment size, decrease DS_HEL_MARGIN */
-#include <stdarg.h> -#include <math.h> /* Insomnia - pow() function */ - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <mmsystem.h> -#include <winternl.h> -//#include "mmddk.h" -#include <wine/debug.h> -#include <dsound.h> #include "dsound_private.h"
/* default velocity of sound in the air */ #define DEFAULT_VELOCITY 340 - -WINE_DEFAULT_DEBUG_CHANNEL(dsound3d);
/******************************************************************************* * Auxiliary functions