Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
b557c395
Commit
b557c395
authored
Sep 30, 2021
by
Nikolay Sivov
Committed by
Alexandre Julliard
Sep 30, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32/composite: Disable cloning of enumerator instances.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
61f8991f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
11 deletions
+7
-11
compositemoniker.c
dlls/ole32/compositemoniker.c
+3
-3
moniker.c
dlls/ole32/tests/moniker.c
+4
-8
No files found.
dlls/ole32/compositemoniker.c
View file @
b557c395
...
...
@@ -1363,14 +1363,14 @@ EnumMonikerImpl_Reset(IEnumMoniker* iface)
static
HRESULT
WINAPI
EnumMonikerImpl_Clone
(
IEnumMoniker
*
iface
,
IEnumMoniker
**
ret
)
{
EnumMonikerImpl
*
This
=
impl_from_IEnumMoniker
(
iface
);
TRACE
(
"%p, %p.
\n
"
,
iface
,
ret
);
if
(
!
ret
)
return
E_INVALIDARG
;
return
EnumMonikerImpl_CreateEnumMoniker
(
This
->
tabMoniker
,
This
->
tabSize
,
This
->
currentPos
,
TRUE
,
ret
);
*
ret
=
NULL
;
return
E_NOTIMPL
;
}
static
const
IEnumMonikerVtbl
VT_EnumMonikerImpl
=
...
...
dlls/ole32/tests/moniker.c
View file @
b557c395
...
...
@@ -3699,10 +3699,9 @@ todo_wine {
enummoniker2
=
(
void
*
)
0xdeadbeef
;
hr
=
IEnumMoniker_Clone
(
enummoniker
,
&
enummoniker2
);
todo_wine
{
ok
(
hr
==
E_NOTIMPL
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
enummoniker2
,
"Unexpected pointer.
\n
"
);
}
hr
=
IEnumMoniker_Reset
(
enummoniker
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
...
...
@@ -3718,10 +3717,9 @@ todo_wine {
enummoniker2
=
(
void
*
)
0xdeadbeef
;
hr
=
IEnumMoniker_Clone
(
enummoniker
,
&
enummoniker2
);
todo_wine
{
ok
(
hr
==
E_NOTIMPL
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
enummoniker2
,
"Unexpected pointer.
\n
"
);
}
IEnumMoniker_Release
(
enummoniker
);
/* Backward direction */
...
...
@@ -3783,10 +3781,9 @@ todo_wine {
enummoniker2
=
(
void
*
)
0xdeadbeef
;
hr
=
IEnumMoniker_Clone
(
enummoniker
,
&
enummoniker2
);
todo_wine
{
ok
(
hr
==
E_NOTIMPL
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
enummoniker2
,
"Unexpected pointer.
\n
"
);
}
hr
=
IEnumMoniker_Reset
(
enummoniker
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
...
...
@@ -3802,10 +3799,9 @@ todo_wine {
enummoniker2
=
(
void
*
)
0xdeadbeef
;
hr
=
IEnumMoniker_Clone
(
enummoniker
,
&
enummoniker2
);
todo_wine
{
ok
(
hr
==
E_NOTIMPL
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
enummoniker2
,
"Unexpected pointer.
\n
"
);
}
IEnumMoniker_Release
(
enummoniker
);
IMoniker_Release
(
moniker
);
...
...
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