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
a7ca3518
Commit
a7ca3518
authored
Jan 31, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Feb 02, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Respond to CLSID in pointer moniker interface query.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
8f34b9e8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
8 deletions
+4
-8
pointermoniker.c
dlls/ole32/pointermoniker.c
+2
-1
moniker.c
dlls/ole32/tests/moniker.c
+2
-7
No files found.
dlls/ole32/pointermoniker.c
View file @
a7ca3518
...
...
@@ -74,7 +74,8 @@ static HRESULT WINAPI PointerMonikerImpl_QueryInterface(IMoniker *iface, REFIID
if
(
IsEqualIID
(
&
IID_IUnknown
,
riid
)
||
IsEqualIID
(
&
IID_IPersist
,
riid
)
||
IsEqualIID
(
&
IID_IPersistStream
,
riid
)
||
IsEqualIID
(
&
IID_IMoniker
,
riid
))
IsEqualIID
(
&
IID_IMoniker
,
riid
)
||
IsEqualGUID
(
&
CLSID_PointerMoniker
,
riid
))
{
*
ppvObject
=
iface
;
}
...
...
dlls/ole32/tests/moniker.c
View file @
a7ca3518
...
...
@@ -2886,13 +2886,8 @@ static void test_pointer_moniker(void)
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
);
if
(
SUCCEEDED
(
hr
))
{
ok
(
unknown
==
(
IUnknown
*
)
moniker
,
"Unexpected interface.
\n
"
);
IUnknown_Release
(
unknown
);
}
ok
(
unknown
==
(
IUnknown
*
)
moniker
,
"Unexpected interface.
\n
"
);
IUnknown_Release
(
unknown
);
hr
=
IMoniker_QueryInterface
(
moniker
,
&
IID_IMarshal
,
(
void
**
)
&
marshal
);
ok
(
hr
==
S_OK
,
"Failed to get interface, 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