Added patch to start SERVICE_FILE_SYSTEM_DRIVER services with winedevice.

README.md

@@ -34,7 +34,7 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 -----------------------------------
 
-**Bug fixes and features included in the next upcoming release [6]:**
+**Bug fixes and features included in the next upcoming release [7]:**
 
 * Add information for delayed end of DST in Europe/Istanbul
 * Also send WM_CAPTURECHANGE when capture has not changed ([Wine Bug #13683](https://bugs.winehq.org/show_bug.cgi?id=13683))
@@ -42,6 +42,7 @@ Included bug fixes and improvements
 * Fix font loading in Capella ([Wine Bug #12377](https://bugs.winehq.org/show_bug.cgi?id=12377))
 * Silence repeated FIXME message in surface_cpu_blt
 * Skip invalid entries in GetPrivateProfileString16 ([Wine Bug #9919](https://bugs.winehq.org/show_bug.cgi?id=9919))
+* Start SERVICE_FILE_SYSTEM_DRIVER services with winedevice ([Wine Bug #35824](https://bugs.winehq.org/show_bug.cgi?id=35824))
 
 
 **Bug fixes and features in Wine Staging 1.8-rc1 [268]:**

patches/patchinstall.sh

@@ -252,6 +252,7 @@ patch_enable_all ()
 	enable_server_Signal_Thread="$1"
 	enable_server_Stored_ACLs="$1"
 	enable_server_Timestamp_Compat="$1"
+	enable_services_SERVICE_FILE_SYSTEM_DRIVER="$1"
 	enable_setupapi_HSPFILEQ_Check_Type="$1"
 	enable_setupapi_SetupDiSelectBestCompatDrv="$1"
 	enable_setupapi_SetupDiSetDeviceInstallParamsW="$1"
@@ -866,6 +867,9 @@ patch_enable ()
 		server-Timestamp_Compat)
 			enable_server_Timestamp_Compat="$2"
 			;;
+		services-SERVICE_FILE_SYSTEM_DRIVER)
+			enable_services_SERVICE_FILE_SYSTEM_DRIVER="$2"
+			;;
 		setupapi-HSPFILEQ_Check_Type)
 			enable_setupapi_HSPFILEQ_Check_Type="$2"
 			;;
@@ -5054,6 +5058,21 @@ if test "$enable_server_Timestamp_Compat" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset services-SERVICE_FILE_SYSTEM_DRIVER
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#35824] Start SERVICE_FILE_SYSTEM_DRIVER services with winedevice
+# |
+# | Modified files:
+# |   *	programs/services/services.c
+# |
+if test "$enable_services_SERVICE_FILE_SYSTEM_DRIVER" -eq 1; then
+	patch_apply services-SERVICE_FILE_SYSTEM_DRIVER/0001-services-Start-SERVICE_FILE_SYSTEM_DRIVER-services-w.patch
+	(
+		echo '+    { "Sebastian Lackner", "services: Start SERVICE_FILE_SYSTEM_DRIVER services with winedevice.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset setupapi-HSPFILEQ_Check_Type
 # |
 # | This patchset fixes the following Wine bugs:

patches/services-SERVICE_FILE_SYSTEM_DRIVER/0001-services-Start-SERVICE_FILE_SYSTEM_DRIVER-services-w.patch

@@ -0,0 +1,26 @@
+From fa3088d5c689f7403df2525394a8d6837681959a Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sat, 28 Nov 2015 23:29:49 +0100
+Subject: services: Start SERVICE_FILE_SYSTEM_DRIVER services with winedevice.
+
+---
+ programs/services/services.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/programs/services/services.c b/programs/services/services.c
+index 1335837..53a3846 100644
+--- a/programs/services/services.c
++++ b/programs/services/services.c
+@@ -631,7 +631,8 @@ static DWORD get_service_binary_path(const struct service_entry *service_entry,
+ 
+     ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName, *path, size);
+ 
+-    if (service_entry->config.dwServiceType == SERVICE_KERNEL_DRIVER)
++    if (service_entry->config.dwServiceType == SERVICE_KERNEL_DRIVER ||
++        service_entry->config.dwServiceType == SERVICE_FILE_SYSTEM_DRIVER)
+     {
+         static const WCHAR winedeviceW[] = {'\\','w','i','n','e','d','e','v','i','c','e','.','e','x','e',' ',0};
+         WCHAR system_dir[MAX_PATH];
+-- 
+2.6.2
+

patches/services-SERVICE_FILE_SYSTEM_DRIVER/definition

@@ -0,0 +1 @@
+Fixes: [35824] Start SERVICE_FILE_SYSTEM_DRIVER services with winedevice

staging/changelog

@@ -16,6 +16,7 @@ wine-staging (1.8~rc2) UNRELEASED; urgency=low
   * Added patch to skip invalid entries in GetPrivateProfileString16.
   * Added patch to send WM_CAPTURECHANGE also when capture has not changed.
   * Added patch to silence repeated FIXME message in surface_cpu_blt.
+  * Added patch to start SERVICE_FILE_SYSTEM_DRIVER services with winedevice.
  -- Sebastian Lackner <sebastian@fds-team.de>  Wed, 25 Nov 2015 20:21:46 +0100
 
 wine-staging (1.8~rc1) unstable; urgency=low