Module: wine Branch: master Commit: e11f6e0eb3d30d1c20a735bd4629341f2f8c90a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e11f6e0eb3d30d1c20a735bd4...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Feb 16 11:43:40 2021 +0100
kernel32: Don't use wine/server.h.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/kernel32/comm.c | 3 +-- dlls/kernel32/console.c | 4 ++-- dlls/kernel32/process.c | 1 - 3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 209a490b623..e9dd0feac58 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -24,13 +24,12 @@
#include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winnls.h" #include "winerror.h" #include "winioctl.h" #include "ddk/ntddser.h"
-#include "wine/server.h" - #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(comm); diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 7b3a07f0de5..8c61d28e8c6 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -33,11 +33,11 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winnls.h" #include "winerror.h" #include "wincon.h" #include "wine/condrv.h" -#include "wine/server.h" #include "wine/exception.h" #include "wine/debug.h" #include "excpt.h" @@ -59,7 +59,7 @@ HWND WINAPI GetConsoleWindow(void)
ret = DeviceIoControl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL ); - return ret ? wine_server_ptr_handle(info.win) : NULL; + return ret ? LongToHandle( info.win ) : NULL; }
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 756d1ef3f87..41a5b34af19 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -36,7 +36,6 @@ #include "psapi.h" #include "ddk/wdm.h" #include "wine/exception.h" -#include "wine/server.h" #include "wine/asm.h" #include "wine/debug.h"