Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-08-29 14:26:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

精准匹配清除sing-tun残留的wintun设备驱动

Browse source
This commit is contained in:
chao wan 2024-04-05 03:45:35 +08:00
parent abe3f64901
commit 639ffa6254
4 changed files with 42 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
v2rayN/v2rayN/Common/Utils.cs
View file

@ -22,6 +22,7 @@ using ZXing;
using ZXing.Common;
using ZXing.QrCode;
using ZXing.Windows.Compatibility;
using Vanara.PInvoke;
namespace v2rayN
{
@ -756,7 +757,7 @@ namespace v2rayN
public static void SetDarkBorder(System.Windows.Window window, bool dark)
{
// Make sure the handle is created before the window is shown
IntPtr hWnd = new System.Windows.Interop.WindowInteropHelper(window).EnsureHandle();
IntPtr hWnd = new WindowInteropHelper(window).EnsureHandle();
int attribute = dark ? 1 : 0;
uint attributeSize = (uint)Marshal.SizeOf(attribute);
DwmSetWindowAttribute(hWnd, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1, ref attribute, attributeSize);
@ -1170,6 +1171,42 @@ namespace v2rayN
}
}
public static bool RemoveDeviceByDevIstId(string deviceInstanceId)
{
var isRemoved = false;
var devs = SetupAPI.SetupDiGetClassDevs(SetupAPI.GUID_DEVCLASS_NET, null, HWND.NULL, SetupAPI.DIGCF.DIGCF_PROFILE);
var instanceIdSize = deviceInstanceId.Length + 1;
var devInfo = new SetupAPI.SP_DEVINFO_DATA() { cbSize = (uint)Marshal.SizeOf<SetupAPI.SP_DEVINFO_DATA>() };
var instanceId = new StringBuilder(instanceIdSize);
uint index = 0;
while (SetupAPI.SetupDiEnumDeviceInfo(devs, index++, ref devInfo))
{
var success = SetupAPI.SetupDiGetDeviceInstanceId(devs, devInfo, instanceId, (uint)instanceIdSize, out uint size);
if (success && size == instanceIdSize && instanceId.ToString() == deviceInstanceId)
{
isRemoved = SetupAPI.SetupDiRemoveDevice(devs, ref devInfo);
}
}
SetupAPI.SetupDiDestroyDeviceInfoList(devs);
return isRemoved;
}
public static string GetSingboxTunDeviceInstanceId(string deviceName)
{
string deviceInstanceId = string.Empty;
string deviceId = "SWD\\WINTUN\\";
if (!string.IsNullOrEmpty(deviceName))
{
List<byte> data = [.. Encoding.UTF8.GetBytes("wintun"), .. Encoding.UTF8.GetBytes(deviceName)];
byte[] hash = MD5.HashData(data.ToArray());
deviceInstanceId = deviceId + new Guid(hash).ToString("B").ToUpper();
}
return deviceInstanceId;
}
#endregion 开机自动启动等
#region Windows API

1
v2rayN/v2rayN/Global.cs
View file

@ -43,6 +43,7 @@ namespace v2rayN
public const string DNSV2rayNormalFileName = "v2rayN.Sample.dns_v2ray_normal";
public const string DNSSingboxNormalFileName = "v2rayN.Sample.dns_singbox_normal";
public const string DefaultSingboxTunDeviceName = "tun_singbox";
public const string DefaultSecurity = "auto";
public const string DefaultNetwork = "tcp";
public const string TcpHeaderHttp = "http";

2
v2rayN/v2rayN/Handler/CoreHandler.cs
View file

@ -54,7 +54,7 @@ namespace v2rayN.Handler
{
ShowMsg(true, $"{node!.GetSummary()}");
CoreStop();
Utils.RemoveTunDevice();
Utils.RemoveDeviceByDevIstId(Utils.GetSingboxTunDeviceInstanceId(Global.DefaultSingboxTunDeviceName));
CoreStart(node);
}
executingResetEvents.ForEach(result => result.Set());

3
v2rayN/v2rayN/v2rayN.csproj
View file

@ -20,7 +20,8 @@
<PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.124" />
<PackageReference Include="QRCoder.Xaml" Version="1.4.3" />
<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
<PackageReference Include="TaskScheduler" Version="2.10.1" />
<PackageReference Include="TaskScheduler" Version="2.10.1" />
<PackageReference Include="Vanara.PInvoke.SetupAPI" Version="4.0.0" />
<PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.12" />
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
<PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />