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

svn path=/trunk/; revision=20477
This commit is contained in:
Andrew Munger
2005-12-31 01:38:59 +00:00
parent e1a79c8b7f
commit 0f3dff0211
+4 -21
View File
@@ -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
}