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

[PATCH] widl: Add support for WinRT regscript generation.
by Rémi Bernon 04 Mar '21

04 Mar '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/register.c | 64 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index c03ab3c56b1..76bfc3c715c 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -185,6 +185,22 @@ static void write_coclasses( const statement_list_t *stmts, const typelib_t *typ } } +static void write_runtimeclasses_registry( const statement_list_t *stmts ) +{ + const statement_t *stmt; + const type_t *type; + + if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) + { + if (stmt->type != STMT_TYPE) continue; + if (type_get_type((type = stmt->u.type)) != TYPE_RUNTIMECLASS) continue; + put_str( indent, "ForceRemove %s\n", format_namespace( type->namespace, "", ".", type->name, NULL ) ); + put_str( indent++, "{\n" ); + put_str( indent, "val 'DllPath' = s '%%MODULE%%'\n" ); + put_str( --indent, "}\n" ); + } +} + static int write_progid( const type_t *class ) { const UUID *uuid = get_attrp( class->attrs, ATTR_UUID ); @@ -236,22 +252,44 @@ void write_regscript( const statement_list_t *stmts ) init_output_buffer(); - put_str( indent, "HKCR\n" ); - put_str( indent++, "{\n" ); + if (winrt_mode) + { + put_str( indent, "HKLM\n" ); + put_str( indent++, "{\n" ); + put_str( indent, "NoRemove Software\n" ); + put_str( indent++, "{\n" ); + put_str( indent, "NoRemove Microsoft\n" ); + put_str( indent++, "{\n" ); + put_str( indent, "NoRemove WindowsRuntime\n" ); + put_str( indent++, "{\n" ); + put_str( indent, "NoRemove ActivatableClassId\n" ); + put_str( indent++, "{\n" ); + write_runtimeclasses_registry( stmts ); + put_str( --indent, "}\n" ); + put_str( --indent, "}\n" ); + put_str( --indent, "}\n" ); + put_str( --indent, "}\n" ); + put_str( --indent, "}\n" ); + } + else + { + put_str( indent, "HKCR\n" ); + put_str( indent++, "{\n" ); - put_str( indent, "NoRemove Interface\n" ); - put_str( indent++, "{\n" ); - ps_factory = find_ps_factory( stmts ); - if (ps_factory) write_interfaces( stmts, ps_factory ); - put_str( --indent, "}\n" ); + put_str( indent, "NoRemove Interface\n" ); + put_str( indent++, "{\n" ); + ps_factory = find_ps_factory( stmts ); + if (ps_factory) write_interfaces( stmts, ps_factory ); + put_str( --indent, "}\n" ); - put_str( indent, "NoRemove CLSID\n" ); - put_str( indent++, "{\n" ); - write_coclasses( stmts, NULL ); - put_str( --indent, "}\n" ); + put_str( indent, "NoRemove CLSID\n" ); + put_str( indent++, "{\n" ); + write_coclasses( stmts, NULL ); + put_str( --indent, "}\n" ); - write_progids( stmts ); - put_str( --indent, "}\n" ); + write_progids( stmts ); + put_str( --indent, "}\n" ); + } if (strendswith( regscript_name, ".res" )) /* create a binary resource file */ { -- 2.30.0

2 1

[PATCH] tdh: add TdhLoadManifestFromBinary stub
by Austin English 04 Mar '21

04 Mar '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50725 --- dlls/tdh/tdh.spec | 2 +- dlls/tdh/tdh_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/tdh/tdh.spec b/dlls/tdh/tdh.spec index 0e7c5a5995a..cde397c3899 100644 --- a/dlls/tdh/tdh.spec +++ b/dlls/tdh/tdh.spec @@ -22,7 +22,7 @@ @ stub TdhGetWppMessage @ stub TdhGetWppProperty @ stdcall TdhLoadManifest(wstr) -@ stub TdhLoadManifestFromBinary +@ stdcall TdhLoadManifestFromBinary(wstr) @ stub TdhOpenDecodingHandle @ stub TdhQueryProviderFieldInformation @ stub TdhQueryRemoteWBEMProviderFieldInformation diff --git a/dlls/tdh/tdh_main.c b/dlls/tdh/tdh_main.c index 2e6a9e69a38..60f32976b98 100644 --- a/dlls/tdh/tdh_main.c +++ b/dlls/tdh/tdh_main.c @@ -32,3 +32,9 @@ ULONG WINAPI TdhLoadManifest(LPWSTR manifest) FIXME("(%s): stub\n", debugstr_w(manifest)); return STATUS_SUCCESS; } + +ULONG WINAPI TdhLoadManifestFromBinary(LPWSTR binary) +{ + FIXME("(%s): stub\n", debugstr_w(binary)); + return STATUS_SUCCESS; +} -- 2.30.1

3 2

[PATCH 1/5] dwrite: Implement font set object stub.
by Nikolay Sivov 04 Mar '21

04 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 355 ++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/font.c | 23 ++- 2 files changed, 361 insertions(+), 17 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index bbd73f734de..ef61b173824 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -257,6 +257,16 @@ struct dwrite_fontset_entry unsigned int simulations; }; +struct dwrite_fontset +{ + IDWriteFontSet3 IDWriteFontSet3_iface; + LONG refcount; + IDWriteFactory7 *factory; + + struct dwrite_fontset_entry *entries; + unsigned int count; +}; + struct dwrite_fontset_builder { IDWriteFontSetBuilder2 IDWriteFontSetBuilder2_iface; @@ -396,6 +406,11 @@ static struct dwrite_fontset_builder *impl_from_IDWriteFontSetBuilder2(IDWriteFo return CONTAINING_RECORD(iface, struct dwrite_fontset_builder, IDWriteFontSetBuilder2_iface); } +static struct dwrite_fontset *impl_from_IDWriteFontSet3(IDWriteFontSet3 *iface) +{ + return CONTAINING_RECORD(iface, struct dwrite_fontset, IDWriteFontSet3_iface); +} + static HRESULT get_cached_glyph_metrics(struct dwrite_fontface *fontface, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics) { static const DWRITE_GLYPH_METRICS nil; @@ -7080,6 +7095,336 @@ HRESULT create_font_resource(IDWriteFactory7 *factory, IDWriteFontFile *file, UI return S_OK; } +static HRESULT WINAPI dwritefontset_QueryInterface(IDWriteFontSet3 *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IDWriteFontSet3) || + IsEqualIID(riid, &IID_IDWriteFontSet2) || + IsEqualIID(riid, &IID_IDWriteFontSet1) || + IsEqualIID(riid, &IID_IDWriteFontSet)) + { + *obj = iface; + IDWriteFontSet3_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dwritefontset_AddRef(IDWriteFontSet3 *iface) +{ + struct dwrite_fontset *set = impl_from_IDWriteFontSet3(iface); + ULONG refcount = InterlockedIncrement(&set->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static void fontset_release_entries(struct dwrite_fontset_entry *entries, unsigned int count) +{ + unsigned int i; + + for (i = 0; i < count; ++i) + IDWriteFontFile_Release(entries[i].file); +} + +static ULONG WINAPI dwritefontset_Release(IDWriteFontSet3 *iface) +{ + struct dwrite_fontset *set = impl_from_IDWriteFontSet3(iface); + ULONG refcount = InterlockedDecrement(&set->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + IDWriteFactory7_Release(set->factory); + fontset_release_entries(set->entries, set->count); + heap_free(set->entries); + heap_free(set); + } + + return refcount; +} + +static UINT32 WINAPI dwritefontset_GetFontCount(IDWriteFontSet3 *iface) +{ + struct dwrite_fontset *set = impl_from_IDWriteFontSet3(iface); + + TRACE("%p.\n", iface); + + return set->count; +} + +static HRESULT WINAPI dwritefontset_GetFontFaceReference(IDWriteFontSet3 *iface, UINT32 index, + IDWriteFontFaceReference **reference) +{ + FIXME("%p, %u, %p.\n", iface, index, reference); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset_FindFontFaceReference(IDWriteFontSet3 *iface, + IDWriteFontFaceReference *reference, UINT32 *index, BOOL *exists) +{ + FIXME("%p, %p, %p, %p.\n", iface, reference, index, exists); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset_FindFontFace(IDWriteFontSet3 *iface, IDWriteFontFace *fontface, + UINT32 *index, BOOL *exists) +{ + FIXME("%p, %p, %p, %p.\n", iface, fontface, index, exists); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset_GetPropertyValues__(IDWriteFontSet3 *iface, DWRITE_FONT_PROPERTY_ID id, + IDWriteStringList **values) +{ + FIXME("%p, %d, %p.\n", iface, id, values); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset_GetPropertyValues_(IDWriteFontSet3 *iface, DWRITE_FONT_PROPERTY_ID id, + WCHAR const *preferred_locales, IDWriteStringList **values) +{ + FIXME("%p, %d, %s, %p.\n", iface, id, debugstr_w(preferred_locales), values); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset_GetPropertyValues(IDWriteFontSet3 *iface, UINT32 index, DWRITE_FONT_PROPERTY_ID id, + BOOL *exists, IDWriteLocalizedStrings **values) +{ + FIXME("%p, %u, %d, %p, %p.\n", iface, index, id, exists, values); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset_GetPropertyOccurrenceCount(IDWriteFontSet3 *iface, DWRITE_FONT_PROPERTY const *property, + UINT32 *count) +{ + FIXME("%p, %p, %p.\n", iface, property, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset_GetMatchingFonts_(IDWriteFontSet3 *iface, WCHAR const *family, DWRITE_FONT_WEIGHT weight, + DWRITE_FONT_STRETCH stretch, DWRITE_FONT_STYLE style, IDWriteFontSet **fontset) +{ + FIXME("%p, %s, %d, %d, %d, %p.\n", iface, debugstr_w(family), weight, stretch, style, fontset); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset_GetMatchingFonts(IDWriteFontSet3 *iface, DWRITE_FONT_PROPERTY const *props, UINT32 count, + IDWriteFontSet **fontset) +{ + FIXME("%p, %p, %u, %p.\n", iface, props, count, fontset); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset1_GetMatchingFonts(IDWriteFontSet3 *iface, DWRITE_FONT_PROPERTY const *property, + DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 num_values, IDWriteFontSet1 **fontset) +{ + FIXME("%p, %p, %p, %u, %p.\n", iface, property, axis_values, num_values, fontset); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset1_GetFirstFontResources(IDWriteFontSet3 *iface, IDWriteFontSet1 **fontset) +{ + FIXME("%p, %p.\n", iface, fontset); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset1_GetFilteredFonts__(IDWriteFontSet3 *iface, UINT32 const *indices, + UINT32 num_indices, IDWriteFontSet1 **fontset) +{ + FIXME("%p, %p, %u, %p.\n", iface, indices, num_indices, fontset); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset1_GetFilteredFonts_(IDWriteFontSet3 *iface, DWRITE_FONT_AXIS_RANGE const *axis_ranges, + UINT32 num_ranges, BOOL select_any_range, IDWriteFontSet1 **fontset) +{ + FIXME("%p, %p, %u, %d, %p.\n", iface, axis_ranges, num_ranges, select_any_range, fontset); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset1_GetFilteredFonts(IDWriteFontSet3 *iface, DWRITE_FONT_PROPERTY const *props, + UINT32 num_properties, BOOL select_any_property, IDWriteFontSet1 **fontset) +{ + FIXME("%p, %p, %u, %d, %p.\n", iface, props, num_properties, select_any_property, fontset); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset1_GetFilteredFontIndices_(IDWriteFontSet3 *iface, DWRITE_FONT_AXIS_RANGE const *ranges, + UINT32 num_ranges, BOOL select_any_range, UINT32 *indices, UINT32 num_indices, UINT32 *actual_num_indices) +{ + FIXME("%p, %p, %u, %d, %p, %u, %p.\n", iface, ranges, num_ranges, select_any_range, indices, num_indices, actual_num_indices); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset1_GetFilteredFontIndices(IDWriteFontSet3 *iface, DWRITE_FONT_PROPERTY const *props, + UINT32 num_properties, BOOL select_any_range, UINT32 *indices, UINT32 num_indices, UINT32 *actual_num_indices) +{ + FIXME("%p, %p, %u, %d, %p, %u, %p.\n", iface, props, num_properties, select_any_range, indices, + num_indices, actual_num_indices); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset1_GetFontAxisRanges_(IDWriteFontSet3 *iface, UINT32 font_index, + DWRITE_FONT_AXIS_RANGE *axis_ranges, UINT32 num_ranges, UINT32 *actual_num_ranges) +{ + FIXME("%p, %u, %p, %u, %p.\n", iface, font_index, axis_ranges, num_ranges, actual_num_ranges); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset1_GetFontAxisRanges(IDWriteFontSet3 *iface, DWRITE_FONT_AXIS_RANGE *axis_ranges, + UINT32 num_ranges, UINT32 *actual_num_ranges) +{ + FIXME("%p, %p, %u, %p.\n", iface, axis_ranges, num_ranges, actual_num_ranges); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset1_GetFontFaceReference(IDWriteFontSet3 *iface, UINT32 index, + IDWriteFontFaceReference1 **reference) +{ + FIXME("%p, %u, %p.\n", iface, index, reference); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset1_CreateFontResource(IDWriteFontSet3 *iface, UINT32 index, IDWriteFontResource **resource) +{ + FIXME("%p, %u, %p.\n", iface, index, resource); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontset1_CreateFontFace(IDWriteFontSet3 *iface, UINT32 index, IDWriteFontFace5 **fontface) +{ + FIXME("%p, %u, %p.\n", iface, index, fontface); + + return E_NOTIMPL; +} + +static DWRITE_LOCALITY WINAPI dwritefontset1_GetFontLocality(IDWriteFontSet3 *iface, UINT32 index) +{ + FIXME("%p, %u.\n", iface, index); + + return DWRITE_LOCALITY_LOCAL; +} + +static HANDLE WINAPI dwritefontset2_GetExpirationEvent(IDWriteFontSet3 *iface) +{ + FIXME("%p.\n", iface); + + return NULL; +} + +static DWRITE_FONT_SOURCE_TYPE WINAPI dwritefontset3_GetFontSourceType(IDWriteFontSet3 *iface, UINT32 index) +{ + FIXME("%p, %u.\n", iface, index); + + return DWRITE_FONT_SOURCE_TYPE_UNKNOWN; +} + +static UINT32 WINAPI dwritefontset3_GetFontSourceNameLength(IDWriteFontSet3 *iface, UINT32 index) +{ + FIXME("%p, %u.\n", iface, index); + + return 0; +} + +static HRESULT WINAPI dwritefontset3_GetFontSourceName(IDWriteFontSet3 *iface, UINT32 index, WCHAR *buffer, UINT32 buffer_size) +{ + FIXME("%p, %u, %p, %u.\n", iface, index, buffer, buffer_size); + + return E_NOTIMPL; +} + +static const IDWriteFontSet3Vtbl fontsetvtbl = +{ + dwritefontset_QueryInterface, + dwritefontset_AddRef, + dwritefontset_Release, + dwritefontset_GetFontCount, + dwritefontset_GetFontFaceReference, + dwritefontset_FindFontFaceReference, + dwritefontset_FindFontFace, + dwritefontset_GetPropertyValues__, + dwritefontset_GetPropertyValues_, + dwritefontset_GetPropertyValues, + dwritefontset_GetPropertyOccurrenceCount, + dwritefontset_GetMatchingFonts_, + dwritefontset_GetMatchingFonts, + dwritefontset1_GetMatchingFonts, + dwritefontset1_GetFirstFontResources, + dwritefontset1_GetFilteredFonts__, + dwritefontset1_GetFilteredFonts_, + dwritefontset1_GetFilteredFonts, + dwritefontset1_GetFilteredFontIndices_, + dwritefontset1_GetFilteredFontIndices, + dwritefontset1_GetFontAxisRanges_, + dwritefontset1_GetFontAxisRanges, + dwritefontset1_GetFontFaceReference, + dwritefontset1_CreateFontResource, + dwritefontset1_CreateFontFace, + dwritefontset1_GetFontLocality, + dwritefontset2_GetExpirationEvent, + dwritefontset3_GetFontSourceType, + dwritefontset3_GetFontSourceNameLength, + dwritefontset3_GetFontSourceName, +}; + +static HRESULT fontset_builder_create_fontset(IDWriteFactory7 *factory, struct dwrite_fontset_entry *entries, + unsigned int count, IDWriteFontSet **ret) +{ + struct dwrite_fontset *object; + unsigned int i; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IDWriteFontSet3_iface.lpVtbl = &fontsetvtbl; + object->refcount = 1; + object->factory = factory; + IDWriteFactory7_AddRef(object->factory); + + if (count) + { + object->entries = heap_calloc(count, sizeof(*object->entries)); + object->count = count; + + for (i = 0; i < object->count; ++i) + { + object->entries[i] = entries[i]; + IDWriteFontFile_AddRef(object->entries[i].file); + } + } + + *ret = (IDWriteFontSet *)&object->IDWriteFontSet3_iface; + + return S_OK; +} + static HRESULT WINAPI dwritefontsetbuilder_QueryInterface(IDWriteFontSetBuilder2 *iface, REFIID riid, void **obj) { @@ -7114,15 +7459,13 @@ static ULONG WINAPI dwritefontsetbuilder_Release(IDWriteFontSetBuilder2 *iface) { struct dwrite_fontset_builder *builder = impl_from_IDWriteFontSetBuilder2(iface); ULONG refcount = InterlockedDecrement(&builder->refcount); - size_t i; TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { IDWriteFactory7_Release(builder->factory); - for (i = 0; i < builder->count; ++i) - IDWriteFontFile_Release(builder->entries[i].file); + fontset_release_entries(builder->entries, builder->count); heap_free(builder->entries); heap_free(builder); } @@ -7210,9 +7553,11 @@ static HRESULT WINAPI dwritefontsetbuilder_AddFontSet(IDWriteFontSetBuilder2 *if static HRESULT WINAPI dwritefontsetbuilder_CreateFontSet(IDWriteFontSetBuilder2 *iface, IDWriteFontSet **fontset) { - FIXME("%p, %p.\n", iface, fontset); + struct dwrite_fontset_builder *builder = impl_from_IDWriteFontSetBuilder2(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, fontset); + + return fontset_builder_create_fontset(builder->factory, builder->entries, builder->count, fontset); } static HRESULT WINAPI dwritefontsetbuilder1_AddFontFile(IDWriteFontSetBuilder2 *iface, IDWriteFontFile *file) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c377f20556b..97caa7b31a2 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9400,17 +9400,13 @@ static void test_fontsetbuilder(void) ok(hr == S_OK, "Unexpected hr %#x.\n",hr); hr = IDWriteFontSetBuilder1_CreateFontSet(builder1, &fontset); - todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n",hr); - if (SUCCEEDED(hr)) - { /* No attempt to eliminate duplicates. */ count = IDWriteFontSet_GetFontCount(fontset); ok(count == 2, "Unexpected font count %u.\n", count); IDWriteFontSet_Release(fontset); - } IDWriteFontFile_Release(file); IDWriteFontSetBuilder1_Release(builder1); @@ -9453,33 +9449,37 @@ static void test_fontsetbuilder(void) EXPECT_REF(ref, 1); hr = IDWriteFontSetBuilder_CreateFontSet(builder, &fontset); - todo_wine ok(hr == S_OK, "Failed to create a font set, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { setcount = IDWriteFontSet_GetFontCount(fontset); ok(setcount == 1, "Unexpected font count %u.\n", setcount); + ref2 = NULL; hr = IDWriteFontSet_GetFontFaceReference(fontset, 0, &ref2); + todo_wine ok(hr == S_OK, "Failed to get font face reference, hr %#x.\n", hr); ok(ref2 != ref, "Unexpected reference.\n"); + ref3 = NULL; hr = IDWriteFontSet_GetFontFaceReference(fontset, 0, &ref3); + todo_wine { ok(hr == S_OK, "Failed to get font face reference, hr %#x.\n", hr); ok(ref2 != ref3, "Unexpected reference.\n"); - - IDWriteFontFaceReference_Release(ref3); - IDWriteFontFaceReference_Release(ref2); + } + if (ref3) + IDWriteFontFaceReference_Release(ref3); + if (ref2) + IDWriteFontFaceReference_Release(ref2); for (id = DWRITE_FONT_PROPERTY_ID_FAMILY_NAME; id < DWRITE_FONT_PROPERTY_ID_TOTAL; ++id) { IDWriteLocalizedStrings *values; WCHAR buffW[255], buff2W[255]; UINT32 c, ivalue = 0; - BOOL exists; + BOOL exists = FALSE; hr = IDWriteFontSet_GetPropertyValues(fontset, 0, id, &exists, &values); + todo_wine ok(hr == S_OK, "Failed to get property value, hr %#x.\n", hr); if (!exists) @@ -9529,7 +9529,6 @@ static void test_fontsetbuilder(void) } IDWriteFontSet_Release(fontset); - } IDWriteFontFaceReference_Release(ref); IDWriteFontSetBuilder_Release(builder); -- 2.30.1

1 4

[tools] testbot/LogUtils: Add support for IgnoreExceptions.
by Francois Gouget 04 Mar '21

04 Mar '21

Any exception occurring while IgnoreExceptions=1 is expected and should be ignored. Note that this is made possible by the fact that ParseWineTestReport() is now the sole authority on what is a report error line, and thus won't be contradicted by GetReportLineCategory() (which lacks the context information to deal with IgnoreExceptions directives). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This fixes the failure count when running kernel32:debugger. That is the TestBot will no longer report every kernel32:debugger run as failed. --- testbot/lib/WineTestBot/LogUtils.pm | 56 ++++++++++++++++++----------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 0bd7d19de..bdba8dad0 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -611,44 +611,60 @@ sub ParseWineTestReport($$$) _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } + elsif (($Cur->{Unit} ne "" and + $Line =~ /($Cur->{UnitsRE})\.c:\d+: IgnoreExceptions=([01])/) or + $Line =~ /^([_.a-z0-9]+)\.c:\d+: IgnoreExceptions=([01])/) + { + my ($Unit, $Ignore) = ($1, $2); + _CheckUnit($LogInfo, $Cur, $Unit, "ignore exceptions"); + $Cur->{IgnoreExceptions} = $Ignore; + } elsif (($Cur->{Unit} ne "" and $Line =~ /([0-9a-f]+):($Cur->{UnitsRE}): unhandled exception [0-9a-fA-F]{8} at /) or $Line =~ /^([0-9a-f]+):([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at /) { my ($Pid, $Unit) = ($1, $2); - - if ($Cur->{Units}->{$Unit}) + _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); + if (!$Cur->{IgnoreExceptions}) { - # This also replaces a test summary line. - $Cur->{Pids}->{$Pid || 0} = 1; - $Cur->{SummaryFailures}++; + if ($Cur->{Units}->{$Unit}) + { + # This also replaces a test summary line. + $Cur->{Pids}->{$Pid || 0} = 1; + $Cur->{SummaryFailures}++; + } + _AddReportError($LogInfo, $Cur, $LineNo, $Line); + $Cur->{LineFailures}++; } - _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); - _AddReportError($LogInfo, $Cur, $LineNo, $Line); - $Cur->{LineFailures}++; } elsif ($Line =~ /Unhandled exception: .* in .* code /) { - # This also replaces a test summary line. The pid is unknown so use 0. - $Cur->{Pids}->{0} = 1; - $Cur->{SummaryFailures}++; - _AddReportError($LogInfo, $Cur, $LineNo, $Line); - $Cur->{LineFailures}++; + if (!$Cur->{IgnoreExceptions}) + { + # This also replaces a test summary line. The pid is unknown so use 0. + $Cur->{Pids}->{0} = 1; + $Cur->{SummaryFailures}++; + _AddReportError($LogInfo, $Cur, $LineNo, $Line); + $Cur->{LineFailures}++; + } } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE})\.c:\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) or $Line =~ /^([_.a-z0-9]+)\.c:\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) { my ($Unit, $Pid) = ($1, $2); - if ($Cur->{Units}->{$Unit}) + _CheckUnit($LogInfo, $Cur, $Unit, "child exception"); + if (!$Cur->{IgnoreExceptions}) { - # This also replaces a test summary line. - $Cur->{Pids}->{$Pid || 0} = 1; - $Cur->{SummaryFailures}++; + if ($Cur->{Units}->{$Unit}) + { + # This also replaces a test summary line. + $Cur->{Pids}->{$Pid || 0} = 1; + $Cur->{SummaryFailures}++; + } + _AddReportError($LogInfo, $Cur, $LineNo, $Line); + $Cur->{LineFailures}++; } - _CheckUnit($LogInfo, $Cur, $Unit, "child exception"); - _AddReportError($LogInfo, $Cur, $LineNo, $Line); - $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and $Line =~ /([0-9a-f]+):($Cur->{Unit}): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) or -- 2.20.1

1 0

[tools 1/2] testbot: Allow for more complex Collection filtering.
by Francois Gouget 04 Mar '21

04 Mar '21

The previous scheme used an implicit AND between all the property filters, with no way of replacing it with an OR. The new scheme makes it possible to create almost any where clause (excluding joins). For instance this makes it possible to get all the Jobs that were submitted or completed recently: $Jobs->AddFilter(FilterOr(FilterValue("Submitted", ">=", [$Recent]]), FilterValue("Ended", ">=", [$Recent]))); Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 98 ++++++++++++++-- testbot/lib/ObjectModel/DBIBackEnd.pm | 158 ++++++++++++++++++-------- 2 files changed, 201 insertions(+), 55 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 1fe1481f6..782f32c23 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -1,6 +1,6 @@ # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # Copyright 2009 Ge van Geldorp -# Copyright 2012-2014 Francois Gouget +# Copyright 2012-2014, 2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -38,6 +38,7 @@ criteria. =cut use Exporter 'import'; +our @EXPORT = qw(FilterValue FilterNull FilterNotNull FilterAnd FilterOr FilterNot); our @EXPORT_OK = qw(new ComputeMasterKey); use Scalar::Util qw(blessed weaken); @@ -90,7 +91,7 @@ sub new($$$$$;$$@) MasterColNames => $MasterColNames, MasterColValues => $MasterColValues, MasterKey => ComputeMasterKey($MasterColValues), - Filters => {}, + Filter => undef, AllScopeItems => $AllScopeItems || {}, Items => undef}; if ($AllScopeItems) @@ -692,18 +693,99 @@ sub DeleteAll($) return undef; } -sub AddFilter($$$;$) + +# +# Item filtering +# + +my %FilterTypes = ( + 'value' => 1, + 'null' => 1, + 'not null' => 1, + 'and' => 1, + 'or' => 1, + 'not' => 1, +); + +my %ValueComparators = ( + '=' => 1, + '<>' => 1, + '<' => 1, + '<=' => 1, + '>' => 1, + '>=' => 1, + 'LIKE' => 1, + 'NOT LIKE' => 1, +); + +sub FilterValue($$$) { - my ($self, $PropertyName, $Values, $Type) = @_; + my ($PropertyName, $Comparator, $Values) = @_; - $self->{Filters}{$PropertyName} = [($Type || "="), $Values]; + die "unknown '$Comparator' comparator" if (!$ValueComparators{$Comparator}); + return { Type => 'value', + Property => $PropertyName, + Comparator => $Comparator, + Values => $Values, + }; } -sub GetFilters($) +sub FilterNull($) { - my ($self) = @_; + my ($PropertyName) = @_; + + return { Type => 'null', Property => $PropertyName }; +} + +sub FilterNotNull($) +{ + my ($PropertyName) = @_; + + return { Type => 'not null', Property => $PropertyName }; +} + +sub FilterAnd(@) +{ + return { Type => 'and', Terms => [@_] }; +} + +sub FilterOr(@) +{ + + return { Type => 'or', Terms => [@_] }; +} + +sub FilterNot($) +{ + my ($Term) = @_; + + return { Type => 'not', Term => $Term }; +} + +sub AddFilter($$;$$) +{ + my $self = shift; + my $Filter = @_ == 1 ? $_[0] : FilterValue($_[0], $_[2] || "=", $_[1]); + + if (!$self->{Filter}) + { + $self->{Filter} = $Filter; + } + elsif ($self->{Filter}->{Type} eq 'and') + { + push @{$self->{Filter}->{Terms}}, $Filter; + } + else + { + $self->{Filter} = FilterAnd($self->{Filter}, $Filter); + } +} + +sub GetFilter($) +{ + my ($self, $PropertyName, $Values, $Type) = @_; - return $self->{Filters}; + return $self->{Filter}; } 1; diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 88ecf8521..10cc1f3c3 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -1,6 +1,6 @@ # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # Copyright 2009 Ge van Geldorp -# Copyright 2012, 2014 Francois Gouget +# Copyright 2012, 2014, 2018 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -174,15 +174,108 @@ sub BuildFieldList($$) return $Fields; } -my %_AllowedFilterTypes = ( - "=" => 1, - "<>" => 1, - "<" => 1, - "<=" => 1, - ">" => 1, - ">=" => 1, - "LIKE" => 1, -); +sub ColNameToDb($) +{ + my ($PropertyDescriptor) = @_; + + my $ColNames = $PropertyDescriptor->GetColNames(); + if (@$ColNames != 1) + { + die "cannot filter on Itemref with more than one column name: @$ColNames"; + } + return $ColNames->[0]; +} + +=pod +=over 12 + +=item C<GetFilterWhere()> + +Builds the WHERE clause and its associated data parameter from the specified +collection and filter tree. + +Returns a triplet composed of a boolean which is true if the returned WHERE +clause is composite, that is if it should be enclosed in parentheses before +being combined with other filters ; the WHERE clause string ; and a reference +to the data array. + +=back +=cut + +sub GetFilterWhere($$$); +sub GetFilterWhere($$$) +{ + my ($self, $Collection, $Filter) = @_; + + if ($Filter->{Type} eq 'value') + { + my $Values = $Filter->{Values}; + if (!$Values or @$Values == 0) + { + die "no values for the $Filter->{Property} $Filter->{Comparator} property filter"; + } + + my $PropertyDescriptor = $Collection->GetPropertyDescriptorByName($Filter->{Property}); + my (@Wheres, @Data); + foreach my $ColValue (@$Values) + { + my $ColName = ColNameToDb($PropertyDescriptor); + push @Wheres, "$ColName $Filter->{Comparator} ?"; + + if ($PropertyDescriptor->GetClass() eq "Itemref") + { + $ColValue = $ColValue->GetKey(); + } + push @Data, $self->ToDb($ColValue, $PropertyDescriptor); + } + return (@$Values > 1, join(" OR ", @Wheres), \@Data); + } + + if ($Filter->{Type} eq 'and' or $Filter->{Type} eq 'or') + { + my $Terms = $Filter->{Terms}; + if (!$Terms or !@$Terms) + { + die "no terms for the $Filter->{Type} filter"; + } + if (@$Terms == 1) + { + return GetFilterWhere($self, $Collection, $Terms->[0]); + } + + my (@Wheres, @Data); + foreach my $Term (@$Terms) + { + my ($Composite, $TermWhere, $TermData) = GetFilterWhere($self, $Collection, $Term); + push @Wheres, ($Composite ? "($TermWhere)" : $TermWhere); + push @Data, @$TermData; + } + + my $Operator = ($Filter->{Type} eq 'and' ? " AND " : " OR "); + return (1, join($Operator, @Wheres), \@Data); + } + + if ($Filter->{Type} eq 'null' or $Filter->{Type} eq 'not null') + { + my $PropertyDescriptor = $Collection->GetPropertyDescriptorByName($Filter->{Property}); + my $ColName = ColNameToDb($PropertyDescriptor); + my $Operator = ($Filter->{Type} eq 'null' ? "IS NULL" : "IS NOT NULL"); + return (0, "$ColName $Operator", []); + } + + if ($Filter->{Type} eq 'not') + { + if (!$Filter->{Term}) + { + die "no term for the not filter"; + } + my ($Composite, $TermWhere, $TermData) = GetFilterWhere($self, $Collection, $Filter->{Term}); + # To avoid confusion add parentheses even it the term is not composite + return (0, "NOT ($TermWhere)", $TermData); + } + + die "unsupported '$Filter->{Type}' filter type"; +} sub LoadCollection($$) { @@ -199,48 +292,19 @@ sub LoadCollection($$) push @Data, @{$MasterColValues}; } - my $Filters = $Collection->GetFilters(); - foreach my $FilterProperty (keys %$Filters) + my $Filter = $Collection->GetFilter(); + if ($Filter) { + my ($Composite, $FilterWhere, $FilterData) = GetFilterWhere($self, $Collection, $Filter); if ($Where ne "") { - $Where .= " AND "; - } - my $PropertyDescriptor = $Collection->GetPropertyDescriptorByName($FilterProperty); - my ($FilterType, $FilterValues) = @{$Filters->{$FilterProperty}}; - if (!$_AllowedFilterTypes{$FilterType}) - { - die "unknown '$FilterType' filter type"; - } - if (!@$FilterValues) - { - die "no values for the '$FilterType' filter"; - } - - if (@$FilterValues != 1) - { - $Where .= "("; - } - foreach my $FilterIndex (0 .. @$FilterValues - 1) - { - if ($FilterIndex != 0) - { - $Where .= " OR "; - } - my $ColValue = $FilterValues->[$FilterIndex]; - if ($PropertyDescriptor->GetClass() eq "Itemref") - { - $ColValue = $ColValue->GetKey(); - } - foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) - { - $Where .= "$ColName $FilterType ?"; - $Data[@Data] = $self->ToDb($ColValue, $PropertyDescriptor); - } + $Where .= ($Composite ? " AND ($FilterWhere)" : " AND $FilterWhere"); + push @Data, @$FilterData; } - if (@$FilterValues != 1) + else { - $Where .= ")"; + $Where = $FilterWhere; + @Data = @$FilterData; } } -- 2.20.1

1 1

[PATCH 1/4] windows.media.speech: Add stub dll.
by Rémi Bernon 04 Mar '21

04 Mar '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This DLL is required to run Microsoft Flight Simulator. configure.ac | 1 + dlls/windows.media.speech.dll/Makefile.in | 5 + .../windows.media.speech.spec | 3 + .../windows.media.speech_main.c | 140 ++++++++++++++++++ loader/wine.inf.in | 1 + 5 files changed, 150 insertions(+) create mode 100644 dlls/windows.media.speech.dll/Makefile.in create mode 100644 dlls/windows.media.speech.dll/windows.media.speech.spec create mode 100644 dlls/windows.media.speech.dll/windows.media.speech_main.c diff --git a/configure.ac b/configure.ac index caff5d1fe52..78720ab188f 100644 --- a/configure.ac +++ b/configure.ac @@ -3796,6 +3796,7 @@ WINE_CONFIG_MAKEFILE(dlls/win32s16.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/windebug.dll16,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/windows.media.speech.dll) WINE_CONFIG_MAKEFILE(dlls/windowscodecs) WINE_CONFIG_MAKEFILE(dlls/windowscodecs/tests) WINE_CONFIG_MAKEFILE(dlls/windowscodecsext) diff --git a/dlls/windows.media.speech.dll/Makefile.in b/dlls/windows.media.speech.dll/Makefile.in new file mode 100644 index 00000000000..e1f4b3402bd --- /dev/null +++ b/dlls/windows.media.speech.dll/Makefile.in @@ -0,0 +1,5 @@ +MODULE = windows.media.speech.dll +IMPORTS = combase uuid +EXTRADLLFLAGS = -mno-cygwin +C_SRCS = \ + windows.media.speech_main.c diff --git a/dlls/windows.media.speech.dll/windows.media.speech.spec b/dlls/windows.media.speech.dll/windows.media.speech.spec new file mode 100644 index 00000000000..721493229c2 --- /dev/null +++ b/dlls/windows.media.speech.dll/windows.media.speech.spec @@ -0,0 +1,3 @@ +1 stdcall -private DllCanUnloadNow() +2 stdcall -private DllGetActivationFactory(ptr ptr) +3 stdcall -private DllGetClassObject(ptr ptr ptr) diff --git a/dlls/windows.media.speech.dll/windows.media.speech_main.c b/dlls/windows.media.speech.dll/windows.media.speech_main.c new file mode 100644 index 00000000000..c7c14deef78 --- /dev/null +++ b/dlls/windows.media.speech.dll/windows.media.speech_main.c @@ -0,0 +1,140 @@ +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "wine/debug.h" +#include "objbase.h" + +#include "initguid.h" +#include "activation.h" + +#include "windows.foundation.h" +#include "windows.media.speechsynthesis.h" + +WINE_DEFAULT_DEBUG_CHANNEL(speech); + +static const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +struct windows_media_speech +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct windows_media_speech *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct windows_media_speech, IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_QueryInterface( + IActivationFactory *iface, REFIID iid, void **out) +{ + struct windows_media_speech *impl = impl_from_IActivationFactory(iface); + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IActivationFactory)) + { + IUnknown_AddRef(iface); + *out = &impl->IActivationFactory_iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE windows_media_speech_AddRef( + IActivationFactory *iface) +{ + struct windows_media_speech *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE windows_media_speech_Release( + IActivationFactory *iface) +{ + struct windows_media_speech *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_GetIids( + IActivationFactory *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_GetRuntimeClassName( + IActivationFactory *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_GetTrustLevel( + IActivationFactory *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_ActivateInstance( + IActivationFactory *iface, IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl activation_factory_vtbl = +{ + windows_media_speech_QueryInterface, + windows_media_speech_AddRef, + windows_media_speech_Release, + /* IInspectable methods */ + windows_media_speech_GetIids, + windows_media_speech_GetRuntimeClassName, + windows_media_speech_GetTrustLevel, + /* IActivationFactory methods */ + windows_media_speech_ActivateInstance, +}; + +static struct windows_media_speech windows_media_speech = +{ + {&activation_factory_vtbl}, + 0 +}; + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory); + *factory = &windows_media_speech.IActivationFactory_iface; + IUnknown_AddRef(*factory); + return S_OK; +} diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d5dd2d5b66b..db816327a51 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -713,6 +713,7 @@ HKLM,%MciExtStr%,"wmx",,"MPEGVideo" HKLM,%MciExtStr%,"wvx",,"MPEGVideo" [Misc] +HKLM,Software\Microsoft\WindowsRuntime\ActivatableClassId\Windows.Media.SpeechSynthesis.SpeechSynthesizer,"DllPath",2,"Windows.Media.Speech.dll" HKLM,Software\Borland\Database Engine\Settings\SYSTEM\INIT,SHAREDMEMLOCATION,,9000 HKLM,Software\Clients\Mail,,2,"Native Mail Client" HKLM,Software\Clients\Mail\Native Mail Client,,2,"Native Mail Client" -- 2.30.0

2 6

[tools] winetest/dissect: Don't close nonexistent test units.
by Francois Gouget 04 Mar '21

04 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index fc83726bf..7f4f3271d 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -770,7 +770,7 @@ while ($line = <IN>) { # And close the current test unit taking into account # it may have been polluted by the new one. $broken = 1; - close_test_unit(0); + close_test_unit(0) if ($dll ne ""); # Then switch to the new test unit, not for the past lines, but for # those before the next 'start' line. This 'new' test unit may have -- 2.20.1

1 0

[tools] testbot/LogUtils: Don't close nonexistent test units.
by Francois Gouget 04 Mar '21

04 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This shouldn't really happen unless there is a bug that prevents ParseWineTestReport() from recognizing the initial start line (which is of course what happened). At least this makes it consistent with the other _CloseTestUnit() call. --- 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 4d2619ccc..0bd7d19de 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -683,7 +683,7 @@ sub ParseWineTestReport($$$) # First close the current test unit taking into account # it may have been polluted by the new one. $Cur->{IsBroken} = 1; - _CloseTestUnit($LogInfo, $Cur, 0); + _CloseTestUnit($LogInfo, $Cur, 0) if ($Cur->{Dll} ne ""); # Then switch to the new test unit, not for the past lines, but for # those before the next 'start' line. This 'new' test unit may have -- 2.20.1

1 0

[PATCH] mprapi: Add stub for MprConfigServerConnect().
by Paul Gofman 04 Mar '21

04 Mar '21

Fixes ARK Park start failure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mprapi/mprapi.c | 12 ++++++++++++ dlls/mprapi/mprapi.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/mprapi/mprapi.c b/dlls/mprapi/mprapi.c index cfb4259b339..b3d641fe108 100644 --- a/dlls/mprapi/mprapi.c +++ b/dlls/mprapi/mprapi.c @@ -60,3 +60,15 @@ BOOL APIENTRY MprAdminIsServiceRunning(LPWSTR server) return FALSE; } + +/*********************************************************************** + * MprConfigServerConnect (MPRAPI.@) + */ +DWORD APIENTRY MprConfigServerConnect(LPWSTR server_name, HANDLE *hmprconfig) +{ + FIXME("server_name %s, hmprconfig %p stub.\n", debugstr_w(server_name), hmprconfig); + + *hmprconfig = NULL; + + return ERROR_NOT_SUPPORTED; +} diff --git a/dlls/mprapi/mprapi.spec b/dlls/mprapi/mprapi.spec index 4b5937b8806..21d39841db5 100644 --- a/dlls/mprapi/mprapi.spec +++ b/dlls/mprapi/mprapi.spec @@ -82,7 +82,7 @@ @ stub MprConfigInterfaceTransportRemove @ stub MprConfigInterfaceTransportSetInfo @ stub MprConfigServerBackup -@ stub MprConfigServerConnect +@ stdcall MprConfigServerConnect(wstr ptr) @ stub MprConfigServerDisconnect @ stub MprConfigServerGetInfo @ stub MprConfigServerInstall -- 2.29.2

1 0

[PATCH] dwrite/tests: Do not assume that fonts have a en-us name.
by Giovanni Mascellani 04 Mar '21

04 Mar '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/dwrite/tests/analyzer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 6dd251270c7..0294bbfb719 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1500,7 +1500,10 @@ static void get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, unsig hr = IDWriteLocalizedStrings_FindLocaleName(strings, L"en-us", &index, &exists); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(exists, "Failed to find locale name %d.\n", exists); + + /* Not all fonts have an en-us name! */ + if (!exists) + index = 0; hr = IDWriteLocalizedStrings_GetString(strings, index, buff, size); ok(hr == S_OK, "Failed to get name string, hr %#x.\n", hr); -- 2.30.1

2 2