Rebase against 480bae108c96dfe370feba2680dbefc42ef97571

This commit is contained in:
Alistair Leslie-Hughes
2019-08-27 08:47:31 +10:00
parent fcfeaf092c
commit ff10ae6e74
10 changed files with 74 additions and 441 deletions

View File

@@ -1,4 +1,4 @@
From e2fd31757e447acc266b152cd46d3ea383b01861 Mon Sep 17 00:00:00 2001
From 0b5b7f54630a4e7e2f3ed0fa82fbad727fbc0a77 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Thu, 27 Jun 2019 22:30:15 -0500
Subject: [PATCH] wine.inf: Remove registration for the winebus service.
@@ -9,34 +9,34 @@ Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
1 file changed, 12 deletions(-)
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 0918c890fb..e686bcf3c6 100644
index 02e46c5a542..eb6cfbbd705 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -130,7 +130,6 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService
@@ -135,7 +135,6 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService
AddService=LanmanServer,0,LanmanServerService
AddService=FontCache,0,FontCacheService
AddService=Schedule,0,TaskSchedulerService
-AddService=WineBus,0,WineBusService
AddService=Winmgmt,0,WinmgmtService
AddService=wuauserv,0,wuauService
[DefaultInstall.NT.Services]
@@ -146,7 +145,6 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService
@@ -153,7 +152,6 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService
AddService=LanmanServer,0,LanmanServerService
AddService=FontCache,0,FontCacheService
AddService=Schedule,0,TaskSchedulerService
-AddService=WineBus,0,WineBusService
AddService=Winmgmt,0,WinmgmtService
AddService=wuauserv,0,wuauService
[DefaultInstall.ntamd64.Services]
@@ -162,7 +160,6 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService
@@ -171,7 +169,6 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService
AddService=LanmanServer,0,LanmanServerService
AddService=FontCache,0,FontCacheService
AddService=Schedule,0,TaskSchedulerService
-AddService=WineBus,0,WineBusService
AddService=Winmgmt,0,WinmgmtService
AddService=wuauserv,0,wuauService
[Strings]
@@ -3465,15 +3462,6 @@ ServiceType=32
@@ -3681,15 +3678,6 @@ ServiceType=32
StartType=3
ErrorControl=1