libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-13 04:29:09 +08:00
Code Issues Projects Releases Wiki Activity

Cygwin: dsp: Fix incorrect openflags when opening multiple /dev/dsp

Browse Source 
Previously, the following steps failed with error:
  1) Open /dev/dsp with O_RDONLY
  2) Open /dev/dsp with O_WRONLY
  3) Issue SNDCTL_DSP_GETOSPACE ioctl() for 2)
This is because IS_WRITE() returns false for 2) due to incorrect
openflags handling in archetype instance. This patch fixes the
issue by adding open_setup() to fhandler_dev_dsp to set openflags
correctly for each instance.

Fixes: 92ddb7429065 ("* fhandler_dsp.cc (fhandler_dev_dsp::open): Remove archetype handling.")
Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
This commit is contained in:
Takashi Yano 2024-06-28 13:42:03 +09:00
parent d1670f1e96
commit 40f751e1f4
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
winsup/cygwin/fhandler/dsp.cc
View File

@ -1026,19 +1026,19 @@ fhandler_dev_dsp::fhandler_dev_dsp ():
ssize_t ssize_t
fhandler_dev_dsp::write (const void *ptr, size_t len) fhandler_dev_dsp::write (const void *ptr, size_t len)
{ {
return base ()->_write (ptr, len); return base ()->_write (ptr, len, this);
} }
void void
fhandler_dev_dsp::read (void *ptr, size_t& len) fhandler_dev_dsp::read (void *ptr, size_t& len)
{ {
base ()->_read (ptr, len); base ()->_read (ptr, len, this);
} }
int int
fhandler_dev_dsp::ioctl (unsigned int cmd, void *buf) fhandler_dev_dsp::ioctl (unsigned int cmd, void *buf)
{ {
return base ()->_ioctl (cmd, buf); return base ()->_ioctl (cmd, buf, this);
} }
int int
@ -1065,7 +1065,6 @@ fhandler_dev_dsp::open (int flags, mode_t mode)
{ {
int ret = -1, err = 0; int ret = -1, err = 0;
UINT num_in = 0, num_out = 0; UINT num_in = 0, num_out = 0;
set_flags ((flags & ~O_TEXT) | O_BINARY);
// Work out initial sample format & frequency, /dev/dsp defaults // Work out initial sample format & frequency, /dev/dsp defaults
audioformat_ = AFMT_U8; audioformat_ = AFMT_U8;
audiofreq_ = 8000; audiofreq_ = 8000;
@ -1105,11 +1104,11 @@ fhandler_dev_dsp::open (int flags, mode_t mode)
return ret; return ret;
} }
#define IS_WRITE() ((get_flags() & O_ACCMODE) != O_RDONLY) #define IS_WRITE() ((fh->get_flags() & O_ACCMODE) != O_RDONLY)
#define IS_READ() ((get_flags() & O_ACCMODE) != O_WRONLY) #define IS_READ() ((fh->get_flags() & O_ACCMODE) != O_WRONLY)
ssize_t ssize_t
fhandler_dev_dsp::_write (const void *ptr, size_t len) fhandler_dev_dsp::_write (const void *ptr, size_t len, fhandler_dev_dsp *fh)
{ {
debug_printf ("ptr=%p len=%ld", ptr, len); debug_printf ("ptr=%p len=%ld", ptr, len);
int len_s = len; int len_s = len;
@ -1168,7 +1167,7 @@ fhandler_dev_dsp::_write (const void *ptr, size_t len)
} }
void void
fhandler_dev_dsp::_read (void *ptr, size_t& len) fhandler_dev_dsp::_read (void *ptr, size_t& len, fhandler_dev_dsp *fh)
{ {
debug_printf ("ptr=%p len=%ld", ptr, len); debug_printf ("ptr=%p len=%ld", ptr, len);
@ -1244,7 +1243,7 @@ fhandler_dev_dsp::close ()
} }
int int
fhandler_dev_dsp::_ioctl (unsigned int cmd, void *buf) fhandler_dev_dsp::_ioctl (unsigned int cmd, void *buf, fhandler_dev_dsp *fh)
{ {
debug_printf ("audio_in=%p audio_out=%p", audio_in_, audio_out_); debug_printf ("audio_in=%p audio_out=%p", audio_in_, audio_out_);
int *intbuf = (int *) buf; int *intbuf = (int *) buf;
@ -1349,7 +1348,7 @@ fhandler_dev_dsp::_ioctl (unsigned int cmd, void *buf)
CASE (SNDCTL_DSP_STEREO) CASE (SNDCTL_DSP_STEREO)
{ {
int nChannels = *intbuf + 1; int nChannels = *intbuf + 1;
int res = _ioctl (SNDCTL_DSP_CHANNELS, &nChannels); int res = _ioctl (SNDCTL_DSP_CHANNELS, &nChannels, fh);
*intbuf = nChannels - 1; *intbuf = nChannels - 1;
return res; return res;
} }
@ -1547,3 +1546,10 @@ fhandler_dev_dsp::read_ready ()
{ {
return base ()->_read_ready (); return base ()->_read_ready ();
} }
bool
fhandler_dev_dsp::open_setup (int flags)
{
set_flags ((flags & ~O_TEXT) | O_BINARY);
return fhandler_base::open_setup (flags);
}

7
winsup/cygwin/local_includes/fhandler.h
View File

@ -2870,11 +2870,12 @@ class fhandler_dev_dsp: public fhandler_base
int close (); int close ();
void fixup_after_fork (HANDLE); void fixup_after_fork (HANDLE);
void fixup_after_exec (); void fixup_after_exec ();
bool open_setup (int);
private: private:
ssize_t _write (const void *, size_t); ssize_t _write (const void *, size_t, fhandler_dev_dsp *);
void _read (void *, size_t&); void _read (void *, size_t&, fhandler_dev_dsp *);
int _ioctl (unsigned int, void *); int _ioctl (unsigned int, void *, fhandler_dev_dsp *);
int _fcntl (int cmd, intptr_t); int _fcntl (int cmd, intptr_t);
void _fixup_after_fork (HANDLE); void _fixup_after_fork (HANDLE);
void _fixup_after_exec (); void _fixup_after_exec ();