diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c
index 7c826feeb53..fc6dc777810 100644
--- a/dlls/advapi32/service.c
+++ b/dlls/advapi32/service.c
@@ -195,36 +195,6 @@ static inline VOID SERV_free( LPWSTR wstr )
     HeapFree( GetProcessHeap(), 0, wstr );
 }
 
-/******************************************************************************
- * EnumServicesStatusA [ADVAPI32.@]
- */
-BOOL WINAPI
-EnumServicesStatusA( SC_HANDLE hSCManager, DWORD dwServiceType,
-                     DWORD dwServiceState, LPENUM_SERVICE_STATUSA lpServices,
-                     DWORD cbBufSize, LPDWORD pcbBytesNeeded,
-                     LPDWORD lpServicesReturned, LPDWORD lpResumeHandle )
-{	FIXME("%p type=%lx state=%lx %p %lx %p %p %p\n", hSCManager,
-		dwServiceType, dwServiceState, lpServices, cbBufSize,
-		pcbBytesNeeded, lpServicesReturned,  lpResumeHandle);
-	SetLastError (ERROR_ACCESS_DENIED);
-	return FALSE;
-}
-
-/******************************************************************************
- * EnumServicesStatusW [ADVAPI32.@]
- */
-BOOL WINAPI
-EnumServicesStatusW( SC_HANDLE hSCManager, DWORD dwServiceType,
-                     DWORD dwServiceState, LPENUM_SERVICE_STATUSW lpServices,
-                     DWORD cbBufSize, LPDWORD pcbBytesNeeded,
-                     LPDWORD lpServicesReturned, LPDWORD lpResumeHandle )
-{	FIXME("%p type=%lx state=%lx %p %lx %p %p %p\n", hSCManager,
-		dwServiceType, dwServiceState, lpServices, cbBufSize,
-		pcbBytesNeeded, lpServicesReturned,  lpResumeHandle);
-	SetLastError (ERROR_ACCESS_DENIED);
-	return FALSE;
-}
-
 /******************************************************************************
  * read_scm_lock_data
  *
@@ -1820,36 +1790,78 @@ QueryServiceConfigW( SC_HANDLE hService,
     return TRUE;
 }
 
+/******************************************************************************
+ * EnumServicesStatusA [ADVAPI32.@]
+ */
+BOOL WINAPI
+EnumServicesStatusA( SC_HANDLE hSCManager, DWORD dwServiceType,
+                     DWORD dwServiceState, LPENUM_SERVICE_STATUSA lpServices,
+                     DWORD cbBufSize, LPDWORD pcbBytesNeeded,
+                     LPDWORD lpServicesReturned, LPDWORD lpResumeHandle )
+{
+    FIXME("%p type=%lx state=%lx %p %lx %p %p %p\n", hSCManager,
+          dwServiceType, dwServiceState, lpServices, cbBufSize,
+          pcbBytesNeeded, lpServicesReturned,  lpResumeHandle);
+    SetLastError (ERROR_ACCESS_DENIED);
+    return FALSE;
+}
+
+/******************************************************************************
+ * EnumServicesStatusW [ADVAPI32.@]
+ */
+BOOL WINAPI
+EnumServicesStatusW( SC_HANDLE hSCManager, DWORD dwServiceType,
+                     DWORD dwServiceState, LPENUM_SERVICE_STATUSW lpServices,
+                     DWORD cbBufSize, LPDWORD pcbBytesNeeded,
+                     LPDWORD lpServicesReturned, LPDWORD lpResumeHandle )
+{
+    FIXME("%p type=%lx state=%lx %p %lx %p %p %p\n", hSCManager,
+          dwServiceType, dwServiceState, lpServices, cbBufSize,
+          pcbBytesNeeded, lpServicesReturned,  lpResumeHandle);
+    SetLastError (ERROR_ACCESS_DENIED);
+    return FALSE;
+}
+
+/******************************************************************************
+ * GetServiceKeyNameA [ADVAPI32.@]
+ */
 BOOL WINAPI GetServiceKeyNameA( SC_HANDLE hSCManager, LPCSTR lpDisplayName,
                                 LPSTR lpServiceName, LPDWORD lpcchBuffer )
 {
     FIXME("%p %s %p %p\n", hSCManager, debugstr_a(lpDisplayName), lpServiceName, lpcchBuffer);
-
     return FALSE;
 }
 
+/******************************************************************************
+ * GetServiceKeyNameW [ADVAPI32.@]
+ */
 BOOL WINAPI GetServiceKeyNameW( SC_HANDLE hSCManager, LPCWSTR lpDisplayName,
                                 LPWSTR lpServiceName, LPDWORD lpcchBuffer )
 {
     FIXME("%p %s %p %p\n", hSCManager, debugstr_w(lpDisplayName), lpServiceName, lpcchBuffer);
-
     return FALSE;
 }
 
+/******************************************************************************
+ * QueryServiceLockStatusA [ADVAPI32.@]
+ */
 BOOL WINAPI QueryServiceLockStatusA( SC_HANDLE hSCManager,
                                      LPQUERY_SERVICE_LOCK_STATUSA lpLockStatus,
                                      DWORD cbBufSize, LPDWORD pcbBytesNeeded)
 {
-    FIXME("%p %p 0x%08lx %p - stub\n", hSCManager, lpLockStatus, cbBufSize, pcbBytesNeeded);
+    FIXME("%p %p %08lx %p\n", hSCManager, lpLockStatus, cbBufSize, pcbBytesNeeded);
 
     return FALSE;
 }
 
+/******************************************************************************
+ * QueryServiceLockStatusW [ADVAPI32.@]
+ */
 BOOL WINAPI QueryServiceLockStatusW( SC_HANDLE hSCManager,
                                      LPQUERY_SERVICE_LOCK_STATUSW lpLockStatus,
                                      DWORD cbBufSize, LPDWORD pcbBytesNeeded)
 {
-    FIXME("%p %p 0x%08lx %p - stub\n", hSCManager, lpLockStatus, cbBufSize, pcbBytesNeeded);
+    FIXME("%p %p %08lx %p\n", hSCManager, lpLockStatus, cbBufSize, pcbBytesNeeded);
 
     return FALSE;
 }
@@ -1865,7 +1877,6 @@ BOOL WINAPI GetServiceDisplayNameA( SC_HANDLE hSCManager, LPCSTR lpServiceName,
     return FALSE;
 }
 
-
 /******************************************************************************
  * GetServiceDisplayNameW  [ADVAPI32.@]
  */
@@ -1877,7 +1888,6 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName,
     return FALSE;
 }
 
-
 /******************************************************************************
  * ChangeServiceConfigW  [ADVAPI32.@]
  */
@@ -2023,10 +2033,10 @@ BOOL WINAPI QueryServiceObjectSecurity(SC_HANDLE hService,
        DWORD cbBufSize, LPDWORD pcbBytesNeeded)
 {
     PACL pACL = NULL;
+
     FIXME("%p %ld %p %lu %p\n", hService, dwSecurityInformation,
           lpSecurityDescriptor, cbBufSize, pcbBytesNeeded);
 
-
     InitializeSecurityDescriptor(lpSecurityDescriptor, SECURITY_DESCRIPTOR_REVISION);
 
     pACL = HeapAlloc( GetProcessHeap(), 0, sizeof(ACL) );
@@ -2046,13 +2056,15 @@ BOOL WINAPI SetServiceObjectSecurity(SC_HANDLE hService,
     return TRUE;
 }
 
+/******************************************************************************
+ * SetServiceBits [ADVAPI32.@]
+ */
 BOOL WINAPI SetServiceBits( SERVICE_STATUS_HANDLE hServiceStatus,
         DWORD dwServiceBits,
         BOOL bSetBitsOn,
         BOOL bUpdateImmediately)
 {
-    FIXME("0x%08lx 0x%08lx %x %x - stub\n", hServiceStatus, dwServiceBits,
+    FIXME("%08lx %08lx %x %x\n", hServiceStatus, dwServiceBits,
           bSetBitsOn, bUpdateImmediately);
-
     return TRUE;
 }