Modified: trunk/reactos/tools/widl/ChangeLog
Modified: trunk/reactos/tools/widl/client.c
Modified: trunk/reactos/tools/widl/header.c
Modified: trunk/reactos/tools/widl/server.c
Modified: trunk/reactos/tools/widl/widl.c
Modified: trunk/reactos/tools/widl/widl.h
--- trunk/reactos/tools/widl/ChangeLog 2005-03-10 19:56:46 UTC (rev 13915)
+++ trunk/reactos/tools/widl/ChangeLog 2005-03-10 20:07:17 UTC (rev 13916)
@@ -1,5 +1,16 @@
ChangeLog
+2005-03-10 ekohl
+
+ tools/widl/client.c
+ tools/widl/header.c
+ tools/widl/server.c
+ tools/widl/widl.c
+ tools/widl/widl.h
+
+Implement '-o' option. This is equivalent to MIDLs '/oldnames' option.
+
+
2005-03-06 ekohl
tools/widl/client.c
@@ -20,13 +31,13 @@
tools/widl/typelib.c
Merge in Winehq changes to reduce noise.
-
+
tools/widl/server.h
tools/widl/client.h
tools/widl/proxy.h
-Deleted unneeded headers.
-
+Deleted unneeded headers.
+
2005-02-26 ekohl
tools/widl/server.c
--- trunk/reactos/tools/widl/client.c 2005-03-10 19:56:46 UTC (rev 13915)
+++ trunk/reactos/tools/widl/client.c 2005-03-10 20:07:17 UTC (rev 13916)
@@ -672,8 +672,12 @@
print_client("0,\n");
indent--;
print_client("};\n");
- print_client("RPC_IF_HANDLE %s_v%d_%d_c_ifspec = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n",
- iface->name, LOWORD(ver), HIWORD(ver), iface->name);
+ if (old_names)
+ print_client("RPC_IF_HANDLE %s_ClientIfHandle = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n",
+ iface->name, iface->name);
+ else
+ print_client("RPC_IF_HANDLE %s_v%d_%d_c_ifspec = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n",
+ iface->name, LOWORD(ver), HIWORD(ver), iface->name);
fprintf(client, "\n");
}
--- trunk/reactos/tools/widl/header.c 2005-03-10 19:56:46 UTC (rev 13915)
+++ trunk/reactos/tools/widl/header.c 2005-03-10 20:07:17 UTC (rev 13916)
@@ -851,8 +851,16 @@
{
fprintf(header, "extern handle_t %s;\n", var);
}
- fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_c_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver));
- fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_s_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver));
+ if (old_names)
+ {
+ fprintf(header, "extern RPC_IF_HANDLE %s_ClientIfHandle;\n", iface->name);
+ fprintf(header, "extern RPC_IF_HANDLE %s_ServerIfHandle;\n", iface->name);
+ }
+ else
+ {
+ fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_c_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver));
+ fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_s_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver));
+ }
write_function_proto(iface);
fprintf(header, "\n");
--- trunk/reactos/tools/widl/server.c 2005-03-10 19:56:46 UTC (rev 13915)
+++ trunk/reactos/tools/widl/server.c 2005-03-10 20:07:17 UTC (rev 13916)
@@ -677,8 +677,12 @@
print_server("0,\n");
indent--;
print_server("};\n");
- print_server("RPC_IF_HANDLE %s_v%d_%d_s_ifspec = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n",
- iface->name, LOWORD(ver), HIWORD(ver), iface->name);
+ if (old_names)
+ print_server("RPC_IF_HANDLE %s_ServerIfHandle = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n",
+ iface->name, iface->name);
+ else
+ print_server("RPC_IF_HANDLE %s_v%d_%d_s_ifspec = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n",
+ iface->name, LOWORD(ver), HIWORD(ver), iface->name);
fprintf(server, "\n");
}
--- trunk/reactos/tools/widl/widl.c 2005-03-10 19:56:46 UTC (rev 13915)
+++ trunk/reactos/tools/widl/widl.c 2005-03-10 20:07:17 UTC (rev 13916)
@@ -58,6 +58,7 @@
" -H file Name of header file (default is infile.h)\n"
" -I path Set include search dir to path (multiple -I allowed)\n"
" -N Do not preprocess input\n"
+" -o Use old naming conventions\n"
" -p Generate proxy\n"
" -P file Name of proxy file (default is infile_p.c)\n"
" -s Generate server stub\n"
@@ -90,6 +91,7 @@
int do_client = 0;
int do_server = 0;
int no_preprocess = 0;
+int old_names = 0;
char *input_name;
char *header_name;
@@ -142,8 +144,8 @@
now = time(NULL);
- while((optc = getopt(argc, argv, "cC:d:D:EhH:I:NpP:sS:tT:VW")) != EOF) {
- switch(optc) {
+ while((optc = getopt(argc, argv, "cC:d:D:EhH:I:NopP:sS:tT:VW")) != EOF) {
+ switch (optc) {
case 'c':
do_everything = 0;
do_client = 1;
@@ -174,6 +176,9 @@
case 'N':
no_preprocess = 1;
break;
+ case 'o':
+ old_names = 1;
+ break;
case 'p':
do_everything = 0;
do_proxies = 1;
@@ -207,10 +212,10 @@
}
}
- if(do_everything) {
+ if (do_everything) {
do_header = do_typelib = do_proxies = do_client = do_server = 1;
}
- if(optind < argc) {
+ if (optind < argc) {
input_name = xstrdup(argv[optind]);
}
else {
@@ -218,7 +223,7 @@
return 1;
}
- if(debuglevel)
+ if (debuglevel)
{
setbuf(stdout,0);
setbuf(stderr,0);
--- trunk/reactos/tools/widl/widl.h 2005-03-10 19:56:46 UTC (rev 13915)
+++ trunk/reactos/tools/widl/widl.h 2005-03-10 20:07:17 UTC (rev 13916)
@@ -43,6 +43,7 @@
extern int do_proxies;
extern int do_client;
extern int do_server;
+extern int old_names;
extern char *input_name;
extern char *header_name;