From 16e620d6472f197b97eaa0990db77a8185ed6174 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sun, 25 May 2025 14:34:25 +0200
Subject: [PATCH] [ADVAPI32] Pass PnP data to services on
 SERVICE_CONTROL_DEVICEEVENT

Services can now receive PnP events.
---
 dll/win32/advapi32/service/sctrl.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c
index d13c1ce8380..a6c86e3436f 100644
--- a/dll/win32/advapi32/service/sctrl.c
+++ b/dll/win32/advapi32/service/sctrl.c
@@ -551,6 +551,8 @@ ScControlService(PACTIVE_SERVICE lpService,
                  PSCM_CONTROL_PACKET ControlPacket)
 {
     DWORD dwError = ERROR_SUCCESS;
+    DWORD dwEventType = 0;
+    PVOID pEventData = NULL;
 
     TRACE("ScControlService(%p %p)\n",
           lpService, ControlPacket);
@@ -578,11 +580,17 @@ ScControlService(PACTIVE_SERVICE lpService,
     }
     else if (lpService->HandlerFunctionEx)
     {
+        if (ControlPacket->dwControl == SERVICE_CONTROL_DEVICEEVENT)
+        {
+            dwEventType = *(LPDWORD)((ULONG_PTR)ControlPacket + sizeof(SCM_CONTROL_PACKET));
+            pEventData = (PVOID)((ULONG_PTR)ControlPacket + sizeof(SCM_CONTROL_PACKET) + sizeof(DWORD));
+        }
+
         _SEH2_TRY
         {
-            /* FIXME: Send correct 2nd and 3rd parameters */
             (lpService->HandlerFunctionEx)(ControlPacket->dwControl,
-                                           0, NULL,
+                                           dwEventType,
+                                           pEventData,
                                            lpService->HandlerContext);
         }
         _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)