Commit 240d1e4f authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

wmi: Implement SystemName property for service class.

parent 773cf1e5
...@@ -153,6 +153,8 @@ static const WCHAR prop_stateW[] = ...@@ -153,6 +153,8 @@ static const WCHAR prop_stateW[] =
{'S','t','a','t','e',0}; {'S','t','a','t','e',0};
static const WCHAR prop_systemdirectoryW[] = static const WCHAR prop_systemdirectoryW[] =
{'S','y','s','t','e','m','D','i','r','e','c','t','o','r','y',0}; {'S','y','s','t','e','m','D','i','r','e','c','t','o','r','y',0};
static const WCHAR prop_systemnameW[] =
{'S','y','s','t','e','m','N','a','m','e',0};
static const WCHAR prop_tagW[] = static const WCHAR prop_tagW[] =
{'T','a','g',0}; {'T','a','g',0};
static const WCHAR prop_threadcountW[] = static const WCHAR prop_threadcountW[] =
...@@ -262,7 +264,8 @@ static const struct column col_service[] = ...@@ -262,7 +264,8 @@ static const struct column col_service[] =
{ prop_processidW, CIM_UINT32 }, { prop_processidW, CIM_UINT32 },
{ prop_servicetypeW, CIM_STRING }, { prop_servicetypeW, CIM_STRING },
{ prop_startmodeW, CIM_STRING }, { prop_startmodeW, CIM_STRING },
{ prop_stateW, CIM_STRING } { prop_stateW, CIM_STRING },
{ prop_systemnameW, CIM_STRING|COL_FLAG_DYNAMIC }
}; };
static const struct column col_stdregprov[] = static const struct column col_stdregprov[] =
{ {
...@@ -400,6 +403,7 @@ struct record_service ...@@ -400,6 +403,7 @@ struct record_service
const WCHAR *servicetype; const WCHAR *servicetype;
const WCHAR *startmode; const WCHAR *startmode;
const WCHAR *state; const WCHAR *state;
const WCHAR *systemname;
}; };
struct record_stdregprov struct record_stdregprov
{ {
...@@ -868,6 +872,8 @@ static void fill_service( struct table *table ) ...@@ -868,6 +872,8 @@ static void fill_service( struct table *table )
SC_HANDLE manager; SC_HANDLE manager;
ENUM_SERVICE_STATUS_PROCESSW *tmp, *services = NULL; ENUM_SERVICE_STATUS_PROCESSW *tmp, *services = NULL;
SERVICE_STATUS_PROCESS *status; SERVICE_STATUS_PROCESS *status;
WCHAR sysnameW[MAX_COMPUTERNAME_LENGTH + 1];
DWORD len = sizeof(sysnameW) / sizeof(sysnameW[0]);
UINT i, num_rows = 0, offset = 0, size = 256, needed, count; UINT i, num_rows = 0, offset = 0, size = 256, needed, count;
BOOL ret; BOOL ret;
...@@ -890,6 +896,8 @@ static void fill_service( struct table *table ) ...@@ -890,6 +896,8 @@ static void fill_service( struct table *table )
} }
if (!(table->data = heap_alloc( sizeof(*rec) * count ))) goto done; if (!(table->data = heap_alloc( sizeof(*rec) * count ))) goto done;
GetComputerNameW( sysnameW, &len );
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
QUERY_SERVICE_CONFIGW *config; QUERY_SERVICE_CONFIGW *config;
...@@ -920,6 +928,7 @@ static void fill_service( struct table *table ) ...@@ -920,6 +928,7 @@ static void fill_service( struct table *table )
rec->servicetype = get_service_type( status->dwServiceType ); rec->servicetype = get_service_type( status->dwServiceType );
rec->startmode = get_service_startmode( startmode ); rec->startmode = get_service_startmode( startmode );
rec->state = get_service_state( status->dwCurrentState ); rec->state = get_service_state( status->dwCurrentState );
rec->systemname = heap_strdupW( sysnameW );
offset += sizeof(*rec); offset += sizeof(*rec);
num_rows++; num_rows++;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment