wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Zebediah Figura : devenum: Correctly implement IMoniker::GetDisplayName().
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: b0300ce56483fb2f2a03de8aa216d41b0bfd034e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0300ce56483fb2f2a03de8a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 6 20:57:10 2018 -0600 devenum: Correctly implement IMoniker::GetDisplayName(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/devenum_private.h | 1 + dlls/devenum/mediacatenum.c | 51 ++++++++++++++++++++++++++++++++---------- dlls/devenum/tests/devenum.c | 4 ++-- 3 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 9a0b5ad..83d0ce3 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -95,6 +95,7 @@ static const WCHAR wszActiveMovieKey[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'A','c','t','i','v','e','M','o','v','i','e','\\', 'd','e','v','e','n','u','m','\\',0}; +static const WCHAR deviceW[] = {'@','d','e','v','i','c','e',':',0}; extern const WCHAR clsid_keyname[6] DECLSPEC_HIDDEN; diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 0f38a0e..0d4e01e 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); typedef struct { IEnumMoniker IEnumMoniker_iface; + CLSID class; LONG ref; HKEY sw_key; DWORD sw_index; @@ -621,24 +622,35 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_RelativePathTo(IMoniker *iface, I static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *ppszDisplayName) { + static const WCHAR swW[] = {'s','w',':',0}; + static const WCHAR cmW[] = {'c','m',':',0}; MediaCatMoniker *This = impl_from_IMoniker(iface); - WCHAR wszBuffer[MAX_PATH]; - static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; - DWORD received = sizeof(wszBuffer); + WCHAR *buffer; TRACE("(%p)->(%p, %p, %p)\n", iface, pbc, pmkToLeft, ppszDisplayName); *ppszDisplayName = NULL; - /* FIXME: should this be the weird stuff we have to parse in IParseDisplayName? */ - if (RegQueryValueExW(This->hkey, wszFriendlyName, NULL, NULL, (LPBYTE)wszBuffer, &received) == ERROR_SUCCESS) + buffer = CoTaskMemAlloc((strlenW(deviceW) + 4 + (This->has_class ? CHARS_IN_GUID : 0) + + strlenW(This->name) + 1) * sizeof(WCHAR)); + if (!buffer) + return E_OUTOFMEMORY; + + strcpyW(buffer, deviceW); + if (This->type == DEVICE_FILTER) + strcatW(buffer, swW); + else if (This->type == DEVICE_CODEC) + strcatW(buffer, cmW); + + if (This->has_class) { - *ppszDisplayName = CoTaskMemAlloc(received); - strcpyW(*ppszDisplayName, wszBuffer); - return S_OK; + StringFromGUID2(&This->class, buffer + strlenW(buffer), CHARS_IN_GUID); + strcatW(buffer, backslashW); } + strcatW(buffer, This->name); - return E_FAIL; + *ppszDisplayName = buffer; + return S_OK; } static HRESULT WINAPI DEVENUM_IMediaCatMoniker_ParseDisplayName(IMoniker *iface, IBindCtx *pbc, @@ -782,6 +794,11 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, This->sw_index++; if ((res = RegOpenKeyExW(This->sw_key, buffer, 0, KEY_QUERY_VALUE, &hkey))) break; + + if (!(pMoniker = DEVENUM_IMediaCatMoniker_Construct())) + return E_OUTOFMEMORY; + + pMoniker->type = DEVICE_FILTER; } /* then try codecs */ else if (!(res = RegEnumKeyW(This->cm_key, This->cm_index, buffer, sizeof(buffer)/sizeof(WCHAR)))) @@ -790,14 +807,23 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, if ((res = RegOpenKeyExW(This->cm_key, buffer, 0, KEY_QUERY_VALUE, &hkey))) break; + + if (!(pMoniker = DEVENUM_IMediaCatMoniker_Construct())) + return E_OUTOFMEMORY; + + pMoniker->type = DEVICE_CODEC; } else break; - pMoniker = DEVENUM_IMediaCatMoniker_Construct(); - if (!pMoniker) + if (!(pMoniker->name = CoTaskMemAlloc((strlenW(buffer) + 1) * sizeof(WCHAR)))) + { + IMoniker_Release(&pMoniker->IMoniker_iface); return E_OUTOFMEMORY; - + } + strcpyW(pMoniker->name, buffer); + pMoniker->has_class = TRUE; + pMoniker->class = This->class; pMoniker->hkey = hkey; rgelt[fetched] = &pMoniker->IMoniker_iface; @@ -887,6 +913,7 @@ HRESULT create_EnumMoniker(REFCLSID class, IEnumMoniker **ppEnumMoniker) pEnumMoniker->ref = 1; pEnumMoniker->sw_index = 0; pEnumMoniker->cm_index = 0; + pEnumMoniker->class = *class; strcpyW(buffer, clsidW); StringFromGUID2(class, buffer + strlenW(buffer), CHARS_IN_GUID); diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index fe8cb2e..0437b6b 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -293,10 +293,8 @@ static IMoniker *check_display_name_(int line, IParseDisplayName *parser, WCHAR ok_(__FILE__, line)(hr == S_OK, "ParseDisplayName failed: %#x\n", hr); hr = IMoniker_GetDisplayName(mon, NULL, NULL, &str); -todo_wine { ok_(__FILE__, line)(hr == S_OK, "GetDisplayName failed: %#x\n", hr); ok_(__FILE__, line)(!lstrcmpW(str, buffer), "got %s\n", wine_dbgstr_w(str)); -} CoTaskMemFree(str); @@ -328,6 +326,7 @@ static void test_directshow_filter(void) mon = check_display_name(parser, buffer); /* Test writing and reading from the property bag */ +todo_wine ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "filter should not be registered\n"); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); @@ -426,6 +425,7 @@ static void test_codec(void) mon = check_display_name(parser, buffer); /* Test writing and reading from the property bag */ +todo_wine ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "codec should not be registered\n"); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag);

1 0

Zebediah Figura : devenum: Allow parsing display name without class ID.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: f49fc4c7ef940409a2c41ab7230a97e423980015 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f49fc4c7ef940409a2c41ab7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 6 20:57:09 2018 -0600 devenum: Allow parsing display name without class ID. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/devenum_private.h | 5 +++ dlls/devenum/mediacatenum.c | 3 ++ dlls/devenum/parsedisplayname.c | 96 +++++++++++++++++++---------------------- dlls/devenum/tests/devenum.c | 37 ++++++++++++++++ 4 files changed, 90 insertions(+), 51 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index bcc5085..9a0b5ad 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -71,6 +71,10 @@ typedef struct IMoniker IMoniker_iface; LONG ref; HKEY hkey; + CLSID class; + BOOL has_class; + enum device_type type; + WCHAR *name; } MediaCatMoniker; MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void) DECLSPEC_HIDDEN; @@ -84,6 +88,7 @@ extern IParseDisplayName DEVENUM_ParseDisplayName DECLSPEC_HIDDEN; * Global string constant declarations */ +static const WCHAR backslashW[] = {'\\',0}; static const WCHAR clsidW[] = {'C','L','S','I','D','\\',0}; static const WCHAR instanceW[] = {'\\','I','n','s','t','a','n','c','e',0}; static const WCHAR wszActiveMovieKey[] = {'S','o','f','t','w','a','r','e','\\', diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 583ca7d..0f38a0e 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -345,6 +345,7 @@ static ULONG WINAPI DEVENUM_IMediaCatMoniker_Release(IMoniker *iface) if (ref == 0) { RegCloseKey(This->hkey); + CoTaskMemFree(This->name); CoTaskMemFree(This); DEVENUM_UnlockModule(); } @@ -695,6 +696,8 @@ MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void) pMoniker->IMoniker_iface.lpVtbl = &IMoniker_Vtbl; pMoniker->ref = 0; pMoniker->hkey = NULL; + pMoniker->has_class = FALSE; + pMoniker->name = NULL; DEVENUM_IMediaCatMoniker_AddRef(&pMoniker->IMoniker_iface); diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index b5a3951..2875a8c 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -76,87 +76,81 @@ static ULONG WINAPI DEVENUM_IParseDisplayName_Release(IParseDisplayName *iface) * not in "@device:sw:{CLSID1}\<filter name or CLSID>" format */ static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName(IParseDisplayName *iface, - IBindCtx *pbc, LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) + IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret) { - LPOLESTR pszBetween = NULL; - LPOLESTR pszClass = NULL; - MediaCatMoniker * pMoniker = NULL; - CLSID clsidDevice; - HRESULT hr = S_OK; - WCHAR wszRegKeyName[MAX_PATH]; + WCHAR buffer[MAX_PATH]; enum device_type type; + MediaCatMoniker *mon; HKEY hbasekey; - int classlen; - LONG res; - static const WCHAR wszRegSeparator[] = {'\\', 0 }; + CLSID class; + LRESULT res; - TRACE("(%p, %s, %p, %p)\n", pbc, debugstr_w(pszDisplayName), pchEaten, ppmkOut); + TRACE("(%p, %s, %p, %p)\n", pbc, debugstr_w(name), eaten, ret); - *ppmkOut = NULL; - if (pchEaten) - *pchEaten = strlenW(pszDisplayName); + *ret = NULL; + if (eaten) + *eaten = strlenW(name); - pszDisplayName = strchrW(pszDisplayName, ':') + 1; - if (pszDisplayName[0] == 's' && pszDisplayName[1] == 'w' && pszDisplayName[2] == ':') + name = strchrW(name, ':') + 1; + + if (name[0] == 's' && name[1] == 'w' && name[2] == ':') { type = DEVICE_FILTER; if ((res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsidW, 0, 0, &hbasekey))) return HRESULT_FROM_WIN32(res); + name += 3; } - else if (pszDisplayName[0] == 'c' && pszDisplayName[1] == 'm' && pszDisplayName[2] == ':') + else if (name[0] == 'c' && name[1] == 'm' && name[2] == ':') { type = DEVICE_CODEC; if ((res = RegOpenKeyExW(HKEY_CURRENT_USER, wszActiveMovieKey, 0, 0, &hbasekey))) return HRESULT_FROM_WIN32(res); + name += 3; } else { - FIXME("unhandled device type %s\n", debugstr_w(pszDisplayName+1)); + FIXME("unhandled device type %s\n", debugstr_w(name)); return MK_E_SYNTAX; } - pszDisplayName = strchrW(pszDisplayName, '{'); - pszBetween = strchrW(pszDisplayName, '}') + 2; - - /* size = pszBetween - pszDisplayName - 1 (for '\\' after CLSID) - * + 1 (for NULL character) - */ - classlen = (int)(pszBetween - pszDisplayName - 1); - pszClass = CoTaskMemAlloc((classlen + 1) * sizeof(WCHAR)); - if (!pszClass) + if (!(mon = DEVENUM_IMediaCatMoniker_Construct())) return E_OUTOFMEMORY; - memcpy(pszClass, pszDisplayName, classlen * sizeof(WCHAR)); - pszClass[classlen] = 0; + lstrcpynW(buffer, name, CHARS_IN_GUID); + if (CLSIDFromString(buffer, &class) == S_OK) + { + mon->has_class = TRUE; + mon->class = class; + name += CHARS_IN_GUID; + } - TRACE("Device CLSID: %s\n", debugstr_w(pszClass)); + mon->type = type; - hr = CLSIDFromString(pszClass, &clsidDevice); + if (!(mon->name = CoTaskMemAlloc((strlenW(name) + 1) * sizeof(WCHAR)))) + { + IMoniker_Release(&mon->IMoniker_iface); + return E_OUTOFMEMORY; + } + strcpyW(mon->name, name); - if (SUCCEEDED(hr)) + buffer[0] = 0; + if (mon->has_class) { - pMoniker = DEVENUM_IMediaCatMoniker_Construct(); - if (pMoniker) - { - strcpyW(wszRegKeyName, pszClass); - if (type == DEVICE_FILTER) - strcatW(wszRegKeyName, instanceW); - strcatW(wszRegKeyName, wszRegSeparator); - strcatW(wszRegKeyName, pszBetween); - if (RegCreateKeyW(hbasekey, wszRegKeyName, &pMoniker->hkey) == ERROR_SUCCESS) - *ppmkOut = &pMoniker->IMoniker_iface; - else - { - IMoniker_Release(&pMoniker->IMoniker_iface); - hr = MK_E_NOOBJECT; - } - } + StringFromGUID2(&mon->class, buffer, CHARS_IN_GUID); + if (mon->type == DEVICE_FILTER) + strcatW(buffer, instanceW); + strcatW(buffer, backslashW); } + strcatW(buffer, mon->name); - CoTaskMemFree(pszClass); + if (RegCreateKeyW(hbasekey, buffer, &mon->hkey)) + { + IMoniker_Release(&mon->IMoniker_iface); + return MK_E_NOOBJECT; + } + *ret = &mon->IMoniker_iface; - TRACE("-- returning: %x\n", hr); - return hr; + return S_OK; } /********************************************************************** diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index c53f909..fe8cb2e 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -365,6 +365,43 @@ static void test_directshow_filter(void) VariantClear(&var); IPropertyBag_Release(prop_bag); + + /* name can be anything */ + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, testW+1); + mon = check_display_name(parser, buffer); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(testW); + hr = IPropertyBag_Write(prop_bag, friendly_name, &var); + if (hr != E_ACCESSDENIED) + { + ok(hr == S_OK, "Write failed: %#x\n", hr); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(!lstrcmpW(V_BSTR(&var), testW), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + + IMoniker_Release(mon); + + /* vista+ stores it inside the Instance key */ + RegDeleteKeyA(HKEY_CLASSES_ROOT, "CLSID\\test\\Instance"); + + res = RegDeleteKeyA(HKEY_CLASSES_ROOT, "CLSID\\test"); + ok(!res, "RegDeleteKey failed: %lu\n", res); + } + + VariantClear(&var); + IPropertyBag_Release(prop_bag); IParseDisplayName_Release(parser); }

1 0

Zebediah Figura : devenum: More correctly handle device types.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: f5c531bdd10ea10c78a74e45beb9009dadf70c09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5c531bdd10ea10c78a74e45… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 6 20:57:08 2018 -0600 devenum: More correctly handle device types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 134 ++++++------------------------------- dlls/devenum/devenum_private.h | 23 ++++--- dlls/devenum/mediacatenum.c | 100 +++++++++++++++------------ dlls/devenum/parsedisplayname.c | 42 ++++++++---- dlls/devenum/tests/devenum.c | 145 +++++++++++++++++++++++++++++++++++++++- 5 files changed, 267 insertions(+), 177 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f5c531bdd10ea10c78a7…

1 0

Zebediah Figura : devenum/tests: Test registering DirectShow filters.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: a736400eed739052dab56750411ddf53919948d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a736400eed739052dab56750… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 6 20:57:07 2018 -0600 devenum/tests: Test registering DirectShow filters. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/tests/devenum.c | 74 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 575aebd..79189f3 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -211,7 +211,78 @@ static void test_moniker_isequal(void) return; } -/* CLSID_CDeviceMoniker */ +static BOOL find_moniker(const GUID *class, IMoniker *needle) +{ + ICreateDevEnum *devenum; + IEnumMoniker *enum_mon; + IMoniker *mon; + BOOL found = FALSE; + + CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, &IID_ICreateDevEnum, (void **)&devenum); + ICreateDevEnum_CreateClassEnumerator(devenum, class, &enum_mon, 0); + while (!found && IEnumMoniker_Next(enum_mon, 1, &mon, NULL) == S_OK) + { + if (IMoniker_IsEqual(mon, needle) == S_OK) + found = TRUE; + + IMoniker_Release(mon); + } + + IEnumMoniker_Release(enum_mon); + ICreateDevEnum_Release(devenum); + return found; +} + +DEFINE_GUID(CLSID_TestFilter, 0xdeadbeef,0xcf51,0x43e6,0xb6,0xc5,0x29,0x9e,0xa8,0xb6,0xb5,0x91); + +static void test_register_filter(void) +{ + static const WCHAR name[] = {'d','e','v','e','n','u','m',' ','t','e','s','t',0}; + IFilterMapper2 *mapper2; + IMoniker *mon = NULL; + REGFILTER2 rgf2 = {0}; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC, &IID_IFilterMapper2, (void **)&mapper2); + ok(hr == S_OK, "Failed to create FilterMapper2: %#x\n", hr); + + rgf2.dwVersion = 2; + rgf2.dwMerit = MERIT_UNLIKELY; + S2(U(rgf2)).cPins2 = 0; + + hr = IFilterMapper2_RegisterFilter(mapper2, &CLSID_TestFilter, name, &mon, NULL, NULL, &rgf2); + if (hr == E_ACCESSDENIED) + { + skip("Not enough permissions to register filters\n"); + IFilterMapper2_Release(mapper2); + return; + } + ok(hr == S_OK, "RegisterFilter failed: %#x\n", hr); + + ok(find_moniker(&CLSID_LegacyAmFilterCategory, mon), "filter should be registered\n"); + + hr = IFilterMapper2_UnregisterFilter(mapper2, NULL, NULL, &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); + + mon = NULL; + hr = IFilterMapper2_RegisterFilter(mapper2, &CLSID_TestFilter, name, &mon, &CLSID_AudioRendererCategory, NULL, &rgf2); + ok(hr == S_OK, "RegisterFilter failed: %#x\n", hr); + + ok(find_moniker(&CLSID_AudioRendererCategory, mon), "filter should be registered\n"); + + hr = IFilterMapper2_UnregisterFilter(mapper2, &CLSID_AudioRendererCategory, NULL, &CLSID_TestFilter); +todo_wine + ok(hr == S_OK, "UnregisterFilter failed: %#x\n", hr); + +todo_wine + ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "filter should not be registered\n"); + IMoniker_Release(mon); + + IFilterMapper2_Release(mapper2); +} START_TEST(devenum) { @@ -231,6 +302,7 @@ START_TEST(devenum) } test_moniker_isequal(); + test_register_filter(); CoUninitialize(); }

1 0

Zebediah Figura : devenum/tests: Test all registered categories.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: d34637f597bcd9172ed2d47aaf70a30d4395523b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d34637f597bcd9172ed2d47a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 6 20:57:06 2018 -0600 devenum/tests: Test all registered categories. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/tests/devenum.c | 109 +++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 61 deletions(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 5a41183..575aebd 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -30,57 +30,56 @@ 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 clsidW[] = {'C','L','S','I','D',0}; static const WCHAR mrleW[] = {'m','r','l','e',0}; -struct category -{ - const char * name; - const GUID * clsid; -}; - -static struct category am_categories[] = -{ - { "Legacy AM Filter category", &CLSID_LegacyAmFilterCategory }, - { "Audio renderer category", &CLSID_AudioRendererCategory }, - { "Midi renderer category", &CLSID_MidiRendererCategory }, - { "Audio input device category", &CLSID_AudioInputDeviceCategory }, - { "Video input device category", &CLSID_VideoInputDeviceCategory }, - { "Audio compressor category", &CLSID_AudioCompressorCategory }, - { "Video compressor category", &CLSID_VideoCompressorCategory } -}; - static void test_devenum(IBindCtx *bind_ctx) { - HRESULT res; + IEnumMoniker *enum_cat, *enum_moniker; ICreateDevEnum* create_devenum; - IEnumMoniker* enum_moniker = NULL; + IPropertyBag *prop_bag; + IMoniker *moniker; BOOL have_mrle = FALSE; - int i; + GUID cat_guid, clsid; + VARIANT var; + HRESULT hr; - res = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, + hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, &IID_ICreateDevEnum, (LPVOID*)&create_devenum); - if (res != S_OK) { - skip("Cannot create SystemDeviceEnum object (%x)\n", res); - return; - } + ok(hr == S_OK, "Failed to create devenum: %#x\n", hr); - for (i = 0; i < (sizeof(am_categories) / sizeof(struct category)); i++) + hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_ActiveMovieCategories, &enum_cat, 0); + ok(hr == S_OK, "Failed to enum categories: %#x\n", hr); + + while (IEnumMoniker_Next(enum_cat, 1, &moniker, NULL) == S_OK) { + hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "IMoniker_BindToStorage failed: %#x\n", hr); + + VariantInit(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + ok(hr == S_OK, "Failed to read FriendlyName: %#x\n", hr); + if (winetest_debug > 1) - trace("%s:\n", am_categories[i].name); + trace("%s:\n", wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + ok(hr == S_OK, "Failed to read CLSID: %#x\n", hr); + + hr = CLSIDFromString(V_BSTR(&var), &cat_guid); + ok(hr == S_OK, "got %#x\n", hr); + + IPropertyBag_Release(prop_bag); + IMoniker_Release(moniker); + + hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &cat_guid, &enum_moniker, 0); + ok(SUCCEEDED(hr), "Failed to enum devices: %#x\n", hr); - res = ICreateDevEnum_CreateClassEnumerator(create_devenum, am_categories[i].clsid, &enum_moniker, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); - if (res == S_OK) + if (hr == S_OK) { - IMoniker* moniker; while (IEnumMoniker_Next(enum_moniker, 1, &moniker, NULL) == S_OK) { - IPropertyBag* prop_bag = NULL; - VARIANT var; - HRESULT hr; - CLSID clsid = {0}; - hr = IMoniker_GetClassID(moniker, NULL); ok(hr == E_INVALIDARG, "IMoniker_GetClassID should failed %x\n", hr); @@ -93,36 +92,24 @@ static void test_devenum(IBindCtx *bind_ctx) hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); - if (SUCCEEDED(hr)) - { - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); - ok((hr == S_OK) || broken(hr == 0x80070002), "IPropertyBag_Read failed with error %x\n", hr); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + ok(hr == S_OK, "IPropertyBag_Read failed: %#x\n", hr); - if (SUCCEEDED(hr)) - { - if (winetest_debug > 1) - trace(" %s\n", wine_dbgstr_w(V_BSTR(&var))); - VariantClear(&var); - } - else - { - trace(" ???\n"); - } + if (winetest_debug > 1) + trace(" %s\n", wine_dbgstr_w(V_BSTR(&var))); - if (IsEqualGUID(&CLSID_VideoCompressorCategory, am_categories[i].clsid)) { - /* Test well known compressor to ensure that we really enumerate codecs */ - hr = IPropertyBag_Read(prop_bag, fcc_handlerW, &var, NULL); - if (SUCCEEDED(hr)) { - ok(V_VT(&var) == VT_BSTR, "V_VT(var) = %d\n", V_VT(&var)); - if(!lstrcmpW(V_BSTR(&var), mrleW)) - have_mrle = TRUE; - VariantClear(&var); - } + if (IsEqualGUID(&CLSID_VideoCompressorCategory, &cat_guid)) { + /* Test well known compressor to ensure that we really enumerate codecs */ + hr = IPropertyBag_Read(prop_bag, fcc_handlerW, &var, NULL); + if (SUCCEEDED(hr)) { + ok(V_VT(&var) == VT_BSTR, "V_VT(var) = %d\n", V_VT(&var)); + if(!lstrcmpW(V_BSTR(&var), mrleW)) + have_mrle = TRUE; + VariantClear(&var); } } - if (prop_bag) - IPropertyBag_Release(prop_bag); + IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); } IEnumMoniker_Release(enum_moniker);

1 0

Francois Gouget : testbot: Treat directories and files the same when using rmtree().
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: tools Branch: master Commit: 19586b07b6dbe9207faf680261e3c92713126b45 URL: https://source.winehq.org/git/tools.git/?a=commit;h=19586b07b6dbe9207faf680… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 7 13:32:12 2018 +0100 testbot: Treat directories and files the same when using rmtree(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index d8a9650..41f88d9 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -242,8 +242,7 @@ if (opendir(my $dh, "$DataDir/staging")) { if ($Age >= $JobPurgeDays + 7) { - if ((-d $FileName and !rmtree($FileName)) or - !unlink($FileName)) + if (!rmtree($FileName)) { LogMsg "Could not delete '$FileName': $!\n"; }

1 0

Francois Gouget : testbot/JobDetails: Clarify what the $Item objects are.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: tools Branch: master Commit: e40afe84f0b2db718fe9e130552d4326014ba68c URL: https://source.winehq.org/git/tools.git/?a=commit;h=e40afe84f0b2db718fe9e13… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 7 13:31:49 2018 +0100 testbot/JobDetails: Clarify what the $Item objects are. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index c8ecb4c..10a0d7c 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -237,11 +237,11 @@ sub GenerateBody($) my $Keys = $self->SortKeys(undef, $self->{Collection}->GetKeys()); foreach my $Key (@$Keys) { - my $Item = $self->{Collection}->GetItem($Key); - my $TaskDir = $Item->GetTaskDir(); - my $VM = $Item->VM; + my $StepTask = $self->{Collection}->GetItem($Key); + my $TaskDir = $StepTask->GetTaskDir(); + my $VM = $StepTask->VM; print "<h2><a name='k", $self->escapeHTML($Key), "'></a>" , - $self->escapeHTML($Item->GetTitle()), "</h2>\n"; + $self->escapeHTML($StepTask->GetTitle()), "</h2>\n"; print "<details><summary>", $self->CGI->escapeHTML($VM->Description || $VM->Name), "</summary>", @@ -254,8 +254,8 @@ sub GenerateBody($) my $ErrName = "$TaskDir/err"; print "<div class='TaskMoreInfoLinks'>\n"; # FIXME: Disable live screenshots for now - if (0 && $Item->Status eq "running" && - ($Item->Type eq "single" || $Item->Type eq "suite")) + if (0 && $StepTask->Status eq "running" && + ($StepTask->Type eq "single" || $StepTask->Type eq "suite")) { if (defined($self->GetParam($ScreenshotParamName))) { @@ -279,8 +279,8 @@ sub GenerateBody($) if (defined($self->GetParam($ScreenshotParamName))) { my $URI = "/Screenshot.pl?JobKey=" . uri_escape($self->{JobId}) . - "&StepKey=" . uri_escape($Item->StepNo) . - "&TaskKey=" . uri_escape($Item->TaskNo); + "&StepKey=" . uri_escape($StepTask->StepNo) . + "&TaskKey=" . uri_escape($StepTask->TaskNo); print "<div class='Screenshot'><img src='" . $self->CGI->escapeHTML($URI) . "' alt='Screenshot' /></div>\n"; } @@ -406,8 +406,8 @@ sub GenerateBody($) else { print $HasLogEntries ? "No " . - ($Item->Type eq "single" || - $Item->Type eq "suite" ? "test" : "build") . + ($StepTask->Type eq "single" || + $StepTask->Type eq "suite" ? "test" : "build") . " failures found" : "Empty log"; } } @@ -435,11 +435,11 @@ sub GenerateBody($) } close ERRFILE; } - elsif ($Item->Status eq "canceled") + elsif ($StepTask->Status eq "canceled") { print "<p>No log, task was canceled</p>\n"; } - elsif ($Item->Status eq "skipped") + elsif ($StepTask->Status eq "skipped") { print "<p>No log, task skipped</p>\n"; } @@ -453,36 +453,36 @@ sub GenerateBody($) sub GenerateDataCell($$$$$) { - my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; + my ($self, $CollectionBlock, $StepTask, $PropertyDescriptor, $DetailsPage) = @_; my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "VM") { - print "<td><a href='#k", $self->escapeHTML($Item->GetKey()), "'>"; - print $self->escapeHTML($self->GetDisplayValue($CollectionBlock, $Item, + print "<td><a href='#k", $self->escapeHTML($StepTask->GetKey()), "'>"; + print $self->escapeHTML($self->GetDisplayValue($CollectionBlock, $StepTask, $PropertyDescriptor)); print "</a></td>\n"; } elsif ($PropertyName eq "FileName") { - my $FileName = $Item->GetStepDir() ."/". $Item->FileName; + my $FileName = $StepTask->GetStepDir() ."/". $StepTask->FileName; if (-r $FileName) { my $URI = "/GetFile.pl?JobKey=" . uri_escape($self->{JobId}) . - "&StepKey=" . uri_escape($Item->StepNo); + "&StepKey=" . uri_escape($StepTask->StepNo); print "<td><a href='" . $self->escapeHTML($URI) . "'>"; - print $self->escapeHTML($self->GetDisplayValue($CollectionBlock, $Item, + print $self->escapeHTML($self->GetDisplayValue($CollectionBlock, $StepTask, $PropertyDescriptor)); print "</a></td>\n"; } else { - $self->SUPER::GenerateDataCell($CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataCell($CollectionBlock, $StepTask, $PropertyDescriptor, $DetailsPage); } } else { - $self->SUPER::GenerateDataCell($CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataCell($CollectionBlock, $StepTask, $PropertyDescriptor, $DetailsPage); } }

1 0

Francois Gouget : testbot/web: Simplify JobDetailsPage::GeneratePage().
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: tools Branch: master Commit: a18eff576ab47fb50cc5ac43af79323f760e5a94 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a18eff576ab47fb50cc5ac4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 7 13:31:33 2018 +0100 testbot/web: Simplify JobDetailsPage::GeneratePage(). The JobDetailsPage collection contains StepTasks, not Jobs! But there is no need to inspect the Status of each of the Job's Tasks to know whether it's worth reloading the page: they are all summarized in the Job Status. So just check if the Job is still running. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 923ef97..c8ecb4c 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -219,13 +219,9 @@ sub GeneratePage($) { my ($self) = @_; - foreach my $Job (@{$self->{Collection}->GetItems()}) + if ($self->{Job}->Status =~ /^(queued|running)$/) { - if ($Job->Status eq "queued" || $Job->Status eq "running") - { - $self->{Request}->headers_out->add("Refresh", "30"); - last; - } + $self->{Request}->headers_out->add("Refresh", "30"); } $self->SUPER::GeneratePage();

1 0

Julian Rüger : German translation for release 3.3
by Jeremy Newman 07 Mar '18

07 Mar '18

Module: website Branch: master Commit: 17da8645ede61afbdbad4961fcd90571de75263d URL: https://source.winehq.org/git/website.git/?a=commit;h=17da8645ede61afbdbad4… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Mar 7 15:49:55 2018 +0100 German translation for release 3.3 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018030201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2018030201.xml b/news/de/2018030201.xml new file mode 100644 index 0000000..c3fb9b7 --- /dev/null +++ b/news/de/2018030201.xml @@ -0,0 +1,17 @@ +<news> +<date>2. März 2018</date> +<title>Wine 3.3 freigegeben</title> +<body> +<p> Die Entwicklungsversion 3.3 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/3.3">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Anfänge von Vulkan-Unterstützung.</li> + <li>Der Direct3D Multi-Threaded-Command-Stream ist nun standardmäßig aktiv.</li> + <li>Multisample-Texturen sind ebenfalls standardmäßig aktiv.</li> + <li>Unterstützung von Game-Controllern durch SDL.</li> + <li>Laden von reinen CIL .Net-Anwendungen wird unterstützt.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.3.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Piotr Caban : comctl32/tests: Add out of visible area item expand test.
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: dc328fe314970d39cbe6e330d99102adf619a73c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc328fe314970d39cbe6e330… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 6 14:30:40 2018 -0600 comctl32/tests: Add out of visible area item expand test. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index d38fad6..5cf397f 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1528,6 +1528,49 @@ static void test_expandinvisible(void) DestroyWindow(hTree); } +static void test_expand(void) +{ + HTREEITEM first, second, last, child; + TVINSERTSTRUCTA ins; + BOOL visible; + RECT rect; + HWND tv; + int i; + + tv = create_treeview_control(0); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_LAST; + U(ins).item.mask = 0; + first = TreeView_InsertItemA(tv, &ins); + ok(first != NULL, "failed to insert first node\n"); + second = TreeView_InsertItemA(tv, &ins); + ok(second != NULL, "failed to insert second node\n"); + for (i=0; i<100; i++) + { + last = TreeView_InsertItemA(tv, &ins); + ok(last != NULL, "failed to insert %d node\n", i); + } + + ins.hParent = second; + child = TreeView_InsertItemA(tv, &ins); + ok(child != NULL, "failed to insert child node\n"); + + ok(SendMessageA(tv, TVM_SELECTITEM, TVGN_CARET, (LPARAM)last), "last node selection failed\n"); + ok(SendMessageA(tv, TVM_EXPAND, TVE_EXPAND, (LPARAM)second), "expand of second node failed\n"); + ok(SendMessageA(tv, TVM_SELECTITEM, TVGN_CARET, (LPARAM)first), "first node selection failed\n"); + + *(HTREEITEM *)&rect = first; + visible = SendMessageA(tv, TVM_GETITEMRECT, FALSE, (LPARAM)&rect); + ok(visible, "first node should be visible\n"); + ok(!rect.left, "rect.left = %d\n", rect.left); + ok(!rect.top, "rect.top = %d\n", rect.top); + ok(rect.right, "rect.right = 0\n"); + ok(rect.bottom, "rect.bottom = 0\n"); + + DestroyWindow(tv); +} + static void test_itemedit(void) { DWORD r; @@ -2859,6 +2902,7 @@ START_TEST(treeview) test_get_set_tooltips(); test_get_set_unicodeformat(); test_expandinvisible(); + test_expand(); test_itemedit(); test_treeview_classinfo(); test_delete_items();

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018