Revert r18735 and add the missing definition to svcctl.idl.

svn path=/trunk/; revision=18737

diff --git a/reactos/include/idl/svcctl.idl b/reactos/include/idl/svcctl.idl
index 24436ea..0327104 100644 (file)
--- a/reactos/include/idl/svcctl.idl
+++ b/reactos/include/idl/svcctl.idl
@@ -74,7 +74,21 @@ cpp_quote("#endif")
   /* Function 9 */\r
   DWORD ScmrNotifyBootConfigStatus([in] handle_t BindingHandle,\r
                                    [in] BOOL BootAcceptable);\r
-\r
+  /* Function 11 */\r
+  DWORD ScmrChangeServiceConfigW([in] handle_t BiningHandle,\r
+                                 [in] SC_HANDLE hSCManager,\r
+                                 [in] DWORD dwServiceType,\r
+                                 [in] DWORD dwStartType,\r
+                                [in] DWORD dwErrorControl,\r
+                                 [in, string, ref] LPCWSTR lpBinaryPathName,\r
+                                [in, string, unique] LPCWSTR lpLoadOrderGroup,\r
+                                 [in, out, unique] LPDWORD lpdwTagId,\r
+                                 [in, size_is(dwDependenciesLength), unique] LPCWSTR lpDependencies,\r
+                                 [in] DWORD dwDependenciesLength,\r
+                                 [in, string, unique] LPCWSTR lpServiceStartName,\r
+                                 [in, size_is(dwPasswordLength), unique] LPCWSTR lpPassword,\r
+                                 [in] DWORD dwPasswordLength,\r
+                                 [in, string, unique] LPCWSTR lpDisplayName);\r
 \r
   /* Function 12 */\r
   DWORD ScmrCreateServiceW([in] handle_t BindingHandle,\r

diff --git a/reactos/lib/advapi32/service/scm.c b/reactos/lib/advapi32/service/scm.c
index 61cad8b..36a9285 100644 (file)
--- a/reactos/lib/advapi32/service/scm.c
+++ b/reactos/lib/advapi32/service/scm.c
@@ -121,7 +121,6 @@ ChangeServiceConfigW(SC_HANDLE hService,
                      LPCWSTR lpPassword,
                      LPCWSTR lpDisplayName)
 {
-#if 0 /* Temporarily deactivated to fix the build (ScmrChangeServiceConfigW is missing */
     DWORD dwError;
     DWORD dwDependenciesLength = 0;
     DWORD dwLength;
@@ -169,11 +168,6 @@ ChangeServiceConfigW(SC_HANDLE hService,
     }
 
     return TRUE;
-#else
-    DPRINT1("ChangeServiceConfigW temporarily disabled\n");
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-#endif
 }