Module: wine Branch: master Commit: 58eceff167ad13530f4841b2b606472d34bb392c URL: https://source.winehq.org/git/wine.git/?a=commit;h=58eceff167ad13530f4841b2b...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Feb 16 11:37:38 2021 +0100
ntdll: Don't use wine/server.h from the PE side.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ntdll/actctx.c | 1 + dlls/ntdll/atom.c | 2 -- dlls/ntdll/directory.c | 1 - dlls/ntdll/exception.c | 1 - dlls/ntdll/heap.c | 1 - dlls/ntdll/loader.c | 1 + dlls/ntdll/nt.c | 1 - dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/sync.c | 1 - dlls/ntdll/thread.c | 1 - dlls/ntdll/threadpool.c | 7 +++---- dlls/ntdll/unix/registry.c | 1 + dlls/ntdll/unix/security.c | 1 + dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 1 - dlls/ntdll/virtual.c | 1 - 16 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 5db464a383e..5032f1b0cc4 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -24,6 +24,7 @@
#include <stdarg.h> #include <stdio.h> +#include <stdlib.h>
#include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/ntdll/atom.c b/dlls/ntdll/atom.c index ab8d7ee317f..adde3208e88 100644 --- a/dlls/ntdll/atom.c +++ b/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" diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index cfb4595d457..fb2f25d35bc 100644 --- a/dlls/ntdll/directory.c +++ b/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" diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 4594d12f8a0..d5b3042c491 100644 --- a/dlls/ntdll/exception.c +++ b/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" diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 2d7b229174d..cae41cba0d9 100644 --- a/dlls/ntdll/heap.c +++ b/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);
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9403cdb89fd..a67c326d875 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -21,6 +21,7 @@
#include <assert.h> #include <stdarg.h> +#include <stdlib.h>
#include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index dc3eb73e976..3d7063caa1d 100644 --- a/dlls/ntdll/nt.c +++ b/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); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 60b8ffc46d6..67696f80db3 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/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) \ diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 8df7015df9f..f1263ae33fd 100644 --- a/dlls/ntdll/sync.c +++ b/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"
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 425e8770294..25496609f08 100644 --- a/dlls/ntdll/thread.c +++ b/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" diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index bdc1ebddd7d..1b51a191979 100644 --- a/dlls/ntdll/threadpool.c +++ b/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 );
diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index f94c8ff98ee..c0897033609 100644 --- a/dlls/ntdll/unix/registry.c +++ b/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"
diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 8838ca13ee4..fc9cc9d4572 100644 --- a/dlls/ntdll/unix/security.c +++ b/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"
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 6ab96397412..1a864b6fb5d 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/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__ diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 8dc42320f18..0439a5a937b 100644 --- a/dlls/ntdll/unixlib.h +++ b/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; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e0435181e95..8e512c5d85a 100644 --- a/dlls/ntdll/virtual.c +++ b/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"