[AUDIO-BRINGUP]

- Remove installation of non-existant wdmaud / sysaudio / kmixer

svn path=/branches/audio-bringup/; revision=49956

diff --git a/dll/cpl/mmsys/mmsys.c b/dll/cpl/mmsys/mmsys.c
index 6e76560..69ba413 100644 (file)
--- a/dll/cpl/mmsys/mmsys.c
+++ b/dll/cpl/mmsys/mmsys.c
@@ -395,13 +395,6 @@ MMSYS_InstallDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData)
                                          NULL,
                                          NULL);
 
-    if (Result)
-    {
-        Result = SetupInstallServicesFromInfSectionW(hInf,
-                                                     L"Audio_Inst.NT.Services",
-                                                     0);
-    }
-
     SetupTermDefaultQueueCallback(Context);
     SetupCloseInfFile(hInf);
 

diff --git a/media/inf/audio.inf b/media/inf/audio.inf
index 7db18a3..0a3cea6 100644 (file)
--- a/media/inf/audio.inf
+++ b/media/inf/audio.inf
@@ -30,38 +30,13 @@ HKR, , Installer32,     0, "MmSys.Cpl,MediaClassInstaller"
 CopyFiles = Audio.CopyFiles.KernelMode, Audio.CopyFiles.UserMode
 
 [Audio.CopyFiles.KernelMode]
-sysaudio.sys
-wdmaud.sys
 portcls.sys
 drmk.sys
-kmixer.sys
 
 [Audio.CopyFiles.UserMode]
 wdmaud.drv
 ksuser.dll
 
-[Audio_Inst.NT.Services]
-AddService = wdmaud,,wdmaud_Service_Inst
-AddService = sysaudio,,sysaudio_Service_Inst
-AddService = kmixer,,kmixer_Service_Inst
-
-[wdmaud_Service_Inst]
-ServiceType   = 1
-StartType     = 3
-ErrorControl  = 0
-ServiceBinary = %12%\wdmaud.sys
-
-[kmixer_Service_Inst]
-ServiceType   = 1
-StartType     = 3
-ErrorControl  = 0
-ServiceBinary = %12%\kmixer.sys
-
-[sysaudio_Service_Inst]
-ServiceType   = 1
-StartType     = 3
-ErrorControl  = 0
-ServiceBinary = %12%\sysaudio.sys
 
 ;-------------------------------- STRINGS -------------------------------