[PATCH 0/2] MR6808: services: Load mountmgr early so other services can use functionality provided by it.

[Piotr Caban (＠piotr)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6808

[PATCH 1/2] services: Sort services start order by start type.

[Piotr Caban]

From: Piotr Caban <piotr(a)codeweavers.com>

---
 programs/services/services.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/programs/services/services.c b/programs/services/services.c
index b2a9f10c5a4..d686dd39f3e 100644
--- a/programs/services/services.c
+++ b/programs/services/services.c
@@ -291,10 +291,12 @@ static void scmdatabase_remove_service(struct scmdatabase *db, struct service_en
     service->entry.next = service->entry.prev = NULL;
 }
 
-static int __cdecl compare_tags(const void *a, const void *b)
+static int __cdecl compare_service(const void *a, const void *b)
 {
     struct service_entry *service_a = *(struct service_entry **)a;
     struct service_entry *service_b = *(struct service_entry **)b;
+    if (service_a->config.dwStartType != service_b->config.dwStartType)
+        return service_a->config.dwStartType - service_b->config.dwStartType;
     return service_a->config.dwTagId - service_b->config.dwTagId;
 }
 
@@ -443,7 +445,7 @@ static void scmdatabase_autostart_services(struct scmdatabase *db)
     size = i;
 
     scmdatabase_unlock(db);
-    qsort(services_list, size, sizeof(services_list[0]), compare_tags);
+    qsort(services_list, size, sizeof(services_list[0]), compare_service);
     scmdatabase_lock_startup(db, INFINITE);
 
     for (i = 0; i < size; i++)
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/6808

[PATCH 2/2] wine.inf: Set MountMgr service start option to SERVICE_BOOT_START.

[Piotr Caban]

From: Piotr Caban <piotr(a)codeweavers.com>

This matches with native. It's needed to ensure that mountmgr is started
before other services that use functionality provided by it. Fixes
Autodesk Desktop Licensing Service that uses GetVolumeInformationByHandleW.
---
 loader/wine.inf.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 456555e28b9..181a6d62c9b 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -2338,7 +2338,7 @@ Description="Device mounting service"
 DisplayName="Mount Manager"
 ServiceBinary="%12%\mountmgr.sys"
 ServiceType=1
-StartType=2
+StartType=0
 ErrorControl=1
 LoadOrderGroup="System Bus Extender"
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6808

[PATCH 2/2] wine.inf: Set MountMgr service start option to SERVICE_BOOT_START.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=149642

Your paranoid android.


=== debian11b (64 bit WoW report) ===

user32:
input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 0000000000710100, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032