March 2018 - Wine-devel - list.winehq.org

[PATCH 1/4] regedit: Use monospace font for hex edit dialog.
by Zebediah Figura 11 Mar '18

11 Mar '18

For https://bugs.winehq.org/show_bug.cgi?id=42563 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- programs/regedit/edit.c | 1 + programs/regedit/hexedit.c | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index c8b77bd..c982791 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -151,6 +151,7 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara else SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, g_pszDefaultValueName); SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->cbData, (LPARAM)params->pData); + SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, WM_SETFONT, (WPARAM) GetStockObject(ANSI_FIXED_FONT), TRUE); return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index fc6c3a3..46d9b82 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -330,16 +330,6 @@ HexEdit_Char (HEXEDIT_INFO *infoPtr, WCHAR ch) } static inline LRESULT -HexEdit_Create (HEXEDIT_INFO *infoPtr, LPCREATESTRUCTW lpcs) -{ - HexEdit_SetFont(infoPtr, GetStockObject(SYSTEM_FONT), FALSE); - HexEdit_UpdateScrollbars(infoPtr); - - return 0; -} - - -static inline LRESULT HexEdit_Destroy (HEXEDIT_INFO *infoPtr) { HWND hwnd = infoPtr->hwndSelf; @@ -630,9 +620,6 @@ HexEdit_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_CHAR: return HexEdit_Char (infoPtr, (WCHAR)wParam); - case WM_CREATE: - return HexEdit_Create (infoPtr, (LPCREATESTRUCTW)lParam); - case WM_DESTROY: return HexEdit_Destroy (infoPtr); -- 2.7.4

1 3

[PATCH] kernel32: Add forward slash path handling to GetVolumePathNameW.
by Mark White 11 Mar '18

11 Mar '18

From: Mark White <chopinbig2(a)gmail.com> Fixes https://bugs.winehq.org/show_bug.cgi?id=42446 GetVolumePathNameW is causing some incompatibity problems with some Windows applications such as Native Instruments "Native Access" because of an inability to handle path names containing forward slash's whereas the Windows GetVolumePathName's behaviour handles path names with both forward and back slash's. Tested on Debian Stretch and Windows Vista Signed-off-by: Mark White <chopinbig2(a)gmail.com> --- dlls/kernel32/tests/volume.c | 4 ++++ dlls/kernel32/volume.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 365e38c444..c47043d288 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -772,6 +772,10 @@ static void test_GetVolumePathNameA(void) "s:omefile", "S:\\" /* win2k, winxp */, sizeof(volume_path), ERROR_FILE_NOT_FOUND, NO_ERROR }, + { /* test 42: a reasonable forward slash path that is guaranteed to exist */ + "C:/windows/system32", "C:\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, }; BOOL ret, success; DWORD error; diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index b4163f02eb..ac887b2f3f 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1670,6 +1670,7 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu WCHAR fallbackpathW[] = { 'C',':','\\',0 }; NTSTATUS status = STATUS_SUCCESS; WCHAR *volumenameW = NULL, *c; + WCHAR *fwdslash; int pos, last_pos, stop_pos; UNICODE_STRING nt_name; ANSI_STRING unix_name; @@ -1693,6 +1694,8 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu return FALSE; } strcpyW( volumenameW, filename ); + /* forward slash backslash replace */ + for (fwdslash = volumenameW; *fwdslash; fwdslash++) if (*fwdslash == '/') *fwdslash = '\\'; stop_pos = 0; /* stop searching slashes early for NT-type and nearly NT-type paths */ if (strncmpW(ntprefixW, filename, strlenW(ntprefixW)) == 0) -- 2.11.0

2 1

GSOC
by Abhishek Kumar 11 Mar '18

11 Mar '18

hi when i click on properties in background menu, nothing happens .Any idea to implement this. Output in terminal *BackgroundMenu_InvokeCommand launch item properties dialog* . Please reply soon as possible. Abhishek

1 0

[PATCH] user32: Add more ex-style trace messages.
by Akihiro Sagawa 11 Mar '18

11 Mar '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/win.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

1 0

Re: GSOC
by Abhishek Kumar 11 Mar '18

11 Mar '18

I think that it could be Shortcut.

1 0

Re: GSOC
by Austin English 11 Mar '18

11 Mar '18

On Fri, Mar 9, 2018 at 3:09 PM, Abhishek Kumar <abhishek.sec09(a)gmail.com> wrote: > > ---------- Forwarded message ---------- > From: Abhishek Kumar <abhishek.sec09(a)gmail.com> > Date: Sat, Mar 10, 2018 at 12:36 AM > Subject: Re: GSOC > To: Stefan Dösinger <stefandoesinger(a)gmail.com> > > > When i have to submit the patch? > I think that i have to submit patch after proposing the idea in the > application(accepted). > Again, please _bottom post_ and keep wine-devel in CC. You should ideally have submitted a patch by the time you've sent in your GSOC application. Your patch MUST be accepted by March 27 16:00 UTC (student application deadline). I would HIGHLY recommend against waiting until the last minute. -- -Austin GPG: 267B CC1F 053F 0749 (expires 2021/02/18)

3 3

[PATCH] crypt32: Add CryptSIPRetrieveSubjectGuidForCatalogFile stub
by Alistair Leslie-Hughes 11 Mar '18

11 Mar '18

Fixes: https://bugs.winehq.org/show_bug.cgi?id=44707 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/sip.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index fc0955e009..0bc78a158d 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -177,6 +177,7 @@ @ stdcall CryptSIPRemoveProvider(ptr) @ stdcall CryptSIPRemoveSignedDataMsg(ptr long) @ stdcall CryptSIPRetrieveSubjectGuid(wstr long ptr) +@ stdcall CryptSIPRetrieveSubjectGuidForCatalogFile(wstr long ptr) @ stdcall CryptSIPVerifyIndirectData(ptr ptr) @ stub CryptSetAsyncParam @ stdcall CryptSetOIDFunctionValue(long str str wstr long ptr long) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index 8b561fdc2c..b0c4692c1f 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -801,3 +801,13 @@ BOOL WINAPI CryptSIPVerifyIndirectData(SIP_SUBJECTINFO* pSubjectInfo, TRACE("returning %d\n", ret); return ret; } + +/*********************************************************************** + * CryptSIPRetrieveSubjectGuidForCatalogFile (CRYPT32.@) + */ +BOOL WINAPI CryptSIPRetrieveSubjectGuidForCatalogFile(LPCWSTR filename, HANDLE handle, GUID *subject) +{ + FIXME("(%s %p %p)\n", debugstr_w(filename), handle, subject); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; +} -- 2.16.1

1 0

[PATCH 1/2] devenum: Register legacy AM filters as devenum codecs, not through FilterMapper2.
by Zebediah Figura 11 Mar '18

11 Mar '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This fixes one facet of the error originally reported here: https://www.winehq.org/pipermail/wine-devel/2018-March/123533.html dlls/devenum/Makefile.in | 4 +- dlls/devenum/createdevenum.c | 255 +++++++++++++++++++++++++-------------- dlls/devenum/fil_data.idl | 47 ++++++++ dlls/devenum/tests/devenum.c | 76 +++++++++++- dlls/quartz/tests/filtermapper.c | 18 +++ 5 files changed, 307 insertions(+), 93 deletions(-) create mode 100644 dlls/devenum/fil_data.idl diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in index 38ca83d..0a7e903 100644 --- a/dlls/devenum/Makefile.in +++ b/dlls/devenum/Makefile.in @@ -9,6 +9,8 @@ C_SRCS = \ mediacatenum.c \ parsedisplayname.c -IDL_SRCS = devenum_classes.idl +IDL_SRCS = \ + devenum_classes.idl \ + fil_data.idl RC_SRCS = devenum.rc diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index c1e29fc..a6f6626 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -32,8 +32,12 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "mmddk.h" +#include "initguid.h" +#include "fil_data.h" + WINE_DEFAULT_DEBUG_CHANNEL(devenum); extern HINSTANCE DEVENUM_hInstance; @@ -50,9 +54,11 @@ static const WCHAR wszTypes[] = {'T','y','p','e','s',0}; static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; static const WCHAR wszWaveInID[] = {'W','a','v','e','I','n','I','D',0}; static const WCHAR wszWaveOutID[] = {'W','a','v','e','O','u','t','I','D',0}; +static const WCHAR wszFilterData[] = {'F','i','l','t','e','r','D','a','t','a',0}; static ULONG WINAPI DEVENUM_ICreateDevEnum_AddRef(ICreateDevEnum * iface); static HRESULT register_codecs(void); +static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory); /********************************************************************** * DEVENUM_ICreateDevEnum_QueryInterface (also IUnknown) @@ -124,6 +130,36 @@ static HKEY open_special_category_key(const CLSID *clsid, BOOL create) return ret; } +static HRESULT register_codec(const CLSID *class, const WCHAR *name, IMoniker **ret) +{ + static const WCHAR deviceW[] = {'@','d','e','v','i','c','e',':','c','m',':',0}; + IParseDisplayName *parser; + WCHAR *buffer; + ULONG eaten; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); + if (FAILED(hr)) + return hr; + + buffer = heap_alloc((strlenW(deviceW) + CHARS_IN_GUID + strlenW(name) + 1) * sizeof(WCHAR)); + if (!buffer) + { + IParseDisplayName_Release(parser); + return E_OUTOFMEMORY; + } + + strcpyW(buffer, deviceW); + StringFromGUID2(class, buffer + strlenW(buffer), CHARS_IN_GUID); + strcatW(buffer, backslashW); + strcatW(buffer, name); + + hr = IParseDisplayName_ParseDisplayName(parser, NULL, buffer, &eaten, ret); + IParseDisplayName_Release(parser); + heap_free(buffer); + return hr; +} + static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS2 *rgPin) { HKEY hkeyTypes = NULL; @@ -312,21 +348,77 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2) rgf2->u.s2.rgPins2 = rgPins; } -static HRESULT DEVENUM_RegisterLegacyAmFilters(void) +static void free_regfilter2(REGFILTER2 *rgf) +{ + if (rgf->u.s2.rgPins2) + { + UINT iPin; + + for (iPin = 0; iPin < rgf->u.s2.cPins2; iPin++) + { + if (rgf->u.s2.rgPins2[iPin].lpMediaType) + { + UINT iType; + + for (iType = 0; iType < rgf->u.s2.rgPins2[iPin].nMediaTypes; iType++) + { + CoTaskMemFree((void *)rgf->u.s2.rgPins2[iPin].lpMediaType[iType].clsMajorType); + CoTaskMemFree((void *)rgf->u.s2.rgPins2[iPin].lpMediaType[iType].clsMinorType); + } + + CoTaskMemFree((void *)rgf->u.s2.rgPins2[iPin].lpMediaType); + } + } + + CoTaskMemFree((void *)rgf->u.s2.rgPins2); + } +} + +static void write_filter_data(IPropertyBag *prop_bag, REGFILTER2 *rgf) +{ + IAMFilterData *fildata; + SAFEARRAYBOUND sabound; + BYTE *data, *array; + VARIANT var = {0}; + ULONG size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC, &IID_IAMFilterData, (void **)&fildata); + if (FAILED(hr)) goto cleanup; + + hr = IAMFilterData_CreateFilterData(fildata, rgf, &data, &size); + if (FAILED(hr)) goto cleanup; + + V_VT(&var) = VT_ARRAY | VT_UI1; + sabound.lLbound = 0; + sabound.cElements = size; + if (!(V_ARRAY(&var) = SafeArrayCreate(VT_UI1, 1, &sabound))) + goto cleanup; + hr = SafeArrayAccessData(V_ARRAY(&var), (void *)&array); + if (FAILED(hr)) goto cleanup; + + memcpy(array, data, size); + hr = SafeArrayUnaccessData(V_ARRAY(&var)); + if (FAILED(hr)) goto cleanup; + + hr = IPropertyBag_Write(prop_bag, wszFilterData, &var); + if (FAILED(hr)) goto cleanup; + +cleanup: + VariantClear(&var); + CoTaskMemFree(data); + IAMFilterData_Release(fildata); +} + +static void register_legacy_filters(void) { HKEY hkeyFilter = NULL; DWORD dwFilterSubkeys, i; LONG lRet; - IFilterMapper2 *pMapper = NULL; HRESULT hr; - hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC, - &IID_IFilterMapper2, (void **) &pMapper); - if (SUCCEEDED(hr)) - { - lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszFilterKeyName, 0, KEY_READ, &hkeyFilter); - hr = HRESULT_FROM_WIN32(lRet); - } + lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszFilterKeyName, 0, KEY_READ, &hkeyFilter); + hr = HRESULT_FROM_WIN32(lRet); if (SUCCEEDED(hr)) { @@ -335,106 +427,87 @@ static HRESULT DEVENUM_RegisterLegacyAmFilters(void) } if (SUCCEEDED(hr)) + hr = DEVENUM_CreateAMCategoryKey(&CLSID_LegacyAmFilterCategory); + + if (SUCCEEDED(hr)) { for (i = 0; i < dwFilterSubkeys; i++) { WCHAR wszFilterSubkeyName[64]; DWORD cName = sizeof(wszFilterSubkeyName) / sizeof(WCHAR); + IPropertyBag *prop_bag = NULL; WCHAR wszRegKey[MAX_PATH]; - HKEY hkeyInstance = NULL; + HKEY classkey = NULL; + IMoniker *mon = NULL; + VARIANT var = {0}; + REGFILTER2 rgf2; + DWORD Type, len; if (RegEnumKeyExW(hkeyFilter, i, wszFilterSubkeyName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue; - strcpyW(wszRegKey, wszActiveMovieKey); - StringFromGUID2(&CLSID_LegacyAmFilterCategory, wszRegKey + strlenW(wszRegKey), CHARS_IN_GUID); + TRACE("Registering %s\n", debugstr_w(wszFilterSubkeyName)); - strcatW(wszRegKey, wszRegSeparator); + strcpyW(wszRegKey, clsidW); strcatW(wszRegKey, wszFilterSubkeyName); - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszRegKey, 0, KEY_READ, &hkeyInstance) == ERROR_SUCCESS) - { - RegCloseKey(hkeyInstance); - } - else - { - /* Filter is registered the IFilterMapper(1)-way in HKCR\Filter. Needs to be added to - * legacy am filter category. */ - HKEY hkeyFilterClass = NULL; - REGFILTER2 rgf2; - CLSID clsidFilter; - WCHAR wszFilterName[MAX_PATH]; - DWORD Type; - DWORD cbData; - HRESULT res; - IMoniker *pMoniker = NULL; - - TRACE("Registering %s\n", debugstr_w(wszFilterSubkeyName)); - - strcpyW(wszRegKey, clsid_keyname); - strcatW(wszRegKey, wszRegSeparator); - strcatW(wszRegKey, wszFilterSubkeyName); - - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszRegKey, 0, KEY_READ, &hkeyFilterClass) != ERROR_SUCCESS) - continue; - - rgf2.dwMerit = 0; - - cbData = sizeof(wszFilterName); - if (RegQueryValueExW(hkeyFilterClass, NULL, NULL, &Type, (LPBYTE)wszFilterName, &cbData) != ERROR_SUCCESS || - Type != REG_SZ) - goto cleanup; - - cbData = sizeof(rgf2.dwMerit); - if (RegQueryValueExW(hkeyFilterClass, wszMeritName, NULL, &Type, (LPBYTE)&rgf2.dwMerit, &cbData) != ERROR_SUCCESS || - Type != REG_DWORD) - goto cleanup; - - DEVENUM_ReadPins(hkeyFilterClass, &rgf2); + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszRegKey, 0, KEY_READ, &classkey) != ERROR_SUCCESS) + continue; - res = CLSIDFromString(wszFilterSubkeyName, &clsidFilter); - if (FAILED(res)) goto cleanup; + hr = register_codec(&CLSID_LegacyAmFilterCategory, wszFilterSubkeyName, &mon); + if (FAILED(hr)) goto cleanup; - IFilterMapper2_RegisterFilter(pMapper, &clsidFilter, wszFilterName, &pMoniker, NULL, NULL, &rgf2); + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + if (FAILED(hr)) goto cleanup; - if (pMoniker) - IMoniker_Release(pMoniker); - - cleanup: - - if (hkeyFilterClass) RegCloseKey(hkeyFilterClass); - - if (rgf2.u.s2.rgPins2) - { - UINT iPin; - - for (iPin = 0; iPin < rgf2.u.s2.cPins2; iPin++) - { - if (rgf2.u.s2.rgPins2[iPin].lpMediaType) - { - UINT iType; - - for (iType = 0; iType < rgf2.u.s2.rgPins2[iPin].nMediaTypes; iType++) - { - CoTaskMemFree((void*)rgf2.u.s2.rgPins2[iPin].lpMediaType[iType].clsMajorType); - CoTaskMemFree((void*)rgf2.u.s2.rgPins2[iPin].lpMediaType[iType].clsMinorType); - } - - CoTaskMemFree((void*)rgf2.u.s2.rgPins2[iPin].lpMediaType); - } - } - - CoTaskMemFree((void*)rgf2.u.s2.rgPins2); - } + /* write friendly name */ + len = 0; + V_VT(&var) = VT_BSTR; + if (!RegQueryValueExW(classkey, NULL, NULL, &Type, NULL, &len)) + { + WCHAR *friendlyname = heap_alloc(len); + if (!friendlyname) + goto cleanup; + RegQueryValueExW(classkey, NULL, NULL, &Type, (BYTE *)friendlyname, &len); + V_BSTR(&var) = SysAllocStringLen(friendlyname, len/sizeof(WCHAR)); + heap_free(friendlyname); } + else + V_BSTR(&var) = SysAllocString(wszFilterSubkeyName); + + if (!V_BSTR(&var)) + goto cleanup; + hr = IPropertyBag_Write(prop_bag, wszFriendlyName, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write clsid */ + V_VT(&var) = VT_BSTR; + if (!(V_BSTR(&var) = SysAllocString(wszFilterSubkeyName))) + goto cleanup; + hr = IPropertyBag_Write(prop_bag, clsid_keyname, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write filter data */ + rgf2.dwMerit = MERIT_NORMAL; + + len = sizeof(rgf2.dwMerit); + RegQueryValueExW(classkey, wszMeritName, NULL, &Type, (BYTE *)&rgf2.dwMerit, &len); + + DEVENUM_ReadPins(classkey, &rgf2); + + write_filter_data(prop_bag, &rgf2); + +cleanup: + if (prop_bag) IPropertyBag_Release(prop_bag); + if (mon) IMoniker_Release(mon); + RegCloseKey(classkey); + VariantClear(&var); + free_regfilter2(&rgf2); } } if (hkeyFilter) RegCloseKey(hkeyFilter); - - if (pMapper) - IFilterMapper2_Release(pMapper); - - return S_OK; } /********************************************************************** @@ -454,7 +527,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( *ppEnumMoniker = NULL; register_codecs(); - DEVENUM_RegisterLegacyAmFilters(); + register_legacy_filters(); return create_EnumMoniker(clsidDeviceClass, ppEnumMoniker); } @@ -562,6 +635,8 @@ static HRESULT register_codecs(void) * or switched from pulseaudio to alsa, delete all old devices first */ RegOpenKeyW(HKEY_CURRENT_USER, wszActiveMovieKey, &basekey); + StringFromGUID2(&CLSID_LegacyAmFilterCategory, class, CHARS_IN_GUID); + RegDeleteTreeW(basekey, class); StringFromGUID2(&CLSID_AudioRendererCategory, class, CHARS_IN_GUID); RegDeleteTreeW(basekey, class); StringFromGUID2(&CLSID_AudioInputDeviceCategory, class, CHARS_IN_GUID); diff --git a/dlls/devenum/fil_data.idl b/dlls/devenum/fil_data.idl new file mode 100644 index 0000000..7e37a75 --- /dev/null +++ b/dlls/devenum/fil_data.idl @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2009 Vitaliy Margolen + * + * 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 + */ + +#pragma makedep header + +import "objidl.idl"; +import "strmif.idl"; +import "unknwn.idl"; + + +/***************************************************************************** + * IAMFilterData interface + */ +[ + object, + uuid(97f7c4d4-547b-4a5f-8332-536430ad2e4d), + pointer_default(unique) +] +interface IAMFilterData : IUnknown +{ + typedef [unique] IAMFilterData *LPIAMFILTERDATA; + + HRESULT ParseFilterData( + [in] BYTE * rgbFilterData, + [in] ULONG cb, + [out] BYTE ** prgbRegFilter2); + + HRESULT CreateFilterData( + [in] REGFILTER2 * prf2, + [out] BYTE ** prgbFilterData, + [out] ULONG * pcb); +} diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index a08dece..43d6eeb 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -27,11 +27,16 @@ #include "ole2.h" #include "strmif.h" #include "uuids.h" +#include "vfwmsgs.h" static const WCHAR friendly_name[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; static const WCHAR fcc_handlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; +static const WCHAR deviceW[] = {'@','d','e','v','i','c','e',':',0}; static const WCHAR clsidW[] = {'C','L','S','I','D',0}; static const WCHAR mrleW[] = {'m','r','l','e',0}; +static const WCHAR swW[] = {'s','w',':',0}; +static const WCHAR cmW[] = {'c','m',':',0}; +static const WCHAR backslashW[] = {'\\',0}; static void test_devenum(IBindCtx *bind_ctx) { @@ -304,7 +309,6 @@ static IMoniker *check_display_name_(int line, IParseDisplayName *parser, WCHAR static void test_directshow_filter(void) { - static const WCHAR deviceW[] = {'@','d','e','v','i','c','e',':','s','w',':',0}; static const WCHAR instanceW[] = {'\\','I','n','s','t','a','n','c','e',0}; static const WCHAR clsidW[] = {'C','L','S','I','D','\\',0}; static WCHAR testW[] = {'\\','t','e','s','t',0}; @@ -321,6 +325,7 @@ static void test_directshow_filter(void) ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); lstrcpyW(buffer, deviceW); + lstrcatW(buffer, swW); StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); lstrcatW(buffer, testW); mon = check_display_name(parser, buffer); @@ -367,6 +372,7 @@ static void test_directshow_filter(void) /* name can be anything */ lstrcpyW(buffer, deviceW); + lstrcatW(buffer, swW); lstrcatW(buffer, testW+1); mon = check_display_name(parser, buffer); @@ -405,7 +411,6 @@ static void test_directshow_filter(void) static void test_codec(void) { - static const WCHAR deviceW[] = {'@','d','e','v','i','c','e',':','c','m',':',0}; static WCHAR testW[] = {'\\','t','e','s','t',0}; IParseDisplayName *parser; IPropertyBag *prop_bag; @@ -419,6 +424,7 @@ static void test_codec(void) ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); lstrcpyW(buffer, deviceW); + lstrcatW(buffer, cmW); StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); lstrcatW(buffer, testW); mon = check_display_name(parser, buffer); @@ -456,6 +462,70 @@ static void test_codec(void) IParseDisplayName_Release(parser); } +static void test_legacy_filter(void) +{ + static const WCHAR nameW[] = {'t','e','s','t',0}; + IParseDisplayName *parser; + IPropertyBag *prop_bag; + IFilterMapper *mapper; + IMoniker *mon; + WCHAR buffer[200]; + VARIANT var; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC, &IID_IFilterMapper, (void **)&mapper); + ok(hr == S_OK, "Failed to create FilterMapper: %#x\n", hr); + + hr = IFilterMapper_RegisterFilter(mapper, CLSID_TestFilter, nameW, 0xdeadbeef); + if (hr == VFW_E_BAD_KEY) + { + win_skip("not enough permissions to register filters\n"); + goto end; + } + ok(hr == S_OK, "RegisterFilter failed: %#x\n", hr); + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, cmW); + StringFromGUID2(&CLSID_LegacyAmFilterCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); + lstrcatW(buffer, backslashW); + StringFromGUID2(&CLSID_TestFilter, buffer + lstrlenW(buffer), CHARS_IN_GUID); + + mon = check_display_name(parser, buffer); + ok(find_moniker(&CLSID_LegacyAmFilterCategory, mon), "filter should be registered\n"); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + VariantInit(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + + StringFromGUID2(&CLSID_TestFilter, buffer, CHARS_IN_GUID); + ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", + wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", + wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); + + IPropertyBag_Release(prop_bag); + + hr = IFilterMapper_UnregisterFilter(mapper, CLSID_TestFilter); + ok(hr == S_OK, "UnregisterFilter failed: %#x\n", hr); + + ok(!find_moniker(&CLSID_LegacyAmFilterCategory, mon), "filter should not be registered\n"); + IMoniker_Release(mon); + +end: + IFilterMapper_Release(mapper); + IParseDisplayName_Release(parser); +} + START_TEST(devenum) { IBindCtx *bind_ctx = NULL; @@ -478,5 +548,7 @@ START_TEST(devenum) test_directshow_filter(); test_codec(); + test_legacy_filter(); + CoUninitialize(); } diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index c9578c6..5a43785 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -294,6 +294,24 @@ static void test_legacy_filter_registration(void) hr = IFilterMapper_UnregisterFilter(mapper, clsid); ok(hr == S_OK, "FilterMapper_UnregisterFilter failed with %x\n", hr); + hr = IFilterMapper2_EnumMatchingFilters(mapper2, &enum_mon, 0, TRUE, MERIT_UNLIKELY, TRUE, + 0, NULL, NULL, &GUID_NULL, FALSE, FALSE, 0, NULL, NULL, &GUID_NULL); + ok(hr == S_OK, "IFilterMapper2_EnumMatchingFilters failed: %x\n", hr); + ok(!enum_find_filter(testfilterW, enum_mon), "IFilterMapper2 shouldn't find filter\n"); + IEnumMoniker_Release(enum_mon); + + found = FALSE; + hr = IFilterMapper_EnumMatchingFilters(mapper, &enum_reg, MERIT_UNLIKELY, TRUE, GUID_NULL, GUID_NULL, + FALSE, FALSE, GUID_NULL, GUID_NULL); + ok(hr == S_OK, "IFilterMapper_EnumMatchingFilters failed with %x\n", hr); + while(!found && IEnumRegFilters_Next(enum_reg, 1, &regfilter, &count) == S_OK) + { + if (!lstrcmpW(regfilter->Name, testfilterW) && IsEqualGUID(&clsid, &regfilter->Clsid)) + found = TRUE; + } + IEnumRegFilters_Release(enum_reg); + ok(!found, "IFilterMapper shouldn't find filter\n"); + ret = RegDeleteKeyW(HKEY_CLASSES_ROOT, key_name); ok(!ret, "RegDeleteKeyA failed: %lu\n", ret); -- 2.7.4

1 1

Your weekly winetest update
by Zebediah Figura 09 Mar '18

09 Mar '18

Hello folks, my name is Zebediah Figura, and I'll be taking over for Jeremy White today. I'd like to start out by thanking everyone who has been working on fixing tests, with special notice to Alex Henrie who has fixed more Windows tests recently than probably anyone else combined. This mail however is not about Windows at all but Wine. Item one: it seems to me—perhaps naïvely so, but it seems to me that we are closer than ever to having an entirely green machine (well, orange really) on the Linux end—so much so that I'm going to run through the failures that are left. Please do take the time to at least skim, since in some cases this is an RFC and what to do to fix a test isn't exactly clear even though the cause is. I also have a few other comments, so I'd appreciate your reading through to the end of this mail. So, without further ado: --- * kernel32:change is due to the asynchronous nature of inotify. How should this be fixed? inotify gives us one creation event and two or more notifications on the parent. It's not clear how to fix this in the test. It certainly doesn't seem possible to make the server behave like Windows. * ole32:clipboard is explained and fixed by 140671 [1]. * quartz:filtergraph is a number of problems related to winegstreamer teardown. I have a set of patches in my local tree which should clear up most to all of these, and I'd like to start submitting these soon. * shell32:shelllink needs some discussion, I think. The problem is that winemenubuilder is holding the file when we check for leaks. On Windows I would imagine all menu-building would be done synchronously, but on Wine this is implausible since we need to create our own copy of the link icon possibly after the link is created. At one point I suggested that menu-building should occur on prefix shutdown, which, while not really possible to do on top of the Windows API, might nevertheless be the best solution. * urlmon:protocol is explained and fixed by 121083 [2]. This solution is less clean than is ideal, but my further attempts to synchronize more cleanly were met with other failures. I'm willing to take another look at this, although I'd appreciate help. * user32:msg is now down to one consistent failure. This is explained and fixed by 140924/140925 [3]/[4]. * user32:win, perhaps one of the most notorious offenders, has three consistent failures left, and possibly some more intermittent ones. - Lines 3364-5 (test_SetForegroundWindow) and 9940-4 (test_LockWindowUpdate) were determined by jwhite to be the fault of the hwndMain test window being minimized during the test. I further investigated and traced this down, surprisingly enough, to a bug in fvwm, which I've reported at [5]. The bug involves a lot of steps to trigger, notably, and we can (and, I think, should) work around it by modifying the test machine configuration: either by changing the focus mode from MouseFocus, or by removing the RaiseTransient or StackTransientParent style. - Line 6838 (test_EnableWindow) is explained and fixed by 141063 [6]. * wininet:ftp, which affects both Linux and Windows, is a recent failure, as can be seen at [7]. But nothing was changed in the tests at that point. It seems more likely that something changed with respect to the ftp.winehq.org server itself, some time on or before 3 January. Could someone with knowledge of wininet or of the FTP server be implored to look into this? Then there are the following failures. I haven't investigated any of these at all, partly because I'm as yet completely unfamiliar with the respective APIs: * A number of Direct3D failures, all (?) of which seem to be dependent on the driver used. I'm not going to enumerate them all here, but I will make note of the fact that cw1 only needs d3d10core:device, d3d11:d3d11, and d3d9:visual, and cw2 only needs d3d9:device. All of these are consistent. * mmdevapi:capture, intermittent and rare. * mmdevapi:render, intermittent but less rare. * mshtml:htmldoc, intermittent but almost consistent. * urlmon:misc, intermittent. * xaudio2_7:xaudio2, intermittent. While I'm certainly willing to fix every last failure myself if need be, just think how much easier it would be if people who were familiar with the code took a look at it! Then there's one very weird set of failures: every D3D-related test from ddraw:ddraw2 onward (i.e. ddraw, dxdiagn, dxgi), on cw1-hd6800-wow32—and only that architecture—fails to print its summary line. This has been the case for since at least early November (unfortunately I lost the exact date when this started happening, but it wasn't obviously the result of any commit). And, finally, the 64-bit failures: * d3dx9_36:math is slightly off on the spherical harmonics values due to the differences in FP math on 64-bit. Here's inviting someone who knows the math to check all of our numbers and make sure they're correct, or otherwise do as Alex Henrie did for spherical light [8]. All others are due to lack of typelib marshaling: * ieframe:ie * msxml3:domdoc * oleaut32:tmarshal * shell32:shelldispatch * user32:dialog (indirectly, since msxml3:domdoc crashes and leaves the winedbg window open) Perhaps in these cases the best thing to do is to mark those todo_wine_if (sizeof (void *) == 8), since properly implementing the 64-bit marshaller takes more work than anyone is willing to do. --- The ultimate goal, of course, is that we finally get a way to run testbot patches on [ideally multiple] Linux machines. Nobody needs me to tell them how important this is, but of course it's also important that we start from a clean slate, since these tests are going to be run for *every* patch, not just those that modify the tests. So while Linux is in a better state than some Windows versions at this point, it seems to me that we really do want a wholly green machine. Along these lines it's worth noting, by the way, that except for the D3D failures, there seems to be no difference between cw1 and cw2. It seems to me it would be a good thing if we started testing multiple window managers as well (and in particular we may want to test those which see common use such as KWin and Mutter). Also along these lines: presumably setting up the testbot to run linux tests is going to require a fair amount of work, and that work is going to be implied to be François' responsibility. I'd just like to say that I'm willing to help as much as I can, though. Okay, so, all that said, we have another problem. I've tried running winetest on my own machine recently, in the interest of rooting out some of the rarer failures, and I've found that the reports it generates are consistently about 1.7 MB long, which is of course over the 1.5 MB limit that test.winehq.org accepts. I did some sed'ing and came up with the worst offenders as being: test bytes % of report d3d11:d3d11 286861 16.27 ws2_32:sock 108672 6.17 kernel32:virtual 75963 4.29 gdi32:font 64700 3.61 user32:win 62114 3.52 shell32:shlexec 41235 2.34 user32:msg 37126 2.11 This isn't, I assert, something wrong with my setup. The D3D team's obviously admirable predisposition toward verbosity, and the need to print a large number of floating-point values, combined with a total of 2167 tests marked todo, has taken over almost one-sixth of the report. But even with d3d11 removed, the report just barely sneaks in under the limit, at 1475812 bytes. One might blame an excess of trace lines, as last time, but in all reality, I am inclined to think that 1.5 MB is no longer a reasonable limit for a test report. If there is an inherent limitation brought on by server storage space or processing power, well, so be it, but if not we probably will want to either raise it—or otherwise start investing energy into getting rid of existing todos. Alright, that's finally it from me, I promise. At least for now ;-) [1] https://source.winehq.org/patches/data/140671 [2] https://www.winehq.org/pipermail/wine-devel/2018-January/121083.html [3] https://source.winehq.org/patches/data/140924 [4] https://source.winehq.org/patches/data/140925 [5] https://github.com/fvwmorg/fvwm/issues/51 [6] https://source.winehq.org/patches/data/141063 [7] http://test.winehq.org/data/tests/wininet:ftp.html [8] https://source.winehq.org/git/wine.git/commit/07f7022fccc1c51eb4ccb4b6735e7…

5 12

[PATCH] [bugzilla] update 2.0 references to 4.0.
by Austin English 09 Mar '18

09 Mar '18

-- -Austin GPG: 267B CC1F 053F 0749 (expires 2021/02/18)

2 3