mirror of
https://github.com/reactos/reactos.git
synced 2025-06-13 02:08:29 +00:00
- Remove unused variable
- Get rid of those ugly single line if-statements. - No code changes svn path=/trunk/; revision=44713
This commit is contained in:
parent
9212e559dc
commit
fa1f780dfb
1 changed files with 12 additions and 7 deletions
|
@ -2228,7 +2228,8 @@ DWORD REnumServicesStatusW(
|
||||||
return ERROR_ACCESS_DENIED;
|
return ERROR_ACCESS_DENIED;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lpResumeHandle) dwLastResumeCount = *lpResumeHandle;
|
if (lpResumeHandle)
|
||||||
|
dwLastResumeCount = *lpResumeHandle;
|
||||||
|
|
||||||
/* FIXME: Lock the service list shared */
|
/* FIXME: Lock the service list shared */
|
||||||
|
|
||||||
|
@ -2306,7 +2307,9 @@ DWORD REnumServicesStatusW(
|
||||||
|
|
||||||
DPRINT("*pcbBytesNeeded: %lu\n", dwRequiredSize);
|
DPRINT("*pcbBytesNeeded: %lu\n", dwRequiredSize);
|
||||||
|
|
||||||
if (lpResumeHandle) *lpResumeHandle = dwLastResumeCount;
|
if (lpResumeHandle)
|
||||||
|
*lpResumeHandle = dwLastResumeCount;
|
||||||
|
|
||||||
*lpServicesReturned = dwServiceCount;
|
*lpServicesReturned = dwServiceCount;
|
||||||
*pcbBytesNeeded = dwRequiredSize;
|
*pcbBytesNeeded = dwRequiredSize;
|
||||||
|
|
||||||
|
@ -3244,7 +3247,8 @@ DWORD REnumDependentServicesA(
|
||||||
KEY_READ,
|
KEY_READ,
|
||||||
&hServicesKey);
|
&hServicesKey);
|
||||||
|
|
||||||
if (dwError != ERROR_SUCCESS) return dwError;
|
if (dwError != ERROR_SUCCESS)
|
||||||
|
return dwError;
|
||||||
|
|
||||||
/* NOTE: Windows calculates the pcbBytesNeeded based on WCHAR strings for
|
/* NOTE: Windows calculates the pcbBytesNeeded based on WCHAR strings for
|
||||||
both EnumDependentServicesA and EnumDependentServicesW. So returned pcbBytesNeeded
|
both EnumDependentServicesA and EnumDependentServicesW. So returned pcbBytesNeeded
|
||||||
|
@ -3376,8 +3380,7 @@ DWORD REnumServicesStatusA(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dwError = REnumServicesStatusW(//BindingHandle,
|
dwError = REnumServicesStatusW(hSCManager,
|
||||||
hSCManager,
|
|
||||||
dwServiceType,
|
dwServiceType,
|
||||||
dwServiceState,
|
dwServiceState,
|
||||||
(LPBYTE)lpStatusPtrW,
|
(LPBYTE)lpStatusPtrW,
|
||||||
|
@ -3387,7 +3390,8 @@ DWORD REnumServicesStatusA(
|
||||||
lpResumeHandle);
|
lpResumeHandle);
|
||||||
|
|
||||||
/* if no services were returned then we are Done */
|
/* if no services were returned then we are Done */
|
||||||
if (*lpServicesReturned == 0) goto Done;
|
if (*lpServicesReturned == 0)
|
||||||
|
goto Done;
|
||||||
|
|
||||||
lpStatusPtrA = (LPENUM_SERVICE_STATUSA)lpBuffer;
|
lpStatusPtrA = (LPENUM_SERVICE_STATUSA)lpBuffer;
|
||||||
lpStringPtrA = (LPSTR)((ULONG_PTR)lpBuffer +
|
lpStringPtrA = (LPSTR)((ULONG_PTR)lpBuffer +
|
||||||
|
@ -3434,7 +3438,8 @@ DWORD REnumServicesStatusA(
|
||||||
}
|
}
|
||||||
|
|
||||||
Done:;
|
Done:;
|
||||||
if (lpStatusPtrW) HeapFree(GetProcessHeap(), 0, lpStatusPtrW);
|
if (lpStatusPtrW)
|
||||||
|
HeapFree(GetProcessHeap(), 0, lpStatusPtrW);
|
||||||
|
|
||||||
DPRINT("REnumServicesStatusA() done (Error %lu)\n", dwError);
|
DPRINT("REnumServicesStatusA() done (Error %lu)\n", dwError);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue