Module: wine Branch: master Commit: f8ddba3ad03ba17afe8092889d4978659a9bae66 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8ddba3ad03ba17afe8092889d49786...
Author: Zebediah Figura zfigura@codeweavers.com Date: Mon Mar 4 23:55:05 2024 -0600
shell32: Implement IDataObject::SetData().
---
dlls/shell32/dataobject.c | 46 ++++++++++++++++++++++++++++++++++++++---- dlls/shell32/tests/shlfolder.c | 29 ++++++++++++-------------- 2 files changed, 55 insertions(+), 20 deletions(-)
diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index dd4d77f6942..d0ed644c437 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -344,11 +344,49 @@ static HRESULT WINAPI IDataObject_fnGetCanonicalFormatEtc(IDataObject *iface, LP return E_NOTIMPL; }
-static HRESULT WINAPI IDataObject_fnSetData(IDataObject *iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium, BOOL fRelease) +static HRESULT WINAPI IDataObject_fnSetData(IDataObject *iface, + FORMATETC *format, STGMEDIUM *medium, BOOL release) { - IDataObjectImpl *This = impl_from_IDataObject(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + IDataObjectImpl *obj = impl_from_IDataObject(iface); + struct data *new_array; + + TRACE("iface %p, format %p, medium %p, release %d.\n", iface, format, medium, release); + + if (!release) + return E_INVALIDARG; + + if (format->tymed != TYMED_HGLOBAL) + { + FIXME("Unhandled format tymed %#lx.\n", format->tymed); + return E_NOTIMPL; + } + + if (medium->tymed != TYMED_HGLOBAL) + { + FIXME("Unhandled medium tymed %#lx.\n", format->tymed); + return E_NOTIMPL; + } + + if (medium->pUnkForRelease) + FIXME("Ignoring IUnknown %p.\n", medium->pUnkForRelease); + + for (size_t i = 0; i < obj->data_count; ++i) + { + if (obj->data[i].cf == format->cfFormat) + { + GlobalFree(obj->data[i].global); + obj->data[i].global = medium->hGlobal; + return S_OK; + } + } + + if (!(new_array = realloc(obj->data, (obj->data_count + 1) * sizeof(*obj->data)))) + return E_OUTOFMEMORY; + obj->data = new_array; + obj->data[obj->data_count].cf = format->cfFormat; + obj->data[obj->data_count].global = medium->hGlobal; + ++obj->data_count; + return S_OK; }
static HRESULT WINAPI IDataObject_fnEnumFormatEtc(IDataObject *iface, DWORD direction, IEnumFORMATETC **out) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 3f364b49769..b2448938728 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5318,15 +5318,15 @@ static void test_enum_format(IDataObject *data_obj) hr = IEnumFORMATETC_Reset(enum1); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Skip(enum1, 4); - ok(hr == S_FALSE, "Got hr %#lx.\n", hr); - hr = IEnumFORMATETC_Skip(enum1, 1); todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + hr = IEnumFORMATETC_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Reset(enum1); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Skip(enum1, 3); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Skip(enum1, 1); - ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Next(enum1, 1, formats, NULL); todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Next(enum2, 1, formats, NULL); @@ -5342,7 +5342,7 @@ static void test_enum_format(IDataObject *data_obj) formats[0].lindex = -1; formats[0].tymed = TYMED_HGLOBAL; hr = IDataObject_SetData(data_obj, &formats[0], &medium, TRUE); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr);
hr = IEnumFORMATETC_Reset(enum1); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -5457,23 +5457,20 @@ static void test_DataObject(void) medium.hGlobal = global; fmt.tymed = TYMED_HGLOBAL; hr = IDataObject_SetData(data_obj, &fmt, &medium, FALSE); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IDataObject_SetData(data_obj, &fmt, &medium, TRUE); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr);
hr = IDataObject_QueryGetData(data_obj, &fmt); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); memset(&medium, 0xcc, sizeof(medium)); hr = IDataObject_GetData(data_obj, &fmt, &medium); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - if (hr == S_OK) - { - ok(medium.hGlobal && medium.hGlobal != global, "Got global %p.\n", medium.hGlobal); - value = GlobalLock(medium.hGlobal); - ok(*value == 0xabacab, "Got value %#x.\n", *value); - GlobalUnlock(medium.hGlobal); - ReleaseStgMedium(&medium); - } + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(medium.hGlobal && medium.hGlobal != global, "Got global %p.\n", medium.hGlobal); + value = GlobalLock(medium.hGlobal); + ok(*value == 0xabacab, "Got value %#x.\n", *value); + GlobalUnlock(medium.hGlobal); + ReleaseStgMedium(&medium);
for (unsigned int i = 0; i < ARRAY_SIZE(enum_directions); ++i) {