Author: ekohl
Date: Sat Feb 20 17:33:28 2010
New Revision: 45636
URL:
http://svn.reactos.org/svn/reactos?rev=45636&view=rev
Log:
[ADVAPI32]
Silence a lot of non-critical service manager error messages (ERR->TRACE).
Modified:
trunk/reactos/dll/win32/advapi32/service/scm.c
Modified: trunk/reactos/dll/win32/advapi32/service/scm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sat Feb 20 17:33:28 2010
@@ -258,7 +258,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RChangeServiceConfig2A() failed (Error %lu)\n", dwError);
+ TRACE("RChangeServiceConfig2A() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -316,7 +316,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RChangeServiceConfig2W() failed (Error %lu)\n", dwError);
+ TRACE("RChangeServiceConfig2W() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -390,7 +390,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RChangeServiceConfigA() failed (Error %lu)\n", dwError);
+ TRACE("RChangeServiceConfigA() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -464,7 +464,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RChangeServiceConfigW() failed (Error %lu)\n", dwError);
+ TRACE("RChangeServiceConfigW() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -504,7 +504,7 @@
if (dwError)
{
- ERR("RCloseServiceHandle() failed (Error %lu)\n", dwError);
+ TRACE("RCloseServiceHandle() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -545,7 +545,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RControlService() failed (Error %lu)\n", dwError);
+ TRACE("RControlService() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -653,7 +653,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RCreateServiceA() failed (Error %lu)\n", dwError);
+ TRACE("RCreateServiceA() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return NULL;
}
@@ -743,7 +743,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RCreateServiceW() failed (Error %lu)\n", dwError);
+ TRACE("RCreateServiceW() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return NULL;
}
@@ -777,7 +777,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RDeleteService() failed (Error %lu)\n", dwError);
+ TRACE("RDeleteService() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -839,7 +839,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("REnumDependentServicesA() failed (Error %lu)\n", dwError);
+ TRACE("REnumDependentServicesA() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -903,7 +903,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("REnumDependentServicesW() failed (Error %lu)\n", dwError);
+ TRACE("REnumDependentServicesW() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -1037,7 +1037,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("REnumServicesStatusA() failed (Error %lu)\n", dwError);
+ TRACE("REnumServicesStatusA() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -1111,7 +1111,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("REnumServicesStatusW() failed (Error %lu)\n", dwError);
+ TRACE("REnumServicesStatusW() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -1195,7 +1195,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("REnumServicesStatusExA() failed (Error %lu)\n", dwError);
+ TRACE("REnumServicesStatusExA() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -1267,7 +1267,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("REnumServicesStatusExW() failed (Error %lu)\n", dwError);
+ TRACE("REnumServicesStatusExW() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -1329,7 +1329,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RGetServiceDisplayNameA() failed (Error %lu)\n", dwError);
+ TRACE("RGetServiceDisplayNameA() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -1386,7 +1386,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RGetServiceDisplayNameW() failed (Error %lu)\n", dwError);
+ TRACE("RGetServiceDisplayNameW() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -1443,7 +1443,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RGetServiceKeyNameA() failed (Error %lu)\n", dwError);
+ TRACE("RGetServiceKeyNameA() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -1500,7 +1500,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RGetServiceKeyNameW() failed (Error %lu)\n", dwError);
+ TRACE("RGetServiceKeyNameW() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -1536,7 +1536,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RLockServiceDatabase() failed (Error %lu)\n", dwError);
+ TRACE("RLockServiceDatabase() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return NULL;
}
@@ -1621,7 +1621,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("ROpenSCManagerA() failed (Error %lu)\n", dwError);
+ TRACE("ROpenSCManagerA() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return NULL;
}
@@ -1666,7 +1666,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("ROpenSCManagerW() failed (Error %lu)\n", dwError);
+ TRACE("ROpenSCManagerW() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return NULL;
}
@@ -1715,7 +1715,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("ROpenServiceA() failed (Error %lu)\n", dwError);
+ TRACE("ROpenServiceA() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return NULL;
}
@@ -1764,10 +1764,7 @@
if (dwError != ERROR_SUCCESS)
{
- if (dwError == ERROR_SERVICE_DOES_NOT_EXIST)
- WARN("ROpenServiceW() failed (Error %lu)\n", dwError);
- else
- ERR("ROpenServiceW() failed (Error %lu)\n", dwError);
+ TRACE("ROpenServiceW() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return NULL;
}
@@ -1810,7 +1807,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RQueryServiceConfigA() failed (Error %lu)\n", dwError);
+ TRACE("RQueryServiceConfigA() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -1879,10 +1876,7 @@
if (dwError != ERROR_SUCCESS)
{
- if (dwError == ERROR_INSUFFICIENT_BUFFER)
- WARN("RQueryServiceConfigW() failed (Error %lu)\n", dwError);
- else
- ERR("RQueryServiceConfigW() failed (Error %lu)\n", dwError);
+ TRACE("RQueryServiceConfigW() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -1933,8 +1927,8 @@
{
DWORD dwError;
- DbgPrint("QueryServiceConfig2A(hService %p, dwInfoLevel %lu, lpBuffer %p,
cbBufSize %lu, pcbBytesNeeded %p)\n",
- hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded);
+ TRACE("QueryServiceConfig2A(hService %p, dwInfoLevel %lu, lpBuffer %p, cbBufSize
%lu, pcbBytesNeeded %p)\n",
+ hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded);
if (dwInfoLevel != SERVICE_CONFIG_DESCRIPTION &&
dwInfoLevel != SERVICE_CONFIG_FAILURE_ACTIONS)
@@ -1967,7 +1961,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RQueryServiceConfig2A() failed (Error %lu)\n", dwError);
+ TRACE("RQueryServiceConfig2A() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -2062,7 +2056,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RQueryServiceConfig2W() failed (Error %lu)\n", dwError);
+ TRACE("RQueryServiceConfig2W() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -2140,7 +2134,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RQueryServiceLockStatusA() failed (Error %lu)\n", dwError);
+ TRACE("RQueryServiceLockStatusA() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -2188,7 +2182,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RQueryServiceLockStatusW() failed (Error %lu)\n", dwError);
+ TRACE("RQueryServiceLockStatusW() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -2239,7 +2233,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("QueryServiceObjectSecurity() failed (Error %lu)\n", dwError);
+ TRACE("QueryServiceObjectSecurity() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -2307,7 +2301,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RServiceObjectSecurity() failed (Error %lu)\n", dwError);
+ TRACE("RServiceObjectSecurity() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -2350,7 +2344,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RQueryServiceStatus() failed (Error %lu)\n", dwError);
+ TRACE("RQueryServiceStatus() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -2398,7 +2392,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RQueryServiceStatusEx() failed (Error %lu)\n", dwError);
+ TRACE("RQueryServiceStatusEx() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -2433,7 +2427,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RStartServiceA() failed (Error %lu)\n", dwError);
+ TRACE("RStartServiceA() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -2468,7 +2462,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RStartServiceW() failed (Error %lu)\n", dwError);
+ TRACE("RStartServiceW() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -2502,7 +2496,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("RUnlockServiceDatabase() failed (Error %lu)\n", dwError);
+ TRACE("RUnlockServiceDatabase() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}
@@ -2537,7 +2531,7 @@
if (dwError != ERROR_SUCCESS)
{
- ERR("NotifyBootConfigStatus() failed (Error %lu)\n", dwError);
+ TRACE("NotifyBootConfigStatus() failed (Error %lu)\n", dwError);
SetLastError(dwError);
return FALSE;
}