ntdll: Don't use wine/server.h from the PE side.

dlls/ntdll/actctx.c

@@ -24,6 +24,7 @@
 
 #include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "ntstatus.h"
 #define WIN32_NO_STATUS

dlls/ntdll/atom.c

@@ -28,8 +28,6 @@
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
 #include "windef.h"
-
-#include "wine/server.h"
 #include "ntdll_misc.h"
 
 #include "wine/debug.h"

dlls/ntdll/directory.c

@@ -36,7 +36,6 @@
 #include "winternl.h"
 #include "ddk/wdm.h"
 #include "ntdll_misc.h"
-#include "wine/server.h"
 #include "wine/list.h"
 #include "wine/debug.h"
 #include "wine/exception.h"

dlls/ntdll/exception.c

@@ -32,7 +32,6 @@
 #include "winternl.h"
 #include "ddk/wdm.h"
 #include "wine/exception.h"
-#include "wine/server.h"
 #include "wine/list.h"
 #include "wine/debug.h"
 #include "excpt.h"

dlls/ntdll/heap.c

@@ -36,7 +36,6 @@
 #include "ntdll_misc.h"
 #include "wine/list.h"
 #include "wine/debug.h"
-#include "wine/server.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(heap);
 

dlls/ntdll/loader.c

@@ -21,6 +21,7 @@
 
 #include <assert.h>
 #include <stdarg.h>
+#include <stdlib.h>
 
 #include "ntstatus.h"
 #define WIN32_NO_STATUS

dlls/ntdll/nt.c

@@ -33,7 +33,6 @@
 #include "windef.h"
 #include "winternl.h"
 #include "ntdll_misc.h"
-#include "wine/server.h"
 #include "ddk/wdm.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ntdll);

dlls/ntdll/ntdll_misc.h

@@ -26,7 +26,6 @@
 #include "winnt.h"
 #include "winternl.h"
 #include "unixlib.h"
-#include "wine/server.h"
 #include "wine/asm.h"
 
 #define DECLARE_CRITICAL_SECTION(cs) \

dlls/ntdll/sync.c

@@ -33,7 +33,6 @@
 #define NONAMELESSUNION
 #include "windef.h"
 #include "winternl.h"
-#include "wine/server.h"
 #include "wine/debug.h"
 #include "ntdll_misc.h"
 

dlls/ntdll/thread.c

@@ -27,7 +27,6 @@
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
 #include "winternl.h"
-#include "wine/server.h"
 #include "wine/debug.h"
 #include "ntdll_misc.h"
 #include "ddk/wdm.h"

dlls/ntdll/threadpool.c

@@ -1090,8 +1090,7 @@ static void CALLBACK timerqueue_thread_proc( void *param )
             }
         }
 
-        timeout_lower = TIMEOUT_INFINITE;
-        timeout_upper = TIMEOUT_INFINITE;
+        timeout_lower = timeout_upper = MAXLONGLONG;
 
         /* Determine next timeout and use the window length to optimize wakeup times. */
         LIST_FOR_EACH_ENTRY( other_timer, &timerqueue.pending_timers,
@@ -1247,7 +1246,7 @@ static void CALLBACK waitqueue_thread_proc( void *param )
     for (;;)
     {
         NtQuerySystemTime( &now );
-        timeout.QuadPart = TIMEOUT_INFINITE;
+        timeout.QuadPart = MAXLONGLONG;
         num_handles = 0;
 
         LIST_FOR_EACH_ENTRY_SAFE( wait, next, &bucket->waiting, struct threadpool_object,
@@ -2985,7 +2984,7 @@ VOID WINAPI TpSetTimer( TP_TIMER *timer, LARGE_INTEGER *timeout, LONG period, LO
 VOID WINAPI TpSetWait( TP_WAIT *wait, HANDLE handle, LARGE_INTEGER *timeout )
 {
     struct threadpool_object *this = impl_from_TP_WAIT( wait );
-    ULONGLONG timestamp = TIMEOUT_INFINITE;
+    ULONGLONG timestamp = MAXLONGLONG;
 
     TRACE( "%p %p %p\n", wait, handle, timeout );
 

dlls/ntdll/unix/registry.c

@@ -30,6 +30,7 @@
 
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
+#include "winternl.h"
 #include "unix_private.h"
 #include "wine/debug.h"
 

dlls/ntdll/unix/security.c

@@ -30,6 +30,7 @@
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
 #include "windef.h"
+#include "winternl.h"
 #include "unix_private.h"
 #include "wine/debug.h"
 

dlls/ntdll/unix/unix_private.h

@@ -24,6 +24,7 @@
 #include <pthread.h>
 #include <signal.h>
 #include "unixlib.h"
+#include "wine/server.h"
 #include "wine/list.h"
 
 #ifdef __i386__

dlls/ntdll/unixlib.h

@@ -21,7 +21,6 @@
 #ifndef __NTDLL_UNIXLIB_H
 #define __NTDLL_UNIXLIB_H
 
-#include "wine/server.h"
 #include "wine/debug.h"
 
 struct _DISPATCHER_CONTEXT;

dlls/ntdll/virtual.c

@@ -31,7 +31,6 @@
 #define NONAMELESSUNION
 #include "windef.h"
 #include "winternl.h"
-#include "wine/server.h"
 #include "wine/debug.h"
 #include "ntdll_misc.h"