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

Fix Error #001 (alternative solution) #8561

Merged
merged 1 commit into from Jan 14, 2020
Merged

Conversation

@JosJuice
Copy link
Contributor

JosJuice commented Jan 14, 2020

This is an alternative to PR #8557 and PR #8558. The way this PR solves the problem is essentially the same as what we had before PR #8394 (except the code we had back then only worked because it was broken).

@JosJuice JosJuice force-pushed the JosJuice:di-wii-oob-2 branch from 7fd5667 to 6ac4d5c Jan 14, 2020
@delroth

This comment has been minimized.

Copy link
Member

delroth commented Jan 14, 2020

How does this interact with the changes in #6947?

@JosJuice

This comment has been minimized.

Copy link
Contributor Author

JosJuice commented Jan 14, 2020

This PR doesn't interact differently with unencrypted disc images than it does with encrypted disc images. Maybe I should clarify the comment I added to the code in this PR – what I meant by "non-decrypting read" in the comment is actually "non-partition read" (i.e. we're reading from PARTITION_NONE).

@JosJuice JosJuice force-pushed the JosJuice:di-wii-oob-2 branch from 6ac4d5c to a6eacd3 Jan 14, 2020
This is an alternative to PR 8557 and PR 8558. The way this PR solves
the problem is essentially the same as what we had before PR 8394
(except the code we had back then only worked because it was broken).
@JosJuice JosJuice force-pushed the JosJuice:di-wii-oob-2 branch from a6eacd3 to 21c152f Jan 14, 2020
@JosJuice

This comment has been minimized.

Copy link
Contributor Author

JosJuice commented Jan 14, 2020

Since this is a rather serious problem (most WBFS files are unplayable), I will be merging this PR in 24 hours unless someone objects (or unless someone merges it before then). I'm doing it with this PR rather than PR #8557 since this PR is the closest to the pre-#8394 behavior.

@Tilka

This comment has been minimized.

Copy link
Member

Tilka commented Jan 14, 2020

Not that I understand all the implications but lgtm.

@Tilka Tilka merged commit 31d7b56 into dolphin-emu:master Jan 14, 2020
10 checks passed
10 checks passed
default Very basic checks passed, handed off to Buildbot.
Details
lint Build succeeded on builder lint
Details
pr-android Build succeeded on builder pr-android
Details
pr-deb-dbg-x64 Build succeeded on builder pr-deb-dbg-x64
Details
pr-deb-x64 Build succeeded on builder pr-deb-x64
Details
pr-freebsd-x64 Build succeeded on builder pr-freebsd-x64
Details
pr-osx-x64 Build succeeded on builder pr-osx-x64
Details
pr-ubu-x64 Build succeeded on builder pr-ubu-x64
Details
pr-win-dbg-x64 Build succeeded on builder pr-win-dbg-x64
Details
pr-win-x64 Build succeeded on builder pr-win-x64
Details
@JosJuice JosJuice deleted the JosJuice:di-wii-oob-2 branch Jan 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants
You can’t perform that action at this time.