Rebase against 8f91df4c4e4fb8b32c737bb02e82dcddfb71a114.

This commit is contained in:
Alistair Leslie-Hughes
2025-05-22 07:44:21 +10:00
parent 7f2c4b8613
commit 554a64f6b3
3 changed files with 12 additions and 12 deletions

View File

@@ -1,4 +1,4 @@
From 7925434a76b590f7cb2d1e9d6dcc9938e0374b35 Mon Sep 17 00:00:00 2001
From 50f9168ed92d261de21615b250dfac115160cc2e Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Mon, 6 Jul 2020 17:17:31 -0500
Subject: [PATCH] ntdll, server: Implement alertable waits.
@@ -164,13 +164,13 @@ index f805af251bb..a80019b76dd 100644
/* We need to let the server know when we are doing a message wait, and when we
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index c8e87a9d5aa..0454922dbe3 100644
index b9043351d57..283fd7d7ff6 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -104,6 +104,7 @@ struct ntdll_thread_data
void *cpu_data[16]; /* 1d4/02f0 reserved for CPU-specific data */
@@ -105,6 +105,7 @@ struct ntdll_thread_data
SYSTEM_SERVICE_TABLE *syscall_table; /* 214/0370 syscall table */
struct syscall_frame *syscall_frame; /* 218/0378 current syscall frame */
int syscall_trace; /* 21c/0380 syscall trace flag */
+ int esync_apc_fd; /* fd to wait on for user APCs */
int request_fd; /* fd for sending server requests */
int reply_fd; /* fd for receiving server replies */