Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Herman Semenov
wine
Commits
5b0bf5dc
Commit
5b0bf5dc
authored
18 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
widl: Convert typelib lists to standard Wine lists.
parent
5aba7b0c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
tools/widl/typelib.c
+5
-9
5 additions, 9 deletions
tools/widl/typelib.c
tools/widl/widltypes.h
+5
-4
5 additions, 4 deletions
tools/widl/widltypes.h
tools/widl/write_msft.c
+3
-5
3 additions, 5 deletions
tools/widl/write_msft.c
with
13 additions
and
18 deletions
tools/widl/typelib.c
+
5
−
9
View file @
5b0bf5dc
...
...
@@ -230,8 +230,8 @@ void start_typelib(char *name, attr_t *attrs)
typelib
->
name
=
xstrdup
(
name
);
typelib
->
filename
=
xstrdup
(
typelib_name
);
typelib
->
attrs
=
attrs
;
typelib
->
entr
y
=
NULL
;
typelib
->
importlibs
=
NULL
;
list_init
(
&
typelib
->
entr
ies
)
;
list_init
(
&
typelib
->
importlibs
)
;
}
void
end_typelib
(
void
)
...
...
@@ -251,8 +251,7 @@ void add_typelib_entry(type_t *t)
chat
(
"add kind %i: %s
\n
"
,
t
->
kind
,
t
->
name
);
entry
=
xmalloc
(
sizeof
(
*
entry
));
entry
->
type
=
t
;
LINK
(
entry
,
typelib
->
entry
);
typelib
->
entry
=
entry
;
list_add_tail
(
&
typelib
->
entries
,
&
entry
->
entry
);
}
static
void
tlb_read
(
int
fd
,
void
*
buf
,
int
count
)
...
...
@@ -365,10 +364,9 @@ void add_importlib(const char *name)
if
(
!
typelib
)
return
;
for
(
importlib
=
typelib
->
importlibs
;
importlib
;
importlib
=
NEXT_LINK
(
importlib
))
{
LIST_FOR_EACH_ENTRY
(
importlib
,
&
typelib
->
importlibs
,
importlib
_t
,
entry
)
if
(
!
strcmp
(
name
,
importlib
->
name
))
return
;
}
chat
(
"add_importlib: %s
\n
"
,
name
);
...
...
@@ -377,7 +375,5 @@ void add_importlib(const char *name)
importlib
->
name
=
xstrdup
(
name
);
read_importlib
(
importlib
);
LINK
(
importlib
,
typelib
->
importlibs
);
typelib
->
importlibs
=
importlib
;
list_add_head
(
&
typelib
->
importlibs
,
&
importlib
->
entry
);
}
This diff is collapsed.
Click to expand it.
tools/widl/widltypes.h
+
5
−
4
View file @
5b0bf5dc
...
...
@@ -24,6 +24,7 @@
#include
<stdarg.h>
#include
"guiddef.h"
#include
"wine/rpcfc.h"
#include
"wine/list.h"
#ifndef UUID_DEFINED
#define UUID_DEFINED
...
...
@@ -254,7 +255,7 @@ struct _ifref_t {
struct
_typelib_entry_t
{
type_t
*
type
;
DECL_LINK
(
typelib_
entry
_t
)
;
struct
list
entry
;
};
struct
_importinfo_t
{
...
...
@@ -279,15 +280,15 @@ struct _importlib_t {
int
allocated
;
DECL_LINK
(
importlib_t
)
;
struct
list
entry
;
};
struct
_typelib_t
{
char
*
name
;
char
*
filename
;
attr_t
*
attrs
;
typelib_entry_
t
*
entr
y
;
importlib_
t
*
importlibs
;
struct
lis
t
entr
ies
;
struct
lis
t
importlibs
;
};
void
init_types
(
void
);
...
...
This diff is collapsed.
Click to expand it.
tools/widl/write_msft.c
+
3
−
5
View file @
5b0bf5dc
...
...
@@ -716,7 +716,8 @@ static importinfo_t *find_importinfo(msft_typelib_t *typelib, const char *name)
if
(
!
name
)
return
NULL
;
for
(
importlib
=
typelib
->
typelib
->
importlibs
;
importlib
;
importlib
=
NEXT_LINK
(
importlib
))
{
LIST_FOR_EACH_ENTRY
(
importlib
,
&
typelib
->
typelib
->
importlibs
,
importlib_t
,
entry
)
{
for
(
i
=
0
;
i
<
importlib
->
ntypeinfos
;
i
++
)
{
if
(
!
strcmp
(
name
,
importlib
->
importinfos
[
i
].
name
))
{
chat
(
"Found %s in importlib.
\n
"
,
name
);
...
...
@@ -2517,10 +2518,7 @@ int create_msft_typelib(typelib_t *typelib)
set_custdata
(
msft
,
&
midl_time_guid
,
VT_UI4
,
&
cur_time
,
&
msft
->
typelib_header
.
CustomDataOffset
);
set_custdata
(
msft
,
&
midl_version_guid
,
VT_UI4
,
&
version
,
&
msft
->
typelib_header
.
CustomDataOffset
);
for
(
entry
=
typelib
->
entry
;
entry
&&
NEXT_LINK
(
entry
);
entry
=
NEXT_LINK
(
entry
))
;
for
(
;
entry
;
entry
=
PREV_LINK
(
entry
))
LIST_FOR_EACH_ENTRY
(
entry
,
&
typelib
->
entries
,
typelib_entry_t
,
entry
)
add_entry
(
msft
,
entry
);
save_all_changes
(
msft
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment