From 4fbabc2add38e710ec7bddf2287cc5da85dadf0b Mon Sep 17 00:00:00 2001 From: Akihiro Sagawa Date: Mon, 3 Jul 2017 23:24:33 +0900 Subject: [PATCH] tools: Support multiple error name tokens in a line. Signed-off-by: Akihiro Sagawa Signed-off-by: Alexandre Julliard --- 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 962b1222ba9..7a4b4b25dd6 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 d99793c2a60..3a81f36bbff 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 () { - 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"; }