Code review notes

zadjii-msft · zadjii-msft · commit 38de95efa842 · 2022-08-19T10:04:37.000-05:00
diff --git a/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest b/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest
@@ -99,7 +99,8 @@
             <com:ComInterface>
                 <com:ProxyStub Id="DEC4804D-56D1-4F73-9FBE-6828E7C85C56" DisplayName="OpenConsoleHandoffProxy" Path="OpenConsoleProxy.dll"/>
                 <com:Interface Id="E686C757-9A35-4A1C-B3CE-0BCC8B5C69F4" ProxyStubClsid="DEC4804D-56D1-4F73-9FBE-6828E7C85C56"/>
-                <com:Interface Id="AA6B364F-4A50-4176-9002-0AE755E7B5EF" ProxyStubClsid="DEC4804D-56D1-4F73-9FBE-6828E7C85C56"/>
+                <com:Interface Id="59D55CCE-FC8A-48B4-ACE8-0A9286C6557F" ProxyStubClsid="DEC4804D-56D1-4F73-9FBE-6828E7C85C56"/> <!-- ITerminalHandoff -->
+                <com:Interface Id="AA6B364F-4A50-4176-9002-0AE755E7B5EF" ProxyStubClsid="DEC4804D-56D1-4F73-9FBE-6828E7C85C56"/> <!-- ITerminalHandoff2 -->
                 <com:Interface Id="746E6BC0-AB05-4E38-AB14-71E86763141F" ProxyStubClsid="DEC4804D-56D1-4F73-9FBE-6828E7C85C56"/>
             </com:ComInterface>
         </com:Extension>
diff --git a/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest b/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest
@@ -188,7 +188,8 @@
             <com:ComInterface>
                 <com:ProxyStub Id="1833E661-CC81-4DD0-87C6-C2F74BD39EFA" DisplayName="OpenConsoleHandoffProxy" Path="OpenConsoleProxy.dll"/>
                 <com:Interface Id="E686C757-9A35-4A1C-B3CE-0BCC8B5C69F4" ProxyStubClsid="1833E661-CC81-4DD0-87C6-C2F74BD39EFA"/>
-                <com:Interface Id="AA6B364F-4A50-4176-9002-0AE755E7B5EF" ProxyStubClsid="1833E661-CC81-4DD0-87C6-C2F74BD39EFA"/>
+                <com:Interface Id="59D55CCE-FC8A-48B4-ACE8-0A9286C6557F" ProxyStubClsid="1833E661-CC81-4DD0-87C6-C2F74BD39EFA"/> <!-- ITerminalHandoff -->
+                <com:Interface Id="AA6B364F-4A50-4176-9002-0AE755E7B5EF" ProxyStubClsid="1833E661-CC81-4DD0-87C6-C2F74BD39EFA"/> <!-- ITerminalHandoff2 -->
                 <com:Interface Id="746E6BC0-AB05-4E38-AB14-71E86763141F" ProxyStubClsid="1833E661-CC81-4DD0-87C6-C2F74BD39EFA"/>
             </com:ComInterface>
         </com:Extension>
diff --git a/src/cascadia/CascadiaPackage/Package.appxmanifest b/src/cascadia/CascadiaPackage/Package.appxmanifest
@@ -188,7 +188,8 @@
             <com:ComInterface>
                 <com:ProxyStub Id="3171DE52-6EFA-4AEF-8A9F-D02BD67E7A4F" DisplayName="OpenConsoleHandoffProxy" Path="OpenConsoleProxy.dll"/>
                 <com:Interface Id="E686C757-9A35-4A1C-B3CE-0BCC8B5C69F4" ProxyStubClsid="3171DE52-6EFA-4AEF-8A9F-D02BD67E7A4F"/>
-                <com:Interface Id="AA6B364F-4A50-4176-9002-0AE755E7B5EF" ProxyStubClsid="3171DE52-6EFA-4AEF-8A9F-D02BD67E7A4F"/>
+                <com:Interface Id="59D55CCE-FC8A-48B4-ACE8-0A9286C6557F" ProxyStubClsid="1833E661-CC81-4DD0-87C6-C2F74BD39EFA"/> <!-- ITerminalHandoff -->
+                <com:Interface Id="AA6B364F-4A50-4176-9002-0AE755E7B5EF" ProxyStubClsid="1833E661-CC81-4DD0-87C6-C2F74BD39EFA"/> <!-- ITerminalHandoff2 -->
                 <com:Interface Id="746E6BC0-AB05-4E38-AB14-71E86763141F" ProxyStubClsid="3171DE52-6EFA-4AEF-8A9F-D02BD67E7A4F"/>
             </com:ComInterface>
         </com:Extension>
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -3270,7 +3270,7 @@ namespace winrt::TerminalApp::implementation
         {
             NewTerminalArgs newTerminalArgs;
             newTerminalArgs.Commandline(connection.Commandline());
-            newTerminalArgs.TabTitle(connection.Title());
+            newTerminalArgs.TabTitle(connection.StartingTitle());
             // GH #12370: We absolutely cannot allow a defterm connection to
             // auto-elevate. Defterm doesn't work for elevated scenarios in the
             // first place. If we try accepting the connection, the spawning an
diff --git a/src/cascadia/TerminalConnection/ConptyConnection.cpp b/src/cascadia/TerminalConnection/ConptyConnection.cpp
@@ -214,8 +214,10 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         THROW_IF_FAILED(ConptyPackPseudoConsole(hServerProcess, hRef, hSig, &_hPC));
         _piClient.hProcess = hClientProcess;
 
-        _startupInfo.title = winrt::hstring{ startupInfo.pszTitle };
-        _startupInfo.iconPath = winrt::hstring{ startupInfo.pszIconPath };
+        _startupInfo.title = winrt::hstring{ startupInfo.pszTitle, SysStringLen(startupInfo.pszTitle) };
+        SysFreeString(startupInfo.pszTitle);
+        _startupInfo.iconPath = winrt::hstring{ startupInfo.pszIconPath, SysStringLen(startupInfo.pszIconPath) };
+        SysFreeString(startupInfo.pszIconPath);
         _startupInfo.iconIndex = startupInfo.iconIndex;
 
         try
@@ -293,7 +295,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         return _commandline;
     }
 
-    winrt::hstring ConptyConnection::Title() const
+    winrt::hstring ConptyConnection::StartingTitle() const
     {
         return _startupInfo.title;
     }
diff --git a/src/cascadia/TerminalConnection/ConptyConnection.h b/src/cascadia/TerminalConnection/ConptyConnection.h
@@ -45,7 +45,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 
         winrt::guid Guid() const noexcept;
         winrt::hstring Commandline() const;
-        winrt::hstring Title() const;
+        winrt::hstring StartingTitle() const;
 
         static void StartInboundListener();
         static void StopInboundListener();
diff --git a/src/cascadia/TerminalConnection/ConptyConnection.idl b/src/cascadia/TerminalConnection/ConptyConnection.idl
@@ -12,7 +12,7 @@ namespace Microsoft.Terminal.TerminalConnection
         ConptyConnection();
         Guid Guid { get; };
         String Commandline { get; };
-        String Title { get; };
+        String StartingTitle { get; };
 
         void ClearBuffer();
 
diff --git a/src/host/proxy/ITerminalHandoff.idl b/src/host/proxy/ITerminalHandoff.idl
@@ -8,10 +8,10 @@ import "ocidl.idl";
 typedef struct _TERMINAL_STARTUP_INFO
 {
     // In STARTUPINFO
-    LPCWSTR pszTitle;
+    BSTR pszTitle;
 
     // Also wanted
-    LPCWSTR pszIconPath;
+    BSTR pszIconPath;
     LONG iconIndex;
 
     // The rest of STARTUPINFO
@@ -24,10 +24,6 @@ typedef struct _TERMINAL_STARTUP_INFO
     DWORD dwFillAttribute;
     DWORD dwFlags;
     WORD wShowWindow;
-
-    // Something else we may be interested in?
-    LPCWSTR fontFace;
-    LONG fontSize;
 } TERMINAL_STARTUP_INFO;
 
 // LOAD BEARING!
diff --git a/src/host/srvinit.cpp b/src/host/srvinit.cpp
@@ -576,9 +576,11 @@ try
     // END code from SetUpConsole
 
     // Take what we've collected, and bundle it up for handoff.
+    auto title = wil::make_bstr(Cac.Title);
+    auto iconPath = wil::make_bstr(icon.path.data());
     TERMINAL_STARTUP_INFO myStartupInfo{
-        Cac.Title,
-        icon.path.c_str(),
+        title.get(),
+        iconPath.get(),
         icon.index
     };
 

Original file line number	Diff line number	Diff line change
`@@ -3270,7 +3270,7 @@ namespace winrt::TerminalApp::implementation`
`3270`	`3270`	`{`
`3271`	`3271`	`NewTerminalArgs newTerminalArgs;`
`3272`	`3272`	`newTerminalArgs.Commandline(connection.Commandline());`
`3273`		`- newTerminalArgs.TabTitle(connection.Title());`
	`3273`	`+ newTerminalArgs.TabTitle(connection.StartingTitle());`
`3274`	`3274`	`// GH #12370: We absolutely cannot allow a defterm connection to`
`3275`	`3275`	`// auto-elevate. Defterm doesn't work for elevated scenarios in the`
`3276`	`3276`	`// first place. If we try accepting the connection, the spawning an`
Original file line number	Diff line number	Diff line change
`@@ -214,8 +214,10 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation`
`214`	`214`	`THROW_IF_FAILED(ConptyPackPseudoConsole(hServerProcess, hRef, hSig, &_hPC));`
`215`	`215`	`_piClient.hProcess = hClientProcess;`
`216`	`216`
`217`		`- _startupInfo.title = winrt::hstring{ startupInfo.pszTitle };`
`218`		`- _startupInfo.iconPath = winrt::hstring{ startupInfo.pszIconPath };`
	`217`	`+ _startupInfo.title = winrt::hstring{ startupInfo.pszTitle, SysStringLen(startupInfo.pszTitle) };`
	`218`	`+ SysFreeString(startupInfo.pszTitle);`
	`219`	`+ _startupInfo.iconPath = winrt::hstring{ startupInfo.pszIconPath, SysStringLen(startupInfo.pszIconPath) };`
	`220`	`+ SysFreeString(startupInfo.pszIconPath);`
`219`	`221`	`_startupInfo.iconIndex = startupInfo.iconIndex;`
`220`	`222`
`221`	`223`	`try`
`@@ -293,7 +295,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation`
`293`	`295`	`return _commandline;`
`294`	`296`	`}`
`295`	`297`
`296`		`- winrt::hstring ConptyConnection::Title() const`
	`298`	`+ winrt::hstring ConptyConnection::StartingTitle() const`
`297`	`299`	`{`
`298`	`300`	`return _startupInfo.title;`
`299`	`301`	`}`