Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-07-30 09:01:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

proton: Improve find_nvidia_wine_dll_dir() handling of missing files

Browse Source 
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>
This commit is contained in:
Liam Middlebrook 2021-06-02 14:08:10 -07:00 committed by Liam Middlebrook
parent 91d99ef236
commit cc7ad4bd13
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
proton
View File

@ -148,10 +148,20 @@ def try_get_game_library_dir():
#
# On failure, returns None
def find_nvidia_wine_dll_dir():
libdl = CDLL(find_library("libdl"))
libglx_nvidia = CDLL("libGLX_nvidia.so.0")
try:
libdl_soname = find_library("dl")
if libdl is None or libglx_nvidia is None:
# If we couldn't determine the proper soname for libdl, bail out.
if libdl_soname is None:
return None
libdl = CDLL(libdl_soname)
except (FileNotFoundError, OSError):
return None
try:
libglx_nvidia = CDLL("libGLX_nvidia.so.0")
except OSError:
return None
# from dlinfo(3)