Eric Pouech : wineoss: Proper support in OSS driver for audio when no
mixer is present.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jan 27 05:59:03 CST 2006
Module: wine
Branch: refs/heads/master
Commit: aef4a77d46a3881ad35c3aeeb70e9ab96efed2b6
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aef4a77d46a3881ad35c3aeeb70e9ab96efed2b6
Author: Eric Pouech <eric.pouech at wanadoo.fr>
Date: Fri Jan 27 12:10:25 2006 +0100
wineoss: Proper support in OSS driver for audio when no mixer is present.
Fixed a couple of potential fd leaks.
---
dlls/winmm/wineoss/audio.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c
index 7df0bca..596190b 100644
--- a/dlls/winmm/wineoss/audio.c
+++ b/dlls/winmm/wineoss/audio.c
@@ -740,9 +740,7 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE*
}
close(mixer);
} else {
- ERR("open(%s) failed (%s)\n", ossdev->mixer_name , strerror(errno));
- OSS_CloseDevice(ossdev);
- return FALSE;
+ WARN("open(%s) failed (%s)\n", ossdev->mixer_name , strerror(errno));
}
}
#endif /* SOUND_MIXER_INFO */
@@ -892,9 +890,7 @@ static BOOL OSS_WaveInInit(OSS_DEVICE* o
}
close(mixer);
} else {
- ERR("open(%s) failed (%s)\n", ossdev->mixer_name, strerror(errno));
- OSS_CloseDevice(ossdev);
- return FALSE;
+ WARN("open(%s) failed (%s)\n", ossdev->mixer_name, strerror(errno));
}
}
#endif /* SOUND_MIXER_INFO */
@@ -2254,6 +2250,7 @@ static DWORD wodGetVolume(WORD wDevID, L
return MMSYSERR_NOTENABLED;
}
if (ioctl(mixer, SOUND_MIXER_READ_PCM, &volume) == -1) {
+ close(mixer);
WARN("ioctl(%s, SOUND_MIXER_READ_PCM) failed (%s)\n",
WOutDev[wDevID].ossdev->mixer_name, strerror(errno));
return MMSYSERR_NOTENABLED;
@@ -2297,12 +2294,12 @@ DWORD wodSetVolume(WORD wDevID, DWORD dw
return MMSYSERR_NOTENABLED;
}
if (ioctl(mixer, SOUND_MIXER_WRITE_PCM, &volume) == -1) {
+ close(mixer);
WARN("ioctl(%s, SOUND_MIXER_WRITE_PCM) failed (%s)\n",
WOutDev[wDevID].ossdev->mixer_name, strerror(errno));
return MMSYSERR_NOTENABLED;
- } else {
- TRACE("volume=%04x\n", (unsigned)volume);
}
+ TRACE("volume=%04x\n", (unsigned)volume);
close(mixer);
/* save requested volume */
More information about the wine-cvs
mailing list