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
5d5eb585
Commit
5d5eb585
authored
Jan 30, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jan 30, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Get rid of redundant pointer check.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
69bb0c77
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
12 deletions
+11
-12
pointermoniker.c
dlls/ole32/pointermoniker.c
+8
-12
moniker.c
dlls/ole32/tests/moniker.c
+3
-0
No files found.
dlls/ole32/pointermoniker.c
View file @
5d5eb585
...
...
@@ -58,20 +58,18 @@ static PointerMonikerImpl *impl_from_IMarshal(IMarshal *iface)
}
static
PointerMonikerImpl
*
unsafe_impl_from_IMoniker
(
IMoniker
*
iface
);
static
HRESULT
WINAPI
PointerMonikerImpl_QueryInterface
(
IMoniker
*
iface
,
REFIID
riid
,
void
**
ppvObject
)
static
HRESULT
WINAPI
PointerMonikerImpl_QueryInterface
(
IMoniker
*
iface
,
REFIID
riid
,
void
**
ppvObject
)
{
PointerMonikerImpl
*
This
=
impl_from_IMoniker
(
iface
);
PointerMonikerImpl
*
moniker
=
impl_from_IMoniker
(
iface
);
TRACE
(
"
(%p,%s,%p)
\n
"
,
This
,
debugstr_guid
(
riid
),
ppvObject
);
TRACE
(
"
%p, %s, %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
ppvObject
);
if
(
(
This
==
0
)
||
(
ppvObject
==
0
)
)
return
E_INVALIDARG
;
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_IPersist
,
riid
)
||
IsEqualIID
(
&
IID_IPersistStream
,
riid
)
||
...
...
@@ -80,13 +78,11 @@ PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject)
*
ppvObject
=
iface
;
}
else
if
(
IsEqualIID
(
&
IID_IMarshal
,
riid
))
*
ppvObject
=
&
This
->
IMarshal_iface
;
*
ppvObject
=
&
moniker
->
IMarshal_iface
;
/* Check that we obtained an interface.*/
if
((
*
ppvObject
)
==
0
)
if
(
!*
ppvObject
)
return
E_NOINTERFACE
;
/* always increase the reference count by one when it is successful */
IMoniker_AddRef
(
iface
);
return
S_OK
;
...
...
dlls/ole32/tests/moniker.c
View file @
5d5eb585
...
...
@@ -2886,6 +2886,9 @@ static void test_pointer_moniker(void)
hr
=
CreatePointerMoniker
((
IUnknown
*
)
&
Test_ClassFactory
,
&
moniker
);
ok_ole_success
(
hr
,
CreatePointerMoniker
);
hr
=
IMoniker_QueryInterface
(
moniker
,
&
IID_IMoniker
,
NULL
);
ok
(
hr
==
E_INVALIDARG
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMoniker_QueryInterface
(
moniker
,
&
CLSID_PointerMoniker
,
(
void
**
)
&
unknown
);
todo_wine
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
...
...
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