win: the ddk got the NTSTATUS_FROM_WIN32 wrong

joyent · Sep 9, 2011 · 12e689d · 12e689d
1 parent cfa1423
commit 12e689d
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/win/winapi.h b/src/win/winapi.h
@@ -4069,11 +4069,14 @@
 # define STATUS_HASH_NOT_PRESENT ((NTSTATUS) 0xC000A101L)
 #endif
 
-#ifndef NTSTATUS_FROM_WIN32
-# define NTSTATUS_FROM_WIN32(error) ((NTSTATUS) (error) <= 0 ? \
-         ((NTSTATUS) (error)) : ((NTSTATUS) (((error) & 0x0000FFFF) | \
-         (FACILITY_NTWIN32 << 16) | ERROR_SEVERITY_ERROR)))
-#endif
+/* This is not the NTSTATUS_FROM_WIN32 that the DDK provides, because the
+/* DDK got it wrong! */
+#ifdef NTSTATUS_FROM_WIN32
+# undef NTSTATUS_FROM_WIN32
+#endif
+#define NTSTATUS_FROM_WIN32(error) ((NTSTATUS) (error) <= 0 ? \
+        ((NTSTATUS) (error)) : ((NTSTATUS) (((error) & 0x0000FFFF) | \
+        (FACILITY_NTWIN32 << 16) | ERROR_SEVERITY_WARNING)))
 
 /* from ntifs.h */
 /* MinGW already has it */