Fix Fulltrustprocess on Windows 10 < 2004 (#6600)

gave92 · web-flow · commit f8c8d3156a60 · 2021-10-26T11:03:32.000-04:00
diff --git a/Files.Launcher/DeviceWatcher.cs b/Files.Launcher/DeviceWatcher.cs
@@ -10,11 +10,11 @@ namespace FilesFullTrust
     public class DeviceWatcher : IDisposable
     {
         private ManagementEventWatcher insertWatcher, removeWatcher, modifyWatcher;
-        private NamedPipeServerStream connection;
+        private PipeStream connection;
 
         private const string WpdGuid = "{6ac27878-a6fa-4155-ba85-f98f491d4f33}";
 
-        public DeviceWatcher(NamedPipeServerStream connection)
+        public DeviceWatcher(PipeStream connection)
         {
             this.connection = connection;
         }
diff --git a/Files.Launcher/MessageHandlers/ApplicationLaunchHandler.cs b/Files.Launcher/MessageHandlers/ApplicationLaunchHandler.cs
@@ -16,11 +16,11 @@ namespace FilesFullTrust.MessageHandlers
 {
     public class ApplicationLaunchHandler : IMessageHandler
     {
-        public void Initialize(NamedPipeServerStream connection)
+        public void Initialize(PipeStream connection)
         {
         }
 
-        public Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments)
+        public Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)
         {
             switch (arguments)
             {
diff --git a/Files.Launcher/MessageHandlers/ContextMenuHandler.cs b/Files.Launcher/MessageHandlers/ContextMenuHandler.cs
@@ -23,15 +23,11 @@ public ContextMenuHandler()
             handleTable = new DisposableDictionary();
         }
 
-        public void Initialize(NamedPipeServerStream connection)
+        public void Initialize(PipeStream connection)
         {
-            // Preload context menu for better performance
-            // We query the context menu for the app's local folder
-            var preloadPath = ApplicationData.Current.LocalFolder.Path;
-            using var _ = ContextMenu.GetContextMenuForFiles(new string[] { preloadPath }, Shell32.CMF.CMF_NORMAL | Shell32.CMF.CMF_SYNCCASCADEMENU, FilterMenuItems(false));
         }
 
-        public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments)
+        public async Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)
         {
             switch (arguments)
             {
diff --git a/Files.Launcher/MessageHandlers/FileOperationsHandler.cs b/Files.Launcher/MessageHandlers/FileOperationsHandler.cs
@@ -23,14 +23,14 @@ public class FileOperationsHandler : IMessageHandler
         private FileTagsDb dbInstance;
         private ProgressHandler progressHandler;
 
-        public void Initialize(NamedPipeServerStream connection)
+        public void Initialize(PipeStream connection)
         {
             string fileTagsDbPath = Path.Combine(Windows.Storage.ApplicationData.Current.LocalFolder.Path, "filetags.db");
             dbInstance = new FileTagsDb(fileTagsDbPath, true);
             progressHandler = new ProgressHandler(connection);
         }
 
-        public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments)
+        public async Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)
         {
             switch (arguments)
             {
@@ -40,7 +40,7 @@ public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictiona
             }
         }
 
-        private async Task ParseFileOperationAsync(NamedPipeServerStream connection, Dictionary<string, object> message)
+        private async Task ParseFileOperationAsync(PipeStream connection, Dictionary<string, object> message)
         {
             switch (message.Get("fileop", ""))
             {
@@ -730,7 +730,7 @@ public void Dispose()
         private class ProgressHandler : IDisposable
         {
             private ManualResetEvent operationsCompletedEvent;
-            private NamedPipeServerStream connection;
+            private PipeStream connection;
 
             private class OperationWithProgress
             {
@@ -743,7 +743,7 @@ private class OperationWithProgress
 
             public System.Windows.Forms.IWin32Window OwnerWindow { get; set; }
 
-            public ProgressHandler(NamedPipeServerStream conn)
+            public ProgressHandler(PipeStream conn)
             {
                 taskbar = Win32API.CreateTaskbarObject();
                 operations = new ConcurrentDictionary<string, OperationWithProgress>();
diff --git a/Files.Launcher/MessageHandlers/FileTagsHandler.cs b/Files.Launcher/MessageHandlers/FileTagsHandler.cs
@@ -109,7 +109,7 @@ public void UpdateTagsDb()
             }
         }
 
-        public Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments)
+        public Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)
         {
             switch (arguments)
             {
@@ -120,7 +120,7 @@ public Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<str
             return Task.CompletedTask;
         }
 
-        public void Initialize(NamedPipeServerStream connection)
+        public void Initialize(PipeStream connection)
         {
         }
 
diff --git a/Files.Launcher/MessageHandlers/IMessageHandler.cs b/Files.Launcher/MessageHandlers/IMessageHandler.cs
@@ -7,8 +7,8 @@ namespace FilesFullTrust.MessageHandlers
 {
     public interface IMessageHandler : IDisposable
     {
-        Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments);
+        Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments);
 
-        void Initialize(NamedPipeServerStream connection);
+        void Initialize(PipeStream connection);
     }
 }
diff --git a/Files.Launcher/MessageHandlers/LibrariesHandler.cs b/Files.Launcher/MessageHandlers/LibrariesHandler.cs
@@ -15,11 +15,11 @@ namespace FilesFullTrust.MessageHandlers
 {
     public class LibrariesHandler : IMessageHandler
     {
-        private NamedPipeServerStream connection;
+        private PipeStream connection;
 
         private FileSystemWatcher librariesWatcher;
 
-        public void Initialize(NamedPipeServerStream connection)
+        public void Initialize(PipeStream connection)
         {
             this.connection = connection;
 
@@ -43,7 +43,7 @@ private void StartLibrariesWatcher()
             librariesWatcher.EnableRaisingEvents = true;
         }
 
-        public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments)
+        public async Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)
         {
             switch (arguments)
             {
diff --git a/Files.Launcher/MessageHandlers/NetworkDrivesHandler.cs b/Files.Launcher/MessageHandlers/NetworkDrivesHandler.cs
@@ -14,11 +14,11 @@ namespace FilesFullTrust.MessageHandlers
 {
     public class NetworkDrivesHandler : IMessageHandler
     {
-        public void Initialize(NamedPipeServerStream connection)
+        public void Initialize(PipeStream connection)
         {
         }
 
-        public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments)
+        public async Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)
         {
             switch (arguments)
             {
@@ -119,7 +119,7 @@ public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictiona
             }
         }
 
-        private async Task ParseNetworkDriveOperationAsync(NamedPipeServerStream connection, Dictionary<string, object> message)
+        private async Task ParseNetworkDriveOperationAsync(PipeStream connection, Dictionary<string, object> message)
         {
             switch (message.Get("netdriveop", ""))
             {
diff --git a/Files.Launcher/MessageHandlers/QuickLookHandler.cs b/Files.Launcher/MessageHandlers/QuickLookHandler.cs
@@ -13,11 +13,11 @@ public class QuickLookHandler : IMessageHandler
     {
         private static readonly Logger Logger = Program.Logger;
 
-        public void Initialize(NamedPipeServerStream connection)
+        public void Initialize(PipeStream connection)
         {
         }
 
-        public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments)
+        public async Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)
         {
             switch (arguments)
             {
diff --git a/Files.Launcher/MessageHandlers/RecycleBinHandler.cs b/Files.Launcher/MessageHandlers/RecycleBinHandler.cs
@@ -18,9 +18,9 @@ namespace FilesFullTrust.MessageHandlers
     public class RecycleBinHandler : IMessageHandler
     {
         private IList<FileSystemWatcher> binWatchers;
-        private NamedPipeServerStream connection;
+        private PipeStream connection;
 
-        public void Initialize(NamedPipeServerStream connection)
+        public void Initialize(PipeStream connection)
         {
             this.connection = connection;
 
@@ -57,7 +57,7 @@ private void StartRecycleBinWatcher()
             }
         }
 
-        public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments)
+        public async Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)
         {
             switch (arguments)
             {
@@ -68,7 +68,7 @@ public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictiona
             }
         }
 
-        private async Task ParseRecycleBinActionAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string action)
+        private async Task ParseRecycleBinActionAsync(PipeStream connection, Dictionary<string, object> message, string action)
         {
             switch (action)
             {
diff --git a/Files.Launcher/MessageHandlers/Win32MessageHandler.cs b/Files.Launcher/MessageHandlers/Win32MessageHandler.cs
@@ -16,11 +16,11 @@ namespace FilesFullTrust.MessageHandlers
 {
     public class Win32MessageHandler : IMessageHandler
     {
-        public void Initialize(NamedPipeServerStream connection)
+        public void Initialize(PipeStream connection)
         {
         }
 
-        public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments)
+        public async Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)
         {
             switch (arguments)
             {
@@ -117,7 +117,7 @@ public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictiona
                         Directory.CreateDirectory(destFolder);
                         if (enable)
                         {
-                            foreach (var file in Directory.GetFiles(Path.Combine(Package.Current.InstalledPath, "Files.Launcher", "Assets", "FilesOpenDialog")))
+                            foreach (var file in Directory.GetFiles(Path.Combine(Package.Current.InstalledLocation.Path, "Files.Launcher", "Assets", "FilesOpenDialog")))
                             {
                                 File.Copy(file, Path.Combine(destFolder, Path.GetFileName(file)), true);
                             }
@@ -144,7 +144,7 @@ public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictiona
                         Directory.CreateDirectory(destFolder);
                         if (enable)
                         {
-                            foreach (var file in Directory.GetFiles(Path.Combine(Package.Current.InstalledPath, "Files.Launcher", "Assets", "FilesOpenDialog")))
+                            foreach (var file in Directory.GetFiles(Path.Combine(Package.Current.InstalledLocation.Path, "Files.Launcher", "Assets", "FilesOpenDialog")))
                             {
                                 File.Copy(file, Path.Combine(destFolder, Path.GetFileName(file)), true);
                             }
diff --git a/Files.Launcher/Program.cs b/Files.Launcher/Program.cs
@@ -8,7 +8,6 @@
 using System.IO;
 using System.IO.Pipes;
 using System.Linq;
-using System.Security.AccessControl;
 using System.Security.Principal;
 using System.Text;
 using System.Threading;
@@ -85,32 +84,24 @@ private static void UnhandledExceptionTrapper(object sender, UnhandledExceptionE
             Logger.UnhandledError(exception, exception.Message);
         }
 
-        private static NamedPipeServerStream connection;
+        private static NamedPipeClientStream connection;
         private static ManualResetEvent appServiceExit;
         private static DeviceWatcher deviceWatcher;
         private static List<IMessageHandler> messageHandlers;
 
         private static async void InitializeAppServiceConnection()
         {
-            connection = new NamedPipeServerStream($@"FilesInteropService_ServerPipe", PipeDirection.InOut, NamedPipeServerStream.MaxAllowedServerInstances, PipeTransmissionMode.Message, PipeOptions.Asynchronous, 2048, 2048, null, HandleInheritability.None, PipeAccessRights.ChangePermissions);
-
-            PipeSecurity Security = connection.GetAccessControl();
-            PipeAccessRule ClientRule = new PipeAccessRule(new SecurityIdentifier("S-1-15-2-1"), PipeAccessRights.ReadWrite | PipeAccessRights.CreateNewInstance, AccessControlType.Allow);
-            PipeAccessRule OwnerRule = new PipeAccessRule(WindowsIdentity.GetCurrent().Owner, PipeAccessRights.FullControl, AccessControlType.Allow);
-            Security.AddAccessRule(ClientRule);
-            Security.AddAccessRule(OwnerRule);
-            if (IsAdministrator())
-            {
-                PipeAccessRule EveryoneRule = new PipeAccessRule(new SecurityIdentifier("S-1-1-0"), PipeAccessRights.ReadWrite | PipeAccessRights.CreateNewInstance, AccessControlType.Allow);
-                Security.AddAccessRule(EveryoneRule); // TODO: find the minimum permission to allow connection when admin
-            }
-            connection.SetAccessControl(Security);
+            var packageSid = ApplicationData.Current.LocalSettings.Values["PackageSid"];
+            connection = new NamedPipeClientStream(".",
+                $"Sessions\\{Process.GetCurrentProcess().SessionId}\\AppContainerNamedObjects\\{packageSid}\\FilesInteropService_ServerPipe",
+                PipeDirection.InOut, PipeOptions.Asynchronous);
 
             try
             {
                 using var cts = new CancellationTokenSource();
-                cts.CancelAfter(TimeSpan.FromSeconds(10));
-                await connection.WaitForConnectionAsync(cts.Token);
+                cts.CancelAfter(TimeSpan.FromSeconds(15));
+                await connection.ConnectAsync(cts.Token);
+                connection.ReadMode = PipeTransmissionMode.Message;
             }
             catch (Exception ex)
             {
@@ -150,14 +141,19 @@ private static void BeginRead((byte[] Buffer, StringBuilder Message) info)
 
         private static void EndReadCallBack(IAsyncResult result)
         {
-            var info = ((byte[] Buffer, StringBuilder Message))result.AsyncState;
             var readBytes = connection.EndRead(result);
             if (readBytes > 0)
             {
+                var info = ((byte[] Buffer, StringBuilder Message))result.AsyncState;
+
                 // Get the read bytes and append them
                 info.Message.Append(Encoding.UTF8.GetString(info.Buffer, 0, readBytes));
 
-                if (connection.IsMessageComplete) // Message is completed
+                if (!connection.IsMessageComplete) // Message is not complete, continue reading
+                {
+                    BeginRead(info);
+                }
+                else
                 {
                     var message = info.Message.ToString().TrimEnd('\0');
 
@@ -166,14 +162,11 @@ private static void EndReadCallBack(IAsyncResult result)
                     // Begin a new reading operation
                     var nextInfo = (Buffer: new byte[connection.InBufferSize], Message: new StringBuilder());
                     BeginRead(nextInfo);
-
-                    return;
                 }
             }
-            BeginRead(info);
         }
 
-        private static async void Connection_RequestReceived(NamedPipeServerStream conn, Dictionary<string, object> message)
+        private static async void Connection_RequestReceived(PipeStream conn, Dictionary<string, object> message)
         {
             // Get a deferral because we use an awaitable API below to respond to the message
             // and we don't want this call to get cancelled while we are waiting.
diff --git a/Files.Launcher/Win32API.cs b/Files.Launcher/Win32API.cs
@@ -364,7 +364,7 @@ private static bool IsAlphaBitmap(BitmapData bmpData)
             return false;
         }
 
-        public static async Task SendMessageAsync(NamedPipeServerStream pipe, ValueSet valueSet, string requestID = null)
+        public static async Task SendMessageAsync(PipeStream pipe, ValueSet valueSet, string requestID = null)
         {
             await Extensions.IgnoreExceptions(async () =>
             {
diff --git a/Files/Helpers/AppServiceConnectionHelper.cs b/Files/Helpers/AppServiceConnectionHelper.cs

Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,11 @@ namespace FilesFullTrust`
`10`	`10`	`public class DeviceWatcher : IDisposable`
`11`	`11`	`{`
`12`	`12`	`private ManagementEventWatcher insertWatcher, removeWatcher, modifyWatcher;`
`13`		`- private NamedPipeServerStream connection;`
	`13`	`+ private PipeStream connection;`
`14`	`14`
`15`	`15`	`private const string WpdGuid = "{6ac27878-a6fa-4155-ba85-f98f491d4f33}";`
`16`	`16`
`17`		`- public DeviceWatcher(NamedPipeServerStream connection)`
	`17`	`+ public DeviceWatcher(PipeStream connection)`
`18`	`18`	`{`
`19`	`19`	`this.connection = connection;`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@ namespace FilesFullTrust.MessageHandlers`
`16`	`16`	`{`
`17`	`17`	`public class ApplicationLaunchHandler : IMessageHandler`
`18`	`18`	`{`
`19`		`- public void Initialize(NamedPipeServerStream connection)`
	`19`	`+ public void Initialize(PipeStream connection)`
`20`	`20`	`{`
`21`	`21`	`}`
`22`	`22`
`23`		`- public Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments)`
	`23`	`+ public Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)`
`24`	`24`	`{`
`25`	`25`	`switch (arguments)`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,11 @@ public ContextMenuHandler()`
`23`	`23`	`handleTable = new DisposableDictionary();`
`24`	`24`	`}`
`25`	`25`
`26`		`- public void Initialize(NamedPipeServerStream connection)`
	`26`	`+ public void Initialize(PipeStream connection)`
`27`	`27`	`{`
`28`		`- // Preload context menu for better performance`
`29`		`- // We query the context menu for the app's local folder`
`30`		`- var preloadPath = ApplicationData.Current.LocalFolder.Path;`
`31`		`- using var _ = ContextMenu.GetContextMenuForFiles(new string[] { preloadPath }, Shell32.CMF.CMF_NORMAL \| Shell32.CMF.CMF_SYNCCASCADEMENU, FilterMenuItems(false));`
`32`	`28`	`}`
`33`	`29`
`34`		`- public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments)`
	`30`	`+ public async Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)`
`35`	`31`	`{`
`36`	`32`	`switch (arguments)`
`37`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,14 @@ public class FileOperationsHandler : IMessageHandler`
`23`	`23`	`private FileTagsDb dbInstance;`
`24`	`24`	`private ProgressHandler progressHandler;`
`25`	`25`
`26`		`- public void Initialize(NamedPipeServerStream connection)`
	`26`	`+ public void Initialize(PipeStream connection)`
`27`	`27`	`{`
`28`	`28`	`string fileTagsDbPath = Path.Combine(Windows.Storage.ApplicationData.Current.LocalFolder.Path, "filetags.db");`
`29`	`29`	`dbInstance = new FileTagsDb(fileTagsDbPath, true);`
`30`	`30`	`progressHandler = new ProgressHandler(connection);`
`31`	`31`	`}`
`32`	`32`
`33`		`- public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments)`
	`33`	`+ public async Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)`
`34`	`34`	`{`
`35`	`35`	`switch (arguments)`
`36`	`36`	`{`
`@@ -40,7 +40,7 @@ public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictiona`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`- private async Task ParseFileOperationAsync(NamedPipeServerStream connection, Dictionary<string, object> message)`
	`43`	`+ private async Task ParseFileOperationAsync(PipeStream connection, Dictionary<string, object> message)`
`44`	`44`	`{`
`45`	`45`	`switch (message.Get("fileop", ""))`
`46`	`46`	`{`
`@@ -730,7 +730,7 @@ public void Dispose()`
`730`	`730`	`private class ProgressHandler : IDisposable`
`731`	`731`	`{`
`732`	`732`	`private ManualResetEvent operationsCompletedEvent;`
`733`		`- private NamedPipeServerStream connection;`
	`733`	`+ private PipeStream connection;`
`734`	`734`
`735`	`735`	`private class OperationWithProgress`
`736`	`736`	`{`
`@@ -743,7 +743,7 @@ private class OperationWithProgress`
`743`	`743`
`744`	`744`	`public System.Windows.Forms.IWin32Window OwnerWindow { get; set; }`
`745`	`745`
`746`		`- public ProgressHandler(NamedPipeServerStream conn)`
	`746`	`+ public ProgressHandler(PipeStream conn)`
`747`	`747`	`{`
`748`	`748`	`taskbar = Win32API.CreateTaskbarObject();`
`749`	`749`	`operations = new ConcurrentDictionary<string, OperationWithProgress>();`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public void UpdateTagsDb()`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`
`112`		`- public Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments)`
	`112`	`+ public Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)`
`113`	`113`	`{`
`114`	`114`	`switch (arguments)`
`115`	`115`	`{`
`@@ -120,7 +120,7 @@ public Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<str`
`120`	`120`	`return Task.CompletedTask;`
`121`	`121`	`}`
`122`	`122`
`123`		`- public void Initialize(NamedPipeServerStream connection)`
	`123`	`+ public void Initialize(PipeStream connection)`
`124`	`124`	`{`
`125`	`125`	`}`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ namespace FilesFullTrust.MessageHandlers`
`7`	`7`	`{`
`8`	`8`	`public interface IMessageHandler : IDisposable`
`9`	`9`	`{`
`10`		`- Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments);`
	`10`	`+ Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments);`
`11`	`11`
`12`		`- void Initialize(NamedPipeServerStream connection);`
	`12`	`+ void Initialize(PipeStream connection);`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@ namespace FilesFullTrust.MessageHandlers`
`15`	`15`	`{`
`16`	`16`	`public class LibrariesHandler : IMessageHandler`
`17`	`17`	`{`
`18`		`- private NamedPipeServerStream connection;`
	`18`	`+ private PipeStream connection;`
`19`	`19`
`20`	`20`	`private FileSystemWatcher librariesWatcher;`
`21`	`21`
`22`		`- public void Initialize(NamedPipeServerStream connection)`
	`22`	`+ public void Initialize(PipeStream connection)`
`23`	`23`	`{`
`24`	`24`	`this.connection = connection;`
`25`	`25`
`@@ -43,7 +43,7 @@ private void StartLibrariesWatcher()`
`43`	`43`	`librariesWatcher.EnableRaisingEvents = true;`
`44`	`44`	`}`
`45`	`45`
`46`		`- public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments)`
	`46`	`+ public async Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)`
`47`	`47`	`{`
`48`	`48`	`switch (arguments)`
`49`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@ namespace FilesFullTrust.MessageHandlers`
`14`	`14`	`{`
`15`	`15`	`public class NetworkDrivesHandler : IMessageHandler`
`16`	`16`	`{`
`17`		`- public void Initialize(NamedPipeServerStream connection)`
	`17`	`+ public void Initialize(PipeStream connection)`
`18`	`18`	`{`
`19`	`19`	`}`
`20`	`20`
`21`		`- public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments)`
	`21`	`+ public async Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)`
`22`	`22`	`{`
`23`	`23`	`switch (arguments)`
`24`	`24`	`{`
`@@ -119,7 +119,7 @@ public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictiona`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
`122`		`- private async Task ParseNetworkDriveOperationAsync(NamedPipeServerStream connection, Dictionary<string, object> message)`
	`122`	`+ private async Task ParseNetworkDriveOperationAsync(PipeStream connection, Dictionary<string, object> message)`
`123`	`123`	`{`
`124`	`124`	`switch (message.Get("netdriveop", ""))`
`125`	`125`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@ public class QuickLookHandler : IMessageHandler`
`13`	`13`	`{`
`14`	`14`	`private static readonly Logger Logger = Program.Logger;`
`15`	`15`
`16`		`- public void Initialize(NamedPipeServerStream connection)`
	`16`	`+ public void Initialize(PipeStream connection)`
`17`	`17`	`{`
`18`	`18`	`}`
`19`	`19`
`20`		`- public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments)`
	`20`	`+ public async Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)`
`21`	`21`	`{`
`22`	`22`	`switch (arguments)`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,9 @@ namespace FilesFullTrust.MessageHandlers`
`18`	`18`	`public class RecycleBinHandler : IMessageHandler`
`19`	`19`	`{`
`20`	`20`	`private IList<FileSystemWatcher> binWatchers;`
`21`		`- private NamedPipeServerStream connection;`
	`21`	`+ private PipeStream connection;`
`22`	`22`
`23`		`- public void Initialize(NamedPipeServerStream connection)`
	`23`	`+ public void Initialize(PipeStream connection)`
`24`	`24`	`{`
`25`	`25`	`this.connection = connection;`
`26`	`26`
`@@ -57,7 +57,7 @@ private void StartRecycleBinWatcher()`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`- public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string arguments)`
	`60`	`+ public async Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)`
`61`	`61`	`{`
`62`	`62`	`switch (arguments)`
`63`	`63`	`{`
`@@ -68,7 +68,7 @@ public async Task ParseArgumentsAsync(NamedPipeServerStream connection, Dictiona`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`- private async Task ParseRecycleBinActionAsync(NamedPipeServerStream connection, Dictionary<string, object> message, string action)`
	`71`	`+ private async Task ParseRecycleBinActionAsync(PipeStream connection, Dictionary<string, object> message, string action)`
`72`	`72`	`{`
`73`	`73`	`switch (action)`
`74`	`74`	`{`