corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1704495 - Map Windows errors ERROR_INVALID_BLOCK, ERROR_INVALID_HANDLE, ERROR_ARENA_TRASHED to NS_ERROR_FILE_INVALID_HANDLE. r=xpcom-reviewers,dom-storage-reviewers,nika,jstutte

Browse Source 
Depends on D130905

Differential Revision: https://phabricator.services.mozilla.com/D130906
This commit is contained in:
Jan Rio Krause
2021-11-17 14:34:43 +00:00
parent b013622368
commit b2e91c4ce9
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
xpcom/base/ErrorList.py
View File

@@ -649,6 +649,7 @@ with modules["FILES"]:
errors["NS_ERROR_FILE_FS_CORRUPTED"] = FAILURE(22)
errors["NS_ERROR_FILE_DEVICE_FAILURE"] = FAILURE(23)
errors["NS_ERROR_FILE_DEVICE_TEMPORARY_FAILURE"] = FAILURE(24)
errors["NS_ERROR_FILE_INVALID_HANDLE"] = FAILURE(25)
errors["NS_SUCCESS_FILE_DIRECTORY_EMPTY"] = SUCCESS(1)
# Result codes used by nsIDirectoryServiceProvider2

13
xpcom/io/nsLocalFileWin.cpp
View File

@@ -265,12 +265,6 @@ static nsresult ConvertWinError(DWORD aWinErr) {
rv = NS_ERROR_FILE_IS_LOCKED;
break;
case ERROR_NOT_ENOUGH_MEMORY:
[[fallthrough]]; // to NS_ERROR_OUT_OF_MEMORY
case ERROR_INVALID_BLOCK:
[[fallthrough]]; // to NS_ERROR_OUT_OF_MEMORY
case ERROR_INVALID_HANDLE:
[[fallthrough]]; // to NS_ERROR_OUT_OF_MEMORY
case ERROR_ARENA_TRASHED:
rv = NS_ERROR_OUT_OF_MEMORY;
break;
case ERROR_DIR_NOT_EMPTY:
@@ -315,6 +309,13 @@ static nsresult ConvertWinError(DWORD aWinErr) {
case ERROR_INVALID_NAME:
rv = NS_ERROR_FILE_INVALID_PATH;
break;
case ERROR_INVALID_BLOCK:
[[fallthrough]]; // to NS_ERROR_FILE_INVALID_HANDLE
case ERROR_INVALID_HANDLE:
[[fallthrough]]; // to NS_ERROR_FILE_INVALID_HANDLE
case ERROR_ARENA_TRASHED:
rv = NS_ERROR_FILE_INVALID_HANDLE;
break;
case 0:
rv = NS_OK;
break;