January 2020 - Wine-Commits

Nikolay Sivov : ole32: Lock item container on BindToObject().
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 0b0b0795c78911f23f4b0f0918a5b2140fc73ac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b0b0795c78911f23f4b0f09… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 23 02:03:05 2020 +0300 ole32: Lock item container on BindToObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index dc7026c4fc..46a16300b7 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -445,6 +445,9 @@ static HRESULT WINAPI ItemMonikerImpl_BindToObject(IMoniker* iface, hr = IMoniker_BindToObject(pmkToLeft, pbc, NULL, &IID_IOleItemContainer, (void **)&container); if (SUCCEEDED(hr)) { + if (FAILED(hr = set_container_lock(container, pbc))) + WARN("Failed to lock container, hr %#x.\n", hr); + hr = IOleItemContainer_GetObject(container, This->itemName, get_bind_speed_from_bindctx(pbc), pbc, riid, ppvResult); IOleItemContainer_Release(container);

1 0

Nikolay Sivov : ole32: Fix IsEqual() for item moniker.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 5330878db78b8b80386918efcb8c65511a08c3d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5330878db78b8b80386918ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 23 02:03:06 2020 +0300 ole32: Fix IsEqual() for item moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 41 ++++++++++++++++++----------------------- dlls/ole32/tests/moniker.c | 5 +++-- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 46a16300b7..c85e263774 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -52,6 +52,8 @@ static inline ItemMonikerImpl *impl_from_IMoniker(IMoniker *iface) return CONTAINING_RECORD(iface, ItemMonikerImpl, IMoniker_iface); } +static ItemMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface); + static inline ItemMonikerImpl *impl_from_IROTData(IROTData *iface) { return CONTAINING_RECORD(iface, ItemMonikerImpl, IROTData_iface); @@ -601,34 +603,20 @@ static HRESULT WINAPI ItemMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumM /****************************************************************************** * ItemMoniker_IsEqual ******************************************************************************/ -static HRESULT WINAPI ItemMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) +static HRESULT WINAPI ItemMonikerImpl_IsEqual(IMoniker *iface, IMoniker *other) { + ItemMonikerImpl *moniker = impl_from_IMoniker(iface), *other_moniker; - CLSID clsid; - LPOLESTR dispName1,dispName2; - IBindCtx* bind; - HRESULT res = S_FALSE; - - TRACE("(%p,%p)\n",iface,pmkOtherMoniker); - - if (!pmkOtherMoniker) return S_FALSE; + TRACE("%p, %p.\n", iface, other); + if (!other) + return E_INVALIDARG; - /* check if both are ItemMoniker */ - if(FAILED (IMoniker_GetClassID(pmkOtherMoniker,&clsid))) return S_FALSE; - if(!IsEqualCLSID(&clsid,&CLSID_ItemMoniker)) return S_FALSE; + other_moniker = unsafe_impl_from_IMoniker(other); + if (!other_moniker) + return S_FALSE; - /* check if both displaynames are the same */ - if(SUCCEEDED ((res = CreateBindCtx(0,&bind)))) { - if(SUCCEEDED (IMoniker_GetDisplayName(iface,bind,NULL,&dispName1))) { - if(SUCCEEDED (IMoniker_GetDisplayName(pmkOtherMoniker,bind,NULL,&dispName2))) { - if(wcscmp(dispName1,dispName2)==0) res = S_OK; - CoTaskMemFree(dispName2); - } - CoTaskMemFree(dispName1); - } - } - return res; + return !wcsicmp(moniker->itemName, other_moniker->itemName) ? S_OK : S_FALSE; } /****************************************************************************** @@ -1002,6 +990,13 @@ static const IMonikerVtbl VT_ItemMonikerImpl = ItemMonikerImpl_IsSystemMoniker }; +static ItemMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface) +{ + if (iface->lpVtbl != &VT_ItemMonikerImpl) + return NULL; + return CONTAINING_RECORD(iface, ItemMonikerImpl, IMoniker_iface); +} + /********************************************************************************/ /* Virtual function table for the IROTData class. */ static const IROTDataVtbl VT_ROTDataImpl = diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 7607468d01..e0e3020234 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2193,6 +2193,9 @@ todo_wine todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_IsEqual(moniker, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); /* IsEqual */ @@ -2205,11 +2208,9 @@ todo_wine ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); hr = IMoniker_IsEqual(moniker, moniker2); - todo_wine_if(i == 4 || i == 5) ok(hr == isequal_tests[i].hr, "%d: unexpected result %#x.\n", i, hr); hr = IMoniker_IsEqual(moniker2, moniker); - todo_wine_if(i == 4 || i == 5) ok(hr == isequal_tests[i].hr, "%d: unexpected result %#x.\n", i, hr); IMoniker_Release(moniker);

1 0

Alexandre Julliard : wmc: Get rid of some unused codepage information.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 3f26eb44551c658a310d0da55cf245818f5d875d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f26eb44551c658a310d0da5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 23 10:03:57 2020 +0100 wmc: Get rid of some unused codepage information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/lang.c | 278 ++++++++++++++++++++++++++----------------------------- tools/wmc/lang.h | 2 - tools/wmc/wmc.c | 1 - 3 files changed, 130 insertions(+), 151 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f26eb44551c658a310d…

1 0

Nikolay Sivov : ole32: Pass correct display name in ParseDisplayName() for item moniker.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 1f648ddd7ab4838df31afe9971ef1ea1e4994331 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f648ddd7ab4838df31afe99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 23 02:03:03 2020 +0300 ole32: Pass correct display name in ParseDisplayName() for item moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 73ed63fe6d..0063c323bc 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -777,7 +777,6 @@ static HRESULT WINAPI ItemMonikerImpl_ParseDisplayName(IMoniker *iface, IBindCtx ItemMonikerImpl *This = impl_from_IMoniker(iface); IOleItemContainer *container; IParseDisplayName *parser; - LPOLESTR displayName; HRESULT hr; TRACE("%p, %p, %p, %s, %p, %p.\n", iface, pbc, pmkToLeft, debugstr_w(displayname), eaten, ppmkOut); @@ -792,9 +791,7 @@ static HRESULT WINAPI ItemMonikerImpl_ParseDisplayName(IMoniker *iface, IBindCtx &IID_IParseDisplayName, (void **)&parser); if (SUCCEEDED(hr)) { - hr = IMoniker_GetDisplayName(iface,pbc,NULL,&displayName); - - hr = IParseDisplayName_ParseDisplayName(parser, pbc, displayName, eaten, ppmkOut); + hr = IParseDisplayName_ParseDisplayName(parser, pbc, displayname, eaten, ppmkOut); IParseDisplayName_Release(parser); }

1 0

Alistair Leslie-Hughes : include: Add remaining DBPROPSET_* GUID's.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 12f5fa1fd7d87d518ada0a7c7d55fd3a0975bcbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=12f5fa1fd7d87d518ada0a7c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 21 23:44:00 2020 +0000 include: Add remaining DBPROPSET_* GUID's. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbs.idl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/dbs.idl b/include/dbs.idl index 53cadedf65..d04aa09ff1 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -482,12 +482,26 @@ cpp_quote(" EXTERN_C const GUID name DECLSPEC_HIDDEN") cpp_quote("#endif") cpp_quote("DEFINE_DBGUID(DB_NULLGUID, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);") -cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_STREAM, 0xc8b522f9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_COLUMN, 0xc8b522b9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DATASOURCE, 0xc8b522ba, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DATASOURCEINFO, 0xc8b522bb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_INDEX, 0xc8b522bd, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_TABLE, 0xc8b522bf, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DATASOURCEALL, 0xc8b522c0, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DATASOURCEINFOALL, 0xc8b522c1, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_ROWSETALL, 0xc8b522c2, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_SESSION, 0xc8b522c6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_SESSIONALL, 0xc8b522c7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_PROPERTIESINERROR, 0xc8b522d4, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") + cpp_quote("#define DBPROMPT_PROMPT 0x01") cpp_quote("#define DBPROMPT_COMPLETE 0x02") cpp_quote("#define DBPROMPT_COMPLETEREQUIRED 0x03")

1 0

Biswapriyo Nath : include: Update dxva2api.idl.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 508764a8bd778178270c040adef474a1f9642652 URL: https://source.winehq.org/git/wine.git/?a=commit;h=508764a8bd778178270c040a… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Jan 22 07:18:00 2019 +0530 include: Update dxva2api.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxva2api.idl | 242 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 242 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=508764a8bd778178270c…

1 0

Zebediah Figura : quartz: Use wide character string literals.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 7770e0bbaf68e5b32788c93de3a74c0b2eec91b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7770e0bbaf68e5b32788c93d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 22 16:30:53 2020 -0600 quartz: Use wide character string literals. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 36 +++++++--------- dlls/quartz/filtergraph.c | 6 +-- dlls/quartz/filtermapper.c | 26 ++++------- dlls/quartz/main.c | 8 ++-- dlls/quartz/regsvr.c | 20 ++++----- dlls/quartz/tests/acmwrapper.c | 35 ++++++--------- dlls/quartz/tests/avidec.c | 43 ++++++++---------- dlls/quartz/tests/avisplit.c | 61 ++++++++++++-------------- dlls/quartz/tests/dsoundrender.c | 15 +++---- dlls/quartz/tests/filesource.c | 45 +++++++++---------- dlls/quartz/tests/filtergraph.c | 91 +++++++++++++++++---------------------- dlls/quartz/tests/filtermapper.c | 54 ++++++++++------------- dlls/quartz/tests/mpegsplit.c | 59 +++++++++++-------------- dlls/quartz/tests/videorenderer.c | 24 +++++------ dlls/quartz/tests/vmr7.c | 50 ++++++++------------- dlls/quartz/tests/vmr9.c | 50 ++++++++------------- dlls/quartz/tests/waveparser.c | 56 +++++++++++------------- dlls/quartz/videorenderer.c | 3 +- dlls/quartz/vmr9.c | 4 +- 19 files changed, 286 insertions(+), 400 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7770e0bbaf68e5b32788…

1 0

Nikolay Sivov : ole32: Handle GetObject() failure in ParseDisplayName() for item moniker.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: dee2fd11479a0c2cab1ed4267abab1507b6eb017 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dee2fd11479a0c2cab1ed426… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 23 02:03:02 2020 +0300 ole32: Handle GetObject() failure in ParseDisplayName() for item moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 10 ++++++---- dlls/ole32/tests/moniker.c | 4 ---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 79fb293c38..73ed63fe6d 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -790,13 +790,15 @@ static HRESULT WINAPI ItemMonikerImpl_ParseDisplayName(IMoniker *iface, IBindCtx { hr = IOleItemContainer_GetObject(container, This->itemName, get_bind_speed_from_bindctx(pbc), pbc, &IID_IParseDisplayName, (void **)&parser); + if (SUCCEEDED(hr)) + { + hr = IMoniker_GetDisplayName(iface,pbc,NULL,&displayName); - hr = IMoniker_GetDisplayName(iface,pbc,NULL,&displayName); - - hr = IParseDisplayName_ParseDisplayName(parser, pbc, displayName, eaten, ppmkOut); + hr = IParseDisplayName_ParseDisplayName(parser, pbc, displayName, eaten, ppmkOut); + IParseDisplayName_Release(parser); + } IOleItemContainer_Release(container); - IParseDisplayName_Release(parser); } return hr; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index bbd964e723..7607468d01 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2141,28 +2141,24 @@ todo_wine hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); -todo_wine ok(hr == (0x8bee0000 | BINDSPEED_INDEFINITE), "Unexpected hr %#x.\n", hr); bind_opts.dwTickCountDeadline = 1; hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); -todo_wine ok(hr == (0x8bee0000 | BINDSPEED_IMMEDIATE), "Unexpected hr %#x.\n", hr); bind_opts.dwTickCountDeadline = 2499; hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); -todo_wine ok(hr == (0x8bee0000 | BINDSPEED_IMMEDIATE), "Unexpected hr %#x.\n", hr); bind_opts.dwTickCountDeadline = 2500; hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); -todo_wine ok(hr == (0x8bee0000 | BINDSPEED_MODERATE), "Unexpected hr %#x.\n", hr); IMoniker_Release(&container_moniker->IMoniker_iface);

1 0

Nikolay Sivov : ole32: Lock item container on ParseDisplayName().
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 91fadaad98f94b742a27e9a84b069d81d174fa1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=91fadaad98f94b742a27e9a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 23 02:03:04 2020 +0300 ole32: Lock item container on ParseDisplayName(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 92 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 86 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 0063c323bc..dc7026c4fc 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -57,6 +57,84 @@ static inline ItemMonikerImpl *impl_from_IROTData(IROTData *iface) return CONTAINING_RECORD(iface, ItemMonikerImpl, IROTData_iface); } +struct container_lock +{ + IUnknown IUnknown_iface; + LONG refcount; + IOleItemContainer *container; +}; + +static struct container_lock *impl_lock_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct container_lock, IUnknown_iface); +} + +static HRESULT WINAPI container_lock_QueryInterface(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI container_lock_AddRef(IUnknown *iface) +{ + struct container_lock *lock = impl_lock_from_IUnknown(iface); + return InterlockedIncrement(&lock->refcount); +} + +static ULONG WINAPI container_lock_Release(IUnknown *iface) +{ + struct container_lock *lock = impl_lock_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&lock->refcount); + + if (!refcount) + { + IOleItemContainer_LockContainer(lock->container, FALSE); + IOleItemContainer_Release(lock->container); + heap_free(lock); + } + + return refcount; +} + +static const IUnknownVtbl container_lock_vtbl = +{ + container_lock_QueryInterface, + container_lock_AddRef, + container_lock_Release, +}; + +static HRESULT set_container_lock(IOleItemContainer *container, IBindCtx *pbc) +{ + struct container_lock *lock; + HRESULT hr; + + if (!(lock = heap_alloc(sizeof(*lock)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = IOleItemContainer_LockContainer(container, TRUE))) + { + heap_free(lock); + return hr; + } + + lock->IUnknown_iface.lpVtbl = &container_lock_vtbl; + lock->refcount = 1; + lock->container = container; + IOleItemContainer_AddRef(lock->container); + + hr = IBindCtx_RegisterObjectBound(pbc, &lock->IUnknown_iface); + IUnknown_Release(&lock->IUnknown_iface); + return hr; +} + static HRESULT ItemMonikerImpl_Destroy(ItemMonikerImpl* iface); /******************************************************************************* @@ -787,13 +865,15 @@ static HRESULT WINAPI ItemMonikerImpl_ParseDisplayName(IMoniker *iface, IBindCtx hr = IMoniker_BindToObject(pmkToLeft, pbc, NULL, &IID_IOleItemContainer, (void **)&container); if (SUCCEEDED(hr)) { - hr = IOleItemContainer_GetObject(container, This->itemName, get_bind_speed_from_bindctx(pbc), pbc, - &IID_IParseDisplayName, (void **)&parser); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr = set_container_lock(container, pbc))) { - hr = IParseDisplayName_ParseDisplayName(parser, pbc, displayname, eaten, ppmkOut); - - IParseDisplayName_Release(parser); + hr = IOleItemContainer_GetObject(container, This->itemName, get_bind_speed_from_bindctx(pbc), pbc, + &IID_IParseDisplayName, (void **)&parser); + if (SUCCEEDED(hr)) + { + hr = IParseDisplayName_ParseDisplayName(parser, pbc, displayname, eaten, ppmkOut); + IParseDisplayName_Release(parser); + } } IOleItemContainer_Release(container); }

1 0

Alistair Leslie-Hughes : include: Add directmanipulation.idl.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 2b6b3498578eab5007a26e33755a537b5c0d9437 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b6b3498578eab5007a26e33… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 21 23:43:56 2020 +0000 include: Add directmanipulation.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/directmanipulation.idl | 416 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 417 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2b6b3498578eab5007a2…

1 0