Modified: trunk/reactos/include/idl/idl.xml
Modified: trunk/reactos/tools/widl/ChangeLog
Modified: trunk/reactos/tools/widl/widl.c
Modified: trunk/reactos/tools/widl/widl.man
--- trunk/reactos/include/idl/idl.xml 2005-12-05 22:06:58 UTC (rev 19920)
+++ trunk/reactos/include/idl/idl.xml 2005-12-05 22:12:42 UTC (rev 19921)
@@ -15,24 +15,24 @@
<include base="ReactOS">.</include>
<include base="ReactOS">w32api/include</include>
<define name="_X86_" />
- <file switches="-o">svcctl.idl</file>
+ <file switches="--oldnames">svcctl.idl</file>
</module>
<module name="scm_client" type="rpcclient">
<include base="ReactOS">.</include>
<include base="ReactOS">w32api/include</include>
<define name="_X86_" />
- <file switches="-o">svcctl.idl</file>
+ <file switches="--oldnames">svcctl.idl</file>
</module>
<module name="eventlog_server" type="rpcserver">
<include base="ReactOS">.</include>
<include base="ReactOS">w32api/include</include>
<define name="_X86_" />
- <file switches="-o">eventlogrpc.idl</file>
+ <file switches="--oldnames">eventlogrpc.idl</file>
</module>
<module name="eventlog_client" type="rpcclient">
<include base="ReactOS">.</include>
<include base="ReactOS">w32api/include</include>
<define name="_X86_" />
- <file switches="-o">eventlogrpc.idl</file>
+ <file switches="--oldnames">eventlogrpc.idl</file>
</module>
</group>
--- trunk/reactos/tools/widl/ChangeLog 2005-12-05 22:06:58 UTC (rev 19920)
+++ trunk/reactos/tools/widl/ChangeLog 2005-12-05 22:12:42 UTC (rev 19921)
@@ -1,5 +1,12 @@
ChangeLog
+2005-12-05 ekohl
+
+ tools/widl/widl.c
+ tools/widl/widl.man
+
+- Change oldnames option from '-o' to '--oldnames'.
+
2005-11-26 ekohl
tools/widl/client.c
--- trunk/reactos/tools/widl/widl.c 2005-12-05 22:06:58 UTC (rev 19920)
+++ trunk/reactos/tools/widl/widl.c 2005-12-05 22:12:42 UTC (rev 19921)
@@ -30,6 +30,9 @@
#include <assert.h>
#include <ctype.h>
#include <signal.h>
+#ifdef HAVE_GETOPT_H
+# include <getopt.h>
+#endif
#define WIDL_FULLVERSION "0.1"
@@ -58,7 +61,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"
+" --oldnames 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"
@@ -116,6 +119,15 @@
static void rm_tempfile(void);
static void segvhandler(int sig);
+static const char* short_options =
+ "cC:d:D:EhH:I:NpP:sS:tT:VW";
+
+static struct option long_options[] = {
+ {"oldnames", 0, 0, 1},
+ { 0, 0, 0, 0 }
+};
+
+
static char *make_token(const char *name)
{
char *token;
@@ -139,13 +151,17 @@
extern int optind;
int optc;
int ret = 0;
+ int opti = 0;
signal(SIGSEGV, segvhandler);
now = time(NULL);
- while((optc = getopt(argc, argv, "cC:d:D:EhH:I:NopP:sS:tT:VW")) != EOF) {
+ while((optc = getopt_long(argc, argv, short_options, long_options, &opti)) != EOF) {
switch (optc) {
+ case 1:
+ old_names = 1;
+ break;
case 'c':
do_everything = 0;
do_client = 1;
@@ -176,9 +192,6 @@
case 'N':
no_preprocess = 1;
break;
- case 'o':
- old_names = 1;
- break;
case 'p':
do_everything = 0;
do_proxies = 1;
--- trunk/reactos/tools/widl/widl.man 2005-12-05 22:06:58 UTC (rev 19920)
+++ trunk/reactos/tools/widl/widl.man 2005-12-05 22:12:42 UTC (rev 19921)
@@ -4,7 +4,7 @@
.SH SYNOPSIS
.BR "widl "\fI[options]\fR " \fIinfile.idl\fR"
.SH DESCRIPTION
-.B widl
+.B widl
is a Wine tool which purpose is to compile Interface Definition Language (IDL) files.
.PP
.SH OPTIONS
@@ -14,6 +14,8 @@
The program prints the help info and then exits.
.PP
.B General options:
+.IP \fB--oldnames\fR
+Use old naming conventions.
.IP \fB-V\fR
Print version number and exits from the program.
.PP
@@ -28,7 +30,7 @@
.IP \fB-t\fR
Generate a type library.
.IP "\fB-T \fIfile\fR"
-Define the name of the type library to be generated.
+Define the name of the type library to be generated.
The default filename is infile.tlb.
.PP
.B Proxy/stub generation options:
@@ -47,7 +49,7 @@
.PP
.B Preprocessor options:
.IP "\fB-I \fIpath\fR"
-Add a header search dir to path. Multiple search
+Add a header search dir to path. Multiple search
dirs are allowed.
.IP "\fB-D \fIid[=val]\fR"
Define preprocessor identifier id value.
@@ -61,7 +63,7 @@
Enable pedantic warnings.
.IP "\fB-d \fIn\fR"
.nf
-Set debug level to n.
+Set debug level to n.
n may be '0x01', '0x02', '0x04', '0x08', '0x10' or '0x20'.
(See section \fBDebug\fR)
.PP