- ScmCreateManagerHandle: Fail on invalid database names.
[reactos.git] / reactos / base / system / services / rpcserver.c
index b71f482..e7902c9 100644 (file)
@@ -1,5 +1,12 @@
 /*
-
+ * PROJECT:     ReactOS Service Control Manager
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/system/services/rpcserver.c
+ * PURPOSE:     RPC server interface for the advapi32 calls
+ * COPYRIGHT:   Copyright 2005-2006 Eric Kohl
+ *              Copyright 2006-2007 HervĂ© Poussineau <hpoussin@reactos.org>
+ *              Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
+ *
  */
 
 /* INCLUDES ****************************************************************/
@@ -10,7 +17,6 @@
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS *****************************************************************/
 
 #define MANAGER_TAG 0x72674D68  /* 'hMgr' */
@@ -105,7 +111,7 @@ ScmStartRpcServer(VOID)
 {
     RPC_STATUS Status;
 
-    DPRINT("ScmStartRpcServer() called");
+    DPRINT("ScmStartRpcServer() called\n");
 
     Status = RpcServerUseProtseqEpW(L"ncacn_np",
                                     10,
@@ -117,7 +123,7 @@ ScmStartRpcServer(VOID)
         return;
     }
 
-    Status = RpcServerRegisterIf(svcctl_ServerIfHandle,
+    Status = RpcServerRegisterIf(svcctl_v2_0_s_ifspec,
                                  NULL,
                                  NULL);
     if (Status != RPC_S_OK)
@@ -133,7 +139,7 @@ ScmStartRpcServer(VOID)
         return;
     }
 
-    DPRINT("ScmStartRpcServer() done");
+    DPRINT("ScmStartRpcServer() done\n");
 }
 
 
@@ -146,7 +152,18 @@ ScmCreateManagerHandle(LPWSTR lpDatabaseName,
     if (lpDatabaseName == NULL)
         lpDatabaseName = SERVICES_ACTIVE_DATABASEW;
 
-    Ptr = HeapAlloc(GetProcessHeap(),
+    if (wcsicmp(lpDatabaseName,SERVICES_FAILED_DATABASEW)==0)
+    {
+        DPRINT1("Database %S, does not exist\n",lpDatabaseName);
+        return ERROR_DATABASE_DOES_NOT_EXIST;
+    }
+    else if (wcsicmp(lpDatabaseName, SERVICES_ACTIVE_DATABASEW) != 0)
+    {
+        DPRINT1("Invalid Database name %S.\n",lpDatabaseName);
+        return ERROR_INVALID_NAME;
+    }
+
+    Ptr = (MANAGER_HANDLE*) HeapAlloc(GetProcessHeap(),
                     HEAP_ZERO_MEMORY,
                     sizeof(MANAGER_HANDLE) + wcslen(lpDatabaseName) * sizeof(WCHAR));
     if (Ptr == NULL)
@@ -171,7 +188,7 @@ ScmCreateServiceHandle(PSERVICE lpServiceEntry,
 {
     PSERVICE_HANDLE Ptr;
 
-    Ptr = HeapAlloc(GetProcessHeap(),
+    Ptr = (SERVICE_HANDLE*) HeapAlloc(GetProcessHeap(),
                     HEAP_ZERO_MEMORY,
                     sizeof(SERVICE_HANDLE));
     if (Ptr == NULL)
@@ -230,20 +247,20 @@ ScmAssignNewTag(PSERVICE lpService)
 
 
 /* Function 0 */
-unsigned long
-ScmrCloseServiceHandle(handle_t BindingHandle,
-                       unsigned int hScObject)
+DWORD RCloseServiceHandle(
+    handle_t BindingHandle,
+    LPSC_RPC_HANDLE hSCObject)
 {
     PMANAGER_HANDLE hManager;
 
-    DPRINT("ScmrCloseServiceHandle() called\n");
+    DPRINT("RCloseServiceHandle() called\n");
 
-    DPRINT("hScObject = %X\n", hScObject);
+    DPRINT("hSCObject = %p\n", *hSCObject);
 
-    if (hScObject == 0)
+    if (*hSCObject == 0)
         return ERROR_INVALID_HANDLE;
 
-    hManager = (PMANAGER_HANDLE)hScObject;
+    hManager = (PMANAGER_HANDLE)*hSCObject;
     if (hManager->Handle.Tag == MANAGER_TAG)
     {
         DPRINT("Found manager handle\n");
@@ -256,7 +273,7 @@ ScmrCloseServiceHandle(handle_t BindingHandle,
             HeapFree(GetProcessHeap(), 0, hManager);
         }
 
-        DPRINT("ScmrCloseServiceHandle() done\n");
+        DPRINT("RCloseServiceHandle() done\n");
         return ERROR_SUCCESS;
     }
     else if (hManager->Handle.Tag == SERVICE_TAG)
@@ -271,7 +288,7 @@ ScmrCloseServiceHandle(handle_t BindingHandle,
             HeapFree(GetProcessHeap(), 0, hManager);
         }
 
-        DPRINT("ScmrCloseServiceHandle() done\n");
+        DPRINT("RCloseServiceHandle() done\n");
         return ERROR_SUCCESS;
     }
 
@@ -282,25 +299,25 @@ ScmrCloseServiceHandle(handle_t BindingHandle,
 
 
 /* Function 1 */
-unsigned long
-ScmrControlService(handle_t BindingHandle,
-                   unsigned int hService,
-                   unsigned long dwControl,
-                   LPSERVICE_STATUS lpServiceStatus)
+DWORD RControlService(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    DWORD dwControl,
+    LPSERVICE_STATUS lpServiceStatus)
 {
     PSERVICE_HANDLE hSvc;
     PSERVICE lpService;
     ACCESS_MASK DesiredAccess;
     DWORD dwError = ERROR_SUCCESS;
 
-    DPRINT("ScmrControlService() called\n");
+    DPRINT("RControlService() called\n");
 
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
     /* Check the service handle */
     hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc->Handle.Tag != SERVICE_TAG)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
         DPRINT1("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
@@ -355,13 +372,10 @@ ScmrControlService(handle_t BindingHandle,
     }
     else
     {
-        /* FIXME: Send control code to the service */
-#if 0
+        /* Send control code to the service */
         dwError = ScmControlService(lpService,
                                     dwControl,
                                     lpServiceStatus);
-#endif
-        dwError = ERROR_INVALID_SERVICE_CONTROL;
     }
 
     /* Return service status information */
@@ -374,25 +388,25 @@ ScmrControlService(handle_t BindingHandle,
 
 
 /* Function 2 */
-unsigned long
-ScmrDeleteService(handle_t BindingHandle,
-                  unsigned int hService)
+DWORD RDeleteService(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService)
 {
     PSERVICE_HANDLE hSvc;
     PSERVICE lpService;
     DWORD dwError;
 
-    DPRINT("ScmrDeleteService() called\n");
+    DPRINT("RDeleteService() called\n");
 
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
     hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc->Handle.Tag != SERVICE_TAG)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
         return ERROR_INVALID_HANDLE;
 
     if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess,
-                                  STANDARD_RIGHTS_REQUIRED))
+                                  DELETE))
         return ERROR_ACCESS_DENIED;
 
     lpService = hSvc->ServiceEntry;
@@ -417,26 +431,26 @@ ScmrDeleteService(handle_t BindingHandle,
 
     /* FIXME: Release service database lock */
 
-    DPRINT("ScmrDeleteService() done\n");
+    DPRINT("RDeleteService() done\n");
 
     return dwError;
 }
 
 
 /* Function 3 */
-unsigned long
-ScmrLockServiceDatabase(handle_t BindingHandle,
-                        unsigned int hSCManager,
-                        unsigned int *hLock)
+DWORD RLockServiceDatabase(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hSCManager,
+    LPSC_RPC_LOCK lpLock)
 {
     PMANAGER_HANDLE hMgr;
 
-    DPRINT("ScmrLockServiceDatabase() called\n");
+    DPRINT("RLockServiceDatabase() called\n");
 
-    *hLock = 0;
+    *lpLock = 0;
 
     hMgr = (PMANAGER_HANDLE)hSCManager;
-    if (hMgr->Handle.Tag != MANAGER_TAG)
+    if (!hMgr || hMgr->Handle.Tag != MANAGER_TAG)
         return ERROR_INVALID_HANDLE;
 
     if (!RtlAreAllAccessesGranted(hMgr->Handle.DesiredAccess,
@@ -446,20 +460,20 @@ ScmrLockServiceDatabase(handle_t BindingHandle,
 //    return ScmLockDatabase(0, hMgr->0xC, hLock);
 
     /* FIXME: Lock the database */
-    *hLock = 0x12345678; /* Dummy! */
+    *lpLock = (void *)0x12345678; /* Dummy! */
 
     return ERROR_SUCCESS;
 }
 
 
 /* Function 4 */
-unsigned long
-ScmrQueryServiceObjectSecurity(handle_t BindingHandle,
-                               unsigned int hService,
-                               unsigned long dwSecurityInformation,
-                               unsigned char *lpSecurityDescriptor,
-                               unsigned long dwSecuityDescriptorSize,
-                               unsigned long *pcbBytesNeeded)
+DWORD RQueryServiceObjectSecurity(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    SECURITY_INFORMATION dwSecurityInformation,
+    LPBYTE lpSecurityDescriptor,
+    DWORD cbBufSize,
+    LPBOUNDED_DWORD_256K pcbBytesNeeded)
 {
 #if 0
     PSERVICE_HANDLE hSvc;
@@ -469,10 +483,10 @@ ScmrQueryServiceObjectSecurity(handle_t BindingHandle,
     DWORD dwBytesNeeded;
     DWORD dwError;
 
-    DPRINT("ScmrQueryServiceObjectSecurity() called\n");
+    DPRINT("RQueryServiceObjectSecurity() called\n");
 
     hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc->Handle.Tag != SERVICE_TAG)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
         DPRINT1("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
@@ -531,20 +545,19 @@ ScmrQueryServiceObjectSecurity(handle_t BindingHandle,
 
     return dwError;
 #endif
-    DPRINT1("ScmrQueryServiceObjectSecurity() is unimplemented\n");
+    UNIMPLEMENTED;
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
 
 /* Function 5 */
-unsigned long
-ScmrSetServiceObjectSecurity(handle_t BindingHandle,
-                             unsigned int hService,
-                             unsigned long dwSecurityInformation,
-                             unsigned char *lpSecurityDescriptor,
-                             unsigned long dwSecuityDescriptorSize)
+DWORD RSetServiceObjectSecurity(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    DWORD dwSecurityInformation,
+    LPBYTE lpSecurityDescriptor,
+    DWORD dwSecuityDescriptorSize)
 {
-#if 0
     PSERVICE_HANDLE hSvc;
     PSERVICE lpService;
     ULONG DesiredAccess = 0;
@@ -553,38 +566,39 @@ ScmrSetServiceObjectSecurity(handle_t BindingHandle,
     NTSTATUS Status;
     DWORD dwError;
 
-    DPRINT1("ScmrSetServiceObjectSecurity() called\n");
+    DPRINT1("RSetServiceObjectSecurity() called\n");
 
     hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc->Handle.Tag != SERVICE_TAG)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
         DPRINT1("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
     if (dwSecurityInformation == 0 ||
-        dwSecurityInformation & ~0xF)
-        return 0x57;
+        dwSecurityInformation & ~(OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION
+        | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION))
+        return ERROR_INVALID_PARAMETER;
 
     if (!RtlValidSecurityDescriptor((PSECURITY_DESCRIPTOR)lpSecurityDescriptor))
-        return 0x57;
+        return ERROR_INVALID_PARAMETER;
 
     if (dwSecurityInformation & SACL_SECURITY_INFORMATION)
         DesiredAccess |= ACCESS_SYSTEM_SECURITY;
 
     if (dwSecurityInformation & DACL_SECURITY_INFORMATION)
-        DesiredAccess |= 0x40000;
+        DesiredAccess |= WRITE_DAC;
 
     if (dwSecurityInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION))
-        DesiredAccess |= 0x80000;
+        DesiredAccess |= WRITE_OWNER;
 
     if ((dwSecurityInformation & OWNER_SECURITY_INFORMATION) &&
         (((PSECURITY_DESCRIPTOR)lpSecurityDescriptor)->Owner == NULL))
-        return 0x57;
+        return ERROR_INVALID_PARAMETER;
 
     if ((dwSecurityInformation & GROUP_SECURITY_INFORMATION) &&
         (((PSECURITY_DESCRIPTOR)lpSecurityDescriptor)->Group == NULL))
-        return 0x57;
+        return ERROR_INVALID_PARAMETER;
 
     if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess,
                                   DesiredAccess))
@@ -601,21 +615,22 @@ ScmrSetServiceObjectSecurity(handle_t BindingHandle,
     }
 
     if (lpService->bDeleted)
-        return 0x430;
+        return ERROR_SERVICE_MARKED_FOR_DELETE;
 
-//    RpcImpersonateClient(NULL);
+    RpcImpersonateClient(NULL);
 
     Status = NtOpenThreadToken(NtCurrentThread(),
                                8,
-                               1,
+                               TRUE,
                                &hToken);
     if (!NT_SUCCESS(Status))
         return RtlNtStatusToDosError(Status);
 
-//    RpcRevertToSelf();
+    RpcRevertToSelf();
 
     /* FIXME: Lock service database */
 
+#if 0
     Status = RtlSetSecurityObject(dwSecurityInformation,
                                   (PSECURITY_DESCRIPTOR)lpSecurityDescriptor,
                                   &lpService->lpSecurityDescriptor,
@@ -626,52 +641,51 @@ ScmrSetServiceObjectSecurity(handle_t BindingHandle,
         dwError = RtlNtStatusToDosError(Status);
         goto Done;
     }
+#endif
 
     dwError = ScmOpenServiceKey(lpService->lpServiceName,
-                                0x20006,
+                                READ_CONTROL | KEY_CREATE_SUB_KEY | KEY_SET_VALUE,
                                 &hServiceKey);
     if (dwError != ERROR_SUCCESS)
         goto Done;
 
+    UNIMPLEMENTED;
+    dwError = ERROR_SUCCESS;
 //    dwError = ScmWriteSecurityDescriptor(hServiceKey,
 //                                         lpService->lpSecurityDescriptor);
 
     RegFlushKey(hServiceKey);
     RegCloseKey(hServiceKey);
 
-Done:;
+Done:
 
     if (hToken != NULL)
         NtClose(hToken);
 
     /* FIXME: Unlock service database */
 
-    DPRINT1("ScmrSetServiceObjectSecurity() done (Error %lu)\n", dwError);
+    DPRINT("RSetServiceObjectSecurity() done (Error %lu)\n", dwError);
 
     return dwError;
-#endif
-
-    DPRINT1("ScmrSetServiceObjectSecurity() is unimplemented\n");
-    return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
 
 /* Function 6 */
-unsigned long
-ScmrQueryServiceStatus(handle_t BindingHandle,
-                       unsigned int hService,
-                       LPSERVICE_STATUS lpServiceStatus)
+DWORD RQueryServiceStatus(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    LPSERVICE_STATUS lpServiceStatus)
 {
     PSERVICE_HANDLE hSvc;
     PSERVICE lpService;
 
-    DPRINT("ScmrQueryServiceStatus() called\n");
+    DPRINT("RQueryServiceStatus() called\n");
 
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
     hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc->Handle.Tag != SERVICE_TAG)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
         DPRINT1("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
@@ -701,76 +715,94 @@ ScmrQueryServiceStatus(handle_t BindingHandle,
 
 
 /* Function 7 */
-unsigned long
-ScmrSetServiceStatus(handle_t BindingHandle,
-                     unsigned long hServiceStatus) /* FIXME */
+DWORD RSetServiceStatus(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hServiceStatus,
+    LPSERVICE_STATUS lpServiceStatus)
 {
-    DPRINT1("ScmrSetServiceStatus() is unimplemented\n");
-    /* FIXME */
-    return ERROR_CALL_NOT_IMPLEMENTED;
+    PSERVICE lpService;
+
+    DPRINT("RSetServiceStatus() called\n");
+
+    if (ScmShutdown)
+        return ERROR_SHUTDOWN_IN_PROGRESS;
+
+    lpService = ScmGetServiceEntryByClientHandle((ULONG)hServiceStatus);
+    if (lpService == NULL)
+    {
+        DPRINT1("lpService == NULL!\n");
+        return ERROR_INVALID_HANDLE;
+    }
+
+    RtlCopyMemory(&lpService->Status,
+                  lpServiceStatus,
+                  sizeof(SERVICE_STATUS));
+
+    DPRINT("Set %S to %lu\n", lpService->lpDisplayName, lpService->Status.dwCurrentState);
+    DPRINT("RSetServiceStatus() done\n");
+
+    return ERROR_SUCCESS;
 }
 
 
 /* Function 8 */
-unsigned long
-ScmrUnlockServiceDatabase(handle_t BindingHandle,
-                          unsigned int hLock)
+DWORD RUnlockServiceDatabase(
+    handle_t BindingHandle,
+    LPSC_RPC_LOCK Lock)
 {
-    DPRINT1("ScmrUnlockServiceDatabase() called\n");
-    /* FIXME */
+    UNIMPLEMENTED;
     return ERROR_SUCCESS;
 }
 
 
 /* Function 9 */
-unsigned long
-ScmrNotifyBootConfigStatus(handle_t BindingHandle,
-                           unsigned long BootAcceptable)
+DWORD RNotifyBootConfigStatus(
+    handle_t BindingHandle,
+    SVCCTL_HANDLEW lpMachineName,
+    DWORD BootAcceptable)
 {
-    DPRINT1("ScmrNotifyBootConfigStatus() called\n");
-    /* FIXME */
+    UNIMPLEMENTED;
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
 
 /* Function 10 */
-unsigned long
-ScmrSetServiceBitsW(handle_t BindingHandle,
-                    unsigned long hServiceStatus,
-                    unsigned long dwServiceBits,
-                    unsigned long bSetBitsOn,
-                    unsigned long bUpdateImmediately,
-                    wchar_t *lpString)
-{
-    DPRINT1("ScmrSetServiceBitsW() called\n");
-    /* FIXME */
+DWORD RSetServiceBitsW(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hServiceStatus,
+    DWORD dwServiceBits,
+    int bSetBitsOn,
+    int bUpdateImmediately,
+    wchar_t *lpString)
+{
+    UNIMPLEMENTED;
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
 
 /* Function 11 */
-unsigned long
-ScmrChangeServiceConfigW(handle_t BiningHandle,
-                         unsigned int hService,
-                         unsigned long dwServiceType,
-                         unsigned long dwStartType,
-                         unsigned long dwErrorControl,
-                         wchar_t *lpBinaryPathName,
-                         wchar_t *lpLoadOrderGroup,
-                         unsigned long *lpdwTagId, /* in, out, unique */
-                         wchar_t *lpDependencies,
-                         unsigned long dwDependenciesLength,
-                         wchar_t *lpServiceStartName,
-                         wchar_t *lpPassword,
-                         unsigned long dwPasswordLength,
-                         wchar_t *lpDisplayName)
+DWORD RChangeServiceConfigW(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    DWORD dwServiceType,
+    DWORD dwStartType,
+    DWORD dwErrorControl,
+    LPWSTR lpBinaryPathName,
+    LPWSTR lpLoadOrderGroup,
+    LPDWORD lpdwTagId,
+    LPBYTE lpDependencies,
+    DWORD dwDependSize,
+    LPWSTR lpServiceStartName,
+    LPBYTE lpPassword,
+    DWORD dwPwSize,
+    LPWSTR lpDisplayName)
 {
     DWORD dwError = ERROR_SUCCESS;
     PSERVICE_HANDLE hSvc;
     PSERVICE lpService = NULL;
     HKEY hServiceKey = NULL;
 
-    DPRINT("ScmrChangeServiceConfigW() called\n");
+    DPRINT("RChangeServiceConfigW() called\n");
     DPRINT("dwServiceType = %lu\n", dwServiceType);
     DPRINT("dwStartType = %lu\n", dwStartType);
     DPRINT("dwErrorControl = %lu\n", dwErrorControl);
@@ -782,7 +814,7 @@ ScmrChangeServiceConfigW(handle_t BiningHandle,
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
     hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc->Handle.Tag != SERVICE_TAG)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
         DPRINT1("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
@@ -946,8 +978,8 @@ ScmrChangeServiceConfigW(handle_t BiningHandle,
     if (lpDependencies != NULL && *lpDependencies != 0)
     {
         dwError = ScmWriteDependencies(hServiceKey,
-                                       lpDependencies,
-                                       dwDependenciesLength);
+                                       (LPWSTR)lpDependencies,
+                                       dwDependSize);
         if (dwError != ERROR_SUCCESS)
             goto done;
     }
@@ -963,31 +995,405 @@ done:
     if (hServiceKey != NULL)
         RegCloseKey(hServiceKey);
 
-    DPRINT("ScmrChangeServiceConfigW() done (Error %lu)\n", dwError);
+    DPRINT("RChangeServiceConfigW() done (Error %lu)\n", dwError);
 
     return dwError;
 }
 
+/* Create a path suitable for the bootloader out of the full path */
+DWORD
+ScmConvertToBootPathName(wchar_t *CanonName, wchar_t **RelativeName)
+{
+    DWORD ServiceNameLen, BufferSize, ExpandedLen;
+    WCHAR Dest;
+    WCHAR *Expanded;
+    UNICODE_STRING NtPathName, SystemRoot, LinkTarget;
+    OBJECT_ATTRIBUTES ObjectAttributes;
+    NTSTATUS Status;
+    HANDLE SymbolicLinkHandle;
+
+    DPRINT("ScmConvertToBootPathName %S\n", CanonName);
+
+    ServiceNameLen = wcslen(CanonName);
+    /* First check, if it's already good */
+    if (ServiceNameLen > 12 &&
+        !wcsnicmp(L"\\SystemRoot\\", CanonName, 12))
+    {
+        *RelativeName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) + sizeof(WCHAR));
+
+        if (*RelativeName == NULL)
+        {
+            DPRINT1("Error allocating memory for boot driver name!\n");
+            return ERROR_NOT_ENOUGH_MEMORY;
+        }
+
+        /* Copy it */
+        wcscpy(*RelativeName, CanonName);
+
+        DPRINT1("Bootdriver name %S\n", *RelativeName);
+        return ERROR_SUCCESS;
+    }
+
+    /* If it has %SystemRoot% prefix, substitute it to \System*/
+    if (ServiceNameLen > 13 &&
+        !wcsnicmp(L"%SystemRoot%\\", CanonName, 13))
+    {
+        /* There is no +sizeof(wchar_t) because the name is less by 1 wchar */
+        *RelativeName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR));
+
+        if (*RelativeName == NULL)
+        {
+            DPRINT1("Error allocating memory for boot driver name!\n");
+            return ERROR_NOT_ENOUGH_MEMORY;
+        }
+
+        /* Copy it */
+        wcscpy(*RelativeName, L"\\SystemRoot\\");
+        wcscat(*RelativeName, CanonName + 13);
+
+        DPRINT1("Bootdriver name %S\n", *RelativeName);
+        return ERROR_SUCCESS;
+    }
+
+    /* Get buffer size needed for expanding env strings */
+    BufferSize = ExpandEnvironmentStringsW(L"%SystemRoot%\\", &Dest, 1);
+
+    if (BufferSize <= 1)
+    {
+        DPRINT1("Error during a call to ExpandEnvironmentStringsW()\n");
+        return ERROR_INVALID_ENVIRONMENT;
+    }
+
+    /* Allocate memory, since the size is known now */
+    Expanded = LocalAlloc(LMEM_ZEROINIT, BufferSize * sizeof(WCHAR) + sizeof(WCHAR));
+    if (!Expanded)
+    {
+            DPRINT1("Error allocating memory for boot driver name!\n");
+            return ERROR_NOT_ENOUGH_MEMORY;
+    }
+
+    /* Expand it */
+    if (ExpandEnvironmentStringsW(L"%SystemRoot%\\", Expanded, BufferSize) >
+        BufferSize)
+    {
+        DPRINT1("Error during a call to ExpandEnvironmentStringsW()\n");
+        LocalFree(Expanded);
+        return ERROR_NOT_ENOUGH_MEMORY;
+    }
+
+    /* Convert to NY-style path */
+    if (!RtlDosPathNameToNtPathName_U(Expanded, &NtPathName, NULL, NULL))
+    {
+        DPRINT1("Error during a call to RtlDosPathNameToNtPathName_U()\n");
+        return ERROR_INVALID_ENVIRONMENT;
+    }
+
+    DPRINT("Converted to NT-style %wZ\n", &NtPathName);
+
+    /* No need to keep the dos-path anymore */
+    LocalFree(Expanded);
+
+    /* Copy it to the allocated place */
+    Expanded = LocalAlloc(LMEM_ZEROINIT, NtPathName.Length + sizeof(WCHAR));
+    if (!Expanded)
+    {
+            DPRINT1("Error allocating memory for boot driver name!\n");
+            return ERROR_NOT_ENOUGH_MEMORY;
+    }
+
+    ExpandedLen = NtPathName.Length / sizeof(WCHAR);
+    wcsncpy(Expanded, NtPathName.Buffer, ExpandedLen);
+    Expanded[ExpandedLen] = 0;
+
+    if (ServiceNameLen > ExpandedLen &&
+        !wcsnicmp(Expanded, CanonName, ExpandedLen))
+    {
+        /* Only \SystemRoot\ is missing */
+        *RelativeName = LocalAlloc(LMEM_ZEROINIT,
+            (ServiceNameLen - ExpandedLen) * sizeof(WCHAR) + 13*sizeof(WCHAR));
+
+        if (*RelativeName == NULL)
+        {
+            DPRINT1("Error allocating memory for boot driver name!\n");
+            LocalFree(Expanded);
+            return ERROR_NOT_ENOUGH_MEMORY;
+        }
+
+        wcscpy(*RelativeName, L"\\SystemRoot\\");
+        wcscat(*RelativeName, CanonName + ExpandedLen);
+
+        RtlFreeUnicodeString(&NtPathName);
+        return ERROR_SUCCESS;
+    }
+
+    /* The most complex case starts here */
+    RtlInitUnicodeString(&SystemRoot, L"\\SystemRoot");
+    InitializeObjectAttributes(&ObjectAttributes,
+                               &SystemRoot,
+                               OBJ_CASE_INSENSITIVE,
+                               NULL,
+                               NULL);
+
+    /* Open this symlink */
+    Status = NtOpenSymbolicLinkObject(&SymbolicLinkHandle, SYMBOLIC_LINK_QUERY, &ObjectAttributes);
+
+    if (NT_SUCCESS(Status))
+    {
+        LinkTarget.Length = 0;
+        LinkTarget.MaximumLength = 0;
+
+        DPRINT("Opened symbolic link object\n");
+
+        Status = NtQuerySymbolicLinkObject(SymbolicLinkHandle, &LinkTarget, &BufferSize);
+        if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_TOO_SMALL)
+        {
+            /* Check if required buffer size is sane */
+            if (BufferSize > 0xFFFD)
+            {
+                DPRINT1("Too large buffer required\n");
+                *RelativeName = 0;
+
+                if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle);
+                LocalFree(Expanded);
+                return ERROR_NOT_ENOUGH_MEMORY;
+            }
+
+            /* Alloc the string */
+            LinkTarget.Buffer = LocalAlloc(LMEM_ZEROINIT, BufferSize + sizeof(WCHAR));
+            if (!LinkTarget.Buffer)
+            {
+                DPRINT1("Unable to alloc buffer\n");
+                if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle);
+                LocalFree(Expanded);
+                return ERROR_NOT_ENOUGH_MEMORY;
+            }
+
+            /* Do a real query now */
+            LinkTarget.Length = BufferSize;
+            LinkTarget.MaximumLength = LinkTarget.Length + sizeof(WCHAR);
+
+            Status = NtQuerySymbolicLinkObject(SymbolicLinkHandle, &LinkTarget, &BufferSize);
+            if (NT_SUCCESS(Status))
+            {
+                DPRINT("LinkTarget: %wZ\n", &LinkTarget);
+
+                ExpandedLen = LinkTarget.Length / sizeof(WCHAR);
+                if ((ServiceNameLen > ExpandedLen) &&
+                    !wcsnicmp(LinkTarget.Buffer, CanonName, ExpandedLen))
+                {
+                    *RelativeName = LocalAlloc(LMEM_ZEROINIT,
+                       (ServiceNameLen - ExpandedLen) * sizeof(WCHAR) + 13*sizeof(WCHAR));
+
+                    if (*RelativeName == NULL)
+                    {
+                        DPRINT1("Unable to alloc buffer\n");
+                        if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle);
+                        LocalFree(Expanded);
+                        RtlFreeUnicodeString(&NtPathName);
+                        return ERROR_NOT_ENOUGH_MEMORY;
+                    }
+
+                    /* Copy it over, substituting the first part
+                       with SystemRoot */
+                    wcscpy(*RelativeName, L"\\SystemRoot\\");
+                    wcscat(*RelativeName, CanonName+ExpandedLen+1);
+
+                    /* Cleanup */
+                    if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle);
+                    LocalFree(Expanded);
+                    RtlFreeUnicodeString(&NtPathName);
+
+                    /* Return success */
+                    return ERROR_SUCCESS;
+                }
+                else
+                {
+                    if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle);
+                    LocalFree(Expanded);
+                    RtlFreeUnicodeString(&NtPathName);
+                    return ERROR_INVALID_PARAMETER;
+                }
+            }
+            else
+            {
+                DPRINT1("Error, Status = %08X\n", Status);
+                if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle);
+                LocalFree(Expanded);
+                RtlFreeUnicodeString(&NtPathName);
+                return ERROR_INVALID_PARAMETER;
+            }
+        }
+        else
+        {
+            DPRINT1("Error, Status = %08X\n", Status);
+            if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle);
+            LocalFree(Expanded);
+            RtlFreeUnicodeString(&NtPathName);
+            return ERROR_INVALID_PARAMETER;
+        }
+    }
+    else
+    {
+        DPRINT1("Error, Status = %08X\n", Status);
+        LocalFree(Expanded);
+        return ERROR_INVALID_PARAMETER;
+    }
+
+    /* Failure */
+    *RelativeName = NULL;
+    return ERROR_INVALID_PARAMETER;
+}
+
+DWORD
+ScmCanonDriverImagePath(DWORD dwStartType,
+                        wchar_t *lpServiceName,
+                        wchar_t **lpCanonName)
+{
+    DWORD ServiceNameLen, Result;
+    UNICODE_STRING NtServiceName;
+    WCHAR *RelativeName;
+    WCHAR *SourceName = lpServiceName;
+
+    /* Calculate the length of the service's name */
+    ServiceNameLen = wcslen(lpServiceName);
+
+    /* 12 is wcslen(L"\\SystemRoot\\") */
+    if (ServiceNameLen > 12 &&
+        !wcsnicmp(L"\\SystemRoot\\", lpServiceName, 12))
+    {
+        /* SystemRoot prefix is already included */
+
+        *lpCanonName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) + sizeof(WCHAR));
+
+        if (*lpCanonName == NULL)
+        {
+            DPRINT1("Error allocating memory for canonized service name!\n");
+            return ERROR_NOT_ENOUGH_MEMORY;
+        }
+
+        /* If it's a boot-time driver, it must be systemroot relative */
+        if (dwStartType == SERVICE_BOOT_START)
+            SourceName += 12;
+
+        /* Copy it */
+        wcscpy(*lpCanonName, SourceName);
+
+        DPRINT("Canonicalized name %S\n", *lpCanonName);
+        return NO_ERROR;
+    }
+
+    /* Check if it has %SystemRoot% (len=13) */
+    if (ServiceNameLen > 13 &&
+        !wcsnicmp(L"%%SystemRoot%%\\", lpServiceName, 13))
+    {
+        /* Substitute %SystemRoot% with \\SystemRoot\\ */
+        *lpCanonName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) + sizeof(WCHAR));
+
+        if (*lpCanonName == NULL)
+        {
+            DPRINT1("Error allocating memory for canonized service name!\n");
+            return ERROR_NOT_ENOUGH_MEMORY;
+        }
+
+        /* If it's a boot-time driver, it must be systemroot relative */
+        if (dwStartType == SERVICE_BOOT_START)
+            wcscpy(*lpCanonName, L"\\SystemRoot\\");
+
+        wcscat(*lpCanonName, lpServiceName + 13);
+
+        DPRINT("Canonicalized name %S\n", *lpCanonName);
+        return NO_ERROR;
+    }
+
+    /* Check if it's a relative path name */
+    if (lpServiceName[0] != L'\\' && lpServiceName[1] != L':')
+    {
+        *lpCanonName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) + sizeof(WCHAR));
+
+        if (*lpCanonName == NULL)
+        {
+            DPRINT1("Error allocating memory for canonized service name!\n");
+            return ERROR_NOT_ENOUGH_MEMORY;
+        }
+
+        /* Just copy it over without changing */
+        wcscpy(*lpCanonName, lpServiceName);
+
+        return NO_ERROR;
+    }
+
+    /* It seems to be a DOS path, convert it */
+    if (!RtlDosPathNameToNtPathName_U(lpServiceName, &NtServiceName, NULL, NULL))
+    {
+        DPRINT1("RtlDosPathNameToNtPathName_U() failed!\n");
+        return ERROR_INVALID_PARAMETER;
+    }
+
+    *lpCanonName = LocalAlloc(LMEM_ZEROINIT, NtServiceName.Length + sizeof(WCHAR));
+
+    if (*lpCanonName == NULL)
+    {
+        DPRINT1("Error allocating memory for canonized service name!\n");
+        RtlFreeUnicodeString(&NtServiceName);
+        return ERROR_NOT_ENOUGH_MEMORY;
+    }
+
+    /* Copy the string */
+    wcsncpy(*lpCanonName, NtServiceName.Buffer, NtServiceName.Length / sizeof(WCHAR));
+
+    /* The unicode string is not needed anymore */
+    RtlFreeUnicodeString(&NtServiceName);
+
+    if (dwStartType != SERVICE_BOOT_START)
+    {
+        DPRINT("Canonicalized name %S\n", *lpCanonName);
+        return NO_ERROR;
+    }
+
+    /* The service is boot-started, so must be relative */
+    Result = ScmConvertToBootPathName(*lpCanonName, &RelativeName);
+    if (Result)
+    {
+        /* There is a problem, free name and return */
+        LocalFree(*lpCanonName);
+        DPRINT1("Error converting named!\n");
+        return Result;
+    }
+
+    ASSERT(RelativeName);
+
+    /* Copy that string */
+    wcscpy(*lpCanonName, RelativeName + 12);
+
+    /* Free the allocated buffer */
+    LocalFree(RelativeName);
+
+    DPRINT("Canonicalized name %S\n", *lpCanonName);
+
+    /* Success */
+    return NO_ERROR;
+}
+
 
 /* Function 12 */
-unsigned long
-ScmrCreateServiceW(handle_t BindingHandle,
-                   unsigned int hSCManager,
-                   wchar_t *lpServiceName,
-                   wchar_t *lpDisplayName,
-                   unsigned long dwDesiredAccess,
-                   unsigned long dwServiceType,
-                   unsigned long dwStartType,
-                   unsigned long dwErrorControl,
-                   wchar_t *lpBinaryPathName,
-                   wchar_t *lpLoadOrderGroup,
-                   unsigned long *lpdwTagId, /* in, out */
-                   wchar_t *lpDependencies,
-                   unsigned long dwDependenciesLength,
-                   wchar_t *lpServiceStartName,
-                   wchar_t *lpPassword,
-                   unsigned long dwPasswordLength,
-                   unsigned int *hService) /* out */
+DWORD RCreateServiceW(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hSCManager,
+    LPWSTR lpServiceName,
+    LPWSTR lpDisplayName,
+    DWORD dwDesiredAccess,
+    DWORD dwServiceType,
+    DWORD dwStartType,
+    DWORD dwErrorControl,
+    LPWSTR lpBinaryPathName,
+    LPWSTR lpLoadOrderGroup,
+    LPDWORD lpdwTagId,
+    LPBYTE lpDependencies,
+    DWORD dwDependSize,
+    LPWSTR lpServiceStartName,
+    LPBYTE lpPassword,
+    DWORD dwPwSize,
+    LPSC_RPC_HANDLE lpServiceHandle)
 {
     PMANAGER_HANDLE hManager;
     DWORD dwError = ERROR_SUCCESS;
@@ -996,7 +1402,7 @@ ScmrCreateServiceW(handle_t BindingHandle,
     LPWSTR lpImagePath = NULL;
     HKEY hServiceKey = NULL;
 
-    DPRINT("ScmrCreateServiceW() called\n");
+    DPRINT("RCreateServiceW() called\n");
     DPRINT("lpServiceName = %S\n", lpServiceName);
     DPRINT("lpDisplayName = %S\n", lpDisplayName);
     DPRINT("dwDesiredAccess = %lx\n", dwDesiredAccess);
@@ -1010,7 +1416,7 @@ ScmrCreateServiceW(handle_t BindingHandle,
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
     hManager = (PMANAGER_HANDLE)hSCManager;
-    if (hManager->Handle.Tag != MANAGER_TAG)
+    if (!hManager || hManager->Handle.Tag != MANAGER_TAG)
     {
         DPRINT1("Invalid manager handle!\n");
         return ERROR_INVALID_HANDLE;
@@ -1031,20 +1437,12 @@ ScmrCreateServiceW(handle_t BindingHandle,
 
     if (dwServiceType & SERVICE_DRIVER)
     {
-        /* FIXME: Adjust the image path
-         * Following line is VERY BAD, because it assumes that the
-         * first part of full file name is the OS directory */
-        if (lpBinaryPathName[1] == ':') lpBinaryPathName += GetWindowsDirectoryW(NULL, 0);
+        dwError = ScmCanonDriverImagePath(dwStartType,
+            lpBinaryPathName,
+            &lpImagePath);
 
-        lpImagePath = HeapAlloc(GetProcessHeap(),
-                                HEAP_ZERO_MEMORY,
-                                (wcslen(lpBinaryPathName) + 1) * sizeof(WCHAR));
-        if (lpImagePath == NULL)
-        {
-            dwError = ERROR_NOT_ENOUGH_MEMORY;
+        if (dwError != ERROR_SUCCESS)
             goto done;
-        }
-        wcscpy(lpImagePath, lpBinaryPathName);
     }
 
     /* Allocate a new service entry */
@@ -1063,7 +1461,7 @@ ScmrCreateServiceW(handle_t BindingHandle,
         *lpDisplayName != 0 &&
         wcsicmp(lpService->lpDisplayName, lpDisplayName) != 0)
     {
-        lpService->lpDisplayName = HeapAlloc(GetProcessHeap(), 0,
+        lpService->lpDisplayName = (WCHAR*) HeapAlloc(GetProcessHeap(), 0,
                                              (wcslen(lpDisplayName) + 1) * sizeof(WCHAR));
         if (lpService->lpDisplayName == NULL)
         {
@@ -1158,7 +1556,7 @@ ScmrCreateServiceW(handle_t BindingHandle,
                                  0,
                                  REG_EXPAND_SZ,
                                  (LPBYTE)lpImagePath,
-                                 (wcslen(lpImagePath) + 1) *sizeof(WCHAR));
+                                 (wcslen(lpImagePath) + 1) * sizeof(WCHAR));
         if (dwError != ERROR_SUCCESS)
             goto done;
     }
@@ -1192,8 +1590,8 @@ ScmrCreateServiceW(handle_t BindingHandle,
     if (lpDependencies != NULL && *lpDependencies != 0)
     {
         dwError = ScmWriteDependencies(hServiceKey,
-                                       lpDependencies,
-                                       dwDependenciesLength);
+                                       (LPWSTR)lpDependencies,
+                                       dwDependSize);
         if (dwError != ERROR_SUCCESS)
             goto done;
     }
@@ -1219,8 +1617,8 @@ done:;
 
     if (dwError == ERROR_SUCCESS)
     {
-        DPRINT("hService %lx\n", hServiceHandle);
-        *hService = (unsigned int)hServiceHandle;
+        DPRINT("hService %p\n", hServiceHandle);
+        *lpServiceHandle = (unsigned long)hServiceHandle; /* FIXME: 64 bit portability */
 
         if (lpdwTagId != NULL)
             *lpdwTagId = lpService->dwTag;
@@ -1228,10 +1626,10 @@ done:;
     else
     {
         /* Release the display name buffer */
-        if (lpService->lpServiceName != lpService->lpDisplayName)
+        if (lpService->lpServiceName != NULL)
             HeapFree(GetProcessHeap(), 0, lpService->lpDisplayName);
 
-        if (hServiceHandle != NULL)
+        if (hServiceHandle)
         {
             /* Remove the service handle */
             HeapFree(GetProcessHeap(), 0, hServiceHandle);
@@ -1246,45 +1644,45 @@ done:;
     if (lpImagePath != NULL)
         HeapFree(GetProcessHeap(), 0, lpImagePath);
 
-    DPRINT("ScmrCreateServiceW() done (Error %lu)\n", dwError);
+    DPRINT("RCreateServiceW() done (Error %lu)\n", dwError);
 
     return dwError;
 }
 
 
 /* Function 13 */
-unsigned long
-ScmrEnumDependentServicesW(handle_t BindingHandle,
-                           unsigned int hService,
-                           unsigned long dwServiceState,
-                           unsigned char *lpServices,
-                           unsigned long cbBufSize,
-                           unsigned long *pcbBytesNeeded,
-                           unsigned long *lpServicesReturned)
+DWORD REnumDependentServicesW(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    DWORD dwServiceState,
+    LPBYTE lpServices,
+    DWORD cbBufSize,
+    LPBOUNDED_DWORD_256K pcbBytesNeeded,
+    LPBOUNDED_DWORD_256K lpServicesReturned)
 {
     DWORD dwError = ERROR_SUCCESS;
 
-    DPRINT1("ScmrEnumDependentServicesW() called\n");
+    UNIMPLEMENTED;
     *pcbBytesNeeded = 0;
     *lpServicesReturned = 0;
 
-    DPRINT1("ScmrEnumDependentServicesW() done (Error %lu)\n", dwError);
+    DPRINT1("REnumDependentServicesW() done (Error %lu)\n", dwError);
 
     return dwError;
 }
 
 
 /* Function 14 */
-unsigned long
-ScmrEnumServicesStatusW(handle_t BindingHandle,
-                        unsigned int hSCManager,
-                        unsigned long dwServiceType,
-                        unsigned long dwServiceState,
-                        unsigned char *lpServices,
-                        unsigned long dwBufSize,
-                        unsigned long *pcbBytesNeeded,
-                        unsigned long *lpServicesReturned,
-                        unsigned long *lpResumeHandle)
+DWORD REnumServicesStatusW(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hSCManager,
+    DWORD dwServiceType,
+    DWORD dwServiceState,
+    LPBYTE lpBuffer,
+    DWORD dwBufSize,
+    LPBOUNDED_DWORD_256K pcbBytesNeeded,
+    LPBOUNDED_DWORD_256K lpServicesReturned,
+    LPBOUNDED_DWORD_256K lpResumeHandle)
 {
     PMANAGER_HANDLE hManager;
     PSERVICE lpService;
@@ -1299,13 +1697,13 @@ ScmrEnumServicesStatusW(handle_t BindingHandle,
     LPENUM_SERVICE_STATUSW lpStatusPtr;
     LPWSTR lpStringPtr;
 
-    DPRINT("ScmrEnumServicesStatusW() called\n");
+    DPRINT("REnumServicesStatusW() called\n");
 
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
     hManager = (PMANAGER_HANDLE)hSCManager;
-    if (hManager->Handle.Tag != MANAGER_TAG)
+    if (!hManager || hManager->Handle.Tag != MANAGER_TAG)
     {
         DPRINT1("Invalid manager handle!\n");
         return ERROR_INVALID_HANDLE;
@@ -1325,7 +1723,7 @@ ScmrEnumServicesStatusW(handle_t BindingHandle,
 
     dwLastResumeCount = *lpResumeHandle;
 
-    /* Lock the service list shared */
+    /* FIXME: Lock the service list shared */
 
     lpService = ScmGetServiceEntryByResumeCount(dwLastResumeCount);
     if (lpService == NULL)
@@ -1408,8 +1806,8 @@ ScmrEnumServicesStatusW(handle_t BindingHandle,
     *lpServicesReturned = dwServiceCount;
     *pcbBytesNeeded = dwRequiredSize;
 
-    lpStatusPtr = (LPENUM_SERVICE_STATUSW)lpServices;
-    lpStringPtr = (LPWSTR)((ULONG_PTR)lpServices +
+    lpStatusPtr = (LPENUM_SERVICE_STATUSW)lpBuffer;
+    lpStringPtr = (LPWSTR)((ULONG_PTR)lpBuffer +
                            dwServiceCount * sizeof(ENUM_SERVICE_STATUSW));
 
     dwRequiredSize = 0;
@@ -1440,13 +1838,13 @@ ScmrEnumServicesStatusW(handle_t BindingHandle,
             /* Copy the service name */
             wcscpy(lpStringPtr,
                    CurrentService->lpServiceName);
-            lpStatusPtr->lpServiceName = (LPWSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpServices);
+            lpStatusPtr->lpServiceName = (LPWSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpBuffer);
             lpStringPtr += (wcslen(CurrentService->lpServiceName) + 1);
 
             /* Copy the display name */
             wcscpy(lpStringPtr,
                    CurrentService->lpDisplayName);
-            lpStatusPtr->lpDisplayName = (LPWSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpServices);
+            lpStatusPtr->lpDisplayName = (LPWSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpBuffer);
             lpStringPtr += (wcslen(CurrentService->lpDisplayName) + 1);
 
             /* Copy the status information */
@@ -1465,26 +1863,26 @@ ScmrEnumServicesStatusW(handle_t BindingHandle,
     }
 
 Done:;
-    /* Unlock the service list */
+    /* FIXME: Unlock the service list */
 
-    DPRINT("ScmrEnumServicesStatusW() done (Error %lu)\n", dwError);
+    DPRINT("REnumServicesStatusW() done (Error %lu)\n", dwError);
 
     return dwError;
 }
 
 
 /* Function 15 */
-unsigned long
-ScmrOpenSCManagerW(handle_t BindingHandle,
-                   wchar_t *lpMachineName,
-                   wchar_t *lpDatabaseName,
-                   unsigned long dwDesiredAccess,
-                   unsigned int *hScm)
+DWORD ROpenSCManagerW(
+    handle_t BindingHandle,
+    LPWSTR lpMachineName,
+    LPWSTR lpDatabaseName,
+    DWORD dwDesiredAccess,
+    LPSC_RPC_HANDLE lpScHandle)
 {
     DWORD dwError;
     SC_HANDLE hHandle;
 
-    DPRINT("ScmrOpenSCManagerW() called\n");
+    DPRINT("ROpenSCManagerW() called\n");
     DPRINT("lpMachineName = %p\n", lpMachineName);
     DPRINT("lpMachineName: %S\n", lpMachineName);
     DPRINT("lpDataBaseName = %p\n", lpDatabaseName);
@@ -1494,6 +1892,9 @@ ScmrOpenSCManagerW(handle_t BindingHandle,
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
+    if (!lpScHandle)
+        return ERROR_INVALID_PARAMETER;
+
     dwError = ScmCreateManagerHandle(lpDatabaseName,
                                      &hHandle);
     if (dwError != ERROR_SUCCESS)
@@ -1512,30 +1913,30 @@ ScmrOpenSCManagerW(handle_t BindingHandle,
         return dwError;
     }
 
-    *hScm = (unsigned int)hHandle;
-    DPRINT("*hScm = %x\n", *hScm);
+    *lpScHandle = (unsigned long)hHandle; /* FIXME: 64 bit portability */
+    DPRINT("*hScm = %p\n", *lpScHandle);
 
-    DPRINT("ScmrOpenSCManagerW() done\n");
+    DPRINT("ROpenSCManagerW() done\n");
 
     return ERROR_SUCCESS;
 }
 
 
 /* Function 16 */
-unsigned int
-ScmrOpenServiceW(handle_t BindingHandle,
-                 unsigned int hSCManager,
-                 wchar_t *lpServiceName,
-                 unsigned long dwDesiredAccess,
-                 unsigned int *hService)
+DWORD ROpenServiceW(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hSCManager,
+    LPWSTR lpServiceName,
+    DWORD dwDesiredAccess,
+    LPSC_RPC_HANDLE lpServiceHandle)
 {
     PSERVICE lpService;
     PMANAGER_HANDLE hManager;
     SC_HANDLE hHandle;
     DWORD dwError;
 
-    DPRINT("ScmrOpenServiceW() called\n");
-    DPRINT("hSCManager = %x\n", hSCManager);
+    DPRINT("ROpenServiceW() called\n");
+    DPRINT("hSCManager = %p\n", hSCManager);
     DPRINT("lpServiceName = %p\n", lpServiceName);
     DPRINT("lpServiceName: %S\n", lpServiceName);
     DPRINT("dwDesiredAccess = %x\n", dwDesiredAccess);
@@ -1543,8 +1944,14 @@ ScmrOpenServiceW(handle_t BindingHandle,
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
+    if (!lpServiceHandle)
+        return ERROR_INVALID_PARAMETER;
+
+    if (!lpServiceName)
+        return ERROR_INVALID_ADDRESS;
+
     hManager = (PMANAGER_HANDLE)hSCManager;
-    if (hManager->Handle.Tag != MANAGER_TAG)
+    if (!hManager || hManager->Handle.Tag != MANAGER_TAG)
     {
         DPRINT1("Invalid manager handle!\n");
         return ERROR_INVALID_HANDLE;
@@ -1579,39 +1986,41 @@ ScmrOpenServiceW(handle_t BindingHandle,
         return dwError;
     }
 
-    *hService = (unsigned int)hHandle;
-    DPRINT("*hService = %x\n", *hService);
+    *lpServiceHandle = (unsigned long)hHandle; /* FIXME: 64 bit portability */
+    DPRINT("*hService = %p\n", *lpServiceHandle);
 
-    DPRINT("ScmrOpenServiceW() done\n");
+    DPRINT("ROpenServiceW() done\n");
 
     return ERROR_SUCCESS;
 }
 
 
 /* Function 17 */
-unsigned long
-ScmrQueryServiceConfigW(handle_t BindingHandle,
-                        unsigned int hService,
-                        unsigned char *lpServiceConfig,
-                        unsigned long cbBufSize,
-                        unsigned long *pcbBytesNeeded)
+DWORD RQueryServiceConfigW(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    LPBYTE lpBuf, //LPQUERY_SERVICE_CONFIGW lpServiceConfig,
+    DWORD cbBufSize,
+    LPBOUNDED_DWORD_8K pcbBytesNeeded)
 {
+    LPQUERY_SERVICE_CONFIGW lpServiceConfig = (LPQUERY_SERVICE_CONFIGW)lpBuf;
     DWORD dwError = ERROR_SUCCESS;
     PSERVICE_HANDLE hSvc;
     PSERVICE lpService = NULL;
     HKEY hServiceKey = NULL;
     LPWSTR lpImagePath = NULL;
+    LPWSTR lpServiceStartName = NULL;
     DWORD dwRequiredSize;
     LPQUERY_SERVICE_CONFIGW lpConfig;
     LPWSTR lpStr;
 
-    DPRINT("ScmrQueryServiceConfigW() called\n");
+    DPRINT("RQueryServiceConfigW() called\n");
 
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
     hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc->Handle.Tag != SERVICE_TAG)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
         DPRINT1("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
@@ -1645,6 +2054,10 @@ ScmrQueryServiceConfigW(handle_t BindingHandle,
     if (dwError != ERROR_SUCCESS)
         goto Done;
 
+    ScmReadString(hServiceKey,
+                  L"ObjectName",
+                  &lpServiceStartName);
+
     dwRequiredSize = sizeof(QUERY_SERVICE_CONFIGW);
 
     if (lpImagePath != NULL)
@@ -1655,7 +2068,8 @@ ScmrQueryServiceConfigW(handle_t BindingHandle,
 
     /* FIXME: Add Dependencies length*/
 
-    /* FIXME: Add ServiceStartName length*/
+    if (lpServiceStartName != NULL)
+        dwRequiredSize += ((wcslen(lpServiceStartName) + 1) * sizeof(WCHAR));
 
     if (lpService->lpDisplayName != NULL)
         dwRequiredSize += ((wcslen(lpService->lpDisplayName) + 1) * sizeof(WCHAR));
@@ -1699,8 +2113,16 @@ ScmrQueryServiceConfigW(handle_t BindingHandle,
         /* FIXME: Append Dependencies */
         lpConfig->lpDependencies = NULL;
 
-        /* FIXME: Append ServiceStartName */
-        lpConfig->lpServiceStartName = NULL;
+        if (lpServiceStartName != NULL)
+        {
+            wcscpy(lpStr, lpServiceStartName);
+            lpConfig->lpServiceStartName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig);
+            lpStr += (wcslen(lpServiceStartName) + 1);
+        }
+        else
+        {
+            lpConfig->lpServiceStartName = NULL;
+        }
 
         if (lpService->lpDisplayName != NULL)
         {
@@ -1720,50 +2142,51 @@ Done:;
     if (lpImagePath != NULL)
         HeapFree(GetProcessHeap(), 0, lpImagePath);
 
+    if (lpServiceStartName != NULL)
+        HeapFree(GetProcessHeap(), 0, lpServiceStartName);
+
     if (hServiceKey != NULL)
         RegCloseKey(hServiceKey);
 
     /* FIXME: Unlock the service database */
 
-    DPRINT("ScmrQueryServiceConfigW() done\n");
+    DPRINT("RQueryServiceConfigW() done\n");
 
     return dwError;
 }
 
 
 /* Function 18 */
-unsigned long
-ScmrQueryServiceLockStatusW(handle_t BindingHandle,
-                            unsigned int hSCManager,
-                            unsigned char *lpLockStatus,   /* [out, unique, size_is(cbBufSize)] */
-                            unsigned long cbBufSize,       /* [in] */
-                            unsigned long *pcbBytesNeeded) /* [out] */
-{
-    DPRINT1("ScmrQueryServiceLockStatusW() called\n");
+DWORD RQueryServiceLockStatusW(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hSCManager,
+    LPQUERY_SERVICE_LOCK_STATUSW lpLockStatus,
+    DWORD cbBufSize,
+    LPBOUNDED_DWORD_4K pcbBytesNeeded)
+{
+    UNIMPLEMENTED;
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
 
 /* Function 19 */
-unsigned long
-ScmrStartServiceW(handle_t BindingHandle,
-                  unsigned int hService,
-                  unsigned long dwNumServiceArgs,
-                  unsigned char *lpServiceArgBuffer,
-                  unsigned long cbBufSize)
+DWORD RStartServiceW(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    DWORD argc,
+    LPSTRING_PTRSW argv)
 {
     DWORD dwError = ERROR_SUCCESS;
     PSERVICE_HANDLE hSvc;
     PSERVICE lpService = NULL;
-    NTSTATUS Status;
 
-    DPRINT1("ScmrStartServiceW() called\n");
+    DPRINT("RStartServiceW() called\n");
 
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
     hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc->Handle.Tag != SERVICE_TAG)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
         DPRINT1("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
@@ -1789,30 +2212,33 @@ ScmrStartServiceW(handle_t BindingHandle,
     if (lpService->bDeleted)
         return ERROR_SERVICE_MARKED_FOR_DELETE;
 
+    if (argv) {
+        UNIMPLEMENTED;
+        argv = NULL;
+    }
+
     /* Start the service */
-    Status = STATUS_SUCCESS; /* FIXME: ScmStartService(lpService); */
-    if (!NT_SUCCESS(Status))
-        return RtlNtStatusToDosError(Status);
+    dwError = ScmStartService(lpService, argc, (LPWSTR *)argv);
 
     return dwError;
 }
 
 
 /* Function 20 */
-unsigned long
-ScmrGetServiceDisplayNameW(handle_t BindingHandle,
-                           unsigned int hSCManager,
-                           wchar_t *lpServiceName,
-                           wchar_t *lpDisplayName, /* [out, unique] */
-                           unsigned long *lpcchBuffer)
+DWORD RGetServiceDisplayNameW(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hSCManager,
+    LPWSTR lpServiceName,
+    LPWSTR lpDisplayName,
+    DWORD *lpcchBuffer)
 {
 //    PMANAGER_HANDLE hManager;
     PSERVICE lpService;
     DWORD dwLength;
     DWORD dwError;
 
-    DPRINT("ScmrGetServiceDisplayNameW() called\n");
-    DPRINT("hSCManager = %x\n", hSCManager);
+    DPRINT("RGetServiceDisplayNameW() called\n");
+    DPRINT("hSCManager = %p\n", hSCManager);
     DPRINT("lpServiceName: %S\n", lpServiceName);
     DPRINT("lpDisplayName: %p\n", lpDisplayName);
     DPRINT("*lpcchBuffer: %lu\n", *lpcchBuffer);
@@ -1829,15 +2255,37 @@ ScmrGetServiceDisplayNameW(handle_t BindingHandle,
     if (lpService == NULL)
     {
         DPRINT1("Could not find a service!\n");
+
+        /* If the service could not be found and lpcchBuffer is 0, windows
+           puts null in lpDisplayName and puts 1 in lpcchBuffer */
+        if (*lpcchBuffer == 0)
+        {
+            *lpcchBuffer = 1;
+            *lpDisplayName = '\0';
+        }
+
         return ERROR_SERVICE_DOES_NOT_EXIST;
     }
 
-    dwLength = wcslen(lpService->lpDisplayName) + 1;
+    if (!lpService->lpDisplayName)
+    {
+        dwLength = wcslen(lpService->lpServiceName);
 
-    if (lpDisplayName != NULL &&
-        *lpcchBuffer >= dwLength)
+        if (lpServiceName != NULL &&
+            *lpcchBuffer > dwLength)
+        {
+            wcscpy(lpDisplayName, lpService->lpServiceName);
+        }
+    }
+    else
     {
-        wcscpy(lpDisplayName, lpService->lpDisplayName);
+        dwLength = wcslen(lpService->lpDisplayName);
+
+        if (lpDisplayName != NULL &&
+            *lpcchBuffer > dwLength)
+        {
+            wcscpy(lpDisplayName, lpService->lpDisplayName);
+        }
     }
 
     dwError = (*lpcchBuffer > dwLength) ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER;
@@ -1849,20 +2297,20 @@ ScmrGetServiceDisplayNameW(handle_t BindingHandle,
 
 
 /* Function 21 */
-unsigned long
-ScmrGetServiceKeyNameW(handle_t BindingHandle,
-                       unsigned int hSCManager,
-                       wchar_t *lpDisplayName,
-                       wchar_t *lpServiceName, /* [out, unique] */
-                       unsigned long *lpcchBuffer)
+DWORD RGetServiceKeyNameW(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hSCManager,
+    LPWSTR lpDisplayName,
+    LPWSTR lpServiceName,
+    DWORD *lpcchBuffer)
 {
 //    PMANAGER_HANDLE hManager;
     PSERVICE lpService;
     DWORD dwLength;
     DWORD dwError;
 
-    DPRINT("ScmrGetServiceKeyNameW() called\n");
-    DPRINT("hSCManager = %x\n", hSCManager);
+    DPRINT("RGetServiceKeyNameW() called\n");
+    DPRINT("hSCManager = %p\n", hSCManager);
     DPRINT("lpDisplayName: %S\n", lpDisplayName);
     DPRINT("lpServiceName: %p\n", lpServiceName);
     DPRINT("*lpcchBuffer: %lu\n", *lpcchBuffer);
@@ -1879,97 +2327,108 @@ ScmrGetServiceKeyNameW(handle_t BindingHandle,
     if (lpService == NULL)
     {
         DPRINT1("Could not find a service!\n");
+
+        /* If the service could not be found and lpcchBuffer is 0, windows
+           puts null in lpDisplayName and puts 2 in lpcchBuffer */
+        if (*lpcchBuffer == 0)
+        {
+            *lpcchBuffer = 2;
+            *lpServiceName = '\0';
+        }
+
         return ERROR_SERVICE_DOES_NOT_EXIST;
     }
 
-    dwLength = wcslen(lpService->lpServiceName) + 1;
+    dwLength = wcslen(lpService->lpServiceName);
 
     if (lpServiceName != NULL &&
-        *lpcchBuffer >= dwLength)
+        *lpcchBuffer > dwLength)
     {
         wcscpy(lpServiceName, lpService->lpServiceName);
+        *lpcchBuffer = dwLength;
+        return ERROR_SUCCESS;
     }
 
     dwError = (*lpcchBuffer > dwLength) ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER;
 
-    *lpcchBuffer = dwLength;
+    *lpcchBuffer = dwLength * 2;
 
     return dwError;
 }
 
 
 /* Function 22 */
-unsigned long
-ScmrSetServiceBitsA(handle_t BindingHandle,
-                    unsigned long hServiceStatus,
-                    unsigned long dwServiceBits,
-                    unsigned long bSetBitsOn,
-                    unsigned long bUpdateImmediately,
-                    char *lpString)
-{
-    DPRINT1("ScmrSetServiceBitsA() is unimplemented\n");
+DWORD RSetServiceBitsA(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hServiceStatus,
+    DWORD dwServiceBits,
+    int bSetBitsOn,
+    int bUpdateImmediately,
+    char *lpString)
+{
+    UNIMPLEMENTED;
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
 
 /* Function 23 */
-unsigned long
-ScmrChangeServiceConfigA(handle_t BiningHandle,
-                         unsigned int hService,
-                         unsigned long dwServiceType,
-                         unsigned long dwStartType,
-                         unsigned long dwErrorControl,
-                         char *lpBinaryPathName,
-                         char *lpLoadOrderGroup,
-                         unsigned long *lpdwTagId,
-                         char *lpDependencies,
-                         unsigned long dwDependenciesLength,
-                         char *lpServiceStartName,
-                         char *lpPassword,
-                         unsigned long dwPasswordLength,
-                         char *lpDisplayName)
-{
-    DPRINT1("ScmrChangeServiceConfigA() is unimplemented\n");
+DWORD RChangeServiceConfigA(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    DWORD dwServiceType,
+    DWORD dwStartType,
+    DWORD dwErrorControl,
+    LPSTR lpBinaryPathName,
+    LPSTR lpLoadOrderGroup,
+    LPDWORD lpdwTagId,
+    LPSTR lpDependencies,
+    DWORD dwDependSize,
+    LPSTR lpServiceStartName,
+    LPBYTE lpPassword,
+    DWORD dwPwSize,
+    LPSTR lpDisplayName)
+{
+    UNIMPLEMENTED;
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
 
 /* Function 24 */
-unsigned long
-ScmrCreateServiceA(handle_t BindingHandle,
-                   unsigned int hSCManager,
-                   char *lpServiceName,
-                   char *lpDisplayName,
-                   unsigned long dwDesiredAccess,
-                   unsigned long dwServiceType,
-                   unsigned long dwStartType,
-                   unsigned long dwErrorControl,
-                   char *lpBinaryPathName,
-                   char *lpLoadOrderGroup,
-                   unsigned long *lpdwTagId, /* in, out */
-                   char *lpDependencies,
-                   unsigned long dwDependenciesLength,
-                   char *lpServiceStartName,
-                   char *lpPassword,
-                   unsigned long dwPasswordLength,
-                   unsigned int *hService) /* out */
-{
-    DPRINT1("ScmrCreateServiceA() is unimplemented\n");
+DWORD RCreateServiceA(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hSCManager,
+    LPSTR lpServiceName,
+    LPSTR lpDisplayName,
+    DWORD dwDesiredAccess,
+    DWORD dwServiceType,
+    DWORD dwStartType,
+    DWORD dwErrorControl,
+    LPSTR lpBinaryPathName,
+    LPSTR lpLoadOrderGroup,
+    LPDWORD lpdwTagId,
+    LPBYTE lpDependencies,
+    DWORD dwDependSize,
+    LPSTR lpServiceStartName,
+    LPBYTE lpPassword,
+    DWORD dwPwSize,
+    LPSC_RPC_HANDLE lpServiceHandle)
+{
+    UNIMPLEMENTED;
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
 
 /* Function 25 */
-unsigned long
-ScmrEnumDependentServicesA(handle_t BindingHandle,
-                           unsigned int hService,
-                           unsigned long dwServiceState,
-                           unsigned char *lpServices,
-                           unsigned long cbBufSize,
-                           unsigned long *pcbBytesNeeded,
-                           unsigned long *lpServicesReturned)
-{
-    DPRINT1("ScmrEnumDependentServicesA() is unimplemented\n");
+DWORD REnumDependentServicesA(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    DWORD dwServiceState,
+    LPBYTE lpServices,
+    DWORD cbBufSize,
+    LPBOUNDED_DWORD_256K pcbBytesNeeded,
+    LPBOUNDED_DWORD_256K lpServicesReturned)
+{
+    UNIMPLEMENTED;
     *pcbBytesNeeded = 0;
     *lpServicesReturned = 0;
     return ERROR_CALL_NOT_IMPLEMENTED;
@@ -1977,35 +2436,35 @@ ScmrEnumDependentServicesA(handle_t BindingHandle,
 
 
 /* Function 26 */
-unsigned long
-ScmrEnumServicesStatusA(handle_t BindingHandle,
-                        unsigned int hSCManager,
-                        unsigned long dwServiceType,
-                        unsigned long dwServiceState,
-                        unsigned char *lpServices,
-                        unsigned long dwBufSize,
-                        unsigned long *pcbBytesNeeded,
-                        unsigned long *lpServicesReturned,
-                        unsigned long *lpResumeHandle)
-{
-    DPRINT1("ScmrEnumServicesAtatusA() is unimplemented\n");
+DWORD REnumServicesStatusA(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hSCManager,
+    DWORD dwServiceType,
+    DWORD dwServiceState,
+    LPBYTE lpBuffer,
+    DWORD dwBufSize,
+    LPBOUNDED_DWORD_256K pcbBytesNeeded,
+    LPBOUNDED_DWORD_256K lpServicesReturned,
+    LPBOUNDED_DWORD_256K lpResumeHandle)
+{
+    UNIMPLEMENTED;
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
 
 /* Function 27 */
-unsigned long
-ScmrOpenSCManagerA(handle_t BindingHandle,
-                   char *lpMachineName,
-                   char *lpDatabaseName,
-                   unsigned long dwDesiredAccess,
-                   unsigned int *hScm)
+DWORD ROpenSCManagerA(
+    handle_t BindingHandle,
+    LPSTR lpMachineName,
+    LPSTR lpDatabaseName,
+    DWORD dwDesiredAccess,
+    LPSC_RPC_HANDLE lpScHandle)
 {
     UNICODE_STRING MachineName;
     UNICODE_STRING DatabaseName;
     DWORD dwError;
 
-    DPRINT("ScmrOpenSCManagerA() called\n");
+    DPRINT("ROpenSCManagerA() called\n");
 
     if (lpMachineName)
         RtlCreateUnicodeStringFromAsciiz(&MachineName,
@@ -2015,11 +2474,11 @@ ScmrOpenSCManagerA(handle_t BindingHandle,
         RtlCreateUnicodeStringFromAsciiz(&DatabaseName,
                                          lpDatabaseName);
 
-    dwError = ScmrOpenSCManagerW(BindingHandle,
+    dwError = ROpenSCManagerW(BindingHandle,
                                  lpMachineName ? MachineName.Buffer : NULL,
                                  lpDatabaseName ? DatabaseName.Buffer : NULL,
                                  dwDesiredAccess,
-                                 hScm);
+                                 lpScHandle);
 
     if (lpMachineName)
         RtlFreeUnicodeString(&MachineName);
@@ -2032,185 +2491,549 @@ ScmrOpenSCManagerA(handle_t BindingHandle,
 
 
 /* Function 28 */
-unsigned int
-ScmrOpenServiceA(handle_t BindingHandle,
-                 unsigned int hSCManager,
-                 char *lpServiceName,
-                 unsigned long dwDesiredAccess,
-                 unsigned int *hService)
+DWORD ROpenServiceA(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hSCManager,
+    LPSTR lpServiceName,
+    DWORD dwDesiredAccess,
+    LPSC_RPC_HANDLE lpServiceHandle)
 {
     UNICODE_STRING ServiceName;
     DWORD dwError;
 
-    DPRINT("ScmrOpenServiceA() called\n");
+    DPRINT("ROpenServiceA() called\n");
 
-    RtlCreateUnicodeStringFromAsciiz(&ServiceName,
-                                     lpServiceName);
+    if (lpServiceName)
+        RtlCreateUnicodeStringFromAsciiz(&ServiceName,
+                                         lpServiceName);
 
-    dwError = ScmrOpenServiceW(BindingHandle,
+    dwError = ROpenServiceW(BindingHandle,
                                hSCManager,
                                ServiceName.Buffer,
                                dwDesiredAccess,
-                               hService);
+                               lpServiceHandle);
 
-    RtlFreeUnicodeString(&ServiceName);
+    if (lpServiceName)
+        RtlFreeUnicodeString(&ServiceName);
 
     return dwError;
 }
 
 
 /* Function 29 */
-unsigned long
-ScmrQueryServiceConfigA(handle_t BindingHandle,
-                        unsigned int hService,
-                        unsigned char *lpServiceConfig,
-                        unsigned long cbBufSize,
-                        unsigned long *pcbBytesNeeded)
-{
-    DPRINT1("ScmrQueryServiceConfigA() is unimplemented\n");
+DWORD RQueryServiceConfigA(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    LPBYTE lpBuf, //LPQUERY_SERVICE_CONFIGA lpServiceConfig,
+    DWORD cbBufSize,
+    LPBOUNDED_DWORD_8K pcbBytesNeeded)
+{
+    UNIMPLEMENTED;
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
 
 /* Function 30 */
-unsigned long
-ScmrQueryServiceLockStatusA(handle_t BindingHandle,
-                            unsigned int hSCManager,
-                            unsigned char *lpLockStatus,   /* [out, unique, size_is(cbBufSize)] */
-                            unsigned long cbBufSize,       /* [in] */
-                            unsigned long *pcbBytesNeeded) /* [out] */
-{
-    DPRINT1("ScmrQueryServiceLockStatusA() called\n");
+DWORD RQueryServiceLockStatusA(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hSCManager,
+    LPQUERY_SERVICE_LOCK_STATUSA lpLockStatus,
+    DWORD cbBufSize,
+    LPBOUNDED_DWORD_4K pcbBytesNeeded)
+{
+    UNIMPLEMENTED;
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
 
 /* Function 31 */
-unsigned long
-ScmrStartServiceA(handle_t BindingHandle,
-                  unsigned int hService,
-                  unsigned long dwNumServiceArgs,
-                  unsigned char *lpServiceArgBuffer,
-                  unsigned long cbBufSize)
-{
-    DPRINT1("ScmrStartServiceA() called\n");
-    return ERROR_SUCCESS;
-//    return ERROR_CALL_NOT_IMPLEMENTED;
-}
+DWORD RStartServiceA(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    DWORD argc,
+    LPSTRING_PTRSA argv)
+{
+    DWORD dwError = ERROR_SUCCESS;
+    PSERVICE_HANDLE hSvc;
+    PSERVICE lpService = NULL;
 
+    DPRINT1("RStartServiceA() called\n");
 
-/* Function 32 */
-unsigned long
-ScmrGetServiceDisplayNameA(handle_t BindingHandle,
-                           unsigned int hSCManager,
-                           char *lpServiceName,
-                           char *lpDisplayName, /* [out, unique] */
-                           unsigned long *lpcchBuffer)
-{
-    DPRINT1("ScmrGetServiceDisplayNameA() is unimplemented\n");
-    return ERROR_CALL_NOT_IMPLEMENTED;
-}
+    if (ScmShutdown)
+        return ERROR_SHUTDOWN_IN_PROGRESS;
 
+    hSvc = (PSERVICE_HANDLE)hService;
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
+    {
+        DPRINT1("Invalid handle tag!\n");
+        return ERROR_INVALID_HANDLE;
+    }
 
-/* Function 33 */
-unsigned long
-ScmrGetServiceKeyNameA(handle_t BindingHandle,
-                       unsigned int hSCManager,
-                       char *lpDisplayName,
-                       char *lpServiceName, /* [out, unique] */
-                       unsigned long *lpcchBuffer)
-{
-    DPRINT1("ScmrGetServiceKeyNameA() is unimplemented\n");
-    return ERROR_CALL_NOT_IMPLEMENTED;
-}
+    if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess,
+                                  SERVICE_START))
+    {
+        DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess);
+        return ERROR_ACCESS_DENIED;
+    }
 
+    lpService = hSvc->ServiceEntry;
+    if (lpService == NULL)
+    {
+        DPRINT1("lpService == NULL!\n");
+        return ERROR_INVALID_HANDLE;
+    }
 
-/* Function 34 */
-unsigned long
-ScmrGetCurrentGroupStateW(handle_t BindingHandle)
+    if (lpService->dwStartType == SERVICE_DISABLED)
+        return ERROR_SERVICE_DISABLED;
+
+    if (lpService->bDeleted)
+        return ERROR_SERVICE_MARKED_FOR_DELETE;
+
+    /* FIXME: Convert argument vector to Unicode */
+
+    /* Start the service */
+    dwError = ScmStartService(lpService, 0, NULL);
+
+    /* FIXME: Free argument vector */
+
+    return dwError;
+}
+
+
+/* Function 32 */
+DWORD RGetServiceDisplayNameA(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hSCManager,
+    LPSTR lpServiceName,
+    LPSTR lpDisplayName,
+    LPBOUNDED_DWORD_4K lpcchBuffer)
 {
-    DPRINT1("ScmrGetCurrentGroupStateW() is unimplemented\n");
+//    PMANAGER_HANDLE hManager;
+    PSERVICE lpService;
+    DWORD dwLength;
+    DWORD dwError;
+    LPWSTR lpServiceNameW;
+
+    DPRINT("RGetServiceDisplayNameA() called\n");
+    DPRINT("hSCManager = %p\n", hSCManager);
+    DPRINT("lpServiceName: %s\n", lpServiceName);
+    DPRINT("lpDisplayName: %p\n", lpDisplayName);
+    DPRINT("*lpcchBuffer: %lu\n", *lpcchBuffer);
+
+//    hManager = (PMANAGER_HANDLE)hSCManager;
+//    if (hManager->Handle.Tag != MANAGER_TAG)
+//    {
+//        DPRINT1("Invalid manager handle!\n");
+//        return ERROR_INVALID_HANDLE;
+//    }
+
+    dwLength = strlen(lpServiceName) + 1;
+    lpServiceNameW = HeapAlloc(GetProcessHeap(),
+                               HEAP_ZERO_MEMORY,
+                               dwLength * sizeof(WCHAR));
+    if (!lpServiceNameW)
+        return ERROR_NOT_ENOUGH_MEMORY;
+
+    MultiByteToWideChar(CP_ACP,
+                        0,
+                        lpServiceName,
+                        strlen(lpServiceName),
+                        lpServiceNameW,
+                        dwLength);
+
+    lpService = ScmGetServiceEntryByName(lpServiceNameW);
+
+    HeapFree(GetProcessHeap(), 0, lpServiceNameW);
+
+    if (lpService == NULL)
+    {
+        DPRINT1("Could not find a service!\n");
+
+        /* If the service could not be found and lpcchBuffer is 0, windows
+           puts null in lpDisplayName and puts 1 in lpcchBuffer */
+        if (*lpcchBuffer == 0)
+        {
+            *lpcchBuffer = 1;
+            *lpDisplayName = '\0';
+        }
+        return ERROR_SERVICE_DOES_NOT_EXIST;
+    }
+
+    if (!lpService->lpDisplayName)
+    {
+        dwLength = wcslen(lpService->lpServiceName);
+        if (lpServiceName != NULL &&
+            *lpcchBuffer > dwLength)
+        {
+            WideCharToMultiByte(CP_ACP,
+                                0,
+                                lpService->lpServiceName,
+                                wcslen(lpService->lpServiceName),
+                                lpDisplayName,
+                                *lpcchBuffer,
+                                NULL,
+                                NULL);
+            return ERROR_SUCCESS;
+        }
+    }
+    else
+    {
+        dwLength = wcslen(lpService->lpDisplayName);
+        if (lpDisplayName != NULL &&
+            *lpcchBuffer > dwLength)
+        {
+            WideCharToMultiByte(CP_ACP,
+                                0,
+                                lpService->lpDisplayName,
+                                wcslen(lpService->lpDisplayName),
+                                lpDisplayName,
+                                *lpcchBuffer,
+                                NULL,
+                                NULL);
+            return ERROR_SUCCESS;
+        }
+    }
+
+    dwError = (*lpcchBuffer > dwLength) ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER;
+
+    *lpcchBuffer = dwLength * 2;
+
+    return dwError;
+}
+
+
+/* Function 33 */
+DWORD RGetServiceKeyNameA(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hSCManager,
+    LPSTR lpDisplayName,
+    LPSTR lpServiceName,
+    LPBOUNDED_DWORD_4K lpcchBuffer)
+{
+    PSERVICE lpService;
+    DWORD dwLength;
+    DWORD dwError;
+    LPWSTR lpDisplayNameW;
+
+    DPRINT("RGetServiceKeyNameA() called\n");
+    DPRINT("hSCManager = %p\n", hSCManager);
+    DPRINT("lpDisplayName: %s\n", lpDisplayName);
+    DPRINT("lpServiceName: %p\n", lpServiceName);
+    DPRINT("*lpcchBuffer: %lu\n", *lpcchBuffer);
+
+    dwLength = strlen(lpDisplayName) + 1;
+    lpDisplayNameW = HeapAlloc(GetProcessHeap(),
+                               HEAP_ZERO_MEMORY,
+                               dwLength * sizeof(WCHAR));
+    if (!lpDisplayNameW)
+        return ERROR_NOT_ENOUGH_MEMORY;
+
+    MultiByteToWideChar(CP_ACP,
+                        0,
+                        lpDisplayName,
+                        strlen(lpDisplayName),
+                        lpDisplayNameW,
+                        dwLength);
+
+    lpService = ScmGetServiceEntryByDisplayName(lpDisplayNameW);
+
+    HeapFree(GetProcessHeap(), 0, lpDisplayNameW);
+
+    if (lpService == NULL)
+    {
+        DPRINT1("Could not find the service!\n");
+
+        /* If the service could not be found and lpcchBuffer is 0,
+           put null in lpDisplayName and puts 1 in lpcchBuffer, verified WINXP. */
+        if (*lpcchBuffer == 0)
+        {
+            *lpcchBuffer = 1;
+            *lpServiceName = '\0';
+        }
+
+        return ERROR_SERVICE_DOES_NOT_EXIST;
+    }
+
+    dwLength = wcslen(lpService->lpServiceName);
+    if (lpService != NULL &&
+        *lpcchBuffer > dwLength)
+    {
+        WideCharToMultiByte(CP_ACP,
+                            0,
+                            lpService->lpServiceName,
+                            wcslen(lpService->lpServiceName),
+                            lpServiceName,
+                            dwLength,
+                            NULL,
+                            NULL);
+        return ERROR_SUCCESS;
+    }
+
+    dwError = (*lpcchBuffer > dwLength) ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER;
+
+    *lpcchBuffer = dwLength * 2;
+
+    return dwError;
+}
+
+
+/* Function 34 */
+DWORD RGetCurrentGroupStateW(
+    handle_t BindingHandle)
+{
+    UNIMPLEMENTED;
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
 
 /* Function 35 */
-unsigned long
-ScmrEnumServiceGroupW(handle_t BindingHandle)
+DWORD REnumServiceGroupW(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hSCManager,
+    DWORD dwServiceType,
+    DWORD dwServiceState,
+    LPBYTE lpBuffer,
+    DWORD cbBufSize,
+    LPBOUNDED_DWORD_256K pcbBytesNeeded,
+    LPBOUNDED_DWORD_256K lpServicesReturned,
+    LPBOUNDED_DWORD_256K lpResumeIndex,
+    LPCWSTR pszGroupName)
 {
-    DPRINT1("ScmrEnumServiceGroupW() is unimplemented\n");
+    UNIMPLEMENTED;
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
 
 /* Function 36 */
-unsigned long
-ScmrChangeServiceConfig2A(handle_t BindingHandle,
-                          unsigned int hService,
-                          unsigned long dwInfoLevel,
-                          unsigned char *lpInfo,
-                          unsigned long dwInfoSize)
-{
-    DPRINT1("ScmrChangeServiceConfig2A() is unimplemented\n");
+DWORD RChangeServiceConfig2A(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    SC_RPC_CONFIG_INFOA Info)
+{
+    UNIMPLEMENTED;
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
 
 /* Function 37 */
-unsigned long
-ScmrChangeServiceConfig2W(handle_t BindingHandle,
-                          unsigned int hService,
-                          unsigned long dwInfoLevel,
-                          unsigned char *lpInfo,
-                          unsigned long dwInfoSize)
-{
-    DPRINT1("ScmrChangeServiceConfig2W() is unimplemented\n");
-    return ERROR_CALL_NOT_IMPLEMENTED;
+DWORD RChangeServiceConfig2W(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    SC_RPC_CONFIG_INFOW Info)
+{
+    DWORD dwError = ERROR_SUCCESS;
+    PSERVICE_HANDLE hSvc;
+    PSERVICE lpService = NULL;
+    HKEY hServiceKey = NULL;
+
+    DPRINT("RChangeServiceConfig2W() called\n");
+    DPRINT("dwInfoLevel = %lu\n", Info.dwInfoLevel);
+
+    if (ScmShutdown)
+        return ERROR_SHUTDOWN_IN_PROGRESS;
+
+    hSvc = (PSERVICE_HANDLE)hService;
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
+    {
+        DPRINT1("Invalid handle tag!\n");
+        return ERROR_INVALID_HANDLE;
+    }
+
+    if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess,
+                                  SERVICE_CHANGE_CONFIG))
+    {
+        DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess);
+        return ERROR_ACCESS_DENIED;
+    }
+
+    lpService = hSvc->ServiceEntry;
+    if (lpService == NULL)
+    {
+        DPRINT1("lpService == NULL!\n");
+        return ERROR_INVALID_HANDLE;
+    }
+
+    /* FIXME: Lock database exclusively */
+
+    if (lpService->bDeleted)
+    {
+        /* FIXME: Unlock database */
+        DPRINT1("The service has already been marked for delete!\n");
+        return ERROR_SERVICE_MARKED_FOR_DELETE;
+    }
+
+    /* Open the service key */
+    dwError = ScmOpenServiceKey(lpService->szServiceName,
+                                KEY_SET_VALUE,
+                                &hServiceKey);
+    if (dwError != ERROR_SUCCESS)
+        goto done;
+
+    if (Info.dwInfoLevel & SERVICE_CONFIG_DESCRIPTION)
+    {
+        LPSERVICE_DESCRIPTIONW lpServiceDescription;
+
+        lpServiceDescription = (LPSERVICE_DESCRIPTIONW)&Info;
+        lpServiceDescription->lpDescription = (LPWSTR)(&Info + sizeof(LPSERVICE_DESCRIPTIONW));
+
+        if (lpServiceDescription != NULL &&
+            lpServiceDescription->lpDescription != NULL)
+        {
+            RegSetValueExW(hServiceKey,
+                           L"Description",
+                           0,
+                           REG_SZ,
+                           (LPBYTE)lpServiceDescription->lpDescription,
+                           (wcslen(lpServiceDescription->lpDescription) + 1) * sizeof(WCHAR));
+
+            if (dwError != ERROR_SUCCESS)
+                goto done;
+        }
+    }
+    else if (Info.dwInfoLevel & SERVICE_CONFIG_FAILURE_ACTIONS)
+    {
+        UNIMPLEMENTED;
+        dwError = ERROR_CALL_NOT_IMPLEMENTED;
+        goto done;
+    }
+
+done:
+    /* FIXME: Unlock database */
+    if (hServiceKey != NULL)
+        RegCloseKey(hServiceKey);
+
+    DPRINT("RChangeServiceConfig2W() done (Error %lu)\n", dwError);
+
+    return dwError;
 }
 
 
 /* Function 38 */
-unsigned long
-ScmrQueryServiceConfig2A(handle_t BindingHandle,
-                         unsigned int hService,
-                         unsigned long dwInfoLevel,
-                         unsigned char *lpBuffer,
-                         unsigned long cbBufSize,
-                         unsigned long *pcbBytesNeeded)
-{
-    DPRINT1("ScmrQueryServiceConfig2A() is unimplemented\n");
+DWORD RQueryServiceConfig2A(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    DWORD dwInfoLevel,
+    LPBYTE lpBuffer,
+    DWORD cbBufSize,
+    LPBOUNDED_DWORD_8K pcbBytesNeeded)
+{
+    UNIMPLEMENTED;
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
 
 /* Function 39 */
-unsigned long
-ScmrQueryServiceConfig2W(handle_t BindingHandle,
-                         unsigned int hService,
-                         unsigned long dwInfoLevel,
-                         unsigned char *lpBuffer,
-                         unsigned long cbBufSize,
-                         unsigned long *pcbBytesNeeded)
-{
-    DPRINT1("ScmrQueryServiceConfig2W() is unimplemented\n");
-    return ERROR_CALL_NOT_IMPLEMENTED;
+DWORD RQueryServiceConfig2W(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    DWORD dwInfoLevel,
+    LPBYTE lpBuffer,
+    DWORD cbBufSize,
+    LPBOUNDED_DWORD_8K pcbBytesNeeded)
+{
+    DWORD dwError = ERROR_SUCCESS;
+    PSERVICE_HANDLE hSvc;
+    PSERVICE lpService = NULL;
+    HKEY hServiceKey = NULL;
+    DWORD dwRequiredSize;
+    LPWSTR lpDescription = NULL;
+
+    DPRINT("RQueryServiceConfig2W() called\n");
+
+    if (ScmShutdown)
+        return ERROR_SHUTDOWN_IN_PROGRESS;
+
+    hSvc = (PSERVICE_HANDLE)hService;
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
+    {
+        DPRINT1("Invalid handle tag!\n");
+        return ERROR_INVALID_HANDLE;
+    }
+
+    if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess,
+                                  SERVICE_QUERY_CONFIG))
+    {
+        DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess);
+        return ERROR_ACCESS_DENIED;
+    }
+
+    lpService = hSvc->ServiceEntry;
+    if (lpService == NULL)
+    {
+        DPRINT1("lpService == NULL!\n");
+        return ERROR_INVALID_HANDLE;
+    }
+
+    /* FIXME: Lock the service database shared */
+
+    dwError = ScmOpenServiceKey(lpService->lpServiceName,
+                                KEY_READ,
+                                &hServiceKey);
+    if (dwError != ERROR_SUCCESS)
+        goto done;
+
+    if (dwInfoLevel & SERVICE_CONFIG_DESCRIPTION)
+    {
+        LPSERVICE_DESCRIPTIONW lpServiceDescription = (LPSERVICE_DESCRIPTIONW)lpBuffer;
+        LPWSTR lpStr;
+
+        dwError = ScmReadString(hServiceKey,
+                                L"Description",
+                                &lpDescription);
+        if (dwError != ERROR_SUCCESS)
+            goto done;
+
+        dwRequiredSize = sizeof(SERVICE_DESCRIPTIONW) + ((wcslen(lpDescription) + 1) * sizeof(WCHAR));
+
+        if (cbBufSize < dwRequiredSize)
+        {
+            *pcbBytesNeeded = dwRequiredSize;
+            dwError = ERROR_INSUFFICIENT_BUFFER;
+            goto done;
+        }
+        else
+        {
+            lpStr = (LPWSTR)(lpServiceDescription + 1);
+            wcscpy(lpStr, lpDescription);
+            lpServiceDescription->lpDescription = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceDescription);
+        }
+    }
+    else if (dwInfoLevel & SERVICE_CONFIG_FAILURE_ACTIONS)
+    {
+        UNIMPLEMENTED;
+        dwError = ERROR_CALL_NOT_IMPLEMENTED;
+        goto done;
+    }
+
+done:
+    if (lpDescription != NULL)
+        HeapFree(GetProcessHeap(), 0, lpDescription);
+
+    if (hServiceKey != NULL)
+        RegCloseKey(hServiceKey);
+
+    /* FIXME: Unlock database */
+
+    DPRINT("RQueryServiceConfig2W() done (Error %lu)\n", dwError);
+
+    return dwError;
 }
 
 
 /* Function 40 */
-unsigned long
-ScmrQueryServiceStatusEx(handle_t BindingHandle,
-                         unsigned int hService,
-                         unsigned long InfoLevel,
-                         unsigned char *lpBuffer, /* out */
-                         unsigned long cbBufSize,
-                         unsigned long *pcbBytesNeeded) /* out */
+DWORD RQueryServiceStatusEx(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    SC_STATUS_TYPE InfoLevel,
+    LPBYTE lpBuffer,
+    DWORD cbBufSize,
+    LPBOUNDED_DWORD_8K pcbBytesNeeded)
 {
     LPSERVICE_STATUS_PROCESS lpStatus;
     PSERVICE_HANDLE hSvc;
     PSERVICE lpService;
 
-    DPRINT("ScmrQueryServiceStatusEx() called\n");
+    DPRINT("RQueryServiceStatusEx() called\n");
 
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
@@ -2224,7 +3047,7 @@ ScmrQueryServiceStatusEx(handle_t BindingHandle,
         return ERROR_INSUFFICIENT_BUFFER;
 
     hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc->Handle.Tag != SERVICE_TAG)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
         DPRINT1("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
@@ -2259,20 +3082,20 @@ ScmrQueryServiceStatusEx(handle_t BindingHandle,
 
 
 /* Function 41 */
-unsigned long
-ScmrEnumServicesStatusExA(handle_t BindingHandle,
-                          unsigned int hSCManager,
-                          unsigned long InfoLevel,
-                          unsigned long dwServiceType,
-                          unsigned long dwServiceState,
-                          unsigned char *lpServices,
-                          unsigned long dwBufSize,
-                          unsigned long *pcbBytesNeeded,
-                          unsigned long *lpServicesReturned,
-                          unsigned long *lpResumeHandle,
-                          char *pszGroupName)
-{
-    DPRINT1("ScmrEnumServicesStatusExA() is unimplemented\n");
+DWORD REnumServicesStatusExA(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hSCManager,
+    SC_ENUM_TYPE InfoLevel,
+    DWORD dwServiceType,
+    DWORD dwServiceState,
+    LPBYTE lpBuffer,
+    DWORD cbBufSize,
+    LPBOUNDED_DWORD_256K pcbBytesNeeded,
+    LPBOUNDED_DWORD_256K lpServicesReturned,
+    LPBOUNDED_DWORD_256K lpResumeIndex,
+    LPCSTR pszGroupName)
+{
+    UNIMPLEMENTED;
     *pcbBytesNeeded = 0;
     *lpServicesReturned = 0;
     return ERROR_CALL_NOT_IMPLEMENTED;
@@ -2280,18 +3103,18 @@ ScmrEnumServicesStatusExA(handle_t BindingHandle,
 
 
 /* Function 42 */
-unsigned long
-ScmrEnumServicesStatusExW(handle_t BindingHandle,
-                          unsigned int hSCManager,
-                          unsigned long InfoLevel,
-                          unsigned long dwServiceType,
-                          unsigned long dwServiceState,
-                          unsigned char *lpServices,
-                          unsigned long dwBufSize,
-                          unsigned long *pcbBytesNeeded,
-                          unsigned long *lpServicesReturned,
-                          unsigned long *lpResumeHandle,
-                          wchar_t *pszGroupName)
+DWORD REnumServicesStatusExW(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hSCManager,
+    SC_ENUM_TYPE InfoLevel,
+    DWORD dwServiceType,
+    DWORD dwServiceState,
+    LPBYTE lpBuffer,
+    DWORD cbBufSize,
+    LPBOUNDED_DWORD_256K pcbBytesNeeded,
+    LPBOUNDED_DWORD_256K lpServicesReturned,
+    LPBOUNDED_DWORD_256K lpResumeIndex,
+    LPCWSTR pszGroupName)
 {
     PMANAGER_HANDLE hManager;
     PSERVICE lpService;
@@ -2306,7 +3129,7 @@ ScmrEnumServicesStatusExW(handle_t BindingHandle,
     LPENUM_SERVICE_STATUS_PROCESSW lpStatusPtr;
     LPWSTR lpStringPtr;
 
-    DPRINT("ScmrEnumServicesStatusExW() called\n");
+    DPRINT("REnumServicesStatusExW() called\n");
 
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
@@ -2315,7 +3138,7 @@ ScmrEnumServicesStatusExW(handle_t BindingHandle,
         return ERROR_INVALID_LEVEL;
 
     hManager = (PMANAGER_HANDLE)hSCManager;
-    if (hManager->Handle.Tag != MANAGER_TAG)
+    if (!hManager || hManager->Handle.Tag != MANAGER_TAG)
     {
         DPRINT1("Invalid manager handle!\n");
         return ERROR_INVALID_HANDLE;
@@ -2333,7 +3156,7 @@ ScmrEnumServicesStatusExW(handle_t BindingHandle,
     *pcbBytesNeeded = 0;
     *lpServicesReturned = 0;
 
-    dwLastResumeCount = *lpResumeHandle;
+    dwLastResumeCount = *lpResumeIndex;
 
     /* Lock the service list shared */
 
@@ -2384,7 +3207,7 @@ ScmrEnumServicesStatusExW(handle_t BindingHandle,
                  ((wcslen(CurrentService->lpServiceName) + 1) * sizeof(WCHAR)) +
                  ((wcslen(CurrentService->lpDisplayName) + 1) * sizeof(WCHAR));
 
-        if (dwRequiredSize + dwSize <= dwBufSize)
+        if (dwRequiredSize + dwSize <= cbBufSize)
         {
             DPRINT("Service name: %S  fit\n", CurrentService->lpServiceName);
             dwRequiredSize += dwSize;
@@ -2444,12 +3267,12 @@ ScmrEnumServicesStatusExW(handle_t BindingHandle,
 
     DPRINT("*pcbBytesNeeded: %lu\n", dwRequiredSize);
 
-    *lpResumeHandle = dwLastResumeCount;
+    *lpResumeIndex = dwLastResumeCount;
     *lpServicesReturned = dwServiceCount;
     *pcbBytesNeeded = dwRequiredSize;
 
-    lpStatusPtr = (LPENUM_SERVICE_STATUS_PROCESSW)lpServices;
-    lpStringPtr = (LPWSTR)((ULONG_PTR)lpServices +
+    lpStatusPtr = (LPENUM_SERVICE_STATUS_PROCESSW)lpBuffer;
+    lpStringPtr = (LPWSTR)((ULONG_PTR)lpBuffer +
                            dwServiceCount * sizeof(ENUM_SERVICE_STATUS_PROCESSW));
 
     dwRequiredSize = 0;
@@ -2490,18 +3313,18 @@ ScmrEnumServicesStatusExW(handle_t BindingHandle,
                  ((wcslen(CurrentService->lpServiceName) + 1) * sizeof(WCHAR)) +
                  ((wcslen(CurrentService->lpDisplayName) + 1) * sizeof(WCHAR));
 
-        if (dwRequiredSize + dwSize <= dwBufSize)
+        if (dwRequiredSize + dwSize <= cbBufSize)
         {
             /* Copy the service name */
             wcscpy(lpStringPtr,
                    CurrentService->lpServiceName);
-            lpStatusPtr->lpServiceName = (LPWSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpServices);
+            lpStatusPtr->lpServiceName = (LPWSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpBuffer);
             lpStringPtr += (wcslen(CurrentService->lpServiceName) + 1);
 
             /* Copy the display name */
             wcscpy(lpStringPtr,
                    CurrentService->lpDisplayName);
-            lpStatusPtr->lpDisplayName = (LPWSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpServices);
+            lpStatusPtr->lpDisplayName = (LPWSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpBuffer);
             lpStringPtr += (wcslen(CurrentService->lpDisplayName) + 1);
 
             /* Copy the status information */
@@ -2524,14 +3347,173 @@ ScmrEnumServicesStatusExW(handle_t BindingHandle,
 Done:;
     /* Unlock the service list */
 
-    DPRINT("ScmrEnumServicesStatusExW() done (Error %lu)\n", dwError);
+    DPRINT("REnumServicesStatusExW() done (Error %lu)\n", dwError);
 
     return dwError;
 }
 
 
 /* Function 43 */
-/* ScmrSendTSMessage */
+DWORD RSendTSMessage(
+    handle_t BindingHandle)
+{
+    UNIMPLEMENTED;
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/* Function 44 */
+DWORD RCreateServiceWOW64A(
+    handle_t BindingHandle,
+    LPSTR lpServiceName,
+    LPSTR lpDisplayName,
+    DWORD dwDesiredAccess,
+    DWORD dwServiceType,
+    DWORD dwStartType,
+    DWORD dwErrorControl,
+    LPSTR lpBinaryPathName,
+    LPSTR lpLoadOrderGroup,
+    LPDWORD lpdwTagId,
+    LPBYTE lpDependencies,
+    DWORD dwDependSize,
+    LPSTR lpServiceStartName,
+    LPBYTE lpPassword,
+    DWORD dwPwSize,
+    LPSC_RPC_HANDLE lpServiceHandle)
+{
+    UNIMPLEMENTED;
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/* Function 45 */
+DWORD RCreateServiceWOW64W(
+    handle_t BindingHandle,
+    LPWSTR lpServiceName,
+    LPWSTR lpDisplayName,
+    DWORD dwDesiredAccess,
+    DWORD dwServiceType,
+    DWORD dwStartType,
+    DWORD dwErrorControl,
+    LPWSTR lpBinaryPathName,
+    LPWSTR lpLoadOrderGroup,
+    LPDWORD lpdwTagId,
+    LPBYTE lpDependencies,
+    DWORD dwDependSize,
+    LPWSTR lpServiceStartName,
+    LPBYTE lpPassword,
+    DWORD dwPwSize,
+    LPSC_RPC_HANDLE lpServiceHandle)
+{
+    UNIMPLEMENTED;
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/* Function 46 */
+DWORD RQueryServiceTagInfo(
+    handle_t BindingHandle)
+{
+    UNIMPLEMENTED;
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/* Function 47 */
+DWORD RNotifyServiceStatusChange(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    SC_RPC_NOTIFY_PARAMS NotifyParams,
+    GUID *pClientProcessGuid,
+    GUID *pSCMProcessGuid,
+    PBOOL pfCreateRemoteQueue,
+    LPSC_NOTIFY_RPC_HANDLE phNotify)
+{
+    UNIMPLEMENTED;
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/* Function 48 */
+DWORD RGetNotifyResults(
+    handle_t BindingHandle,
+    SC_NOTIFY_RPC_HANDLE hNotify,
+    PSC_RPC_NOTIFY_PARAMS_LIST *ppNotifyParams)
+{
+    UNIMPLEMENTED;
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/* Function 49 */
+DWORD RCloseNotifyHandle(
+    handle_t BindingHandle,
+    LPSC_NOTIFY_RPC_HANDLE phNotify,
+    PBOOL pfApcFired)
+{
+    UNIMPLEMENTED;
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/* Function 50 */
+DWORD RControlServiceExA(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    DWORD dwControl,
+    DWORD dwInfoLevel)
+{
+    UNIMPLEMENTED;
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/* Function 51 */
+DWORD RControlServiceExW(
+    handle_t BindingHandle,
+    SC_RPC_HANDLE hService,
+    DWORD dwControl,
+    DWORD dwInfoLevel)
+{
+    UNIMPLEMENTED;
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/* Function 52 */
+DWORD RSendPnPMessage(
+    handle_t BindingHandle)
+{
+    UNIMPLEMENTED;
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/* Function 53 */
+DWORD RValidatePnPService(
+    handle_t BindingHandle)
+{
+    UNIMPLEMENTED;
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/* Function 54 */
+DWORD ROpenServiceStatusHandle(
+    handle_t BindingHandle)
+{
+    UNIMPLEMENTED;
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/* Function 55 */
+DWORD RFunction55(
+    handle_t BindingHandle)
+{
+    UNIMPLEMENTED;
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
 
 
 void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len)
@@ -2545,4 +3527,20 @@ void __RPC_USER midl_user_free(void __RPC_FAR * ptr)
     HeapFree(GetProcessHeap(), 0, ptr);
 }
 
+
+void __RPC_USER SC_RPC_HANDLE_rundown(SC_RPC_HANDLE hSCObject)
+{
+}
+
+
+void __RPC_USER SC_RPC_LOCK_rundown(SC_RPC_LOCK Lock)
+{
+}
+
+
+void __RPC_USER SC_NOTIFY_RPC_HANDLE_rundown(SC_NOTIFY_RPC_HANDLE hNotify)
+{
+}
+
+
 /* EOF */