diff --git a/v2rayN/v2rayN/App.xaml b/v2rayN/v2rayN/App.xaml index 20bd6d0b..3fc23de2 100644 --- a/v2rayN/v2rayN/App.xaml +++ b/v2rayN/v2rayN/App.xaml @@ -1,9 +1,9 @@  diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs index b596371d..727066a8 100644 --- a/v2rayN/v2rayN/Global.cs +++ b/v2rayN/v2rayN/Global.cs @@ -177,4 +177,4 @@ #endregion global variable } -} +} \ No newline at end of file diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs index 2d4f2105..e80a6756 100644 --- a/v2rayN/v2rayN/Handler/ConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs @@ -205,7 +205,6 @@ namespace v2rayN.Handler }; } - LazyConfig.Instance.SetConfig(config); return 0; } diff --git a/v2rayN/v2rayN/Handler/CoreConfigHandler.cs b/v2rayN/v2rayN/Handler/CoreConfigHandler.cs index 95334ee9..2042f588 100644 --- a/v2rayN/v2rayN/Handler/CoreConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/CoreConfigHandler.cs @@ -155,4 +155,4 @@ namespace v2rayN.Handler return coreConfigV2ray.GenerateClientSpeedtestConfigString(selecteds, out msg); } } -} +} \ No newline at end of file diff --git a/v2rayN/v2rayN/Handler/CoreHandler.cs b/v2rayN/v2rayN/Handler/CoreHandler.cs index f8fa3c8f..fdada7c9 100644 --- a/v2rayN/v2rayN/Handler/CoreHandler.cs +++ b/v2rayN/v2rayN/Handler/CoreHandler.cs @@ -62,7 +62,6 @@ namespace v2rayN.Handler Utils.SaveLog("Tun mode restart the core once"); } } - }); } } diff --git a/v2rayN/v2rayN/Handler/LazyConfig.cs b/v2rayN/v2rayN/Handler/LazyConfig.cs index 3348c2ff..c67225af 100644 --- a/v2rayN/v2rayN/Handler/LazyConfig.cs +++ b/v2rayN/v2rayN/Handler/LazyConfig.cs @@ -378,4 +378,4 @@ namespace v2rayN.Handler #endregion Core Type } -} +} \ No newline at end of file diff --git a/v2rayN/v2rayN/Handler/ProxySetting.cs b/v2rayN/v2rayN/Handler/ProxySetting.cs index fe0ea689..e728f3f4 100644 --- a/v2rayN/v2rayN/Handler/ProxySetting.cs +++ b/v2rayN/v2rayN/Handler/ProxySetting.cs @@ -78,7 +78,7 @@ namespace v2rayN.Handler if (optionCount > 1) { options[1].m_Option = m_Option; - options[1].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(strProxy); // !! remember to deallocate memory 1 + options[1].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(strProxy); // !! remember to deallocate memory 1 // except for these addresses ... if (optionCount > 2) { @@ -91,10 +91,10 @@ namespace v2rayN.Handler list.dwSize = Marshal.SizeOf(list); if (connectionName != null) { - list.szConnection = Marshal.StringToHGlobalAuto(connectionName); // !! remember to deallocate memory 3 + list.szConnection = Marshal.StringToHGlobalAuto(connectionName); // !! remember to deallocate memory 3 } else - { + { list.szConnection = IntPtr.Zero; } list.dwOptionCount = options.Length; @@ -141,7 +141,7 @@ namespace v2rayN.Handler } // FREE the data ASAP - if(list.szConnection != IntPtr.Zero) Marshal.FreeHGlobal(list.szConnection); // release mem 3 + if (list.szConnection != IntPtr.Zero) Marshal.FreeHGlobal(list.szConnection); // release mem 3 if (optionCount > 1) { Marshal.FreeHGlobal(options[1].m_Value.m_StringPtr); // release mem 1 @@ -155,7 +155,7 @@ namespace v2rayN.Handler if (returnvalue != 0) { // throw the error codes, they might be helpful - throw new ApplicationException($"Set Internet Proxy failed with error code: {Marshal.GetLastWin32Error()}" ); + throw new ApplicationException($"Set Internet Proxy failed with error code: {Marshal.GetLastWin32Error()}"); } return true; @@ -256,8 +256,8 @@ namespace v2rayN.Handler // Constants public const int RAS_MaxEntryName = 256; - public const int MAX_PATH = 260; // Standard MAX_PATH value in Windows + public const int MAX_PATH = 260; // Standard MAX_PATH value in Windows } #endregion WinInet structures @@ -310,6 +310,7 @@ namespace v2rayN.Handler [DllImport("WinInet.dll", SetLastError = true, CharSet = CharSet.Auto)] [return: MarshalAs(UnmanagedType.Bool)] public static extern bool InternetSetOption(IntPtr hInternet, InternetOption dwOption, IntPtr lpBuffer, int dwBufferLength); + [DllImport("Rasapi32.dll", CharSet = CharSet.Auto)] public static extern uint RasEnumEntries( string? reserved, // Reserved, must be null diff --git a/v2rayN/v2rayN/Handler/SysProxyHandle.cs b/v2rayN/v2rayN/Handler/SysProxyHandle.cs index 9bce9058..fcf09db7 100644 --- a/v2rayN/v2rayN/Handler/SysProxyHandle.cs +++ b/v2rayN/v2rayN/Handler/SysProxyHandle.cs @@ -1,10 +1,5 @@ using PacLib; -using System.Diagnostics; -using System.IO; -using System.Text; using v2rayN.Mode; -using v2rayN.Properties; -using v2rayN.Tool; namespace v2rayN.Handler { @@ -33,7 +28,6 @@ namespace v2rayN.Handler static SysProxyHandle() { - } public static bool UpdateSysProxy(Config config, bool forceDisable) diff --git a/v2rayN/v2rayN/Mode/Config.cs b/v2rayN/v2rayN/Mode/Config.cs index a8c0ea27..fde5a14f 100644 --- a/v2rayN/v2rayN/Mode/Config.cs +++ b/v2rayN/v2rayN/Mode/Config.cs @@ -28,7 +28,7 @@ public ConstItem constItem { get; set; } public SpeedTestItem speedTestItem { get; set; } public Mux4SboxItem mux4SboxItem { get; set; } - public HysteriaItem hysteriaItem { get; set; } + public HysteriaItem hysteriaItem { get; set; } public List inbound { get; set; } public List globalHotkeys { get; set; } public List coreTypeItem { get; set; } diff --git a/v2rayN/v2rayN/Mode/ECoreType.cs b/v2rayN/v2rayN/Mode/ECoreType.cs index 4e161e4a..319f3d26 100644 --- a/v2rayN/v2rayN/Mode/ECoreType.cs +++ b/v2rayN/v2rayN/Mode/ECoreType.cs @@ -16,4 +16,4 @@ hysteria2 = 26, v2rayN = 99 } -} +} \ No newline at end of file diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs index 5d971349..a5af2b71 100644 --- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs @@ -89,7 +89,7 @@ namespace v2rayN.ViewModels public ReactiveCommand AddShadowsocksServerCmd { get; } public ReactiveCommand AddSocksServerCmd { get; } public ReactiveCommand AddTrojanServerCmd { get; } - public ReactiveCommand AddHysteria2ServerCmd { get; } + public ReactiveCommand AddHysteria2ServerCmd { get; } public ReactiveCommand AddCustomServerCmd { get; } public ReactiveCommand AddServerViaClipboardCmd { get; } public ReactiveCommand AddServerViaScanCmd { get; } @@ -148,11 +148,14 @@ namespace v2rayN.ViewModels public ReactiveCommand CheckUpdateNCmd { get; } public ReactiveCommand CheckUpdateV2flyCoreCmd { get; } + //public ReactiveCommand CheckUpdateSagerNetCoreCmd { get; } public ReactiveCommand CheckUpdateXrayCoreCmd { get; } + //public ReactiveCommand CheckUpdateClashCoreCmd { get; } //public ReactiveCommand CheckUpdateClashMetaCoreCmd { get; } public ReactiveCommand CheckUpdateSingBoxCoreCmd { get; } + public ReactiveCommand CheckUpdateGeoCmd { get; } public ReactiveCommand ReloadCmd { get; } diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml index 712deaa7..640962ff 100644 --- a/v2rayN/v2rayN/Views/AddServerWindow.xaml +++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml @@ -1,12 +1,12 @@  - - - -