mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
kernel-Process: Attempt to fix test failures in kernel32/loader.c.
This commit is contained in:
parent
3029f615d2
commit
be50941de6
@ -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
|
||||
|
@ -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?= <michael@fds-team.de>
|
||||
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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user