Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

GetServiceDisplayNameA/W and GetServiceKeyNameA/W must return an empty String if the given Buffer is too small. This fixes 6 tests.

Browse source 
svn path=/trunk/; revision=45366
This commit is contained in:
Eric Kohl 2010-01-31 22:22:50 +00:00
parent 661d200caa
commit a6d399d000
1 changed files with 44 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
reactos/dll/win32/advapi32/service/scm.c
View file

@ -1289,6 +1289,8 @@ GetServiceDisplayNameA(SC_HANDLE hSCManager,
LPDWORD lpcchBuffer)
{
DWORD dwError;
LPSTR lpNameBuffer;
CHAR szEmptyName[] = "";
TRACE("GetServiceDisplayNameA() called\n");
TRACE("%p %s %p %p\n", hSCManager,
@ -1300,14 +1302,21 @@ GetServiceDisplayNameA(SC_HANDLE hSCManager,
return FALSE;
}
if (!lpDisplayName)
*lpcchBuffer = 0;
if (!lpDisplayName || *lpcchBuffer < sizeof(CHAR))
{
lpNameBuffer = szEmptyName;
*lpcchBuffer = sizeof(CHAR);
}
else
{
lpNameBuffer = lpDisplayName;
}
RpcTryExcept
{
dwError = RGetServiceDisplayNameA((SC_RPC_HANDLE)hSCManager,
lpServiceName,
lpDisplayName,
lpNameBuffer,
lpcchBuffer);
}
RpcExcept(EXCEPTION_EXECUTE_HANDLER)
@ -1315,8 +1324,6 @@ GetServiceDisplayNameA(SC_HANDLE hSCManager,
/* HACK: because of a problem with rpcrt4, rpcserver is hacked to return 6 for ERROR_SERVICE_DOES_NOT_EXIST */
dwError = ScmRpcStatusToWinError(RpcExceptionCode());
}
RpcEndExcept;
if (dwError != ERROR_SUCCESS)
@ -1342,6 +1349,8 @@ GetServiceDisplayNameW(SC_HANDLE hSCManager,
LPDWORD lpcchBuffer)
{
DWORD dwError;
LPWSTR lpNameBuffer;
WCHAR szEmptyName[] = L"";
TRACE("GetServiceDisplayNameW() called\n");
@ -1351,14 +1360,21 @@ GetServiceDisplayNameW(SC_HANDLE hSCManager,
return FALSE;
}
if (!lpDisplayName)
*lpcchBuffer = 0;
if (!lpDisplayName || *lpcchBuffer < sizeof(WCHAR))
{
lpNameBuffer = szEmptyName;
*lpcchBuffer = sizeof(WCHAR);
}
else
{
lpNameBuffer = lpDisplayName;
}
RpcTryExcept
{
dwError = RGetServiceDisplayNameW((SC_RPC_HANDLE)hSCManager,
lpServiceName,
lpDisplayName,
lpNameBuffer,
lpcchBuffer);
}
RpcExcept(EXCEPTION_EXECUTE_HANDLER)
@ -1390,6 +1406,8 @@ GetServiceKeyNameA(SC_HANDLE hSCManager,
LPDWORD lpcchBuffer)
{
DWORD dwError;
LPSTR lpNameBuffer;
CHAR szEmptyName[] = "";
TRACE("GetServiceKeyNameA() called\n");
@ -1399,23 +1417,21 @@ GetServiceKeyNameA(SC_HANDLE hSCManager,
return FALSE;
}
if (!lpDisplayName)
if (!lpServiceName || *lpcchBuffer < sizeof(CHAR))
{
SetLastError(ERROR_INVALID_ADDRESS);
if (!lpServiceName)
*lpcchBuffer = 1;
return FALSE;
lpNameBuffer = szEmptyName;
*lpcchBuffer = sizeof(CHAR);
}
else
{
lpNameBuffer = lpServiceName;
}
if (!lpServiceName)
*lpcchBuffer = 0;
RpcTryExcept
{
dwError = RGetServiceKeyNameA((SC_RPC_HANDLE)hSCManager,
lpDisplayName,
lpServiceName,
lpNameBuffer,
lpcchBuffer);
}
RpcExcept(EXCEPTION_EXECUTE_HANDLER)
@ -1447,6 +1463,8 @@ GetServiceKeyNameW(SC_HANDLE hSCManager,
LPDWORD lpcchBuffer)
{
DWORD dwError;
LPWSTR lpNameBuffer;
WCHAR szEmptyName[] = L"";
TRACE("GetServiceKeyNameW() called\n");
@ -1456,23 +1474,21 @@ GetServiceKeyNameW(SC_HANDLE hSCManager,
return FALSE;
}
if (!lpDisplayName)
if (!lpServiceName || *lpcchBuffer < sizeof(WCHAR))
{
SetLastError(ERROR_INVALID_ADDRESS);
if (!lpServiceName)
*lpcchBuffer = 1;
return FALSE;
lpNameBuffer = szEmptyName;
*lpcchBuffer = sizeof(WCHAR);
}
else
{
lpNameBuffer = lpServiceName;
}
if (!lpServiceName)
*lpcchBuffer = 0;
RpcTryExcept
{
dwError = RGetServiceKeyNameW((SC_RPC_HANDLE)hSCManager,
lpDisplayName,
lpServiceName,
lpNameBuffer,
lpcchBuffer);
}
RpcExcept(EXCEPTION_EXECUTE_HANDLER)