trcc-linux 8.7.0__tar.gz → 8.7.2__tar.gz

{trcc_linux-8.7.0 → trcc_linux-8.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trcc-linux
-Version: 8.7.0
+Version: 8.7.2
 Summary: Linux implementation of Thermalright LCD Control Center
 Project-URL: Homepage, https://github.com/Lexonight1/thermalright-trcc-linux
 Project-URL: Documentation, https://github.com/Lexonight1/thermalright-trcc-linux#readme
@@ -32,6 +32,7 @@ Requires-Dist: pyside6>=6.5.0
 Requires-Dist: python-multipart>=0.0.6
 Requires-Dist: pyusb>=1.2.0
 Requires-Dist: typer>=0.9.0
+Requires-Dist: tzdata>=2024.1; sys_platform == 'win32'
 Requires-Dist: uvicorn[standard]>=0.20
 Requires-Dist: wmi>=1.5.1; sys_platform == 'win32'
 Provides-Extra: all
@@ -78,7 +79,7 @@ Description-Content-Type: text/markdown
 [![Platform](https://img.shields.io/badge/platform-Linux-FCC624?logo=linux&logoColor=black)](https://github.com/Lexonight1/thermalright-trcc-linux)
 
 [![CI](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml/badge.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
-[![Tests](https://img.shields.io/badge/tests-5254_passed-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
+[![Tests](https://img.shields.io/badge/tests-5258_passed-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
 [![Coverage](https://img.shields.io/badge/coverage-72%25-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
 [![Python](https://img.shields.io/badge/python-3.9%2B-blue.svg)](https://python.org)
 [![Code Style](https://img.shields.io/badge/code_style-ruff-D7FF64?logo=ruff&logoColor=black)](https://docs.astral.sh/ruff/)
@@ -126,13 +127,13 @@ Pre-built packages are available for every major distro. No pip, no venv, no PEP
 
 **Fedora / openSUSE / Nobara:**
 ```bash
-sudo dnf install https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.7.0-1.fc43.noarch.rpm
+sudo dnf install https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.7.2-1.fc43.noarch.rpm
 ```
 
 **Ubuntu 24.04+ / Debian 13+ / Mint 22+ / Pop!_OS 24.04+ / Zorin 17+:**
 ```bash
-curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux_8.7.0-1_all.deb
-sudo dpkg -i trcc-linux_8.7.0-1_all.deb
+curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux_8.7.2-1_all.deb
+sudo dpkg -i trcc-linux_8.7.2-1_all.deb
 sudo apt-get install -f    # pulls in any missing dependencies
 ```
 
@@ -140,8 +141,8 @@ sudo apt-get install -f    # pulls in any missing dependencies
 
 **Arch / CachyOS / Manjaro / EndeavourOS / Garuda:**
 ```bash
-curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.7.0-1-any.pkg.tar.zst
-sudo pacman -U trcc-linux-8.7.0-1-any.pkg.tar.zst
+curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.7.2-1-any.pkg.tar.zst
+sudo pacman -U trcc-linux-8.7.2-1-any.pkg.tar.zst
 ```
 
 **NixOS** — add to your `flake.nix` inputs:
@@ -168,8 +169,8 @@ That's it! If your device isn't detected, run `trcc detect --all` to see what's
 
 | OS | Download | Notes |
 |----|----------|-------|
-| **Windows 10/11** | [`trcc-8.7.0-setup.exe`](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) | GUI + CLI, bundles 7z/ffmpeg/libusb |
-| **macOS 11+** | [`trcc-8.7.0-macos.dmg`](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) | Drag to Applications, `brew install libusb` first |
+| **Windows 10/11** | [`trcc-8.7.2-setup.exe`](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) | GUI + CLI, bundles 7z/ffmpeg/libusb |
+| **macOS 11+** | [`trcc-8.7.2-macos.dmg`](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) | Drag to Applications, `brew install libusb` first |
 | **FreeBSD** | `pip install trcc-linux` | PyPI only, needs `libusb` + `py311-pyusb` |
 
 See the **[Install Guide](doc/GUIDE_INSTALL.md)** for detailed setup instructions, requirements, and troubleshooting for each platform.
@@ -457,13 +458,13 @@ A big thanks to everyone who has contributed invaluable reports to this project:
 
 Thanks to everyone who took a moment to star this project — it means the world.
 
-**[alessa-lara](https://github.com/alessa-lara)** · **[ArcaneCoder404](https://github.com/ArcaneCoder404)** · **[betolink](https://github.com/betolink)** · **[bive242](https://github.com/bive242)** · **[BrunoLeguizamon05](https://github.com/BrunoLeguizamon05)** · **[cancos1](https://github.com/cancos1)** · **[codeflitting](https://github.com/codeflitting)** · **[dabombUSA](https://github.com/dabombUSA)** · **[damachine](https://github.com/damachine)** · **[DasFlogetier](https://github.com/DasFlogetier)** · **[eap5](https://github.com/eap5)** · **[emaspa](https://github.com/emaspa)** · **[honjow](https://github.com/honjow)** · **[jezzaw007](https://github.com/jezzaw007)** · **[jhlasnik](https://github.com/jhlasnik)** · **[jmo808](https://github.com/jmo808)** · **[knappstar](https://github.com/knappstar)** · **[mgaruccio](https://github.com/mgaruccio)** · **[michael-spinelli](https://github.com/michael-spinelli)** · **[mkogut](https://github.com/mkogut)** · **[nathanielhernandez](https://github.com/nathanielhernandez)** · **[oddajpierscien](https://github.com/oddajpierscien)** · **[Pewful2021](https://github.com/Pewful2021)** · **[Pikarz](https://github.com/Pikarz)** · **[qussaif10](https://github.com/qussaif10)** · **[Rehaell](https://github.com/Rehaell)** · **[riodevelop](https://github.com/riodevelop)** · **[rslater](https://github.com/rslater)** · **[shadowepaxeor-glitch](https://github.com/shadowepaxeor-glitch)** · **[Smokemic](https://github.com/Smokemic)** · **[Spebelgenenst](https://github.com/Spebelgenenst)** · **[spiritofjon](https://github.com/spiritofjon)** · **[Thymur](https://github.com/Thymur)** · **[Vydon](https://github.com/Vydon)** · **[Xentrino](https://github.com/Xentrino)** · **[Ziusz](https://github.com/Ziusz)**
+**[alessa-lara](https://github.com/alessa-lara)** · **[ArcaneCoder404](https://github.com/ArcaneCoder404)** · **[betolink](https://github.com/betolink)** · **[bive242](https://github.com/bive242)** · **[BrunoLeguizamon05](https://github.com/BrunoLeguizamon05)** · **[cancos1](https://github.com/cancos1)** · **[codeflitting](https://github.com/codeflitting)** · **[dabombUSA](https://github.com/dabombUSA)** · **[damachine](https://github.com/damachine)** · **[DasFlogetier](https://github.com/DasFlogetier)** · **[eap5](https://github.com/eap5)** · **[emaspa](https://github.com/emaspa)** · **[honjow](https://github.com/honjow)** · **[jezzaw007](https://github.com/jezzaw007)** · **[jhlasnik](https://github.com/jhlasnik)** · **[jmo808](https://github.com/jmo808)** · **[knappstar](https://github.com/knappstar)** · **[mgaruccio](https://github.com/mgaruccio)** · **[michael-spinelli](https://github.com/michael-spinelli)** · **[mkogut](https://github.com/mkogut)** · **[nathanielhernandez](https://github.com/nathanielhernandez)** · **[oddajpierscien](https://github.com/oddajpierscien)** · **[Pewful2021](https://github.com/Pewful2021)** · **[Pikarz](https://github.com/Pikarz)** · **[qussaif10](https://github.com/qussaif10)** · **[Rehaell](https://github.com/Rehaell)** · **[riodevelop](https://github.com/riodevelop)** · **[rslater](https://github.com/rslater)** · **[shadowepaxeor-glitch](https://github.com/shadowepaxeor-glitch)** · **[ShaunnyBwoy](https://github.com/ShaunnyBwoy)** · **[Smokemic](https://github.com/Smokemic)** · **[Spebelgenenst](https://github.com/Spebelgenenst)** · **[spiritofjon](https://github.com/spiritofjon)** · **[Thymur](https://github.com/Thymur)** · **[Vydon](https://github.com/Vydon)** · **[Xentrino](https://github.com/Xentrino)** · **[Ziusz](https://github.com/Ziusz)**
 
 ## Faulkers
 
 Thanks for carrying the torch — these folks forked the repo to build on it.
 
-**[dabombUSA](https://github.com/dabombUSA)** · **[jezzaw007](https://github.com/jezzaw007)** · **[taillis](https://github.com/taillis)**
+**[dabombUSA](https://github.com/dabombUSA)** · **[DasFlogetier](https://github.com/DasFlogetier)** · **[jezzaw007](https://github.com/jezzaw007)** · **[taillis](https://github.com/taillis)**
 
 ## Donations
 

{trcc_linux-8.7.0 → trcc_linux-8.7.2}/README.md

@@ -12,7 +12,7 @@
 [![Platform](https://img.shields.io/badge/platform-Linux-FCC624?logo=linux&logoColor=black)](https://github.com/Lexonight1/thermalright-trcc-linux)
 
 [![CI](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml/badge.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
-[![Tests](https://img.shields.io/badge/tests-5254_passed-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
+[![Tests](https://img.shields.io/badge/tests-5258_passed-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
 [![Coverage](https://img.shields.io/badge/coverage-72%25-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
 [![Python](https://img.shields.io/badge/python-3.9%2B-blue.svg)](https://python.org)
 [![Code Style](https://img.shields.io/badge/code_style-ruff-D7FF64?logo=ruff&logoColor=black)](https://docs.astral.sh/ruff/)
@@ -60,13 +60,13 @@ Pre-built packages are available for every major distro. No pip, no venv, no PEP
 
 **Fedora / openSUSE / Nobara:**
 ```bash
-sudo dnf install https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.7.0-1.fc43.noarch.rpm
+sudo dnf install https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.7.2-1.fc43.noarch.rpm
 ```
 
 **Ubuntu 24.04+ / Debian 13+ / Mint 22+ / Pop!_OS 24.04+ / Zorin 17+:**
 ```bash
-curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux_8.7.0-1_all.deb
-sudo dpkg -i trcc-linux_8.7.0-1_all.deb
+curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux_8.7.2-1_all.deb
+sudo dpkg -i trcc-linux_8.7.2-1_all.deb
 sudo apt-get install -f    # pulls in any missing dependencies
 ```
 
@@ -74,8 +74,8 @@ sudo apt-get install -f    # pulls in any missing dependencies
 
 **Arch / CachyOS / Manjaro / EndeavourOS / Garuda:**
 ```bash
-curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.7.0-1-any.pkg.tar.zst
-sudo pacman -U trcc-linux-8.7.0-1-any.pkg.tar.zst
+curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.7.2-1-any.pkg.tar.zst
+sudo pacman -U trcc-linux-8.7.2-1-any.pkg.tar.zst
 ```
 
 **NixOS** — add to your `flake.nix` inputs:
@@ -102,8 +102,8 @@ That's it! If your device isn't detected, run `trcc detect --all` to see what's
 
 | OS | Download | Notes |
 |----|----------|-------|
-| **Windows 10/11** | [`trcc-8.7.0-setup.exe`](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) | GUI + CLI, bundles 7z/ffmpeg/libusb |
-| **macOS 11+** | [`trcc-8.7.0-macos.dmg`](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) | Drag to Applications, `brew install libusb` first |
+| **Windows 10/11** | [`trcc-8.7.2-setup.exe`](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) | GUI + CLI, bundles 7z/ffmpeg/libusb |
+| **macOS 11+** | [`trcc-8.7.2-macos.dmg`](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) | Drag to Applications, `brew install libusb` first |
 | **FreeBSD** | `pip install trcc-linux` | PyPI only, needs `libusb` + `py311-pyusb` |
 
 See the **[Install Guide](doc/GUIDE_INSTALL.md)** for detailed setup instructions, requirements, and troubleshooting for each platform.
@@ -391,13 +391,13 @@ A big thanks to everyone who has contributed invaluable reports to this project:
 
 Thanks to everyone who took a moment to star this project — it means the world.
 
-**[alessa-lara](https://github.com/alessa-lara)** · **[ArcaneCoder404](https://github.com/ArcaneCoder404)** · **[betolink](https://github.com/betolink)** · **[bive242](https://github.com/bive242)** · **[BrunoLeguizamon05](https://github.com/BrunoLeguizamon05)** · **[cancos1](https://github.com/cancos1)** · **[codeflitting](https://github.com/codeflitting)** · **[dabombUSA](https://github.com/dabombUSA)** · **[damachine](https://github.com/damachine)** · **[DasFlogetier](https://github.com/DasFlogetier)** · **[eap5](https://github.com/eap5)** · **[emaspa](https://github.com/emaspa)** · **[honjow](https://github.com/honjow)** · **[jezzaw007](https://github.com/jezzaw007)** · **[jhlasnik](https://github.com/jhlasnik)** · **[jmo808](https://github.com/jmo808)** · **[knappstar](https://github.com/knappstar)** · **[mgaruccio](https://github.com/mgaruccio)** · **[michael-spinelli](https://github.com/michael-spinelli)** · **[mkogut](https://github.com/mkogut)** · **[nathanielhernandez](https://github.com/nathanielhernandez)** · **[oddajpierscien](https://github.com/oddajpierscien)** · **[Pewful2021](https://github.com/Pewful2021)** · **[Pikarz](https://github.com/Pikarz)** · **[qussaif10](https://github.com/qussaif10)** · **[Rehaell](https://github.com/Rehaell)** · **[riodevelop](https://github.com/riodevelop)** · **[rslater](https://github.com/rslater)** · **[shadowepaxeor-glitch](https://github.com/shadowepaxeor-glitch)** · **[Smokemic](https://github.com/Smokemic)** · **[Spebelgenenst](https://github.com/Spebelgenenst)** · **[spiritofjon](https://github.com/spiritofjon)** · **[Thymur](https://github.com/Thymur)** · **[Vydon](https://github.com/Vydon)** · **[Xentrino](https://github.com/Xentrino)** · **[Ziusz](https://github.com/Ziusz)**
+**[alessa-lara](https://github.com/alessa-lara)** · **[ArcaneCoder404](https://github.com/ArcaneCoder404)** · **[betolink](https://github.com/betolink)** · **[bive242](https://github.com/bive242)** · **[BrunoLeguizamon05](https://github.com/BrunoLeguizamon05)** · **[cancos1](https://github.com/cancos1)** · **[codeflitting](https://github.com/codeflitting)** · **[dabombUSA](https://github.com/dabombUSA)** · **[damachine](https://github.com/damachine)** · **[DasFlogetier](https://github.com/DasFlogetier)** · **[eap5](https://github.com/eap5)** · **[emaspa](https://github.com/emaspa)** · **[honjow](https://github.com/honjow)** · **[jezzaw007](https://github.com/jezzaw007)** · **[jhlasnik](https://github.com/jhlasnik)** · **[jmo808](https://github.com/jmo808)** · **[knappstar](https://github.com/knappstar)** · **[mgaruccio](https://github.com/mgaruccio)** · **[michael-spinelli](https://github.com/michael-spinelli)** · **[mkogut](https://github.com/mkogut)** · **[nathanielhernandez](https://github.com/nathanielhernandez)** · **[oddajpierscien](https://github.com/oddajpierscien)** · **[Pewful2021](https://github.com/Pewful2021)** · **[Pikarz](https://github.com/Pikarz)** · **[qussaif10](https://github.com/qussaif10)** · **[Rehaell](https://github.com/Rehaell)** · **[riodevelop](https://github.com/riodevelop)** · **[rslater](https://github.com/rslater)** · **[shadowepaxeor-glitch](https://github.com/shadowepaxeor-glitch)** · **[ShaunnyBwoy](https://github.com/ShaunnyBwoy)** · **[Smokemic](https://github.com/Smokemic)** · **[Spebelgenenst](https://github.com/Spebelgenenst)** · **[spiritofjon](https://github.com/spiritofjon)** · **[Thymur](https://github.com/Thymur)** · **[Vydon](https://github.com/Vydon)** · **[Xentrino](https://github.com/Xentrino)** · **[Ziusz](https://github.com/Ziusz)**
 
 ## Faulkers
 
 Thanks for carrying the torch — these folks forked the repo to build on it.
 
-**[dabombUSA](https://github.com/dabombUSA)** · **[jezzaw007](https://github.com/jezzaw007)** · **[taillis](https://github.com/taillis)**
+**[dabombUSA](https://github.com/dabombUSA)** · **[DasFlogetier](https://github.com/DasFlogetier)** · **[jezzaw007](https://github.com/jezzaw007)** · **[taillis](https://github.com/taillis)**
 
 ## Donations
 

{trcc_linux-8.7.0 → trcc_linux-8.7.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "trcc-linux"
-version = "8.7.0"
+version = "8.7.2"
 description = "Linux implementation of Thermalright LCD Control Center"
 readme = "README.md"
 license = "GPL-3.0-or-later"
@@ -37,6 +37,7 @@ dependencies = [
     "click>=7.0",
     "typer>=0.9.0",
     "fastapi>=0.100",
+    "tzdata>=2024.1; sys_platform == 'win32'",
     "uvicorn[standard]>=0.20",
     "python-multipart>=0.0.6",
     "wmi>=1.5.1; sys_platform == 'win32'",

{trcc_linux-8.7.0 → trcc_linux-8.7.2}/src/trcc/__version__.py

@@ -1,4 +1,4 @@
 """TRCC Linux version information. History in doc/CHANGELOG.md."""
 
-__version__ = "8.7.0"
+__version__ = "8.7.2"
 __version_info__ = tuple(int(x) for x in __version__.split("."))

{trcc_linux-8.7.0 → trcc_linux-8.7.2}/src/trcc/adapters/device/factory.py

@@ -339,11 +339,24 @@ class WindowsScsiProtocol(DeviceProtocol):
 
     Uses WindowsScsiTransport instead of Linux sg_raw/SG_IO.
     The device_path is a PhysicalDrive path (e.g. \\\\.\\PhysicalDrive1).
+    Keeps the transport handle open for the lifetime of the protocol.
     """
 
     def __init__(self, device_path: str):
         super().__init__()
         self._path = device_path
+        self._transport: Any = None
+
+    def _get_transport(self):
+        """Get or create persistent WindowsScsiTransport handle."""
+        if self._transport is None or self._transport._handle is None:
+            from .windows.scsi import WindowsScsiTransport
+            self._transport = WindowsScsiTransport(self._path)
+            if not self._transport.open():
+                log.error("Failed to open Windows SCSI device %s", self._path)
+                self._transport = None
+                return None
+        return self._transport
 
     def _do_handshake(self) -> Optional[HandshakeResult]:
         """Poll Windows SCSI device to discover FBL → resolution."""
@@ -356,11 +369,9 @@ class WindowsScsiProtocol(DeviceProtocol):
             _BOOT_WAIT_SECONDS,
             _POST_INIT_DELAY,
         )
-        from .windows.scsi import WindowsScsiTransport
 
-        transport = WindowsScsiTransport(self._path)
-        if not transport.open():
-            log.error("Failed to open Windows SCSI device %s", self._path)
+        transport = self._get_transport()
+        if transport is None:
             return None
 
         try:
@@ -370,12 +381,16 @@ class WindowsScsiProtocol(DeviceProtocol):
             # Poll with boot state check
             response = b''
             for attempt in range(_BOOT_MAX_RETRIES):
-                response = transport.read_cdb(cdb, 0xE100)
+                response = transport.read_cdb(cdb, 0xE100, timeout=15)
                 if len(response) >= 8 and response[4:8] == _BOOT_SIGNATURE:
                     log.info("Device %s still booting (attempt %d/%d)",
                              self._path, attempt + 1, _BOOT_MAX_RETRIES)
                     time.sleep(_BOOT_WAIT_SECONDS)
+                elif response:
+                    break
                 else:
+                    log.warning("Windows SCSI poll returned empty, "
+                                "defaulting FBL=100")
                     break
 
             fbl = response[0] if response else 100
@@ -400,15 +415,12 @@ class WindowsScsiProtocol(DeviceProtocol):
         except Exception:
             log.exception("Windows SCSI handshake failed on %s", self._path)
             return None
-        finally:
-            transport.close()
 
     def send_image(self, image_data: bytes, width: int, height: int) -> bool:
         from .scsi import ScsiDevice
-        from .windows.scsi import WindowsScsiTransport
 
-        transport = WindowsScsiTransport(self._path)
-        if not transport.open():
+        transport = self._get_transport()
+        if transport is None:
             return False
 
         try:
@@ -428,11 +440,11 @@ class WindowsScsiProtocol(DeviceProtocol):
         except Exception:
             log.exception("Windows SCSI send_image failed")
             return False
-        finally:
-            transport.close()
 
     def close(self) -> None:
-        pass
+        if self._transport is not None:
+            self._transport.close()
+            self._transport = None
 
     def get_info(self) -> 'ProtocolInfo':
         return ProtocolInfo(

{trcc_linux-8.7.0 → trcc_linux-8.7.2}/src/trcc/adapters/device/windows/detector.py

@@ -171,6 +171,75 @@ def _match_device(
     return None
 
 
+def _scan_physical_drives_ctypes() -> list[tuple[str, str]]:
+    """Scan PhysicalDrive0..15 for USB-bus drives using ctypes.
+
+    Returns list of (drive_path, vendor_id_string) for USB-connected drives.
+    No WMI dependency — uses DeviceIoControl IOCTL_STORAGE_QUERY_PROPERTY.
+    """
+    import ctypes
+    import ctypes.wintypes  # pyright: ignore[reportMissingImports]
+
+    kernel32 = ctypes.windll.kernel32  # pyright: ignore[reportAttributeAccessIssue]
+
+    GENERIC_READ = 0x80000000
+    FILE_SHARE_RW = 0x3
+    OPEN_EXISTING = 3
+    IOCTL_STORAGE_QUERY_PROPERTY = 0x2D1400
+
+    # STORAGE_PROPERTY_QUERY: PropertyId=0 (StorageDeviceProperty), QueryType=0
+    query = (ctypes.c_ubyte * 12)()
+    query[0] = 0   # PropertyId = StorageDeviceProperty
+    query[4] = 0   # QueryType = PropertyStandardQuery
+
+    results: list[tuple[str, str]] = []
+
+    for i in range(16):
+        path = f'\\\\.\\PhysicalDrive{i}'
+        handle = kernel32.CreateFileW(
+            path, GENERIC_READ, FILE_SHARE_RW,
+            None, OPEN_EXISTING, 0, None,
+        )
+        if handle == -1:
+            continue
+        try:
+            # Query storage device descriptor (contains bus type + vendor ID)
+            out_buf = (ctypes.c_ubyte * 1024)()
+            bytes_returned = ctypes.wintypes.DWORD(0)
+            ok = kernel32.DeviceIoControl(
+                handle,
+                IOCTL_STORAGE_QUERY_PROPERTY,
+                ctypes.byref(query), ctypes.sizeof(query),
+                ctypes.byref(out_buf), ctypes.sizeof(out_buf),
+                ctypes.byref(bytes_returned),
+                None,
+            )
+            if not ok:
+                continue
+
+            # STORAGE_DEVICE_DESCRIPTOR layout:
+            #   offset 12: VendorIdOffset (DWORD) — offset to vendor string
+            #   offset 28: BusType (DWORD) — 7 = BusTypeUsb
+            bus_type = int.from_bytes(bytes(out_buf[28:32]), 'little')
+            if bus_type != 7:  # Not USB
+                continue
+
+            vendor_offset = int.from_bytes(bytes(out_buf[12:16]), 'little')
+            vendor = ''
+            if 0 < vendor_offset < 1024:
+                # Read null-terminated ASCII string
+                end = vendor_offset
+                while end < 1024 and out_buf[end] != 0:
+                    end += 1
+                vendor = bytes(out_buf[vendor_offset:end]).decode('ascii', errors='replace').strip()
+
+            results.append((path, vendor))
+        finally:
+            kernel32.CloseHandle(handle)
+
+    return results
+
+
 def _find_physical_drive(vid: int, pid: int) -> str | None:
     """Find the Windows physical drive path for a USB SCSI device.
 
@@ -190,7 +259,9 @@ def _find_physical_drive(vid: int, pid: int) -> str | None:
 
         # Strategy 1: VID directly in disk PNPDeviceID
         for disk in w.Win32_DiskDrive():
-            if vid_tag in (disk.PNPDeviceID or '').upper():
+            pnp = (disk.PNPDeviceID or '').upper()
+            log.debug("Strategy 1: disk %s PNP=%s", disk.DeviceID, pnp[:80])
+            if vid_tag in pnp:
                 return disk.DeviceID
 
         # Strategy 2: USBSTOR disks — PNPDeviceID uses vendor names
@@ -198,17 +269,22 @@ def _find_physical_drive(vid: int, pid: int) -> str | None:
         # Confirm the USB device exists, then find the USBSTOR disk
         # by matching known Thermalright USBSTOR vendor strings.
         _USBSTOR_VENDORS = ('VEN_USBLCD', 'VEN_THERMALR', 'VEN_WINBOND')
-        has_usb_device = any(
-            vid_tag in (rel.Dependent or '').upper()
-            and pid_tag in (rel.Dependent or '').upper()
-            for rel in w.Win32_USBControllerDevice()
-        )
+        has_usb_device = False
+        for rel in w.Win32_USBControllerDevice():
+            dep = str(rel.Dependent or '').upper()
+            if vid_tag in dep and pid_tag in dep:
+                has_usb_device = True
+                log.debug("USB parent found: %s", dep[:120])
+                break
+        log.debug("Strategy 2: has_usb_device=%s", has_usb_device)
         if has_usb_device:
             for disk in w.Win32_DiskDrive():
                 pnp_upper = (disk.PNPDeviceID or '').upper()
+                log.debug("Strategy 2: checking disk %s PNP=%s", disk.DeviceID, pnp_upper[:80])
                 if not pnp_upper.startswith('USBSTOR'):
                     continue
                 if any(v in pnp_upper for v in _USBSTOR_VENDORS):
+                    log.debug("Strategy 2: vendor match! %s", disk.DeviceID)
                     return disk.DeviceID
             # Fallback: no vendor match but USB device confirmed —
             # try any USBSTOR disk with zero/tiny capacity (LCD devices
@@ -221,6 +297,31 @@ def _find_physical_drive(vid: int, pid: int) -> str | None:
                 if size < 1_000_000:  # < 1MB = not a real storage device
                     log.debug("USBSTOR fallback: %s (size=%d)", disk.DeviceID, size)
                     return disk.DeviceID
-    except Exception:
-        log.debug("Could not find physical drive for %04X:%04X", vid, pid)
+    except Exception as e:
+        log.debug("WMI strategies failed for %04X:%04X: %s", vid, pid, e)
+
+    # Strategy 3: brute-force scan PhysicalDrive0..15 — no WMI needed.
+    # Query each drive's bus type via IOCTL_STORAGE_QUERY_PROPERTY.
+    # USB devices report BusTypeUsb (7). Filter to USB-bus drives only,
+    # then check vendor string for Thermalright LCD identifiers.
+    log.debug("Strategy 3: brute-force PhysicalDrive scan")
+    try:
+        usb_drives = _scan_physical_drives_ctypes()
+        for path, vendor in usb_drives:
+            log.debug("Strategy 3: USB drive %s vendor=%r", path, vendor)
+            # Match known LCD vendor strings from USBSTOR enumeration
+            v_upper = vendor.upper()
+            if any(k in v_upper for k in ('USBLCD', 'USB PRC', 'THERMALR', 'WINBOND')):
+                log.info("Strategy 3: vendor match at %s (%s)", path, vendor)
+                return path
+        # Fallback: if only one USB drive found and we confirmed VID/PID
+        # exists via WMI (or detection), it's likely our device
+        if len(usb_drives) == 1:
+            path, vendor = usb_drives[0]
+            log.info("Strategy 3: single USB drive fallback %s (%s)", path, vendor)
+            return path
+    except Exception as e:
+        log.debug("Strategy 3 failed: %s", e)
+
+    log.debug("Could not find physical drive for %04X:%04X", vid, pid)
     return None

{trcc_linux-8.7.0 → trcc_linux-8.7.2}/tests/adapters/device/test_windows_detector.py

@@ -302,3 +302,62 @@ class TestFindPhysicalDrive:
             result = _find_physical_drive(0x0402, 0x3922)
 
         assert result is None
+
+    def test_strategy3_ctypes_vendor_match(self):
+        """Strategy 3: WMI fails, ctypes scan finds USB drive with LCD vendor."""
+        from trcc.adapters.device.windows.detector import _find_physical_drive
+
+        # WMI fails entirely
+        mock_wmi_mod = MagicMock()
+        mock_wmi_mod.WMI.side_effect = Exception("WMI unavailable")
+
+        # ctypes scan finds a USB drive with USBLCD vendor
+        with patch.dict('sys.modules', {'wmi': mock_wmi_mod}), \
+             patch(f'{MODULE}._scan_physical_drives_ctypes',
+                   return_value=[('\\\\.\\PhysicalDrive1', 'USBLCD')]):
+            result = _find_physical_drive(0x0402, 0x3922)
+
+        assert result == '\\\\.\\PhysicalDrive1'
+
+    def test_strategy3_single_usb_drive_fallback(self):
+        """Strategy 3: unknown vendor but only one USB drive — fallback match."""
+        from trcc.adapters.device.windows.detector import _find_physical_drive
+
+        mock_wmi_mod = MagicMock()
+        mock_wmi_mod.WMI.side_effect = Exception("WMI unavailable")
+
+        with patch.dict('sys.modules', {'wmi': mock_wmi_mod}), \
+             patch(f'{MODULE}._scan_physical_drives_ctypes',
+                   return_value=[('\\\\.\\PhysicalDrive2', 'UNKNOWN_DEVICE')]):
+            result = _find_physical_drive(0x0402, 0x3922)
+
+        assert result == '\\\\.\\PhysicalDrive2'
+
+    def test_strategy3_multiple_usb_drives_no_vendor_match(self):
+        """Strategy 3: multiple USB drives, no vendor match — returns None."""
+        from trcc.adapters.device.windows.detector import _find_physical_drive
+
+        mock_wmi_mod = MagicMock()
+        mock_wmi_mod.WMI.side_effect = Exception("WMI unavailable")
+
+        with patch.dict('sys.modules', {'wmi': mock_wmi_mod}), \
+             patch(f'{MODULE}._scan_physical_drives_ctypes',
+                   return_value=[('\\\\.\\PhysicalDrive1', 'KINGSTON'),
+                                 ('\\\\.\\PhysicalDrive2', 'SANDISK')]):
+            result = _find_physical_drive(0x0402, 0x3922)
+
+        assert result is None
+
+    def test_strategy3_no_usb_drives(self):
+        """Strategy 3: no USB drives found — returns None."""
+        from trcc.adapters.device.windows.detector import _find_physical_drive
+
+        mock_wmi_mod = MagicMock()
+        mock_wmi_mod.WMI.side_effect = Exception("WMI unavailable")
+
+        with patch.dict('sys.modules', {'wmi': mock_wmi_mod}), \
+             patch(f'{MODULE}._scan_physical_drives_ctypes',
+                   return_value=[]):
+            result = _find_physical_drive(0x0402, 0x3922)
+
+        assert result is None