Deprecate ATL based IPC wrapper library

* C# projects now use named pipe server implementations from two_way_pipe_message through the interop C++/Cli library.
microsoft · Apr 20, 2020 · f91c9f5 · f91c9f5
1 parent 20f3500
commit f91c9f5
Show file tree

Hide file tree

Showing 34 changed files with 629 additions and 1,510 deletions.
diff --git a/PowerToys.sln b/PowerToys.sln
@@ -189,16 +189,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "core", "{C3081D9A-1586-441A-B5F4-ED815B3719C1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Settings.UI.Runner", "src\core\Microsoft.PowerToys.Settings.UI.Runner\Microsoft.PowerToys.Settings.UI.Runner.csproj", "{E4E0D2AE-B17D-4BD4-8BEE-AFC8CC464C5F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F88B6FD1-14BD-48DB-85C2-6C51B8045121} = {F88B6FD1-14BD-48DB-85C2-6C51B8045121}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.PowerToys.Settings.TwoWayIPCLib", "src\core\Microsoft.PowerToys.Settings.TwoWayIPCLib\TwoWayIPCLib.vcxproj", "{F88B6FD1-14BD-48DB-85C2-6C51B8045121}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.PowerToys.Settings.UI", "src\core\Microsoft.PowerToys.Settings.UI\Microsoft.PowerToys.Settings.UI.csproj", "{A7D5099E-F0FD-4BF3-8522-5A682759F915}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.PowerToys.Settings.IPCWrapperPS", "src\core\Microsoft.PowerToys.Settings.IPCWrapperPS\Microsoft.PowerToys.Settings.IPCWrapperPS.vcxproj", "{C073B057-B157-40F0-8678-1DCD119D841C}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4981CCD1-4CD9-4A49-B240-00AA46493FF8}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@@ -375,18 +368,12 @@ Global
 		{E4E0D2AE-B17D-4BD4-8BEE-AFC8CC464C5F}.Debug|x64.Build.0 = Debug|x64
 		{E4E0D2AE-B17D-4BD4-8BEE-AFC8CC464C5F}.Release|x64.ActiveCfg = Release|x64
 		{E4E0D2AE-B17D-4BD4-8BEE-AFC8CC464C5F}.Release|x64.Build.0 = Release|x64
-		{F88B6FD1-14BD-48DB-85C2-6C51B8045121}.Debug|x64.ActiveCfg = Debug|x64
-		{F88B6FD1-14BD-48DB-85C2-6C51B8045121}.Debug|x64.Build.0 = Debug|x64
-		{F88B6FD1-14BD-48DB-85C2-6C51B8045121}.Release|x64.ActiveCfg = Release|x64
-		{F88B6FD1-14BD-48DB-85C2-6C51B8045121}.Release|x64.Build.0 = Release|x64
 		{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Debug|x64.ActiveCfg = Debug|x64
 		{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Debug|x64.Build.0 = Debug|x64
 		{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Debug|x64.Deploy.0 = Debug|x64
 		{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Release|x64.ActiveCfg = Release|x64
 		{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Release|x64.Build.0 = Release|x64
 		{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Release|x64.Deploy.0 = Release|x64
-		{C073B057-B157-40F0-8678-1DCD119D841C}.Debug|x64.ActiveCfg = Debug|x64
-		{C073B057-B157-40F0-8678-1DCD119D841C}.Release|x64.ActiveCfg = Release|x64
 		{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A}.Debug|x64.ActiveCfg = Debug|x64
 		{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A}.Debug|x64.Build.0 = Debug|x64
 		{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A}.Release|x64.ActiveCfg = Release|x64
@@ -453,9 +440,7 @@ Global
 		{217DF501-135C-4E38-BFC8-99D4821032EA} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{47310AB4-9034-4BD1-8D8B-E88AD21A171B} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{E4E0D2AE-B17D-4BD4-8BEE-AFC8CC464C5F} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
-		{F88B6FD1-14BD-48DB-85C2-6C51B8045121} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
 		{A7D5099E-F0FD-4BF3-8522-5A682759F915} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
-		{C073B057-B157-40F0-8678-1DCD119D841C} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
 		{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
 		{A80355C2-780D-4245-BD80-25B8DE698EE3} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
 		{F055103B-F80B-4D0C-BF48-057C55620033} = {1AFB6476-670D-4E80-A464-657E01DFF482}

diff --git a/src/common/common-md-flag/common-md-flag.vcxproj b/src/common/common-md-flag/common-md-flag.vcxproj
@@ -142,11 +142,14 @@
   <ItemGroup>
     <ClInclude Include="..\keyboard_layout.h" />
     <ClInclude Include="..\keyboard_layout_impl.h" />
+    <ClInclude Include="..\two_way_pipe_message_ipc.h" />
+    <ClInclude Include="..\two_way_pipe_message_ipc_impl.h" />
     <ClInclude Include="framework.h" />
     <ClInclude Include="pch.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\keyboard_layout.cpp" />
+    <ClCompile Include="..\two_way_pipe_message_ipc.cpp" />
     <ClCompile Include="common-md-flag.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>

diff --git a/src/common/common-md-flag/common-md-flag.vcxproj.filters b/src/common/common-md-flag/common-md-flag.vcxproj.filters
@@ -27,6 +27,12 @@
     <ClInclude Include="..\keyboard_layout_impl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\two_way_pipe_message_ipc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\two_way_pipe_message_ipc_impl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="common-md-flag.cpp">
@@ -38,5 +44,8 @@
     <ClCompile Include="..\keyboard_layout.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\two_way_pipe_message_ipc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
@@ -125,6 +125,7 @@
     <ClInclude Include="keyboard_layout_impl.h" />
     <ClInclude Include="notifications.h" />
     <ClInclude Include="timeutil.h" />
+    <ClInclude Include="two_way_pipe_message_ipc.h" />
     <ClInclude Include="VersionHelper.h" />
     <ClInclude Include="window_helpers.h" />
     <ClInclude Include="icon_helpers.h" />
@@ -139,7 +140,7 @@
     <ClInclude Include="common.h" />
     <ClInclude Include="Telemetry\ProjectTelemetry.h" />
     <ClInclude Include="Telemetry\TraceLoggingDefines.h" />
-    <ClInclude Include="two_way_pipe_message_ipc.h" />
+    <ClInclude Include="two_way_pipe_message_ipc_impl.h" />
     <ClInclude Include="version.h" />
     <ClInclude Include="windows_colors.h" />
     <ClInclude Include="winstore.h" />
@@ -165,6 +166,7 @@
     <ClCompile Include="start_visible.cpp" />
     <ClCompile Include="tasklist_positions.cpp" />
     <ClCompile Include="common.cpp" />
+    <ClCompile Include="two_way_pipe_message_ipc.cpp" />
     <ClCompile Include="VersionHelper.cpp" />
     <ClCompile Include="windows_colors.cpp" />
     <ClCompile Include="window_helpers.cpp" />

diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters
@@ -51,9 +51,6 @@
     <ClInclude Include="Telemetry\TraceLoggingDefines.h">
       <Filter>Header Files\Telemetry</Filter>
     </ClInclude>
-    <ClInclude Include="two_way_pipe_message_ipc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="async_message_queue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -105,6 +102,12 @@
     <ClInclude Include="keyboard_layout.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="two_way_pipe_message_ipc_impl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="two_way_pipe_message_ipc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="d2d_svg.cpp">
@@ -168,6 +171,9 @@
     <ClCompile Include="keyboard_layout.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="two_way_pipe_message_ipc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

diff --git a/src/common/interop/interop.h b/src/common/interop/interop.h
@@ -1,6 +1,10 @@
 #pragma once
 
 #include <common\keyboard_layout.h>
+#include <common\two_way_pipe_message_ipc.h>
+#include <msclr\marshal.h>
+#include <msclr\marshal_cppstd.h>
+
 using namespace System;
 
 //https://docs.microsoft.com/en-us/cpp/dotnet/how-to-wrap-native-class-for-use-by-csharp?view=vs-2019
@@ -36,5 +40,46 @@ public ref class LayoutMapManaged
     private:
         LayoutMap* _map;
     };
+
+    public ref class TwoWayPipeMessageIPCManaged
+    {
+    public:
+        TwoWayPipeMessageIPCManaged(String^ inputPipeName, String^ outputPipeName)
+        {
+            _pipe = new TwoWayPipeMessageIPC(
+                msclr::interop::marshal_as<std::wstring>(inputPipeName),
+                msclr::interop::marshal_as<std::wstring>(outputPipeName),
+                nullptr);
+        }
+
+        ~TwoWayPipeMessageIPCManaged()
+        {
+            delete _pipe;
+        }
+
+        void Send(String^ msg)
+        {
+            _pipe->send(msclr::interop::marshal_as<std::wstring>(msg));
+        }
+
+        void Start()
+        {
+            _pipe->start(nullptr);
+        }
+
+        void End()
+        {
+            _pipe->end();
+        }
+
+    protected:
+        !TwoWayPipeMessageIPCManaged()
+        {
+            delete _pipe;
+        }
+
+    private:
+        TwoWayPipeMessageIPC* _pipe;
+    };
 }