Update SteamScript (fix Steam browser and Uplay rendering issues) by Kreyren · Pull Request #979 · PhoenicisOrg/scripts

Kreyren · 2019-06-06T00:17:16Z

run {steamwebhelper.exe,steam.exe} with winxp to fix steam browser
run {UbisoftGameLauncher.exe,upc.exe} with winvista to fix rendering issues in uplay client
+ corefonts because they are used by steam

ImperatorS79

@Kreyren You should always test your changes as most as possible when you open a PR.

Kreyren · 2019-06-06T09:09:24Z

@Kreyren You should always test your changes as most as possible when you open a PR.

org.phoenicis.scripts.interpreter.ScriptException: javax.script.ScriptException: <eval>:122:8 Expected an operand but found .
        .corefonts();
        ^ in <eval> at line number 122 at column number 8
	at org.phoenicis.scripts.nashorn.builtins.EngineInjector.throwException(EngineInjector.java:22)
	at org.phoenicis.scripts.nashorn.NashornEngine.handleError(NashornEngine.java:74)
	at org.phoenicis.scripts.nashorn.NashornEngine.eval(NashornEngine.java:53)
	at org.phoenicis.scripts.nashorn.NashornEngine.eval(NashornEngine.java:44)
	at org.phoenicis.scripts.nashorn.builtins.IncludeInjector.lambda$injectInto$0(IncludeInjector.java:33)
	at jdk.scripting.nashorn.scripts/jdk.nashorn.internal.scripts.Script$Recompilation$341$\^eval\_.:program(<eval>:5)
	at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.ScriptFunctionData.invoke(ScriptFunctionData.java:655)
	at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.ScriptFunction.invoke(ScriptFunction.java:513)
	at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.ScriptRuntime.apply(ScriptRuntime.java:527)
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.evalImpl(NashornScriptEngine.java:456)
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.evalImpl(NashornScriptEngine.java:413)
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.evalImpl(NashornScriptEngine.java:409)
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.eval(NashornScriptEngine.java:162)
	at java.scripting/javax.script.AbstractScriptEngine.eval(AbstractScriptEngine.java:264)
	at org.phoenicis.scripts.nashorn.NashornEngine.eval(NashornEngine.java:50)
	at org.phoenicis.scripts.nashorn.NashornScriptInterpreter.runScript(NashornScriptInterpreter.java:35)
	at org.phoenicis.scripts.interpreter.BackgroundScriptInterpreter.lambda$runScript$0(BackgroundScriptInterpreter.java:35)
	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
	at java.base/java.lang.Thread.run(Thread.java:834)
Caused by: javax.script.ScriptException: <eval>:122:8 Expected an operand but found .
        .corefonts();
        ^ in <eval> at line number 122 at column number 8
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.throwAsScriptException(NashornScriptEngine.java:477)
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.compileImpl(NashornScriptEngine.java:544)
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.compileImpl(NashornScriptEngine.java:531)
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.evalImpl(NashornScriptEngine.java:409)
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.eval(NashornScriptEngine.java:162)
	at java.scripting/javax.script.AbstractScriptEngine.eval(AbstractScriptEngine.java:264)
	at org.phoenicis.scripts.nashorn.NashornEngine.eval(NashornEngine.java:50)
	... 17 more
Caused by: jdk.nashorn.internal.runtime.ParserException: <eval>:122:8 Expected an operand but found .
        .corefonts();
        ^
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.AbstractParser.error(AbstractParser.java:297)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.AbstractParser.error(AbstractParser.java:282)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.memberExpression(Parser.java:3653)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.leftHandSideExpression(Parser.java:3407)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.unaryExpression(Parser.java:4440)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.expression(Parser.java:4620)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.conditionalExpression(Parser.java:4772)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.assignmentExpression(Parser.java:4711)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.expression(Parser.java:4589)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.expression(Parser.java:4585)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.expressionStatement(Parser.java:1854)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.statement(Parser.java:1155)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.sourceElements(Parser.java:909)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.functionBody(Parser.java:4206)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.functionExpression(Parser.java:3831)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.memberExpression(Parser.java:3578)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.leftHandSideExpression(Parser.java:3407)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.unaryExpression(Parser.java:4440)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.expression(Parser.java:4620)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.conditionalExpression(Parser.java:4772)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.assignmentExpression(Parser.java:4711)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.assignmentExpression(Parser.java:4734)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.expression(Parser.java:4589)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.expression(Parser.java:4585)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.expressionStatement(Parser.java:1854)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.statement(Parser.java:1155)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.sourceElements(Parser.java:909)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.program(Parser.java:844)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.parse(Parser.java:325)
	at jdk.scripting.nashorn/jdk.nashorn.internal.parser.Parser.parse(Parser.java:285)
	at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.Context.compile(Context.java:1500)
	at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.Context.compileScript(Context.java:1467)
	at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.Context.compileScript(Context.java:750)
	at jdk.scripting.nashorn/jdk.nashorn.api.scripting.NashornScriptEngine.compileImpl(NashornScriptEngine.java:542)
	... 22 more

Didn't have time yesterday for tests + i prefer rolling model that doesn't require tests most of the time >.>

Kreyren · 2019-06-06T09:17:35Z

Affected by #959

Kreyren · 2019-06-06T09:27:07Z

Blame @ImperatorS79: you broke Codacy

Force-pushed Imperator's spam, because i'm lazy to invoke git pull

Kreyren · 2019-06-06T13:42:57Z

Ready to merge,

#959 Should be resolved in another MR since i'm not touching that

ImperatorS79 · 2019-06-06T13:44:51Z

+    wine.setOsForApplication().set("steamwebhelper.exe", "winxp").do();
+
+    // Fix for Uplay games that are executed on steam
+    wine.setOsForApplication().set("upc.exe", "winvista").do();


@plata Should we set it here ? It is a simple way to do IMHO ^^.

@ImperatorS79 how else you want to do it assuming that we are not using quick uplay nor uplay script in quick steam script

We could chose it is not the responsibility of SteamScript to handle it and for any Steamapps using Uplay you had to set it in the .preInstall. But I think your solution is clean.

@ImperatorS79 I'm for sanitization your suggestion is better, proceed.

It shouldn't hurt. I'm not sure about the "steamwebhelper.exe". Does this really work still?

@plata

I'm not sure about the "steamwebhelper.exe". Does this really work still?

Works on my system (tm)

plata · 2019-06-06T16:56:36Z

@Kreyren please:

use a title and pull request description which actually describe what the pull request is all about
do not bloat the pull request with completely unrelated images/gifs etc.

Kreyren · 2019-06-06T17:26:35Z

* use a title and pull request description which actually describe what the pull request is all about

Don't blame me, your current syntax is uneffective to explain the requests.. Tried to adapt it to your liking.

* do not bloat the pull request with completely unrelated images/gifs etc.

You are boring >:-( + it's not bloating

plata · 2019-06-06T17:27:47Z

It is bloating and completely useless. If you do not remove it, I will do so.

Kreyren · 2019-06-06T17:28:32Z

It is bloating and completely useless. If you do not remove it, I will do so.

it's improving sanity to perform more work for me 👀 but fine!

plata · 2019-06-06T17:39:35Z

Please complete the stubs I prepared for you.

Kreyren · 2019-06-06T17:55:38Z

Please complete the stubs I prepared for you.

what stubs, did you forget to push?

EDIT: Updated OP

plata · 2019-06-07T15:51:45Z

Thanks. That's what I'm talking about.

plata · 2019-06-07T15:53:30Z

@ImperatorS79 feel free to finish the review process here.

Kreyren · 2019-06-08T14:53:43Z

Disclaimer: I'm not satisfied with the way we handle uplay workarounds here, should be sanitized and applied only when they are needed to avoid unexpected results.

Kreyren force-pushed the steam_quick branch 2 times, most recently from 94dd176 to 42f8a6b Compare June 6, 2019 02:19

ImperatorS79 requested changes Jun 6, 2019

View reviewed changes

Comment thread Engines/Wine/QuickScript/Steam Script/script.js Outdated

Comment thread Engines/Wine/QuickScript/Steam Script/script.js

Jacob Hrbek added 2 commits June 6, 2019 03:58

Fix for steam quickscript

fdd5067

Added include for corefonts

5f8cf90

Kreyren force-pushed the steam_quick branch from 42f8a6b to 5f8cf90 Compare June 6, 2019 08:59

Added include for windows_version

9ac4f73

Jacob Hrbek added 2 commits June 6, 2019 04:11

Fix for corefonts syntax, imperator was right dammit!

fb996d2

Fixed indentation

b81bb19

Added fix for Uplay games on steam

0cc166c

Kreyren force-pushed the steam_quick branch from 4be0772 to 0cc166c Compare June 6, 2019 13:39

ImperatorS79 reviewed Jun 6, 2019

View reviewed changes

Kreyren changed the title ~~Fix for steam quickscript~~ FIx {Quick,} Steam script to work on phoenicis since they need steam.exe and steamwebhelper.exe set in winxp + corefonts verb and fix for uplay games running through steam Jun 6, 2019

plata changed the title ~~Update {Quick,} Steam script to work on phoenicis since they need steam.exe and steamwebhelper.exe set in winxp + corefonts verb and fix for uplay games running through steam~~ Update SteamScript (fix Steam browser and Uplay rendering issues) Jun 7, 2019

ImperatorS79 approved these changes Jun 7, 2019

View reviewed changes

ImperatorS79 merged commit aade429 into PhoenicisOrg:master Jun 7, 2019

Conversation

Kreyren commented Jun 6, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ImperatorS79 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Kreyren commented Jun 6, 2019

Uh oh!

Kreyren commented Jun 6, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Kreyren commented Jun 6, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Kreyren commented Jun 6, 2019

Uh oh!

ImperatorS79 Jun 6, 2019

Choose a reason for hiding this comment

Uh oh!

Kreyren Jun 6, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ImperatorS79 Jun 6, 2019

Choose a reason for hiding this comment

Uh oh!

Kreyren Jun 6, 2019

Choose a reason for hiding this comment

Uh oh!

plata Jun 6, 2019

Choose a reason for hiding this comment

Uh oh!

Kreyren Jun 6, 2019

Choose a reason for hiding this comment

Uh oh!

plata commented Jun 6, 2019

Uh oh!

Kreyren commented Jun 6, 2019

Uh oh!

plata commented Jun 6, 2019

Uh oh!

Kreyren commented Jun 6, 2019

Uh oh!

plata commented Jun 6, 2019

Uh oh!

Kreyren commented Jun 6, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

plata commented Jun 7, 2019

Uh oh!

plata commented Jun 7, 2019

Uh oh!

Kreyren commented Jun 8, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Kreyren commented Jun 6, 2019 •

edited

Loading

Kreyren commented Jun 6, 2019 •

edited

Loading

Kreyren commented Jun 6, 2019 •

edited

Loading

Kreyren Jun 6, 2019 •

edited

Loading

Kreyren commented Jun 6, 2019 •

edited

Loading