ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 04:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix some QueryServiceConfig2A winetests

Browse Source 
svn path=/trunk/; revision=39433
This commit is contained in:
Christoph von Wittich
2009-02-06 08:51:20 +00:00
parent 7f0c18cb38
commit 18922ff0a4
1 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/base/system/services/rpcserver.c
+26 -24
View File
@@ -4209,7 +4209,6 @@ DWORD RQueryServiceConfig2A(
PSERVICE_HANDLE hSvc;
PSERVICE lpService = NULL;
HKEY hServiceKey = NULL;
DWORD dwRequiredSize;
LPWSTR lpDescriptionW = NULL;
LPSTR lpDescription = NULL;
@@ -4255,39 +4254,42 @@ DWORD RQueryServiceConfig2A(
LPSERVICE_DESCRIPTIONA lpServiceDescription = (LPSERVICE_DESCRIPTIONA)lpBuffer;
LPSTR lpStr;
*pcbBytesNeeded = sizeof(SERVICE_DESCRIPTIONA);
dwError = ScmReadString(hServiceKey,
L"Description",
&lpDescriptionW);
if (dwError != ERROR_SUCCESS)
if (dwError == ERROR_SUCCESS)
{
if (cbBufSize < sizeof(SERVICE_DESCRIPTIONA))
*pcbBytesNeeded += ((wcslen(lpDescriptionW) + 1));
}
if (cbBufSize >= *pcbBytesNeeded)
{
if (dwError == ERROR_SUCCESS)
{
*pcbBytesNeeded = sizeof(SERVICE_DESCRIPTIONA);
dwError = ERROR_INSUFFICIENT_BUFFER;
lpStr = (LPSTR)(lpServiceDescription + 1);
WideCharToMultiByte(CP_ACP,
0,
lpDescriptionW,
-1,
lpStr,
wcslen(lpDescriptionW),
NULL,
NULL);
lpServiceDescription->lpDescription = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceDescription);
}
else
{
lpServiceDescription->lpDescription = NULL;
}
goto done;
}
dwRequiredSize = sizeof(SERVICE_DESCRIPTIONA) + ((wcslen(lpDescriptionW) + 1));
if (cbBufSize < dwRequiredSize)
else
{
*pcbBytesNeeded = dwRequiredSize;
dwError = ERROR_INSUFFICIENT_BUFFER;
goto done;
}
lpStr = (LPSTR)(lpServiceDescription + 1);
WideCharToMultiByte(CP_ACP,
0,
lpDescriptionW,
-1,
lpStr,
wcslen(lpDescriptionW),
NULL,
NULL);
lpServiceDescription->lpDescription = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceDescription);
}
else if (dwInfoLevel & SERVICE_CONFIG_FAILURE_ACTIONS)
{