Alexandre Julliard : widl: Avoid dependency on COBJMACROS in generated code .

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Fri Jan 26 12:09:14 2007 +0100

widl: Avoid dependency on COBJMACROS in generated code.

---

 tools/widl/proxy.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c
index c5a0532..f3a32fb 100644
--- a/tools/widl/proxy.c
+++ b/tools/widl/proxy.c
@@ -401,9 +401,12 @@ static void gen_stub(type_t *iface, cons
   fprintf(proxy, "\n");
   print_proxy("");
   if (has_ret) fprintf(proxy, "_RetVal = ");
-  fprintf(proxy, "%s_", iface->name);
-  if (cas) fprintf(proxy, "%s_Stub", cas);
-  else write_name(proxy, def);
+  if (cas) fprintf(proxy, "%s_%s_Stub", iface->name, cas);
+  else
+  {
+      fprintf(proxy, "_This->lpVtbl->");
+      write_name(proxy, def);
+  }
   fprintf(proxy, "(_This");
 
   if (cur->args)