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

Return error when trying to close files with pending operations #8868

Merged
merged 3 commits into from
Jul 24, 2016

Conversation

hrydgard
Copy link
Owner

@hrydgard hrydgard commented Jul 24, 2016

Also, fix error for trying to close stdin/stderr/stdout.

Blindly tries to help #6357 by trying to do the same thing as jpcsp/jpcsp@61ecddc .

Does it work?

@hrydgard hrydgard changed the title Errors when trying to close files with pending operations Return error when trying to close files with pending operations Jul 24, 2016
@hrydgard
Copy link
Owner Author

That vulkan commit I moved to master. Don't know why it still shows here as a diff..

@@ -66,7 +66,8 @@ static const int ERROR_ERRNO_FILE_ALREADY_EXISTS = 0x80010011;
static const int ERROR_MEMSTICK_DEVCTL_BAD_PARAMS = 0x80220081;
static const int ERROR_MEMSTICK_DEVCTL_TOO_MANY_CALLBACKS = 0x80220082;
static const int ERROR_KERNEL_BAD_FILE_DESCRIPTOR = 0x80020323;

static const int ERROR_KERNEL_ILLEGAL_PERMISSION = 0x800200d1;
Copy link
Collaborator

@unknownbrackets unknownbrackets Jul 24, 2016

Choose a reason for hiding this comment

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

Should we use SCE_KERNEL_ERROR_ILLEGAL_PERM instead? Same value, and used other places.

-[Unknown]

Copy link
Owner Author

Choose a reason for hiding this comment

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

I suppose so. I searched the code base for ILLEGAL_PERMISSION, didn't anticipate just "PERM"..

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yeah.... most of those names came from the "snapshot" commit, not sure.

-[Unknown]

@unknownbrackets
Copy link
Collaborator

This does fix it in the trial, yes. It doesn't fix the animation "tweening" by mip bias, though.

-[Unknown]

@hrydgard
Copy link
Owner Author

Well, yeah, it's obviously not expected to fix the mipmap trickery, that should really be a separate issue.

@unknownbrackets
Copy link
Collaborator

Yeah, of course, was just noting it for people who don't read the code...

-[Unknown]

@unknownbrackets unknownbrackets merged commit f4999bc into master Jul 24, 2016
@hrydgard hrydgard deleted the close-errors branch July 24, 2016 19:50
@sum2012
Copy link
Collaborator

sum2012 commented Jul 24, 2016

Should add back ERROR_KERNEL_BAD_FILE_DESCRIPTOR error code
jpcsp/jpcsp@31f4f07

@hrydgard
Copy link
Owner Author

@sum2012 we already return SCE_KERNEL_ERROR_BADF in that case, see https://github.com/hrydgard/ppsspp/blob/master/Core/HLE/sceIo.cpp#L1902

@sum2012
Copy link
Collaborator

sum2012 commented Jul 24, 2016

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.

3 participants