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
b5a8c331
Commit
b5a8c331
authored
Aug 23, 2010
by
Nikolay Sivov
Committed by
Alexandre Julliard
Aug 23, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32/olepicture: No need to check interface pointer in vtable methods.
parent
32c2ef6c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
21 deletions
+6
-21
olepicture.c
dlls/oleaut32/olepicture.c
+6
-21
No files found.
dlls/oleaut32/olepicture.c
View file @
b5a8c331
...
...
@@ -438,22 +438,14 @@ static HRESULT WINAPI OLEPictureImpl_QueryInterface(
void
**
ppvObject
)
{
OLEPictureImpl
*
This
=
(
OLEPictureImpl
*
)
iface
;
TRACE
(
"(%p)->(%s, %p)
\n
"
,
This
,
debugstr_guid
(
riid
),
ppvObject
);
/*
* Perform a sanity check on the parameters.
*/
if
(
(
This
==
0
)
||
(
ppvObject
==
0
)
)
if
(
!
ppvObject
)
return
E_INVALIDARG
;
/*
* Initialize the return parameter.
*/
*
ppvObject
=
0
;
/*
* Compare the riid with the interface IDs implemented by this object.
*/
if
(
IsEqualIID
(
&
IID_IUnknown
,
riid
)
||
IsEqualIID
(
&
IID_IPicture
,
riid
))
*
ppvObject
=
This
;
else
if
(
IsEqualIID
(
&
IID_IDispatch
,
riid
))
...
...
@@ -465,20 +457,13 @@ static HRESULT WINAPI OLEPictureImpl_QueryInterface(
else
if
(
IsEqualIID
(
&
IID_IConnectionPointContainer
,
riid
))
*
ppvObject
=
&
This
->
lpvtblIConnectionPointContainer
;
/*
* Check that we obtained an interface.
*/
if
((
*
ppvObject
)
==
0
)
if
(
!*
ppvObject
)
{
FIXME
(
"() : asking for un supported interface %s
\n
"
,
debugstr_guid
(
riid
));
return
E_NOINTERFACE
;
}
/*
* Query Interface always increases the reference count by one when it is
* successful
*/
OLEPictureImpl_AddRef
((
IPicture
*
)
This
);
IPicture_AddRef
(
iface
);
return
S_OK
;
}
...
...
@@ -1335,9 +1320,9 @@ static HRESULT OLEPictureImpl_LoadAPM(OLEPictureImpl *This,
*
* Currently implemented: BITMAP, ICON, JPEG, GIF, WMF, EMF
*/
static
HRESULT
WINAPI
OLEPictureImpl_Load
(
IPersistStream
*
iface
,
IStream
*
pStm
)
{
static
HRESULT
WINAPI
OLEPictureImpl_Load
(
IPersistStream
*
iface
,
IStream
*
pStm
)
{
HRESULT
hr
;
BOOL
headerisdata
=
FALSE
;
BOOL
headerisdata
;
BOOL
statfailed
=
FALSE
;
ULONG
xread
,
toread
;
ULONG
headerread
;
...
...
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