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

launcher: work around Win7 CreateProcess problem

Browse Source
This commit is contained in:
Bill Zissimopoulos 2017-12-11 21:40:47 -08:00
parent b2e474658d
commit 35255526d3
No known key found for this signature in database
GPG Key ID: 3D4F95D52C7B3EA3
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/launcher/launcher.c
View File

@ -21,14 +21,16 @@
#define PROGNAME "WinFsp.Launcher" #define PROGNAME "WinFsp.Launcher"
BOOL CreateOverlappedPipe( BOOL CreateOverlappedPipe(
PHANDLE PReadPipe, PSECURITY_ATTRIBUTES ReadSecurityAttributes, PHANDLE PReadPipe, PHANDLE PWritePipe,
PHANDLE PWritePipe, PSECURITY_ATTRIBUTES WriteSecurityAttributes,
DWORD Size, DWORD Size,
BOOL ReadInherit, BOOL WriteInherit,
DWORD ReadMode, DWORD WriteMode) DWORD ReadMode, DWORD WriteMode)
{ {
RPC_STATUS RpcStatus; RPC_STATUS RpcStatus;
UUID Uuid; UUID Uuid;
WCHAR PipeNameBuf[MAX_PATH]; WCHAR PipeNameBuf[MAX_PATH];
SECURITY_ATTRIBUTES ReadSecurityAttributes = { sizeof(SECURITY_ATTRIBUTES), 0, ReadInherit };
SECURITY_ATTRIBUTES WriteSecurityAttributes = { sizeof(SECURITY_ATTRIBUTES), 0, WriteInherit };
HANDLE ReadPipe, WritePipe; HANDLE ReadPipe, WritePipe;
DWORD LastError; DWORD LastError;
@ -48,13 +50,13 @@ BOOL CreateOverlappedPipe(
ReadPipe = CreateNamedPipeW(PipeNameBuf, ReadPipe = CreateNamedPipeW(PipeNameBuf,
PIPE_ACCESS_INBOUND | FILE_FLAG_FIRST_PIPE_INSTANCE | ReadMode, PIPE_ACCESS_INBOUND | FILE_FLAG_FIRST_PIPE_INSTANCE | ReadMode,
PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT | PIPE_REJECT_REMOTE_CLIENTS, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT | PIPE_REJECT_REMOTE_CLIENTS,
1, Size, Size, 120 * 1000, ReadSecurityAttributes); 1, Size, Size, 120 * 1000, &ReadSecurityAttributes);
if (INVALID_HANDLE_VALUE == ReadPipe) if (INVALID_HANDLE_VALUE == ReadPipe)
return FALSE; return FALSE;
WritePipe = CreateFileW(PipeNameBuf, WritePipe = CreateFileW(PipeNameBuf,
GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
WriteSecurityAttributes, OPEN_EXISTING, WriteMode, 0); &WriteSecurityAttributes, OPEN_EXISTING, WriteMode, 0);
if (INVALID_HANDLE_VALUE == WritePipe) if (INVALID_HANDLE_VALUE == WritePipe)
{ {
LastError = GetLastError(); LastError = GetLastError();
@ -385,7 +387,6 @@ NTSTATUS SvcInstanceCreateProcess(PWSTR Executable, PWSTR CommandLine,
STARTUPINFOEXW StartupInfoEx; STARTUPINFOEXW StartupInfoEx;
HANDLE ChildHandles[3] = { INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, 0/* DO NOT CLOSE!*/ }; HANDLE ChildHandles[3] = { INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, 0/* DO NOT CLOSE!*/ };
HANDLE ParentHandles[2] = { INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE }; HANDLE ParentHandles[2] = { INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE };
SECURITY_ATTRIBUTES PipeAttributesInherit = { sizeof(SECURITY_ATTRIBUTES), 0, TRUE };
PPROC_THREAD_ATTRIBUTE_LIST AttrList = 0; PPROC_THREAD_ATTRIBUTE_LIST AttrList = 0;
SIZE_T Size; SIZE_T Size;
NTSTATUS Result; NTSTATUS Result;
@ -403,20 +404,16 @@ NTSTATUS SvcInstanceCreateProcess(PWSTR Executable, PWSTR CommandLine,
*/ */
/* create stdin read/write ends; make them inheritable */ /* create stdin read/write ends; make them inheritable */
if (!CreateOverlappedPipe( if (!CreateOverlappedPipe(&ChildHandles[0], &ParentHandles[0],
&ChildHandles[0], &PipeAttributesInherit, 0, TRUE, FALSE, 0, 0))
&ParentHandles[0], 0,
0, 0, 0))
{ {
Result = FspNtStatusFromWin32(GetLastError()); Result = FspNtStatusFromWin32(GetLastError());
goto exit; goto exit;
} }
/* create stdout read/write ends; make them inheritable */ /* create stdout read/write ends; make them inheritable */
if (!CreateOverlappedPipe( if (!CreateOverlappedPipe(&ParentHandles[1], &ChildHandles[1],
&ParentHandles[1], 0, 0, FALSE, TRUE, FILE_FLAG_OVERLAPPED, 0))
&ChildHandles[1], &PipeAttributesInherit,
0, FILE_FLAG_OVERLAPPED, 0))
{ {
Result = FspNtStatusFromWin32(GetLastError()); Result = FspNtStatusFromWin32(GetLastError());
goto exit; goto exit;