Akihiro Sagawa : tools: Support multiple error name tokens in a line.
Alexandre Julliard
julliard at winehq.org
Mon Jul 3 15:56:47 CDT 2017
Module: wine
Branch: master
Commit: 4fbabc2add38e710ec7bddf2287cc5da85dadf0b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fbabc2add38e710ec7bddf2287cc5da85dadf0b
Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date: Mon Jul 3 23:24:33 2017 +0900
tools: Support multiple error name tokens in a line.
Signed-off-by: Akihiro Sagawa <sagawa.aki at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
server/trace.c | 1 +
tools/make_requests | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/trace.c b/server/trace.c
index 962b122..7a4b4b2 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -5429,6 +5429,7 @@ static const struct
{ "PRIVILEGE_NOT_HELD", STATUS_PRIVILEGE_NOT_HELD },
{ "PROCESS_IN_JOB", STATUS_PROCESS_IN_JOB },
{ "PROCESS_IS_TERMINATING", STATUS_PROCESS_IS_TERMINATING },
+ { "PROCESS_NOT_IN_JOB", STATUS_PROCESS_NOT_IN_JOB },
{ "SECTION_TOO_BIG", STATUS_SECTION_TOO_BIG },
{ "SEMAPHORE_LIMIT_EXCEEDED", STATUS_SEMAPHORE_LIMIT_EXCEEDED },
{ "SHARING_VIOLATION", STATUS_SHARING_VIOLATION },
diff --git a/tools/make_requests b/tools/make_requests
index d99793c..3a81f36 100755
--- a/tools/make_requests
+++ b/tools/make_requests
@@ -290,11 +290,11 @@ sub GET_ERROR_NAMES()
open FILE, $f or die "Can't open $f";
while (<FILE>)
{
- if (/STATUS_(\w+)/)
+ while (/\bSTATUS_(\w+)/g)
{
$errors{$1} = "STATUS_$1" unless ($1 eq "SUCCESS" || $1 eq "WAIT_0");
}
- elsif (/set_win32_error\s*\(\s*(\w+)\s*\)/)
+ while (/\bset_win32_error\s*\(\s*(\w+)\s*\)/g)
{
$errors{$1} = "0xc0010000 | $1";
}
More information about the wine-cvs
mailing list