Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-04-23 00:43:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

launcher: testing

Browse Source
This commit is contained in:
Bill Zissimopoulos 2016-05-13 12:38:30 -07:00
parent be952729c9
commit 0c6300b97c
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/launcher/launcher.c
View File

@ -96,8 +96,8 @@ static NTSTATUS SvcInstanceReplaceArguments(PWSTR String, ULONG Argc, PWSTR *Arg
{ {
case L'%': case L'%':
P++; P++;
if (L'1' <= *P && *P <= '9' && Argc > (ULONG)(*P - L'1')) if (L'0' <= *P && *P <= '9' && Argc > (ULONG)(*P - L'0'))
Length += SvcInstanceArgumentLength(Argv[*P - L'1']); Length += SvcInstanceArgumentLength(Argv[*P - L'0']);
else else
Length++; Length++;
break; break;
@ -117,8 +117,8 @@ static NTSTATUS SvcInstanceReplaceArguments(PWSTR String, ULONG Argc, PWSTR *Arg
{ {
case L'%': case L'%':
P++; P++;
if (L'1' <= *P && *P <= '9' && Argc > (ULONG)(*P - L'1')) if (L'0' <= *P && *P <= '9' && Argc > (ULONG)(*P - L'0'))
Q = SvcInstanceArgumentCopy(Q, Argv[*P - L'1']); Q = SvcInstanceArgumentCopy(Q, Argv[*P - L'0']);
else else
*Q++ = *P; *Q++ = *P;
break; break;
@ -163,22 +163,30 @@ static NTSTATUS SvcInstanceAccessCheck(HANDLE ClientToken, ULONG DesiredAccess,
} }
NTSTATUS SvcInstanceCreate(HANDLE ClientToken, NTSTATUS SvcInstanceCreate(HANDLE ClientToken,
PWSTR ClassName, PWSTR InstanceName, ULONG Argc, PWSTR *Argv, PWSTR ClassName, PWSTR InstanceName, ULONG Argc, PWSTR *Argv0,
SVC_INSTANCE **PSvcInstance) SVC_INSTANCE **PSvcInstance)
{ {
SVC_INSTANCE *SvcInstance = 0; SVC_INSTANCE *SvcInstance = 0;
HKEY RegKey = 0; HKEY RegKey = 0;
DWORD RegResult, RegSize; DWORD RegResult, RegSize;
DWORD ClassNameSize, InstanceNameSize; DWORD ClassNameSize, InstanceNameSize;
WCHAR Executable[MAX_PATH], CommandLine[512], SecurityBuf[512] = L"O:SYG:SY"; WCHAR Executable[MAX_PATH], CommandLineBuf[512] = L"%0 ", SecurityBuf[512] = L"O:SYG:SY";
PWSTR Security; PWSTR CommandLine, Security;
PSECURITY_DESCRIPTOR SecurityDescriptor; PSECURITY_DESCRIPTOR SecurityDescriptor;
PWSTR Argv[10];
STARTUPINFOW StartupInfo; STARTUPINFOW StartupInfo;
PROCESS_INFORMATION ProcessInfo; PROCESS_INFORMATION ProcessInfo;
NTSTATUS Result; NTSTATUS Result;
*PSvcInstance = 0; *PSvcInstance = 0;
if (Argc > sizeof Argv / sizeof Argv[0] - 1)
Argc = sizeof Argv / sizeof Argv[0] - 1;
for (ULONG Argi = 0; Argc > Argi; Argi++)
Argv[Argi + 1] = Argv0[Argi];
Argv[0] = 0;
Argc++;
EnterCriticalSection(&SvcInstanceLock); EnterCriticalSection(&SvcInstanceLock);
if (0 != SvcInstanceLookup(ClassName, InstanceName)) if (0 != SvcInstanceLookup(ClassName, InstanceName))
@ -203,9 +211,10 @@ NTSTATUS SvcInstanceCreate(HANDLE ClientToken,
Result = FspNtStatusFromWin32(RegResult); Result = FspNtStatusFromWin32(RegResult);
goto exit; goto exit;
} }
Argv[0] = Executable;
RegSize = sizeof CommandLine; CommandLine = CommandLineBuf + lstrlenW(CommandLineBuf);
CommandLine[0] = L'\0'; RegSize = (DWORD)(sizeof CommandLineBuf - (CommandLine - CommandLineBuf) * sizeof(WCHAR));
RegResult = RegGetValueW(RegKey, ClassName, L"CommandLine", RRF_RT_REG_SZ, 0, RegResult = RegGetValueW(RegKey, ClassName, L"CommandLine", RRF_RT_REG_SZ, 0,
CommandLine, &RegSize); CommandLine, &RegSize);
if (ERROR_SUCCESS != RegResult && ERROR_FILE_NOT_FOUND != RegResult) if (ERROR_SUCCESS != RegResult && ERROR_FILE_NOT_FOUND != RegResult)
@ -213,6 +222,9 @@ NTSTATUS SvcInstanceCreate(HANDLE ClientToken,
Result = FspNtStatusFromWin32(RegResult); Result = FspNtStatusFromWin32(RegResult);
goto exit; goto exit;
} }
if (ERROR_FILE_NOT_FOUND == RegResult)
CommandLine[-1] = L'\0';
CommandLine = CommandLineBuf;
Security = SecurityBuf + lstrlenW(SecurityBuf); Security = SecurityBuf + lstrlenW(SecurityBuf);
RegSize = (DWORD)(sizeof SecurityBuf - (Security - SecurityBuf) * sizeof(WCHAR)); RegSize = (DWORD)(sizeof SecurityBuf - (Security - SecurityBuf) * sizeof(WCHAR));
@ -262,12 +274,9 @@ NTSTATUS SvcInstanceCreate(HANDLE ClientToken,
SvcInstance->InstanceName = SvcInstance->Buffer + ClassNameSize / sizeof(WCHAR); SvcInstance->InstanceName = SvcInstance->Buffer + ClassNameSize / sizeof(WCHAR);
SvcInstance->SecurityDescriptor = SecurityDescriptor; SvcInstance->SecurityDescriptor = SecurityDescriptor;
if (L'\0' != CommandLine[0])
{
Result = SvcInstanceReplaceArguments(CommandLine, Argc, Argv, &SvcInstance->CommandLine); Result = SvcInstanceReplaceArguments(CommandLine, Argc, Argv, &SvcInstance->CommandLine);
if (!NT_SUCCESS(Result)) if (!NT_SUCCESS(Result))
goto exit; goto exit;
}
memset(&StartupInfo, 0, sizeof StartupInfo); memset(&StartupInfo, 0, sizeof StartupInfo);
StartupInfo.cb = sizeof StartupInfo; StartupInfo.cb = sizeof StartupInfo;