[ros-diffs] [amunger] 20477: Revert 20343, which puts the implementation of QueryServiceConfigW back into place. (20255)

[amunger at svn.reactos.org]

Revert 20343, which puts the implementation of QueryServiceConfigW back
into place. (20255)
Modified: trunk/reactos/lib/advapi32/service/scm.c
  _____  

Modified: trunk/reactos/lib/advapi32/service/scm.c
--- trunk/reactos/lib/advapi32/service/scm.c	2005-12-31 00:03:19 UTC
(rev 20476)
+++ trunk/reactos/lib/advapi32/service/scm.c	2005-12-31 01:38:59 UTC
(rev 20477)
@@ -504,7 +504,7 @@

     DWORD dwLength;
     LPWSTR lpStr;
 
-    DPRINT("CreateServiceW() called\n");
+    DPRINT1("CreateServiceW() called\n");
 
     /* Calculate the Dependencies length*/
     if (lpDependencies != NULL)
@@ -543,7 +543,7 @@
                                  (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 @@
                                (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 @@
                                (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 @@
                     DWORD cbBufSize,
                     LPDWORD pcbBytesNeeded)
 {
-#if 0
     DWORD dwError;
 
     DPRINT("QueryServiceConfigW(%p, %p, %lu, %p)\n",
@@ -1263,13 +1262,11 @@
     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 @@
     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
 }
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20051231/45b4c58f/attachment.html