chore(windows): clean up build/packaging - drop vendored driver binaries + the LLVM-21 pin

Now that the drivers build from source in CI, remove the dead checked-in binaries and the toolchain cruft they left behind: - Delete packaging/windows/{pf-vdisplay,gamepad-drivers}/ (the prebuilt .dll/.inf/.cat/.cer). pack-host-installer.ps1 builds + signs all three drivers from the drivers/ workspace and nothing reads the vendored dirs anymore; stage-pf-vdisplay.ps1's -VendorDir is now a mandatory build-output path, not a vendored default. - Drop the LLVM-21 pin. The vendored bindgen 0.71->0.72 bump (the shipping pack already builds green on the runner-default clang 22) retired the bindgen-0.71 layout-test overflow that needed LLVM 21.1.2, so windows-drivers.yml + provision-windows-wdk.ps1 no longer install/point at C:\llvm-21 (~898 MB off a fresh provision) - both driver builds now use one toolchain (clang 22 + bindgen 0.72). - pack -SkipBuild on the gamepad build (build-pf-vdisplay.ps1 already builds the whole workspace), build-web.ps1 reaps a stale node too, deploy-dev.ps1 nefconc path + comments. - Reword the vendored-driver references (build scripts, .iss, READMEs, the vite web-bundle comment) to the build-from-source reality. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-26 16:16:46 +00:00
parent 7ab0661ddc
commit a9cca82fb8
23 changed files with 51 additions and 301 deletions
@@ -10,8 +10,8 @@
  `cargo build --release` builds the whole workspace (this shares wdk-sys/wdk-build + the bindgen pin with
  pf-vdisplay). Then, per driver: CLEAR the FORCE_INTEGRITY PE bit, sign the .dll, stampinf a DriverVer
  into the INF; then Inf2Cat both catalogs and sign them. Both drivers share ONE self-signed cert (or a
-  supplied DRIVER_CERT secret) + ONE exported .cer, matching the vendored gamepad-drivers/ layout that
-  install-gamepad-drivers.ps1 expects.
+  supplied DRIVER_CERT secret) + ONE exported .cer - the layout install-gamepad-drivers.ps1 consumes
+  (per-driver .inf/.cat/.dll + one shared punktfunk-driver.cer).

  Output (-Out): pf_dualsense.{dll,inf,cat} + pf_xusb.{dll,inf,cat} + punktfunk-driver.cer.

@@ -15,8 +15,8 @@
  Version_Number=10.0.26100.0, run `cargo build`.

  Re-deploying needs a HIGHER DriverVer than the installed one or pnputil silently keeps the old binary —
-  hence the 9.9.MMdd.HHmm scheme (the vendored build is 9.5.*). If the host service is running it holds the
-  driver: `punktfunk-host service stop`, deploy, then start it, for a clean test.
+  hence the 9.9.MMdd.HHmm scheme (also what the installer build uses; a later-minute dev redeploy wins).
+  If the host service is running it holds the driver: `punktfunk-host service stop`, deploy, then start it.
 .PARAMETER Install
  Also add the driver package to the store + (if absent) create the Root\pf_vdisplay devnode via nefconc.
  Needs an ELEVATED shell.
@@ -25,7 +25,7 @@
 param(
    [string]$Stage      = 'C:\Users\Public\pfvd-stage-deploy',
    [string]$Thumbprint = '6A52984E54376C45A1C236B1A2C8A746C5AB6131',
-    [string]$Nefconc    = 'C:\Users\Public\virtual-display-rs\installer\files\nefconc.exe',
+    [string]$Nefconc    = 'C:\Users\Public\nefcon\x64\nefconc.exe',   # pinned nefcon (stage-pf-vdisplay.ps1 fetches it)
    [switch]$Install
 )
 $ErrorActionPreference = 'Stop'
@@ -56,7 +56,7 @@ Copy-Item $inx $stagedInf -Force   # stampinf rewrites this copy in place
 # Clear FORCE_INTEGRITY BEFORE signing (the clear edits the PE, which invalidates any signature).
 & $clear -Path $stagedDll | Out-Null

-# DriverVer must strictly increase. Installed is 9.5.* — 9.9.MMdd.HHmm always wins on the same day.
+# DriverVer must strictly increase past whatever is installed; 9.9.MMdd.HHmm bumps every minute.
 $now = Get-Date
 $ver = '9.9.{0}.{1}' -f $now.ToString('MMdd'), $now.ToString('HHmm')

@@ -24,8 +24,9 @@ version control / portability of the spike.

 ## Build / sign / install recipe (the one that actually loads)

-Prereqs on the Windows box: **WDK 26100**, **LLVM 21.1.2** (pinned — newer bindgen breaks),
-`cargo-make`, Rust MSVC. A self-signed CodeSigning cert in `CurrentUser\My` + `LocalMachine\Root` +
+Prereqs on the Windows box: **WDK 26100**, **LLVM** (the current default; bindgen 0.72 builds on clang
+22), Rust MSVC. Built as a member of the `packaging/windows/drivers/` workspace (plain `cargo build`, no
+cargo-make). A self-signed CodeSigning cert in `CurrentUser\My` + `LocalMachine\Root` +
 `TrustedPublisher`.

 Every build needs:
@@ -66,8 +66,8 @@ there); these repo files are the canonical copies — keep them in sync.
 `crates/punktfunk-host/src/inject/gamepad_windows.rs` is the Windows `GamepadManager` (used by
 `PadBackend::Xbox360`): it SwDeviceCreate's the `pf_xusb` companion, maps `pfxusb-shm-<index>`, writes
 the XInput state from the client's gamepad frame (already XInput-convention) and forwards rumble. There
-is **no ViGEmBus dependency** anymore. The driver is vendored + pnputil-installed by the Inno Setup
-installer (`packaging/windows/gamepad-drivers/` + `install-gamepad-drivers.ps1`).
+is **no ViGEmBus dependency** anymore. The driver is built from source (`packaging/windows/drivers/pf-xusb`),
+signed, and pnputil-installed by the Inno Setup installer (via `install-gamepad-drivers.ps1`).

 ## Multi-pad

@@ -1,82 +0,0 @@
-;/*++
-; punktfunk virtual DualSense — UMDF2 HID minidriver INF (M0 spike).
-; Adapted from the WDK vhidmini2 UMDF2 sample (VhidminiUm.inx).
-; Depends on MsHidUmdf.inf (build >= 22000).
-; Install: devgen /add /hardwareid "root\pf_dualsense"  (after pnputil /add-driver /install)
-;--*/
-[Version]
-Signature="$WINDOWS NT$"
-Class=HIDClass
-ClassGuid={745a17a0-74d3-11d0-b6fe-00a0c90f57da}
-Provider=%ProviderString%
-CatalogFile = pf_dualsense.cat
-PnpLockdown=1
-DriverVer = 06/22/2026,16.23.43.887
-
-[DestinationDirs]
-DefaultDestDir = 13
-
-[SourceDisksNames]
-1=%Disk_Description%,,,
-
-[SourceDisksFiles]
-pf_dualsense.dll=1
-
-[Manufacturer]
-%ManufacturerString%=pf, NTamd64.10.0...22000
-
-[pf.NTamd64.10.0...22000]
-; Hardware ids: `root\pf_dualsense` for a root-enumerated devnode (devgen/devcon tests); `pf_dualsense`
-; for the host's SwDeviceCreate'd DualSense (the `root\` prefix is reserved for root enumeration, so
-; SwDeviceCreate rejects it with E_INVALIDARG); `pf_dualshock4` for the host's virtual DualShock 4 — the
-; same driver binds both and serves the DualSense or DS4 identity per the device_type byte the host
-; stamps into shared memory.
-%DeviceDesc%=pfDualSense, root\pf_dualsense, pf_dualsense, pf_dualshock4
-
-[pfDualSense.NT]
-CopyFiles=UMDriverCopy
-Include=MsHidUmdf.inf
-Needs=MsHidUmdf.NT
-Include=WUDFRD.inf
-Needs=WUDFRD_LowerFilter.NT
-
-[pfDualSense.NT.hw]
-Include=MsHidUmdf.inf
-Needs=MsHidUmdf.NT.hw
-Include=WUDFRD.inf
-Needs=WUDFRD_LowerFilter.NT.hw
-
-[pfDualSense.NT.Services]
-Include=MsHidUmdf.inf
-Needs=MsHidUmdf.NT.Services
-Include=WUDFRD.inf
-Needs=WUDFRD_LowerFilter.NT.Services
-
-[pfDualSense.NT.Filters]
-Include=WUDFRD.inf
-Needs=WUDFRD_LowerFilter.NT.Filters
-
-[pfDualSense.NT.Wdf]
-UmdfService="pf_dualsense", pf_dualsense_Install
-UmdfServiceOrder=pf_dualsense
-UmdfKernelModeClientPolicy=AllowKernelModeClients
-UmdfFileObjectPolicy=AllowNullAndUnknownFileObjects
-UmdfMethodNeitherAction=Copy
-UmdfFsContextUsePolicy=CanUseFsContext2
-; Each pad gets its OWN WUDFHost so the driver's per-pad statics (incl. the shm index) don't collide
-; across multiple simultaneous controllers (multi-pad).
-UmdfHostProcessSharing=ProcessSharingDisabled
-
-[pf_dualsense_Install]
-UmdfLibraryVersion=2.31.0
-ServiceBinary="%13%\pf_dualsense.dll"
-
-[UMDriverCopy]
-pf_dualsense.dll
-
-[Strings]
-ProviderString     ="punktfunk"
-ManufacturerString ="punktfunk"
-ClassName          ="HID device"
-Disk_Description   ="punktfunk DualSense Installation Disk"
-DeviceDesc         ="punktfunk Virtual DualSense"
@@ -1,66 +0,0 @@
-;/*++
-; punktfunk virtual Xbox 360 XUSB companion — a non-HID UMDF2 driver that registers the XUSB
-; device-interface GUID {EC87F1E3-...} and answers the buffered XInput IOCTLs, so classic
-; XInputGetState() reads the pad without a kernel bus driver (the HIDMaestro approach). System class,
-; hosted by the in-box WUDFRd reflector. Created per-session by the host via SwDeviceCreate
-; (hardware id `pf_xusb`); `root\pf_xusb` is the devgen/devcon test id.
-;--*/
-[Version]
-Signature   = "$WINDOWS NT$"
-Class       = System
-ClassGuid   = {4D36E97D-E325-11CE-BFC1-08002BE10318}
-Provider    = %ProviderString%
-CatalogFile = pf_xusb.cat
-PnpLockdown = 1
-DriverVer = 06/22/2026,16.17.56.696
-
-[DestinationDirs]
-DefaultDestDir = 13
-
-[SourceDisksNames]
-1 = %DiskId1%,,,""
-
-[SourceDisksFiles]
-pf_xusb.dll = 1,,
-
-[Manufacturer]
-%StdMfg%=Standard, NTamd64.10.0...22000
-
-[Standard.NTamd64.10.0...22000]
-%DeviceDesc%=pfXusb, root\pf_xusb, pf_xusb
-
-[pfXusb.NT]
-CopyFiles=Drivers_Dir
-Include=WUDFRD.inf
-Needs=WUDFRD.NT
-
-[Drivers_Dir]
-pf_xusb.dll
-
-[pfXusb.NT.HW]
-Include=WUDFRD.inf
-Needs=WUDFRD.NT.HW
-
-[pfXusb.NT.Services]
-Include=WUDFRD.inf
-Needs=WUDFRD.NT.Services
-
-[pfXusb.NT.Wdf]
-UmdfService=pf_xusb, pfXusb_Install
-UmdfServiceOrder=pf_xusb
-UmdfKernelModeClientPolicy=AllowKernelModeClients
-UmdfFileObjectPolicy=AllowNullAndUnknownFileObjects
-UmdfMethodNeitherAction=Copy
-UmdfFsContextUsePolicy=CanUseFsContext2
-UmdfHostProcessSharing=ProcessSharingDisabled
-
-[pfXusb_Install]
-UmdfLibraryVersion=2.31.0
-ServiceBinary=%13%\pf_xusb.dll
-
-[Strings]
-ProviderString = "punktfunk"
-StdMfg         = "(Standard system devices)"
-DiskId1        = "punktfunk XUSB Installation Disk"
-DeviceDesc     = "punktfunk Virtual Xbox 360 (XUSB)"
-
@@ -164,7 +164,9 @@ else { Write-Host "-NoDriver: building installer WITHOUT the bundled pf-vdisplay
 # gamepad-drivers.ps1 adds each to the store (the host SwDeviceCreate's the per-session devnodes).
 if (-not $NoDriver) {
    $gpBuilt = Join-Path $OutDir 'gamepad-built'
-    & (Join-Path $here 'build-gamepad-drivers.ps1') -Out $gpBuilt
+    # -SkipBuild: build-pf-vdisplay.ps1 above already `cargo build`s the WHOLE drivers workspace (incl.
+    # the gamepad cdylibs), so just sign+stage them here - no redundant second full build.
+    & (Join-Path $here 'build-gamepad-drivers.ps1') -Out $gpBuilt -SkipBuild
    $gpStage = Join-Path $OutDir 'gamepad'
    if (Test-Path $gpStage) { Remove-Item -Recurse -Force $gpStage }
    New-Item -ItemType Directory -Force -Path $gpStage | Out-Null
@@ -1,85 +0,0 @@
-;/*++
-; pf-vdisplay - punktfunk virtual display, UMDF2 IddCx driver INF (template; stampinf -> .inf).
-;
-; For the all-Rust wdk-sys / windows-drivers-rs driver in THIS tree
-; (packaging/windows/drivers/pf-vdisplay/). The driver registers the OWNED pf_driver_proto
-; control-interface GUID in CODE (WdfDeviceCreateDeviceInterface), so this INF is GUID-agnostic and
-; is byte-identical to the superseded oracle's (packaging/windows/vdisplay-driver/.../pf_vdisplay.inx,
-; itself adapted from MolotovCherry/virtual-display-rs (MIT) + SudoVDA's control-device security DACL).
-; HWID Root\pf_vdisplay + IddCx0102 + the DACL match the host backend (crates/punktfunk-host/src/
-; vdisplay/pf_vdisplay.rs) and install-pf-vdisplay.ps1's Test-PfVdisplayPresent / nefconc node-create.
-;--*/
-[Version]
-PnpLockdown=1
-Signature="$Windows NT$"
-ClassGUID={4D36E968-E325-11CE-BFC1-08002BE10318}
-Class=Display
-ClassVer=2.0
-Provider=%ManufacturerName%
-CatalogFile=pf_vdisplay.cat
-DriverVer = 06/25/2026,9.5.0625.1614
-
-[Manufacturer]
-%ManufacturerName%=Standard,NTamd64
-
-[Standard.NTamd64]
-%DeviceName%=pf_vdisplay_Install, Root\pf_vdisplay
-
-[SourceDisksFiles]
-pf_vdisplay.dll=1
-
-[SourceDisksNames]
-1=%DiskName%
-
-; =================== UMDF IddCx device ====================
-
-[pf_vdisplay_Install.NT]
-CopyFiles=UMDriverCopy
-
-[pf_vdisplay_Install.NT.hw]
-AddReg=pf_vdisplay_HardwareDeviceSettings
-
-[pf_vdisplay_HardwareDeviceSettings]
-HKR, , "UpperFilters", %REG_MULTI_SZ%, "IndirectKmd"
-HKR, "WUDF", "DeviceGroupId", %REG_SZ%, "pfVDisplayGroup"
-; Let the host (LocalSystem service) + admins open the control device for the ADD/REMOVE/PING IOCTLs.
-HKR, , "Security", , "D:P(A;;GA;;;SY)(A;;GA;;;BA)(A;;GRGW;;;WD)"
-
-[pf_vdisplay_Install.NT.Services]
-AddService=WUDFRd,0x000001fa,WUDFRD_ServiceInstall
-
-[pf_vdisplay_Install.NT.Wdf]
-UmdfService=pf_vdisplay, pf_vdisplay_Install
-UmdfServiceOrder=pf_vdisplay
-UmdfKernelModeClientPolicy=AllowKernelModeClients
-UmdfHostProcessSharing=ProcessSharingDisabled
-
-[pf_vdisplay_Install]
-UmdfLibraryVersion=2.15.0
-ServiceBinary=%12%\UMDF\pf_vdisplay.dll
-UmdfExtensions=IddCx0102
-
-[WUDFRD_ServiceInstall]
-DisplayName=%WudfRdDisplayName%
-ServiceType=1
-StartType=3
-ErrorControl=1
-ServiceBinary=%12%\WUDFRd.sys
-
-[DestinationDirs]
-UMDriverCopy=12,UMDF
-
-[UMDriverCopy]
-pf_vdisplay.dll
-
-[Strings]
-ManufacturerName="punktfunk"
-DiskName="punktfunk Virtual Display Installation Disk"
-WudfRdDisplayName="Windows Driver Foundation - User-mode Driver Framework Reflector"
-DeviceName="punktfunk Virtual Display"
-
-REG_MULTI_SZ=0x00010000
-REG_SZ=0x00000000
-REG_EXPAND_SZ=0x00020000
-REG_DWORD=0x00010001
-
@@ -40,7 +40,7 @@
 #ifdef StageDir
  #define WithDriver
 #endif
-; GamepadStageDir (the vendored UMDF gamepad drivers + install-gamepad-drivers.ps1) is optional.
+; GamepadStageDir (the built-from-source UMDF gamepad drivers + install-gamepad-drivers.ps1) is optional.
 #ifdef GamepadStageDir
  #define WithGamepad
 #endif
@@ -126,7 +126,7 @@ Source: "{#WebSetup}"; DestDir: "{tmp}"; DestName: "web-setup.ps1"; Flags: delet
 Source: "{#StageDir}\*"; DestDir: "{tmp}\pfvdisplay"; Flags: deleteafterinstall recursesubdirs createallsubdirs; Tasks: installdriver
 #endif
 #ifdef WithGamepad
-; The vendored UMDF gamepad drivers + install-gamepad-drivers.ps1, extracted to {tmp}, removed after.
+; The built-from-source UMDF gamepad drivers + install-gamepad-drivers.ps1, extracted to {tmp}, removed after.
 Source: "{#GamepadStageDir}\*"; DestDir: "{tmp}\gamepad"; Flags: deleteafterinstall recursesubdirs createallsubdirs; Tasks: installgamepad
 #endif
 #ifdef WithVkLayer
@@ -1,20 +1,20 @@
 <#
 .SYNOPSIS
-  Stage the pf-vdisplay driver bundle the installer ships into -OutDir: the VENDORED signed pf-vdisplay
-  driver + the fetched nefcon device tool.
+  Stage the pf-vdisplay driver bundle the installer ships into -OutDir: the freshly-built signed
+  pf-vdisplay driver (from -VendorDir) + the fetched nefcon device tool.

 .DESCRIPTION
-  pf-vdisplay (our all-Rust IddCx virtual display) is built from packaging/windows/drivers/, and
-  the SIGNED output (pf_vdisplay.dll/.inf/.cat + punktfunk-driver.cer) is VENDORED under
-  packaging/windows/pf-vdisplay/ (signer punktfunk-ds-test - shared with the gamepad drivers - Class=
-  Display, HWID root\pf_vdisplay). Rebuild + re-vendor with
-  packaging/windows/drivers/deploy-dev.ps1 when the driver source changes, then copy the staged
-  pf_vdisplay.{dll,inf,cat} over the vendored copies. nefcon publishes a pinned release, so we fetch +
+  pf-vdisplay (our all-Rust IddCx virtual display) is BUILT FROM SOURCE per release by
+  build-pf-vdisplay.ps1 (packaging/windows/drivers/), which emits the signed pf_vdisplay.{dll,inf,cat}
+  + punktfunk-driver.cer into a build-output dir. pack-host-installer.ps1 passes that dir here as
+  -VendorDir; we copy it + add the nefcon tool. (The old checked-in binaries under
+  packaging/windows/pf-vdisplay/ were retired - building from source keeps the .dll/.inf/.cat in
+  lockstep; see design/windows-build-and-packaging.md.) nefcon publishes a pinned release, so we fetch +
  SHA-256-verify it (it provides nefconc.exe, used to create the root-enumerated device node - pnputil
  can't).

  Output (consumed by punktfunk-host.iss): -OutDir gets pf_vdisplay.inf/.cat/.dll + punktfunk-driver.cer
-  and nefconc.exe (x64). pack-host-installer.ps1 also drops install-pf-vdisplay.ps1 in.
+  and nefconc.exe (x64).

 .EXAMPLE
  pwsh -File stage-pf-vdisplay.ps1 -OutDir C:\t\out\stage
@@ -22,7 +22,7 @@
 [CmdletBinding()]
 param(
    [Parameter(Mandatory = $true)][string]$OutDir,
-    [string]$VendorDir = (Join-Path $PSScriptRoot 'pf-vdisplay'),
+    [Parameter(Mandatory = $true)][string]$VendorDir,   # the build-pf-vdisplay.ps1 output dir
    # PINNED nefcon release (https://github.com/nefarius/nefcon/releases). MIT-licensed.
    [string]$NefconUrl = 'https://github.com/nefarius/nefcon/releases/download/v1.17.40/nefcon_v1.17.40.zip',
    [string]$NefconSha256 = '812bae7ed7dfb7d6d2284bc7de2f8ccebc92ed2a0b1ae893c53b337096e50c1a'
@@ -34,11 +34,11 @@ $PSNativeCommandUseErrorActionPreference = $false
 if (Test-Path $OutDir) { Remove-Item -Recurse -Force $OutDir }
 New-Item -ItemType Directory -Force -Path $OutDir | Out-Null

-# --- vendored pf-vdisplay driver --------------------------------------------------------------
+# --- built pf-vdisplay driver -----------------------------------------------------------------
 $inf = Get-ChildItem -Path $VendorDir -Filter pf_vdisplay.inf -ErrorAction SilentlyContinue | Select-Object -First 1
-if (-not $inf) { throw "no vendored pf_vdisplay.inf under $VendorDir - re-vendor via drivers/deploy-dev.ps1" }
+if (-not $inf) { throw "no pf_vdisplay.inf under $VendorDir - did build-pf-vdisplay.ps1 run?" }
 Copy-Item (Join-Path $VendorDir '*') $OutDir -Force
-Write-Host "==> vendored pf-vdisplay staged from $VendorDir"
+Write-Host "==> pf-vdisplay staged from $VendorDir"

 # --- nefcon (fetched + verified) --------------------------------------------------------------
 $work = Join-Path ([IO.Path]::GetTempPath()) ('nefcon-' + [IO.Path]::GetRandomFileName())