Hans Leidekker : wbemprox: Add a function to query the service configuration.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bbb823f8c2aa16c56f82ebcdb6813cbf1e91109a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bbb823f8c2aa16c56f82ebcdb6...

Author: Hans Leidekker 
Date:   Tue Sep  4 13:49:11 2012 +0200

wbemprox: Add a function to query the service configuration.

---

dlls/wbemprox/builtin.c |   45 +++++++++++++++++++++++----------------------
 1 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c
index 1016ca5..29d7392 100644
--- a/dlls/wbemprox/builtin.c
+++ b/dlls/wbemprox/builtin.c
@@ -880,6 +880,25 @@ static const WCHAR *get_service_startmode( DWORD mode )
     }
 }

+static QUERY_SERVICE_CONFIGW *query_service_config( SC_HANDLE manager, const WCHAR *name )
+{
+    QUERY_SERVICE_CONFIGW *config = NULL;
+    SC_HANDLE service;
+    DWORD size;
+
+    if (!(service = OpenServiceW( manager, name, SERVICE_QUERY_CONFIG ))) return NULL;
+    QueryServiceConfigW( service, NULL, 0, &size );
+    if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) goto done;
+    if (!(config = heap_alloc( size ))) goto done;
+    if (QueryServiceConfigW( service, config, size, &size )) goto done;
+    heap_free( config );
+    config = NULL;
+
+done:
+    CloseServiceHandle( service );
+    return config;
+}
+
 static void fill_service( struct table *table )
 {
     struct record_service *rec;
@@ -915,27 +934,8 @@ static void fill_service( struct table *table )
     for (i = 0; i < count; i++)
     {
         QUERY_SERVICE_CONFIGW *config;
-        SC_HANDLE service;
-        DWORD startmode;
-        DWORD size;
-
-        service = OpenServiceW(manager, services[i].lpServiceName, GENERIC_READ);
-        QueryServiceConfigW(service, NULL, 0, &size);
-        config = heap_alloc(size);
-        if (!config)
-        {
-            CloseServiceHandle(service);
-            break;
-        }
-        if (QueryServiceConfigW(service, config, size, &size))
-            startmode = config->dwStartType;
-        else
-        {
-            ERR("failed to get %s service config data\n", debugstr_w(services[i].lpServiceName));
-            startmode = SERVICE_DISABLED;
-        }
-        CloseServiceHandle(service);
-        heap_free(config);
+
+        if (!(config = query_service_config( manager, services[i].lpServiceName ))) continue;

status = &services[i].ServiceStatusProcess;
         rec = (struct record_service *)(table->data + offset);
@@ -945,9 +945,10 @@ static void fill_service( struct table *table )
         rec->name         = heap_strdupW( services[i].lpServiceName );
         rec->process_id   = status->dwProcessId;
         rec->servicetype  = get_service_type( status->dwServiceType );
-        rec->startmode    = get_service_startmode( startmode );
+        rec->startmode    = get_service_startmode( config->dwStartType );
         rec->state        = get_service_state( status->dwCurrentState );
         rec->systemname   = heap_strdupW( sysnameW );
+        heap_free( config );
         offset += sizeof(*rec);
         num_rows++;
     }