[MMIXER]

- Add more error checks
- Fix a bug MMixerGetControlsFromPinByConnectionIndex which pre-early stopped the enumeration of mixer controls
- Only add guids which can be later be resolved to mixer control
- Check if no a topology connection has no links connected

svn path=/trunk/; revision=44559

reactos/lib/drivers/sound/mmixer/controls.c

@@ -96,6 +96,12 @@ MMixerGetControlsFromPinByConnectionIndex(
     else
         NodeIndex = CurConnection->ToNode;
 
+    if (NodeIndex > NodeTypes->Count)
+    {
+        // reached end of pin connection
+        return MM_STATUS_SUCCESS;
+    }
+
     /* get target node type of current connection */
     NodeType = MMixerGetNodeType(NodeTypes, NodeIndex);
 
@@ -124,7 +130,7 @@ MMixerGetControlsFromPinByConnectionIndex(
         Status = MMixerGetNodeIndexes(MixerContext, NodeConnections, NodeIndex, TRUE, TRUE, &NodeConnectionCount, &NodeConnection);
     }
 
-    if (Status != MM_STATUS_SUCCESS)
+    if (Status == MM_STATUS_SUCCESS)
     {
         for(Index = 0; Index < NodeConnectionCount; Index++)
         {
@@ -332,6 +338,7 @@ MMixerAddMixerSourceLine(
     LPWSTR PinName;
     GUID NodeType;
     ULONG BytesReturned, ControlCount, Index;
+    LPGUID Node;
     PULONG Nodes;
 
     if (!bTargetPin)
@@ -414,10 +421,16 @@ MMixerAddMixerSourceLine(
     {
         if (Nodes[Index])
         {
-            // found a node
+            // get node type
+            Node = MMixerGetNodeType(NodeTypes, Index);
+
+            if (MMixerGetControlTypeFromTopologyNode(Node))
+            {
+                // found a node which can be resolved to a type
                 ControlCount++;
             }
         }
+    }
 
     /* now allocate the line controls */
     if (ControlCount)
@@ -456,6 +469,11 @@ MMixerAddMixerSourceLine(
         for(Index = 0; Index < NodeTypes->Count; Index++)
         {
             if (Nodes[Index])
+            {
+                // get node type
+                Node = MMixerGetNodeType(NodeTypes, Index);
+
+                if (MMixerGetControlTypeFromTopologyNode(Node))
                 {
                     /* store the node index for retrieving / setting details */
                     SrcLine->NodeIds[ControlCount] = Index;
@@ -468,6 +486,7 @@ MMixerAddMixerSourceLine(
                     }
                 }
             }
+        }
         /* store control count */
         SrcLine->Line.cControls = ControlCount;
     }
@@ -902,8 +921,6 @@ MMixerInitializeFilter(
         return Status;
     }
 
-
-
     RtlZeroMemory(Pins, sizeof(ULONG) * PinCount);
     // now get the target pins of the ADC / DAC node
     Status = MMixerGetTargetPins(MixerContext, NodeTypes, NodeConnections, NodeIndex, bInputMixer, Pins, PinCount);

reactos/lib/drivers/sound/mmixer/sup.c

@@ -251,6 +251,13 @@ MMixerGetNodeIndexes(
         Connection++;
     }
 
+    if (!Count)
+    {
+        *NodeReferenceCount = 0;
+        *NodeReference = NULL;
+        return MM_STATUS_SUCCESS;
+    }
+
     ASSERT(Count != 0);
 
     /* now allocate node index array */