From 4d8896cc355bb10fe1d3287ef1d402b43121daad Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 30 Apr 2021 09:12:29 +1000 Subject: [PATCH] Rebase against ca03802a456e7cf4efd834edfeddc483ac72e4b5. --- ...rver-objects-for-eventfd-based-synch.patch | 22 +++++++++++------ ...Move-some-tests-to-a-new-sync.c-file.patch | 24 +++++++++---------- patches/patchinstall.sh | 2 +- staging/upstream-commit | 2 +- 4 files changed, 29 insertions(+), 21 deletions(-) diff --git a/patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch b/patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch index ac9108f9..510f3666 100644 --- a/patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch +++ b/patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch @@ -1,4 +1,4 @@ -From 45b0af272838c1b28dee3dd50c588af888604f59 Mon Sep 17 00:00:00 2001 +From 2e40c85732d66a427927d26d0d560c835187fcf2 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Thu, 7 Jun 2018 20:09:59 -0500 Subject: [PATCH] server: Create server objects for eventfd-based @@ -9,8 +9,8 @@ Subject: [PATCH] server: Create server objects for eventfd-based server/esync.c | 320 ++++++++++++++++++++++++++++++++++++++++++++ server/esync.h | 22 +++ server/main.c | 4 + - server/protocol.def | 24 ++++ - 5 files changed, 371 insertions(+) + server/protocol.def | 25 +++- + 5 files changed, 371 insertions(+), 1 deletion(-) create mode 100644 server/esync.c create mode 100644 server/esync.h @@ -403,13 +403,21 @@ index dae08339874..f68888d0fa8 100644 set_current_time(); init_scheduler(); diff --git a/server/protocol.def b/server/protocol.def -index abccc0a1275..f41afda0251 100644 +index 10da65be735..22050c65f06 100644 --- a/server/protocol.def +++ b/server/protocol.def -@@ -3695,3 +3695,27 @@ struct handle_info - @REQ(resume_process) +@@ -3690,7 +3690,6 @@ struct handle_info obj_handle_t handle; /* process handle */ @END + +- + /* Iterate thread list for process */ + @REQ(get_next_thread) + obj_handle_t process; /* process handle */ +@@ -3701,3 +3700,27 @@ struct handle_info + @REPLY + obj_handle_t handle; /* next thread handle */ + @END + +enum esync_type +{ @@ -435,5 +443,5 @@ index abccc0a1275..f41afda0251 100644 + unsigned int shm_idx; +@END -- -2.20.1 +2.30.2 diff --git a/patches/ntdll-NtAlertThreadByThreadId/0001-ntdll-tests-Move-some-tests-to-a-new-sync.c-file.patch b/patches/ntdll-NtAlertThreadByThreadId/0001-ntdll-tests-Move-some-tests-to-a-new-sync.c-file.patch index 52b75946..91b178f3 100644 --- a/patches/ntdll-NtAlertThreadByThreadId/0001-ntdll-tests-Move-some-tests-to-a-new-sync.c-file.patch +++ b/patches/ntdll-NtAlertThreadByThreadId/0001-ntdll-tests-Move-some-tests-to-a-new-sync.c-file.patch @@ -1,4 +1,4 @@ -From b7328b5a416b09c66f37ba53cb010afe0266a12e Mon Sep 17 00:00:00 2001 +From b2fef9e91f2625ccb700963ac87b47eeb3138a9a Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Thu, 9 Jan 2020 13:44:01 -0600 Subject: [PATCH] ntdll/tests: Move some tests to a new sync.c file. @@ -23,7 +23,7 @@ index ed15c51339f..9a99c01bd7c 100644 time.c \ virtual.c diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c -index 1878a480cb8..77370fb5c4a 100644 +index 7d9ca47be12..7759736ca1c 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -30,10 +30,6 @@ @@ -61,8 +61,8 @@ index 1878a480cb8..77370fb5c4a 100644 -static void (WINAPI *pRtlWakeAddressSingle)( const void * ); static NTSTATUS (WINAPI *pNtOpenProcess)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, const CLIENT_ID * ); static NTSTATUS (WINAPI *pNtCreateDebugObject)( HANDLE *, ACCESS_MASK, OBJECT_ATTRIBUTES *, ULONG ); - -@@ -1705,286 +1693,6 @@ static void test_type_mismatch(void) + static NTSTATUS (WINAPI *pNtGetNextThread)(HANDLE process, HANDLE thread, ACCESS_MASK access, ULONG attributes, +@@ -1722,286 +1710,6 @@ static void test_type_mismatch(void) pNtClose( h ); } @@ -349,7 +349,7 @@ index 1878a480cb8..77370fb5c4a 100644 static void test_null_device(void) { OBJECT_ATTRIBUTES attr; -@@ -2058,119 +1766,6 @@ static void test_null_device(void) +@@ -2075,119 +1783,6 @@ static void test_null_device(void) CloseHandle(ov.hEvent); } @@ -469,7 +469,7 @@ index 1878a480cb8..77370fb5c4a 100644 static void test_semaphore(void) { SEMAPHORE_BASIC_INFORMATION info; -@@ -2247,79 +1842,6 @@ static void test_semaphore(void) +@@ -2264,79 +1859,6 @@ static void test_semaphore(void) NtClose( semaphore ); } @@ -549,7 +549,7 @@ index 1878a480cb8..77370fb5c4a 100644 static void test_process(void) { OBJECT_ATTRIBUTES attr; -@@ -2562,13 +2084,7 @@ START_TEST(om) +@@ -2668,13 +2190,7 @@ START_TEST(om) pNtCreateMailslotFile = (void *)GetProcAddress(hntdll, "NtCreateMailslotFile"); pNtCreateMutant = (void *)GetProcAddress(hntdll, "NtCreateMutant"); pNtOpenEvent = (void *)GetProcAddress(hntdll, "NtOpenEvent"); @@ -563,7 +563,7 @@ index 1878a480cb8..77370fb5c4a 100644 pNtOpenFile = (void *)GetProcAddress(hntdll, "NtOpenFile"); pNtClose = (void *)GetProcAddress(hntdll, "NtClose"); pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); -@@ -2589,15 +2105,9 @@ START_TEST(om) +@@ -2695,15 +2211,9 @@ START_TEST(om) pNtReleaseSemaphore = (void *)GetProcAddress(hntdll, "NtReleaseSemaphore"); pNtCreateKeyedEvent = (void *)GetProcAddress(hntdll, "NtCreateKeyedEvent"); pNtOpenKeyedEvent = (void *)GetProcAddress(hntdll, "NtOpenKeyedEvent"); @@ -578,8 +578,8 @@ index 1878a480cb8..77370fb5c4a 100644 - pRtlWakeAddressSingle = (void *)GetProcAddress(hntdll, "RtlWakeAddressSingle"); pNtOpenProcess = (void *)GetProcAddress(hntdll, "NtOpenProcess"); pNtCreateDebugObject = (void *)GetProcAddress(hntdll, "NtCreateDebugObject"); - -@@ -2609,12 +2119,8 @@ START_TEST(om) + pNtGetNextThread = (void *)GetProcAddress(hntdll, "NtGetNextThread"); +@@ -2716,12 +2226,8 @@ START_TEST(om) test_symboliclink(); test_query_object(); test_type_mismatch(); @@ -591,7 +591,7 @@ index 1878a480cb8..77370fb5c4a 100644 - test_wait_on_address(); test_process(); test_object_types(); - } + test_get_next_thread(); diff --git a/dlls/ntdll/tests/sync.c b/dlls/ntdll/tests/sync.c new file mode 100644 index 00000000000..3f41cdfeedd @@ -1146,5 +1146,5 @@ index 00000000000..3f41cdfeedd + test_keyed_events(); +} -- -2.20.1 +2.30.2 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 833df99e..32881140 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "8f8fa9182af7a2995940a5e17cf074bc849f2c0f" + echo "ca03802a456e7cf4efd834edfeddc483ac72e4b5" } # Show version information diff --git a/staging/upstream-commit b/staging/upstream-commit index 9892c279..13b48efc 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -8f8fa9182af7a2995940a5e17cf074bc849f2c0f +ca03802a456e7cf4efd834edfeddc483ac72e4b5