Repository navigation
Launcher: the Wine path walk reaches the drive root; the host test follows LinuxRdna4Name - #197
Merged
phantoslayer21 merged 2 commits intoNov 14, 2026
Conversation
…r does not convert
The walk that converts the deepest existing folder to a Z: path stopped at
the first folder below the drive (cut < 3) and returned the path unchanged,
so C:\<first>\F\model.wgcm with only C:\ convertible never tried C:\. The
install then warned and wrote the prefix-local path.
The walk now keeps the separator on the root ("C:\") and tries it before
giving up, and drops the root's trailing '/' so the tail's own separator does
not double. Only the UnderWine() branch changes; outside Wine the function
still returns the path as it is.
Test: wg_core_tests converts C:\con\F\model.wgcm under Wine. Wine converts a
single missing folder but not a DOS device name like CON, so the first folder
fails while C:\ exists. Before the fix: FAILED: PathForGamePrefix under Wine:
a Z: path when only the drive's root exists (wg-core-tests, after 81 checks).
After: wg-core-tests 92 checks passed (main: 91).
Signed-off-by: Jonathan Shin <85975340+j0nsh1n@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…ad of probing cards itself The under-Wine part of wg_core_tests.cpp probed card0 to card15 on its own to decide whether Linux reports an RDNA 4 card, and compared that with LinuxRdna4Name(). LinuxRdna4Name looks at every card in the folder, so the two disagreed when the only RDNA 4 card is card16 or later. The duplicate probe is dropped rather than made to enumerate the same way: a second enumerator in the test would only repeat the code under test. Which cards LinuxRdna4Name looks at is already checked on the made-up folder (card20 and card17 in the same file). The under-Wine block now only checks that DetectGpu follows LinuxRdna4Name: when it names a card, DetectGpu reports an RDNA 4 AMD card. The made-up folder's card20 check was seen to fail with DrmCards limited to card15 (FAILED: LinuxRdna4Name: a card numbered 20, reported as not confirmed), so card16 and later stay covered; the change was reverted. The probe's check is gone, so wg-core-tests counts one less: 91 on main, 90 with this commit alone, 91 on top of the drive-root commit (92 -> 91). Signed-off-by: Jonathan Shin <85975340+j0nsh1n@users.noreply.github.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
j0nsh1n
added a commit
to j0nsh1n/wronggpu
that referenced
this pull request
Nov 15, 2026
Brings the launcher branch up to upstream main (217 commits: phantoslayer21#47, phantoslayer21#105, phantoslayer21#196, phantoslayer21#197, phantoslayer21#209, Model K/L, frame generation, ...). Changes beyond resolving the three conflicts (CMakeLists.txt project(), util.h's includes, the restorer test): - POSIX layer: the Win32 calls main's handle-based restore uses (SetFileInformationByHandle with FileBasicInfo, FileDispositionInfo and FileDispositionInfoEx's POSIX delete, GetFileInformationByHandleEx FileBasicInfo, SetEndOfFile, ExitProcess, GetProcessHeap/HeapFree, CDECL, ERROR_TOO_MANY_LINKS/FILE_CORRUPT/READ_FAULT), with posix-layer tests. - run_launcher_tests.py stays below the 256 KB source limit: the edition section moves unchanged to launcher_edition_cases.py and the Linux run's plumbing to native_linux.NativeT. - launcher-native runs only in a -DWRONGGPU_PRESET_K=OFF build (like CI's launcher build: the suite expects no seeded wronggpu-asi.ini); its two checks that fail on main's own launcher too (phantoslayer21#219) are skipped while they fail (native_linux.KNOWN_ON_MAIN). Verified: fresh build, ctest 22/22 (launcher-native 365 passed, 0 failed, 6 skipped: 4 Windows-only sections, the 2 phantoslayer21#219 checks); reuse lint passes. Signed-off-by: Jonathan Shin <85975340+j0nsh1n@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this changes and why
Follow-up to #105, for the two points in its approval review. Two commits; each stands alone on
main.PathForGamePrefixreaches the drive root. The review: "The path walk can miss the drive root. In util.cpp:259-263, with C:\missing\F\model.wgcm where only C:\ exists, the walk stops at C:\missing and never tries C:. The install then warns and writes the prefix-local path. Keeping the separator on the root, plus a test for that case, would fix it."C:\) and tries it before giving up. The root's Unix name ends in/, so that is dropped when a tail follows, to avoid a doubled separator.UnderWine()branch changes. Windows behaviour is the same.wg_core_tests.cpp:C:\con\F\model.wgcmunder Wine must come back as aZ:path with its tail. With GE-Proton 11-11's Wine, a single missing folder belowC:\converts on its own, soC:\missing\...is not enough to reach the bug. A DOS device name such asCONdoes not convert even thoughC:\exists, so the walk gets stuck exactly as the review describes.DetectGpucheck stays: whenLinuxRdna4Name()names a card,DetectGpumust report an RDNA 4 AMD card.card20,card17).What each new or substantially changed file is based on
clean/installer/src/wg_core/util.cpp: own design, using Wine's documentedwine_get_unix_file_name.clean/installer/tests/wg_core_tests.cpp: own design; synthetic fixtures only, no game or model data.How it was tested
CI runs the CPU tests. Under Wine, with
clean/linux/run_wine_tests.py --tests launcherunder GE-Proton 11-11, onmainat 6622148 (wg-core-tests counts; the other three programs stay at 240, 187 and 18 checks):mainmainDrmCardsto card15 for one run:FAILED: LinuxRdna4Name: a card numbered 20, reported as not confirmed. I then reverted that.check_wording.py,check_source_size.py,tools/ci/check_line_endings.pyandreuse lintpass.Checklist
CONTRIBUTING.md
for this and all my contributions (required once, in my first pull request). (Made in Launcher: install for Proton games from under Wine #105.)
Signed-off-by:line (git commit -s; Developer Certificate of Origin 1.1).REUSE.toml. (No new files.)binaries; no paths, user or machine names of my PC.
🤖 Generated with Claude Code