[Jean-Baptiste Marchand <Jean-Baptiste.Marchand@xxxxxx>]

Hello,

attached patches add operations names for all operations in the svcctl
MSRPC interface.

Jean-Baptiste Marchand
-- 
Jean-Baptiste.Marchand@xxxxxx
HSC - http://www.hsc.fr/

Index: packet-dcerpc-svcctl.c
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-svcctl.c,v
retrieving revision 1.11
diff -u -r1.11 packet-dcerpc-svcctl.c
--- packet-dcerpc-svcctl.c	4 Aug 2003 02:48:59 -0000	1.11
+++ packet-dcerpc-svcctl.c	2 Oct 2003 11:35:04 -0000
@@ -447,32 +447,82 @@
 	{ SVC_CLOSE_SERVICE_HANDLE, "CloseServiceHandle", 
 		svcctl_dissect_CloseServiceHandle_rqst, 
 		svcctl_dissect_CloseServiceHandle_reply  },
-	{ SVC_STOP_SERVICE, "Stop", NULL, NULL },
-	{ SVC_DELETE, "Delete", NULL, NULL },
+	{ SVC_CONTROL_SERVICE, "ControlService", NULL, NULL },
+	{ SVC_DELETE_SERVICE, "DeleteService", NULL, NULL },
 	{ SVC_LOCK_SERVICE_DATABASE, "LockServiceDatabase",
 		svcctl_dissect_LockServiceDatabase_rqst, 
 		svcctl_dissect_LockServiceDatabase_reply  },
-	{ SVC_GET_SVC_SEC, "Get security", NULL, NULL },
+	{ SVC_QUERY_SERVICE_OBJECT_SECURITY, "QueryServiceObjectSecurity", 
+	  NULL, NULL },
+	{ SVC_SET_SERVICE_OBJECT_SECURITY, "SetServiceObjectSecurity", 
+	  NULL, NULL },
+ 	{ SVC_QUERY_SERVICE_STATUS, "QueryServiceStatus", 
+	  NULL, NULL },
+	{ SVC_SET_SERVICE_STATUS, "SetServiceStatus", 
+	  NULL, NULL },
 	{ SVC_UNLOCK_SERVICE_DATABASE, "UnlockServiceDatabase",
 		svcctl_dissect_UnlockServiceDatabase_rqst, 
 		svcctl_dissect_UnlockServiceDatabase_reply  },
-	{ SVC_CHANGE_SVC_CONFIG, "Change config", NULL, NULL },
-	{ SVC_ENUM_SVCS_STATUS, "Enum status", NULL, NULL },
-	{ SVC_OPEN_SC_MAN, "Open SC Manager", NULL, NULL },
-	{ SVC_OPEN_SERVICE, "Open service", NULL, NULL },
-	{ SVC_QUERY_SVC_CONFIG, "Query config", NULL, NULL },
-	{ SVC_START_SERVICE, "Start", NULL, NULL },
-	{ SVC_QUERY_DISP_NAME, "Query display name", NULL, NULL },
-	{ SVC_ENUM_SERVICES_STATUS, "EnumServicesStatus",
+	{ SVC_NOTIFY_BOOT_CONFIG_STATUS, "NotifyBootConfigStatus", 
+	  NULL, NULL },
+	{ SVC_SC_SET_SERVICE_BITS_W, "ScSetServiceBitsW",
+	  NULL, NULL },
+	{ SVC_CHANGE_SERVICE_CONFIG_W, "ChangeServiceConfigW", 
+	  NULL, NULL },
+	{ SVC_CREATE_SERVICE_W, "CreateServiceW", NULL, NULL },
+	{ SVC_ENUM_DEPENDENT_SERVICES_W, "EnumDependentServicesW", 
+	  NULL, NULL },
+	{ SVC_ENUM_SERVICES_STATUS_W, "EnumServicesStatusW", 
+	  NULL, NULL },
+	{ SVC_OPEN_SC_MANAGER_W, "OpenSCManagerW", NULL, NULL },
+	{ SVC_OPEN_SERVICE_W, "OpenServiceW", NULL, NULL },
+	{ SVC_QUERY_SERVICE_CONFIG_W, "QueryServiceConfigW", NULL, NULL },
+	{ SVC_QUERY_SERVICE_LOCK_STATUS_W, "QueryServiceLockStatusW", 
+	  NULL, NULL },
+	{ SVC_START_SERVICE_W, "StartServiceW", NULL, NULL },
+	{ SVC_GET_SERVICE_DISPLAY_NAME_W, "GetServiceDisplayNameW", 
+	  NULL, NULL },
+	{ SVC_GET_SERVICE_KEY_NAME_W, "GetServiceKeyNameW", NULL, NULL },
+	{ SVC_SC_SET_SERVICE_BITS_A, "ScSetServiceBitsA", NULL, NULL },
+	{ SVC_CHANGE_SERVICE_CONFIG_A, "ChangeServiceConfigA", NULL, NULL },
+	{ SVC_CREATE_SERVICE_A, "CreateServiceA", NULL, NULL },
+	{ SVC_ENUM_DEPENDENT_SERVICES_A, "EnumDependentServicesA", 
+	  NULL, NULL },
+	{ SVC_ENUM_SERVICES_STATUS_A, "EnumServicesStatusA",
 		svcctl_dissect_EnumServicesStatus_rqst, 
 		NULL },
-	{ SVC_OPEN_SC_MANAGER, "OpenSCManager",
+	{ SVC_OPEN_SC_MANAGER_A, "OpenSCManagerA",
 		svcctl_dissect_OpenSCManager_rqst,
 		svcctl_dissect_OpenSCManager_reply },
-	{ SVC_OPEN_SERVICE_A, "Open Service A", NULL, NULL },
-	{ SVC_QUERY_SERVICE_LOCK_STATUS, "QueryServiceLockStatus",
+	{ SVC_OPEN_SERVICE_A, "OpenServiceA", NULL, NULL },
+	{ SVC_QUERY_SERVICE_CONFIG_A, "QueryServiceConfigA", NULL, NULL },
+	{ SVC_QUERY_SERVICE_LOCK_STATUS_A, "QueryServiceLockStatusA",
 		svcctl_dissect_QueryServiceLockStatus_rqst,
 		svcctl_dissect_QueryServiceLockStatus_reply },
+	{ SVC_START_SERVICE_A, "StartServiceA", NULL, NULL },
+	{ SVC_GET_SERVICE_DISPLAY_NAME_A, "GetServiceDisplayNameA",
+	  NULL, NULL },
+	{ SVC_GET_SERVICE_KEY_NAME_A, "GetServiceKeyNameA", NULL, NULL },	
+	{ SVC_SC_GET_CURRENT_GROUPE_STATE_W, "ScGetCurrentGroupStateW",
+	  NULL, NULL },
+	{ SVC_ENUM_SERVICE_GROUP_W, "EnumServiceGroupW", 
+	  NULL, NULL },
+	{ SVC_CHANGE_SERVICE_CONFIG2_A, "ChangeServiceConfig2A", 
+	  NULL, NULL },
+	{ SVC_CHANGE_SERVICE_CONFIG2_W, "ChangeServiceConfig2W",
+	  NULL, NULL },
+	{ SVC_QUERY_SERVICE_CONFIG2_A, "QueryServiceConfig2A", 
+	  NULL, NULL },
+	{ SVC_QUERY_SERVICE_CONFIG2_W, "QueryServiceConfig2W", 
+	  NULL, NULL },
+	{ SVC_QUERY_SERVICE_STATUS_EX, "QueryServiceStatusEx", 
+	  NULL, NULL },
+	{ SVC_ENUM_SERVICES_STATUS_EX_A, "EnumServicesStatusExA", 
+	  NULL, NULL },
+	{ SVC_ENUM_SERVICES_STATUS_EX_W, "EnumServicesStatusExW", 
+	  NULL, NULL },
+	{ SVC_SC_SEND_TS_MESSAGE, "ScSendTSMessage", 
+	  NULL, NULL },
 	{0, NULL, NULL, NULL}
 };
 

Index: packet-dcerpc-svcctl.h
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-svcctl.h,v
retrieving revision 1.5
diff -u -r1.5 packet-dcerpc-svcctl.h
--- packet-dcerpc-svcctl.h	27 Apr 2003 06:05:43 -0000	1.5
+++ packet-dcerpc-svcctl.h	2 Oct 2003 11:35:12 -0000
@@ -26,22 +26,49 @@
 #ifndef __PACKET_DCERPC_SVCCTL_H
 #define __PACKET_DCERPC_SVCCTL_H
 
-#define SVC_CLOSE_SERVICE_HANDLE 0x00
-#define SVC_STOP_SERVICE      0x01
-#define SVC_DELETE            0x02
-#define SVC_LOCK_SERVICE_DATABASE 0x03
-#define SVC_GET_SVC_SEC       0x04
-#define SVC_UNLOCK_SERVICE_DATABASE 0x08
-#define SVC_CHANGE_SVC_CONFIG 0x0b
-#define SVC_ENUM_SVCS_STATUS  0x0e
-#define SVC_OPEN_SC_MAN       0x0f
-#define SVC_OPEN_SERVICE      0x10
-#define SVC_QUERY_SVC_CONFIG  0x11
-#define SVC_START_SERVICE     0x13
-#define SVC_QUERY_DISP_NAME   0x14
-#define SVC_ENUM_SERVICES_STATUS	0x1a
-#define SVC_OPEN_SC_MANAGER     0x1b
-#define SVC_OPEN_SERVICE_A    0x1c
-#define SVC_QUERY_SERVICE_LOCK_STATUS	0x1e
+#define SVC_CLOSE_SERVICE_HANDLE 		0x00
+#define SVC_CONTROL_SERVICE      		0x01
+#define SVC_DELETE_SERVICE 			0x02
+#define SVC_LOCK_SERVICE_DATABASE 		0x03
+#define SVC_QUERY_SERVICE_OBJECT_SECURITY  	0x04
+#define SVC_SET_SERVICE_OBJECT_SECURITY		0x05
+#define SVC_QUERY_SERVICE_STATUS		0x06 
+#define SVC_SET_SERVICE_STATUS			0x07
+#define SVC_UNLOCK_SERVICE_DATABASE 		0x08
+#define SVC_NOTIFY_BOOT_CONFIG_STATUS		0x09
+#define SVC_SC_SET_SERVICE_BITS_W		0x0a
+#define SVC_CHANGE_SERVICE_CONFIG_W 		0x0b
+#define SVC_CREATE_SERVICE_W			0x0c
+#define SVC_ENUM_DEPENDENT_SERVICES_W		0x0d
+#define SVC_ENUM_SERVICES_STATUS_W 		0x0e
+#define SVC_OPEN_SC_MANAGER_W      		0x0f
+#define SVC_OPEN_SERVICE_W 			0x10
+#define SVC_QUERY_SERVICE_CONFIG_W 		0x11
+#define SVC_QUERY_SERVICE_LOCK_STATUS_W		0x12
+#define SVC_START_SERVICE_W    			0x13
+#define SVC_GET_SERVICE_DISPLAY_NAME_W 		0x14
+#define SVC_GET_SERVICE_KEY_NAME_W 		0x15
+#define SVC_SC_SET_SERVICE_BITS_A		0x16
+#define SVC_CHANGE_SERVICE_CONFIG_A		0x17
+#define SVC_CREATE_SERVICE_A			0x18
+#define SVC_ENUM_DEPENDENT_SERVICES_A		0x19
+#define SVC_ENUM_SERVICES_STATUS_A		0x1a
+#define SVC_OPEN_SC_MANAGER_A 			0x1b
+#define SVC_OPEN_SERVICE_A    			0x1c
+#define SVC_QUERY_SERVICE_CONFIG_A 		0x1d
+#define SVC_QUERY_SERVICE_LOCK_STATUS_A		0x1e
+#define SVC_START_SERVICE_A			0x1f
+#define SVC_GET_SERVICE_DISPLAY_NAME_A 		0x20
+#define SVC_GET_SERVICE_KEY_NAME_A 		0x21
+#define SVC_SC_GET_CURRENT_GROUPE_STATE_W	0x22
+#define SVC_ENUM_SERVICE_GROUP_W		0x23
+#define SVC_CHANGE_SERVICE_CONFIG2_A		0x24
+#define SVC_CHANGE_SERVICE_CONFIG2_W		0x25
+#define SVC_QUERY_SERVICE_CONFIG2_A 		0x26
+#define SVC_QUERY_SERVICE_CONFIG2_W 		0x27
+#define SVC_QUERY_SERVICE_STATUS_EX		0x28
+#define SVC_ENUM_SERVICES_STATUS_EX_A 		0x29
+#define SVC_ENUM_SERVICES_STATUS_EX_W 		0x2a
+#define SVC_SC_SEND_TS_MESSAGE			0x2b
 
 #endif