mirror of
https://github.com/reactos/reactos.git
synced 2025-06-10 04:14:53 +00:00
[SERVICES]
RStartServiceA: Convert the ANSI start arguments vector to a UNICODE vector and pass it to ScmStartService. Calls to StartServiceA can now be used to pass arguments to a starting service. svn path=/trunk/; revision=53579
This commit is contained in:
parent
acbe8f03e5
commit
7f50216c38
1 changed files with 50 additions and 3 deletions
|
@ -4086,6 +4086,9 @@ DWORD RStartServiceA(
|
|||
DWORD dwError = ERROR_SUCCESS;
|
||||
PSERVICE_HANDLE hSvc;
|
||||
PSERVICE lpService = NULL;
|
||||
LPWSTR *lpVector = NULL;
|
||||
DWORD i;
|
||||
DWORD dwLength;
|
||||
|
||||
DPRINT("RStartServiceA() called\n");
|
||||
|
||||
|
@ -4119,12 +4122,56 @@ DWORD RStartServiceA(
|
|||
if (lpService->bDeleted)
|
||||
return ERROR_SERVICE_MARKED_FOR_DELETE;
|
||||
|
||||
/* FIXME: Convert argument vector to Unicode */
|
||||
/* Build a Unicode argument vector */
|
||||
if (argc > 0)
|
||||
{
|
||||
lpVector = HeapAlloc(GetProcessHeap(),
|
||||
HEAP_ZERO_MEMORY,
|
||||
argc * sizeof(LPWSTR));
|
||||
if (lpVector == NULL)
|
||||
return ERROR_NOT_ENOUGH_MEMORY;
|
||||
|
||||
for (i = 0; i < argc; i++)
|
||||
{
|
||||
dwLength = MultiByteToWideChar(CP_ACP,
|
||||
0,
|
||||
((LPSTR*)argv)[i],
|
||||
-1,
|
||||
NULL,
|
||||
0);
|
||||
|
||||
lpVector[i] = HeapAlloc(GetProcessHeap(),
|
||||
HEAP_ZERO_MEMORY,
|
||||
dwLength * sizeof(WCHAR));
|
||||
if (lpVector[i] == NULL)
|
||||
{
|
||||
dwError = ERROR_NOT_ENOUGH_MEMORY;
|
||||
goto done;
|
||||
}
|
||||
|
||||
MultiByteToWideChar(CP_ACP,
|
||||
0,
|
||||
((LPSTR*)argv)[i],
|
||||
-1,
|
||||
lpVector[i],
|
||||
dwLength);
|
||||
}
|
||||
}
|
||||
|
||||
/* Start the service */
|
||||
dwError = ScmStartService(lpService, 0, NULL);
|
||||
dwError = ScmStartService(lpService, argc, lpVector);
|
||||
|
||||
/* FIXME: Free argument vector */
|
||||
done:
|
||||
/* Free the Unicode argument vector */
|
||||
if (lpVector != NULL)
|
||||
{
|
||||
for (i = 0; i < argc; i++)
|
||||
{
|
||||
if (lpVector[i] != NULL)
|
||||
HeapFree(GetProcessHeap(), 0, lpVector[i]);
|
||||
}
|
||||
HeapFree(GetProcessHeap(), 0, lpVector);
|
||||
}
|
||||
|
||||
return dwError;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue