Rebase against 78f74446b9806f63a27c2d643b8e29156b5bdcbe

This commit is contained in:
Alistair Leslie-Hughes
2019-06-11 08:44:55 +10:00
parent 5681cd5466
commit 9afb244a8e
11 changed files with 318 additions and 737 deletions

View File

@@ -1,19 +1,19 @@
From 0873ea7db1a66d1555ac608b249ac350f9c9097b Mon Sep 17 00:00:00 2001
From 5613df7b70c1463cb5d115bf6d6bad077e27ca26 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: [PATCH] wuauserv: Add dummy service.
---
configure.ac | 1 +
loader/wine.inf.in | 11 +++++
programs/wuauserv/Makefile.in | 6 +++
programs/wuauserv/main.c | 104 ++++++++++++++++++++++++++++++++++++++++++
loader/wine.inf.in | 11 ++++
programs/wuauserv/Makefile.in | 6 ++
programs/wuauserv/main.c | 104 ++++++++++++++++++++++++++++++++++
4 files changed, 122 insertions(+)
create mode 100644 programs/wuauserv/Makefile.in
create mode 100644 programs/wuauserv/main.c
diff --git a/configure.ac b/configure.ac
index 13467e5..ddfba7d 100644
index acdd8d5577f..adf23e9a95f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4039,6 +4039,7 @@ WINE_CONFIG_MAKEFILE(programs/wordpad)
@@ -25,34 +25,34 @@ index 13467e5..ddfba7d 100644
WINE_CONFIG_MAKEFILE(programs/xcopy)
WINE_CONFIG_MAKEFILE(programs/xcopy/tests)
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index edb8401..c5d8e8f 100644
index f77831f44a6..3e6a8e0a8cf 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -136,6 +136,7 @@ AddService=Schedule,0,TaskSchedulerService
@@ -132,6 +132,7 @@ AddService=FontCache,0,FontCacheService
AddService=Schedule,0,TaskSchedulerService
AddService=WineBus,0,WineBusService
AddService=WineHID,0,WineHIDService
AddService=Winmgmt,0,WinmgmtService
+AddService=wuauserv,0,wuauService
[DefaultInstall.NT.Services]
AddService=BITS,0,BITSService
@@ -153,6 +154,7 @@ AddService=Schedule,0,TaskSchedulerService
@@ -148,6 +149,7 @@ AddService=FontCache,0,FontCacheService
AddService=Schedule,0,TaskSchedulerService
AddService=WineBus,0,WineBusService
AddService=WineHID,0,WineHIDService
AddService=Winmgmt,0,WinmgmtService
+AddService=wuauserv,0,wuauService
[DefaultInstall.ntamd64.Services]
AddService=BITS,0,BITSService
@@ -170,6 +172,7 @@ AddService=Schedule,0,TaskSchedulerService
@@ -164,6 +166,7 @@ AddService=FontCache,0,FontCacheService
AddService=Schedule,0,TaskSchedulerService
AddService=WineBus,0,WineBusService
AddService=WineHID,0,WineHIDService
AddService=Winmgmt,0,WinmgmtService
+AddService=wuauserv,0,wuauService
[Strings]
MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions"
@@ -3471,6 +3474,14 @@ ErrorControl=1
@@ -3634,6 +3637,14 @@ ErrorControl=1
HKR,Parameters,"ServiceDll",,"%11%\schedsvc.dll"
HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule"
@@ -69,7 +69,7 @@ index edb8401..c5d8e8f 100644
HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16
diff --git a/programs/wuauserv/Makefile.in b/programs/wuauserv/Makefile.in
new file mode 100644
index 0000000..16f27f1
index 00000000000..16f27f13120
--- /dev/null
+++ b/programs/wuauserv/Makefile.in
@@ -0,0 +1,6 @@
@@ -81,7 +81,7 @@ index 0000000..16f27f1
+ main.c
diff --git a/programs/wuauserv/main.c b/programs/wuauserv/main.c
new file mode 100644
index 0000000..31df299
index 00000000000..31df299e90e
--- /dev/null
+++ b/programs/wuauserv/main.c
@@ -0,0 +1,104 @@
@@ -190,5 +190,5 @@ index 0000000..31df299
+ return 0;
+}
--
1.9.1
2.17.1