Unwrap FACILITY_WIN32 HRESULT errors

BCSharp · Jan 13, 2025 · ca5e076 · ca5e076
1 parent 6de1e81
commit ca5e076
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Src/IronPython.Modules/nt.cs b/Src/IronPython.Modules/nt.cs
@@ -2326,6 +2326,10 @@ private static string GetWin32ErrorMessage(int errorCode) {
 
         [SupportedOSPlatform("windows")]
         internal static Exception GetWin32Error(int winerror, string? filename = null, string? filename2 = null) {
+            // Unwrap FACILITY_WIN32 HRESULT errors
+            if ((winerror & 0xFFFF0000) == 0x80070000) {
+                winerror &= 0x0000FFFF;
+            }
             var msg = GetWin32ErrorMessage(winerror);
             return PythonOps.OSError(0, msg, filename, winerror, filename2);
         }

diff --git a/Src/IronPython/Runtime/Exceptions/PythonExceptions.cs b/Src/IronPython/Runtime/Exceptions/PythonExceptions.cs
@@ -125,7 +125,7 @@ public partial class _OSError {
                     if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
                         if (args.Length >= 4 && args[3] is int winerror) {
                             errno = WinErrorToErrno(winerror);
-                        }
+                        } 
                     }
                     cls = ErrorEnumToPythonType(ErrnoToErrorEnum(errno));
                 }
@@ -439,6 +439,11 @@ internal static class Errno {
 
             // See also errmap.h in CPython
             internal static int WinErrorToErrno(int winerror) {
+                // Unwrap FACILITY_WIN32 HRESULT errors
+                if ((winerror & 0xFFFF0000) == 0x80070000) {
+                    winerror &= 0x0000FFFF;
+                }
+
                 int errno = winerror;
                 if (winerror < WSABASEERR) {
                     switch (winerror) {