Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-01-26 05:28:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

proton: Change global references to instance

Browse Source
This commit is contained in:
Andrew Eikum 2019-07-29 13:53:16 -05:00
parent 7425001e8e
commit d2cf7e08eb
1 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
proton
View File

@ -128,8 +128,8 @@ class Proton:
if not os.path.isdir(self.default_pfx_dir): if not os.path.isdir(self.default_pfx_dir):
#make default prefix #make default prefix
local_env["WINEPREFIX"] = self.default_pfx_dir local_env["WINEPREFIX"] = self.default_pfx_dir
g_session.run_wine([self.wine, "wineboot"]) g_session.run_proc([self.wine, "wineboot"])
g_session.run_wine([self.wineserver, "-w"]) g_session.run_proc([self.wineserver, "-w"])
class CompatData: class CompatData:
def __init__(self, compatdata): def __init__(self, compatdata):
@ -416,64 +416,64 @@ class Session:
self.compat_config = set() self.compat_config = set()
def init_wine(self): def init_wine(self):
if "HOST_LC_ALL" in g_session.env and len(g_session.env["HOST_LC_ALL"]) > 0: if "HOST_LC_ALL" in self.env and len(self.env["HOST_LC_ALL"]) > 0:
#steam sets LC_ALL=C to help some games, but Wine requires the real value #steam sets LC_ALL=C to help some games, but Wine requires the real value
#in order to do path conversion between win32 and host. steam sets #in order to do path conversion between win32 and host. steam sets
#HOST_LC_ALL to allow us to use the real value. #HOST_LC_ALL to allow us to use the real value.
g_session.env["LC_ALL"] = g_session.env["HOST_LC_ALL"] self.env["LC_ALL"] = self.env["HOST_LC_ALL"]
else: else:
g_session.env.pop("LC_ALL", "") self.env.pop("LC_ALL", "")
#for performance, logging is disabled by default; override with user_settings.py #for performance, logging is disabled by default; override with user_settings.py
g_session.env["DXVK_LOG_LEVEL"] = "none" self.env["DXVK_LOG_LEVEL"] = "none"
g_session.env["WINEDEBUG"] = "-all" self.env["WINEDEBUG"] = "-all"
g_session.env.pop("WINEARCH", "") self.env.pop("WINEARCH", "")
if ld_path_var in os.environ: if ld_path_var in os.environ:
g_session.env[ld_path_var] = g_proton.lib64_dir + ":" + g_proton.lib_dir + ":" + os.environ[ld_path_var] self.env[ld_path_var] = g_proton.lib64_dir + ":" + g_proton.lib_dir + ":" + os.environ[ld_path_var]
else: else:
g_session.env[ld_path_var] = g_proton.lib64_dir + ":" + g_proton.lib_dir self.env[ld_path_var] = g_proton.lib64_dir + ":" + g_proton.lib_dir
g_session.env["WINEDLLPATH"] = g_proton.lib64_dir + "/wine:" + g_proton.lib_dir + "/wine" self.env["WINEDLLPATH"] = g_proton.lib64_dir + "/wine:" + g_proton.lib_dir + "/wine"
if "PATH" in os.environ: if "PATH" in os.environ:
g_session.env["PATH"] = g_proton.bin_dir + ":" + os.environ["PATH"] self.env["PATH"] = g_proton.bin_dir + ":" + os.environ["PATH"]
else: else:
g_session.env["PATH"] = g_proton.bin_dir self.env["PATH"] = g_proton.bin_dir
def check_environment(self, env_name, config_name): def check_environment(self, env_name, config_name):
if not env_name in g_session.env: if not env_name in self.env:
return False return False
if nonzero(g_session.env[env_name]): if nonzero(self.env[env_name]):
g_session.compat_config.add(config_name) self.compat_config.add(config_name)
else: else:
g_session.compat_config.discard(config_name) self.compat_config.discard(config_name)
return True return True
def init_session(self): def init_session(self):
g_session.env["WINEPREFIX"] = g_compatdata.prefix_dir self.env["WINEPREFIX"] = g_compatdata.prefix_dir
if "PROTON_LOG" in g_session.env and nonzero(g_session.env["PROTON_LOG"]): if "PROTON_LOG" in self.env and nonzero(self.env["PROTON_LOG"]):
g_session.env["WINEDEBUG"] = "+timestamp,+pid,+tid,+seh,+debugstr,+loaddll,+mscoree" self.env["WINEDEBUG"] = "+timestamp,+pid,+tid,+seh,+debugstr,+loaddll,+mscoree"
g_session.env["DXVK_LOG_LEVEL"] = "info" self.env["DXVK_LOG_LEVEL"] = "info"
g_session.env["WINE_MONO_TRACE"] = "E:System.NotImplementedException" self.env["WINE_MONO_TRACE"] = "E:System.NotImplementedException"
#default wine-mono override for FNA games #default wine-mono override for FNA games
g_session.env["WINE_MONO_OVERRIDES"] = "Microsoft.Xna.Framework.*,Gac=n" self.env["WINE_MONO_OVERRIDES"] = "Microsoft.Xna.Framework.*,Gac=n"
#load environment overrides #load environment overrides
if os.path.exists(g_proton.user_settings_file): if os.path.exists(g_proton.user_settings_file):
try: try:
import user_settings import user_settings
g_session.env.update(user_settings.user_settings) self.env.update(user_settings.user_settings)
except: except:
log("************************************************") log("************************************************")
log("THERE IS AN ERROR IN YOUR user_settings.py FILE:") log("THERE IS AN ERROR IN YOUR user_settings.py FILE:")
log("%s" % sys.exc_info()[1]) log("%s" % sys.exc_info()[1])
log("************************************************") log("************************************************")
if "wined3d11" in g_session.compat_config: if "wined3d11" in self.compat_config:
g_session.compat_config.add("wined3d") self.compat_config.add("wined3d")
if not self.check_environment("PROTON_USE_WINED3D", "wined3d"): if not self.check_environment("PROTON_USE_WINED3D", "wined3d"):
self.check_environment("PROTON_USE_WINED3D11", "wined3d") self.check_environment("PROTON_USE_WINED3D11", "wined3d")
@ -485,91 +485,91 @@ class Session:
self.check_environment("PROTON_FORCE_LARGE_ADDRESS_AWARE", "forcelgadd") self.check_environment("PROTON_FORCE_LARGE_ADDRESS_AWARE", "forcelgadd")
self.check_environment("PROTON_OLD_GL_STRING", "oldglstr") self.check_environment("PROTON_OLD_GL_STRING", "oldglstr")
if not "noesync" in g_session.compat_config: if not "noesync" in self.compat_config:
g_session.env["WINEESYNC"] = "1" self.env["WINEESYNC"] = "1"
if not "nofsync" in g_session.compat_config: if not "nofsync" in self.compat_config:
g_session.env["WINEFSYNC"] = "1" self.env["WINEFSYNC"] = "1"
if "oldglstr" in g_session.compat_config: if "oldglstr" in self.compat_config:
#mesa override #mesa override
g_session.env["MESA_EXTENSION_MAX_YEAR"] = "2003" self.env["MESA_EXTENSION_MAX_YEAR"] = "2003"
#nvidia override #nvidia override
g_session.env["__GL_ExtensionStringVersion"] = "17700" self.env["__GL_ExtensionStringVersion"] = "17700"
if "forcelgadd" in g_session.compat_config: if "forcelgadd" in self.compat_config:
#forcelgadd should be used just for testing whether a game is helped by #forcelgadd should be used just for testing whether a game is helped by
#setting LARGE_ADDRESS_AWARE. If it does, then add an AppDefault in the #setting LARGE_ADDRESS_AWARE. If it does, then add an AppDefault in the
#registry, so that it doesn't impact every executable in the prefix. #registry, so that it doesn't impact every executable in the prefix.
g_session.env["WINE_LARGE_ADDRESS_AWARE"] = "1" self.env["WINE_LARGE_ADDRESS_AWARE"] = "1"
if "SteamGameId" in g_session.env: if "SteamGameId" in self.env:
if g_session.env["WINEDEBUG"] != "-all": if self.env["WINEDEBUG"] != "-all":
lfile_path = os.environ["HOME"] + "/steam-" + os.environ["SteamGameId"] + ".log" lfile_path = os.environ["HOME"] + "/steam-" + os.environ["SteamGameId"] + ".log"
if os.path.exists(lfile_path): if os.path.exists(lfile_path):
os.remove(lfile_path) os.remove(lfile_path)
g_session.log_file = open(lfile_path, "w+") self.log_file = open(lfile_path, "w+")
g_session.log_file.write("======================\n") self.log_file.write("======================\n")
with open(g_proton.version_file, "r") as f: with open(g_proton.version_file, "r") as f:
g_session.log_file.write("Proton: " + f.readline().strip() + "\n") self.log_file.write("Proton: " + f.readline().strip() + "\n")
g_session.log_file.write("SteamGameId: " + g_session.env["SteamGameId"] + "\n") self.log_file.write("SteamGameId: " + self.env["SteamGameId"] + "\n")
g_session.log_file.write("Command: " + str(sys.argv[2:]) + "\n") self.log_file.write("Command: " + str(sys.argv[2:]) + "\n")
g_session.log_file.write("Options: " + str(g_session.compat_config) + "\n") self.log_file.write("Options: " + str(self.compat_config) + "\n")
g_session.log_file.write("======================\n") self.log_file.write("======================\n")
g_session.log_file.flush() self.log_file.flush()
else: else:
g_session.env["WINEDEBUG"] = "-all" self.env["WINEDEBUG"] = "-all"
g_compatdata.setup_prefix() g_compatdata.setup_prefix()
if "nod3d11" in g_session.compat_config: if "nod3d11" in self.compat_config:
g_session.dlloverrides["d3d11"] = "" self.dlloverrides["d3d11"] = ""
if "dxgi" in g_session.dlloverrides: if "dxgi" in self.dlloverrides:
del g_session.dlloverrides["dxgi"] del self.dlloverrides["dxgi"]
if "nod3d10" in g_session.compat_config: if "nod3d10" in self.compat_config:
g_session.dlloverrides["d3d10_1"] = "" self.dlloverrides["d3d10_1"] = ""
g_session.dlloverrides["d3d10"] = "" self.dlloverrides["d3d10"] = ""
g_session.dlloverrides["dxgi"] = "" self.dlloverrides["dxgi"] = ""
s = "" s = ""
for dll in g_session.dlloverrides: for dll in self.dlloverrides:
setting = g_session.dlloverrides[dll] setting = self.dlloverrides[dll]
if len(s) > 0: if len(s) > 0:
s = s + ";" + dll + "=" + setting s = s + ";" + dll + "=" + setting
else: else:
s = dll + "=" + setting s = dll + "=" + setting
if "WINEDLLOVERRIDES" in os.environ: if "WINEDLLOVERRIDES" in os.environ:
g_session.env["WINEDLLOVERRIDES"] = os.environ["WINEDLLOVERRIDES"] + ";" + s self.env["WINEDLLOVERRIDES"] = os.environ["WINEDLLOVERRIDES"] + ";" + s
else: else:
g_session.env["WINEDLLOVERRIDES"] = s self.env["WINEDLLOVERRIDES"] = s
def dump_dbg_env(self, f): def dump_dbg_env(self, f):
f.write("PATH=\"" + g_session.env["PATH"] + "\" \\\n") f.write("PATH=\"" + self.env["PATH"] + "\" \\\n")
f.write("\tTERM=\"xterm\" \\\n") #XXX f.write("\tTERM=\"xterm\" \\\n") #XXX
f.write("\tWINEDEBUG=\"-all\" \\\n") f.write("\tWINEDEBUG=\"-all\" \\\n")
f.write("\tWINEDLLPATH=\"" + g_session.env["WINEDLLPATH"] + "\" \\\n") f.write("\tWINEDLLPATH=\"" + self.env["WINEDLLPATH"] + "\" \\\n")
f.write("\t" + ld_path_var + "=\"" + g_session.env[ld_path_var] + "\" \\\n") f.write("\t" + ld_path_var + "=\"" + self.env[ld_path_var] + "\" \\\n")
f.write("\tWINEPREFIX=\"" + g_session.env["WINEPREFIX"] + "\" \\\n") f.write("\tWINEPREFIX=\"" + self.env["WINEPREFIX"] + "\" \\\n")
if "WINEESYNC" in g_session.env: if "WINEESYNC" in self.env:
f.write("\tWINEESYNC=\"" + g_session.env["WINEESYNC"] + "\" \\\n") f.write("\tWINEESYNC=\"" + self.env["WINEESYNC"] + "\" \\\n")
if "SteamGameId" in g_session.env: if "SteamGameId" in self.env:
f.write("\tSteamGameId=\"" + g_session.env["SteamGameId"] + "\" \\\n") f.write("\tSteamGameId=\"" + self.env["SteamGameId"] + "\" \\\n")
if "SteamAppId" in g_session.env: if "SteamAppId" in self.env:
f.write("\tSteamAppId=\"" + g_session.env["SteamAppId"] + "\" \\\n") f.write("\tSteamAppId=\"" + self.env["SteamAppId"] + "\" \\\n")
if "PROTON_VR_RUNTIME" in g_session.env: if "PROTON_VR_RUNTIME" in self.env:
f.write("\tPROTON_VR_RUNTIME=\"" + g_session.env["PROTON_VR_RUNTIME"] + "\" \\\n") f.write("\tPROTON_VR_RUNTIME=\"" + self.env["PROTON_VR_RUNTIME"] + "\" \\\n")
if "WINEDLLOVERRIDES" in g_session.env: if "WINEDLLOVERRIDES" in self.env:
f.write("\tWINEDLLOVERRIDES=\"" + g_session.env["WINEDLLOVERRIDES"] + "\" \\\n") f.write("\tWINEDLLOVERRIDES=\"" + self.env["WINEDLLOVERRIDES"] + "\" \\\n")
if "STEAM_COMPAT_CLIENT_INSTALL_PATH" in g_session.env: if "STEAM_COMPAT_CLIENT_INSTALL_PATH" in self.env:
f.write("\tSTEAM_COMPAT_CLIENT_INSTALL_PATH=\"" + g_session.env["STEAM_COMPAT_CLIENT_INSTALL_PATH"] + "\" \\\n") f.write("\tSTEAM_COMPAT_CLIENT_INSTALL_PATH=\"" + self.env["STEAM_COMPAT_CLIENT_INSTALL_PATH"] + "\" \\\n")
if "WINE_LARGE_ADDRESS_AWARE" in g_session.env: if "WINE_LARGE_ADDRESS_AWARE" in self.env:
f.write("\tWINE_LARGE_ADDRESS_AWARE=\"" + g_session.env["WINE_LARGE_ADDRESS_AWARE"] + "\" \\\n") f.write("\tWINE_LARGE_ADDRESS_AWARE=\"" + self.env["WINE_LARGE_ADDRESS_AWARE"] + "\" \\\n")
def dump_dbg_scripts(self): def dump_dbg_scripts(self):
exe_name = os.path.basename(sys.argv[2]) exe_name = os.path.basename(sys.argv[2])
tmpdir = g_session.env.get("PROTON_DEBUG_DIR", "/tmp") + "/proton_" + os.environ["USER"] + "/" tmpdir = self.env.get("PROTON_DEBUG_DIR", "/tmp") + "/proton_" + os.environ["USER"] + "/"
makedirs(tmpdir) makedirs(tmpdir)
with open(tmpdir + "winedbg", "w") as f: with open(tmpdir + "winedbg", "w") as f:
@ -646,16 +646,16 @@ class Session:
f.write("\t\"" + g_proton.wine_bin + "\" steam.exe \"${@:-${DEF_CMD[@]}}\"\n") f.write("\t\"" + g_proton.wine_bin + "\" steam.exe \"${@:-${DEF_CMD[@]}}\"\n")
os.chmod(tmpdir + "run", 0o755) os.chmod(tmpdir + "run", 0o755)
def run_wine(self, args): def run_proc(self, args):
subprocess.call(args, env=g_session.env, stderr=g_session.log_file, stdout=g_session.log_file) subprocess.call(args, env=self.env, stderr=self.log_file, stdout=self.log_file)
def run(self): def run(self):
if "PROTON_DUMP_DEBUG_COMMANDS" in g_session.env and nonzero(g_session.env["PROTON_DUMP_DEBUG_COMMANDS"]): if "PROTON_DUMP_DEBUG_COMMANDS" in self.env and nonzero(self.env["PROTON_DUMP_DEBUG_COMMANDS"]):
try: try:
self.dump_dbg_scripts() self.dump_dbg_scripts()
except OSError: except OSError:
log("Unable to write debug scripts! " + str(sys.exc_info()[1])) log("Unable to write debug scripts! " + str(sys.exc_info()[1]))
self.run_wine([g_proton.wine_bin, "steam"] + sys.argv[2:]) self.run_proc([g_proton.wine_bin, "steam"] + sys.argv[2:])
if not "STEAM_COMPAT_DATA_PATH" in os.environ: if not "STEAM_COMPAT_DATA_PATH" in os.environ:
@ -689,7 +689,7 @@ if sys.argv[1] == "run":
g_session.run() g_session.run()
elif sys.argv[1] == "waitforexitandrun": elif sys.argv[1] == "waitforexitandrun":
#wait for wineserver to shut down #wait for wineserver to shut down
g_session.run_wine([g_proton.wineserver_bin, "-w"]) g_session.run_proc([g_proton.wineserver_bin, "-w"])
#then run #then run
g_session.run() g_session.run()
elif sys.argv[1] == "getcompatpath": elif sys.argv[1] == "getcompatpath":