Match PSDK STATUS_* definitions.

dlls/advapi32/crypt.c

@@ -39,13 +39,14 @@
 # include <unistd.h>
 #endif
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "crypt.h"
 #include "winnls.h"
 #include "winreg.h"
 #include "wine/debug.h"
 #include "wine/unicode.h"
 #include "winternl.h"
-#include "ntstatus.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(crypt);
 

dlls/advapi32/crypt_lmhash.c

@@ -22,11 +22,12 @@
 
 #include <stdarg.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
 #include "winternl.h"
-#include "ntstatus.h"
 
 #include "crypt.h"
 

dlls/advapi32/lsa.c

@@ -23,11 +23,12 @@
 
 #include <stdarg.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
 #include "winternl.h"
-#include "ntstatus.h"
 #include "ntsecapi.h"
 
 #include "wine/debug.h"

dlls/advapi32/registry.c

@@ -30,11 +30,12 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
 #include "winerror.h"
-#include "ntstatus.h"
 #include "winternl.h"
 
 #include "wine/unicode.h"

dlls/advapi32/security.c

@@ -21,6 +21,8 @@
 #include <stdarg.h>
 #include <string.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
@@ -28,7 +30,6 @@
 #include "winreg.h"
 #include "winternl.h"
 #include "winioctl.h"
-#include "ntstatus.h"
 #include "ntsecapi.h"
 #include "accctrl.h"
 #include "sddl.h"

dlls/dbghelp/minidump.c

@@ -23,8 +23,9 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 
-#include "dbghelp_private.h"
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
+#include "dbghelp_private.h"
 #include "winnls.h"
 #include "winreg.h"
 #include "winternl.h"

dlls/dbghelp/path.c

@@ -24,7 +24,6 @@
 #include <string.h>
 
 #include "dbghelp_private.h"
-#include "ntstatus.h"
 #include "winnls.h"
 #include "winreg.h"
 #include "winternl.h"

dlls/dbghelp/stack.c

@@ -27,9 +27,10 @@
 #include <string.h>
 #include <assert.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "dbghelp_private.h"
 #include "winreg.h"
-#include "ntstatus.h"
 #include "winternl.h"
 #include "wine/winbase16.h"
 #include "wine/debug.h"
@@ -426,4 +427,3 @@ BOOL WINAPI SymRegisterFunctionEntryCallback64(HANDLE hProc,
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return FALSE;
 }
-

dlls/dplayx/dplayx_messages.c

@@ -27,7 +27,6 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "winerror.h"
-#include "ntstatus.h"
 
 #include "dplayx_messages.h"
 #include "dplay_global.h"

dlls/imagehlp/integrity.c

@@ -27,7 +27,6 @@
 #include "winreg.h"
 #include "winternl.h"
 #include "winnt.h"
-#include "ntstatus.h"
 #include "imagehlp.h"
 #include "wine/debug.h"
 

dlls/kernel/actctx.c

@@ -22,7 +22,6 @@
 #include "wine/port.h"
 
 #include <stdarg.h>
-#include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/kernel/change.c

@@ -24,10 +24,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
-#include "ntstatus.h"
 #include "winternl.h"
 #include "kernel_private.h"
 #include "wine/windef16.h"

dlls/kernel/comm.c

@@ -58,7 +58,6 @@
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
-#include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/kernel/computername.c

@@ -35,6 +35,7 @@
 #endif
 
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/kernel/debugger.c

@@ -24,7 +24,6 @@
 #include "winerror.h"
 #include "wine/winbase16.h"
 #include "wine/server.h"
-#include "ntstatus.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"
 #include "wine/debug.h"

dlls/kernel/environ.c

@@ -27,6 +27,7 @@
 #include <assert.h>
 
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/kernel/except.c

@@ -41,6 +41,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/kernel/file.c

@@ -33,6 +33,7 @@
 #define NONAMELESSSTRUCT
 #include "winerror.h"
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winternl.h"

dlls/kernel/format_msg.c

@@ -25,6 +25,7 @@
 #include <string.h>
 
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/kernel/global16.c

@@ -38,7 +38,6 @@
 #endif
 
 #include "wine/winbase16.h"
-#include "ntstatus.h"
 #include "toolhelp.h"
 #include "winternl.h"
 #include "kernel_private.h"

dlls/kernel/instr.c

@@ -25,7 +25,6 @@
 
 #include <stdarg.h>
 
-#include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/kernel/locale.c

@@ -32,6 +32,7 @@
 #include <stdlib.h>
 
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"  /* for RT_STRINGW */

dlls/kernel/module.c

@@ -29,9 +29,10 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "wine/winbase16.h"
 #include "winerror.h"
-#include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
 #include "winternl.h"

dlls/kernel/oldconfig.c

@@ -46,7 +46,6 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "winternl.h"
-#include "ntstatus.h"
 #include "winioctl.h"
 #include "ntddscsi.h"
 #include "wine/library.h"

dlls/kernel/path.c

@@ -32,6 +32,7 @@
 #define NONAMELESSSTRUCT
 #include "winerror.h"
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winternl.h"

dlls/kernel/process.c

@@ -33,9 +33,10 @@
 #endif
 #include <sys/types.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
-#include "ntstatus.h"
 #include "winioctl.h"
 #include "winternl.h"
 #include "module.h"

dlls/kernel/resource.c

@@ -27,6 +27,7 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winternl.h"

dlls/kernel/sync.c

@@ -45,6 +45,7 @@
 #define NONAMELESSSTRUCT
 
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/kernel/thread.c

@@ -30,6 +30,7 @@
 #endif
 
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/kernel/time.c

@@ -41,10 +41,11 @@
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winternl.h"
-#include "ntstatus.h"
 #include "kernel_private.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"

dlls/kernel/version.c

@@ -29,6 +29,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/kernel/virtual.c

@@ -33,6 +33,7 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"

dlls/kernel/volume.c

@@ -29,11 +29,12 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"
 #include "winternl.h"
-#include "ntstatus.h"
 #include "winioctl.h"
 #include "ntddstor.h"
 #include "ntddcdrm.h"

dlls/mcicda/mcicda.c

@@ -25,16 +25,18 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "ntstatus.h"
 #include "wownt32.h"
 #include "mmddk.h"
 #include "winioctl.h"
 #include "ntddstor.h"
 #include "ntddcdrm.h"
+#include "winternl.h"
 #include "wine/debug.h"
 #include "wine/unicode.h"
 

dlls/netapi32/wksta.c

@@ -23,6 +23,8 @@
 
 #include <stdarg.h>
 #include <stdlib.h>
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winsock2.h"
@@ -33,7 +35,6 @@
 #include "lmwksta.h"
 #include "iphlpapi.h"
 #include "winerror.h"
-#include "ntstatus.h"
 #include "winreg.h"
 #include "winternl.h"
 #include "ntsecapi.h"

dlls/ntdll/atom.c

@@ -28,8 +28,9 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "windef.h"
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
+#include "windef.h"
 
 #include "wine/server.h"
 #include "wine/unicode.h"

dlls/ntdll/cdrom.c

@@ -86,6 +86,7 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winternl.h"
 #include "winioctl.h"

dlls/ntdll/critsection.c

@@ -27,6 +27,8 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <time.h>
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winternl.h"
 #include "wine/debug.h"

dlls/ntdll/debugbuffer.c

@@ -25,6 +25,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winnt.h"
 #include "winternl.h"

dlls/ntdll/debugtools.c

@@ -34,7 +34,6 @@
 #include "wine/exception.h"
 #include "wine/library.h"
 #include "wine/unicode.h"
-#include "ntstatus.h"
 #include "winnt.h"
 #include "winternl.h"
 #include "excpt.h"

dlls/ntdll/directory.c

@@ -59,9 +59,10 @@
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winnt.h"
-#include "ntstatus.h"
 #include "thread.h"
 #include "winternl.h"
 #include "ntdll_misc.h"

dlls/ntdll/env.c

@@ -23,6 +23,8 @@
 #include <assert.h>
 #include <stdarg.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winternl.h"
 #include "wine/unicode.h"

dlls/ntdll/error.c

@@ -24,6 +24,7 @@
 #include <stdarg.h>
 
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winternl.h"
 #include "winerror.h"

dlls/ntdll/exception.c

@@ -27,6 +27,7 @@
 #include <stdarg.h>
 
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winternl.h"
 #include "wine/exception.h"

dlls/ntdll/file.c

@@ -65,6 +65,8 @@
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "wine/unicode.h"
 #include "wine/debug.h"
 #include "thread.h"

dlls/ntdll/handletable.c

@@ -20,6 +20,8 @@
 
 #include <stdarg.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winternl.h"
 #include "wine/debug.h"

dlls/ntdll/heap.c

@@ -33,6 +33,7 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winternl.h"
 #include "winnt.h"

dlls/ntdll/large_int.c

@@ -22,6 +22,7 @@
 #include <stdarg.h>
 
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winternl.h"
 

dlls/ntdll/loader.c

@@ -28,6 +28,8 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winnt.h"
 #include "winternl.h"

dlls/ntdll/nt.c

@@ -26,9 +26,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "wine/debug.h"
 #include "wine/unicode.h"
-
 #include "windef.h"
 #include "winternl.h"
 #include "ntdll_misc.h"

dlls/ntdll/ntdll_misc.h

@@ -23,7 +23,6 @@
 
 #include "windef.h"
 #include "winnt.h"
-#include "ntstatus.h"
 #include "winternl.h"
 #include "winioctl.h"
 #include "wine/server.h"

dlls/ntdll/om.c

@@ -29,8 +29,10 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#include "wine/debug.h"
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+#include "wine/debug.h"
 #include "windef.h"
 #include "winternl.h"
 #include "ntdll_misc.h"

dlls/ntdll/path.c

@@ -32,6 +32,8 @@
 # include <unistd.h>
 #endif
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winioctl.h"
 #include "wine/unicode.h"

dlls/ntdll/process.c

@@ -26,8 +26,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "wine/debug.h"
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+#include "wine/debug.h"
 #include "windef.h"
 #include "winternl.h"
 #include "ntdll_misc.h"

dlls/ntdll/reg.c

@@ -33,6 +33,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "wine/library.h"
 #include "ntdll_misc.h"
 #include "wine/debug.h"

dlls/ntdll/resource.c

@@ -35,6 +35,7 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"

dlls/ntdll/rtl.c

@@ -30,6 +30,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winternl.h"
 #include "wine/debug.h"

dlls/ntdll/rtlstr.c

@@ -27,6 +27,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winnt.h"
 #include "winternl.h"

dlls/ntdll/sec.c

@@ -32,6 +32,8 @@
 # include <unistd.h>
 #endif
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "wine/exception.h"
 #include "ntdll_misc.h"

dlls/ntdll/server.c

@@ -54,6 +54,7 @@
 #endif
 
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "wine/library.h"
 #include "wine/pthread.h"
 #include "wine/server.h"

dlls/ntdll/sync.c

@@ -50,6 +50,8 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "thread.h"
 #include "wine/server.h"

dlls/ntdll/tests/large_int.c

@@ -390,22 +390,22 @@ static void test_RtlLargeIntegerToChar(void)
     value = largeint2str[0].value;
     result = pRtlLargeIntegerToChar(&value, 20, largeint2str[0].MaximumLength, NULL);
     ok(result == STATUS_INVALID_PARAMETER,
-       "(test a): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %x\n",
+       "(test a): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %lx\n",
        largeint2str[0].value, 20, largeint2str[0].MaximumLength, result, STATUS_INVALID_PARAMETER);
 
     result = pRtlLargeIntegerToChar(&value, 20, 0, NULL);
     ok(result == STATUS_INVALID_PARAMETER,
-       "(test b): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %x\n",
+       "(test b): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %lx\n",
        largeint2str[0].value, 20, largeint2str[0].MaximumLength, result, STATUS_INVALID_PARAMETER);
 
     result = pRtlLargeIntegerToChar(&value, largeint2str[0].base, 0, NULL);
     ok(result == STATUS_BUFFER_OVERFLOW,
-       "(test c): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %x\n",
+       "(test c): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %lx\n",
        largeint2str[0].value, largeint2str[0].base, 0, result, STATUS_BUFFER_OVERFLOW);
 
     result = pRtlLargeIntegerToChar(&value, largeint2str[0].base, largeint2str[0].MaximumLength, NULL);
     ok(result == STATUS_ACCESS_VIOLATION,
-       "(test d): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %x\n",
+       "(test d): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %lx\n",
        largeint2str[0].value, largeint2str[0].base, largeint2str[0].MaximumLength, result, STATUS_ACCESS_VIOLATION);
 }
 

dlls/ntdll/tests/rtlstr.c

@@ -199,8 +199,8 @@ static void test_RtlInitUnicodeStringEx(void)
     uni.Buffer = (void *) 0xdeadbeef;
     result = pRtlInitUnicodeStringEx(&uni, teststring);
     ok(result == STATUS_SUCCESS,
-       "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %x\n",
-       result, STATUS_SUCCESS);
+       "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected 0\n",
+       result);
     ok(uni.Length == 32,
        "pRtlInitUnicodeStringEx(&uni, 0) sets Length to %u, expected %u\n",
        uni.Length, 32);
@@ -230,7 +230,7 @@ static void test_RtlInitUnicodeStringEx(void)
     uni.Buffer = (void *) 0xdeadbeef;
     result = pRtlInitUnicodeStringEx(&uni, teststring2);
     ok(result == STATUS_NAME_TOO_LONG,
-       "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %x\n",
+       "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %lx\n",
        result, STATUS_NAME_TOO_LONG);
     ok(uni.Length == 12345,
        "pRtlInitUnicodeStringEx(&uni, 0) sets Length to %u, expected %u\n",
@@ -263,8 +263,8 @@ static void test_RtlInitUnicodeStringEx(void)
     uni.Buffer = (void *) 0xdeadbeef;
     result = pRtlInitUnicodeStringEx(&uni, 0);
     ok(result == STATUS_SUCCESS,
-       "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %x\n",
-       result, STATUS_SUCCESS);
+       "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected 0\n",
+       result);
     ok(uni.Length == 0,
        "pRtlInitUnicodeStringEx(&uni, 0) sets Length to %u, expected %u\n",
        uni.Length, 0);
@@ -1650,22 +1650,22 @@ static void test_RtlIntegerToChar(void)
 
     result = pRtlIntegerToChar(int2str[0].value, 20, int2str[0].MaximumLength, NULL);
     ok(result == STATUS_INVALID_PARAMETER,
-       "(test a): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %x\n",
+       "(test a): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %lx\n",
        int2str[0].value, 20, int2str[0].MaximumLength, result, STATUS_INVALID_PARAMETER);
 
     result = pRtlIntegerToChar(int2str[0].value, 20, 0, NULL);
     ok(result == STATUS_INVALID_PARAMETER,
-       "(test b): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %x\n",
+       "(test b): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %lx\n",
        int2str[0].value, 20, 0, result, STATUS_INVALID_PARAMETER);
 
     result = pRtlIntegerToChar(int2str[0].value, int2str[0].base, 0, NULL);
     ok(result == STATUS_BUFFER_OVERFLOW,
-       "(test c): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %x\n",
+       "(test c): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %lx\n",
        int2str[0].value, int2str[0].base, 0, result, STATUS_BUFFER_OVERFLOW);
 
     result = pRtlIntegerToChar(int2str[0].value, int2str[0].base, int2str[0].MaximumLength, NULL);
     ok(result == STATUS_ACCESS_VIOLATION,
-       "(test d): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %x\n",
+       "(test d): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %lx\n",
        int2str[0].value, int2str[0].base, int2str[0].MaximumLength, result, STATUS_ACCESS_VIOLATION);
 }
 

dlls/ntdll/thread.c

@@ -31,6 +31,7 @@
 
 #define NONAMELESSUNION
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "thread.h"
 #include "winternl.h"
 #include "wine/library.h"

dlls/ntdll/time.c

@@ -39,6 +39,8 @@
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winternl.h"
 #include "wine/unicode.h"

dlls/ntdll/version.c

@@ -29,6 +29,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"

dlls/ntdll/virtual.c

@@ -42,6 +42,7 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winternl.h"
 #include "winioctl.h"

dlls/powrprof/powrprof.c

@@ -19,12 +19,13 @@
 
 #include <stdarg.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winnt.h"
 #include "winreg.h"
 #include "winternl.h"
-#include "ntstatus.h"
 #include "powrprof.h"
 #include "wine/debug.h"
 #include "wine/unicode.h"

dlls/psapi/psapi_main.c

@@ -21,6 +21,8 @@
 
 #include <stdarg.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
@@ -28,7 +30,6 @@
 #include "wine/debug.h"
 #include "winnls.h"
 #include "winternl.h"
-#include "ntstatus.h"
 #include "psapi.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(psapi);

dlls/quartz/filesource.c

@@ -30,7 +30,6 @@
 #include "vfwmsgs.h"
 #include "winbase.h"
 #include "winreg.h"
-#include "ntstatus.h"
 #include <assert.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(quartz);

dlls/rpcrt4/rpc_server.c

@@ -34,7 +34,6 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "winreg.h"
-#include "ntstatus.h"
 
 #include "rpc.h"
 #include "rpcndr.h"

dlls/rpcrt4/rpcss_np_client.c

@@ -23,7 +23,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "ntstatus.h"
 #include "wine/rpcss_shared.h"
 #include "wine/debug.h"
 

dlls/user/cursoricon.c

@@ -55,7 +55,6 @@
 #include "wingdi.h"
 #include "wownt32.h"
 #include "winerror.h"
-#include "ntstatus.h"
 #include "excpt.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"

dlls/user/message.c

@@ -25,6 +25,7 @@
 #include <stdarg.h>
 
 #include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/user/painting.c

@@ -25,10 +25,11 @@
 #include <stdarg.h>
 #include <string.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
-#include "ntstatus.h"
 #include "winuser.h"
 #include "wine/server.h"
 #include "win.h"

dlls/user/winpos.c

@@ -24,12 +24,13 @@
 
 #include <stdarg.h>
 #include <string.h>
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "winerror.h"
-#include "ntstatus.h"
 #include "wine/winuser16.h"
 #include "wine/server.h"
 #include "controls.h"

dlls/vmm.vxd/vmm.c

@@ -29,7 +29,6 @@
 #include "winbase.h"
 #include "winreg.h"
 #include "winnls.h"
-#include "ntstatus.h"
 #include "winternl.h"
 #include "wine/debug.h"
 

dlls/winedos/int2f.c

@@ -27,9 +27,11 @@
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "wine/winbase16.h"
 #include "wine/debug.h"
-#include "ntstatus.h"
+#include "winternl.h"
 #include "winioctl.h"
 #include "ntddstor.h"
 #include "ntddcdrm.h"

dlls/winedos/vxd.c

@@ -32,13 +32,14 @@
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
 #include "winternl.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "ntstatus.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "dosexe.h"

dlls/wininet/internet.c

@@ -48,7 +48,6 @@
 #endif
 #include <assert.h>
 
-#include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"

dlls/winmm/mmsystem.c

@@ -35,7 +35,6 @@
 #include "winbase.h"
 #include "mmsystem.h"
 #include "winreg.h"
-#include "ntstatus.h"
 #include "winternl.h"
 #include "wownt32.h"
 #include "winnls.h"

dlls/winsock/socket.c

@@ -119,6 +119,8 @@
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
@@ -135,7 +137,6 @@
 #include "thread.h"
 #include "wine/server.h"
 #include "wine/debug.h"
-#include "ntstatus.h"
 #include "wine/unicode.h"
 
 #ifdef HAVE_IPX

dlls/x11drv/dce.c

@@ -22,11 +22,12 @@
 #include "config.h"
 
 #include <assert.h>
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "win.h"
 #include "windef.h"
 #include "wingdi.h"
 #include "wownt32.h"
-#include "ntstatus.h"
 #include "x11drv.h"
 #include "wine/winbase16.h"
 #include "wine/wingdi16.h"

dlls/x11drv/winpos.c

@@ -33,7 +33,6 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "winerror.h"
-#include "ntstatus.h"
 #include "wownt32.h"
 #include "wine/wingdi16.h"
 

include/winnt.h

@@ -416,51 +416,51 @@ typedef DWORD FLONG;
 
 #ifndef WIN32_NO_STATUS
 
-#define STATUS_WAIT_0                    0x00000000
-#define STATUS_ABANDONED_WAIT_0          0x00000080
-#define STATUS_USER_APC                  0x000000C0
-#define STATUS_TIMEOUT                   0x00000102
-#define STATUS_PENDING                   0x00000103
-#define STATUS_SEGMENT_NOTIFICATION      0x40000005
-#define STATUS_GUARD_PAGE_VIOLATION      0x80000001
-#define STATUS_DATATYPE_MISALIGNMENT     0x80000002
-#define STATUS_BREAKPOINT                0x80000003
-#define STATUS_SINGLE_STEP               0x80000004
-#define STATUS_ACCESS_VIOLATION          0xC0000005
-#define STATUS_IN_PAGE_ERROR             0xC0000006
-#define STATUS_INVALID_HANDLE            0xC0000008
-#define STATUS_NO_MEMORY                 0xC0000017
-#define STATUS_ILLEGAL_INSTRUCTION       0xC000001D
-#define STATUS_NONCONTINUABLE_EXCEPTION  0xC0000025
-#define STATUS_INVALID_DISPOSITION       0xC0000026
-#define STATUS_ARRAY_BOUNDS_EXCEEDED     0xC000008C
-#define STATUS_FLOAT_DENORMAL_OPERAND    0xC000008D
-#define STATUS_FLOAT_DIVIDE_BY_ZERO      0xC000008E
-#define STATUS_FLOAT_INEXACT_RESULT      0xC000008F
-#define STATUS_FLOAT_INVALID_OPERATION   0xC0000090
-#define STATUS_FLOAT_OVERFLOW            0xC0000091
-#define STATUS_FLOAT_STACK_CHECK         0xC0000092
-#define STATUS_FLOAT_UNDERFLOW           0xC0000093
-#define STATUS_INTEGER_DIVIDE_BY_ZERO    0xC0000094
-#define STATUS_INTEGER_OVERFLOW          0xC0000095
-#define STATUS_PRIVILEGED_INSTRUCTION    0xC0000096
-#define STATUS_STACK_OVERFLOW            0xC00000FD
-#define STATUS_CONTROL_C_EXIT            0xC000013A
-#define STATUS_FLOAT_MULTIPLE_FAULTS     0xC00002B4
-#define STATUS_FLOAT_MULTIPLE_TRAPS      0xC00002B5
-#define STATUS_REG_NAT_CONSUMPTION       0xC00002C9
-#define STATUS_SXS_EARLY_DEACTIVATION    0xC015000F
-#define STATUS_SXS_INVALID_DEACTIVATION  0xC0150010
+#define STATUS_WAIT_0                    ((DWORD) 0x00000000)
+#define STATUS_ABANDONED_WAIT_0          ((DWORD) 0x00000080)
+#define STATUS_USER_APC                  ((DWORD) 0x000000C0)
+#define STATUS_TIMEOUT                   ((DWORD) 0x00000102)
+#define STATUS_PENDING                   ((DWORD) 0x00000103)
+#define STATUS_SEGMENT_NOTIFICATION      ((DWORD) 0x40000005)
+#define STATUS_GUARD_PAGE_VIOLATION      ((DWORD) 0x80000001)
+#define STATUS_DATATYPE_MISALIGNMENT     ((DWORD) 0x80000002)
+#define STATUS_BREAKPOINT                ((DWORD) 0x80000003)
+#define STATUS_SINGLE_STEP               ((DWORD) 0x80000004)
+#define STATUS_ACCESS_VIOLATION          ((DWORD) 0xC0000005)
+#define STATUS_IN_PAGE_ERROR             ((DWORD) 0xC0000006)
+#define STATUS_INVALID_HANDLE            ((DWORD) 0xC0000008)
+#define STATUS_NO_MEMORY                 ((DWORD) 0xC0000017)
+#define STATUS_ILLEGAL_INSTRUCTION       ((DWORD) 0xC000001D)
+#define STATUS_NONCONTINUABLE_EXCEPTION  ((DWORD) 0xC0000025)
+#define STATUS_INVALID_DISPOSITION       ((DWORD) 0xC0000026)
+#define STATUS_ARRAY_BOUNDS_EXCEEDED     ((DWORD) 0xC000008C)
+#define STATUS_FLOAT_DENORMAL_OPERAND    ((DWORD) 0xC000008D)
+#define STATUS_FLOAT_DIVIDE_BY_ZERO      ((DWORD) 0xC000008E)
+#define STATUS_FLOAT_INEXACT_RESULT      ((DWORD) 0xC000008F)
+#define STATUS_FLOAT_INVALID_OPERATION   ((DWORD) 0xC0000090)
+#define STATUS_FLOAT_OVERFLOW            ((DWORD) 0xC0000091)
+#define STATUS_FLOAT_STACK_CHECK         ((DWORD) 0xC0000092)
+#define STATUS_FLOAT_UNDERFLOW           ((DWORD) 0xC0000093)
+#define STATUS_INTEGER_DIVIDE_BY_ZERO    ((DWORD) 0xC0000094)
+#define STATUS_INTEGER_OVERFLOW          ((DWORD) 0xC0000095)
+#define STATUS_PRIVILEGED_INSTRUCTION    ((DWORD) 0xC0000096)
+#define STATUS_STACK_OVERFLOW            ((DWORD) 0xC00000FD)
+#define STATUS_CONTROL_C_EXIT            ((DWORD) 0xC000013A)
+#define STATUS_FLOAT_MULTIPLE_FAULTS     ((DWORD) 0xC00002B4)
+#define STATUS_FLOAT_MULTIPLE_TRAPS      ((DWORD) 0xC00002B5)
+#define STATUS_REG_NAT_CONSUMPTION       ((DWORD) 0xC00002C9)
+#define STATUS_SXS_EARLY_DEACTIVATION    ((DWORD) 0xC015000F)
+#define STATUS_SXS_INVALID_DEACTIVATION  ((DWORD) 0xC0150010)
 
 /* status values for ContinueDebugEvent */
-#define DBG_EXCEPTION_HANDLED       0x00010001
-#define DBG_CONTINUE                0x00010002
-#define DBG_TERMINATE_THREAD        0x40010003
-#define DBG_TERMINATE_PROCESS       0x40010004
-#define DBG_CONTROL_C               0x40010005
-#define DBG_CONTROL_BREAK           0x40010008
-#define DBG_COMMAND_EXCEPTION       0x40010009
-#define DBG_EXCEPTION_NOT_HANDLED   0x80010001
+#define DBG_EXCEPTION_HANDLED       ((DWORD) 0x00010001)
+#define DBG_CONTINUE                ((DWORD) 0x00010002)
+#define DBG_TERMINATE_THREAD        ((DWORD) 0x40010003)
+#define DBG_TERMINATE_PROCESS       ((DWORD) 0x40010004)
+#define DBG_CONTROL_C               ((DWORD) 0x40010005)
+#define DBG_CONTROL_BREAK           ((DWORD) 0x40010008)
+#define DBG_COMMAND_EXCEPTION       ((DWORD) 0x40010009)
+#define DBG_EXCEPTION_NOT_HANDLED   ((DWORD) 0x80010001)
 
 #endif /* WIN32_NO_STATUS */
 

programs/rpcss/np_server.c

@@ -20,7 +20,6 @@
 
 #include <assert.h>
 
-#include "ntstatus.h"
 #include "rpcss.h"
 #include "wine/debug.h"
 

programs/wcmd/wcmdmain.c

@@ -24,7 +24,6 @@
  * - Lots of functionality missing from builtins
  */
 
-#include "ntstatus.h"
 #include "wcmd.h"
 
 const char * const inbuilt[] = {"ATTRIB", "CALL", "CD", "CHDIR", "CLS", "COPY", "CTTY",

programs/winedbg/dbg.y

@@ -30,8 +30,8 @@
 # include <unistd.h>
 #endif
 
-#include "wine/exception.h"
 #include "debugger.h"
+#include "wine/exception.h"
 #include "expr.h"
 
 int yylex(void);

programs/winedbg/debugger.h

@@ -26,11 +26,13 @@
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #define WIN32_LEAN_AND_MEAN
 #include "windef.h"
 #include "winbase.h"
-#include "ntstatus.h"
 #include "winver.h"
+#include "winternl.h"
 #include "dbghelp.h"
 #include "cvconst.h"
 #include "objbase.h"

programs/winedbg/gdbproxy.c

@@ -45,6 +45,8 @@
 # include <unistd.h>
 #endif
 
+#include "debugger.h"
+
 #include "windef.h"
 #include "winbase.h"
 #include "tlhelp32.h"
@@ -53,8 +55,6 @@
 #include "wingdi.h"
 #include "winuser.h"
 
-#include "debugger.h"
-
 #define GDBPXY_TRC_LOWLEVEL             0x01
 #define GDBPXY_TRC_PACKET               0x02
 #define GDBPXY_TRC_COMMAND              0x04

server/atom.c

@@ -27,6 +27,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+
 #include "unicode.h"
 #include "request.h"
 #include "object.h"
@@ -34,6 +37,7 @@
 #include "handle.h"
 #include "user.h"
 #include "winuser.h"
+#include "winternl.h"
 
 #define HASH_SIZE     37
 #define MIN_HASH_SIZE 4

server/change.c

@@ -28,12 +28,15 @@
 #include <signal.h>
 #include <sys/stat.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 
 #include "file.h"
 #include "handle.h"
 #include "thread.h"
 #include "request.h"
+#include "winternl.h"
 
 #ifdef linux
 #ifndef F_NOTIFY

server/class.c

@@ -27,6 +27,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+
 #include "wine/list.h"
 
 #include "request.h"
@@ -34,6 +37,7 @@
 #include "process.h"
 #include "user.h"
 #include "winuser.h"
+#include "winternl.h"
 
 struct window_class
 {

server/clipboard.c

@@ -26,10 +26,13 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "request.h"
 #include "object.h"
 #include "user.h"
 #include "winuser.h"
+#include "winternl.h"
 
 struct clipboard
 {

server/console.c

@@ -29,11 +29,14 @@
 #include <unistd.h>
 #include <signal.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "handle.h"
 #include "process.h"
 #include "request.h"
 #include "unicode.h"
 #include "console.h"
+#include "winternl.h"
 
 static void console_input_dump( struct object *obj, int verbose );
 static void console_input_destroy( struct object *obj );

server/debugger.c

@@ -27,7 +27,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
+#include "winternl.h"
 
 #include "handle.h"
 #include "process.h"

server/event.c

@@ -26,6 +26,8 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winternl.h"
 

server/fd.c

@@ -45,6 +45,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "object.h"
 #include "file.h"
 #include "handle.h"

server/file.c

@@ -43,6 +43,8 @@
 #include <poll.h>
 #endif
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winternl.h"