Zebediah Figura : services: Do not overwrite the service type in SetServiceStatus().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4f8dfdba3df0401bdca7ceab1c0fd031446b53c6
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4f8dfdba3df0401bdca7ceab1c0fd031446b53c6

Author: Zebediah Figura <zfigura at codeweavers.com>
Date:   Wed Jul  3 17:29:35 2019 -0500

services: Do not overwrite the service type in SetServiceStatus().

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ntoskrnl.exe/tests/ntoskrnl.c |  2 ++
 programs/services/rpc.c            | 17 ++++++++++-------
 programs/services/tests/service.c  |  8 ++++----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
index 267fddb..48ddb29 100644
--- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
@@ -135,6 +135,8 @@ static BOOL start_driver(HANDLE service)
     }
     ok(status.dwCurrentState == SERVICE_RUNNING,
        "expected SERVICE_RUNNING, got %d\n", status.dwCurrentState);
+    ok(status.dwServiceType == SERVICE_KERNEL_DRIVER,
+       "expected SERVICE_KERNEL_DRIVER, got %#x\n", status.dwServiceType);
 
     return TRUE;
 }
diff --git a/programs/services/rpc.c b/programs/services/rpc.c
index 8a77d97..a657492 100644
--- a/programs/services/rpc.c
+++ b/programs/services/rpc.c
@@ -865,28 +865,31 @@ static void fill_notify(struct sc_notify_handle *notify, struct service_entry *s
     SetEvent(notify->event);
 }
 
-DWORD __cdecl svcctl_SetServiceStatus(
-    SC_RPC_HANDLE hServiceStatus,
-    LPSERVICE_STATUS lpServiceStatus)
+DWORD __cdecl svcctl_SetServiceStatus(SC_RPC_HANDLE handle, SERVICE_STATUS *status)
 {
     struct sc_service_handle *service, *service_handle;
     struct process_entry *process;
     DWORD err, mask;
 
-    WINE_TRACE("(%p, %p)\n", hServiceStatus, lpServiceStatus);
+    WINE_TRACE("(%p, %p)\n", handle, status);
 
-    if ((err = validate_service_handle(hServiceStatus, SERVICE_SET_STATUS, &service)) != 0)
+    if ((err = validate_service_handle(handle, SERVICE_SET_STATUS, &service)) != 0)
         return err;
 
     service_lock(service->service_entry);
 
     /* FIXME: be a bit more discriminant about what parts of the status we set
      * and check that fields are valid */
-    service->service_entry->status = *lpServiceStatus;
+    service->service_entry->status.dwCurrentState = status->dwCurrentState;
+    service->service_entry->status.dwControlsAccepted = status->dwControlsAccepted;
+    service->service_entry->status.dwWin32ExitCode = status->dwWin32ExitCode;
+    service->service_entry->status.dwServiceSpecificExitCode = status->dwServiceSpecificExitCode;
+    service->service_entry->status.dwCheckPoint = status->dwCheckPoint;
+    service->service_entry->status.dwWaitHint = status->dwWaitHint;
     SetEvent(service->service_entry->status_changed_event);
 
     if ((process = service->service_entry->process) &&
-        lpServiceStatus->dwCurrentState == SERVICE_STOPPED)
+        status->dwCurrentState == SERVICE_STOPPED)
     {
         service->service_entry->process = NULL;
         if (!--process->use_count)
diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c
index f6e36fb..dcaf5f0 100644
--- a/programs/services/tests/service.c
+++ b/programs/services/tests/service.c
@@ -462,7 +462,7 @@ static void test_service(void)
 
     res = QueryServiceStatus(service_handle, &status);
     ok(res, "QueryServiceStatus failed: %d\n", GetLastError());
-    todo_wine ok(status.dwServiceType == SERVICE_WIN32_OWN_PROCESS, "status.dwServiceType = %x\n", status.dwServiceType);
+    ok(status.dwServiceType == SERVICE_WIN32_OWN_PROCESS, "status.dwServiceType = %x\n", status.dwServiceType);
     ok(status.dwCurrentState == SERVICE_RUNNING, "status.dwCurrentState = %x\n", status.dwCurrentState);
     ok(status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN),
             "status.dwControlsAccepted = %x\n", status.dwControlsAccepted);
@@ -517,7 +517,7 @@ static inline void test_no_stop(void)
 
     res = QueryServiceStatus(service_handle, &status);
     ok(res, "QueryServiceStatus failed: %d\n", GetLastError());
-    todo_wine ok(status.dwServiceType == SERVICE_WIN32_OWN_PROCESS, "status.dwServiceType = %x\n", status.dwServiceType);
+    ok(status.dwServiceType == SERVICE_WIN32_OWN_PROCESS, "status.dwServiceType = %x\n", status.dwServiceType);
     ok(status.dwCurrentState == SERVICE_RUNNING, "status.dwCurrentState = %x\n", status.dwCurrentState);
     ok(status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN),
             "status.dwControlsAccepted = %x\n", status.dwControlsAccepted);
@@ -538,7 +538,7 @@ static inline void test_no_stop(void)
 
     res = QueryServiceStatus(service_handle, &status);
     ok(res, "QueryServiceStatus failed: %d\n", GetLastError());
-    todo_wine ok(status.dwServiceType == SERVICE_WIN32_OWN_PROCESS, "status.dwServiceType = %x\n", status.dwServiceType);
+    ok(status.dwServiceType == SERVICE_WIN32_OWN_PROCESS, "status.dwServiceType = %x\n", status.dwServiceType);
     ok(status.dwCurrentState==SERVICE_STOPPED || status.dwCurrentState==SERVICE_STOP_PENDING,
             "status.dwCurrentState = %x\n", status.dwCurrentState);
     ok(status.dwControlsAccepted == 0, "status.dwControlsAccepted = %x\n", status.dwControlsAccepted);
@@ -558,7 +558,7 @@ static inline void test_no_stop(void)
 
     res = QueryServiceStatus(service_handle, &status);
     ok(res, "QueryServiceStatus failed: %d\n", GetLastError());
-    todo_wine ok(status.dwServiceType == SERVICE_WIN32_OWN_PROCESS, "status.dwServiceType = %x\n", status.dwServiceType);
+    ok(status.dwServiceType == SERVICE_WIN32_OWN_PROCESS, "status.dwServiceType = %x\n", status.dwServiceType);
     ok(status.dwCurrentState==SERVICE_STOPPED || status.dwCurrentState==SERVICE_STOP_PENDING,
             "status.dwCurrentState = %x\n", status.dwCurrentState);
     ok(status.dwControlsAccepted == 0, "status.dwControlsAccepted = %x\n", status.dwControlsAccepted);