From 096c2a10892cb11f4ee258ed938e371472c0289a Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Mon, 18 Apr 2005 22:11:46 +0000
Subject: [PATCH] Reenable ControlService and fix syntax errors in svcctl.idl.

svn path=/trunk/; revision=14686
---
 reactos/include/idl/svcctl.idl             | 15 +++++++--------
 reactos/lib/advapi32/service/scm.c         |  5 -----
 reactos/subsys/system/services/rpcserver.c |  2 --
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/reactos/include/idl/svcctl.idl b/reactos/include/idl/svcctl.idl
index de93e5e5ba9..dee3a4caf77 100644
--- a/reactos/include/idl/svcctl.idl
+++ b/reactos/include/idl/svcctl.idl
@@ -21,7 +21,7 @@
 ]
 interface svcctl
 {
-cpp_quote("#if 0");
+cpp_quote("#if 0")
   typedef struct _SERVICE_STATUS
   {
     DWORD dwServiceType;
@@ -32,17 +32,17 @@ cpp_quote("#if 0");
     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 @@ cpp_quote("#endif");
                            [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 @@ cpp_quote("#endif");
                              [in, string] LPCSTR lpServiceName,
                              [in] DWORD dwDesiredAccess,
                              [out] SC_HANDLE *hScm);
-
 }
diff --git a/reactos/lib/advapi32/service/scm.c b/reactos/lib/advapi32/service/scm.c
index bc36ad01109..466046e2dd4 100644
--- a/reactos/lib/advapi32/service/scm.c
+++ b/reactos/lib/advapi32/service/scm.c
@@ -169,7 +169,6 @@ ControlService(SC_HANDLE        hService,
                DWORD            dwControl,
                LPSERVICE_STATUS lpServiceStatus)
 {
-#if 0
   DWORD dwError;
 
   DPRINT("ControlService(%x, %x, %p)\n",
@@ -192,10 +191,6 @@ ControlService(SC_HANDLE        hService,
   DPRINT("ControlService() done\n");
 
   return TRUE;
-#endif
-  DPRINT1("ControlService is unimplemented\n");
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return FALSE;
 }
 
 
diff --git a/reactos/subsys/system/services/rpcserver.c b/reactos/subsys/system/services/rpcserver.c
index 37a8e9fc2a8..7aae0064134 100644
--- a/reactos/subsys/system/services/rpcserver.c
+++ b/reactos/subsys/system/services/rpcserver.c
@@ -272,7 +272,6 @@ ScmrCloseServiceHandle(handle_t BindingHandle,
 
 
 /* Function 1 */
-#if 0
 unsigned long
 ScmrControlService(handle_t BindingHandle,
                    unsigned int hService,
@@ -296,7 +295,6 @@ ScmrControlService(handle_t BindingHandle,
 
   return ERROR_SUCCESS;
 }
-#endif
 
 
 /* Function 2 */