Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 17:44:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ADVAPI32][SECLOGON] CreateProcessWithLogonW: Pass the environment to the callee

Browse source
This commit is contained in:
Eric Kohl 2023-06-10 14:10:14 +02:00
parent 59e74584ac
commit c3db5e9c8e
3 changed files with 61 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
base/services/seclogon/rpcserver.c
View file

@ -126,11 +126,13 @@ SeclCreateProcessWithLogonW(
}
}
/* Initialize the startup information */
ZeroMemory(&StartupInfo, sizeof(StartupInfo));
StartupInfo.cb = sizeof(StartupInfo);
/* FIXME: Get startup info from the caller */
/* Initialize the process information */
ZeroMemory(&ProcessInfo, sizeof(ProcessInfo));
/* Create Process */
@ -141,7 +143,7 @@ SeclCreateProcessWithLogonW(
NULL, // lpThreadAttributes,
FALSE, // bInheritHandles,
pRequest->dwCreationFlags,
NULL, // lpEnvironment,
pRequest->Environment, // lpEnvironment,
pRequest->CurrentDirectory,
&StartupInfo,
&ProcessInfo);

56
dll/win32/advapi32/wine/security.c
View file

@ -3472,6 +3472,53 @@ ConvertSidToStringSidA(PSID Sid,
return TRUE;
}
static
DWORD
GetUnicodeEnvironmentSize(
PVOID pEnvironment)
{
INT Length, TotalLength = 0;
PWCHAR Ptr;
if (pEnvironment == NULL)
return 0;
Ptr = (PWCHAR)pEnvironment;
while (*Ptr != UNICODE_NULL)
{
Length = wcslen(Ptr) + 1;
TotalLength += Length;
Ptr = Ptr + Length;
}
return (TotalLength + 1) * sizeof(WCHAR);
}
static
DWORD
GetAnsiEnvironmentSize(
PVOID pEnvironment)
{
INT Length, TotalLength = 0;
PCHAR Ptr;
if (pEnvironment == NULL)
return 0;
Ptr = (PCHAR)pEnvironment;
while (*Ptr != ANSI_NULL)
{
Length = strlen(Ptr) + 1;
TotalLength += Length;
Ptr = Ptr + Length;
}
return TotalLength + 1;
}
/*
* @unimplemented
*/
@ -3535,6 +3582,15 @@ CreateProcessWithLogonW(
Request.CommandLine = (LPWSTR)lpCommandLine;
Request.CurrentDirectory = (LPWSTR)lpCurrentDirectory;
if (dwCreationFlags & CREATE_UNICODE_ENVIRONMENT)
Request.dwEnvironmentSize = GetUnicodeEnvironmentSize(lpEnvironment);
else
Request.dwEnvironmentSize = GetAnsiEnvironmentSize(lpEnvironment);
Request.Environment = lpEnvironment;
TRACE("Request.dwEnvironmentSize %lu\n", Request.dwEnvironmentSize);
TRACE("Request.Environment %p\n", Request.Environment);
Request.dwLogonFlags = dwLogonFlags;
Request.dwCreationFlags = dwCreationFlags;

2
sdk/include/reactos/idl/seclogon.idl
View file

@ -12,6 +12,8 @@ typedef struct _SECL_REQUEST
[string] WCHAR *ApplicationName;
[string] WCHAR *CommandLine;
[string] WCHAR *CurrentDirectory;
[size_is(dwEnvironmentSize)] BYTE *Environment;
DWORD dwEnvironmentSize;
DWORD dwLogonFlags;
DWORD dwCreationFlags;
DWORD dwProcessId;