Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-17 16:50:26 +02:00
Code Issues Releases Wiki Activity

bug 11 - Fix potential memory leaks in DirectSound part of portmixer.

Browse Source 
Also, in some research I learned that the DirectSound guid to Wave ID function can sometimes return success without writing to the output struct at all.  I added a check to initialize and bail if this happens.  This can possibly help with some of our USB issues.
This commit is contained in:
mchinen 2011-03-22 20:55:04 +00:00
parent 8fe322f633
commit 6a868ff21d
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib-src/portmixer/src/px_win_ds.c
View File

@ -78,6 +78,13 @@ static void dprintf(const char *format, ...)
} }
#endif #endif
// Apparently sometimes IKsPropertySet_Get succeeds and does not change
// the value of WaveDeviceId. So use a crazy device index (we cant use
// ((UINT) -1) because this is for the WAVE_MAPPER.
// I believe the wave ids just start from zero so I think -111 is an acceptable value
// I suspect this happens with USB Devices.
#define kImpossibleWaveID ((ULONG) -111)
int OpenMixer_Win_DirectSound(px_mixer *Px, int index) int OpenMixer_Win_DirectSound(px_mixer *Px, int index)
{ {
DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA desc; DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA desc;
@ -91,12 +98,13 @@ int OpenMixer_Win_DirectSound(px_mixer *Px, int index)
LPGUID guidOut; LPGUID guidOut;
UINT deviceIn = -1; UINT deviceIn = -1;
UINT deviceOut = -1; UINT deviceOut = -1;
int ret = FALSE;
guidIn = PaWinDS_GetStreamInputGUID(Px->pa_stream); guidIn = PaWinDS_GetStreamInputGUID(Px->pa_stream);
guidOut = PaWinDS_GetStreamOutputGUID(Px->pa_stream); guidOut = PaWinDS_GetStreamOutputGUID(Px->pa_stream);
do { do {
hDsound = LoadLibrary("dsound.dll"); hDsound = LoadLibraryA("dsound.dll");
if (hDsound == NULL) { if (hDsound == NULL) {
break; break;
} }
@ -122,8 +130,12 @@ int OpenMixer_Win_DirectSound(px_mixer *Px, int index)
} }
if (guidIn) { if (guidIn) {
memset(&desc, 0, sizeof(desc));
memcpy(&desc.DeviceId, guidIn, sizeof(desc.DeviceId)); memcpy(&desc.DeviceId, guidIn, sizeof(desc.DeviceId));
desc.WaveDeviceId = kImpossibleWaveID;
desc.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE; desc.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
hr = IKsPropertySet_Get(pps, hr = IKsPropertySet_Get(pps,
&DSPROPSETID_DirectSoundDevice, &DSPROPSETID_DirectSoundDevice,
DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION, DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION,
@ -132,15 +144,19 @@ int OpenMixer_Win_DirectSound(px_mixer *Px, int index)
&desc, &desc,
sizeof(desc), sizeof(desc),
&bytes); &bytes);
if (FAILED(hr)) { if (FAILED(hr) || kImpossibleWaveID == desc.WaveDeviceId) {
break; break;
} }
deviceIn = desc.WaveDeviceId; deviceIn = desc.WaveDeviceId;
} }
if (guidOut) { if (guidOut) {
memset(&desc, 0, sizeof(desc));
memcpy(&desc.DeviceId, guidOut, sizeof(desc.DeviceId)); memcpy(&desc.DeviceId, guidOut, sizeof(desc.DeviceId));
desc.WaveDeviceId = kImpossibleWaveID;
desc.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER; desc.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
hr = IKsPropertySet_Get(pps, hr = IKsPropertySet_Get(pps,
&DSPROPSETID_DirectSoundDevice, &DSPROPSETID_DirectSoundDevice,
DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION, DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION,
@ -149,7 +165,7 @@ int OpenMixer_Win_DirectSound(px_mixer *Px, int index)
&desc, &desc,
sizeof(desc), sizeof(desc),
&bytes); &bytes);
if (FAILED(hr)) { if (FAILED(hr) || kImpossibleWaveID == desc.WaveDeviceId) {
break; break;
} }
deviceOut = desc.WaveDeviceId; deviceOut = desc.WaveDeviceId;
@ -157,7 +173,7 @@ int OpenMixer_Win_DirectSound(px_mixer *Px, int index)
if (open_mixers(Px, deviceIn, deviceOut)) if (open_mixers(Px, deviceIn, deviceOut))
{ {
return TRUE; ret = TRUE;
} }
} while( FALSE ); } while( FALSE );
@ -169,9 +185,11 @@ int OpenMixer_Win_DirectSound(px_mixer *Px, int index)
IUnknown_Release(pcf); IUnknown_Release(pcf);
} }
// Free the library. Note that portaudio also opens dsound.dll
// so this probably doesn't do anything until Pa_Terminate is called.
if (hDsound != INVALID_HANDLE_VALUE) { if (hDsound != INVALID_HANDLE_VALUE) {
FreeLibrary(hDsound); FreeLibrary(hDsound);
} }
return FALSE; return ret;
} }