Changeset 2913

Timestamp:

Sep 14, 2016, 4:06:32 PM (9 years ago)

Author:

bird

Message:

report STATUS_DELETE_PENDING as ENOENT.

Location:

trunk/src

Files:

• kmk/main.c (modified) (1 diff)
• lib/nt/nthlpcore.c (modified) (5 diffs)
• lib/nt/ntstuff.h (modified) (1 diff)

trunk/src/kmk/main.c

@@ -1381 +1381 @@
 
 # ifndef ELECTRIC_HEAP /* Drop this because it prevents JIT debugging. */
-  SetUnhandledExceptionFilter(handle_runtime_exceptions);
+//  SetUnhandledExceptionFilter(handle_runtime_exceptions);
 # endif /* !ELECTRIC_HEAP */
 

trunk/src/lib/nt/nthlpcore.c

@@ -62 +62 @@
 BOOLEAN     (WINAPI *g_pfnRtlEqualString)(MY_ANSI_STRING const *, MY_ANSI_STRING const *, BOOLEAN);
 UCHAR       (WINAPI *g_pfnRtlUpperChar)(UCHAR uch);
+ULONG       (WINAPI *g_pfnRtlNtStatusToDosError)(MY_NTSTATUS rcNt);
 
 
@@ -85 +86 @@
     { (FARPROC *)&g_pfnRtlEqualString,                  "RtlEqualString" },
     { (FARPROC *)&g_pfnRtlUpperChar,                    "RtlUpperChar" },
+    { (FARPROC *)&g_pfnRtlNtStatusToDosError,           "RtlNtStatusToDosError" },
 };
 /** Set to 1 if we've successfully resolved the imports, otherwise 0. */
@@ -156 +158 @@
         /* EPERM            =  1 */
         case STATUS_CANNOT_DELETE:
-        case STATUS_DELETE_PENDING:
             return EPERM;
         /* ENOENT           =  2 */
@@ -173 +174 @@
         case STATUS_DFS_EXIT_PATH_FOUND:
         case RPC_NT_OBJECT_NOT_FOUND:
+        case STATUS_DELETE_PENDING:
             return ENOENT;
         /* ESRCH            =  3 */
@@ -378 +380 @@
 {
     errno = birdErrnoFromNtStatus(rcNt);
+#if 0
+    {
+        ULONG rcWin32;
+        _doserrno = rcWin32 = g_pfnRtlNtStatusToDosError(rcNt);
+        SetLastError(rcWin32);
+    }
+#endif
     return -1;
 }

trunk/src/lib/nt/ntstuff.h

@@ -508 +508 @@
                                                   BOOLEAN fCaseInsensitive);
 extern UCHAR       (WINAPI * g_pfnRtlUpperChar)(UCHAR uch);
+extern ULONG       (WINAPI * g_pfnRtlNtStatusToDosError)(MY_NTSTATUS rcNt);