Rebase against f9e1dbb83d850a2f7cb17079e02de139e2f8b920

This commit is contained in:
Alistair Leslie-Hughes
2018-02-23 09:33:49 +11:00
parent 84fb9656a1
commit 9d84ed42f1
42 changed files with 412 additions and 677 deletions

View File

@@ -1,4 +1,4 @@
From f47c0b273cc8d9765ddde4c9fa2698c58ae1db0c Mon Sep 17 00:00:00 2001
From ee89a3402d072488571fd53dfc4cef133bf7081d 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 bfca87c..ce1f326 100644
index 5b30f88..beee787 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4004,6 +4004,7 @@ WINE_CONFIG_PROGRAM(wordpad,,[install])
WINE_CONFIG_PROGRAM(write,,[install])
WINE_CONFIG_PROGRAM(wscript,,[install])
@@ -4013,6 +4013,7 @@ WINE_CONFIG_PROGRAM(wordpad)
WINE_CONFIG_PROGRAM(write)
WINE_CONFIG_PROGRAM(wscript)
WINE_CONFIG_TEST(programs/wscript/tests)
+WINE_CONFIG_PROGRAM(wuauserv,,[install])
WINE_CONFIG_PROGRAM(wusa,,[install])
WINE_CONFIG_PROGRAM(xcopy,,[install])
WINE_CONFIG_PROGRAM(wusa)
WINE_CONFIG_PROGRAM(xcopy)
WINE_CONFIG_TEST(programs/xcopy/tests)
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 90acd58..638be4f 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 90acd58..638be4f 100644
[Strings]
MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions"
@@ -3457,6 +3460,14 @@ ErrorControl=1
@@ -3458,6 +3461,14 @@ ErrorControl=1
HKR,Parameters,"ServiceDll",,"%11%\schedsvc.dll"
HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule"