Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
d062924f
Commit
d062924f
authored
Oct 05, 2004
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed no longer needed ICOM compatibility mode in widl.
parent
7e8d5ceb
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
65 deletions
+5
-65
Make.rules.in
Make.rules.in
+1
-1
header.c
tools/widl/header.c
+0
-52
widl.c
tools/widl/widl.c
+1
-6
widl.h
tools/widl/widl.h
+0
-1
widl.man
tools/widl/widl.man
+3
-5
No files found.
Make.rules.in
View file @
d062924f
...
...
@@ -137,7 +137,7 @@ LINTS = $(C_SRCS:.c=.ln)
$(WINEBUILD) -w $(DEFS) -o $@ --def $<
.idl.h:
$(WIDL) $(IDLFLAGS) -
b -
h -H $@ $<
$(WIDL) $(IDLFLAGS) -h -H $@ $<
.c.ln:
$(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 )
...
...
tools/widl/header.c
View file @
d062924f
...
...
@@ -448,53 +448,6 @@ var_t *is_callas(attr_t *a)
return
get_attrp
(
a
,
ATTR_CALLAS
);
}
static
void
write_icom_method_def
(
type_t
*
iface
)
{
func_t
*
cur
=
iface
->
funcs
;
if
(
iface
->
ref
)
write_icom_method_def
(
iface
->
ref
);
if
(
!
cur
)
return
;
while
(
NEXT_LINK
(
cur
))
cur
=
NEXT_LINK
(
cur
);
if
(
cur
)
fprintf
(
header
,
"
\\\n
/*** %s methods ***/"
,
iface
->
name
);
while
(
cur
)
{
var_t
*
def
=
cur
->
def
;
if
(
!
is_callas
(
def
->
attrs
))
{
var_t
*
arg
=
cur
->
args
;
if
(
arg
)
{
while
(
NEXT_LINK
(
arg
))
{
arg
=
NEXT_LINK
(
arg
);
}
}
fprintf
(
header
,
"
\\\n
STDMETHOD_("
);
write_type
(
header
,
def
->
type
,
def
,
def
->
tname
);
fprintf
(
header
,
","
);
write_name
(
header
,
def
);
fprintf
(
header
,
")(%s"
,
arg
?
"THIS_ "
:
"THIS"
);
while
(
arg
)
{
write_type
(
header
,
arg
->
type
,
arg
,
arg
->
tname
);
if
(
arg
->
args
)
{
fprintf
(
header
,
" (STDMETHODCALLTYPE *"
);
write_name
(
header
,
arg
);
fprintf
(
header
,
")("
);
write_args
(
header
,
arg
->
args
,
NULL
,
0
,
FALSE
);
fprintf
(
header
,
")"
);
}
else
{
fprintf
(
header
,
" "
);
write_name
(
header
,
arg
);
}
write_array
(
header
,
arg
->
array
,
0
);
arg
=
PREV_LINK
(
arg
);
if
(
arg
)
fprintf
(
header
,
", "
);
}
fprintf
(
header
,
") PURE;"
);
}
cur
=
PREV_LINK
(
cur
);
}
}
static
int
write_method_macro
(
type_t
*
iface
,
char
*
name
)
{
int
idx
;
...
...
@@ -800,11 +753,6 @@ void write_com_interface(type_t *iface)
fprintf
(
header
,
"
\n
"
);
fprintf
(
header
,
"#endif
\n
"
);
fprintf
(
header
,
"
\n
"
);
if
(
compat_icom
)
{
fprintf
(
header
,
"#define %s_METHODS"
,
iface
->
name
);
write_icom_method_def
(
iface
);
fprintf
(
header
,
"
\n\n
"
);
}
write_method_proto
(
iface
);
fprintf
(
header
,
"
\n
#endif /* __%s_INTERFACE_DEFINED__ */
\n\n
"
,
iface
->
name
);
}
...
...
tools/widl/widl.c
View file @
d062924f
...
...
@@ -56,7 +56,6 @@
static
char
usage
[]
=
"Usage: widl [options...] infile.idl
\n
"
" -b Make headers compatible with ICOM macros
\n
"
" -d n Set debug level to 'n'
\n
"
" -D id[=val] Define preprocessor identifier id=val
\n
"
" -E Preprocess only
\n
"
...
...
@@ -89,7 +88,6 @@ int preprocess_only = 0;
int
header_only
=
0
;
int
typelib_only
=
0
;
int
no_preprocess
=
0
;
int
compat_icom
=
0
;
char
*
input_name
;
char
*
header_name
;
...
...
@@ -138,11 +136,8 @@ int main(int argc,char *argv[])
now
=
time
(
NULL
);
while
((
optc
=
getopt
(
argc
,
argv
,
"
b
d:D:EhH:I:NtT:VW"
))
!=
EOF
)
{
while
((
optc
=
getopt
(
argc
,
argv
,
"d:D:EhH:I:NtT:VW"
))
!=
EOF
)
{
switch
(
optc
)
{
case
'b'
:
compat_icom
=
1
;
break
;
case
'd'
:
debuglevel
=
strtol
(
optarg
,
NULL
,
0
);
break
;
...
...
tools/widl/widl.h
View file @
d062924f
...
...
@@ -41,7 +41,6 @@ extern int pedantic;
extern
int
do_everything
;
extern
int
header_only
;
extern
int
typelib_only
;
extern
int
compat_icom
;
extern
char
*
input_name
;
extern
char
*
header_name
;
...
...
tools/widl/widl.man
View file @
d062924f
...
...
@@ -23,18 +23,16 @@ The default filename is infile.tlb.
Print version number and exits from the program.
.PP
.B Header options:
.IP \fB-b\fR
Make headers compatible with ICOM macros.
.IP \fB-h\fR
Only generate header files.
.IP "\fB-H \fIfile\fR"
Name of header file to
includ
e. The default header
Name of header file to
generat
e. The default header
filename is infile.h.
.PP
.B Preprocessor options:
.IP "\fB-I \fIpath\fR"
Add a header search dir to path. Multiple search
dirs are allowed.
.PP
.B Preprocessor options:
.IP "\fB-D \fIid[=val]\fR"
Define preprocessor identifier id value.
.IP \fB-E\fR
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment