mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against 14f03e84d46dbd94ae2e3711687420f816dc784f.
This commit is contained in:
Alistair Leslie-Hughes
parent
163f74fe61
commit
fcf7b80107
@ -1,4 +1,4 @@
|
||||
From 9d8e065b5e001715aa96cfee3fb9fcd89cc77674 Mon Sep 17 00:00:00 2001
|
||||
From 68c31664972be60b93397bf7d8a9cfab11baf046 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.
|
||||
@ -6,9 +6,9 @@ Subject: [PATCH] ntdll/tests: Move some tests to a new sync.c file.
|
||||
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
|
||||
---
|
||||
dlls/ntdll/tests/Makefile.in | 1 +
|
||||
dlls/ntdll/tests/om.c | 573 -------------------------------
|
||||
dlls/ntdll/tests/om.c | 574 -------------------------------
|
||||
dlls/ntdll/tests/sync.c | 630 +++++++++++++++++++++++++++++++++++
|
||||
3 files changed, 631 insertions(+), 573 deletions(-)
|
||||
3 files changed, 631 insertions(+), 574 deletions(-)
|
||||
create mode 100644 dlls/ntdll/tests/sync.c
|
||||
|
||||
diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in
|
||||
@ -24,7 +24,7 @@ index 7ad39e0992c..8c6a86fb965 100644
|
||||
time.c \
|
||||
virtual.c \
|
||||
diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c
|
||||
index 82f8188d176..9a9536f4639 100644
|
||||
index 81be7de00f6..9a9536f4639 100644
|
||||
--- a/dlls/ntdll/tests/om.c
|
||||
+++ b/dlls/ntdll/tests/om.c
|
||||
@@ -30,10 +30,6 @@
|
||||
@ -353,7 +353,7 @@ index 82f8188d176..9a9536f4639 100644
|
||||
static void test_null_device(void)
|
||||
{
|
||||
OBJECT_ATTRIBUTES attr;
|
||||
@@ -2075,268 +1782,6 @@ static void test_null_device(void)
|
||||
@@ -2075,269 +1782,6 @@ static void test_null_device(void)
|
||||
CloseHandle(ov.hEvent);
|
||||
}
|
||||
|
||||
@ -548,10 +548,10 @@ index 82f8188d176..9a9536f4639 100644
|
||||
-
|
||||
-static void test_wait_on_address(void)
|
||||
-{
|
||||
- DWORD ticks;
|
||||
- SIZE_T size;
|
||||
- NTSTATUS status;
|
||||
- LARGE_INTEGER timeout;
|
||||
- LARGE_INTEGER start, end, timeout;
|
||||
- DWORD elapsed;
|
||||
- LONG64 address, compare;
|
||||
-
|
||||
- if (!pRtlWaitOnAddress)
|
||||
@ -580,13 +580,13 @@ index 82f8188d176..9a9536f4639 100644
|
||||
- /* values match */
|
||||
- address = 0;
|
||||
- compare = 0;
|
||||
- pNtQuerySystemTime(&timeout);
|
||||
- timeout.QuadPart += 100*10000;
|
||||
- ticks = GetTickCount();
|
||||
- pNtQuerySystemTime(&start);
|
||||
- timeout.QuadPart = start.QuadPart + 100 * 10000;
|
||||
- status = pRtlWaitOnAddress(&address, &compare, 8, &timeout);
|
||||
- ticks = GetTickCount() - ticks;
|
||||
- pNtQuerySystemTime(&end);
|
||||
- ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status);
|
||||
- ok(ticks >= 80 && ticks <= 1000, "got %u\n", ticks);
|
||||
- elapsed = (end.QuadPart - start.QuadPart) / 10000;
|
||||
- ok(90 <= elapsed && elapsed <= 900, "timed out in %u ms\n", elapsed);
|
||||
- ok(address == 0, "got %s\n", wine_dbgstr_longlong(address));
|
||||
- ok(compare == 0, "got %s\n", wine_dbgstr_longlong(compare));
|
||||
-
|
||||
@ -596,12 +596,13 @@ index 82f8188d176..9a9536f4639 100644
|
||||
- compare = ~0;
|
||||
- compare <<= size * 8;
|
||||
-
|
||||
- pNtQuerySystemTime(&start);
|
||||
- timeout.QuadPart = -100 * 10000;
|
||||
- ticks = GetTickCount();
|
||||
- status = pRtlWaitOnAddress(&address, &compare, size, &timeout);
|
||||
- ticks = GetTickCount() - ticks;
|
||||
- pNtQuerySystemTime(&end);
|
||||
- ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status);
|
||||
- ok(ticks >= 80 && ticks <= 1000, "got %u\n", ticks);
|
||||
- elapsed = (end.QuadPart - start.QuadPart) / 10000;
|
||||
- ok(90 <= elapsed && elapsed <= 900, "timed out in %u ms\n", elapsed);
|
||||
-
|
||||
- status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout);
|
||||
- ok(!status, "got 0x%08x\n", status);
|
||||
@ -622,7 +623,7 @@ index 82f8188d176..9a9536f4639 100644
|
||||
static void test_process(void)
|
||||
{
|
||||
OBJECT_ATTRIBUTES attr;
|
||||
@@ -2668,13 +2113,7 @@ START_TEST(om)
|
||||
@@ -2669,13 +2113,7 @@ START_TEST(om)
|
||||
pNtCreateMailslotFile = (void *)GetProcAddress(hntdll, "NtCreateMailslotFile");
|
||||
pNtCreateMutant = (void *)GetProcAddress(hntdll, "NtCreateMutant");
|
||||
pNtOpenEvent = (void *)GetProcAddress(hntdll, "NtOpenEvent");
|
||||
@ -636,7 +637,7 @@ index 82f8188d176..9a9536f4639 100644
|
||||
pNtOpenFile = (void *)GetProcAddress(hntdll, "NtOpenFile");
|
||||
pNtClose = (void *)GetProcAddress(hntdll, "NtClose");
|
||||
pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString");
|
||||
@@ -2686,7 +2125,6 @@ START_TEST(om)
|
||||
@@ -2687,7 +2125,6 @@ START_TEST(om)
|
||||
pNtQuerySymbolicLinkObject = (void *)GetProcAddress(hntdll, "NtQuerySymbolicLinkObject");
|
||||
pNtCreateSemaphore = (void *)GetProcAddress(hntdll, "NtCreateSemaphore");
|
||||
pNtOpenSemaphore = (void *)GetProcAddress(hntdll, "NtOpenSemaphore");
|
||||
@ -644,7 +645,7 @@ index 82f8188d176..9a9536f4639 100644
|
||||
pNtCreateTimer = (void *)GetProcAddress(hntdll, "NtCreateTimer");
|
||||
pNtOpenTimer = (void *)GetProcAddress(hntdll, "NtOpenTimer");
|
||||
pNtCreateSection = (void *)GetProcAddress(hntdll, "NtCreateSection");
|
||||
@@ -2695,15 +2133,9 @@ START_TEST(om)
|
||||
@@ -2696,15 +2133,9 @@ START_TEST(om)
|
||||
pNtReleaseSemaphore = (void *)GetProcAddress(hntdll, "NtReleaseSemaphore");
|
||||
pNtCreateKeyedEvent = (void *)GetProcAddress(hntdll, "NtCreateKeyedEvent");
|
||||
pNtOpenKeyedEvent = (void *)GetProcAddress(hntdll, "NtOpenKeyedEvent");
|
||||
@ -660,7 +661,7 @@ index 82f8188d176..9a9536f4639 100644
|
||||
pNtOpenProcess = (void *)GetProcAddress(hntdll, "NtOpenProcess");
|
||||
pNtCreateDebugObject = (void *)GetProcAddress(hntdll, "NtCreateDebugObject");
|
||||
pNtGetNextThread = (void *)GetProcAddress(hntdll, "NtGetNextThread");
|
||||
@@ -2716,12 +2148,7 @@ START_TEST(om)
|
||||
@@ -2717,12 +2148,7 @@ START_TEST(om)
|
||||
test_symboliclink();
|
||||
test_query_object();
|
||||
test_type_mismatch();
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From fd8bfe5f17e0c95cdaf5125f4f4a18ad7b06cfd8 Mon Sep 17 00:00:00 2001
|
||||
From 601db6caf92a018e469a714085c7a573c7cd8fa1 Mon Sep 17 00:00:00 2001
|
||||
From: Zebediah Figura <z.figura12@gmail.com>
|
||||
Date: Mon, 31 Aug 2020 23:30:52 -0500
|
||||
Subject: [PATCH] ntdll: Merge critsection.c into sync.c.
|
||||
@ -12,7 +12,7 @@ Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
|
||||
delete mode 100644 dlls/ntdll/critsection.c
|
||||
|
||||
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
|
||||
index 0fdfb83df15..2e79843890d 100644
|
||||
index 881a3b28ff1..841e1a4a943 100644
|
||||
--- a/dlls/ntdll/Makefile.in
|
||||
+++ b/dlls/ntdll/Makefile.in
|
||||
@@ -9,7 +9,6 @@ EXTRADLLFLAGS = -mno-cygwin -nodefaultlibs -Wl,--image-base,0x7bc00000
|
||||
@ -22,7 +22,7 @@ index 0fdfb83df15..2e79843890d 100644
|
||||
- critsection.c \
|
||||
crypt.c \
|
||||
debugbuffer.c \
|
||||
directory.c \
|
||||
env.c \
|
||||
diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c
|
||||
deleted file mode 100644
|
||||
index fe7d933c0fa..00000000000
|
||||
|
||||
@ -51,7 +51,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "12d33d21d33788fd46898ea42e9592d33b6e7c8e"
|
||||
echo "14f03e84d46dbd94ae2e3711687420f816dc784f"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
|
||||
@ -1 +1 @@
|
||||
52ba1b498a9694daf804c9aea99c788bb4e753a3
|
||||
14f03e84d46dbd94ae2e3711687420f816dc784f
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user