Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-04 16:36:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SERVICES]

Browse source 
Improve a check in RQueryServiceConfig2W and RQueryServiceConfig2A
Patch by Hermès Bélusca.

See issue #7123 for more details.

svn path=/trunk/; revision=56739
This commit is contained in:
Eric Kohl 2012-06-16 20:00:55 +00:00
parent bb5ffbd494
commit 25dcec8bf3
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/base/system/services/rpcserver.c
View file

@ -5268,7 +5268,7 @@ DWORD RQueryServiceConfig2A(
}
/* Now we can fill the buffer */
if (dwType == REG_BINARY)
if (dwError != ERROR_FILE_NOT_FOUND && dwType == REG_BINARY)
{
dwError = RegQueryValueExW(hServiceKey,
L"FailureActions",
@ -5284,7 +5284,11 @@ DWORD RQueryServiceConfig2A(
}
else
{
dwError = ERROR_UNSUPPORTED_TYPE;
/*
* The value of the error doesn't really matter, the only
* important thing is that it must be != ERROR_SUCCESS .
*/
dwError = ERROR_INVALID_DATA;
}
if (dwError == ERROR_SUCCESS)
@ -5492,7 +5496,7 @@ DWORD RQueryServiceConfig2W(
}
/* Now we can fill the buffer */
if (dwType == REG_BINARY)
if (dwError != ERROR_FILE_NOT_FOUND && dwType == REG_BINARY)
{
dwError = RegQueryValueExW(hServiceKey,
L"FailureActions",
@ -5508,7 +5512,11 @@ DWORD RQueryServiceConfig2W(
}
else
{
dwError = ERROR_UNSUPPORTED_TYPE;
/*
* The value of the error doesn't really matter, the only
* important thing is that it must be != ERROR_SUCCESS .
*/
dwError = ERROR_INVALID_DATA;
}
if (dwError == ERROR_SUCCESS)