[Cegcc-svn] SF.net SVN: cegcc: [921] trunk/cegcc/src/w32api

[<ped...@us...>]

Revision: 921
          http://svn.sourceforge.net/cegcc/?rev=921&view=rev
Author:   pedroalves
Date:     2007-05-30 05:04:05 -0700 (Wed, 30 May 2007)

Log Message:
-----------
	* include/mmsystem.h (waveOutGetDevCapsW, waveOutGetErrorTextW)
	(waveInGetDevCapsW, waveInGetErrorTextW, mixerGetDevCapsW)
	(mixerGetLineInfoW, mixerGetLineControlsW)
	(mixerGetControlDetailsW) [_WIN32_WCE]: Define as waveOutGetDevCaps,
	waveOutGetErrorText, waveInGetDevCaps, waveInGetErrorText,
	mixerGetDevCaps, mixerGetLineInfo, mixerGetLineControls and
	mixerGetControlDetails.

	(waveOutGetDevCaps, waveOutGetErrorText, waveInGetDevCaps)
	(waveInGetErrorText, mixerGetDevCaps, mixerGetLineInfo)
	(mixerGetLineControls, mixerGetControlDetails) [_WIN32_WCE]: Don't
	map to the W counterparts.

Modified Paths:
--------------
    trunk/cegcc/src/w32api/ChangeLog.ce
    trunk/cegcc/src/w32api/include/mmsystem.h

Modified: trunk/cegcc/src/w32api/ChangeLog.ce
===================================================================
--- trunk/cegcc/src/w32api/ChangeLog.ce	2007-05-28 09:48:22 UTC (rev 920)
+++ trunk/cegcc/src/w32api/ChangeLog.ce	2007-05-30 12:04:05 UTC (rev 921)
@@ -1,3 +1,18 @@
+2007-05-30  Pedro Alves  <ped...@po...>
+
+	* include/mmsystem.h (waveOutGetDevCapsW, waveOutGetErrorTextW)
+	(waveInGetDevCapsW, waveInGetErrorTextW, mixerGetDevCapsW)
+	(mixerGetLineInfoW, mixerGetLineControlsW)
+	(mixerGetControlDetailsW) [_WIN32_WCE]: Define as waveOutGetDevCaps,
+	waveOutGetErrorText, waveInGetDevCaps, waveInGetErrorText,
+	mixerGetDevCaps, mixerGetLineInfo, mixerGetLineControls and
+	mixerGetControlDetails.
+
+	(waveOutGetDevCaps, waveOutGetErrorText, waveInGetDevCaps)
+	(waveInGetErrorText, mixerGetDevCaps, mixerGetLineInfo)
+	(mixerGetLineControls, mixerGetControlDetails) [_WIN32_WCE]: Don't
+	map to the W counterparts.
+
 2007-03-26  Pedro Alves  <ped...@po...>
 	
 	* libce/coredll.def: Add 'keep in sync' warning.

Modified: trunk/cegcc/src/w32api/include/mmsystem.h
===================================================================
--- trunk/cegcc/src/w32api/include/mmsystem.h	2007-05-28 09:48:22 UTC (rev 920)
+++ trunk/cegcc/src/w32api/include/mmsystem.h	2007-05-30 12:04:05 UTC (rev 921)
@@ -1561,6 +1561,12 @@
 BOOL WINAPI PlaySoundA(LPCSTR,HMODULE,DWORD);
 BOOL WINAPI PlaySoundW(LPCWSTR,HMODULE,DWORD);
 UINT WINAPI waveOutGetNumDevs(void);
+#ifdef _WIN32_WCE
+#define waveOutGetDevCapsW waveOutGetDevCaps
+#define waveOutGetErrorTextW waveOutGetErrorText
+#define waveInGetDevCapsW waveInGetDevCaps
+#define waveInGetErrorTextW waveInGetErrorText
+#endif
 MMRESULT WINAPI waveOutGetDevCapsA(UINT,LPWAVEOUTCAPSA,UINT);
 MMRESULT WINAPI waveOutGetDevCapsW(UINT,LPWAVEOUTCAPSW,UINT);
 MMRESULT WINAPI waveOutGetVolume(HWAVEOUT,PDWORD);
@@ -1649,6 +1655,12 @@
 MMRESULT WINAPI auxGetVolume(UINT,PDWORD);
 MMRESULT WINAPI auxOutMessage(UINT,UINT,DWORD,DWORD);
 UINT WINAPI mixerGetNumDevs(void);
+#ifdef _WIN32_WCE
+#define mixerGetDevCapsW mixerGetDevCaps
+#define mixerGetLineInfoW mixerGetLineInfo
+#define mixerGetLineControlsW mixerGetLineControls
+#define mixerGetControlDetailsW mixerGetControlDetails
+#endif
 MMRESULT WINAPI mixerGetDevCapsA(UINT,LPMIXERCAPSA,UINT);
 MMRESULT WINAPI mixerGetDevCapsW(UINT,LPMIXERCAPSW,UINT);
 MMRESULT WINAPI mixerOpen(LPHMIXER,UINT,DWORD,DWORD,DWORD);
@@ -1863,19 +1875,23 @@
 typedef MCI_OVLY_SAVE_PARMSW MCI_OVLY_SAVE_PARMS,*PMCI_OVLY_SAVE_PARMS,*LPMCI_OVLY_SAVE_PARMS;
 #define sndPlaySound sndPlaySoundW
 #define PlaySound PlaySoundW
+#ifndef _WIN32_WCE
 #define waveOutGetDevCaps waveOutGetDevCapsW
 #define waveOutGetErrorText waveOutGetErrorTextW
 #define waveInGetDevCaps waveInGetDevCapsW
 #define waveInGetErrorText waveInGetErrorTextW
+#endif
 #define midiOutGetDevCaps midiOutGetDevCapsW
 #define midiOutGetErrorText midiOutGetErrorTextW
 #define midiInGetDevCaps midiInGetDevCapsW
 #define midiInGetErrorText midiInGetErrorTextW
 #define auxGetDevCaps auxGetDevCapsW
+#ifndef _WIN32_WCE
 #define mixerGetDevCaps mixerGetDevCapsW
 #define mixerGetLineInfo mixerGetLineInfoW
 #define mixerGetLineControls mixerGetLineControlsW
 #define mixerGetControlDetails mixerGetControlDetailsW
+#endif
 #define joyGetDevCaps joyGetDevCapsW
 #define mmioInstallIOProc mmioInstallIOProcW
 #define mmioStringToFOURCC mmioStringToFOURCCW


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.