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

Zebediah Figura : devenum: Allow parsing display name without class ID.
by Alexandre Julliard March 7, 2018

March 7, 2018

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/tests: Test all registered categories.
by Alexandre Julliard March 7, 2018

March 7, 2018

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

Henri Verbeet : wined3d: Pass a texture and sub-resource index to surface_depth_blt_fbo().
by Alexandre Julliard March 7, 2018

March 7, 2018

Module: wine Branch: master Commit: 243e2ddfde7a9a7d9e3577f42b96ed5244abac41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=243e2ddfde7a9a7d9e3577f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 7 11:14:43 2018 +0330 wined3d: Pass a texture and sub-resource index to surface_depth_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 23b7fa3..3bf72e4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -259,24 +259,20 @@ static BOOL texture2d_is_full_rect(const struct wined3d_texture *texture, unsign return TRUE; } -static void surface_depth_blt_fbo(const struct wined3d_device *device, - struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect, - struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect) +static void texture2d_depth_blt_fbo(const struct wined3d_device *device, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, DWORD src_location, + const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + DWORD dst_location, const RECT *dst_rect) { - unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); - struct wined3d_texture *dst_texture = dst_surface->container; - struct wined3d_texture *src_texture = src_surface->container; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; DWORD src_mask, dst_mask; GLbitfield gl_mask; - TRACE("device %p\n", device); - TRACE("src_surface %p, src_location %s, src_rect %s,\n", - src_surface, wined3d_debug_location(src_location), wine_dbgstr_rect(src_rect)); - TRACE("dst_surface %p, dst_location %s, dst_rect %s.\n", - dst_surface, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect)); + TRACE("device %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " + "dst_texture %p, dst_sub_resource_idx %u, dst_location %s, dst_rect %s.\n", device, + src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), wine_dbgstr_rect(src_rect), + dst_texture, dst_sub_resource_idx, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect)); src_mask = src_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); dst_mask = dst_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); @@ -320,10 +316,12 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, gl_info = context->gl_info; - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, src_surface, src_location); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, + src_texture->sub_resources[src_sub_resource_idx].u.surface, src_location); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, dst_surface, dst_location); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, + dst_texture->sub_resources[dst_sub_resource_idx].u.surface, dst_location); context_set_draw_buffer(context, GL_NONE); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); @@ -2418,7 +2416,9 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (blit_op == WINED3D_BLIT_OP_DEPTH_BLIT) { TRACE("Depth/stencil blit.\n"); - surface_depth_blt_fbo(device, src_surface, src_location, src_rect, dst_surface, dst_location, dst_rect); + texture2d_depth_blt_fbo(device, src_surface->container, surface_get_sub_resource_idx(src_surface), + src_location, src_rect, dst_surface->container, surface_get_sub_resource_idx(dst_surface), + dst_location, dst_rect); return dst_location; }

1 0

Zebediah Figura : devenum/tests: Test registering DirectShow filters.
by Alexandre Julliard March 7, 2018

March 7, 2018

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

James Woodcock : msvcrt: Gets() should handle EOF on stdin gracefully.
by Alexandre Julliard March 7, 2018

March 7, 2018

Module: wine Branch: master Commit: 91c72ce7def5ccec3ea7f759111b0d6fb96d722b URL: https://source.winehq.org/git/wine.git/?a=commit;h=91c72ce7def5ccec3ea7f759… Author: James Woodcock <james_woodcock(a)yahoo.co.uk> Date: Tue Mar 6 22:16:28 2018 -0600 msvcrt: Gets() should handle EOF on stdin gracefully. Signed-off-by: James Woodcock <james_woodcock(a)yahoo.co.uk> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7022e48..6b295cf 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4719,10 +4719,16 @@ char * CDECL MSVCRT_gets(char *buf) if(cc != '\r') *buf++ = (char)cc; } + MSVCRT__unlock_file(MSVCRT_stdin); + + if ((cc == MSVCRT_EOF) && (buf_start == buf)) + { + TRACE(":nothing read\n"); + return NULL; + } *buf = '\0'; TRACE("got '%s'\n", buf_start); - MSVCRT__unlock_file(MSVCRT_stdin); return buf_start; } @@ -4741,10 +4747,16 @@ MSVCRT_wchar_t* CDECL MSVCRT__getws(MSVCRT_wchar_t* buf) if (cc != '\r') *buf++ = (MSVCRT_wchar_t)cc; } + MSVCRT__unlock_file(MSVCRT_stdin); + + if ((cc == MSVCRT_WEOF) && (ws == buf)) + { + TRACE(":nothing read\n"); + return NULL; + } *buf = '\0'; TRACE("got %s\n", debugstr_w(ws)); - MSVCRT__unlock_file(MSVCRT_stdin); return ws; }

1 0

Francois Gouget : testbot/web: Simplify JobDetailsPage::GeneratePage().
by Alexandre Julliard March 7, 2018

March 7, 2018

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

Francois Gouget : testbot: Treat directories and files the same when using rmtree().
by Alexandre Julliard March 7, 2018

March 7, 2018

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 March 7, 2018

March 7, 2018

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

Julian Rüger : German translation for release 3.3
by Jeremy Newman March 7, 2018

March 7, 2018

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

Alexandre Julliard : ntdll: Handle LOAD_LIBRARY_AS_IMAGE_RESOURCE modules when loading resources.
by Alexandre Julliard March 6, 2018

March 6, 2018

Module: wine Branch: master Commit: 7aa6dcafbb1703984ac5d858b475110444a9f9b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aa6dcafbb1703984ac5d858… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 6 09:08:10 2018 -0600 ntdll: Handle LOAD_LIBRARY_AS_IMAGE_RESOURCE modules when loading resources. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 7 ++----- dlls/ntdll/resource.c | 12 ++++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index de2cc54..7140645 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3277,11 +3277,8 @@ PVOID WINAPI RtlImageDirectoryEntryToData( HMODULE module, BOOL image, WORD dir, const IMAGE_NT_HEADERS *nt; DWORD addr; - if ((ULONG_PTR)module & 1) /* mapped as data file */ - { - module = (HMODULE)((ULONG_PTR)module & ~1); - image = FALSE; - } + if ((ULONG_PTR)module & 1) image = FALSE; /* mapped as data file */ + module = (HMODULE)((ULONG_PTR)module & ~3); if (!(nt = RtlImageNtHeader( module ))) return NULL; if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) { diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index f542677..0d5172a 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -333,12 +333,12 @@ static inline NTSTATUS access_resource( HMODULE hmod, const IMAGE_RESOURCE_DATA_ { if (ptr) { - if (is_data_file_module(hmod)) - { - HMODULE mod = (HMODULE)((ULONG_PTR)hmod & ~1); - *ptr = RtlImageRvaToVa( RtlImageNtHeader(mod), mod, entry->OffsetToData, NULL ); - } - else *ptr = (char *)hmod + entry->OffsetToData; + BOOL is_data_file = is_data_file_module(hmod); + hmod = (HMODULE)((ULONG_PTR)hmod & ~3); + if (is_data_file) + *ptr = RtlImageRvaToVa( RtlImageNtHeader(hmod), hmod, entry->OffsetToData, NULL ); + else + *ptr = (char *)hmod + entry->OffsetToData; } if (size) *size = entry->Size; status = STATUS_SUCCESS;

1 0