Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wmp11: add new verb #1489

Merged
merged 1 commit into from
Mar 13, 2020
Merged

wmp11: add new verb #1489

merged 1 commit into from
Mar 13, 2020

Conversation

soredake
Copy link
Contributor

@soredake soredake commented Feb 10, 2020

Currently tested with Resident Evil 5/6 in 64-bit prefix with proton.

@mmbossoni
Copy link

I've tested with Revelations 2. Seems to be working correctly.

Copy link
Contributor

@austin987 austin987 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also change the commit message to something meaningful. For example:
wmp11: add new verb

src/winetricks Outdated Show resolved Hide resolved
src/winetricks Outdated Show resolved Hide resolved
src/winetricks Outdated

# remove builtin placeholders to allow update
rm -f "$W_SYSTEM64_DLLS"/wmvcore.dll "$W_SYSTEM64_DLLS"/wmp.dll
rm -f "$W_PROGRAMS_UNIX/Windows Media Player/wmplayer.exe"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same (could be combined with line above, but separate is okay too).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

src/winetricks Outdated Show resolved Hide resolved
src/winetricks Outdated Show resolved Hide resolved
src/winetricks Outdated
# Crashes on exit, but otherwise ok; see https://bugs.winehq.org/show_bug.cgi?id=12633
w_try_cd "$W_CACHE/$W_PACKAGE"
# https://docs.microsoft.com/en-us/windows/win32/wmp/redistributing-windows-media-player-11
"$WINE" wmp11-windowsxp-x64-enu.exe /q:A /c:"setup_wm.exe /Q /R:N"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add w_try.

This also unconditionally installs in quiet mode. Those flags should only be passed if W_OPT_UNATTENDED is set.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add w_try.

Installer tries to install some incompatible things and fails with 126 code at end.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. Please add a comment.

src/winetricks Outdated Show resolved Hide resolved
@soredake
Copy link
Contributor Author

Updated verb.

@soredake
Copy link
Contributor Author

@basxto for now installation works only with silent mode, dunno how to make work in non-silent.

@luca-s
Copy link

luca-s commented Mar 8, 2020

I've tested it on Proton 5.0-3 with RE Revelations 2, works great thanks!

src/winetricks Outdated
w_try_cd "$W_CACHE/$W_PACKAGE"

# https://docs.microsoft.com/en-us/windows/win32/wmp/redistributing-windows-media-player-11
if [ "$W_ARCH" = "win32" ]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could simplify this to:
"${WINE}" wmp11-windowsxp-x86-enu.exe ${wmp11_exe} ${W_OPT_UNATTENDED:+ /q:A /c:"setup_wm.exe /Q /R:N"}

if you add 'wmp11_exe=` for each after w_download.

src/winetricks Outdated
# Crashes on exit, but otherwise ok; see https://bugs.winehq.org/show_bug.cgi?id=12633
w_try_cd "$W_CACHE/$W_PACKAGE"
# https://docs.microsoft.com/en-us/windows/win32/wmp/redistributing-windows-media-player-11
"$WINE" wmp11-windowsxp-x64-enu.exe /q:A /c:"setup_wm.exe /Q /R:N"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. Please add a comment.

Copy link
Contributor

@austin987 austin987 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good, I made a few more comments.

@soredake
Copy link
Contributor Author

Updated.

Copy link
Contributor

@austin987 austin987 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@jdetychey
Copy link

using the last winetricks isn't making the cut for RE6 on my side
ValveSoftware/Proton#1252 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants