Rebase against f53c320f04114253955b509da294ef454864679d.

This commit is contained in:
Sebastian Lackner
2016-09-07 17:58:48 +02:00
parent 82a0709ef2
commit b3a71a8918
5 changed files with 26 additions and 26 deletions

View File

@@ -1,4 +1,4 @@
From 7e5702413a132b28a02abaf8c22f2c25b9ca1edf Mon Sep 17 00:00:00 2001
From 4aef2c13b8f93320c112fb3646b7cc37d0be2dc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 11 Mar 2016 21:44:53 +0100
Subject: wuauserv: Add dummy service.
@@ -13,10 +13,10 @@ Subject: wuauserv: Add dummy service.
create mode 100644 programs/wuauserv/main.c
diff --git a/configure.ac b/configure.ac
index 09e0f53..bffb944 100644
index 8d5116c..3bfb84c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3520,6 +3520,7 @@ WINE_CONFIG_PROGRAM(wordpad,,[clean,install])
@@ -3564,6 +3564,7 @@ WINE_CONFIG_PROGRAM(wordpad,,[clean,install])
WINE_CONFIG_PROGRAM(write,,[clean,install])
WINE_CONFIG_PROGRAM(wscript,,[clean,install])
WINE_CONFIG_TEST(programs/wscript/tests)
@@ -25,34 +25,34 @@ index 09e0f53..bffb944 100644
WINE_CONFIG_PROGRAM(xcopy,,[clean,install])
WINE_CONFIG_TEST(programs/xcopy/tests)
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index d22b29b..fe7459e 100644
index 4e29026..04f60ff 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -129,6 +129,7 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService
AddService=LanmanServer,0,LanmanServerService
@@ -131,6 +131,7 @@ AddService=LanmanServer,0,LanmanServerService
AddService=FontCache,0,FontCacheService
AddService=Schedule,0,TaskSchedulerService
AddService=WineBus,0,WineBusService
+AddService=wuauserv,0,wuauService
[DefaultInstall.NT.Services]
AddService=BITS,0,BITSService
@@ -142,6 +143,7 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService
AddService=LanmanServer,0,LanmanServerService
@@ -146,6 +147,7 @@ AddService=LanmanServer,0,LanmanServerService
AddService=FontCache,0,FontCacheService
AddService=Schedule,0,TaskSchedulerService
AddService=WineBus,0,WineBusService
+AddService=wuauserv,0,wuauService
[DefaultInstall.ntamd64.Services]
AddService=BITS,0,BITSService
@@ -155,6 +157,7 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService
AddService=LanmanServer,0,LanmanServerService
@@ -161,6 +163,7 @@ AddService=LanmanServer,0,LanmanServerService
AddService=FontCache,0,FontCacheService
AddService=Schedule,0,TaskSchedulerService
AddService=WineBus,0,WineBusService
+AddService=wuauserv,0,wuauService
[Strings]
MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions"
@@ -3253,6 +3256,14 @@ ErrorControl=1
@@ -3279,6 +3282,14 @@ ErrorControl=1
HKR,Parameters,"ServiceDll",,"%11%\schedsvc.dll"
HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule"
@@ -190,5 +190,5 @@ index 0000000..31df299
+ return 0;
+}
--
2.7.1
2.9.0