[ros-diffs] [silverblade] 34304: Rename MME entrypoint files to avoid Windows issues with the aux.c file name. Now it is called auxMessage.c - the other files have been renamed accordingly.
silverblade at svn.reactos.org
silverblade at svn.reactos.org
Sat Jul 5 14:42:48 CEST 2008
Author: silverblade
Date: Sat Jul 5 07:42:48 2008
New Revision: 34304
URL: http://svn.reactos.org/svn/reactos?rev=34304&view=rev
Log:
Rename MME entrypoint files to avoid Windows issues with the aux.c file name.
Now it is called auxMessage.c - the other files have been renamed accordingly.
Added:
branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/DriverProc.c
- copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c
branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/auxMessage.c
- copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c
branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/midMessage.c
- copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c
branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/modMessage.c
- copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c
branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxdMessage.c
- copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c
branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/widMessage.c
- copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c
branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wodMessage.c
- copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c
Removed:
branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c
branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c
branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c
branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c
branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c
branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c
branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c
Modified:
branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild
Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c
URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c?rev=34303&view=auto
==============================================================================
--- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c [iso-8859-1] (original)
+++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c (removed)
@@ -1,31 +1,0 @@
-/*
- ReactOS Sound System
- MME Interface
-
- Purpose:
- Auxiliary device message handler
-
- Author:
- Andrew Greenwood (silverblade at reactos.org)
-
- History:
- 4 July 2008 - Created
-*/
-
-#include <windows.h>
-#include <mmsystem.h>
-#include <mmddk.h>
-#include <debug.h>
-
-APIENTRY DWORD
-auxMessage(
- DWORD device_id,
- DWORD message,
- DWORD private_handle,
- DWORD parameter1,
- DWORD parameter2)
-{
- DPRINT("auxMessageStub called\n");
- /* TODO */
- return MMSYSERR_NOTSUPPORTED;
-}
Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c
URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c?rev=34303&view=auto
==============================================================================
--- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c [iso-8859-1] (original)
+++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c (removed)
@@ -1,77 +1,0 @@
-/*
- ReactOS Sound System
- MME Interface
-
- Purpose:
- Default DriverProc implementation
-
- Author:
- Andrew Greenwood (silverblade at reactos.org)
-
- History:
- 4 July 2008 - Created
-*/
-
-#include <windows.h>
-#include <mmddk.h>
-#include <ntddsnd.h>
-#include <debug.h>
-
-LONG
-DefaultDriverProc(
- DWORD driver_id,
- HANDLE driver_handle,
- UINT message,
- LONG parameter1,
- LONG parameter2)
-{
- switch ( message )
- {
- case DRV_LOAD :
- DPRINT("DRV_LOAD\n");
- return 1L;
-
- case DRV_FREE :
- DPRINT("DRV_FREE\n");
- return 1L;
-
- case DRV_OPEN :
- DPRINT("DRV_OPEN\n");
- return 1L;
-
- case DRV_CLOSE :
- DPRINT("DRV_CLOSE\n");
- return 1L;
-
- case DRV_ENABLE :
- DPRINT("DRV_ENABLE\n");
- return 1L;
-
- case DRV_DISABLE :
- DPRINT("DRV_DISABLE\n");
- return 1L;
-
- /*
- We don't provide configuration capabilities. This used to be
- for things like I/O port, IRQ, DMA settings, etc.
- */
-
- case DRV_QUERYCONFIGURE :
- DPRINT("DRV_QUERYCONFIGURE\n");
- return 0L;
-
- case DRV_CONFIGURE :
- DPRINT("DRV_CONFIGURE\n");
- return 0L;
-
- case DRV_INSTALL :
- DPRINT("DRV_INSTALL\n");
- return DRVCNF_RESTART;
- };
-
- return DefDriverProc(driver_id,
- driver_handle,
- message,
- parameter1,
- parameter2);
-}
Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c
URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c?rev=34303&view=auto
==============================================================================
--- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c [iso-8859-1] (original)
+++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c (removed)
@@ -1,49 +1,0 @@
-/*
- ReactOS Sound System
- MME Interface
-
- Purpose:
- MIDI Input device message handler
-
- Author:
- Andrew Greenwood (silverblade at reactos.org)
-
- History:
- 4 July 2008 - Created
-*/
-
-#include <windows.h>
-#include <mmsystem.h>
-#include <mmddk.h>
-#include <debug.h>
-
-APIENTRY DWORD
-midMessage(
- DWORD device_id,
- DWORD message,
- DWORD private_handle,
- DWORD parameter1,
- DWORD parameter2)
-{
- DPRINT("midMessageStub called\n");
-
- switch ( message )
- {
- case MIDM_GETNUMDEVS :
- return 0;
-
- case MIDM_GETDEVCAPS :
- case MIDM_OPEN :
- return MMSYSERR_BADDEVICEID;
-
- case MIDM_CLOSE :
- case MIDM_ADDBUFFER :
- case MIDM_START :
- case MIDM_STOP :
- case MIDM_RESET :
- return MMSYSERR_INVALHANDLE;
-
- default :
- return MMSYSERR_NOTSUPPORTED;
- }
-}
Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c
URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c?rev=34303&view=auto
==============================================================================
--- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c [iso-8859-1] (original)
+++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c (removed)
@@ -1,48 +1,0 @@
-/*
- ReactOS Sound System
- MME Interface
-
- Purpose:
- MIDI Output device message handler
-
- Author:
- Andrew Greenwood (silverblade at reactos.org)
-
- History:
- 4 July 2008 - Created
-*/
-
-#include <windows.h>
-#include <mmsystem.h>
-#include <mmddk.h>
-#include <debug.h>
-
-APIENTRY DWORD
-modMessage(
- DWORD device_id,
- DWORD message,
- DWORD private_handle,
- DWORD parameter1,
- DWORD parameter2)
-{
- DPRINT("modMessageStub called\n");
-
- switch ( message )
- {
- case MODM_GETNUMDEVS :
- return 0;
-
- case MODM_GETDEVCAPS :
- case MODM_OPEN :
- return MMSYSERR_BADDEVICEID;
-
- case MODM_CLOSE :
- case MODM_DATA :
- case MODM_LONGDATA :
- case MODM_RESET :
- return MMSYSERR_INVALHANDLE;
-
- default :
- return MMSYSERR_NOTSUPPORTED;
- }
-}
Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c
URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c?rev=34303&view=auto
==============================================================================
--- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c [iso-8859-1] (original)
+++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c (removed)
@@ -1,31 +1,0 @@
-/*
- ReactOS Sound System
- MME Interface
-
- Purpose:
- Mixer device message handler
-
- Author:
- Andrew Greenwood (silverblade at reactos.org)
-
- History:
- 4 July 2008 - Created
-*/
-
-#include <windows.h>
-#include <mmsystem.h>
-#include <mmddk.h>
-#include <debug.h>
-
-APIENTRY DWORD
-mxdMessage(
- DWORD device_id,
- DWORD message,
- DWORD private_handle,
- DWORD parameter1,
- DWORD parameter2)
-{
- DPRINT("mxdMessageStub called\n");
- /* TODO */
- return MMSYSERR_NOTSUPPORTED;
-}
Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c
URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c?rev=34303&view=auto
==============================================================================
--- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c [iso-8859-1] (original)
+++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c (removed)
@@ -1,50 +1,0 @@
-/*
- ReactOS Sound System
- MME Interface
-
- Purpose:
- Wave input device message handler
-
- Author:
- Andrew Greenwood (silverblade at reactos.org)
-
- History:
- 4 July 2008 - Created
-*/
-
-#include <windows.h>
-#include <mmsystem.h>
-#include <mmddk.h>
-#include <debug.h>
-#include <ntddsnd.h>
-
-#include <mmebuddy.h>
-
-APIENTRY DWORD
-widMessage(
- DWORD device_id,
- DWORD message,
- DWORD private_handle,
- DWORD parameter1,
- DWORD parameter2)
-{
- DPRINT("widMessageStub called\n");
-
- switch ( message )
- {
- case WIDM_GETNUMDEVS :
- return GetSoundDeviceCount(WAVE_IN_DEVICE_TYPE);
-
- case WIDM_GETDEVCAPS :
- case WIDM_OPEN :
- return MMSYSERR_BADDEVICEID;
-
- case WIDM_CLOSE :
- case WIDM_START :
- case WIDM_RESET :
- return MMSYSERR_INVALHANDLE;
-
- default :
- return MMSYSERR_NOTSUPPORTED;
- }
-}
Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c
URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c?rev=34303&view=auto
==============================================================================
--- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c [iso-8859-1] (original)
+++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c (removed)
@@ -1,81 +1,0 @@
-/*
- ReactOS Sound System
- MME Interface
-
- Purpose:
- Wave output device message handler
-
- Author:
- Andrew Greenwood (silverblade at reactos.org)
-
- History:
- 4 July 2008 - Created
-*/
-
-#include <windows.h>
-#include <mmsystem.h>
-#include <mmddk.h>
-#include <debug.h>
-
-#include <ntddsnd.h>
-#include <mmebuddy.h>
-
-APIENTRY DWORD
-wodMessage(
- DWORD device_id,
- DWORD message,
- DWORD private_handle,
- DWORD parameter1,
- DWORD parameter2)
-{
- MMRESULT Result = MMSYSERR_NOERROR;
- PSOUND_DEVICE Device = NULL;
- DPRINT("wodMessageStub called\n");
-
- switch ( message )
- {
- case WODM_GETNUMDEVS :
- return GetSoundDeviceCount(WAVE_OUT_DEVICE_TYPE);
-
- case WODM_GETDEVCAPS :
- {
- UNIVERSAL_CAPS Capabilities;
-
- Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, device_id, &Device);
- if ( Result != MMSYSERR_NOERROR )
- return Result;
-
- Result = GetSoundDeviceCapabilities(Device, &Capabilities);
- if ( Result != MMSYSERR_NOERROR )
- return Result;
-
- CopyMemory((LPWAVEOUTCAPS)parameter1, &Capabilities.WaveOut, parameter2);
-
- return Result;
- }
-
- case WODM_OPEN :
- /*
- OpenSoundDevice();
- */
- return MMSYSERR_BADDEVICEID;
-
- case WODM_CLOSE :
- /* CloseSoundDevice() */
-
- case WODM_WRITE :
- case WODM_PAUSE :
- case WODM_RESTART :
- case WODM_RESET :
- case WODM_BREAKLOOP :
- return MMSYSERR_INVALHANDLE;
-
- /* Let WINMM take care of these */
- case WODM_PREPARE :
- case WODM_UNPREPARE :
- return MMSYSERR_NOTSUPPORTED;
-
- default :
- return MMSYSERR_NOTSUPPORTED;
- }
-}
Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild?rev=34304&r1=34303&r2=34304&view=diff
==============================================================================
--- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild [iso-8859-1] (original)
+++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild [iso-8859-1] Sat Jul 5 07:42:48 2008
@@ -10,13 +10,13 @@
<file>thread.c</file>
<file>testing.c</file>
<directory name="mme">
- <file>entry.c</file>
- <file>wod.c</file>
- <file>wid.c</file>
- <file>mod.c</file>
- <file>mid.c</file>
- <file>mxd.c</file>
- <file>aux.c</file>
+ <file>DriverProc.c</file>
+ <file>wodMessage.c</file>
+ <file>widMessage.c</file>
+ <file>modMessage.c</file>
+ <file>midMessage.c</file>
+ <file>mxdMessage.c</file>
+ <file>auxMessage.c</file>
</directory>
<directory name="wave">
<file>wavethread.c</file>
More information about the Ros-diffs
mailing list