system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 10:42:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

winealsa: Fixed returned string in capabilities.

Browse source
This commit is contained in:
Eric Pouech 2005-12-08 11:58:48 +01:00 committed by Alexandre Julliard
parent 65a1796bc7
commit fa1d997ddc
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dlls/winmm/winealsa/audio.c
View file

@ -1091,7 +1091,6 @@ static int ALSA_AddDeviceToArray(WINE_WAVEDEV *ww, WINE_WAVEDEV **array,
static int ALSA_AddPlaybackDevice(snd_ctl_t *ctl, snd_pcm_t *pcm, const char *pcmname, int isdefault)
{
WINE_WAVEDEV wwo;
WCHAR nameW[MAXPNAMELEN * 2];
int rc;
memset(&wwo, '\0', sizeof(wwo));
@ -1100,8 +1099,9 @@ static int ALSA_AddPlaybackDevice(snd_ctl_t *ctl, snd_pcm_t *pcm, const char *pc
if (rc)
return(rc);
MultiByteToWideChar(CP_ACP, 0, wwo.ds_desc.szDesc, -1, nameW, sizeof(nameW)/sizeof(WCHAR));
strcpyW(wwo.outcaps.szPname, nameW);
MultiByteToWideChar(CP_ACP, 0, wwo.ds_desc.szDesc, -1,
wwo.outcaps.szPname, sizeof(wwo.outcaps.szPname)/sizeof(WCHAR));
wwo.outcaps.szPname[sizeof(wwo.outcaps.szPname)/sizeof(WCHAR) - 1] = '\0';
wwo.outcaps.wMid = MM_CREATIVE;
wwo.outcaps.wPid = MM_CREATIVE_SBP16_WAVEOUT;
@ -1131,7 +1131,6 @@ static int ALSA_AddPlaybackDevice(snd_ctl_t *ctl, snd_pcm_t *pcm, const char *pc
static int ALSA_AddCaptureDevice(snd_ctl_t *ctl, snd_pcm_t *pcm, const char *pcmname, int isdefault)
{
WINE_WAVEDEV wwi;
WCHAR nameW[MAXPNAMELEN * 2];
int rc;
memset(&wwi, '\0', sizeof(wwi));
@ -1140,8 +1139,9 @@ static int ALSA_AddCaptureDevice(snd_ctl_t *ctl, snd_pcm_t *pcm, const char *pcm
if (rc)
return(rc);
MultiByteToWideChar(CP_ACP, 0, wwi.ds_desc.szDesc, -1, nameW, sizeof(nameW)/sizeof(WCHAR));
strcpyW(wwi.incaps.szPname, nameW);
MultiByteToWideChar(CP_ACP, 0, wwi.ds_desc.szDesc, -1,
wwi.incaps.szPname, sizeof(wwi.incaps.szPname) / sizeof(WCHAR));
wwi.incaps.szPname[sizeof(wwi.incaps.szPname)/sizeof(WCHAR) - 1] = '\0';
wwi.incaps.wMid = MM_CREATIVE;
wwi.incaps.wPid = MM_CREATIVE_SBP16_WAVEOUT;