[SERVMAN]

[reactos.git] / reactos / base / applications / mscutils / servman / query.c

diff --git a/reactos/base/applications/mscutils/servman/query.c b/reactos/base/applications/mscutils/servman/query.c
index 69f0343..ff9f3a5 100644 (file)
--- a/reactos/base/applications/mscutils/servman/query.c
+++ b/reactos/base/applications/mscutils/servman/query.c
@@ -26,27 +26,27 @@ GetSelectedService(PMAIN_WND_INFO Info)
 }
 
 LPQUERY_SERVICE_CONFIG
-GetServiceConfig(LPTSTR lpServiceName)
+GetServiceConfig(LPWSTR lpServiceName)
 {
-    LPQUERY_SERVICE_CONFIG lpServiceConfig = NULL;
+    LPQUERY_SERVICE_CONFIGW lpServiceConfig = NULL;
     SC_HANDLE hSCManager;
     SC_HANDLE hService;
     DWORD dwBytesNeeded;
 
-    hSCManager = OpenSCManager(NULL,
-                               NULL,
-                               SC_MANAGER_ALL_ACCESS);
+    hSCManager = OpenSCManagerW(NULL,
+                                NULL,
+                                SC_MANAGER_CONNECT);
     if (hSCManager)
     {
-        hService = OpenService(hSCManager,
-                               lpServiceName,
-                               SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_QUERY_CONFIG);
+        hService = OpenServiceW(hSCManager,
+                                lpServiceName,
+                                SERVICE_QUERY_CONFIG);
         if (hService)
         {
-            if (!QueryServiceConfig(hService,
-                                    NULL,
-                                    0,
-                                    &dwBytesNeeded))
+            if (!QueryServiceConfigW(hService,
+                                     NULL,
+                                     0,
+                                     &dwBytesNeeded))
             {
                 if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
                 {
@@ -55,7 +55,7 @@ GetServiceConfig(LPTSTR lpServiceName)
                                                                         dwBytesNeeded);
                     if (lpServiceConfig)
                     {
-                        if (!QueryServiceConfig(hService,
+                        if (!QueryServiceConfigW(hService,
                                                 lpServiceConfig,
                                                 dwBytesNeeded,
                                                 &dwBytesNeeded))
@@ -80,38 +80,38 @@ GetServiceConfig(LPTSTR lpServiceName)
 
 BOOL
 SetServiceConfig(LPQUERY_SERVICE_CONFIG pServiceConfig,
-                 LPTSTR lpServiceName,
-                 LPTSTR lpPassword)
+                 LPWSTR lpServiceName,
+                 LPWSTR lpPassword)
 {
     SC_HANDLE hSCManager;
     SC_HANDLE hSc;
     SC_LOCK scLock;
     BOOL bRet = FALSE;
 
-    hSCManager = OpenSCManager(NULL,
-                               NULL,
-                               SC_MANAGER_LOCK);
+    hSCManager = OpenSCManagerW(NULL,
+                                NULL,
+                                SC_MANAGER_LOCK);
     if (hSCManager)
     {
         scLock = LockServiceDatabase(hSCManager);
         if (scLock)
         {
-            hSc = OpenService(hSCManager,
-                              lpServiceName,
-                              SERVICE_CHANGE_CONFIG);
+            hSc = OpenServiceW(hSCManager,
+                               lpServiceName,
+                               SERVICE_CHANGE_CONFIG);
             if (hSc)
             {
-                if (ChangeServiceConfig(hSc,
-                                        pServiceConfig->dwServiceType,
-                                        pServiceConfig->dwStartType,
-                                        pServiceConfig->dwErrorControl,
-                                        pServiceConfig->lpBinaryPathName,
-                                        pServiceConfig->lpLoadOrderGroup,
-                                        pServiceConfig->dwTagId ? &pServiceConfig->dwTagId : NULL,
-                                        pServiceConfig->lpDependencies,
-                                        pServiceConfig->lpServiceStartName,
-                                        lpPassword,
-                                        pServiceConfig->lpDisplayName))
+                if (ChangeServiceConfigW(hSc,
+                                         pServiceConfig->dwServiceType,
+                                         pServiceConfig->dwStartType,
+                                         pServiceConfig->dwErrorControl,
+                                         pServiceConfig->lpBinaryPathName,
+                                         pServiceConfig->lpLoadOrderGroup,
+                                         pServiceConfig->dwTagId ? &pServiceConfig->dwTagId : NULL,
+                                         pServiceConfig->lpDependencies,
+                                         pServiceConfig->lpServiceStartName,
+                                         lpPassword,
+                                         pServiceConfig->lpDisplayName))
                 {
                     bRet = TRUE;
                 }
@@ -131,35 +131,35 @@ SetServiceConfig(LPQUERY_SERVICE_CONFIG pServiceConfig,
     return bRet;
 }
 
-LPTSTR
-GetServiceDescription(LPTSTR lpServiceName)
+LPWSTR
+GetServiceDescription(LPWSTR lpServiceName)
 {
     SC_HANDLE hSCManager = NULL;
     SC_HANDLE hSc = NULL;
-    SERVICE_DESCRIPTION *pServiceDescription = NULL;
-    LPTSTR lpDescription = NULL;
+    SERVICE_DESCRIPTIONW *pServiceDescription = NULL;
+    LPWSTR lpDescription = NULL;
     DWORD BytesNeeded = 0;
     DWORD dwSize;
 
-    hSCManager = OpenSCManager(NULL,
-                               NULL,
-                               SC_MANAGER_ENUMERATE_SERVICE);
+    hSCManager = OpenSCManagerW(NULL,
+                                NULL,
+                                SC_MANAGER_ENUMERATE_SERVICE);
     if (hSCManager == NULL)
     {
         GetError();
         return NULL;
     }
 
-    hSc = OpenService(hSCManager,
-                      lpServiceName,
-                      SERVICE_QUERY_CONFIG);
+    hSc = OpenServiceW(hSCManager,
+                       lpServiceName,
+                       SERVICE_QUERY_CONFIG);
     if (hSc)
     {
-        if (!QueryServiceConfig2(hSc,
-                                 SERVICE_CONFIG_DESCRIPTION,
-                                 NULL,
-                                 0,
-                                 &BytesNeeded))
+        if (!QueryServiceConfig2W(hSc,
+                                  SERVICE_CONFIG_DESCRIPTION,
+                                  NULL,
+                                  0,
+                                  &BytesNeeded))
         {
             if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
             {
@@ -169,23 +169,23 @@ GetServiceDescription(LPTSTR lpServiceName)
                 if (pServiceDescription == NULL)
                     goto cleanup;
 
-                if (QueryServiceConfig2(hSc,
-                                        SERVICE_CONFIG_DESCRIPTION,
-                                        (LPBYTE)pServiceDescription,
-                                        BytesNeeded,
-                                        &BytesNeeded))
+                if (QueryServiceConfig2W(hSc,
+                                         SERVICE_CONFIG_DESCRIPTION,
+                                         (LPBYTE)pServiceDescription,
+                                         BytesNeeded,
+                                         &BytesNeeded))
                 {
                     if (pServiceDescription->lpDescription)
                     {
-                        dwSize = _tcslen(pServiceDescription->lpDescription) + 1;
+                        dwSize = wcslen(pServiceDescription->lpDescription) + 1;
                         lpDescription = HeapAlloc(ProcessHeap,
                                                   0,
-                                                  dwSize * sizeof(TCHAR));
+                                                  dwSize * sizeof(WCHAR));
                         if (lpDescription)
                         {
-                            _tcscpy_s(lpDescription,
-                                      dwSize,
-                                      pServiceDescription->lpDescription);
+                            StringCchCopyW(lpDescription,
+                                           dwSize,
+                                           pServiceDescription->lpDescription);
                         }
                     }
                 }
@@ -207,8 +207,8 @@ cleanup:
 }
 
 BOOL
-SetServiceDescription(LPTSTR lpServiceName,
-                      LPTSTR lpDescription)
+SetServiceDescription(LPWSTR lpServiceName,
+                      LPWSTR lpDescription)
 {
     SC_HANDLE hSCManager;
     SC_HANDLE hSc;
@@ -216,24 +216,24 @@ SetServiceDescription(LPTSTR lpServiceName,
     SERVICE_DESCRIPTION ServiceDescription;
     BOOL bRet = FALSE;
 
-    hSCManager = OpenSCManager(NULL,
-                               NULL,
-                               SC_MANAGER_LOCK);
+    hSCManager = OpenSCManagerW(NULL,
+                                NULL,
+                                SC_MANAGER_LOCK);
     if (hSCManager)
     {
         scLock = LockServiceDatabase(hSCManager);
         if (scLock)
         {
-            hSc = OpenService(hSCManager,
-                              lpServiceName,
-                              SERVICE_CHANGE_CONFIG);
+            hSc = OpenServiceW(hSCManager,
+                               lpServiceName,
+                               SERVICE_CHANGE_CONFIG);
             if (hSc)
             {
                 ServiceDescription.lpDescription = lpDescription;
 
-                if (ChangeServiceConfig2(hSc,
-                                         SERVICE_CONFIG_DESCRIPTION,
-                                         &ServiceDescription))
+                if (ChangeServiceConfig2W(hSc,
+                                          SERVICE_CONFIG_DESCRIPTION,
+                                          &ServiceDescription))
                 {
                     bRet = TRUE;
                 }
@@ -270,12 +270,13 @@ GetServiceList(PMAIN_WND_INFO Info,
         HeapFree(ProcessHeap,
                      0,
                      Info->pAllServices);
+        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,
@@ -319,7 +320,7 @@ GetServiceList(PMAIN_WND_INFO Info,
     if (ScHandle)
         CloseServiceHandle(ScHandle);
 
-    if (!bRet)
+    if (!bRet && Info->pAllServices)
     {
         HeapFree(ProcessHeap,
                  0,
@@ -335,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;