wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against dd417540bb3afb3aa5a04a007eea9a7ee347655b.

Browse Source
This commit is contained in:
Zebediah Figura
2021-02-04 17:28:33 -06:00
parent cfe1b94e0f
commit a2f82c5c85
45 changed files with 2228 additions and 1319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
patches/ntdll-NtAlertThreadByThreadId/0001-ntdll-tests-Move-some-tests-to-a-new-sync.c-file.patch
View File

@@ -1,13 +1,13 @@
From d6d1a8e33e479f9f7d8bd228efaaa5a9157255ab Mon Sep 17 00:00:00 2001
From 8294521265f2ce0c316ddeadec39c50351239dd1 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Thu, 9 Jan 2020 13:44:01 -0600
Subject: [PATCH] ntdll/tests: Move some tests to a new sync.c file.
---
dlls/ntdll/tests/Makefile.in | 1 +
dlls/ntdll/tests/om.c | 500 +-------------------------------
dlls/ntdll/tests/om.c | 494 -------------------------------
dlls/ntdll/tests/sync.c | 547 +++++++++++++++++++++++++++++++++++
3 files changed, 550 insertions(+), 498 deletions(-)
3 files changed, 548 insertions(+), 494 deletions(-)
create mode 100644 dlls/ntdll/tests/sync.c
diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in
@@ -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 b318c0b2e64..a65c879465c 100644
index 21de385a8bc..245a5ae2d15 100644
--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
@@ -30,10 +30,6 @@
@@ -46,7 +46,7 @@ index b318c0b2e64..a65c879465c 100644
static NTSTATUS (WINAPI *pNtCreateSemaphore)( PHANDLE, ACCESS_MASK,const POBJECT_ATTRIBUTES,LONG,LONG );
static NTSTATUS (WINAPI *pNtOpenSemaphore)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES );
static NTSTATUS (WINAPI *pNtQuerySemaphore)( PHANDLE, SEMAPHORE_INFORMATION_CLASS, PVOID, ULONG, PULONG );
@@ -67,25 +61,17 @@ static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,U
@@ -67,15 +61,9 @@ static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,U
static NTSTATUS (WINAPI *pNtReleaseSemaphore)(HANDLE, ULONG, PULONG);
static NTSTATUS (WINAPI *pNtCreateKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, ULONG );
static NTSTATUS (WINAPI *pNtOpenKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES * );
@@ -61,20 +61,8 @@ index b318c0b2e64..a65c879465c 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 );
static NTSTATUS (WINAPI *pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG);
-#define KEYEDEVENT_WAIT 0x0001
-#define KEYEDEVENT_WAKE 0x0002
-#define KEYEDEVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x0003)
-
#define ROUND_UP(value, alignment) (((value) + ((alignment) - 1)) & ~((alignment)-1))
+#define KEYEDEVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x0003)
+
static LPCSTR wine_dbgstr_us( const UNICODE_STRING *us )
{
if (!us) return "(null)";
@@ -1783,286 +1769,6 @@ static void test_type_mismatch(void)
@@ -1665,286 +1653,6 @@ static void test_type_mismatch(void)
pNtClose( h );
}
@@ -361,7 +349,7 @@ index b318c0b2e64..a65c879465c 100644
static void test_null_device(void)
{
OBJECT_ATTRIBUTES attr;
@@ -2136,119 +1842,6 @@ static void test_null_device(void)
@@ -2018,119 +1726,6 @@ static void test_null_device(void)
CloseHandle(ov.hEvent);
}
@@ -481,7 +469,7 @@ index b318c0b2e64..a65c879465c 100644
static void test_semaphore(void)
{
SEMAPHORE_BASIC_INFORMATION info;
@@ -2325,79 +1918,6 @@ static void test_semaphore(void)
@@ -2207,79 +1802,6 @@ static void test_semaphore(void)
NtClose( semaphore );
}
@@ -561,7 +549,7 @@ index b318c0b2e64..a65c879465c 100644
static void test_process(void)
{
OBJECT_ATTRIBUTES attr;
@@ -2461,13 +1981,7 @@ START_TEST(om)
@@ -2343,13 +1865,7 @@ START_TEST(om)
pNtCreateMailslotFile = (void *)GetProcAddress(hntdll, "NtCreateMailslotFile");
pNtCreateMutant = (void *)GetProcAddress(hntdll, "NtCreateMutant");
pNtOpenEvent = (void *)GetProcAddress(hntdll, "NtOpenEvent");
@@ -575,7 +563,7 @@ index b318c0b2e64..a65c879465c 100644
pNtOpenFile = (void *)GetProcAddress(hntdll, "NtOpenFile");
pNtClose = (void *)GetProcAddress(hntdll, "NtClose");
pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString");
@@ -2488,15 +2002,9 @@ START_TEST(om)
@@ -2370,15 +1886,9 @@ START_TEST(om)
pNtReleaseSemaphore = (void *)GetProcAddress(hntdll, "NtReleaseSemaphore");
pNtCreateKeyedEvent = (void *)GetProcAddress(hntdll, "NtCreateKeyedEvent");
pNtOpenKeyedEvent = (void *)GetProcAddress(hntdll, "NtOpenKeyedEvent");
@@ -590,10 +578,10 @@ index b318c0b2e64..a65c879465c 100644
- pRtlWakeAddressSingle = (void *)GetProcAddress(hntdll, "RtlWakeAddressSingle");
pNtOpenProcess = (void *)GetProcAddress(hntdll, "NtOpenProcess");
pNtCreateDebugObject = (void *)GetProcAddress(hntdll, "NtCreateDebugObject");
pNtQuerySystemInformation = (void *)GetProcAddress(hntdll, "NtQuerySystemInformation");
@@ -2510,11 +2018,7 @@ START_TEST(om)
@@ -2390,11 +1900,7 @@ START_TEST(om)
test_symboliclink();
test_query_object();
test_query_object_types();
test_type_mismatch();
- test_event();
- test_mutant();
@@ -1157,5 +1145,5 @@ index 00000000000..3f41cdfeedd
+ test_keyed_events();
+}
--
2.29.2
2.20.1

2
patches/ntdll-NtAlertThreadByThreadId/definition
View File

@@ -1,2 +1,2 @@
Fixes: [50292] Process-local synchronization objects use private interfaces into the Unix library
Depends: server-Object_Types
#Depends: server-Object_Types