From 0d6eafe06a49fc0dc53b02fca96b5b76d9ce247c Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Fri, 27 Mar 2015 17:30:05 +0000 Subject: [PATCH] [INF] - properly install kmixer - disable audio category filter until audio stack is ready svn path=/trunk/; revision=66921 --- reactos/drivers/wdm/audio/filters/kmixer/filter.c | 1 + reactos/media/inf/wdmaudio.inf | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/reactos/drivers/wdm/audio/filters/kmixer/filter.c b/reactos/drivers/wdm/audio/filters/kmixer/filter.c index 1298f867708..429f58f3a98 100644 --- a/reactos/drivers/wdm/audio/filters/kmixer/filter.c +++ b/reactos/drivers/wdm/audio/filters/kmixer/filter.c @@ -20,6 +20,7 @@ Dispatch_fnDeviceIoControl( PIRP Irp) { UNIMPLEMENTED + DbgBreakPoint(); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; Irp->IoStatus.Information = 0; diff --git a/reactos/media/inf/wdmaudio.inf b/reactos/media/inf/wdmaudio.inf index b86aeeb2228..d378081a152 100644 --- a/reactos/media/inf/wdmaudio.inf +++ b/reactos/media/inf/wdmaudio.inf @@ -52,7 +52,7 @@ portcls.sys,,,0x0100 [DeviceRegistration] ; Kmixer swenum install HKLM,%RunOnce%,"WDM_KMIXER0",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_KMIXER.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_MIXER%,%17%\WDMAUDIO.inf,WDM_KMIXER.Interface.Install" -HKLM,%RunOnce%,"WDM_KMIXER1",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_KMIXER.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_AUDIO%,%17%\WDMAUDIO.inf,WDM_KMIXER.Interface.Install" +;HKLM,%RunOnce%,"WDM_KMIXER1",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_KMIXER.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_AUDIO%,%17%\WDMAUDIO.inf,WDM_KMIXER.Interface.Install" ; Sysaudio swenum install HKLM,%RunOnce%,"WDM_SYSAUDIO",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_SYSAUDIO.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_SYSAUDIO%,%17%\WDMAUDIO.inf,WDM_SYSAUDIO.Interface.Install" @@ -189,7 +189,8 @@ KSCATEGORY_AUDIO = "{6994AD04-93EF-11D0-A3CC-00A0C9223196}" PKEY_AudioEngine_OEMFormat = "{E4870E26-3CC5-4CD2-BA46-CA0A9A70ED04},3" WDM_WDMAUD.DeviceId = "{CD171DE3-69E5-11D2-B56D-0000F8754380}" KSCATEGORY_WDMAUD = "{3E227E76-690D-11D2-8161-0000F8775BF1}" - +WDM_KMIXER.DeviceId = "{B7EAFDC0-A680-11D0-96D8-00AA0051E51D}" +KSCATEGORY_MIXER = "{AD809C00-7B88-11D0-A5D6-28DB04C10000}" ;Localizable WDM_KMIXER.DeviceDesc = "ReactOS Wave Audio Mixer"