December 2019 - Wine-commits

Zebediah Figura : qcap: Rework v4l2 state change logic.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: wine Branch: master Commit: 84e55192fa2d6610acac2edfef3421cba0705331 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84e55192fa2d6610acac2edf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 4 23:03:30 2019 -0600 qcap: Rework v4l2 state change logic. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capture.h | 7 +- dlls/qcap/v4l.c | 170 ++++++++++++++++--------------------------------- dlls/qcap/vfwcapture.c | 60 +++++++++-------- 3 files changed, 91 insertions(+), 146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=84e55192fa2d6610acac…

1 0

Zebediah Figura : strmbase: Get rid of the "vtbl" parameter to strmbase_filter_init().
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: wine Branch: master Commit: 18f561a78334da35adc0f11ae00134e2cafc5cf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18f561a78334da35adc0f11a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 4 23:03:31 2019 -0600 strmbase: Get rid of the "vtbl" parameter to strmbase_filter_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 20 +-------------- dlls/qcap/avico.c | 20 +-------------- dlls/qcap/avimux.c | 20 +-------------- dlls/qcap/smartteefilter.c | 20 +-------------- dlls/qcap/vfwcapture.c | 21 +--------------- dlls/qedit/samplegrabber.c | 21 +--------------- dlls/quartz/dsoundrender.c | 12 ++++----- dlls/quartz/filesource.c | 22 +--------------- dlls/quartz/tests/videorenderer.c | 21 +--------------- dlls/quartz/tests/vmr7.c | 21 +--------------- dlls/quartz/tests/vmr9.c | 21 +--------------- dlls/strmbase/filter.c | 53 ++++++++++++++++++++++++++------------- dlls/strmbase/renderer.c | 21 +--------------- dlls/strmbase/transform.c | 22 +--------------- dlls/winegstreamer/gstdemux.c | 27 +++----------------- dlls/wineqtdecoder/qtsplitter.c | 20 +-------------- include/wine/strmbase.h | 18 +------------ 17 files changed, 60 insertions(+), 320 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=18f561a78334da35adc0…

1 0

Nikolay Sivov : dwrite: Add partial implementation for IDWriteFontResource.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: wine Branch: master Commit: 393d50f9814d3d83e4489266b9dd0ba75ba46c19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=393d50f9814d3d83e4489266… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 5 11:55:57 2019 +0300 dwrite: Add partial implementation for IDWriteFontResource. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 + dlls/dwrite/font.c | 217 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 4 +- dlls/dwrite/tests/font.c | 22 +++-- 4 files changed, 233 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=393d50f9814d3d83e448…

1 0

Nikolay Sivov : dwrite: Respond to IDWriteFontFace5 queries.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: wine Branch: master Commit: 0f22205768ab1e03ef9e5c0294c2dcd37f46f771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f22205768ab1e03ef9e5c02… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 5 11:55:58 2019 +0300 dwrite: Respond to IDWriteFontFace5 queries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 7 ++++--- dlls/dwrite/tests/font.c | 17 ++++++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8788181303..bfe32d5fd9 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -474,7 +474,8 @@ static HRESULT WINAPI dwritefontface_QueryInterface(IDWriteFontFace5 *iface, REF TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); - if (IsEqualIID(riid, &IID_IDWriteFontFace4) || + if (IsEqualIID(riid, &IID_IDWriteFontFace5) || + IsEqualIID(riid, &IID_IDWriteFontFace4) || IsEqualIID(riid, &IID_IDWriteFontFace3) || IsEqualIID(riid, &IID_IDWriteFontFace2) || IsEqualIID(riid, &IID_IDWriteFontFace1) || @@ -1425,7 +1426,7 @@ static HRESULT WINAPI dwritefontface5_GetFontAxisValues(IDWriteFontFace5 *iface, return E_NOTIMPL; } -static BOOL WINAPI dwritefontface5_HasVariantions(IDWriteFontFace5 *iface) +static BOOL WINAPI dwritefontface5_HasVariations(IDWriteFontFace5 *iface) { FIXME("%p: stub\n", iface); @@ -1496,7 +1497,7 @@ static const IDWriteFontFace5Vtbl dwritefontfacevtbl = dwritefontface4_ReleaseGlyphImageData, dwritefontface5_GetFontAxisValueCount, dwritefontface5_GetFontAxisValues, - dwritefontface5_HasVariantions, + dwritefontface5_HasVariations, dwritefontface5_GetFontResource, }; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f0266cb751..d06b2f555a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9291,25 +9291,28 @@ if (SUCCEEDED(hr)) IDWriteFontFaceReference1_Release(reference); } hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace5, (void **)&fontface5); -todo_wine ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - if (FAILED(hr)) - return; - hr = IDWriteFontFace5_GetFontResource(fontface5, &resource2); +todo_wine ok(hr == S_OK, "Failed to get font resource, hr %#x.\n", hr); + +if (SUCCEEDED(hr)) +{ ok(resource != resource2, "Unexpected resource instance.\n"); IDWriteFontResource_Release(resource); - +} hr = IDWriteFontFace5_GetFontResource(fontface5, &resource); +todo_wine ok(hr == S_OK, "Failed to get font resource, hr %#x.\n", hr); + +if (SUCCEEDED(hr)) +{ ok(resource != resource2, "Unexpected resource instance.\n"); EXPECT_REF(resource, 1); - IDWriteFontResource_Release(resource); IDWriteFontResource_Release(resource2); - +} IDWriteFontFace5_Release(fontface5); IDWriteFontResource_Release(resource);

1 0

Nikolay Sivov : dwrite: Use IDWriteFactory7 internall for fontfaces.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: wine Branch: master Commit: 16152993d6406f1c2d134fc65d978976768cdb6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=16152993d6406f1c2d134fc6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 5 11:55:59 2019 +0300 dwrite: Use IDWriteFactory7 internall for fontfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 10 +++++----- dlls/dwrite/font.c | 11 ++++++----- dlls/dwrite/main.c | 14 +++++++------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index a5d946c385..1598bb6aee 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -154,7 +154,7 @@ struct glyphrunanalysis_desc struct fontface_desc { - IDWriteFactory5 *factory; + IDWriteFactory7 *factory; DWRITE_FONT_FACE_TYPE face_type; IDWriteFontFile * const *files; IDWriteFontFileStream *stream; @@ -193,7 +193,7 @@ struct dwrite_fontface UINT32 file_count; UINT32 index; - IDWriteFactory5 *factory; + IDWriteFactory7 *factory; struct fontfacecached *cached; USHORT simulations; @@ -268,7 +268,7 @@ extern HRESULT factory_get_cached_fontface(IDWriteFactory5*,IDWriteFontFile*cons struct list**,REFIID,void**) DECLSPEC_HIDDEN; extern void factory_detach_fontcollection(IDWriteFactory5 *factory, IDWriteFontCollection3 *collection) DECLSPEC_HIDDEN; extern void factory_detach_gdiinterop(IDWriteFactory5*,IDWriteGdiInterop1*) DECLSPEC_HIDDEN; -extern struct fontfacecached *factory_cache_fontface(IDWriteFactory5 *factory, struct list *fontfaces, +extern struct fontfacecached *factory_cache_fontface(IDWriteFactory7 *factory, struct list *fontfaces, IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN; extern void get_logfont_from_font(IDWriteFont*,LOGFONTW*) DECLSPEC_HIDDEN; extern void get_logfont_from_fontface(IDWriteFontFace*,LOGFONTW*) DECLSPEC_HIDDEN; @@ -276,8 +276,8 @@ extern HRESULT get_fontsig_from_font(IDWriteFont*,FONTSIGNATURE*) DECLSPEC_HIDDE extern HRESULT get_fontsig_from_fontface(IDWriteFontFace*,FONTSIGNATURE*) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteFactory5*,IDWriteGdiInterop1**) DECLSPEC_HIDDEN; extern void fontface_detach_from_cache(IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN; -extern void factory_lock(IDWriteFactory5*) DECLSPEC_HIDDEN; -extern void factory_unlock(IDWriteFactory5*) DECLSPEC_HIDDEN; +extern void factory_lock(IDWriteFactory7 *factory) DECLSPEC_HIDDEN; +extern void factory_unlock(IDWriteFactory7 *factory) DECLSPEC_HIDDEN; extern HRESULT create_inmemory_fileloader(IDWriteFontFileLoader**) DECLSPEC_HIDDEN; extern HRESULT create_font_resource(IDWriteFactory7 *factory, IDWriteFontFile *file, UINT32 face_index, IDWriteFontResource **resource) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index bfe32d5fd9..8c58d7561a 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -551,7 +551,7 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) freetype_notify_cacheremove(iface); - IDWriteFactory5_Release(fontface->factory); + IDWriteFactory7_Release(fontface->factory); heap_free(fontface); } @@ -1518,7 +1518,7 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace5 if (FAILED(hr = get_filestream_from_file(data->file, &desc.stream))) return hr; - desc.factory = font->family->collection->factory; + desc.factory = (IDWriteFactory7 *)font->family->collection->factory; desc.face_type = data->face_type; desc.files = &data->file; desc.files_number = 1; @@ -4051,7 +4051,7 @@ HRESULT create_font_collection(IDWriteFactory5 *factory, IDWriteFontFileEnumerat WCHAR familyW[255]; UINT32 index; - desc.factory = factory; + desc.factory = (IDWriteFactory7 *)factory; desc.face_type = face_type; desc.files = &file; desc.stream = stream; @@ -4394,7 +4394,7 @@ static HRESULT eudc_collection_add_family(IDWriteFactory5 *factory, struct dwrit struct fontface_desc desc; /* alloc and init new font data structure */ - desc.factory = factory; + desc.factory = (IDWriteFactory7 *)factory; desc.face_type = face_type; desc.index = i; desc.files = &file; @@ -4660,7 +4660,8 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->colr.exists = TRUE; fontface->index = desc->index; fontface->simulations = desc->simulations; - IDWriteFactory5_AddRef(fontface->factory = desc->factory); + fontface->factory = desc->factory; + IDWriteFactory7_AddRef(fontface->factory); for (i = 0; i < fontface->file_count; i++) { fontface->files[i] = desc->files[i]; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 1c1fabdb7d..e4b76823ff 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -847,15 +847,15 @@ static HRESULT WINAPI dwritefactory_CreateCustomFontFileReference(IDWriteFactory return create_font_file(loader, reference_key, key_size, font_file); } -void factory_lock(IDWriteFactory5 *iface) +void factory_lock(IDWriteFactory7 *iface) { - struct dwritefactory *factory = impl_from_IDWriteFactory7((IDWriteFactory7 *)iface); + struct dwritefactory *factory = impl_from_IDWriteFactory7(iface); EnterCriticalSection(&factory->cs); } -void factory_unlock(IDWriteFactory5 *iface) +void factory_unlock(IDWriteFactory7 *iface) { - struct dwritefactory *factory = impl_from_IDWriteFactory7((IDWriteFactory7 *)iface); + struct dwritefactory *factory = impl_from_IDWriteFactory7(iface); LeaveCriticalSection(&factory->cs); } @@ -935,10 +935,10 @@ HRESULT factory_get_cached_fontface(IDWriteFactory5 *iface, IDWriteFontFile * co return *obj ? S_OK : S_FALSE; } -struct fontfacecached *factory_cache_fontface(IDWriteFactory5 *iface, struct list *fontfaces, +struct fontfacecached *factory_cache_fontface(IDWriteFactory7 *iface, struct list *fontfaces, IDWriteFontFace5 *fontface) { - struct dwritefactory *factory = impl_from_IDWriteFactory7((IDWriteFactory7 *)iface); + struct dwritefactory *factory = impl_from_IDWriteFactory7(iface); struct fontfacecached *cached; /* new cache entry */ @@ -1006,7 +1006,7 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory7 *iface, DWRIT if (hr != S_FALSE) goto failed; - desc.factory = (IDWriteFactory5 *)iface; + desc.factory = iface; desc.face_type = req_facetype; desc.files = font_files; desc.stream = stream;

1 0

Nikolay Sivov : dwrite: Implement GetFontResource() for fontface.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: wine Branch: master Commit: 6f7a9158f487c5f610a6e6f664805981ab07796c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f7a9158f487c5f610a6e6f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 5 11:56:00 2019 +0300 dwrite: Implement GetFontResource() for fontface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 6 ++++-- dlls/dwrite/tests/font.c | 13 ++----------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8c58d7561a..8045bce870 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1435,9 +1435,11 @@ static BOOL WINAPI dwritefontface5_HasVariations(IDWriteFontFace5 *iface) static HRESULT WINAPI dwritefontface5_GetFontResource(IDWriteFontFace5 *iface, IDWriteFontResource **resource) { - FIXME("%p, %p: stub\n", iface, resource); + struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, resource); + + return IDWriteFactory7_CreateFontResource(fontface->factory, fontface->files[0], fontface->index, resource); } static const IDWriteFontFace5Vtbl dwritefontfacevtbl = diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d06b2f555a..83d6be4449 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9294,28 +9294,19 @@ if (SUCCEEDED(hr)) ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); hr = IDWriteFontFace5_GetFontResource(fontface5, &resource2); -todo_wine ok(hr == S_OK, "Failed to get font resource, hr %#x.\n", hr); - -if (SUCCEEDED(hr)) -{ ok(resource != resource2, "Unexpected resource instance.\n"); IDWriteFontResource_Release(resource); -} + hr = IDWriteFontFace5_GetFontResource(fontface5, &resource); -todo_wine ok(hr == S_OK, "Failed to get font resource, hr %#x.\n", hr); - -if (SUCCEEDED(hr)) -{ ok(resource != resource2, "Unexpected resource instance.\n"); EXPECT_REF(resource, 1); IDWriteFontResource_Release(resource); IDWriteFontResource_Release(resource2); -} + IDWriteFontFace5_Release(fontface5); - IDWriteFontResource_Release(resource); IDWriteFontFile_Release(fontfile); IDWriteFontFace_Release(fontface);

1 0

Nikolay Sivov : dwrite: Add newer CreateFontFaceReference() variant.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: wine Branch: master Commit: 7e665fd2678e2dd591e7d106b74a261158395122 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e665fd2678e2dd591e7d106… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 5 11:56:01 2019 +0300 dwrite: Add newer CreateFontFaceReference() variant. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 5 +++-- dlls/dwrite/font.c | 26 +++++++++++++++++++++----- dlls/dwrite/main.c | 19 ++++++++++++------- dlls/dwrite/tests/font.c | 25 +++++++++++++++++++------ 4 files changed, 55 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 1598bb6aee..9447c59663 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -262,8 +262,9 @@ extern void release_system_fontfallback(IDWriteFontFallback1 *fallback) DECLSPEC extern HRESULT create_fontfallback_builder(IDWriteFactory5*,IDWriteFontFallbackBuilder**) DECLSPEC_HIDDEN; extern HRESULT create_matching_font(IDWriteFontCollection*,const WCHAR*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, IDWriteFont**) DECLSPEC_HIDDEN; -extern HRESULT create_fontfacereference(IDWriteFactory5*,IDWriteFontFile*,UINT32,DWRITE_FONT_SIMULATIONS, - IDWriteFontFaceReference**) DECLSPEC_HIDDEN; +extern HRESULT create_fontfacereference(IDWriteFactory5 *factory, IDWriteFontFile *file, UINT32 face_index, + DWRITE_FONT_SIMULATIONS simulations, DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 axis_values_count, + IDWriteFontFaceReference1 **reference) DECLSPEC_HIDDEN; extern HRESULT factory_get_cached_fontface(IDWriteFactory5*,IDWriteFontFile*const*,UINT32,DWRITE_FONT_SIMULATIONS, struct list**,REFIID,void**) DECLSPEC_HIDDEN; extern void factory_detach_fontcollection(IDWriteFactory5 *factory, IDWriteFontCollection3 *collection) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8045bce870..c9f1e885d5 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -231,6 +231,8 @@ struct dwrite_fontfacereference IDWriteFontFile *file; UINT32 index; USHORT simulations; + DWRITE_FONT_AXIS_VALUE *axis_values; + UINT32 axis_values_count; IDWriteFactory5 *factory; }; @@ -6081,6 +6083,7 @@ static ULONG WINAPI fontfacereference_Release(IDWriteFontFaceReference1 *iface) { IDWriteFontFile_Release(reference->file); IDWriteFactory5_Release(reference->factory); + heap_free(reference->axis_values); heap_free(reference); } @@ -6253,9 +6256,11 @@ static HRESULT WINAPI fontfacereference1_CreateFontFace(IDWriteFontFaceReference static UINT32 WINAPI fontfacereference1_GetFontAxisValueCount(IDWriteFontFaceReference1 *iface) { - FIXME("%p.\n", iface); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); - return 0; + TRACE("%p.\n", iface); + + return reference->axis_values_count; } static HRESULT WINAPI fontfacereference1_GetFontAxisValues(IDWriteFontFaceReference1 *iface, @@ -6291,7 +6296,8 @@ static const IDWriteFontFaceReference1Vtbl fontfacereferencevtbl = }; HRESULT create_fontfacereference(IDWriteFactory5 *factory, IDWriteFontFile *file, UINT32 index, - DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFaceReference **ret) + DWRITE_FONT_SIMULATIONS simulations, DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 axis_values_count, + IDWriteFontFaceReference1 **ret) { struct dwrite_fontfacereference *object; @@ -6300,7 +6306,7 @@ HRESULT create_fontfacereference(IDWriteFactory5 *factory, IDWriteFontFile *file if (!is_simulation_valid(simulations)) return E_INVALIDARG; - object = heap_alloc(sizeof(*object)); + object = heap_alloc_zero(sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -6313,8 +6319,18 @@ HRESULT create_fontfacereference(IDWriteFactory5 *factory, IDWriteFontFile *file IDWriteFontFile_AddRef(object->file); object->index = index; object->simulations = simulations; + if (axis_values_count) + { + if (!(object->axis_values = heap_alloc(axis_values_count * sizeof(*axis_values)))) + { + IDWriteFontFaceReference1_Release(&object->IDWriteFontFaceReference1_iface); + return E_OUTOFMEMORY; + } + memcpy(object->axis_values, axis_values, axis_values_count * sizeof(*axis_values)); + object->axis_values_count = axis_values_count; + } - *ret = (IDWriteFontFaceReference *)&object->IDWriteFontFaceReference1_iface; + *ret = &object->IDWriteFontFaceReference1_iface; return S_OK; } diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index e4b76823ff..5f30b8e4f4 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1443,7 +1443,8 @@ static HRESULT WINAPI dwritefactory3_CreateFontFaceReference_(IDWriteFactory7 *i { TRACE("%p, %p, %u, %x, %p.\n", iface, file, index, simulations, reference); - return create_fontfacereference((IDWriteFactory5 *)iface, file, index, simulations, reference); + return create_fontfacereference((IDWriteFactory5 *)iface, file, index, simulations, NULL, 0, + (IDWriteFontFaceReference1 **)reference); } static HRESULT WINAPI dwritefactory3_CreateFontFaceReference(IDWriteFactory7 *iface, WCHAR const *path, @@ -1455,13 +1456,15 @@ static HRESULT WINAPI dwritefactory3_CreateFontFaceReference(IDWriteFactory7 *if TRACE("%p, %s, %p, %u, %#x, %p.\n", iface, debugstr_w(path), writetime, index, simulations, reference); - hr = IDWriteFactory5_CreateFontFileReference((IDWriteFactory5 *)iface, path, writetime, &file); - if (FAILED(hr)) { + hr = IDWriteFactory7_CreateFontFileReference(iface, path, writetime, &file); + if (FAILED(hr)) + { *reference = NULL; return hr; } - hr = IDWriteFactory5_CreateFontFaceReference_((IDWriteFactory5 *)iface, file, index, simulations, reference); + hr = create_fontfacereference((IDWriteFactory5 *)iface, file, index, simulations, NULL, 0, + (IDWriteFontFaceReference1 **)reference); IDWriteFontFile_Release(file); return hr; } @@ -1656,11 +1659,13 @@ static HRESULT WINAPI dwritefactory5_UnpackFontFile(IDWriteFactory7 *iface, DWRI static HRESULT WINAPI dwritefactory6_CreateFontFaceReference(IDWriteFactory7 *iface, IDWriteFontFile *file, UINT32 face_index, DWRITE_FONT_SIMULATIONS simulations, DWRITE_FONT_AXIS_VALUE const *axis_values, - UINT32 num_axis, IDWriteFontFaceReference1 **ref) + UINT32 axis_values_count, IDWriteFontFaceReference1 **reference) { - FIXME("%p, %p, %u, %#x, %p, %u, %p.\n", iface, file, face_index, simulations, axis_values, num_axis, ref); + TRACE("%p, %p, %u, %#x, %p, %u, %p.\n", iface, file, face_index, simulations, axis_values, axis_values_count, + reference); - return E_NOTIMPL; + return create_fontfacereference((IDWriteFactory5 *)iface, file, face_index, simulations, axis_values, + axis_values_count, reference); } static HRESULT WINAPI dwritefactory6_CreateFontResource(IDWriteFactory7 *iface, IDWriteFontFile *file, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 83d6be4449..5ab01465b7 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9239,6 +9239,7 @@ static void test_font_resource(void) IDWriteFontFaceReference1 *reference, *reference2; IDWriteFontResource *resource, *resource2; IDWriteFontFile *fontfile, *fontfile2; + DWRITE_FONT_AXIS_VALUE axis_value; IDWriteFontFace5 *fontface5; IDWriteFontFace *fontface; IDWriteFactory6 *factory; @@ -9274,22 +9275,34 @@ static void test_font_resource(void) index = IDWriteFontResource_GetFontFaceIndex(resource); ok(!index, "Unexpected index %u.\n", index); + /* Specify axis value, font has no variations. */ + axis_value.axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axis_value.value = 400.0f; + hr = IDWriteFontResource_CreateFontFaceReference(resource, DWRITE_FONT_SIMULATIONS_NONE, &axis_value, 1, &reference); + ok(hr == S_OK, "Failed to create reference object, hr %#x.\n", hr); + + count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference); + ok(count == 1, "Unexpected axis value count.\n"); + + IDWriteFontFaceReference1_Release(reference); + + hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, &axis_value, 1, + &reference); + count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference); + ok(count == 1, "Unexpected axis value count.\n"); + IDWriteFontFaceReference1_Release(reference); + EXPECT_REF(resource, 1); hr = IDWriteFontResource_CreateFontFaceReference(resource, DWRITE_FONT_SIMULATIONS_NONE, NULL, 0, &reference); -todo_wine ok(hr == S_OK, "Failed to create reference object, hr %#x.\n", hr); EXPECT_REF(resource, 1); hr = IDWriteFontResource_CreateFontFaceReference(resource, DWRITE_FONT_SIMULATIONS_NONE, NULL, 0, &reference2); -todo_wine ok(hr == S_OK, "Failed to create reference object, hr %#x.\n", hr); - -if (SUCCEEDED(hr)) -{ ok(reference != reference2, "Unexpected reference instance.\n"); IDWriteFontFaceReference1_Release(reference2); IDWriteFontFaceReference1_Release(reference); -} + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace5, (void **)&fontface5); ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr);

1 0

Francois Gouget : testbot/web: Require filling the captcha on the feedback page.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: tools Branch: master Commit: 345c225095e4be9cb97057e19b82cfd6f7a3e17b URL: https://source.winehq.org/git/tools.git/?a=commit;h=345c225095e4be9cb97057e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 5 10:39:43 2019 +0100 testbot/web: Require filling the captcha on the feedback page. Spammers (or their bots) have taken to spamming the TestBot's feedback page. As if that was going to egt them anywhere! The captcha is only required for users who are not logged in obviously. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Feedback.pl | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index 36f0a2b..b43397f 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -33,16 +33,21 @@ sub _initialize($$$) { my ($self, $Request, $RequiredRole) = @_; + my $Session = $self->GetCurrentSession(); my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Name", "Name", !1, !1, "A", 40), CreateBasicPropertyDescriptor("EMail", "Email", !1, !1, "A", 40), CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, 1, "textarea", 1024), ); + if (!$Session and $RegistrationQ) + { + $self->GetParam("FeedA", "") if (!defined $self->GetParam("FeedA")); + push @PropertyDescriptors, CreateBasicPropertyDescriptor("FeedA", "Please demonstrate you are not a bot by answering this question: $RegistrationQ", !1, 1, "A", 40); + } $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); - my $Session = $self->GetCurrentSession(); - if (defined($Session)) + if ($Session) { # Provide default values my $User = $Session->User; @@ -79,6 +84,17 @@ sub OnSend($) { my ($self) = @_; + my $Session = $self->GetCurrentSession(); + if (!$Session and $RegistrationQ) + { + my $FeedA = $self->GetParam("FeedA"); + if ($FeedA !~ /$RegistrationARE/) + { + $self->{ErrMessage} = "Wrong 'captcha' answer. Please try again."; + $self->{ErrField} = "Captcha"; + return !1; + } + } if (! $self->Validate) { return !1;

1 0

Francois Gouget : testbot/web: Abuse the Status field to show more details about accounts.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: tools Branch: master Commit: 5e371818f866e5f7958108d49502574161841680 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5e371818f866e5f7958108d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 5 10:39:48 2019 +0100 testbot/web: Abuse the Status field to show more details about accounts. This allows quickly identifying accounts that have been approved but where the user did not pick a password. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/WineTestBot.css | 8 +++++++ testbot/web/admin/UsersList.pl | 47 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 1456036..f588355 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -387,6 +387,14 @@ pre .boterror { color: #e55600; } .canceled { color: black; } +.userrequest { color: #e55600; } +.userapproved { color: green; } +.useradmin { color: black; } +.userdevel { color: black; } +.usernone { color: red; } +.userdisabled { color: red; } +.userdeleted { color: red; } + .log-info { background-color: #d9ffcc; } .log-skip { color: blue; } .log-todo { color: #d08000; } diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index f46949d..2799070 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -25,6 +25,7 @@ package UsersListPage; use ObjectModel::CGI::CollectionPage; our @ISA = qw(ObjectModel::CGI::CollectionPage); +use URI::Escape; use WineTestBot::CGI::Sessions; use WineTestBot::Config; use WineTestBot::Users; @@ -55,6 +56,52 @@ sub DisplayProperty($$$) $PropertyName eq "Status" || $PropertyName eq "RealName"; } +sub GenerateDataCell($$$$$) +{ + my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; + + my $PropertyName = $PropertyDescriptor->GetName(); + if ($PropertyName eq "Status") + { + my $Status = $Item->Status; + my ($Class, $Label); + if ($Status eq "disabled") + { + ($Class, $Label) = ('userdisabled', 'disabled'); + } + elsif ($Status eq "deleted") + { + ($Class, $Label) = ('userdeleted', 'deleted'); + } + elsif ($Item->WaitingForApproval()) + { + ($Class, $Label) = ('userrequest', 'request'); + } + elsif (!$Item->Activated()) + { + ($Class, $Label) = ('userapproved', 'approved'); + } + elsif ($Item->HasRole("admin")) + { + ($Class, $Label) = ('useradmin', 'admin'); + } + elsif ($Item->HasRole("wine-devel")) + { + ($Class, $Label) = ('userdevel', 'wine-devel'); + } + else + { + ($Class, $Label) = ('usernone', 'none'); + } + print "<td><a href='/admin/UserDetails.pl?Key=", uri_escape($Item->GetKey()), + "'><span class='$Class'>$Label</span></a></td>"; + } + else + { + $self->SUPER::GenerateDataCell($CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage); + } +} + sub GetActions($$) { my ($self, $CollectionBlock) = @_;

1 0

Francois Gouget : testbot/LogUtils: Fix GetNewLogErrors() when there are no errors.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: tools Branch: master Commit: d469942b22d626522a9316582294fb11d1a14f84 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d469942b22d626522a93165… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 5 10:53:28 2019 +0100 testbot/LogUtils: Fix GetNewLogErrors() when there are no errors. Don't use $Groups if it is undefined. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 5193296..32bf0fa 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -889,7 +889,7 @@ sub GetNewLogErrors($$$) my ($RefFileName, $Groups, $Errors) = @_; my (@NewGroups, %NewErrors, %NewIndices); - return (\@NewGroups, \%NewErrors, \%NewIndices) if (!@$Groups); + return (\@NewGroups, \%NewErrors, \%NewIndices) if (!$Groups or !@$Groups); my ($RefGroups, $RefErrors) = GetLogErrors($RefFileName); return (undef, undef) if (!$RefGroups);

1 0