[SERVICES]

ScmWriteDependencies:
- Fixed an off-by-one bug. This bug caused a wrong calculation of the 'DependOnGroup' value data length. Group dependencies were not written properly to the registry.

- Write 'DependOnService' and 'DependOnService' values to the registry only if the dependency strings are not empty. Delete a value if the corresponding dependency string is empty.

This fixes another winetest.

svn path=/trunk/; revision=51172

reactos/base/system/services/config.c

@@ -125,7 +125,7 @@ ScmWriteDependencies(HKEY hServiceKey,
         lpDst = lpGroupDeps;
         while (*lpSrc != 0)
         {
-            dwLength = wcslen(lpSrc);
+            dwLength = wcslen(lpSrc) + 1;
             if (*lpSrc == SC_GROUP_IDENTIFIERW)
             {
                 lpSrc++;
@@ -157,14 +157,24 @@ ScmWriteDependencies(HKEY hServiceKey,
         *lpDst = 0;
         dwServiceLength++;
 
+        if (dwGroupLength > 1)
+        {
             dwError = RegSetValueExW(hServiceKey,
                                      L"DependOnGroup",
                                      0,
                                      REG_MULTI_SZ,
                                      (LPBYTE)lpGroupDeps,
                                      dwGroupLength * sizeof(WCHAR));
+        }
+        else
+        {
+            RegDeleteValueW(hServiceKey,
+                            L"DependOnGroup");
+        }
 
         if (dwError == ERROR_SUCCESS)
+        {
+            if (dwServiceLength > 1)
             {
                 dwError = RegSetValueExW(hServiceKey,
                                          L"DependOnService",
@@ -173,6 +183,12 @@ ScmWriteDependencies(HKEY hServiceKey,
                                          (LPBYTE)lpServiceDeps,
                                          dwServiceLength * sizeof(WCHAR));
             }
+            else
+            {
+                RegDeleteValueW(hServiceKey,
+                                L"DependOnService");
+            }
+        }
 
         HeapFree(GetProcessHeap(), 0, lpGroupDeps);
     }