proton: Improve find_nvidia_wine_dll_dir() handling of missing files - #4882
Merged
aeikum merged 1 commit intoJun 2, 2021
Merged
Conversation
DadSchoorse
reviewed
Jun 2, 2021
| libdl = CDLL(find_library("libdl")) | ||
| libglx_nvidia = CDLL("libGLX_nvidia.so.0") | ||
| try: | ||
| libdl_soname = find_library("dl") |
Contributor
There was a problem hiding this comment.
I think you should check for None here as well, at least that's what the documentations says will be returned if no library can be found.
Contributor
Author
There was a problem hiding this comment.
Ah yeah, I see that here on a second pass-through: https://docs.python.org/3/library/ctypes.html#finding-shared-libraries
Additionally split out the find_library() logic for discovery of libdl so that the case of a missing libdl (no matter how unlikely) is caught before attempting to load an erroneous CDLL. Fixes: 4881 (Latest Proton Experimental Fails To Open) Reviewed-by: Adam Moss <amoss@nvidia.com>
liam-middlebrook
force-pushed
the
fix-nv-dll-discovery
branch
from
June 2, 2021 21:25
7bec3dc to
cc7ad4b
Compare
|
Thanks. |
Contributor
|
Thanks for the quick fix. Will get that out shortly. |
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
4 participants
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.
Additionally split out the find_library() logic for discovery of libdl
so that the case of a missing libdl (no matter how unlikely) is caught
before attempting to load an erroneous CDLL.
Fixes: #4881 (Latest Proton Experimental Fails To Open)