[MMIXER]

- Handle failure of device enumeration
- Add sanity check

svn path=/trunk/; revision=47715

diff --git a/reactos/lib/drivers/sound/mmixer/controls.c b/reactos/lib/drivers/sound/mmixer/controls.c
index 0b2e499..36794df 100644 (file)
--- a/reactos/lib/drivers/sound/mmixer/controls.c
+++ b/reactos/lib/drivers/sound/mmixer/controls.c
@@ -385,6 +385,8 @@ MMixerAddMixerSourceLine(
         SrcLine->Line.Target.wPid = MixerInfo->MixCaps.wPid;
         SrcLine->Line.Target.vDriverVersion = MixerInfo->MixCaps.vDriverVersion;
         InitializeListHead(&SrcLine->LineControlsExtraData);
+
+        ASSERT(MixerInfo->MixCaps.szPname[MAXPNAMELEN-1] == L'\0');
         wcscpy(SrcLine->Line.Target.szPname, MixerInfo->MixCaps.szPname);
 
     }

diff --git a/reactos/lib/drivers/sound/mmixer/mixer.c b/reactos/lib/drivers/sound/mmixer/mixer.c
index a05f2a7..46e2c6d 100644 (file)
--- a/reactos/lib/drivers/sound/mmixer/mixer.c
+++ b/reactos/lib/drivers/sound/mmixer/mixer.c
@@ -472,6 +472,13 @@ MMixerInitialize(
                 // enumeration has finished
                 break;
             }
+            else
+            {
+                DPRINT1("Failed to enumerate device %lu\n", DeviceIndex);
+
+                // TODO cleanup
+                return Status;
+            }
         }
         else
         {