Update vulkanSDK #825

ImperatorS79 · 2019-01-18T19:04:25Z

The verb did not create the reg entries, but now it only create the entry for Wow6432node.

@Zemogiter could you check ?

Merge Phoenicis/Scripts:master into ImperatorS79/Scripts:master

updated Hearthstone (download application directly) (PhoenicisOrg#383)

Merge master

Merge recent commits

Merge master

ImperatorS79 · 2019-01-20T14:00:28Z

Ok, tested with a .reg. If using wine regedit myreg.reg -> does not work. But if I import int from regedit itself from the GUI -> works.

Maybe a bug in wine so I will simply add a wizard asking the user to add the key manually for now.

ImperatorS79 · 2019-01-20T14:15:03Z

Ready to be merged if no errors.

qparis · 2019-01-20T14:15:42Z

Engines/Wine/Verbs/vulkanSDK/script.js


-    return this;
+    this.wizard().message(message);


I don't understand why showing this to the user

Because the part using regedit does not work, so the user has to create the key himself.

Why it does not work?
This is not acceptable to ask him to do it in terms of user experience

Seems my comment did not get uploaded ^^.

I've just seen it. This could not be a bug in wine

I have just tested it and it is. The second key is created but not the first one. Also importing the .reg in regedit gui works, but not with wine regedit myreg.reg.

The file must not be correctly formatted. Why would it not work just with this particular reg file?

Look, you've left a trailing "n" character

No idea. But importing it in the gui works -> not a format problem.

Look, you've left a trailing "n" character in your file...

qparis · 2019-01-20T14:24:24Z

Now that you have fixed the reg file, wine should be able to import it

ImperatorS79 · 2019-01-20T14:25:15Z

That was not that .reg file which causes problem, and the n was just a copy paste error.

qparis · 2019-01-20T14:26:08Z

Please send us the .reg file that causes problem then.

ImperatorS79 · 2019-01-20T14:32:29Z

Just copy paste this in a .reg:

REGEDIT4

[HKEY_LOCAL_MACHINE\Software\Khronos\Vulkan\Drivers]
"C:\\Windows\\winevulkan.json"=dword:00000000

You can interchangeREGEDIT 4 and Windows Registry Editor Version 5.00.

qparis · 2019-01-20T14:33:27Z

Ok, and what is the key that works correctly?

ImperatorS79 · 2019-01-20T14:36:26Z

REGEDIT4

[HKEY_LOCAL_MACHINE\Software\Wow6432Node\Khronos\Vulkan\Drivers]
"C:\\Windows\\winevulkan.json"=dword:00000000

qparis · 2019-01-20T15:11:17Z

Both work for me

ImperatorS79 · 2019-01-20T15:30:47Z

With wine regedit hello.reg ? Which wine version ?

qparis · 2019-01-20T15:34:54Z

Ensure that the line returns are the same in both files

Engines/Wine/Verbs/vulkanSDK/script.js

Zemogiter · 2019-01-21T08:31:28Z

I've tried the old script for VulkanSDK and it only created the registry entry for Wow6432Node. I'm going to test your commit then mine. I was sure it was working when I created the PR.
UPDATE: Your commit works the same as the old script while mine fails to create registry entries for both x32 and x64. Maybe we should do it like I did with my Subnautica script before switching to Vulkan.

ImperatorS79 · 2019-01-27T10:02:05Z

The two errors are strange since those identifiers in the json have to be like this.

plata · 2019-01-27T11:13:16Z

It's ok. You may ignore them.

plata · 2019-01-27T11:13:54Z

@qparis do you want to do the review (you checked also before)?

ImperatorS79 · 2019-02-10T13:29:41Z

I think this is ready to be merged.

Zemogiter · 2019-02-10T16:42:33Z

Just tested that and everything works expect for 32bit registry entry creation. Winetricks works though.

plata · 2019-02-11T17:59:37Z

@Zemogiter so the 32bit registry issue should be fixed before merging this?

Zemogiter · 2019-02-11T22:26:21Z

Yes

plata · 2019-02-12T17:09:53Z

@ImperatorS79 can you do that?

ImperatorS79 · 2019-02-12T18:56:47Z

I have no idea where this issue come from. Nevertheless, the code was not working at all before this PR, so I suggest to merge this and open a new issue.

Zemogiter · 2019-02-12T20:35:22Z

OK so here's the thing. I've checked on winetricks source code and saw they did not include "\ in

"\"C:\\\\Windows\\\\winevulkan.json\"=dword:00000000" ;

After I've removed that and installed in osu wineprefix the Drivers key inside Vulkan is created which didn't happen before. Drivers is empty though but this confirms there might be something wrong with the script despite the 64bit section working.

ImperatorS79 · 2019-02-12T20:44:05Z

This is a \" actually, which just allows to type " in a string delimited by ... "

plata · 2019-02-13T17:18:49Z

@ImperatorS79 please merge master to resolve the conflict.

ImperatorS79 · 2019-02-22T15:14:19Z

I will open an issue for the registry key as soon as this is merged.

plata · 2019-02-26T16:22:52Z

@ImperatorS79 don't forget to add some details to the merge description (not title) when you merge this.

- Use a fixed sdkVersion variable - Use JSON.stringify to make winevulkan.json - Use regedit plugin instead of "wine reg add ..." - Fix \\ in .reg

ImperatorS79 added 16 commits August 28, 2017 15:19

Merge pull request #1 from PhoenicisOrg/master

06ad52f

Merge Phoenicis/Scripts:master into ImperatorS79/Scripts:master

Update script.js

86fd07c

Merge pull request #2 from PhoenicisOrg/master

a6f232b

updated Hearthstone (download application directly) (PhoenicisOrg#383)

Merge pull request #3 from PhoenicisOrg/master

a80aa84

Merge master

Merge pull request #4 from PhoenicisOrg/master

6da4a59

Merge recent commits

Merge pull request #8 from PhoenicisOrg/master

4a11f65

Merge master

Merge pull request #9 from PhoenicisOrg/master

b2d5724

Merge master

Merge pull request #10 from PhoenicisOrg/master

b7d1f0f

Merge master

Merge pull request #11 from PhoenicisOrg/master

533df6e

Merge master

Merge pull request #12 from PhoenicisOrg/master

186e4ed

Merge master

Merge pull request #13 from PhoenicisOrg/master

99cf1db

Merge master

Merge pull request #15 from PhoenicisOrg/master

87999b4

Merge master

Merge pull request #16 from PhoenicisOrg/master

610b258

Merge master

Merge pull request #17 from PhoenicisOrg/master

ad2ea01

Merge master

Merge pull request #18 from PhoenicisOrg/master

2e53a22

Merge master

Update script.js

077d175

Update script.js

e03625d

qparis reviewed Jan 20, 2019

View reviewed changes

ImperatorS79 added 2 commits January 20, 2019 15:18

Update script.js

2d5fa8c

Update script.js

4948a28

Add files via upload

9d6dc01

qparis reviewed Jan 20, 2019

View reviewed changes

Engines/Wine/Verbs/vulkanSDK/script.js Outdated Show resolved Hide resolved

Update script.js

f20d631

ImperatorS79 mentioned this pull request Jan 28, 2019

Update dotnet (add versions +fix) #839

Merged

Use latest sdk

8ca92ff

ImperatorS79 added 3 commits February 13, 2019 18:36

Merge branch 'master' into vulkanSDK

41e1cc5

Merge branch 'master' into vulkanSDK

eadb545

Silence codacy

81a330c

Merge branch 'master' into vulkanSDK

b4018ce

plata approved these changes Feb 26, 2019

View reviewed changes

ImperatorS79 merged commit 7a5412a into PhoenicisOrg:master Feb 26, 2019

ImperatorS79 deleted the vulkanSDK branch February 27, 2019 13:00

Kreyren mentioned this pull request Mar 8, 2019

Update League Of Legends #797

Closed

petermetz pushed a commit to petermetz/scripts that referenced this pull request Jun 7, 2020

Update vulkanSDK (PhoenicisOrg#825)

ff2ef39

- Use a fixed sdkVersion variable - Use JSON.stringify to make winevulkan.json - Use regedit plugin instead of "wine reg add ..." - Fix \\ in .reg

Update vulkanSDK #825

Update vulkanSDK #825

Conversation

ImperatorS79 commented Jan 18, 2019

ImperatorS79 commented Jan 20, 2019

ImperatorS79 commented Jan 20, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ImperatorS79 Jan 20, 2019 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

qparis commented Jan 20, 2019

ImperatorS79 commented Jan 20, 2019

qparis commented Jan 20, 2019

ImperatorS79 commented Jan 20, 2019 • edited

qparis commented Jan 20, 2019

ImperatorS79 commented Jan 20, 2019

qparis commented Jan 20, 2019

ImperatorS79 commented Jan 20, 2019 • edited

qparis commented Jan 20, 2019

Zemogiter commented Jan 21, 2019 • edited

ImperatorS79 commented Jan 27, 2019

plata commented Jan 27, 2019

plata commented Jan 27, 2019

ImperatorS79 commented Feb 10, 2019

Zemogiter commented Feb 10, 2019 • edited

plata commented Feb 11, 2019

Zemogiter commented Feb 11, 2019

plata commented Feb 12, 2019

ImperatorS79 commented Feb 12, 2019 • edited

Zemogiter commented Feb 12, 2019

ImperatorS79 commented Feb 12, 2019 • edited

plata commented Feb 13, 2019

ImperatorS79 commented Feb 22, 2019 • edited

plata commented Feb 26, 2019

ImperatorS79 Jan 20, 2019 •

edited

ImperatorS79 commented Jan 20, 2019 •

edited

ImperatorS79 commented Jan 20, 2019 •

edited

Zemogiter commented Jan 21, 2019 •

edited

Zemogiter commented Feb 10, 2019 •

edited

ImperatorS79 commented Feb 12, 2019 •

edited

ImperatorS79 commented Feb 12, 2019 •

edited

ImperatorS79 commented Feb 22, 2019 •

edited