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

VolumeVerifier: Show underdump warnings for WBFS/CISO too #8204

Merged
merged 1 commit into from Aug 9, 2019

Conversation

@JosJuice
Copy link
Contributor

commented Jun 18, 2019

No description provided.

@leoetlino

This comment has been minimized.

Copy link
Member

commented Jun 29, 2019

This needs a rebase

@JosJuice JosJuice force-pushed the JosJuice:volumeverifier-underdump-wbfs branch from f2bb05c to 8179e26 Jun 29, 2019

if (m_biggest_referenced_offset > volume_size)
{
const bool second_layer_missing =
m_biggest_referenced_offset > SL_DVD_SIZE && m_volume.GetSize() >= SL_DVD_SIZE;

This comment has been minimized.

Copy link
@leoetlino

leoetlino Jun 29, 2019

Member

I'm probably misreading this, but shouldn't the second check be <=?

This comment has been minimized.

Copy link
@JosJuice

JosJuice Jun 29, 2019

Author Contributor

This is intentional but probably a bit confusing. second_layer_missing should be false if m_volume.GetSize() < SL_DVD_SIZE, so that the user always will get the message about needing to merge the split files if they have split files (regardless of whether the disc is supposed to be dual layer). As for why I used m_volume.GetSize() >= SL_DVD_SIZE instead of m_volume.GetSize() == SL_DVD_SIZE, it's because I also want to count disc images of the size SL_DVD_R_SIZE as single layer disc images. I could change this to m_volume.GetSize() >= SL_DVD_SIZE && m_volume.GetSize() <= SL_DVD_R_SIZE to make it make more sense, but when I originally wrote the code, I figured it didn't matter since there's no reasonable way that you'd get a file that's bigger than a single layer disc but smaller than a two layer disc. (The problem with split files is limited to 4 GiB, after all.)

@JosJuice JosJuice force-pushed the JosJuice:volumeverifier-underdump-wbfs branch from 8179e26 to 8c8bab3 Aug 9, 2019

@stenzek stenzek merged commit b88e561 into dolphin-emu:master Aug 9, 2019

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:volumeverifier-underdump-wbfs branch Aug 9, 2019

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.