January 2020 - Wine-commits

Zebediah Figura : quartz: Simplify FilterMapper_RegisterPinType().
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: e44948a2c274e484bcdaeacf1e72259e1df337b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e44948a2c274e484bcdaeacf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 22 16:30:50 2020 -0600 quartz: Simplify FilterMapper_RegisterPinType(). Avoid some unnecessary allocations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 96 ++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 67 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index f7259a1650..32d3e1a822 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1214,81 +1214,43 @@ static HRESULT WINAPI FilterMapper_RegisterPin(IFilterMapper *iface, CLSID clsid } -static HRESULT WINAPI FilterMapper_RegisterPinType( - IFilterMapper * iface, - CLSID clsFilter, - LPCWSTR szName, - CLSID clsMajorType, - CLSID clsSubType) +static HRESULT WINAPI FilterMapper_RegisterPinType(IFilterMapper *iface, + CLSID clsid, const WCHAR *pin, CLSID majortype, CLSID subtype) { - HRESULT hr; - LONG lRet; - LPWSTR wszClsid = NULL; - LPWSTR wszClsidMajorType = NULL; - LPWSTR wszClsidSubType = NULL; - HKEY hKey = NULL; - WCHAR * wszTypesKey; - WCHAR wszKeyName[MAX_PATH]; - - TRACE("(%p)->(%s, %s, %s, %s)\n", iface, debugstr_guid(&clsFilter), debugstr_w(szName), - debugstr_guid(&clsMajorType), debugstr_guid(&clsSubType)); - - hr = StringFromCLSID(&clsFilter, &wszClsid); - - if (SUCCEEDED(hr)) - { - hr = StringFromCLSID(&clsMajorType, &wszClsidMajorType); - } + WCHAR *keypath, type_keypath[38 + 1 + 38 + 1]; + HKEY key, type_key; + size_t len; + LONG ret; - if (SUCCEEDED(hr)) - { - hr = StringFromCLSID(&clsSubType, &wszClsidSubType); - } + TRACE("iface %p, clsid %s, pin %s, majortype %s, subtype %s.\n", iface, + debugstr_guid(&clsid), debugstr_w(pin), debugstr_guid(&majortype), debugstr_guid(&subtype)); - if (SUCCEEDED(hr)) - { - wszTypesKey = CoTaskMemAlloc((lstrlenW(wszClsidSlash) + lstrlenW(wszClsid) + lstrlenW(wszPins) + - lstrlenW(szName) + lstrlenW(wszTypes) + 3 + 1) * 2); - if (!wszTypesKey) - hr = E_OUTOFMEMORY; - } - - if (SUCCEEDED(hr)) - { - lstrcpyW(wszTypesKey, wszClsidSlash); - lstrcatW(wszTypesKey, wszClsid); - lstrcatW(wszTypesKey, wszSlash); - lstrcatW(wszTypesKey, wszPins); - lstrcatW(wszTypesKey, wszSlash); - lstrcatW(wszTypesKey, szName); - lstrcatW(wszTypesKey, wszSlash); - lstrcatW(wszTypesKey, wszTypes); - - lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszTypesKey, 0, KEY_WRITE, &hKey); - hr = HRESULT_FROM_WIN32(lRet); - CoTaskMemFree(wszTypesKey); - } + len = 6 + 38 + 6 + wcslen(pin) + 6 + 1; + if (!(keypath = malloc(len * sizeof(WCHAR)))) + return E_OUTOFMEMORY; - if (SUCCEEDED(hr)) + wcscpy(keypath, L"CLSID\\"); + StringFromGUID2(&clsid, keypath + wcslen(keypath), len - wcslen(keypath)); + wcscat(keypath, L"\\Pins\\"); + wcscat(keypath, pin); + wcscat(keypath, L"\\Types"); + if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, keypath, 0, KEY_CREATE_SUB_KEY, &key))) { - HKEY hkeyDummy = NULL; - - lstrcpyW(wszKeyName, wszClsidMajorType); - lstrcatW(wszKeyName, wszSlash); - lstrcatW(wszKeyName, wszClsidSubType); - - lRet = RegCreateKeyExW(hKey, wszKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkeyDummy, NULL); - hr = HRESULT_FROM_WIN32(lRet); - RegCloseKey(hKey); - - if (hkeyDummy) RegCloseKey(hkeyDummy); + free(keypath); + return HRESULT_FROM_WIN32(ret); } + free(keypath); - CoTaskMemFree(wszClsid); - CoTaskMemFree(wszClsidMajorType); - CoTaskMemFree(wszClsidSubType); + StringFromGUID2(&majortype, type_keypath, ARRAY_SIZE(type_keypath)); + wcscat(type_keypath, L"\\"); + StringFromGUID2(&subtype, type_keypath + wcslen(type_keypath), ARRAY_SIZE(type_keypath) - wcslen(type_keypath)); + if (!(ret = RegCreateKeyExW(key, type_keypath, 0, NULL, 0, 0, NULL, &type_key, NULL))) + RegCloseKey(type_key); + else + ERR("Failed to create type key, error %u.\n", ret); - return hr; + RegCloseKey(key); + return HRESULT_FROM_WIN32(ret); } static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID Filter)

1 0

Zebediah Figura : quartz: Simplify FilterMapper_UnregisterFilter().
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: 021354c5541aeb353c653c5594fc95b2465215b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=021354c5541aeb353c653c55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 22 16:30:51 2020 -0600 quartz: Simplify FilterMapper_UnregisterFilter(). Avoid some unnecessary allocations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 71 ++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 49 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 32d3e1a822..dde4a6caa5 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -83,12 +83,8 @@ static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a', static const WCHAR wszMeritName[] = {'M','e','r','i','t',0}; /* FilterData property in media category Moniker (not CLSID_ActiveMovieCategories) */ static const WCHAR wszFilterDataName[] = {'F','i','l','t','e','r','D','a','t','a',0}; -/* For filters registered with IFilterMapper */ -static const WCHAR wszFilter[] = {'F','i','l','t','e','r',0}; /* For pins registered with IFilterMapper */ static const WCHAR wszPins[] = {'P','i','n','s',0}; -/* For types registered with IFilterMapper */ -static const WCHAR wszTypes[] = {'T','y','p','e','s',0}; /* registry format for REGFILTER2 */ @@ -1253,59 +1249,36 @@ static HRESULT WINAPI FilterMapper_RegisterPinType(IFilterMapper *iface, return HRESULT_FROM_WIN32(ret); } -static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID Filter) +static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper *iface, CLSID clsid) { - HRESULT hr; - LONG lRet; - LPWSTR wszClsid = NULL; - HKEY hKey; - WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; - - TRACE("(%p)->(%s)\n", iface, debugstr_guid(&Filter)); - - hr = StringFromCLSID(&Filter, &wszClsid); - - if (SUCCEEDED(hr)) - { - lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszFilter, 0, KEY_WRITE, &hKey); - hr = HRESULT_FROM_WIN32(lRet); - } + WCHAR guidstr[39], keypath[6 + 38 + 1]; + LONG ret; + HKEY key; - if (SUCCEEDED(hr)) - { - lRet = RegDeleteKeyW(hKey, wszClsid); - hr = HRESULT_FROM_WIN32(lRet); - RegCloseKey(hKey); - } + TRACE("iface %p, clsid %s.\n", iface, debugstr_guid(&clsid)); - if (SUCCEEDED(hr)) - { - lstrcpyW(wszKeyName, wszClsidSlash); - lstrcatW(wszKeyName, wszClsid); + StringFromGUID2(&clsid, guidstr, ARRAY_SIZE(guidstr)); - lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, KEY_WRITE, &hKey); - if (lRet == ERROR_FILE_NOT_FOUND) - goto done; - hr = HRESULT_FROM_WIN32(lRet); - } + if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Filter", 0, 0, &key))) + return HRESULT_FROM_WIN32(ret); + if ((ret = RegDeleteKeyW(key, guidstr))) + ERR("Failed to delete filter key, error %u.\n", ret); + RegCloseKey(key); - if (SUCCEEDED(hr)) + wcscpy(keypath, L"CLSID\\"); + wcscat(keypath, guidstr); + if (!(ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, keypath, 0, KEY_WRITE, &key))) { - lRet = RegDeleteValueW(hKey, wszMeritName); - if (lRet != ERROR_SUCCESS && lRet != ERROR_FILE_NOT_FOUND) - hr = HRESULT_FROM_WIN32(lRet); - - lRet = RegDeleteTreeW(hKey, wszPins); - if (lRet != ERROR_SUCCESS && lRet != ERROR_FILE_NOT_FOUND) - hr = HRESULT_FROM_WIN32(lRet); - - RegCloseKey(hKey); + if ((ret = RegDeleteValueW(key, L"Merit"))) + ERR("Failed to delete Merit value, error %u.\n", ret); + if ((ret = RegDeleteTreeW(key, L"Pins"))) + ERR("Failed to delete Pins key, error %u.\n", ret); + RegCloseKey(key); } + else + ERR("Failed to open CLSID key, error %u.\n", ret); -done: - CoTaskMemFree(wszClsid); - - return hr; + return S_OK; } static HRESULT WINAPI FilterMapper_UnregisterFilterInstance(IFilterMapper * iface, CLSID MRId)

1 0

Zebediah Figura : quartz: Simplify FilterMapper_UnregisterPin().
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: c947dab09dda58ef1ca76ff79279694f19f3631f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c947dab09dda58ef1ca76ff7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 22 16:30:52 2020 -0600 quartz: Simplify FilterMapper_UnregisterPin(). Avoid some unnecessary allocations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 60 ++++++++++++---------------------------------- 1 file changed, 15 insertions(+), 45 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index dde4a6caa5..84338e39c3 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -72,9 +72,6 @@ static inline FilterMapper3Impl *impl_from_IUnknown( IUnknown *iface ) return CONTAINING_RECORD(iface, FilterMapper3Impl, IUnknown_inner); } -static const WCHAR wszClsidSlash[] = {'C','L','S','I','D','\\',0}; -static const WCHAR wszSlash[] = {'\\',0}; - /* CLSID property in media category Moniker */ static const WCHAR wszClsidName[] = {'C','L','S','I','D',0}; /* FriendlyName property in media category Moniker */ @@ -83,8 +80,6 @@ static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a', static const WCHAR wszMeritName[] = {'M','e','r','i','t',0}; /* FilterData property in media category Moniker (not CLSID_ActiveMovieCategories) */ static const WCHAR wszFilterDataName[] = {'F','i','l','t','e','r','D','a','t','a',0}; -/* For pins registered with IFilterMapper */ -static const WCHAR wszPins[] = {'P','i','n','s',0}; /* registry format for REGFILTER2 */ @@ -1290,54 +1285,29 @@ static HRESULT WINAPI FilterMapper_UnregisterFilterInstance(IFilterMapper * ifac return E_NOTIMPL; } -static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID Filter, LPCWSTR Name) +static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID clsid, const WCHAR *name) { - HRESULT hr; - LONG lRet; - LPWSTR wszClsid = NULL; - HKEY hKey = NULL; - WCHAR * wszPinNameKey; - WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; + WCHAR keypath[6 + 38 + 5 + 1]; + LONG ret; + HKEY key; - TRACE("(%p)->(%s, %s)\n", iface, debugstr_guid(&Filter), debugstr_w(Name)); + TRACE("iface %p, clsid %s, name %s.\n", iface, debugstr_guid(&clsid), debugstr_w(name)); - if (!Name) + if (!name) return E_INVALIDARG; - hr = StringFromCLSID(&Filter, &wszClsid); - - if (SUCCEEDED(hr)) - { - lstrcpyW(wszKeyName, wszClsidSlash); - lstrcatW(wszKeyName, wszClsid); - - lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, KEY_WRITE, &hKey); - hr = HRESULT_FROM_WIN32(lRet); - } - - if (SUCCEEDED(hr)) - { - wszPinNameKey = CoTaskMemAlloc((lstrlenW(wszPins) + 1 + lstrlenW(Name) + 1) * 2); - if (!wszPinNameKey) - hr = E_OUTOFMEMORY; - } - - if (SUCCEEDED(hr)) - { - lstrcpyW(wszPinNameKey, wszPins); - lstrcatW(wszPinNameKey, wszSlash); - lstrcatW(wszPinNameKey, Name); + wcscpy(keypath, L"CLSID\\"); + StringFromGUID2(&clsid, keypath + wcslen(keypath), ARRAY_SIZE(keypath) - wcslen(keypath)); + wcscat(keypath, L"\\Pins"); + if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, keypath, 0, 0, &key))) + return HRESULT_FROM_WIN32(ret); - lRet = RegDeleteTreeW(hKey, wszPinNameKey); - hr = HRESULT_FROM_WIN32(lRet); - CoTaskMemFree(wszPinNameKey); - } + if ((ret = RegDeleteTreeW(key, name))) + ERR("Failed to delete subkey, error %u.\n", ret); - CoTaskMemFree(wszClsid); - if (hKey) - RegCloseKey(hKey); + RegCloseKey(key); - return hr; + return S_OK; } static const IFilterMapperVtbl fmvtbl =

1 0

Zebediah Figura : quartz: Use wide character string literals.
by Alexandre Julliard 23 Jan '20

23 Jan '20

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 23 Jan '20

23 Jan '20

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: Pass correct display name in ParseDisplayName() for item moniker.
by Alexandre Julliard 23 Jan '20

23 Jan '20

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

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

23 Jan '20

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

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

23 Jan '20

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 23 Jan '20

23 Jan '20

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 23 Jan '20

23 Jan '20

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