From: Andrew Munger <waxdragon@gmail.com>
Date: Sat, 31 Dec 2005 01:38:59 +0000 (+0000)
Subject: Revert 20343, which puts the implementation of QueryServiceConfigW back into place... 
X-Git-Tag: backups/expat-rbuild@40467~666
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=0f3dff0211dd1a47d463fdbcc02a8524e526464f;ds=sidebyside

Revert 20343, which puts the implementation of QueryServiceConfigW back into place. (20255)

svn path=/trunk/; revision=20477
---

diff --git a/reactos/lib/advapi32/service/scm.c b/reactos/lib/advapi32/service/scm.c
index 0f7997cab35..1846689a725 100644
--- a/reactos/lib/advapi32/service/scm.c
+++ b/reactos/lib/advapi32/service/scm.c
@@ -504,7 +504,7 @@ CreateServiceW(SC_HANDLE hSCManager,
     DWORD dwLength;
     LPWSTR lpStr;
 
-    DPRINT("CreateServiceW() called\n");
+    DPRINT1("CreateServiceW() called\n");
 
     /* Calculate the Dependencies length*/
     if (lpDependencies != NULL)
@@ -543,7 +543,7 @@ CreateServiceW(SC_HANDLE hSCManager,
                                  (unsigned int *)&hService);
     if (dwError != ERROR_SUCCESS)
     {
-        DPRINT1("ScmrCreateServiceW(%S) failed (Error %lu)\n", lpServiceName, dwError);
+        DPRINT1("ScmrCreateServiceW() failed (Error %lu)\n", dwError);
         SetLastError(dwError);
         return NULL;
     }
@@ -1132,7 +1132,7 @@ OpenServiceA(SC_HANDLE hSCManager,
                                (unsigned int*)&hService);
     if (dwError != ERROR_SUCCESS)
     {
-        DPRINT("ScmrOpenServiceA(%s) failed (Error %lu)\n", lpServiceName, dwError);
+        DPRINT1("ScmrOpenServiceA() failed (Error %lu)\n", dwError);
         SetLastError(dwError);
         return NULL;
     }
@@ -1169,7 +1169,7 @@ OpenServiceW(SC_HANDLE hSCManager,
                                (unsigned int*)&hService);
     if (dwError != ERROR_SUCCESS)
     {
-        DPRINT("ScmrOpenServiceW(%S) failed (Error %lu)\n", lpServiceName, dwError);
+        DPRINT1("ScmrOpenServiceW() failed (Error %lu)\n", dwError);
         SetLastError(dwError);
         return NULL;
     }
@@ -1254,7 +1254,6 @@ QueryServiceConfigW(SC_HANDLE hService,
                     DWORD cbBufSize,
                     LPDWORD pcbBytesNeeded)
 {
-#if 0
     DWORD dwError;
 
     DPRINT("QueryServiceConfigW(%p, %p, %lu, %p)\n",
@@ -1263,13 +1262,11 @@ QueryServiceConfigW(SC_HANDLE hService,
     HandleBind();
 
     /* Call to services.exe using RPC */
-    CHECKPOINT1;
     dwError = ScmrQueryServiceConfigW(BindingHandle,
                                       (unsigned int)hService,
                                       (unsigned char *)lpServiceConfig,
                                       cbBufSize,
                                       pcbBytesNeeded);
-    CHECKPOINT1;
     if (dwError != ERROR_SUCCESS)
     {
         DPRINT("ScmrQueryServiceConfigW() failed (Error %lu)\n", dwError);
@@ -1306,20 +1303,6 @@ QueryServiceConfigW(SC_HANDLE hService,
     DPRINT("QueryServiceConfigW() done\n");
 
     return TRUE;
-#else
-    DPRINT1("QueryServiceConfigW is unimplemented\n");
-    if (lpServiceConfig && cbBufSize >= sizeof(QUERY_SERVICE_CONFIGW))
-    {
-        memset(lpServiceConfig, 0, *pcbBytesNeeded);
-        return TRUE;
-    }
-    else
-    {
-        *pcbBytesNeeded = sizeof(QUERY_SERVICE_CONFIGW);
-        SetLastError(ERROR_INSUFFICIENT_BUFFER);
-        return FALSE;
-    }
-#endif
 }