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
c978bbee
Commit
c978bbee
authored
Mar 03, 2008
by
Maarten Lankhorst
Committed by
Alexandre Julliard
Mar 05, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Handle TKIND_ALIAS properly when passed as pointer.
parent
6f14ba73
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
4 deletions
+30
-4
tmarshal.c
dlls/oleaut32/tmarshal.c
+30
-4
No files found.
dlls/oleaut32/tmarshal.c
View file @
c978bbee
...
...
@@ -698,11 +698,24 @@ serialize_param(
}
ITypeInfo_GetTypeAttr
(
tinfo2
,
&
tattr
);
switch
(
tattr
->
typekind
)
{
case
TKIND_ALIAS
:
if
(
tattr
->
tdescAlias
.
vt
==
VT_USERDEFINED
)
{
DWORD
href
=
tattr
->
tdescAlias
.
u
.
hreftype
;
ITypeInfo_ReleaseTypeAttr
(
tinfo
,
tattr
);
ITypeInfo_Release
(
tinfo2
);
hres
=
ITypeInfo_GetRefTypeInfo
(
tinfo
,
href
,
&
tinfo2
);
if
(
hres
)
{
ERR
(
"Could not get typeinfo of hreftype %x for VT_USERDEFINED.
\n
"
,
tdesc
->
u
.
lptdesc
->
u
.
hreftype
);
return
hres
;
}
ITypeInfo_GetTypeAttr
(
tinfo2
,
&
tattr
);
derefhere
=
(
tattr
->
typekind
!=
TKIND_DISPATCH
&&
tattr
->
typekind
!=
TKIND_INTERFACE
);
}
break
;
case
TKIND_ENUM
:
/* confirmed */
case
TKIND_RECORD
:
/* FIXME: mostly untested */
derefhere
=
TRUE
;
break
;
case
TKIND_ALIAS
:
/* FIXME: untested */
case
TKIND_DISPATCH
:
/* will be done in VT_USERDEFINED case */
case
TKIND_INTERFACE
:
/* will be done in VT_USERDEFINED case */
derefhere
=
FALSE
;
...
...
@@ -1030,11 +1043,24 @@ deserialize_param(
}
ITypeInfo_GetTypeAttr
(
tinfo2
,
&
tattr
);
switch
(
tattr
->
typekind
)
{
case
TKIND_ALIAS
:
if
(
tattr
->
tdescAlias
.
vt
==
VT_USERDEFINED
)
{
DWORD
href
=
tattr
->
tdescAlias
.
u
.
hreftype
;
ITypeInfo_ReleaseTypeAttr
(
tinfo
,
tattr
);
ITypeInfo_Release
(
tinfo2
);
hres
=
ITypeInfo_GetRefTypeInfo
(
tinfo
,
href
,
&
tinfo2
);
if
(
hres
)
{
ERR
(
"Could not get typeinfo of hreftype %x for VT_USERDEFINED.
\n
"
,
tdesc
->
u
.
lptdesc
->
u
.
hreftype
);
return
hres
;
}
ITypeInfo_GetTypeAttr
(
tinfo2
,
&
tattr
);
derefhere
=
(
tattr
->
typekind
!=
TKIND_DISPATCH
&&
tattr
->
typekind
!=
TKIND_INTERFACE
);
}
break
;
case
TKIND_ENUM
:
/* confirmed */
case
TKIND_RECORD
:
/* FIXME: mostly untested */
derefhere
=
TRUE
;
break
;
case
TKIND_ALIAS
:
/* FIXME: untested */
case
TKIND_DISPATCH
:
/* will be done in VT_USERDEFINED case */
case
TKIND_INTERFACE
:
/* will be done in VT_USERDEFINED case */
derefhere
=
FALSE
;
...
...
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