Fix UWP UserSwitch

rmbadmin · rmbadmin · commit 90dc08c1ce66 · 2021-09-14T01:57:49.000+08:00
diff --git a/src/ST.Client.Desktop.Windows/Services/Implementation/WindowsDesktopPlatformServiceImpl.cs b/src/ST.Client.Desktop.Windows/Services/Implementation/WindowsDesktopPlatformServiceImpl.cs
@@ -217,7 +217,18 @@ public string GetLastSteamLoginUserName()
 
         public void SetCurrentUser(string userName)
         {
-            Registry.CurrentUser.AddOrUpdate(SteamRegistryPath, "AutoLoginUser", userName, RegistryValueKind.String);
+            if (DesktopBridge.IsRunningAsUwp)
+            {
+                var reg = $"Windows Registry Editor Version 5.00{Environment.NewLine}[HKEY_CURRENT_USER\\Software\\Valve\\Steam]{Environment.NewLine}\"AutoLoginUser\"=\"{userName}\"";
+                var path = Path.Combine(IOPath.CacheDirectory, "switchuser.reg");
+                File.WriteAllText(path, reg, Text.Encoding.UTF8);
+
+                Process2.Start("regedit", $"/s \"{path}\"", true);
+            }
+            else
+            {
+                Registry.CurrentUser.AddOrUpdate(SteamRegistryPath, "AutoLoginUser", userName, RegistryValueKind.String);
+            }
         }
 
         static string GetMachineSecretKey()
diff --git a/src/ST.Client.Desktop/Services/Implementation/SteamServiceImpl.cs b/src/ST.Client.Desktop/Services/Implementation/SteamServiceImpl.cs
@@ -132,7 +132,7 @@ public void StartSteam(string? arguments = null)
         {
             if (!string.IsNullOrEmpty(SteamProgramPath))
             {
-                Process2.Start(SteamProgramPath, arguments);
+                Process2.Start(SteamProgramPath, arguments, workingDirectory: SteamDirPath);
             }
         }
 
diff --git a/src/ST.Client/Services/Implementation/HttpProxyServiceImpl.cs b/src/ST.Client/Services/Implementation/HttpProxyServiceImpl.cs
@@ -577,8 +577,6 @@ public bool StartProxy()
                 {
                     if (OperatingSystem2.IsWindows)
                     {
-                        //proxyServer.SetAsSystemHttpProxy(explicitProxyEndPoint);
-                        //proxyServer.SetAsSystemHttpsProxy(explicitProxyEndPoint);
                         proxyServer.SetAsSystemProxy(explicitProxyEndPoint, ProxyProtocolType.AllHttp);
                     }
                     else if (OperatingSystem2.IsMacOS)

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public void StartSteam(string? arguments = null)`
`132`	`132`	`{`
`133`	`133`	`if (!string.IsNullOrEmpty(SteamProgramPath))`
`134`	`134`	`{`
`135`		`- Process2.Start(SteamProgramPath, arguments);`
	`135`	`+ Process2.Start(SteamProgramPath, arguments, workingDirectory: SteamDirPath);`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
Original file line number	Diff line number	Diff line change
`@@ -577,8 +577,6 @@ public bool StartProxy()`
`577`	`577`	`{`
`578`	`578`	`if (OperatingSystem2.IsWindows)`
`579`	`579`	`{`
`580`		`- //proxyServer.SetAsSystemHttpProxy(explicitProxyEndPoint);`
`581`		`- //proxyServer.SetAsSystemHttpsProxy(explicitProxyEndPoint);`
`582`	`580`	`proxyServer.SetAsSystemProxy(explicitProxyEndPoint, ProxyProtocolType.AllHttp);`
`583`	`581`	`}`
`584`	`582`	`else if (OperatingSystem2.IsMacOS)`