From be50941de6b867ecd51a8a175802e6d2e209c9ce Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 22 Aug 2014 13:57:51 +0200 Subject: [PATCH] kernel-Process: Attempt to fix test failures in kernel32/loader.c. --- patches/Makefile | 4 ++-- ...Return-error-when-opening-a-terminating-proce.patch | 10 +++++----- patches/server-Process/definition | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/patches/Makefile b/patches/Makefile index cda4abc6..1ff5190b 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -686,7 +686,7 @@ server-Misc_ACL.ok: # Patchset server-Process # | # | Included patches: -# | * Return error when opening a terminating process. [by Michael Müller] +# | * Return error when opening a terminating process. [rev 2, by Michael Müller] # | # | This patchset fixes the following Wine bugs: # | * [#37087] Gothic 2 demo expects an error when opening a terminating process @@ -698,7 +698,7 @@ server-Misc_ACL.ok: server-Process.ok: $(call APPLY_FILE,server-Process/0001-server-Return-error-when-opening-a-terminating-proce.patch) @( \ - echo '+ { "server-Process", "Michael Müller", "Return error when opening a terminating process." },'; \ + echo '+ { "server-Process", "Michael Müller", "Return error when opening a terminating process. [rev 2]" },'; \ ) > server-Process.ok # Patchset server-Stored_ACLs diff --git a/patches/server-Process/0001-server-Return-error-when-opening-a-terminating-proce.patch b/patches/server-Process/0001-server-Return-error-when-opening-a-terminating-proce.patch index a573cdfe..48ad1bea 100644 --- a/patches/server-Process/0001-server-Return-error-when-opening-a-terminating-proce.patch +++ b/patches/server-Process/0001-server-Return-error-when-opening-a-terminating-proce.patch @@ -1,14 +1,14 @@ -From dd42b1c92e5e72953da216a12e2d244178633089 Mon Sep 17 00:00:00 2001 +From 4f041a785404f778e34d5ecbf1249ca79704a89d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 14 Aug 2014 03:05:52 +0200 Subject: server: Return error when opening a terminating process. --- - server/process.c | 5 ++++- + server/process.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c -index 7b9a3b2..7935373 100644 +index 7b9a3b2..1012a8e 100644 --- a/server/process.c +++ b/server/process.c @@ -1082,7 +1082,10 @@ DECL_HANDLER(open_process) @@ -16,7 +16,7 @@ index 7b9a3b2..7935373 100644 if (process) { - reply->handle = alloc_handle( current->process, process, req->access, req->attributes ); -+ if (!process->is_terminating) ++ if (process->startup_state != STARTUP_ABORTED) + reply->handle = alloc_handle( current->process, process, req->access, req->attributes ); + else + set_error( STATUS_INVALID_PARAMETER ); @@ -24,5 +24,5 @@ index 7b9a3b2..7935373 100644 } } -- -1.9.1 +1.7.9.5 diff --git a/patches/server-Process/definition b/patches/server-Process/definition index deb23d35..1a973982 100644 --- a/patches/server-Process/definition +++ b/patches/server-Process/definition @@ -1,4 +1,4 @@ Author: Michael Müller Subject: Return error when opening a terminating process. -Revision: 1 +Revision: 2 Fixes: [37087] Gothic 2 demo expects an error when opening a terminating process