Changeset 8517 for trunk/src

Timestamp:

May 29, 2002, 5:13:05 PM (23 years ago)

Author:

sandervl

Message:

mixerGetLineInfoW & mixerGetLineControlsA fixes

File:

• trunk/src/winmm/mixer.cpp (modified) (6 diffs)

trunk/src/winmm/mixer.cpp

@@ -1 @@
-/* $Id: mixer.cpp,v 1.22 2002-05-28 14:09:24 sandervl Exp $ */
+/* $Id: mixer.cpp,v 1.23 2002-05-29 15:13:05 sandervl Exp $ */
 
 /*
@@ -717 +717 @@
         }
         pLine = &pmixerLines[lpMlc->dwLineID]->line;
-        if(lpMlc->cControls != pLine->cControls || lpMlc->cbmxctrl < pLine->cControls*sizeof(MIXERCONTROLA)) {
+        if(lpMlc->cControls != pLine->cControls) {
             dprintf(("ERROR: invalid nr of controls %d or structure size %d (%d) (ptr %x)", lpMlc->cControls, lpMlc->cbmxctrl, pLine->cControls*sizeof(MIXERCONTROLA), lpMlc->pamxctrl));
             return MMSYSERR_INVALPARAM;
@@ -723 +723 @@
         for(int i=0;i<lpMlc->cControls;i++) {
             pCtrl = lpMlc->pamxctrl+i;
-            memcpy(pCtrl, &pmixerLines[lpMlc->dwLineID]->Controls[i], sizeof(MIXERCONTROLA));
+            memcpy(pCtrl, &mixerControls[pmixerLines[lpMlc->dwLineID]->Controls[i]], sizeof(MIXERCONTROLA));
             dprintf(("found control %s (%s) control id %d", pCtrl->szName, pCtrl->szShortName, pCtrl->dwControlID));
         }
@@ -1154 +1154 @@
     line.cChannels             = pmxl->cChannels;
     line.cConnections          = pmxl->cConnections;
+    line.cControls             = pmxl->cControls;
     line.dwComponentType       = pmxl->dwComponentType;
     line.dwDestination         = pmxl->dwDestination;
@@ -1177 +1178 @@
     pmxl->cChannels             = line.cChannels;
     pmxl->cConnections          = line.cConnections;
+    pmxl->cControls             = line.cControls;
     pmxl->dwComponentType       = line.dwComponentType;
     pmxl->dwDestination         = line.dwDestination;
@@ -1840 +1842 @@
     //add control to list of controls associated with source line
     pSrcLine->Controls[pSrcLine->cControls] = pctrl->dwControlID;
+    pSrcLine->line.cControls++;
     pSrcLine->cControls++;