Eric Pouech : winealsa: Fixed returned string in capabilities.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: fa1d997ddc35d2452874bd077d8fc9f2ee3f4a6b
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=fa1d997ddc35d2452874bd07...

Author: Eric Pouech 
Date:   Thu Dec  8 11:58:48 2005 +0100

winealsa: Fixed returned string in capabilities.

---

dlls/winmm/winealsa/audio.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c
index a8d35b0..a64d70e 100644
--- a/dlls/winmm/winealsa/audio.c
+++ b/dlls/winmm/winealsa/audio.c
@@ -1091,7 +1091,6 @@ static int ALSA_AddDeviceToArray(WINE_WA
 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_ct
     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_ct
 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
     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;