relay trace analysis fix

[Eric Pouech]

this patch fixes the analysis of relay traces for VxD output
A+
-------------- next part --------------
This patched is released under the X11 license.

Name: exm_relay
ChangeLog: fixed VxD call tracing
GenDate: 2002/03/22 19:34:03 UTC
ModifiedFiles: tools/examine-relay
AddedFiles: 
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/tools/examine-relay,v
retrieving revision 1.4
diff -u -w -u -r1.4 examine-relay
--- tools/examine-relay	10 Mar 2002 00:24:22 -0000	1.4
+++ tools/examine-relay	17 Mar 2002 12:11:08 -0000
@@ -44,7 +44,8 @@
 
 #	print "have call func=$func <$_>\n";
 	if (/ ret=(........)$/ ||
-	    / ret=(....:....) (ds=....)$/) {
+	    / ret=(....:....) (ds=....)$/ ||
+	    / ret=(........) fs=....$/) {
 	    my $retaddr = $1;
 	    my $segreg = $2;
 
@@ -56,7 +57,7 @@
 	    # Assume a line got cut by a line feed in a string.
 	    $_ .= scalar (<IN>);
 	    if (!$newlineerror) {
-		print "Err[$tid] string probably cut by newline.\n";
+		print "Err[$tid] string probably cut by newline at line $. .\n";
 		$newlineerror = 1;
 	    }	    
 	    # print "[$_]";
@@ -66,6 +67,7 @@
 
     if (/^([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=(........)$/) {
 	my $tid = $1;
 	my $func = $2;