Changeset 8f167e8 in nscp

Timestamp:

06/14/08 18:06:38 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

dff5db9

Parents:

eb30340

Message:

proper versions (memleak fix)

Location:

include

Files:

• EnumNtSrv.cpp (modified) (7 diffs)
• EnumNtSrv.h (modified) (1 diff)

include/EnumNtSrv.cpp

@@ -136 +136 @@
 // dwType = bit OR of SERVICE_WIN32, SERVICE_DRIVER
 // dwState = bit OR of SERVICE_ACTIVE, SERVICE_INACTIVE
-TNtServiceInfo *TNtServiceInfo::EnumServices(DWORD dwType, DWORD dwState, DWORD *pdwCount)
-{
-  ASSERT(pdwCount != NULL);
+TNtServiceInfoList TNtServiceInfo::EnumServices(DWORD dwType, DWORD dwState)
+{
+  TNtServiceInfoList ret;
   // Maybe check if dwType and dwState have at least one constant specified
-  *pdwCount = 0;
-  TNtServiceInfo *info = NULL;
   SC_HANDLE scman = ::OpenSCManager(NULL,NULL,SC_MANAGER_ENUMERATE_SERVICE);
   if (scman) {
@@ -154 +152 @@
       ::EnumServicesStatus(scman,dwType,dwState,lpservice,bytes,
         &bytesNeeded,&servicesReturned,&resumeHandle);
-      *pdwCount = servicesReturned;    // Not a chance that 0 services is returned
-      info = new TNtServiceInfo [servicesReturned];
       TCHAR Buffer[1024];       // Should be enough for service info
       QUERY_SERVICE_CONFIG *lpqch = (QUERY_SERVICE_CONFIG*)Buffer;
       for (DWORD ndx = 0; ndx < servicesReturned; ndx++) {
-        info[ndx].m_strServiceName = lpservice[ndx].lpServiceName;
-        info[ndx].m_strDisplayName = lpservice[ndx].lpDisplayName;
-        info[ndx].m_dwServiceType = lpservice[ndx].ServiceStatus.dwServiceType;
-        info[ndx].m_dwCurrentState = lpservice[ndx].ServiceStatus.dwCurrentState;
+        TNtServiceInfo info;
+        info.m_strServiceName = lpservice[ndx].lpServiceName;
+        info.m_strDisplayName = lpservice[ndx].lpDisplayName;
+        info.m_dwServiceType = lpservice[ndx].ServiceStatus.dwServiceType;
+        info.m_dwCurrentState = lpservice[ndx].ServiceStatus.dwCurrentState;
         SC_HANDLE sh = ::OpenService(scman,lpservice[ndx].lpServiceName,SERVICE_QUERY_CONFIG);
         if (::QueryServiceConfig(sh,lpqch,sizeof(Buffer),&bytesNeeded)) {
-          info[ndx].m_strBinaryPath = lpqch->lpBinaryPathName;
-          info[ndx].m_dwStartType = lpqch->dwStartType;
-          info[ndx].m_dwErrorControl = lpqch->dwErrorControl;
+          info.m_strBinaryPath = lpqch->lpBinaryPathName;
+          info.m_dwStartType = lpqch->dwStartType;
+          info.m_dwErrorControl = lpqch->dwErrorControl;
         }
         ::CloseServiceHandle(sh);
+        ret.push_back(info);
       }
       delete [] lpservice;
@@ -175 +173 @@
     ::CloseServiceHandle(scman);
   }
-  return info;
-}
+  return ret;
+}
+
 
 #define SC_BUF_LEN 4096
@@ -193 +192 @@
     if (GetServiceKeyName(scman, name.c_str(), buf, &bufLen) == 0) {
       ::CloseServiceHandle(scman);
+      delete [] buf;
       throw NTServiceException(name, _T("GetServiceKeyName: Could not translate service name"), GetLastError());
     }
@@ -204 +204 @@
     */
     sh = ::OpenService(scman,buf,SERVICE_QUERY_STATUS);
+    delete [] buf;
     if (sh == NULL) {
       ::CloseServiceHandle(scman);
@@ -224 +225 @@
 }
 
-
+/*
 // Enumerate services on this machine and return an STL list of service objects 
 // dwType = bit OR of SERVICE_WIN32, SERVICE_DRIVER
@@ -239 +240 @@
   delete [] pSrvList;
 }
-
+*/
 /*#############################################################################
 # End of file ENUMNTSRV.CPP

include/EnumNtSrv.h

@@ -70 +70 @@
   std::wstring GetCurrentState(void);
 
-  static TNtServiceInfo *EnumServices(DWORD dwType, DWORD dwState, DWORD *pdwCount);
-  static void EnumServices(DWORD dwType, DWORD dwState, TNtServiceInfoList *pList);
+  static TNtServiceInfoList EnumServices(DWORD dwType, DWORD dwState);
+  //static void EnumServices(DWORD dwType, DWORD dwState, TNtServiceInfoList *pList);
   static TNtServiceInfo GetService(std::wstring);
 };