From 12e689dcf89050f1d51f2e1f1ab9c712238b374e Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Fri, 9 Sep 2011 04:33:07 +0200 Subject: [PATCH] win: the ddk got the NTSTATUS_FROM_WIN32 wrong --- src/win/winapi.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/win/winapi.h b/src/win/winapi.h index da3a95db..760281e8 100644 --- 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))) +/* 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 */