mtfyun/usbipd-win
1
0 Fork 0
mirror of https://github.com/dorssel/usbipd-win.git synced 2026-11-10 22:50:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Frans van Dorsselaer committed 2024-01-20 20:04:07 +01:00
1 parent 5a7efc47e3
commit 76f97ff01b
5 files changed
+6 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Installer/PowerShell.wxs
+1 -4
View File
@@ -4,10 +4,7 @@ SPDX-FileCopyrightText: 2024 Frans van Dorsselaer
SPDX-License-Identifier: GPL-3.0-only
-->
<Wix
xmlns="http://wixtoolset.org/schemas/v4/wxs"
xmlns:fw="http://wixtoolset.org/schemas/v4/wxs/firewall"
>
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Fragment>
<DirectoryRef Id="APPLICATIONFOLDER">
<Directory Id="PowerShell" Name="PowerShell" />
Installer/Product.wxs
-14
View File
@@ -41,20 +41,6 @@ SPDX-License-Identifier: GPL-3.0-only
<Property Id="MSIDEPLOYMENTCOMPLIANT" Value="1" />
<!--
We use .NET trimmed publishing, which will modify the .NET DLLs, but keeps the file version the same.
Therefore, we must always overwrite all files, as the trimming may be different from one build to another.
This is safe, since we only install files in our own dedicated application directory.
-->
<SetProperty
Action="SetREINSTALLMODE"
Id="REINSTALLMODE"
Value="amus"
Before="CostInitialize"
Sequence="first"
Condition="NOT REINSTALLMODE"
/>
<!--
MSI specifies that TARGETDIR overrides the default installation location, and winget relies on that.
WiX, however, uses APPLICATIONFOLDER.
Installer/Server.wxs
+2 -2
View File
@@ -81,7 +81,7 @@ SPDX-License-Identifier: GPL-3.0-only
<!-- This will restore the original Windows drivers for devices that were forced bound. -->
<SetProperty Id="RestoreDrivers" Value="&quot;[#usbipd.exe]&quot; unbind --all" Sequence="execute" Before="RestoreDrivers" />
<CustomAction Id="RestoreDrivers" BinaryRef="Wix4UtilCA_X64" DllEntry="WixQuietExec64" Return="ignore" Impersonate="no" Execute="deferred" />
<CustomAction Id="RestoreDrivers" BinaryRef="Wix4UtilCA_X64" DllEntry="WixQuietExec" Return="ignore" Impersonate="no" Execute="deferred" />
<!--
This will *try to* start the service. However, unlike ServiceControl, it will not fail if it can't.
@@ -89,7 +89,7 @@ SPDX-License-Identifier: GPL-3.0-only
The CLI tool will inform the user if the service is not running and that a reboot should fix that.
-->
<SetProperty Id="TryStartService" Value="&quot;[System64Folder]\sc.exe&quot; start usbipd" Sequence="execute" Before="TryStartService" />
<CustomAction Id="TryStartService" BinaryRef="Wix4UtilCA_X64" DllEntry="WixQuietExec64" Return="ignore" Impersonate="no" Execute="deferred" />
<CustomAction Id="TryStartService" BinaryRef="Wix4UtilCA_X64" DllEntry="WixQuietExec" Return="ignore" Impersonate="no" Execute="deferred" />
<InstallExecuteSequence>
<!-- Condition: usbipd.exe is installed and will be uninstalled -->
Installer/WSL.wxs
+3 -6
View File
@@ -4,10 +4,7 @@ SPDX-FileCopyrightText: 2024 Frans van Dorsselaer
SPDX-License-Identifier: GPL-3.0-only
-->
<Wix
xmlns="http://wixtoolset.org/schemas/v4/wxs"
xmlns:fw="http://wixtoolset.org/schemas/v4/wxs/firewall"
>
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Fragment>
<DirectoryRef Id="APPLICATIONFOLDER">
<!-- Windows uses uppercase spelling for folders related to WSL (and lowercase for files). -->
@@ -36,7 +33,7 @@ SPDX-License-Identifier: GPL-3.0-only
-->
<!--
<SetProperty Id="FixExecutionRights_file.id" Value="&quot;[System64Folder]\icacls.exe&quot; &quot;[#file.id]&quot; /deny &quot;*S-1-1-0:(X)&quot;" Sequence="execute" Before="FixExecutionRights_file.id" />
<CustomAction Id="FixExecutionRights_file.id" BinaryRef="Wix4UtilCA_X64" DllEntry="WixQuietExec64" Return="ignore" Impersonate="no" Execute="deferred" />
<CustomAction Id="FixExecutionRights_file.id" BinaryRef="Wix4UtilCA_X64" DllEntry="WixQuietExec" Return="ignore" Impersonate="no" Execute="deferred" />
<InstallExecuteSequence>
<Custom Action="FixExecutionRights_file.id" Before="InstallFinalize" Condition="$file.id=3" />
@@ -44,7 +41,7 @@ SPDX-License-Identifier: GPL-3.0-only
-->
<SetProperty Id="FixExecutionRights_WSL_README.md" Value="&quot;[System64Folder]\icacls.exe&quot; &quot;[#WSL_README.md]&quot; /deny &quot;*S-1-1-0:(X)&quot;" Sequence="execute" Before="FixExecutionRights_WSL_README.md" />
<CustomAction Id="FixExecutionRights_WSL_README.md" BinaryRef="Wix4UtilCA_X64" DllEntry="WixQuietExec64" Return="ignore" Impersonate="no" Execute="deferred" />
<CustomAction Id="FixExecutionRights_WSL_README.md" BinaryRef="Wix4UtilCA_X64" DllEntry="WixQuietExec" Return="ignore" Impersonate="no" Execute="deferred" />
<InstallExecuteSequence>
<Custom Action="FixExecutionRights_WSL_README.md" After="InstallFiles" Condition="$WSL_README.md=3" />
Usbipd/NativeMethods.txt
-3
View File
@@ -28,7 +28,6 @@ CreateFile
DeviceIoControl
DiInstallDevice
GetCurrentProcess
GetTokenInformation
LookupPrivilegeValue
OpenProcessToken
RegDeleteKey
@@ -112,5 +111,3 @@ IOCTL_USB_HUB_CYCLE_PORT
// USB_NODE_CONNECTION_INFORMATION_EX
USB_NODE_CONNECTION_INFORMATION_EX_V2
USB_CYCLE_PORT_PARAMS
tcp_keepalive