mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2024-11-16 11:42:21 +08:00
Compare commits
No commits in common. "97717c648e5623af96d716b1c316f552b68d3af7" and "e87e06dd37e91e804cc2478d5bd4ca929c7c4f82" have entirely different histories.
97717c648e
...
e87e06dd37
|
@ -697,27 +697,34 @@ Var VC_REDIST_URL
|
|||
Var VC_REDIST_EXE
|
||||
|
||||
Section CheckAndInstallVSRuntime
|
||||
${If} ${IsNativeARM64}
|
||||
StrCpy $VC_REDIST_URL "https://aka.ms/vs/17/release/vc_redist.arm64.exe"
|
||||
StrCpy $VC_REDIST_EXE "vc_redist.arm64.exe"
|
||||
IfFileExists "$SYSDIR\msvcp140.dll" Done
|
||||
${ElseIf} ${RunningX64}
|
||||
StrCpy $VC_REDIST_URL "https://aka.ms/vs/17/release/vc_redist.x64.exe"
|
||||
StrCpy $VC_REDIST_EXE "vc_redist.x64.exe"
|
||||
IfFileExists "$WINDIR\SysWOW64\msvcp140.dll" Done
|
||||
${Else}
|
||||
; Set default values for x86
|
||||
StrCpy $VC_REDIST_URL "https://aka.ms/vs/17/release/vc_redist.x86.exe"
|
||||
StrCpy $VC_REDIST_EXE "vc_redist.x86.exe"
|
||||
IfFileExists "$SYSDIR\msvcp140.dll" Done
|
||||
|
||||
${If} ${RunningX64}
|
||||
; Update values for x64
|
||||
StrCpy $VC_REDIST_URL "https://aka.ms/vs/17/release/vc_redist.x64.exe"
|
||||
StrCpy $VC_REDIST_EXE "vc_redist.x64.exe"
|
||||
${EndIf}
|
||||
|
||||
; 下载并安装VC运行库
|
||||
nsisdl::download "$VC_REDIST_URL" "$TEMP\$VC_REDIST_EXE"
|
||||
Pop $0
|
||||
${If} $0 == "success"
|
||||
nsExec::Exec '"$TEMP\$VC_REDIST_EXE" /quiet /norestart'
|
||||
|
||||
${If} ${RunningX64}
|
||||
IfFileExists "$WINDIR\SysWOW64\msvcp140.dll" Done
|
||||
${EndIf}
|
||||
|
||||
IfFileExists "$SYSDIR\msvcp140.dll" Done
|
||||
|
||||
; 如果文件不存在,进行安装
|
||||
; 下载文件
|
||||
nsisdl::download "$VC_REDIST_URL" "$TEMP\$VC_REDIST_EXE"
|
||||
Pop $0 ; 获取下载结果
|
||||
StrCmp $0 "success" +2
|
||||
; 下载失败时,直接跳转到结束
|
||||
Goto Done
|
||||
|
||||
; 安装运行库
|
||||
nsExec::Exec '"$TEMP\$VC_REDIST_EXE" /quiet /norestart'
|
||||
|
||||
Done:
|
||||
SectionEnd
|
||||
|
||||
|
|
|
@ -23,8 +23,7 @@
|
|||
"app": {
|
||||
"trayIcon": {
|
||||
"iconPath": "icons/tray-icon.ico",
|
||||
"iconAsTemplate": true,
|
||||
"menuOnLeftClick": false
|
||||
"iconAsTemplate": true
|
||||
},
|
||||
"windows": []
|
||||
}
|
||||
|
|
|
@ -160,16 +160,6 @@ export const ProxyItemMini = (props: Props) => {
|
|||
TFO
|
||||
</TypeBox>
|
||||
)}
|
||||
{proxy.mptcp && (
|
||||
<TypeBox color="text.secondary" component="span">
|
||||
MPTCP
|
||||
</TypeBox>
|
||||
)}
|
||||
{proxy.smux && (
|
||||
<TypeBox color="text.secondary" component="span">
|
||||
SMUX
|
||||
</TypeBox>
|
||||
)}
|
||||
</Box>
|
||||
)}
|
||||
</Box>
|
||||
|
|
|
@ -127,8 +127,6 @@ export const ProxyItem = (props: Props) => {
|
|||
{showType && proxy.udp && <TypeBox>UDP</TypeBox>}
|
||||
{showType && proxy.xudp && <TypeBox>XUDP</TypeBox>}
|
||||
{showType && proxy.tfo && <TypeBox>TFO</TypeBox>}
|
||||
{showType && proxy.mptcp && <TypeBox>MPTCP</TypeBox>}
|
||||
{showType && proxy.smux && <TypeBox>SMUX</TypeBox>}
|
||||
</>
|
||||
}
|
||||
/>
|
||||
|
|
|
@ -122,8 +122,6 @@ export const getProxies = async () => {
|
|||
udp: false,
|
||||
xudp: false,
|
||||
tfo: false,
|
||||
mptcp: false,
|
||||
smux: false,
|
||||
history: [],
|
||||
};
|
||||
};
|
||||
|
|
5
src/services/types.d.ts
vendored
5
src/services/types.d.ts
vendored
|
@ -56,8 +56,6 @@ interface IProxyItem {
|
|||
udp: boolean;
|
||||
xudp: boolean;
|
||||
tfo: boolean;
|
||||
mptcp: boolean;
|
||||
smux: boolean;
|
||||
history: {
|
||||
time: string;
|
||||
delay: number;
|
||||
|
@ -470,7 +468,6 @@ interface IProxyVlessConfig extends IProxyBaseConfig {
|
|||
fingerprint?: string;
|
||||
servername?: string;
|
||||
"client-fingerprint"?: ClientFingerprint;
|
||||
smux?: boolean;
|
||||
}
|
||||
// vmess
|
||||
interface IProxyVmessConfig extends IProxyBaseConfig {
|
||||
|
@ -499,7 +496,6 @@ interface IProxyVmessConfig extends IProxyBaseConfig {
|
|||
"global-padding"?: boolean;
|
||||
"authenticated-length"?: boolean;
|
||||
"client-fingerprint"?: ClientFingerprint;
|
||||
smux?: boolean;
|
||||
}
|
||||
interface WireGuardPeerOptions {
|
||||
server?: string;
|
||||
|
@ -608,7 +604,6 @@ interface IProxyShadowsocksConfig extends IProxyBaseConfig {
|
|||
"udp-over-tcp"?: boolean;
|
||||
"udp-over-tcp-version"?: number;
|
||||
"client-fingerprint"?: ClientFingerprint;
|
||||
smux?: boolean;
|
||||
}
|
||||
// shadowsocksR
|
||||
interface IProxyshadowsocksRConfig extends IProxyBaseConfig {
|
||||
|
|
Loading…
Reference in New Issue
Block a user