From 6a9bc47c37ab2ea5c510f10ebe33ac0c343ff296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Mon, 26 Oct 2015 23:15:40 +0000
Subject: [PATCH] [SERVMAN] - Explicitely use UNICODE versions of OpenSCManager
 and OpenService. - When OpenSCManager or OpenService fail, they return a NULL
 handle (not INVALID_HANDLE_VALUE).

svn path=/trunk/; revision=69719
---
 .../applications/mscutils/servman/delete.c    | 12 +++++-----
 .../mscutils/servman/dependencies_tv2.c       | 12 +++++-----
 .../applications/mscutils/servman/query.c     | 22 +++++++++----------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/reactos/base/applications/mscutils/servman/delete.c b/reactos/base/applications/mscutils/servman/delete.c
index 6c60c01067d..b3c0a5de5e7 100644
--- a/reactos/base/applications/mscutils/servman/delete.c
+++ b/reactos/base/applications/mscutils/servman/delete.c
@@ -17,14 +17,14 @@ DoDeleteService(PMAIN_WND_INFO Info,
     SC_HANDLE hSc;
     BOOL bRet = FALSE;
 
-    hSCManager = OpenSCManager(NULL,
-                               NULL,
-                               SC_MANAGER_ALL_ACCESS);
+    hSCManager = OpenSCManagerW(NULL,
+                                NULL,
+                                SC_MANAGER_ALL_ACCESS);
     if (hSCManager)
     {
-        hSc = OpenService(hSCManager,
-                          Info->pCurrentService->lpServiceName,
-                          DELETE);
+        hSc = OpenServiceW(hSCManager,
+                           Info->pCurrentService->lpServiceName,
+                           DELETE);
         if (hSc)
         {
             if (DeleteService(hSc))
diff --git a/reactos/base/applications/mscutils/servman/dependencies_tv2.c b/reactos/base/applications/mscutils/servman/dependencies_tv2.c
index 47c2feca4f0..dfd94a1daff 100644
--- a/reactos/base/applications/mscutils/servman/dependencies_tv2.c
+++ b/reactos/base/applications/mscutils/servman/dependencies_tv2.c
@@ -17,14 +17,14 @@ TV2_HasDependantServices(LPWSTR lpServiceName)
     DWORD dwBytesNeeded, dwCount;
     BOOL bRet = FALSE;
 
-    hSCManager = OpenSCManager(NULL,
-                               NULL,
-                               SC_MANAGER_ALL_ACCESS);
+    hSCManager = OpenSCManagerW(NULL,
+                                NULL,
+                                SC_MANAGER_ALL_ACCESS);
     if (hSCManager)
     {
-        hService = OpenService(hSCManager,
-                               lpServiceName,
-                               SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS);
+        hService = OpenServiceW(hSCManager,
+                                lpServiceName,
+                                SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS);
         if (hService)
         {
             /* Does this have any dependencies? */
diff --git a/reactos/base/applications/mscutils/servman/query.c b/reactos/base/applications/mscutils/servman/query.c
index 149150f52aa..f25987e0b76 100644
--- a/reactos/base/applications/mscutils/servman/query.c
+++ b/reactos/base/applications/mscutils/servman/query.c
@@ -273,10 +273,10 @@ GetServiceList(PMAIN_WND_INFO Info,
         Info->pAllServices = NULL;
     }
 
-    ScHandle = OpenSCManager(NULL,
-                             NULL,
-                             SC_MANAGER_ENUMERATE_SERVICE);
-    if (ScHandle != INVALID_HANDLE_VALUE)
+    ScHandle = OpenSCManagerW(NULL,
+                              NULL,
+                              SC_MANAGER_ENUMERATE_SERVICE);
+    if (ScHandle != NULL)
     {
         if (!EnumServicesStatusEx(ScHandle,
                                   SC_ENUM_PROCESS_INFO,
@@ -336,16 +336,16 @@ UpdateServiceStatus(ENUM_SERVICE_STATUS_PROCESS* pService)
     SC_HANDLE hScm;
     BOOL bRet = FALSE;
 
-    hScm = OpenSCManager(NULL,
-                             NULL,
-                             SC_MANAGER_ENUMERATE_SERVICE);
-    if (hScm != INVALID_HANDLE_VALUE)
+    hScm = OpenSCManagerW(NULL,
+                          NULL,
+                          SC_MANAGER_ENUMERATE_SERVICE);
+    if (hScm != NULL)
     {
         SC_HANDLE hService;
 
-        hService = OpenService(hScm,
-                               pService->lpServiceName,
-                               SERVICE_QUERY_STATUS);
+        hService = OpenServiceW(hScm,
+                                pService->lpServiceName,
+                                SERVICE_QUERY_STATUS);
         if (hService)
         {
             DWORD size;