Rebase against 3d5a2567977455d04e4896368a71db74e7b9074b.

This commit is contained in:
Zebediah Figura
2018-10-31 00:06:39 -05:00
parent b874b3656e
commit 6fc555874b
8 changed files with 71 additions and 72 deletions

View File

@@ -1,22 +1,22 @@
From cf25edc841ba3490113f23f8f5b64ba099f84d8e Mon Sep 17 00:00:00 2001
From 34f55cc1771af01e49322148c89710f965d0197d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 21 Mar 2017 23:12:09 +0100
Subject: ntdll: Implement NtSuspendProcess and NtResumeProcess.
---
dlls/ntdll/process.c | 28 +++++-
dlls/ntdll/process.c | 28 ++++-
dlls/ntdll/tests/Makefile.in | 1 +
dlls/ntdll/tests/process.c | 207 +++++++++++++++++++++++++++++++++++++++++++
server/protocol.def | 12 +++
server/thread.c | 49 ++++++++++
dlls/ntdll/tests/process.c | 207 +++++++++++++++++++++++++++++++++++
server/protocol.def | 12 ++
server/thread.c | 49 +++++++++
5 files changed, 293 insertions(+), 4 deletions(-)
create mode 100644 dlls/ntdll/tests/process.c
diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
index ffc9bff690..ac1dc0a889 100644
index 623bf653..6cd16a42 100644
--- a/dlls/ntdll/process.c
+++ b/dlls/ntdll/process.c
@@ -737,8 +737,18 @@ NTSTATUS WINAPI NtOpenProcess(PHANDLE handle, ACCESS_MASK access,
@@ -763,8 +763,18 @@ NTSTATUS WINAPI NtOpenProcess(PHANDLE handle, ACCESS_MASK access,
*/
NTSTATUS WINAPI NtResumeProcess( HANDLE handle )
{
@@ -37,7 +37,7 @@ index ffc9bff690..ac1dc0a889 100644
}
/******************************************************************************
@@ -747,6 +757,16 @@ NTSTATUS WINAPI NtResumeProcess( HANDLE handle )
@@ -773,8 +783,18 @@ NTSTATUS WINAPI NtResumeProcess( HANDLE handle )
*/
NTSTATUS WINAPI NtSuspendProcess( HANDLE handle )
{
@@ -56,8 +56,10 @@ index ffc9bff690..ac1dc0a889 100644
+
+ return status;
}
diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in
index 0de4fe8f20..c5c519150e 100644
index 5c70f3f0..a1b85883 100644
--- a/dlls/ntdll/tests/Makefile.in
+++ b/dlls/ntdll/tests/Makefile.in
@@ -16,6 +16,7 @@ C_SRCS = \
@@ -70,7 +72,7 @@ index 0de4fe8f20..c5c519150e 100644
rtlbitmap.c \
diff --git a/dlls/ntdll/tests/process.c b/dlls/ntdll/tests/process.c
new file mode 100644
index 0000000000..41303b7e9a
index 00000000..41303b7e
--- /dev/null
+++ b/dlls/ntdll/tests/process.c
@@ -0,0 +1,207 @@
@@ -282,10 +284,10 @@ index 0000000000..41303b7e9a
+ test_NtSuspendProcess(argv[0]);
+}
diff --git a/server/protocol.def b/server/protocol.def
index 04377e16c5..f886d958d8 100644
index 41d8f5a4..2aa76bdc 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -3887,3 +3887,15 @@ struct handle_info
@@ -3864,3 +3864,15 @@ struct handle_info
unsigned int threads; /* number of threads */
unsigned int handles; /* number of handles */
@END
@@ -302,10 +304,10 @@ index 04377e16c5..f886d958d8 100644
+ obj_handle_t handle; /* process handle */
+@END
diff --git a/server/thread.c b/server/thread.c
index 108444ebc5..5b9b80d303 100644
index 7162fc33..8bdfe41d 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -1797,3 +1797,52 @@ DECL_HANDLER(get_selector_entry)
@@ -1824,3 +1824,52 @@ DECL_HANDLER(get_selector_entry)
release_object( thread );
}
}
@@ -359,5 +361,5 @@ index 108444ebc5..5b9b80d303 100644
+ }
+}
--
2.11.0
2.19.1