Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-01-27 08:12:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8802 from unknownbrackets/file-minor

Browse Source 
Fix extract file and sharing violation handling
This commit is contained in:
Henrik Rydgård 2016-06-05 08:22:48 +02:00
commit cad7235c86
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Core/FileSystems/DirectoryFileSystem.cpp
View File

@ -220,6 +220,17 @@ bool DirectoryFileHandle::Open(std::string &basePath, std::string &fileName, Fil
bool success = hFile != INVALID_HANDLE_VALUE;
if (!success) {
DWORD w32err = GetLastError();
if (w32err == ERROR_SHARING_VIOLATION) {
// Sometimes, the file is locked for write, let's try again.
sharemode |= FILE_SHARE_WRITE;
hFile = CreateFile(ConvertUTF8ToWString(fullName).c_str(), desired, sharemode, 0, openmode, 0, 0);
success = hFile != INVALID_HANDLE_VALUE;
if (!success) {
w32err = GetLastError();
}
}
if (w32err == ERROR_DISK_FULL || w32err == ERROR_NOT_ENOUGH_QUOTA) {
// This is returned when the disk is full.
I18NCategory *err = GetI18NCategory("Error");

8
Windows/MainWindowMenu.cpp
View File

@ -842,9 +842,11 @@ namespace MainWindow {
FILE *fp = File::OpenCFile(fn, "wb");
u32 handle = pspFileSystem.OpenFile(filename, FILEACCESS_READ, "");
u8 buffer[4096];
while (pspFileSystem.ReadFile(handle, buffer, sizeof(buffer)) > 0) {
fwrite(buffer, sizeof(buffer), 1, fp);
}
size_t bytes;
do {
bytes = pspFileSystem.ReadFile(handle, buffer, sizeof(buffer));
fwrite(buffer, 1, bytes, fp);
} while (bytes == sizeof(buffer));
pspFileSystem.CloseFile(handle);
fclose(fp);
}