Rob Shearman : widl: Don' t search for a import file name with a path in the include directories for compatibility with MIDL .

Alexandre Julliard julliard at winehq.org
Mon Feb 4 08:42:54 CST 2008


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

Author: Rob Shearman <rob at codeweavers.com>
Date:   Wed Jan 30 22:29:23 2008 +0000

widl: Don't search for a import file name with a path in the include directories for compatibility with MIDL.

---

 tools/widl/parser.l |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/tools/widl/parser.l b/tools/widl/parser.l
index 98f17af..2497a5e 100644
--- a/tools/widl/parser.l
+++ b/tools/widl/parser.l
@@ -414,7 +414,11 @@ int do_import(char *fname)
 	import->next = first_import;
 	first_import = import;
 
-        if (!(path = wpp_find_include( fname, input_name )))
+        /* don't search for a file name with a path in the include directories,
+         * for compatibility with MIDL */
+        if (strchr( fname, '/' ) || strchr( fname, '\\' ))
+            path = strdup( fname );
+        else if (!(path = wpp_find_include( fname, input_name )))
             error_loc("Unable to open include file %s\n", fname);
 
 	import_stack[ptr].temp_name = temp_name;




More information about the wine-cvs mailing list