Module: wine Branch: master Commit: 4be47ac4a36a3a52e4a35516706509d9472fb020 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4be47ac4a36a3a52e4a355167...
Author: Eric Pouech eric.pouech@gmail.com Date: Mon Dec 6 15:55:28 2021 +0100
examine-relay: DLLs can have underscore in their names (like ws2_32).
Signed-off-by: Eric Pouech eric.pouech@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
tools/examine-relay | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/examine-relay b/tools/examine-relay index d82110c570a..48782e4728d 100755 --- a/tools/examine-relay +++ b/tools/examine-relay @@ -44,7 +44,7 @@ LINE: while (<IN>) {
- if (/^([0-9a-f]+):Call ([A-Za-z0-9]+.[A-Za-z0-9_.]+)((.*)) .*/) { + if (/^([0-9a-f]+):Call ([A-Za-z0-9_]+.[A-Za-z0-9_.]+)((.*)) .*/) { my $tid = $1; my $func = $2; if (defined $fullformat) { @@ -96,10 +96,10 @@ while (<IN>) { push @{$tid_callstack{$tid}}, [$func, $retaddr, $segreg]; }
- elsif (/^([0-9a-f]+):Ret ([A-Za-z0-9]+.[A-Za-z0-9_.]+)(.*) .* ret=(........)$/ || - /^([0-9a-f]+):Ret ([A-Za-z0-9]+.[A-Za-z0-9_.]+)(.*) .* ret=(....:....) (ds=....)$/ || - /^([0-9a-f]+):Ret ([A-Za-z0-9]+.[A-Za-z0-9_.]+)(.*) .* ret=(........) fs=....$/ || - /^([0-9a-f]+):RET ([A-Za-z0-9]+.[A-Za-z0-9_.]+: [A-Za-z0-9]+)(.*) .* ret=(........)$/ || + elsif (/^([0-9a-f]+):Ret ([A-Za-z0-9_]+.[A-Za-z0-9_.]+)(.*) .* ret=(........)$/ || + /^([0-9a-f]+):Ret ([A-Za-z0-9_]+.[A-Za-z0-9_.]+)(.*) .* ret=(....:....) (ds=....)$/ || + /^([0-9a-f]+):Ret ([A-Za-z0-9_]+.[A-Za-z0-9_.]+)(.*) .* ret=(........) fs=....$/ || + /^([0-9a-f]+):RET ([A-Za-z0-9_]+.[A-Za-z0-9_.]+: [A-Za-z0-9]+)(.*) .* ret=(........)$/ || /^([0-9a-f]+):Ret (window proc) ([0-9a-fx]+) .*/) { my $tid = $1; my $func = $2;