Handle case where partial structure update requested.
Minor white space cleanup.
This commit is contained in:
parent
7d2f5a7b15
commit
a7e8f6f3a2
|
@ -404,18 +404,20 @@ static DWORD wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSA lpWaveC
|
|||
return MMSYSERR_BADDEVICEID;
|
||||
/* otherwise, return caps of mapper itself */
|
||||
if (wDevID == (UINT)-1 || wDevID == (UINT16)-1) {
|
||||
lpWaveCaps->wMid = 0x00FF;
|
||||
lpWaveCaps->wPid = 0x0001;
|
||||
lpWaveCaps->vDriverVersion = 0x0100;
|
||||
strcpy(lpWaveCaps->szPname, "Wine wave out mapper");
|
||||
lpWaveCaps->dwFormats =
|
||||
WAVEOUTCAPSA woc;
|
||||
woc.wMid = 0x00FF;
|
||||
woc.wPid = 0x0001;
|
||||
woc.vDriverVersion = 0x0100;
|
||||
strcpy(woc.szPname, "Wine wave out mapper");
|
||||
woc.dwFormats =
|
||||
WAVE_FORMAT_96M08 | WAVE_FORMAT_96S08 | WAVE_FORMAT_96M16 | WAVE_FORMAT_96S16 |
|
||||
WAVE_FORMAT_48M08 | WAVE_FORMAT_48S08 | WAVE_FORMAT_48M16 | WAVE_FORMAT_48S16 |
|
||||
WAVE_FORMAT_4M08 | WAVE_FORMAT_4S08 | WAVE_FORMAT_4M16 | WAVE_FORMAT_4S16 |
|
||||
WAVE_FORMAT_2M08 | WAVE_FORMAT_2S08 | WAVE_FORMAT_2M16 | WAVE_FORMAT_2S16 |
|
||||
WAVE_FORMAT_1M08 | WAVE_FORMAT_1S08 | WAVE_FORMAT_1M16 | WAVE_FORMAT_1S16;
|
||||
lpWaveCaps->wChannels = 2;
|
||||
lpWaveCaps->dwSupport = WAVECAPS_VOLUME | WAVECAPS_LRVOLUME;
|
||||
woc.wChannels = 2;
|
||||
woc.dwSupport = WAVECAPS_VOLUME | WAVECAPS_LRVOLUME;
|
||||
memcpy(lpWaveCaps, &woc, min(dwParam2, sizeof(woc)));
|
||||
|
||||
return MMSYSERR_NOERROR;
|
||||
}
|
||||
|
@ -847,17 +849,20 @@ static DWORD widGetDevCaps(UINT wDevID, WAVEMAPDATA* wim, LPWAVEINCAPSA lpWaveCa
|
|||
return MMSYSERR_BADDEVICEID;
|
||||
/* otherwise, return caps of mapper itself */
|
||||
if (wDevID == (UINT)-1 || wDevID == (UINT16)-1) {
|
||||
lpWaveCaps->wMid = 0x00FF;
|
||||
lpWaveCaps->wPid = 0x0001;
|
||||
lpWaveCaps->vDriverVersion = 0x0001;
|
||||
strcpy(lpWaveCaps->szPname, "Wine wave in mapper");
|
||||
lpWaveCaps->dwFormats =
|
||||
WAVEINCAPSA wic;
|
||||
wic.wMid = 0x00FF;
|
||||
wic.wPid = 0x0001;
|
||||
wic.vDriverVersion = 0x0001;
|
||||
strcpy(wic.szPname, "Wine wave in mapper");
|
||||
wic.dwFormats =
|
||||
WAVE_FORMAT_96M08 | WAVE_FORMAT_96S08 | WAVE_FORMAT_96M16 | WAVE_FORMAT_96S16 |
|
||||
WAVE_FORMAT_48M08 | WAVE_FORMAT_48S08 | WAVE_FORMAT_48M16 | WAVE_FORMAT_48S16 |
|
||||
WAVE_FORMAT_4M08 | WAVE_FORMAT_4S08 | WAVE_FORMAT_4M16 | WAVE_FORMAT_4S16 |
|
||||
WAVE_FORMAT_2M08 | WAVE_FORMAT_2S08 | WAVE_FORMAT_2M16 | WAVE_FORMAT_2S16 |
|
||||
WAVE_FORMAT_1M08 | WAVE_FORMAT_1S08 | WAVE_FORMAT_1M16 | WAVE_FORMAT_1S16;
|
||||
lpWaveCaps->wChannels = 2;
|
||||
wic.wChannels = 2;
|
||||
memcpy(lpWaveCaps, &wic, min(dwParam2, sizeof(wic)));
|
||||
|
||||
return MMSYSERR_NOERROR;
|
||||
}
|
||||
ERR("This shouldn't happen\n");
|
||||
|
|
Loading…
Reference in New Issue