From 554a64f6b3accd2a57218a4aa1ea04df41691e2f Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 22 May 2025 07:44:21 +1000 Subject: [PATCH] Rebase against 8f91df4c4e4fb8b32c737bb02e82dcddfb71a114. --- ...35-ntdll-server-Implement-alertable-waits.patch | 8 ++++---- ...r-Mark-drive_c-as-case-insensitive-when-c.patch | 14 +++++++------- staging/upstream-commit | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/patches/eventfd_synchronization/0035-ntdll-server-Implement-alertable-waits.patch b/patches/eventfd_synchronization/0035-ntdll-server-Implement-alertable-waits.patch index ee910cfb..ba1581e3 100644 --- a/patches/eventfd_synchronization/0035-ntdll-server-Implement-alertable-waits.patch +++ b/patches/eventfd_synchronization/0035-ntdll-server-Implement-alertable-waits.patch @@ -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 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 */ diff --git a/patches/ntdll-ext4-case-folder/0002-ntdll-server-Mark-drive_c-as-case-insensitive-when-c.patch b/patches/ntdll-ext4-case-folder/0002-ntdll-server-Mark-drive_c-as-case-insensitive-when-c.patch index 99c53968..b00faca3 100644 --- a/patches/ntdll-ext4-case-folder/0002-ntdll-server-Mark-drive_c-as-case-insensitive-when-c.patch +++ b/patches/ntdll-ext4-case-folder/0002-ntdll-server-Mark-drive_c-as-case-insensitive-when-c.patch @@ -1,4 +1,4 @@ -From 1fbb361023f9474a3522762aae32ad64d056e37e Mon Sep 17 00:00:00 2001 +From 537fd63e028ce58f4b5dfead7a9fc2a64692fa1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Iv=C4=83ncescu?= Date: Fri, 24 May 2019 15:09:35 +0300 Subject: [PATCH] ntdll/server: Mark drive_c as case-insensitive when created @@ -13,7 +13,7 @@ Signed-off-by: Gabriel Ivăncescu 1 file changed, 43 insertions(+) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c -index ab9d99c4f47..f40897757e3 100644 +index 159b62f268d..66685f4a87b 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -49,6 +49,10 @@ @@ -27,9 +27,9 @@ index ab9d99c4f47..f40897757e3 100644 #ifdef HAVE_SYS_PRCTL_H # include #endif -@@ -83,6 +87,22 @@ - +@@ -85,6 +89,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(server); + WINE_DECLARE_DEBUG_CHANNEL(syscall); +/* just in case... */ +#undef EXT2_IOC_GETFLAGS @@ -50,7 +50,7 @@ index ab9d99c4f47..f40897757e3 100644 #ifndef MSG_CMSG_CLOEXEC #define MSG_CMSG_CLOEXEC 0 #endif -@@ -1137,6 +1157,28 @@ static const char *init_server_dir( dev_t dev, ino_t ino ) +@@ -1291,6 +1311,28 @@ static const char *init_server_dir( dev_t dev, ino_t ino ) } @@ -79,7 +79,7 @@ index ab9d99c4f47..f40897757e3 100644 /*********************************************************************** * setup_config_dir * -@@ -1173,6 +1215,7 @@ static int setup_config_dir(void) +@@ -1327,6 +1369,7 @@ static int setup_config_dir(void) if (!mkdir( "dosdevices", 0777 )) { mkdir( "drive_c", 0777 ); @@ -88,5 +88,5 @@ index ab9d99c4f47..f40897757e3 100644 symlink( "/", "dosdevices/z:" ); } -- -2.34.1 +2.47.2 diff --git a/staging/upstream-commit b/staging/upstream-commit index 0f9e68f4..060e1e92 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -a550040d94de646c65f4013337b5cce89383b634 +8f91df4c4e4fb8b32c737bb02e82dcddfb71a114