ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ole32/composite: Disable cloning of enumerator instances. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2021-09-30 11:26:47 +03:00 committed by Alexandre Julliard
parent 61f8991fd9
commit b557c39555
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/ole32/compositemoniker.c
View File

@ -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 =

12
dlls/ole32/tests/moniker.c
View File

@ -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);