Alexandre Julliard : widl: If possible, use the interface name as prefix for the expr eval functions.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun 13 23:59:04 2011 +0200

widl: If possible, use the interface name as prefix for the expr eval functions.

---

 tools/widl/typegen.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c
index e6de531..81c511d 100644
--- a/tools/widl/typegen.c
+++ b/tools/widl/typegen.c
@@ -4727,7 +4727,7 @@ int write_expr_eval_routines(FILE *file, const char *iface)
         result = 1;
 
         print_file(file, 0, "static void __RPC_USER %s_%sExprEval_%04u(PMIDL_STUB_MESSAGE pStubMsg)\n",
-                   iface, name, callback_offset);
+                   eval->iface ? eval->iface->name : iface, name, callback_offset);
         print_file(file, 0, "{\n");
         if (type_get_type( eval->cont_type ) == TYPE_FUNCTION)
         {
@@ -4763,7 +4763,8 @@ void write_expr_eval_routine_list(FILE *file, const char *iface)
 
     LIST_FOR_EACH_ENTRY_SAFE(eval, cursor, &expr_eval_routines, struct expr_eval_routine, entry)
     {
-        print_file(file, 1, "%s_%sExprEval_%04u,\n", iface, eval->name, callback_offset);
+        print_file(file, 1, "%s_%sExprEval_%04u,\n",
+                   eval->iface ? eval->iface->name : iface, eval->name, callback_offset);
         callback_offset++;
         list_remove(&eval->entry);
         free(eval->name);