Eric Pouech : dbghelp: When using a regular expression on a file name, interpret '*' as any string (.* in regexp form).

Alexandre Julliard julliard at winehq.org
Tue Mar 8 11:03:51 CST 2011


Module: wine
Branch: master
Commit: 2d570921dc37a9cec36a9a1bf4e71205bf199c91
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2d570921dc37a9cec36a9a1bf4e71205bf199c91

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Mon Mar  7 22:41:02 2011 +0100

dbghelp: When using a regular expression on a file name, interpret '*' as any string (.* in regexp form).

---

 dlls/dbghelp/symbol.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c
index 07e62e2..78b0b2c 100644
--- a/dlls/dbghelp/symbol.c
+++ b/dlls/dbghelp/symbol.c
@@ -220,6 +220,10 @@ static BOOL compile_file_regex(regex_t* re, const char* srcfile)
             *p++ = '\\';
             *p++ = '.';
             break;
+        case '*':
+            *p++ = '.';
+            *p++ = '*';
+            break;
         default:
             *p++ = *srcfile;
             break;
@@ -2029,8 +2033,8 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland,
             if (dli->is_source_file)
             {
                 file = source_get(pair.effective, dli->u.source_file);
-                if (!match_regexp(&re, file)) file = "";
-                strcpy(sci.FileName, file);
+                if (!match_regexp(&re, file)) sci.FileName[0] = '\0';
+                else strcpy(sci.FileName, file);
             }
             else if (sci.FileName[0])
             {




More information about the wine-cvs mailing list