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
8f34b9e8
Commit
8f34b9e8
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 antimoniker interface query.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
0024d184
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
12 deletions
+6
-12
antimoniker.c
dlls/ole32/antimoniker.c
+4
-6
moniker.c
dlls/ole32/tests/moniker.c
+2
-6
No files found.
dlls/ole32/antimoniker.c
View file @
8f34b9e8
...
...
@@ -81,19 +81,19 @@ AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject)
TRACE
(
"(%p,%s,%p)
\n
"
,
This
,
debugstr_guid
(
riid
),
ppvObject
);
/* Perform a sanity check on the parameters.*/
if
(
ppvObject
==
0
)
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
)
||
IsEqualIID
(
&
IID_IMoniker
,
riid
))
IsEqualIID
(
&
IID_IMoniker
,
riid
)
||
IsEqualGUID
(
&
CLSID_AntiMoniker
,
riid
))
{
*
ppvObject
=
iface
;
}
else
if
(
IsEqualIID
(
&
IID_IROTData
,
riid
))
*
ppvObject
=
&
This
->
IROTData_iface
;
else
if
(
IsEqualIID
(
&
IID_IMarshal
,
riid
))
...
...
@@ -106,11 +106,9 @@ AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject)
return
IUnknown_QueryInterface
(
This
->
pMarshal
,
riid
,
ppvObject
);
}
/* Check that we obtained an interface.*/
if
((
*
ppvObject
)
==
0
)
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 @
8f34b9e8
...
...
@@ -2454,13 +2454,9 @@ static void test_anti_moniker(void)
ok_ole_success
(
hr
,
CreateAntiMoniker
);
hr
=
IMoniker_QueryInterface
(
moniker
,
&
CLSID_AntiMoniker
,
(
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
);
test_moniker
(
"anti moniker"
,
moniker
,
expected_anti_moniker_marshal_data
,
sizeof
(
expected_anti_moniker_marshal_data
),
...
...
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