widl: Consolidate writing of COM and dispatch interfaces into one function to…

widl: Consolidate writing of COM and dispatch interfaces into one function to remove duplicated code. Split up the writing into start and end to eventually support the style MIDL uses where it writes declared types, etc. between the start and end of the interface. Make internal header functions take the file pointer to print to. Don't write interface IDs for non-object interfaces and always write handle declarations even if the interface has no methods, like MIDL does.

widl: Consolidate writing of COM and dispatch interfaces into one function to…
033cade6 · Rob Shearman · Alexandre Julliard · 550aaade · 033cade6 · 033cade6
Commit 033cade6 authored May 01, 2008 by Rob Shearman Committed by Alexandre Julliard May 01, 2008
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

header.c tools/widl/header.c +0 -0

header.h tools/widl/header.h +0 -1

parser.y tools/widl/parser.y +2 -2

No files found.
--- a/tools/widl/header.c
+++ b/tools/widl/header.c
--- a/tools/widl/header.h
+++ b/tools/widl/header.h
@@ -52,7 +52,6 @@ extern void write_array(FILE *h, array_dims_t *v, int field);
 extern void write_import(const char *fname);
 extern void write_forward(type_t *iface);
 extern void write_interface(type_t *iface);
-extern void write_dispinterface(type_t *iface);
 extern void write_locals(FILE *fp, const type_t *iface, int body);
 extern void write_coclass(type_t *cocl);
 extern void write_coclass_forward(type_t *cocl);

--- a/tools/widl/parser.y
+++ b/tools/widl/parser.y
@@ -904,7 +904,7 @@ dispinterfacedef: dispinterfacehdr '{'
 	  '}'					{ $$ = $1;
 						  $$->fields_or_args = $3;
 						  $$->funcs = $4;
-						  if (!parse_only && do_header) write_dispinterface($$);
+						  if (!parse_only && do_header) write_interface($$);
 						  if (!parse_only && do_idfile) write_diid($$);
 						  is_in_interface = FALSE;
 						}
@@ -912,7 +912,7 @@ dispinterfacedef: dispinterfacehdr '{'
 	 '{' interface ';' '}' 			{ $$ = $1;
 						  $$->fields_or_args = $3->fields_or_args;
 						  $$->funcs = $3->funcs;
-						  if (!parse_only && do_header) write_dispinterface($$);
+						  if (!parse_only && do_header) write_interface($$);
 						  if (!parse_only && do_idfile) write_diid($$);
 						  is_in_interface = FALSE;
 						}