July 2008 - Wine-commits - list.winehq.org

Alexander Dorofeyev : quartz: Fix string buffer overflow.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: 10b593b2e7d1131198dacdc23a3d925e185ac1fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b593b2e7d1131198dacdc23… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Jun 29 15:07:43 2008 +0300 quartz: Fix string buffer overflow. --- dlls/quartz/filtermapper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 06ec334..c4b925c 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1472,7 +1472,7 @@ static HRESULT WINAPI FilterMapper_RegisterPinType( LPWSTR wszClsidSubType = NULL; HKEY hKey = NULL; WCHAR * wszTypesKey; - WCHAR wszKeyName[strlenW(wszClsidSlash) + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[MAX_PATH]; TRACE("(%p)->(%s, %s, %s, %s)\n", iface, debugstr_guid(&clsFilter), debugstr_w(szName), debugstr_guid(&clsMajorType), debugstr_guid(&clsSubType));

1 0

Alexander Dorofeyev : quartz/tests: Add test for IFilterMapper_RegisterFilter.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: bff9f1114aff11350f484b58fdb1e44753bf48a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff9f1114aff11350f484b58f… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Jun 29 15:07:38 2008 +0300 quartz/tests: Add test for IFilterMapper_RegisterFilter. --- dlls/quartz/tests/Makefile.in | 2 +- dlls/quartz/tests/filtermapper.c | 114 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 94cd8aa..63577c7 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = quartz.dll -IMPORTS = strmiids uuid oleaut32 ole32 kernel32 +IMPORTS = strmiids uuid oleaut32 ole32 advapi32 kernel32 CTESTS = \ filtergraph.c \ diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index b2ce800..e09497b 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -170,11 +170,125 @@ static void test_fm2_enummatchingfilters(void) if (pMapper) IFilterMapper2_Release(pMapper); } +static void test_legacy_filter_registration(void) +{ + IFilterMapper2 *pMapper2 = NULL; + IFilterMapper *pMapper = NULL; + HRESULT hr; + static const WCHAR wszFilterName[] = {'T', 'e', 's', 't', 'f', 'i', 'l', 't', 'e', 'r', 0 }; + static const WCHAR wszPinName[] = {'P', 'i', 'n', '1', 0 }; + CLSID clsidFilter; + WCHAR wszRegKey[MAX_PATH]; + static const WCHAR wszClsid[] = {'C','L','S','I','D', 0}; + static const WCHAR wszSlash[] = {'\\', 0}; + LONG lRet; + HKEY hKey = NULL; + IEnumMoniker *pEnum = NULL; + BOOL found; + IEnumRegFilters *pRegEnum = NULL; + + /* Test if legacy filter registration scheme works (filter is added to HKCR\Filter). IFilterMapper_RegisterFilter + * registers in this way. Filters so registered must then be accessible through both IFilterMapper_EnumMatchingFilters + * and IFilterMapper2_EnumMatchingFilters. */ + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterMapper2, (LPVOID*)&pMapper2); + ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); + if (FAILED(hr)) goto out; + + hr = IFilterMapper2_QueryInterface(pMapper2, &IID_IFilterMapper, (LPVOID)&pMapper); + ok(hr == S_OK, "IFilterMapper2_QueryInterface failed with %x\n", hr); + if (FAILED(hr)) goto out; + + /* Register a test filter. */ + hr = CoCreateGuid(&clsidFilter); + ok(hr == S_OK, "CoCreateGuid failed with %x\n", hr); + + lstrcpyW(wszRegKey, wszClsid); + lstrcatW(wszRegKey, wszSlash); + lRet = StringFromGUID2(&clsidFilter, wszRegKey + lstrlenW(wszRegKey), MAX_PATH - lstrlenW(wszRegKey)); + ok(lRet > 0, "StringFromGUID2 failed\n"); + if (!lRet) goto out; + + /* Register---- functions need a filter class key to write pin and pin media type data to. Create a bogus + * class key for it. */ + lRet = RegCreateKeyExW(HKEY_CLASSES_ROOT, wszRegKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); + ok(lRet == ERROR_SUCCESS, "RegCreateKeyExW failed with %x\n", HRESULT_FROM_WIN32(lRet)); + + /* Set default value - this is interpreted as "friendly name" later. */ + lRet = RegSetValueExW(hKey, NULL, 0, REG_SZ, (LPBYTE)wszFilterName, (lstrlenW(wszFilterName) + 1) * 2); + ok(lRet == ERROR_SUCCESS, "RegSetValueExW failed with %x\n", HRESULT_FROM_WIN32(lRet)); + + if (hKey) RegCloseKey(hKey); + hKey = NULL; + + hr = IFilterMapper_RegisterFilter(pMapper, clsidFilter, wszFilterName, MERIT_UNLIKELY); + ok(hr == S_OK, "IFilterMapper_RegisterFilter failed with %x\n", hr); + + hr = IFilterMapper_RegisterPin(pMapper, clsidFilter, wszPinName, TRUE, FALSE, FALSE, FALSE, GUID_NULL, NULL); + ok(hr == S_OK, "IFilterMapper_RegisterPin failed with %x\n", hr); + + hr = IFilterMapper_RegisterPinType(pMapper, clsidFilter, wszPinName, GUID_NULL, GUID_NULL); + ok(hr == S_OK, "IFilterMapper_RegisterPinType failed with %x\n", hr); + + hr = IFilterMapper2_EnumMatchingFilters(pMapper2, &pEnum, 0, TRUE, MERIT_UNLIKELY, TRUE, + 0, NULL, NULL, &GUID_NULL, FALSE, FALSE, 0, NULL, NULL, &GUID_NULL); + ok(hr == S_OK, "IFilterMapper2_EnumMatchingFilters failed with %x\n", hr); + if (SUCCEEDED(hr) && pEnum) + { + found = enum_find_filter(wszFilterName, pEnum); + ok(found, "IFilterMapper2_EnumMatchingFilters failed to return the test filter\n"); + } + + if (pEnum) IEnumMoniker_Release(pEnum); + pEnum = NULL; + + found = FALSE; + hr = IFilterMapper_EnumMatchingFilters(pMapper, &pRegEnum, MERIT_UNLIKELY, TRUE, GUID_NULL, GUID_NULL, + FALSE, FALSE, GUID_NULL, GUID_NULL); + ok(hr == S_OK, "IFilterMapper_EnumMatchingFilters failed with %x\n", hr); + if (SUCCEEDED(hr) && pRegEnum) + { + ULONG cFetched; + REGFILTER *prgf; + + while(!found && IEnumRegFilters_Next(pRegEnum, 1, &prgf, &cFetched) == S_OK) + { + if (!lstrcmpW(prgf->Name, wszFilterName)) found = TRUE; + + CoTaskMemFree(prgf); + } + + IEnumRegFilters_Release(pRegEnum); + } + ok(found, "IFilterMapper_EnumMatchingFilters failed to return the test filter\n"); + + hr = IFilterMapper_UnregisterFilter(pMapper, clsidFilter); + ok(hr == S_OK, "FilterMapper_UnregisterFilter failed with %x\n", hr); + + lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszClsid, 0, KEY_WRITE | DELETE, &hKey); + ok(lRet == ERROR_SUCCESS, "RegOpenKeyExW failed with %x\n", HRESULT_FROM_WIN32(lRet)); + + lRet = StringFromGUID2(&clsidFilter, wszRegKey, MAX_PATH); + ok(lRet > 0, "StringFromGUID2 failed\n"); + + lRet = RegDeleteTreeW(hKey, wszRegKey); + ok(lRet == ERROR_SUCCESS, "RegDeleteTreeW failed with %x\n", HRESULT_FROM_WIN32(lRet)); + + if (hKey) RegCloseKey(hKey); + hKey = NULL; + + out: + + if (pMapper) IFilterMapper_Release(pMapper); + if (pMapper2) IFilterMapper2_Release(pMapper2); +} + START_TEST(filtermapper) { CoInitialize(NULL); test_fm2_enummatchingfilters(); + test_legacy_filter_registration(); CoUninitialize(); }

1 0

Alexander Dorofeyev : quartz: Improve variant handling in FilterMapper_EnumMatchingFilters.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: 9778faee0b62c09586d73e30f8640887e1c4d17f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9778faee0b62c09586d73e30f… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Jun 29 15:07:24 2008 +0300 quartz: Improve variant handling in FilterMapper_EnumMatchingFilters. Adds VariantClear and removes unnecessary variant type assignment that may cause heap corruption. --- dlls/quartz/filtermapper.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index c4b925c..ef603d8 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1257,7 +1257,6 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( int len; VariantInit(&var); - V_VT(&var) = VT_BSTR; hrSub = IMoniker_BindToStorage(IMon, NULL, NULL, &IID_IPropertyBag, (LPVOID*)&pPropBagCat); @@ -1267,6 +1266,8 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( if (SUCCEEDED(hrSub)) hrSub = CLSIDFromString(V_UNION(&var, bstrVal), &clsid); + VariantClear(&var); + if (SUCCEEDED(hrSub)) hrSub = IPropertyBag_Read(pPropBagCat, wszFriendlyName, &var, NULL); @@ -1287,6 +1288,7 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( if (pPropBagCat) IPropertyBag_Release(pPropBagCat); IMoniker_Release(IMon); + VariantClear(&var); } /* In case of release all resources */

1 0

James Hawkins : mshtml: Fix a test failure in win2k.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: d5158cc35de5d7d27f45818ce7b98ed07d5ba7b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5158cc35de5d7d27f45818ce… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 00:01:06 2008 -0500 mshtml: Fix a test failure in win2k. --- dlls/mshtml/tests/protocol.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 9c09037..4e8b3d0 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -724,8 +724,9 @@ static void test_about_protocol(void) hres = IInternetProtocolInfo_QueryInfo(protocol_info, about_blank_url, QUERY_CAN_NAVIGATE, 0, buf, sizeof(buf), &size, 0); - ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, - "QueryInfo returned: %08x, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER\n", hres); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER || + hres == E_FAIL, /* win2k */ + "QueryInfo returned: %08x, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER or E_FAIL\n", hres); size = 0xdeadbeef; memset(buf, '?', sizeof(buf));

1 0

Alexander Dorofeyev : quartz: Improve removal of registry data in Filtermapper unregister methods.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: cd5fa7dedb5ccd05bca19e87ea574e2053e33c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd5fa7dedb5ccd05bca19e87e… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Jun 29 15:07:53 2008 +0300 quartz: Improve removal of registry data in Filtermapper unregister methods. --- dlls/quartz/filtermapper.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index bc8d4c8..06ec334 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1571,8 +1571,14 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID if (SUCCEEDED(hr)) { - lRet = RegDeleteKeyW(hKey, wszMeritName); - hr = HRESULT_FROM_WIN32(lRet); + lRet = RegDeleteValueW(hKey, wszMeritName); + if (lRet != ERROR_SUCCESS) + hr = HRESULT_FROM_WIN32(lRet); + + lRet = RegDeleteTreeW(hKey, wszPins); + if (lRet != ERROR_SUCCESS) + hr = HRESULT_FROM_WIN32(lRet); + CloseHandle(hKey); } @@ -1628,7 +1634,7 @@ static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID Fi strcatW(wszPinNameKey, wszSlash); strcatW(wszPinNameKey, Name); - lRet = RegDeleteKeyW(hKey, wszPinNameKey); + lRet = RegDeleteTreeW(hKey, wszPinNameKey); hr = HRESULT_FROM_WIN32(lRet); CoTaskMemFree(wszPinNameKey); }

1 0

Alexander Dorofeyev : devenum: Move locating category key to function, use it ParseDisplayName.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: de70686f17a37151d84ddb2d17335f365115b3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=de70686f17a37151d84ddb2d1… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Jun 29 15:07:32 2008 +0300 devenum: Move locating category key to function, use it ParseDisplayName. --- dlls/devenum/createdevenum.c | 58 +++++++++++++++++++++++---------------- dlls/devenum/devenum_private.h | 5 +++ dlls/devenum/parsedisplayname.c | 18 +++++------- 3 files changed, 47 insertions(+), 34 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 11efca2..5b9dcbc 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -96,6 +96,35 @@ static ULONG WINAPI DEVENUM_ICreateDevEnum_Release(ICreateDevEnum * iface) return 1; /* non-heap based object */ } +HRESULT DEVENUM_GetCategoryKey(REFCLSID clsidDeviceClass, HKEY *pBaseKey, WCHAR *wszRegKeyName, UINT maxLen) +{ + if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) || + IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) || + IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) || + IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory)) + { + *pBaseKey = HKEY_CURRENT_USER; + strcpyW(wszRegKeyName, wszActiveMovieKey); + + if (!StringFromGUID2(clsidDeviceClass, wszRegKeyName + strlenW(wszRegKeyName), maxLen - strlenW(wszRegKeyName))) + return E_OUTOFMEMORY; + } + else + { + *pBaseKey = HKEY_CLASSES_ROOT; + strcpyW(wszRegKeyName, clsid_keyname); + strcatW(wszRegKeyName, wszRegSeparator); + + if (!StringFromGUID2(clsidDeviceClass, wszRegKeyName + CLSID_STR_LEN, maxLen - CLSID_STR_LEN)) + return E_OUTOFMEMORY; + + strcatW(wszRegKeyName, wszRegSeparator); + strcatW(wszRegKeyName, wszInstanceKeyName); + } + + return S_OK; +} + /********************************************************************** * DEVENUM_ICreateDevEnum_CreateClassEnumerator */ @@ -108,6 +137,7 @@ HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( WCHAR wszRegKey[MAX_PATH]; HKEY hkey; HKEY hbasekey; + HRESULT hr; CreateDevEnumImpl *This = (CreateDevEnumImpl *)iface; TRACE("(%p)->(%s, %p, %x)\n\tDeviceClass:\t%s\n", This, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass)); @@ -117,29 +147,9 @@ HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( *ppEnumMoniker = NULL; - if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory)) - { - hbasekey = HKEY_CURRENT_USER; - strcpyW(wszRegKey, wszActiveMovieKey); - - if (!StringFromGUID2(clsidDeviceClass, wszRegKey + strlenW(wszRegKey), MAX_PATH - strlenW(wszRegKey))) - return E_OUTOFMEMORY; - } - else - { - hbasekey = HKEY_CLASSES_ROOT; - strcpyW(wszRegKey, clsid_keyname); - strcatW(wszRegKey, wszRegSeparator); - - if (!StringFromGUID2(clsidDeviceClass, wszRegKey + CLSID_STR_LEN, MAX_PATH - CLSID_STR_LEN)) - return E_OUTOFMEMORY; - - strcatW(wszRegKey, wszRegSeparator); - strcatW(wszRegKey, wszInstanceKeyName); - } + hr = DEVENUM_GetCategoryKey(clsidDeviceClass, &hbasekey, wszRegKey, MAX_PATH); + if (FAILED(hr)) + return hr; if (RegOpenKeyW(hbasekey, wszRegKey, &hkey) != ERROR_SUCCESS) { @@ -148,7 +158,7 @@ HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) || IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory)) { - HRESULT hr = DEVENUM_CreateSpecialCategories(); + hr = DEVENUM_CreateSpecialCategories(); if (FAILED(hr)) return hr; if (RegOpenKeyW(hbasekey, wszRegKey, &hkey) != ERROR_SUCCESS) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 061a8f4..b50afb8 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -93,6 +93,11 @@ extern CreateDevEnumImpl DEVENUM_CreateDevEnum; extern ParseDisplayNameImpl DEVENUM_ParseDisplayName; /********************************************************************** + * Private helper function to get AM filter category key location + */ +HRESULT DEVENUM_GetCategoryKey(REFCLSID clsidDeviceClass, HKEY *pBaseKey, WCHAR *wszRegKeyName, UINT maxLen); + +/********************************************************************** * Global string constant declarations */ extern const WCHAR clsid_keyname[6]; diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index 0305c98..4025215 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -90,11 +90,13 @@ static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName( { LPOLESTR pszBetween = NULL; LPOLESTR pszClass = NULL; - IEnumMoniker * pEm = NULL; MediaCatMoniker * pMoniker = NULL; CLSID clsidDevice; HRESULT res = S_OK; + WCHAR wszRegKeyName[MAX_PATH]; + HKEY hbasekey; int classlen; + static const WCHAR wszRegSeparator[] = {'\\', 0 }; TRACE("(%p, %s, %p, %p)\n", pbc, debugstr_w(pszDisplayName), pchEaten, ppmkOut); @@ -122,9 +124,7 @@ static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName( if (SUCCEEDED(res)) { - res = DEVENUM_ICreateDevEnum_CreateClassEnumerator((ICreateDevEnum *)(char*)&DEVENUM_CreateDevEnum, &clsidDevice, &pEm, 0); - if (res == S_FALSE) /* S_FALSE means no category */ - res = MK_E_NOOBJECT; + res = DEVENUM_GetCategoryKey(&clsidDevice, &hbasekey, wszRegKeyName, MAX_PATH); } if (SUCCEEDED(res)) @@ -132,9 +132,10 @@ static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName( pMoniker = DEVENUM_IMediaCatMoniker_Construct(); if (pMoniker) { - if (RegCreateKeyW(((EnumMonikerImpl *)pEm)->hkey, - pszBetween, - &pMoniker->hkey) == ERROR_SUCCESS) + strcatW(wszRegKeyName, wszRegSeparator); + strcatW(wszRegKeyName, pszBetween); + + if (RegCreateKeyW(hbasekey, wszRegKeyName, &pMoniker->hkey) == ERROR_SUCCESS) *ppmkOut = (LPMONIKER)pMoniker; else { @@ -144,9 +145,6 @@ static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName( } } - if (pEm) - IEnumMoniker_Release(pEm); - CoTaskMemFree(pszClass); TRACE("-- returning: %x\n", res);

1 0

Alexander Dorofeyev : quartz/tests: Add test for EnumMatchingFilters.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: d19ad8f072100e4efc41f4ab6ec0b47e0b380a2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d19ad8f072100e4efc41f4ab6… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Jun 29 15:06:44 2008 +0300 quartz/tests: Add test for EnumMatchingFilters. --- dlls/quartz/tests/Makefile.in | 3 +- dlls/quartz/tests/filtermapper.c | 180 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 182 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 10f1046..94cd8aa 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -3,10 +3,11 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = quartz.dll -IMPORTS = strmiids uuid ole32 kernel32 +IMPORTS = strmiids uuid oleaut32 ole32 kernel32 CTESTS = \ filtergraph.c \ + filtermapper.c \ memallocator.c \ misc.c \ referenceclock.c \ diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c new file mode 100644 index 0000000..b2ce800 --- /dev/null +++ b/dlls/quartz/tests/filtermapper.c @@ -0,0 +1,180 @@ +/* + * Filtermapper unit tests for Quartz + * + * Copyright (C) 2008 Alexander Dorofeyev + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "wine/test.h" +#include "winbase.h" +#include "dshow.h" + +/* Helper function, checks if filter with given name was enumerated. */ +static BOOL enum_find_filter(const WCHAR *wszFilterName, IEnumMoniker *pEnum) +{ + IMoniker *pMoniker = NULL; + BOOL found = FALSE; + ULONG nb; + HRESULT hr; + static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; + + while(!found && IEnumMoniker_Next(pEnum, 1, &pMoniker, &nb) == S_OK) + { + IPropertyBag * pPropBagCat = NULL; + VARIANT var; + + VariantInit(&var); + + hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID*)&pPropBagCat); + ok(SUCCEEDED(hr), "IMoniker_BindToStorage failed with %x\n", hr); + if (FAILED(hr) || !pPropBagCat) + { + VariantClear(&var); + IMoniker_Release(pMoniker); + continue; + } + + hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, &var, NULL); + ok(SUCCEEDED(hr), "IPropertyBag_Read failed with %x\n", hr); + + if (SUCCEEDED(hr)) + { + if (!lstrcmpW((WCHAR*)V_UNION(&var, bstrVal), wszFilterName)) found = TRUE; + } + + IPropertyBag_Release(pPropBagCat); + IMoniker_Release(pMoniker); + VariantClear(&var); + } + + return found; +} + +static void test_fm2_enummatchingfilters(void) +{ + IFilterMapper2 *pMapper = NULL; + HRESULT hr; + REGFILTER2 rgf2; + REGFILTERPINS2 rgPins2[2]; + REGPINTYPES rgPinType; + static const WCHAR wszFilterName1[] = {'T', 'e', 's', 't', 'f', 'i', 'l', 't', 'e', 'r', '1', 0 }; + static const WCHAR wszFilterName2[] = {'T', 'e', 's', 't', 'f', 'i', 'l', 't', 'e', 'r', '2', 0 }; + CLSID clsidFilter1; + CLSID clsidFilter2; + IEnumMoniker *pEnum = NULL; + BOOL found; + + ZeroMemory(&rgf2, sizeof(rgf2)); + + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterMapper2, (LPVOID*)&pMapper); + ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); + if (FAILED(hr)) goto out; + + hr = CoCreateGuid(&clsidFilter1); + ok(hr == S_OK, "CoCreateGuid failed with %x\n", hr); + hr = CoCreateGuid(&clsidFilter2); + ok(hr == S_OK, "CoCreateGuid failed with %x\n", hr); + + /* Test that a test renderer filter is returned when enumerating filters with bRender=FALSE */ + rgf2.dwVersion = 2; + rgf2.dwMerit = MERIT_UNLIKELY; + S1(U(rgf2)).cPins2 = 1; + S1(U(rgf2)).rgPins2 = rgPins2; + + rgPins2[0].dwFlags = REG_PINFLAG_B_RENDERER; + rgPins2[0].cInstances = 1; + rgPins2[0].nMediaTypes = 1; + rgPins2[0].lpMediaType = &rgPinType; + rgPins2[0].nMediums = 0; + rgPins2[0].lpMedium = NULL; + rgPins2[0].clsPinCategory = NULL; + + rgPinType.clsMajorType = &GUID_NULL; + rgPinType.clsMinorType = &GUID_NULL; + + hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter1, wszFilterName1, NULL, + &CLSID_LegacyAmFilterCategory, NULL, &rgf2); + ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); + + rgPins2[0].dwFlags = 0; + + rgPins2[1].dwFlags = REG_PINFLAG_B_OUTPUT; + rgPins2[1].cInstances = 1; + rgPins2[1].nMediaTypes = 1; + rgPins2[1].lpMediaType = &rgPinType; + rgPins2[1].nMediums = 0; + rgPins2[1].lpMedium = NULL; + rgPins2[1].clsPinCategory = NULL; + + S1(U(rgf2)).cPins2 = 2; + + hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter2, wszFilterName2, NULL, + &CLSID_LegacyAmFilterCategory, NULL, &rgf2); + ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); + + hr = IFilterMapper2_EnumMatchingFilters(pMapper, &pEnum, 0, TRUE, MERIT_UNLIKELY, TRUE, + 0, NULL, NULL, &GUID_NULL, FALSE, FALSE, 0, NULL, NULL, &GUID_NULL); + ok(hr == S_OK, "IFilterMapper2_EnumMatchingFilters failed with %x\n", hr); + if (SUCCEEDED(hr) && pEnum) + { + found = enum_find_filter(wszFilterName1, pEnum); + ok(found, "EnumMatchingFilters failed to return the test filter 1\n"); + found = enum_find_filter(wszFilterName2, pEnum); + ok(found, "EnumMatchingFilters failed to return the test filter 2\n"); + } + + if (pEnum) IEnumMoniker_Release(pEnum); + pEnum = NULL; + + /* Non renderer must not be returned with bRender=TRUE */ + + hr = IFilterMapper2_EnumMatchingFilters(pMapper, &pEnum, 0, TRUE, MERIT_UNLIKELY, TRUE, + 0, NULL, NULL, &GUID_NULL, TRUE, FALSE, 0, NULL, NULL, &GUID_NULL); + ok(hr == S_OK, "IFilterMapper2_EnumMatchingFilters failed with %x\n", hr); + + if (SUCCEEDED(hr) && pEnum) + { + found = enum_find_filter(wszFilterName1, pEnum); + ok(found, "EnumMatchingFilters failed to return the test filter 1\n"); + found = enum_find_filter(wszFilterName2, pEnum); + ok(!found, "EnumMatchingFilters should not return the test filter 2\n"); + } + + hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, + &clsidFilter1); + ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + + hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, + &clsidFilter2); + ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + + out: + + if (pEnum) IEnumMoniker_Release(pEnum); + if (pMapper) IFilterMapper2_Release(pMapper); +} + +START_TEST(filtermapper) +{ + CoInitialize(NULL); + + test_fm2_enummatchingfilters(); + + CoUninitialize(); +}

1 0

Alexander Dorofeyev : quartz: Fix calculating wide string size.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: d6df8996034fe430d75470edd990f1fd4bd1a976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6df8996034fe430d75470edd… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Jun 29 15:06:51 2008 +0300 quartz: Fix calculating wide string size. --- dlls/quartz/filtermapper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 7f7e688..0676e90 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1330,7 +1330,7 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface, CLSID c if (SUCCEEDED(hr)) { - lRet = RegSetValueExW(hKey, NULL, 0, REG_SZ, (const BYTE*)szName, strlenW(szName) + 1); + lRet = RegSetValueExW(hKey, NULL, 0, REG_SZ, (const BYTE*)szName, (strlenW(szName) + 1) * sizeof(WCHAR)); hr = HRESULT_FROM_WIN32(lRet); CloseHandle(hKey); }

1 0

Alexander Dorofeyev : quartz: Fix registry key creation.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: f9e2914ed6780ec88b64c7f00d2a10ae41f7068b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e2914ed6780ec88b64c7f00… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Jun 29 15:07:49 2008 +0300 quartz: Fix registry key creation. --- dlls/quartz/filtermapper.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 0676e90..bc8d4c8 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1440,8 +1440,12 @@ static HRESULT WINAPI FilterMapper_RegisterPin( if (SUCCEEDED(hr)) { - lRet = RegCreateKeyExW(hPinsKey, wszTypes, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, NULL, NULL); + HKEY hkeyDummy = NULL; + + lRet = RegCreateKeyExW(hPinsKey, wszTypes, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkeyDummy, NULL); hr = HRESULT_FROM_WIN32(lRet); + + if (hkeyDummy) RegCloseKey(hkeyDummy); } CoTaskMemFree(wszClsid); @@ -1511,13 +1515,17 @@ static HRESULT WINAPI FilterMapper_RegisterPinType( if (SUCCEEDED(hr)) { + HKEY hkeyDummy = NULL; + strcpyW(wszKeyName, wszClsidMajorType); strcatW(wszKeyName, wszSlash); strcatW(wszKeyName, wszClsidSubType); - lRet = RegCreateKeyExW(hKey, wszKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, NULL, NULL); + lRet = RegCreateKeyExW(hKey, wszKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkeyDummy, NULL); hr = HRESULT_FROM_WIN32(lRet); CloseHandle(hKey); + + if (hkeyDummy) RegCloseKey(hkeyDummy); } CoTaskMemFree(wszClsid);

1 0

Juan Lang : richedit: Only send update events in 1. 0 emulation mode if the event mask specifies it.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: c40c08b3d3b74c0c98c8de462270d98130423396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c40c08b3d3b74c0c98c8de462… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jun 28 18:04:58 2008 -0700 richedit: Only send update events in 1.0 emulation mode if the event mask specifies it. Fixes a crash in native cryptui.dll when viewing certificate properties. --- dlls/riched20/paint.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 95befbc..a2bc7c5 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -98,7 +98,8 @@ void ME_Repaint(ME_TextEditor *editor) ME_UpdateScrollBar(editor); FIXME("ME_Repaint had to call ME_WrapMarkedParagraphs\n"); } - ME_SendOldNotify(editor, EN_UPDATE); + if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) + ME_SendOldNotify(editor, EN_UPDATE); UpdateWindow(editor->hWnd); }

1 0