Rebase against acd2f1e59bd22197b63eb5ae4ac0d621a0b8cce0

This commit is contained in:
Alistair Leslie-Hughes
2018-03-06 09:29:38 +11:00
parent e09e1fd366
commit fcca2476bf
42 changed files with 395 additions and 976 deletions

View File

@@ -1,4 +1,4 @@
From 1aed6403e787e6bc1f61470be8663e33757c88ab Mon Sep 17 00:00:00 2001
From ed96944bde2b0e5cc749fc3e4fec7ad404b6ab20 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.
@@ -13,19 +13,19 @@ Subject: [PATCH] wuauserv: Add dummy service.
create mode 100644 programs/wuauserv/main.c
diff --git a/configure.ac b/configure.ac
index 7b796ef..a64c7b1 100644
index 053af80..595e94b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3881,6 +3881,7 @@ WINE_CONFIG_PROGRAM(wordpad)
WINE_CONFIG_PROGRAM(write)
WINE_CONFIG_PROGRAM(wscript)
WINE_CONFIG_TEST(programs/wscript/tests)
+WINE_CONFIG_PROGRAM(wuauserv)
WINE_CONFIG_PROGRAM(wusa)
WINE_CONFIG_PROGRAM(xcopy)
WINE_CONFIG_TEST(programs/xcopy/tests)
@@ -4012,6 +4012,7 @@ WINE_CONFIG_MAKEFILE(programs/wordpad)
WINE_CONFIG_MAKEFILE(programs/write)
WINE_CONFIG_MAKEFILE(programs/wscript)
WINE_CONFIG_MAKEFILE(programs/wscript/tests)
+WINE_CONFIG_MAKEFILE(programs/wuauserv)
WINE_CONFIG_MAKEFILE(programs/wusa)
WINE_CONFIG_MAKEFILE(programs/xcopy)
WINE_CONFIG_MAKEFILE(programs/xcopy/tests)
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 3c55125..520d2a2 100644
index bd83ba2..b4377ed 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -135,6 +135,7 @@ AddService=FontCache,0,FontCacheService
@@ -52,7 +52,7 @@ index 3c55125..520d2a2 100644
[Strings]
MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions"
@@ -3391,6 +3394,14 @@ ErrorControl=1
@@ -3458,6 +3461,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.4
1.9.1