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
4281d19d
Commit
4281d19d
authored
Dec 12, 2013
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Dec 13, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Cast to the correct type instead to void pointer.
parent
03f8f85d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
15 deletions
+11
-15
connpt.c
dlls/oleaut32/connpt.c
+4
-6
olefont.c
dlls/oleaut32/olefont.c
+6
-8
olepicture.c
dlls/oleaut32/olepicture.c
+1
-1
No files found.
dlls/oleaut32/connpt.c
View file @
4281d19d
...
...
@@ -254,9 +254,7 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer(
ConnectionPointImpl
*
This
=
impl_from_IConnectionPoint
(
iface
);
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
ppCPC
);
return
IUnknown_QueryInterface
(
This
->
Obj
,
&
IID_IConnectionPointContainer
,
(
LPVOID
)
ppCPC
);
return
IUnknown_QueryInterface
(
This
->
Obj
,
&
IID_IConnectionPointContainer
,
(
void
**
)
ppCPC
);
}
/************************************************************************
...
...
@@ -273,7 +271,7 @@ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface,
TRACE
(
"(%p)->(%p, %p)
\n
"
,
This
,
lpUnk
,
pdwCookie
);
*
pdwCookie
=
0
;
if
(
FAILED
(
IUnknown_QueryInterface
(
lpUnk
,
&
This
->
iid
,
(
LPVOID
)
&
lpSink
)))
if
(
FAILED
(
IUnknown_QueryInterface
(
lpUnk
,
&
This
->
iid
,
(
void
**
)
&
lpSink
)))
return
CONNECT_E_CANNOTCONNECT
;
for
(
i
=
0
;
i
<
This
->
maxSinks
;
i
++
)
{
...
...
@@ -349,7 +347,7 @@ static HRESULT WINAPI ConnectionPointImpl_EnumConnections(
EnumObj
=
EnumConnectionsImpl_Construct
((
IUnknown
*
)
This
,
This
->
nSinks
,
pCD
);
hr
=
IEnumConnections_QueryInterface
(
&
EnumObj
->
IEnumConnections_iface
,
&
IID_IEnumConnections
,
(
LPVOID
)
ppEnum
);
&
IID_IEnumConnections
,
(
void
**
)
ppEnum
);
IEnumConnections_Release
(
&
EnumObj
->
IEnumConnections_iface
);
HeapFree
(
GetProcessHeap
(),
0
,
pCD
);
...
...
@@ -623,7 +621,7 @@ HRESULT CreateConnectionPoint(IUnknown *pUnk, REFIID riid,
if
(
!
Obj
)
return
E_OUTOFMEMORY
;
hr
=
IConnectionPoint_QueryInterface
(
&
Obj
->
IConnectionPoint_iface
,
&
IID_IConnectionPoint
,
(
LPVOID
)
pCP
);
&
IID_IConnectionPoint
,
(
void
**
)
pCP
);
IConnectionPoint_Release
(
&
Obj
->
IConnectionPoint_iface
);
return
hr
;
}
dlls/oleaut32/olefont.c
View file @
4281d19d
...
...
@@ -414,7 +414,7 @@ static void OLEFont_SendNotify(OLEFontImpl* this, DISPID dispID)
while
(
IEnumConnections_Next
(
pEnum
,
1
,
&
CD
,
NULL
)
==
S_OK
)
{
IPropertyNotifySink
*
sink
;
IUnknown_QueryInterface
(
CD
.
pUnk
,
&
IID_IPropertyNotifySink
,
(
LPVOID
)
&
sink
);
IUnknown_QueryInterface
(
CD
.
pUnk
,
&
IID_IPropertyNotifySink
,
(
void
**
)
&
sink
);
IPropertyNotifySink_OnChanged
(
sink
,
dispID
);
IPropertyNotifySink_Release
(
sink
);
IUnknown_Release
(
CD
.
pUnk
);
...
...
@@ -440,7 +440,7 @@ static void OLEFont_SendNotify(OLEFontImpl* this, DISPID dispID)
while
(
IEnumConnections_Next
(
pEnum
,
1
,
&
CD
,
NULL
)
==
S_OK
)
{
IFontEventsDisp
*
disp
;
IUnknown_QueryInterface
(
CD
.
pUnk
,
&
IID_IFontEventsDisp
,
(
LPVOID
)
&
disp
);
IUnknown_QueryInterface
(
CD
.
pUnk
,
&
IID_IFontEventsDisp
,
(
void
**
)
&
disp
);
IFontEventsDisp_Invoke
(
disp
,
DISPID_FONT_CHANGED
,
&
IID_NULL
,
LOCALE_NEUTRAL
,
INVOKE_FUNC
,
&
dispparams
,
NULL
,
NULL
,
NULL
);
...
...
@@ -1848,13 +1848,11 @@ static HRESULT WINAPI OLEFontImpl_FindConnectionPoint(
TRACE
(
"(%p)->(%s, %p)
\n
"
,
this
,
debugstr_guid
(
riid
),
ppCp
);
if
(
IsEqualIID
(
riid
,
&
IID_IPropertyNotifySink
))
{
return
IConnectionPoint_QueryInterface
(
this
->
pPropertyNotifyCP
,
&
IID_IConnectionPoint
,
(
LPVOID
)
ppCp
);
return
IConnectionPoint_QueryInterface
(
this
->
pPropertyNotifyCP
,
&
IID_IConnectionPoint
,
(
void
**
)
ppCp
);
}
else
if
(
IsEqualIID
(
riid
,
&
IID_IFontEventsDisp
))
{
return
IConnectionPoint_QueryInterface
(
this
->
pFontEventsCP
,
&
IID_IConnectionPoint
,
(
LPVOID
)
ppCp
);
return
IConnectionPoint_QueryInterface
(
this
->
pFontEventsCP
,
&
IID_IConnectionPoint
,
(
void
**
)
ppCp
);
}
else
{
FIXME
(
"no connection point for %s
\n
"
,
debugstr_guid
(
riid
));
return
CONNECT_E_NOCONNECTION
;
...
...
dlls/oleaut32/olepicture.c
View file @
4281d19d
...
...
@@ -923,7 +923,7 @@ static HRESULT WINAPI OLEPictureImpl_FindConnectionPoint(
return
E_POINTER
;
*
ppCP
=
NULL
;
if
(
IsEqualGUID
(
riid
,
&
IID_IPropertyNotifySink
))
return
IConnectionPoint_QueryInterface
(
This
->
pCP
,
&
IID_IConnectionPoint
,(
LPVOID
)
ppCP
);
return
IConnectionPoint_QueryInterface
(
This
->
pCP
,
&
IID_IConnectionPoint
,
(
void
**
)
ppCP
);
FIXME
(
"no connection point for %s
\n
"
,
debugstr_guid
(
riid
));
return
CONNECT_E_NOCONNECTION
;
}
...
...
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