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
e851556f
Commit
e851556f
authored
Apr 07, 2010
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Fix some pointer conversion warnings on 64-bit.
parent
93437fc9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
11 deletions
+8
-11
typelib.c
dlls/oleaut32/typelib.c
+8
-11
No files found.
dlls/oleaut32/typelib.c
View file @
e851556f
...
...
@@ -1908,7 +1908,7 @@ MSFT_DoFuncs(TLBContext* pcx,
{
if
(
!
IS_INTRESOURCE
(
pFuncRec
->
OptAttr
[
2
]))
ERR
(
"ordinal 0x%08x invalid, IS_INTRESOURCE is false
\n
"
,
pFuncRec
->
OptAttr
[
2
]);
(
*
pptfd
)
->
Entry
=
(
BSTR
)
pFuncRec
->
OptAttr
[
2
]
;
(
*
pptfd
)
->
Entry
=
(
BSTR
)
(
DWORD_PTR
)
LOWORD
(
pFuncRec
->
OptAttr
[
2
])
;
}
else
{
...
...
@@ -2934,7 +2934,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength)
else
if
(
td
[
0
]
==
VT_CARRAY
)
{
/* array descr table here */
pTypeLibImpl
->
pTypeDesc
[
i
].
u
.
lpadesc
=
(
void
*
)(
(
int
)
td
[
2
])
;
/* temp store offset in*/
pTypeLibImpl
->
pTypeDesc
[
i
].
u
.
lpadesc
=
(
void
*
)(
INT_PTR
)
td
[
2
]
;
/* temp store offset in*/
}
else
if
(
td
[
0
]
==
VT_USERDEFINED
)
{
...
...
@@ -2949,7 +2949,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength)
if
(
pTypeLibImpl
->
pTypeDesc
[
i
].
vt
!=
VT_CARRAY
)
continue
;
if
(
tlbSegDir
.
pArrayDescriptions
.
offset
>
0
)
{
MSFT_ReadLEWords
(
td
,
sizeof
(
td
),
&
cx
,
tlbSegDir
.
pArrayDescriptions
.
offset
+
(
int
)
pTypeLibImpl
->
pTypeDesc
[
i
].
u
.
lpadesc
);
MSFT_ReadLEWords
(
td
,
sizeof
(
td
),
&
cx
,
tlbSegDir
.
pArrayDescriptions
.
offset
+
(
INT_PTR
)
pTypeLibImpl
->
pTypeDesc
[
i
].
u
.
lpadesc
);
pTypeLibImpl
->
pTypeDesc
[
i
].
u
.
lpadesc
=
TLB_Alloc
(
sizeof
(
ARRAYDESC
)
+
sizeof
(
SAFEARRAYBOUND
)
*
(
td
[
3
]
-
1
));
if
(
td
[
1
]
<
0
)
...
...
@@ -4786,13 +4786,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind(
&
subtypeinfo
,
&
subdesckind
,
&
subbindptr
);
if
(
SUCCEEDED
(
hr
)
&&
(
subdesckind
!=
DESCKIND_NONE
))
{
TYPEDESC
tdesc_appobject
=
{
{
(
TYPEDESC
*
)
pTypeInfo
->
hreftype
},
VT_USERDEFINED
};
TYPEDESC
tdesc_appobject
;
const
VARDESC
vardesc_appobject
=
{
-
2
,
/* memid */
...
...
@@ -4814,6 +4808,9 @@ static HRESULT WINAPI ITypeLibComp_fnBind(
VAR_STATIC
/* varkind */
};
tdesc_appobject
.
u
.
hreftype
=
pTypeInfo
->
hreftype
;
tdesc_appobject
.
vt
=
VT_USERDEFINED
;
TRACE
(
"found in implicit app object: %s
\n
"
,
debugstr_w
(
szName
));
/* cleanup things filled in by Bind call so we can put our
...
...
@@ -6606,7 +6603,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid
if
(
pBstrName
)
*
pBstrName
=
NULL
;
if
(
pwOrdinal
)
*
pwOrdinal
=
(
DWORD
)
pFDesc
->
Entry
;
*
pwOrdinal
=
LOWORD
(
pFDesc
->
Entry
)
;
return
S_OK
;
}
return
TYPE_E_ELEMENTNOTFOUND
;
...
...
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