Reenable ControlService and fix syntax errors in svcctl.idl. Modified: trunk/reactos/include/idl/svcctl.idl Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/subsys/system/services/rpcserver.c _____
Modified: trunk/reactos/include/idl/svcctl.idl --- trunk/reactos/include/idl/svcctl.idl 2005-04-18 22:00:52 UTC (rev 14685) +++ trunk/reactos/include/idl/svcctl.idl 2005-04-18 22:11:46 UTC (rev 14686) @@ -21,7 +21,7 @@
] interface svcctl { -cpp_quote("#if 0"); +cpp_quote("#if 0") typedef struct _SERVICE_STATUS { DWORD dwServiceType; @@ -32,17 +32,17 @@ DWORD dwCheckPoint; DWORD dwWaitHint; } SERVICE_STATUS, *LPSERVICE_STATUS; -cpp_quote("#endif"); +cpp_quote("#endif")
/* Function 0 */ DWORD ScmrCloseServiceHandle([in] handle_t BindingHandle, [in] SC_HANDLE hSCObject);
/* Function 1 */ -// BOOL ScmrControlService([in] handle_t BindingHandle, -// [in] SC_HANDLE hService, -// [in] DWORD dwControl, -// [out] LPSERVICE_STATUS lpServiceStatus); + BOOL ScmrControlService([in] handle_t BindingHandle, + [in] SC_HANDLE hService, + [in] DWORD dwControl, + [out] LPSERVICE_STATUS lpServiceStatus);
/* Function 2 */ DWORD ScmrDeleteService([in] handle_t BindingHandle, @@ -85,7 +85,7 @@ [in] DWORD dwErrorControl, [in, string, ref] LPCWSTR lpBinaryPathName, [in, string, unique] LPCWSTR lpLoadOrderGroup, - [out, unique] LPDWORD lpdwTagId, + [out] LPDWORD lpdwTagId, [in, string, unique] LPCWSTR lpDependencies, [in, string, unique] LPCWSTR lpServiceStartName, [in, string, unique] LPCWSTR lpPassword); @@ -119,5 +119,4 @@ [in, string] LPCSTR lpServiceName, [in] DWORD dwDesiredAccess, [out] SC_HANDLE *hScm); - } _____
Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-04-18 22:00:52 UTC (rev 14685) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-04-18 22:11:46 UTC (rev 14686) @@ -169,7 +169,6 @@
DWORD dwControl, LPSERVICE_STATUS lpServiceStatus) { -#if 0 DWORD dwError;
DPRINT("ControlService(%x, %x, %p)\n", @@ -192,10 +191,6 @@ DPRINT("ControlService() done\n");
return TRUE; -#endif - DPRINT1("ControlService is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; }
_____
Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-04-18 22:00:52 UTC (rev 14685) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-04-18 22:11:46 UTC (rev 14686) @@ -272,7 +272,6 @@
/* Function 1 */ -#if 0 unsigned long ScmrControlService(handle_t BindingHandle, unsigned int hService, @@ -296,7 +295,6 @@
return ERROR_SUCCESS; } -#endif
/* Function 2 */